@livestore/common-cf 0.5.0-dev.0 → 0.5.0

package/dist/do-rpc/server.js

@@ -1,44 +1,33 @@
-import { Effect, Exit, Headers, Option, Rpc, RpcMessage, RpcSchema, RpcSerialization, Result, Schema, SchemaIssue, Stream, } from '@livestore/utils/effect';
-/**
- * The erased dynamic RPC schemas (`Rpc.exitSchema(...) as Schema.Top`, `rpc.payloadSchema`) are
- * plain data — they need NO decoding/encoding services. `Schema.Top` types those service channels
- * as `unknown`, which surfaces as `unknown` in the requirements channel of `encode/decodeUnknownEffect`
- * (anyUnknownInErrorContext / TS377030). Assert the true `never` services in ONE place.
- *
- * TODO(effect): revisit if a cleaner/idiomatic API lands — https://github.com/Effect-TS/effect/issues/6489
- */
-const erasedJsonCodec = (schema) => 
+import { Effect, Exit, Fiber, Headers, Option, Rpc, RpcMessage, RpcSchema, RpcSerialization, Result, Schema, SchemaIssue, Stream, } from '@livestore/utils/effect';
+const isEncodedRpcMessage = Schema.is(RpcMessage.EncodedSchema);
+const isRequestEncoded = (message) => isEncodedRpcMessage(message) === true && message._tag === 'Request';
+const erasedCodec = (codecFor, schema) => 
 // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- erased RPC data schemas require no codec services
-Schema.toCodecJson(schema);
+codecFor(schema);
+const schemaBinarySerialization = RpcSerialization.RpcSerialization.pipe(Effect.provide(RpcSerialization.layerSchemaBinary()));
+const encodeBytes = (parser, value) => {
+    const encoded = parser.encode(value);
+    if (encoded instanceof Uint8Array === false) {
+        throw new TypeError('SchemaBinary RPC serialization did not produce bytes');
+    }
+    if (encoded.buffer instanceof ArrayBuffer === false) {
+        throw new TypeError('SchemaBinary RPC serialization produced shared bytes');
+    }
+    return new Uint8Array(encoded.buffer, encoded.byteOffset, encoded.byteLength);
+};
 /**
  * Construct a Durable Object RPC handler from an `RpcGroup`.
  * This is the DO equivalent of `RpcServer.toWebHandler`.
  */
 export const toDurableObjectHandler = (group, options) => (serializedPayload) => Effect.gen(function* () {
-    const parser = RpcSerialization.msgPack.makeUnsafe();
-    // Decode incoming requests - client sends array of requests
-    const decoded = parser.decode(serializedPayload);
-    // Handle potential nested array from client serialization
-    let requests;
-    if (Array.isArray(decoded) === true && decoded.length === 1 && Array.isArray(decoded[0]) === true) {
-        // Double-wrapped array [[{...}]] -> [{...}]
-        requests = decoded[0];
-    }
-    else if (Array.isArray(decoded) === true) {
-        // Single array [{...}]
-        requests = decoded;
-    }
-    else {
-        requests = [];
-    }
+    const serialization = yield* schemaBinarySerialization;
+    const parser = serialization.makeUnsafe();
+    const requests = parser.decode(serializedPayload).filter(isRequestEncoded);
     // Get the context with handlers
     const context = yield* Effect.context();
     // Process each request
     const responses = [];
     for (const request of requests) {
-        if (request._tag !== 'Request') {
-            continue;
-        }
         const requestId = RpcMessage.RequestId(request.id);
         // Find the RPC handler
         // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- RpcGroup.requests map returns Rpc.Any; narrowing to AnyWithProps for property access
@@ -53,14 +42,12 @@ export const toDurableObjectHandler = (group, options) => (serializedPayload) =>
             });
             continue;
         }
