@livestore/sync-cf 0.3.2-dev.0 → 0.3.2-dev.10

package/src/cf-worker/worker.ts

@@ -3,8 +3,8 @@ import { UnexpectedError } from '@livestore/common'
 import type { Schema } from '@livestore/utils/effect'
 import { Effect, UrlParams } from '@livestore/utils/effect'
 
-import { SearchParamsSchema } from '../common/mod.js'
-import type { Env } from './durable-object.js'
+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
@@ -46,7 +46,12 @@ export type CFWorker<TEnv extends Env = Env, _T extends CfWorker.Rpc.DurableObje
 }
 
 export type MakeWorkerOptions<TEnv extends Env = Env> = {
-  validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>
+  /**
+   * Validates the payload during WebSocket connection establishment.
+   * Note: This runs only at connection time, not for individual push events.
+   * For push event validation, use the `onPush` callback in the durable object.
+   */
+  validatePayload?: (payload: Schema.JsonValue | undefined, context: { storeId: string }) => void | Promise<void>
   /** @default false */
   enableCORS?: boolean
   durableObject?: {
@@ -120,7 +125,8 @@ export const makeWorker = <
  *
  * @example
  * ```ts
- * const validatePayload = (payload: Schema.JsonValue | undefined) => {
+ * const validatePayload = (payload: Schema.JsonValue | undefined, context: { storeId: string }) => {
+ *   console.log(`Validating connection for store: ${context.storeId}`)
  *   if (payload?.authToken !== 'insecure-token-change-me') {
  *     throw new Error('Invalid auth token')
  *   }
@@ -150,7 +156,7 @@ export const handleWebSocket = <
   options: {
     headers?: CfWorker.HeadersInit
     durableObject?: MakeWorkerOptions<TEnv>['durableObject']
-    validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>
+    validatePayload?: (payload: Schema.JsonValue | undefined, context: { storeId: string }) => void | Promise<void>
   },
 ): Promise<CfWorker.Response> =>
   Effect.gen(function* () {
@@ -169,7 +175,7 @@ export const handleWebSocket = <
     const { storeId, payload } = paramsResult.right
 
     if (options.validatePayload !== undefined) {
-      const result = yield* Effect.promise(async () => options.validatePayload!(payload)).pipe(
+      const result = yield* Effect.promise(async () => options.validatePayload!(payload, { storeId })).pipe(
         UnexpectedError.mapToUnexpectedError,
         Effect.either,
       )

package/src/common/mod.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@livestore/utils/effect'
 
-export * as WSMessage from './ws-message-types.js'
+export * as WSMessage from './ws-message-types.ts'
 
 export const SearchParamsSchema = Schema.Struct({
   storeId: Schema.String,

package/src/sync-impl/mod.ts

@@ -1 +1 @@
-export * from './ws-impl.js'
+export * from './ws-impl.ts'

package/src/sync-impl/ws-impl.ts

@@ -19,8 +19,8 @@ import {
 } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 
-import { SearchParamsSchema, WSMessage } from '../common/mod.js'
-import type { SyncMetadata } from '../common/ws-message-types.js'
+import { SearchParamsSchema, WSMessage } from '../common/mod.ts'
+import type { SyncMetadata } from '../common/ws-message-types.ts'
 
 export interface WsSyncOptions {
   url: string
@@ -235,10 +235,10 @@ const connect = (wsUrl: string) =>
 
       // NOTE it seems that this callback doesn't work reliably on a worker but only via `window.addEventListener`
       // We might need to proxy the event from the main thread to the worker if we want this to work reliably.
-      // eslint-disable-next-line unicorn/prefer-global-this
+
       if (typeof self !== 'undefined' && typeof self.addEventListener === 'function') {
         // TODO support an Expo equivalent for this
-        // eslint-disable-next-line unicorn/prefer-global-this
+
         yield* Effect.eventListener(self, 'offline', () => Deferred.succeed(connectionClosed, void 0))
       }