fixes

angrymouse · Jun 18, 2021 · a3c1666 · a3c1666
1 parent e6c51e7
commit a3c1666
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/client/index.js b/client/index.js
@@ -73,16 +73,11 @@ class RFManager {
                 }
                 fun(...this.__deserializeArgs(data.args))
                     .then((res) => {
-                        this.__send(
-                            JSON.stringify({
-                                type: "functionResult",
-                                data: {
-                                    reqId: data.reqId,
-                                    resultType: "resolve",
-                                    result: res,
-                                },
-                            })
-                        );
+                        this.__send("functionResult", {
+                            reqId: data.reqId,
+                            resultType: "resolve",
+                            result: res,
+                        });
                     })
                     .catch((error) => {
                         this.__send(

diff --git a/index.js b/index.js
@@ -1,6 +1,7 @@
 class RemoteFunctionsServerManager {
     clients = [];
     __callbacks = new Map();
+    __awaiting = {};
     constructor(functions = []) {
         this.functions = new Map(
             functions.map((f) => [
@@ -82,6 +83,16 @@ class RemoteFunctionsServerManager {
                             client.readyIndicator.resolve();
                         }
                     },
+                    functionResult: (data) => {
+                        if (!this.__awaiting[data.reqId]) {
+                            return;
+                        }
+
+                        this.__awaiting[data.reqId][data.resultType](
+                            data.result
+                        );
+                        delete this.__awaiting[data.reqId];
+                    },
                 }[message.type](message.data));
             } catch (e) {
                 return client.send(
@@ -147,11 +158,16 @@ class RemoteFunctionsServerManager {
     __callClientFunc(client, fname, args) {
         return new Promise((resolve, reject) => {
             let reqId = Math.random().toString(16).substr(2);
-            client.send("callClientFunc", {
-                fname,
-                args: this.__serializeArgs(args),
-                reqId,
-            });
+            client.send(
+                JSON.stringify({
+                    type: "callClientFunc",
+                    data: {
+                        fname,
+                        args: this.__serializeArgs(args),
+                        reqId,
+                    },
+                })
+            );
             this.__awaiting[reqId] = {
                 resolve,
                 reject,