@rocicorp/zero 0.26.0-canary.0 → 0.26.0-canary.3

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

@@ -1 +1 @@
-{"version":3,"file":"syncer.js","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {resolver} from '@rocicorp/resolver';\nimport {type JWTPayload} from 'jose';\nimport {pid} from 'node:process';\nimport type {MessagePort} from 'node:worker_threads';\nimport {WebSocketServer, type ServerOptions, type WebSocket} from 'ws';\nimport {promiseVoid} from '../../../shared/src/resolved-promises.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {tokenConfigOptions, verifyToken} from '../auth/jwt.ts';\nimport {type ZeroConfig} from '../config/zero-config.ts';\nimport {\n  recordConnectionAttempted,\n  recordConnectionSuccess,\n  setActiveClientGroupsGetter,\n} from '../server/anonymous-otel-start.ts';\nimport type {Mutagen} from '../services/mutagen/mutagen.ts';\nimport type {Pusher} from '../services/mutagen/pusher.ts';\nimport type {ReplicaState} from '../services/replicator/replicator.ts';\nimport {ServiceRunner} from '../services/runner.ts';\nimport type {\n  ActivityBasedService,\n  Service,\n  SingletonService,\n} from '../services/service.ts';\nimport {DrainCoordinator} from '../services/view-syncer/drain-coordinator.ts';\nimport type {ViewSyncer} from '../services/view-syncer/view-syncer.ts';\nimport type {Worker} from '../types/processes.ts';\nimport type {Subscription} from '../types/subscription.ts';\nimport {installWebSocketReceiver} from '../types/websocket-handoff.ts';\nimport type {ConnectParams} from './connect-params.ts';\nimport {Connection, sendError} from './connection.ts';\nimport {createNotifierFrom, subscribeTo} from './replicator.ts';\nimport {SyncerWsMessageHandler} from './syncer-ws-message-handler.ts';\n\nexport type SyncerWorkerData = {\n  replicatorPort: MessagePort;\n};\n\nfunction getWebSocketServerOptions(config: ZeroConfig): ServerOptions {\n  const options: ServerOptions = {\n    noServer: true,\n  };\n\n  if (config.websocketCompression) {\n    options.perMessageDeflate = true;\n\n    if (config.websocketCompressionOptions) {\n      try {\n        const compressionOptions = JSON.parse(\n          config.websocketCompressionOptions,\n        );\n        options.perMessageDeflate = compressionOptions;\n      } catch (e) {\n        throw new Error(\n          `Failed to parse ZERO_WEBSOCKET_COMPRESSION_OPTIONS: ${String(e)}. Expected valid JSON.`,\n        );\n      }\n    }\n  }\n\n  return options;\n}\n\n/**\n * The Syncer worker receives websocket handoffs for \"/sync\" connections\n * from the Dispatcher in the main thread, and creates websocket\n * {@link Connection}s with a corresponding {@link ViewSyncer}, {@link Mutagen},\n * and {@link Subscription} to version notifications from the Replicator\n * worker.\n */\nexport class Syncer implements SingletonService {\n  readonly id = `syncer-${pid}`;\n  readonly #lc: LogContext;\n  readonly #viewSyncers: ServiceRunner<ViewSyncer & ActivityBasedService>;\n  readonly #mutagens: ServiceRunner<Mutagen & Service>;\n  readonly #pushers: ServiceRunner<Pusher & Service> | undefined;\n  readonly #connections = new Map<string, Connection>();\n  readonly #drainCoordinator = new DrainCoordinator();\n  readonly #parent: Worker;\n  readonly #wss: WebSocketServer;\n  readonly #stopped = resolver();\n  readonly #config: ZeroConfig;\n\n  constructor(\n    lc: LogContext,\n    config: ZeroConfig,\n    viewSyncerFactory: (\n      id: string,\n      sub: Subscription<ReplicaState>,\n      drainCoordinator: DrainCoordinator,\n    ) => ViewSyncer & ActivityBasedService,\n    mutagenFactory: (id: string) => Mutagen & Service,\n    pusherFactory: ((id: string) => Pusher & Service) | undefined,\n    parent: Worker,\n  ) {\n    this.#config = config;\n    // Relays notifications from the parent thread subscription\n    // to ViewSyncers within this thread.\n    const notifier = createNotifierFrom(lc, parent);\n    subscribeTo(lc, parent);\n\n    this.#lc = lc;\n    this.#viewSyncers = new ServiceRunner(\n      lc,\n      id => viewSyncerFactory(id, notifier.subscribe(), this.#drainCoordinator),\n      v => v.keepalive(),\n    );\n    this.#mutagens = new ServiceRunner(lc, mutagenFactory, m => m.hasRefs());\n    if (pusherFactory) {\n      this.#pushers = new ServiceRunner(lc, pusherFactory, p => p.hasRefs());\n    }\n    this.#parent = parent;\n    this.#wss = new WebSocketServer(getWebSocketServerOptions(config));\n\n    installWebSocketReceiver(\n      lc,\n      this.#wss,\n      this.#createConnection,\n      this.#parent,\n    );\n\n    setActiveClientGroupsGetter(() => this.#viewSyncers.size);\n  }\n\n  readonly #createConnection = async (ws: WebSocket, params: ConnectParams) => {\n    this.#lc.debug?.(\n      'creating connection',\n      params.clientGroupID,\n      params.clientID,\n    );\n    recordConnectionAttempted();\n    const {clientID, clientGroupID, auth, userID} = params;\n    const existing = this.#connections.get(clientID);\n    if (existing) {\n      this.#lc.debug?.(\n        `client ${clientID} already connected, closing existing connection`,\n      );\n      existing.close(`replaced by ${params.wsID}`);\n    }\n\n    let decodedToken: JWTPayload | undefined;\n    if (auth) {\n      const tokenOptions = tokenConfigOptions(this.#config.auth);\n\n      const hasPushOrMutate =\n        this.#config?.push?.url !== undefined ||\n        this.#config?.mutate?.url !== undefined;\n      const hasQueries =\n        this.#config?.query?.url !== undefined ||\n        this.#config?.getQueries?.url !== undefined;\n\n      // must either have one of the token options set or have custom mutations & queries enabled\n      const hasExactlyOneTokenOption = tokenOptions.length === 1;\n      const hasCustomEndpoints = hasPushOrMutate && hasQueries;\n      if (!hasExactlyOneTokenOption && !hasCustomEndpoints) {\n        throw new Error(\n          'Exactly one of jwk, secret, or jwksUrl must be set in order to verify tokens but actually the following were set: ' +\n            JSON.stringify(tokenOptions) +\n            '. You may also set both ZERO_MUTATE_URL and ZERO_QUERY_URL to enable custom mutations and queries without passing token verification options.',\n        );\n      }\n\n      if (tokenOptions.length > 0) {\n        try {\n          decodedToken = await verifyToken(this.#config.auth, auth, {\n            subject: userID,\n          });\n          this.#lc.debug?.(\n            `Received auth token ${auth} for clientID ${clientID}, decoded: ${JSON.stringify(decodedToken)}`,\n          );\n        } catch (e) {\n          sendError(\n            this.#lc,\n            ws,\n            {\n              kind: ErrorKind.AuthInvalidated,\n              message: `Failed to decode auth token: ${String(e)}`,\n              origin: ErrorOrigin.ZeroCache,\n            },\n            e,\n          );\n          ws.close(3000, 'Failed to decode JWT');\n          return;\n        }\n      } else {\n        this.#lc.warn?.(\n          `One of jwk, secret, or jwksUrl is not configured - the \\`authorization\\` header must be manually verified by the user`,\n        );\n      }\n    } else {\n      this.#lc.debug?.(`No auth token received for clientID ${clientID}`);\n    }\n\n    const mutagen = this.#mutagens.getService(clientGroupID);\n    const pusher = this.#pushers?.getService(clientGroupID);\n    // a new connection is using the mutagen and pusher. Bump their ref counts.\n    mutagen.ref();\n    pusher?.ref();\n\n    let connection: Connection;\n    try {\n      connection = new Connection(\n        this.#lc,\n        params,\n        ws,\n        new SyncerWsMessageHandler(\n          this.#lc,\n          params,\n          auth\n            ? {\n                raw: auth,\n                decoded: decodedToken ?? {},\n              }\n            : undefined,\n          this.#viewSyncers.getService(clientGroupID),\n          mutagen,\n          pusher,\n        ),\n        () => {\n          if (this.#connections.get(clientID) === connection) {\n            this.#connections.delete(clientID);\n          }\n          // Connection is closed. We can unref the mutagen and pusher.\n          // If their ref counts are zero, they will stop themselves and set themselves invalid.\n          mutagen.unref();\n          pusher?.unref();\n        },\n      );\n    } catch (e) {\n      mutagen.unref();\n      pusher?.unref();\n      throw e;\n    }\n\n    this.#connections.set(clientID, connection);\n\n    connection.init() && recordConnectionSuccess();\n\n    if (params.initConnectionMsg) {\n      this.#lc.debug?.(\n        'handling init connection message from sec header',\n        params.clientGroupID,\n        params.clientID,\n      );\n      await connection.handleInitConnection(\n        JSON.stringify(params.initConnectionMsg),\n      );\n    }\n  };\n\n  run() {\n    return this.#stopped.promise;\n  }\n\n  /**\n   * Graceful shutdown involves shutting down view syncers one at a time, pausing\n   * for the duration of view syncer's hydration between each one. This paces the\n   * disconnects to avoid creating a backlog of hydrations in the receiving server\n   * when the clients reconnect.\n   */\n  async drain() {\n    const start = Date.now();\n    this.#lc.info?.(`draining ${this.#viewSyncers.size} view-syncers`);\n\n    this.#drainCoordinator.drainNextIn(0);\n\n    while (this.#viewSyncers.size) {\n      await this.#drainCoordinator.forceDrainTimeout;\n\n      // Pick an arbitrary view syncer to force drain.\n      for (const vs of this.#viewSyncers.getServices()) {\n        this.#lc.debug?.(`draining view-syncer ${vs.id} (forced)`);\n        // When this drain or an elective drain completes, the forceDrainTimeout will\n        // resolve after the next drain interval.\n        void vs.stop();\n        break;\n      }\n    }\n    this.#lc.info?.(`finished draining (${Date.now() - start} ms)`);\n  }\n\n  stop() {\n    this.#wss.close();\n    this.#stopped.resolve();\n    return promiseVoid;\n  }\n}\n"],"names":["ErrorKind.AuthInvalidated","ErrorOrigin.ZeroCache"],"mappings":"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"}
+{"version":3,"file":"syncer.js","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {resolver} from '@rocicorp/resolver';\nimport {type JWTPayload} from 'jose';\nimport {pid} from 'node:process';\nimport type {MessagePort} from 'node:worker_threads';\nimport {WebSocketServer, type ServerOptions, type WebSocket} from 'ws';\nimport {promiseVoid} from '../../../shared/src/resolved-promises.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {tokenConfigOptions, verifyToken} from '../auth/jwt.ts';\nimport {type ZeroConfig} from '../config/zero-config.ts';\nimport {\n  recordConnectionAttempted,\n  recordConnectionSuccess,\n  setActiveClientGroupsGetter,\n} from '../server/anonymous-otel-start.ts';\nimport type {Mutagen} from '../services/mutagen/mutagen.ts';\nimport type {Pusher} from '../services/mutagen/pusher.ts';\nimport type {ReplicaState} from '../services/replicator/replicator.ts';\nimport {ServiceRunner} from '../services/runner.ts';\nimport type {\n  ActivityBasedService,\n  Service,\n  SingletonService,\n} from '../services/service.ts';\nimport {DrainCoordinator} from '../services/view-syncer/drain-coordinator.ts';\nimport type {ViewSyncer} from '../services/view-syncer/view-syncer.ts';\nimport type {Worker} from '../types/processes.ts';\nimport type {Subscription} from '../types/subscription.ts';\nimport {installWebSocketReceiver} from '../types/websocket-handoff.ts';\nimport type {ConnectParams} from './connect-params.ts';\nimport {Connection, sendError} from './connection.ts';\nimport {createNotifierFrom, subscribeTo} from './replicator.ts';\nimport {SyncerWsMessageHandler} from './syncer-ws-message-handler.ts';\n\nexport type SyncerWorkerData = {\n  replicatorPort: MessagePort;\n};\n\nfunction getWebSocketServerOptions(config: ZeroConfig): ServerOptions {\n  const options: ServerOptions = {\n    noServer: true,\n    maxPayload: config.websocketMaxPayloadBytes,\n  };\n\n  if (config.websocketCompression) {\n    options.perMessageDeflate = true;\n\n    if (config.websocketCompressionOptions) {\n      try {\n        const compressionOptions = JSON.parse(\n          config.websocketCompressionOptions,\n        );\n        options.perMessageDeflate = compressionOptions;\n      } catch (e) {\n        throw new Error(\n          `Failed to parse ZERO_WEBSOCKET_COMPRESSION_OPTIONS: ${String(e)}. Expected valid JSON.`,\n        );\n      }\n    }\n  }\n\n  return options;\n}\n\n/**\n * The Syncer worker receives websocket handoffs for \"/sync\" connections\n * from the Dispatcher in the main thread, and creates websocket\n * {@link Connection}s with a corresponding {@link ViewSyncer}, {@link Mutagen},\n * and {@link Subscription} to version notifications from the Replicator\n * worker.\n */\nexport class Syncer implements SingletonService {\n  readonly id = `syncer-${pid}`;\n  readonly #lc: LogContext;\n  readonly #viewSyncers: ServiceRunner<ViewSyncer & ActivityBasedService>;\n  readonly #mutagens: ServiceRunner<Mutagen & Service>;\n  readonly #pushers: ServiceRunner<Pusher & Service> | undefined;\n  readonly #connections = new Map<string, Connection>();\n  readonly #drainCoordinator = new DrainCoordinator();\n  readonly #parent: Worker;\n  readonly #wss: WebSocketServer;\n  readonly #stopped = resolver();\n  readonly #config: ZeroConfig;\n\n  constructor(\n    lc: LogContext,\n    config: ZeroConfig,\n    viewSyncerFactory: (\n      id: string,\n      sub: Subscription<ReplicaState>,\n      drainCoordinator: DrainCoordinator,\n    ) => ViewSyncer & ActivityBasedService,\n    mutagenFactory: (id: string) => Mutagen & Service,\n    pusherFactory: ((id: string) => Pusher & Service) | undefined,\n    parent: Worker,\n  ) {\n    this.#config = config;\n    // Relays notifications from the parent thread subscription\n    // to ViewSyncers within this thread.\n    const notifier = createNotifierFrom(lc, parent);\n    subscribeTo(lc, parent);\n\n    this.#lc = lc;\n    this.#viewSyncers = new ServiceRunner(\n      lc,\n      id => viewSyncerFactory(id, notifier.subscribe(), this.#drainCoordinator),\n      v => v.keepalive(),\n    );\n    this.#mutagens = new ServiceRunner(lc, mutagenFactory, m => m.hasRefs());\n    if (pusherFactory) {\n      this.#pushers = new ServiceRunner(lc, pusherFactory, p => p.hasRefs());\n    }\n    this.#parent = parent;\n    this.#wss = new WebSocketServer(getWebSocketServerOptions(config));\n\n    installWebSocketReceiver(\n      lc,\n      this.#wss,\n      this.#createConnection,\n      this.#parent,\n    );\n\n    setActiveClientGroupsGetter(() => this.#viewSyncers.size);\n  }\n\n  readonly #createConnection = async (ws: WebSocket, params: ConnectParams) => {\n    this.#lc.debug?.(\n      'creating connection',\n      params.clientGroupID,\n      params.clientID,\n    );\n    recordConnectionAttempted();\n    const {clientID, clientGroupID, auth, userID} = params;\n\n    // Verify JWT BEFORE touching existing connections - prevents unauthenticated\n    // attackers from force-disconnecting legitimate users via DoS\n    let decodedToken: JWTPayload | undefined;\n    if (auth) {\n      const tokenOptions = tokenConfigOptions(this.#config.auth);\n\n      const hasPushOrMutate =\n        this.#config?.push?.url !== undefined ||\n        this.#config?.mutate?.url !== undefined;\n      const hasQueries =\n        this.#config?.query?.url !== undefined ||\n        this.#config?.getQueries?.url !== undefined;\n\n      // must either have one of the token options set or have custom mutations & queries enabled\n      const hasExactlyOneTokenOption = tokenOptions.length === 1;\n      const hasCustomEndpoints = hasPushOrMutate && hasQueries;\n      if (!hasExactlyOneTokenOption && !hasCustomEndpoints) {\n        throw new Error(\n          'Exactly one of jwk, secret, or jwksUrl must be set in order to verify tokens but actually the following were set: ' +\n            JSON.stringify(tokenOptions) +\n            '. You may also set both ZERO_MUTATE_URL and ZERO_QUERY_URL to enable custom mutations and queries without passing token verification options.',\n        );\n      }\n\n      if (tokenOptions.length > 0) {\n        try {\n          decodedToken = await verifyToken(this.#config.auth, auth, {\n            subject: userID,\n            ...(this.#config.auth.issuer && {\n              issuer: this.#config.auth.issuer,\n            }),\n            ...(this.#config.auth.audience && {\n              audience: this.#config.auth.audience,\n            }),\n          });\n          this.#lc.debug?.(\n            `Received auth token [redacted...${auth.slice(-8)}] for clientID ${clientID}`,\n          );\n        } catch (e) {\n          sendError(\n            this.#lc,\n            ws,\n            {\n              kind: ErrorKind.AuthInvalidated,\n              message: `Failed to decode auth token: ${String(e)}`,\n              origin: ErrorOrigin.ZeroCache,\n            },\n            e,\n          );\n          ws.close(3000, 'Failed to decode JWT');\n          return;\n        }\n      } else {\n        this.#lc.warn?.(\n          `One of jwk, secret, or jwksUrl is not configured - the \\`authorization\\` header must be manually verified by the user`,\n        );\n      }\n    } else {\n      this.#lc.debug?.(`No auth token received for clientID ${clientID}`);\n    }\n\n    // Only check for and close existing connections AFTER auth is validated\n    const existing = this.#connections.get(clientID);\n    if (existing) {\n      this.#lc.debug?.(\n        `client ${clientID} already connected, closing existing connection`,\n      );\n      existing.close(`replaced by ${params.wsID}`);\n    }\n\n    const mutagen = this.#mutagens.getService(clientGroupID);\n    const pusher = this.#pushers?.getService(clientGroupID);\n    // a new connection is using the mutagen and pusher. Bump their ref counts.\n    mutagen.ref();\n    pusher?.ref();\n\n    let connection: Connection;\n    try {\n      connection = new Connection(\n        this.#lc,\n        params,\n        ws,\n        new SyncerWsMessageHandler(\n          this.#lc,\n          params,\n          auth\n            ? {\n                raw: auth,\n                decoded: decodedToken ?? {},\n              }\n            : undefined,\n          this.#viewSyncers.getService(clientGroupID),\n          mutagen,\n          pusher,\n        ),\n        () => {\n          if (this.#connections.get(clientID) === connection) {\n            this.#connections.delete(clientID);\n          }\n          // Connection is closed. We can unref the mutagen and pusher.\n          // If their ref counts are zero, they will stop themselves and set themselves invalid.\n          mutagen.unref();\n          pusher?.unref();\n        },\n      );\n    } catch (e) {\n      mutagen.unref();\n      pusher?.unref();\n      throw e;\n    }\n\n    this.#connections.set(clientID, connection);\n\n    connection.init() && recordConnectionSuccess();\n\n    if (params.initConnectionMsg) {\n      this.#lc.debug?.(\n        'handling init connection message from sec header',\n        params.clientGroupID,\n        params.clientID,\n      );\n      await connection.handleInitConnection(\n        JSON.stringify(params.initConnectionMsg),\n      );\n    }\n  };\n\n  run() {\n    return this.#stopped.promise;\n  }\n\n  /**\n   * Graceful shutdown involves shutting down view syncers one at a time, pausing\n   * for the duration of view syncer's hydration between each one. This paces the\n   * disconnects to avoid creating a backlog of hydrations in the receiving server\n   * when the clients reconnect.\n   */\n  async drain() {\n    const start = Date.now();\n    this.#lc.info?.(`draining ${this.#viewSyncers.size} view-syncers`);\n\n    this.#drainCoordinator.drainNextIn(0);\n\n    while (this.#viewSyncers.size) {\n      await this.#drainCoordinator.forceDrainTimeout;\n\n      // Pick an arbitrary view syncer to force drain.\n      for (const vs of this.#viewSyncers.getServices()) {\n        this.#lc.debug?.(`draining view-syncer ${vs.id} (forced)`);\n        // When this drain or an elective drain completes, the forceDrainTimeout will\n        // resolve after the next drain interval.\n        void vs.stop();\n        break;\n      }\n    }\n    this.#lc.info?.(`finished draining (${Date.now() - start} ms)`);\n  }\n\n  stop() {\n    this.#wss.close();\n    this.#stopped.resolve();\n    return promiseVoid;\n  }\n}\n"],"names":["ErrorKind.AuthInvalidated","ErrorOrigin.ZeroCache"],"mappings":"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"}

