@rocicorp/zero 0.2.2024101101 → 0.3.2024102300

package/out/zero-cache/src/workers/syncer.js

@@ -3,14 +3,14 @@ import { resolver } from '@rocicorp/resolver';
 import assert from 'assert';
 import { jwtVerify } from 'jose';
 import { pid } from 'process';
-import { must } from '../../../shared/src/must.js';
-import { promiseVoid } from '../../../shared/src/resolved-promises.js';
-import { sleep } from '../../../shared/src/sleep.js';
 import { MessagePort } from 'worker_threads';
 import { WebSocketServer } from 'ws';
+import { must } from '../../../shared/src/must.js';
+import { promiseVoid } from '../../../shared/src/resolved-promises.js';
 import {} from '../config/zero-config.js';
 import { installWebSocketReceiver } from '../services/dispatcher/websocket-handoff.js';
 import { ServiceRunner } from '../services/runner.js';
+import { DrainCoordinator } from '../services/view-syncer/drain-coordinator.js';
 import { Subscription } from '../types/subscription.js';
 import { Connection } from './connection.js';
 import { createNotifierFrom, subscribeTo } from './replicator.js';
@@ -27,17 +27,20 @@ export class Syncer {
     #viewSyncers;
     #mutagens;
     #connections = new Map();
+    #drainCoordinator = new DrainCoordinator();
     #parent;
     #wss;
     #stopped = resolver();
+    #config;
     #jwtSecretBytes;
     constructor(lc, config, viewSyncerFactory, mutagenFactory, parent) {
+        this.#config = config;
         // Relays notifications from the parent thread subscription
         // to ViewSyncers within this thread.
         const notifier = createNotifierFrom(lc, parent);
         subscribeTo(lc, parent);
         this.#lc = lc;
-        this.#viewSyncers = new ServiceRunner(lc, id => viewSyncerFactory(id, notifier.subscribe()), v => v.keepalive());
+        this.#viewSyncers = new ServiceRunner(lc, id => viewSyncerFactory(id, notifier.subscribe(), this.#drainCoordinator), v => v.keepalive());
         this.#mutagens = new ServiceRunner(lc, mutagenFactory);
         this.#parent = parent;
         this.#wss = new WebSocketServer({ noServer: true });
@@ -62,12 +65,13 @@ export class Syncer {
                 ws.close(3000, 'Failed to decode JWT');
             }
         }
-        const connection = new Connection(this.#lc, decodedToken ?? {}, this.#viewSyncers.getService(clientGroupID), this.#mutagens.getService(clientGroupID), params, ws, () => {
+        const connection = new Connection(this.#lc, this.#config, decodedToken ?? {}, this.#viewSyncers.getService(clientGroupID), this.#mutagens.getService(clientGroupID), params, ws, () => {
             if (this.#connections.get(clientID) === connection) {
                 this.#connections.delete(clientID);
             }
         });
         this.#connections.set(clientID, connection);
+        await connection.handleInitConnection(params.initConnectionMsg);
     };
     run() {
         return this.#stopped.promise;
@@ -81,10 +85,17 @@ export class Syncer {
     async drain() {
         const start = Date.now();
         this.#lc.info?.(`draining ${this.#viewSyncers.size} view-syncers`);
-        for (const viewSyncer of this.#viewSyncers.getServices()) {
-            const hydrationTimeMs = viewSyncer.totalHydrationTimeMs();
-            await viewSyncer.stop();
-            await sleep(hydrationTimeMs);
+        this.#drainCoordinator.drainNextIn(0);
+        while (this.#viewSyncers.size) {
+            await this.#drainCoordinator.forceDrainTimeout;
+            // Pick an arbitrary view syncer to force drain.
+            for (const vs of this.#viewSyncers.getServices()) {
+                this.#lc.debug?.(`draining view-syncer ${vs.id} (forced)`);
+                // When this drain or an elective drain completes, the forceDrainTimeout will
+                // resolve after the next drain interval.
+                void vs.stop();
+                break;
+            }
         }
         this.#lc.info?.(`finished draining (${Date.now() - start} ms)`);
     }

package/out/zero-cache/src/workers/syncer.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"names":[],"mappings":"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"}

package/out/zero-client/src/client/context.d.ts

@@ -1,5 +1,5 @@
 import type { ExperimentalNoIndexDiff } from '../../../replicache/src/mod.js';
-import type { AST } from '../../../zql/src/zql/ast/ast.js';
+import type { AST } from '../../../zero-protocol/src/ast.js';
 import type { Storage } from '../../../zql/src/zql/ivm/operator.js';
 import type { Source } from '../../../zql/src/zql/ivm/source.js';
 import type { CommitListener, GotCallback, QueryDelegate } from '../../../zql/src/zql/query/query-impl.js';

package/out/zero-client/src/client/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,gCAAgC,CAAC;AAE5E,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,iCAAiC,CAAC;AAIzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,sCAAsC,CAAC;AAClE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oCAAoC,CAAC;AAC/D,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACd,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AAGtE,MAAM,MAAM,QAAQ,GAAG,CACrB,GAAG,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,KAClC,MAAM,IAAI,CAAC;AAEhB;;;;GAIG;AACH,qBAAa,WAAY,YAAW,aAAa;;IAU/C,QAAQ,CAAC,qBAAqB,YAAa;gBAE/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,QAAQ;IAKnE,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa3C,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,SArCrD,IAAI;IAyCb,aAAa,IAAI,OAAO;IAIxB,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,MAAM,IAAI;IAOnD,cAAc,CAAC,OAAO,EAAE,uBAAuB;CAsDhD"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,gCAAgC,CAAC;AAE5E,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAI3D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,sCAAsC,CAAC;AAClE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oCAAoC,CAAC;AAC/D,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACX,aAAa,EACd,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AAGtE,MAAM,MAAM,QAAQ,GAAG,CACrB,GAAG,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,KAClC,MAAM,IAAI,CAAC;AAEhB;;;;GAIG;AACH,qBAAa,WAAY,YAAW,aAAa;;IAU/C,QAAQ,CAAC,qBAAqB,YAAa;gBAE/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,QAAQ;IAKnE,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa3C,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,SArCrD,IAAI;IAyCb,aAAa,IAAI,OAAO;IAIxB,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,MAAM,IAAI;IAOnD,cAAc,CAAC,OAAO,EAAE,uBAAuB;CAsDhD"}

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

@@ -0,0 +1,99 @@
+import { assert, unreachable } from '../../../shared/src/asserts.js';
+import { MemorySource } from '../../../zql/src/zql/ivm/memory-source.js';
+import { MemoryStorage } from '../../../zql/src/zql/ivm/memory-storage.js';
+import { ENTITIES_KEY_PREFIX } from './keys.js';
+/**
+ * ZeroContext glues together zql and Replicache. It listens to changes in
+ * Replicache data and pushes them into IVM and on tells the server about new
+ * queries.
+ */
+export class ZeroContext {
+    // It is a bummer to have to maintain separate MemorySources here and copy the
+    // data in from the Replicache db. But we want the data to be accessible via
+    // pipelines *synchronously* and the core Replicache infra is all async. So
+    // that needs to be fixed.
+    #sources = new Map();
+    #tables;
+    #addQuery;
+    #commitListeners = new Set();
+    staticQueryParameters = undefined;
+    constructor(tables, addQuery) {
+        this.#tables = tables;
+        this.#addQuery = addQuery;
+    }
+    getSource(name) {
+        if (this.#sources.has(name)) {
+            return this.#sources.get(name);
+        }
+        const schema = this.#tables[name];
+        const source = schema
+            ? new MemorySource(name, schema.columns, schema.primaryKey)
+            : undefined;
+        this.#sources.set(name, source);
+        return source;
+    }
+    addServerQuery(ast, gotCallback) {
+        return this.#addQuery(ast, gotCallback);
+    }
+    createStorage() {
+        return new MemoryStorage();
+    }
+    onTransactionCommit(cb) {
+        this.#commitListeners.add(cb);
+        return () => {
+            this.#commitListeners.delete(cb);
+        };
+    }
+    processChanges(changes) {
+        try {
+            for (const diff of changes) {
+                const { key } = diff;
+                assert(key.startsWith(ENTITIES_KEY_PREFIX));
+                const slash = key.indexOf('/', ENTITIES_KEY_PREFIX.length);
+                const name = key.slice(ENTITIES_KEY_PREFIX.length, slash);
+                const source = this.getSource(name);
+                if (!source) {
+                    continue;
+                }
+                switch (diff.op) {
+                    case 'del':
+                        assert(typeof diff.oldValue === 'object');
+                        source.push({
+                            type: 'remove',
+                            row: diff.oldValue,
+                        });
+                        break;
+                    case 'add':
+                        assert(typeof diff.newValue === 'object');
+                        source.push({
+                            type: 'add',
+                            row: diff.newValue,
+                        });
+                        break;
+                    case 'change':
+                        assert(typeof diff.newValue === 'object');
+                        assert(typeof diff.oldValue === 'object');
+                        // Edit changes are not yet supported everywhere. For now we only
+                        // generate them in tests.
+                        source.push({
+                            type: 'edit',
+                            row: diff.newValue,
+                            oldRow: diff.oldValue,
+                        });
+                        break;
+                    default:
+                        unreachable(diff);
+                }
+            }
+        }
+        finally {
+            this.#endTransaction();
+        }
+    }
+    #endTransaction() {
+        for (const listener of this.#commitListeners) {
+            listener();
+        }
+    }
+}
+//# sourceMappingURL=context.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../zero-client/src/client/context.ts"],"names":[],"mappings":"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"}

