@rocicorp/zero 0.25.0 → 0.26.0-canary.0

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

@@ -0,0 +1,310 @@
+import { resolver } from "@rocicorp/resolver";
+import { Subscribable } from "../../../shared/src/subscribable.js";
+import { ClientClosed, Offline, ConnectTimeout, AbruptClose, CleanClose } from "./client-error-kind-enum.js";
+import { Connecting, NeedsAuth, Error, Closed, Disconnected, Connected } from "./connection-status-enum.js";
+import { ClientError, isClientError } from "./error.js";
+const DEFAULT_TIMEOUT_CHECK_INTERVAL_MS = 1e3;
+const TERMINAL_STATES = [
+  NeedsAuth,
+  Error
+];
+class ConnectionManager extends Subscribable {
+  #state;
+  /**
+   * The timestamp when we first started trying to connect.
+   * This is used to track the retry window.
+   * Reset to undefined when we successfully connect or when we transition to disconnected.
+   */
+  #connectingStartedAt;
+  /**
+   * The amount of milliseconds we allow for continuous connecting attempts before
+   * transitioning to disconnected state.
+   */
+  #disconnectTimeout;
+  /**
+   * Handle for the timeout interval that periodically checks whether we've
+   * exceeded the allowed connecting window.
+   */
+  #timeoutInterval;
+  /**
+   * Interval duration for checking whether the connecting timeout has elapsed.
+   */
+  #timeoutCheckIntervalMs;
+  /**
+   * Resolver used to signal waiting callers when the state changes.
+   */
+  #stateChangeResolver = resolver();
+  constructor(options) {
+    super();
+    const now = Date.now();
+    this.#disconnectTimeout = options.disconnectTimeout;
+    this.#timeoutCheckIntervalMs = options.timeoutCheckIntervalMs ?? DEFAULT_TIMEOUT_CHECK_INTERVAL_MS;
+    this.#state = {
+      name: Connecting,
+      attempt: 0,
+      disconnectAt: now + this.#disconnectTimeout
+    };
+    this.#connectingStartedAt = now;
+    this.#maybeStartTimeoutInterval();
+  }
+  get state() {
+    return this.#state;
+  }
+  /**
+   * Returns true if the current state is equal to the given status.
+   */
+  is(status) {
+    return this.#state.name === status;
+  }
+  /**
+   * Returns true if the current state is a terminal state
+   * that can be recovered from by calling connect().
+   */
+  isInTerminalState() {
+    return ConnectionManager.isTerminalState(this.#state);
+  }
+  /**
+   * Returns true if the given status is a terminal state
+   * that can be recovered from by calling connect().
+   */
+  static isTerminalState(state) {
+    return TERMINAL_STATES.includes(
+      state.name
+    );
+  }
+  /**
+   * Returns true if the run loop should continue.
+   * The run loop continues in all states except closed.
+   * In needs-auth and error states, the run loop pauses and waits for connect() to be called.
+   */
+  shouldContinueRunLoop() {
+    return this.#state.name !== Closed;
+  }
+  /**
+   * Waits for the next state change.
+   * @returns A promise that resolves when the next state change occurs.
+   */
+  waitForStateChange() {
+    return this.#nextStatePromise();
+  }
+  /**
+   * Transition to connecting state.
+   *
+   * This starts the timeout timer, but if we've entered disconnected state,
+   * we stay there and continue retrying.
+   *
+   * @returns An object containing a promise that resolves on the next state change.
+   */
+  connecting(reason) {
+    if (this.#state.name === Closed) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    if (this.#state.name === Disconnected) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    const now = Date.now();
+    if (this.#state.name === Connecting) {
+      this.#state = {
+        ...this.#state,
+        attempt: this.#state.attempt + 1,
+        reason
+      };
+      const nextStatePromise2 = this.#publishStateAndGetPromise();
+      this.#maybeStartTimeoutInterval();
+      return { nextStatePromise: nextStatePromise2 };
+    }
+    if (this.#connectingStartedAt === void 0) {
+      this.#connectingStartedAt = now;
+    }
+    const disconnectAt = this.#connectingStartedAt + this.#disconnectTimeout;
+    this.#state = {
+      name: Connecting,
+      attempt: 1,
+      disconnectAt,
+      reason
+    };
+    const nextStatePromise = this.#publishStateAndGetPromise();
+    this.#maybeStartTimeoutInterval();
+    return { nextStatePromise };
+  }
+  /**
+   * Transition to connected state.
+   * This resets the connecting timeout timer.
+   *
+   * @returns An object containing a promise that resolves on the next state change.
+   */
+  connected() {
+    if (this.#state.name === Closed) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    if (this.#state.name === Connected) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    this.#connectingStartedAt = void 0;
+    this.#maybeStopTimeoutInterval();
+    this.#state = {
+      name: Connected
+    };
+    const nextStatePromise = this.#publishStateAndGetPromise();
+    return { nextStatePromise };
+  }
+  /**
+   * Transition to disconnected state.
+   * This is called when the timeout expires.
+   * The run loop will continue trying to reconnect.
+   *
+   * @returns An object containing a promise that resolves on the next state change.
+   */
+  disconnected(reason) {
+    if (this.#state.name === Closed) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    if (this.#state.name === Disconnected) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    if (this.#state.name === Connected) {
+      this.#connectingStartedAt = void 0;
+    }
+    this.#maybeStopTimeoutInterval();
+    this.#state = {
+      name: Disconnected,
+      reason
+    };
+    const nextStatePromise = this.#publishStateAndGetPromise();
+    return { nextStatePromise };
+  }
+  /**
+   * Transition to needs-auth state.
+   * This pauses the run loop until connect() is called with new credentials.
+   * Resets the retry window and attempt counter.
+   *
+   * @returns An object containing a promise that resolves on the next state change.
+   */
+  needsAuth(reason) {
+    if (this.#state.name === Closed) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    if (this.#state.name === NeedsAuth) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    this.#connectingStartedAt = void 0;
+    this.#maybeStopTimeoutInterval();
+    this.#state = {
+      name: NeedsAuth,
+      reason
+    };
+    const nextStatePromise = this.#publishStateAndGetPromise();
+    return { nextStatePromise };
+  }
+  /**
+   * Transition to error state.
+   * This pauses the run loop until connect() is called.
+   * Resets the retry window and attempt counter.
+   *
+   * @returns An object containing a promise that resolves on the next state change.
+   */
+  error(reason) {
+    if (this.#state.name === Closed) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    if (this.#state.name === Error) {
+      return { nextStatePromise: this.#nextStatePromise() };
+    }
+    this.#connectingStartedAt = void 0;
+    this.#maybeStopTimeoutInterval();
+    this.#state = {
+      name: Error,
+      reason
+    };
+    const nextStatePromise = this.#publishStateAndGetPromise();
+    return { nextStatePromise };
+  }
+  /**
+   * Transition to closed state.
+   * This is terminal - no further transitions are allowed.
+   */
+  closed() {
+    if (this.#state.name === Closed) {
+      return;
+    }
+    this.#connectingStartedAt = void 0;
+    this.#maybeStopTimeoutInterval();
+    this.#state = {
+      name: Closed,
+      reason: new ClientError({
+        kind: ClientClosed,
+        message: "Zero was explicitly closed by calling zero.close()"
+      })
+    };
+    this.#publishState();
+    this.cleanup();
+    return;
+  }
+  cleanup = () => {
+    this._listeners.clear();
+    this.#resolveNextStateWaiters();
+  };
+  #resolveNextStateWaiters() {
+    this.#stateChangeResolver.resolve(this.#state);
+    this.#stateChangeResolver = resolver();
+  }
+  #publishState() {
+    this.notify(this.#state);
+    this.#resolveNextStateWaiters();
+  }
+  #nextStatePromise() {
+    return this.#stateChangeResolver.promise;
+  }
+  #publishStateAndGetPromise() {
+    this.#publishState();
+    return this.#nextStatePromise();
+  }
+  /**
+   * Check if we should transition from connecting to disconnected due to timeout.
+   * Returns true if the transition happened.
+   */
+  #checkTimeout() {
+    if (this.#state.name !== Connecting) {
+      return false;
+    }
+    const now = Date.now();
+    if (now >= this.#state.disconnectAt) {
+      this.disconnected(
+        new ClientError({
+          kind: Offline,
+          message: `Zero was unable to connect for ${Math.floor(this.#disconnectTimeout / 1e3)} seconds and was disconnected`
+        })
+      );
+      return true;
+    }
+    return false;
+  }
+  #maybeStartTimeoutInterval() {
+    if (this.#timeoutInterval !== void 0) {
+      return;
+    }
+    this.#timeoutInterval = setInterval(() => {
+      this.#checkTimeout();
+    }, this.#timeoutCheckIntervalMs);
+  }
+  #maybeStopTimeoutInterval() {
+    if (this.#timeoutInterval === void 0) {
+      return;
+    }
+    clearInterval(this.#timeoutInterval);
+    this.#timeoutInterval = void 0;
+  }
+}
+const throwIfConnectionError = (state) => {
+  if (ConnectionManager.isTerminalState(state) || state.name === Closed || (state.name === Connecting || state.name === Disconnected) && state.reason) {
+    if (isClientError(state.reason) && (state.reason.kind === ConnectTimeout || state.reason.kind === AbruptClose || state.reason.kind === CleanClose)) {
+      return;
+    }
+    throw state.reason;
+  }
+};
+export {
+  ConnectionManager,
+  throwIfConnectionError
+};
+//# sourceMappingURL=connection-manager.js.map

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

