@rocicorp/zero 0.25.10-canary.9 → 0.25.11-canary.0

package/out/zero-cache/src/services/view-syncer/view-syncer.js

@@ -155,7 +155,8 @@ class ViewSyncerService {
   );
   #inspectorDelegate;
   #config;
-  constructor(config, lc, shard, taskID, clientGroupID, cvrDb, upstreamDb, pipelineDriver, versionChanges, drainCoordinator, slowHydrateThreshold, inspectorDelegate, customQueryTransformer, keepaliveMs = DEFAULT_KEEPALIVE_MS, setTimeoutFn = setTimeout.bind(globalThis)) {
+  #runPriorityOp;
+  constructor(config, lc, shard, taskID, clientGroupID, cvrDb, upstreamDb, pipelineDriver, versionChanges, drainCoordinator, slowHydrateThreshold, inspectorDelegate, customQueryTransformer, runPriorityOp, keepaliveMs = DEFAULT_KEEPALIVE_MS, setTimeoutFn = setTimeout.bind(globalThis)) {
     const queryConfig = config.query?.url ? config.query : config.getQueries;
     this.#config = config;
     this.id = clientGroupID;
@@ -181,6 +182,7 @@ class ViewSyncerService {
       () => this.#stateChanges.cancel()
     );
     this.#setTimeout = setTimeoutFn;
+    this.#runPriorityOp = runPriorityOp;
     this.keepalive();
   }
   #getHeaderOptions(forwardCookie) {
@@ -200,11 +202,14 @@ class ViewSyncerService {
       if (!this.#stateChanges.active) {
         this.#lc.debug?.("state changes are inactive");
         clearTimeout(this.#expiredQueriesTimer);
-        throw new ProtocolErrorWithLevel({
-          kind: Rehome,
-          message: "Reconnect required",
-          origin: ZeroCache
-        });
+        throw new ProtocolErrorWithLevel(
+          {
+            kind: Rehome,
+            message: "Reconnect required",
+            origin: ZeroCache
+          },
+          "info"
+        );
       }
       if (await this.#checkForShutdownConditionsInLock()) {
         this.#lc.info?.(`closing clientGroupID=${this.id}`);
@@ -212,8 +217,12 @@ class ViewSyncerService {
         return;
       }
       if (!this.#cvr) {
-        this.#lc.debug?.("loading CVR");
-        this.#cvr = await this.#cvrStore.load(lc, this.#lastConnectTime);
+        this.#lc.debug?.("loading cvr");
+        this.#cvr = await this.#runPriorityOp(
+          lc,
+          "loading cvr",
+          () => this.#cvrStore.load(lc, this.#lastConnectTime)
+        );
         this.#ttlClock = this.#cvr.ttlClock;
         this.#ttlClockBase = Date.now();
       } else {
@@ -269,6 +278,7 @@ class ViewSyncerService {
             }
             lc.info?.(`resetting pipelines: ${result.message}`);
             this.#pipelines.reset(clientSchema);
+            this.#pipelinesSynced = false;
           }
           const version2 = this.#pipelines.advanceWithoutDiff();
           const cvrVer = versionString(cvr.version);
@@ -303,8 +313,9 @@ class ViewSyncerService {
     if (hasExpiredQueries(cvr)) {
       lc = lc.withContext("method", "#removeExpiredQueries");
       lc.debug?.("Queries have expired");
-      await this.#syncQueryPipelineSet(lc, cvr);
-      this.#pipelinesSynced = true;
+      if (this.#pipelinesSynced) {
+        await this.#syncQueryPipelineSet(lc, cvr);
+      }
     }
     this.#scheduleExpireEviction(lc, cvr);
   };
@@ -440,11 +451,14 @@ class ViewSyncerService {
         initConnectionMessage,
         async (lc2, clientID2, msg, cvr) => {
           if (cvr.clientSchema === null && !msg.clientSchema) {
-            throw new ProtocolErrorWithLevel({
-              kind: InvalidConnectionRequest,
-              message: "The initConnection message for a new client group must include client schema.",
-              origin: ZeroCache
-            });
+            throw new ProtocolErrorWithLevel(
+              {
+                kind: InvalidConnectionRequest,
+                message: "The initConnection message for a new client group must include client schema.",
+                origin: ZeroCache
+              },
+              "warn"
+            );
           }
           await this.#handleConfigUpdate(
             lc2,
@@ -488,19 +502,21 @@ class ViewSyncerService {
     this.#ttlClockBase = now;
     return ttlClock;
   }
-  async #flushUpdater(lc, updater) {
-    const now = Date.now();
-    const ttlClock = this.#getTTLClock(now);
-    const { cvr, flushed } = await updater.flush(
-      lc,
-      this.#lastConnectTime,
-      now,
-      ttlClock
-    );
-    if (flushed) {
-      this.#startTTLClockInterval(lc);
-    }
-    return cvr;
+  #flushUpdater(lc, updater) {
+    return this.#runPriorityOp(lc, "flushing cvr", async () => {
+      const now = Date.now();
+      const ttlClock = this.#getTTLClock(now);
+      const { cvr, flushed } = await updater.flush(
+        lc,
+        this.#lastConnectTime,
+        now,
+        ttlClock
+      );
+      if (flushed) {
+        this.#startTTLClockInterval(lc);
+      }
+      return cvr;
+    });
   }
   #startTTLClockInterval(lc) {
     this.#stopTTLClockInterval();
@@ -757,11 +773,16 @@ class ViewSyncerService {
         "Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache."
       );
     }
-    if (this.#customQueryTransformer && customQueries.size > 0) {
-      const transformedCustomQueries = await this.#customQueryTransformer.transform(
-        this.#getHeaderOptions(this.#queryConfig.forwardCookies),
-        customQueries.values(),
-        this.userQueryURL
+    const customQueryTransformer = this.#customQueryTransformer;
+    if (customQueryTransformer && customQueries.size > 0) {
+      const transformedCustomQueries = await this.#runPriorityOp(
+        lc,
+        "#hydrateUnchangedQueries transforming custom queries",
+        () => customQueryTransformer.transform(
+          this.#getHeaderOptions(this.#queryConfig.forwardCookies),
+          customQueries.values(),
+          this.userQueryURL
+        )
       );
       this.#processTransformedCustomQueries(
         lc,
@@ -790,7 +811,7 @@ class ViewSyncerService {
       transformationHash,
       transformedAst
     } of transformedQueries) {
-      const timer = new TimeSliceTimer();
+      const timer = new TimeSliceTimer(lc);
       let count = 0;
       await startAsyncSpan(
         tracer,
@@ -936,16 +957,25 @@ class ViewSyncerService {
         );
       }
       let erroredQueryIDs;
-      if (this.#customQueryTransformer && customQueries.size > 0) {
+      const customQueryTransformer = this.#customQueryTransformer;
+      if (customQueryTransformer && customQueries.size > 0) {
         const transformStart = performance.now();
         let transformedCustomQueries;
         try {
-          transformedCustomQueries = await this.#customQueryTransformer.transform(
-            this.#getHeaderOptions(true),
-            customQueries.values(),
-            this.userQueryURL
+          transformedCustomQueries = await this.#runPriorityOp(
+            lc,
+            "#syncQueryPipelineSet transforming custom queries",
+            () => customQueryTransformer.transform(
+              this.#getHeaderOptions(true),
+              customQueries.values(),
+              this.userQueryURL
+            )
           );
-          this.#queryTransformations.add(1, { result: "success" });
+          if (!Array.isArray(transformedCustomQueries) && transformedCustomQueries.kind === TransformFailed) {
+            throw new ProtocolErrorWithLevel(transformedCustomQueries, "warn");
+          } else {
+            this.#queryTransformations.add(1, { result: "success" });
+          }
         } catch (e) {
           this.#queryTransformations.add(1, { result: "error" });
           throw e;
@@ -953,12 +983,6 @@ class ViewSyncerService {
           const transformDuration = (performance.now() - transformStart) / 1e3;
           this.#queryTransformationTime.record(transformDuration);
         }
-        if (!Array.isArray(transformedCustomQueries) && transformedCustomQueries.kind === TransformFailed) {
-          throw new ProtocolErrorWithLevel(
-            transformedCustomQueries,
-            getLogLevel(transformedCustomQueries.kind)
-          );
-        }
         const successfullyTransformed = /* @__PURE__ */ new Map();
         erroredQueryIDs = this.#processTransformedCustomQueries(
           lc,
@@ -1133,12 +1157,12 @@ class ViewSyncerService {
         }
       }
       let totalProcessTime = 0;
-      const timer = new TimeSliceTimer();
+      const timer = new TimeSliceTimer(lc);
       const pipelines = this.#pipelines;
       const hydrations = this.#hydrations;
       const hydrationTime = this.#hydrationTime;
       const self = this;
-      await yieldProcess();
+      await yieldProcess(lc);
       function* generateRowChanges(slowHydrateThreshold) {
         for (const q of addQueries) {
           lc = lc.withContext("hash", q.id).withContext("transformationHash", q.transformationHash);
@@ -1359,7 +1383,7 @@ class ViewSyncerService {
         "pipelines must be initialized (advancePipelines"
       );
       const start = performance.now();
-      const timer = new TimeSliceTimer();
+      const timer = new TimeSliceTimer(lc);
       const { version: version2, numChanges, changes } = this.#pipelines.advance(timer);
       lc = lc.withContext("newVersion", version2);
       const updater = new CVRQueryDrivenUpdater(
@@ -1464,7 +1488,7 @@ function createHashToIDs(cvr) {
   return hashToIDs;
 }
 const timeSliceQueue = new Lock();
-function yieldProcess() {
+function yieldProcess(_lc) {
   return timeSliceQueue.withLock(() => new Promise(setImmediate));
 }
 function contentsAndVersion(row) {
@@ -1552,8 +1576,12 @@ function hasExpiredQueries(cvr) {
 class TimeSliceTimer {
   #total = 0;
   #start = 0;
+  #lc;
+  constructor(lc) {
+    this.#lc = lc;
+  }
   async start() {
-    await yieldProcess();
+    await yieldProcess(this.#lc);
     return this.startWithoutYielding();
   }
   startWithoutYielding() {
@@ -1563,7 +1591,7 @@ class TimeSliceTimer {
   }
   async yieldProcess(_msgForTesting) {
     this.#stopLap();
-    await yieldProcess();
+    await yieldProcess(this.#lc);
     this.#startLap();
   }
   #startLap() {