@livestore/sync-cf 0.0.0-snapshot-4c2ee347c9a2ee93b7d67a7652d1db36f5b7ee30 → 0.0.0-snapshot-1d99fea7d2ce2c7a5d9ed0a3752f8a7bda6bc3db

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

@@ -1,82 +1,70 @@
 /// <reference lib="dom" />
 
-import type { SyncBackend, SyncBackendOptionsBase } from '@livestore/common'
+import type { SyncBackend } from '@livestore/common'
 import { InvalidPullError, InvalidPushError } from '@livestore/common'
+import { pick } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
-import { Deferred, Effect, Option, PubSub, Queue, Schema, Stream, SubscriptionRef } from '@livestore/utils/effect'
+import {
+  Deferred,
+  Effect,
+  Option,
+  PubSub,
+  Queue,
+  Schedule,
+  Schema,
+  Stream,
+  SubscriptionRef,
+  WebSocket,
+} from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 
-import { WSMessage } from '../common/index.js'
+import { WSMessage } from '../common/mod.js'
+import type { SyncMetadata } from '../common/ws-message-types.js'
 
-export interface WsSyncOptions extends SyncBackendOptionsBase {
-  type: 'cf'
+export interface WsSyncOptions {
   url: string
-  roomId: string
+  storeId: string
 }
 
-interface LiveStoreGlobalCf {
-  syncBackend: WsSyncOptions
-}
-
-declare global {
-  interface LiveStoreGlobal extends LiveStoreGlobalCf {}
-}
-
-export const makeWsSync = (options: WsSyncOptions): Effect.Effect<SyncBackend<null>, never, Scope.Scope> =>
+export const makeWsSync = (options: WsSyncOptions): Effect.Effect<SyncBackend<SyncMetadata>, never, Scope.Scope> =>
   Effect.gen(function* () {
-    const wsUrl = `${options.url}/websocket?room=${options.roomId}`
+    // TODO also allow for auth scenarios
+    const wsUrl = `${options.url}/websocket?storeId=${options.storeId}`
 
     const { isConnected, incomingMessages, send } = yield* connect(wsUrl)
 
-    const metadata = Option.none()
-
     const api = {
       isConnected,
-      pull: (args, { listenForNew }) =>
-        listenForNew
-          ? Effect.gen(function* () {
-              const requestId = nanoid()
-              const cursor = Option.getOrUndefined(args)?.cursor.global
-
-              yield* send(WSMessage.PullReq.make({ cursor, requestId }))
-
-              return Stream.fromPubSub(incomingMessages).pipe(
-                Stream.filter((_) => (_._tag === 'WSMessage.PullRes' ? _.requestId === requestId : true)),
-                Stream.tap((_) =>
-                  _._tag === 'WSMessage.Error' ? new InvalidPullError({ message: _.message }) : Effect.void,
-                ),
-                Stream.filter(Schema.is(Schema.Union(WSMessage.PushBroadcast, WSMessage.PullRes))),
-                Stream.map((msg) =>
-                  msg._tag === 'WSMessage.PushBroadcast'
-                    ? [{ mutationEventEncoded: msg.mutationEventEncoded, persisted: msg.persisted, metadata }]
-                    : msg.events.map((_) => ({ mutationEventEncoded: _, metadata, persisted: true })),
-                ),
-                Stream.flattenIterables,
-              )
-            }).pipe(Stream.unwrap)
-          : Effect.gen(function* () {
-              const requestId = nanoid()
-              const cursor = Option.getOrUndefined(args)?.cursor.global
-
-              yield* send(WSMessage.PullReq.make({ cursor, requestId }))
-
-              return Stream.fromPubSub(incomingMessages).pipe(
-                Stream.filter((_) => _._tag !== 'WSMessage.PushBroadcast' && _.requestId === requestId),
-                Stream.tap((_) =>
-                  _._tag === 'WSMessage.Error' ? new InvalidPullError({ message: _.message }) : Effect.void,
-                ),
-                Stream.filter(Schema.is(WSMessage.PullRes)),
-                Stream.takeUntil((_) => _.hasMore === false),
-                Stream.map((_) => _.events),
-                Stream.flattenIterables,
-                Stream.map((mutationEventEncoded) => ({
-                  mutationEventEncoded,
-                  metadata,
-                  persisted: true,
-                })),
-              )
-            }).pipe(Stream.unwrap),
-      push: (mutationEventEncoded, persisted) =>
+      pull: (args) =>
+        Effect.gen(function* () {
+          const requestId = nanoid()
+          const cursor = Option.getOrUndefined(args)?.cursor.global
+
+          yield* send(WSMessage.PullReq.make({ cursor, requestId }))
+
+          return Stream.fromPubSub(incomingMessages).pipe(
+            Stream.filter((_) => (_._tag === 'WSMessage.PullRes' ? _.requestId === requestId : true)),
+            Stream.tap((_) =>
+              _._tag === 'WSMessage.Error' && _.requestId === requestId
+                ? new InvalidPullError({ message: _.message })
+                : Effect.void,
+            ),
+            Stream.filter(Schema.is(Schema.Union(WSMessage.PushBroadcast, WSMessage.PullRes))),
+            Stream.map((msg) =>
+              msg._tag === 'WSMessage.PushBroadcast'
+                ? { batch: [pick(msg, ['mutationEventEncoded', 'metadata'])], remaining: 0 }
+                : {
+                    batch: msg.events.map(({ mutationEventEncoded, metadata }) => ({
+                      mutationEventEncoded,
+                      metadata,
+                    })),
+                    remaining: msg.remaining,
+                  },
+            ),
+          )
+        }).pipe(Stream.unwrap),
+
+      push: (batch) =>
         Effect.gen(function* () {
           const ready = yield* Deferred.make<void, InvalidPushError>()
           const requestId = nanoid()
@@ -85,11 +73,12 @@ export const makeWsSync = (options: WsSyncOptions): Effect.Effect<SyncBackend<nu
             Stream.filter((_) => _._tag !== 'WSMessage.PushBroadcast' && _.requestId === requestId),
             Stream.tap((_) =>
               _._tag === 'WSMessage.Error'
-                ? Deferred.fail(ready, new InvalidPushError({ message: _.message }))
+                ? Deferred.fail(ready, new InvalidPushError({ reason: { _tag: 'Unexpected', message: _.message } }))
                 : Effect.void,
             ),
             Stream.filter(Schema.is(WSMessage.PushAck)),
-            Stream.filter((_) => _.mutationId === mutationEventEncoded.id.global),
+            // TODO bring back filterting of "own events"
+            // Stream.filter((_) => _.mutationId === mutationEventEncoded.id.global),
             Stream.take(1),
             Stream.tap(() => Deferred.succeed(ready, void 0)),
             Stream.runDrain,
@@ -97,13 +86,15 @@ export const makeWsSync = (options: WsSyncOptions): Effect.Effect<SyncBackend<nu
             Effect.fork,
           )
 
-          yield* send(WSMessage.PushReq.make({ mutationEventEncoded, requestId, persisted }))
+          yield* send(WSMessage.PushReq.make({ batch, requestId }))
 
-          yield* Deferred.await(ready)
+          yield* ready
 
-          return { metadata }
+          const createdAt = new Date().toISOString()
+
+          return { metadata: Array.from({ length: batch.length }, () => Option.some({ createdAt })) }
         }),
-    } satisfies SyncBackend<null>
+    } satisfies SyncBackend<SyncMetadata>
 
     return api
   })
