@livestore/sync-cf 0.3.0-dev.9 → 0.3.0

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

@@ -1,6 +1,49 @@
+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 declare const makeWorker: () => CFWorker;
+export type MakeWorkerOptions = {
+    validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>;
+    /** @default false */
+    enableCORS?: boolean;
+    durableObject?: {
+        /**
+         * Needs to match the binding name from the wrangler config
+         *
+         * @default 'WEBSOCKET_SERVER'
+         */
+        name?: string;
+    };
+};
+export declare const makeWorker: (options?: MakeWorkerOptions) => CFWorker;
+/**
+ * Handles `/websocket` endpoint.
+ *
+ * @example
+ * ```ts
+ * const validatePayload = (payload: Schema.JsonValue | undefined) => {
+ *   if (payload?.authToken !== 'insecure-token-change-me') {
+ *     throw new Error('Invalid auth token')
+ *   }
+ * }
+ *
+ * export default {
+ *   fetch: async (request, env, ctx) => {
+ *     if (request.url.endsWith('/websocket')) {
+ *       return handleWebSocket(request, env, ctx, { headers: {}, validatePayload })
+ *     }
+ *
+ *     return new Response('Invalid path', { status: 400, headers: corsHeaders })
+ *   }
+ * }
+ * ```
+ *
+ * @throws {UnexpectedError} If the payload is invalid
+ */
+export declare const handleWebSocket: (request: Request, env: Env, _ctx: ExecutionContext, options: {
+    headers?: HeadersInit;
+    durableObject?: MakeWorkerOptions["durableObject"];
+    validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>;
+}) => Promise<Response>;
 //# sourceMappingURL=worker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"AAAA,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,eAAO,MAAM,UAAU,QAAO,QAgC7B,CAAA"}
+{"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;IACpB,aAAa,CAAC,EAAE;QACd;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;CACF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,UAAS,iBAAsB,KAAG,QAiD5D,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,eAAe,GAC1B,SAAS,OAAO,EAChB,KAAK,GAAG,EACR,MAAM,gBAAgB,EACtB,SAAS;IACP,OAAO,CAAC,EAAE,WAAW,CAAA;IACrB,aAAa,CAAC,EAAE,iBAAiB,CAAC,eAAe,CAAC,CAAA;IAClD,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAClF,KACA,OAAO,CAAC,QAAQ,CAwCmC,CAAA"}

package/dist/cf-worker/worker.js

@@ -1,29 +1,99 @@
-export const makeWorker = () => {
+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) => {
             const url = new URL(request.url);
-            const searchParams = url.searchParams;
-            const storeId = searchParams.get('storeId');
-            if (storeId === null) {
-                return new Response('storeId search param is required', { status: 400 });
+            await new Promise((resolve) => setTimeout(resolve, 500));
+            if (request.method === 'GET' && url.pathname === '/') {
+                return new Response('Info: WebSocket sync backend endpoint for @livestore/sync-cf.', {
+                    status: 200,
+                    headers: { 'Content-Type': 'text/plain' },
+                });
             }
-            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 });
+            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') ?? '*',
                 }
-                return durableObject.fetch(request);
+                : {};
+            if (request.method === 'OPTIONS' && options.enableCORS) {
+                return new Response(null, {
+                    status: 204,
+                    headers: corsHeaders,
+                });
+            }
+            if (url.pathname.endsWith('/websocket')) {
+                return handleWebSocket(request, env, _ctx, {
+                    headers: corsHeaders,
+                    validatePayload: options.validatePayload,
+                    durableObject: options.durableObject,
+                });
             }
-            return new Response(null, {
+            console.error('Invalid path', url.pathname);
+            return new Response('Invalid path', {
                 status: 400,
                 statusText: 'Bad Request',
                 headers: {
+                    ...corsHeaders,
                     'Content-Type': 'text/plain',
                 },
             });
         },
     };
 };
