dynamodb-reactive 0.4.0 → 0.5.0

package/dist/client.js

@@ -23,9 +23,7 @@ function canonicalize(value, seen, key, arrayItem = false, applyToJSON = true) {
         if (Array.isArray(value)) {
           const items = [];
           for (let index = 0; index < value.length; index++) {
-            items.push(
-              canonicalize(value[index], seen, String(index), true) ?? "null"
-            );
+            items.push(canonicalize(value[index], seen, String(index), true) ?? "null");
           }
           return `[${items.join(",")}]`;
         }
@@ -42,6 +40,9 @@ function canonicalize(value, seen, key, arrayItem = false, applyToJSON = true) {
         seen.delete(value);
       }
     }
+    case "bigint":
+    case "function":
+    case "symbol":
     default:
       throw new TypeError(`Unsupported query input value: ${typeof value}`);
   }
@@ -49,7 +50,6 @@ function canonicalize(value, seen, key, arrayItem = false, applyToJSON = true) {
 function getQueryKey(path, input) {
   return `${JSON.stringify(path)}:${canonicalize(input, /* @__PURE__ */ new Set(), "") ?? "undefined"}`;
 }
-var { applyPatch } = jsonpatch;
 function applyPatches(document, patches) {
   if (patches.length === 0) {
     return document;
@@ -68,7 +68,7 @@ function applyPatches(document, patches) {
     return op;
   });
   try {
-    const result = applyPatch(
+    const result = jsonpatch.applyPatch(
       structuredClone(document),
       operations,
       true,
@@ -88,12 +88,13 @@ function error(...values) {
 }
 
 // ../client/src/websocket.ts
-var HEARTBEAT_INTERVAL_MS = 5 * 60 * 1e3;
 function withDefaults(config) {
   return {
     autoReconnect: true,
     connectionTimeout: 1e4,
     handshakeTimeout: 1e4,
+    heartbeatInterval: 5 * 60 * 1e3,
+    heartbeatTimeout: 15e3,
     maxReconnectAttempts: 10,
     reconnectDelay: 1e3,
     ...config
@@ -107,6 +108,7 @@ var WebSocketManager = class {
   reconnectTimer = null;
   handshakeTimer = null;
   heartbeatTimer = null;
+  pongTimer = null;
   messageHandlers = /* @__PURE__ */ new Set();
   stateHandlers = /* @__PURE__ */ new Set();
   handshakeHandlers = /* @__PURE__ */ new Set();
@@ -206,16 +208,7 @@ var WebSocketManager = class {
       };
       nextSocket.onclose = () => {
         if (!this.isCurrent(nextSocket, generation)) return;
-        this.clearConnectionTimers();
-        this.ws = null;
-        this._connectionId = null;
-        this.setState("disconnected");
-        this.invokeLifecycleCallback("onDisconnect", this.config.onDisconnect);
-        if (this.config.autoReconnect && !this.intentionalDisconnect) {
-          this.scheduleReconnect();
-        } else {
-          this.rejectWaiters(new Error("WebSocket disconnected"));
-        }
+        this.handleClose();
       };
       nextSocket.onerror = () => {
         if (!this.isCurrent(nextSocket, generation)) return;
@@ -304,6 +297,7 @@ var WebSocketManager = class {
         return;
       }
       if (message.type === "pong") {
+        this.clearPongTimer();
         if (!this._connectionId || this.state === "connected") return;
         this.clearHandshakeTimer();
         this.lastConnectionError = void 0;
@@ -332,6 +326,18 @@ var WebSocketManager = class {
       socket.close(4e3, "Handshake timeout");
     }, this.config.handshakeTimeout);
   }
+  handleClose() {
+    this.clearConnectionTimers();
+    this.ws = null;
+    this._connectionId = null;
+    this.setState("disconnected");
+    this.invokeLifecycleCallback("onDisconnect", this.config.onDisconnect);
+    if (this.config.autoReconnect && !this.intentionalDisconnect) {
+      this.scheduleReconnect();
+    } else {
+      this.rejectWaiters(new Error("WebSocket disconnected"));
+    }
+  }
   startHeartbeat(socket, generation) {
     this.clearHeartbeatTimer();
     this.heartbeatTimer = setInterval(() => {
@@ -339,7 +345,17 @@ var WebSocketManager = class {
         return;
       }
       socket.send(JSON.stringify({ type: "ping" }));
-    }, HEARTBEAT_INTERVAL_MS);
+      this.pongTimer ??= setTimeout(() => {
+        this.pongTimer = null;
+        if (!this.isCurrent(socket, generation)) return;
+        const failure = new Error("WebSocket heartbeat timed out");
+        this.lastConnectionError = failure;
+        this.invokeLifecycleCallback("onError", this.config.onError, failure);
+        socket.onclose = null;
+        socket.close(4001, "Heartbeat timeout");
+        this.handleClose();
+      }, this.config.heartbeatTimeout);
+    }, this.config.heartbeatInterval);
   }
   isCurrent(socket, generation) {
     return this.ws === socket && this.socketGeneration === generation;
@@ -406,9 +422,15 @@ var WebSocketManager = class {
     clearInterval(this.heartbeatTimer);
     this.heartbeatTimer = null;
   }
+  clearPongTimer() {
+    if (!this.pongTimer) return;
+    clearTimeout(this.pongTimer);
+    this.pongTimer = null;
+  }
   clearConnectionTimers() {
     this.clearHandshakeTimer();
     this.clearHeartbeatTimer();
+    this.clearPongTimer();
   }
   clearTimers() {
     this.clearConnectionTimers();
@@ -508,10 +530,7 @@ var ReactiveClient = class {
       this.subscriptionsByKey.set(key, shared);
       this.subscriptionsById.set(shared.id, shared);
       if (this.connectionState === "connected") {
-        void this.ensureRegistered(
-          shared,
-          this.wsManager.generation
-        ).catch(() => void 0);
+        void this.ensureRegistered(shared, this.wsManager.generation).catch(() => void 0);
       }
     }
     const leaseId = generateId();
@@ -520,9 +539,7 @@ var ReactiveClient = class {
       onError: options.onError
     });
     if (this.connectionState === "connected" && (!shared.hasRegistered || shared.stale) && !shared.registrationPromise) {
-      void this.ensureRegistered(shared, this.wsManager.generation).catch(
-        () => void 0
-      );
+      void this.ensureRegistered(shared, this.wsManager.generation).catch(() => void 0);
     }
     const state = shared;
     let released = false;
@@ -611,9 +628,7 @@ var ReactiveClient = class {
   registerActiveSubscriptions(socketGeneration) {
     for (const state of this.subscriptionsByKey.values()) {
       if (state.active) {
-        void this.ensureRegistered(state, socketGeneration).catch(
-          () => void 0
-        );
+        void this.ensureRegistered(state, socketGeneration).catch(() => void 0);
       }
     }
   }
@@ -666,9 +681,7 @@ var ReactiveClient = class {
           })
         });
         if (!response.ok) {
-          throw new Error(
-            `Subscribe failed: ${response.status} ${response.statusText}`
-          );
+          throw new Error(`Subscribe failed: ${response.status} ${response.statusText}`);
         }
         const result = await response.json();
         if (result.type === "error") {
@@ -687,12 +700,7 @@ var ReactiveClient = class {
         throw cause;
       } finally {
         if ((!state.active || !isCurrent()) && requestIssued) {
-          void this.sendUnsubscribe(
-            registrationConnectionId,
-            state.id,
-            generation,
-            registrationId
-          );
+          void this.sendUnsubscribe(registrationConnectionId, state.id, generation, registrationId);
         }
         if (state.registrationPromise === request) {
           state.registrationPromise = void 0;
@@ -797,15 +805,12 @@ var ReactiveClient = class {
       return;
     }
     this.discardStalePatches(state);
-    while (true) {
-      const next = [...state.patchBuffer.values()].filter((patch) => patch.fromVersion === state.version).sort((left, right) => left.toVersion - right.toVersion)[0];
+    for (; ; ) {
+      const next = [...state.patchBuffer.values()].filter((patch) => patch.fromVersion === state.version).sort((left, right) => left.toVersion - right.toVersion).at(0);
       if (!next) break;
       state.patchBuffer.delete(next.messageId);
       try {
-        state.authoritativeData = applyPatches(
-          state.authoritativeData,
-          next.patches
-        );
+        state.authoritativeData = applyPatches(state.authoritativeData, next.patches);
         state.version = next.toVersion;
         state.appliedMessageIds.add(next.messageId);
         const awaitingReconciliation = this.hasSettledLayers(state);
@@ -843,12 +848,7 @@ var ReactiveClient = class {
     state.stale = true;
     state.loading = true;
     this.notifySubscription(state);
-    let request;
-    request = this.ensureRegistered(
-      state,
-      this.wsManager.generation,
-      true
-    ).finally(() => {
+    const request = this.ensureRegistered(state, this.wsManager.generation, true).finally(() => {
       if (state.resyncPromise === request) {
         state.resyncPromise = void 0;
         state.resyncGeneration = void 0;
@@ -916,7 +916,10 @@ var ReactiveClient = class {
     if (options?.optimisticData === void 0) return void 0;
     return (data) => {
       if (!Array.isArray(data)) return data;
-      const optimistic = settled ? result === void 0 ? typeof options.optimisticData === "function" ? options.optimisticData(input, data) : options.optimisticData : result : typeof options.optimisticData === "function" ? options.optimisticData(input, data) : options.optimisticData;
+      const optimistic = settled ? (
+        // oxlint-disable-next-line typescript/prefer-nullish-coalescing -- null is a valid mutation result.
+        result === void 0 ? typeof options.optimisticData === "function" ? options.optimisticData(input, data) : options.optimisticData : result
+      ) : typeof options.optimisticData === "function" ? options.optimisticData(input, data) : options.optimisticData;
       if (settled && optimistic !== null && typeof optimistic === "object") {
         const optimisticId = optimistic.id;
         if (optimisticId !== void 0 && data.some(
@@ -931,12 +934,7 @@ var ReactiveClient = class {
   settleMutationLayers(mutationId, input, result, options, states) {
     for (const state of states) {
       const layer = state.optimisticLayers.get(mutationId);
-      const updater = this.createOptimisticUpdater(
-        input,
-        options,
-        result,
-        true
-      );
+      const updater = this.createOptimisticUpdater(input, options, result, true);
       if (!layer || !updater) continue;
       layer.updater = updater;
       layer.settledRevision = ++state.settlementRevision;