let talkerapi only handle what it is addressed to

cables-gl · Apr 19, 2024 · e839a58 · e839a58
1 parent 306d29e
commit e839a58
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/shared/client/src/talkerapi.js b/shared/client/src/talkerapi.js
@@ -15,20 +15,23 @@ export default class TalkerAPI extends Events
 
         this._talker.onMessage = (msg) =>
         {
-            if (msg.data.cmd === "callback")
+            if (msg.data && msg.data.cmd) // other messages are not for talkerapi, i.e. anything that somehow is sent via .postMessage
             {
-                if (this._callbacks[msg.data.cb]) this._callbacks[msg.data.cb](msg.data.error, msg.data.response);
-            }
-            else
-            {
-                if (!this.hasListenerForEventName(msg.data.cmd))
+                if (msg.data.cmd === "callback")
                 {
-                    console.error("TalkerAPI has no listener for", msg.data.cmd);
+                    if (this._callbacks[msg.data.cb]) this._callbacks[msg.data.cb](msg.data.error, msg.data.response);
                 }
-                this.emitEvent(msg.data.cmd, msg.data.data, (error, r) =>
+                else
                 {
-                    this._talker.send("cables", { "cmd": "callback", "cb": msg.data.cb, "response": r, "error": error });
-                });
+                    if (!this.hasListenerForEventName(msg.data.cmd))
+                    {
+                        console.error("TalkerAPI has no listener for", msg.data.cmd);
+                    }
+                    this.emitEvent(msg.data.cmd, msg.data.data, (error, r) =>
+                    {
+                        this._talker.send("cables", { "cmd": "callback", "cb": msg.data.cb, "response": r, "error": error });
+                    });
+                }
             }
         };
     }