+/**
+ * Handles `/websocket` endpoint.
+ *
+ * @example
+ * ```ts
+ * const validatePayload = (payload: Schema.JsonValue | undefined) => {
+ *   if (payload?.authToken !== 'insecure-token-change-me') {
+ *     throw new Error('Invalid auth token')
+ *   }
+ * }
+ *
+ * export default {
+ *   fetch: async (request, env, ctx) => {
+ *     if (request.url.endsWith('/websocket')) {
+ *       return handleWebSocket(request, env, ctx, { headers: {}, validatePayload })
+ *     }
+ *
+ *     return new Response('Invalid path', { status: 400, headers: corsHeaders })
+ *   }
+ * }
+ * ```
+ *
+ * @throws {UnexpectedError} If the payload is invalid
+ */
+export const handleWebSocket = (request, env, _ctx, options) => 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);
+    if (paramsResult._tag === 'Left') {
+        return new Response(`Invalid search params: ${paramsResult.left.toString()}`, {
+            status: 500,
+            headers: options?.headers,
+        });
+    }
+    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: options.headers });
+        }
+    }
+    const durableObjectName = options.durableObject?.name ?? 'WEBSOCKET_SERVER';
+    const durableObjectNamespace = env[durableObjectName];
+    const id = durableObjectNamespace.idFromName(storeId);
+    const durableObject = durableObjectNamespace.get(id);
+    const upgradeHeader = request.headers.get('Upgrade');
+    if (!upgradeHeader || upgradeHeader !== 'websocket') {
+        return new Response('Durable Object expected Upgrade: websocket', { status: 426, headers: options?.headers });
+    }
+    return yield* Effect.promise(() => durableObject.fetch(request));
+}).pipe(Effect.tapCauseLogPretty, Effect.runPromise);
 //# sourceMappingURL=worker.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,UAAU,GAAG,GAAa,EAAE;IACvC,OAAO;QACL,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAChC,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAA;YACrC,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YAE3C,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,OAAO,IAAI,QAAQ,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;YAC1E,CAAC;YAED,MAAM,EAAE,GAAG,GAAG,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YACnD,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAElD,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gBACpD,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,WAAW,EAAE,CAAC;oBACpD,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;gBACpF,CAAC;gBAED,OAAO,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACrC,CAAC;YAED,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACxB,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,aAAa;gBACzB,OAAO,EAAE;oBACP,cAAc,EAAE,YAAY;iBAC7B;aACF,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"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"}

package/dist/common/mod.d.ts

@@ -1,2 +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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}
+{"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

@@ -1,2 +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

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}
+{"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,141 +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.Struct<{
-            mutation: typeof Schema.String;
+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>;
+            seqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+            parentSeqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, 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.Struct<{
-        mutation: 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>;
-    }>;
-    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.Struct<{
-        mutation: typeof Schema.String;
+        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>;
+        seqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        parentSeqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, 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.Struct<{
-            mutation: typeof Schema.String;
+}>, 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>;
+            seqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+            parentSeqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+            clientId: typeof Schema.String;
+            sessionId: typeof Schema.String;
         }>;
         metadata: Schema.Option<Schema.Struct<{
             /** ISO date format */
             createdAt: typeof Schema.String;
         }>>;
     }>>;
