@livestore/sync-cf 0.3.0-dev.4 → 0.3.0-dev.41

package/dist/cf-worker/mod.d.ts

@@ -0,0 +1,3 @@
+export * from './durable-object.js';
+export * from './worker.js';
+//# sourceMappingURL=mod.d.ts.map

package/dist/cf-worker/mod.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/cf-worker/mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA"}

package/dist/cf-worker/mod.js

@@ -0,0 +1,3 @@
+export * from './durable-object.js';
+export * from './worker.js';
+//# sourceMappingURL=mod.js.map

package/dist/cf-worker/mod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/cf-worker/mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA"}

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

@@ -0,0 +1,12 @@
+import type { Schema } from '@livestore/utils/effect';
+import type { Env } from './durable-object.js';
+export type CFWorker = {
+    fetch: (request: Request, env: Env, ctx: ExecutionContext) => Promise<Response>;
+};
+export type MakeWorkerOptions = {
+    validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>;
+    /** @default false */
+    enableCORS?: boolean;
+};
+export declare const makeWorker: (options?: MakeWorkerOptions) => CFWorker;
+//# sourceMappingURL=worker.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAE9C,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CAChF,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjF,qBAAqB;IACrB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,UAAS,iBAAsB,KAAG,QAmE5D,CAAA"}

package/dist/cf-worker/worker.js

@@ -0,0 +1,58 @@
+import { UnexpectedError } from '@livestore/common';
+import { Effect, UrlParams } from '@livestore/utils/effect';
+import { SearchParamsSchema } from '../common/mod.js';
+export const makeWorker = (options = {}) => {
+    return {
+        fetch: async (request, env, _ctx) => Effect.gen(function* () {
+            const url = new URL(request.url);
+            const urlParams = UrlParams.fromInput(url.searchParams);
+            const paramsResult = yield* UrlParams.schemaStruct(SearchParamsSchema)(urlParams).pipe(Effect.either);
+            const corsHeaders = options.enableCORS
+                ? {
+                    'Access-Control-Allow-Origin': '*',
+                    'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
+                    'Access-Control-Allow-Headers': request.headers.get('Access-Control-Request-Headers') ?? '*',
+                }
+                : {};
+            if (request.method === 'OPTIONS' && options.enableCORS) {
+                return new Response(null, {
+                    status: 204,
+                    headers: corsHeaders,
+                });
+            }
+            if (paramsResult._tag === 'Left') {
+                return new Response(`Invalid search params: ${paramsResult.left.toString()}`, {
+                    status: 500,
+                    headers: corsHeaders,
+                });
+            }
+            const { storeId, payload } = paramsResult.right;
+            if (options.validatePayload !== undefined) {
+                const result = yield* Effect.promise(async () => options.validatePayload(payload)).pipe(UnexpectedError.mapToUnexpectedError, Effect.either);
+                if (result._tag === 'Left') {
+                    console.error('Invalid payload', result.left);
+                    return new Response(result.left.toString(), { status: 400, headers: corsHeaders });
+                }
+            }
+            const id = env.WEBSOCKET_SERVER.idFromName(storeId);
+            const durableObject = env.WEBSOCKET_SERVER.get(id);
+            if (url.pathname.endsWith('/websocket')) {
+                const upgradeHeader = request.headers.get('Upgrade');
+                if (!upgradeHeader || upgradeHeader !== 'websocket') {
+                    return new Response('Durable Object expected Upgrade: websocket', { status: 426, headers: corsHeaders });
+                }
+                return durableObject.fetch(request);
+            }
+            console.error('Invalid path', url.pathname);
+            return new Response(null, {
+                status: 400,
+                statusText: 'Bad Request',
+                headers: {
+                    ...corsHeaders,
+                    'Content-Type': 'text/plain',
+                },
+            });
+        }).pipe(Effect.tapCauseLogPretty, Effect.runPromise),
+    };
+};
+//# sourceMappingURL=worker.js.map

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

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

package/dist/common/mod.d.ts

@@ -0,0 +1,7 @@
+import { Schema } from '@livestore/utils/effect';
+export * as WSMessage from './ws-message-types.js';
+export declare const SearchParamsSchema: Schema.Struct<{
+    storeId: typeof Schema.String;
+    payload: Schema.UndefinedOr<Schema.transform<Schema.transformOrFail<Schema.SchemaClass<string, string, never>, typeof Schema.String, never>, Schema.transform<Schema.SchemaClass<unknown, string, never>, Schema.Schema<Schema.JsonValue, Schema.JsonValue, never>>>>;
+}>;
+//# sourceMappingURL=mod.d.ts.map

package/dist/common/mod.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAElD,eAAO,MAAM,kBAAkB;;;EAG7B,CAAA"}

