Fixed left-overs from #293

migrations/Migration20250101204808.ts

@@ -1,6 +1,6 @@
 import { Migration } from '@mikro-orm/migrations';
 
-export class Migration20250101195157 extends Migration {
+export class Migration20250101204808 extends Migration {
 
   override async up(): Promise<void> {
     this.addSql(`create table \`map_object\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`tags\` json null, \`origin_x\` int not null default 0, \`origin_y\` int not null default 0, \`is_animated\` tinyint(1) not null default false, \`frame_rate\` int not null default 0, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);

src/application/types.ts

@@ -7,8 +7,8 @@ import { ZoneEventTileTeleport } from '#entities/zoneEventTileTeleport'
 export type UUID = `${string}-${string}-${string}-${string}-${string}`
 
 export type TSocket = Socket & {
-  userId?: number
+  userId?: UUID
-  characterId?: number
+  characterId?: UUID
   handshake?: {
     query?: {
       token?: any

src/events/character/connect.ts

@@ -1,13 +1,13 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import Database from '#application/database'
+import { UUID } from '#application/types'
 import ZoneManager from '#managers/zoneManager'
 import CharacterHairRepository from '#repositories/characterHairRepository'
 import CharacterRepository from '#repositories/characterRepository'
 import TeleportService from '#services/teleportService'
 
 interface CharacterConnectPayload {
-  characterId: number
+  characterId: UUID
-  characterHairId?: number
+  characterHairId?: UUID
 }
 
 export default class CharacterConnectEvent extends BaseEvent {

src/events/character/delete.ts

@@ -1,10 +1,11 @@
 import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 import { Zone } from '#entities/zone'
 import CharacterRepository from '#repositories/characterRepository'
 
 type TypePayload = {
-  characterId: number
+  characterId: UUID
 }
 
 type TypeResponse = {

src/events/chat/gameMaster/teleportCommand.ts

@@ -1,4 +1,5 @@
 import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
 import ZoneManager from '#managers/zoneManager'
 import ZoneRepository from '#repositories/zoneRepository'
 import ChatService from '#services/chatService'
@@ -40,14 +41,14 @@ export default class TeleportCommandEvent extends BaseEvent {
         return
       }
 
-      const zoneId = parseInt(args[0], 10)
+      const zoneId = args[0] as UUID
       const targetX = args[1] ? parseInt(args[1], 10) : 0
       const targetY = args[2] ? parseInt(args[2], 10) : 0
 
-      if (isNaN(zoneId) || isNaN(targetX) || isNaN(targetY)) {
+      if (!zoneId || isNaN(targetX) || isNaN(targetY)) {
         this.socket.emit('notification', {
           title: 'Server message',
-          message: 'Invalid parameters. All values must be numbers.'
+          message: 'Invalid parameters. X and Y coordinates must be numbers.'
         })
         return
       }

src/managers/socketManager.ts

@@ -8,7 +8,7 @@ import { Server as SocketServer } from 'socket.io'
 import config from '#application/config'
 import Logger, { LoggerType } from '#application/logger'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
+import { TSocket, UUID } from '#application/types'
 import { Authentication } from '#middleware/authentication'
 
 class SocketManager {
@@ -111,12 +111,12 @@ class SocketManager {
       .emit(event, ...args)
   }
 
-  public getSocketByUserId(userId: number): TSocket | undefined {
+  public getSocketByUserId(userId: UUID): TSocket | undefined {
     const sockets = Array.from(this.getIO().sockets.sockets.values())
     return sockets.find((socket: TSocket) => socket.userId === userId)
   }
 
-  public getSocketByCharacterId(characterId: number): TSocket | undefined {
+  public getSocketByCharacterId(characterId: UUID): TSocket | undefined {
     const sockets = Array.from(this.getIO().sockets.sockets.values())
     return sockets.find((socket: TSocket) => socket.characterId === characterId)
   }

src/managers/zoneManager.ts

@@ -1,11 +1,12 @@
 import Logger, { LoggerType } from '#application/logger'
+import { UUID } from '#application/types'
 import { Zone } from '#entities/zone'
 import LoadedZone from '#models/loadedZone'
 import ZoneCharacter from '#models/zoneCharacter'
 import ZoneRepository from '#repositories/zoneRepository'
 
 class ZoneManager {
-  private readonly zones = new Map<number, LoadedZone>()
+  private readonly zones = new Map<UUID, LoadedZone>()
   private logger = Logger.type(LoggerType.GAME)
 
   public async boot(): Promise<void> {
@@ -21,7 +22,7 @@ class ZoneManager {
     this.logger.info(`Zone ID ${zone.id} loaded`)
   }
 
-  public unloadZone(zoneId: number): void {
+  public unloadZone(zoneId: UUID): void {
     this.zones.delete(zoneId)
     this.logger.info(`Zone ID ${zoneId} unloaded`)
   }
@@ -30,11 +31,11 @@ class ZoneManager {
     return Array.from(this.zones.values())
   }
 
-  public getZoneById(zoneId: number): LoadedZone | undefined {
+  public getZoneById(zoneId: UUID): LoadedZone | undefined {
     return this.zones.get(zoneId)
   }
 
-  public getCharacterById(characterId: number): ZoneCharacter | undefined {
+  public getCharacterById(characterId: UUID): ZoneCharacter | undefined {
     for (const zone of this.zones.values()) {
       const character = zone.getCharactersInZone().find((char) => char.character.id === characterId)
       if (character) return character
@@ -42,7 +43,7 @@ class ZoneManager {
     return undefined
   }
 
-  public removeCharacter(characterId: number): void {
+  public removeCharacter(characterId: UUID): void {
     this.zones.forEach((zone) => zone.removeCharacter(characterId))
   }
 }

src/models/loadedZone.ts

@@ -1,5 +1,6 @@
 import ZoneCharacter from './zoneCharacter'
 
+import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 import { Zone } from '#entities/zone'
 import zoneEventTileRepository from '#repositories/zoneEventTileRepository'
@@ -21,7 +22,7 @@ class LoadedZone {
     this.characters.push(zoneCharacter)
   }
 
-  public async removeCharacter(id: number) {
+  public async removeCharacter(id: UUID) {
     const zoneCharacter = this.getCharacterById(id)
     if (zoneCharacter) {
       await zoneCharacter.savePosition()
@@ -29,7 +30,7 @@ class LoadedZone {
     }
   }
 
-  public getCharacterById(id: number): ZoneCharacter | undefined {
+  public getCharacterById(id: UUID): ZoneCharacter | undefined {
     return this.characters.find((c) => c.character.id === id)
   }
 

src/repositories/characterRepository.ts

@@ -1,8 +1,9 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 
 class CharacterRepository extends BaseRepository {
-  async getByUserId(userId: number): Promise<Character[]> {
+  async getByUserId(userId: UUID): Promise<Character[]> {
     try {
       const repository = this.em.getRepository(Character)
       return await repository.find({ user: userId })
@@ -12,7 +13,7 @@ class CharacterRepository extends BaseRepository {
     }
   }
 
-  async getByUserAndId(userId: number, characterId: number): Promise<Character | null> {
+  async getByUserAndId(userId: UUID, characterId: UUID): Promise<Character | null> {
     try {
       const repository = this.em.getRepository(Character)
       return await repository.findOne({ user: userId, id: characterId })
@@ -22,7 +23,7 @@ class CharacterRepository extends BaseRepository {
     }
   }
 
-  async getById(id: number, populate?: string[]): Promise<Character | null> {
+  async getById(id: UUID, populate?: string[]): Promise<Character | null> {
     try {
       const repository = this.em.getRepository(Character)
       return await repository.findOne({ id })

src/repositories/characterTypeRepository.ts

@@ -1,4 +1,5 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { CharacterType } from '#entities/characterType'
 
 class CharacterTypeRepository extends BaseRepository {

src/repositories/chatRepository.ts

@@ -1,8 +1,9 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { Chat } from '#entities/chat'
 
 class ChatRepository extends BaseRepository {
-  async getById(id: number): Promise<Chat[]> {
+  async getById(id: UUID): Promise<Chat[]> {
     try {
       const repository = this.em.getRepository(Chat)
       return await repository.find({
@@ -24,7 +25,7 @@ class ChatRepository extends BaseRepository {
     }
   }
 
-  async getByCharacterId(characterId: number): Promise<Chat[]> {
+  async getByCharacterId(characterId: UUID): Promise<Chat[]> {
     try {
       const repository = this.em.getRepository(Chat)
       return await repository.find({ character: characterId })
@@ -34,7 +35,7 @@ class ChatRepository extends BaseRepository {
     }
   }
 
-  async getByZoneId(zoneId: number): Promise<Chat[]> {
+  async getByZoneId(zoneId: UUID): Promise<Chat[]> {
     try {
       const repository = this.em.getRepository(Chat)
       return await repository.find({ zone: zoneId })

src/repositories/itemRepository.ts

@@ -1,8 +1,9 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { Item } from '#entities/item'
 
 class ItemRepository extends BaseRepository {
-  async getById(id: string): Promise<any> {
+  async getById(id: UUID): Promise<any> {
     try {
       const repository = this.em.getRepository(Item)
       return await repository.findOne({ id })
@@ -12,7 +13,7 @@ class ItemRepository extends BaseRepository {
     }
   }
 
-  async getByIds(ids: string[]): Promise<any> {
+  async getByIds(ids: UUID[]): Promise<any> {
     try {
       const repository = this.em.getRepository(Item)
       return await repository.find({

src/repositories/objectRepository.ts

@@ -1,7 +1,8 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 
 class ObjectRepository extends BaseRepository {
-  async getById(id: string): Promise<any> {
+  async getById(id: UUID): Promise<any> {
     try {
       const repository = this.em.getRepository(Object)
       return await repository.findOne({ id })

src/repositories/passwordResetTokenRepository.ts

@@ -1,8 +1,9 @@
 import { BaseRepository } from '#application/base/baseRepository' // Import the global Prisma instance
+import { UUID } from '#application/types'
 import { PasswordResetToken } from '#entities/passwordResetToken'
 
 class PasswordResetTokenRepository extends BaseRepository {
-  async getById(id: number): Promise<any> {
+  async getById(id: UUID): Promise<any> {
     try {
       const repository = this.em.getRepository(PasswordResetToken)
       return await repository.findOne({ id })
@@ -12,7 +13,7 @@ class PasswordResetTokenRepository extends BaseRepository {
     }
   }
 
-  async getByUserId(userId: number): Promise<any> {
+  async getByUserId(userId: UUID): Promise<any> {
     try {
       const repository = this.em.getRepository(PasswordResetToken)
       return await repository.findOne({

src/repositories/spriteRepository.ts

@@ -1,10 +1,9 @@
-import { FilterValue } from '@mikro-orm/core'
-
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { Sprite } from '#entities/sprite'
 
 class SpriteRepository extends BaseRepository {
-  async getById(id: FilterValue<`${string}-${string}-${string}-${string}-${string}`>) {
+  async getById(id: UUID) {
     try {
       const repository = this.em.getRepository(Sprite)
       return await repository.findOne({ id })

src/repositories/userRepository.ts

@@ -1,8 +1,9 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { User } from '#entities/user'
 
 class UserRepository extends BaseRepository {
-  async getById(id: number) {
+  async getById(id: UUID) {
     try {
       const repository = this.em.getRepository(User)
       return await repository.findOne({ id })

src/repositories/zoneEventTileRepository.ts

@@ -1,8 +1,9 @@
 import { BaseRepository } from '#application/base/baseRepository'
+import { UUID } from '#application/types'
 import { ZoneEventTile } from '#entities/zoneEventTile'
 
 class ZoneEventTileRepository extends BaseRepository {
-  async getAll(id: number): Promise<ZoneEventTile[]> {
+  async getAll(id: UUID): Promise<ZoneEventTile[]> {
     try {
       const repository = this.em.getRepository(ZoneEventTile)
       return await repository.find({
@@ -14,7 +15,7 @@ class ZoneEventTileRepository extends BaseRepository {
     }
   }
 
-  async getEventTileByZoneIdAndPosition(zoneId: number, positionX: number, positionY: number) {
+  async getEventTileByZoneIdAndPosition(zoneId: UUID, positionX: number, positionY: number) {
     try {
       const repository = this.em.getRepository(ZoneEventTile)
       return await repository.findOne({

src/services/chatService.ts

@@ -1,14 +1,14 @@
 import { Server } from 'socket.io'
 
 import { BaseService } from '#application/base/baseService'
-import { TSocket } from '#application/types'
+import { TSocket, UUID } from '#application/types'
 import { Chat } from '#entities/chat'
 import CharacterRepository from '#repositories/characterRepository'
 import ChatRepository from '#repositories/chatRepository'
 import ZoneRepository from '#repositories/zoneRepository'
 
 class ChatService extends BaseService {
-  async sendZoneMessage(io: Server, socket: TSocket, message: string, characterId: number, zoneId: number): Promise<boolean> {
+  async sendZoneMessage(io: Server, socket: TSocket, message: string, characterId: UUID, zoneId: UUID): Promise<boolean> {
     try {
       const character = await CharacterRepository.getById(characterId)
       if (!character) return false

src/services/teleportService.ts

@@ -1,11 +1,12 @@
 import Logger, { LoggerType } from '#application/logger'
+import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 import SocketManager from '#managers/socketManager'
 import ZoneManager from '#managers/zoneManager'
 import ZoneCharacter from '#models/zoneCharacter'
 
 interface TeleportOptions {
-  targetZoneId: number
+  targetZoneId: UUID
   targetX: number
   targetY: number
   rotation?: number
@@ -16,7 +17,7 @@ interface TeleportOptions {
 class TeleportService {
   private readonly logger = Logger.type(LoggerType.GAME)
 
-  public async teleportCharacter(characterId: number, options: TeleportOptions): Promise<boolean> {
+  public async teleportCharacter(characterId: UUID, options: TeleportOptions): Promise<boolean> {
     const { targetZoneId, targetX, targetY, rotation = 0, isInitialJoin = false, character } = options
 
     const socket = SocketManager.getSocketByCharacterId(characterId)