-    remaining: typeof Schema.Number;
-}>, Schema.TaggedStruct<"WSMessage.PushBroadcast", {
-    mutationEventEncoded: Schema.Struct<{
-        mutation: 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>;
+    requestId: Schema.Struct<{
+        context: Schema.Literal<["pull", "push"]>;
+        requestId: typeof Schema.String;
     }>;
-    metadata: Schema.Option<Schema.Struct<{
-        /** ISO date format */
-        createdAt: typeof Schema.String;
-    }>>;
-}>, Schema.TaggedStruct<"WSMessage.PushReq", {
+    remaining: typeof Schema.Number;
+}>, Schema.Struct<{
+    _tag: Schema.tag<"WSMessage.PushReq">;
+} & {
     requestId: typeof Schema.String;
     batch: Schema.Array$<Schema.Struct<{
-        mutation: typeof Schema.String;
+        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>;
+        seqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        parentSeqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        clientId: typeof Schema.String;
+        sessionId: 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.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;
@@ -152,68 +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.Struct<{
-            mutation: typeof Schema.String;
+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>;
+            seqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+            parentSeqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+            clientId: typeof Schema.String;
+            sessionId: typeof Schema.String;
         }>;
         metadata: Schema.Option<Schema.Struct<{
             /** ISO date format */
             createdAt: typeof Schema.String;
         }>>;
     }>>;
-    remaining: typeof Schema.Number;
-}>, Schema.TaggedStruct<"WSMessage.PushBroadcast", {
-    mutationEventEncoded: Schema.Struct<{
-        mutation: 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>;
+    requestId: Schema.Struct<{
+        context: Schema.Literal<["pull", "push"]>;
+        requestId: typeof Schema.String;
     }>;
-    metadata: Schema.Option<Schema.Struct<{
-        /** ISO date format */
-        createdAt: typeof Schema.String;
-    }>>;
-}>, Schema.TaggedStruct<"WSMessage.PushAck", {
+    remaining: typeof Schema.Number;
+}>, 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.Struct<{
-        mutation: typeof Schema.String;
+        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>;
+        seqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        parentSeqNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
     }>>;
-}>, Schema.TaggedStruct<"WSMessage.AdminResetRoomReq", {
+}>, 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;

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

@@ -1 +1 @@
-{"version":3,"file":"ws-message-types.d.ts","sourceRoot":"","sources":["../../src/common/ws-message-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ws-message-types.d.ts","sourceRoot":"","sources":["../../src/common/ws-message-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,eAAO,MAAM,OAAO;;;;IAElB,wDAAwD;;EAEH,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAEzC,eAAO,MAAM,YAAY;IACvB,sBAAsB;;EAEoC,CAAA;AAE5D,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,OAAO;;;;;;;;;;;;;YANlB,sBAAsB;;;;;;;;;EAe+B,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAEzC,eAAO,MAAM,OAAO;;;;;;;;;;;;EAGmC,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAEzC,eAAO,MAAM,OAAO;;;;EAEmC,CAAA;AAEvD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAEzC,eAAO,MAAM,KAAK;;;;;EAGmC,CAAA;AAErD,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAErC,eAAO,MAAM,IAAI;;;;EAEmC,CAAA;AAEpD,MAAM,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,IAAI,CAAA;AAEnC,eAAO,MAAM,IAAI;;;;EAEmC,CAAA;AAEpD,MAAM,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,IAAI,CAAA;AAEnC,eAAO,MAAM,iBAAiB;;;;;EAGmC,CAAA;AAEjE,MAAM,MAAM,iBAAiB,GAAG,OAAO,iBAAiB,CAAC,IAAI,CAAA;AAE7D,eAAO,MAAM,iBAAiB;;;;EAEmC,CAAA;AAEjE,MAAM,MAAM,iBAAiB,GAAG,OAAO,iBAAiB,CAAC,IAAI,CAAA;AAE7D,eAAO,MAAM,YAAY;;;;;EAGmC,CAAA;AAE5D,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,YAAY;;;;;;;EAKmC,CAAA;AAE5D,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,OAAO;;;;IAvFlB,wDAAwD;;;;;;;;;;;;;;;YAOxD,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4F8B,CAAA;AAEtD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AACzC,MAAM,MAAM,cAAc,GAAG,OAAO,OAAO,CAAC,OAAO,CAAA;AAEnD,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;YAjGjC,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiG0F,CAAA;AAClH,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC,IAAI,CAAA;AAEvE,eAAO,MAAM,sBAAsB;;;;IA3GjC,wDAAwD;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA2GiD,CAAA;AAC3G,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC,IAAI,CAAA"}