More event progress

src/events/gameMaster/assetManager/sprite/copy.ts

@@ -1,79 +1,35 @@
-import { Server } from 'socket.io'
-
-import type { Prisma } from '@prisma/client'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
+import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
+import { Sprite } from '#entities/sprite'
 import CharacterRepository from '#repositories/characterRepository'
+import SpriteRepository from '#repositories/spriteRepository'
 
 interface CopyPayload {
-  id: string
+  id: UUID
 }
 
-export default class SpriteCopyEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class SpriteCopyEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:copy', this.handleEvent.bind(this))
   }
 
   private async handleEvent(payload: CopyPayload, callback: (success: boolean) => void): Promise<void> {
     try {
-      if (!(await this.validateGameMasterAccess())) {
-        return callback(false)
-      }
+      if (!(await this.isCharacterGM())) return
 
-      const sourceSprite = await prisma.sprite.findUnique({
-        where: { id: payload.id },
-        include: {
-          spriteActions: true
-        }
-      })
+      const sourceSprite = await SpriteRepository.getById(payload.id)
 
       if (!sourceSprite) {
         throw new Error('Source sprite not found')
       }
 
-      const newSprite = await prisma.sprite.create({
-        data: {
-          name: `${sourceSprite.name} (Copy)`,
-          spriteActions: {
-            create: sourceSprite.spriteActions.map((action) => ({
-              action: action.action,
-              sprites: action.sprites as Prisma.InputJsonValue,
-              originX: action.originX,
-              originY: action.originY,
-              isAnimated: action.isAnimated,
-              isLooping: action.isLooping,
-              frameWidth: action.frameWidth,
-              frameHeight: action.frameHeight,
-              frameRate: action.frameRate
-            }))
-          }
-        }
-      })
+      const newSprite = new Sprite()
+      await newSprite.setName(`${sourceSprite.getName()} (Copy)`).setSpriteActions(sourceSprite.getSpriteActions()).save()
 
       callback(true)
     } catch (error) {
-      this.handleError(error, payload.id, callback)
+      this.logger.error(`Error copying sprite:`, String(error))
+      callback(false)
     }
   }
-
-  private async validateGameMasterAccess(): Promise<boolean> {
-    const character = await CharacterRepository.getById(this.socket.characterId!)
-    return character?.role === 'gm'
-  }
-
-  private handleError(error: unknown, spriteId: string, callback: (success: boolean) => void): void {
-    gameMasterLogger.error(`Error copying sprite ${spriteId}: ${this.getErrorMessage(error)}`)
-    callback(false)
-  }
-
-  private getErrorMessage(error: unknown): string {
-    return error instanceof Error ? error.message : String(error)
-  }
 }

src/events/gameMaster/assetManager/sprite/create.ts

@@ -2,12 +2,10 @@ import fs from 'fs/promises'
 
 import { Server } from 'socket.io'
 
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
 
