scoundrel-remote-eval 1.0.0 → 1.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "scoundrel-remote-eval",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/client/connections/web-socket/index.js

@@ -1,11 +1,10 @@
 import Logger from "../../../logger.js"
 
-const logger = new Logger("Scoundrel WebSocket")
-
-// logger.setDebug(true)
-
 export default class WebSocket {
   constructor(ws) {
+    this.logger = new Logger("Scoundrel WebSocket")
+    // this.logger.setDebug(true)
+
     this.ws = ws
     this.ws.addEventListener("error", this.onSocketError)
     this.ws.addEventListener("open", this.onSocketOpen)
@@ -20,7 +19,7 @@ export default class WebSocket {
   }
 
   onSocketError = (event) => {
-    logger.error(() => ["onSocketError", event])
+    this.logger.error(() => ["onSocketError", event])
   }
 
   onSocketMessage = (event) => {
@@ -41,7 +40,7 @@ export default class WebSocket {
   }
 
   onSocketOpen = (event) => {
-    logger.log(() =>"onSocketOpen")
+    this.logger.log(() =>"onSocketOpen")
   }
 
   send(data) {
@@ -53,9 +52,7 @@ export default class WebSocket {
       })
 
       this.commands[commandCount] = {resolve, reject}
-
-      logger.log(() => ["Sending", sendData])
-
+      this.logger.log(() => ["Sending", sendData])
       this.ws.send(sendData)
     })
   }

package/src/server/client/index.js

@@ -1,9 +1,10 @@
 export default class ServerClient {
-  constructor(clientBackend) {
+  constructor(clientBackend, server) {
     this.clientBackend = clientBackend
     this.clientBackend.onCommand(this.onCommand)
     this.objects = {}
     this.objectsCount = 0
+    this.server = server
   }
 
   onCommand = (commandId, data) => {
@@ -14,11 +15,17 @@ export default class ServerClient {
         let object
 
         if (typeof className == "string") {
-          const classInstance = global[className]
+          const ServerClassInstance = this.server.getClass(className)
 
-          if (!classInstance) throw new Error(`No such class: ${className}`)
+          if (ServerClassInstance) {
+            object = new ServerClassInstance[className](...data.args)
+          } else {
+            const classInstance = global[className]
 
-          object = new global[className](...data.args)
+            if (!classInstance) throw new Error(`No such class: ${className}`)
+
+            object = new global[className](...data.args)
+          }
         } else {
           throw new Error(`Don't know how to handle class name: ${typeof className}`)
         }

package/src/server/index.js

@@ -5,13 +5,24 @@ export default class ScoundrelServer {
     this.backend = backend
     this.backend.onNewClient(this.onNewClient)
     this.clients = []
+    this._classes = {}
   }
 
   close = () => this.backend.close()
 
   onNewClient = (clientBackend) => {
-    const client = new Client(clientBackend)
+    const client = new Client(clientBackend, this)
 
     this.clients.push(client)
   }
+
+  registerClass(className, classInstance) {
+    if (className in this._classes) throw new Error(`Class already exists: ${className}`)
+
+    this._classes[className] = classInstance
+  }
+
+  getClass(className) {
+    return this._classes[className]
+  }
 }