-        const payloadResult = yield* Schema.decodeUnknownEffect(erasedJsonCodec(rpc.payloadSchema))(request.payload).pipe(Effect.provideContext(entry.context), Effect.result);
+        const payloadResult = yield* Schema.decodeUnknownEffect(erasedCodec(serialization.codecFor, rpc.payloadSchema))(request.payload).pipe(Effect.provideContext(entry.context), Effect.result);
         if (Result.isFailure(payloadResult) === true) {
-            // Request payloads are encoded with the JSON codec by Effect's RPC client. Decode them
-            // before dispatch so JSON-only representations such as `null` become their schema values.
             // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- Rpc.exitSchema requires AnyWithProps; type narrowing already done above
             const exitSchema = Rpc.exitSchema(rpc);
             const rawExit = Exit.die(SchemaIssue.makeFormatterDefault()(payloadResult.failure.issue));
-            const encodedExit = yield* Schema.encodeUnknownEffect(erasedJsonCodec(exitSchema))(rawExit).pipe(Effect.provideContext(entry.context));
+            const encodedExit = yield* Schema.encodeUnknownEffect(erasedCodec(serialization.codecFor, exitSchema))(rawExit).pipe(Effect.provideContext(entry.context));
             responses.push({
                 _tag: 'Exit',
                 requestId,
@@ -73,7 +60,7 @@ export const toDurableObjectHandler = (group, options) => (serializedPayload) =>
         const isStream = RpcSchema.isStreamSchema(rpc.successSchema);
         // For streaming RPCs with only one request, return ReadableStream directly
         if (isStream === true && requests.length === 1) {
-            return yield* createStreamingResponse(rpc, entry, requestId, payload, parser, options.layer);
+            return yield* createStreamingResponse(rpc, entry, requestId, payload, parser, serialization.codecFor, options.layer);
         }
         // Execute the handler
         const result = yield* Effect.gen(function* () {
@@ -101,7 +88,7 @@ export const toDurableObjectHandler = (group, options) => (serializedPayload) =>
             if (exitSchema !== undefined) {
                 // Use schema encoding for proper serialization
                 const rawExit = Exit.succeed(value);
-                encodedExit = yield* Schema.encodeUnknownEffect(erasedJsonCodec(exitSchema))(rawExit);
+                encodedExit = yield* Schema.encodeUnknownEffect(erasedCodec(serialization.codecFor, exitSchema))(rawExit);
             }
             else {
                 // Fallback to direct exit
@@ -121,7 +108,7 @@ export const toDurableObjectHandler = (group, options) => (serializedPayload) =>
                 if (exitSchema !== undefined) {
                     // Use schema encoding for proper serialization
                     const rawExit = Exit.failCause(cause);
-                    encodedExit = yield* Schema.encodeUnknownEffect(erasedJsonCodec(exitSchema))(rawExit);
+                    encodedExit = yield* Schema.encodeUnknownEffect(erasedCodec(serialization.codecFor, exitSchema))(rawExit);
                 }
                 else {
                     // Fallback to direct exit
@@ -136,31 +123,30 @@ export const toDurableObjectHandler = (group, options) => (serializedPayload) =>
         }));
         responses.push(result);
     }
-    // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- msgPack parser.encode returns unknown; cast to expected wire format
-    const encoded = parser.encode(responses);
-    return encoded;
+    return encodeBytes(parser, responses);
 }).pipe(Effect.provide(options.layer), Effect.scoped, Effect.orDie);
 /** Out-of-band RPC stream response emission back to the caller DO */
-export const emitStreamResponse = Effect.fn('do-rpc/emitStreamResponse')(function* ({ callerContext, env, requestId, storeId, values, }) {
+export const emitStreamResponse = Effect.fn('do-rpc/emitStreamResponse')(function* ({ callerContext, env, requestId, schema, storeId, values, }) {
     // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- CF worker env bindings are typed as Record<string, any>; narrowing to known DO namespace
     const clientDoNamespace = env[callerContext.bindingName];
     if (clientDoNamespace === undefined) {
         throw new Error(`Client DO namespace not found: ${callerContext.bindingName}`);
     }
     const clientDo = clientDoNamespace.get(clientDoNamespace.idFromString(callerContext.durableObjectId));
-    const res = { _tag: 'Chunk', requestId, values };
-    const parser = RpcSerialization.msgPack.makeUnsafe();
+    const serialization = yield* schemaBinarySerialization;
+    const parser = serialization.makeUnsafe();
+    const encodedValues = yield* Schema.encodeUnknownEffect(erasedCodec(serialization.codecFor, Schema.NonEmptyArray(schema)))(values);
+    const res = { _tag: 'Chunk', requestId, values: encodedValues };
     // Native Cloudflare RPC rejects schema values with custom prototypes. Keep the callback
     // boundary clone-safe by sending the already-encoded Effect RPC message as bytes.
-    // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- msgPack parser.encode returns unknown; the encoded result is a byte payload
-    const serializedRes = parser.encode(res);
+    const serializedRes = encodeBytes(parser, res);
     yield* Effect.tryPromise(() => clientDo.syncUpdateRpc(serializedRes, storeId));
 });
 /**
  * Creates a ReadableStream response for streaming RPCs.
  * This converts an Effect Stream into a ReadableStream of serialized RPC messages.
  */
-const createStreamingResponse = (rpc, entry, requestId, payload, parser, layer) => Effect.gen(function* () {
+const createStreamingResponse = (rpc, entry, requestId, payload, parser, codecFor, layer) => Effect.gen(function* () {
     // Execute the handler to get the stream
     const handlerResult = entry.handler(payload, {
         client: new Rpc.ServerClient(0), // TODO: add proper clientId if needed
@@ -171,9 +157,12 @@ const createStreamingResponse = (rpc, entry, requestId, payload, parser, layer)
         rpc,
     });
     const effectOrStream = Rpc.isWrapper(handlerResult) === true ? handlerResult.value : handlerResult;
-    const stream = 
-    // @effect-diagnostics-next-line anyUnknownInErrorContext:off -- `Rpc.Handler.handler` returns `Effect<any, any>` due to dynamic dispatch; orDie converts the error to a defect handled by the downstream catchCause
-    Effect.isEffect(effectOrStream) === true ? yield* Effect.orDie(effectOrStream) : effectOrStream;
+    // @effect-diagnostics-next-line anyUnknownInErrorContext:off -- dynamically dispatched handlers have an unknown error; orDie converts it to a defect handled by the downstream catchCause
+    const result = Effect.isEffect(effectOrStream) === true ? yield* Effect.orDie(effectOrStream) : effectOrStream;
+    if (Stream.isStream(result) === false) {
+        return yield* Effect.die(`Streaming RPC ${rpc._tag} did not produce a Stream`);
+    }
+    const stream = result;
     // Get the stream schemas for proper chunk-level encoding
     // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- Rpc.Handler doesn't expose successSchema publicly; see https://github.com/Effect-TS/effect/issues/6064
     const streamSchemas = RpcSchema.isStreamSchema(rpc.successSchema) === true
@@ -183,9 +172,11 @@ const createStreamingResponse = (rpc, entry, requestId, payload, parser, layer)
         })
         : Option.none();
     const arrayEncoder = Option.isSome(streamSchemas) === true
-        ? Schema.encodeUnknownEffect(Schema.toCodecJson(Schema.Array(streamSchemas.value.success)))
-        : Schema.encodeUnknownEffect(Schema.toCodecJson(Schema.Array(Schema.Any)));
+        ? Schema.encodeUnknownEffect(erasedCodec(codecFor, Schema.NonEmptyArray(streamSchemas.value.success)))
+        : Schema.encodeUnknownEffect(erasedCodec(codecFor, Schema.NonEmptyArray(Schema.Any)));
     // Convert stream to ReadableStream
+    let producer;
+    let cancelled = false;
     const readableStream = new ReadableStream({
         start(controller) {
             // Run the stream and send chunks + final exit
@@ -201,42 +192,43 @@ const createStreamingResponse = (rpc, entry, requestId, payload, parser, layer)
                         requestId,
                         values: encodedValues,
                     };
-                    // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- msgPack parser.encode returns unknown; cast to expected wire format
-                    const serialized = parser.encode([chunkMessage]);
-                    controller.enqueue(serialized);
+                    controller.enqueue(encodeBytes(parser, [chunkMessage]));
                 }));
                 // Send final exit message with proper schema encoding
                 const rawExit = Exit.void;
                 // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- Rpc.exitSchema requires AnyWithProps; type narrowing already done above
                 const exitSchema = Rpc.exitSchema(rpc);
-                const encodedExit = yield* Schema.encodeUnknownEffect(erasedJsonCodec(exitSchema))(rawExit);
+                const encodedExit = yield* Schema.encodeUnknownEffect(erasedCodec(codecFor, exitSchema))(rawExit);
                 const exitMessage = {
                     _tag: 'Exit',
                     requestId,
                     exit: encodedExit,
                 };
-                // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- msgPack parser.encode returns unknown; cast to expected wire format
-                const exitSerialized = parser.encode([exitMessage]);
-                controller.enqueue(exitSerialized);
+                controller.enqueue(encodeBytes(parser, [exitMessage]));
                 controller.close();
             }).pipe(Effect.catchCause((cause) => Effect.gen(function* () {
+                if (cancelled === true)
+                    return;
                 // Send error exit with proper schema encoding
                 const rawExit = Exit.failCause(cause);
                 // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- Rpc.exitSchema requires AnyWithProps; type narrowing already done above
                 const exitSchema = Rpc.exitSchema(rpc);
-                const encodedExit = yield* Schema.encodeUnknownEffect(erasedJsonCodec(exitSchema))(rawExit);
+                const encodedExit = yield* Schema.encodeUnknownEffect(erasedCodec(codecFor, exitSchema))(rawExit);
                 const exitMessage = {
                     _tag: 'Exit',
                     requestId,
                     exit: encodedExit,
                 };
-                // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- msgPack parser.encode returns unknown; cast to expected wire format
-                const exitSerialized = parser.encode([exitMessage]);
-                controller.enqueue(exitSerialized);
+                controller.enqueue(encodeBytes(parser, [exitMessage]));
                 controller.close();
             })));
             // Run the stream processing
-            runStream.pipe(Effect.provide(layer), Effect.scoped, Effect.tapCauseLogPretty, (_) => _, Effect.runPromise);
+            producer = runStream.pipe(Effect.provide(layer), Effect.scoped, Effect.tapCauseLogPretty, (_) => _, Effect.runFork);
+        },
+        cancel() {
+            cancelled = true;
+            // @effect-diagnostics-next-line runEffectInsideEffect:off -- native stream callback runs outside Effect; interruption needs no services
+            return producer === undefined ? undefined : Effect.runPromise(Fiber.interrupt(producer));
         },
         // oxlint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- bridging standard Web API ReadableStream to Cloudflare Worker ReadableStream type
     });

