@rocicorp/zero 0.25.0-canary.8 → 0.25.0-canary.9

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

@@ -8,7 +8,7 @@ import { stringify } from "../../../../shared/src/bigint-json.js";
 import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
 import { must } from "../../../../shared/src/must.js";
 import { randInt } from "../../../../shared/src/rand.js";
-import { Rehome, ClientNotFound, TransformFailed, Unauthorized, InvalidConnectionRequestBaseCookie } from "../../../../zero-protocol/src/error-kind-enum.js";
+import { Rehome, ClientNotFound, InvalidConnectionRequest, TransformFailed, Unauthorized, InvalidConnectionRequestBaseCookie } from "../../../../zero-protocol/src/error-kind-enum.js";
 import { ZeroCache } from "../../../../zero-protocol/src/error-origin-enum.js";
 import { ProtocolError } from "../../../../zero-protocol/src/error.js";
 import { clampTTL, MAX_TTL_MS } from "../../../../zql/src/query/ttl.js";
@@ -156,11 +156,11 @@ 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)) {
-    const { getQueries: pullConfig } = config;
+    const queryConfig = config.query?.url ? config.query : config.getQueries;
     this.#config = config;
     this.id = clientGroupID;
     this.#shard = shard;
-    this.#queryConfig = pullConfig;
+    this.#queryConfig = queryConfig;
     this.#lc = lc;
     this.#pipelines = pipelineDriver;
     this.#stateChanges = versionChanges;
@@ -249,8 +249,12 @@ class ViewSyncerService {
         }
         assert(state === "version-ready", "state should be version-ready");
         await this.#runInLockWithCVR(async (lc, cvr) => {
+          const clientSchema = must(
+            cvr.clientSchema,
+            "cvr.clientSchema missing after initialization"
+          );
           if (!this.#pipelines.initialized()) {
-            this.#pipelines.init(must(cvr.clientSchema));
+            this.#pipelines.init(clientSchema);
           }
           if (cvr.replicaVersion !== null && cvr.version.stateVersion !== "00" && this.#pipelines.replicaVersion < cvr.replicaVersion) {
             const message = `Cannot sync from older replica: CVR=${cvr.replicaVersion}, DB=${this.#pipelines.replicaVersion}`;
@@ -267,7 +271,7 @@ class ViewSyncerService {
               return;
             }
             lc.info?.(`resetting pipelines: ${result.message}`);
-            this.#pipelines.reset(must(cvr.clientSchema));
+            this.#pipelines.reset(clientSchema);
           }
           const version2 = this.#pipelines.advanceWithoutDiff();
           const cvrVer = versionString(cvr.version);
@@ -286,11 +290,14 @@ class ViewSyncerService {
       }
       this.#cleanup();
     } catch (e) {
-      this.#lc[getLogLevel(e)]?.(`stopping view-syncer: ${String(e)}`, e);
+      this.#lc[getLogLevel(e)]?.(
+        `stopping view-syncer ${this.id}: ${String(e)}`,
+        e
+      );
       this.#cleanup(e);
     } finally {
       await this.#cvrStore.flushed(this.#lc).catch((e) => this.#lc[getLogLevel(e)]?.(e));
-      this.#lc.info?.("view-syncer stopped");
+      this.#lc.info?.(`view-syncer ${this.id} finished`);
       this.#stopped.resolve();
     }
   }
@@ -381,7 +388,6 @@ class ViewSyncerService {
         protocolVersion
       } = ctx;
       this.#authData = pickToken(this.#lc, this.#authData, tokenData);
-      this.#initialized.resolve("initialized");
       this.#lc.debug?.(
         `Picked auth token: ${JSON.stringify(this.#authData?.decoded)}`
       );
@@ -391,7 +397,7 @@ class ViewSyncerService {
         this.userQueryURL = userQueryURL;
       } else {
         if (this.userQueryURL !== userQueryURL) {
-          this.#lc.error?.(
+          this.#lc.warn?.(
             "Client provided different query parameters than client group",
             {
               clientID,
@@ -433,7 +439,17 @@ class ViewSyncerService {
       void this.#runInLockForClient(
         ctx,
         initConnectionMessage,
-        this.#handleConfigUpdate,
+        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
+            });
+          }
+          await this.#handleConfigUpdate(lc2, clientID2, msg, cvr);
+          this.#initialized.resolve("initialized");
+        },
         newClient
       ).catch((e) => newClient.fail(e));
       return downstream;
@@ -443,15 +459,11 @@ class ViewSyncerService {
     await this.#runInLockForClient(ctx, msg, this.#handleConfigUpdate);
   }
   async deleteClients(ctx, msg) {
-    try {
-      await this.#runInLockForClient(
-        ctx,
-        [msg[0], { deleted: msg[1] }],
-        this.#handleConfigUpdate
-      );
-    } catch (e) {
-      this.#lc.error?.("deleteClients failed", e);
-    }
+    await this.#runInLockForClient(
+      ctx,
+      [msg[0], { deleted: msg[1] }],
+      this.#handleConfigUpdate
+    );
   }
   #getTTLClock(now) {
     const delta = now - this.#ttlClockBase;
@@ -729,8 +741,8 @@ class ViewSyncerService {
     }
     const transformedQueries = [];
     if (customQueries.size > 0 && !this.#customQueryTransformer) {
-      lc.error?.(
-        "Custom/named queries were requested but no `ZERO_GET_QUERIES_URL` is configured for Zero Cache."
+      lc.warn?.(
+        "Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache."
       );
     }
     if (this.#customQueryTransformer && customQueries.size > 0) {
@@ -808,7 +820,7 @@ class ViewSyncerService {
     for (const q of transformedCustomQueries) {
       if ("error" in q) {
         const errorMessage = `Error transforming custom query ${q.name}: ${q.error}${q.details ? ` ${JSON.stringify(q.details)}` : ""}`;
-        lc.error?.(errorMessage, q);
+        lc.warn?.(errorMessage, q);
         appQueryErrors.push(q);
         continue;
       }
@@ -907,8 +919,8 @@ class ViewSyncerService {
         });
       }
       if (customQueries.size > 0 && !this.#customQueryTransformer) {
-        lc.error?.(
-          "Custom/named queries were requested but no `ZERO_GET_QUERIES_URL` is configured for Zero Cache."
+        lc.warn?.(
+          "Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache."
         );
       }
       let erroredQueryIDs;
@@ -1002,10 +1014,21 @@ class ViewSyncerService {
         );
       }
       if (erroredQueryIDs) {
+        const successfulHashes = new Set(
+          transformedQueries.map(
+            ({ transformed }) => transformed.transformationHash
+          )
+        );
         for (const queryID of erroredQueryIDs) {
+          let lastKnownHash;
+          const cvrQuery = cvr.queries[queryID];
+          if (cvrQuery?.transformationHash) {
+            lastKnownHash = cvrQuery.transformationHash;
+          }
+          const transformationHash = lastKnownHash && successfulHashes.has(lastKnownHash) ? void 0 : lastKnownHash;
           removeQueries.push({
             id: queryID,
-            transformationHash: void 0
+            transformationHash
           });
         }
       }