@@ -0,0 +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":";;;;;AAaA,MAAM,oCAAoC;AA0C1C,MAAM,kBAAkB;AAAA,EACtBA;AAAAA,EACAC;AACF;AAQO,MAAM,0BAA0B,aAAqC;AAAA,EAC1E;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA;AAAA;AAAA;AAAA,EAKA,uBAAyD,SAAA;AAAA,EAEzD,YAAY,SAAmC;AAC7C,UAAA;AAEA,UAAM,MAAM,KAAK,IAAA;AAEjB,SAAK,qBAAqB,QAAQ;AAClC,SAAK,0BACH,QAAQ,0BAA0B;AACpC,SAAK,SAAS;AAAA,MACZ,MAAMC;AAAAA,MACN,SAAS;AAAA,MACT,cAAc,MAAM,KAAK;AAAA,IAAA;AAE3B,SAAK,uBAAuB;AAC5B,SAAK,2BAAA;AAAA,EACP;AAAA,EAEA,IAAI,QAAgC;AAClC,WAAO,KAAK;AAAA,EACd;AAAA;AAAA;AAAA;AAAA,EAKA,GAAG,QAAmC;AACpC,WAAO,KAAK,OAAO,SAAS;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,oBAA6B;AAC3B,WAAO,kBAAkB,gBAAgB,KAAK,MAAM;AAAA,EACtD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,OAAO,gBACL,OACyC;AACzC,WAAQ,gBAAgD;AAAA,MACtD,MAAM;AAAA,IAAA;AAAA,EAEV;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,wBAAiC;AAC/B,WAAO,KAAK,OAAO,SAASC;AAAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,qBAAsD;AACpD,WAAO,KAAK,kBAAA;AAAA,EACd;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,WAAW,QAET;AAEA,QAAI,KAAK,OAAO,SAASA,QAAyB;AAChD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAKA,QAAI,KAAK,OAAO,SAASC,cAA+B;AACtD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAEA,UAAM,MAAM,KAAK,IAAA;AAGjB,QAAI,KAAK,OAAO,SAASF,YAA6B;AACpD,WAAK,SAAS;AAAA,QACZ,GAAG,KAAK;AAAA,QACR,SAAS,KAAK,OAAO,UAAU;AAAA,QAC/B;AAAA,MAAA;AAEF,YAAMG,oBAAmB,KAAK,2BAAA;AAC9B,WAAK,2BAAA;AACL,aAAO,EAAC,kBAAAA,kBAAAA;AAAAA,IACV;AAKA,QAAI,KAAK,yBAAyB,QAAW;AAC3C,WAAK,uBAAuB;AAAA,IAC9B;AAEA,UAAM,eAAe,KAAK,uBAAuB,KAAK;AAEtD,SAAK,SAAS;AAAA,MACZ,MAAMH;AAAAA,MACN,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IAAA;AAEF,UAAM,mBAAmB,KAAK,2BAAA;AAC9B,SAAK,2BAAA;AACL,WAAO,EAAC,iBAAA;AAAA,EACV;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,YAAiE;AAE/D,QAAI,KAAK,OAAO,SAASC,QAAyB;AAChD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,QAAI,KAAK,OAAO,SAASG,WAA4B;AACnD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,SAAK,uBAAuB;AAC5B,SAAK,0BAAA;AAEL,SAAK,SAAS;AAAA,MACZ,MAAMA;AAAAA,IAAiB;AAEzB,UAAM,mBAAmB,KAAK,2BAAA;AAC9B,WAAO,EAAC,iBAAA;AAAA,EACV;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,aAAa,QAEX;AAEA,QAAI,KAAK,OAAO,SAASH,QAAyB;AAChD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,QAAI,KAAK,OAAO,SAASC,cAA+B;AACtD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAIA,QAAI,KAAK,OAAO,SAASE,WAA4B;AACnD,WAAK,uBAAuB;AAAA,IAC9B;AAIA,SAAK,0BAAA;AAEL,SAAK,SAAS;AAAA,MACZ,MAAMF;AAAAA,MACN;AAAA,IAAA;AAEF,UAAM,mBAAmB,KAAK,2BAAA;AAC9B,WAAO,EAAC,iBAAA;AAAA,EACV;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,UAAU,QAER;AAEA,QAAI,KAAK,OAAO,SAASD,QAAyB;AAChD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,QAAI,KAAK,OAAO,SAASH,WAA4B;AACnD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,SAAK,uBAAuB;AAC5B,SAAK,0BAAA;AAEL,SAAK,SAAS;AAAA,MACZ,MAAMA;AAAAA,MACN;AAAA,IAAA;AAEF,UAAM,mBAAmB,KAAK,2BAAA;AAC9B,WAAO,EAAC,iBAAA;AAAA,EACV;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,QAEJ;AAEA,QAAI,KAAK,OAAO,SAASG,QAAyB;AAChD,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,QAAI,KAAK,OAAO,SAASF,OAAwB;AAC/C,aAAO,EAAC,kBAAkB,KAAK,oBAAkB;AAAA,IACnD;AAGA,SAAK,uBAAuB;AAC5B,SAAK,0BAAA;AAEL,SAAK,SAAS;AAAA,MACZ,MAAMA;AAAAA,MACN;AAAA,IAAA;AAEF,UAAM,mBAAmB,KAAK,2BAAA;AAC9B,WAAO,EAAC,iBAAA;AAAA,EACV;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,SAAS;AAEP,QAAI,KAAK,OAAO,SAASE,QAAyB;AAChD;AAAA,IACF;AAEA,SAAK,uBAAuB;AAC5B,SAAK,0BAAA;AAEL,SAAK,SAAS;AAAA,MACZ,MAAMA;AAAAA,MACN,QAAQ,IAAI,YAAY;AAAA,QACtB,MAAMI;AAAAA,QACN,SAAS;AAAA,MAAA,CACV;AAAA,IAAA;AAEH,SAAK,cAAA;AACL,SAAK,QAAA;AACL;AAAA,EACF;AAAA,EAES,UAAU,MAAY;AAC7B,SAAK,WAAW,MAAA;AAChB,SAAK,yBAAA;AAAA,EACP;AAAA,EAEA,2BAAiC;AAC/B,SAAK,qBAAqB,QAAQ,KAAK,MAAM;AAC7C,SAAK,uBAAuB,SAAA;AAAA,EAC9B;AAAA,EAEA,gBAAsB;AACpB,SAAK,OAAO,KAAK,MAAM;AACvB,SAAK,yBAAA;AAAA,EACP;AAAA,EAEA,oBAAqD;AACnD,WAAO,KAAK,qBAAqB;AAAA,EACnC;AAAA,EAEA,6BAA8D;AAC5D,SAAK,cAAA;AACL,WAAO,KAAK,kBAAA;AAAA,EACd;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,gBAAyB;AACvB,QAAI,KAAK,OAAO,SAASL,YAA6B;AACpD,aAAO;AAAA,IACT;AAEA,UAAM,MAAM,KAAK,IAAA;AACjB,QAAI,OAAO,KAAK,OAAO,cAAc;AACnC,WAAK;AAAA,QACH,IAAI,YAAY;AAAA,UACd,MAAMM;AAAAA,UACN,SAAS,kCAAkC,KAAK,MAAM,KAAK,qBAAqB,GAAK,CAAC;AAAA,QAAA,CACvF;AAAA,MAAA;AAEH,aAAO;AAAA,IACT;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,6BAAmC;AACjC,QAAI,KAAK,qBAAqB,QAAW;AACvC;AAAA,IACF;AACA,SAAK,mBAAmB,YAAY,MAAM;AACxC,WAAK,cAAA;AAAA,IACP,GAAG,KAAK,uBAAuB;AAAA,EACjC;AAAA,EAEA,4BAAkC;AAChC,QAAI,KAAK,qBAAqB,QAAW;AACvC;AAAA,IACF;AACA,kBAAc,KAAK,gBAAgB;AACnC,SAAK,mBAAmB;AAAA,EAC1B;AACF;AAOO,MAAM,yBAAyB,CAAC,UAAkC;AACvE,MACE,kBAAkB,gBAAgB,KAAK,KACvC,MAAM,SAASL,WACb,MAAM,SAASD,cACf,MAAM,SAASE,iBACf,MAAM,QACR;AACA,QACE,cAAc,MAAM,MAAM,MACzB,MAAM,OAAO,SAASK,kBACrB,MAAM,OAAO,SAASC,eACtB,MAAM,OAAO,SAASC,aACxB;AACA;AAAA,IACF;AACA,UAAM,MAAM;AAAA,EACd;AACF;"}

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

