@livestore/sync-cf 0.3.2-dev.9 → 0.4.0-dev.1

package/src/cf-worker/worker.ts

@@ -4,37 +4,40 @@ import type { Schema } from '@livestore/utils/effect'
 import { Effect, UrlParams } from '@livestore/utils/effect'
 
 import { SearchParamsSchema } from '../common/mod.ts'
+
 import type { Env } from './durable-object.ts'
 
-// Redeclaring Response to Cloudflare Worker Response type to avoid lib.dom type clashing
-declare const Response: typeof CfWorker.Response
+// NOTE We need to redeclare runtime types here to avoid type conflicts with the lib.dom Response type.
+declare class Response extends CfWorker.Response {}
 
-/**
- * Helper type to extract DurableObject keys from Env to give consumer type safety.
- *
- * @example
- * ```ts
- *  type PlatformEnv = {
- *    DB: D1Database
- *    ADMIN_TOKEN: string
- *    WEBSOCKET_SERVER: DurableObjectNamespace<WebSocketServer>
- * }
- *  export default makeWorker<PlatformEnv>({
- *    durableObject: { name: "WEBSOCKET_SERVER" },
- *    // ^ (property) name?: "WEBSOCKET_SERVER" | undefined
- *  });
- */
-type ExtractDurableObjectKeys<TEnv = Env> = TEnv extends Env
-  ? [keyof TEnv] extends [keyof Env]
+export namespace HelperTypes {
+  type AnyDON = CfWorker.DurableObjectNamespace<undefined>
+
+  type DOKeys<T> = {
+    [K in keyof T]-?: T[K] extends AnyDON ? K : never
+  }[keyof T]
+
+  type NonBuiltins<T> = Omit<T, keyof Env>
+
+  /**
+   * Helper type to extract DurableObject keys from Env to give consumer type safety.
+   *
+   * @example
+   * ```ts
+   *  type PlatformEnv = {
+   *    DB: D1Database
+   *    ADMIN_TOKEN: string
+   *    WEBSOCKET_SERVER: DurableObjectNamespace<WebSocketServer>
+   * }
+   *  export default makeWorker<PlatformEnv>({
+   *    durableObject: { name: "WEBSOCKET_SERVER" },
+   *    // ^ (property) name?: "WEBSOCKET_SERVER" | undefined
+   *  });
+   */
+  export type ExtractDurableObjectKeys<TEnv = Env> = DOKeys<NonBuiltins<TEnv>> extends never
     ? string
-    : keyof {
-        [K in keyof TEnv as K extends keyof Env
-          ? never
-          : TEnv[K] extends CfWorker.DurableObjectNamespace<any>
-            ? K
-            : never]: TEnv[K]
-      }
-  : never
+    : DOKeys<NonBuiltins<TEnv>>
+}
 
 // HINT: If we ever extend user's custom worker RPC, type T can help here with expected return type safety. Currently unused.
 export type CFWorker<TEnv extends Env = Env, _T extends CfWorker.Rpc.DurableObjectBranded | undefined = undefined> = {
@@ -60,7 +63,7 @@ export type MakeWorkerOptions<TEnv extends Env = Env> = {
      *
      * @default 'WEBSOCKET_SERVER'
      */
-    name?: ExtractDurableObjectKeys<TEnv>
+    name?: HelperTypes.ExtractDurableObjectKeys<TEnv>
   }
 }
 
@@ -138,7 +141,8 @@ export const makeWorker = <
  *       return handleWebSocket(request, env, ctx, { headers: {}, validatePayload })
  *     }
  *
- *     return new Response('Invalid path', { status: 400, headers: corsHeaders })
+ *     return new Response('Invalid path', { status: 400 })
+ *     return new Response('Invalid path', { status: 400 })
  *   }
  * }
  * ```
@@ -157,7 +161,7 @@ export const handleWebSocket = <
     headers?: CfWorker.HeadersInit
     durableObject?: MakeWorkerOptions<TEnv>['durableObject']
     validatePayload?: (payload: Schema.JsonValue | undefined, context: { storeId: string }) => void | Promise<void>
-  },
+  } = {},
 ): Promise<CfWorker.Response> =>
   Effect.gen(function* () {
     const url = new URL(request.url)
@@ -188,10 +192,13 @@ export const handleWebSocket = <
 
     const durableObjectName = options.durableObject?.name ?? 'WEBSOCKET_SERVER'
     if (!(durableObjectName in env)) {
-      return new Response(`Failed dependency: Required Durable Object binding '${durableObjectName}' not available`, {
-        status: 424,
-        headers: options.headers,
-      })
+      return new Response(
+        `Failed dependency: Required Durable Object binding '${durableObjectName as string}' not available`,
+        {
+          status: 424,
+          headers: options.headers,
+        },
+      )
     }
 
     const durableObjectNamespace = env[
@@ -210,5 +217,5 @@ export const handleWebSocket = <
     }
 
     // Cloudflare Durable Object type clashing with lib.dom Response type, which is why we need the casts here.
-    return yield* Effect.promise(() => durableObject.fetch(request as any) as unknown as Promise<CfWorker.Response>)
+    return yield* Effect.promise(() => durableObject.fetch(request))
   }).pipe(Effect.tapCauseLogPretty, Effect.runPromise)