@livestore/common 0.4.0-dev.2 → 0.4.0-dev.21

package/dist/leader-thread/stream-events.d.ts

@@ -0,0 +1,56 @@
+import type { Subscribable } from '@livestore/utils/effect';
+import { Stream } from '@livestore/utils/effect';
+import { type LiveStoreEvent } from '../schema/mod.ts';
+import type * as SyncState from '../sync/syncstate.ts';
+import type { LeaderSqliteDb, StreamEventsOptions } from './types.ts';
+/**
+ * Streams events for leader-thread adapters.
+ *
+ * Provides a continuous stream from the eventlog as the upstream head advances.
+ * When an until event is passed in the stream finalizes upon reaching it.
+ *
+ * The batch size is set to 100 by default as this was meassured to provide the
+ * best performance and 1000 as the upper limit.
+ *
+ * Adapters that call this helper:
+ * - `packages/@livestore/adapter-web/src/in-memory/in-memory-adapter.ts`
+ * - `packages/@livestore/adapter-web/src/web-worker/leader-worker/make-leader-worker.ts`
+ * - `packages/@livestore/adapter-node/src/client-session/adapter.ts`
+ * - `packages/@livestore/adapter-node/src/make-leader-worker.ts`
+ * - `packages/@livestore/adapter-cloudflare/src/make-adapter.ts`
+ *
+ * Each caller resolves dependencies inside the leader scope before invoking this helper,
+ * so the stream stays environment-agnostic and does not leak `LeaderThreadCtx` into runtime
+ * entry points such as `Store.eventsStream`.
+ *
+ * Test files:
+ * Unit: `tests/package-common/src/leader-thread/stream-events.test.ts`
+ * Integration: `packages/@livestore/livestore/src/store/store-eventstream.test.ts`
+ * Performance: `tests/perf-eventlog/tests/suites/event-streaming.test.ts`
+ *
+ * Optimization explorations
+ *
+ * In order to alleviate the occurence of many small queries when the syncState
+ * is sequentially progressing quickly we have explored some time-based batching
+ * approaches. It remains to be determined if and when the added complexity of
+ * these approaches are worth the benefit. They come with some drawbacks such as
+ * degraded time to first event or general performance degredation for larger
+ * query steps. These aspects can likely be mitigated with some more work but
+ * that is best assessed when we have a final implementation of event streaming
+ * with support for session and leader level streams.
+ *
+ * Fetch plans into a Sink
+ * https://gist.github.com/slashv/f1223689f2d1171d2eeb60a2823f4c7c
+ *
+ * Fetch plans into sink and decompose into windows
+ * https://gist.github.com/slashv/a8f55f50121c080937f42e44b4039ac8
+ *
+ * Mailbox and Latch approach (suggestion by Tim Smart)
+ * https://gist.github.com/slashv/d6b12395c85415bf0d3363372a1636c3
+ */
+export declare const streamEventsWithSyncState: ({ dbEventlog, syncState, options, }: {
+    dbEventlog: LeaderSqliteDb;
+    syncState: Subscribable.Subscribable<SyncState.SyncState>;
+    options: StreamEventsOptions;
+}) => Stream.Stream<LiveStoreEvent.Client.Encoded>;
+//# sourceMappingURL=stream-events.d.ts.map

package/dist/leader-thread/stream-events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-events.d.ts","sourceRoot":"","sources":["../../src/leader-thread/stream-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAgC,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC3E,OAAO,KAAK,KAAK,SAAS,MAAM,sBAAsB,CAAA;AAEtD,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,yBAAyB,GAAI,qCAIvC;IACD,UAAU,EAAE,cAAc,CAAA;IAC1B,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACzD,OAAO,EAAE,mBAAmB,CAAA;CAC7B,KAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CA4I9C,CAAA"}

package/dist/leader-thread/stream-events.js

