@livestore/sync-cf 0.4.0-dev.18 → 0.4.0-dev.19

package/src/client/transport/do-rpc-client.ts

@@ -1,4 +1,4 @@
-import { InvalidPullError, InvalidPushError, SyncBackend, UnexpectedError } from '@livestore/common'
+import { InvalidPullError, InvalidPushError, SyncBackend, UnknownError } from '@livestore/common'
 import { splitChunkBySize } from '@livestore/common/sync'
 import { type CfTypes, layerProtocolDurableObject } from '@livestore/common-cf'
 import { omit, shouldNeverHappen } from '@livestore/utils'
@@ -114,7 +114,7 @@ export const makeDoRpcSync =
                 backendId,
               }),
             }),
-            Effect.mapError((cause) => new InvalidPushError({ cause: new UnexpectedError({ cause }) })),
+            Effect.mapError((cause) => new InvalidPushError({ cause: new UnknownError({ cause }) })),
           )
 
           for (const chunk of Chunk.toReadonlyArray(batchChunks)) {
@@ -123,9 +123,7 @@ export const makeDoRpcSync =
           }
         }).pipe(
           Effect.mapError((cause) =>
-            cause._tag === 'InvalidPushError'
-              ? cause
-              : InvalidPushError.make({ cause: new UnexpectedError({ cause }) }),
+            cause._tag === 'InvalidPushError' ? cause : InvalidPushError.make({ cause: new UnknownError({ cause }) }),
           ),
           Effect.withSpan('rpc-sync-client:push'),
         )
@@ -133,7 +131,7 @@ export const makeDoRpcSync =
       const ping: SyncBackend.SyncBackend<{ createdAt: string }>['ping'] = rpcClient.SyncDoRpc.Ping({
         storeId,
         payload,
-      }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('rpc-sync-client:ping'))
+      }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('rpc-sync-client:ping'))
 
       return SyncBackend.of({
         connect,

package/src/client/transport/http-rpc-client.ts

@@ -1,4 +1,4 @@
-import { InvalidPullError, InvalidPushError, SyncBackend, UnexpectedError } from '@livestore/common'
+import { InvalidPullError, InvalidPushError, SyncBackend, UnknownError } from '@livestore/common'
 import type { EventSequenceNumber } from '@livestore/common/schema'
 import { splitChunkBySize } from '@livestore/common/sync'
 import { omit } from '@livestore/utils'
@@ -76,7 +76,7 @@ export const makeHttpSync =
         storeId,
         payload,
         transport: 'http',
-      }).pipe(UnexpectedError.mapToUnexpectedError)
+      }).pipe(UnknownError.mapToUnknownError)
 
       const urlParams = UrlParams.fromInput(urlParamsData)
 
@@ -103,7 +103,7 @@ export const makeHttpSync =
 
         yield* SubscriptionRef.set(isConnected, true)
       }).pipe(
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.timeout(pingTimeout),
         Effect.catchTag('TimeoutException', () => SubscriptionRef.set(isConnected, false)),
       )
@@ -116,14 +116,14 @@ export const makeHttpSync =
       }
 
       // Helps already establish a TCP connection to the server
-      const connect = ping.pipe(UnexpectedError.mapToUnexpectedError)
+      const connect = ping.pipe(UnknownError.mapToUnknownError)
 
       const backendIdHelper = yield* SyncBackend.makeBackendIdHelper
 
       const mapCursor = (cursor: Option.Option<{ eventSequenceNumber: number }>) =>
         cursor.pipe(
           Option.map((a) => ({
-            eventSequenceNumber: a.eventSequenceNumber as EventSequenceNumber.GlobalEventSequenceNumber,
+            eventSequenceNumber: a.eventSequenceNumber as EventSequenceNumber.Global.Type,
             backendId: backendIdHelper.get().pipe(Option.getOrThrow),
           })),
         )
@@ -190,7 +190,7 @@ export const makeHttpSync =
                 backendId,
               }),
             }),
-            Effect.mapError((cause) => new InvalidPushError({ cause: new UnexpectedError({ cause }) })),
+            Effect.mapError((cause) => new InvalidPushError({ cause: new UnknownError({ cause }) })),
           )
 
           for (const chunk of Chunk.toReadonlyArray(batchChunks)) {
@@ -200,7 +200,7 @@ export const makeHttpSync =
         }).pipe(
           pushSemaphore.withPermits(1),
           Effect.mapError((cause) =>
-            cause._tag === 'InvalidPushError' ? cause : new InvalidPushError({ cause: new UnexpectedError({ cause }) }),
+            cause._tag === 'InvalidPushError' ? cause : new InvalidPushError({ cause: new UnknownError({ cause }) }),
           ),
           Effect.withSpan('http-sync-client:push'),
         )

package/src/client/transport/ws-rpc-client.ts

