versacall-core-library-react 2.0.86-dev → 2.0.87-dev

package/dist/context/Channels/ChannelsWorker.js

@@ -39,7 +39,7 @@ let packetIdCounter = 0;
  * topic string → { channelKey, channelName }
  * Maintained across reconnects so we can resubscribe automatically.
  */
-const activeSubscriptions = new Map();
+const activeSubscriptions = new Map(); // lookupKey → {channelKey, channelName, ports: Set}
 
 // ─── Helpers ─────────────────────────────────────────────────────────────────
 
@@ -57,6 +57,18 @@ function concat(a, b) {
   out.set(b, a.length);
   return out;
 }
+function cleanupPortSubscriptions(port) {
+  for (const [lookupKey, sub] of activeSubscriptions) {
+    sub.ports.delete(port);
+    if (sub.ports.size === 0) {
+      activeSubscriptions.delete(lookupKey);
+      const mqttTopic = "".concat(sub.channelKey, "/").concat(sub.channelName, "/");
+      if (mqttConnected) {
+        wsSend(buildUnsubscribe(nextPacketId(), mqttTopic));
+      }
+    }
+  }
+}
 
 // ─── MQTT encoding ───────────────────────────────────────────────────────────
 
@@ -368,22 +380,34 @@ function handlePortMessage(port, msg) {
       {
         const mqttTopic = "".concat(msg.channelKey, "/").concat(msg.channelName, "/");
         const lookupKey = "".concat(msg.channelName, "/");
-        activeSubscriptions.set(lookupKey, {
-          channelKey: msg.channelKey,
-          channelName: msg.channelName
-        });
-        if (mqttConnected) {
-          wsSend(buildSubscribe(nextPacketId(), mqttTopic));
+        const existing = activeSubscriptions.get(lookupKey);
+        if (existing) {
+          existing.ports.add(port);
+        } else {
+          activeSubscriptions.set(lookupKey, {
+            channelKey: msg.channelKey,
+            channelName: msg.channelName,
+            ports: new Set([port])
+          });
+          if (mqttConnected) {
+            wsSend(buildSubscribe(nextPacketId(), mqttTopic));
+          }
         }
         break;
       }
     case 'UNSUBSCRIBE':
       {
         const lookupKey = "".concat(msg.channelName, "/");
-        activeSubscriptions.delete(lookupKey);
-        const mqttTopic = "".concat(msg.channelKey, "/").concat(msg.channelName, "/");
-        if (mqttConnected) {
-          wsSend(buildUnsubscribe(nextPacketId(), mqttTopic));
+        const existing = activeSubscriptions.get(lookupKey);
+        if (existing) {
+          existing.ports.delete(port);
+          if (existing.ports.size === 0) {
+            activeSubscriptions.delete(lookupKey);
+            const mqttTopic = "".concat(msg.channelKey, "/").concat(msg.channelName, "/");
+            if (mqttConnected) {
+              wsSend(buildUnsubscribe(nextPacketId(), mqttTopic));
+            }
+          }
         }
         break;
       }
@@ -402,9 +426,9 @@ self.onconnect = event => {
   const port = event.ports[0];
   ports.add(port);
   port.onmessage = ev => handlePortMessage(port, ev.data);
-  port.onmessageerror = () => ports.delete(port);
-
-  // start() is required when the port was not started implicitly via
-  // addEventListener — calling it on an already-started port is harmless.
+  port.onmessageerror = () => {
+    ports.delete(port);
+    cleanupPortSubscriptions(port);
+  };
   port.start();
 };

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Core Library React",
     "applicationType": "react-library",
-    "build": 86
+    "build": 87
   },
   "name": "versacall-core-library-react",
-  "version": "2.0.86-dev",
+  "version": "2.0.87-dev",
   "description": "Versacall Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",