hm

src/application/base/baseRepository.ts

@@ -1,7 +1,6 @@
 import { EntityManager } from '@mikro-orm/core'
 
-import Database from '../database'
-
+import Database from '#application/database'
 import Logger, { LoggerType } from '#application/logger'
 
 export abstract class BaseRepository {

src/application/database.ts

@@ -1,7 +1,7 @@
 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'
 
 class Database {
   private static orm: MikroORM

src/entities/base/map.ts

@@ -22,7 +22,7 @@ export class BaseMap extends BaseEntity {
   height = 10
 
   @Property({ type: 'json', nullable: true })
-  tiles?: any
+  tiles: Array<Array<string>> = []
 
   @Property()
   pvp = false

src/entities/base/mapEffect.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto'
 
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
+import { ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
 import { BaseEntity } from '#application/base/baseEntity'
 import { UUID } from '#application/types'

src/middleware/authentication.ts

@@ -1,4 +1,4 @@
-import { verify } from 'jsonwebtoken'
+import jwt from 'jsonwebtoken'
 
 import config from '#application/config'
 import Logger, { LoggerType } from '#application/logger'
@@ -39,7 +39,7 @@ class SocketAuthenticator {
   }
 
   private verifyToken(token: string): void {
-    verify(token, config.JWT_SECRET, (err: any, decoded: any) => {
+    jwt.verify(token, config.JWT_SECRET, (err: any, decoded: any) => {
       if (err) {
         this.logger.error('Invalid token')
         return this.next(new Error('Authentication error'))

src/mikro-orm.config.ts

@@ -0,0 +1,27 @@
+// import { defineConfig, MariaDbDriver } from '@mikro-orm/mariadb'
+import { Migrator } from '@mikro-orm/migrations'
+import { defineConfig, MySqlDriver } from '@mikro-orm/mysql'
+import { TsMorphMetadataProvider } from '@mikro-orm/reflection'
+
+import serverConfig from '#application/config'
+
+export default defineConfig({
+  extensions: [Migrator],
+  metadataProvider: TsMorphMetadataProvider,
+  entities: ['./src/entities/*.js'],
+  entitiesTs: ['./src/entities/*.ts'],
+  driver: MySqlDriver,
+  host: serverConfig.DB_HOST,
+  port: serverConfig.DB_PORT,
+  user: serverConfig.DB_USER,
+  password: serverConfig.DB_PASS,
+  dbName: serverConfig.DB_NAME,
+  debug: false,
+  driverOptions: {
+    allowPublicKeyRetrieval: true
+  },
+  migrations: {
+    path: './migrations',
+    pathTs: './migrations'
+  }
+})

src/models/loadedMap.ts

@@ -1,8 +1,7 @@
-import MapCharacter from './mapCharacter'
-
 import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 import { Map } from '#entities/map'
+import MapCharacter from '#models/mapCharacter'
 import MapEventTileRepository from '#repositories/mapEventTileRepository'
 
 class LoadedMap {