Added pivot point logic

asd

.dockerignore

@@ -0,0 +1,17 @@
+node_modules
+npm-debug.log
+Dockerfile
+.dockerignore
+.git
+.gitignore
+README.md
+.env
+.env.*
+docker-compose*
+*.md
+coverage
+.vscode
+.idea
+dist
+build
+temp

.env.example

@@ -6,10 +6,10 @@ JWT_SECRET="secret"
 CLIENT_URL="http://localhost:5173"
 
 # Database configuration
-REDIS_URL="redis://@127.0.0.1:6379/4"
-DB_HOST="localhost"
-DB_USER="root"
-DB_PASS=""
+REDIS_URL="redis://@redis:6379/4"
+DB_HOST="mariadb"
+DB_USER="mariadb"
+DB_PASS="mariadb"
 DB_PORT="3306"
 DB_NAME="game"
 
@@ -25,4 +25,8 @@ DEFAULT_CHARACTER_POS_Y="0"
 SMTP_HOST=my.directonline.io
 SMTP_PORT=587
 SMTP_USER=no-reply@noxious.gg
-SMTP_PASSWORD=""
+SMTP_PASSWORD=""
+
+# SSL
+#PUBLIC_KEY_PATH=
+#PRIVATE_KEY_PATH=

.prettierignore

@@ -0,0 +1 @@
+migrations

.prettierrc.json

@@ -4,5 +4,8 @@
   "tabWidth": 2,
   "singleQuote": true,
   "printWidth": 200,
-  "trailingComma": "none"
+  "trailingComma": "none",
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy", "classProperties"],
+  "importOrderCaseSensitive": false
 }

Dockerfile

@@ -1,41 +0,0 @@
-# Use the official Node.js 22.4.1 image
-FROM node:22.4.1-alpine
-
-# Install Redis and tmux
-RUN apk add --no-cache redis tmux
-
-# Set the working directory in the container
-WORKDIR /usr/src/
-
-# Copy package.json and package-lock.json (if available)
-COPY package*.json ./
-
-# Install application dependencies
-RUN npm install
-
-# Copy prisma schema
-COPY prisma ./prisma/
-
-# Generate Prisma client
-RUN npx prisma generate
-
-# Copy the rest of your application code to the container
-COPY . .
-
-# Build the application
-RUN npm run build
-
-# Expose the ports your Node.js application and Redis will listen on
-EXPOSE 80 6379
-
-# Create a shell script to run Redis, run migrations, and start the application in a tmux session
-RUN echo '#!/bin/sh' > /usr/src/start.sh && \
-    echo 'redis-server --daemonize yes' >> /usr/src/start.sh && \
-    echo 'npx prisma migrate deploy' >> /usr/src/start.sh && \
-    echo 'tmux new-session -d -s nodeapp "node dist/server.js"' >> /usr/src/start.sh && \
-    echo 'echo "App is running in tmux session. Attach with: tmux attach-session -t nodeapp"' >> /usr/src/start.sh && \
-    echo 'tail -f /dev/null' >> /usr/src/start.sh && \
-    chmod +x /usr/src/start.sh
-
-# Use the shell script as the entry point
-CMD ["/usr/src/start.sh"]

README.md

@@ -5,7 +5,7 @@ This is the server for the Noxious game.
 ## Projects requirements
 
 - NodeJS 20.x or higher
-- MySQL 8.x or higher
+- MariaDB 11.x or higher
 - Redis 7.x or higher
 
 ## Installation
@@ -14,7 +14,7 @@ This is the server for the Noxious game.
 2. Install dependencies with `npm install`
 3. Copy the `.env.example` file to `.env` and fill in the required variables
 4. Extract assets.zip to the `public` folder
-5. After MySQL and Redis are running, run `npx mikro-orm migration:up` to create the database schema
+5. After MySQL and Redis are running, run `npx mikro-orm-esm migration:up` to create the database schema
 6. Run the server with `npm run dev`
 7. Write `init` in the console to import default data and restart the server
 8. Write `tiles` in the console to fix tile sizes
@@ -39,15 +39,15 @@ MikroORM is used as the ORM for the server.
 
 ### Create init. migrations
 
-Run `npx mikro-orm migration:create --initial` to create a new initial migration.
+Run `npm run mikro-orm migration:create --initial` to create a new initial migration.
 
 ### Create migrations
 
-Run `npx mikro-orm migration:create` to create a new migration. You do this when you want to add a new table or change an existing one.
+Run `npm run mikro-orm migration:create` to create a new migration. You do this when you want to add a new table or change an existing one.
 
 ### Apply migrations
 
-Run `npx mikro-orm migration:up` to apply all pending migrations.
+Run `npm run mikro-orm migration:up` to apply all pending migrations.
 
 ### Import default data
 

captain-definition

@@ -1,4 +0,0 @@
-{
-	"schemaVersion": 2,
-	"dockerfilePath" :"./Dockerfile"
-}

eslint.config.js

@@ -1,42 +0,0 @@
-import eslint from '@eslint/js';
-import tseslint from '@typescript-eslint/eslint-plugin';
-import tsparser from '@typescript-eslint/parser';
-import importPlugin from 'eslint-plugin-import';
-
-export default [
-  eslint.configs.recommended,
-  {
-    files: ['**/*.ts'],
-    languageOptions: {
-      parser: tsparser,
-      parserOptions: {
-        project: './tsconfig.json',
-        ecmaVersion: 2023,
-      },
-    },
-    plugins: {
-      '@typescript-eslint': tseslint,
-      'import': importPlugin,
-    },
-    rules: {
-      ...tseslint.configs['recommended'].rules,
-      ...tseslint.configs['recommended-requiring-type-checking'].rules,
-      'import/order': ['error', {
-        'groups': [
-          'builtin',
-          'external',
-          'internal',
-          ['parent', 'sibling'],
-          'index',
-          'object',
-          'type'
-        ],
-        'newlines-between': 'always',
-        'alphabetize': {
-          'order': 'asc',
-          'caseInsensitive': true
-        }
-      }]
-    }
-  }
-];

package.json