@@ -1,4 +1,4 @@
-import { InvalidPullError, InvalidPushError, IsOfflineError, SyncBackend, UnexpectedError } from '@livestore/common'
+import { InvalidPullError, InvalidPushError, IsOfflineError, SyncBackend, UnknownError } from '@livestore/common'
 import type { LiveStoreEvent } from '@livestore/common/schema'
 import { splitChunkBySize } from '@livestore/common/sync'
 import { omit } from '@livestore/utils'
@@ -17,8 +17,8 @@ import {
   Stream,
   SubscriptionRef,
   UrlParams,
-  type WebSocket,
 } from '@livestore/utils/effect'
+import type { WebSocket } from '@livestore/utils/effect/browser'
 import { MAX_PUSH_EVENTS_PER_REQUEST, MAX_WS_MESSAGE_BYTES } from '../../common/constants.ts'
 import { SearchParamsSchema } from '../../common/mod.ts'
 import type { SyncMetadata } from '../../common/sync-message-types.ts'
@@ -73,7 +73,7 @@ export const makeWsSync =
         storeId,
         payload,
         transport: 'ws',
-      }).pipe(UnexpectedError.mapToUnexpectedError)
+      }).pipe(UnknownError.mapToUnknownError)
 
       const urlParams = UrlParams.fromInput(urlParamsData)
       const wsUrl = `${options.url}?${UrlParams.toString(urlParams)}`
@@ -119,7 +119,7 @@ export const makeWsSync =
       }).pipe(
         Effect.timeout(pingTimeout),
         Effect.catchTag('TimeoutException', () => SubscriptionRef.set(isConnected, false)),
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.withSpan('ping'),
       )
 
@@ -156,7 +156,7 @@ export const makeWsSync =
           Effect.gen(function* () {
             if (batch.length === 0) return
 
-            const encodePayload = (batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>) => ({
+            const encodePayload = (batch: ReadonlyArray<LiveStoreEvent.Global.Encoded>) => ({
               storeId,
               payload,
               batch,
@@ -169,7 +169,7 @@ export const makeWsSync =
                 maxBytes: MAX_WS_MESSAGE_BYTES,
                 encode: encodePayload,
               }),
-              Effect.mapError((cause) => new InvalidPushError({ cause: new UnexpectedError({ cause }) })),
+              Effect.mapError((cause) => new InvalidPushError({ cause: new UnknownError({ cause }) })),
             )
 
             for (const sub of chunksChunk) {
@@ -182,7 +182,7 @@ export const makeWsSync =
                 Effect.mapError((cause) =>
                   cause._tag === 'InvalidPushError'
                     ? cause
-                    : new InvalidPushError({ cause: new UnexpectedError({ cause }) }),
+                    : new InvalidPushError({ cause: new UnknownError({ cause }) }),
                 ),
               )
             }

package/src/common/http-rpc-schema.ts

@@ -1,4 +1,4 @@
-import { InvalidPullError, InvalidPushError, UnexpectedError } from '@livestore/common'
+import { InvalidPullError, InvalidPushError, UnknownError } from '@livestore/common'
 import { Rpc, RpcGroup, Schema } from '@livestore/utils/effect'
 import * as SyncMessage from './sync-message-types.ts'
 
@@ -35,6 +35,6 @@ export class SyncHttpRpc extends RpcGroup.make(
       payload: Schema.optional(Schema.JsonValue),
     }),
     success: SyncMessage.Pong,
-    error: UnexpectedError,
+    error: UnknownError,
   }),
 ) {}

package/src/common/sync-message-types.ts

@@ -20,7 +20,7 @@ export const PullRequest = Schema.Struct({
   cursor: Schema.Option(
     Schema.Struct({
       backendId: BackendId,
-      eventSequenceNumber: EventSequenceNumber.GlobalEventSequenceNumber,
+      eventSequenceNumber: EventSequenceNumber.Global.Schema,
     }),
   ),
 }).annotations({ title: '@livestore/sync-cf:PullRequest' })
@@ -30,7 +30,7 @@ export type PullRequest = typeof PullRequest.Type
 export const PullResponse = Schema.Struct({
   batch: Schema.Array(
     Schema.Struct({
-      eventEncoded: LiveStoreEvent.AnyEncodedGlobal,
+      eventEncoded: LiveStoreEvent.Global.Encoded,
       metadata: Schema.Option(SyncMetadata),
     }),
   ),
@@ -48,7 +48,7 @@ export const emptyPullResponse = (backendId: string) =>
 export type PullResponse = typeof PullResponse.Type
 
 export const PushRequest = Schema.Struct({
-  batch: Schema.Array(LiveStoreEvent.AnyEncodedGlobal),
+  batch: Schema.Array(LiveStoreEvent.Global.Encoded),
   backendId: Schema.Option(BackendId),
 }).annotations({ title: '@livestore/sync-cf:PushRequest' })