package/out/zero-client/src/client/crud.d.ts

@@ -1,9 +1,10 @@
 import type { MaybePromise } from '../../../shared/src/types.js';
-import { type PrimaryKeyValueRecord } from '../../../zero-protocol/src/primary-key.js';
-import { CRUD_MUTATION_NAME, type CreateOp, type CRUDMutationArg, type CRUDOp, type DeleteOp, type SetOp, type UpdateOp } from '../../../zero-protocol/src/push.js';
-import type { Row } from '../../../zql/src/zql/ivm/data.js';
-import type { PrimaryKey } from '../../../zql/src/zql/ivm/schema.js';
+import type { Row } from '../../../zero-protocol/src/data.js';
+import { type PrimaryKey, type PrimaryKeyValueRecord } from '../../../zero-protocol/src/primary-key.js';
+import { CRUD_MUTATION_NAME, type CRUDMutationArg, type CRUDOp } from '../../../zero-protocol/src/push.js';
+import type { NormalizedPrimaryKey } from '../../../zql/src/zql/query/normalize-table-schema.js';
 import type { SchemaToRow } from '../../../zql/src/zql/query/query.js';
+import type { NormalizedSchema } from './normalized-schema.js';
 import type { MutatorDefs, WriteTransaction } from './replicache-types.js';
 import type { Schema } from './zero.js';
 export type SetValue<R extends Row, PK extends PrimaryKey> = AsPrimaryKeyValueRecord<Pick<R, PK[number]>> & Omit<R, PK[number]>;