package/out/zero-client/src/client/connection-manager.d.ts

@@ -67,6 +67,14 @@ export declare class ConnectionManager extends Subscribable<ConnectionManagerSta
      * @returns A promise that resolves when the next state change occurs.
      */
     waitForStateChange(): Promise<ConnectionManagerState>;
+    requestConnect(): void;
+    waitForConnectRequest(): Promise<void>;
+    /**
+     * Consume a pending connect request and resume connecting.
+     *
+     * @returns true if a pending request was handled.
+     */
+    resumeFromConnectRequest(): boolean;
     /**
      * Transition to connecting state.
      *

package/out/zero-client/src/client/connection-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/connection-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,qCAAqC,CAAC;AAEjE,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACf,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,sBAAsB,GAC9B;IACE,IAAI,EAAE,gBAAgB,CAAC,YAAY,CAAC;IACpC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CAChC,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,MAAM,EAAE,SAAS,CAAC;CACnB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC;IAC7B,MAAM,EAAE,SAAS,CAAC;CACnB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAEN,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF,QAAA,MAAM,eAAe,yBAGkB,CAAC;AAExC,KAAK,wBAAwB,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACjE,KAAK,8BAA8B,GAAG,OAAO,CAC3C,sBAAsB,EACtB;IAAC,IAAI,EAAE,wBAAwB,CAAA;CAAC,CACjC,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,sBAAsB,CAAC;;gBAgC7D,OAAO,EAAE,wBAAwB;IAiB7C,IAAI,KAAK,IAAI,sBAAsB,CAElC;IAED;;OAEG;IACH,EAAE,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO;IAIrC;;;OAGG;IACH,iBAAiB,IAAI,OAAO;IAI5B;;;OAGG;IACH,MAAM,CAAC,eAAe,CACpB,KAAK,EAAE,sBAAsB,GAC5B,KAAK,IAAI,8BAA8B;IAM1C;;;;OAIG;IACH,qBAAqB,IAAI,OAAO;IAIhC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAIrD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG;QAC9B,gBAAgB,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;KACnD;IA+CD;;;;;OAKG;IACH,SAAS,IAAI;QAAC,gBAAgB,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAA;KAAC;IAsBhE;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG;QACxC,gBAAgB,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;KACnD;IA6BD;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG;QAC5B,gBAAgB,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;KACnD;IAuBD;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG;QACxB,gBAAgB,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;KACnD;IAuBD;;;OAGG;IACH,MAAM;IAqBG,OAAO,QAAO,IAAI,CAGzB;CA4DH;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,sBAAsB,SAkBnE,CAAC"}
+{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/connection-manager.ts"],"names":[],"mappings":"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"}

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

@@ -10,6 +10,7 @@ const TERMINAL_STATES = [
 ];
 class ConnectionManager extends Subscribable {
   #state;
+  #connectRequestResolver = resolver();
   /**
    * The timestamp when we first started trying to connect.
    * This is used to track the retry window.
@@ -87,6 +88,38 @@ class ConnectionManager extends Subscribable {
   waitForStateChange() {
     return this.#nextStatePromise();
   }
+  requestConnect() {
+    if (this.#connectRequestResolver === void 0) {
+      return;
+    }
+    this.#connectRequestResolver.resolve();
+    this.#connectRequestResolver = void 0;
+  }
+  waitForConnectRequest() {
+    return this.#connectRequestResolver === void 0 ? Promise.resolve() : this.#connectRequestResolver.promise;
+  }
+  #consumeConnectRequest() {
+    if (this.#connectRequestResolver !== void 0) {
+      return false;
+    }
+    this.#connectRequestResolver = resolver();
+    return true;
+  }
+  /**
+   * Consume a pending connect request and resume connecting.
+   *
+   * @returns true if a pending request was handled.
+   */
+  resumeFromConnectRequest() {
+    if (!this.isInTerminalState()) {
+      return false;
+    }
+    if (!this.#consumeConnectRequest()) {
+      return false;
+    }
+    this.connecting();
+    return true;
+  }
   /**
    * Transition to connecting state.
    *

package/out/zero-client/src/client/connection-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-manager.js","sources":["../../../../../zero-client/src/client/connection-manager.ts"],"sourcesContent":["import {resolver, type Resolver} from '@rocicorp/resolver';\nimport {Subscribable} from '../../../shared/src/subscribable.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {ConnectionStatus} from './connection-status.ts';\nimport {\n  ClientError,\n  isClientError,\n  type AuthError,\n  type ClosedError,\n  type DisconnectedReason,\n  type ZeroError,\n} from './error.ts';\n\nconst DEFAULT_TIMEOUT_CHECK_INTERVAL_MS = 1_000;\n\nexport type ConnectionManagerState =\n  | {\n      name: ConnectionStatus.Disconnected;\n      reason: DisconnectedReason;\n    }\n  | {\n      name: ConnectionStatus.Connecting;\n      attempt: number;\n      disconnectAt: number;\n      reason?: ZeroError | undefined;\n    }\n  | {\n      name: ConnectionStatus.Connected;\n    }\n  | {\n      name: ConnectionStatus.NeedsAuth;\n      reason: AuthError;\n    }\n  | {\n      name: ConnectionStatus.Error;\n      reason: ZeroError;\n    }\n  | {\n      name: ConnectionStatus.Closed;\n      reason: ClosedError;\n    };\n\nexport type ConnectionManagerOptions = {\n  /**\n   * The amount of milliseconds we allow for continuous connecting attempts before\n   * transitioning to disconnected state.\n   */\n  disconnectTimeout: number;\n  /**\n   * How frequently we check whether the connecting timeout has elapsed.\n   * Defaults to 1 second.\n   */\n  timeoutCheckIntervalMs?: number | undefined;\n};\n\nconst TERMINAL_STATES = [\n  ConnectionStatus.NeedsAuth,\n  ConnectionStatus.Error,\n] as const satisfies ConnectionStatus[];\n\ntype TerminalConnectionStatus = (typeof TERMINAL_STATES)[number];\ntype TerminalConnectionManagerState = Extract<\n  ConnectionManagerState,\n  {name: TerminalConnectionStatus}\n>;\n\nexport class ConnectionManager extends Subscribable<ConnectionManagerState> {\n  #state: ConnectionManagerState;\n\n  /**\n   * The timestamp when we first started trying to connect.\n   * This is used to track the retry window.\n   * Reset to undefined when we successfully connect or when we transition to disconnected.\n   */\n  #connectingStartedAt: number | undefined;\n\n  /**\n   * The amount of milliseconds we allow for continuous connecting attempts before\n   * transitioning to disconnected state.\n   */\n  #disconnectTimeout: number;\n\n  /**\n   * Handle for the timeout interval that periodically checks whether we've\n   * exceeded the allowed connecting window.\n   */\n  #timeoutInterval: ReturnType<typeof setInterval> | undefined;\n\n  /**\n   * Interval duration for checking whether the connecting timeout has elapsed.\n   */\n  #timeoutCheckIntervalMs: number;\n\n  /**\n   * Resolver used to signal waiting callers when the state changes.\n   */\n  #stateChangeResolver: Resolver<ConnectionManagerState> = resolver();\n\n  constructor(options: ConnectionManagerOptions) {\n    super();\n\n    const now = Date.now();\n\n    this.#disconnectTimeout = options.disconnectTimeout;\n    this.#timeoutCheckIntervalMs =\n      options.timeoutCheckIntervalMs ?? DEFAULT_TIMEOUT_CHECK_INTERVAL_MS;\n    this.#state = {\n      name: ConnectionStatus.Connecting,\n      attempt: 0,\n      disconnectAt: now + this.#disconnectTimeout,\n    };\n    this.#connectingStartedAt = now;\n    this.#maybeStartTimeoutInterval();\n  }\n\n  get state(): ConnectionManagerState {\n    return this.#state;\n  }\n\n  /**\n   * Returns true if the current state is equal to the given status.\n   */\n  is(status: ConnectionStatus): boolean {\n    return this.#state.name === status;\n  }\n\n  /**\n   * Returns true if the current state is a terminal state\n   * that can be recovered from by calling connect().\n   */\n  isInTerminalState(): boolean {\n    return ConnectionManager.isTerminalState(this.#state);\n  }\n\n  /**\n   * Returns true if the given status is a terminal state\n   * that can be recovered from by calling connect().\n   */\n  static isTerminalState(\n    state: ConnectionManagerState,\n  ): state is TerminalConnectionManagerState {\n    return (TERMINAL_STATES as readonly ConnectionStatus[]).includes(\n      state.name,\n    );\n  }\n\n  /**\n   * Returns true if the run loop should continue.\n   * The run loop continues in all states except closed.\n   * In needs-auth and error states, the run loop pauses and waits for connect() to be called.\n   */\n  shouldContinueRunLoop(): boolean {\n    return this.#state.name !== ConnectionStatus.Closed;\n  }\n\n  /**\n   * Waits for the next state change.\n   * @returns A promise that resolves when the next state change occurs.\n   */\n  waitForStateChange(): Promise<ConnectionManagerState> {\n    return this.#nextStatePromise();\n  }\n\n  /**\n   * Transition to connecting state.\n   *\n   * This starts the timeout timer, but if we've entered disconnected state,\n   * we stay there and continue retrying.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  connecting(reason?: ZeroError): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // we cannot intentionally transition from disconnected to connecting\n    // disconnected can transition to connected on successful connection\n    // or a terminal state\n    if (this.#state.name === ConnectionStatus.Disconnected) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    const now = Date.now();\n\n    // If we're already connecting, increment the attempt counter\n    if (this.#state.name === ConnectionStatus.Connecting) {\n      this.#state = {\n        ...this.#state,\n        attempt: this.#state.attempt + 1,\n        reason,\n      };\n      const nextStatePromise = this.#publishStateAndGetPromise();\n      this.#maybeStartTimeoutInterval();\n      return {nextStatePromise};\n    }\n\n    // Starting a new connecting session\n    // If #connectingStartedAt is undefined, this is a fresh start - set it to now\n    // If it's already set, we're retrying within the same retry window, so keep it\n    if (this.#connectingStartedAt === undefined) {\n      this.#connectingStartedAt = now;\n    }\n\n    const disconnectAt = this.#connectingStartedAt + this.#disconnectTimeout;\n\n    this.#state = {\n      name: ConnectionStatus.Connecting,\n      attempt: 1,\n      disconnectAt,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    this.#maybeStartTimeoutInterval();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to connected state.\n   * This resets the connecting timeout timer.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  connected(): {nextStatePromise: Promise<ConnectionManagerState>} {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already connected, no-op\n    if (this.#state.name === ConnectionStatus.Connected) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Reset the timeout timer on successful connection\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Connected,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to disconnected state.\n   * This is called when the timeout expires.\n   * The run loop will continue trying to reconnect.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  disconnected(reason: DisconnectedReason): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already disconnected, no-op\n    if (this.#state.name === ConnectionStatus.Disconnected) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // When transitioning from connected to disconnected, we've lost a connection\n    // we previously had. Clear the timeout timer so we can start a fresh timeout window.\n    if (this.#state.name === ConnectionStatus.Connected) {\n      this.#connectingStartedAt = undefined;\n    }\n    // When transitioning from connecting to disconnected (e.g., due to timeout),\n    // we keep the start time to maintain the context that we've been trying for a while.\n\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Disconnected,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to needs-auth state.\n   * This pauses the run loop until connect() is called with new credentials.\n   * Resets the retry window and attempt counter.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  needsAuth(reason: AuthError): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already in needs-auth state, no-op\n    if (this.#state.name === ConnectionStatus.NeedsAuth) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Reset the timeout timer and connecting start time\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.NeedsAuth,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to error state.\n   * This pauses the run loop until connect() is called.\n   * Resets the retry window and attempt counter.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  error(reason: ZeroError): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already in error state, no-op\n    if (this.#state.name === ConnectionStatus.Error) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Reset the timeout timer and connecting start time\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Error,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to closed state.\n   * This is terminal - no further transitions are allowed.\n   */\n  closed() {\n    // Already closed, no-op\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return;\n    }\n\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Closed,\n      reason: new ClientError({\n        kind: ClientErrorKind.ClientClosed,\n        message: 'Zero was explicitly closed by calling zero.close()',\n      }),\n    };\n    this.#publishState();\n    this.cleanup();\n    return;\n  }\n\n  override cleanup = (): void => {\n    this._listeners.clear();\n    this.#resolveNextStateWaiters();\n  };\n\n  #resolveNextStateWaiters(): void {\n    this.#stateChangeResolver.resolve(this.#state);\n    this.#stateChangeResolver = resolver();\n  }\n\n  #publishState(): void {\n    this.notify(this.#state);\n    this.#resolveNextStateWaiters();\n  }\n\n  #nextStatePromise(): Promise<ConnectionManagerState> {\n    return this.#stateChangeResolver.promise;\n  }\n\n  #publishStateAndGetPromise(): Promise<ConnectionManagerState> {\n    this.#publishState();\n    return this.#nextStatePromise();\n  }\n\n  /**\n   * Check if we should transition from connecting to disconnected due to timeout.\n   * Returns true if the transition happened.\n   */\n  #checkTimeout(): boolean {\n    if (this.#state.name !== ConnectionStatus.Connecting) {\n      return false;\n    }\n\n    const now = Date.now();\n    if (now >= this.#state.disconnectAt) {\n      this.disconnected(\n        new ClientError({\n          kind: ClientErrorKind.Offline,\n          message: `Zero was unable to connect for ${Math.floor(this.#disconnectTimeout / 1_000)} seconds and was disconnected`,\n        }),\n      );\n      return true;\n    }\n\n    return false;\n  }\n\n  #maybeStartTimeoutInterval(): void {\n    if (this.#timeoutInterval !== undefined) {\n      return;\n    }\n    this.#timeoutInterval = setInterval(() => {\n      this.#checkTimeout();\n    }, this.#timeoutCheckIntervalMs);\n  }\n\n  #maybeStopTimeoutInterval(): void {\n    if (this.#timeoutInterval === undefined) {\n      return;\n    }\n    clearInterval(this.#timeoutInterval);\n    this.#timeoutInterval = undefined;\n  }\n}\n\n/**\n * Used to trigger the catch block when a terminal state is reached.\n *\n * @param state - The current connection state.\n */\nexport const throwIfConnectionError = (state: ConnectionManagerState) => {\n  if (\n    ConnectionManager.isTerminalState(state) ||\n    state.name === ConnectionStatus.Closed ||\n    ((state.name === ConnectionStatus.Connecting ||\n      state.name === ConnectionStatus.Disconnected) &&\n      state.reason)\n  ) {\n    if (\n      isClientError(state.reason) &&\n      (state.reason.kind === ClientErrorKind.ConnectTimeout ||\n        state.reason.kind === ClientErrorKind.AbruptClose ||\n        state.reason.kind === ClientErrorKind.CleanClose)\n    ) {\n      return;\n    }\n    throw state.reason;\n  }\n};\n"],"names":["ConnectionStatus.NeedsAuth","ConnectionStatus.Error","ConnectionStatus.Connecting","ConnectionStatus.Closed","ConnectionStatus.Disconnected","nextStatePromise","ConnectionStatus.Connected","ClientErrorKind.ClientClosed","ClientErrorKind.Offline","ClientErrorKind.ConnectTimeout","ClientErrorKind.AbruptClose","ClientErrorKind.CleanClose"],"mappings":"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"}
+{"version":3,"file":"connection-manager.js","sources":["../../../../../zero-client/src/client/connection-manager.ts"],"sourcesContent":["import {resolver, type Resolver} from '@rocicorp/resolver';\nimport {Subscribable} from '../../../shared/src/subscribable.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {ConnectionStatus} from './connection-status.ts';\nimport {\n  ClientError,\n  isClientError,\n  type AuthError,\n  type ClosedError,\n  type DisconnectedReason,\n  type ZeroError,\n} from './error.ts';\n\nconst DEFAULT_TIMEOUT_CHECK_INTERVAL_MS = 1_000;\n\nexport type ConnectionManagerState =\n  | {\n      name: ConnectionStatus.Disconnected;\n      reason: DisconnectedReason;\n    }\n  | {\n      name: ConnectionStatus.Connecting;\n      attempt: number;\n      disconnectAt: number;\n      reason?: ZeroError | undefined;\n    }\n  | {\n      name: ConnectionStatus.Connected;\n    }\n  | {\n      name: ConnectionStatus.NeedsAuth;\n      reason: AuthError;\n    }\n  | {\n      name: ConnectionStatus.Error;\n      reason: ZeroError;\n    }\n  | {\n      name: ConnectionStatus.Closed;\n      reason: ClosedError;\n    };\n\nexport type ConnectionManagerOptions = {\n  /**\n   * The amount of milliseconds we allow for continuous connecting attempts before\n   * transitioning to disconnected state.\n   */\n  disconnectTimeout: number;\n  /**\n   * How frequently we check whether the connecting timeout has elapsed.\n   * Defaults to 1 second.\n   */\n  timeoutCheckIntervalMs?: number | undefined;\n};\n\nconst TERMINAL_STATES = [\n  ConnectionStatus.NeedsAuth,\n  ConnectionStatus.Error,\n] as const satisfies ConnectionStatus[];\n\ntype TerminalConnectionStatus = (typeof TERMINAL_STATES)[number];\ntype TerminalConnectionManagerState = Extract<\n  ConnectionManagerState,\n  {name: TerminalConnectionStatus}\n>;\n\nexport class ConnectionManager extends Subscribable<ConnectionManagerState> {\n  #state: ConnectionManagerState;\n  #connectRequestResolver: Resolver<void> | undefined = resolver();\n\n  /**\n   * The timestamp when we first started trying to connect.\n   * This is used to track the retry window.\n   * Reset to undefined when we successfully connect or when we transition to disconnected.\n   */\n  #connectingStartedAt: number | undefined;\n\n  /**\n   * The amount of milliseconds we allow for continuous connecting attempts before\n   * transitioning to disconnected state.\n   */\n  #disconnectTimeout: number;\n\n  /**\n   * Handle for the timeout interval that periodically checks whether we've\n   * exceeded the allowed connecting window.\n   */\n  #timeoutInterval: ReturnType<typeof setInterval> | undefined;\n\n  /**\n   * Interval duration for checking whether the connecting timeout has elapsed.\n   */\n  #timeoutCheckIntervalMs: number;\n\n  /**\n   * Resolver used to signal waiting callers when the state changes.\n   */\n  #stateChangeResolver: Resolver<ConnectionManagerState> = resolver();\n\n  constructor(options: ConnectionManagerOptions) {\n    super();\n\n    const now = Date.now();\n\n    this.#disconnectTimeout = options.disconnectTimeout;\n    this.#timeoutCheckIntervalMs =\n      options.timeoutCheckIntervalMs ?? DEFAULT_TIMEOUT_CHECK_INTERVAL_MS;\n    this.#state = {\n      name: ConnectionStatus.Connecting,\n      attempt: 0,\n      disconnectAt: now + this.#disconnectTimeout,\n    };\n    this.#connectingStartedAt = now;\n    this.#maybeStartTimeoutInterval();\n  }\n\n  get state(): ConnectionManagerState {\n    return this.#state;\n  }\n\n  /**\n   * Returns true if the current state is equal to the given status.\n   */\n  is(status: ConnectionStatus): boolean {\n    return this.#state.name === status;\n  }\n\n  /**\n   * Returns true if the current state is a terminal state\n   * that can be recovered from by calling connect().\n   */\n  isInTerminalState(): boolean {\n    return ConnectionManager.isTerminalState(this.#state);\n  }\n\n  /**\n   * Returns true if the given status is a terminal state\n   * that can be recovered from by calling connect().\n   */\n  static isTerminalState(\n    state: ConnectionManagerState,\n  ): state is TerminalConnectionManagerState {\n    return (TERMINAL_STATES as readonly ConnectionStatus[]).includes(\n      state.name,\n    );\n  }\n\n  /**\n   * Returns true if the run loop should continue.\n   * The run loop continues in all states except closed.\n   * In needs-auth and error states, the run loop pauses and waits for connect() to be called.\n   */\n  shouldContinueRunLoop(): boolean {\n    return this.#state.name !== ConnectionStatus.Closed;\n  }\n\n  /**\n   * Waits for the next state change.\n   * @returns A promise that resolves when the next state change occurs.\n   */\n  waitForStateChange(): Promise<ConnectionManagerState> {\n    return this.#nextStatePromise();\n  }\n\n  requestConnect(): void {\n    if (this.#connectRequestResolver === undefined) {\n      return;\n    }\n    this.#connectRequestResolver.resolve();\n    this.#connectRequestResolver = undefined;\n  }\n\n  waitForConnectRequest(): Promise<void> {\n    return this.#connectRequestResolver === undefined\n      ? Promise.resolve()\n      : this.#connectRequestResolver.promise;\n  }\n\n  #consumeConnectRequest(): boolean {\n    if (this.#connectRequestResolver !== undefined) {\n      return false;\n    }\n    this.#connectRequestResolver = resolver();\n    return true;\n  }\n\n  /**\n   * Consume a pending connect request and resume connecting.\n   *\n   * @returns true if a pending request was handled.\n   */\n  resumeFromConnectRequest(): boolean {\n    if (!this.isInTerminalState()) {\n      return false;\n    }\n    if (!this.#consumeConnectRequest()) {\n      return false;\n    }\n    this.connecting();\n    return true;\n  }\n\n  /**\n   * Transition to connecting state.\n   *\n   * This starts the timeout timer, but if we've entered disconnected state,\n   * we stay there and continue retrying.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  connecting(reason?: ZeroError): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // we cannot intentionally transition from disconnected to connecting\n    // disconnected can transition to connected on successful connection\n    // or a terminal state\n    if (this.#state.name === ConnectionStatus.Disconnected) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    const now = Date.now();\n\n    // If we're already connecting, increment the attempt counter\n    if (this.#state.name === ConnectionStatus.Connecting) {\n      this.#state = {\n        ...this.#state,\n        attempt: this.#state.attempt + 1,\n        reason,\n      };\n      const nextStatePromise = this.#publishStateAndGetPromise();\n      this.#maybeStartTimeoutInterval();\n      return {nextStatePromise};\n    }\n\n    // Starting a new connecting session\n    // If #connectingStartedAt is undefined, this is a fresh start - set it to now\n    // If it's already set, we're retrying within the same retry window, so keep it\n    if (this.#connectingStartedAt === undefined) {\n      this.#connectingStartedAt = now;\n    }\n\n    const disconnectAt = this.#connectingStartedAt + this.#disconnectTimeout;\n\n    this.#state = {\n      name: ConnectionStatus.Connecting,\n      attempt: 1,\n      disconnectAt,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    this.#maybeStartTimeoutInterval();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to connected state.\n   * This resets the connecting timeout timer.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  connected(): {nextStatePromise: Promise<ConnectionManagerState>} {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already connected, no-op\n    if (this.#state.name === ConnectionStatus.Connected) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Reset the timeout timer on successful connection\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Connected,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to disconnected state.\n   * This is called when the timeout expires.\n   * The run loop will continue trying to reconnect.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  disconnected(reason: DisconnectedReason): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already disconnected, no-op\n    if (this.#state.name === ConnectionStatus.Disconnected) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // When transitioning from connected to disconnected, we've lost a connection\n    // we previously had. Clear the timeout timer so we can start a fresh timeout window.\n    if (this.#state.name === ConnectionStatus.Connected) {\n      this.#connectingStartedAt = undefined;\n    }\n    // When transitioning from connecting to disconnected (e.g., due to timeout),\n    // we keep the start time to maintain the context that we've been trying for a while.\n\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Disconnected,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to needs-auth state.\n   * This pauses the run loop until connect() is called with new credentials.\n   * Resets the retry window and attempt counter.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  needsAuth(reason: AuthError): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already in needs-auth state, no-op\n    if (this.#state.name === ConnectionStatus.NeedsAuth) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Reset the timeout timer and connecting start time\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.NeedsAuth,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to error state.\n   * This pauses the run loop until connect() is called.\n   * Resets the retry window and attempt counter.\n   *\n   * @returns An object containing a promise that resolves on the next state change.\n   */\n  error(reason: ZeroError): {\n    nextStatePromise: Promise<ConnectionManagerState>;\n  } {\n    // cannot transition from closed to any other status\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Already in error state, no-op\n    if (this.#state.name === ConnectionStatus.Error) {\n      return {nextStatePromise: this.#nextStatePromise()};\n    }\n\n    // Reset the timeout timer and connecting start time\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Error,\n      reason,\n    };\n    const nextStatePromise = this.#publishStateAndGetPromise();\n    return {nextStatePromise};\n  }\n\n  /**\n   * Transition to closed state.\n   * This is terminal - no further transitions are allowed.\n   */\n  closed() {\n    // Already closed, no-op\n    if (this.#state.name === ConnectionStatus.Closed) {\n      return;\n    }\n\n    this.#connectingStartedAt = undefined;\n    this.#maybeStopTimeoutInterval();\n\n    this.#state = {\n      name: ConnectionStatus.Closed,\n      reason: new ClientError({\n        kind: ClientErrorKind.ClientClosed,\n        message: 'Zero was explicitly closed by calling zero.close()',\n      }),\n    };\n    this.#publishState();\n    this.cleanup();\n    return;\n  }\n\n  override cleanup = (): void => {\n    this._listeners.clear();\n    this.#resolveNextStateWaiters();\n  };\n\n  #resolveNextStateWaiters(): void {\n    this.#stateChangeResolver.resolve(this.#state);\n    this.#stateChangeResolver = resolver();\n  }\n\n  #publishState(): void {\n    this.notify(this.#state);\n    this.#resolveNextStateWaiters();\n  }\n\n  #nextStatePromise(): Promise<ConnectionManagerState> {\n    return this.#stateChangeResolver.promise;\n  }\n\n  #publishStateAndGetPromise(): Promise<ConnectionManagerState> {\n    this.#publishState();\n    return this.#nextStatePromise();\n  }\n\n  /**\n   * Check if we should transition from connecting to disconnected due to timeout.\n   * Returns true if the transition happened.\n   */\n  #checkTimeout(): boolean {\n    if (this.#state.name !== ConnectionStatus.Connecting) {\n      return false;\n    }\n\n    const now = Date.now();\n    if (now >= this.#state.disconnectAt) {\n      this.disconnected(\n        new ClientError({\n          kind: ClientErrorKind.Offline,\n          message: `Zero was unable to connect for ${Math.floor(this.#disconnectTimeout / 1_000)} seconds and was disconnected`,\n        }),\n      );\n      return true;\n    }\n\n    return false;\n  }\n\n  #maybeStartTimeoutInterval(): void {\n    if (this.#timeoutInterval !== undefined) {\n      return;\n    }\n    this.#timeoutInterval = setInterval(() => {\n      this.#checkTimeout();\n    }, this.#timeoutCheckIntervalMs);\n  }\n\n  #maybeStopTimeoutInterval(): void {\n    if (this.#timeoutInterval === undefined) {\n      return;\n    }\n    clearInterval(this.#timeoutInterval);\n    this.#timeoutInterval = undefined;\n  }\n}\n\n/**\n * Used to trigger the catch block when a terminal state is reached.\n *\n * @param state - The current connection state.\n */\nexport const throwIfConnectionError = (state: ConnectionManagerState) => {\n  if (\n    ConnectionManager.isTerminalState(state) ||\n    state.name === ConnectionStatus.Closed ||\n    ((state.name === ConnectionStatus.Connecting ||\n      state.name === ConnectionStatus.Disconnected) &&\n      state.reason)\n  ) {\n    if (\n      isClientError(state.reason) &&\n      (state.reason.kind === ClientErrorKind.ConnectTimeout ||\n        state.reason.kind === ClientErrorKind.AbruptClose ||\n        state.reason.kind === ClientErrorKind.CleanClose)\n    ) {\n      return;\n    }\n    throw state.reason;\n  }\n};\n"],"names":["ConnectionStatus.NeedsAuth","ConnectionStatus.Error","ConnectionStatus.Connecting","ConnectionStatus.Closed","ConnectionStatus.Disconnected","nextStatePromise","ConnectionStatus.Connected","ClientErrorKind.ClientClosed","ClientErrorKind.Offline","ClientErrorKind.ConnectTimeout","ClientErrorKind.AbruptClose","ClientErrorKind.CleanClose"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,qCAAqC,CAAC;AAGjE,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAGjC;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;CACnB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EACF;QACE,IAAI,EAAE,QAAQ,CAAC;QACf,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACD;QACE,IAAI,EAAE,OAAO,CAAC;QACd,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACD;QACE,IAAI,EAAE,YAAY,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACP,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEN,MAAM,WAAW,MAAM,CAAC,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAExC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,qBAAa,cAAe,YAAW,UAAU;;gBAO7C,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI;IAQpD,IAAI,KAAK,IAAI,MAAM,CAAC,eAAe,CAAC,CAEnC;IAEK,OAAO,CAAC,IAAI,CAAC,EAAE;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAsCvE;AAED,qBAAa,gBACX,SAAQ,YAAY,CAAC,eAAe,CACpC,YAAW,MAAM,CAAC,eAAe,CAAC;;gBAItB,iBAAiB,EAAE,iBAAiB;IAchD,IAAI,OAAO,IAAI,eAAe,CAE7B;CA0DF"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,qCAAqC,CAAC;AAGjE,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAGjC;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;CACnB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EACF;QACE,IAAI,EAAE,QAAQ,CAAC;QACf,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACD;QACE,IAAI,EAAE,OAAO,CAAC;QACd,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACD;QACE,IAAI,EAAE,YAAY,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACP,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEN,MAAM,WAAW,MAAM,CAAC,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAExC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,qBAAa,cAAe,YAAW,UAAU;;gBAO7C,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI;IAQpD,IAAI,KAAK,IAAI,MAAM,CAAC,eAAe,CAAC,CAEnC;IAEK,OAAO,CAAC,IAAI,CAAC,EAAE;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAwCvE;AAED,qBAAa,gBACX,SAAQ,YAAY,CAAC,eAAe,CACpC,YAAW,MAAM,CAAC,eAAe,CAAC;;gBAItB,iBAAiB,EAAE,iBAAiB;IAchD,IAAI,OAAO,IAAI,eAAe,CAE7B;CA0DF"}

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

@@ -2,7 +2,7 @@ import { unreachable } from "../../../shared/src/asserts.js";
 import { Subscribable } from "../../../shared/src/subscribable.js";
 import { PushFailed, TransformFailed } from "../../../zero-protocol/src/error-kind-enum.js";
 import { NoSocketOrigin } from "./client-error-kind-enum.js";
-import { Disconnected, NeedsAuth, Error, Connecting, Connected, Closed } from "./connection-status-enum.js";
+import { Disconnected, Connecting, NeedsAuth, Error, Connected, Closed } from "./connection-status-enum.js";
 class ConnectionImpl {
   #connectionManager;
   #lc;
@@ -39,8 +39,11 @@ class ConnectionImpl {
     lc.info?.(
       `Resuming connection from state: ${this.#connectionManager.state.name}`
     );
-    const { nextStatePromise } = this.#connectionManager.connecting();
-    await nextStatePromise;
+    this.#connectionManager.requestConnect();
+    if (this.#connectionManager.state.name === Connecting) {
+      return;
+    }
+    await this.#connectionManager.waitForStateChange();
   }
 }
 class ConnectionSource extends Subscribable {

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

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sources":["../../../../../zero-client/src/client/connection.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../shared/src/asserts.ts';\nimport {Subscribable} from '../../../shared/src/subscribable.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport type {\n  ConnectionManager,\n  ConnectionManagerState,\n} from './connection-manager.ts';\nimport {ConnectionStatus} from './connection-status.ts';\n\n/**\n * The current connection state of the Zero instance. One of the following states:\n *\n * - `connecting`: The client is actively trying to connect every 5 seconds.\n * - `disconnected`: The client is now in an \"offline\" state. It will continue\n *   to try to connect every 5 seconds.\n * - `connected`: The client has opened a successful connection to the server.\n * - `needs-auth`: Authentication is invalid or expired. No connection retries will be made\n *   until the host application calls `connect()`.\n * - `error`: A fatal error occurred. No connection retries will be made until the host\n *   application calls `connect()` again.\n * - `closed`: The client was shut down (for example via `zero.close()`). This is\n *   a terminal state, and a new Zero instance must be created to reconnect.\n */\nexport type ConnectionState =\n  | {\n      name: 'disconnected';\n      reason: string;\n    }\n  | {\n      name: 'connecting';\n      reason?: string;\n    }\n  | {\n      name: 'connected';\n    }\n  | {\n      name: 'needs-auth';\n      reason:\n        | {\n            type: 'mutate';\n            status: 401 | 403;\n            body?: string;\n          }\n        | {\n            type: 'query';\n            status: 401 | 403;\n            body?: string;\n          }\n        | {\n            type: 'zero-cache';\n            reason: string;\n          };\n    }\n  | {\n      name: 'error';\n      reason: string;\n    }\n  | {\n      name: 'closed';\n      reason: string;\n    };\n\nexport interface Source<T> {\n  /**\n   * The current state value.\n   */\n  readonly current: T;\n\n  /**\n   * Subscribe to state changes.\n   *\n   * @param listener - Called when the state changes with the new state value.\n   * @returns A function to unsubscribe from state changes.\n   */\n  subscribe(listener: (state: T) => void): () => void;\n}\n\n/**\n * Connection API for managing Zero's connection lifecycle.\n */\nexport interface Connection {\n  /**\n   * The current connection state as a subscribable value.\n   */\n  readonly state: Source<ConnectionState>;\n\n  /**\n   * Resumes the connection from a terminal state.\n   *\n   * If called when not in a terminal state, this method does nothing.\n   *\n   * @param opts - Optional connection options\n   * @param opts.auth - Token to use for authentication. If provided, this overrides\n   *                    the stored auth credential for this connection attempt.\n   *                    If `null` or `undefined`, the stored auth credential is cleared.\n   * @returns A promise that resolves once the connection state has transitioned to connecting.\n   */\n  connect(opts?: {auth: string | null | undefined}): Promise<void>;\n}\n\nexport class ConnectionImpl implements Connection {\n  readonly #connectionManager: ConnectionManager;\n  readonly #lc: LogContext;\n  readonly #source: ConnectionSource;\n  readonly #setAuth: (auth: string | null | undefined) => void;\n\n  constructor(\n    connectionManager: ConnectionManager,\n    lc: LogContext,\n    setAuth: (auth: string | null | undefined) => void,\n  ) {\n    this.#connectionManager = connectionManager;\n    this.#lc = lc;\n    this.#source = new ConnectionSource(connectionManager);\n    this.#setAuth = setAuth;\n  }\n\n  get state(): Source<ConnectionState> {\n    return this.#source;\n  }\n\n  async connect(opts?: {auth: string | null | undefined}): Promise<void> {\n    const lc = this.#lc.withContext('connect');\n\n    if (opts && 'auth' in opts) {\n      lc.debug?.('Updating auth credential from connect()');\n      this.#setAuth(opts.auth);\n    }\n\n    // if the connection is disconnected due to a missing cacheURL, we don't allow a reconnect\n    if (\n      this.#connectionManager.state.name === ConnectionStatus.Disconnected &&\n      this.#connectionManager.state.reason.kind ===\n        ClientErrorKind.NoSocketOrigin\n    ) {\n      lc.error?.(\n        'connect() called but the connection is disconnected due to a missing cacheURL. No reconnect will be attempted.',\n      );\n      return;\n    }\n\n    // only allow connect() to be called from a terminal state\n    if (!this.#connectionManager.isInTerminalState()) {\n      lc.debug?.(\n        'connect() called but not in a terminal state. Current state:',\n        this.#connectionManager.state.name,\n      );\n      return;\n    }\n\n    lc.info?.(\n      `Resuming connection from state: ${this.#connectionManager.state.name}`,\n    );\n\n    // Transition to connecting, which will trigger the state change resolver\n    // and unblock the run loop. Wait for the next state change (connected, disconnected, etc.)\n    const {nextStatePromise} = this.#connectionManager.connecting();\n    await nextStatePromise;\n  }\n}\n\nexport class ConnectionSource\n  extends Subscribable<ConnectionState>\n  implements Source<ConnectionState>\n{\n  #state: ConnectionState;\n\n  constructor(connectionManager: ConnectionManager) {\n    super();\n    this.#state = this.#mapConnectionManagerState(connectionManager.state);\n\n    // Subscribe to ConnectionManager immediately to keep #state in sync.\n    // This ensures `current` always returns the correct state, even if\n    // external code hasn't subscribed yet (fixes race condition where\n    // connection completes before React subscribes).\n    connectionManager.subscribe(state => {\n      this.#state = this.#mapConnectionManagerState(state);\n      this.notify(this.#state);\n    });\n  }\n\n  get current(): ConnectionState {\n    return this.#state;\n  }\n\n  #mapConnectionManagerState(state: ConnectionManagerState): ConnectionState {\n    switch (state.name) {\n      case ConnectionStatus.Closed:\n        return {\n          name: 'closed',\n          reason: state.reason.message,\n        };\n      case ConnectionStatus.Connected:\n        return {\n          name: 'connected',\n        };\n      case ConnectionStatus.Connecting:\n        return {\n          name: 'connecting',\n          ...(state.reason?.message ? {reason: state.reason.message} : {}),\n        };\n      case ConnectionStatus.Disconnected:\n        return {\n          name: 'disconnected',\n          reason: state.reason.message,\n        };\n      case ConnectionStatus.Error:\n        return {\n          name: 'error',\n          reason: state.reason.message,\n        };\n      case ConnectionStatus.NeedsAuth:\n        return {\n          name: 'needs-auth',\n          reason:\n            state.reason.errorBody.kind === ErrorKind.PushFailed\n              ? {\n                  type: 'mutate',\n                  status: state.reason.errorBody.status,\n                  ...(state.reason.errorBody.bodyPreview\n                    ? {body: state.reason.errorBody.bodyPreview}\n                    : {}),\n                }\n              : state.reason.errorBody.kind === ErrorKind.TransformFailed\n                ? {\n                    type: 'query',\n                    status: state.reason.errorBody.status,\n                    ...(state.reason.errorBody.bodyPreview\n                      ? {body: state.reason.errorBody.bodyPreview}\n                      : {}),\n                  }\n                : {\n                    type: 'zero-cache',\n                    reason: state.reason.message,\n                  },\n        };\n\n      default:\n        unreachable(state);\n    }\n  }\n}\n"],"names":["ConnectionStatus.Disconnected","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Closed","ConnectionStatus.Connected","ConnectionStatus.Connecting","ConnectionStatus.Error","ConnectionStatus.NeedsAuth","ErrorKind.PushFailed","ErrorKind.TransformFailed"],"mappings":";;;;;AAsGO,MAAM,eAAqC;AAAA,EACvC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,mBACA,IACA,SACA;AACA,SAAK,qBAAqB;AAC1B,SAAK,MAAM;AACX,SAAK,UAAU,IAAI,iBAAiB,iBAAiB;AACrD,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,IAAI,QAAiC;AACnC,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,MAAM,QAAQ,MAAyD;AACrE,UAAM,KAAK,KAAK,IAAI,YAAY,SAAS;AAEzC,QAAI,QAAQ,UAAU,MAAM;AAC1B,SAAG,QAAQ,yCAAyC;AACpD,WAAK,SAAS,KAAK,IAAI;AAAA,IACzB;AAGA,QACE,KAAK,mBAAmB,MAAM,SAASA,gBACvC,KAAK,mBAAmB,MAAM,OAAO,SACnCC,gBACF;AACA,SAAG;AAAA,QACD;AAAA,MAAA;AAEF;AAAA,IACF;AAGA,QAAI,CAAC,KAAK,mBAAmB,qBAAqB;AAChD,SAAG;AAAA,QACD;AAAA,QACA,KAAK,mBAAmB,MAAM;AAAA,MAAA;AAEhC;AAAA,IACF;AAEA,OAAG;AAAA,MACD,mCAAmC,KAAK,mBAAmB,MAAM,IAAI;AAAA,IAAA;AAKvE,UAAM,EAAC,iBAAA,IAAoB,KAAK,mBAAmB,WAAA;AACnD,UAAM;AAAA,EACR;AACF;AAEO,MAAM,yBACH,aAEV;AAAA,EACE;AAAA,EAEA,YAAY,mBAAsC;AAChD,UAAA;AACA,SAAK,SAAS,KAAK,2BAA2B,kBAAkB,KAAK;AAMrE,sBAAkB,UAAU,CAAA,UAAS;AACnC,WAAK,SAAS,KAAK,2BAA2B,KAAK;AACnD,WAAK,OAAO,KAAK,MAAM;AAAA,IACzB,CAAC;AAAA,EACH;AAAA,EAEA,IAAI,UAA2B;AAC7B,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,2BAA2B,OAAgD;AACzE,YAAQ,MAAM,MAAA;AAAA,MACZ,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QAAQ,MAAM,OAAO;AAAA,QAAA;AAAA,MAEzB,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,QAAA;AAAA,MAEV,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,GAAI,MAAM,QAAQ,UAAU,EAAC,QAAQ,MAAM,OAAO,YAAW,CAAA;AAAA,QAAC;AAAA,MAElE,KAAKJ;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QAAQ,MAAM,OAAO;AAAA,QAAA;AAAA,MAEzB,KAAKK;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QAAQ,MAAM,OAAO;AAAA,QAAA;AAAA,MAEzB,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QACE,MAAM,OAAO,UAAU,SAASC,aAC5B;AAAA,YACE,MAAM;AAAA,YACN,QAAQ,MAAM,OAAO,UAAU;AAAA,YAC/B,GAAI,MAAM,OAAO,UAAU,cACvB,EAAC,MAAM,MAAM,OAAO,UAAU,gBAC9B,CAAA;AAAA,UAAC,IAEP,MAAM,OAAO,UAAU,SAASC,kBAC9B;AAAA,YACE,MAAM;AAAA,YACN,QAAQ,MAAM,OAAO,UAAU;AAAA,YAC/B,GAAI,MAAM,OAAO,UAAU,cACvB,EAAC,MAAM,MAAM,OAAO,UAAU,gBAC9B,CAAA;AAAA,UAAC,IAEP;AAAA,YACE,MAAM;AAAA,YACN,QAAQ,MAAM,OAAO;AAAA,UAAA;AAAA,QACvB;AAAA,MAGZ;AACE,oBAAiB;AAAA,IAAA;AAAA,EAEvB;AACF;"}
+{"version":3,"file":"connection.js","sources":["../../../../../zero-client/src/client/connection.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../shared/src/asserts.ts';\nimport {Subscribable} from '../../../shared/src/subscribable.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport type {\n  ConnectionManager,\n  ConnectionManagerState,\n} from './connection-manager.ts';\nimport {ConnectionStatus} from './connection-status.ts';\n\n/**\n * The current connection state of the Zero instance. One of the following states:\n *\n * - `connecting`: The client is actively trying to connect every 5 seconds.\n * - `disconnected`: The client is now in an \"offline\" state. It will continue\n *   to try to connect every 5 seconds.\n * - `connected`: The client has opened a successful connection to the server.\n * - `needs-auth`: Authentication is invalid or expired. No connection retries will be made\n *   until the host application calls `connect()`.\n * - `error`: A fatal error occurred. No connection retries will be made until the host\n *   application calls `connect()` again.\n * - `closed`: The client was shut down (for example via `zero.close()`). This is\n *   a terminal state, and a new Zero instance must be created to reconnect.\n */\nexport type ConnectionState =\n  | {\n      name: 'disconnected';\n      reason: string;\n    }\n  | {\n      name: 'connecting';\n      reason?: string;\n    }\n  | {\n      name: 'connected';\n    }\n  | {\n      name: 'needs-auth';\n      reason:\n        | {\n            type: 'mutate';\n            status: 401 | 403;\n            body?: string;\n          }\n        | {\n            type: 'query';\n            status: 401 | 403;\n            body?: string;\n          }\n        | {\n            type: 'zero-cache';\n            reason: string;\n          };\n    }\n  | {\n      name: 'error';\n      reason: string;\n    }\n  | {\n      name: 'closed';\n      reason: string;\n    };\n\nexport interface Source<T> {\n  /**\n   * The current state value.\n   */\n  readonly current: T;\n\n  /**\n   * Subscribe to state changes.\n   *\n   * @param listener - Called when the state changes with the new state value.\n   * @returns A function to unsubscribe from state changes.\n   */\n  subscribe(listener: (state: T) => void): () => void;\n}\n\n/**\n * Connection API for managing Zero's connection lifecycle.\n */\nexport interface Connection {\n  /**\n   * The current connection state as a subscribable value.\n   */\n  readonly state: Source<ConnectionState>;\n\n  /**\n   * Resumes the connection from a terminal state.\n   *\n   * If called when not in a terminal state, this method does nothing.\n   *\n   * @param opts - Optional connection options\n   * @param opts.auth - Token to use for authentication. If provided, this overrides\n   *                    the stored auth credential for this connection attempt.\n   *                    If `null` or `undefined`, the stored auth credential is cleared.\n   * @returns A promise that resolves once the connection state has transitioned to connecting.\n   */\n  connect(opts?: {auth: string | null | undefined}): Promise<void>;\n}\n\nexport class ConnectionImpl implements Connection {\n  readonly #connectionManager: ConnectionManager;\n  readonly #lc: LogContext;\n  readonly #source: ConnectionSource;\n  readonly #setAuth: (auth: string | null | undefined) => void;\n\n  constructor(\n    connectionManager: ConnectionManager,\n    lc: LogContext,\n    setAuth: (auth: string | null | undefined) => void,\n  ) {\n    this.#connectionManager = connectionManager;\n    this.#lc = lc;\n    this.#source = new ConnectionSource(connectionManager);\n    this.#setAuth = setAuth;\n  }\n\n  get state(): Source<ConnectionState> {\n    return this.#source;\n  }\n\n  async connect(opts?: {auth: string | null | undefined}): Promise<void> {\n    const lc = this.#lc.withContext('connect');\n\n    if (opts && 'auth' in opts) {\n      lc.debug?.('Updating auth credential from connect()');\n      this.#setAuth(opts.auth);\n    }\n\n    // if the connection is disconnected due to a missing cacheURL, we don't allow a reconnect\n    if (\n      this.#connectionManager.state.name === ConnectionStatus.Disconnected &&\n      this.#connectionManager.state.reason.kind ===\n        ClientErrorKind.NoSocketOrigin\n    ) {\n      lc.error?.(\n        'connect() called but the connection is disconnected due to a missing cacheURL. No reconnect will be attempted.',\n      );\n      return;\n    }\n\n    // only allow connect() to be called from a terminal state\n    if (!this.#connectionManager.isInTerminalState()) {\n      lc.debug?.(\n        'connect() called but not in a terminal state. Current state:',\n        this.#connectionManager.state.name,\n      );\n      return;\n    }\n\n    lc.info?.(\n      `Resuming connection from state: ${this.#connectionManager.state.name}`,\n    );\n\n    this.#connectionManager.requestConnect();\n    if (this.#connectionManager.state.name === ConnectionStatus.Connecting) {\n      return;\n    }\n\n    await this.#connectionManager.waitForStateChange();\n  }\n}\n\nexport class ConnectionSource\n  extends Subscribable<ConnectionState>\n  implements Source<ConnectionState>\n{\n  #state: ConnectionState;\n\n  constructor(connectionManager: ConnectionManager) {\n    super();\n    this.#state = this.#mapConnectionManagerState(connectionManager.state);\n\n    // Subscribe to ConnectionManager immediately to keep #state in sync.\n    // This ensures `current` always returns the correct state, even if\n    // external code hasn't subscribed yet (fixes race condition where\n    // connection completes before React subscribes).\n    connectionManager.subscribe(state => {\n      this.#state = this.#mapConnectionManagerState(state);\n      this.notify(this.#state);\n    });\n  }\n\n  get current(): ConnectionState {\n    return this.#state;\n  }\n\n  #mapConnectionManagerState(state: ConnectionManagerState): ConnectionState {\n    switch (state.name) {\n      case ConnectionStatus.Closed:\n        return {\n          name: 'closed',\n          reason: state.reason.message,\n        };\n      case ConnectionStatus.Connected:\n        return {\n          name: 'connected',\n        };\n      case ConnectionStatus.Connecting:\n        return {\n          name: 'connecting',\n          ...(state.reason?.message ? {reason: state.reason.message} : {}),\n        };\n      case ConnectionStatus.Disconnected:\n        return {\n          name: 'disconnected',\n          reason: state.reason.message,\n        };\n      case ConnectionStatus.Error:\n        return {\n          name: 'error',\n          reason: state.reason.message,\n        };\n      case ConnectionStatus.NeedsAuth:\n        return {\n          name: 'needs-auth',\n          reason:\n            state.reason.errorBody.kind === ErrorKind.PushFailed\n              ? {\n                  type: 'mutate',\n                  status: state.reason.errorBody.status,\n                  ...(state.reason.errorBody.bodyPreview\n                    ? {body: state.reason.errorBody.bodyPreview}\n                    : {}),\n                }\n              : state.reason.errorBody.kind === ErrorKind.TransformFailed\n                ? {\n                    type: 'query',\n                    status: state.reason.errorBody.status,\n                    ...(state.reason.errorBody.bodyPreview\n                      ? {body: state.reason.errorBody.bodyPreview}\n                      : {}),\n                  }\n                : {\n                    type: 'zero-cache',\n                    reason: state.reason.message,\n                  },\n        };\n\n      default:\n        unreachable(state);\n    }\n  }\n}\n"],"names":["ConnectionStatus.Disconnected","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Connecting","ConnectionStatus.Closed","ConnectionStatus.Connected","ConnectionStatus.Error","ConnectionStatus.NeedsAuth","ErrorKind.PushFailed","ErrorKind.TransformFailed"],"mappings":";;;;;AAsGO,MAAM,eAAqC;AAAA,EACvC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,mBACA,IACA,SACA;AACA,SAAK,qBAAqB;AAC1B,SAAK,MAAM;AACX,SAAK,UAAU,IAAI,iBAAiB,iBAAiB;AACrD,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,IAAI,QAAiC;AACnC,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,MAAM,QAAQ,MAAyD;AACrE,UAAM,KAAK,KAAK,IAAI,YAAY,SAAS;AAEzC,QAAI,QAAQ,UAAU,MAAM;AAC1B,SAAG,QAAQ,yCAAyC;AACpD,WAAK,SAAS,KAAK,IAAI;AAAA,IACzB;AAGA,QACE,KAAK,mBAAmB,MAAM,SAASA,gBACvC,KAAK,mBAAmB,MAAM,OAAO,SACnCC,gBACF;AACA,SAAG;AAAA,QACD;AAAA,MAAA;AAEF;AAAA,IACF;AAGA,QAAI,CAAC,KAAK,mBAAmB,qBAAqB;AAChD,SAAG;AAAA,QACD;AAAA,QACA,KAAK,mBAAmB,MAAM;AAAA,MAAA;AAEhC;AAAA,IACF;AAEA,OAAG;AAAA,MACD,mCAAmC,KAAK,mBAAmB,MAAM,IAAI;AAAA,IAAA;AAGvE,SAAK,mBAAmB,eAAA;AACxB,QAAI,KAAK,mBAAmB,MAAM,SAASC,YAA6B;AACtE;AAAA,IACF;AAEA,UAAM,KAAK,mBAAmB,mBAAA;AAAA,EAChC;AACF;AAEO,MAAM,yBACH,aAEV;AAAA,EACE;AAAA,EAEA,YAAY,mBAAsC;AAChD,UAAA;AACA,SAAK,SAAS,KAAK,2BAA2B,kBAAkB,KAAK;AAMrE,sBAAkB,UAAU,CAAA,UAAS;AACnC,WAAK,SAAS,KAAK,2BAA2B,KAAK;AACnD,WAAK,OAAO,KAAK,MAAM;AAAA,IACzB,CAAC;AAAA,EACH;AAAA,EAEA,IAAI,UAA2B;AAC7B,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,2BAA2B,OAAgD;AACzE,YAAQ,MAAM,MAAA;AAAA,MACZ,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QAAQ,MAAM,OAAO;AAAA,QAAA;AAAA,MAEzB,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,QAAA;AAAA,MAEV,KAAKF;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,GAAI,MAAM,QAAQ,UAAU,EAAC,QAAQ,MAAM,OAAO,YAAW,CAAA;AAAA,QAAC;AAAA,MAElE,KAAKF;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QAAQ,MAAM,OAAO;AAAA,QAAA;AAAA,MAEzB,KAAKK;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QAAQ,MAAM,OAAO;AAAA,QAAA;AAAA,MAEzB,KAAKC;AACH,eAAO;AAAA,UACL,MAAM;AAAA,UACN,QACE,MAAM,OAAO,UAAU,SAASC,aAC5B;AAAA,YACE,MAAM;AAAA,YACN,QAAQ,MAAM,OAAO,UAAU;AAAA,YAC/B,GAAI,MAAM,OAAO,UAAU,cACvB,EAAC,MAAM,MAAM,OAAO,UAAU,gBAC9B,CAAA;AAAA,UAAC,IAEP,MAAM,OAAO,UAAU,SAASC,kBAC9B;AAAA,YACE,MAAM;AAAA,YACN,QAAQ,MAAM,OAAO,UAAU;AAAA,YAC/B,GAAI,MAAM,OAAO,UAAU,cACvB,EAAC,MAAM,MAAM,OAAO,UAAU,gBAC9B,CAAA;AAAA,UAAC,IAEP;AAAA,YACE,MAAM;AAAA,YACN,QAAQ,MAAM,OAAO;AAAA,UAAA;AAAA,QACvB;AAAA,MAGZ;AACE,oBAAiB;AAAA,IAAA;AAAA,EAEvB;AACF;"}

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

@@ -6,6 +6,7 @@ import "../../../shared/src/config.js";
 import "../../../replicache/src/hash.js";
 import "../../../replicache/src/btree/node.js";
 import "compare-utf8";
+import "../../../shared/src/iterables.js";
 import "../../../shared/src/btree-set.js";
 import "../../../zero-protocol/src/ast.js";
 import "js-xxhash";

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

@@ -1 +1 @@
-{"version":3,"file":"context.js","sources":["../../../../../zero-client/src/client/context.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {NoIndexDiff} from '../../../replicache/src/btree/node.ts';\nimport type {Hash} from '../../../replicache/src/hash.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport type {DebugDelegate} from '../../../zql/src/builder/debug-delegate.ts';\nimport type {Input} from '../../../zql/src/ivm/operator.ts';\nimport type {Source, SourceInput} from '../../../zql/src/ivm/source.ts';\nimport {MeasurePushOperator} from '../../../zql/src/query/measure-push-operator.ts';\nimport type {MetricsDelegate} from '../../../zql/src/query/metrics-delegate.ts';\nimport {QueryDelegateBase} from '../../../zql/src/query/query-delegate-base.ts';\nimport type {CommitListener} from '../../../zql/src/query/query-delegate.ts';\nimport type {RunOptions} from '../../../zql/src/query/query.ts';\nimport {type IVMSourceBranch} from './ivm-branch.ts';\nimport type {QueryManager} from './query-manager.ts';\n\nexport type AddQuery = QueryManager['addLegacy'];\nexport type AddCustomQuery = QueryManager['addCustom'];\n\nexport type UpdateQuery = QueryManager['updateLegacy'];\nexport type UpdateCustomQuery = QueryManager['updateCustom'];\nexport type FlushQueryChanges = QueryManager['flushBatch'];\n\n/**\n * ZeroContext glues together zql and Replicache. It listens to changes in\n * Replicache data and pushes them into IVM and on tells the server about new\n * queries.\n */\nexport class ZeroContext extends QueryDelegateBase {\n  readonly #lc: LogContext;\n\n  // It is a bummer to have to maintain separate MemorySources here and copy the\n  // data in from the Replicache db. But we want the data to be accessible via\n  // pipelines *synchronously* and the core Replicache infra is all async. So\n  // that needs to be fixed.\n  readonly #mainSources: IVMSourceBranch;\n\n  readonly addServerQuery: AddQuery;\n  readonly addCustomQuery: AddCustomQuery;\n  readonly updateServerQuery: UpdateQuery;\n  readonly updateCustomQuery: UpdateCustomQuery;\n  readonly flushQueryChanges: () => void;\n  readonly #batchViewUpdates: (applyViewUpdates: () => void) => void;\n  readonly #commitListeners: Set<CommitListener> = new Set();\n\n  readonly assertValidRunOptions: (options?: RunOptions) => void;\n\n  /**\n   * Client-side queries start out as \"unknown\" and are then updated to\n   * \"complete\" once the server has sent back the query result.\n   */\n  readonly defaultQueryComplete = false;\n\n  readonly addMetric: MetricsDelegate['addMetric'];\n\n  constructor(\n    lc: LogContext,\n    mainSources: IVMSourceBranch,\n    addQuery: AddQuery,\n    addCustomQuery: AddCustomQuery,\n    updateQuery: UpdateQuery,\n    updateCustomQuery: UpdateCustomQuery,\n    flushQueryChanges: () => void,\n    batchViewUpdates: (applyViewUpdates: () => void) => void,\n    addMetric: MetricsDelegate['addMetric'],\n    assertValidRunOptions: (options?: RunOptions) => void,\n  ) {\n    super();\n    this.#lc = lc;\n    this.#mainSources = mainSources;\n    this.addServerQuery = addQuery;\n    this.updateServerQuery = updateQuery;\n    this.updateCustomQuery = updateCustomQuery;\n    this.#batchViewUpdates = batchViewUpdates;\n    this.assertValidRunOptions = assertValidRunOptions;\n    this.addCustomQuery = addCustomQuery;\n    this.flushQueryChanges = flushQueryChanges;\n    this.addMetric = addMetric;\n  }\n\n  applyFiltersAnyway?: boolean | undefined;\n\n  debug?: DebugDelegate | undefined;\n\n  getSource(name: string): Source | undefined {\n    return this.#mainSources.getSource(name);\n  }\n\n  mapAst(ast: AST): AST {\n    return ast;\n  }\n\n  override decorateSourceInput(input: SourceInput, queryID: string): Input {\n    return new MeasurePushOperator(input, queryID, this, 'query-update-client');\n  }\n\n  onTransactionCommit(cb: CommitListener): () => void {\n    this.#commitListeners.add(cb);\n    return () => {\n      this.#commitListeners.delete(cb);\n    };\n  }\n\n  override batchViewUpdates<T>(applyViewUpdates: () => T) {\n    let result: T | undefined;\n    let viewChangesPerformed = false;\n    this.#batchViewUpdates(() => {\n      result = applyViewUpdates();\n      viewChangesPerformed = true;\n    });\n    assert(\n      viewChangesPerformed,\n      'batchViewUpdates must call applyViewUpdates synchronously.',\n    );\n    return result as T;\n  }\n\n  processChanges(\n    expectedHead: Hash | undefined,\n    newHead: Hash,\n    changes: NoIndexDiff,\n  ) {\n    this.batchViewUpdates(() => {\n      try {\n        this.#mainSources.advance(expectedHead, newHead, changes);\n      } finally {\n        this.#endTransaction();\n      }\n    });\n  }\n\n  #endTransaction() {\n    for (const listener of this.#commitListeners) {\n      try {\n        listener();\n      } catch (e) {\n        // We should not fatal the inner-workings of Zero due to the user's application\n        // code throwing an error.\n        // Hence we wrap notifications in a try-catch block.\n        this.#lc.error?.(\n          ErrorKind.Internal,\n          'Failed notifying a commit listener of IVM updates',\n          e,\n        );\n      }\n    }\n  }\n}\n"],"names":["ErrorKind.Internal"],"mappings":";;;;;;;;;;;;;AA6BO,MAAM,oBAAoB,kBAAkB;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,uCAA4C,IAAA;AAAA,EAE5C;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,uBAAuB;AAAA,EAEvB;AAAA,EAET,YACE,IACA,aACA,UACA,gBACA,aACA,mBACA,mBACA,kBACA,WACA,uBACA;AACA,UAAA;AACA,SAAK,MAAM;AACX,SAAK,eAAe;AACpB,SAAK,iBAAiB;AACtB,SAAK,oBAAoB;AACzB,SAAK,oBAAoB;AACzB,SAAK,oBAAoB;AACzB,SAAK,wBAAwB;AAC7B,SAAK,iBAAiB;AACtB,SAAK,oBAAoB;AACzB,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA,UAAU,MAAkC;AAC1C,WAAO,KAAK,aAAa,UAAU,IAAI;AAAA,EACzC;AAAA,EAEA,OAAO,KAAe;AACpB,WAAO;AAAA,EACT;AAAA,EAES,oBAAoB,OAAoB,SAAwB;AACvE,WAAO,IAAI,oBAAoB,OAAO,SAAS,MAAM,qBAAqB;AAAA,EAC5E;AAAA,EAEA,oBAAoB,IAAgC;AAClD,SAAK,iBAAiB,IAAI,EAAE;AAC5B,WAAO,MAAM;AACX,WAAK,iBAAiB,OAAO,EAAE;AAAA,IACjC;AAAA,EACF;AAAA,EAES,iBAAoB,kBAA2B;AACtD,QAAI;AACJ,QAAI,uBAAuB;AAC3B,SAAK,kBAAkB,MAAM;AAC3B,eAAS,iBAAA;AACT,6BAAuB;AAAA,IACzB,CAAC;AACD;AAAA,MACE;AAAA,MACA;AAAA,IAAA;AAEF,WAAO;AAAA,EACT;AAAA,EAEA,eACE,cACA,SACA,SACA;AACA,SAAK,iBAAiB,MAAM;AAC1B,UAAI;AACF,aAAK,aAAa,QAAQ,cAAc,SAAS,OAAO;AAAA,MAC1D,UAAA;AACE,aAAK,gBAAA;AAAA,MACP;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,kBAAkB;AAChB,eAAW,YAAY,KAAK,kBAAkB;AAC5C,UAAI;AACF,iBAAA;AAAA,MACF,SAAS,GAAG;AAIV,aAAK,IAAI;AAAA,UACPA;AAAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AAAA,IACF;AAAA,EACF;AACF;"}
+{"version":3,"file":"context.js","sources":["../../../../../zero-client/src/client/context.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {NoIndexDiff} from '../../../replicache/src/btree/node.ts';\nimport type {Hash} from '../../../replicache/src/hash.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport type {DebugDelegate} from '../../../zql/src/builder/debug-delegate.ts';\nimport type {Input} from '../../../zql/src/ivm/operator.ts';\nimport type {Source, SourceInput} from '../../../zql/src/ivm/source.ts';\nimport {MeasurePushOperator} from '../../../zql/src/query/measure-push-operator.ts';\nimport type {MetricsDelegate} from '../../../zql/src/query/metrics-delegate.ts';\nimport {QueryDelegateBase} from '../../../zql/src/query/query-delegate-base.ts';\nimport type {CommitListener} from '../../../zql/src/query/query-delegate.ts';\nimport type {RunOptions} from '../../../zql/src/query/query.ts';\nimport {type IVMSourceBranch} from './ivm-branch.ts';\nimport type {QueryManager} from './query-manager.ts';\n\nexport type AddQuery = QueryManager['addLegacy'];\nexport type AddCustomQuery = QueryManager['addCustom'];\n\nexport type UpdateQuery = QueryManager['updateLegacy'];\nexport type UpdateCustomQuery = QueryManager['updateCustom'];\nexport type FlushQueryChanges = QueryManager['flushBatch'];\n\n/**\n * ZeroContext glues together zql and Replicache. It listens to changes in\n * Replicache data and pushes them into IVM and on tells the server about new\n * queries.\n */\nexport class ZeroContext extends QueryDelegateBase {\n  readonly #lc: LogContext;\n\n  // It is a bummer to have to maintain separate MemorySources here and copy the\n  // data in from the Replicache db. But we want the data to be accessible via\n  // pipelines *synchronously* and the core Replicache infra is all async. So\n  // that needs to be fixed.\n  readonly #mainSources: IVMSourceBranch;\n\n  readonly addServerQuery: AddQuery;\n  readonly addCustomQuery: AddCustomQuery;\n  readonly updateServerQuery: UpdateQuery;\n  readonly updateCustomQuery: UpdateCustomQuery;\n  readonly flushQueryChanges: () => void;\n  readonly #batchViewUpdates: (applyViewUpdates: () => void) => void;\n  readonly #commitListeners: Set<CommitListener> = new Set();\n\n  readonly assertValidRunOptions: (options?: RunOptions) => void;\n\n  /**\n   * Client-side queries start out as \"unknown\" and are then updated to\n   * \"complete\" once the server has sent back the query result.\n   */\n  readonly defaultQueryComplete = false;\n\n  readonly addMetric: MetricsDelegate['addMetric'];\n\n  constructor(\n    lc: LogContext,\n    mainSources: IVMSourceBranch,\n    addQuery: AddQuery,\n    addCustomQuery: AddCustomQuery,\n    updateQuery: UpdateQuery,\n    updateCustomQuery: UpdateCustomQuery,\n    flushQueryChanges: () => void,\n    batchViewUpdates: (applyViewUpdates: () => void) => void,\n    addMetric: MetricsDelegate['addMetric'],\n    assertValidRunOptions: (options?: RunOptions) => void,\n  ) {\n    super();\n    this.#lc = lc;\n    this.#mainSources = mainSources;\n    this.addServerQuery = addQuery;\n    this.updateServerQuery = updateQuery;\n    this.updateCustomQuery = updateCustomQuery;\n    this.#batchViewUpdates = batchViewUpdates;\n    this.assertValidRunOptions = assertValidRunOptions;\n    this.addCustomQuery = addCustomQuery;\n    this.flushQueryChanges = flushQueryChanges;\n    this.addMetric = addMetric;\n  }\n\n  applyFiltersAnyway?: boolean | undefined;\n\n  debug?: DebugDelegate | undefined;\n\n  getSource(name: string): Source | undefined {\n    return this.#mainSources.getSource(name);\n  }\n\n  mapAst(ast: AST): AST {\n    return ast;\n  }\n\n  override decorateSourceInput(input: SourceInput, queryID: string): Input {\n    return new MeasurePushOperator(input, queryID, this, 'query-update-client');\n  }\n\n  onTransactionCommit(cb: CommitListener): () => void {\n    this.#commitListeners.add(cb);\n    return () => {\n      this.#commitListeners.delete(cb);\n    };\n  }\n\n  override batchViewUpdates<T>(applyViewUpdates: () => T) {\n    let result: T | undefined;\n    let viewChangesPerformed = false;\n    this.#batchViewUpdates(() => {\n      result = applyViewUpdates();\n      viewChangesPerformed = true;\n    });\n    assert(\n      viewChangesPerformed,\n      'batchViewUpdates must call applyViewUpdates synchronously.',\n    );\n    return result as T;\n  }\n\n  processChanges(\n    expectedHead: Hash | undefined,\n    newHead: Hash,\n    changes: NoIndexDiff,\n  ) {\n    this.batchViewUpdates(() => {\n      try {\n        this.#mainSources.advance(expectedHead, newHead, changes);\n      } finally {\n        this.#endTransaction();\n      }\n    });\n  }\n\n  #endTransaction() {\n    for (const listener of this.#commitListeners) {\n      try {\n        listener();\n      } catch (e) {\n        // We should not fatal the inner-workings of Zero due to the user's application\n        // code throwing an error.\n        // Hence we wrap notifications in a try-catch block.\n        this.#lc.error?.(\n          ErrorKind.Internal,\n          'Failed notifying a commit listener of IVM updates',\n          e,\n        );\n      }\n    }\n  }\n}\n"],"names":["ErrorKind.Internal"],"mappings":";;;;;;;;;;;;;;AA6BO,MAAM,oBAAoB,kBAAkB;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,uCAA4C,IAAA;AAAA,EAE5C;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,uBAAuB;AAAA,EAEvB;AAAA,EAET,YACE,IACA,aACA,UACA,gBACA,aACA,mBACA,mBACA,kBACA,WACA,uBACA;AACA,UAAA;AACA,SAAK,MAAM;AACX,SAAK,eAAe;AACpB,SAAK,iBAAiB;AACtB,SAAK,oBAAoB;AACzB,SAAK,oBAAoB;AACzB,SAAK,oBAAoB;AACzB,SAAK,wBAAwB;AAC7B,SAAK,iBAAiB;AACtB,SAAK,oBAAoB;AACzB,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA,UAAU,MAAkC;AAC1C,WAAO,KAAK,aAAa,UAAU,IAAI;AAAA,EACzC;AAAA,EAEA,OAAO,KAAe;AACpB,WAAO;AAAA,EACT;AAAA,EAES,oBAAoB,OAAoB,SAAwB;AACvE,WAAO,IAAI,oBAAoB,OAAO,SAAS,MAAM,qBAAqB;AAAA,EAC5E;AAAA,EAEA,oBAAoB,IAAgC;AAClD,SAAK,iBAAiB,IAAI,EAAE;AAC5B,WAAO,MAAM;AACX,WAAK,iBAAiB,OAAO,EAAE;AAAA,IACjC;AAAA,EACF;AAAA,EAES,iBAAoB,kBAA2B;AACtD,QAAI;AACJ,QAAI,uBAAuB;AAC3B,SAAK,kBAAkB,MAAM;AAC3B,eAAS,iBAAA;AACT,6BAAuB;AAAA,IACzB,CAAC;AACD;AAAA,MACE;AAAA,MACA;AAAA,IAAA;AAEF,WAAO;AAAA,EACT;AAAA,EAEA,eACE,cACA,SACA,SACA;AACA,SAAK,iBAAiB,MAAM;AAC1B,UAAI;AACF,aAAK,aAAa,QAAQ,cAAc,SAAS,OAAO;AAAA,MAC1D,UAAA;AACE,aAAK,gBAAA;AAAA,MACP;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,kBAAkB;AAChB,eAAW,YAAY,KAAK,kBAAkB;AAC5C,UAAI;AACF,iBAAA;AAAA,MACF,SAAS,GAAG;AAIV,aAAK,IAAI;AAAA,UACPA;AAAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AAAA,IACF;AAAA,EACF;AACF;"}

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

@@ -65,9 +65,9 @@ function getErrorConnectionTransition(ex) {
       case PingTimeout:
       case PullTimeout:
       case Hidden:
+      case UnexpectedBaseCookie:
         return { status: NO_STATUS_TRANSITION, reason: ex };
       // Fatal errors that should transition to error state
-      case UnexpectedBaseCookie:
       case Internal:
       case InvalidMessage:
       case UserDisconnect:

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

@@ -1 +1 @@
-{"version":3,"file":"error.js","sources":["../../../../../zero-client/src/client/error.ts"],"sourcesContent":["import {unreachable} from '../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../shared/src/error.ts';\nimport type {Expand} from '../../../shared/src/expand.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport type {ProtocolError} from '../../../zero-protocol/src/error.ts';\nimport {\n  type BackoffBody,\n  type ErrorBody,\n  isProtocolError,\n  type PushFailedBody,\n  type TransformFailedBody,\n} from '../../../zero-protocol/src/error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {ConnectionStatus} from './connection-status.ts';\n\nexport type AuthError = ProtocolError<NeedsAuthReason>;\nexport type ClientErrorBody = {\n  kind: ClientErrorKind;\n  origin: typeof ErrorOrigin.Client;\n  message: string;\n};\nexport type ClosedError = ClientError<{\n  kind: ClientErrorKind.ClientClosed;\n  message: string;\n}>;\nexport type NeedsAuthReason = Expand<\n  | (ErrorBody & {\n      kind: ErrorKind.AuthInvalidated | ErrorKind.Unauthorized;\n    })\n  | (Extract<PushFailedBody, {reason: ErrorReason.HTTP}> & {status: 401 | 403})\n  | (Extract<TransformFailedBody, {reason: ErrorReason.HTTP}> & {\n      status: 401 | 403;\n    })\n>;\nexport type OfflineError = ClientError<{\n  kind: ClientErrorKind.Offline;\n  message: string;\n}>;\nexport type NoSocketOriginError = ClientError<{\n  kind: ClientErrorKind.NoSocketOrigin;\n  message: string;\n}>;\nexport type DisconnectedReason = OfflineError | NoSocketOriginError;\nexport type ServerError = ProtocolError<ErrorBody>;\nexport type ZeroError = ServerError | ClientError;\nexport type ZeroErrorBody = Expand<ErrorBody | ClientErrorBody>;\nexport type ZeroErrorDetails = Expand<Omit<ZeroErrorBody, 'message'>>;\nexport type ZeroErrorKind = Expand<ErrorKind | ClientErrorKind>;\n\n/**\n * Represents an error encountered by the Zero client.\n */\nexport class ClientError<\n  const T extends Omit<ClientErrorBody, 'origin'> = Omit<\n    ClientErrorBody,\n    'origin'\n  >,\n> extends Error {\n  readonly errorBody: {origin: typeof ErrorOrigin.Client} & T;\n\n  constructor(errorBody: T, options?: ErrorOptions) {\n    super(errorBody.message, options);\n    this.name = 'ClientError';\n    this.errorBody = {...errorBody, origin: ErrorOrigin.Client};\n  }\n\n  get kind(): T['kind'] {\n    return this.errorBody.kind;\n  }\n}\n\nexport function isZeroError(ex: unknown): ex is ZeroError {\n  return isClientError(ex) || isServerError(ex);\n}\n\nexport function isClientError(ex: unknown): ex is ClientError<ClientErrorBody> {\n  return (\n    ex instanceof ClientError && ex.errorBody.origin === ErrorOrigin.Client\n  );\n}\n\nexport function isServerError(ex: unknown): ex is ServerError {\n  return (\n    isProtocolError(ex) &&\n    (ex.errorBody.origin === ErrorOrigin.Server ||\n      ex.errorBody.origin === ErrorOrigin.ZeroCache)\n  );\n}\n\nexport function isOfflineError(ex: unknown): ex is OfflineError {\n  return isClientError(ex) && ex.kind === ClientErrorKind.Offline;\n}\n\nexport function isAuthError(ex: unknown): ex is AuthError {\n  if (isServerError(ex)) {\n    if (\n      ex.kind === ErrorKind.AuthInvalidated ||\n      ex.kind === ErrorKind.Unauthorized\n    ) {\n      return true;\n    }\n    if (\n      (ex.errorBody.kind === ErrorKind.PushFailed ||\n        ex.errorBody.kind === ErrorKind.TransformFailed) &&\n      ex.errorBody.reason === ErrorReason.HTTP &&\n      (ex.errorBody.status === 401 || ex.errorBody.status === 403)\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport function getBackoffParams(error: ZeroError): BackoffBody | undefined {\n  if (isServerError(error)) {\n    switch (error.errorBody.kind) {\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return error.errorBody;\n    }\n  }\n  return undefined;\n}\n\nexport const NO_STATUS_TRANSITION = 'NO_STATUS_TRANSITION';\n\nexport type ErrorConnectionTransition =\n  | {status: typeof NO_STATUS_TRANSITION; reason: ZeroError}\n  | {status: ConnectionStatus.NeedsAuth; reason: AuthError}\n  | {status: ConnectionStatus.Error; reason: ZeroError}\n  | {status: ConnectionStatus.Disconnected; reason: DisconnectedReason}\n  | {status: ConnectionStatus.Closed; reason: ZeroError};\n\n/**\n * Returns the status to transition to, or null if the error\n * indicates that the connection should continue in the current state.\n */\nexport function getErrorConnectionTransition(\n  ex: unknown,\n): ErrorConnectionTransition {\n  // Handle auth errors by transitioning to needs-auth state\n  if (isAuthError(ex)) {\n    return {\n      status: ConnectionStatus.NeedsAuth,\n      reason: ex,\n    } as const;\n  }\n\n  if (isClientError(ex)) {\n    switch (ex.kind) {\n      // Connecting errors that should continue in the current state\n      case ClientErrorKind.AbruptClose:\n      case ClientErrorKind.CleanClose:\n      case ClientErrorKind.ConnectTimeout:\n      case ClientErrorKind.PingTimeout:\n      case ClientErrorKind.PullTimeout:\n      case ClientErrorKind.Hidden:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Fatal errors that should transition to error state\n      case ClientErrorKind.UnexpectedBaseCookie:\n      case ClientErrorKind.Internal:\n      case ClientErrorKind.InvalidMessage:\n      case ClientErrorKind.UserDisconnect:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Disconnected error (this should already result in a disconnected state)\n      case ClientErrorKind.Offline:\n      case ClientErrorKind.NoSocketOrigin:\n        return {\n          status: ConnectionStatus.Disconnected,\n          reason: ex as DisconnectedReason,\n        } as const;\n\n      // Closed error (this should already result in a closed state)\n      case ClientErrorKind.ClientClosed:\n        return {status: ConnectionStatus.Closed, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  if (isServerError(ex)) {\n    switch (ex.kind) {\n      // Errors that should transition to error state\n      case ErrorKind.ClientNotFound:\n      case ErrorKind.InvalidConnectionRequest:\n      case ErrorKind.InvalidConnectionRequestBaseCookie:\n      case ErrorKind.InvalidConnectionRequestLastMutationID:\n      case ErrorKind.InvalidConnectionRequestClientDeleted:\n      case ErrorKind.InvalidMessage:\n      case ErrorKind.InvalidPush:\n      case ErrorKind.VersionNotSupported:\n      case ErrorKind.SchemaVersionNotSupported:\n      case ErrorKind.Internal:\n      // PushFailed and TransformFailed can be auth errors (401/403)\n      // or other errors - handle non-auth cases here\n      case ErrorKind.PushFailed:\n      case ErrorKind.TransformFailed:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Errors that should continue with backoff/retry\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Auth errors are handled above by isAuthError check\n      case ErrorKind.AuthInvalidated:\n      case ErrorKind.Unauthorized:\n        return {\n          status: ConnectionStatus.NeedsAuth,\n          reason: ex as AuthError,\n        } as const;\n\n      // Mutation-specific errors don't affect connection state\n      case ErrorKind.MutationRateLimited:\n      case ErrorKind.MutationFailed:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  // we default to error state if we don't know what to do\n  // this is a catch-all for unexpected errors\n  return {\n    status: ConnectionStatus.Error,\n    reason: new ClientError(\n      {\n        kind: ClientErrorKind.Internal,\n        message: 'Unexpected internal error: ' + getErrorMessage(ex),\n      },\n      {cause: ex},\n    ),\n  } as const;\n}\n"],"names":["ErrorOrigin.Client","ErrorOrigin.Server","ErrorOrigin.ZeroCache","ErrorKind.AuthInvalidated","ErrorKind.Unauthorized","ErrorKind.PushFailed","ErrorKind.TransformFailed","ErrorReason.HTTP","ErrorKind.Rebalance","ErrorKind.Rehome","ErrorKind.ServerOverloaded","ConnectionStatus.NeedsAuth","ClientErrorKind.AbruptClose","ClientErrorKind.CleanClose","ClientErrorKind.ConnectTimeout","ClientErrorKind.PingTimeout","ClientErrorKind.PullTimeout","ClientErrorKind.Hidden","ClientErrorKind.UnexpectedBaseCookie","ClientErrorKind.Internal","ClientErrorKind.InvalidMessage","ClientErrorKind.UserDisconnect","ConnectionStatus.Error","ClientErrorKind.Offline","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Disconnected","ClientErrorKind.ClientClosed","ConnectionStatus.Closed","ErrorKind.ClientNotFound","ErrorKind.InvalidConnectionRequest","ErrorKind.InvalidConnectionRequestBaseCookie","ErrorKind.InvalidConnectionRequestLastMutationID","ErrorKind.InvalidConnectionRequestClientDeleted","ErrorKind.InvalidMessage","ErrorKind.InvalidPush","ErrorKind.VersionNotSupported","ErrorKind.SchemaVersionNotSupported","ErrorKind.Internal","ErrorKind.MutationRateLimited","ErrorKind.MutationFailed"],"mappings":"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"}
+{"version":3,"file":"error.js","sources":["../../../../../zero-client/src/client/error.ts"],"sourcesContent":["import {unreachable} from '../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../shared/src/error.ts';\nimport type {Expand} from '../../../shared/src/expand.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport type {ProtocolError} from '../../../zero-protocol/src/error.ts';\nimport {\n  type BackoffBody,\n  type ErrorBody,\n  isProtocolError,\n  type PushFailedBody,\n  type TransformFailedBody,\n} from '../../../zero-protocol/src/error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {ConnectionStatus} from './connection-status.ts';\n\nexport type AuthError = ProtocolError<NeedsAuthReason>;\nexport type ClientErrorBody = {\n  kind: ClientErrorKind;\n  origin: typeof ErrorOrigin.Client;\n  message: string;\n};\nexport type ClosedError = ClientError<{\n  kind: ClientErrorKind.ClientClosed;\n  message: string;\n}>;\nexport type NeedsAuthReason = Expand<\n  | (ErrorBody & {\n      kind: ErrorKind.AuthInvalidated | ErrorKind.Unauthorized;\n    })\n  | (Extract<PushFailedBody, {reason: ErrorReason.HTTP}> & {status: 401 | 403})\n  | (Extract<TransformFailedBody, {reason: ErrorReason.HTTP}> & {\n      status: 401 | 403;\n    })\n>;\nexport type OfflineError = ClientError<{\n  kind: ClientErrorKind.Offline;\n  message: string;\n}>;\nexport type NoSocketOriginError = ClientError<{\n  kind: ClientErrorKind.NoSocketOrigin;\n  message: string;\n}>;\nexport type DisconnectedReason = OfflineError | NoSocketOriginError;\nexport type ServerError = ProtocolError<ErrorBody>;\nexport type ZeroError = ServerError | ClientError;\nexport type ZeroErrorBody = Expand<ErrorBody | ClientErrorBody>;\nexport type ZeroErrorDetails = Expand<Omit<ZeroErrorBody, 'message'>>;\nexport type ZeroErrorKind = Expand<ErrorKind | ClientErrorKind>;\n\n/**\n * Represents an error encountered by the Zero client.\n */\nexport class ClientError<\n  const T extends Omit<ClientErrorBody, 'origin'> = Omit<\n    ClientErrorBody,\n    'origin'\n  >,\n> extends Error {\n  readonly errorBody: {origin: typeof ErrorOrigin.Client} & T;\n\n  constructor(errorBody: T, options?: ErrorOptions) {\n    super(errorBody.message, options);\n    this.name = 'ClientError';\n    this.errorBody = {...errorBody, origin: ErrorOrigin.Client};\n  }\n\n  get kind(): T['kind'] {\n    return this.errorBody.kind;\n  }\n}\n\nexport function isZeroError(ex: unknown): ex is ZeroError {\n  return isClientError(ex) || isServerError(ex);\n}\n\nexport function isClientError(ex: unknown): ex is ClientError<ClientErrorBody> {\n  return (\n    ex instanceof ClientError && ex.errorBody.origin === ErrorOrigin.Client\n  );\n}\n\nexport function isServerError(ex: unknown): ex is ServerError {\n  return (\n    isProtocolError(ex) &&\n    (ex.errorBody.origin === ErrorOrigin.Server ||\n      ex.errorBody.origin === ErrorOrigin.ZeroCache)\n  );\n}\n\nexport function isOfflineError(ex: unknown): ex is OfflineError {\n  return isClientError(ex) && ex.kind === ClientErrorKind.Offline;\n}\n\nexport function isAuthError(ex: unknown): ex is AuthError {\n  if (isServerError(ex)) {\n    if (\n      ex.kind === ErrorKind.AuthInvalidated ||\n      ex.kind === ErrorKind.Unauthorized\n    ) {\n      return true;\n    }\n    if (\n      (ex.errorBody.kind === ErrorKind.PushFailed ||\n        ex.errorBody.kind === ErrorKind.TransformFailed) &&\n      ex.errorBody.reason === ErrorReason.HTTP &&\n      (ex.errorBody.status === 401 || ex.errorBody.status === 403)\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport function getBackoffParams(error: ZeroError): BackoffBody | undefined {\n  if (isServerError(error)) {\n    switch (error.errorBody.kind) {\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return error.errorBody;\n    }\n  }\n  return undefined;\n}\n\nexport const NO_STATUS_TRANSITION = 'NO_STATUS_TRANSITION';\n\nexport type ErrorConnectionTransition =\n  | {status: typeof NO_STATUS_TRANSITION; reason: ZeroError}\n  | {status: ConnectionStatus.NeedsAuth; reason: AuthError}\n  | {status: ConnectionStatus.Error; reason: ZeroError}\n  | {status: ConnectionStatus.Disconnected; reason: DisconnectedReason}\n  | {status: ConnectionStatus.Closed; reason: ZeroError};\n\n/**\n * Returns the status to transition to, or null if the error\n * indicates that the connection should continue in the current state.\n */\nexport function getErrorConnectionTransition(\n  ex: unknown,\n): ErrorConnectionTransition {\n  // Handle auth errors by transitioning to needs-auth state\n  if (isAuthError(ex)) {\n    return {\n      status: ConnectionStatus.NeedsAuth,\n      reason: ex,\n    } as const;\n  }\n\n  if (isClientError(ex)) {\n    switch (ex.kind) {\n      // Connecting errors that should continue in the current state\n      case ClientErrorKind.AbruptClose:\n      case ClientErrorKind.CleanClose:\n      case ClientErrorKind.ConnectTimeout:\n      case ClientErrorKind.PingTimeout:\n      case ClientErrorKind.PullTimeout:\n      case ClientErrorKind.Hidden:\n      case ClientErrorKind.UnexpectedBaseCookie:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Fatal errors that should transition to error state\n      case ClientErrorKind.Internal:\n      case ClientErrorKind.InvalidMessage:\n      case ClientErrorKind.UserDisconnect:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Disconnected error (this should already result in a disconnected state)\n      case ClientErrorKind.Offline:\n      case ClientErrorKind.NoSocketOrigin:\n        return {\n          status: ConnectionStatus.Disconnected,\n          reason: ex as DisconnectedReason,\n        } as const;\n\n      // Closed error (this should already result in a closed state)\n      case ClientErrorKind.ClientClosed:\n        return {status: ConnectionStatus.Closed, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  if (isServerError(ex)) {\n    switch (ex.kind) {\n      // Errors that should transition to error state\n      case ErrorKind.ClientNotFound:\n      case ErrorKind.InvalidConnectionRequest:\n      case ErrorKind.InvalidConnectionRequestBaseCookie:\n      case ErrorKind.InvalidConnectionRequestLastMutationID:\n      case ErrorKind.InvalidConnectionRequestClientDeleted:\n      case ErrorKind.InvalidMessage:\n      case ErrorKind.InvalidPush:\n      case ErrorKind.VersionNotSupported:\n      case ErrorKind.SchemaVersionNotSupported:\n      case ErrorKind.Internal:\n      // PushFailed and TransformFailed can be auth errors (401/403)\n      // or other errors - handle non-auth cases here\n      case ErrorKind.PushFailed:\n      case ErrorKind.TransformFailed:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Errors that should continue with backoff/retry\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Auth errors are handled above by isAuthError check\n      case ErrorKind.AuthInvalidated:\n      case ErrorKind.Unauthorized:\n        return {\n          status: ConnectionStatus.NeedsAuth,\n          reason: ex as AuthError,\n        } as const;\n\n      // Mutation-specific errors don't affect connection state\n      case ErrorKind.MutationRateLimited:\n      case ErrorKind.MutationFailed:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  // we default to error state if we don't know what to do\n  // this is a catch-all for unexpected errors\n  return {\n    status: ConnectionStatus.Error,\n    reason: new ClientError(\n      {\n        kind: ClientErrorKind.Internal,\n        message: 'Unexpected internal error: ' + getErrorMessage(ex),\n      },\n      {cause: ex},\n    ),\n  } as const;\n}\n"],"names":["ErrorOrigin.Client","ErrorOrigin.Server","ErrorOrigin.ZeroCache","ErrorKind.AuthInvalidated","ErrorKind.Unauthorized","ErrorKind.PushFailed","ErrorKind.TransformFailed","ErrorReason.HTTP","ErrorKind.Rebalance","ErrorKind.Rehome","ErrorKind.ServerOverloaded","ConnectionStatus.NeedsAuth","ClientErrorKind.AbruptClose","ClientErrorKind.CleanClose","ClientErrorKind.ConnectTimeout","ClientErrorKind.PingTimeout","ClientErrorKind.PullTimeout","ClientErrorKind.Hidden","ClientErrorKind.UnexpectedBaseCookie","ClientErrorKind.Internal","ClientErrorKind.InvalidMessage","ClientErrorKind.UserDisconnect","ConnectionStatus.Error","ClientErrorKind.Offline","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Disconnected","ClientErrorKind.ClientClosed","ConnectionStatus.Closed","ErrorKind.ClientNotFound","ErrorKind.InvalidConnectionRequest","ErrorKind.InvalidConnectionRequestBaseCookie","ErrorKind.InvalidConnectionRequestLastMutationID","ErrorKind.InvalidConnectionRequestClientDeleted","ErrorKind.InvalidMessage","ErrorKind.InvalidPush","ErrorKind.VersionNotSupported","ErrorKind.SchemaVersionNotSupported","ErrorKind.Internal","ErrorKind.MutationRateLimited","ErrorKind.MutationFailed"],"mappings":"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"}

package/out/zero-client/src/client/mutator-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutator-proxy.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAInE,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAc,KAAK,SAAS,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAY3D,qBAAa,YAAY;;gBAOrB,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe;IAYlC,IAAI,sBAAsB,IAAI,SAAS,GAAG,SAAS,CAElD;IA0CD,iBAAiB,CACf,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,CAAC,iBAAiB,CAAC,KAAK;QAC/C,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1B,EACD,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa;CAwGjE"}
+{"version":3,"file":"mutator-proxy.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAInE,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAc,KAAK,SAAS,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAuB3D,qBAAa,YAAY;;gBAOrB,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe;IAYlC,IAAI,sBAAsB,IAAI,SAAS,GAAG,SAAS,CAElD;IA0CD,iBAAiB,CACf,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,CAAC,iBAAiB,CAAC,KAAK;QAC/C,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1B,EACD,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa;CA4GjE"}

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

@@ -1,12 +1,22 @@
 import { unreachable } from "../../../shared/src/asserts.js";
 import { wrapWithApplicationError } from "../../../zero-protocol/src/application-error.js";
-import { NoSocketOrigin } from "./client-error-kind-enum.js";
+import { NoSocketOrigin, ClientClosed, Offline } from "./client-error-kind-enum.js";
 import { Disconnected, NeedsAuth, Connecting, Connected, Closed, Error } from "./connection-status-enum.js";
 import { isZeroError } from "./error.js";
 const successResultDetails = {
   type: "success"
 };
 const successResult = () => successResultDetails;
+function getStateDescription(error) {
+  switch (error.kind) {
+    case Offline:
+      return "offline";
+    case ClientClosed:
+      return "closed";
+    default:
+      return "in error state";
+  }
+}
 class MutatorProxy {
   #lc;
   #connectionManager;
@@ -60,6 +70,10 @@ class MutatorProxy {
   wrapCustomMutator(name, f) {
     return (...args) => {
       if (this.#mutationRejection) {
+        const error = this.#mutationRejection.error;
+        this.#lc.warn?.(
+          `Mutation "${name}" rejected because Zero is ${getStateDescription(error)}. Details: ${error.message}. See also: https://zero.rocicorp.dev/docs/connection.`
+        );
         return {
           client: this.#mutationRejection.promise,
           server: this.#mutationRejection.promise

package/out/zero-client/src/client/mutator-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutator-proxy.js","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {ApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {wrapWithApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport type {\n  ConnectionManager,\n  ConnectionManagerState,\n} from './connection-manager.ts';\nimport {ConnectionStatus} from './connection-status.ts';\nimport type {\n  MutatorResult,\n  MutatorResultErrorDetails,\n  MutatorResultSuccessDetails,\n} from './custom.ts';\nimport {isZeroError, type ZeroError} from './error.ts';\nimport type {MutationTracker} from './mutation-tracker.ts';\n\nconst successResultDetails = {\n  type: 'success',\n} as const satisfies MutatorResultSuccessDetails;\nconst successResult = () => successResultDetails;\n\ntype CachedMutationRejection = {\n  readonly error: ZeroError;\n  readonly promise: Promise<MutatorResultErrorDetails>;\n};\n\nexport class MutatorProxy {\n  readonly #lc: LogContext;\n  readonly #connectionManager: ConnectionManager;\n  readonly #mutationTracker: MutationTracker;\n  #mutationRejection: CachedMutationRejection | undefined;\n\n  constructor(\n    lc: LogContext,\n    connectionManager: ConnectionManager,\n    mutationTracker: MutationTracker,\n  ) {\n    this.#lc = lc;\n    this.#connectionManager = connectionManager;\n    this.#mutationTracker = mutationTracker;\n\n    this.#connectionManager.subscribe(state =>\n      this.#onConnectionStateChange(state),\n    );\n    this.#onConnectionStateChange(connectionManager.state);\n  }\n\n  get mutationRejectionError(): ZeroError | undefined {\n    return this.#mutationRejection?.error;\n  }\n\n  /**\n   * Called when the connection state changes.\n   *\n   * If the connection state is disconnected, error, or closed, the\n   * mutation rejection error is set and all outstanding `.server` promises in\n   * the mutation tracker are rejected with the error.\n   */\n  #onConnectionStateChange(state: ConnectionManagerState) {\n    // we short circuit the rejection if the error is due to a missing cacheURL\n    // this allows local writes to continue\n    if (\n      state.name === ConnectionStatus.Disconnected &&\n      state.reason.kind === ClientErrorKind.NoSocketOrigin\n    ) {\n      this.#mutationRejection = undefined;\n      return;\n    }\n\n    switch (state.name) {\n      case ConnectionStatus.Disconnected:\n      case ConnectionStatus.Error:\n      case ConnectionStatus.Closed:\n        this.#mutationRejection = {\n          error: state.reason,\n          promise: Promise.resolve(\n            this.#makeZeroErrorResultDetails(state.reason),\n          ),\n        };\n        this.#mutationTracker.rejectAllOutstandingMutations(state.reason);\n        break;\n      case ConnectionStatus.Connected:\n      case ConnectionStatus.Connecting:\n      case ConnectionStatus.NeedsAuth:\n        this.#mutationRejection = undefined;\n        return;\n      default:\n        unreachable(state);\n    }\n  }\n\n  wrapCustomMutator<\n    F extends (...args: [] | [ReadonlyJSONValue]) => {\n      client: Promise<unknown>;\n      server: Promise<unknown>;\n    },\n  >(name: string, f: F): (...args: Parameters<F>) => MutatorResult {\n    return (...args) => {\n      if (this.#mutationRejection) {\n        return {\n          client: this.#mutationRejection.promise,\n          server: this.#mutationRejection.promise,\n        } as const satisfies MutatorResult;\n      }\n\n      let result: {\n        client: Promise<unknown>;\n        server: Promise<unknown>;\n      };\n\n      const cachedMutationPromises: Partial<\n        Record<'client' | 'server', Promise<MutatorResultErrorDetails>>\n      > = {};\n\n      const wrapErrorFor =\n        (origin: 'client' | 'server') =>\n        (error: unknown): Promise<MutatorResultErrorDetails> => {\n          const cachedPromise = cachedMutationPromises[origin];\n          if (cachedPromise) {\n            return cachedPromise;\n          }\n\n          if (isZeroError(error)) {\n            this.#lc.error?.(`Mutator \"${name}\" error on ${origin}`, error);\n\n            const zeroErrorPromise = this.#makeZeroErrorResultDetails(error);\n            cachedMutationPromises[origin] = zeroErrorPromise;\n            return zeroErrorPromise;\n          }\n\n          const applicationError = wrapWithApplicationError(error);\n          this.#lc.error?.(\n            `Mutator \"${name}\" app error on ${origin}`,\n            applicationError,\n          );\n\n          const applicationErrorPromise =\n            this.#makeApplicationErrorResultDetails(applicationError);\n          cachedMutationPromises[origin] = applicationErrorPromise;\n          return applicationErrorPromise;\n        };\n\n      try {\n        result = f(...args);\n      } catch (error) {\n        const clientPromise = wrapErrorFor('client')(error);\n        const serverPromise = wrapErrorFor('server')(error);\n\n        return {\n          client: clientPromise,\n          server: serverPromise,\n        } as const satisfies MutatorResult;\n      }\n\n      const client = this.#normalizeResultPromise(\n        result.client,\n        wrapErrorFor('client'),\n      );\n      const server = this.#normalizeResultPromise(\n        result.server,\n        wrapErrorFor('server'),\n      );\n\n      return {\n        client,\n        server,\n      };\n    };\n  }\n\n  #normalizeResultPromise(\n    promise: Promise<unknown>,\n    wrapError: (error: unknown) => Promise<MutatorResultErrorDetails>,\n  ) {\n    return promise.then<MutatorResultSuccessDetails, MutatorResultErrorDetails>(\n      successResult,\n      wrapError,\n    );\n  }\n\n  #makeZeroErrorResultDetails(zeroError: ZeroError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'zero',\n        message: zeroError.message,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n\n  #makeApplicationErrorResultDetails(applicationError: ApplicationError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'app',\n        message: applicationError.message,\n        details: applicationError.details,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n}\n"],"names":["ConnectionStatus.Disconnected","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Error","ConnectionStatus.Closed","ConnectionStatus.Connected","ConnectionStatus.Connecting","ConnectionStatus.NeedsAuth"],"mappings":"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"}
+{"version":3,"file":"mutator-proxy.js","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {ApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {wrapWithApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport type {\n  ConnectionManager,\n  ConnectionManagerState,\n} from './connection-manager.ts';\nimport {ConnectionStatus} from './connection-status.ts';\nimport type {\n  MutatorResult,\n  MutatorResultErrorDetails,\n  MutatorResultSuccessDetails,\n} from './custom.ts';\nimport {isZeroError, type ZeroError} from './error.ts';\nimport type {MutationTracker} from './mutation-tracker.ts';\n\nconst successResultDetails = {\n  type: 'success',\n} as const satisfies MutatorResultSuccessDetails;\nconst successResult = () => successResultDetails;\n\nfunction getStateDescription(error: ZeroError): string {\n  switch (error.kind) {\n    case ClientErrorKind.Offline:\n      return 'offline';\n    case ClientErrorKind.ClientClosed:\n      return 'closed';\n    default:\n      return 'in error state';\n  }\n}\n\ntype CachedMutationRejection = {\n  readonly error: ZeroError;\n  readonly promise: Promise<MutatorResultErrorDetails>;\n};\n\nexport class MutatorProxy {\n  readonly #lc: LogContext;\n  readonly #connectionManager: ConnectionManager;\n  readonly #mutationTracker: MutationTracker;\n  #mutationRejection: CachedMutationRejection | undefined;\n\n  constructor(\n    lc: LogContext,\n    connectionManager: ConnectionManager,\n    mutationTracker: MutationTracker,\n  ) {\n    this.#lc = lc;\n    this.#connectionManager = connectionManager;\n    this.#mutationTracker = mutationTracker;\n\n    this.#connectionManager.subscribe(state =>\n      this.#onConnectionStateChange(state),\n    );\n    this.#onConnectionStateChange(connectionManager.state);\n  }\n\n  get mutationRejectionError(): ZeroError | undefined {\n    return this.#mutationRejection?.error;\n  }\n\n  /**\n   * Called when the connection state changes.\n   *\n   * If the connection state is disconnected, error, or closed, the\n   * mutation rejection error is set and all outstanding `.server` promises in\n   * the mutation tracker are rejected with the error.\n   */\n  #onConnectionStateChange(state: ConnectionManagerState) {\n    // we short circuit the rejection if the error is due to a missing cacheURL\n    // this allows local writes to continue\n    if (\n      state.name === ConnectionStatus.Disconnected &&\n      state.reason.kind === ClientErrorKind.NoSocketOrigin\n    ) {\n      this.#mutationRejection = undefined;\n      return;\n    }\n\n    switch (state.name) {\n      case ConnectionStatus.Disconnected:\n      case ConnectionStatus.Error:\n      case ConnectionStatus.Closed:\n        this.#mutationRejection = {\n          error: state.reason,\n          promise: Promise.resolve(\n            this.#makeZeroErrorResultDetails(state.reason),\n          ),\n        };\n        this.#mutationTracker.rejectAllOutstandingMutations(state.reason);\n        break;\n      case ConnectionStatus.Connected:\n      case ConnectionStatus.Connecting:\n      case ConnectionStatus.NeedsAuth:\n        this.#mutationRejection = undefined;\n        return;\n      default:\n        unreachable(state);\n    }\n  }\n\n  wrapCustomMutator<\n    F extends (...args: [] | [ReadonlyJSONValue]) => {\n      client: Promise<unknown>;\n      server: Promise<unknown>;\n    },\n  >(name: string, f: F): (...args: Parameters<F>) => MutatorResult {\n    return (...args) => {\n      if (this.#mutationRejection) {\n        const error = this.#mutationRejection.error;\n        this.#lc.warn?.(\n          `Mutation \"${name}\" rejected because Zero is ${getStateDescription(error)}. Details: ${error.message}. See also: https://zero.rocicorp.dev/docs/connection.`,\n        );\n        return {\n          client: this.#mutationRejection.promise,\n          server: this.#mutationRejection.promise,\n        } as const satisfies MutatorResult;\n      }\n\n      let result: {\n        client: Promise<unknown>;\n        server: Promise<unknown>;\n      };\n\n      const cachedMutationPromises: Partial<\n        Record<'client' | 'server', Promise<MutatorResultErrorDetails>>\n      > = {};\n\n      const wrapErrorFor =\n        (origin: 'client' | 'server') =>\n        (error: unknown): Promise<MutatorResultErrorDetails> => {\n          const cachedPromise = cachedMutationPromises[origin];\n          if (cachedPromise) {\n            return cachedPromise;\n          }\n\n          if (isZeroError(error)) {\n            this.#lc.error?.(`Mutator \"${name}\" error on ${origin}`, error);\n\n            const zeroErrorPromise = this.#makeZeroErrorResultDetails(error);\n            cachedMutationPromises[origin] = zeroErrorPromise;\n            return zeroErrorPromise;\n          }\n\n          const applicationError = wrapWithApplicationError(error);\n          this.#lc.error?.(\n            `Mutator \"${name}\" app error on ${origin}`,\n            applicationError,\n          );\n\n          const applicationErrorPromise =\n            this.#makeApplicationErrorResultDetails(applicationError);\n          cachedMutationPromises[origin] = applicationErrorPromise;\n          return applicationErrorPromise;\n        };\n\n      try {\n        result = f(...args);\n      } catch (error) {\n        const clientPromise = wrapErrorFor('client')(error);\n        const serverPromise = wrapErrorFor('server')(error);\n\n        return {\n          client: clientPromise,\n          server: serverPromise,\n        } as const satisfies MutatorResult;\n      }\n\n      const client = this.#normalizeResultPromise(\n        result.client,\n        wrapErrorFor('client'),\n      );\n      const server = this.#normalizeResultPromise(\n        result.server,\n        wrapErrorFor('server'),\n      );\n\n      return {\n        client,\n        server,\n      };\n    };\n  }\n\n  #normalizeResultPromise(\n    promise: Promise<unknown>,\n    wrapError: (error: unknown) => Promise<MutatorResultErrorDetails>,\n  ) {\n    return promise.then<MutatorResultSuccessDetails, MutatorResultErrorDetails>(\n      successResult,\n      wrapError,\n    );\n  }\n\n  #makeZeroErrorResultDetails(zeroError: ZeroError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'zero',\n        message: zeroError.message,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n\n  #makeApplicationErrorResultDetails(applicationError: ApplicationError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'app',\n        message: applicationError.message,\n        details: applicationError.details,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n}\n"],"names":["ClientErrorKind.Offline","ClientErrorKind.ClientClosed","ConnectionStatus.Disconnected","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Error","ConnectionStatus.Closed","ConnectionStatus.Connected","ConnectionStatus.Connecting","ConnectionStatus.NeedsAuth"],"mappings":"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"}

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

@@ -119,6 +119,11 @@ export interface ZeroOptions<S extends Schema = DefaultSchema, MD extends Custom
      * If not provided, uses the default configured in zero-cache.
      */
     mutateURL?: string | undefined;
+    /**
+     * Custom headers to include in mutation requests sent to your API server.
+     * These headers are passed through zero-cache to the mutate endpoint.
+     */
+    mutateHeaders?: Record<string, string> | undefined;
     /**
      * Custom URL for query requests sent to your API server.
      * If not provided, uses the default configured in zero-cache.
@@ -131,6 +136,11 @@ export interface ZeroOptions<S extends Schema = DefaultSchema, MD extends Custom
      * If not provided, uses the default configured in zero-cache.
      */
     queryURL?: string | undefined;
+    /**
+     * Custom headers to include in query requests sent to your API server.
+     * These headers are passed through zero-cache to the query endpoint.
+     */
+    queryHeaders?: Record<string, string> | undefined;
     /**
      * `onOnlineChange` is called when the Zero instance's online status changes.
      *
@@ -184,7 +194,7 @@ export interface ZeroOptions<S extends Schema = DefaultSchema, MD extends Custom
      * The number of milliseconds to wait before disconnecting a Zero
      * instance when the connection to the server has timed out.
      *
-     * Default is 5 minutes.
+     * Default is 1 minute.
      */
     disconnectTimeoutMs?: number | undefined;
     /**

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

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