@@ -111,9 +102,11 @@ export const makeWsSync = (options: WsSyncOptions): Effect.Effect<SyncBackend<nu
 const connect = (wsUrl: string) =>
   Effect.gen(function* () {
     const isConnected = yield* SubscriptionRef.make(false)
-    const wsRef: { current: WebSocket | undefined } = { current: undefined }
+    const socketRef: { current: globalThis.WebSocket | undefined } = { current: undefined }
 
-    const incomingMessages = yield* PubSub.unbounded<Exclude<WSMessage.BackendToClientMessage, WSMessage.Pong>>()
+    const incomingMessages = yield* PubSub.unbounded<Exclude<WSMessage.BackendToClientMessage, WSMessage.Pong>>().pipe(
+      Effect.acquireRelease(PubSub.shutdown),
+    )
 
     const waitUntilOnline = isConnected.changes.pipe(Stream.filter(Boolean), Stream.take(1), Stream.runDrain)
 
@@ -122,80 +115,86 @@ const connect = (wsUrl: string) =>
         // Wait first until we're online
         yield* waitUntilOnline
 
-        wsRef.current!.send(Schema.encodeSync(Schema.parseJson(WSMessage.Message))(message))
+        yield* Effect.spanEvent(
+          `Sending message: ${message._tag}`,
+          message._tag === 'WSMessage.PushReq'
+            ? {
+                id: message.batch[0]!.id,
+                parentId: message.batch[0]!.parentId,
+                batchLength: message.batch.length,
+              }
+            : message._tag === 'WSMessage.PullReq'
+              ? { cursor: message.cursor ?? '-' }
+              : {},
+        )
+
+        // TODO use MsgPack instead of JSON to speed up the serialization / reduce the size of the messages
+        socketRef.current!.send(Schema.encodeSync(Schema.parseJson(WSMessage.Message))(message))
       })
 
     const innerConnect = Effect.gen(function* () {
       // If the browser already tells us we're offline, then we'll at least wait until the browser
       // thinks we're online again. (We'll only know for sure once the WS conneciton is established.)
-      while (navigator.onLine === false) {
+      while (typeof navigator !== 'undefined' && navigator.onLine === false) {
         yield* Effect.sleep(1000)
       }
       // if (navigator.onLine === false) {
       //   yield* Effect.async((cb) => self.addEventListener('online', () => cb(Effect.void)))
       // }
 
-      const ws = new WebSocket(wsUrl)
+      const socket = yield* WebSocket.makeWebSocket({ url: wsUrl, reconnect: Schedule.exponential(100) })
+
+      yield* SubscriptionRef.set(isConnected, true)
+      socketRef.current = socket
+
       const connectionClosed = yield* Deferred.make<void>()
 
-      const pongMessages = yield* Queue.unbounded<WSMessage.Pong>()
+      const pongMessages = yield* Queue.unbounded<WSMessage.Pong>().pipe(Effect.acquireRelease(Queue.shutdown))
 
-      const messageHandler = (event: MessageEvent<any>): void => {
-        const decodedEventRes = Schema.decodeUnknownEither(Schema.parseJson(WSMessage.BackendToClientMessage))(
-          event.data,
-        )
+      yield* Effect.eventListener(socket, 'message', (event: MessageEvent) =>
+        Effect.gen(function* () {
+          const decodedEventRes = Schema.decodeUnknownEither(Schema.parseJson(WSMessage.BackendToClientMessage))(
+            event.data,
+          )
 
-        if (decodedEventRes._tag === 'Left') {
-          console.error('Sync: Invalid message received', decodedEventRes.left)
-          return
-        } else {
-          if (decodedEventRes.right._tag === 'WSMessage.Pong') {
-            Queue.offer(pongMessages, decodedEventRes.right).pipe(Effect.runSync)
+          if (decodedEventRes._tag === 'Left') {
+            console.error('Sync: Invalid message received', decodedEventRes.left)
+            return
           } else {
-            PubSub.publish(incomingMessages, decodedEventRes.right).pipe(Effect.runSync)
+            if (decodedEventRes.right._tag === 'WSMessage.Pong') {
+              yield* Queue.offer(pongMessages, decodedEventRes.right)
+            } else {
+              // yield* Effect.logDebug(`decodedEventRes: ${decodedEventRes.right._tag}`)
+              yield* PubSub.publish(incomingMessages, decodedEventRes.right)
+            }
           }
-        }
-      }
+        }),
+      )
 
-      const offlineHandler = () => {
-        Deferred.succeed(connectionClosed, void 0).pipe(Effect.runSync)
-      }
+      yield* Effect.eventListener(socket, 'close', () => Deferred.succeed(connectionClosed, void 0))
+
+      yield* Effect.eventListener(socket, 'error', () =>
+        Effect.gen(function* () {
+          socket.close(3000, 'Sync: WebSocket error')
+          yield* Deferred.succeed(connectionClosed, void 0)
+        }),
+      )
 
       // 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.
-      self.addEventListener('offline', offlineHandler)
+      // eslint-disable-next-line unicorn/prefer-global-this
+      if (typeof self !== 'undefined') {
+        // eslint-disable-next-line unicorn/prefer-global-this
+        yield* Effect.eventListener(self, 'offline', () => Deferred.succeed(connectionClosed, void 0))
+      }
 
       yield* Effect.addFinalizer(() =>
         Effect.gen(function* () {
-          ws.removeEventListener('message', messageHandler)
-          self.removeEventListener('offline', offlineHandler)
-          wsRef.current?.close()
-          wsRef.current = undefined
+          socketRef.current = undefined
           yield* SubscriptionRef.set(isConnected, false)
         }),
       )
 
-      ws.addEventListener('message', messageHandler)
-
-      if (ws.readyState === WebSocket.OPEN) {
-        wsRef.current = ws
-        SubscriptionRef.set(isConnected, true).pipe(Effect.runSync)
-      } else {
-        ws.addEventListener('open', () => {
-          wsRef.current = ws
-          SubscriptionRef.set(isConnected, true).pipe(Effect.runSync)
-        })
-      }
-
-      ws.addEventListener('close', () => {
-        Deferred.succeed(connectionClosed, void 0).pipe(Effect.runSync)
-      })
-
-      ws.addEventListener('error', () => {
-        ws.close()
-        Deferred.succeed(connectionClosed, void 0).pipe(Effect.runSync)
-      })
-
       const checkPingPong = Effect.gen(function* () {
         // TODO include pong latency infomation in network status
         yield* send({ _tag: 'WSMessage.Ping', requestId: 'ping' })
@@ -204,7 +203,7 @@ const connect = (wsUrl: string) =>
         yield* Queue.take(pongMessages).pipe(Effect.timeout(5000))
 
         yield* Effect.sleep(25_000)
-      }).pipe(Effect.withSpan('@livestore/sync-cf:connect:checkPingPong'))
+      }).pipe(Effect.withSpan('@livestore/sync-cf:connect:checkPingPong'), Effect.ignore)
 
       yield* waitUntilOnline.pipe(
         Effect.andThen(checkPingPong.pipe(Effect.forever)),
@@ -212,10 +211,10 @@ const connect = (wsUrl: string) =>
         Effect.forkScoped,
       )
 
-      yield* Deferred.await(connectionClosed)
-    }).pipe(Effect.scoped)
+      yield* connectionClosed
+    }).pipe(Effect.scoped, Effect.withSpan('@livestore/sync-cf:connect'))
 