@@ -36,19 +37,16 @@ type ZeroCRUDMutate = {
  * queries are `issue` and `label`, then this object will have `issue` and
  * `label` properties.
  */
-export declare function makeCRUDMutate<const S extends Schema>(schema: S, repMutate: ZeroCRUDMutate): MakeCRUDMutate<S>;
+export declare function makeCRUDMutate<const S extends Schema>(schema: NormalizedSchema, repMutate: ZeroCRUDMutate): MakeCRUDMutate<S>;
 /**
  * Creates the `{create, set, update, delete}` object for use inside a batch.
  */
-export declare function makeBatchCRUDMutate<R extends Row, PK extends PrimaryKey>(tableName: string, schema: Schema, ops: CRUDOp[]): RowCRUDMutate<R, PK>;
+export declare function makeBatchCRUDMutate<R extends Row, PK extends NormalizedPrimaryKey>(tableName: string, schema: NormalizedSchema, ops: CRUDOp[]): RowCRUDMutate<R, PK>;
 export type WithCRUD<MD extends MutatorDefs> = MD & {
     [CRUD_MUTATION_NAME]: CRUDMutator;
 };
 export type CRUDMutate = (crudArg: CRUDMutationArg) => Promise<void>;
 export type CRUDMutator = (tx: WriteTransaction, crudArg: CRUDMutationArg) => Promise<void>;
-export declare function makeCRUDMutator<S extends Schema>(schema: S): CRUDMutator;
-export declare function setImpl(tx: WriteTransaction, arg: CreateOp | SetOp, schema: Schema): Promise<void>;
-export declare function updateImpl(tx: WriteTransaction, arg: UpdateOp, schema: Schema): Promise<void>;
-export declare function deleteImpl(tx: WriteTransaction, arg: DeleteOp, schema: Schema): Promise<void>;
+export declare function makeCRUDMutator(schema: NormalizedSchema): CRUDMutator;
 export {};
 //# sourceMappingURL=crud.d.ts.map

package/out/zero-client/src/client/crud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crud.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/crud.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"crud.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/crud.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,181 @@
+import { promiseVoid } from '../../../shared/src/resolved-promises.js';
+import {} from '../../../zero-protocol/src/primary-key.js';
+import { CRUD_MUTATION_NAME, } from '../../../zero-protocol/src/push.js';
+import { toPrimaryKeyString } from './keys.js';
+/**
+ * This is the zero.mutate object part representing the CRUD operations. If the
+ * queries are `issue` and `label`, then this object will have `issue` and
+ * `label` properties.
+ */
+export function makeCRUDMutate(schema, repMutate) {
+    const { [CRUD_MUTATION_NAME]: zeroCRUD } = repMutate;
+    let inBatch = false;
+    const mutate = async (body) => {
+        if (inBatch) {
+            throw new Error('Cannot call mutate inside a batch');
+        }
+        inBatch = true;
+        try {
+            const ops = [];
+            const m = {};
+            for (const name of Object.keys(schema.tables)) {
+                m[name] = makeBatchCRUDMutate(name, schema, ops);
+            }
+            const rv = await body(m);
+            await zeroCRUD({ ops });
+            return rv;
+        }
+        finally {
+            inBatch = false;
+        }
+    };
+    const assertNotInBatch = (tableName, op) => {
+        if (inBatch) {
+            throw new Error(`Cannot call mutate.${tableName}.${op} inside a batch`);
+        }
+    };
+    for (const [name, tableSchema] of Object.entries(schema.tables)) {
+        mutate[name] = makeEntityCRUDMutate(name, tableSchema.primaryKey, zeroCRUD, assertNotInBatch);
+    }
+    return mutate;
+}
+/**
+ * Creates the `{create, set, update, delete}` object for use outside a batch.
+ */
+function makeEntityCRUDMutate(tableName, primaryKey, zeroCRUD, assertNotInBatch) {
+    return {
+        create: (value) => {
+            assertNotInBatch(tableName, 'create');
+            const op = {
+                op: 'create',
+                tableName,
+                primaryKey,
+                value,
+            };
+            return zeroCRUD({ ops: [op] });
+        },
+        set: (value) => {
+            assertNotInBatch(tableName, 'set');
+            const op = {
+                op: 'set',
+                tableName,
+                primaryKey,
+                value,
+            };
+            return zeroCRUD({ ops: [op] });
+        },
+        update: (value) => {
+            assertNotInBatch(tableName, 'update');
+            const op = {
+                op: 'update',
+                tableName,
+                primaryKey,
+                value,
+            };
+            return zeroCRUD({ ops: [op] });
+        },
+        delete: (id) => {
+            assertNotInBatch(tableName, 'delete');
+            const op = {
+                op: 'delete',
+                tableName,
+                primaryKey,
+                value: id,
+            };
+            return zeroCRUD({ ops: [op] });
+        },
+    };
+}
+/**
+ * Creates the `{create, set, update, delete}` object for use inside a batch.
+ */
+export function makeBatchCRUDMutate(tableName, schema, ops) {
+    const { primaryKey } = schema.tables[tableName];
+    return {
+        create: (value) => {
+            const op = {
+                op: 'create',
+                tableName,
+                primaryKey,
+                value,
+            };
+            ops.push(op);
+            return promiseVoid;
+        },
+        set: (value) => {
+            const op = {
+                op: 'set',
+                tableName,
+                primaryKey,
+                value,
+            };
+            ops.push(op);
+            return promiseVoid;
+        },
+        update: (value) => {
+            const op = {
+                op: 'update',
+                tableName,
+                primaryKey,
+                value,
+            };
+            ops.push(op);
+            return promiseVoid;
+        },
+        delete: (id) => {
+            const op = {
+                op: 'delete',
+                tableName,
+                primaryKey,
+                value: id,
+            };
+            ops.push(op);
+            return promiseVoid;
+        },
+    };
+}
+export function makeCRUDMutator(schema) {
+    return async function zeroCRUDMutator(tx, crudArg) {
+        for (const op of crudArg.ops) {
+            switch (op.op) {
+                case 'create':
+                    await createImpl(tx, op, schema);
+                    break;
+                case 'set':
+                    await setImpl(tx, op, schema);
+                    break;
+                case 'update':
+                    await updateImpl(tx, op, schema);
+                    break;
+                case 'delete':
+                    await deleteImpl(tx, op, schema);
+                    break;
+            }
+        }
+    };
+}
+async function createImpl(tx, arg, schema) {
+    const key = toPrimaryKeyString(arg.tableName, schema.tables[arg.tableName].primaryKey, arg.value);
+    if (!(await tx.has(key))) {
+        await tx.set(key, arg.value);
+    }
+}
+async function setImpl(tx, arg, schema) {
+    const key = toPrimaryKeyString(arg.tableName, schema.tables[arg.tableName].primaryKey, arg.value);
+    await tx.set(key, arg.value);
+}
+async function updateImpl(tx, arg, schema) {
+    const key = toPrimaryKeyString(arg.tableName, schema.tables[arg.tableName].primaryKey, arg.value);
+    const prev = await tx.get(key);
+    if (prev === undefined) {
+        return;
+    }
+    const update = arg.value;
+    const next = { ...prev, ...update };
+    await tx.set(key, next);
+}
+async function deleteImpl(tx, arg, schema) {
+    const key = toPrimaryKeyString(arg.tableName, schema.tables[arg.tableName].primaryKey, arg.value);
+    await tx.del(key);
+}
+//# sourceMappingURL=crud.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../../../../zero-client/src/client/crud.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,21 @@
+// https://www.oreilly.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
+const IPV4_ADDRESS_REGEX = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+// This doesn't ensure a valid ipv6, but any ipv6 hostname will
+// match this regex, and no domain based hostnames will.
+const IPV6_ADDRESS_HOSTNAME_REGEX = /^\[[a-fA-F0-9:]*:[a-fA-F0-9:]*\]$/;
+export const IP_ADDRESS_HOSTNAME_REGEX = new RegExp(`(${IPV4_ADDRESS_REGEX.source}|${IPV6_ADDRESS_HOSTNAME_REGEX.source})`);
+export function shouldEnableAnalytics(server, enableAnalytics = true) {
+    if (!enableAnalytics) {
+        return false;
+    }
+    const serverURL = server === null ? null : new URL(server);
+    const socketHostname = serverURL?.hostname;
+    // If the hostname is undefined, localhost, or an ip address, then
+    // this is most likely a test or local development, in which case we
+    // do not want to enable analytics.
+    return (server !== null &&
+        socketHostname !== undefined &&
+        socketHostname !== 'localhost' &&
+        !IP_ADDRESS_HOSTNAME_REGEX.test(socketHostname));
+}
+//# sourceMappingURL=enable-analytics.js.map

package/out/zero-client/src/client/enable-analytics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enable-analytics.js","sourceRoot":"","sources":["../../../../../zero-client/src/client/enable-analytics.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,MAAM,kBAAkB,GACtB,6FAA6F,CAAC;AAChG,+DAA+D;AAC/D,wDAAwD;AACxD,MAAM,2BAA2B,GAAG,mCAAmC,CAAC;AAExE,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,MAAM,CACjD,IAAI,kBAAkB,CAAC,MAAM,IAAI,2BAA2B,CAAC,MAAM,GAAG,CACvE,CAAC;AAEF,MAAM,UAAU,qBAAqB,CACnC,MAAqB,EACrB,eAAe,GAAG,IAAI;IAEtB,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,SAAS,EAAE,QAAQ,CAAC;IAC3C,kEAAkE;IAClE,oEAAoE;IACpE,mCAAmC;IACnC,OAAO,CACL,MAAM,KAAK,IAAI;QACf,cAAc,KAAK,SAAS;QAC5B,cAAc,KAAK,WAAW;QAC9B,CAAC,yBAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAChD,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,14 @@
+import { assert } from '../../../shared/src/asserts.js';
+export function toWSString(url) {
+    return ('ws' + url.slice(4));
+}
+export function toHTTPString(url) {
+    return ('http' + url.slice(2));
+}
+export function assertHTTPString(url) {
+    assert(/^https?:\/\//.test(url));
+}
+export function assertWSString(url) {
+    assert(/^wss?:\/\//.test(url));
+}
+//# sourceMappingURL=http-string.js.map

package/out/zero-client/src/client/http-string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-string.js","sourceRoot":"","sources":["../../../../../zero-client/src/client/http-string.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAMtD,MAAM,UAAU,UAAU,CAAC,GAAe;IACxC,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAa,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAa;IACxC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAe,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC"}

package/out/zero-client/src/client/keys.d.ts

@@ -1,4 +1,5 @@
-import type { PrimaryKey, PrimaryKeyValueRecord } from '../../../zero-protocol/src/primary-key.js';
+import type { Row } from '../../../zero-protocol/src/data.js';
+import type { NormalizedPrimaryKey } from '../../../zql/src/zql/query/normalize-table-schema.js';
 export declare const CLIENTS_KEY_PREFIX = "c/";
 export declare const DESIRED_QUERIES_KEY_PREFIX = "d/";
 export declare const GOT_QUERIES_KEY_PREFIX = "g/";
@@ -7,5 +8,5 @@ export declare function toClientsKey(clientID: string): string;
 export declare function toDesiredQueriesKey(clientID: string, hash: string): string;
 export declare function desiredQueriesPrefixForClient(clientID: string): string;
 export declare function toGotQueriesKey(hash: string): string;
-export declare function toPrimaryKeyString(tableName: string, primaryKey: PrimaryKey, id: PrimaryKeyValueRecord): string;
+export declare function toPrimaryKeyString(tableName: string, primaryKey: NormalizedPrimaryKey, value: Row): string;
 //# sourceMappingURL=keys.d.ts.map

package/out/zero-client/src/client/keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/keys.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,qBAAqB,EACtB,MAAM,2CAA2C,CAAC;AAEnD,eAAO,MAAM,kBAAkB,OAAO,CAAC;AACvC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAcD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,qBAAqB,GACxB,MAAM,CAaR"}
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/keys.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAE5D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sDAAsD,CAAC;AAE/F,eAAO,MAAM,kBAAkB,OAAO,CAAC;AACvC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,oBAAoB,EAChC,KAAK,EAAE,GAAG,GACT,MAAM,CAeR"}

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

@@ -0,0 +1,32 @@
+import { h64WithReverse } from '../../../shared/src/h64-with-reverse.js';
+import * as v from '../../../shared/src/valita.js';
+import { primaryKeyValueSchema } from '../../../zero-protocol/src/primary-key.js';
+export const CLIENTS_KEY_PREFIX = 'c/';
+export const DESIRED_QUERIES_KEY_PREFIX = 'd/';
+export const GOT_QUERIES_KEY_PREFIX = 'g/';
+export const ENTITIES_KEY_PREFIX = 'e/';
+export function toClientsKey(clientID) {
+    return CLIENTS_KEY_PREFIX + clientID;
+}
+export function toDesiredQueriesKey(clientID, hash) {
+    return DESIRED_QUERIES_KEY_PREFIX + clientID + '/' + hash;
+}
+export function desiredQueriesPrefixForClient(clientID) {
+    return DESIRED_QUERIES_KEY_PREFIX + clientID + '/';
+}
+export function toGotQueriesKey(hash) {
+    return GOT_QUERIES_KEY_PREFIX + hash;
+}
+export function toPrimaryKeyString(tableName, primaryKey, value) {
+    if (primaryKey.length === 1) {
+        return (ENTITIES_KEY_PREFIX +
+            tableName +
+            '/' +
+            v.parse(value[primaryKey[0]], primaryKeyValueSchema));
+    }
+    const values = primaryKey.map(k => v.parse(value[k], primaryKeyValueSchema));
+    const str = JSON.stringify(values);
+    const idSegment = h64WithReverse(str);
+    return ENTITIES_KEY_PREFIX + tableName + '/' + idSegment;
+}
+//# sourceMappingURL=keys.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../../../zero-client/src/client/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,yCAAyC,CAAC;AACvE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,OAAO,EAAC,qBAAqB,EAAC,MAAM,2CAA2C,CAAC;AAGhF,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAC;AACvC,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAC3C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAExC,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,OAAO,kBAAkB,GAAG,QAAQ,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAgB,EAAE,IAAY;IAChE,OAAO,0BAA0B,GAAG,QAAQ,GAAG,GAAG,GAAG,IAAI,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,QAAgB;IAC5D,OAAO,0BAA0B,GAAG,QAAQ,GAAG,GAAG,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,sBAAsB,GAAG,IAAI,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,UAAgC,EAChC,KAAU;IAEV,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CACL,mBAAmB;YACnB,SAAS;YACT,GAAG;YACH,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CACrD,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC7E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACtC,OAAO,mBAAmB,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC;AAC3D,CAAC"}

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

@@ -0,0 +1,57 @@
+import { TeeLogSink, consoleLogSink, } from '@rocicorp/logger';
+import { DatadogLogSink, } from '../../../datadog/src/mod.js';
+import { version } from './version.js';
+class LevelFilterLogSink {
+    #wrappedLogSink;
+    #level;
+    constructor(wrappedLogSink, level) {
+        this.#wrappedLogSink = wrappedLogSink;
+        this.#level = level;
+    }
+    log(level, context, ...args) {
+        if (this.#level === 'error' && level !== 'error') {
+            return;
+        }
+        if (this.#level === 'info' && level === 'debug') {
+            return;
+        }
+        this.#wrappedLogSink.log(level, context, ...args);
+    }
+    async flush() {
+        await consoleLogSink.flush?.();
+    }
+}
+const DATADOG_LOG_LEVEL = 'info';
+const ZERO_SASS_DOMAIN = '.reflect-server.net';
+export function createLogOptions(options, createDatadogLogSink = (options) => new DatadogLogSink(options)) {
+    const { consoleLogLevel, server, enableAnalytics } = options;
+    if (!enableAnalytics || server === null) {
+        return {
+            logLevel: consoleLogLevel,
+            logSink: consoleLogSink,
+        };
+    }
+    const serverURL = new URL(server);
+    const socketHostname = serverURL.hostname;
+    const datadogServiceLabel = socketHostname.endsWith(ZERO_SASS_DOMAIN)
+        ? socketHostname
+            .substring(0, socketHostname.length - ZERO_SASS_DOMAIN.length)
+            .toLowerCase()
+        : socketHostname;
+    const baseURL = new URL('/api/logs/v0/log', server);
+    const logLevel = consoleLogLevel === 'debug' ? 'debug' : 'info';
+    const logSink = new TeeLogSink([
+        new LevelFilterLogSink(consoleLogSink, consoleLogLevel),
+        new LevelFilterLogSink(createDatadogLogSink({
+            service: datadogServiceLabel,
+            host: location.host,
+            version,
+            baseURL,
+        }), DATADOG_LOG_LEVEL),
+    ]);
+    return {
+        logLevel,
+        logSink,
+    };
+}
+//# sourceMappingURL=log-options.js.map