package/dist/common/mod.js

@@ -0,0 +1,7 @@
+import { Schema } from '@livestore/utils/effect';
+export * as WSMessage from './ws-message-types.js';
+export const SearchParamsSchema = Schema.Struct({
+    storeId: Schema.String,
+    payload: Schema.compose(Schema.StringFromUriComponent, Schema.parseJson(Schema.JsonValue)).pipe(Schema.UndefinedOr),
+});
+//# sourceMappingURL=mod.js.map

package/dist/common/mod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;CACpH,CAAC,CAAA"}

package/dist/common/ws-message-types.d.ts

@@ -1,5 +1,7 @@
 import { Schema } from '@livestore/utils/effect';
-export declare const PullReq: Schema.TaggedStruct<"WSMessage.PullReq", {
+export declare const PullReq: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PullReq">;
+} & {
     requestId: typeof Schema.String;
     /** Omitting the cursor will start from the beginning */
     cursor: Schema.optional<typeof Schema.Number>;
@@ -10,243 +12,172 @@ export declare const SyncMetadata: Schema.Struct<{
     createdAt: typeof Schema.String;
 }>;
 export type SyncMetadata = typeof SyncMetadata.Type;
-export declare const PullRes: Schema.TaggedStruct<"WSMessage.PullRes", {
-    requestId: typeof Schema.String;
-    events: Schema.Array$<Schema.Struct<{
-        mutationEventEncoded: Schema.SchemaClass<{
-            readonly id: {
-                readonly global: number;
-                readonly local: number;
-            };
-            readonly mutation: string;
-            readonly args: any;
-            readonly parentId: {
-                readonly global: number;
-                readonly local: number;
-            };
-        }, {
-            readonly id: {
-                readonly global: number;
-                readonly local: number;
-            };
-            readonly mutation: string;
-            readonly args: any;
-            readonly parentId: {
-                readonly global: number;
-                readonly local: number;
-            };
-        }, never>;
+export declare const PullRes: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PullRes">;
+} & {
+    batch: Schema.Array$<Schema.Struct<{
+        eventEncoded: Schema.Struct<{
+            name: typeof Schema.String;
+            args: typeof Schema.Any;
+            id: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+            parentId: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+            clientId: typeof Schema.String;
+            sessionId: typeof Schema.String;
+        }>;
         metadata: Schema.Option<Schema.Struct<{
             /** ISO date format */
             createdAt: typeof Schema.String;
         }>>;
     }>>;
+    requestId: Schema.Struct<{
+        context: Schema.Literal<["pull", "push"]>;
+        requestId: typeof Schema.String;
+    }>;
     remaining: typeof Schema.Number;
 }>;
 export type PullRes = typeof PullRes.Type;
-export declare const PushBroadcast: Schema.TaggedStruct<"WSMessage.PushBroadcast", {
-    mutationEventEncoded: Schema.SchemaClass<{
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, {
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, never>;
-    metadata: Schema.Option<Schema.Struct<{
-        /** ISO date format */
-        createdAt: typeof Schema.String;
-    }>>;
-}>;
-export type PushBroadcast = typeof PushBroadcast.Type;
-export declare const PushReq: Schema.TaggedStruct<"WSMessage.PushReq", {
+export declare const PushReq: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushReq">;
+} & {
     requestId: typeof Schema.String;
-    batch: Schema.Array$<Schema.SchemaClass<{
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, {
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, never>>;
+    batch: Schema.Array$<Schema.Struct<{
+        name: typeof Schema.String;
+        args: typeof Schema.Any;
+        id: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        parentId: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
 }>;
 export type PushReq = typeof PushReq.Type;
-export declare const PushAck: Schema.TaggedStruct<"WSMessage.PushAck", {
+export declare const PushAck: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushAck">;
+} & {
     requestId: typeof Schema.String;
-    mutationId: typeof Schema.Number;
 }>;
 export type PushAck = typeof PushAck.Type;
-export declare const Error: Schema.TaggedStruct<"WSMessage.Error", {
+export declare const Error: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Error">;
+} & {
     requestId: typeof Schema.String;
     message: typeof Schema.String;
 }>;
-export declare const Ping: Schema.TaggedStruct<"WSMessage.Ping", {
+export type Error = typeof Error.Type;
+export declare const Ping: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Ping">;
+} & {
     requestId: Schema.Literal<["ping"]>;
 }>;
 export type Ping = typeof Ping.Type;
-export declare const Pong: Schema.TaggedStruct<"WSMessage.Pong", {
+export declare const Pong: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Pong">;
+} & {
     requestId: Schema.Literal<["ping"]>;
 }>;
 export type Pong = typeof Pong.Type;
-export declare const AdminResetRoomReq: Schema.TaggedStruct<"WSMessage.AdminResetRoomReq", {
+export declare const AdminResetRoomReq: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminResetRoomReq">;
+} & {
     requestId: typeof Schema.String;
     adminSecret: typeof Schema.String;
 }>;
 export type AdminResetRoomReq = typeof AdminResetRoomReq.Type;
-export declare const AdminResetRoomRes: Schema.TaggedStruct<"WSMessage.AdminResetRoomRes", {
+export declare const AdminResetRoomRes: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminResetRoomRes">;
+} & {
     requestId: typeof Schema.String;
 }>;
 export type AdminResetRoomRes = typeof AdminResetRoomRes.Type;
-export declare const AdminInfoReq: Schema.TaggedStruct<"WSMessage.AdminInfoReq", {
+export declare const AdminInfoReq: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminInfoReq">;
+} & {
     requestId: typeof Schema.String;
     adminSecret: typeof Schema.String;
 }>;
 export type AdminInfoReq = typeof AdminInfoReq.Type;
-export declare const AdminInfoRes: Schema.TaggedStruct<"WSMessage.AdminInfoRes", {
+export declare const AdminInfoRes: Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminInfoRes">;
+} & {
     requestId: typeof Schema.String;
     info: Schema.Struct<{
         durableObjectId: typeof Schema.String;
     }>;
 }>;
 export type AdminInfoRes = typeof AdminInfoRes.Type;
-export declare const Message: Schema.Union<[Schema.TaggedStruct<"WSMessage.PullReq", {
+export declare const Message: Schema.Union<[Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PullReq">;
+} & {
     requestId: typeof Schema.String;
     /** Omitting the cursor will start from the beginning */
     cursor: Schema.optional<typeof Schema.Number>;
-}>, Schema.TaggedStruct<"WSMessage.PullRes", {
-    requestId: typeof Schema.String;
-    events: Schema.Array$<Schema.Struct<{
-        mutationEventEncoded: Schema.SchemaClass<{
-            readonly id: {
-                readonly global: number;
-                readonly local: number;
-            };
-            readonly mutation: string;
-            readonly args: any;
-            readonly parentId: {
-                readonly global: number;
-                readonly local: number;
-            };
-        }, {
-            readonly id: {
-                readonly global: number;
-                readonly local: number;
-            };
-            readonly mutation: string;
-            readonly args: any;
-            readonly parentId: {
-                readonly global: number;
-                readonly local: number;
-            };
-        }, never>;
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PullRes">;
+} & {
+    batch: Schema.Array$<Schema.Struct<{
+        eventEncoded: Schema.Struct<{
+            name: typeof Schema.String;
+            args: typeof Schema.Any;
+            id: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+            parentId: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+            clientId: typeof Schema.String;
+            sessionId: typeof Schema.String;
+        }>;
         metadata: Schema.Option<Schema.Struct<{
             /** ISO date format */
             createdAt: typeof Schema.String;
         }>>;
     }>>;
+    requestId: Schema.Struct<{
+        context: Schema.Literal<["pull", "push"]>;
+        requestId: typeof Schema.String;
+    }>;
     remaining: typeof Schema.Number;
-}>, Schema.TaggedStruct<"WSMessage.PushBroadcast", {
-    mutationEventEncoded: Schema.SchemaClass<{
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, {
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, never>;
-    metadata: Schema.Option<Schema.Struct<{
-        /** ISO date format */
-        createdAt: typeof Schema.String;
-    }>>;
-}>, Schema.TaggedStruct<"WSMessage.PushReq", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushReq">;
+} & {
     requestId: typeof Schema.String;
-    batch: Schema.Array$<Schema.SchemaClass<{
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, {
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, never>>;
-}>, Schema.TaggedStruct<"WSMessage.PushAck", {
+    batch: Schema.Array$<Schema.Struct<{
+        name: typeof Schema.String;
+        args: typeof Schema.Any;
+        id: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        parentId: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushAck">;
+} & {
     requestId: typeof Schema.String;
-    mutationId: typeof Schema.Number;
-}>, Schema.TaggedStruct<"WSMessage.Error", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Error">;
+} & {
     requestId: typeof Schema.String;
     message: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.Ping", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Ping">;
+} & {
     requestId: Schema.Literal<["ping"]>;
-}>, Schema.TaggedStruct<"WSMessage.Pong", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Pong">;
+} & {
     requestId: Schema.Literal<["ping"]>;
-}>, Schema.TaggedStruct<"WSMessage.AdminResetRoomReq", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminResetRoomReq">;
+} & {
     requestId: typeof Schema.String;
     adminSecret: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.AdminResetRoomRes", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminResetRoomRes">;
+} & {
     requestId: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.AdminInfoReq", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminInfoReq">;
+} & {
     requestId: typeof Schema.String;
     adminSecret: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.AdminInfoRes", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminInfoRes">;
+} & {
     requestId: typeof Schema.String;
     info: Schema.Struct<{
         durableObjectId: typeof Schema.String;
@@ -254,119 +185,85 @@ export declare const Message: Schema.Union<[Schema.TaggedStruct<"WSMessage.PullR
 }>]>;
 export type Message = typeof Message.Type;
 export type MessageEncoded = typeof Message.Encoded;
-export declare const BackendToClientMessage: Schema.Union<[Schema.TaggedStruct<"WSMessage.PullRes", {
-    requestId: typeof Schema.String;
-    events: Schema.Array$<Schema.Struct<{
-        mutationEventEncoded: Schema.SchemaClass<{
-            readonly id: {
-                readonly global: number;
-                readonly local: number;
-            };
-            readonly mutation: string;
-            readonly args: any;
-            readonly parentId: {
-                readonly global: number;
-                readonly local: number;
-            };
-        }, {
-            readonly id: {
-                readonly global: number;
-                readonly local: number;
-            };
-            readonly mutation: string;
-            readonly args: any;
-            readonly parentId: {
-                readonly global: number;
-                readonly local: number;
-            };
-        }, never>;
+export declare const BackendToClientMessage: Schema.Union<[Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PullRes">;
+} & {
+    batch: Schema.Array$<Schema.Struct<{
+        eventEncoded: Schema.Struct<{
+            name: typeof Schema.String;
+            args: typeof Schema.Any;
+            id: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+            parentId: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+            clientId: typeof Schema.String;
+            sessionId: typeof Schema.String;
+        }>;
         metadata: Schema.Option<Schema.Struct<{
             /** ISO date format */
             createdAt: typeof Schema.String;
         }>>;
     }>>;
+    requestId: Schema.Struct<{
+        context: Schema.Literal<["pull", "push"]>;
+        requestId: typeof Schema.String;
+    }>;
     remaining: typeof Schema.Number;
-}>, Schema.TaggedStruct<"WSMessage.PushBroadcast", {
-    mutationEventEncoded: Schema.SchemaClass<{
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, {
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, never>;
-    metadata: Schema.Option<Schema.Struct<{
-        /** ISO date format */
-        createdAt: typeof Schema.String;
-    }>>;
-}>, Schema.TaggedStruct<"WSMessage.PushAck", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushAck">;
+} & {
     requestId: typeof Schema.String;
-    mutationId: typeof Schema.Number;
-}>, Schema.TaggedStruct<"WSMessage.AdminResetRoomRes", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminResetRoomRes">;
+} & {
     requestId: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.AdminInfoRes", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminInfoRes">;
+} & {
     requestId: typeof Schema.String;
     info: Schema.Struct<{
         durableObjectId: typeof Schema.String;
     }>;
-}>, Schema.TaggedStruct<"WSMessage.Error", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Error">;
+} & {
     requestId: typeof Schema.String;
     message: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.Pong", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Pong">;
+} & {
     requestId: Schema.Literal<["ping"]>;
 }>]>;
 export type BackendToClientMessage = typeof BackendToClientMessage.Type;
-export declare const ClientToBackendMessage: Schema.Union<[Schema.TaggedStruct<"WSMessage.PullReq", {
+export declare const ClientToBackendMessage: Schema.Union<[Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PullReq">;
+} & {
     requestId: typeof Schema.String;
     /** Omitting the cursor will start from the beginning */
     cursor: Schema.optional<typeof Schema.Number>;
-}>, Schema.TaggedStruct<"WSMessage.PushReq", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushReq">;
+} & {
     requestId: typeof Schema.String;
-    batch: Schema.Array$<Schema.SchemaClass<{
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, {
-        readonly id: {
-            readonly global: number;
-            readonly local: number;
-        };
-        readonly mutation: string;
-        readonly args: any;
-        readonly parentId: {
-            readonly global: number;
-            readonly local: number;
-        };
-    }, never>>;
-}>, Schema.TaggedStruct<"WSMessage.AdminResetRoomReq", {
+    batch: Schema.Array$<Schema.Struct<{
+        name: typeof Schema.String;
+        args: typeof Schema.Any;
+        id: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        parentId: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventId">, number, never>;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminResetRoomReq">;
+} & {
     requestId: typeof Schema.String;
     adminSecret: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.AdminInfoReq", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.AdminInfoReq">;
+} & {
     requestId: typeof Schema.String;
     adminSecret: typeof Schema.String;
-}>, Schema.TaggedStruct<"WSMessage.Ping", {
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.Ping">;
+} & {
     requestId: Schema.Literal<["ping"]>;
 }>]>;
 export type ClientToBackendMessage = typeof ClientToBackendMessage.Type;