@@ -0,0 +1,166 @@
+import { Chunk, Effect, Option, Queue, Stream } from '@livestore/utils/effect';
+import { EventSequenceNumber } from "../schema/mod.js";
+import * as Eventlog from "./eventlog.js";
+/**
+ * Streams events for leader-thread adapters.
+ *
+ * Provides a continuous stream from the eventlog as the upstream head advances.
+ * When an until event is passed in the stream finalizes upon reaching it.
+ *
+ * The batch size is set to 100 by default as this was meassured to provide the
+ * best performance and 1000 as the upper limit.
+ *
+ * Adapters that call this helper:
+ * - `packages/@livestore/adapter-web/src/in-memory/in-memory-adapter.ts`
+ * - `packages/@livestore/adapter-web/src/web-worker/leader-worker/make-leader-worker.ts`
+ * - `packages/@livestore/adapter-node/src/client-session/adapter.ts`
+ * - `packages/@livestore/adapter-node/src/make-leader-worker.ts`
+ * - `packages/@livestore/adapter-cloudflare/src/make-adapter.ts`
+ *
+ * Each caller resolves dependencies inside the leader scope before invoking this helper,
+ * so the stream stays environment-agnostic and does not leak `LeaderThreadCtx` into runtime
+ * entry points such as `Store.eventsStream`.
+ *
+ * Test files:
+ * Unit: `tests/package-common/src/leader-thread/stream-events.test.ts`
+ * Integration: `packages/@livestore/livestore/src/store/store-eventstream.test.ts`
+ * Performance: `tests/perf-eventlog/tests/suites/event-streaming.test.ts`
+ *
+ * Optimization explorations
+ *
+ * In order to alleviate the occurence of many small queries when the syncState
+ * is sequentially progressing quickly we have explored some time-based batching
+ * approaches. It remains to be determined if and when the added complexity of
+ * these approaches are worth the benefit. They come with some drawbacks such as
+ * degraded time to first event or general performance degredation for larger
+ * query steps. These aspects can likely be mitigated with some more work but
+ * that is best assessed when we have a final implementation of event streaming
+ * with support for session and leader level streams.
+ *
+ * Fetch plans into a Sink
+ * https://gist.github.com/slashv/f1223689f2d1171d2eeb60a2823f4c7c
+ *
+ * Fetch plans into sink and decompose into windows
+ * https://gist.github.com/slashv/a8f55f50121c080937f42e44b4039ac8
+ *
+ * Mailbox and Latch approach (suggestion by Tim Smart)
+ * https://gist.github.com/slashv/d6b12395c85415bf0d3363372a1636c3
+ */
+export const streamEventsWithSyncState = ({ dbEventlog, syncState, options, }) => {
+    const initialCursor = options.since ?? EventSequenceNumber.Client.ROOT;
+    const batchSize = options.batchSize ?? 100;
+    return Stream.unwrapScoped(Effect.gen(function* () {
+        /**
+         * Single-element Queue allows suspending the event stream until head
+         * advances because Queue.take is a suspending effect. SubscriptionRef in
+         * comparrison lacks a primitive for suspending a stream until a new value
+         * is set and would require polling.
+         *
+         * The use of a sliding Queue here is useful since it ensures only the
+         * lastest head from syncState is the one present on the queue without the
+         * need for manual substitution.
+         */
+        const headQueue = yield* Queue.sliding(1);
+        /**
+         * We run a separate fiber which listens to changes in syncState and
+         * offer the latest head to the headQueue. Keeping track of the previous
+         * value is done to prevent syncState changes unrelated to the
+         * upstreamHead triggering empty queries.
+         *
+         * When we implement support for leader and session level streams
+         * this will need to be adapted to support the relevant value from
+         * syncState that we are interested in tracking.
+         */
+        let prevGlobalHead = -1;
+        yield* syncState.changes.pipe(Stream.map((state) => state.upstreamHead), Stream.filter((head) => {
+            if (head.global > prevGlobalHead) {
+                prevGlobalHead = head.global;
+                return true;
+            }
+            return false;
+        }), Stream.runForEach((head) => Queue.offer(headQueue, head)), Effect.forkScoped);
+        return Stream.paginateChunkEffect({ cursor: initialCursor, head: EventSequenceNumber.Client.ROOT }, ({ cursor, head }) => Effect.gen(function* () {
+            /**
+             * Early check guards agains:
+             * since === until : Prevent empty query
+             * since > until : Incorrectly inverted interval
+             */
+            if (options.until && EventSequenceNumber.Client.isGreaterThanOrEqual(cursor, options.until)) {
+                return [Chunk.empty(), Option.none()];
+            }
+            /**
+             * There are two scenarios where we take the next head from the headQueue:
+             *
+             * 1. We need to wait for the head to advance
+             * The Stream suspends until a new head is available on the headQueue
+             *
+             * 2. Head has advanced during itteration
+             * While itterating towards the lastest head taken from the headQueue
+             * in increments of batchSize it's possible the head could have
+             * advanced. This leads to a suboptimal amount of queries. Therefor we
+             * check if the headQueue is full which tells us that there's a new
+             * head available to take. Example:
+             *
+             * batchSize: 2
+             *
+             * --> head at: e3
+             * First query: e0 -> e2 (two events)
+             * --> head advances to: e4
+             * Second query: e2 -> e3 (one event but we could have taken 2)
+             * --> Take the new head of e4
+             * Third query: e3 -> e4 (unnecessary third query)
+             *
+             *
+             * To define the target, which will be used as the temporary until
+             * marker for the eventlog query, we select the lowest of three possible values:
+             *
+             * hardStop: A user supplied until marker
+             * current cursor + batchSize: A batchSize step towards the latest head from headQueue
+             * nextHead: The latest head from headQueue
+             */
+            const waitForHead = EventSequenceNumber.Client.isGreaterThanOrEqual(cursor, head);
+            const maybeHead = waitForHead
+                ? yield* Queue.take(headQueue).pipe(Effect.map(Option.some))
+                : yield* Queue.poll(headQueue);
+            const nextHead = Option.getOrElse(maybeHead, () => head);
+            const hardStop = options.until?.global ?? Number.POSITIVE_INFINITY;
+            const target = EventSequenceNumber.Client.Composite.make({
+                global: Math.min(hardStop, cursor.global + batchSize, nextHead.global),
+                client: EventSequenceNumber.Client.DEFAULT,
+            });
+            /**
+             * Eventlog.getEventsFromEventlog returns a Chunk from each
+             * query which is what we emit at each itteration.
+             */
+            const chunk = yield* Eventlog.getEventsFromEventlog({
+                dbEventlog,
+                options: {
+                    ...options,
+                    since: cursor,
+                    until: target,
+                },
+            });
+            /**
+             * We construct the state for the following itteration of the stream
+             * loop by setting the current target as the since cursor and pass
+             * along the latest head.
+             *
+             * If we have the reached the user supplied until marker we signal the
+             * finalization of the stream by passing Option.none() instead.
+             */
+            const reachedUntil = options.until !== undefined && EventSequenceNumber.Client.isGreaterThanOrEqual(target, options.until);
+            const nextState = reachedUntil ? Option.none() : Option.some({ cursor: target, head: nextHead });
+            const spanAttributes = {
+                'livestore.streamEvents.cursor.global': cursor.global,
+                'livestore.streamEvents.target.global': target.global,
+                'livestore.streamEvents.batchSize': batchSize,
+                'livestore.streamEvents.waitedForHead': waitForHead,
+            };
+            return yield* Effect.succeed([
+                chunk,
+                nextState,
+            ]).pipe(Effect.withSpan('@livestore/common:streamEvents:segment', { attributes: spanAttributes }));
+        }));
+    }));
+};
+//# sourceMappingURL=stream-events.js.map

