@livestore/sync-cf 0.4.0 → 0.5.0-dev.1

package/dist/cf-worker/do/observability.test.js

@@ -0,0 +1,204 @@
+import { ROOT_CONTEXT, SpanStatusCode, trace } from '@opentelemetry/api';
+import { BackendIdMismatchError, UnknownError } from '@livestore/common';
+import { layerProtocolDurableObject, WsContext } from '@livestore/common-cf';
+import { makeNoopSpan, makeNoopTracer } from '@livestore/utils';
+import { Vitest } from '@livestore/utils-dev/node-vitest';
+import { Deferred, Effect, FetchHttpClient, Fiber, Layer, Option, OtelTracer, RpcClient, RpcTest, Schema, Stream, TestClock, Tracer, } from '@livestore/utils/effect';
+import { SyncDoRpc } from '../../common/do-rpc-schema.js';
+import { SyncWsRpc } from '../../common/ws-rpc-schema.js';
+import { WebSocketAttachmentSchema } from '../shared.js';
+import { makeObservability, rpcSpanOptions, withRpcSpan, withRpcStreamSpan } from './observability.js';
+import { createDoRpcHandler } from './transport/do-rpc-server.js';
+import { makeRpcHandlers } from './transport/ws-rpc-server.js';
+Vitest.describe('sync-cf telemetry ownership', () => {
+    Vitest.afterEach(() => Vitest.vi.restoreAllMocks());
+    Vitest.effect('runs sync effects and streams without exporting when telemetry is omitted', () => Effect.gen(function* () {
+        const fetch = Vitest.vi.fn(async () => new Response('{}'));
+        const observability = makeObservability(undefined);
+        const result = yield* Effect.succeed('ack').pipe(Effect.withSpan('push'), observability.effect, Effect.provideService(FetchHttpClient.Fetch, fetch));
+        const history = yield* Stream.make('event').pipe(Stream.withSpan('pull'), observability.stream, Stream.runCollect, Effect.provideService(FetchHttpClient.Fetch, fetch));
+        yield* TestClock.adjust('4 seconds');
+        Vitest.expect(result).toBe('ack');
+        Vitest.expect(history).toEqual(['event']);
+        Vitest.expect(fetch).not.toHaveBeenCalled();
+    }));
+    Vitest.effect('builds and finalizes a supplied layer independently for overlapping operations', () => Effect.gen(function* () {
+        const firstStarted = yield* Deferred.make();
+        const secondStarted = yield* Deferred.make();
+        const firstGate = yield* Deferred.make();
+        const secondGate = yield* Deferred.make();
+        const firstReleased = yield* Deferred.make();
+        const secondReleased = yield* Deferred.make();
+        const builds = [];
+        const releases = [];
+        const layer = Layer.effectDiscard(Effect.acquireRelease(Effect.currentSpan.pipe(Effect.orDie, Effect.tap((span) => Effect.sync(() => builds.push(span.name)))), (span) => Effect.sync(() => releases.push(span.name)).pipe(Effect.andThen(Deferred.succeed(span.name === 'first' ? firstReleased : secondReleased, undefined)))));
+        const observability = makeObservability(layer);
+        const first = yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.andThen(Deferred.await(firstGate)), observability.effect, Effect.withSpan('first'), Effect.forkChild);
+        yield* Deferred.await(firstStarted);
+        const second = yield* Deferred.succeed(secondStarted, undefined).pipe(Effect.andThen(Deferred.await(secondGate)), observability.effect, Effect.withSpan('second'), Effect.forkChild);
+        yield* Deferred.await(secondStarted);
+        Vitest.expect(builds).toEqual(['first', 'second']);
+        Vitest.expect(releases).toEqual([]);
+        yield* Deferred.succeed(firstGate, undefined);
+        yield* Fiber.join(first);
+        yield* Deferred.await(firstReleased);
+        Vitest.expect(releases).toEqual(['first']);
+        Vitest.expect(second.pollUnsafe()).toBeUndefined();
+        yield* Deferred.succeed(secondGate, undefined);
+        yield* Fiber.join(second);
+        yield* Deferred.await(secondReleased);
+        Vitest.expect(releases).toEqual(['first', 'second']);
+    }));
+    Vitest.effect('finalizes finite history while the live subscription is still open', () => Effect.gen(function* () {
+        const { layer, ended } = makeRecordingTracer();
+        const finalized = yield* Deferred.make();
+        const live = yield* Deferred.make();
+        const observability = makeObservability(Layer.mergeAll(layer, Layer.effectDiscard(Effect.addFinalizer(() => Deferred.succeed(finalized, [...ended])))));
+        const fiber = yield* Stream.make('history').pipe(Stream.withSpan('pull-history'), observability.stream, Stream.concat(Stream.fromEffect(Deferred.succeed(live, undefined)).pipe(Stream.concat(Stream.never))), Stream.runDrain, Effect.forkChild);
+        yield* Effect.addFinalizer(() => Fiber.interrupt(fiber));
+        yield* Deferred.await(live);
+        Vitest.expect(yield* Deferred.await(finalized)).toContain('pull-history');
+        Vitest.expect(fiber.pollUnsafe()).toBeUndefined();
+    }));
+    Vitest.effect('ends WebSocket telemetry before the production handler enters its live tail', () => Effect.gen(function* () {
+        const { layer, ended } = makeRecordingTracer();
+        const finalized = yield* Deferred.make();
+        const observability = makeObservability(Layer.mergeAll(layer, Layer.effectDiscard(Effect.addFinalizer(() => Deferred.succeed(finalized, undefined)))));
+        const input = makeDoInput();
+        const handlers = makeRpcHandlers({ ...input, observability }).pipe(Layer.provide(Layer.succeed(WsContext, WsContext.of({ ws: makeWebSocket() }))));
+        const client = yield* RpcTest.makeClient(SyncWsRpc).pipe(Effect.provide(handlers));
+        const pullFiber = yield* client['SyncWsRpc.Pull']({
+            storeId: 'store',
+            cursor: Option.none(),
+            live: true,
+        }).pipe(Stream.runDrain, Effect.forkChild);
+        yield* Effect.addFinalizer(() => Fiber.interrupt(pullFiber));
+        yield* Deferred.await(finalized).pipe(Effect.timeout('1 second'));
+        Vitest.expect(ended).toContain('RpcServer.SyncWsRpc.Pull');
+        Vitest.expect(pullFiber.pollUnsafe()).toBeUndefined();
+    }));
+    Vitest.effect('installs telemetry inside the Durable Object RPC stream runtime', () => Effect.gen(function* () {
+        const { layer, ended } = makeRecordingTracer();
+        const observability = makeObservability(layer);
+        const input = makeDoInput();
+        const protocol = layerProtocolDurableObject({
+            callerContext: { bindingName: 'TEST', durableObjectId: 'client' },
+            callRpc: (payload) => createDoRpcHandler({
+                // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- Effect RPC owns this ArrayBuffer-backed payload.
+                payload: payload,
+                input,
+                observability,
+            }).pipe(Effect.runPromise),
+        });
+        const responses = yield* Effect.gen(function* () {
+            const client = yield* RpcClient.make(SyncDoRpc);
+            return yield* client['SyncDoRpc.Pull']({ storeId: 'store', cursor: Option.none() }).pipe(Stream.runCollect);
+        }).pipe(Effect.provide(protocol));
+        Vitest.expect(responses).toHaveLength(1);
+        Vitest.expect(ended).toContain('RpcServer.SyncDoRpc.Pull');
+    }));
+    Vitest.effect('attaches a finite span to a sampled caller across an unexported RPC envelope', () => Effect.gen(function* () {
+        const { layer, spans, ended } = makeRecordingTracer();
+        const observability = makeObservability(layer);
+        const caller = Tracer.externalSpan({ traceId: '1'.repeat(32), spanId: '2222222222222222', sampled: true });
+        yield* Effect.flatMap(rpcSpanOptions, (options) => withRpcSpan(Effect.void.pipe(Effect.withSpan('push')), 'finite-rpc', options)).pipe(observability.effect, Effect.withSpan('unexported-rpc-envelope'), Effect.withParentSpan(caller));
+        Vitest.expect(spans.get('finite-rpc')?.parentId).toBe(caller.spanId);
+        Vitest.expect(spans.get('push')?.parentId).toBe(spans.get('finite-rpc')?.spanId);
+        Vitest.expect(ended).toEqual(['push', 'finite-rpc']);
+    }));
+    Vitest.effect('starts a backend root when the RPC caller is unsampled', () => Effect.gen(function* () {
+        const { layer, spans, ended } = makeRecordingTracer();
+        const observability = makeObservability(layer);
+        const caller = Tracer.externalSpan({ traceId: '1'.repeat(32), spanId: '2222222222222222', sampled: false });
+        yield* Effect.flatMap(rpcSpanOptions, (options) => withRpcSpan(Effect.void, 'finite-rpc', options)).pipe(observability.effect, Effect.withSpan('unexported-rpc-envelope'), Effect.withParentSpan(caller));
+        Vitest.expect(spans.get('finite-rpc')?.parentId).toBeUndefined();
+        Vitest.expect(ended).toEqual(['finite-rpc']);
+    }));
+    Vitest.effect('keeps anticipated RPC recovery failures out of boundary error telemetry', () => Effect.gen(function* () {
+        const { layer, statuses } = makeRecordingTracer();
+        const observability = makeObservability(layer);
+        const expected = new BackendIdMismatchError({ expected: 'backend-a', received: 'backend-b' });
+        const unexpected = new UnknownError({ cause: new Error('boom') });
+        const effectError = yield* withRpcSpan(Effect.fail(expected), 'expected-effect').pipe(observability.effect, Effect.flip);
+        const streamError = yield* Stream.fail(expected).pipe((_) => withRpcStreamSpan(_, 'expected-stream'), observability.stream, Stream.runDrain, Effect.flip);
+        const unexpectedError = yield* withRpcSpan(Effect.fail(unexpected), 'unexpected-effect').pipe(observability.effect, Effect.flip);
+        Vitest.expect(effectError).toBe(expected);
+        Vitest.expect(streamError).toBe(expected);
+        Vitest.expect(unexpectedError).toBe(unexpected);
+        Vitest.expect(statuses.get('expected-effect')).toBe(SpanStatusCode.OK);
+        Vitest.expect(statuses.get('expected-stream')).toBe(SpanStatusCode.OK);
+        Vitest.expect(statuses.get('unexpected-effect')).toBe(SpanStatusCode.ERROR);
+    }));
+    Vitest.effect('forwards the operation exit to supplied layer finalizers', () => Effect.gen(function* () {
+        const released = yield* Deferred.make();
+        const expected = new BackendIdMismatchError({ expected: 'backend-a', received: 'backend-b' });
+        const observability = makeObservability(Layer.effectDiscard(Effect.acquireRelease(Effect.void, (_, exit) => Deferred.succeed(released, exit._tag).pipe(Effect.asVoid))));
+        const error = yield* Effect.fail(expected).pipe(observability.effect, Effect.flip);
+        Vitest.expect(error).toBe(expected);
+        Vitest.expect(yield* Deferred.await(released)).toBe('Failure');
+    }));
+    Vitest.live('acknowledges before the owned OTLP collector responds', () => Effect.gen(function* () {
+        const started = Promise.withResolvers();
+        const gate = Promise.withResolvers();
+        const acknowledged = yield* Deferred.make();
+        const fetch = Vitest.vi.fn(() => {
+            started.resolve();
+            return gate.promise.then(() => new Response('{}', { headers: { 'content-type': 'application/json' } }));
+        });
+        yield* Effect.addFinalizer(() => Effect.sync(() => gate.resolve()));
+        const observability = makeObservability({ baseUrl: 'http://collector.invalid' });
+        yield* Effect.void.pipe(Effect.withSpan('push'), observability.effect, Effect.andThen(Deferred.succeed(acknowledged, undefined)), Effect.provideService(FetchHttpClient.Fetch, fetch), Effect.forkChild);
+        yield* Effect.promise(() => started.promise);
+        yield* Effect.yieldNow;
+        Vitest.expect(yield* Deferred.isDone(acknowledged)).toBe(true);
+    }));
+});
+/** Record the public OTel boundary; span IDs are compared relationally, not fixed to creation order. */
+const makeRecordingTracer = () => {
+    const tracer = makeNoopTracer();
+    const ended = [];
+    const statuses = new Map();
+    const spans = new Map();
+    let nextId = 0;
+    Vitest.vi.spyOn(tracer, 'startSpan').mockImplementation((name, _options, context) => {
+        const spanId = (++nextId).toString(16).padStart(16, '0');
+        spans.set(name, { spanId, parentId: trace.getSpanContext(context ?? ROOT_CONTEXT)?.spanId });
+        const noopSpan = makeNoopSpan();
+        return {
+            ...noopSpan,
+            spanContext: () => ({ traceId: '1'.repeat(32), spanId, traceFlags: 1 }),
+            setStatus: (status) => {
+                statuses.set(name, status.code);
+                return noopSpan;
+            },
+            end: () => {
+                ended.push(name);
+            },
+        };
+    });
+    const layer = OtelTracer.layerWithoutOtelTracer.pipe(Layer.provide(Layer.succeed(OtelTracer.OtelTracer, tracer)));
+    return { layer, ended, spans, statuses };
+};
+/** Minimal empty SQLite-backed Durable Object boundary for transport composition tests. */
+const makeDoInput = () => {
+    const emptyCursor = Object.assign([], { toArray: () => [] });
+    const doSelf = {
+        env: {},
+        ctx: {
+            storage: {
+                sql: { exec: () => emptyCursor },
+                kv: { get: () => undefined, put: () => undefined, delete: () => undefined },
+                deleteAll: async () => undefined,
+            },
+        },
+    };
+    // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- The test intentionally stubs the narrow Worker APIs reached by an empty pull.
+    return { doSelf: doSelf, doOptions: undefined };
+};
+const makeWebSocket = () => {
+    const attachment = Schema.encodeSync(WebSocketAttachmentSchema)({ storeId: 'store', pullRequestIds: [] });
+    const ws = { deserializeAttachment: () => attachment, close: Vitest.vi.fn() };
+    // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- The handler only reads the attachment and closes invalid sockets.
+    return ws;
+};
+//# sourceMappingURL=observability.test.js.map