-export default class SpriteCreateEvent {
+export default class SpriteCreateEvent extends BaseEvent {
   constructor(
     private readonly io: Server,
     private readonly socket: TSocket
@@ -19,12 +17,7 @@ export default class SpriteCreateEvent {
 
   private async handleEvent(data: undefined, callback: (response: boolean) => void): Promise<void> {
     try {
-      const character = await characterRepository.getById(this.socket.characterId!)
-      if (!character) return callback(false)
-
-      if (character.role !== 'gm') {
-        return callback(false)
-      }
+      if (!(await this.isCharacterGM())) return
 
       const public_folder = Storage.getPublicPath('sprites')
 

src/events/gameMaster/assetManager/sprite/delete.ts

@@ -1,45 +1,30 @@
 import fs from 'fs'
 
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import CharacterRepository from '#repositories/characterRepository'
+import { UUID } from '#application/types'
+import SpriteRepository from '#repositories/spriteRepository'
 
 type Payload = {
-  id: string
+  id: UUID
 }
 
-export default class GMSpriteDeleteEvent {
-  private readonly public_folder: string
-
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {
-    this.public_folder = Storage.getPublicPath('sprites')
-  }
-
+export default class GMSpriteDeleteEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:delete', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    const character = await CharacterRepository.getById(this.socket.characterId!)
-    if (character?.role !== 'gm') {
-      return callback(false)
-    }
+    if (!(await this.isCharacterGM())) return
 
     try {
       await this.deleteSpriteFolder(data.id)
-      await this.deleteSpriteFromDatabase(data.id)
+      await (await SpriteRepository.getById(data.id))?.delete()
 
-      gameMasterLogger.info(`Sprite ${data.id} deleted.`)
+      this.logger.info(`Sprite ${data.id} deleted.`)
       callback(true)
     } catch (error: any) {
-      gameMasterLogger.error('gm:sprite:delete error', error.message)
+      this.logger.error('gm:sprite:delete error', error.message)
       callback(false)
     }
   }
@@ -51,12 +36,4 @@ export default class GMSpriteDeleteEvent {
       await fs.promises.rmdir(finalFilePath, { recursive: true })
     }
   }
-
-  private async deleteSpriteFromDatabase(spriteId: string): Promise<void> {
-    await prisma.sprite.delete({
-      where: {
-        id: spriteId
-      }
-    })
-  }
 }

src/events/gameMaster/assetManager/sprite/list.ts

@@ -1,29 +1,17 @@
 import { Sprite } from '@prisma/client'
-import { Server } from 'socket.io'
 
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
 import SpriteRepository from '#repositories/spriteRepository'
 
 interface IPayload {}
 
-export default class SpriteListEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class SpriteListEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:list', this.handleEvent.bind(this))
   }
 
-  private async handleEvent(data: any, callback: (response: Sprite[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId!)
-    if (!character) return callback([])
-
-    if (character.role !== 'gm') {
-      return callback([])
-    }
+  private async handleEvent(data: IPayload, callback: (response: Sprite[]) => void): Promise<void> {
+    if (!(await this.isCharacterGM())) return
 
     // get all sprites
     const sprites = await SpriteRepository.getAll()

src/events/gameMaster/assetManager/sprite/update.ts

@@ -1,15 +1,11 @@
 import { writeFile, mkdir } from 'node:fs/promises'
 
 import sharp from 'sharp'
-import { Server } from 'socket.io'
 
-import type { Prisma, SpriteAction } from '@prisma/client'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import CharacterRepository from '#repositories/characterRepository'
+import { SpriteAction } from '#entities/spriteAction'
+import SpriteRepository from '#repositories/spriteRepository'
 
 // Constants
 const ISOMETRIC_CONFIG = {
@@ -41,7 +37,7 @@ interface SpriteActionInput extends Omit<SpriteAction, 'id' | 'spriteId' | 'fram
 interface UpdatePayload {
   id: string
   name: string
-  spriteActions: Prisma.JsonValue
+  spriteActions: SpriteAction[]
 }
 
 interface ProcessedSpriteAction extends SpriteActionInput {
@@ -62,21 +58,14 @@ interface SpriteAnalysis {
   contentBounds: ContentBounds
 }
 
-export default class SpriteUpdateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class SpriteUpdateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:update', this.handleEvent.bind(this))
   }
 
   private async handleEvent(payload: UpdatePayload, callback: (success: boolean) => void): Promise<void> {
     try {
-      if (!(await this.validateGameMasterAccess())) {
-        return callback(false)
-      }
+      if (!(await this.isCharacterGM())) return
 
       const parsedActions = this.validateSpriteActions(payload.spriteActions)
 
@@ -111,11 +100,6 @@ export default class SpriteUpdateEvent {
     }
   }
 
-  private async validateGameMasterAccess(): Promise<boolean> {
-    const character = await CharacterRepository.getById(this.socket.characterId!)
-    return character?.role === 'gm'
-  }
-
   private validateSpriteActions(actions: Prisma.JsonValue): SpriteActionInput[] {
     try {
       const parsed = JSON.parse(JSON.stringify(actions)) as SpriteActionInput[]
@@ -375,6 +359,8 @@ export default class SpriteUpdateEvent {
         }
       }
     })
+
+    await (await SpriteRepository.getById(id))?.setName(name).setSpriteActions(actions).update()
   }
 
   private mapActionToDatabase(action: ProcessedSpriteAction) {
@@ -392,7 +378,7 @@ export default class SpriteUpdateEvent {
   }
 
   private handleError(error: unknown, spriteId: string, callback: (success: boolean) => void): void {
-    gameMasterLogger.error(`Error updating sprite ${spriteId}: ${this.getErrorMessage(error)}`)
+    this.logger.error(`Error updating sprite ${spriteId}: ${this.getErrorMessage(error)}`)
     callback(false)
   }
 

src/events/gameMaster/assetManager/tile/delete.ts

@@ -1,60 +1,36 @@
 import fs from 'fs/promises'
 
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { UUID } from '#application/types'
+import TileRepository from '#repositories/tileRepository'
 
 type Payload = {
-  id: string
+  id: UUID
 }
 
-export default class GMTileDeleteEvent {
-  private readonly public_folder: string
-
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {
-    this.public_folder = Storage.getPublicPath('tiles')
-  }
-
+export default class GMTileDeleteEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:tile:delete', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return
-    }
+    if (!(await this.isCharacterGM())) return
 
     try {
-      gameMasterLogger.info(`Deleting tile ${data.id}`)
-      await this.deleteTileFromDatabase(data.id)
+      this.logger.info(`Deleting tile ${data.id}`)
+
       await this.deleteTileFile(data.id)
+      await (await TileRepository.getById(data.id))?.delete()
 
-      gameMasterLogger.info(`Tile ${data.id} deleted successfully.`)
-      callback(true)
-    } catch (error: any) {
-      gameMasterLogger.error('gm:tile:delete error', error.message)
-      callback(false)
+      this.logger.info(`Tile ${data.id} deleted successfully.`)
+      return callback(true)
+    } catch (error: unknown) {
+      this.logger.error('gm:tile:delete error', error)
+      return callback(false)
     }
   }
 
-  private async deleteTileFromDatabase(tileId: string): Promise<void> {
-    await prisma.tile.delete({
-      where: {
-        id: tileId
-      }
-    })
-  }
-
   private async deleteTileFile(tileId: string): Promise<void> {
     const finalFilePath = Storage.getPublicPath('tiles', `${tileId}.png`)
     try {
@@ -63,7 +39,7 @@ export default class GMTileDeleteEvent {
       if (error.code !== 'ENOENT') {
         throw error
       }
-      gameMasterLogger.warn(`File ${finalFilePath} does not exist.`)
+      this.logger.warn(`File ${finalFilePath} does not exist.`)
     }
   }
 }

src/events/gameMaster/assetManager/tile/list.ts

@@ -1,7 +1,6 @@
-import characterRepository from '#repositories/characterRepository'
-import TileRepository from '#repositories/tileRepository'
 import { BaseEvent } from '#application/base/baseEvent'
 import { Tile } from '#entities/tile'
+import TileRepository from '#repositories/tileRepository'
 
 interface IPayload {}
 
@@ -11,15 +10,10 @@ export default class TileListEven extends BaseEvent {
   }
 
   private async handleEvent(data: IPayload, callback: (response: Tile[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId!)
-    if (!character) return
-
-    if (character.role !== 'gm') {
-      return
-    }
+    if (!(await this.isCharacterGM())) return
 
     // get all tiles
     const tiles = await TileRepository.getAll()
-    callback(tiles)
+    return callback(tiles)
   }
 }

src/events/gameMaster/assetManager/tile/update.ts

@@ -1,7 +1,6 @@
-import characterRepository from '#repositories/characterRepository'
 import { BaseEvent } from '#application/base/baseEvent'
-import TileRepository from '#repositories/tileRepository'
 import { UUID } from '#application/types'
+import TileRepository from '#repositories/tileRepository'
 
 type Payload = {
   id: UUID
@@ -9,29 +8,22 @@ type Payload = {
   tags: string[]
 }
 
-export default class TileUpdateEvent extends BaseEvent{
+export default class TileUpdateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:tile:update', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId!)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return
-    }
+    if (!(await this.isCharacterGM())) return
 
     try {
       const tile = await TileRepository.getById(data.id)
       if (!tile) return callback(false)
 
       await tile.setName(data.name).setTags(data.tags).update()
-
-      callback(true)
+      return callback(true)
     } catch (error) {
-      console.error(error)
-      callback(false)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/tile/upload.ts

@@ -1,9 +1,8 @@
 import fs from 'fs/promises'
 import { writeFile } from 'node:fs/promises'
 
-import Storage from '#application/storage'
-import characterRepository from '#repositories/characterRepository'
 import { BaseEvent } from '#application/base/baseEvent'
+import Storage from '#application/storage'
 import { Tile } from '#entities/tile'
 
 interface ITileData {
@@ -17,12 +16,7 @@ export default class TileUploadEvent extends BaseEvent {
 
   private async handleEvent(data: ITileData, callback: (response: boolean) => void): Promise<void> {
     try {
-      const character = await characterRepository.getById(this.socket.characterId!)
-      if (!character) return callback(false)
-
-      if (character.role !== 'gm') {
-        return
-      }
+      if (!(await this.isCharacterGM())) return
 
       const public_folder = Storage.getPublicPath('tiles')