package/dist/leader-thread/stream-events.js.map

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

package/dist/leader-thread/types.d.ts

@@ -2,9 +2,9 @@ import type { Deferred, Effect, HttpClient, Option, Queue, Scope, Stream, Subscr
 import { Context, Schema } from '@livestore/utils/effect';
 import type { MeshNode } from '@livestore/webmesh';
 import type { MigrationsReport } from '../defs.ts';
-import type { SqliteError } from '../errors.ts';
-import type { BootStatus, Devtools, LeaderAheadError, MakeSqliteDb, PersistenceInfo, SqliteDb, SyncBackend, UnexpectedError } from '../index.ts';
-import type { EventSequenceNumber, LiveStoreEvent, LiveStoreSchema } from '../schema/mod.ts';
+import type { MaterializeError } from '../errors.ts';
+import type { BootStatus, Devtools, LeaderAheadError, MakeSqliteDb, PersistenceInfo, SqliteDb, SyncBackend, UnknownError } from '../index.ts';
+import { EventSequenceNumber, type LiveStoreEvent, type LiveStoreSchema } from '../schema/mod.ts';
 import type * as SyncState from '../sync/syncstate.ts';
 import type { ShutdownChannel } from './shutdown-channel.ts';
 export type ShutdownState = 'running' | 'shutting-down';
@@ -19,7 +19,7 @@ export declare const InitialSyncOptions: Schema.Union<[Schema.TaggedStruct<"Skip
 }>]>;
 export type InitialSyncOptions = typeof InitialSyncOptions.Type;
 export type InitialSyncInfo = Option.Option<{
-    cursor: EventSequenceNumber.EventSequenceNumber;
+    eventSequenceNumber: EventSequenceNumber.Global.Type;
     metadata: Option.Option<Schema.JsonValue>;
 }>;
 export type LeaderSqliteDb = SqliteDb<{
@@ -38,7 +38,7 @@ export type DevtoolsOptions = {
         node: MeshNode;
         persistenceInfo: PersistenceInfoPair;
         mode: 'proxy' | 'direct';
-    }, UnexpectedError, Scope.Scope | HttpClient.HttpClient | LeaderThreadCtx>;
+    }, UnknownError, Scope.Scope | HttpClient.HttpClient | LeaderThreadCtx>;
 };
 export type DevtoolsContext = {
     enabled: true;
@@ -59,13 +59,13 @@ declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThr
     bootStatusQueue: Queue.Queue<BootStatus>;
     shutdownStateSubRef: SubscriptionRef.SubscriptionRef<ShutdownState>;
     shutdownChannel: ShutdownChannel;
-    eventSchema: LiveStoreEvent.ForEventDefRecord<any>;
+    eventSchema: LiveStoreEvent.ForEventDef.ForRecord<any>;
     devtools: DevtoolsContext;
-    syncBackend: SyncBackend | undefined;
+    syncBackend: SyncBackend.SyncBackend | undefined;
     syncProcessor: LeaderSyncProcessor;
     materializeEvent: MaterializeEvent;
     initialState: {
-        leaderHead: EventSequenceNumber.EventSequenceNumber;
+        leaderHead: EventSequenceNumber.Client.Composite;
         migrationsReport: MigrationsReport;
     };
     /**
@@ -74,10 +74,11 @@ declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThr
      * This is currently separated from `.devtools` as it also needs to work when devtools are disabled
      */
     extraIncomingMessagesQueue: Queue.Queue<Devtools.Leader.MessageToApp>;
+    networkStatus: Subscribable.Subscribable<SyncBackend.NetworkStatus>;
 }>;
 export declare class LeaderThreadCtx extends LeaderThreadCtx_base {
 }
