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

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

@@ -1,37 +1,37 @@
 import { Rpc, RpcGroup, Schema } from '@livestore/utils/effect';
-declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Ping", Schema.Struct<{
-    message: typeof Schema.String;
+declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Add", Schema.Struct<{
+    readonly a: Schema.Finite;
+    readonly b: Schema.Finite;
 }>, Schema.Struct<{
-    response: typeof Schema.String;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
-    text: typeof Schema.String;
+    readonly result: Schema.Finite;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Defect", Schema.Struct<{
+    readonly message: Schema.String;
 }>, Schema.Struct<{
-    echo: typeof Schema.String;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Add", Schema.Struct<{
-    a: typeof Schema.Number;
-    b: typeof Schema.Number;
+    readonly never: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
+    readonly text: Schema.String;
 }>, Schema.Struct<{
-    result: typeof Schema.Number;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Defect", Schema.Struct<{
-    message: typeof Schema.String;
+    readonly echo: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Fail", Schema.Struct<{
+    readonly message: Schema.String;
 }>, Schema.Struct<{
-    never: typeof Schema.String;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Fail", Schema.Struct<{
-    message: typeof Schema.String;
+    readonly never: Schema.String;
+}>, Schema.String, never, never> | Rpc.Rpc<"Ping", Schema.Struct<{
+    readonly message: Schema.String;
 }>, Schema.Struct<{
-    never: typeof Schema.String;
-}>, typeof Schema.String, never> | Rpc.Rpc<"Stream", Schema.Struct<{}>, import("@effect/rpc/RpcSchema").Stream<Schema.Struct<{
-    maybeNumber: Schema.Option<typeof Schema.Number>;
-}>, typeof Schema.Never>, typeof Schema.Never, never> | Rpc.Rpc<"StreamError", Schema.Struct<{
-    count: typeof Schema.Number;
-    errorAfter: typeof Schema.Number;
-}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.String>, typeof Schema.Never, never> | Rpc.Rpc<"StreamDefect", Schema.Struct<{
-    count: typeof Schema.Number;
-    defectAfter: typeof Schema.Number;
-}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.Never>, typeof Schema.Never, never> | Rpc.Rpc<"StreamInterruptible", Schema.Struct<{
-    delay: typeof Schema.Number;
-    interruptAfterCount: typeof Schema.Number;
-}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.Never>, typeof Schema.Never, never> | Rpc.Rpc<"StreamBugScenarioDoServer", Schema.Struct<{}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.Never>, typeof Schema.Never, never> | Rpc.Rpc<"StreamBugScenarioDoClient", Schema.Struct<{}>, typeof Schema.Number, typeof Schema.Never, never>>;
+    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<"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/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/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/rpc-schema.js

