From 058988e8743c5d8316064ef15c253903d74d5a39 Mon Sep 17 00:00:00 2001 From: Dennis Postma Date: Tue, 24 Dec 2024 23:48:37 +0100 Subject: [PATCH] Added paths in typescript config and utilise this in all project files --- src/commands/init.ts | 4 ++-- src/commands/listZones.ts | 2 +- src/commands/tiles.ts | 4 ++-- src/http/assets.ts | 12 ++++++------ src/http/auth.ts | 6 +++--- src/http/avatar.ts | 8 ++++---- src/http/index.ts | 4 ++-- src/jobs/SomeJob.ts | 2 +- src/managers/commandManager.ts | 4 ++-- src/managers/dateManager.ts | 6 +++--- src/managers/queueManager.ts | 8 ++++---- src/managers/userManager.ts | 2 +- src/managers/weatherManager.ts | 6 +++--- src/managers/zoneManager.ts | 10 +++++----- src/middleware/authentication.ts | 8 ++++---- src/models/loadedZone.ts | 2 +- src/models/zoneCharacter.ts | 2 +- src/repositories/characterHairRepository.ts | 2 +- src/repositories/characterRepository.ts | 4 ++-- src/repositories/characterTypeRepository.ts | 2 +- src/repositories/chatRepository.ts | 2 +- src/repositories/itemRepository.ts | 6 +++--- src/repositories/objectRepository.ts | 2 +- src/repositories/passwordResetTokenRepository.ts | 4 ++-- src/repositories/spriteRepository.ts | 2 +- src/repositories/tileRepository.ts | 6 +++--- src/repositories/userRepository.ts | 1 - src/repositories/worldRepository.ts | 4 ++-- src/repositories/zoneEventTileRepository.ts | 4 ++-- src/repositories/zoneRepository.ts | 6 +++--- src/server.ts | 2 +- src/services/characterService.ts | 10 +++++----- src/services/chatService.ts | 8 ++++---- src/services/passwordResetTokenService.ts | 6 +++--- src/services/userService.ts | 10 +++++----- src/services/worldService.ts | 6 +++--- src/services/zoneEventTileService.ts | 8 ++++---- src/services/zoneService.ts | 4 ++-- .../charactersScreen/character_hair_list.ts | 4 ++-- src/socketEvents/character/connect.ts | 10 +++++----- src/socketEvents/character/create.ts | 10 +++++----- src/socketEvents/character/delete.ts | 6 +++--- src/socketEvents/character/list.ts | 6 +++--- src/socketEvents/chat/gameMaster/alertCommand.ts | 8 ++++---- .../chat/gameMaster/setTimeCommand.ts | 10 +++++----- .../chat/gameMaster/teleportCommand.ts | 14 +++++++------- .../chat/gameMaster/toggleFogCommand.ts | 10 +++++----- .../chat/gameMaster/toggleRainCommand.ts | 10 +++++----- src/socketEvents/chat/message.ts | 12 ++++++------ src/socketEvents/disconnect.ts | 6 +++--- .../assetManager/characterHair/create.ts | 6 +++--- .../assetManager/characterHair/delete.ts | 8 ++++---- .../assetManager/characterHair/list.ts | 8 ++++---- .../assetManager/characterHair/update.ts | 8 ++++---- .../assetManager/characterType/create.ts | 6 +++--- .../assetManager/characterType/delete.ts | 8 ++++---- .../assetManager/characterType/list.ts | 8 ++++---- .../assetManager/characterType/update.ts | 6 +++--- .../gameMaster/assetManager/item/create.ts | 6 +++--- .../gameMaster/assetManager/item/delete.ts | 8 ++++---- .../gameMaster/assetManager/item/list.ts | 8 ++++---- .../gameMaster/assetManager/item/update.ts | 8 ++++---- .../gameMaster/assetManager/object/list.ts | 6 +++--- .../gameMaster/assetManager/object/remove.ts | 10 +++++----- .../gameMaster/assetManager/object/update.ts | 6 +++--- .../gameMaster/assetManager/object/upload.ts | 10 +++++----- .../gameMaster/assetManager/sprite/copy.ts | 8 ++++---- .../gameMaster/assetManager/sprite/create.ts | 8 ++++---- .../gameMaster/assetManager/sprite/delete.ts | 10 +++++----- .../gameMaster/assetManager/sprite/list.ts | 6 +++--- .../gameMaster/assetManager/sprite/update.ts | 10 +++++----- .../gameMaster/assetManager/tile/delete.ts | 10 +++++----- .../gameMaster/assetManager/tile/list.ts | 6 +++--- .../gameMaster/assetManager/tile/update.ts | 6 +++--- .../gameMaster/assetManager/tile/upload.ts | 10 +++++----- src/socketEvents/gameMaster/zoneEditor/create.ts | 10 +++++----- src/socketEvents/gameMaster/zoneEditor/delete.ts | 10 +++++----- src/socketEvents/gameMaster/zoneEditor/list.ts | 8 ++++---- .../gameMaster/zoneEditor/request.ts | 8 ++++---- src/socketEvents/gameMaster/zoneEditor/update.ts | 12 ++++++------ src/socketEvents/login.ts | 6 +++--- src/socketEvents/zone/characterJoin.ts | 14 +++++++------- src/socketEvents/zone/characterLeave.ts | 10 +++++----- src/socketEvents/zone/characterMove.ts | 16 ++++++++-------- src/socketEvents/zone/weather.ts | 6 +++--- tsconfig.json | 10 ++++++++++ 86 files changed, 304 insertions(+), 295 deletions(-) diff --git a/src/commands/init.ts b/src/commands/init.ts index 5844735..9c40846 100644 --- a/src/commands/init.ts +++ b/src/commands/init.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import prisma from '../utilities/prisma' +import prisma from '#utilities/prisma' import fs from 'fs' -import { getPublicPath, getRootPath } from '../utilities/storage' +import { getPublicPath, getRootPath } from '#utilities/storage' import sharp from 'sharp' import { CharacterEquipmentSlotType, CharacterGender, CharacterRace } from '@prisma/client' import bcrypt from 'bcryptjs' diff --git a/src/commands/listZones.ts b/src/commands/listZones.ts index d0992a6..5f4c17b 100644 --- a/src/commands/listZones.ts +++ b/src/commands/listZones.ts @@ -1,5 +1,5 @@ import { Server } from 'socket.io' -import ZoneManager from '../managers/zoneManager' +import ZoneManager from '#managers/zoneManager' type CommandInput = string[] diff --git a/src/commands/tiles.ts b/src/commands/tiles.ts index 8f9ba4f..771ef08 100644 --- a/src/commands/tiles.ts +++ b/src/commands/tiles.ts @@ -1,8 +1,8 @@ import fs from 'fs' import sharp from 'sharp' -import { commandLogger } from '../utilities/logger' +import { commandLogger } from '#utilities/logger' import { Server } from 'socket.io' -import { getPublicPath } from '../utilities/storage' +import { getPublicPath } from '#utilities/storage' import path from 'path' export default class TilesCommand { diff --git a/src/http/assets.ts b/src/http/assets.ts index cddee59..333559a 100644 --- a/src/http/assets.ts +++ b/src/http/assets.ts @@ -1,11 +1,11 @@ import { Router, Request, Response } from 'express' import fs from 'fs' -import { httpLogger } from '../utilities/logger' -import { getPublicPath } from '../utilities/storage' -import TileRepository from '../repositories/tileRepository' -import ZoneRepository from '../repositories/zoneRepository' -import SpriteRepository from '../repositories/spriteRepository' -import { AssetData } from '../utilities/types' +import { httpLogger } from '#utilities/logger' +import { getPublicPath } from '#utilities/storage' +import TileRepository from '#repositories/tileRepository' +import ZoneRepository from '#repositories/zoneRepository' +import SpriteRepository from '#repositories/spriteRepository' +import { AssetData } from '#utilities/types' const router = Router() diff --git a/src/http/auth.ts b/src/http/auth.ts index fe4291d..a901a6e 100644 --- a/src/http/auth.ts +++ b/src/http/auth.ts @@ -1,8 +1,8 @@ import { Router, Request, Response } from 'express' -import UserService from '../services/userService' +import UserService from '#services/userService' import jwt from 'jsonwebtoken' -import config from '../utilities/config' -import { loginAccountSchema, registerAccountSchema, resetPasswordSchema, newPasswordSchema } from '../utilities/zodTypes' +import config from '#utilities/config' +import { loginAccountSchema, registerAccountSchema, resetPasswordSchema, newPasswordSchema } from '#utilities/zodTypes' const router = Router() diff --git a/src/http/avatar.ts b/src/http/avatar.ts index e442f24..411f582 100644 --- a/src/http/avatar.ts +++ b/src/http/avatar.ts @@ -4,10 +4,10 @@ import { Router, Request, Response } from 'express' import sharp from 'sharp' import fs from 'fs' -import CharacterRepository from '../repositories/characterRepository' -import CharacterHairRepository from '../repositories/characterHairRepository' -import CharacterTypeRepository from '../repositories/characterTypeRepository' -import { getPublicPath } from '../utilities/storage' +import CharacterRepository from '#repositories/characterRepository' +import CharacterHairRepository from '#repositories/characterHairRepository' +import CharacterTypeRepository from '#repositories/characterTypeRepository' +import { getPublicPath } from '#utilities/storage' const router = Router() diff --git a/src/http/index.ts b/src/http/index.ts index 122a6fa..7abfe37 100644 --- a/src/http/index.ts +++ b/src/http/index.ts @@ -1,8 +1,8 @@ import { Application } from 'express' -import { httpLogger } from '../utilities/logger' +import { httpLogger } from '#utilities/logger' import fs from 'fs' import path from 'path' -import { getAppPath } from '../utilities/storage' +import { getAppPath } from '#utilities/storage' async function addHttpRoutes(app: Application) { const routeFiles = fs.readdirSync(__dirname).filter((file) => { diff --git a/src/jobs/SomeJob.ts b/src/jobs/SomeJob.ts index 9009868..abdc9b5 100644 --- a/src/jobs/SomeJob.ts +++ b/src/jobs/SomeJob.ts @@ -1,4 +1,4 @@ -import { TSocket } from '../utilities/types' +import { TSocket } from '#utilities/types' import { Server as SocketServer } from 'socket.io' export default class SomeJob { diff --git a/src/managers/commandManager.ts b/src/managers/commandManager.ts index 5d6f386..c4b92ad 100644 --- a/src/managers/commandManager.ts +++ b/src/managers/commandManager.ts @@ -2,8 +2,8 @@ import * as readline from 'readline' import * as fs from 'fs' import * as path from 'path' import { Server } from 'socket.io' -import { commandLogger } from '../utilities/logger' -import { getAppPath } from '../utilities/storage' +import { commandLogger } from '#utilities/logger' +import { getAppPath } from '#utilities/storage' class CommandManager { private commands: Map = new Map() diff --git a/src/managers/dateManager.ts b/src/managers/dateManager.ts index b8566e3..339485d 100644 --- a/src/managers/dateManager.ts +++ b/src/managers/dateManager.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { appLogger } from '../utilities/logger' -import worldService from '../services/worldService' -import worldRepository from '../repositories/worldRepository' +import { appLogger } from '#utilities/logger' +import worldService from '#services/worldService' +import worldRepository from '#repositories/worldRepository' class DateManager { private static readonly GAME_SPEED = 8 // 24 game hours / 3 real hours diff --git a/src/managers/queueManager.ts b/src/managers/queueManager.ts index 27e226b..f679174 100644 --- a/src/managers/queueManager.ts +++ b/src/managers/queueManager.ts @@ -1,11 +1,11 @@ import IORedis from 'ioredis' import { Job, Queue, Worker } from 'bullmq' -import config from '../utilities/config' +import config from '#utilities/config' import { Server as SocketServer } from 'socket.io' -import { TSocket } from '../utilities/types' -import { queueLogger } from '../utilities/logger' +import { TSocket } from '#utilities/types' +import { queueLogger } from '#utilities/logger' import fs from 'fs' -import { getAppPath } from '../utilities/storage' +import { getAppPath } from '#utilities/storage' class QueueManager { private connection!: IORedis diff --git a/src/managers/userManager.ts b/src/managers/userManager.ts index 135da63..20b235e 100644 --- a/src/managers/userManager.ts +++ b/src/managers/userManager.ts @@ -1,5 +1,5 @@ import { User } from '@prisma/client' -import { appLogger } from '../utilities/logger' +import { appLogger } from '#utilities/logger' type TLoggedInUsers = { users: User[] diff --git a/src/managers/weatherManager.ts b/src/managers/weatherManager.ts index 48b326f..d722536 100644 --- a/src/managers/weatherManager.ts +++ b/src/managers/weatherManager.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { appLogger } from '../utilities/logger' -import worldService from '../services/worldService' -import worldRepository from '../repositories/worldRepository' +import { appLogger } from '#utilities/logger' +import worldService from '#services/worldService' +import worldRepository from '#repositories/worldRepository' interface WeatherState { isRainEnabled: boolean diff --git a/src/managers/zoneManager.ts b/src/managers/zoneManager.ts index 0dd3a43..486ac3d 100644 --- a/src/managers/zoneManager.ts +++ b/src/managers/zoneManager.ts @@ -1,9 +1,9 @@ import { Zone } from '@prisma/client' -import ZoneRepository from '../repositories/zoneRepository' -import ZoneService from '../services/zoneService' -import LoadedZone from '../models/loadedZone' -import { gameLogger } from '../utilities/logger' -import ZoneCharacter from '../models/zoneCharacter' +import ZoneRepository from '#repositories/zoneRepository' +import ZoneService from '#services/zoneService' +import LoadedZone from '#models/loadedZone' +import { gameLogger } from '#utilities/logger' +import ZoneCharacter from '#models/zoneCharacter' class ZoneManager { private readonly zones = new Map() diff --git a/src/middleware/authentication.ts b/src/middleware/authentication.ts index 3f607d0..1581d1d 100644 --- a/src/middleware/authentication.ts +++ b/src/middleware/authentication.ts @@ -1,9 +1,9 @@ import { verify } from 'jsonwebtoken' -import { TSocket } from '../utilities/types' -import config from '../utilities/config' -import UserRepository from '../repositories/userRepository' +import { TSocket } from '#utilities/types' +import config from '#utilities/config' +import UserRepository from '#repositories/userRepository' import { User } from '@prisma/client' -import { gameLogger } from '../utilities/logger' +import { gameLogger } from '#utilities/logger' /** * Socket io jwt auth middleware diff --git a/src/models/loadedZone.ts b/src/models/loadedZone.ts index 2819d64..c358f01 100644 --- a/src/models/loadedZone.ts +++ b/src/models/loadedZone.ts @@ -1,5 +1,5 @@ import { Character, Zone } from '@prisma/client' -import zoneEventTileRepository from '../repositories/zoneEventTileRepository' +import zoneEventTileRepository from '#repositories/zoneEventTileRepository' import ZoneCharacter from './zoneCharacter' class LoadedZone { diff --git a/src/models/zoneCharacter.ts b/src/models/zoneCharacter.ts index a6912ef..710ad6c 100644 --- a/src/models/zoneCharacter.ts +++ b/src/models/zoneCharacter.ts @@ -1,5 +1,5 @@ import { Character } from '@prisma/client' -import { CharacterService } from '../services/characterService' +import { CharacterService } from '#services/characterService' class ZoneCharacter { public readonly character: Character diff --git a/src/repositories/characterHairRepository.ts b/src/repositories/characterHairRepository.ts index e030cf6..a4afa22 100644 --- a/src/repositories/characterHairRepository.ts +++ b/src/repositories/characterHairRepository.ts @@ -1,4 +1,4 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { CharacterHair } from '@prisma/client' class CharacterHairRepository { diff --git a/src/repositories/characterRepository.ts b/src/repositories/characterRepository.ts index e555c5f..1fd6df8 100644 --- a/src/repositories/characterRepository.ts +++ b/src/repositories/characterRepository.ts @@ -1,5 +1,5 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance -import { appLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' // Import the global Prisma instance +import { appLogger } from '#utilities/logger' class CharacterRepository { async getByUserId(userId: number) { diff --git a/src/repositories/characterTypeRepository.ts b/src/repositories/characterTypeRepository.ts index 69d66f5..7498012 100644 --- a/src/repositories/characterTypeRepository.ts +++ b/src/repositories/characterTypeRepository.ts @@ -1,4 +1,4 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { CharacterType } from '@prisma/client' class CharacterTypeRepository { diff --git a/src/repositories/chatRepository.ts b/src/repositories/chatRepository.ts index d20019e..93bcd73 100644 --- a/src/repositories/chatRepository.ts +++ b/src/repositories/chatRepository.ts @@ -1,4 +1,4 @@ -import prisma from '../utilities/prisma' +import prisma from '#utilities/prisma' import { Chat } from '@prisma/client' class ChatRepository { diff --git a/src/repositories/itemRepository.ts b/src/repositories/itemRepository.ts index 5644459..fb6aaa7 100644 --- a/src/repositories/itemRepository.ts +++ b/src/repositories/itemRepository.ts @@ -1,8 +1,8 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { Tile } from '@prisma/client' import zoneRepository from './zoneRepository' -import { unduplicateArray } from '../utilities/utilities' -import { FlattenZoneArray } from '../utilities/zone' +import { unduplicateArray } from '#utilities/utilities' +import { FlattenZoneArray } from '#utilities/zone' class ItemRepository { async getById(id: string) { diff --git a/src/repositories/objectRepository.ts b/src/repositories/objectRepository.ts index 32bbd71..f3fb9eb 100644 --- a/src/repositories/objectRepository.ts +++ b/src/repositories/objectRepository.ts @@ -1,4 +1,4 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { Object } from '@prisma/client' class ObjectRepository { diff --git a/src/repositories/passwordResetTokenRepository.ts b/src/repositories/passwordResetTokenRepository.ts index 78037d6..fd323c2 100644 --- a/src/repositories/passwordResetTokenRepository.ts +++ b/src/repositories/passwordResetTokenRepository.ts @@ -1,5 +1,5 @@ -import prisma from '../utilities/prisma' -import { appLogger } from '../utilities/logger' // Import the global Prisma instance +import prisma from '#utilities/prisma' +import { appLogger } from '#utilities/logger' // Import the global Prisma instance class PasswordResetTokenRepository { async getById(id: number): Promise { diff --git a/src/repositories/spriteRepository.ts b/src/repositories/spriteRepository.ts index e72ea0a..832128c 100644 --- a/src/repositories/spriteRepository.ts +++ b/src/repositories/spriteRepository.ts @@ -1,4 +1,4 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { SpriteAction } from '@prisma/client' class SpriteRepository { diff --git a/src/repositories/tileRepository.ts b/src/repositories/tileRepository.ts index f02a8a0..5cfc410 100644 --- a/src/repositories/tileRepository.ts +++ b/src/repositories/tileRepository.ts @@ -1,8 +1,8 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { Tile } from '@prisma/client' import zoneRepository from './zoneRepository' -import { unduplicateArray } from '../utilities/utilities' -import { FlattenZoneArray } from '../utilities/zone' +import { unduplicateArray } from '#utilities/utilities' +import { FlattenZoneArray } from '#utilities/zone' class TileRepository { async getById(id: string): Promise { diff --git a/src/repositories/userRepository.ts b/src/repositories/userRepository.ts index 83dab6d..08eec32 100644 --- a/src/repositories/userRepository.ts +++ b/src/repositories/userRepository.ts @@ -1,4 +1,3 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance import { appLogger } from '#utilities/logger' import { Database } from '#utilities/database' import { User } from '../entities/user' diff --git a/src/repositories/worldRepository.ts b/src/repositories/worldRepository.ts index b5648f8..02535bb 100644 --- a/src/repositories/worldRepository.ts +++ b/src/repositories/worldRepository.ts @@ -1,6 +1,6 @@ -import prisma from '../utilities/prisma' // Import the global Prisma instance +import prisma from '#utilities/prisma' // Import the global Prisma instance import { World } from '@prisma/client' -import { gameLogger } from '../utilities/logger' +import { gameLogger } from '#utilities/logger' class WorldRepository { async getFirst(): Promise { diff --git a/src/repositories/zoneEventTileRepository.ts b/src/repositories/zoneEventTileRepository.ts index 790d239..5356e21 100644 --- a/src/repositories/zoneEventTileRepository.ts +++ b/src/repositories/zoneEventTileRepository.ts @@ -1,6 +1,6 @@ import { ZoneEventTile } from '@prisma/client' -import prisma from '../utilities/prisma' -import { appLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' +import { appLogger } from '#utilities/logger' class ZoneEventTileRepository { async getAll(id: number): Promise { diff --git a/src/repositories/zoneRepository.ts b/src/repositories/zoneRepository.ts index 53aedfe..cf76ec5 100644 --- a/src/repositories/zoneRepository.ts +++ b/src/repositories/zoneRepository.ts @@ -1,7 +1,7 @@ import { Zone, ZoneEventTile, ZoneEventTileType, ZoneObject } from '@prisma/client' -import prisma from '../utilities/prisma' -import { ZoneEventTileWithTeleport } from '../utilities/types' -import { appLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' +import { ZoneEventTileWithTeleport } from '#utilities/types' +import { appLogger } from '#utilities/logger' class ZoneRepository { async getAll(): Promise { diff --git a/src/server.ts b/src/server.ts index fbd5113..cc01549 100644 --- a/src/server.ts +++ b/src/server.ts @@ -6,7 +6,7 @@ import { createServer as httpServer, Server as HTTPServer } from 'http' import { addHttpRoutes } from './http' import cors from 'cors' import { Server as SocketServer } from 'socket.io' -import { Authentication } from './middleware/authentication' +import { Authentication } from '#middleware/authentication' import { TSocket } from '#utilities/types' import { Database } from '#utilities/database' import prisma from '#utilities/prisma' // @TODO: Remove this diff --git a/src/services/characterService.ts b/src/services/characterService.ts index dab47a9..a206d5a 100644 --- a/src/services/characterService.ts +++ b/src/services/characterService.ts @@ -1,8 +1,8 @@ -import { AStar } from '../utilities/character/aStar' -import ZoneManager from '../managers/zoneManager' -import prisma from '../utilities/prisma' -import Rotation from '../utilities/character/rotation' -import { appLogger, gameLogger } from '../utilities/logger' +import { AStar } from '#utilities/character/aStar' +import ZoneManager from '#managers/zoneManager' +import prisma from '#utilities/prisma' +import Rotation from '#utilities/character/rotation' +import { appLogger, gameLogger } from '#utilities/logger' import { Character } from '@prisma/client' interface Position { diff --git a/src/services/chatService.ts b/src/services/chatService.ts index d8bb979..fe9bc37 100644 --- a/src/services/chatService.ts +++ b/src/services/chatService.ts @@ -1,8 +1,8 @@ -import prisma from '../utilities/prisma' -import { gameLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' +import { gameLogger } from '#utilities/logger' import { Server } from 'socket.io' -import { TSocket } from '../utilities/types' -import ChatRepository from '../repositories/chatRepository' +import { TSocket } from '#utilities/types' +import ChatRepository from '#repositories/chatRepository' class ChatService { async sendZoneMessage(io: Server, socket: TSocket, message: string, characterId: number, zoneId: number): Promise { diff --git a/src/services/passwordResetTokenService.ts b/src/services/passwordResetTokenService.ts index edba78c..467eb15 100644 --- a/src/services/passwordResetTokenService.ts +++ b/src/services/passwordResetTokenService.ts @@ -1,6 +1,6 @@ -import prisma from '../utilities/prisma' -import passwordResetTokenRepository from '../repositories/passwordResetTokenRepository' -import { appLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' +import passwordResetTokenRepository from '#repositories/passwordResetTokenRepository' +import { appLogger } from '#utilities/logger' class PasswordResetTokenService { /** diff --git a/src/services/userService.ts b/src/services/userService.ts index da92a1f..80e602f 100644 --- a/src/services/userService.ts +++ b/src/services/userService.ts @@ -1,11 +1,11 @@ import bcrypt from 'bcryptjs' -import UserRepository from '../repositories/userRepository' -import PasswordResetTokenRepository from '../repositories/passwordResetTokenRepository' -import prisma from '../utilities/prisma' +import UserRepository from '#repositories/userRepository' +import PasswordResetTokenRepository from '#repositories/passwordResetTokenRepository' +import prisma from '#utilities/prisma' import { User } from '@prisma/client' -import config from '../utilities/config' +import config from '#utilities/config' import NodeMailer from 'nodemailer' -import { httpLogger } from '../utilities/logger' +import { httpLogger } from '#utilities/logger' import PasswordResetTokenService from './passwordResetTokenService' /** diff --git a/src/services/worldService.ts b/src/services/worldService.ts index afe0f2e..5a42ce3 100644 --- a/src/services/worldService.ts +++ b/src/services/worldService.ts @@ -1,7 +1,7 @@ -import prisma from '../utilities/prisma' -import { gameLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' +import { gameLogger } from '#utilities/logger' import { World } from '@prisma/client' -import WorldRepository from '../repositories/worldRepository' +import WorldRepository from '#repositories/worldRepository' class WorldService { async update(worldData: Partial): Promise { diff --git a/src/services/zoneEventTileService.ts b/src/services/zoneEventTileService.ts index 4b8d991..d8db6e2 100644 --- a/src/services/zoneEventTileService.ts +++ b/src/services/zoneEventTileService.ts @@ -1,9 +1,9 @@ -import { ExtendedCharacter, TSocket } from '../utilities/types' -import prisma from '../utilities/prisma' +import { ExtendedCharacter, TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' import { ZoneEventTileTeleport } from '@prisma/client' import { Server } from 'socket.io' -import ZoneManager from '../managers/zoneManager' -import { gameLogger } from '../utilities/logger' +import ZoneManager from '#managers/zoneManager' +import { gameLogger } from '#utilities/logger' export class ZoneEventTileService { public async handleTeleport(io: Server, socket: TSocket, character: ExtendedCharacter, teleport: ZoneEventTileTeleport): Promise { diff --git a/src/services/zoneService.ts b/src/services/zoneService.ts index 6c6abf6..fdd54c3 100644 --- a/src/services/zoneService.ts +++ b/src/services/zoneService.ts @@ -1,5 +1,5 @@ -import prisma from '../utilities/prisma' -import { gameLogger } from '../utilities/logger' +import prisma from '#utilities/prisma' +import { gameLogger } from '#utilities/logger' class ZoneService { diff --git a/src/socketEvents/character/charactersScreen/character_hair_list.ts b/src/socketEvents/character/charactersScreen/character_hair_list.ts index 33c5577..85e9204 100644 --- a/src/socketEvents/character/charactersScreen/character_hair_list.ts +++ b/src/socketEvents/character/charactersScreen/character_hair_list.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' import { CharacterHair } from '@prisma/client' -import { TSocket } from '../../../utilities/types' -import characterHairRepository from '../../../repositories/characterHairRepository' +import { TSocket } from '#utilities/types' +import characterHairRepository from '#repositories/characterHairRepository' interface IPayload {} diff --git a/src/socketEvents/character/connect.ts b/src/socketEvents/character/connect.ts index f883319..321d965 100644 --- a/src/socketEvents/character/connect.ts +++ b/src/socketEvents/character/connect.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' -import CharacterRepository from '../../repositories/characterRepository' -import { gameLogger } from '../../utilities/logger' -import ZoneManager from '../../managers/zoneManager' -import { CharacterService } from '../../services/characterService' +import { TSocket } from '#utilities/types' +import CharacterRepository from '#repositories/characterRepository' +import { gameLogger } from '#utilities/logger' +import ZoneManager from '#managers/zoneManager' +import { CharacterService } from '#services/characterService' interface CharacterConnectPayload { characterId: number diff --git a/src/socketEvents/character/create.ts b/src/socketEvents/character/create.ts index 349d2e0..482fe9a 100644 --- a/src/socketEvents/character/create.ts +++ b/src/socketEvents/character/create.ts @@ -1,10 +1,10 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' +import { TSocket } from '#utilities/types' import { Character } from '@prisma/client' -import CharacterRepository from '../../repositories/characterRepository' -import { CharacterService } from '../../services/characterService' -import { ZCharacterCreate } from '../../utilities/zodTypes' -import { gameLogger } from '../../utilities/logger' +import CharacterRepository from '#repositories/characterRepository' +import { CharacterService } from '#services/characterService' +import { ZCharacterCreate } from '#utilities/zodTypes' +import { gameLogger } from '#utilities/logger' import { ZodError } from 'zod' export default class CharacterCreateEvent { diff --git a/src/socketEvents/character/delete.ts b/src/socketEvents/character/delete.ts index 5104cb2..2166424 100644 --- a/src/socketEvents/character/delete.ts +++ b/src/socketEvents/character/delete.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' +import { TSocket } from '#utilities/types' import { Character, Zone } from '@prisma/client' -import CharacterRepository from '../../repositories/characterRepository' -import { CharacterService } from '../../services/characterService' +import CharacterRepository from '#repositories/characterRepository' +import { CharacterService } from '#services/characterService' type TypePayload = { characterId: number diff --git a/src/socketEvents/character/list.ts b/src/socketEvents/character/list.ts index 5b342da..06e2437 100644 --- a/src/socketEvents/character/list.ts +++ b/src/socketEvents/character/list.ts @@ -1,8 +1,8 @@ import { Socket, Server } from 'socket.io' -import { TSocket } from '../../utilities/types' +import { TSocket } from '#utilities/types' import { Character } from '@prisma/client' -import CharacterRepository from '../../repositories/characterRepository' -import { gameLogger } from '../../utilities/logger' +import CharacterRepository from '#repositories/characterRepository' +import { gameLogger } from '#utilities/logger' export default class CharacterListEvent { constructor( diff --git a/src/socketEvents/chat/gameMaster/alertCommand.ts b/src/socketEvents/chat/gameMaster/alertCommand.ts index 1030d63..53e824d 100644 --- a/src/socketEvents/chat/gameMaster/alertCommand.ts +++ b/src/socketEvents/chat/gameMaster/alertCommand.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import { getArgs, isCommand } from '../../../utilities/chat' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameLogger } from '../../../utilities/logger' +import { TSocket } from '#utilities/types' +import { getArgs, isCommand } from '#utilities/chat' +import CharacterRepository from '#repositories/characterRepository' +import { gameLogger } from '#utilities/logger' type TypePayload = { message: string diff --git a/src/socketEvents/chat/gameMaster/setTimeCommand.ts b/src/socketEvents/chat/gameMaster/setTimeCommand.ts index 64e4379..d4d90f9 100644 --- a/src/socketEvents/chat/gameMaster/setTimeCommand.ts +++ b/src/socketEvents/chat/gameMaster/setTimeCommand.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import { getArgs, isCommand } from '../../../utilities/chat' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameLogger } from '../../../utilities/logger' -import DateManager from '../../../managers/dateManager' +import { TSocket } from '#utilities/types' +import { getArgs, isCommand } from '#utilities/chat' +import CharacterRepository from '#repositories/characterRepository' +import { gameLogger } from '#utilities/logger' +import DateManager from '#managers/dateManager' type TypePayload = { message: string diff --git a/src/socketEvents/chat/gameMaster/teleportCommand.ts b/src/socketEvents/chat/gameMaster/teleportCommand.ts index 9017938..015c337 100644 --- a/src/socketEvents/chat/gameMaster/teleportCommand.ts +++ b/src/socketEvents/chat/gameMaster/teleportCommand.ts @@ -1,11 +1,11 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import { getArgs, isCommand } from '../../../utilities/chat' -import ZoneRepository from '../../../repositories/zoneRepository' -import { gameLogger, gameMasterLogger } from '../../../utilities/logger' -import ZoneManager from '../../../managers/zoneManager' -import ZoneCharacter from '../../../models/zoneCharacter' -import zoneManager from '../../../managers/zoneManager' +import { TSocket } from '#utilities/types' +import { getArgs, isCommand } from '#utilities/chat' +import ZoneRepository from '#repositories/zoneRepository' +import { gameLogger, gameMasterLogger } from '#utilities/logger' +import ZoneManager from '#managers/zoneManager' +import ZoneCharacter from '#models/zoneCharacter' +import zoneManager from '#managers/zoneManager' type TypePayload = { message: string diff --git a/src/socketEvents/chat/gameMaster/toggleFogCommand.ts b/src/socketEvents/chat/gameMaster/toggleFogCommand.ts index b1ef920..6cf6f41 100644 --- a/src/socketEvents/chat/gameMaster/toggleFogCommand.ts +++ b/src/socketEvents/chat/gameMaster/toggleFogCommand.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import { isCommand } from '../../../utilities/chat' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameLogger } from '../../../utilities/logger' -import WeatherManager from '../../../managers/weatherManager' +import { TSocket } from '#utilities/types' +import { isCommand } from '#utilities/chat' +import CharacterRepository from '#repositories/characterRepository' +import { gameLogger } from '#utilities/logger' +import WeatherManager from '#managers/weatherManager' type TypePayload = { message: string diff --git a/src/socketEvents/chat/gameMaster/toggleRainCommand.ts b/src/socketEvents/chat/gameMaster/toggleRainCommand.ts index 7950525..b136b24 100644 --- a/src/socketEvents/chat/gameMaster/toggleRainCommand.ts +++ b/src/socketEvents/chat/gameMaster/toggleRainCommand.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import { isCommand } from '../../../utilities/chat' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameLogger } from '../../../utilities/logger' -import WeatherManager from '../../../managers/weatherManager' +import { TSocket } from '#utilities/types' +import { isCommand } from '#utilities/chat' +import CharacterRepository from '#repositories/characterRepository' +import { gameLogger } from '#utilities/logger' +import WeatherManager from '#managers/weatherManager' type TypePayload = { message: string diff --git a/src/socketEvents/chat/message.ts b/src/socketEvents/chat/message.ts index 7b3b5c3..0e043ab 100644 --- a/src/socketEvents/chat/message.ts +++ b/src/socketEvents/chat/message.ts @@ -1,10 +1,10 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' -import ZoneRepository from '../../repositories/zoneRepository' -import { isCommand } from '../../utilities/chat' -import { gameLogger } from '../../utilities/logger' -import ZoneManager from '../../managers/zoneManager' -import ChatService from '../../services/chatService' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' +import { isCommand } from '#utilities/chat' +import { gameLogger } from '#utilities/logger' +import ZoneManager from '#managers/zoneManager' +import ChatService from '#services/chatService' type TypePayload = { message: string diff --git a/src/socketEvents/disconnect.ts b/src/socketEvents/disconnect.ts index 8202e35..d834ee0 100644 --- a/src/socketEvents/disconnect.ts +++ b/src/socketEvents/disconnect.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../utilities/types' -import { gameLogger } from '../utilities/logger' -import ZoneManager from '../managers/zoneManager' +import { TSocket } from '#utilities/types' +import { gameLogger } from '#utilities/logger' +import ZoneManager from '#managers/zoneManager' export default class DisconnectEvent { constructor( diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/create.ts b/src/socketEvents/gameMaster/assetManager/characterHair/create.ts index 491ace7..2535a38 100644 --- a/src/socketEvents/gameMaster/assetManager/characterHair/create.ts +++ b/src/socketEvents/gameMaster/assetManager/characterHair/create.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' export default class CharacterHairCreateEvent { constructor( diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/delete.ts b/src/socketEvents/gameMaster/assetManager/characterHair/delete.ts index 5791125..79dcd41 100644 --- a/src/socketEvents/gameMaster/assetManager/characterHair/delete.ts +++ b/src/socketEvents/gameMaster/assetManager/characterHair/delete.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' interface IPayload { id: number diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/list.ts b/src/socketEvents/gameMaster/assetManager/characterHair/list.ts index 2a06b15..79a4264 100644 --- a/src/socketEvents/gameMaster/assetManager/characterHair/list.ts +++ b/src/socketEvents/gameMaster/assetManager/characterHair/list.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { CharacterHair } from '@prisma/client' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' -import characterHairRepository from '../../../../repositories/characterHairRepository' +import { gameMasterLogger } from '#utilities/logger' +import characterRepository from '#repositories/characterRepository' +import characterHairRepository from '#repositories/characterHairRepository' interface IPayload {} diff --git a/src/socketEvents/gameMaster/assetManager/characterHair/update.ts b/src/socketEvents/gameMaster/assetManager/characterHair/update.ts index c66ad8b..3019d49 100644 --- a/src/socketEvents/gameMaster/assetManager/characterHair/update.ts +++ b/src/socketEvents/gameMaster/assetManager/characterHair/update.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' import { CharacterGender, CharacterRace } from '@prisma/client' -import { gameMasterLogger } from '../../../../utilities/logger' +import { gameMasterLogger } from '#utilities/logger' type Payload = { id: number diff --git a/src/socketEvents/gameMaster/assetManager/characterType/create.ts b/src/socketEvents/gameMaster/assetManager/characterType/create.ts index 71e08e1..3e9069b 100644 --- a/src/socketEvents/gameMaster/assetManager/characterType/create.ts +++ b/src/socketEvents/gameMaster/assetManager/characterType/create.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' import { CharacterGender, CharacterRace } from '@prisma/client' export default class CharacterTypeCreateEvent { diff --git a/src/socketEvents/gameMaster/assetManager/characterType/delete.ts b/src/socketEvents/gameMaster/assetManager/characterType/delete.ts index abcbc8d..314e3bc 100644 --- a/src/socketEvents/gameMaster/assetManager/characterType/delete.ts +++ b/src/socketEvents/gameMaster/assetManager/characterType/delete.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' interface IPayload { id: number diff --git a/src/socketEvents/gameMaster/assetManager/characterType/list.ts b/src/socketEvents/gameMaster/assetManager/characterType/list.ts index b3624f6..fb88bc4 100644 --- a/src/socketEvents/gameMaster/assetManager/characterType/list.ts +++ b/src/socketEvents/gameMaster/assetManager/characterType/list.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { CharacterType } from '@prisma/client' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' -import CharacterTypeRepository from '../../../../repositories/characterTypeRepository' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' +import CharacterTypeRepository from '#repositories/characterTypeRepository' interface IPayload {} diff --git a/src/socketEvents/gameMaster/assetManager/characterType/update.ts b/src/socketEvents/gameMaster/assetManager/characterType/update.ts index ff8b475..cd27c48 100644 --- a/src/socketEvents/gameMaster/assetManager/characterType/update.ts +++ b/src/socketEvents/gameMaster/assetManager/characterType/update.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' import { CharacterGender, CharacterRace } from '@prisma/client' type Payload = { diff --git a/src/socketEvents/gameMaster/assetManager/item/create.ts b/src/socketEvents/gameMaster/assetManager/item/create.ts index dc86dd3..313a4be 100644 --- a/src/socketEvents/gameMaster/assetManager/item/create.ts +++ b/src/socketEvents/gameMaster/assetManager/item/create.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' export default class ItemCreateEvent { constructor( diff --git a/src/socketEvents/gameMaster/assetManager/item/delete.ts b/src/socketEvents/gameMaster/assetManager/item/delete.ts index cc78667..8d9470c 100644 --- a/src/socketEvents/gameMaster/assetManager/item/delete.ts +++ b/src/socketEvents/gameMaster/assetManager/item/delete.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' interface IPayload { id: string diff --git a/src/socketEvents/gameMaster/assetManager/item/list.ts b/src/socketEvents/gameMaster/assetManager/item/list.ts index 58513a3..1a78972 100644 --- a/src/socketEvents/gameMaster/assetManager/item/list.ts +++ b/src/socketEvents/gameMaster/assetManager/item/list.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { Item } from '@prisma/client' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' -import itemRepository from '../../../../repositories/itemRepository' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' +import itemRepository from '#repositories/itemRepository' interface IPayload {} diff --git a/src/socketEvents/gameMaster/assetManager/item/update.ts b/src/socketEvents/gameMaster/assetManager/item/update.ts index 03d3044..782b89e 100644 --- a/src/socketEvents/gameMaster/assetManager/item/update.ts +++ b/src/socketEvents/gameMaster/assetManager/item/update.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' import { ItemType, ItemRarity } from '@prisma/client' -import { gameMasterLogger } from '../../../../utilities/logger' +import { gameMasterLogger } from '#utilities/logger' type Payload = { id: string diff --git a/src/socketEvents/gameMaster/assetManager/object/list.ts b/src/socketEvents/gameMaster/assetManager/object/list.ts index 7ecea2d..3f363e9 100644 --- a/src/socketEvents/gameMaster/assetManager/object/list.ts +++ b/src/socketEvents/gameMaster/assetManager/object/list.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { Object } from '@prisma/client' -import ObjectRepository from '../../../../repositories/objectRepository' -import characterRepository from '../../../../repositories/characterRepository' +import ObjectRepository from '#repositories/objectRepository' +import characterRepository from '#repositories/characterRepository' interface IPayload {} diff --git a/src/socketEvents/gameMaster/assetManager/object/remove.ts b/src/socketEvents/gameMaster/assetManager/object/remove.ts index 0a86382..d633198 100644 --- a/src/socketEvents/gameMaster/assetManager/object/remove.ts +++ b/src/socketEvents/gameMaster/assetManager/object/remove.ts @@ -1,10 +1,10 @@ import fs from 'fs' import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { getPublicPath } from '../../../../utilities/storage' -import { gameLogger, gameMasterLogger } from '../../../../utilities/logger' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { getPublicPath } from '#utilities/storage' +import { gameLogger, gameMasterLogger } from '#utilities/logger' interface IPayload { object: string diff --git a/src/socketEvents/gameMaster/assetManager/object/update.ts b/src/socketEvents/gameMaster/assetManager/object/update.ts index 983a2c8..6158dc8 100644 --- a/src/socketEvents/gameMaster/assetManager/object/update.ts +++ b/src/socketEvents/gameMaster/assetManager/object/update.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' type Payload = { id: string diff --git a/src/socketEvents/gameMaster/assetManager/object/upload.ts b/src/socketEvents/gameMaster/assetManager/object/upload.ts index 7b196da..8191b4b 100644 --- a/src/socketEvents/gameMaster/assetManager/object/upload.ts +++ b/src/socketEvents/gameMaster/assetManager/object/upload.ts @@ -1,12 +1,12 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { writeFile } from 'node:fs/promises' import fs from 'fs/promises' -import prisma from '../../../../utilities/prisma' +import prisma from '#utilities/prisma' import sharp from 'sharp' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' -import { getPublicPath } from '../../../../utilities/storage' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' +import { getPublicPath } from '#utilities/storage' interface IObjectData { [key: string]: Buffer diff --git a/src/socketEvents/gameMaster/assetManager/sprite/copy.ts b/src/socketEvents/gameMaster/assetManager/sprite/copy.ts index 2d38725..75602f1 100644 --- a/src/socketEvents/gameMaster/assetManager/sprite/copy.ts +++ b/src/socketEvents/gameMaster/assetManager/sprite/copy.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import CharacterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' import type { Prisma } from '@prisma/client' interface CopyPayload { diff --git a/src/socketEvents/gameMaster/assetManager/sprite/create.ts b/src/socketEvents/gameMaster/assetManager/sprite/create.ts index 29fb126..9d91bd2 100644 --- a/src/socketEvents/gameMaster/assetManager/sprite/create.ts +++ b/src/socketEvents/gameMaster/assetManager/sprite/create.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import fs from 'fs/promises' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { getPublicPath } from '../../../../utilities/storage' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { getPublicPath } from '#utilities/storage' export default class SpriteCreateEvent { constructor( diff --git a/src/socketEvents/gameMaster/assetManager/sprite/delete.ts b/src/socketEvents/gameMaster/assetManager/sprite/delete.ts index 21c645f..9309136 100644 --- a/src/socketEvents/gameMaster/assetManager/sprite/delete.ts +++ b/src/socketEvents/gameMaster/assetManager/sprite/delete.ts @@ -1,10 +1,10 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import fs from 'fs' -import prisma from '../../../../utilities/prisma' -import { gameMasterLogger } from '../../../../utilities/logger' -import { getPublicPath } from '../../../../utilities/storage' -import CharacterRepository from '../../../../repositories/characterRepository' +import prisma from '#utilities/prisma' +import { gameMasterLogger } from '#utilities/logger' +import { getPublicPath } from '#utilities/storage' +import CharacterRepository from '#repositories/characterRepository' type Payload = { id: string diff --git a/src/socketEvents/gameMaster/assetManager/sprite/list.ts b/src/socketEvents/gameMaster/assetManager/sprite/list.ts index a504494..be2e906 100644 --- a/src/socketEvents/gameMaster/assetManager/sprite/list.ts +++ b/src/socketEvents/gameMaster/assetManager/sprite/list.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { Sprite } from '@prisma/client' -import SpriteRepository from '../../../../repositories/spriteRepository' -import characterRepository from '../../../../repositories/characterRepository' +import SpriteRepository from '#repositories/spriteRepository' +import characterRepository from '#repositories/characterRepository' interface IPayload {} diff --git a/src/socketEvents/gameMaster/assetManager/sprite/update.ts b/src/socketEvents/gameMaster/assetManager/sprite/update.ts index f7b57af..5e0b78e 100644 --- a/src/socketEvents/gameMaster/assetManager/sprite/update.ts +++ b/src/socketEvents/gameMaster/assetManager/sprite/update.ts @@ -1,12 +1,12 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' import type { Prisma, SpriteAction } from '@prisma/client' import { writeFile, mkdir } from 'node:fs/promises' import sharp from 'sharp' -import { getPublicPath } from '../../../../utilities/storage' -import CharacterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' +import { getPublicPath } from '#utilities/storage' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' // Constants const ISOMETRIC_CONFIG = { diff --git a/src/socketEvents/gameMaster/assetManager/tile/delete.ts b/src/socketEvents/gameMaster/assetManager/tile/delete.ts index 1bf994a..3e59fd6 100644 --- a/src/socketEvents/gameMaster/assetManager/tile/delete.ts +++ b/src/socketEvents/gameMaster/assetManager/tile/delete.ts @@ -1,10 +1,10 @@ import fs from 'fs/promises' import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' -import { getPublicPath } from '../../../../utilities/storage' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' +import { getPublicPath } from '#utilities/storage' type Payload = { id: string diff --git a/src/socketEvents/gameMaster/assetManager/tile/list.ts b/src/socketEvents/gameMaster/assetManager/tile/list.ts index 9e6856f..36ec5b5 100644 --- a/src/socketEvents/gameMaster/assetManager/tile/list.ts +++ b/src/socketEvents/gameMaster/assetManager/tile/list.ts @@ -1,8 +1,8 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { Tile } from '@prisma/client' -import TileRepository from '../../../../repositories/tileRepository' -import characterRepository from '../../../../repositories/characterRepository' +import TileRepository from '#repositories/tileRepository' +import characterRepository from '#repositories/characterRepository' interface IPayload {} diff --git a/src/socketEvents/gameMaster/assetManager/tile/update.ts b/src/socketEvents/gameMaster/assetManager/tile/update.ts index 372e2ab..688338c 100644 --- a/src/socketEvents/gameMaster/assetManager/tile/update.ts +++ b/src/socketEvents/gameMaster/assetManager/tile/update.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' type Payload = { id: string diff --git a/src/socketEvents/gameMaster/assetManager/tile/upload.ts b/src/socketEvents/gameMaster/assetManager/tile/upload.ts index b14febf..b01290b 100644 --- a/src/socketEvents/gameMaster/assetManager/tile/upload.ts +++ b/src/socketEvents/gameMaster/assetManager/tile/upload.ts @@ -1,11 +1,11 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../../utilities/types' +import { TSocket } from '#utilities/types' import { writeFile } from 'node:fs/promises' import fs from 'fs/promises' -import prisma from '../../../../utilities/prisma' -import characterRepository from '../../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../../utilities/logger' -import { getPublicPath } from '../../../../utilities/storage' +import prisma from '#utilities/prisma' +import characterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' +import { getPublicPath } from '#utilities/storage' interface ITileData { [key: string]: Buffer diff --git a/src/socketEvents/gameMaster/zoneEditor/create.ts b/src/socketEvents/gameMaster/zoneEditor/create.ts index e050192..87654c2 100644 --- a/src/socketEvents/gameMaster/zoneEditor/create.ts +++ b/src/socketEvents/gameMaster/zoneEditor/create.ts @@ -1,10 +1,10 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import ZoneRepository from '../../../repositories/zoneRepository' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' import { Zone } from '@prisma/client' -import prisma from '../../../utilities/prisma' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../utilities/logger' +import prisma from '#utilities/prisma' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' type Payload = { name: string diff --git a/src/socketEvents/gameMaster/zoneEditor/delete.ts b/src/socketEvents/gameMaster/zoneEditor/delete.ts index 858ed49..3580340 100644 --- a/src/socketEvents/gameMaster/zoneEditor/delete.ts +++ b/src/socketEvents/gameMaster/zoneEditor/delete.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import ZoneRepository from '../../../repositories/zoneRepository' -import prisma from '../../../utilities/prisma' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../utilities/logger' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' +import prisma from '#utilities/prisma' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' type Payload = { zoneId: number diff --git a/src/socketEvents/gameMaster/zoneEditor/list.ts b/src/socketEvents/gameMaster/zoneEditor/list.ts index 170408b..4ecdb51 100644 --- a/src/socketEvents/gameMaster/zoneEditor/list.ts +++ b/src/socketEvents/gameMaster/zoneEditor/list.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' +import { TSocket } from '#utilities/types' import { Zone } from '@prisma/client' -import ZoneRepository from '../../../repositories/zoneRepository' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../utilities/logger' +import ZoneRepository from '#repositories/zoneRepository' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' interface IPayload {} diff --git a/src/socketEvents/gameMaster/zoneEditor/request.ts b/src/socketEvents/gameMaster/zoneEditor/request.ts index bf425f9..53895a0 100644 --- a/src/socketEvents/gameMaster/zoneEditor/request.ts +++ b/src/socketEvents/gameMaster/zoneEditor/request.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import ZoneRepository from '../../../repositories/zoneRepository' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' import { Zone } from '@prisma/client' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../utilities/logger' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' interface IPayload { zoneId: number diff --git a/src/socketEvents/gameMaster/zoneEditor/update.ts b/src/socketEvents/gameMaster/zoneEditor/update.ts index a8f11c4..261d20c 100644 --- a/src/socketEvents/gameMaster/zoneEditor/update.ts +++ b/src/socketEvents/gameMaster/zoneEditor/update.ts @@ -1,11 +1,11 @@ import { Server } from 'socket.io' -import { TSocket } from '../../../utilities/types' -import ZoneRepository from '../../../repositories/zoneRepository' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' import { Zone, ZoneEffect, ZoneEventTileType, ZoneObject } from '@prisma/client' -import prisma from '../../../utilities/prisma' -import zoneManager from '../../../managers/zoneManager' -import CharacterRepository from '../../../repositories/characterRepository' -import { gameMasterLogger } from '../../../utilities/logger' +import prisma from '#utilities/prisma' +import zoneManager from '#managers/zoneManager' +import CharacterRepository from '#repositories/characterRepository' +import { gameMasterLogger } from '#utilities/logger' interface IPayload { zoneId: number diff --git a/src/socketEvents/login.ts b/src/socketEvents/login.ts index 79fbfd1..d6b0311 100644 --- a/src/socketEvents/login.ts +++ b/src/socketEvents/login.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../utilities/types' -import { gameLogger } from '../utilities/logger' -import UserRepository from '../repositories/userRepository' +import { TSocket } from '#utilities/types' +import { gameLogger } from '#utilities/logger' +import UserRepository from '#repositories/userRepository' export default class LoginEvent { constructor( diff --git a/src/socketEvents/zone/characterJoin.ts b/src/socketEvents/zone/characterJoin.ts index fe9e2ad..475f13b 100644 --- a/src/socketEvents/zone/characterJoin.ts +++ b/src/socketEvents/zone/characterJoin.ts @@ -1,12 +1,12 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' -import ZoneRepository from '../../repositories/zoneRepository' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' import { Zone } from '@prisma/client' -import { gameLogger } from '../../utilities/logger' -import CharacterRepository from '../../repositories/characterRepository' -import ZoneManager from '../../managers/zoneManager' -import zoneCharacter from '../../models/zoneCharacter' -import zoneManager from '../../managers/zoneManager' +import { gameLogger } from '#utilities/logger' +import CharacterRepository from '#repositories/characterRepository' +import ZoneManager from '#managers/zoneManager' +import zoneCharacter from '#models/zoneCharacter' +import zoneManager from '#managers/zoneManager' interface IResponse { zone: Zone diff --git a/src/socketEvents/zone/characterLeave.ts b/src/socketEvents/zone/characterLeave.ts index d7e1c09..b8b6133 100644 --- a/src/socketEvents/zone/characterLeave.ts +++ b/src/socketEvents/zone/characterLeave.ts @@ -1,9 +1,9 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' -import ZoneRepository from '../../repositories/zoneRepository' -import { gameLogger } from '../../utilities/logger' -import ZoneManager from '../../managers/zoneManager' -import CharacterRepository from '../../repositories/characterRepository' +import { TSocket } from '#utilities/types' +import ZoneRepository from '#repositories/zoneRepository' +import { gameLogger } from '#utilities/logger' +import ZoneManager from '#managers/zoneManager' +import CharacterRepository from '#repositories/characterRepository' export default class ZoneLeaveEvent { constructor( diff --git a/src/socketEvents/zone/characterMove.ts b/src/socketEvents/zone/characterMove.ts index 14395bf..b671232 100644 --- a/src/socketEvents/zone/characterMove.ts +++ b/src/socketEvents/zone/characterMove.ts @@ -1,12 +1,12 @@ import { Server } from 'socket.io' -import { TSocket, ZoneEventTileWithTeleport } from '../../utilities/types' -import { CharacterService } from '../../services/characterService' -import { ZoneEventTileService } from '../../services/zoneEventTileService' -import Rotation from '../../utilities/character/rotation' -import { gameLogger } from '../../utilities/logger' -import ZoneManager from '../../managers/zoneManager' -import ZoneCharacter from '../../models/zoneCharacter' -import zoneEventTileRepository from '../../repositories/zoneEventTileRepository' +import { TSocket, ZoneEventTileWithTeleport } from '#utilities/types' +import { CharacterService } from '#services/characterService' +import { ZoneEventTileService } from '#services/zoneEventTileService' +import Rotation from '#utilities/character/rotation' +import { gameLogger } from '#utilities/logger' +import ZoneManager from '#managers/zoneManager' +import ZoneCharacter from '#models/zoneCharacter' +import zoneEventTileRepository from '#repositories/zoneEventTileRepository' export default class CharacterMove { private readonly characterService = new CharacterService() diff --git a/src/socketEvents/zone/weather.ts b/src/socketEvents/zone/weather.ts index 43df57e..873df1a 100644 --- a/src/socketEvents/zone/weather.ts +++ b/src/socketEvents/zone/weather.ts @@ -1,7 +1,7 @@ import { Server } from 'socket.io' -import { TSocket } from '../../utilities/types' -import { gameLogger } from '../../utilities/logger' -import WeatherManager from '../../managers/weatherManager' +import { TSocket } from '#utilities/types' +import { gameLogger } from '#utilities/logger' +import WeatherManager from '#managers/weatherManager' export default class Weather { constructor( diff --git a/tsconfig.json b/tsconfig.json index e022d97..8d6a352 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,16 @@ "baseUrl": ".", "paths": { + "#commands/*": ["./src/commands/*"], + "#entities/*": ["./src/entities/*"], + "#http/*": ["./src/http/*"], + "#jobs/*": ["./src/jobs/*"], + "#managers/*": ["./src/managers/*"], + "#middleware/*": ["./src/middleware/*"], + "#models/*": ["./src/models/*"], + "#repositories/*": ["./src/repositories/*"], + "#services/*": ["./src/services/*"], + "#socketEvents/*": ["./src/socketEvents/*"], "#utilities/*": ["./src/utilities/*"], },