Almost finalised refactoring

src/events/character/charactersScreen/characterHairList.ts

@@ -11,8 +11,13 @@ export default class characterHairListEvent extends BaseEvent {
   }
 
   private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {
-    const items: CharacterHair[] = await characterHairRepository.getAllSelectable()
-    await Database.getEntityManager().populate(items, ['sprite'])
-    callback(items)
+    try {
+      const items: CharacterHair[] = await characterHairRepository.getAllSelectable()
+      await Database.getEntityManager().populate(items, ['sprite'])
+      return callback(items)
+    } catch (error) {
+      this.logger.error('character:hair:list error', error)
+      return callback([])
+    }
   }
 }

src/events/character/connect.ts

@@ -15,30 +15,14 @@ export default class CharacterConnectEvent extends BaseEvent {
     this.socket.on('character:connect', this.handleEvent.bind(this))
   }
 
-  /**
-   * Handle character connect event
-   * @TODO:
-   * 1. Check if character is already connected
-   * 2. Update character hair if provided
-   * 3. Emit character connect event
-   * 4. Let other clients know of new character
-   * @param data
-   * @param callback
-   * @private
-   */
   private async handleEvent(data: CharacterConnectPayload, callback: (response: any) => void): Promise<void> {
-    if (!this.socket.userId) {
-      this.emitError('User not authenticated')
-      return
-    }
-
     try {
       if (await this.checkForActiveCharacters()) {
         this.emitError('You are already connected to another character')
         return
       }
 
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId, data.characterId)
+      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, data.characterId)
 
       if (!character) {
         this.emitError('Character not found or does not belong to this user')
@@ -57,8 +41,8 @@ export default class CharacterConnectEvent extends BaseEvent {
       // Emit character connect event
       callback({ character })
 
-      // wait 300 ms, @TODO: Find a better way to do this
-      await new Promise((resolve) => setTimeout(resolve, 100))
+      // wait 300 ms, @TODO: Find a better way to do this, race condition
+      await new Promise((resolve) => setTimeout(resolve, 500))
 
       await TeleportService.teleportCharacter(character.id, {
         targetMapId: character.map.id,

src/events/character/delete.ts

@@ -9,7 +9,6 @@ type TypePayload = {
 }
 
 type TypeResponse = {
-  map: Map
   characters: Character[]
 }
 
@@ -20,11 +19,7 @@ export default class CharacterDeleteEvent extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: TypeResponse) => void): Promise<any> {
     try {
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, data.characterId)
-      if (character) {
-        await character.delete()
-      }
-
+      await (await CharacterRepository.getByUserAndId(this.socket.userId!, data.characterId))?.delete()
       const characters: Character[] = await CharacterRepository.getByUserId(this.socket.userId!)
 
       this.socket.emit('character:list', characters)

src/events/character/list.ts

@@ -1,5 +1,4 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import Database from '#application/database'
 import { Character } from '#entities/character'
 import CharacterRepository from '#repositories/characterRepository'
 
@@ -10,9 +9,7 @@ export default class CharacterListEvent extends BaseEvent {
 
   private async handleEvent(data: any): Promise<void> {
     try {
-      const characters: Character[] = await CharacterRepository.getByUserId(this.socket.userId!)
-      await Database.getEntityManager().populate(characters, ['characterType', 'characterHair'])
-
+      let characters: Character[] = await CharacterRepository.getByUserId(this.socket.userId!, ['characterType', 'characterHair'])
       this.socket.emit('character:list', characters)
     } catch (error: any) {
       this.logger.error('character:list error', error.message)