package/dist/do-rpc/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/do-rpc/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/do-rpc/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EAEP,MAAM,EAEN,GAAG,EAEH,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,MAAM,EACN,MAAM,EACN,WAAW,EAEX,MAAM,GACP,MAAM,yBAAyB,CAAA;AAIhC,MAAM,mBAAmB,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;AAE/D,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAwC,EAAE,CAClF,mBAAmB,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAA;AAErE,MAAM,WAAW,GAAG,CAAC,QAAmC,EAAE,MAAkB,EAAE,EAAE;AAC9E,4HAA4H;AAC5H,QAAQ,CAAC,MAAsD,CAAC,CAAA;AAElE,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CACtE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CACrD,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,MAA+B,EAAE,KAAc,EAA2B,EAAE;IAC/F,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpC,IAAI,OAAO,YAAY,UAAU,KAAK,KAAK,EAAE,CAAC;QAC5C,MAAM,IAAI,SAAS,CAAC,sDAAsD,CAAC,CAAA;IAC7E,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,YAAY,WAAW,KAAK,KAAK,EAAE,CAAC;QACpD,MAAM,IAAI,SAAS,CAAC,sDAAsD,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;AAC/E,CAAC,CAAA;AAWD;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GACjC,CACE,KAA8B,EAC9B,OAKC,EAGmE,EAAE,CACxE,CAAC,iBAAiB,EAAE,EAAE,CACpB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,yBAAyB,CAAA;IACtD,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,EAAE,CAAA;IAEzC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAE1E,gCAAgC;IAChC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAA8C,CAAA;IAEnF,uBAAuB;IACvB,MAAM,SAAS,GAAU,EAAE,CAAA;IAE3B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAElD,uBAAuB;QACvB,+JAA+J;QAC/J,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAiC,CAAA;QAC3E,yJAAyJ;QACzJ,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAA8B,CAAA;QAEzE,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACjC,SAAS,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,MAAM;gBACZ,SAAS;gBACT,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,wBAAwB,OAAO,CAAC,GAAG,EAAE,CAAC;aACtD,CAAC,CAAA;YACF,SAAQ;QACV,CAAC;QAED,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,CAC7G,OAAO,CAAC,OAAO,CAChB,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;QAE3D,IAAI,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7C,kJAAkJ;YAClJ,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAU,CAAe,CAAA;YAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;YACzF,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CACpG,OAAO,CACR,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;YAC5C,SAAS,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,MAAM;gBACZ,SAAS;gBACT,IAAI,EAAE,WAAW;aAClB,CAAC,CAAA;YACF,SAAQ;QACV,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QAErC,mCAAmC;QACnC,MAAM,QAAQ,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAE5D,2EAA2E;QAC3E,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC,CAAC,uBAAuB,CACnC,GAAG,EACH,KAAK,EACL,SAAS,EACT,OAAO,EACP,MAAM,EACN,aAAa,CAAC,QAAQ,EACtB,OAAO,CAAC,KAAK,CACd,CAAA;QACH,CAAC;QAED,sBAAsB;QACtB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACxC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE;gBAC3C,MAAM,EAAE,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,sCAAsC;gBACvE,SAAS;gBACT,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;oBACzB,kBAAkB,EAAE,SAAS,CAAC,QAAQ,EAAE;iBACzC,CAAC;gBACF,GAAG;aACJ,CAAC,CAAA;YACF,MAAM,cAAc,GAClB,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAA;YAE7E,IAAI,KAAU,CAAA;YACd,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7C,yIAAyI;gBACzI,KAAK,GAAG,KAAK,CAAC,CAAC,cAAc,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,cAAc,CAAA;YACxB,CAAC;YAED,mCAAmC;YACnC,kJAAkJ;YAClJ,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAU,CAAe,CAAA;YAE3D,IAAI,WAAgB,CAAA;YACpB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,+CAA+C;gBAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBACnC,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YAC3G,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACnC,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,MAAe;gBACrB,SAAS;gBACT,IAAI,EAAE,WAAW;aAClB,CAAA;QACH,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,mCAAmC;YACnC,kJAAkJ;YAClJ,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAU,CAAe,CAAA;YAE3D,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,IAAI,WAAgB,CAAA;gBACpB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC7B,+CAA+C;oBAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;oBACrC,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAC9F,OAAO,CACR,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACN,0BAA0B;oBAC1B,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;gBACrC,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,MAAe;oBACrB,SAAS;oBACT,IAAI,EAAE,WAAW;iBAClB,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CACH,CAAA;QAED,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACxB,CAAC;IAED,OAAO,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AACvC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAEjE,CAAA;AAEL,qEAAqE;AACrE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,EAClF,aAAa,EACb,GAAG,EACH,SAAS,EACT,MAAM,EACN,OAAO,EACP,MAAM,GAQP;IACC,mKAAmK;IACnK,MAAM,iBAAiB,GAAG,GAAG,CAAC,aAAa,CAAC,WAAW,CAE1C,CAAA;IAEb,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,kCAAkC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAA;IAChF,CAAC;IAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAA;IAErG,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,yBAAyB,CAAA;IACtD,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,EAAE,CAAA;IACzC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CACrD,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAClE,CAAC,MAAM,CAAC,CAAA;IACT,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,CAAA;IAC/D,wFAAwF;IACxF,kFAAkF;IAClF,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAE9C,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAA;AAChF,CAAC,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAC9B,GAAqB,EACrB,KAAgC,EAChC,SAA+B,EAC/B,OAAgB,EAChB,MAA+B,EAC/B,QAAmC,EACnC,KAAkE,EACP,EAAE,CAC7D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,wCAAwC;IACxC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE;QAC3C,MAAM,EAAE,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,sCAAsC;QACvE,SAAS;QACT,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC;YACzB,kBAAkB,EAAE,SAAS,CAAC,QAAQ,EAAE;SACzC,CAAC;QACF,GAAG;KACJ,CAAC,CAAA;IACF,MAAM,cAAc,GAClB,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAA;IAE7E,0LAA0L;IAC1L,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAA;IAC9G,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,IAAI,2BAA2B,CAAC,CAAA;IAChF,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAA;IAErB,yDAAyD;IACzD,iLAAiL;IACjL,MAAM,aAAa,GACjB,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,IAAI;QAClD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,GAAG,CAAC,aAAa,CAAC,OAAO;YAClC,KAAK,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK;SAC/B,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;IACnB,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,IAAI;QACnC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACtG,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAEzF,mCAAmC;IACnC,IAAI,QAAuC,CAAA;IAC3C,IAAI,SAAS,GAAG,KAAK,CAAA;IACrB,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;QACxC,KAAK,CAAC,UAAU;YACd,8CAA8C;YAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACpC,2EAA2E;gBAC3E,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAC9C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAClB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;wBAAE,OAAM;oBAE9B,sEAAsE;oBACtE,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;oBAEhD,MAAM,YAAY,GAAG;wBACnB,IAAI,EAAE,OAAgB;wBACtB,SAAS;wBACT,MAAM,EAAE,aAAa;qBACtB,CAAA;oBAED,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;gBACzD,CAAC,CAAC,CACH,CAAA;gBAED,sDAAsD;gBACtD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;gBACzB,kJAAkJ;gBAClJ,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAU,CAAe,CAAA;gBAC3D,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;gBAEjG,MAAM,WAAW,GAAG;oBAClB,IAAI,EAAE,MAAe;oBACrB,SAAS;oBACT,IAAI,EAAE,WAAW;iBAClB,CAAA;gBAED,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;gBACtD,UAAU,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,IAAI,SAAS,KAAK,IAAI;oBAAE,OAAM;gBAC9B,8CAA8C;gBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;gBACrC,kJAAkJ;gBAClJ,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAU,CAAe,CAAA;gBAC3D,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;gBAEjG,MAAM,WAAW,GAAG;oBAClB,IAAI,EAAE,MAAe;oBACrB,SAAS;oBACT,IAAI,EAAE,WAAW;iBAClB,CAAA;gBAED,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;gBACtD,UAAU,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,CACH,CACF,CAAA;YAED,4BAA4B;YAC5B,QAAQ,GAAG,SAAS,CAAC,IAAI,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EACrB,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,iBAAiB,EACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAwB,EAC/B,MAAM,CAAC,OAAO,CACf,CAAA;QACH,CAAC;QACD,MAAM;YACJ,SAAS,GAAG,IAAI,CAAA;YAChB,wIAAwI;YACxI,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC1F,CAAC;QACD,4JAA4J;KAC7J,CAAkC,CAAA;IAEnC,kFAAkF;IAElF,OAAO,cAAc,CAAA;AACvB,CAAC,CAAC,CAAA"}

