1
0
forked from noxious/server

NPM update, removed CRUD functions from object repository, added prettier

This commit is contained in:
2024-07-22 01:36:05 +02:00
parent 792abdfaf6
commit 6131a8455a
51 changed files with 1450 additions and 1460 deletions

View File

@ -1,20 +1,20 @@
import { Socket, Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import CharacterRepository from "../../repositories/CharacterRepository";
import {Character, User} from "@prisma/client";
import { Socket, Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import CharacterRepository from '../../repositories/CharacterRepository'
import { Character, User } from '@prisma/client'
type SocketResponseT = {
character_id: number
character_id: number
}
export default function (socket: TSocket, io: Server) {
socket.on('character:connect', async (data: SocketResponseT) => {
console.log('character:connect requested', data);
try {
socket.character = await CharacterRepository.getByUserAndId(socket.user?.id as number, data.character_id) as Character;
socket.emit('character:connect', socket.character)
} catch (error: any) {
console.log('character:connect error', error);
}
});
}
socket.on('character:connect', async (data: SocketResponseT) => {
console.log('character:connect requested', data)
try {
socket.character = (await CharacterRepository.getByUserAndId(socket.user?.id as number, data.character_id)) as Character
socket.emit('character:connect', socket.character)
} catch (error: any) {
console.log('character:connect error', error)
}
})
}

View File

@ -1,37 +1,37 @@
import { Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import {Character} from "@prisma/client";
import CharacterRepository from "../../repositories/CharacterRepository";
import {ZCharacterCreate} from "../../utilities/ZodTypes";
import { Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import { Character } from '@prisma/client'
import CharacterRepository from '../../repositories/CharacterRepository'
import { ZCharacterCreate } from '../../utilities/ZodTypes'
export default function (socket: TSocket, io: Server) {
socket.on('character:create', async (data: any) => {
// zod validate
try {
data = ZCharacterCreate.parse(data);
socket.on('character:create', async (data: any) => {
// zod validate
try {
data = ZCharacterCreate.parse(data)
const user_id = socket.user?.id as number;
const user_id = socket.user?.id as number
// Check if character name already exists
const characterExists = await CharacterRepository.getByName(data.name);
// Check if character name already exists
const characterExists = await CharacterRepository.getByName(data.name)
if (characterExists) {
return socket.emit('notification', {message: 'Character name already exists'});
}
if (characterExists) {
return socket.emit('notification', { message: 'Character name already exists' })
}
let characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[];
let characters: Character[] = (await CharacterRepository.getByUserId(user_id)) as Character[]
if (characters.length >= 4) {
return socket.emit('notification', {message: 'You can only have 4 characters'});
}
if (characters.length >= 4) {
return socket.emit('notification', { message: 'You can only have 4 characters' })
}
const character: Character = await CharacterRepository.create(user_id, data.name, 'player') as Character;
characters = [...characters, character];
const character: Character = (await CharacterRepository.create(user_id, data.name, 'player')) as Character
characters = [...characters, character]
socket.emit('character:create:success');
socket.emit('character:list', characters);
} catch (error: any) {
return socket.emit('notification', {message: error.errors[0]?.message ?? 'Invalid data'});
}
});
}
socket.emit('character:create:success')
socket.emit('character:list', characters)
} catch (error: any) {
return socket.emit('notification', { message: error.errors[0]?.message ?? 'Invalid data' })
}
})
}

View File

@ -1,30 +1,30 @@
import {Server} from "socket.io";
import {TSocket} from "../../utilities/Types";
import { Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import { Character, Zone } from '@prisma/client'
import CharacterRepository from "../../repositories/CharacterRepository";
import CharacterRepository from '../../repositories/CharacterRepository'
type TypePayload = {
character_id: number;
character_id: number
}
type TypeResponse = {
zone: Zone;
characters: Character[];
zone: Zone
characters: Character[]
}
export default function (socket: TSocket, io: Server) {
socket.on('character:delete', async (data: TypePayload, callback: (response: TypeResponse) => void) => {
// zod validate
try {
await CharacterRepository.deleteByUserIdAndId(socket.user?.id as number, data.character_id as number);
socket.on('character:delete', async (data: TypePayload, callback: (response: TypeResponse) => void) => {
// zod validate
try {
await CharacterRepository.deleteByUserIdAndId(socket.user?.id as number, data.character_id as number)
const user_id = socket.user?.id as number;
const characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[];
const user_id = socket.user?.id as number
const characters: Character[] = (await CharacterRepository.getByUserId(user_id)) as Character[]
socket.emit('character:list', characters);
} catch (error: any) {
console.log(error);
return socket.emit('notification', {message: 'Character delete failed. Please try again.'});
}
});
}
socket.emit('character:list', characters)
} catch (error: any) {
console.log(error)
return socket.emit('notification', { message: 'Character delete failed. Please try again.' })
}
})
}

View File

@ -1,17 +1,17 @@
import { Socket, Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import {Character} from "@prisma/client";
import CharacterRepository from "../../repositories/CharacterRepository";
import { Socket, Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import { Character } from '@prisma/client'
import CharacterRepository from '../../repositories/CharacterRepository'
export default function CharacterList(socket: TSocket, io: Server) {
socket.on('character:list', async (data: any) => {
try {
console.log('character:list requested');
const user_id = socket.user?.id as number;
const characters: Character[] = await CharacterRepository.getByUserId(user_id) as Character[];
socket.emit('character:list', characters);
} catch (error: any) {
console.log('character:list error', error);
}
});
}
socket.on('character:list', async (data: any) => {
try {
console.log('character:list requested')
const user_id = socket.user?.id as number
const characters: Character[] = (await CharacterRepository.getByUserId(user_id)) as Character[]
socket.emit('character:list', characters)
} catch (error: any) {
console.log('character:list error', error)
}
})
}

View File

@ -1,33 +1,33 @@
import { Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import CharacterRepository from "../../repositories/CharacterRepository";
import ZoneManager from "../../managers/ZoneManager";
import { Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import CharacterRepository from '../../repositories/CharacterRepository'
import ZoneManager from '../../managers/ZoneManager'
type SocketResponseT = {
position_x: number,
position_y: number,
position_x: number
position_y: number
}
export default function (socket: TSocket, io: Server) {
socket.on('character:move', async (data: SocketResponseT) => {
try {
console.log('character:move requested', data);
socket.on('character:move', async (data: SocketResponseT) => {
try {
console.log('character:move requested', data)
if (!socket.character) {
console.log('character:move error', 'Character not found');
return;
}
if (!socket.character) {
console.log('character:move error', 'Character not found')
return
}
socket.character.position_x = data.position_x;
socket.character.position_y = data.position_y;
socket.character.position_x = data.position_x
socket.character.position_y = data.position_y
await CharacterRepository.updatePosition(socket.character.id as number, data.position_x, data.position_y);
ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character);
console.log(socket.character);
await CharacterRepository.updatePosition(socket.character.id as number, data.position_x, data.position_y)
ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character)
console.log(socket.character)
io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character);
} catch (error: any) {
console.log('character:move error', error);
}
});
}
io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
} catch (error: any) {
console.log('character:move error', error)
}
})
}

View File

@ -1,8 +1,8 @@
import { Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import ZoneRepository from "../../repositories/ZoneRepository";
import ZoneManager from "../../managers/ZoneManager";
import {Character, Zone} from "@prisma/client";
import { Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import ZoneRepository from '../../repositories/ZoneRepository'
import ZoneManager from '../../managers/ZoneManager'
import { Character, Zone } from '@prisma/client'
/**
* Handle character zone leave event
@ -10,39 +10,39 @@ import {Character, Zone} from "@prisma/client";
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('character:zone:leave', async () => {
console.log(`---Socket ${socket.character?.id} has leaved zone.`);
socket.on('character:zone:leave', async () => {
console.log(`---Socket ${socket.character?.id} has leaved zone.`)
if (!socket.character) {
console.log('Socket leaved zone but had no character set');
return;
}
if (!socket.character) {
console.log('Socket leaved zone but had no character set')
return
}
if (!socket.character.zoneId) {
console.log(`---Zone id not provided.`);
return;
}
if (!socket.character.zoneId) {
console.log(`---Zone id not provided.`)
return
}
const zone = await ZoneRepository.getById(socket.character.zoneId);
const zone = await ZoneRepository.getById(socket.character.zoneId)
if (!zone) {
console.log(`---Zone not found.`);
return;
}
if (!zone) {
console.log(`---Zone not found.`)
return
}
socket.leave(zone.id.toString());
socket.leave(zone.id.toString())
socket.emit('character:zone:unload');
socket.emit('character:zone:unload')
// let other clients know of new character
io.to(zone.id.toString()).emit('zone:character:leave', socket.character);
// let other clients know of new character
io.to(zone.id.toString()).emit('zone:character:leave', socket.character)
// add character to zone manager
ZoneManager.removeCharacterFromZone(zone.id, socket.character as Character);
});
// add character to zone manager
ZoneManager.removeCharacterFromZone(zone.id, socket.character as Character)
})
}
/**
* Resources:
* https://stackoverflow.com/questions/6873607/socket-io-rooms-difference-between-broadcast-to-and-sockets-in
*/
*/

View File

@ -1,16 +1,16 @@
import { Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import ZoneRepository from "../../repositories/ZoneRepository";
import ZoneManager from "../../managers/ZoneManager";
import {Character, Zone} from "@prisma/client";
import { Server } from 'socket.io'
import { TSocket } from '../../utilities/Types'
import ZoneRepository from '../../repositories/ZoneRepository'
import ZoneManager from '../../managers/ZoneManager'
import { Character, Zone } from '@prisma/client'
interface IPayload {
zoneId: number;
zoneId: number
}
interface IResponse {
zone: Zone;
characters: Character[];
zone: Zone
characters: Character[]
}
/**
@ -19,30 +19,30 @@ interface IResponse {
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('character:zone:request', async (data: IPayload, callback: (response: IResponse) => void) => {
console.log(`---User ${socket.character?.id} has requested zone.`);
socket.on('character:zone:request', async (data: IPayload, callback: (response: IResponse) => void) => {
console.log(`---User ${socket.character?.id} has requested zone.`)
if (!data.zoneId) {
console.log(`---Zone id not provided.`);
return;
}
if (!data.zoneId) {
console.log(`---Zone id not provided.`)
return
}
const zone = await ZoneRepository.getById(data.zoneId);
const zone = await ZoneRepository.getById(data.zoneId)
if (!zone) {
console.log(`---Zone not found.`);
return;
}
if (!zone) {
console.log(`---Zone not found.`)
return
}
socket.join(zone.id.toString());
socket.join(zone.id.toString())
// send over zone and characters to socket
callback({zone, characters: ZoneManager.getCharactersInZone(zone.id)});
// send over zone and characters to socket
callback({ zone, characters: ZoneManager.getCharactersInZone(zone.id) })
// let other clients know of new character
io.to(zone.id.toString()).emit('zone:character:join', socket.character);
// let other clients know of new character
io.to(zone.id.toString()).emit('zone:character:join', socket.character)
// add character to zone manager
ZoneManager.addCharacterToZone(zone.id, socket.character as Character);
});
}
// add character to zone manager
ZoneManager.addCharacterToZone(zone.id, socket.character as Character)
})
}