@@ -1,13 +1,14 @@
 {
+  "type": "module",
+  "tsNode": true,
   "scripts": {
-    "start": "node dist/server.js",
+    "start": "tsx src/server.ts",
     "dev": "nodemon --exec tsx src/server.ts",
-    "build": "tsc",
     "format": "prettier --write src/",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
+    "mikro-orm": "tsx ./node_modules/.bin/mikro-orm-esm"
   },
   "dependencies": {
+    "@mikro-orm/cli": "^6.4.2",
     "@mikro-orm/core": "^6.4.2",
     "@mikro-orm/mariadb": "^6.4.2",
     "@mikro-orm/migrations": "^6.4.2",
@@ -15,32 +16,31 @@
     "@mikro-orm/reflection": "^6.4.2",
     "@types/ioredis": "^4.28.10",
     "bcryptjs": "^2.4.3",
+    "bufferutil": "^4.0.9",
     "bullmq": "^5.13.2",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
+    "https": "^1.0.0",
     "ioredis": "^5.4.1",
     "jsonwebtoken": "^9.0.2",
     "nodemailer": "^6.9.15",
     "pino": "^9.3.2",
+    "reflect-metadata": "^0.2.2",
     "sharp": "^0.33.4",
     "socket.io": "^4.7.5",
-    "ts-node": "^10.9.2",
     "typescript": "^5.5.3",
+    "utf-8-validate": "^6.0.5",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@mikro-orm/cli": "^6.4.2",
+    "ts-node": "^10.9.2",
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
     "@types/bcryptjs": "^2.4.6",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/node": "^20.14.11",
     "@types/nodemailer": "^6.4.16",
-    "@typescript-eslint/eslint-plugin": "^8.18.2",
-    "@typescript-eslint/parser": "^8.18.2",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.31.0",
     "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
     "tsx": "^4.19.2"

src/application/base/baseCommand.ts

@@ -1,7 +1,6 @@
+import Logger, { LoggerType } from '@/application/logger'
 import { Server } from 'socket.io'
 
-import Logger, { LoggerType } from '#application/logger'
-
 export abstract class BaseCommand {
   protected readonly logger = Logger.type(LoggerType.COMMAND)
   constructor(readonly io: Server) {}

src/application/base/baseController.ts

@@ -1,8 +1,6 @@
 import fs from 'fs'
-
-import { Response } from 'express'
-
-import Logger, { LoggerType } from '#application/logger'
+import Logger, { LoggerType } from '@/application/logger'
+import type { Response } from 'express'
 
 export abstract class BaseController {
   protected readonly logger = Logger.type(LoggerType.HTTP)

src/application/base/baseEntity.ts

@@ -1,8 +1,7 @@
+import Database from '@/application/database'
+import Logger, { LoggerType } from '@/application/logger'
 import { EntityManager } from '@mikro-orm/core'
 
-import Database from '#application/database'
-import Logger, { LoggerType } from '#application/logger'
-
 export abstract class BaseEntity {
   protected readonly logger = Logger.type(LoggerType.ENTITY)
   protected entityManager?: EntityManager

src/application/base/baseEvent.ts

@@ -1,21 +1,43 @@
+import { SocketEvent } from '@/application/enums'
+import Logger, { LoggerType } from '@/application/logger'
+import type { TSocket } from '@/application/types'
+import { Character } from '@/entities/character'
+import MapManager from '@/managers/mapManager'
+import type MapCharacter from '@/models/mapCharacter'
+import CharacterRepository from '@/repositories/characterRepository'
 import { Server } from 'socket.io'
 
-import Logger, { LoggerType } from '#application/logger'
-import { TSocket } from '#application/types'
-import { Character } from '#entities/character'
-import CharacterRepository from '#repositories/characterRepository'
-
 export abstract class BaseEvent {
   protected readonly logger = Logger.type(LoggerType.GAME)
+  private lastActionTimes: Map<string, number> = new Map()
 
   constructor(
     readonly io: Server,
     readonly socket: TSocket
   ) {}
 
+  protected isThrottled(actionId: string, throttleTime: number): boolean {
+    const now = Date.now()
+    const lastActionTime = this.lastActionTimes.get(actionId) || 0
+
+    if (now - lastActionTime < throttleTime) {
+      return true
+    }
+
+    this.lastActionTimes.set(actionId, now)
+
+    return false
+  }
+
+  protected getMapCharacter(): MapCharacter | null {
+    if (!this.socket.characterId) return null
+    return MapManager.getCharacterById(this.socket.characterId)
+  }
+
   protected async getCharacter(): Promise<Character | null> {
+    if (!this.socket.characterId) return null
     const characterRepository = new CharacterRepository()
-    return characterRepository.getById(this.socket.characterId!)
+    return characterRepository.getById(this.socket.characterId)
   }
 
   protected async isCharacterGM(): Promise<boolean> {
@@ -24,13 +46,14 @@ export abstract class BaseEvent {
   }
 
   protected emitError(message: string): void {
-    this.socket.emit('notification', { title: 'Server message', message })
-    this.logger.error('character:connect error', `Player ${this.socket.userId}: ${message}`)
+    this.socket.emit(SocketEvent.NOTIFICATION, { title: 'Server message', message })
+    this.logger.error('Base event error', `Player ${this.socket.userId}: ${message}`)
   }
 
   protected handleError(context: string, error: unknown): void {
-    const errorMessage = error instanceof Error ? error.message : String(error)
-    this.emitError(`${context}: ${errorMessage}`)
-    this.logger.error('character:connect error', errorMessage)
+    console.log(error)
+    const errorMessage = error instanceof Error ? error.message : error && typeof error === 'object' && 'toString' in error ? error.toString() : String(error)
+    this.socket.emit(SocketEvent.NOTIFICATION, { title: 'Server message', message: `Server error occured. Please contact the server administrator.` })
+    this.logger.error('Base event error', errorMessage)
   }
 }

src/application/base/baseRepository.ts

@@ -1,9 +1,7 @@
+import Database from '@/application/database'
+import Logger, { LoggerType } from '@/application/logger'
 import { EntityManager } from '@mikro-orm/core'
 
-import Database from '../database'
-
-import Logger, { LoggerType } from '#application/logger'
-
 export abstract class BaseRepository {
   protected readonly logger = Logger.type(LoggerType.REPOSITORY)
   private entityManager?: EntityManager

src/application/base/baseService.ts

@@ -1,4 +1,4 @@
-import Logger, { LoggerType } from '#application/logger'
+import Logger, { LoggerType } from '@/application/logger'
 
 export abstract class BaseService {
   protected readonly logger = Logger.type(LoggerType.GAME)

src/application/config.ts

@@ -6,7 +6,7 @@ class config {
   // Server configuration
   static ENV: string = process.env.ENV || 'development'
   static HOST: string = process.env.HOST || '0.0.0.0'
-  static PORT: number = process.env.PORT ? parseInt(process.env.PORT) : 6969
+  static PORT: number = process.env.PORT ? parseInt(process.env.PORT) : 4000
   static JWT_SECRET: string = process.env.JWT_SECRET || 'secret'
   static CLIENT_URL: string = process.env.CLIENT_URL ? process.env.CLIENT_URL : 'https://noxious.gg'
 
@@ -31,6 +31,10 @@ class config {
   static SMTP_PORT: number = process.env.SMTP_PORT ? parseInt(process.env.SMTP_PORT) : 587
   static SMTP_USER: string = process.env.SMTP_USER || 'no-reply@noxious.gg'
   static SMTP_PASSWORD: string = process.env.SMTP_PASSWORD || 'password'
+
+  // SSL
+  static PUBLIC_KEY_PATH: string = process.env.PUBLIC_KEY_PATH || ''
+  static PRIVATE_KEY_PATH: string = process.env.PRIVATE_KEY_PATH || ''
 }
 
 export default config

src/application/console/commandRegistry.ts

@@ -1,10 +1,9 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import { pathToFileURL } from 'url'
-
-import Logger, { LoggerType } from '#application/logger'
-import Storage from '#application/storage'
-import { Command } from '#application/types'
+import Logger, { LoggerType } from '@/application/logger'
+import Storage from '@/application/storage'
+import type { Command } from '@/application/types'
 
 export class CommandRegistry {
   private readonly commands: Map<string, Command> = new Map()

src/application/console/logReader.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs'
 import * as path from 'path'
-
-import Logger, { LoggerType } from '#application/logger'
+import Logger, { LoggerType } from '@/application/logger'
 
 export class LogReader {
   private logger = Logger.type(LoggerType.CONSOLE)

src/application/database.ts

@@ -1,7 +1,8 @@
-import { MikroORM } from '@mikro-orm/mysql'
+// import { MikroORM } from '@mikro-orm/mysql'
 
-import Logger, { LoggerType } from './logger'
-import config from '../../mikro-orm.config'
+import Logger, { LoggerType } from '@/application/logger'
+import config from '@/root/mikro-orm.config'
+import { MikroORM } from '@mikro-orm/mariadb'
 
 class Database {
   private static orm: MikroORM

src/application/enums.ts

@@ -1,17 +1,57 @@
 export enum SocketEvent {
-  CHARACTER_CONNECT = 1,
-  CHARACTER_MOVE = 2,
-  CHARACTER_MOVE_ERROR = 3,
-  CHARACTER_TELEPORT = 4,
-  ZONE_CHARACTER_LEAVE = 5,
-  ZONE_CHARACTER_JOIN = 6,
-  ZONE_CHARACTER_LIST = 7,
-  ZONE_CHARACTER_DELETE = 8,
-  ZONE_CHARACTER_CREATE = 9,
-  ZONE_CHARACTER_UPDATE = 10,
-  ZONE_CHARACTER_HAIR_UPDATE = 11,
-  ZONE_CHARACTER_HAIR_LIST = 12,
-  ZONE_CHARACTER_TELEPORT = 13
+  CLOSE = '52',
+  DATA = '51',
+  CHARACTER_CONNECT = '50',
+  CHARACTER_CREATE = '49',
+  CHARACTER_DELETE = '48',
+  CHARACTER_LIST = '47',
+  GM_CHARACTERHAIR_CREATE = '46',
+  GM_CHARACTERHAIR_REMOVE = '45',
+  GM_CHARACTERHAIR_LIST = '44',
+  GM_CHARACTERHAIR_UPDATE = '43',
+  GM_CHARACTERTYPE_CREATE = '42',
+  GM_CHARACTERTYPE_REMOVE = '41',
+  GM_CHARACTERTYPE_LIST = '40',
+  GM_CHARACTERTYPE_UPDATE = '39',
+  GM_ITEM_CREATE = '38',
+  GM_ITEM_REMOVE = '37',
+  GM_ITEM_LIST = '36',
+  GM_ITEM_UPDATE = '35',
+  GM_MAPOBJECT_LIST = '34',
+  GM_MAPOBJECT_REMOVE = '33',
+  GM_MAPOBJECT_UPDATE = '32',
+  GM_MAPOBJECT_UPLOAD = '31',
+  GM_SPRITE_COPY = '30',
+  GM_SPRITE_CREATE = '29',
+  GM_SPRITE_DELETE = '28',
+  GM_SPRITE_LIST = '27',
+  GM_SPRITE_UPDATE = '26',
+  GM_TILE_DELETE = '25',
+  GM_TILE_LIST = '24',
+  GM_TILE_UPDATE = '23',
+  GM_TILE_UPLOAD = '22',
+  GM_MAP_CREATE = '21',
+  GM_MAP_DELETE = '20',
+  GM_MAP_REQUEST = '19',
+  GM_MAP_UPDATE = '18',
+  MAP_CHARACTER_MOVEERROR = '17',
+  DISCONNECT = '16',
+  USER_DISCONNECT = '15',
+  LOGIN = '14',
+  LOGGED_IN = '13',
+  NOTIFICATION = '12',
+  DATE = '11',
+  FAILED = '10',
+  COMPLETED = '9',
+  CONNECTION = '8',
+  WEATHER = '7',
+  CHARACTER_DISCONNECT = '6',
+  MAP_CHARACTER_ATTACK = '5',
+  MAP_CHARACTER_TELEPORT = '4',
+  MAP_CHARACTER_JOIN = '3',
+  MAP_CHARACTER_LEAVE = '2',
+  MAP_CHARACTER_MOVE = '1',
+  CHAT_MESSAGE = '0'
 }
 
 export enum ItemType {

src/application/logger.ts

@@ -1,5 +1,7 @@
 import pino from 'pino'
 
+const logger = pino.pino
+
 export enum LoggerType {
   HTTP = 'http',
   GAME = 'game',
@@ -13,13 +15,13 @@ export enum LoggerType {
 }
 
 class Logger {
-  private instances: Map<LoggerType, ReturnType<typeof pino>> = new Map()
+  private instances: Map<LoggerType, pino.Logger> = new Map()
 
-  private getLogger(type: LoggerType): ReturnType<typeof pino> {
+  private getLogger(type: LoggerType): pino.Logger {
     if (!this.instances.has(type)) {
       this.instances.set(
         type,
-        pino({
+        logger({
           level: process.env.LOG_LEVEL || 'debug',
           transport: {
             target: 'pino/file',

src/application/storage.ts

@@ -1,7 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-
-import config from '#application/config'
+import config from '@/application/config'
 
 class Storage {
   private readonly baseDir: string
@@ -9,7 +8,7 @@ class Storage {
 
   constructor() {
     this.rootDir = process.cwd()
-    this.baseDir = config.ENV === 'development' ? 'src' : 'dist'
+    this.baseDir = config.ENV === 'development' ? 'src' : 'src'
   }
 
   /**

src/application/types.ts

@@ -1,9 +1,8 @@
+import { Character } from '@/entities/character'
+import { MapEventTile } from '@/entities/mapEventTile'
+import { MapEventTileTeleport } from '@/entities/mapEventTileTeleport'
 import { Server, Socket } from 'socket.io'
 
-import { Character } from '#entities/character'
-import { MapEventTile } from '#entities/mapEventTile'
-import { MapEventTileTeleport } from '#entities/mapEventTileTeleport'
-
 export type UUID = `${string}-${string}-${string}-${string}-${string}`
 
 export type TSocket = Socket & {

src/commands/alert.ts

@@ -1,13 +1,13 @@
+import { BaseCommand } from '@/application/base/baseCommand'
+import { SocketEvent } from '@/application/enums'
 import { Server } from 'socket.io'
 
-import { BaseCommand } from '#application/base/baseCommand'
-
 type CommandInput = string[]
 
 export default class AlertCommand extends BaseCommand {
   public execute(input: CommandInput): void {
     const message: string = input.join(' ') ?? null
     if (!message) return console.log('message is required')
-    this.io.emit('notification', { message: message })
+    this.io.emit(SocketEvent.NOTIFICATION, { message: message })
   }
 }

src/commands/init.ts

@@ -1,25 +1,23 @@
 import fs from 'fs'
-
+import { BaseCommand } from '@/application/base/baseCommand'
+import { CharacterGender, CharacterRace } from '@/application/enums'
+import Storage from '@/application/storage'
+import type { UUID } from '@/application/types'
+import { Character } from '@/entities/character'
+import { CharacterHair } from '@/entities/characterHair'
+import { CharacterType } from '@/entities/characterType'
+import { Map } from '@/entities/map'
+import { MapEffect } from '@/entities/mapEffect'
+import { MapObject } from '@/entities/mapObject'
+import { Sprite } from '@/entities/sprite'
+import { SpriteAction } from '@/entities/spriteAction'
+import { Tile } from '@/entities/tile'
+import { User } from '@/entities/user'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
+import MapRepository from '@/repositories/mapRepository'
 import sharp from 'sharp'
 
-import { BaseCommand } from '#application/base/baseCommand'
-import { CharacterGender, CharacterRace } from '#application/enums'
-import Storage from '#application/storage'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { CharacterHair } from '#entities/characterHair'
-import { CharacterType } from '#entities/characterType'
-import { Map } from '#entities/map'
-import { MapEffect } from '#entities/mapEffect'
-import { MapObject } from '#entities/mapObject'
-import { Sprite } from '#entities/sprite'
-import { SpriteAction } from '#entities/spriteAction'
-import { Tile } from '#entities/tile'
-import { User } from '#entities/user'
-import CharacterHairRepository from '#repositories/characterHairRepository'
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
-import MapRepository from '#repositories/mapRepository'
-
 // @TODO : Replace this with seeding
 // https://mikro-orm.io/docs/seeding
 
@@ -354,7 +352,7 @@ export default class InitCommand extends BaseCommand {
       .setUser(user)
       .setName('root')
       .setRole('gm')
-      .setMap((await this.mapRepository.getFirst())!)
+      .setMap(await this.mapRepository.getFirst())
       .setCharacterType(await this.characterTypeRepository.getFirst())
       .setCharacterHair(await this.characterHairRepository.getFirst())
       .save()

src/commands/listMaps.ts

@@ -1,5 +1,5 @@
-import { BaseCommand } from '#application/base/baseCommand'
-import MapManager from '#managers/mapManager'
+import { BaseCommand } from '@/application/base/baseCommand'
+import MapManager from '@/managers/mapManager'
 
 type CommandInput = string[]
 

src/commands/tiles.ts

@@ -1,10 +1,8 @@
 import fs from 'fs'
-
+import { BaseCommand } from '@/application/base/baseCommand'
+import Storage from '@/application/storage'
 import sharp from 'sharp'
 
-import { BaseCommand } from '#application/base/baseCommand'
-import Storage from '#application/storage'
-
 export default class TilesCommand extends BaseCommand {
   public async execute(): Promise<void> {
     // Get all tiles

src/controllers/auth.ts

@@ -1,11 +1,10 @@
-import { Request, Response } from 'express'
+import { BaseController } from '@/application/base/baseController'
+import config from '@/application/config'
+import { loginAccountSchema, newPasswordSchema, registerAccountSchema, resetPasswordSchema } from '@/application/zodTypes'
+import UserService from '@/services/userService'
+import type { Request, Response } from 'express'
 import jwt from 'jsonwebtoken'
 
-import { BaseController } from '#application/base/baseController'
-import config from '#application/config'
-import { loginAccountSchema, registerAccountSchema, resetPasswordSchema, newPasswordSchema } from '#application/zodTypes'
-import UserService from '#services/userService'
-
 export class AuthController extends BaseController {
   /**
    * Login user

src/controllers/avatar.ts

@@ -1,15 +1,13 @@
 import fs from 'fs'
-
-import { Request, Response } from 'express'
+import { BaseController } from '@/application/base/baseController'
+import Storage from '@/application/storage'
+import type { UUID } from '@/application/types'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
+import CharacterRepository from '@/repositories/characterRepository'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
+import type { Request, Response } from 'express'
 import sharp from 'sharp'
 
-import { BaseController } from '#application/base/baseController'
-import Storage from '#application/storage'
-import { UUID } from '#application/types'
-import CharacterHairRepository from '#repositories/characterHairRepository'
-import CharacterRepository from '#repositories/characterRepository'
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
-
 interface AvatarOptions {
   characterTypeId: UUID
   characterHairId?: UUID
@@ -26,7 +24,7 @@ export class AvatarController extends BaseController {
    * @param res
    */
   public async getByName(req: Request, res: Response) {
-    const character = await this.characterRepository.getByName(req.params.characterName)
+    const character = await this.characterRepository.getByName(req.params.characterName!)
     if (!character?.characterType) {
       return this.sendError(res, 'Character or character type not found', 404)
     }

src/controllers/cache.ts

@@ -1,12 +1,11 @@
-import { Request, Response } from 'express'
-
-import { BaseController } from '#application/base/baseController'
-import CharacterHairRepository from '#repositories/characterHairRepository'
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
-import MapObjectRepository from '#repositories/mapObjectRepository'
-import MapRepository from '#repositories/mapRepository'
-import SpriteRepository from '#repositories/spriteRepository'
-import TileRepository from '#repositories/tileRepository'
+import { BaseController } from '@/application/base/baseController'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
+import MapObjectRepository from '@/repositories/mapObjectRepository'
+import MapRepository from '@/repositories/mapRepository'
+import SpriteRepository from '@/repositories/spriteRepository'
+import TileRepository from '@/repositories/tileRepository'
+import type { Request, Response } from 'express'
 
 export class CacheController extends BaseController {
   /**

src/controllers/textures.ts

@@ -1,7 +1,6 @@
-import { Request, Response } from 'express'
-
-import { BaseController } from '#application/base/baseController'
-import Storage from '#application/storage'
+import { BaseController } from '@/application/base/baseController'
+import Storage from '@/application/storage'
+import type { Request, Response } from 'express'
 
 export class TexturesController extends BaseController {
   /**
@@ -12,6 +11,10 @@ export class TexturesController extends BaseController {
   public async download(req: Request, res: Response) {
     const { type, spriteId, file } = req.params
 
+    if (!type || !file) {
+      return this.sendError(res, 'Invalid request', 400)
+    }
+
     const texture = type === 'sprites' && spriteId ? Storage.getPublicPath(type, spriteId, file) : Storage.getPublicPath(type, file)
 
     this.sendFile(res, texture)

src/entities/base/character.ts

@@ -1,16 +1,14 @@
 import { randomUUID } from 'node:crypto'
-
-import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { CharacterEquipment } from '#entities/characterEquipment'
-import { CharacterHair } from '#entities/characterHair'
-import { CharacterItem } from '#entities/characterItem'
-import { CharacterType } from '#entities/characterType'
-import { Chat } from '#entities/chat'
-import { Map } from '#entities/map'
-import { User } from '#entities/user'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { CharacterEquipment } from '@/entities/characterEquipment'
+import type { CharacterHair } from '@/entities/characterHair'
+import type { CharacterItem } from '@/entities/characterItem'
+import type { CharacterType } from '@/entities/characterType'
+import type { Chat } from '@/entities/chat'
+import type { Map } from '@/entities/map'
+import type { User } from '@/entities/user'
+import { Collection, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseCharacter extends BaseEntity {
   @PrimaryKey()
@@ -28,7 +26,7 @@ export class BaseCharacter extends BaseEntity {
   @Property()
   role = 'player'
 
-  @OneToMany(() => Chat, (chat) => chat.character)
+  @OneToMany({ mappedBy: 'character' })
   chats = new Collection<Chat>(this)
 
   // Position - @TODO: Update to spawn point when current map is not found

src/entities/base/characterEquipment.ts

@@ -1,13 +1,11 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import { CharacterEquipmentSlotType } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import type { Character } from '@/entities/character'
+import type { CharacterItem } from '@/entities/characterItem'
 import { Enum, ManyToOne, PrimaryKey } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { CharacterEquipmentSlotType } from '#application/enums'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { CharacterItem } from '#entities/characterItem'
-
 export class BaseCharacterEquipment extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/characterHair.ts

@@ -1,13 +1,11 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import { CharacterGender } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import { Character } from '@/entities/character'
+import { Sprite } from '@/entities/sprite'
 import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { CharacterGender } from '#application/enums'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { Sprite } from '#entities/sprite'
-
 export class BaseCharacterHair extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/characterItem.ts

@@ -1,12 +1,9 @@
 import { randomUUID } from 'node:crypto'
-
-import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { CharacterEquipment } from '#entities/characterEquipment'
-import { Item } from '#entities/item'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { Character } from '@/entities/character'
+import type { Item } from '@/entities/item'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseCharacterItem extends BaseEntity {
   @PrimaryKey()

src/entities/base/characterType.ts

@@ -1,13 +1,11 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import { CharacterGender, CharacterRace } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import { Character } from '@/entities/character'
+import { Sprite } from '@/entities/sprite'
 import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { CharacterGender, CharacterRace } from '#application/enums'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { Sprite } from '#entities/sprite'
-
 export class BaseCharacterType extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/chat.ts

@@ -1,11 +1,9 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { Map } from '#entities/map'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { Character } from '@/entities/character'
+import type { Map } from '@/entities/map'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseChat extends BaseEntity {
   @PrimaryKey()

src/entities/base/item.ts

@@ -1,13 +1,11 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import { ItemRarity, ItemType } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import { CharacterItem } from '@/entities/characterItem'
+import { Sprite } from '@/entities/sprite'
 import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { ItemType, ItemRarity } from '#application/enums'
-import { UUID } from '#application/types'
-import { CharacterItem } from '#entities/characterItem'
-import { Sprite } from '#entities/sprite'
-
 export class BaseItem extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/map.ts

@@ -1,12 +1,10 @@
 import { randomUUID } from 'node:crypto'
-
-import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { MapEffect } from '#entities/mapEffect'
-import { MapEventTile } from '#entities/mapEventTile'
-import { PlacedMapObject } from '#entities/placedMapObject'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { MapEffect } from '@/entities/mapEffect'
+import type { MapEventTile } from '@/entities/mapEventTile'
+import type { PlacedMapObject } from '@/entities/placedMapObject'
+import { Collection, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseMap extends BaseEntity {
   @PrimaryKey()
@@ -22,7 +20,7 @@ export class BaseMap extends BaseEntity {
   height = 10
 
   @Property({ type: 'json', nullable: true })
-  tiles?: any
+  tiles: Array<Array<string>> = []
 
   @Property()
   pvp = false
@@ -33,13 +31,13 @@ export class BaseMap extends BaseEntity {
   @Property()
   updatedAt = new Date()
 
-  @OneToMany(() => MapEffect, (effect) => effect.map, { orphanRemoval: true })
+  @OneToMany({ mappedBy: 'map', orphanRemoval: true })
   mapEffects = new Collection<MapEffect>(this)
 
-  @OneToMany(() => MapEventTile, (tile) => tile.map, { orphanRemoval: true })
+  @OneToMany({ mappedBy: 'map', orphanRemoval: true })
   mapEventTiles = new Collection<MapEventTile>(this)
 
-  @OneToMany(() => PlacedMapObject, (placedMapObject) => placedMapObject.map, { orphanRemoval: true })
+  @OneToMany({ mappedBy: 'map', orphanRemoval: true })
   placedMapObjects = new Collection<PlacedMapObject>(this)
 
   setId(id: UUID) {

src/entities/base/mapEffect.ts

@@ -1,10 +1,8 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Map } from '#entities/map'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { Map } from '@/entities/map'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseMapEffect extends BaseEntity {
   @PrimaryKey()

src/entities/base/mapEventTile.ts

@@ -1,12 +1,10 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, Enum, ManyToOne, OneToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { MapEventTileType } from '#application/enums'
-import { UUID } from '#application/types'
-import { Map } from '#entities/map'
-import { MapEventTileTeleport } from '#entities/mapEventTileTeleport'
+import { BaseEntity } from '@/application/base/baseEntity'
+import { MapEventTileType } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import type { Map } from '@/entities/map'
+import type { MapEventTileTeleport } from '@/entities/mapEventTileTeleport'
+import { Enum, ManyToOne, OneToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseMapEventTile extends BaseEntity {
   @PrimaryKey()
@@ -24,7 +22,7 @@ export class BaseMapEventTile extends BaseEntity {
   @Property()
   positionY!: number
 
-  @OneToOne(() => MapEventTileTeleport, (teleport) => teleport.mapEventTile, { eager: true })
+  @OneToOne({ eager: true })
   teleport?: MapEventTileTeleport
 
   setId(id: UUID) {

src/entities/base/mapEventTileTeleport.ts

@@ -1,11 +1,9 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, ManyToOne, OneToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Map } from '#entities/map'
-import { MapEventTile } from '#entities/mapEventTile'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { Map } from '@/entities/map'
+import type { MapEventTile } from '@/entities/mapEventTile'
+import { ManyToOne, OneToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BaseMapEventTileTeleport extends BaseEntity {
   @PrimaryKey()

src/entities/base/mapObject.ts

@@ -1,10 +1,8 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
 import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-
 export class BaseMapObject extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()
@@ -12,8 +10,11 @@ export class BaseMapObject extends BaseEntity {
   @Property()
   name!: string
 
-  @Property({ type: 'json', nullable: true })
-  tags?: any
+  @Property({ type: 'json' })
+  tags: string[] = []
+
+  @Property({ type: 'json' })
+  pivotPoints: { x: number; y: number; }[] = []
 
   @Property({ type: 'decimal', precision: 10, scale: 2 })
   originX = 0
@@ -63,6 +64,15 @@ export class BaseMapObject extends BaseEntity {
     return this.tags
   }
 
+  setPivotPoints(pivotPoints: { x: number; y: number; }[]) {
+    this.pivotPoints = pivotPoints
+    return this
+  }
+
+  getPivotPoints() {
+    return this.pivotPoints
+  }
+
   setOriginX(originX: number) {
     this.originX = originX
     return this

src/entities/base/passwordResetToken.ts

@@ -1,10 +1,8 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { User } from '#entities/user'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { User } from '@/entities/user'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BasePasswordResetToken extends BaseEntity {
   @PrimaryKey()

src/entities/base/placedMapObject.ts

@@ -1,13 +1,9 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Map } from '#entities/map'
-import { MapObject } from '#entities/mapObject'
-
-//@TODO : Rename mapObject
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { Map } from '@/entities/map'
+import type { MapObject } from '@/entities/mapObject'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export class BasePlacedMapObject extends BaseEntity {
   @PrimaryKey()

src/entities/base/sprite.ts

@@ -1,11 +1,9 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import { SpriteAction } from '@/entities/spriteAction'
 import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { SpriteAction } from '#entities/spriteAction'
-
 export class BaseSprite extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/spriteAction.ts

@@ -1,10 +1,8 @@
 import { randomUUID } from 'node:crypto'
-
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Sprite } from '#entities/sprite'
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import type { Sprite } from '@/entities/sprite'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 export interface SpriteImage {
   url: string

src/entities/base/tile.ts

@@ -1,10 +1,8 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
 import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-
 export class BaseTile extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/user.ts

@@ -1,13 +1,11 @@
 import { randomUUID } from 'node:crypto'
-
+import { BaseEntity } from '@/application/base/baseEntity'
+import type { UUID } from '@/application/types'
+import { Character } from '@/entities/character'
+import { PasswordResetToken } from '@/entities/passwordResetToken'
 import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
 import bcrypt from 'bcryptjs'
 
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import { PasswordResetToken } from '#entities/passwordResetToken'
-
 export class BaseUser extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()

src/entities/base/world.ts

@@ -1,7 +1,6 @@
+import { BaseEntity } from '@/application/base/baseEntity'
 import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
-
 export class BaseWorld extends BaseEntity {
   @PrimaryKey()
   date = new Date()

src/entities/character.ts

@@ -1,6 +1,5 @@
+import { BaseCharacter } from '@/entities/base/character'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseCharacter } from '#entities/base/character'
-
 @Entity()
 export class Character extends BaseCharacter {}

src/entities/characterEquipment.ts

@@ -1,6 +1,5 @@
+import { BaseCharacterEquipment } from '@/entities/base/characterEquipment'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseCharacterEquipment } from '#entities/base/characterEquipment'
-
 @Entity()
 export class CharacterEquipment extends BaseCharacterEquipment {}

src/entities/characterHair.ts

@@ -1,7 +1,6 @@
+import { BaseCharacterHair } from '@/entities/base/characterHair'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseCharacterHair } from '#entities/base/characterHair'
-
 @Entity()
 export class CharacterHair extends BaseCharacterHair {
   public async cache() {

src/entities/characterItem.ts

@@ -1,6 +1,5 @@
+import { BaseCharacterItem } from '@/entities/base/characterItem'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseCharacterItem } from '#entities/base/characterItem'
-
 @Entity()
 export class CharacterItem extends BaseCharacterItem {}

src/entities/characterType.ts

@@ -1,7 +1,6 @@
+import { BaseCharacterType } from '@/entities/base/characterType'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseCharacterType } from '#entities/base/characterType'
-
 @Entity()
 export class CharacterType extends BaseCharacterType {
   public async cache() {

src/entities/chat.ts

@@ -1,6 +1,5 @@
+import { BaseChat } from '@/entities/base/chat'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseChat } from '#entities/base/chat'
-
 @Entity()
 export class Chat extends BaseChat {}

src/entities/item.ts

@@ -1,6 +1,5 @@
+import { BaseItem } from '@/entities/base/item'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseItem } from '#entities/base/item'
-
 @Entity()
 export class Item extends BaseItem {}

src/entities/map.ts

@@ -1,7 +1,6 @@
+import { BaseMap } from '@/entities/base/map'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseMap } from '#entities/base/map'
-
 export type MapCacheT = ReturnType<Map['cache']> | {}
 
 @Entity()

src/entities/mapEffect.ts

@@ -1,6 +1,5 @@
+import { BaseMapEffect } from '@/entities/base/mapEffect'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseMapEffect } from '#entities/base/mapEffect'
-
 @Entity()
 export class MapEffect extends BaseMapEffect {}

src/entities/mapEventTile.ts

@@ -1,6 +1,5 @@
+import { BaseMapEventTile } from '@/entities/base/mapEventTile'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseMapEventTile } from '#entities/base/mapEventTile'
-
 @Entity()
 export class MapEventTile extends BaseMapEventTile {}

src/entities/mapEventTileTeleport.ts

@@ -1,6 +1,5 @@
+import { BaseMapEventTileTeleport } from '@/entities/base/mapEventTileTeleport'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseMapEventTileTeleport } from '#entities/base/mapEventTileTeleport'
-
 @Entity()
 export class MapEventTileTeleport extends BaseMapEventTileTeleport {}

src/entities/mapObject.ts

@@ -1,7 +1,6 @@
+import { BaseMapObject } from '@/entities/base/mapObject'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseMapObject } from '#entities/base/mapObject'
-
 @Entity()
 export class MapObject extends BaseMapObject {
   public async cache() {

src/entities/passwordResetToken.ts

@@ -1,6 +1,5 @@
+import { BasePasswordResetToken } from '@/entities/base/passwordResetToken'
 import { Entity } from '@mikro-orm/core'
 
-import { BasePasswordResetToken } from '#entities/base/passwordResetToken'
-
 @Entity()
 export class PasswordResetToken extends BasePasswordResetToken {}

src/entities/placedMapObject.ts

@@ -1,6 +1,5 @@
+import { BasePlacedMapObject } from '@/entities/base/placedMapObject'
 import { Entity } from '@mikro-orm/core'
 
-import { BasePlacedMapObject } from '#entities/base/placedMapObject'
-
 @Entity()
 export class PlacedMapObject extends BasePlacedMapObject {}

src/entities/sprite.ts

@@ -1,7 +1,6 @@
+import { BaseSprite } from '@/entities/base/sprite'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseSprite } from '#entities/base/sprite'
-
 @Entity()
 export class Sprite extends BaseSprite {
   public async cache() {

src/entities/spriteAction.ts

@@ -1,6 +1,5 @@
+import { BaseSpriteAction } from '@/entities/base/spriteAction'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseSpriteAction } from '#entities/base/spriteAction'
-
 @Entity()
 export class SpriteAction extends BaseSpriteAction {}

src/entities/tile.ts

@@ -1,7 +1,6 @@
+import { BaseTile } from '@/entities/base/tile'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseTile } from '#entities/base/tile'
-
 @Entity()
 export class Tile extends BaseTile {
   public async cache() {

src/entities/user.ts

@@ -1,6 +1,5 @@
+import { BaseUser } from '@/entities/base/user'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseUser } from '#entities/base/user'
-
 @Entity()
 export class User extends BaseUser {}

src/entities/world.ts

@@ -1,6 +1,5 @@
+import { BaseWorld } from '@/entities/base/world'
 import { Entity } from '@mikro-orm/core'
 
-import { BaseWorld } from '#entities/base/world'
-
 @Entity()
 export class World extends BaseWorld {}

src/events/character/connect.ts

@@ -1,9 +1,10 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import MapManager from '#managers/mapManager'
-import CharacterHairRepository from '#repositories/characterHairRepository'
-import CharacterRepository from '#repositories/characterRepository'
-import TeleportService from '#services/characterTeleportService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import MapManager from '@/managers/mapManager'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
+import CharacterRepository from '@/repositories/characterRepository'
+import TeleportService from '@/services/characterTeleportService'
 
 interface CharacterConnectPayload {
   characterId: UUID
@@ -15,7 +16,7 @@ export default class CharacterConnectEvent extends BaseEvent {
   private readonly characterRepository = new CharacterRepository()
 
   public listen(): void {
-    this.socket.on('character:connect', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHARACTER_CONNECT, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: CharacterConnectPayload, callback: (response: any) => void): Promise<void> {
@@ -25,7 +26,7 @@ export default class CharacterConnectEvent extends BaseEvent {
         return
       }
 
-      const character = await this.characterRepository.getByUserAndId(this.socket.userId!, data.characterId)
+      const character = await this.characterRepository.getByUserAndId(this.socket.userId, data.characterId)
 
       if (!character) {
         this.emitError('Character not found or does not belong to this user')
@@ -61,7 +62,7 @@ export default class CharacterConnectEvent extends BaseEvent {
   }
 
   private async checkForActiveCharacters(): Promise<boolean> {
-    const characters = await this.characterRepository.getByUserId(this.socket.userId!)
+    const characters = await this.characterRepository.getByUserId(this.socket.userId)
     return characters?.some((char) => MapManager.getCharacterById(char.id)) ?? false
   }
 }

src/events/character/create.ts

@@ -1,67 +1,84 @@
-import { ZodError } from 'zod'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { ZCharacterCreate } from '@/application/zodTypes'
+import { Character } from '@/entities/character'
+import CharacterRepository from '@/repositories/characterRepository'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
+import MapRepository from '@/repositories/mapRepository'
+import UserRepository from '@/repositories/userRepository'
+import { z, ZodError } from 'zod'
 
-import { BaseEvent } from '#application/base/baseEvent'
-import { ZCharacterCreate } from '#application/zodTypes'
-import { Character } from '#entities/character'
-import CharacterRepository from '#repositories/characterRepository'
-import MapRepository from '#repositories/mapRepository'
-import UserRepository from '#repositories/userRepository'
+const MAX_CHARACTERS = 4
 
 export default class CharacterCreateEvent extends BaseEvent {
+  private readonly userRepository: UserRepository = new UserRepository()
+  private readonly characterRepository: CharacterRepository = new CharacterRepository()
+  private readonly characterTypeRepository: CharacterTypeRepository = new CharacterTypeRepository()
+  private readonly mapRepository: MapRepository = new MapRepository()
+
   public listen(): void {
-    this.socket.on('character:create', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHARACTER_CREATE, this.handleEvent.bind(this))
   }
 
-  private async handleEvent(data: any): Promise<any> {
-    // zod validate
+  private async handleEvent(data: z.infer<typeof ZCharacterCreate>, callback: (success: boolean) => void): Promise<void> {
     try {
-      data = ZCharacterCreate.parse(data)
-
-      const userRepository = new UserRepository()
-      const characterRepository = new CharacterRepository()
-      const mapRepository = new MapRepository()
-
-      const user = await userRepository.getById(this.socket.userId!)
-
-      if (!user) {
-        return this.socket.emit('notification', { message: 'User not found' })
-      }
-
-      // Check if character name already exists
-      const characterExists = await characterRepository.getByName(data.name)
-
-      if (characterExists) {
-        return this.socket.emit('notification', { message: 'Character name already exists' })
-      }
-
-      let characters: Character[] = await characterRepository.getByUserId(user.getId())
-
-      if (characters.length >= 4) {
-        return this.socket.emit('notification', { message: 'You can only have 4 characters' })
-      }
-
-      // @TODO: Change to default location
-      const map = await mapRepository.getFirst()
-
-      const newCharacter = new Character()
-      await newCharacter.setName(data.name).setUser(user).setMap(map!).save()
-
-      if (!newCharacter) {
-        return this.socket.emit('notification', { message: 'Failed to create character. Please try again (later).' })
-      }
-
-      characters = [...characters, newCharacter]
-
-      this.socket.emit('character:create:success')
-      this.socket.emit('character:list', characters)
-
-      this.logger.info('character:create success')
-    } catch (error: any) {
-      this.logger.error(`character:create error: ${error.message}`)
-      if (error instanceof ZodError) {
-        return this.socket.emit('notification', { message: error.issues[0].message })
-      }
-      return this.socket.emit('notification', { message: 'Could not create character. Please try again (later).' })
+      const validatedData = ZCharacterCreate.parse(data)
+      await this.createCharacter(validatedData)
+      callback(true)
+    } catch (error: unknown) {
+      this.returnError(error)
+      callback(false)
     }
   }
+
+  private async createCharacter(data: z.infer<typeof ZCharacterCreate>): Promise<void> {
+    const user = await this.userRepository.getById(this.socket.userId)
+    if (!user) {
+      throw new Error('You are not logged in')
+    }
+
+    const characterExists = await this.characterRepository.getByName(data.name)
+    if (characterExists) {
+      throw new Error('Character name already exists')
+    }
+
+    let characters = await this.characterRepository.getByUserId(user.getId())
+    if (characters.length >= MAX_CHARACTERS) {
+      throw new Error(`You can only create ${MAX_CHARACTERS} characters`)
+    }
+
+    const map = await this.mapRepository.getFirst()
+    if (!map) {
+      throw new Error('No default map found')
+    }
+
+    const characterType = await this.characterTypeRepository.getFirst()
+    if (!characterType) {
+      throw new Error('No character type found')
+    }
+
+    const newCharacter = new Character()
+    await newCharacter.setName(data.name).setUser(user).setMap(map).setCharacterType(characterType).save()
+    characters = await this.characterRepository.getByUserId(user.getId())
+
+    this.socket.emit(SocketEvent.CHARACTER_LIST, characters)
+    this.logger.info('character:create success')
+  }
+
+  private returnError(error: unknown): void {
+    this.logger.error(`character:create error: ${error instanceof Error ? error.message : 'Unknown error'}`)
+
+    let errorMessage = 'Could not create character. Please try again later.'
+
+    if (error instanceof ZodError) {
+      errorMessage = error.issues[0]?.message || errorMessage
+    } else if (error instanceof Error) {
+      errorMessage = error.message
+    }
+
+    this.socket.emit(SocketEvent.NOTIFICATION, {
+      title: 'Error',
+      message: errorMessage
+    })
+  }
 }

src/events/character/delete.ts

@@ -1,7 +1,8 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import { Character } from '#entities/character'
-import CharacterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import { Character } from '@/entities/character'
+import CharacterRepository from '@/repositories/characterRepository'
 
 type TypePayload = {
   characterId: UUID
@@ -13,18 +14,18 @@ type TypeResponse = {
 
 export default class CharacterDeleteEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('character:delete', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHARACTER_DELETE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: TypeResponse) => void): Promise<any> {
     try {
       const characterRepository = new CharacterRepository()
-      await (await characterRepository.getByUserAndId(this.socket.userId!, data.characterId))?.delete()
-      const characters: Character[] = await characterRepository.getByUserId(this.socket.userId!)
+      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)
+      this.socket.emit(SocketEvent.CHARACTER_LIST, characters)
     } catch (error: any) {
-      return this.socket.emit('notification', { message: 'Character delete failed. Please try again.' })
+      return this.socket.emit(SocketEvent.NOTIFICATION, { message: 'Character delete failed. Please try again.' })
     }
   }
 }

src/events/character/list.ts

@@ -1,18 +1,19 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { Character } from '#entities/character'
-import CharacterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { Character } from '@/entities/character'
+import CharacterRepository from '@/repositories/characterRepository'
 
 export default class CharacterListEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('character:list', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHARACTER_LIST, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: any): Promise<void> {
     try {
       const characterRepository = new CharacterRepository()
-      let characters: Character[] = await characterRepository.getByUserId(this.socket.userId!)
+      let characters: Character[] = await characterRepository.getByUserId(this.socket.userId)
 
-      this.socket.emit('character:list', characters)
+      this.socket.emit(SocketEvent.CHARACTER_LIST, characters)
     } catch (error: any) {
       this.logger.error('character:list error', error.message)
     }

src/events/chat/gameMaster/alertCommand.ts

@@ -1,6 +1,7 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import CharacterRepository from '#repositories/characterRepository'
-import ChatService from '#services/chatService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import CharacterRepository from '@/repositories/characterRepository'
+import ChatService from '@/services/chatService'
 
 type TypePayload = {
   message: string
@@ -8,7 +9,7 @@ type TypePayload = {
 
 export default class AlertCommandEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('chat:message', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHAT_MESSAGE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
@@ -25,7 +26,7 @@ export default class AlertCommandEvent extends BaseEvent {
         return callback(false)
       }
 
-      this.io.emit('notification', { title: 'Message from GM', message: args.join(' ') })
+      this.io.emit(SocketEvent.NOTIFICATION, { title: 'Message from GM', message: args.join(' ') })
       return callback(true)
     } catch (error: any) {
       this.logger.error('chat:alert_command error', error.message)

src/events/chat/gameMaster/setTimeCommand.ts

@@ -1,7 +1,8 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import DateManager from '#managers/dateManager'
-import CharacterRepository from '#repositories/characterRepository'
-import ChatService from '#services/chatService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import DateManager from '@/managers/dateManager'
+import CharacterRepository from '@/repositories/characterRepository'
+import ChatService from '@/services/chatService'
 
 type TypePayload = {
   message: string
@@ -9,7 +10,7 @@ type TypePayload = {
 
 export default class SetTimeCommand extends BaseEvent {
   public listen(): void {
-    this.socket.on('chat:message', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHAT_MESSAGE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {

src/events/chat/gameMaster/teleportCommand.ts

@@ -1,9 +1,10 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import MapManager from '#managers/mapManager'
-import MapRepository from '#repositories/mapRepository'
-import TeleportService from '#services/characterTeleportService'
-import ChatService from '#services/chatService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import MapManager from '@/managers/mapManager'
+import MapRepository from '@/repositories/mapRepository'
+import TeleportService from '@/services/characterTeleportService'
+import ChatService from '@/services/chatService'
 
 type TypePayload = {
   message: string
@@ -11,7 +12,7 @@ type TypePayload = {
 
 export default class TeleportCommandEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('chat:message', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHAT_MESSAGE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void) {
@@ -28,7 +29,7 @@ export default class TeleportCommandEvent extends BaseEvent {
       const args = ChatService.getArgs('teleport', data.message)
 
       if (!args || args.length === 0 || args.length > 3) {
-        this.socket.emit('notification', {
+        this.socket.emit(SocketEvent.NOTIFICATION, {
           title: 'Server message',
           message: 'Usage: /teleport <mapId> [x] [y]'
         })
@@ -40,7 +41,7 @@ export default class TeleportCommandEvent extends BaseEvent {
       const targetY = args[2] ? parseInt(args[2], 10) : 0
 
       if (!mapId || isNaN(targetX) || isNaN(targetY)) {
-        this.socket.emit('notification', {
+        this.socket.emit(SocketEvent.NOTIFICATION, {
           title: 'Server message',
           message: 'Invalid parameters. X and Y coordinates must be numbers.'
         })
@@ -50,7 +51,7 @@ export default class TeleportCommandEvent extends BaseEvent {
       const mapRepository = new MapRepository()
       const map = await mapRepository.getById(mapId)
       if (!map) {
-        this.socket.emit('notification', {
+        this.socket.emit(SocketEvent.NOTIFICATION, {
           title: 'Server message',
           message: 'Map not found'
         })
@@ -58,7 +59,7 @@ export default class TeleportCommandEvent extends BaseEvent {
       }
 
       if (character.map.id === map.id && targetX === character.positionX && targetY === character.positionY) {
-        this.socket.emit('notification', {
+        this.socket.emit(SocketEvent.NOTIFICATION, {
           title: 'Server message',
           message: 'You are already at that location'
         })
@@ -73,20 +74,20 @@ export default class TeleportCommandEvent extends BaseEvent {
       })
 
       if (!success) {
-        return this.socket.emit('notification', {
+        return this.socket.emit(SocketEvent.NOTIFICATION, {
           title: 'Server message',
           message: 'Failed to teleport'
         })
       }
 
-      this.socket.emit('notification', {
+      this.socket.emit(SocketEvent.NOTIFICATION, {
         title: 'Server message',
         message: `Teleported to ${map.name} (${targetX}, ${targetY})`
       })
       this.logger.info('teleport', `Character ${character.id} teleported to map ${map.id} at position (${targetX}, ${targetY})`)
     } catch (error: any) {
       this.logger.error(`Error in teleport command: ${error.message}`)
-      this.socket.emit('notification', {
+      this.socket.emit(SocketEvent.NOTIFICATION, {
         title: 'Server message',
         message: 'An error occurred while teleporting'
       })

src/events/chat/gameMaster/toggleFogCommand.ts

@@ -1,6 +1,7 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import WeatherManager from '#managers/weatherManager'
-import ChatService from '#services/chatService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import WeatherManager from '@/managers/weatherManager'
+import ChatService from '@/services/chatService'
 
 type TypePayload = {
   message: string
@@ -8,7 +9,7 @@ type TypePayload = {
 
 export default class ToggleFogCommand extends BaseEvent {
   public listen(): void {
-    this.socket.on('chat:message', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHAT_MESSAGE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {

src/events/chat/gameMaster/toggleRainCommand.ts

@@ -1,6 +1,7 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import WeatherManager from '#managers/weatherManager'
-import ChatService from '#services/chatService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import WeatherManager from '@/managers/weatherManager'
+import ChatService from '@/services/chatService'
 
 type TypePayload = {
   message: string
@@ -8,7 +9,7 @@ type TypePayload = {
 
 export default class ToggleRainCommand extends BaseEvent {
   public listen(): void {
-    this.socket.on('chat:message', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHAT_MESSAGE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {

src/events/chat/message.ts

@@ -1,7 +1,7 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import MapManager from '#managers/mapManager'
-import MapRepository from '#repositories/mapRepository'
-import ChatService from '#services/chatService'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import MapManager from '@/managers/mapManager'
+import ChatService from '@/services/chatService'
 
 type TypePayload = {
   message: string
@@ -9,31 +9,22 @@ type TypePayload = {
 
 export default class ChatMessageEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('chat:message', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.CHAT_MESSAGE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (!data.message || ChatService.isCommand(data.message)) {
-        return callback(false)
-      }
+      if (!data.message || ChatService.isCommand(data.message)) return
 
       const mapCharacter = MapManager.getCharacterById(this.socket.characterId!)
       if (!mapCharacter) {
         this.logger.error('chat:message error', 'Character not found')
-        return callback(false)
+        return
       }
 
       const character = mapCharacter.character
 
-      const mapRepository = new MapRepository()
-      const map = await mapRepository.getById(character.map.id)
-      if (!map) {
-        this.logger.error('chat:message error', 'Map not found')
-        return callback(false)
-      }
-
-      if (await ChatService.sendMapMessage(character.getId(), map.getId(), data.message)) {
+      if (await ChatService.sendMapMessage(character.getId(), data.message)) {
         return callback(true)
       }
 

src/events/disconnect.ts

@@ -1,5 +1,6 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import MapManager from '#managers/mapManager'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import MapManager from '@/managers/mapManager'
 
 export default class DisconnectEvent extends BaseEvent {
   public listen(): void {
@@ -13,7 +14,7 @@ export default class DisconnectEvent extends BaseEvent {
         return
       }
 
-      this.io.emit('user:disconnect', this.socket.userId)
+      this.io.emit(SocketEvent.USER_DISCONNECT, this.socket.userId)
 
       const mapCharacter = MapManager.getCharacterById(this.socket.characterId!)
       if (!mapCharacter) {

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

@@ -1,9 +1,10 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { CharacterHair } from '#entities/characterHair'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { CharacterHair } from '@/entities/characterHair'
 
 export default class CharacterHairCreateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterHair:create', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERHAIR_CREATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean) => void): Promise<void> {

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

@@ -1,27 +1,31 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import CharacterHairRepository from '#repositories/characterHairRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
 
 interface IPayload {
   id: UUID
 }
 
-export default class characterHairDeleteEvent extends BaseEvent {
+export default class CharacterHairDeleteEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterHair:remove', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERHAIR_REMOVE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
     try {
       if (!(await this.isCharacterGM())) return
 
-      const characterHair = await CharacterHairRepository.getById(data.id)
-      await (await CharacterHairRepository.getById(data.id))?.delete()
+      const characterHairRepository = new CharacterHairRepository()
+      const characterHair = await characterHairRepository.getById(data.id)
+      if (!characterHair) return callback(false)
+
+      await characterHair.delete()
 
       return callback(true)
     } catch (error) {
-      this.logger.error(`Error deleting character type ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
-      callback(false)
+      this.logger.error(`Error deleting character hair ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
+      return callback(false)
     }
   }
 }

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

@@ -1,12 +1,13 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { CharacterHair } from '#entities/characterHair'
-import CharacterHairRepository from '#repositories/characterHairRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { CharacterHair } from '@/entities/characterHair'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
 
 interface IPayload {}
 
 export default class characterHairListEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterHair:list', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERHAIR_LIST, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {

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

@@ -1,8 +1,8 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { CharacterGender } from '#application/enums'
-import { UUID } from '#application/types'
-import CharacterHairRepository from '#repositories/characterHairRepository'
-import SpriteRepository from '#repositories/spriteRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { CharacterGender, SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import CharacterHairRepository from '@/repositories/characterHairRepository'
+import SpriteRepository from '@/repositories/spriteRepository'
 
 type Payload = {
   id: UUID
@@ -14,7 +14,7 @@ type Payload = {
 
 export default class CharacterHairUpdateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterHair:update', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERHAIR_UPDATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {

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

@@ -1,9 +1,10 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { CharacterType } from '#entities/characterType'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { CharacterType } from '@/entities/characterType'
 
 export default class CharacterTypeCreateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterType:create', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERTYPE_CREATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {

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

@@ -1,6 +1,7 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
 
 interface IPayload {
   id: UUID
@@ -8,7 +9,7 @@ interface IPayload {
 
 export default class CharacterTypeDeleteEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterType:remove', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERTYPE_REMOVE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {

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

@@ -1,12 +1,13 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { CharacterType } from '#entities/characterType'
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { CharacterType } from '@/entities/characterType'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
 
 interface IPayload {}
 
 export default class CharacterTypeListEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterType:list', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERTYPE_LIST, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: CharacterType[]) => void): Promise<void> {

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

@@ -1,8 +1,8 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { CharacterGender, CharacterRace } from '#application/enums'
-import { UUID } from '#application/types'
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
-import SpriteRepository from '#repositories/spriteRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { CharacterGender, CharacterRace, SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import CharacterTypeRepository from '@/repositories/characterTypeRepository'
+import SpriteRepository from '@/repositories/spriteRepository'
 
 type Payload = {
   id: UUID
@@ -15,7 +15,7 @@ type Payload = {
 
 export default class CharacterTypeUpdateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:characterType:update', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_CHARACTERTYPE_UPDATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {

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

@@ -1,17 +1,23 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { Item } from '#entities/item'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { ItemRarity, ItemType, SocketEvent } from '@/application/enums'
+import { Item } from '@/entities/item'
+import SpriteRepository from '@/repositories/spriteRepository'
 
 export default class ItemCreateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:item:create', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_ITEM_CREATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean, item?: any) => void): Promise<void> {
     try {
       if (!(await this.isCharacterGM())) return
 
+      const spriteRepository = new SpriteRepository()
+      const sprite = await spriteRepository.getFirst()
+      if (!sprite) return callback(false)
+
       const newItem = new Item()
-      await newItem.setName('New Item').setItemType('WEAPON').setStackable(false).setRarity('COMMON').setSprite(null).save()
+      await newItem.setName('New Item').setItemType(ItemType.WEAPON).setStackable(false).setRarity(ItemRarity.COMMON).setSprite(sprite).save()
 
       return callback(true, newItem)
     } catch (error) {

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

@@ -1,6 +1,7 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import ItemRepository from '#repositories/itemRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import ItemRepository from '@/repositories/itemRepository'
 
 interface IPayload {
   id: UUID
@@ -8,7 +9,7 @@ interface IPayload {
 
 export default class ItemDeleteEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:item:remove', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_ITEM_REMOVE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {

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

@@ -1,12 +1,13 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { Item } from '#entities/item'
-import ItemRepository from '#repositories/itemRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { Item } from '@/entities/item'
+import ItemRepository from '@/repositories/itemRepository'
 
 interface IPayload {}
 
 export default class ItemListEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:item:list', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_ITEM_LIST, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: Item[]) => void): Promise<void> {

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

@@ -1,8 +1,8 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { ItemType, ItemRarity } from '#application/enums'
-import { UUID } from '#application/types'
-import ItemRepository from '#repositories/itemRepository'
-import SpriteRepository from '#repositories/spriteRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { ItemRarity, ItemType, SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import ItemRepository from '@/repositories/itemRepository'
+import SpriteRepository from '@/repositories/spriteRepository'
 
 type Payload = {
   id: UUID
@@ -16,7 +16,7 @@ type Payload = {
 
 export default class ItemUpdateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:item:update', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_ITEM_UPDATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {

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

@@ -1,12 +1,13 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { MapObject } from '#entities/mapObject'
-import MapObjectRepository from '#repositories/mapObjectRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import { MapObject } from '@/entities/mapObject'
+import MapObjectRepository from '@/repositories/mapObjectRepository'
 
 interface IPayload {}
 
 export default class MapObjectListEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:mapObject:list', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_MAPOBJECT_LIST, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: MapObject[]) => void): Promise<void> {

src/events/gameMaster/assetManager/mapObject/remove.ts

@@ -1,9 +1,9 @@
 import fs from 'fs'
-
-import { BaseEvent } from '#application/base/baseEvent'
-import Storage from '#application/storage'
-import { UUID } from '#application/types'
-import MapObjectRepository from '#repositories/mapObjectRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import Storage from '@/application/storage'
+import type { UUID } from '@/application/types'
+import MapObjectRepository from '@/repositories/mapObjectRepository'
 
 interface IPayload {
   mapObjectId: UUID
@@ -11,7 +11,7 @@ interface IPayload {
 
 export default class MapObjectRemoveEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:mapObject:remove', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_MAPOBJECT_REMOVE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {

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

@@ -1,11 +1,13 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import MapObjectRepository from '#repositories/mapObjectRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import MapObjectRepository from '@/repositories/mapObjectRepository'
 
 type Payload = {
   id: UUID
   name: string
   tags: string[]
+  pivotPoints: { x: number; y: number; }[]
   originX: number
   originY: number
   frameRate: number
@@ -15,7 +17,7 @@ type Payload = {
 
 export default class MapObjectUpdateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:mapObject:update', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_MAPOBJECT_UPDATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
@@ -27,19 +29,20 @@ export default class MapObjectUpdateEvent extends BaseEvent {
       const mapObject = await mapObjectRepository.getById(data.id)
       if (!mapObject) return callback(false)
 
-      await mapObject
-        .setName(data.name)
-        .setTags(data.tags)
-        .setOriginX(data.originX)
-        .setOriginY(data.originY)
-        .setFrameRate(data.frameRate)
-        .setFrameWidth(data.frameWidth)
-        .setFrameHeight(data.frameHeight)
-        .save()
+      if (data.name !== undefined) mapObject.name = data.name
+      if (data.tags !== undefined) mapObject.tags = data.tags
+      if (data.pivotPoints !== undefined) mapObject.pivotPoints = data.pivotPoints
+      if (data.originX !== undefined) mapObject.originX = data.originX
+      if (data.originY !== undefined) mapObject.originY = data.originY
+      if (data.frameRate !== undefined) mapObject.frameRate = data.frameRate
+      if (data.frameWidth !== undefined) mapObject.frameWidth = data.frameWidth
+      if (data.frameHeight !== undefined) mapObject.frameHeight = data.frameHeight
+
+      await mapObject.save()
 
       return callback(true)
     } catch (error) {
-      console.error(error)
+      this.socket.emit(SocketEvent.NOTIFICATION, { title: 'Error', message: 'Failed to update mapObject.' })
       return callback(false)
     }
   }

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

@@ -1,19 +1,18 @@
 import fs from 'fs/promises'
 import { writeFile } from 'node:fs/promises'
-
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import Storage from '@/application/storage'
+import { MapObject } from '@/entities/mapObject'
 import sharp from 'sharp'
 
-import { BaseEvent } from '#application/base/baseEvent'
-import Storage from '#application/storage'
-import { MapObject } from '#entities/mapObject'
-
 interface IObjectData {
   [key: string]: Buffer
 }
 
 export default class MapObjectUploadEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:mapObject:upload', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_MAPOBJECT_UPLOAD, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IObjectData, callback: (response: boolean) => void): Promise<void> {

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

@@ -1,7 +1,8 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import { UUID } from '#application/types'
-import { Sprite } from '#entities/sprite'
-import SpriteRepository from '#repositories/spriteRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import type { UUID } from '@/application/types'
+import { Sprite } from '@/entities/sprite'
+import SpriteRepository from '@/repositories/spriteRepository'
 
 interface CopyPayload {
   id: UUID
@@ -9,7 +10,7 @@ interface CopyPayload {
 
 export default class SpriteCopyEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:sprite:copy', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_SPRITE_COPY, this.handleEvent.bind(this))
   }
 
   private async handleEvent(payload: CopyPayload, callback: (success: boolean) => void): Promise<void> {

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

@@ -1,12 +1,12 @@
 import fs from 'fs/promises'
-
-import { BaseEvent } from '#application/base/baseEvent'
-import Storage from '#application/storage'
-import { Sprite } from '#entities/sprite'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import Storage from '@/application/storage'
+import { Sprite } from '@/entities/sprite'
 
 export default class SpriteCreateEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:sprite:create', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_SPRITE_CREATE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean) => void): Promise<void> {

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

@@ -1,9 +1,9 @@
 import fs from 'fs'
-
-import { BaseEvent } from '#application/base/baseEvent'
-import Storage from '#application/storage'
-import { UUID } from '#application/types'
-import SpriteRepository from '#repositories/spriteRepository'
+import { BaseEvent } from '@/application/base/baseEvent'
+import { SocketEvent } from '@/application/enums'
+import Storage from '@/application/storage'
+import type { UUID } from '@/application/types'
+import SpriteRepository from '@/repositories/spriteRepository'
 
 type Payload = {
   id: UUID
@@ -11,7 +11,7 @@ type Payload = {
 
 export default class GMSpriteDeleteEvent extends BaseEvent {
   public listen(): void {
-    this.socket.on('gm:sprite:delete', this.handleEvent.bind(this))
+    this.socket.on(SocketEvent.GM_SPRITE_DELETE, this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (response: boolean) => void): Promise<void> {