package/dist/do-rpc/test-fixtures/rpc-schema.d.ts

@@ -1,13 +1,5 @@
 import { Rpc, RpcGroup, Schema } from '@livestore/utils/effect';
-declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Ping", Schema.Struct<{
-    readonly message: Schema.String;
-}>, Schema.Struct<{
-    readonly response: Schema.String;
-}>, Schema.Never, never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
-    readonly text: Schema.String;
-}>, Schema.Struct<{
-    readonly echo: Schema.String;
-}>, Schema.Never, never, never> | Rpc.Rpc<"Add", Schema.Struct<{
+declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Add", Schema.Struct<{
     readonly a: Schema.Finite;
     readonly b: Schema.Finite;
 }>, Schema.Struct<{
@@ -16,22 +8,30 @@ declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Ping", Schema.Struct<{
     readonly message: Schema.String;
 }>, Schema.Struct<{
     readonly never: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
+    readonly text: Schema.String;
+}>, Schema.Struct<{
+    readonly echo: Schema.String;
 }>, Schema.Never, never, never> | Rpc.Rpc<"Fail", Schema.Struct<{
     readonly message: Schema.String;
 }>, Schema.Struct<{
     readonly never: Schema.String;
-}>, Schema.String, never, never> | Rpc.Rpc<"Stream", Schema.Struct<{}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Struct<{
+}>, Schema.String, never, never> | Rpc.Rpc<"Ping", Schema.Struct<{
+    readonly message: Schema.String;
+}>, Schema.Struct<{
+    readonly response: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Stream", Schema.Struct<{}>, import("effect/rpc/RpcSchema").Stream<Schema.Struct<{
     readonly maybeNumber: Schema.Option<Schema.Finite>;
-}>, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamError", Schema.Struct<{
-    readonly count: Schema.Finite;
-    readonly errorAfter: Schema.Finite;
-}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.String>, Schema.Never, never, never> | Rpc.Rpc<"StreamDefect", Schema.Struct<{
+}>, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamBugScenarioDoClient", Schema.Struct<{}>, Schema.Finite, Schema.Never, never, never> | Rpc.Rpc<"StreamBugScenarioDoServer", Schema.Struct<{}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamDefect", Schema.Struct<{
     readonly count: Schema.Finite;
     readonly defectAfter: Schema.Finite;
-}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamInterruptible", Schema.Struct<{
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamError", Schema.Struct<{
+    readonly count: Schema.Finite;
+    readonly errorAfter: Schema.Finite;
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.String>, Schema.Never, never, never> | Rpc.Rpc<"StreamInterruptible", Schema.Struct<{
     readonly delay: Schema.Finite;
     readonly interruptAfterCount: Schema.Finite;
-}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamBugScenarioDoServer", Schema.Struct<{}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamBugScenarioDoClient", Schema.Struct<{}>, Schema.Finite, Schema.Never, never, never>>;
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never>>;
 export declare class TestRpcs extends TestRpcs_base {
 }
 export type TestRpcsI = RpcGroup.Rpcs<typeof TestRpcs>;