@@ -0,0 +1,15 @@
+const Disconnected = "disconnected";
+const Connecting = "connecting";
+const Connected = "connected";
+const NeedsAuth = "needs-auth";
+const Error = "error";
+const Closed = "closed";
+export {
+  Closed,
+  Connected,
+  Connecting,
+  Disconnected,
+  Error,
+  NeedsAuth
+};
+//# sourceMappingURL=connection-status-enum.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"connection-status-enum.js","sources":["../../../../../zero-client/src/client/connection-status-enum.ts"],"sourcesContent":["export const Disconnected = 'disconnected';\nexport const Connecting = 'connecting';\nexport const Connected = 'connected';\nexport const NeedsAuth = 'needs-auth';\nexport const Error = 'error';\nexport const Closed = 'closed';\n\nexport type Disconnected = typeof Disconnected;\nexport type Connecting = typeof Connecting;\nexport type Connected = typeof Connected;\nexport type NeedsAuth = typeof NeedsAuth;\nexport type Error = typeof Error;\nexport type Closed = typeof Closed;\n"],"names":[],"mappings":"AAAO,MAAM,eAAe;AACrB,MAAM,aAAa;AACnB,MAAM,YAAY;AAClB,MAAM,YAAY;AAClB,MAAM,QAAQ;AACd,MAAM,SAAS;"}

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

