* Fixed solaris-common imports and module import issues.

* Updated wait() method in Mutex class to correct log message typo.
solaris-games · Jan 20, 2025 · 292c592 · 292c592
1 parent f99e0e9
commit 292c592
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 42 deletions.
diff --git 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
diff --git 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
@@ -3,16 +3,16 @@
   "version": "1.0.0",
   "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:prod": "node dist/server/jobs/index.js",
-    "start-api:dev": "ts-node-dev --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",
+    "test": "ts-node -r tsconfig-paths/register -P tsconfig.json --files ../node_modules/jasmine/bin/jasmine",
+    "start-jobs:dev": "ts-node-dev -r tsconfig-paths/register --transpile-only --respawn --inspect=9230 jobs/index.ts",
+    "start-jobs:prod": "node -r tsconfig-paths/register dist/server/jobs/index.js",
+    "start-api:dev": "ts-node-dev -r tsconfig-paths/register --transpile-only --respawn --inspect=9231 api/index.ts",
+    "start-api:prod": "node -r tsconfig-paths/register dist/server/api/index.js",
+    "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:prod": "node dist/server/db/recalculateRankings.js",
-    "restore-game": "ts-node-dev --transpile-only db/restoreGame.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 -r tsconfig-paths/register dist/server/db/recalculateRankings.js",
+    "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<DiplomacySocketEventType> {

diff --git 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<GameSocketEventType> {

diff --git 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<PlayerSocketEventType> {

diff --git 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<TSocketEventType> extends SocketEmitter<TSocketEventType> {

diff --git 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<TData> = SocketEventName<ServerSocketEventType, TData> & { serverSocketEventName: 'serverSocketEventName' };

diff --git 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
@@ -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
@@ -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<TSocketEventType> extends SocketHandler<TSocketEventType> {

diff --git 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,