package/dist/cf-worker/do/observability.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"observability.test.js","sourceRoot":"","sources":["../../../src/cf-worker/do/observability.test.ts"],"names":[],"mappings":"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"}

package/dist/cf-worker/do/pull.d.ts

@@ -2,10 +2,10 @@ import { BackendIdMismatchError, UnknownError } from '@livestore/common';
 import { Schema, Stream } from '@livestore/utils/effect';
 import { SyncMessage } from '../../common/mod.ts';
 import type { ForwardedHeaders } from '../shared.ts';
-import { DoCtx } from './layer.ts';
+import * as DoCtx from './layer.ts';
 export declare const makeEndingPullStream: ({ req, payload, headers, }: {
     req: SyncMessage.PullRequest;
-    payload: Schema.JsonValue | undefined;
+    payload: Schema.Json | undefined;
     headers: ForwardedHeaders | undefined;
-}) => Stream.Stream<SyncMessage.PullResponse, UnknownError | BackendIdMismatchError, DoCtx>;
+}) => Stream.Stream<SyncMessage.PullResponse, UnknownError | BackendIdMismatchError, DoCtx.DoCtx>;
 //# sourceMappingURL=pull.d.ts.map

package/dist/cf-worker/do/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAe,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErF,OAAO,EAAyB,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAG/E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAalC,eAAO,MAAM,oBAAoB,GAAI,4BAIlC;IACD,GAAG,EAAE,WAAW,CAAC,WAAW,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC,KAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,GAAG,sBAAsB,EAAE,KAAK,CAiErF,CAAA"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAe,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAErF,OAAO,EAAkB,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAanC,eAAO,MAAM,oBAAoB,+BAI9B;IACD,GAAG,EAAE,WAAW,CAAC,WAAW,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;IAChC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC,KAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,GAAG,sBAAsB,EAAE,KAAK,CAAC,KAAK,CAiE3F,CAAA"}

