@holo-js/broadcast 0.2.5 → 0.2.6

package/dist/index.mjs

@@ -199,6 +199,9 @@ function unsubscribeRealtimeSubscription(socket, id, subscription) {
     logRealtimeSubscriptionCleanupError(socket.socketId, id, error);
   }
 }
+function isRealtimeSubscriptionCurrent(socket, id, token) {
+  return socket.active && socket.realtimeSubscriptionTokens.get(id) === token;
+}
 function parseChannelKind(channel2) {
   if (channel2.startsWith("private-")) {
     return Object.freeze({
@@ -743,6 +746,9 @@ function createBroadcastWorkerRuntime(options) {
     );
   }
   function sendRealtimeMessage(socket, event, data) {
+    if (!socket.active) {
+      return;
+    }
     socket.send(pusherEvent(event, data));
   }
   function resolveRealtimeErrorStatus(error) {
@@ -812,6 +818,7 @@ function createBroadcastWorkerRuntime(options) {
     }
     if (request.action === "unsubscribe") {
       const subscription = socket.realtimeSubscriptions.get(request.id);
+      socket.realtimeSubscriptionTokens.delete(request.id);
       if (subscription) {
         unsubscribeRealtimeSubscription(socket, request.id, subscription);
       }
@@ -822,6 +829,7 @@ function createBroadcastWorkerRuntime(options) {
       return;
     }
     const context = createRealtimeExecutionContext(socket);
+    let pendingSubscriptionToken;
     try {
       if (request.action === "query") {
         const result = await realtime.query(request.name, request.args, context);
@@ -845,24 +853,53 @@ function createBroadcastWorkerRuntime(options) {
         return;
       }
       const previousSubscription = socket.realtimeSubscriptions.get(request.id);
+      socket.realtimeSubscriptionTokens.delete(request.id);
       if (previousSubscription) {
         unsubscribeRealtimeSubscription(socket, request.id, previousSubscription);
         socket.realtimeSubscriptions.delete(request.id);
       }
+      const subscriptionToken = {};
+      pendingSubscriptionToken = subscriptionToken;
+      socket.realtimeSubscriptionTokens.set(request.id, subscriptionToken);
       const subscription = await realtime.subscribe(request.name, request.args, {
         context,
         onData(snapshot) {
+          if (!isRealtimeSubscriptionCurrent(socket, request.id, subscriptionToken)) {
+            return;
+          }
           sendRealtimeMessage(socket, "holo:realtime:snapshot", {
             id: request.id,
             snapshot
           });
         },
+        onPatch(patch) {
+          if (!isRealtimeSubscriptionCurrent(socket, request.id, subscriptionToken)) {
+            return;
+          }
+          sendRealtimeMessage(socket, "holo:realtime:patch", {
+            id: request.id,
+            patch
+          });
+        },
         onError(error) {
+          if (!isRealtimeSubscriptionCurrent(socket, request.id, subscriptionToken)) {
+            return;
+          }
           sendRealtimeError(socket, request.id, error);
         }
       });
+      if (!isRealtimeSubscriptionCurrent(socket, request.id, subscriptionToken)) {
+        unsubscribeRealtimeSubscription(socket, request.id, subscription);
+        return;
+      }
       socket.realtimeSubscriptions.set(request.id, subscription);
     } catch (error) {
+      if (pendingSubscriptionToken) {
+        if (!isRealtimeSubscriptionCurrent(socket, request.id, pendingSubscriptionToken)) {
+          return;
+        }
+        socket.realtimeSubscriptionTokens.delete(request.id);
+      }
       sendRealtimeError(socket, request.id, error);
     }
   }
@@ -1203,6 +1240,7 @@ function createBroadcastWorkerRuntime(options) {
         close: connection.close,
         subscribedChannels: /* @__PURE__ */ new Set(),
         realtimeSubscriptions: /* @__PURE__ */ new Map(),
+        realtimeSubscriptionTokens: /* @__PURE__ */ new Map(),
         active: true,
         pendingMessage: Promise.resolve()
       });
@@ -1259,6 +1297,7 @@ function createBroadcastWorkerRuntime(options) {
         unsubscribeRealtimeSubscription(socket, subscriptionId, subscription);
       }
       socket.realtimeSubscriptions.clear();
+      socket.realtimeSubscriptionTokens.clear();
       const channelsToCleanup = [...socket.subscribedChannels];
       const scalingCleanupTasks = channelsToCleanup.map((channel2) => {
         const removedPresenceMember = removeSubscriptionLocal(socket.app.appId, socket.socketId, channel2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/broadcast",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Holo-JS Framework - broadcast contracts, channel definitions, and driver registration seams",
   "type": "module",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/config": "^0.2.5",
-    "@holo-js/validation": "^0.2.5",
+    "@holo-js/config": "^0.2.6",
+    "@holo-js/validation": "^0.2.6",
     "ws": "^8.18.3"
   },
   "peerDependencies": {