-    yield* innerConnect.pipe(Effect.forever, Effect.tapCauseLogPretty, Effect.forkScoped)
+    yield* innerConnect.pipe(Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped)
 
     return { isConnected, incomingMessages, send }
   })

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

@@ -1,8 +0,0 @@
-/// <reference no-default-lib="true"/>
-import type { Env } from './durable-object.js';
-export * from './durable-object.js';
-declare const _default: {
-    fetch: (request: Request, env: Env, _ctx: ExecutionContext) => Promise<Response>;
-};
-export default _default;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cf-worker/index.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAE9C,cAAc,qBAAqB,CAAA;;qBA4CV,OAAO,OAAO,GAAG,QAAQ,gBAAgB,KAAG,OAAO,CAAC,QAAQ,CAAC;;AADtF,wBAgCC"}

package/dist/cf-worker/index.js

@@ -1,67 +0,0 @@
-/// <reference no-default-lib="true"/>
-/// <reference lib="esnext" />
-export * from './durable-object.js';
-// const handleRequest = (request: Request, env: Env) =>
-//   HttpServer.router.empty.pipe(
-//     HttpServer.router.get(
-//       '/websocket',
-//       Effect.gen(function* () {
-//         // This example will refer to the same Durable Object instance,
-//         // since the name "foo" is hardcoded.
-//         const id = env.WEBSOCKET_SERVER.idFromName('foo')
-//         const durableObject = env.WEBSOCKET_SERVER.get(id)
-//         HttpServer.
-//         // Expect to receive a WebSocket Upgrade request.
-//         // If there is one, accept the request and return a WebSocket Response.
-//         const headerRes = yield* HttpServer.request
-//           .schemaHeaders(
-//             Schema.Struct({
-//               Upgrade: Schema.Literal('websocket'),
-//             }),
-//           )
-//           .pipe(Effect.either)
-//         if (headerRes._tag === 'Left') {
-//           // return new Response('Durable Object expected Upgrade: websocket', { status: 426 })
-//           return yield* HttpServer.response.text('Durable Object expected Upgrade: websocket', { status: 426 })
-//         }
-//         HttpServer.response.empty
-//         return yield* Effect.promise(() => durableObject.fetch(request))
-//       }),
-//     ),
-//     HttpServer.router.catchAll((e) => {
-//       console.log(e)
-//       return HttpServer.response.empty({ status: 400 })
-//     }),
-//     (_) => HttpServer.app.toWebHandler(_)(request),
-//     // request
-//   )
-// Worker
-export default {
-    fetch: async (request, env, _ctx) => {
-        const url = new URL(request.url);
-        const searchParams = url.searchParams;
-        const roomId = searchParams.get('room');
-        if (roomId === null) {
-            return new Response('Room ID is required', { status: 400 });
-        }
-        // This example will refer to the same Durable Object instance,
-        // since the name "foo" is hardcoded.
-        const id = env.WEBSOCKET_SERVER.idFromName(roomId);
-        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 });
-            }
-            return durableObject.fetch(request);
-        }
-        return new Response(null, {
-            status: 400,
-            statusText: 'Bad Request',
-            headers: {
-                'Content-Type': 'text/plain',
-            },
-        });
-    },
-};
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cf-worker/index.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,8BAA8B;AAO9B,cAAc,qBAAqB,CAAA;AAEnC,wDAAwD;AACxD,kCAAkC;AAClC,6BAA6B;AAC7B,sBAAsB;AACtB,kCAAkC;AAClC,0EAA0E;AAC1E,gDAAgD;AAChD,4DAA4D;AAC5D,6DAA6D;AAE7D,sBAAsB;AAEtB,4DAA4D;AAC5D,kFAAkF;AAClF,sDAAsD;AACtD,4BAA4B;AAC5B,8BAA8B;AAC9B,sDAAsD;AACtD,kBAAkB;AAClB,cAAc;AACd,iCAAiC;AAEjC,2CAA2C;AAC3C,kGAAkG;AAClG,kHAAkH;AAClH,YAAY;AAEZ,oCAAoC;AAEpC,2EAA2E;AAC3E,YAAY;AACZ,SAAS;AACT,0CAA0C;AAC1C,uBAAuB;AACvB,0DAA0D;AAC1D,UAAU;AACV,sDAAsD;AACtD,iBAAiB;AACjB,MAAM;AAEN,SAAS;AACT,eAAe;IACb,KAAK,EAAE,KAAK,EAAE,OAAgB,EAAE,GAAQ,EAAE,IAAsB,EAAqB,EAAE;QACrF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,CAAA;QACrC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAEvC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,IAAI,QAAQ,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAC7D,CAAC;QAED,+DAA+D;QAC/D,qCAAqC;QACrC,MAAM,EAAE,GAAG,GAAG,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAClD,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAElD,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACpD,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,WAAW,EAAE,CAAC;gBACpD,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;YACpF,CAAC;YAED,OAAO,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACrC,CAAC;QAED,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;YACxB,MAAM,EAAE,GAAG;YACX,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE;gBACP,cAAc,EAAE,YAAY;aAC7B;SACF,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}