-export type MaterializeEvent = (eventEncoded: LiveStoreEvent.EncodedWithMeta, options?: {
+export type MaterializeEvent = (eventEncoded: LiveStoreEvent.Client.EncodedWithMeta, options?: {
     /** Needed for rematerializeFromEventlog */
     skipEventlog?: boolean;
 }) => Effect.Effect<{
@@ -89,46 +90,123 @@ export type MaterializeEvent = (eventEncoded: LiveStoreEvent.EncodedWithMeta, op
         _tag: 'no-op';
     };
     hash: Option.Option<number>;
-}, SqliteError | UnexpectedError>;
+}, MaterializeError>;
 export type InitialBlockingSyncContext = {
     blockingDeferred: Deferred.Deferred<void> | undefined;
     update: (_: {
-        remaining: number;
+        pageInfo: SyncBackend.PullResPageInfo;
         processed: number;
     }) => Effect.Effect<void>;
 };
+export declare const STREAM_EVENTS_BATCH_SIZE_DEFAULT = 100;
+export declare const STREAM_EVENTS_BATCH_SIZE_MAX = 1000;
+export declare const StreamEventsOptionsFields: {
+    readonly since: Schema.optional<Schema.Struct<{
+        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
+        rebaseGeneration: typeof Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+    }>;
+    readonly until: Schema.optional<Schema.Struct<{
+        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
+        rebaseGeneration: typeof Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+    }>;
+    readonly filter: Schema.optional<Schema.Array$<typeof Schema.String>>;
+    readonly clientIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
+    readonly sessionIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
+    readonly batchSize: Schema.optional<Schema.filter<typeof Schema.Int>>;
+    readonly includeClientOnly: Schema.optional<typeof Schema.Boolean>;
+};
+export declare const StreamEventsOptionsSchema: Schema.Struct<{
+    readonly since: Schema.optional<Schema.Struct<{
+        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
+        rebaseGeneration: typeof Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+    }>;
+    readonly until: Schema.optional<Schema.Struct<{
+        global: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        client: Schema.BrandSchema<number & import("effect/Brand").Brand<"ClientEventSequenceNumber">, number, never>;
+        rebaseGeneration: typeof Schema.Int;
+    }> & {
+        make: (seqNum: EventSequenceNumber.Client.CompositeInput) => EventSequenceNumber.Client.Composite;
+    }>;
+    readonly filter: Schema.optional<Schema.Array$<typeof Schema.String>>;
+    readonly clientIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
+    readonly sessionIds: Schema.optional<Schema.Array$<typeof Schema.String>>;
+    readonly batchSize: Schema.optional<Schema.filter<typeof Schema.Int>>;
+    readonly includeClientOnly: Schema.optional<typeof Schema.Boolean>;
+}>;
+export interface StreamEventsOptions {
+    /**
+     * Only include events after this logical timestamp (exclusive).
+     * Defaults to `EventSequenceNumber.Client.ROOT` when omitted.
+     */
+    since?: EventSequenceNumber.Client.Composite;
+    /**
+     * Only include events up to this logical timestamp (inclusive).
+     */
+    until?: EventSequenceNumber.Client.Composite;
+    /**
+     * Only include events of the given names.
+     */
+    filter?: ReadonlyArray<string>;
+    /**
+     * Only include events from specific client identifiers.
+     */
+    clientIds?: ReadonlyArray<string>;
+    /**
+     * Only include events from specific session identifiers.
+     */
+    sessionIds?: ReadonlyArray<string>;
+    /**
+     * Number of events to fetch in each batch when streaming from the eventlog.
+     * Defaults to 100.
+     */
+    batchSize?: number;
+    /**
+     * Include client-only events (i.e. events with a positive client sequence number).
+     */
+    includeClientOnly?: boolean;
+}
 export interface LeaderSyncProcessor {
     /** Used by client sessions to subscribe to upstream sync state changes */
     pull: (args: {
-        cursor: EventSequenceNumber.EventSequenceNumber;
+        cursor: EventSequenceNumber.Client.Composite;
     }) => Stream.Stream<{
         payload: typeof SyncState.PayloadUpstream.Type;
-    }, UnexpectedError>;
+    }, UnknownError>;
     /** The `pullQueue` API can be used instead of `pull` when more convenient */
     pullQueue: (args: {
-        cursor: EventSequenceNumber.EventSequenceNumber;
+        cursor: EventSequenceNumber.Client.Composite;
     }) => Effect.Effect<Queue.Queue<{
         payload: typeof SyncState.PayloadUpstream.Type;
-    }>, UnexpectedError, Scope.Scope>;
+    }>, UnknownError, Scope.Scope>;
     /** Used by client sessions to push events to the leader thread */
     push: (
     /** `batch` needs to follow the same rules as `batch` in `SyncBackend.push` */
-    batch: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>, options?: {
+    batch: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>, options?: {
         /**
          * If true, the effect will only finish when the local push has been processed (i.e. succeeded or was rejected).
+         * `true` doesn't mean the events have been pushed to the sync backend.
          * @default false
          */
         waitForProcessing?: boolean;
     }) => Effect.Effect<void, LeaderAheadError>;
     /** Currently only used by devtools which don't provide their own event numbers */
     pushPartial: (args: {
-        event: LiveStoreEvent.PartialAnyEncoded;
+        event: LiveStoreEvent.Input.Encoded;
         clientId: string;
         sessionId: string;
-    }) => Effect.Effect<void, UnexpectedError>;
+    }) => Effect.Effect<void, UnknownError>;
     boot: Effect.Effect<{
-        initialLeaderHead: EventSequenceNumber.EventSequenceNumber;
-    }, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
+        initialLeaderHead: EventSequenceNumber.Client.Composite;
+    }, UnknownError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
     syncState: Subscribable.Subscribable<SyncState.SyncState>;
 }
 export {};

