@rocicorp/zero 0.25.10 → 0.25.11-canary.0

package/out/zero-client/src/client/zero.js

@@ -36,7 +36,7 @@ import { send } from "../util/socket.js";
 import { ActiveClientsManager } from "./active-clients-manager.js";
 import { Internal, ClientClosed, InvalidMessage, CleanClose, AbruptClose, ConnectTimeout, UnexpectedBaseCookie, NoSocketOrigin, Hidden, PullTimeout, PingTimeout } from "./client-error-kind-enum.js";
 import { ConnectionManager, throwIfConnectionError } from "./connection-manager.js";
-import { Connected, Closed, Disconnected, Connecting, Error as Error$1, NeedsAuth } from "./connection-status-enum.js";
+import { Connected, Connecting, Closed, Disconnected, Error as Error$1, NeedsAuth } from "./connection-status-enum.js";
 import { ConnectionImpl } from "./connection.js";
 import { ZeroContext } from "./context.js";
 import { makeCRUDMutateBatch, addTableCRUDProperties } from "./crud.js";
@@ -58,6 +58,7 @@ import { getServer } from "./server-option.js";
 import { version } from "./version.js";
 import { PokeHandler } from "./zero-poke-handler.js";
 import { ZeroRep, fromReplicacheAuthToken, toReplicacheAuthToken } from "./zero-rep.js";
+import { AbortError } from "../../../shared/src/abort-error.js";
 const RUN_LOOP_INTERVAL_MS = 5e3;
 const DEFAULT_PING_TIMEOUT_MS = 5e3;
 const PULL_TIMEOUT_MS = 5e3;
@@ -147,6 +148,7 @@ class Zero {
   #connectErrorCount = 0;
   #abortPingTimeout = () => {
   };
+  #forceEnableRefresh = false;
   /**
    * The timeout in milliseconds for ping operations. Controls both:
    * - How long to wait in idle before sending a ping
@@ -334,6 +336,7 @@ class Zero {
       enableMutationRecovery: false,
       enablePullAndPushInOpen: false,
       // Zero calls push in its connection management code
+      enableRefresh: () => this.#enableRefresh(),
       onClientsDeleted: (deletedClients) => this.#deleteClientsManager.onClientsDeleted(deletedClients),
       zero: new ZeroRep(
         this.#zeroContext,
@@ -472,6 +475,9 @@ class Zero {
     void this.#runLoop();
     this.#expose();
   }
+  #enableRefresh() {
+    return this.#forceEnableRefresh || !this.#connectionManager.is(Connected) && !this.#connectionManager.is(Connecting);
+  }
   #expose() {
     const g = globalThis;
     if (g.__zero === void 0) {
@@ -1422,6 +1428,7 @@ ${error.errorBody.message}`, error);
           ex
         );
         const transition = getErrorConnectionTransition(ex);
+        let sleepMs = void 0;
         switch (transition.status) {
           case NO_STATUS_TRANSITION: {
             const backoffParams = getBackoffParams(transition.reason);
@@ -1440,7 +1447,7 @@ ${error.errorBody.message}`, error);
               "ms before reconnecting due to error, state:",
               this.#connectionManager.state
             );
-            await sleep(backoffMs);
+            sleepMs = backoffMs;
             break;
           }
           case NeedsAuth: {
@@ -1465,6 +1472,25 @@ ${error.errorBody.message}`, error);
           default:
             unreachable();
         }
+        if (transition.status !== Closed) {
+          try {
+            this.#forceEnableRefresh = true;
+            await this.#rep.runRefresh();
+          } catch (ex2) {
+            if (ex2 instanceof AbortError) {
+              this.#lc.debug?.(
+                `Refresh from storage did not complete before close.`
+              );
+            } else {
+              this.#lc.error?.(`Error during refresh from storage`, ex2);
+            }
+          } finally {
+            this.#forceEnableRefresh = false;
+          }
+        }
+        if (sleepMs) {
+          await sleep(sleepMs);
+        }
       }
     }
   }