package/dist/common/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}

package/dist/sync-impl/index.d.ts

@@ -1,2 +0,0 @@
-export * from './ws-impl.js';
-//# sourceMappingURL=index.d.ts.map

package/dist/sync-impl/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sync-impl/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA"}

package/dist/sync-impl/index.js

@@ -1,2 +0,0 @@
-export * from './ws-impl.js';
-//# sourceMappingURL=index.js.map

package/dist/sync-impl/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sync-impl/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA"}

package/src/cf-worker/index.ts

@@ -1,84 +0,0 @@
-/// <reference no-default-lib="true"/>
-/// <reference lib="esnext" />
-
-// import { mutationEventSchemaEncodedAny } from '@livestore/common/schema'
-// import { Effect, HttpServer, Schema } from '@livestore/utils/effect'
-
-import type { Env } from './durable-object.js'
-
-export * from './durable-object.js'
-
-// const handleRequest = (request: Request, env: Env) =>
-//   HttpServer.router.empty.pipe(
-//     HttpServer.router.get(
-//       '/websocket',
-//       Effect.gen(function* () {
-//         // This example will refer to the same Durable Object instance,
-//         // since the name "foo" is hardcoded.
-//         const id = env.WEBSOCKET_SERVER.idFromName('foo')
-//         const durableObject = env.WEBSOCKET_SERVER.get(id)
-
-//         HttpServer.
-
-//         // Expect to receive a WebSocket Upgrade request.
-//         // If there is one, accept the request and return a WebSocket Response.
-//         const headerRes = yield* HttpServer.request
-//           .schemaHeaders(
-//             Schema.Struct({
-//               Upgrade: Schema.Literal('websocket'),
-//             }),
-//           )
-//           .pipe(Effect.either)
-
-//         if (headerRes._tag === 'Left') {
-//           // return new Response('Durable Object expected Upgrade: websocket', { status: 426 })
-//           return yield* HttpServer.response.text('Durable Object expected Upgrade: websocket', { status: 426 })
-//         }
-
-//         HttpServer.response.empty
-
-//         return yield* Effect.promise(() => durableObject.fetch(request))
-//       }),
-//     ),
-//     HttpServer.router.catchAll((e) => {
-//       console.log(e)
-//       return HttpServer.response.empty({ status: 400 })
-//     }),
-//     (_) => HttpServer.app.toWebHandler(_)(request),
-//     // request
-//   )
-
-// Worker
-export default {
-  fetch: async (request: Request, env: Env, _ctx: ExecutionContext): Promise<Response> => {
-    const url = new URL(request.url)
-    const searchParams = url.searchParams
-    const roomId = searchParams.get('room')
-
-    if (roomId === null) {
-      return new Response('Room ID is required', { status: 400 })
-    }
-
-    // This example will refer to the same Durable Object instance,
-    // since the name "foo" is hardcoded.
-    const id = env.WEBSOCKET_SERVER.idFromName(roomId)
-    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 })
-      }
-
-      return durableObject.fetch(request)
-    }
-
-    return new Response(null, {
-      status: 400,
-      statusText: 'Bad Request',
-      headers: {
-        'Content-Type': 'text/plain',
-      },
-    })
-  },
-}

package/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "target": "es2022",
-    "tsBuildInfoFile": "./dist/.tsbuildinfo",
-    "types": ["@cloudflare/workers-types"]
-  },
-  "include": ["./src"],
-  "references": [{ "path": "../common" }, { "path": "../utils" }]
-}

package/wrangler.toml

@@ -1,21 +0,0 @@
-name = "websocket-server"
-main = "./src/cf-worker/index.ts"
-compatibility_date = "2024-05-12"
-
-[[durable_objects.bindings]]
-name = "WEBSOCKET_SERVER"
-class_name = "WebSocketServer"
-
-[[migrations]]
-tag = "v1"
-new_classes = ["WebSocketServer"]
-
-[[d1_databases]]
-binding = "DB"
-database_name = "livestore-sync-cf-demo"
-database_id = "1c9b5dae-f1fa-49d8-83fa-7bd5b39c4121"
-# database_id = "${LIVESTORE_CF_SYNC_DATABASE_ID}"
-
-[vars]
-# should be set via CF dashboard (as secret)
-# ADMIN_SECRET = "..."