package/dist/leader-thread/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,UAAU,EACV,MAAM,EACN,KAAK,EACL,KAAK,EACL,MAAM,EACN,YAAY,EACZ,eAAe,EAChB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,WAAW,EACX,eAAe,EAChB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC5F,OAAO,KAAK,KAAK,SAAS,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,eAAe,CAAA;AAEvD,eAAO,MAAM,sBAAsB,iCAAkC,CAAA;AACrE,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC,IAAI,CAAA;AAEvE,eAAO,MAAM,0BAA0B;;EAErC,CAAA;AAEF,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAC,IAAI,CAAA;AAE/E,eAAO,MAAM,kBAAkB;;IAAmE,CAAA;AAClG,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC,IAAI,CAAA;AAE/D,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;CAC1C,CAAC,CAAA;AAMF,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,eAAe,CAAA;CAAE,CAAC,CAAA;AAC9F,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,eAAe,CAAA;CAAE,CAAA;AAEvF,MAAM,MAAM,eAAe,GACvB;IACE,OAAO,EAAE,KAAK,CAAA;CACf,GACD;IACE,OAAO,EAAE,IAAI,CAAA;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,CACjB;QACE,IAAI,EAAE,QAAQ,CAAA;QACd,eAAe,EAAE,mBAAmB,CAAA;QACpC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;KACzB,EACD,eAAe,EACf,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,GAAG,eAAe,CACtD,CAAA;CACF,CAAA;AAEL,MAAM,MAAM,eAAe,GACvB;IACE,OAAO,EAAE,IAAI,CAAA;IAGb,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAA;IAC9B,qBAAqB,EAAE,eAAe,CAAC,eAAe,CAAC;QAAE,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;CACjF,GACD;IACE,OAAO,EAAE,KAAK,CAAA;CACf,CAAA;;YAKO,eAAe;aACd,MAAM;cACL,MAAM;kBACF,YAAY;aACjB,cAAc;gBACX,cAAc;qBACT,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;yBAEnB,eAAe,CAAC,eAAe,CAAC,aAAa,CAAC;qBAClD,eAAe;iBACnB,cAAc,CAAC,iBAAiB,CAAC,GAAG,CAAC;cACxC,eAAe;iBACZ,WAAW,GAAG,SAAS;mBACrB,mBAAmB;sBAChB,gBAAgB;kBACpB;QACZ,UAAU,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;QACnD,gBAAgB,EAAE,gBAAgB,CAAA;KACnC;IACD;;;;OAIG;gCACyB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;;AA3BzE,qBAAa,eAAgB,SAAQ,oBA6BlC;CAAG;AAEN,MAAM,MAAM,gBAAgB,GAAG,CAC7B,YAAY,EAAE,cAAc,CAAC,eAAe,EAC5C,OAAO,CAAC,EAAE;IACR,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,KACE,MAAM,CAAC,MAAM,CAChB;IACE,gBAAgB,EAAE;QAAE,IAAI,EAAE,kBAAkB,CAAC;QAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7G,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CAC5B,EACD,WAAW,GAAG,eAAe,CAC9B,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,gBAAgB,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;IACrD,MAAM,EAAE,CAAC,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAC7E,CAAA;AAED,MAAM,WAAW,mBAAmB;IAClC,0EAA0E;IAC1E,IAAI,EAAE,CAAC,IAAI,EAAE;QACX,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;KAChD,KAAK,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,CAAA;KAAE,EAAE,eAAe,CAAC,CAAA;IACxF,6EAA6E;IAC7E,SAAS,EAAE,CAAC,IAAI,EAAE;QAChB,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;KAChD,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,OAAO,SAAS,CAAC,eAAe,CAAC,IAAI,CAAA;KAAE,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAElH,kEAAkE;IAClE,IAAI,EAAE;IACJ,8EAA8E;IAC9E,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,EACpD,OAAO,CAAC,EAAE;QACR;;;WAGG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAC5B,KACE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAE1C,kFAAkF;IAClF,WAAW,EAAE,CAAC,IAAI,EAAE;QAClB,KAAK,EAAE,cAAc,CAAC,iBAAiB,CAAA;QACvC,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,MAAM,CAAA;KAClB,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;IAE1C,IAAI,EAAE,MAAM,CAAC,MAAM,CACjB;QAAE,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;KAAE,EAC9D,eAAe,EACf,eAAe,GAAG,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CACtD,CAAA;IACD,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;CAC1D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"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"}

