diff --git a/client/src/sockets/socketHandlers/clientHandler.ts b/client/src/sockets/socketHandlers/clientHandler.ts index 458951744..93d73bbd9 100644 --- a/client/src/sockets/socketHandlers/clientHandler.ts +++ b/client/src/sockets/socketHandlers/clientHandler.ts @@ -1,11 +1,11 @@ import { Emitter, type DefaultEventsMap } from '@socket.io/component-emitter'; +import type { SocketEventName } from '@solaris-common'; import { Socket } from 'socket.io-client'; -import type { SocketEventName } from 'solaris-common'; import type { Store } from 'vuex/types/index.js'; import GameHelper from '../../services/gameHelper'; +import type { State } from '../../store'; import type { PlayerClientSocketEmitter } from '../socketEmitters/player'; import ClientSocketEventNames, { type ClientSocketEventType } from "../socketEventNames/client"; -import type { State } from '../../store'; export class ClientHandler { diff --git a/package-lock.json b/package-lock.json index bafdbb0a9..a70dbf062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2792,6 +2792,17 @@ "version": "5.0.1", "license": "ISC" }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/kareem": { "version": "2.3.2", "license": "Apache-2.0" @@ -4346,7 +4357,6 @@ }, "node_modules/strip-bom": { "version": "3.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -4538,6 +4548,19 @@ "strip-json-comments": "^2.0.0" } }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/tsconfig/node_modules/strip-json-comments": { "version": "2.0.1", "dev": true, @@ -5047,7 +5070,8 @@ "random-seed": "^0.3.0", "recaptcha-v2": "^0.1.3", "simplex-noise": "^4.0.1", - "socket.io": "4.8.1" + "socket.io": "4.8.1", + "tsconfig-paths": "^4.2.0" }, "devDependencies": { "@types/connect-mongodb-session": "2.4.1", diff --git a/server/api/controllers/ledger.ts b/server/api/controllers/ledger.ts index d3e2766f1..712cf310f 100644 --- a/server/api/controllers/ledger.ts +++ b/server/api/controllers/ledger.ts @@ -1,4 +1,4 @@ -import { LedgerType } from 'solaris-common'; +import { LedgerType } from '@solaris-common'; import { DependencyContainer } from '../../services/types/DependencyContainer'; export default (container: DependencyContainer) => { diff --git a/server/package.json b/server/package.json index 8b1007d9c..65cea8ea0 100644 --- a/server/package.json +++ b/server/package.json @@ -4,15 +4,15 @@ "description": "", "scripts": { "test": "ts-node -P tsconfig.json --files ../node_modules/jasmine/bin/jasmine", - "start-jobs:dev": "ts-node-dev --transpile-only --respawn --inspect=9230 jobs/index.ts", + "start-jobs:dev": "ts-node-dev -r tsconfig-paths/register --transpile-only --respawn --inspect=9230 jobs/index.ts", "start-jobs:prod": "node dist/server/jobs/index.js", - "start-api:dev": "ts-node-dev --transpile-only --respawn --inspect=9231 api/index.ts", + "start-api:dev": "ts-node-dev -r tsconfig-paths/register --transpile-only --respawn --inspect=9231 api/index.ts", "start-api:prod": "node dist/server/api/index.js", - "start-db-migrate:dev": "ts-node-dev --transpile-only --respawn --inspect=9233 db/migrate.ts", + "start-db-migrate:dev": "ts-node-dev -r tsconfig-paths/register --transpile-only --respawn --inspect=9233 db/migrate.ts", "start-db-migrate:prod": "node dist/server/db/migrate.js", - "start-db-recalc-ranks:dev": "ts-node-dev --transpile-only --respawn --inspect=9234 db/recalculateRankings.ts", + "start-db-recalc-ranks:dev": "ts-node-dev -r tsconfig-paths/register --transpile-only --respawn --inspect=9234 db/recalculateRankings.ts", "start-db-recalc-ranks:prod": "node dist/server/db/recalculateRankings.js", - "restore-game": "ts-node-dev --transpile-only db/restoreGame.ts", + "restore-game": "ts-node-dev -r tsconfig-paths/register --transpile-only db/restoreGame.ts", "prebuild": "rm -rf ./dist", "build": "tsc", "postbuild": "cp -r services/emailTemplates ./dist/server/services/emailTemplates && cp .env ./dist | true", @@ -51,7 +51,8 @@ "random-seed": "^0.3.0", "recaptcha-v2": "^0.1.3", "simplex-noise": "^4.0.1", - "socket.io": "4.8.1" + "socket.io": "4.8.1", + "tsconfig-paths": "^4.2.0" }, "devDependencies": { "@types/connect-mongodb-session": "2.4.1", diff --git a/server/services/broadcast.ts b/server/services/broadcast.ts index ab3919f64..d0689faca 100644 --- a/server/services/broadcast.ts +++ b/server/services/broadcast.ts @@ -1,7 +1,4 @@ -import { GameState } from 'solaris-common'; -import { ConversationMessageSentResult } from "solaris-common"; -import { DiplomaticStatus } from 'solaris-common'; -import { LedgerType } from 'solaris-common'; +import { ConversationMessageSentResult, DiplomaticStatus, GameState, LedgerType } from '@solaris-common'; import { DiplomacyServerSocketEmitter } from '../sockets/socketEmitters/diplomacy'; import { GameServerSocketEmitter } from '../sockets/socketEmitters/game'; import { PlayerServerSocketEmitter } from '../sockets/socketEmitters/player'; diff --git a/server/services/event.ts b/server/services/event.ts index 05d07eb79..f0531b42d 100644 --- a/server/services/event.ts +++ b/server/services/event.ts @@ -1,4 +1,4 @@ -import { LedgerType } from 'solaris-common'; +import { LedgerType } from '@solaris-common'; import ValidationError from "../errors/validation"; import BadgeService, { BadgeServiceEvents } from "./badge"; import BroadcastService from "./broadcast"; diff --git a/server/services/ledger.ts b/server/services/ledger.ts index 6be19ccfe..b06ba8c11 100644 --- a/server/services/ledger.ts +++ b/server/services/ledger.ts @@ -1,4 +1,4 @@ -import { LedgerType } from "solaris-common"; +import { LedgerType } from "@solaris-common"; import ValidationError from "../errors/validation"; import PlayerService from "./player"; import PlayerCreditsService from "./playerCredits"; diff --git a/server/services/trade.ts b/server/services/trade.ts index a1946330a..29c8b92de 100644 --- a/server/services/trade.ts +++ b/server/services/trade.ts @@ -1,6 +1,6 @@ const EventEmitter = require('events'); const moment = require('moment'); -import { LedgerType } from 'solaris-common'; +import { LedgerType } from '@solaris-common'; import ValidationError from '../errors/validation'; import AchievementService from './achievement'; import DiplomacyService from './diplomacy'; diff --git a/server/services/types/Guild.ts b/server/services/types/Guild.ts index 3a210ea51..3559349ff 100644 --- a/server/services/types/Guild.ts +++ b/server/services/types/Guild.ts @@ -1,4 +1,4 @@ -import { SettingVisibility } from "solaris-common"; +import { SettingVisibility } from "@solaris-common"; import { DBObjectId } from "./DBObjectId"; import { User } from "./User"; diff --git a/server/services/types/Mutex.ts b/server/services/types/Mutex.ts index 1c76c2063..61887be19 100644 --- a/server/services/types/Mutex.ts +++ b/server/services/types/Mutex.ts @@ -33,7 +33,7 @@ export class Mutex { return true; } else { - log.warn(`Cannot unlock Mutex wiht id ${this.id} as lockId does not match. Expected: ${lockId}, Actual: ${lockIdInput}`); + log.warn(`Cannot unlock Mutex with id ${this.id} as lockId does not match. Expected: ${lockId}, Actual: ${lockIdInput}`); } return false; diff --git a/server/services/types/User.ts b/server/services/types/User.ts index 6d81a418a..af34ab46f 100644 --- a/server/services/types/User.ts +++ b/server/services/types/User.ts @@ -1,6 +1,6 @@ +import type { UserGameSettings } from "@solaris-common"; import { DBObjectId } from "./DBObjectId"; import { UserLevel } from "./UserLevel"; -import type { UserGameSettings } from "solaris-common"; export interface UserRoles { administrator: boolean; diff --git a/server/sockets/socketEmitters/diplomacy.ts b/server/sockets/socketEmitters/diplomacy.ts index be4a6d4a9..9fee04079 100644 --- a/server/sockets/socketEmitters/diplomacy.ts +++ b/server/sockets/socketEmitters/diplomacy.ts @@ -1,6 +1,5 @@ +import { DiplomacySocketEventNames, DiplomacySocketEventType, DiplomaticStatus } from "@solaris-common"; import { Server } from "socket.io"; -import { DiplomaticStatus } from "solaris-common"; -import { DiplomacySocketEventNames, DiplomacySocketEventType } from "solaris-common"; import { ServerSocketEmitter } from "./serverSocketEmitter"; export class DiplomacyServerSocketEmitter extends ServerSocketEmitter { diff --git a/server/sockets/socketEmitters/game.ts b/server/sockets/socketEmitters/game.ts index b28ca988e..b15a2952e 100644 --- a/server/sockets/socketEmitters/game.ts +++ b/server/sockets/socketEmitters/game.ts @@ -1,6 +1,5 @@ +import { GameSocketEventNames, GameSocketEventType, GameState } from "@solaris-common"; import { Server } from "socket.io"; -import { GameState } from "solaris-common"; -import { GameSocketEventNames, GameSocketEventType } from "solaris-common"; import { ServerSocketEmitter } from "./serverSocketEmitter"; export class GameServerSocketEmitter extends ServerSocketEmitter { diff --git a/server/sockets/socketEmitters/player.ts b/server/sockets/socketEmitters/player.ts index 702d722f3..4c5caa2de 100644 --- a/server/sockets/socketEmitters/player.ts +++ b/server/sockets/socketEmitters/player.ts @@ -1,8 +1,5 @@ +import { ConversationMessageSentResult, LedgerType, PlayerSocketEventNames, PlayerSocketEventType, TradeEventTechnology } from "@solaris-common"; import { Server } from "socket.io"; -import { ConversationMessageSentResult } from "solaris-common"; -import { LedgerType } from "solaris-common"; -import { TradeEventTechnology } from "solaris-common"; -import { PlayerSocketEventNames, PlayerSocketEventType } from "solaris-common"; import { ServerSocketEmitter } from "./serverSocketEmitter"; export class PlayerServerSocketEmitter extends ServerSocketEmitter { diff --git a/server/sockets/socketEmitters/serverSocketEmitter.ts b/server/sockets/socketEmitters/serverSocketEmitter.ts index 03097a79e..7a5b60e9a 100644 --- a/server/sockets/socketEmitters/serverSocketEmitter.ts +++ b/server/sockets/socketEmitters/serverSocketEmitter.ts @@ -1,7 +1,6 @@ +import { SocketEmitter, type SocketEventName } from "@solaris-common"; import type { DefaultEventsMap, Server } from "socket.io"; import type { Room } from "socket.io-adapter"; -import { SocketEmitter } from "solaris-common"; -import { type SocketEventName } from "solaris-common"; import { TypedEventBroadcaster } from "../../../node_modules/socket.io/dist/typed-events"; export abstract class ServerSocketEmitter extends SocketEmitter { diff --git a/server/sockets/socketEventNames/server.ts b/server/sockets/socketEventNames/server.ts index 0dda86c11..68c966c1e 100644 --- a/server/sockets/socketEventNames/server.ts +++ b/server/sockets/socketEventNames/server.ts @@ -1,6 +1,5 @@ +import { makeCastFunc, type SocketEventName } from "@solaris-common"; import { Socket } from "socket.io"; -import { type SocketEventName } from "solaris-common"; -import { makeCastFunc } from "solaris-common"; export type ServerSocketEventType = { serverSocketEventType: 'serverSocketEventType' }; export type ServerSocketEventName = SocketEventName & { serverSocketEventName: 'serverSocketEventName' }; diff --git a/server/sockets/socketHandlers/player.ts b/server/sockets/socketHandlers/player.ts index 7feb57c9f..27c26bd4e 100644 --- a/server/sockets/socketHandlers/player.ts +++ b/server/sockets/socketHandlers/player.ts @@ -1,5 +1,5 @@ +import { PlayerSocketEventNames, type PlayerSocketEventType } from '@solaris-common'; import type { Socket } from "socket.io"; -import { PlayerSocketEventNames, type PlayerSocketEventType } from 'solaris-common'; import GameService from "../../services/game"; import SocketService from "../../services/socket"; import { objectIdFromString } from "../../services/types/DBObjectId"; diff --git a/server/sockets/socketHandlers/serverHandler.ts b/server/sockets/socketHandlers/serverHandler.ts index 15bbbc08b..221eeeeab 100644 --- a/server/sockets/socketHandlers/serverHandler.ts +++ b/server/sockets/socketHandlers/serverHandler.ts @@ -1,6 +1,6 @@ +import { SocketEventName } from "@solaris-common"; import { Logger } from "pino"; import type { Server, Socket } from "socket.io"; -import { SocketEventName } from "solaris-common"; import { EventEmitter } from "stream"; import ServerSocketEventNames, { ServerSocketEventType } from "../socketEventNames/server"; diff --git a/server/sockets/socketHandlers/serverSocketHandler.ts b/server/sockets/socketHandlers/serverSocketHandler.ts index 622859014..201590d88 100644 --- a/server/sockets/socketHandlers/serverSocketHandler.ts +++ b/server/sockets/socketHandlers/serverSocketHandler.ts @@ -1,6 +1,5 @@ +import { SocketHandler, type SocketEventName } from "@solaris-common"; import type { Socket } from "socket.io"; -import { type SocketEventName } from "solaris-common"; -import { SocketHandler } from "solaris-common"; import { ServerHandler, ServerHandlerEvents } from "./serverHandler"; export abstract class ServerSocketHandler extends SocketHandler { diff --git a/server/tsconfig.json b/server/tsconfig.json index bb463225a..ab6d8bb6e 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -4,7 +4,7 @@ "module": "commonjs", "resolveJsonModule": true, "sourceMap": true, - "outDir": "./dist/server", + "outDir": "./dist", "noEmit": false, "esModuleInterop": true, "forceConsistentCasingInFileNames": true,