package/dist/do-rpc/test-fixtures/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/do-rpc/test-fixtures/worker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAiBlD,MAAM,WAAW,GAAG;IAClB,WAAW,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,CAAA;CAC1D;AAED,qBAAa,oBAAqB,SAAQ,aAAa;IAC5C,sBAAsB,EAA6B,KAAK,CAAA;IAE3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CA4C9C;;mBAGsB,OAAO,OAAO,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;;AAD5D,wBAuEC"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/do-rpc/test-fixtures/worker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAiBlD,MAAM,WAAW,GAAG;IAClB,WAAW,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,CAAA;CAC1D;AAED,qBAAa,oBAAqB,SAAQ,aAAa;IAC5C,sBAAsB,EAA6B,KAAK,CAAA;IAE3D,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CA2C5C;CACF;;IAGO,KAAK,UAAU,OAAO,OAAO,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC"}

package/dist/do-rpc/test-fixtures/worker.js

@@ -2,7 +2,7 @@
 import { DurableObject } from 'cloudflare:workers';
 import { layerProtocolDurableObject, toDurableObjectHandler } from '@livestore/common-cf';
 import { Effect, HttpEffect, Layer, Option, RpcClient, RpcSerialization, RpcServer, Schedule, Stream, } from '@livestore/utils/effect';
