hyperstack-react 0.3.0 → 0.3.2

package/dist/index.js

@@ -6779,40 +6779,26 @@ class HyperStackError extends Error {
     }
 }
 
-function isCompressedFrame(obj) {
-    return (typeof obj === 'object' &&
-        obj !== null &&
-        obj.compressed === 'gzip' &&
-        typeof obj.data === 'string');
-}
-function decompressGzip(base64Data) {
-    const binaryString = atob(base64Data);
-    const bytes = new Uint8Array(binaryString.length);
-    for (let i = 0; i < binaryString.length; i++) {
-        bytes[i] = binaryString.charCodeAt(i);
-    }
-    const decompressed = inflate_1(bytes);
-    return new TextDecoder().decode(decompressed);
-}
-function parseAndDecompress(jsonString) {
-    const parsed = JSON.parse(jsonString);
-    if (isCompressedFrame(parsed)) {
-        const decompressedJson = decompressGzip(parsed.data);
-        const frame = JSON.parse(decompressedJson);
-        return frame;
-    }
-    return parsed;
+const GZIP_MAGIC_0 = 0x1f;
+const GZIP_MAGIC_1 = 0x8b;
+function isGzipData(data) {
+    return data.length >= 2 && data[0] === GZIP_MAGIC_0 && data[1] === GZIP_MAGIC_1;
 }
 function isSnapshotFrame(frame) {
     return frame.op === 'snapshot';
 }
 function parseFrame(data) {
     if (typeof data === 'string') {
-        return parseAndDecompress(data);
+        return JSON.parse(data);
+    }
+    const bytes = new Uint8Array(data);
+    if (isGzipData(bytes)) {
+        const decompressed = inflate_1(bytes);
+        const jsonString = new TextDecoder().decode(decompressed);
+        return JSON.parse(jsonString);
     }
-    const decoder = new TextDecoder('utf-8');
-    const jsonString = decoder.decode(data);
-    return parseAndDecompress(jsonString);
+    const jsonString = new TextDecoder('utf-8').decode(data);
+    return JSON.parse(jsonString);
 }
 async function parseFrameFromBlob(blob) {
     const arrayBuffer = await blob.arrayBuffer();
@@ -6887,8 +6873,8 @@ class ConnectionManager {
                     this.reconnectAttempts = 0;
                     this.updateState('connected');
                     this.startPingInterval();
-                    this.flushSubscriptionQueue();
                     this.resubscribeActive();
+                    this.flushSubscriptionQueue();
                     resolve();
                 };
                 this.ws.onmessage = async (event) => {
@@ -6947,12 +6933,24 @@ class ConnectionManager {
     subscribe(subscription) {
         const subKey = this.makeSubKey(subscription);
         if (this.currentState === 'connected' && this.ws?.readyState === WebSocket.OPEN) {
+            if (this.activeSubscriptions.has(subKey)) {
+                console.log('[hyperstack] Skipping already active subscription:', subKey);
+                return;
+            }
             const subMsg = { type: 'subscribe', ...subscription };
+            console.log('[hyperstack] Sending subscribe:', subKey);
             this.ws.send(JSON.stringify(subMsg));
             this.activeSubscriptions.add(subKey);
         }
         else {
-            this.subscriptionQueue.push(subscription);
+            const alreadyQueued = this.subscriptionQueue.some((s) => this.makeSubKey(s) === subKey);
+            if (alreadyQueued) {
+                console.log('[hyperstack] Skipping duplicate queue entry:', subKey);
+            }
+            else {
+                console.log('[hyperstack] Queuing subscription:', subKey, '| Queue:', this.subscriptionQueue.map(s => this.makeSubKey(s)));
+                this.subscriptionQueue.push(subscription);
+            }
         }
     }
     unsubscribe(view, key) {
@@ -6973,6 +6971,7 @@ class ConnectionManager {
         return `${subscription.view}:${subscription.key ?? '*'}:${subscription.partition ?? ''}`;
     }
     flushSubscriptionQueue() {
+        console.log('[hyperstack] Flushing subscription queue:', this.subscriptionQueue.map(s => this.makeSubKey(s)));
         while (this.subscriptionQueue.length > 0) {
             const sub = this.subscriptionQueue.shift();
             if (sub) {
@@ -6981,6 +6980,7 @@ class ConnectionManager {
         }
     }
     resubscribeActive() {
+        console.log('[hyperstack] Resubscribing active:', Array.from(this.activeSubscriptions));
         for (const subKey of this.activeSubscriptions) {
             const [view, key, partition] = subKey.split(':');
             const subscription = {
@@ -6990,6 +6990,7 @@ class ConnectionManager {
             };
             if (this.ws?.readyState === WebSocket.OPEN) {
                 const subMsg = { type: 'subscribe', ...subscription };
+                console.log('[hyperstack] Resubscribe sending:', subKey);
                 this.ws.send(JSON.stringify(subMsg));
             }
         }