Migrated to inversify

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "inversify"
+    ]
+}

package.json

@@ -26,9 +26,8 @@
     "packages/*"
   ],
   "dependencies": {
+    "inversify": "^6.0.1",
     "reflect-metadata": "^0.1.13",
-    "runtypes": "^6.6.0",
-    "tsyringe": "^4.7.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {

packages/api/src/index.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { container } from "tsyringe";
+import { container } from "@moose-rocket/container";
 import { SocketServer } from "./server/SocketServer";
 
-container.resolve(SocketServer);
+container.get(SocketServer);

packages/api/src/room/Room.ts

@@ -1,21 +1,22 @@
 import "reflect-metadata";
 import { MessagePort } from "node:worker_threads";
-import { container } from "tsyringe";
 import "@moose-rocket/game";
-import { FastMap, Game } from "@moose-rocket/core";
+import { DEPENDENCIES, FastMap, Game } from "@moose-rocket/core";
 import {
   AnyMessage,
   ConnectionApprovedMessage,
   Parser,
 } from "@moose-rocket/messaging";
 import "./components";
+import { container } from "@moose-rocket/container";
 
 /**
  * Each Room will be executed on a new worker thread
  */
 export class Room {
   private readonly players = new FastMap<MessagePort>();
-  private readonly game = container.resolve<Game>("Game");
+
+  private readonly game = container.get<Game>(DEPENDENCIES.Game);
 
   constructor(private readonly id: string) {
     this.game.init();

packages/api/src/room/components/ServerAudioLoader.ts

@@ -1,11 +1,14 @@
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { Audio, AudioLoader } from "@moose-rocket/core";
 
-@singleton()
+@injectable()
 export class ServerAudioLoader implements AudioLoader {
   load(src: string): Audio {
     return {
       play() {},
     };
   }
 }
+
+container.bind(ServerAudioLoader).toSelf().inSingletonScope();

packages/api/src/room/components/ServerBackgroundRenderer.ts

@@ -1,7 +1,10 @@
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { BackgroundRenderer } from "@moose-rocket/core";
 
-@singleton()
+@injectable()
 export class ServerBackgroundRenderer implements BackgroundRenderer {
   draw(): void {}
 }
+
+container.bind(ServerBackgroundRenderer).toSelf().inSingletonScope();

packages/api/src/room/components/ServerEntityRenderer.ts

@@ -1,10 +1,13 @@
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { Entity, EntityRenderer } from "@moose-rocket/core";
 
-@singleton()
+@injectable()
 export class ServerEntityRenderer implements EntityRenderer {
   windowWidth: number = 1000;
   windowHeight: number = 1000;
 
   draw(entities: Entity[]): void {}
 }
+
+container.bind(ServerEntityRenderer).toSelf().inSingletonScope();

packages/api/src/room/components/ServerTextureLoader.ts

@@ -1,7 +1,8 @@
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { Texture, TextureLoader } from "@moose-rocket/core";
 
-@singleton()
+@injectable()
 export class ServerTextureLoader implements TextureLoader {
   load(
     src: string,
@@ -11,3 +12,5 @@ export class ServerTextureLoader implements TextureLoader {
     return {} as Texture;
   }
 }
+
+container.bind(ServerTextureLoader).toSelf().inSingletonScope();

packages/api/src/room/components/ServerTimer.ts

@@ -1,10 +1,11 @@
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { Timer } from "@moose-rocket/core";
 import { Logger } from "@moose-rocket/logger";
 
 type Task = () => void;
 
-@singleton()
+@injectable()
 export class ServerTimer implements Timer {
   private interval: NodeJS.Timer | null = null;
   private tasks: Task[] = [];
@@ -28,10 +29,12 @@ export class ServerTimer implements Timer {
 
   private handleFrame() {
     try {
-        console.log("SERVER TICK")
+      console.log("SERVER TICK");
       this.tasks.forEach((task) => task());
     } catch (e) {
       this.logger.error(e);
     }
   }
 }
+
+container.bind(ServerTimer).toSelf().inSingletonScope();

packages/api/src/room/components/UserInput.ts

@@ -1,7 +1,10 @@
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { INTENT, UserInput, EventSource } from "@moose-rocket/core";
 
-@singleton()
+@injectable()
 export class ServerUserInput
   extends EventSource<INTENT, number>
   implements UserInput {}
+
+container.bind(ServerUserInput).toSelf().inSingletonScope();

packages/api/src/room/components/index.ts

@@ -1,52 +1,12 @@
-import { container, Lifecycle } from "tsyringe";
-import {
-  AudioLoader,
-  BackgroundRenderer,
-  EntityRenderer,
-  TextureLoader,
-  Timer,
-  UserInput,
-} from "@moose-rocket/core";
-import { ServerAudioLoader } from "./ServerAudioLoader";
-import { ServerBackgroundRenderer } from "./ServerBackgroundRenderer";
-import { ServerEntityRenderer } from "./ServerEntityRenderer";
-import { ServerTextureLoader } from "./ServerTextureLoader";
-import { ServerTimer } from "./ServerTimer";
-import { ServerUserInput } from "./UserInput";
+import "./ServerAudioLoader";
+import "./ServerBackgroundRenderer";
+import "./ServerEntityRenderer";
+import "./ServerTextureLoader";
+import "./ServerTimer";
+import "./UserInput";
 
 /**
  * FIXME: Dirty hack to temporarily allow running stuff that
  * relies on window in the server
  */
 (global as any).window = { innerWidth: 1000, innerHeight: 1000 };
-
-container.register<Timer>(
-  "Timer",
-  { useClass: ServerTimer },
-  { lifecycle: Lifecycle.Singleton }
-);
-container.register<UserInput>(
-  "UserInput",
-  { useClass: ServerUserInput },
-  { lifecycle: Lifecycle.Singleton }
-);
-container.register<BackgroundRenderer>(
-  "BackgroundRenderer",
-  { useClass: ServerBackgroundRenderer },
-  { lifecycle: Lifecycle.Singleton }
-);
-container.register<EntityRenderer>(
-  "EntityRenderer",
-  { useClass: ServerEntityRenderer },
-  { lifecycle: Lifecycle.Singleton }
-);
-container.register<TextureLoader>(
-  "TextureLoader",
-  { useClass: ServerTextureLoader },
-  { lifecycle: Lifecycle.Singleton }
-);
-container.register<AudioLoader>(
-  "AudioLoader",
-  { useClass: ServerAudioLoader },
-  { lifecycle: Lifecycle.Singleton }
-);

packages/api/src/server/Authentication.ts

@@ -1,11 +1,12 @@
-import { singleton } from "tsyringe";
+import { container } from "@moose-rocket/container";
+import { injectable } from "inversify";
 
 // FIXME: Move this somewhere else
 const knownUsers: { [key: string]: string } = {
   banana: "45c993a5-f1bd-4bb9-b6a7-e543b3f80560",
 };
 
-@singleton()
+@injectable()
 export class Authentication {
   /**
    * Returns the user ID if the user is recognized, or null if they're not
@@ -28,3 +29,5 @@ export class Authentication {
     return null;
   }
 }
+
+container.bind(Authentication).toSelf().inSingletonScope();

packages/api/src/server/RoomManager.ts

@@ -1,10 +1,11 @@
 import { WebSocket } from "ws";
-import { singleton } from "tsyringe";
+import { injectable } from "inversify";
+import { container } from "@moose-rocket/container";
 import { FastMap } from "@moose-rocket/core";
 import { Logger } from "@moose-rocket/logger";
 import { RoomThread } from "../room";
 
-@singleton()
+@injectable()
 export class RoomManager {
   private readonly rooms = new FastMap<RoomThread>();
 
@@ -33,3 +34,5 @@ export class RoomManager {
     return room;
   }
 }
+
+container.bind(RoomManager).toSelf().inSingletonScope();