scoundrel-remote-eval 1.0.0 → 1.0.2

package/package.json

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

package/src/logger.js

@@ -8,7 +8,15 @@ export default class Logger {
     this.debug = newValue
   }
 
+  error(...args) {
+    return this._sendToConsole("error", ...args)
+  }
+
   log(...args) {
+    return this._sendToConsole("log", ...args)
+  }
+
+  _sendToConsole(logType, ...args) {
     if (!this.debug) {
       return
     }
@@ -17,12 +25,12 @@ export default class Logger {
       const callbackArgs = args[0]()
 
       if (Array.isArray(callbackArgs)) {
-        console.log(this.scopeName, ...callbackArgs)
+        console[logType](this.scopeName, ...callbackArgs)
       } else {
-        console.log(this.scopeName, callbackArgs)
+        console[logType](this.scopeName, callbackArgs)
       }
     } else {
-      console.log(this.scopeName, ...args)
+      console[logType](this.scopeName, ...args)
     }
   }
 }

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]
+  }
 }