package/dist/cf-worker/do/pull.js

@@ -1,9 +1,9 @@
 import { BackendIdMismatchError, SyncBackend, UnknownError } from '@livestore/common';
-import { splitChunkBySize } from '@livestore/common/sync';
-import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
-import { MAX_PULL_EVENTS_PER_MESSAGE, MAX_WS_MESSAGE_BYTES } from "../../common/constants.js";
-import { SyncMessage } from "../../common/mod.js";
-import { DoCtx } from "./layer.js";
+import { splitArrayBySize } from '@livestore/common/sync';
+import { Effect, Option, Schema, Stream } from '@livestore/utils/effect';
+import { MAX_PULL_EVENTS_PER_MESSAGE, MAX_WS_MESSAGE_BYTES } from '../../common/constants.js';
+import { SyncMessage } from '../../common/mod.js';
+import * as DoCtx from './layer.js';
 const encodePullResponse = Schema.encodeSync(SyncMessage.PullResponse);
 // Notes on stream handling:
 // We're intentionally closing the stream once we've read all existing events
@@ -15,9 +15,9 @@ const encodePullResponse = Schema.encodeSync(SyncMessage.PullResponse);
 // - Further chunks will be emitted manually in `push.ts`
 // - If the client sends a `Interrupt` RPC message, TODO
 export const makeEndingPullStream = ({ req, payload, headers, }) => Effect.gen(function* () {
-    const { doOptions, backendId, storeId, storage } = yield* DoCtx;
+    const { doOptions, backendId, storeId, storage } = yield* DoCtx.DoCtx;
     if (doOptions?.onPull !== undefined) {
-        yield* Effect.tryAll(() => doOptions.onPull(req, {
+        yield* Effect.trySyncOrPromiseOrEffect(() => doOptions.onPull(req, {
             storeId,
             ...(payload !== undefined ? { payload } : {}),
             ...(headers !== undefined ? { headers } : {}),
@@ -27,27 +27,26 @@ export const makeEndingPullStream = ({ req, payload, headers, }) => Effect.gen(f
         return yield* new BackendIdMismatchError({ expected: backendId, received: req.cursor.value.backendId });
     }
     const { stream: storedEvents, total } = yield* storage.getEvents(Option.getOrUndefined(req.cursor)?.eventSequenceNumber);
-    return storedEvents.pipe(Stream.mapChunksEffect(splitChunkBySize({
+    return storedEvents.pipe(Stream.mapArrayEffect(splitArrayBySize({
         maxItems: MAX_PULL_EVENTS_PER_MESSAGE,
         maxBytes: MAX_WS_MESSAGE_BYTES,
         encode: (batch) => encodePullResponse(SyncMessage.PullResponse.make({ batch, pageInfo: SyncBackend.pageInfoNoMore, backendId })),
-    })), Stream.mapAccum(total, (remaining, chunk) => {
-        const asArray = Chunk.toReadonlyArray(chunk);
-        const nextRemaining = Math.max(0, remaining - asArray.length);
+    })), Stream.mapAccum(() => total, (remaining, array) => {
+        const nextRemaining = Math.max(0, remaining - array.length);
         return [
             nextRemaining,
-            SyncMessage.PullResponse.make({
-                batch: asArray,
-                pageInfo: nextRemaining > 0 ? SyncBackend.pageInfoMoreKnown(nextRemaining) : SyncBackend.pageInfoNoMore,
-                backendId,
-            }),
+            [
+                SyncMessage.PullResponse.make({
+                    batch: array,
+                    pageInfo: nextRemaining > 0 ? SyncBackend.pageInfoMoreKnown(nextRemaining) : SyncBackend.pageInfoNoMore,
+                    backendId,
+                }),
+            ],
         ];
     }), Stream.tap(Effect.fn(function* (res) {
         if (doOptions?.onPullRes !== undefined) {
-            yield* Effect.tryAll(() => doOptions.onPullRes(res)).pipe(UnknownError.mapToUnknownError);
+            yield* Effect.trySyncOrPromiseOrEffect(() => doOptions.onPullRes(res)).pipe(UnknownError.mapToUnknownError);
         }
     })), Stream.emitIfEmpty(SyncMessage.emptyPullResponse(backendId)));
-}).pipe(Stream.unwrap, Stream.mapError((cause) => cause._tag === 'BackendIdMismatchError' || cause._tag === 'UnknownError'
-    ? cause
-    : new UnknownError({ cause })), Stream.withSpan('cloudflare-provider:pull'));
+}).pipe(Stream.unwrap, Stream.mapError((cause) => cause._tag === 'BackendIdMismatchError' || cause._tag === 'UnknownError' ? cause : new UnknownError({ cause })), Stream.withSpan('cloudflare-provider:pull'));
 //# sourceMappingURL=pull.js.map

package/dist/cf-worker/do/pull.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/cf-worker/do/pull.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/cf-worker/do/pull.ts"],"names":[],"mappings":"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"}

package/dist/cf-worker/do/push.d.ts

@@ -3,13 +3,26 @@ import { type CfTypes } from '@livestore/common-cf';
 import { Effect, Schema } from '@livestore/utils/effect';
 import { SyncMessage } from '../../common/mod.ts';
 import { type Env, type ForwardedHeaders, type MakeDurableObjectClassOptions, type StoreId } from '../shared.ts';
-import { DoCtx } from './layer.ts';
+import * as DoCtx from './layer.ts';
 export declare const makePush: ({ payload, headers, options, storeId, ctx, env, }: {
-    payload: Schema.JsonValue | undefined;
+    payload: Schema.Json | undefined;
     headers: ForwardedHeaders | undefined;
     options: MakeDurableObjectClassOptions | undefined;
     storeId: StoreId;
     ctx: CfTypes.DurableObjectState;
     env: Env;
-}) => (pushRequest: Omit<SyncMessage.PushRequest, "_tag">) => Effect.Effect<{}, UnknownError | BackendIdMismatchError | ServerAheadError, DoCtx>;
+}) => (pushRequest: Omit<SyncMessage.PushRequest, '_tag'>) => Effect.Effect<{}, BackendIdMismatchError | ServerAheadError | UnknownError, DoCtx.DoCtx>;
+/**
+ * Serializes the complete push admission lifecycle, including publication to pull subscribers.
+ *
+ * This complements `blockConcurrencyWhile`: that Cloudflare primitive makes the durable state transition
+ * atomic with respect to other Durable Object requests, whereas this semaphore preserves push order after
+ * the storage gate is released and broadcasting begins. Keeping broadcast outside `blockConcurrencyWhile`
+ * avoids holding Cloudflare's concurrency gate across network I/O.
+ *
+ * Once admitted, the effect is uninterruptible so cancellation cannot leave a committed head without its
+ * matching pull response. Such a gap would make later pushers receive `ServerAhead` while waiting for a
+ * response that was never published.
+ */
+export declare const runSerializedPushAdmission: <A, E, R>(semaphore: DoCtx.Service['pushSemaphore'], admission: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
 //# sourceMappingURL=push.d.ts.map

package/dist/cf-worker/do/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/push.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAEhB,YAAY,EACb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,sBAAsB,CAAA;AAEvE,OAAO,EAAS,MAAM,EAA2B,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGxF,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EACL,KAAK,GAAG,EACR,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAClC,KAAK,OAAO,EAEb,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAMlC,eAAO,MAAM,QAAQ,GAClB,mDAOE;IACD,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,6BAA6B,GAAG,SAAS,CAAA;IAClD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAC,kBAAkB,CAAA;IAC/B,GAAG,EAAE,GAAG,CAAA;CACT,MACA,aAAa,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,uFAuKhD,CAAA"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAe,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACvG,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,sBAAsB,CAAA;AAEvE,OAAO,EAAE,MAAM,EAAyD,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAG/G,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EACL,KAAK,GAAG,EACR,KAAK,gBAAgB,EACrB,KAAK,6BAA6B,EAGlC,KAAK,OAAO,EAEb,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAQnC,eAAO,MAAM,QAAQ,sDAQhB;IACD,OAAO,EAAE,MAAM,CAAC,IAAI,GAAG,SAAS,CAAA;IAChC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;IACrC,OAAO,EAAE,6BAA6B,GAAG,SAAS,CAAA;IAClD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAC,kBAAkB,CAAA;IAC/B,GAAG,EAAE,GAAG,CAAA;CACT,mBACa,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,6FA2KhD,CAAA;AAEL;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,0BAA0B,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,aACrC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,aAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAChC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAqE,CAAA"}

package/dist/cf-worker/do/push.js

@@ -1,21 +1,22 @@
-import { BackendIdMismatchError, ServerAheadError, SyncBackend, UnknownError, } from '@livestore/common';
+import { BackendIdMismatchError, ServerAheadError, SyncBackend, UnknownError } from '@livestore/common';
 import { emitStreamResponse } from '@livestore/common-cf';
-import { splitChunkBySize } from '@livestore/common/sync';
-import { Chunk, Effect, Option, Schema } from '@livestore/utils/effect';
-import { MAX_PUSH_EVENTS_PER_REQUEST, MAX_WS_MESSAGE_BYTES } from "../../common/constants.js";
-import { SyncMessage } from "../../common/mod.js";
-import { WebSocketAttachmentSchema, } from "../shared.js";
-import { DoCtx } from "./layer.js";
-const encodePullResponse = Schema.encodeSync(SyncMessage.PullResponse);
-const jsonStringify = Schema.encodeSync(Schema.parseJson());
+import { splitArrayBySize } from '@livestore/common/sync';
+import { Effect, Option, ReadonlyArray as EffectArray, Schema } from '@livestore/utils/effect';
+import { MAX_PUSH_EVENTS_PER_REQUEST, MAX_WS_MESSAGE_BYTES } from '../../common/constants.js';
+import { SyncMessage } from '../../common/mod.js';
+import { rpcSubscriptionKeyPrefix, WebSocketAttachmentSchema, } from '../shared.js';
+import * as DoCtx from './layer.js';
+const pullResponseJsonSchema = Schema.toCodecJson(SyncMessage.PullResponse);
+const encodePullResponse = Schema.encodeSync(pullResponseJsonSchema);
+const jsonStringify = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (pushRequest) => Effect.gen(function* () {
     // yield* Effect.log(`Pushing ${decodedMessage.batch.length} events`, decodedMessage.batch)
-    const { backendId, storage, currentHeadRef, updateCurrentHead, rpcSubscriptions } = yield* DoCtx;
+    const { backendId, storage, currentHeadRef, updateCurrentHead, pushSemaphore } = yield* DoCtx.DoCtx;
     if (pushRequest.batch.length === 0) {
         return SyncMessage.PushAck.make({});
     }
     if (options?.onPush !== undefined) {
-        yield* Effect.tryAll(() => options.onPush(pushRequest, {
+        yield* Effect.trySyncOrPromiseOrEffect(() => options.onPush(pushRequest, {
             storeId,
             ...(payload !== undefined ? { payload } : {}),
             ...(headers !== undefined ? { headers } : {}),
@@ -24,32 +25,32 @@ export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (
     if (pushRequest.backendId._tag === 'Some' && pushRequest.backendId.value !== backendId) {
         return yield* new BackendIdMismatchError({ expected: backendId, received: pushRequest.backendId.value });
     }
-    // This part of the code needs to run sequentially to avoid race conditions
-    const { createdAt } = yield* Effect.gen(function* () {
-        const currentHead = currentHeadRef.current;
-        // TODO handle clientId unique conflict
-        // Validate the batch
-        const firstEventParent = pushRequest.batch[0].parentSeqNum;
-        if (firstEventParent !== currentHead) {
-            // yield* Effect.logDebug('ServerAheadError: backend head mismatch', {
-            //   expectedHead: currentHead,
-            //   providedHead: firstEventParent,
-            //   batchSize: pushRequest.batch.length,
-            //   backendId,
-            // })
-            return yield* new ServerAheadError({ minimumExpectedNum: currentHead, providedNum: firstEventParent });
-        }
-        const createdAt = new Date().toISOString();
-        // TODO possibly model this as a queue in order to speed up subsequent pushes
-        yield* storage.appendEvents(pushRequest.batch, createdAt);
-        updateCurrentHead(pushRequest.batch.at(-1).seqNum);
-        return { createdAt };
-    }).pipe(blockConcurrencyWhile(ctx));
-    // Run in background but already return the push ack to the client
-    yield* Effect.gen(function* () {
+    // A push is one ordered admit → persist → publish operation. `blockConcurrencyWhile` below protects
+    // the Durable Object state transition, while this semaphore keeps later pushes from overtaking this
+    // push during broadcasting without holding Cloudflare's concurrency gate across network I/O.
+    yield* runSerializedPushAdmission(pushSemaphore, Effect.gen(function* () {
+        // Keep the head check, durable append, and in-memory head update atomic with respect to other
+        // Durable Object requests. Broadcasting intentionally happens after this gate is released.
+        const { createdAt } = yield* Effect.gen(function* () {
+            const currentHead = currentHeadRef.current;
+            // TODO handle clientId unique conflict
+            // Validate the batch
+            const firstEventParent = pushRequest.batch[0].parentSeqNum;
+            if (firstEventParent !== currentHead) {
+                return yield* new ServerAheadError({ minimumExpectedNum: currentHead, providedNum: firstEventParent });
+            }
+            const createdAt = new Date().toISOString();
+            // TODO possibly model this as a queue in order to speed up subsequent pushes
+            yield* storage.appendEvents(pushRequest.batch, createdAt);
+            updateCurrentHead(pushRequest.batch.at(-1).seqNum);
+            return { createdAt };
+        }).pipe(blockConcurrencyWhile(ctx));
         const connectedClients = ctx.getWebSockets();
         // Preparing chunks of responses to make sure we don't exceed the WS message size limit.
-        const responses = yield* Chunk.fromIterable(pushRequest.batch).pipe(splitChunkBySize({
+        if (EffectArray.isReadonlyArrayNonEmpty(pushRequest.batch) === false) {
+            return;
+        }
+        const responses = yield* splitArrayBySize({
             maxItems: MAX_PUSH_EVENTS_PER_REQUEST,
             maxBytes: MAX_WS_MESSAGE_BYTES,
             encode: (items) => encodePullResponse(SyncMessage.PullResponse.make({
@@ -60,8 +61,8 @@ export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (
                 pageInfo: SyncBackend.pageInfoNoMore,
                 backendId,
             })),
-        }), Effect.map(Chunk.map((eventsChunk) => {
-            const batchWithMetadata = Chunk.toReadonlyArray(eventsChunk).map((eventEncoded) => ({
+        })(pushRequest.batch).pipe(Effect.map((eventBatch) => eventBatch.map((events) => {
+            const batchWithMetadata = events.map((eventEncoded) => ({
                 eventEncoded,
                 metadata: Option.some(SyncMessage.SyncMetadata.make({ createdAt })),
             }));
@@ -72,7 +73,7 @@ export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (
             });
             return {
                 response,
-                encoded: Schema.encodeSync(SyncMessage.PullResponse)(response),
+                encoded: encodePullResponse(response),
             };
         })));
         // Dual broadcasting: WebSocket + RPC clients
@@ -81,11 +82,11 @@ export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (
             for (const { response, encoded } of responses) {
                 // Only calling once for now.
                 if (options?.onPullRes !== undefined) {
-                    yield* Effect.tryAll(() => options.onPullRes(response)).pipe(UnknownError.mapToUnknownError);
+                    yield* Effect.trySyncOrPromiseOrEffect(() => options.onPullRes(response)).pipe(UnknownError.mapToUnknownError);
                 }
                 // NOTE we're also sending the pullRes chunk to the pushing ws client as confirmation
                 for (const conn of connectedClients) {
-                    const attachment = yield* Schema.decode(WebSocketAttachmentSchema)(conn.deserializeAttachment());
+                    const attachment = yield* Schema.decodeEffect(WebSocketAttachmentSchema)(conn.deserializeAttachment());
                     // We're doing something a bit "advanced" here as we're directly emitting Effect RPC-compatible
                     // response messsages on the Effect RPC-managed websocket connection to the WS client.
                     // For this we need to get the RPC `requestId` from the WebSocket attachment.
@@ -101,38 +102,58 @@ export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (
             }
             yield* Effect.logDebug(`Broadcasted to ${connectedClients.length} WebSocket clients`);
         }
-        // RPC broadcasting would require reconstructing client stubs from clientIds
-        if (rpcSubscriptions.size > 0) {
-            for (const subscription of rpcSubscriptions.values()) {
-                for (const { encoded } of responses) {
+        // Subscribers live in the DO's KV storage (single source of truth), so fan-out survives reconstruction.
+        // emitStreamResponse reconstructs each client stub from its callerContext.
+        const rpcSubscriptions = Array.from(ctx.storage.kv.list({ prefix: rpcSubscriptionKeyPrefix }));
+        if (rpcSubscriptions.length > 0) {
+            for (const [, subscription] of rpcSubscriptions) {
+                for (const { response } of responses) {
                     yield* emitStreamResponse({
                         callerContext: subscription.callerContext,
                         env,
                         requestId: subscription.requestId,
-                        values: [encoded],
+                        storeId: subscription.storeId,
+                        schema: SyncMessage.PullResponse,
+                        values: [response],
                     }).pipe(Effect.tapCauseLogPretty, Effect.exit);
                 }
             }
-            yield* Effect.logDebug(`Broadcasted to ${rpcSubscriptions.size} RPC clients`);
+            yield* Effect.logDebug(`Broadcasted to ${rpcSubscriptions.length} RPC clients`);
         }
-    }).pipe(Effect.tapCauseLogPretty, Effect.withSpan('push-rpc-broadcast'), Effect.uninterruptible, // We need to make sure Effect RPC doesn't interrupt this fiber
-    Effect.fork);
-    // We need to yield here to make sure the fork above is kicked off before we let Effect RPC finish the request
-    yield* Effect.yieldNow();
+    }).pipe(Effect.tapCauseLogPretty, Effect.withSpan('push-rpc-broadcast')));
+    // Acknowledge only after the committed batch has been published, so a client cannot observe an
+    // advanced server head while the corresponding pull response is still waiting in a detached fiber.
     return SyncMessage.PushAck.make({});
 }).pipe(Effect.tap(Effect.fn(function* (message) {
     if (options?.onPushRes !== undefined) {
-        yield* Effect.tryAll(() => options.onPushRes(message)).pipe(UnknownError.mapToUnknownError);
+        yield* Effect.trySyncOrPromiseOrEffect(() => options.onPushRes(message)).pipe(UnknownError.mapToUnknownError);
     }
 })), Effect.mapError((cause) => cause._tag === 'BackendIdMismatchError' || cause._tag === 'ServerAheadError' || cause._tag === 'UnknownError'
     ? cause
     : new UnknownError({ cause })), Effect.withSpan('sync-cf:do:push', { attributes: { storeId, batchSize: pushRequest.batch.length } }));
 /**
+ * Serializes the complete push admission lifecycle, including publication to pull subscribers.
+ *
+ * This complements `blockConcurrencyWhile`: that Cloudflare primitive makes the durable state transition
+ * atomic with respect to other Durable Object requests, whereas this semaphore preserves push order after
+ * the storage gate is released and broadcasting begins. Keeping broadcast outside `blockConcurrencyWhile`
+ * avoids holding Cloudflare's concurrency gate across network I/O.
+ *
+ * Once admitted, the effect is uninterruptible so cancellation cannot leave a committed head without its
+ * matching pull response. Such a gap would make later pushers receive `ServerAhead` while waiting for a
+ * response that was never published.
+ */
+export const runSerializedPushAdmission = (semaphore, admission) => semaphore.withPermits(1)(admission.pipe(Effect.uninterruptible));
+/**
+ * Runs the storage-backed state transition behind Cloudflare's Durable Object concurrency gate.
+ * This scope should remain limited to local persistence and head mutation; ordered publication is handled
+ * separately by `runSerializedPushAdmission` so outbound work does not block unrelated Durable Object events.
+ *
  * @see https://developers.cloudflare.com/durable-objects/api/state/#blockconcurrencywhile
  */
 const blockConcurrencyWhile = (ctx) => (eff) => Effect.gen(function* () {
-    const runtime = yield* Effect.runtime();
-    const exit = yield* Effect.promise(() => ctx.blockConcurrencyWhile(() => eff.pipe(Effect.provide(runtime), Effect.runPromiseExit)));
+    const services = yield* Effect.context();
+    const exit = yield* Effect.promise(() => ctx.blockConcurrencyWhile(() => eff.pipe(Effect.runPromiseExitWith(services))));
     return yield* exit;
 });
 //# sourceMappingURL=push.js.map