-import { TestRpcs } from "./rpc-schema.js";
+import { TestRpcs } from './rpc-schema.js';
 export class TestRpcDurableObject extends DurableObject {
     __DURABLE_OBJECT_BRAND = 'TestRpcDurableObject';
     async rpc(payload) {

package/dist/mod.js

@@ -1,4 +1,4 @@
-export * from "./do-rpc/mod.js";
-export * from "./helper.js";
-export * from "./ws-rpc/ws-rpc-server.js";
+export * from './do-rpc/mod.js';
+export * from './helper.js';
+export * from './ws-rpc/ws-rpc-server.js';
 //# sourceMappingURL=mod.js.map

package/dist/ws-rpc/test-fixtures/rpc-schema.d.ts

@@ -1,13 +1,5 @@
 import { Rpc, RpcGroup, Schema } from '@livestore/utils/effect';
-declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Ping", Schema.Struct<{
-    readonly message: Schema.String;
-}>, Schema.Struct<{
-    readonly response: Schema.String;
-}>, Schema.Never, never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
-    readonly text: Schema.String;
-}>, Schema.Struct<{
-    readonly echo: Schema.String;
-}>, Schema.Never, never, never> | Rpc.Rpc<"Add", Schema.Struct<{
+declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Add", Schema.Struct<{
     readonly a: Schema.Finite;
     readonly b: Schema.Finite;
 }>, Schema.Struct<{
@@ -16,22 +8,30 @@ declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Ping", Schema.Struct<{
     readonly message: Schema.String;
 }>, Schema.Struct<{
     readonly never: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
+    readonly text: Schema.String;
+}>, Schema.Struct<{
+    readonly echo: Schema.String;
 }>, Schema.Never, never, never> | Rpc.Rpc<"Fail", Schema.Struct<{
     readonly message: Schema.String;
 }>, Schema.Struct<{
     readonly never: Schema.String;
-}>, Schema.String, never, never> | Rpc.Rpc<"Stream", Schema.Struct<{}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Struct<{
+}>, Schema.String, never, never> | Rpc.Rpc<"Ping", Schema.Struct<{
+    readonly message: Schema.String;
+}>, Schema.Struct<{
+    readonly response: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Stream", Schema.Struct<{}>, import("effect/rpc/RpcSchema").Stream<Schema.Struct<{
     readonly maybeNumber: Schema.Option<Schema.Finite>;
-}>, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamError", Schema.Struct<{
-    readonly count: Schema.Finite;
-    readonly errorAfter: Schema.Finite;
-}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.String>, Schema.Never, never, never> | Rpc.Rpc<"StreamDefect", Schema.Struct<{
+}>, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamDefect", Schema.Struct<{
     readonly count: Schema.Finite;
     readonly defectAfter: Schema.Finite;
-}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamInterruptible", Schema.Struct<{
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never> | Rpc.Rpc<"StreamError", Schema.Struct<{
+    readonly count: Schema.Finite;
+    readonly errorAfter: Schema.Finite;
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.String>, Schema.Never, never, never> | Rpc.Rpc<"StreamInterruptible", Schema.Struct<{
     readonly delay: Schema.Finite;
     readonly interruptAfterCount: Schema.Finite;
-}>, import("effect/unstable/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never>>;
+}>, import("effect/rpc/RpcSchema").Stream<Schema.Finite, Schema.Never>, Schema.Never, never, never>>;
 export declare class TestRpcs extends TestRpcs_base {
 }
 export type TestRpcsI = RpcGroup.Rpcs<typeof TestRpcs>;

package/dist/ws-rpc/test-fixtures/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/ws-rpc/test-fixtures/worker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAQlD,MAAM,WAAW,GAAG;IAClB,WAAW,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,CAAA;CAC1D;AAED,qBAAa,oBAAqB,SAAQ,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC;IAC1D,sBAAsB,EAA6B,KAAK,CAAA;gBAErD,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG;IA8ChC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;CAgB1D;;mBAGsB,OAAO,OAAO,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;;AAD5D,wBAeC"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/ws-rpc/test-fixtures/worker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAQlD,MAAM,WAAW,GAAG;IAClB,WAAW,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,CAAA;CAC1D;AAED,qBAAa,oBAAqB,SAAQ,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC;IAC1D,sBAAsB,EAA6B,KAAK,CAAA;IAEjE,YAAY,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,EA4C9C;IAEc,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAexD;CACF;;IAGO,KAAK,UAAU,OAAO,OAAO,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC"}

package/dist/ws-rpc/test-fixtures/worker.js

@@ -1,8 +1,8 @@
 /// <reference types="@cloudflare/workers-types" />
 import { DurableObject } from 'cloudflare:workers';
 import { Effect, Layer, Option, RpcServer, Schedule, Stream } from '@livestore/utils/effect';