@@ -6,8 +6,8 @@ export class TestRpcs extends RpcGroup.make(Rpc.make('Ping', {
     payload: Schema.Struct({ text: Schema.String }),
     success: Schema.Struct({ echo: Schema.String }),
 }), Rpc.make('Add', {
-    payload: Schema.Struct({ a: Schema.Number, b: Schema.Number }),
-    success: Schema.Struct({ result: Schema.Number }),
+    payload: Schema.Struct({ a: Schema.Finite, b: Schema.Finite }),
+    success: Schema.Struct({ result: Schema.Finite }),
 }), Rpc.make('Defect', {
     payload: Schema.Struct({ message: Schema.String }),
     success: Schema.Struct({ never: Schema.String }),
@@ -18,29 +18,29 @@ export class TestRpcs extends RpcGroup.make(Rpc.make('Ping', {
 }), Rpc.make('Stream', {
     payload: Schema.Struct({}),
     success: Schema.Struct({
-        maybeNumber: Schema.Option(Schema.Number),
+        maybeNumber: Schema.Option(Schema.Finite),
     }),
     stream: true,
 }), Rpc.make('StreamError', {
-    payload: Schema.Struct({ count: Schema.Number, errorAfter: Schema.Number }),
-    success: Schema.Number,
+    payload: Schema.Struct({ count: Schema.Finite, errorAfter: Schema.Finite }),
+    success: Schema.Finite,
     error: Schema.String,
     stream: true,
 }), Rpc.make('StreamDefect', {
-    payload: Schema.Struct({ count: Schema.Number, defectAfter: Schema.Number }),
-    success: Schema.Number,
+    payload: Schema.Struct({ count: Schema.Finite, defectAfter: Schema.Finite }),
+    success: Schema.Finite,
     stream: true,
 }), Rpc.make('StreamInterruptible', {
-    payload: Schema.Struct({ delay: Schema.Number, interruptAfterCount: Schema.Number }),
-    success: Schema.Number,
+    payload: Schema.Struct({ delay: Schema.Finite, interruptAfterCount: Schema.Finite }),
+    success: Schema.Finite,
     stream: true,
 }), Rpc.make('StreamBugScenarioDoServer', {
     payload: Schema.Struct({}),
-    success: Schema.Number,
+    success: Schema.Finite,
     stream: true,
 }), Rpc.make('StreamBugScenarioDoClient', {
     payload: Schema.Struct({}),
-    success: Schema.Number,
+    success: Schema.Finite,
 })) {
 }
 //# sourceMappingURL=rpc-schema.js.map

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,wBA0EC"}
+{"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

@@ -1,8 +1,8 @@
 /// <reference types="@cloudflare/workers-types" />
 import { DurableObject } from 'cloudflare:workers';
 import { layerProtocolDurableObject, toDurableObjectHandler } from '@livestore/common-cf';
-import { Effect, HttpApp, Layer, Option, RpcClient, RpcSerialization, RpcServer, Schedule, Stream, } from '@livestore/utils/effect';
-import { TestRpcs } from "./rpc-schema.js";
+import { Effect, HttpEffect, Layer, Option, RpcClient, RpcSerialization, RpcServer, Schedule, Stream, } from '@livestore/utils/effect';
+import { TestRpcs } from './rpc-schema.js';
 export class TestRpcDurableObject extends DurableObject {
     __DURABLE_OBJECT_BRAND = 'TestRpcDurableObject';
     async rpc(payload) {
@@ -32,7 +32,7 @@ export default {
         try {
             const url = new URL(request.url);
             // Handle HTTP RPC endpoint
-            if (url.pathname === '/rpc') {
+            if (url.pathname === '/rpc/') {
                 // Get the test server DO instance
                 const doId = env.TEST_RPC_DO.idFromName('test-server');
                 const serverDO = env.TEST_RPC_DO.get(doId);
@@ -56,16 +56,16 @@ export default {
                         StreamBugScenarioDoServer: () => Stream.die('never called'),
                         StreamBugScenarioDoClient: (msg) => doRpcClient.StreamBugScenarioDoServer(msg).pipe(Stream.tap(() => Effect.fail('doh')), 
                         // observed behaviour: `log1` is still logged
-                        Stream.tapErrorCause((cause) => Effect.log('log1', cause)), Stream.mapError((cause) => cause.toString()), 
+                        Stream.tapCause((cause) => Effect.log('log1', cause)), Stream.mapError((cause) => cause.toString()), 
                         // observed behaviour: after this error mapping `log2` is never logged
-                        Stream.tapErrorCause((cause) => Effect.log('log2', cause)), Stream.tapLogWithLabel('stream'), Stream.runCount, Effect.orDie, 
+                        Stream.tapCause((cause) => Effect.log('log2', cause)), Stream.tapLogWithLabel('stream'), Stream.runCount, Effect.orDie, 
                         // observed behaviour: `log3` is also never logged
-                        Effect.tapErrorCause((cause) => Effect.log('log3', cause))),
-                    }).pipe(Layer.provideMerge(RpcServer.layerProtocolHttp({ path: '/rpc' })), Layer.provideMerge(RpcSerialization.layerJson));
-                    // Create the HTTP RPC app
-                    const httpApp = RpcServer.toHttpApp(TestRpcs).pipe(Effect.provide(handlersLayer));
+                        Effect.tapCause((cause) => Effect.log('log3', cause))),
+                    }).pipe(Layer.provideMerge(RpcSerialization.layerJson));
+                    // Create the HTTP RPC effect
+                    const httpEffect = yield* RpcServer.toHttpEffect(TestRpcs).pipe(Effect.provide(handlersLayer));
                     // Run the app and convert to web handler
-                    const webHandler = yield* httpApp.pipe(Effect.map(HttpApp.toWebHandler));
+                    const webHandler = HttpEffect.toWebHandler(httpEffect);
                     return yield* Effect.promise(() => webHandler(request));
                 }).pipe(Effect.tapCauseLogPretty, Effect.scoped, Effect.withSpan('@livestore/common-cf/do-rpc/test-fixtures/worker:fetch'), 
                 // Effect.provide(ProtocolLive),

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

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

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,37 +1,37 @@
 import { Rpc, RpcGroup, Schema } from '@livestore/utils/effect';
-declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Ping", Schema.Struct<{
-    message: typeof Schema.String;
+declare const TestRpcs_base: RpcGroup.RpcGroup<Rpc.Rpc<"Add", Schema.Struct<{
+    readonly a: Schema.Finite;
+    readonly b: Schema.Finite;
 }>, Schema.Struct<{
-    response: typeof Schema.String;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
-    text: typeof Schema.String;
+    readonly result: Schema.Finite;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Defect", Schema.Struct<{
+    readonly message: Schema.String;
 }>, Schema.Struct<{
-    echo: typeof Schema.String;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Add", Schema.Struct<{
-    a: typeof Schema.Number;
-    b: typeof Schema.Number;
+    readonly never: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Echo", Schema.Struct<{
+    readonly text: Schema.String;
 }>, Schema.Struct<{
-    result: typeof Schema.Number;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Defect", Schema.Struct<{
-    message: typeof Schema.String;
+    readonly echo: Schema.String;
+}>, Schema.Never, never, never> | Rpc.Rpc<"Fail", Schema.Struct<{
+    readonly message: Schema.String;
 }>, Schema.Struct<{
-    never: typeof Schema.String;
-}>, typeof Schema.Never, never> | Rpc.Rpc<"Fail", Schema.Struct<{
-    message: typeof Schema.String;
+    readonly never: Schema.String;
+}>, Schema.String, never, never> | Rpc.Rpc<"Ping", Schema.Struct<{
+    readonly message: Schema.String;
 }>, Schema.Struct<{
-    never: typeof Schema.String;
-}>, typeof Schema.String, never> | Rpc.Rpc<"Stream", Schema.Struct<{}>, import("@effect/rpc/RpcSchema").Stream<Schema.Struct<{
-    maybeNumber: Schema.Option<typeof Schema.Number>;
-}>, typeof Schema.Never>, typeof Schema.Never, never> | Rpc.Rpc<"StreamError", Schema.Struct<{
-    count: typeof Schema.Number;
-    errorAfter: typeof Schema.Number;
-}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.String>, typeof Schema.Never, never> | Rpc.Rpc<"StreamDefect", Schema.Struct<{
-    count: typeof Schema.Number;
-    defectAfter: typeof Schema.Number;
-}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.Never>, typeof Schema.Never, never> | Rpc.Rpc<"StreamInterruptible", Schema.Struct<{
-    delay: typeof Schema.Number;
-    interruptAfterCount: typeof Schema.Number;
-}>, import("@effect/rpc/RpcSchema").Stream<typeof Schema.Number, typeof Schema.Never>, typeof Schema.Never, never>>;
+    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<"StreamDefect", Schema.Struct<{
+    readonly count: Schema.Finite;
+    readonly defectAfter: Schema.Finite;
+}>, 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/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/rpc-schema.js

@@ -6,8 +6,8 @@ export class TestRpcs extends RpcGroup.make(Rpc.make('Ping', {
     payload: Schema.Struct({ text: Schema.String }),
     success: Schema.Struct({ echo: Schema.String }),
 }), Rpc.make('Add', {
-    payload: Schema.Struct({ a: Schema.Number, b: Schema.Number }),
-    success: Schema.Struct({ result: Schema.Number }),
+    payload: Schema.Struct({ a: Schema.Finite, b: Schema.Finite }),
+    success: Schema.Struct({ result: Schema.Finite }),
 }), Rpc.make('Defect', {
     payload: Schema.Struct({ message: Schema.String }),
     success: Schema.Struct({ never: Schema.String }),
@@ -18,21 +18,21 @@ export class TestRpcs extends RpcGroup.make(Rpc.make('Ping', {
 }), Rpc.make('Stream', {
     payload: Schema.Struct({}),
     success: Schema.Struct({
-        maybeNumber: Schema.Option(Schema.Number),
+        maybeNumber: Schema.Option(Schema.Finite),
     }),
     stream: true,
 }), Rpc.make('StreamError', {
-    payload: Schema.Struct({ count: Schema.Number, errorAfter: Schema.Number }),
-    success: Schema.Number,
+    payload: Schema.Struct({ count: Schema.Finite, errorAfter: Schema.Finite }),
+    success: Schema.Finite,
     error: Schema.String,
     stream: true,
 }), Rpc.make('StreamDefect', {
-    payload: Schema.Struct({ count: Schema.Number, defectAfter: Schema.Number }),
-    success: Schema.Number,
+    payload: Schema.Struct({ count: Schema.Finite, defectAfter: Schema.Finite }),
+    success: Schema.Finite,
     stream: true,
 }), Rpc.make('StreamInterruptible', {
-    payload: Schema.Struct({ delay: Schema.Number, interruptAfterCount: Schema.Number }),
-    success: Schema.Number,
+    payload: Schema.Struct({ delay: Schema.Finite, interruptAfterCount: Schema.Finite }),
+    success: Schema.Finite,
     stream: true,
 })) {
 }

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

@@ -14,9 +14,9 @@
  *
  * @see {@link https://developers.cloudflare.com/durable-objects/best-practices/websockets/ Cloudflare WebSocket Best Practices}
  */
-import { Context, Layer, Mailbox, RpcMessage, RpcSerialization, RpcServer } from '@livestore/utils/effect';
+import { Context, Layer, Queue, RpcMessage, RpcSerialization, RpcServer, Scope } from '@livestore/utils/effect';
 import type * as CfTypes from '../cf-types.ts';
-declare const WsContext_base: Context.TagClass<WsContext, "WsContext", {
+declare const WsContext_base: Context.ServiceClass<WsContext, "WsContext", {
     readonly ws: CfTypes.WebSocket;
 }>;
 /**
@@ -40,7 +40,7 @@ export interface DurableObjectWebSocketRpcConfig {
     webSocketMode: 'hibernate' | 'accept';
     /**
      * Effect RPC layer that requires `RpcServer.Protocol` (and `WsContext` if used)
-     * and provides the RPC server runtime.
+     * and provides the RPC server services.
      *
      * This is typically created by:
      * ```typescript
@@ -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>;
 };
@@ -127,9 +131,12 @@ export declare const setupDurableObjectWebSocketRpc: ({ doSelf, rpcLayer, webSoc
  */
 export interface WsRpcServerArgs {
     ws: CfTypes.WebSocket;
+    scope: Scope.Scope;
     onMessage?: (message: RpcMessage.FromClientEncoded, ws: CfTypes.WebSocket) => void;
-    /** Mailbox queue for receiving incoming messages from the WebSocket */
-    incomingQueue: Mailbox.Mailbox<Uint8Array | string>;
+    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>;
 }
 /**
  * Creates an RPC server protocol layer for WebSocket communication.
@@ -145,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,EAGL,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,SAAS,EAGV,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;;iBAOoC,OAAO,CAAC,SAAS;;AALnG;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAyE;CAAG;AAE3G;;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;;;CAsFjC,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,OAAO,CAAC,SAAS,CAAA;IACrB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAA;IAClF,uEAAuE;IACvE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,CAAA;CACpD;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,uBAAuB,GAAI,MAAM,eAAe,0FAC0D,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,13 +15,13 @@
  * @see {@link https://developers.cloudflare.com/durable-objects/best-practices/websockets/ Cloudflare WebSocket Best Practices}
  */
 import { notYetImplemented, omitUndefineds } from '@livestore/utils';
-import { Context, constVoid, Effect, Exit, Layer, Logger, LogLevel, Mailbox, 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)
  * inside RPC handlers.
  */
-export class WsContext extends Context.Tag('WsContext')() {
+export class WsContext extends Context.Service()('WsContext') {
 }
 /**
  * Sets up WebSocket RPC functionality on a Cloudflare Durable Object with hibernation support.
@@ -83,7 +83,7 @@ export class WsContext extends Context.Tag('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`);
     }
@@ -94,26 +94,25 @@ export const setupDurableObjectWebSocketRpc = ({ doSelf, rpcLayer, webSocketMode
         }
         yield* Effect.logDebug(`Launching WebSocket Effect RPC server`);
         const scope = yield* Scope.make();
-        const incomingQueue = yield* Mailbox.make();
-        yield* Scope.addFinalizer(scope, incomingQueue.shutdown);
+        const incomingQueue = yield* Queue.unbounded();
+        yield* Scope.addFinalizer(scope, Queue.shutdown(incomingQueue).pipe(Effect.asVoid));
         const ProtocolLive = layerRpcServerWebsocket({
             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));
-        const runtime = yield* Effect.runtime();
+        const services = yield* Effect.context();
         const ctx = {
             scope,
-            onMessage: (message) => incomingQueue
-                .offer(message)
-                .pipe(Effect.asVoid, Effect.withSpan('ws-rpc-server/onMessage', { root: true }), Effect.provide(runtime), Effect.runPromise),
+            onMessage: (message) => Queue.offer(incomingQueue, message).pipe(Effect.asVoid, Effect.withSpan('ws-rpc-server/onMessage', { root: true }), Effect.runPromiseWith(services)),
         };
         serverCtxMap.set(ws, ctx);
         return ctx;
-    }).pipe(Effect.tapCauseLogPretty, Logger.withMinimumLogLevel(LogLevel.Debug), // Useful for debugging
-    Effect.provide(Layer.mergeAll(Logger.consoleWithThread('ws-rpc-server'), mainLayer ?? Layer.empty)), Effect.withSpan('effect-ws-rpc-server'), Effect.runPromise);
+    }).pipe(Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: 'ws-rpc-server' }), Effect.provide(Layer.mergeAll(Logger.layer([Logger.consoleStructured]), Layer.succeed(References.MinimumLogLevel, 'Debug'), // Useful for debugging
+    mainLayer ?? Layer.empty)), Effect.withSpan('effect-ws-rpc-server'), Effect.runPromise);
     const webSocketMessage = async (ws, message) => {
         // console.log('webSocketMessage', message, serverCtxMap.has(ws))
         const { onMessage } = await launchServer(ws);
@@ -148,7 +147,7 @@ export const setupDurableObjectWebSocketRpc = ({ doSelf, rpcLayer, webSocketMode
  *
  * @internal This is typically used internally by `setupDurableObjectWebSocketRpc`
  */
-export const layerRpcServerWebsocket = (args) => Layer.mergeAll(Layer.scoped(RpcServer.Protocol, makeSocketProtocol(args)), Layer.succeed(WsContext, { ws: args.ws }));
+export const layerRpcServerWebsocket = (args) => Layer.mergeAll(Layer.effect(RpcServer.Protocol, makeSocketProtocol(args)), Layer.succeed(WsContext, WsContext.of({ ws: args.ws })));
 /**
  * Creates the low-level RPC protocol implementation for WebSocket communication.
  *
@@ -160,29 +159,53 @@ export const layerRpcServerWebsocket = (args) => Layer.mergeAll(Layer.scoped(Rpc
  *
  * @internal Used internally by `layerRpcServerWebsocket`
  */
-const makeSocketProtocol = ({ incomingQueue, ws, onMessage }) => Effect.gen(function* () {
+const makeSocketProtocol = ({ incomingQueue, scope, ws, onMessage, onRequestExit, onProtocolDefect, }) => Effect.gen(function* () {
     const serialization = yield* RpcSerialization.RpcSerialization;
-    const disconnects = yield* Mailbox.make();
-    const writeRaw = (msg) => Effect.succeed(ws.send(msg));
+    const disconnects = yield* Queue.unbounded();
+    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.unsafeMake();
+    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
-        const startProcessing = Mailbox.toStream(incomingQueue).pipe(Stream.tap((data) => {
+        const startProcessing = Stream.fromQueue(incomingQueue).pipe(Stream.tap((data) => {
             try {
                 const decoded = parser.decode(data);
                 if (decoded.length === 0)
@@ -192,18 +215,25 @@ const makeSocketProtocol = ({ incomingQueue, ws, onMessage }) => Effect.gen(func
                     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);
                     },
-                    step: constVoid,
+                    step: Function.constVoid,
                 });
             }
             catch (cause) {
-                return Effect.orDie(writeRaw(parser.encode(RpcMessage.ResponseDefectEncoded(cause))));
+                return writeDefect(cause);
             }
-        }), Stream.runDrain, Effect.tapCauseLogPretty, Effect.fork);
+        }), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkIn(scope));
         // Start the message processing
         return Effect.map(startProcessing, () => ({
             disconnects,
@@ -217,6 +247,8 @@ const makeSocketProtocol = ({ incomingQueue, ws, onMessage }) => Effect.gen(func
             supportsAck: true,
             supportsTransferables: false,
             supportsSpanPropagation: true,
+            supportsNotifications: true,
+            codecFor: serialization.codecFor,
         }));
     });
     return protocol;