@@ -1,5 +1,49 @@
-import type { ConnectionManager, ConnectionState } from './connection-manager.ts';
-import type { ZeroLogContext } from './zero-log-context.ts';
+import type { LogContext } from '@rocicorp/logger';
+import { Subscribable } from '../../../shared/src/subscribable.ts';
+import type { ConnectionManager } from './connection-manager.ts';
+/**
+ * The current connection state of the Zero instance. One of the following states:
+ *
+ * - `connecting`: The client is actively trying to connect every 5 seconds.
+ * - `disconnected`: The client is now in an "offline" state. It will continue
+ *   to try to connect every 5 seconds.
+ * - `connected`: The client has opened a successful connection to the server.
+ * - `needs-auth`: Authentication is invalid or expired. No connection retries will be made
+ *   until the host application calls `connect()`.
+ * - `error`: A fatal error occurred. No connection retries will be made until the host
+ *   application calls `connect()` again.
+ * - `closed`: The client was shut down (for example via `zero.close()`). This is
+ *   a terminal state, and a new Zero instance must be created to reconnect.
+ */
+export type ConnectionState = {
+    name: 'disconnected';
+    reason: string;
+} | {
+    name: 'connecting';
+    reason?: string;
+} | {
+    name: 'connected';
+} | {
+    name: 'needs-auth';
+    reason: {
+        type: 'mutate';
+        status: 401 | 403;
+        body?: string;
+    } | {
+        type: 'query';
+        status: 401 | 403;
+        body?: string;
+    } | {
+        type: 'zero-cache';
+        reason: string;
+    };
+} | {
+    name: 'error';
+    reason: string;
+} | {
+    name: 'closed';
+    reason: string;
+};
 export interface Source<T> {
     /**
      * The current state value.
@@ -38,16 +82,15 @@ export interface Connection {
 }
 export declare class ConnectionImpl implements Connection {
     #private;
-    constructor(connectionManager: ConnectionManager, lc: ZeroLogContext, setAuth: (auth: string | null | undefined) => void);
+    constructor(connectionManager: ConnectionManager, lc: LogContext, setAuth: (auth: string | null | undefined) => void);
     get state(): Source<ConnectionState>;
     connect(opts?: {
         auth: string | null | undefined;
     }): Promise<void>;
 }
-export declare class ConnectionSource implements Source<ConnectionState> {
+export declare class ConnectionSource extends Subscribable<ConnectionState> implements Source<ConnectionState> {
     #private;
     constructor(connectionManager: ConnectionManager);
     get current(): ConnectionState;
-    get subscribe(): (listener: (obj: ConnectionState) => unknown) => (() => void);
 }
 //# sourceMappingURL=connection.d.ts.map

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,iBAAiB,EAAE,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAE1D,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,cAAc,EAClB,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;CA0BvE;AAED,qBAAa,gBAAiB,YAAW,MAAM,CAAC,eAAe,CAAC;;gBAGlD,iBAAiB,EAAE,iBAAiB;IAIhD,IAAI,OAAO,IAAI,eAAe,CAE7B;IAED,IAAI,SAAS,kEAEZ;CACF"}
+{"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"}

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

@@ -0,0 +1,110 @@
+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";
+class ConnectionImpl {
+  #connectionManager;
+  #lc;
+  #source;
+  #setAuth;
+  constructor(connectionManager, lc, setAuth) {
+    this.#connectionManager = connectionManager;
+    this.#lc = lc;
+    this.#source = new ConnectionSource(connectionManager);
+    this.#setAuth = setAuth;
+  }
+  get state() {
+    return this.#source;
+  }
+  async connect(opts) {
+    const lc = this.#lc.withContext("connect");
+    if (opts && "auth" in opts) {
+      lc.debug?.("Updating auth credential from connect()");
+      this.#setAuth(opts.auth);
+    }
+    if (this.#connectionManager.state.name === Disconnected && this.#connectionManager.state.reason.kind === NoSocketOrigin) {
+      lc.error?.(
+        "connect() called but the connection is disconnected due to a missing cacheURL. No reconnect will be attempted."
+      );
+      return;
+    }
+    if (!this.#connectionManager.isInTerminalState()) {
+      lc.debug?.(
+        "connect() called but not in a terminal state. Current state:",
+        this.#connectionManager.state.name
+      );
+      return;
+    }
+    lc.info?.(
+      `Resuming connection from state: ${this.#connectionManager.state.name}`
+    );
+    const { nextStatePromise } = this.#connectionManager.connecting();
+    await nextStatePromise;
+  }
+}
+class ConnectionSource extends Subscribable {
+  #state;
+  constructor(connectionManager) {
+    super();
+    this.#state = this.#mapConnectionManagerState(connectionManager.state);
+    connectionManager.subscribe((state) => {
+      this.#state = this.#mapConnectionManagerState(state);
+      this.notify(this.#state);
+    });
+  }
+  get current() {
+    return this.#state;
+  }
+  #mapConnectionManagerState(state) {
+    switch (state.name) {
+      case Closed:
+        return {
+          name: "closed",
+          reason: state.reason.message
+        };
+      case Connected:
+        return {
+          name: "connected"
+        };
+      case Connecting:
+        return {
+          name: "connecting",
+          ...state.reason?.message ? { reason: state.reason.message } : {}
+        };
+      case Disconnected:
+        return {
+          name: "disconnected",
+          reason: state.reason.message
+        };
+      case Error:
+        return {
+          name: "error",
+          reason: state.reason.message
+        };
+      case NeedsAuth:
+        return {
+          name: "needs-auth",
+          reason: state.reason.errorBody.kind === PushFailed ? {
+            type: "mutate",
+            status: state.reason.errorBody.status,
+            ...state.reason.errorBody.bodyPreview ? { body: state.reason.errorBody.bodyPreview } : {}
+          } : state.reason.errorBody.kind === TransformFailed ? {
+            type: "query",
+            status: state.reason.errorBody.status,
+            ...state.reason.errorBody.bodyPreview ? { body: state.reason.errorBody.bodyPreview } : {}
+          } : {
+            type: "zero-cache",
+            reason: state.reason.message
+          }
+        };
+      default:
+        unreachable();
+    }
+  }
+}
+export {
+  ConnectionImpl,
+  ConnectionSource
+};
+//# sourceMappingURL=connection.js.map

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

@@ -0,0 +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;"}

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

@@ -1,15 +1,16 @@
+import type { LogContext } from '@rocicorp/logger';
 import type { NoIndexDiff } from '../../../replicache/src/btree/node.ts';
 import type { Hash } from '../../../replicache/src/hash.ts';
 import type { AST } from '../../../zero-protocol/src/ast.ts';
-import type { FilterInput } from '../../../zql/src/ivm/filter-operators.ts';
-import type { Input, Storage } from '../../../zql/src/ivm/operator.ts';
+import type { DebugDelegate } from '../../../zql/src/builder/debug-delegate.ts';
+import type { Input } from '../../../zql/src/ivm/operator.ts';
 import type { Source, SourceInput } from '../../../zql/src/ivm/source.ts';
 import type { MetricsDelegate } from '../../../zql/src/query/metrics-delegate.ts';
-import type { CommitListener, QueryDelegate } from '../../../zql/src/query/query-delegate.ts';
+import { QueryDelegateBase } from '../../../zql/src/query/query-delegate-base.ts';
+import type { CommitListener } from '../../../zql/src/query/query-delegate.ts';
 import type { RunOptions } from '../../../zql/src/query/query.ts';
 import { type IVMSourceBranch } from './ivm-branch.ts';
 import type { QueryManager } from './query-manager.ts';
-import type { ZeroLogContext } from './zero-log-context.ts';
 export type AddQuery = QueryManager['addLegacy'];
 export type AddCustomQuery = QueryManager['addCustom'];
 export type UpdateQuery = QueryManager['updateLegacy'];
@@ -20,7 +21,7 @@ export type FlushQueryChanges = QueryManager['flushBatch'];
  * Replicache data and pushes them into IVM and on tells the server about new
  * queries.
  */
-export declare class ZeroContext implements QueryDelegate {
+export declare class ZeroContext extends QueryDelegateBase {
     #private;
     readonly addServerQuery: AddQuery;
     readonly addCustomQuery: AddCustomQuery;
@@ -34,14 +35,12 @@ export declare class ZeroContext implements QueryDelegate {
      */
     readonly defaultQueryComplete = false;
     readonly addMetric: MetricsDelegate['addMetric'];
-    constructor(lc: ZeroLogContext, mainSources: IVMSourceBranch, addQuery: AddQuery, addCustomQuery: AddCustomQuery, updateQuery: UpdateQuery, updateCustomQuery: UpdateCustomQuery, flushQueryChanges: () => void, batchViewUpdates: (applyViewUpdates: () => void) => void, addMetric: MetricsDelegate['addMetric'], assertValidRunOptions: (options?: RunOptions) => void);
+    constructor(lc: LogContext, mainSources: IVMSourceBranch, addQuery: AddQuery, addCustomQuery: AddCustomQuery, updateQuery: UpdateQuery, updateCustomQuery: UpdateCustomQuery, flushQueryChanges: () => void, batchViewUpdates: (applyViewUpdates: () => void) => void, addMetric: MetricsDelegate['addMetric'], assertValidRunOptions: (options?: RunOptions) => void);
+    applyFiltersAnyway?: boolean | undefined;
+    debug?: DebugDelegate | undefined;
     getSource(name: string): Source | undefined;
     mapAst(ast: AST): AST;
-    createStorage(): Storage;
-    decorateInput(input: Input): Input;
-    decorateFilterInput(input: FilterInput): FilterInput;
     decorateSourceInput(input: SourceInput, queryID: string): Input;
-    addEdge(): void;
     onTransactionCommit(cb: CommitListener): () => void;
     batchViewUpdates<T>(applyViewUpdates: () => T): T;
     processChanges(expectedHead: Hash | undefined, newHead: Hash, changes: NoIndexDiff): void;

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

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