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

package/dist/context/Channels/ChannelsProvider.js

@@ -172,8 +172,6 @@ function initWorkerPort(host, secure, log) {
       type
     } = ev.data;
     if (type === 'MESSAGE') {
-      // ev.data.channel is the raw MQTT topic "{channelKey}/{channelName}/"
-      // — identical to what emitter-io exposed as msg.channel.
       processMessage(ev.data.channel, ev.data.data);
     } else if (type === 'CONNECTION_CHANGED') {
       log('system', namespace, 'workerPort.onmessage', ev.data.connected ? 'Emitter Connect' : 'Emitter Disconnect');

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 ───────────────────────────────────────────────────────────
 
@@ -166,7 +178,6 @@ function decodeVarInt(buf, offset) {
  * Leaves any trailing incomplete bytes in receiveBuffer.
  */
 function drainBuffer() {
-  console.log('[vc-worker] drainBuffer called, buffer length:', receiveBuffer.length);
   let offset = 0;
   while (offset < receiveBuffer.length) {
     const firstByte = receiveBuffer[offset];
@@ -187,7 +198,6 @@ function drainBuffer() {
 
 /** Route a decoded MQTT packet to the appropriate handler. */
 function dispatchMqttPacket(type, flags, body) {
-  console.log('[vc-worker] dispatchMqttPacket type:', type, 'body length:', body.length);
   switch (type) {
     case 2:
       return onConnack(body);
@@ -228,27 +238,13 @@ function onConnack(body) {
  * forward it unchanged — ChannelsConsumer handlers will match as before.
  */
 function onPublish(flags, body) {
-  console.log('[vc-worker] onPublish called, body length:', body.length);
   if (body.length < 2) return;
   const topicLen = body[0] << 8 | body[1];
   if (2 + topicLen > body.length) return;
   const topic = textDecoder.decode(body.slice(2, 2 + topicLen));
-  console.log('[vc-worker] topic:', topic);
   const qos = flags >> 1 & 0x03;
-  console.log('[vc-worker] qos:', qos);
   const payloadStart = 2 + topicLen + (qos > 0 ? 2 : 0);
   const payloadStr = textDecoder.decode(body.slice(payloadStart));
-  console.log('[vc-worker] payload first 200 chars:', payloadStr.substring(0, 200));
-
-  // TEMPORARY DEBUG - remove after diagnosis
-  ports.forEach(port => {
-    try {
-      port.postMessage({
-        type: 'LOG',
-        message: 'RAW TOPIC: ' + topic + ' | QOS: ' + qos + ' | PAYLOAD: ' + payloadStr.substring(0, 200)
-      });
-    } catch (_) {}
-  });
   let data;
   try {
     data = JSON.parse(payloadStr);
@@ -308,7 +304,6 @@ function openWebSocket(config) {
     pingIntervalId = setInterval(() => wsSend(PINGREQ), 25000);
   };
   ws.onmessage = ev => {
-    console.log('[vc-worker] WebSocket data received, bytes:', ev.data.byteLength);
     receiveBuffer = concat(receiveBuffer, new Uint8Array(ev.data));
     drainBuffer();
   };
@@ -369,10 +364,6 @@ function handlePortMessage(port, msg) {
           // First INIT — record config and open the connection.
           wsConfig = config;
           openWebSocket(config);
-          port.postMessage({
-            type: 'LOG',
-            message: 'Worker: first INIT, opening WebSocket'
-          });
         } else if (mqttConnected) {
           // Subsequent INIT from a later iframe — we're already live.
           // Immediately tell the new port so it can update connection-state UI.
@@ -380,10 +371,6 @@ function handlePortMessage(port, msg) {
             type: 'CONNECTION_CHANGED',
             connected: true
           });
-          port.postMessage({
-            type: 'LOG',
-            message: 'Worker: subsequent INIT, reusing existing connection. Total ports: ' + ports.size
-          });
         }
         // If !mqttConnected and wsConfig is already set we're in the middle of
         // connecting; the CONNACK broadcast will reach the new port once ready.
@@ -393,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;
       }
@@ -427,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": 85
+    "build": 87
   },
   "name": "versacall-core-library-react",
-  "version": "2.0.85-dev",
+  "version": "2.0.87-dev",
   "description": "Versacall Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",