decouple three bindings and three-maxscript bridge, make them injecta…

…ble from inversify

src/interfaces.ts

@@ -141,3 +141,7 @@ export enum SessionServiceEvents {
 export interface IThreeMaxscriptBridge {
     PostScene(sceneJson: any): Promise<any>;
 }
+
+export interface ISceneObjectBinding {
+    PostObject(objectJson: any): Promise<string>;
+}

src/inversify.config.ts

@@ -27,6 +27,7 @@ import { MaxScriptClientPool } from "./services/maxscript_client_pool";
 import { IMaxscriptClient, IThreeMaxscriptBridge } from "./interfaces";
 import { ThreeMaxscriptBridgePool } from "./services/three_maxscript_bridge_pool";
 import { ThreeMaxscriptBridgeFactory } from "./maxscript/three_maxscript_bridge_factory";
+import { SceneBinding } from "./maxscript/three_maxscript_bindings/scene_binding";
 
 const myContainer = new Container();
 
@@ -57,6 +58,9 @@ myContainer.bind<interfaces.ISessionPool<IThreeMaxscriptBridge>>(TYPES.IThreeMax
 myContainer.bind<interfaces.IFactory<interfaces.IMaxscriptClient>>(TYPES.IMaxscriptClientFactory).to(MaxscriptClientFactory).inSingletonScope();
 myContainer.bind<interfaces.IFactory<interfaces.IThreeMaxscriptBridge>>(TYPES.IThreeMaxscriptBridgeFactory).to(ThreeMaxscriptBridgeFactory).inSingletonScope();
 
+// bindings
+myContainer.bind<interfaces.ISceneObjectBinding>(TYPES.ISceneObjectBinding).to(SceneBinding);
+
 // tip: this is how to export same instance with different interfaces
 // EXAMPLE: myContainer.bind<interfaces.ISessionObserver>(TYPES.ISessionObserver).toService(TYPES.ISessionObserver);
 // ===

src/maxscript/three_maxscript_bindings/scene_binding.ts

@@ -0,0 +1,9 @@
+import { injectable } from "inversify";
+import { ISceneObjectBinding } from "../../interfaces";
+
+@injectable()
+export class SceneBinding implements ISceneObjectBinding {
+    public async PostObject(objectJson: any): Promise<string> {
+        return JSON.stringify(objectJson);
+    }
+}

src/maxscript/three_maxscript_bridge.ts

@@ -1,18 +1,21 @@
-import { IMaxscriptClient, IThreeMaxscriptBridge } from "../interfaces";
+import { IMaxscriptClient, IThreeMaxscriptBridge, ISceneObjectBinding } from "../interfaces";
 import { isArray } from "util";
+import { multiInject } from "inversify";
 
 // translates three json objects and changes to maxscript commands,
 // to keep scene up to date with latest changes in three.js scene.
 export class ThreeMaxscriptBridge implements IThreeMaxscriptBridge {
     private _maxscript: IMaxscriptClient;
+    private _sceneObjectBindings: ISceneObjectBinding[];
 
     private _sceneJson: any;
 
     constructor(
-        // @multiInject("IWeapon") weapons: IThreeConverter2[],
         maxscript: IMaxscriptClient,
+        sceneObjectBindings: ISceneObjectBinding[],
     ) {
         this._maxscript = maxscript;
+        this._sceneObjectBindings = sceneObjectBindings;
     }
 
     public async PostScene(sceneJson: any): Promise<any> {

src/maxscript/three_maxscript_bridge_factory.ts

@@ -1,21 +1,24 @@
-import { injectable, inject } from "inversify";
+import { injectable, inject, multiInject } from "inversify";
 import { TYPES } from "../types";
-import { IFactory, IMaxscriptClient, ISessionPool, IThreeMaxscriptBridge } from "../interfaces";
+import { IFactory, IMaxscriptClient, ISessionPool, IThreeMaxscriptBridge, ISceneObjectBinding } from "../interfaces";
 import { Session } from "../database/model/session";
 import { ThreeMaxscriptBridge } from "./three_maxscript_bridge";
 
 @injectable()
 export class ThreeMaxscriptBridgeFactory implements IFactory<IThreeMaxscriptBridge> {
     private _maxscriptClientPool: ISessionPool<IMaxscriptClient>;
+    private _sceneObjectBindings: ISceneObjectBinding[];
 
     constructor(
         @inject(TYPES.IMaxscriptClientPool) maxscriptClientPool: ISessionPool<IMaxscriptClient>,
+        @multiInject(TYPES.ISceneObjectBinding) sceneObjectBindings: ISceneObjectBinding[],
     ) {
         this._maxscriptClientPool = maxscriptClientPool;
+        this._sceneObjectBindings = sceneObjectBindings;
     }
 
     public async Create(session: Session): Promise<IThreeMaxscriptBridge> {
         let maxscript: IMaxscriptClient = await this._maxscriptClientPool.Get(session);
-        return new ThreeMaxscriptBridge(maxscript);
+        return new ThreeMaxscriptBridge(maxscript, this._sceneObjectBindings);
     }
 }

src/types.ts

@@ -15,6 +15,9 @@ const TYPES = {
     ISessionService: Symbol.for("ISessionService"),
     IMaxscriptClientPool: Symbol.for("ISessionPool<IMaxscriptClient>"),
     IThreeMaxscriptBridgePool: Symbol.for("ISessionPool<IThreeMaxscriptBridge>"),
+
+    // bindings
+    ISceneObjectBinding: Symbol.for("ISceneObjectBinding"),
 };
 
 export { TYPES };

test_client/js/rfarm_client.js

@@ -7,7 +7,7 @@ function pad(num, size) {
 var rfarm = {
     apiKey: "75f5-4d53-b0f4",
     workspace: "55a0bd33-9f15-4bc0-a482-17899eb67af3",
-    baseUrl: "https://acc.renderfarmjs.com",
+    baseUrl: "https://localhost:8000",
 
     geometries: {},  // here we map scene geometry uuid <==> backend geometry resource
     materials: {},   // here we map scene material uuid <==> backend material resource