@rocicorp/zero 0.25.0-canary.18 → 0.25.0-canary.21

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, InvalidConnectionRequest, TransformFailed, Unauthorized, InvalidConnectionRequestBaseCookie } from "../../../../zero-protocol/src/error-kind-enum.js";
+import { Rehome, 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";
@@ -19,7 +19,7 @@ import { rowIDString } from "../../types/row-key.js";
 import { Subscription } from "../../types/subscription.js";
 import "../replicator/schema/replication-state.js";
 import { startPoke, ClientHandler } from "./client-handler.js";
-import { CVRStore } from "./cvr-store.js";
+import { CVRStore, ClientNotFoundError } from "./cvr-store.js";
 import { CVRConfigDrivenUpdater, nextEvictionTime, CVRQueryDrivenUpdater } from "./cvr.js";
 import { handleInspect } from "./inspect-handler.js";
 import "../../../../shared/src/config.js";
@@ -101,8 +101,6 @@ class ViewSyncerService {
   // DEPRECATED: remove `authData` in favor of forwarding
   // auth and cookie headers directly
   #authData;
-  // Not sure why lint can't see that this is used?
-  // oxlint-disable-next-line no-unused-private-class-members
   #httpCookie;
   #expiredQueriesTimer = 0;
   #setTimeout;
@@ -260,11 +258,7 @@ class ViewSyncerService {
           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}`;
             lc.info?.(`resetting CVR: ${message}`);
-            throw new ProtocolErrorWithLevel({
-              kind: ClientNotFound,
-              message,
-              origin: ZeroCache
-            });
+            throw new ClientNotFoundError(message);
           }
           if (this.#pipelinesSynced) {
             const result = await this.#advancePipelines(lc, cvr);
@@ -381,6 +375,7 @@ class ViewSyncerService {
     return startSpan(tracer, "vs.initConnection", () => {
       const {
         clientID,
+        profileID,
         wsID,
         baseCookie,
         schemaVersion,
@@ -448,7 +443,17 @@ class ViewSyncerService {
               origin: ZeroCache
             });
           }
-          await this.#handleConfigUpdate(lc2, clientID2, msg, cvr);
+          await this.#handleConfigUpdate(
+            lc2,
+            clientID2,
+            msg,
+            cvr,
+            // Until the profileID is required in the URL, default it to
+            // `cg${clientGroupID}`, as is done in the schema migration.
+            // As clients update to the zero version with the profileID logic,
+            // the value will be correspondingly in the CVR db.
+            profileID ?? `cg${this.id}`
+          );
           this.#initialized.resolve("initialized");
         },
         newClient
@@ -596,7 +601,7 @@ class ViewSyncerService {
     deleted,
     desiredQueriesPatch,
     activeClients
-  }, cvr) => startAsyncSpan(tracer, "vs.#patchQueries", async () => {
+  }, cvr, profileID) => startAsyncSpan(tracer, "vs.#patchQueries", async () => {
     const deletedClientIDs = [];
     const deletedClientGroupIDs = [];
     cvr = await this.#updateCVRConfig(lc, cvr, clientID, (updater) => {
@@ -605,6 +610,9 @@ class ViewSyncerService {
       if (clientSchema) {
         updater.setClientSchema(lc, clientSchema);
       }
+      if (profileID) {
+        updater.setProfileID(lc, profileID);
+      }
       lc.debug?.(`applying ${desiredQueriesPatch?.length} query patches`);
       if (desiredQueriesPatch?.length) {
         for (const patch of desiredQueriesPatch) {
@@ -1464,11 +1472,7 @@ function contentsAndVersion(row) {
 const NEW_CVR_VERSION = { stateVersion: "00" };
 function checkClientAndCVRVersions(client, cvr) {
   if (cmpVersions(cvr, NEW_CVR_VERSION) === 0 && cmpVersions(client, NEW_CVR_VERSION) > 0) {
-    throw new ProtocolErrorWithLevel({
-      kind: ClientNotFound,
-      message: "Client not found",
-      origin: ZeroCache
-    });
+    throw new ClientNotFoundError("Client not found");
   }
   if (cmpVersions(client, cvr) > 0) {
     throw new ProtocolError({