package/dist/leader-thread/types.js

@@ -1,4 +1,5 @@
 import { Context, Schema } from '@livestore/utils/effect';
+import { EventSequenceNumber } from "../schema/mod.js";
 export const InitialSyncOptionsSkip = Schema.TaggedStruct('Skip', {});
 export const InitialSyncOptionsBlocking = Schema.TaggedStruct('Blocking', {
     timeout: Schema.Union(Schema.DurationFromMillis, Schema.Number),
@@ -6,4 +7,16 @@ export const InitialSyncOptionsBlocking = Schema.TaggedStruct('Blocking', {
 export const InitialSyncOptions = Schema.Union(InitialSyncOptionsSkip, InitialSyncOptionsBlocking);
 export class LeaderThreadCtx extends Context.Tag('LeaderThreadCtx')() {
 }
+export const STREAM_EVENTS_BATCH_SIZE_DEFAULT = 100;
+export const STREAM_EVENTS_BATCH_SIZE_MAX = 1_000;
+export const StreamEventsOptionsFields = {
+    since: Schema.optional(EventSequenceNumber.Client.Composite),
+    until: Schema.optional(EventSequenceNumber.Client.Composite),
+    filter: Schema.optional(Schema.Array(Schema.String)),
+    clientIds: Schema.optional(Schema.Array(Schema.String)),
+    sessionIds: Schema.optional(Schema.Array(Schema.String)),
+    batchSize: Schema.optional(Schema.Int.pipe(Schema.between(1, STREAM_EVENTS_BATCH_SIZE_MAX))),
+    includeClientOnly: Schema.optional(Schema.Boolean),
+};
+export const StreamEventsOptionsSchema = Schema.Struct(StreamEventsOptionsFields);
 //# sourceMappingURL=types.js.map

package/dist/leader-thread/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAqBzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAGrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE;IACxE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC;CAChE,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;AA4ClG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EA6BhE;CAAG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAezD,OAAO,EAAE,mBAAmB,EAA6C,MAAM,kBAAkB,CAAA;AAMjG,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAGrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE;IACxE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC;CAChE,CAAC,CAAA;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;AA4ClG,MAAM,OAAO,eAAgB,SAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EA8BhE;CAAG;AAqBN,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,CAAA;AACnD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAA;AAEjD,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5D,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5D,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,4BAA4B,CAAC,CAAC,CAAC;IAC5F,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;CAC1C,CAAA;AAEV,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAA"}

package/dist/logging.d.ts

@@ -0,0 +1,40 @@
+import { Effect, type Layer, LogLevel } from '@livestore/utils/effect';
+/**
+ * Optional Effect logger configuration that LiveStore entry points accept.
+ *
+ * When provided, `logger` replaces the default pretty logger for the runtime.
+ * Use `logLevel` to control verbosity. Set to `LogLevel.None` to disable logging
+ * entirely while keeping the same logger implementation.
+ */
+export type WithLoggerOptions = {
+    /** Optional Effect logger layer to control logging output. */
+    logger?: Layer.Layer<never> | undefined;
+    /** Optional minimum log level for the runtime. */
+    logLevel?: LogLevel.LogLevel | undefined;
+};
+/**
+ * Common defaults for resolving a logger configuration.
+ * - `threadName` is used by the default pretty logger when `logger` is not provided.
+ * - `mode` selects pretty logger mode (e.g. 'browser' for web workers).
+ * - `defaultLogLevel` is used when `logLevel` is not provided.
+ */
+export type LoggerDefaults = {
+    threadName?: string;
+    mode?: 'tty' | 'browser';
+    defaultLogLevel?: LogLevel.LogLevel;
+    /** Optional default logger layer to use when `config.logger` is not provided. */
+    defaultLogger?: Layer.Layer<never>;
+};
+/**
+ * Resolve the logger layer to provide to the Effect runtime.
+ */
+export declare const resolveLoggerLayer: (config?: WithLoggerOptions, defaults?: LoggerDefaults) => Layer.Layer<never>;
+/**
+ * Resolve the minimum log level, falling back to `defaults.defaultLogLevel` then `LogLevel.Debug`.
+ */
+export declare const resolveLogLevel: (config?: WithLoggerOptions, defaults?: LoggerDefaults) => LogLevel.LogLevel;
+/**
+ * Wrap an effect by applying the resolved minimum log level and providing the resolved logger layer.
+ */
+export declare const withLoggerConfig: <TEnv, TError, TOut>(config?: WithLoggerOptions, defaults?: LoggerDefaults) => ((effect: Effect.Effect<TOut, TError, TEnv>) => Effect.Effect<TOut, TError, TEnv>);
+//# sourceMappingURL=logging.d.ts.map

package/dist/logging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,EAAU,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE9E;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;IACvC,kDAAkD;IAClD,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAA;CACzC,CAAA;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;IACxB,eAAe,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACnC,iFAAiF;IACjF,aAAa,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;CACnC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,iBAAiB,EAAE,WAAW,cAAc,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAM3G,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,SAAS,iBAAiB,EAAE,WAAW,cAAc,KAAG,QAAQ,CAAC,QAIhG,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,IAAI,EAAE,MAAM,EAAE,IAAI,EACjD,SAAS,iBAAiB,EAC1B,WAAW,cAAc,KACxB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAInF,CAAA"}

package/dist/logging.js

@@ -0,0 +1,33 @@
+import { isDevEnv } from '@livestore/utils';
+import { Effect, Logger, LogLevel } from '@livestore/utils/effect';
+/**
+ * Resolve the logger layer to provide to the Effect runtime.
+ */
+export const resolveLoggerLayer = (config, defaults) => {
+    if (config?.logger)
+        return config.logger;
+    if (defaults?.defaultLogger)
+        return defaults.defaultLogger;
+    const threadName = defaults?.threadName ?? 'livestore';
+    const mode = defaults?.mode;
+    return Logger.prettyWithThread(threadName, mode ? { mode } : {});
+};
+/**
+ * Resolve the minimum log level, falling back to `defaults.defaultLogLevel` then `LogLevel.Debug`.
+ */
+export const resolveLogLevel = (config, defaults) => {
+    if (config?.logLevel !== undefined)
+        return config.logLevel;
+    if (defaults?.defaultLogLevel !== undefined)
+        return defaults.defaultLogLevel;
+    return isDevEnv() ? LogLevel.Debug : LogLevel.Info;
+};
+/**
+ * Wrap an effect by applying the resolved minimum log level and providing the resolved logger layer.
+ */
+export const withLoggerConfig = (config, defaults) => {
+    const level = resolveLogLevel(config, defaults);
+    const layer = resolveLoggerLayer(config, defaults);
+    return (effect) => effect.pipe(Logger.withMinimumLogLevel(level), Effect.provide(layer));
+};
+//# sourceMappingURL=logging.js.map

package/dist/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAc,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AA8B9E;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAA0B,EAAE,QAAyB,EAAsB,EAAE;IAC9G,IAAI,MAAM,EAAE,MAAM;QAAE,OAAO,MAAM,CAAC,MAAM,CAAA;IACxC,IAAI,QAAQ,EAAE,aAAa;QAAE,OAAO,QAAQ,CAAC,aAAa,CAAA;IAC1D,MAAM,UAAU,GAAG,QAAQ,EAAE,UAAU,IAAI,WAAW,CAAA;IACtD,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,CAAA;IAC3B,OAAO,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAClE,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAA0B,EAAE,QAAyB,EAAqB,EAAE;IAC1G,IAAI,MAAM,EAAE,QAAQ,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAA;IAC1D,IAAI,QAAQ,EAAE,eAAe,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,eAAe,CAAA;IAC5E,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;AACpD,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAA0B,EAC1B,QAAyB,EAC2D,EAAE;IACtF,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAClD,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;AAC1F,CAAC,CAAA"}

package/dist/make-client-session.d.ts

@@ -1,12 +1,12 @@
 import type { Scope, SubscriptionRef } from '@livestore/utils/effect';
 import { Effect } from '@livestore/utils/effect';
 import * as Webmesh from '@livestore/webmesh';
-import type { AdapterArgs, ClientSession, ClientSessionLeaderThreadProxy, LockStatus, SqliteDb, UnexpectedError } from './adapter-types.ts';
+import type { AdapterArgs, ClientSession, ClientSessionLeaderThreadProxy, LockStatus, SqliteDb, UnknownError } from './adapter-types.ts';
 import * as Devtools from './devtools/mod.ts';
 declare global {
     var __debugWebmeshNode: any;
 }
-export declare const makeClientSession: <R>({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, }: AdapterArgs & {
+export declare const makeClientSession: <R>({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, origin, }: AdapterArgs & {
     clientId: string;
     sessionId: string;
     isLeader: boolean;
@@ -16,8 +16,10 @@ export declare const makeClientSession: <R>({ storeId, clientId, sessionId, isLe
     connectWebmeshNode: (args: {
         webmeshNode: Webmesh.MeshNode;
         sessionInfo: Devtools.SessionInfo.SessionInfo;
-    }) => Effect.Effect<void, UnexpectedError, Scope.Scope | R>;
+    }) => Effect.Effect<void, UnknownError, Scope.Scope | R>;
     webmeshMode: "direct" | "proxy";
     registerBeforeUnload: (onBeforeUnload: () => void) => () => void;
+    /** Browser origin of the client session; used for origin-scoped DevTools mesh channels */
+    origin: string | undefined;
 }) => Effect.Effect<ClientSession, never, Scope.Scope | R>;
 //# sourceMappingURL=make-client-session.d.ts.map

package/dist/make-client-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,eAAe,EAChB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,oNAgBlC,WAAW,GAAG;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACvD,YAAY,EAAE,8BAA8B,CAAC,8BAA8B,CAAA;IAC3E,QAAQ,EAAE,QAAQ,CAAA;IAClB,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAA;QAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAA;KAC9C,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC3D,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;CACjE,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAsFY,CAAA"}
+{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,4NAiBlC,WAAW,GAAG;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACvD,YAAY,EAAE,8BAA8B,CAAC,8BAA8B,CAAA;IAC3E,QAAQ,EAAE,QAAQ,CAAA;IAClB,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAA;QAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAA;KAC9C,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IACxD,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAChE,0FAA0F;IAC1F,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAyFY,CAAA"}

package/dist/make-client-session.js

@@ -2,7 +2,7 @@ import { Effect, Stream } from '@livestore/utils/effect';
 import * as Webmesh from '@livestore/webmesh';
 import * as Devtools from "./devtools/mod.js";
 import { liveStoreVersion } from "./version.js";
-export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, }) => Effect.gen(function* () {
+export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, origin, }) => Effect.gen(function* () {
     const devtools = devtoolsEnabled
         ? { enabled: true, pullLatch: yield* Effect.makeLatch(true), pushLatch: yield* Effect.makeLatch(true) }
         : { enabled: false };
@@ -17,9 +17,12 @@ export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devt
                 sessionId,
                 schemaAlias,
                 isLeader,
+                origin,
             });
             yield* connectWebmeshNode({ webmeshNode, sessionInfo });
-            const sessionInfoBroadcastChannel = yield* Devtools.makeSessionInfoBroadcastChannel(webmeshNode);
+            const sessionInfoBroadcastChannel = yield* Devtools.makeSessionInfoBroadcastChannel(webmeshNode, {
+                origin,
+            });
             yield* Devtools.SessionInfo.provideSessionInfo({
                 webChannel: sessionInfoBroadcastChannel,
                 sessionInfo,