From bebd5876da53a92a09d735fc2f09cc40115ec731 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Tue, 11 Feb 2025 23:16:37 +0100 Subject: [PATCH] Console fix --- src/application/base/baseEvent.ts | 2 +- src/application/console/consolePrompt.ts | 3 +-- src/application/console/logReader.ts | 3 +-- src/application/enums.ts | 2 +- src/commands/alert.ts | 2 +- src/events/character/connect.ts | 2 +- src/events/character/create.ts | 2 +- src/events/character/delete.ts | 2 +- src/events/character/list.ts | 2 +- src/events/chat/gameMaster/alertCommand.ts | 2 +- src/events/chat/gameMaster/setTimeCommand.ts | 2 +- src/events/chat/gameMaster/teleportCommand.ts | 2 +- src/events/chat/gameMaster/toggleFogCommand.ts | 2 +- src/events/chat/gameMaster/toggleRainCommand.ts | 2 +- src/events/chat/message.ts | 2 +- src/events/disconnect.ts | 2 +- src/events/gameMaster/assetManager/characterHair/create.ts | 2 +- src/events/gameMaster/assetManager/characterHair/delete.ts | 2 +- src/events/gameMaster/assetManager/characterHair/list.ts | 2 +- src/events/gameMaster/assetManager/characterHair/update.ts | 2 +- src/events/gameMaster/assetManager/characterType/create.ts | 2 +- src/events/gameMaster/assetManager/characterType/delete.ts | 2 +- src/events/gameMaster/assetManager/characterType/list.ts | 2 +- src/events/gameMaster/assetManager/characterType/update.ts | 2 +- src/events/gameMaster/assetManager/item/create.ts | 2 +- src/events/gameMaster/assetManager/item/delete.ts | 2 +- src/events/gameMaster/assetManager/item/list.ts | 2 +- src/events/gameMaster/assetManager/item/update.ts | 2 +- src/events/gameMaster/assetManager/mapObject/list.ts | 2 +- src/events/gameMaster/assetManager/mapObject/remove.ts | 2 +- src/events/gameMaster/assetManager/mapObject/update.ts | 2 +- src/events/gameMaster/assetManager/mapObject/upload.ts | 2 +- src/events/gameMaster/assetManager/sprite/copy.ts | 2 +- src/events/gameMaster/assetManager/sprite/create.ts | 2 +- src/events/gameMaster/assetManager/sprite/delete.ts | 2 +- src/events/gameMaster/assetManager/sprite/list.ts | 2 +- src/events/gameMaster/assetManager/sprite/update.ts | 2 +- src/events/gameMaster/assetManager/tile/delete.ts | 2 +- src/events/gameMaster/assetManager/tile/list.ts | 2 +- src/events/gameMaster/assetManager/tile/update.ts | 2 +- src/events/gameMaster/assetManager/tile/upload.ts | 2 +- src/events/gameMaster/mapEditor/create.ts | 2 +- src/events/gameMaster/mapEditor/delete.ts | 2 +- src/events/gameMaster/mapEditor/request.ts | 2 +- src/events/gameMaster/mapEditor/update.ts | 2 +- src/events/login.ts | 2 +- src/events/map/characterAttack.ts | 2 +- src/events/map/characterMove.ts | 6 ++---- src/events/map/weather.ts | 2 +- src/jobs/someJob.ts | 3 ++- src/managers/dateManager.ts | 2 +- src/managers/weatherManager.ts | 2 +- src/models/mapCharacter.ts | 2 +- src/services/characterAttackService.ts | 2 +- src/services/characterTeleportService.ts | 2 +- src/services/chatService.ts | 2 +- 56 files changed, 58 insertions(+), 61 deletions(-) diff --git a/src/application/base/baseEvent.ts b/src/application/base/baseEvent.ts index 2d26a68..95c7d29 100644 --- a/src/application/base/baseEvent.ts +++ b/src/application/base/baseEvent.ts @@ -1,8 +1,8 @@ -import { SocketEvent } from '#application/enums'; import { Server } from 'socket.io' import type { TSocket } from '#application/types' +import { SocketEvent } from '#application/enums' import Logger, { LoggerType } from '#application/logger' import { Character } from '#entities/character' import CharacterRepository from '#repositories/characterRepository' diff --git a/src/application/console/consolePrompt.ts b/src/application/console/consolePrompt.ts index c7132cf..41aaa74 100644 --- a/src/application/console/consolePrompt.ts +++ b/src/application/console/consolePrompt.ts @@ -1,4 +1,3 @@ -import { SocketEvent } from '#application/enums'; import * as readline from 'readline' export class ConsolePrompt { @@ -11,7 +10,7 @@ export class ConsolePrompt { output: process.stdout }) - this.rl.on(SocketEvent.CLOSE, () => { + this.rl.on('close', () => { this.isClosed = true }) } diff --git a/src/application/console/logReader.ts b/src/application/console/logReader.ts index f062f2a..83f8532 100644 --- a/src/application/console/logReader.ts +++ b/src/application/console/logReader.ts @@ -1,4 +1,3 @@ -import { SocketEvent } from '#application/enums'; import * as fs from 'fs' import * as path from 'path' @@ -61,7 +60,7 @@ export class LogReader { end: newPosition }) - stream.on(SocketEvent.DATA, (data) => { + stream.on('data', (data) => { console.log(`[${filename}]`) console.log(data.toString()) // }) diff --git a/src/application/enums.ts b/src/application/enums.ts index 144b9e4..563b4f9 100644 --- a/src/application/enums.ts +++ b/src/application/enums.ts @@ -51,7 +51,7 @@ export enum SocketEvent { MAP_CHARACTER_JOIN = '3', MAP_CHARACTER_LEAVE = '2', MAP_CHARACTER_MOVE = '1', - CHAT_MESSAGE = '0', + CHAT_MESSAGE = '0' } export enum ItemType { diff --git a/src/commands/alert.ts b/src/commands/alert.ts index 626820d..a7f808e 100644 --- a/src/commands/alert.ts +++ b/src/commands/alert.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import { Server } from 'socket.io' import { BaseCommand } from '#application/base/baseCommand' +import { SocketEvent } from '#application/enums' type CommandInput = string[] diff --git a/src/events/character/connect.ts b/src/events/character/connect.ts index 29d80da..ed40fea 100644 --- a/src/events/character/connect.ts +++ b/src/events/character/connect.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapManager from '#managers/mapManager' import CharacterHairRepository from '#repositories/characterHairRepository' import CharacterRepository from '#repositories/characterRepository' diff --git a/src/events/character/create.ts b/src/events/character/create.ts index f85aa13..4861b4a 100644 --- a/src/events/character/create.ts +++ b/src/events/character/create.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import { ZodError, z } 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' diff --git a/src/events/character/delete.ts b/src/events/character/delete.ts index 91e8ae8..1f78e63 100644 --- a/src/events/character/delete.ts +++ b/src/events/character/delete.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Character } from '#entities/character' import CharacterRepository from '#repositories/characterRepository' diff --git a/src/events/character/list.ts b/src/events/character/list.ts index e8744eb..309736f 100644 --- a/src/events/character/list.ts +++ b/src/events/character/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Character } from '#entities/character' import CharacterRepository from '#repositories/characterRepository' diff --git a/src/events/chat/gameMaster/alertCommand.ts b/src/events/chat/gameMaster/alertCommand.ts index b38f57e..830f843 100644 --- a/src/events/chat/gameMaster/alertCommand.ts +++ b/src/events/chat/gameMaster/alertCommand.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import CharacterRepository from '#repositories/characterRepository' import ChatService from '#services/chatService' diff --git a/src/events/chat/gameMaster/setTimeCommand.ts b/src/events/chat/gameMaster/setTimeCommand.ts index 7aa5e1f..695c217 100644 --- a/src/events/chat/gameMaster/setTimeCommand.ts +++ b/src/events/chat/gameMaster/setTimeCommand.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; 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' diff --git a/src/events/chat/gameMaster/teleportCommand.ts b/src/events/chat/gameMaster/teleportCommand.ts index b256183..fedba4f 100644 --- a/src/events/chat/gameMaster/teleportCommand.ts +++ b/src/events/chat/gameMaster/teleportCommand.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapManager from '#managers/mapManager' import MapRepository from '#repositories/mapRepository' import TeleportService from '#services/characterTeleportService' diff --git a/src/events/chat/gameMaster/toggleFogCommand.ts b/src/events/chat/gameMaster/toggleFogCommand.ts index f312568..e1b90cd 100644 --- a/src/events/chat/gameMaster/toggleFogCommand.ts +++ b/src/events/chat/gameMaster/toggleFogCommand.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import WeatherManager from '#managers/weatherManager' import ChatService from '#services/chatService' diff --git a/src/events/chat/gameMaster/toggleRainCommand.ts b/src/events/chat/gameMaster/toggleRainCommand.ts index bd14c85..7eb9172 100644 --- a/src/events/chat/gameMaster/toggleRainCommand.ts +++ b/src/events/chat/gameMaster/toggleRainCommand.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import WeatherManager from '#managers/weatherManager' import ChatService from '#services/chatService' diff --git a/src/events/chat/message.ts b/src/events/chat/message.ts index 37857aa..edfa09c 100644 --- a/src/events/chat/message.ts +++ b/src/events/chat/message.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapManager from '#managers/mapManager' import MapRepository from '#repositories/mapRepository' import ChatService from '#services/chatService' diff --git a/src/events/disconnect.ts b/src/events/disconnect.ts index c8d6437..bd60761 100644 --- a/src/events/disconnect.ts +++ b/src/events/disconnect.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapManager from '#managers/mapManager' export default class DisconnectEvent extends BaseEvent { diff --git a/src/events/gameMaster/assetManager/characterHair/create.ts b/src/events/gameMaster/assetManager/characterHair/create.ts index 8a7cec1..6c67313 100644 --- a/src/events/gameMaster/assetManager/characterHair/create.ts +++ b/src/events/gameMaster/assetManager/characterHair/create.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { CharacterHair } from '#entities/characterHair' export default class CharacterHairCreateEvent extends BaseEvent { diff --git a/src/events/gameMaster/assetManager/characterHair/delete.ts b/src/events/gameMaster/assetManager/characterHair/delete.ts index 3476a7c..e4f8757 100644 --- a/src/events/gameMaster/assetManager/characterHair/delete.ts +++ b/src/events/gameMaster/assetManager/characterHair/delete.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import CharacterHairRepository from '#repositories/characterHairRepository' interface IPayload { diff --git a/src/events/gameMaster/assetManager/characterHair/list.ts b/src/events/gameMaster/assetManager/characterHair/list.ts index 97916f6..f0a82ff 100644 --- a/src/events/gameMaster/assetManager/characterHair/list.ts +++ b/src/events/gameMaster/assetManager/characterHair/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { CharacterHair } from '#entities/characterHair' import CharacterHairRepository from '#repositories/characterHairRepository' diff --git a/src/events/gameMaster/assetManager/characterHair/update.ts b/src/events/gameMaster/assetManager/characterHair/update.ts index 1379f23..fb9bb46 100644 --- a/src/events/gameMaster/assetManager/characterHair/update.ts +++ b/src/events/gameMaster/assetManager/characterHair/update.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { CharacterGender } from '#application/enums' import CharacterHairRepository from '#repositories/characterHairRepository' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/characterType/create.ts b/src/events/gameMaster/assetManager/characterType/create.ts index 14cb7f2..601e28a 100644 --- a/src/events/gameMaster/assetManager/characterType/create.ts +++ b/src/events/gameMaster/assetManager/characterType/create.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { CharacterType } from '#entities/characterType' export default class CharacterTypeCreateEvent extends BaseEvent { diff --git a/src/events/gameMaster/assetManager/characterType/delete.ts b/src/events/gameMaster/assetManager/characterType/delete.ts index 723aa14..e88bcdd 100644 --- a/src/events/gameMaster/assetManager/characterType/delete.ts +++ b/src/events/gameMaster/assetManager/characterType/delete.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import CharacterTypeRepository from '#repositories/characterTypeRepository' interface IPayload { diff --git a/src/events/gameMaster/assetManager/characterType/list.ts b/src/events/gameMaster/assetManager/characterType/list.ts index 7402849..3f25b2b 100644 --- a/src/events/gameMaster/assetManager/characterType/list.ts +++ b/src/events/gameMaster/assetManager/characterType/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { CharacterType } from '#entities/characterType' import CharacterTypeRepository from '#repositories/characterTypeRepository' diff --git a/src/events/gameMaster/assetManager/characterType/update.ts b/src/events/gameMaster/assetManager/characterType/update.ts index 07b5afc..59ae028 100644 --- a/src/events/gameMaster/assetManager/characterType/update.ts +++ b/src/events/gameMaster/assetManager/characterType/update.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { CharacterGender, CharacterRace } from '#application/enums' import CharacterTypeRepository from '#repositories/characterTypeRepository' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/item/create.ts b/src/events/gameMaster/assetManager/item/create.ts index 0e1e1a5..0ec2da3 100644 --- a/src/events/gameMaster/assetManager/item/create.ts +++ b/src/events/gameMaster/assetManager/item/create.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { ItemRarity, ItemType } from '#application/enums' import { Item } from '#entities/item' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/item/delete.ts b/src/events/gameMaster/assetManager/item/delete.ts index 55cd8dc..44feb00 100644 --- a/src/events/gameMaster/assetManager/item/delete.ts +++ b/src/events/gameMaster/assetManager/item/delete.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import ItemRepository from '#repositories/itemRepository' interface IPayload { diff --git a/src/events/gameMaster/assetManager/item/list.ts b/src/events/gameMaster/assetManager/item/list.ts index 9c491ea..9efecdd 100644 --- a/src/events/gameMaster/assetManager/item/list.ts +++ b/src/events/gameMaster/assetManager/item/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Item } from '#entities/item' import ItemRepository from '#repositories/itemRepository' diff --git a/src/events/gameMaster/assetManager/item/update.ts b/src/events/gameMaster/assetManager/item/update.ts index 9646eee..c555be0 100644 --- a/src/events/gameMaster/assetManager/item/update.ts +++ b/src/events/gameMaster/assetManager/item/update.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { ItemType, ItemRarity } from '#application/enums' import ItemRepository from '#repositories/itemRepository' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/mapObject/list.ts b/src/events/gameMaster/assetManager/mapObject/list.ts index 3ce6693..38999ae 100644 --- a/src/events/gameMaster/assetManager/mapObject/list.ts +++ b/src/events/gameMaster/assetManager/mapObject/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { MapObject } from '#entities/mapObject' import MapObjectRepository from '#repositories/mapObjectRepository' diff --git a/src/events/gameMaster/assetManager/mapObject/remove.ts b/src/events/gameMaster/assetManager/mapObject/remove.ts index 91ee663..5bae6e6 100644 --- a/src/events/gameMaster/assetManager/mapObject/remove.ts +++ b/src/events/gameMaster/assetManager/mapObject/remove.ts @@ -1,9 +1,9 @@ -import { SocketEvent } from '#application/enums'; import fs from 'fs' import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import Storage from '#application/storage' import MapObjectRepository from '#repositories/mapObjectRepository' diff --git a/src/events/gameMaster/assetManager/mapObject/update.ts b/src/events/gameMaster/assetManager/mapObject/update.ts index e94bbe5..66d4edb 100644 --- a/src/events/gameMaster/assetManager/mapObject/update.ts +++ b/src/events/gameMaster/assetManager/mapObject/update.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapObjectRepository from '#repositories/mapObjectRepository' type Payload = { diff --git a/src/events/gameMaster/assetManager/mapObject/upload.ts b/src/events/gameMaster/assetManager/mapObject/upload.ts index 496bde1..e9b58c4 100644 --- a/src/events/gameMaster/assetManager/mapObject/upload.ts +++ b/src/events/gameMaster/assetManager/mapObject/upload.ts @@ -1,10 +1,10 @@ -import { SocketEvent } from '#application/enums'; import fs from 'fs/promises' import { writeFile } from 'node:fs/promises' import sharp from 'sharp' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import Storage from '#application/storage' import { MapObject } from '#entities/mapObject' diff --git a/src/events/gameMaster/assetManager/sprite/copy.ts b/src/events/gameMaster/assetManager/sprite/copy.ts index d68cd9b..0c303c7 100644 --- a/src/events/gameMaster/assetManager/sprite/copy.ts +++ b/src/events/gameMaster/assetManager/sprite/copy.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Sprite } from '#entities/sprite' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/sprite/create.ts b/src/events/gameMaster/assetManager/sprite/create.ts index 85b27ce..ac48c7c 100644 --- a/src/events/gameMaster/assetManager/sprite/create.ts +++ b/src/events/gameMaster/assetManager/sprite/create.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import fs from 'fs/promises' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import Storage from '#application/storage' import { Sprite } from '#entities/sprite' diff --git a/src/events/gameMaster/assetManager/sprite/delete.ts b/src/events/gameMaster/assetManager/sprite/delete.ts index 2250892..5c86c0d 100644 --- a/src/events/gameMaster/assetManager/sprite/delete.ts +++ b/src/events/gameMaster/assetManager/sprite/delete.ts @@ -1,9 +1,9 @@ -import { SocketEvent } from '#application/enums'; import fs from 'fs' import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import Storage from '#application/storage' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/sprite/list.ts b/src/events/gameMaster/assetManager/sprite/list.ts index c1bc651..876f36e 100644 --- a/src/events/gameMaster/assetManager/sprite/list.ts +++ b/src/events/gameMaster/assetManager/sprite/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Sprite } from '#entities/sprite' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/sprite/update.ts b/src/events/gameMaster/assetManager/sprite/update.ts index 5ea54fa..9b232f4 100644 --- a/src/events/gameMaster/assetManager/sprite/update.ts +++ b/src/events/gameMaster/assetManager/sprite/update.ts @@ -1,4 +1,3 @@ -import { SocketEvent } from '#application/enums'; import fs from 'fs' import sharp from 'sharp' @@ -6,6 +5,7 @@ import sharp from 'sharp' import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { SpriteAction } from '#entities/spriteAction' import SpriteRepository from '#repositories/spriteRepository' diff --git a/src/events/gameMaster/assetManager/tile/delete.ts b/src/events/gameMaster/assetManager/tile/delete.ts index cee0536..efa9972 100644 --- a/src/events/gameMaster/assetManager/tile/delete.ts +++ b/src/events/gameMaster/assetManager/tile/delete.ts @@ -1,9 +1,9 @@ -import { SocketEvent } from '#application/enums'; import fs from 'fs/promises' import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import Storage from '#application/storage' import TileRepository from '#repositories/tileRepository' diff --git a/src/events/gameMaster/assetManager/tile/list.ts b/src/events/gameMaster/assetManager/tile/list.ts index 639c262..f6aa133 100644 --- a/src/events/gameMaster/assetManager/tile/list.ts +++ b/src/events/gameMaster/assetManager/tile/list.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Tile } from '#entities/tile' import TileRepository from '#repositories/tileRepository' diff --git a/src/events/gameMaster/assetManager/tile/update.ts b/src/events/gameMaster/assetManager/tile/update.ts index adb93ca..87befb4 100644 --- a/src/events/gameMaster/assetManager/tile/update.ts +++ b/src/events/gameMaster/assetManager/tile/update.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import TileRepository from '#repositories/tileRepository' type Payload = { diff --git a/src/events/gameMaster/assetManager/tile/upload.ts b/src/events/gameMaster/assetManager/tile/upload.ts index e9530c2..87daba8 100644 --- a/src/events/gameMaster/assetManager/tile/upload.ts +++ b/src/events/gameMaster/assetManager/tile/upload.ts @@ -1,8 +1,8 @@ -import { SocketEvent } from '#application/enums'; 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 { Tile } from '#entities/tile' diff --git a/src/events/gameMaster/mapEditor/create.ts b/src/events/gameMaster/mapEditor/create.ts index 64f219b..e2a3f5e 100644 --- a/src/events/gameMaster/mapEditor/create.ts +++ b/src/events/gameMaster/mapEditor/create.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { MapCacheT } from '#entities/map' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Map } from '#entities/map' type Payload = { diff --git a/src/events/gameMaster/mapEditor/delete.ts b/src/events/gameMaster/mapEditor/delete.ts index 221cd59..1dd9cac 100644 --- a/src/events/gameMaster/mapEditor/delete.ts +++ b/src/events/gameMaster/mapEditor/delete.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapRepository from '#repositories/mapRepository' type Payload = { diff --git a/src/events/gameMaster/mapEditor/request.ts b/src/events/gameMaster/mapEditor/request.ts index ac1e440..41987e3 100644 --- a/src/events/gameMaster/mapEditor/request.ts +++ b/src/events/gameMaster/mapEditor/request.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { Map } from '#entities/map' import MapRepository from '#repositories/mapRepository' diff --git a/src/events/gameMaster/mapEditor/update.ts b/src/events/gameMaster/mapEditor/update.ts index b3bebf4..f3fd88d 100644 --- a/src/events/gameMaster/mapEditor/update.ts +++ b/src/events/gameMaster/mapEditor/update.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import { MapEventTileType } from '#application/enums' import { Map } from '#entities/map' import { MapEffect } from '#entities/mapEffect' diff --git a/src/events/login.ts b/src/events/login.ts index 76cb66e..7544b3b 100644 --- a/src/events/login.ts +++ b/src/events/login.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import UserRepository from '#repositories/userRepository' export default class LoginEvent extends BaseEvent { diff --git a/src/events/map/characterAttack.ts b/src/events/map/characterAttack.ts index b217b86..7269610 100644 --- a/src/events/map/characterAttack.ts +++ b/src/events/map/characterAttack.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import CharacterAttackService from '#services/characterAttackService' export default class CharacterMove extends BaseEvent { diff --git a/src/events/map/characterMove.ts b/src/events/map/characterMove.ts index 19ab811..d26ac75 100644 --- a/src/events/map/characterMove.ts +++ b/src/events/map/characterMove.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { MapEventTileWithTeleport } from '#application/types' import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import MapManager from '#managers/mapManager' import MapCharacter from '#models/mapCharacter' import MapEventTileRepository from '#repositories/mapEventTileRepository' @@ -25,9 +25,7 @@ export default class CharacterMove extends BaseEvent { if (this.isThrottled(`movement_${this.socket.characterId}`, this.MOVEMENT_THROTTLE)) { // Only cancel current movement if the new target is different - if (mapCharacter.isMoving && - (Math.floor(positionX) !== Math.floor(mapCharacter.character.positionX) || - Math.floor(positionY) !== Math.floor(mapCharacter.character.positionY))) { + if (mapCharacter.isMoving && (Math.floor(positionX) !== Math.floor(mapCharacter.character.positionX) || Math.floor(positionY) !== Math.floor(mapCharacter.character.positionY))) { mapCharacter.isMoving = false mapCharacter.currentPath = null // this.finalizeMovement(mapCharacter) diff --git a/src/events/map/weather.ts b/src/events/map/weather.ts index be64385..177cdf3 100644 --- a/src/events/map/weather.ts +++ b/src/events/map/weather.ts @@ -1,5 +1,5 @@ -import { SocketEvent } from '#application/enums'; import { BaseEvent } from '#application/base/baseEvent' +import { SocketEvent } from '#application/enums' import WeatherManager from '#managers/weatherManager' export default class Weather extends BaseEvent { diff --git a/src/jobs/someJob.ts b/src/jobs/someJob.ts index 1ae6711..0d904a6 100644 --- a/src/jobs/someJob.ts +++ b/src/jobs/someJob.ts @@ -1,8 +1,9 @@ -import { SocketEvent } from '#application/enums'; import { Server as SocketServer } from 'socket.io' import type { TSocket } from '#application/types' +import { SocketEvent } from '#application/enums' + export default class SomeJob { constructor(private params: any) {} diff --git a/src/managers/dateManager.ts b/src/managers/dateManager.ts index 9bf22cd..a9f049a 100644 --- a/src/managers/dateManager.ts +++ b/src/managers/dateManager.ts @@ -1,6 +1,6 @@ -import { SocketEvent } from '#application/enums'; import { Server } from 'socket.io' +import { SocketEvent } from '#application/enums' import Logger, { LoggerType } from '#application/logger' import { World } from '#entities/world' import SocketManager from '#managers/socketManager' diff --git a/src/managers/weatherManager.ts b/src/managers/weatherManager.ts index a9a6d46..936b4dc 100644 --- a/src/managers/weatherManager.ts +++ b/src/managers/weatherManager.ts @@ -1,6 +1,6 @@ -import { SocketEvent } from '#application/enums'; import { Server } from 'socket.io' +import { SocketEvent } from '#application/enums' import Logger, { LoggerType } from '#application/logger' import { World } from '#entities/world' import SocketManager from '#managers/socketManager' diff --git a/src/models/mapCharacter.ts b/src/models/mapCharacter.ts index bccb0e0..1e227a0 100644 --- a/src/models/mapCharacter.ts +++ b/src/models/mapCharacter.ts @@ -1,8 +1,8 @@ -import { SocketEvent } from '#application/enums'; import { Server } from 'socket.io' import type { TSocket, UUID } from '#application/types' +import { SocketEvent } from '#application/enums' import { Character } from '#entities/character' import MapManager from '#managers/mapManager' import TeleportService from '#services/characterTeleportService' diff --git a/src/services/characterAttackService.ts b/src/services/characterAttackService.ts index fe81c4c..c80fecf 100644 --- a/src/services/characterAttackService.ts +++ b/src/services/characterAttackService.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseService } from '#application/base/baseService' +import { SocketEvent } from '#application/enums' import MapManager from '#managers/mapManager' import SocketManager from '#managers/socketManager' diff --git a/src/services/characterTeleportService.ts b/src/services/characterTeleportService.ts index 4e5c91b..1f8ab26 100644 --- a/src/services/characterTeleportService.ts +++ b/src/services/characterTeleportService.ts @@ -1,6 +1,6 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' +import { SocketEvent } from '#application/enums' import Logger, { LoggerType } from '#application/logger' import { Character } from '#entities/character' import MapManager from '#managers/mapManager' diff --git a/src/services/chatService.ts b/src/services/chatService.ts index 49b9787..d2a5d49 100644 --- a/src/services/chatService.ts +++ b/src/services/chatService.ts @@ -1,7 +1,7 @@ -import { SocketEvent } from '#application/enums'; import type { UUID } from '#application/types' import { BaseService } from '#application/base/baseService' +import { SocketEvent } from '#application/enums' import { Chat } from '#entities/chat' import SocketManager from '#managers/socketManager' import CharacterRepository from '#repositories/characterRepository'