-import { setupDurableObjectWebSocketRpc } from "../ws-rpc-server.js";
-import { TestRpcs } from "./rpc-schema.js";
+import { setupDurableObjectWebSocketRpc } from '../ws-rpc-server.js';
+import { TestRpcs } from './rpc-schema.js';
 export class TestRpcDurableObject extends DurableObject {
     __DURABLE_OBJECT_BRAND = 'TestRpcDurableObject';
     constructor(state, env) {

package/dist/ws-rpc/ws-rpc-server.d.ts

@@ -56,6 +56,10 @@ export interface DurableObjectWebSocketRpcConfig {
     rpcLayer: Layer.Layer<never, never, RpcServer.Protocol | WsContext>;
     /** Function to get access to incoming requests */
     onMessage?: (msg: RpcMessage.FromClientEncoded, ws: CfTypes.WebSocket) => void;
+    /** Called after a terminal RPC response has been accepted by the serializer. */
+    onRequestExit?: (requestId: string | number, ws: CfTypes.WebSocket) => void;
+    /** Called after a connection-level RPC defect has been accepted by the serializer. */
+    onProtocolDefect?: (ws: CfTypes.WebSocket) => void;
     mainLayer?: Layer.Layer<never>;
 }
 /**
@@ -118,7 +122,7 @@ export interface DurableObjectWebSocketRpcConfig {
  * @see {@link https://developers.cloudflare.com/durable-objects/best-practices/websockets/ Cloudflare WebSocket Best Practices}
  * @see {@link https://effect-ts.github.io/effect/docs/rpc Effect RPC Documentation}
  */
-export declare const setupDurableObjectWebSocketRpc: ({ doSelf, rpcLayer, webSocketMode, onMessage, mainLayer, }: DurableObjectWebSocketRpcConfig) => {
+export declare const setupDurableObjectWebSocketRpc: ({ doSelf, rpcLayer, webSocketMode, onMessage, onRequestExit, onProtocolDefect, mainLayer, }: DurableObjectWebSocketRpcConfig) => {
     webSocketMessage: (ws: CfTypes.WebSocket, message: string | ArrayBuffer) => void | Promise<void>;
     webSocketClose: (ws: CfTypes.WebSocket, code: number, reason: string, wasClean: boolean) => void | Promise<void>;
 };
@@ -129,6 +133,8 @@ export interface WsRpcServerArgs {
     ws: CfTypes.WebSocket;
     scope: Scope.Scope;
     onMessage?: (message: RpcMessage.FromClientEncoded, ws: CfTypes.WebSocket) => void;
+    onRequestExit?: (requestId: string | number, ws: CfTypes.WebSocket) => void;
+    onProtocolDefect?: (ws: CfTypes.WebSocket) => void;
     /** Queue for receiving incoming messages from the WebSocket */
     incomingQueue: Queue.Queue<Uint8Array | string>;
 }
@@ -146,6 +152,6 @@ export interface WsRpcServerArgs {
  *
  * @internal This is typically used internally by `setupDurableObjectWebSocketRpc`
  */
-export declare const layerRpcServerWebsocket: (args: WsRpcServerArgs) => Layer.Layer<WsContext | RpcServer.Protocol, never, RpcSerialization.RpcSerialization>;
+export declare const layerRpcServerWebsocket: (args: WsRpcServerArgs) => Layer.Layer<RpcServer.Protocol | WsContext, never, RpcSerialization.RpcSerialization>;
 export {};
 //# sourceMappingURL=ws-rpc-server.d.ts.map

package/dist/ws-rpc/ws-rpc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-rpc-server.d.ts","sourceRoot":"","sources":["../../src/ws-rpc/ws-rpc-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EACL,OAAO,EAIP,KAAK,EAEL,KAAK,EAEL,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,KAAK,EAEN,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;;iBAO2B,OAAO,CAAC,SAAS;;AAL1F;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAA6E;CAAG;AAE/G;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,+CAA+C;IAC/C,MAAM,EAAE,OAAO,CAAC,aAAa,CAAA;IAC7B;;;;OAIG;IACH,aAAa,EAAE,WAAW,GAAG,QAAQ,CAAA;IACrC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;IACnE,kDAAkD;IAClD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAC9E,SAAS,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,eAAO,MAAM,8BAA8B,GAAI,4DAM5C,+BAA+B;;;CA0FjC,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,OAAO,CAAC,SAAS,CAAA;IACrB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAA;IAClB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAClF,+DAA+D;IAC/D,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,CAAA;CAChD;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,uBAAuB,GAAI,MAAM,eAAe,0FAI1D,CAAA"}
+{"version":3,"file":"ws-rpc-server.d.ts","sourceRoot":"","sources":["../../src/ws-rpc/ws-rpc-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EACL,OAAO,EAIP,KAAK,EAEL,KAAK,EAEL,UAAU,EACV,gBAAgB,EAChB,SAAS,EAET,KAAK,EAEN,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;;iBAO2B,OAAO,CAAC,SAAS;;AAL1F;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAA6E;CAAG;AAE/G;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,+CAA+C;IAC/C,MAAM,EAAE,OAAO,CAAC,aAAa,CAAA;IAC7B;;;;OAIG;IACH,aAAa,EAAE,WAAW,GAAG,QAAQ,CAAA;IACrC;;;;;;;;;;;;;;OAcG;IACH,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;IACnE,kDAAkD;IAClD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAC9E,gFAAgF;IAChF,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAC3E,sFAAsF;IACtF,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAClD,SAAS,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,eAAO,MAAM,8BAA8B,gGAQxC,+BAA+B;;;CA0FjC,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,OAAO,CAAC,SAAS,CAAA;IACrB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAA;IAClB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAClF,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAC3E,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAClD,+DAA+D;IAC/D,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,CAAA;CAChD;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,uBAAuB,SAAU,eAAe,0FAI1D,CAAA"}

package/dist/ws-rpc/ws-rpc-server.js

@@ -15,7 +15,7 @@
  * @see {@link https://developers.cloudflare.com/durable-objects/best-practices/websockets/ Cloudflare WebSocket Best Practices}
  */
 import { notYetImplemented, omitUndefineds } from '@livestore/utils';
-import { Context, Effect, Function, Exit, Layer, Logger, Queue, References, RpcMessage, RpcSerialization, RpcServer, Scope, Stream, } from '@livestore/utils/effect';
+import { Context, Effect, Function, Exit, Layer, Logger, Queue, References, RpcMessage, RpcSerialization, RpcServer, Schema, Scope, Stream, } from '@livestore/utils/effect';
 /**
  * Context service providing access to the current WebSocket.
  * This is useful for reading WebSocket attachment data (e.g., forwarded headers)
@@ -83,7 +83,7 @@ export class WsContext extends Context.Service()('WsContext') {
  * @see {@link https://developers.cloudflare.com/durable-objects/best-practices/websockets/ Cloudflare WebSocket Best Practices}
  * @see {@link https://effect-ts.github.io/effect/docs/rpc Effect RPC Documentation}
  */
-export const setupDurableObjectWebSocketRpc = ({ doSelf, rpcLayer, webSocketMode, onMessage, mainLayer, }) => {
+export const setupDurableObjectWebSocketRpc = ({ doSelf, rpcLayer, webSocketMode, onMessage, onRequestExit, onProtocolDefect, mainLayer, }) => {
     if (webSocketMode === 'accept') {
         return notYetImplemented(`WebSocket mode 'accept' is not yet implemented`);
     }
@@ -100,7 +100,7 @@ export const setupDurableObjectWebSocketRpc = ({ doSelf, rpcLayer, webSocketMode
             ws,
             scope,
             incomingQueue,
-            ...omitUndefineds({ onMessage }),
+            ...omitUndefineds({ onMessage, onRequestExit, onProtocolDefect }),
         }).pipe(Layer.provide(RpcSerialization.layerJson));
         const ServerLive = rpcLayer.pipe(Layer.provide(ProtocolLive));
         yield* Layer.launch(ServerLive).pipe(Effect.tapCauseLogPretty, Effect.forkIn(scope));
@@ -159,25 +159,49 @@ export const layerRpcServerWebsocket = (args) => Layer.mergeAll(Layer.effect(Rpc
  *
  * @internal Used internally by `layerRpcServerWebsocket`
  */
-const makeSocketProtocol = ({ incomingQueue, scope, ws, onMessage }) => Effect.gen(function* () {
+const makeSocketProtocol = ({ incomingQueue, scope, ws, onMessage, onRequestExit, onProtocolDefect, }) => Effect.gen(function* () {
     const serialization = yield* RpcSerialization.RpcSerialization;
     const disconnects = yield* Queue.unbounded();
-    const writeRaw = (msg) => Effect.succeed(ws.send(msg));
+    const requestIdsWithSchemas = new Set();
+    const interruptedExitEncoded = yield* Schema.encodeUnknownEffect(serialization.codecFor(Schema.Exit(Schema.Void, Schema.Never, Schema.Never)))(Exit.interrupt()).pipe(Effect.orDie);
+    const writeRaw = (msg) => Effect.sync(() => ws.send(msg));
     let writeRequest;
     const parser = serialization.makeUnsafe();
     const id = 0;
-    const write = (response) => {
+    const runLifecycleHook = (name, hook) => Effect.sync(hook).pipe(Effect.catchCause((cause) => Effect.logError(`WebSocket RPC ${name} hook failed`, { cause })));
+    const writeDefect = (defect) => {
+        try {
+            const encoded = parser.encode(RpcMessage.ResponseDefectEncoded(defect));
+            const responseEffect = encoded === undefined ? Effect.void : Effect.orDie(writeRaw(encoded));
+            const onAccepted = Effect.sync(() => requestIdsWithSchemas.clear()).pipe(Effect.andThen(onProtocolDefect !== undefined
+                ? runLifecycleHook('onProtocolDefect', () => onProtocolDefect(ws))
+                : Effect.void));
+            return Effect.ensuring(responseEffect, onAccepted);
+        }
+        catch (cause) {
+            return Effect.die(cause);
+        }
+    };
+    const writeResponse = (response, onAccepted) => {
         try {
             const encoded = parser.encode(response);
-            if (encoded === undefined) {
-                return Effect.void;
-            }
-            return Effect.orDie(writeRaw(encoded));
+            const responseEffect = encoded === undefined ? Effect.void : Effect.orDie(writeRaw(encoded));
+            return onAccepted === undefined ? responseEffect : Effect.ensuring(responseEffect, onAccepted);
         }
         catch (cause) {
-            return Effect.orDie(writeRaw(parser.encode(RpcMessage.ResponseDefectEncoded(cause))));
+            return writeDefect(cause);
         }
     };
+    const writeExit = (requestId, exit) => writeResponse({ _tag: 'Exit', requestId, exit }, Effect.sync(() => requestIdsWithSchemas.delete(requestId)).pipe(Effect.andThen(onRequestExit !== undefined
+        ? runLifecycleHook('onRequestExit', () => onRequestExit(requestId, ws))
+        : Effect.void)));
+    const write = (response) => {
+        if (response._tag === 'Exit')
+            return writeExit(response.requestId, response.exit);
+        if (response._tag === 'Defect')
+            return writeDefect(response.defect);
+        return writeResponse(response);
+    };
     const protocol = yield* RpcServer.Protocol.make((writeRequest_) => {
         writeRequest = writeRequest_;
         // Start processing messages now that writeRequest is available
@@ -191,8 +215,15 @@ const makeSocketProtocol = ({ incomingQueue, scope, ws, onMessage }) => Effect.g
                     while: () => i < decoded.length,
                     body: () => {
                         const request = decoded[i++];
-                        if (onMessage !== undefined) {
+                        if (onMessage !== undefined)
                             onMessage(request, ws);
+                        if (request._tag === 'Request') {
+                            requestIdsWithSchemas.add(request.id);
+                        }
+                        else if (request._tag === 'Interrupt' && requestIdsWithSchemas.has(request.requestId) === false) {
+                            // Effect creates this Exit for an unknown request, but its encoder drops it when hibernation has
+                            // discarded the request schema.
+                            return writeExit(request.requestId, interruptedExitEncoded);
                         }
                         return writeRequest(id, request);
                     },
@@ -200,7 +231,7 @@ const makeSocketProtocol = ({ incomingQueue, scope, ws, onMessage }) => Effect.g
                 });
             }
             catch (cause) {
-                return Effect.orDie(writeRaw(parser.encode(RpcMessage.ResponseDefectEncoded(cause))));
+                return writeDefect(cause);
             }
         }), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkIn(scope));
         // Start the message processing
@@ -217,6 +248,7 @@ const makeSocketProtocol = ({ incomingQueue, scope, ws, onMessage }) => Effect.g
             supportsTransferables: false,
             supportsSpanPropagation: true,
             supportsNotifications: true,
+            codecFor: serialization.codecFor,
         }));
     });
     return protocol;