@livestore/webmesh 0.3.0-dev.3 → 0.3.0-dev.31

package/src/utils.ts

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-arrow/prefer-arrow-functions */
-import { Duration } from '@livestore/utils/effect'
+import { Duration, Effect } from '@livestore/utils/effect'
 
 /**
  * A set of values that expire after a given timeout
@@ -10,10 +10,19 @@ export class TimeoutSet<V> {
   private timeoutHandle: NodeJS.Timeout | undefined
   private readonly timeoutMs: number
 
-  constructor({ timeout }: { timeout: Duration.DurationInput }) {
+  private constructor({ timeout }: { timeout: Duration.DurationInput }) {
     this.timeoutMs = Duration.toMillis(timeout)
   }
 
+  static make = (timeout: Duration.DurationInput) =>
+    Effect.gen(function* () {
+      const timeoutSet = new TimeoutSet({ timeout })
+
+      yield* Effect.addFinalizer(() => Effect.sync(() => timeoutSet.onShutdown()))
+
+      return timeoutSet
+    })
+
   add(value: V): void {
     this.values.set(value, Date.now())
     this.scheduleCleanup()
@@ -44,4 +53,6 @@ export class TimeoutSet<V> {
       }
     }
   }
+
+  onShutdown = () => clearTimeout(this.timeoutHandle)
 }

package/src/websocket-edge.ts

@@ -0,0 +1,177 @@
+import type { HttpClient } from '@livestore/utils/effect'
+import {
+  Deferred,
+  Effect,
+  Either,
+  Exit,
+  Layer,
+  Queue,
+  Schedule,
+  Schema,
+  Scope,
+  Socket,
+  Stream,
+  WebChannel,
+} from '@livestore/utils/effect'
+
+import * as WebmeshSchema from './mesh-schema.js'
+import type { MeshNode } from './node.js'
+
+export class WSEdgeInit extends Schema.TaggedStruct('WSEdgeInit', {
+  from: Schema.String,
+}) {}
+
+export class WSEdgePayload extends Schema.TaggedStruct('WSEdgePayload', {
+  from: Schema.String,
+  payload: Schema.Any,
+}) {}
+
+export class WSEdgeMessage extends Schema.Union(WSEdgeInit, WSEdgePayload) {}
+
+export const MessageMsgPack = Schema.MsgPack(WSEdgeMessage)
+
+export type SocketType =
+  | {
+      _tag: 'leaf'
+      from: string
+    }
+  | {
+      _tag: 'relay'
+    }
+
+export const connectViaWebSocket = ({
+  node,
+  url,
+}: {
+  node: MeshNode
+  url: string
+}): Effect.Effect<void, never, Scope.Scope | HttpClient.HttpClient> =>
+  Effect.gen(function* () {
+    const disconnected = yield* Deferred.make<void>()
+
+    const socket = yield* Socket.makeWebSocket(url, { openTimeout: 50 })
+
+    const edgeChannel = yield* makeWebSocketEdge({
+      socket,
+      socketType: { _tag: 'leaf', from: node.nodeName },
+    })
+
+    yield* node
+      .addEdge({ target: 'ws', edgeChannel: edgeChannel.webChannel, replaceIfExists: true })
+      .pipe(Effect.acquireRelease(() => node.removeEdge('ws').pipe(Effect.orDie)))
+
+    yield* disconnected
+  }).pipe(Effect.scoped, Effect.forever, Effect.interruptible, Effect.provide(binaryWebSocketConstructorLayer))
+
+const binaryWebSocketConstructorLayer = Layer.succeed(Socket.WebSocketConstructor, (url, protocols) => {
+  const socket = new globalThis.WebSocket(url, protocols)
+  socket.binaryType = 'arraybuffer'
+  return socket
+})
+
+export const makeWebSocketEdge = ({
+  socket,
+  socketType,
+}: {
+  socket: Socket.Socket
+  socketType: SocketType
+}): Effect.Effect<
+  {
+    webChannel: WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>
+    from: string
+  },
+  never,
+  Scope.Scope | HttpClient.HttpClient
+> =>
+  Effect.scopeWithCloseable((scope) =>
+    Effect.gen(function* () {
+      const fromDeferred = yield* Deferred.make<string>()
+
+      const listenQueue = yield* Queue.unbounded<typeof WebmeshSchema.Packet.Type>().pipe(
+        Effect.acquireRelease(Queue.shutdown),
+      )
+
+      const schema = WebChannel.mapSchema(WebmeshSchema.Packet)
+
+      const isConnectedLatch = yield* Effect.makeLatch(true)
+
+      const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
+
+      const retryOpenTimeoutSchedule = Schedule.exponential(100).pipe(
+        Schedule.whileInput((_: Socket.SocketError) => _.reason === 'OpenTimeout'),
+      )
+
+      yield* Stream.never.pipe(
+        Stream.pipeThroughChannel(Socket.toChannel(socket)),
+        Stream.catchTag(
+          'SocketError',
+          Effect.fn(function* (error) {
+            if (error.reason === 'Close') {
+              yield* isConnectedLatch.close
+              yield* Deferred.succeed(closedDeferred, undefined)
+              return yield* Effect.interrupt
+            } else {
+              return yield* Effect.fail(error)
+            }
+          }),
+        ),
+        Stream.retry(retryOpenTimeoutSchedule),
+        Stream.tap(
+          Effect.fn(function* (bytes) {
+            const msg = yield* Schema.decode(MessageMsgPack)(new Uint8Array(bytes))
+            if (msg._tag === 'WSEdgeInit') {
+              yield* Deferred.succeed(fromDeferred, msg.from)
+            } else {
+              const decodedPayload = yield* Schema.decode(schema.listen)(msg.payload)
+              yield* Queue.offer(listenQueue, decodedPayload)
+            }
+          }),
+        ),
+        Stream.runDrain,
+        Effect.interruptible,
+        Effect.withSpan('makeWebSocketEdge:listen'),
+        Effect.tapCauseLogPretty,
+        Effect.forkScoped,
+      )
+
+      const sendToSocket = yield* socket.writer
+
+      const initHandshake = (from: string) =>
+        sendToSocket(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgeInit', from }))
+
+      if (socketType._tag === 'leaf') {
+        yield* initHandshake(socketType.from)
+      }
+
+      const deferredResult = yield* fromDeferred
+      const from = socketType._tag === 'leaf' ? socketType.from : deferredResult
+
+      if (socketType._tag === 'relay') {
+        yield* initHandshake(from)
+      }
+
+      const send = (message: typeof WebmeshSchema.Packet.Type) =>
+        Effect.gen(function* () {
+          yield* isConnectedLatch.await
+          const payload = yield* Schema.encode(schema.send)(message)
+          yield* sendToSocket(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgePayload', payload, from }))
+        }).pipe(Effect.orDie)
+
+      const listen = Stream.fromQueue(listenQueue).pipe(
+        Stream.map(Either.right),
+        WebChannel.listenToDebugPing('websocket-edge'),
+      )
+
+      const webChannel = {
+        [WebChannel.WebChannelSymbol]: WebChannel.WebChannelSymbol,
+        send,
+        listen,
+        closedDeferred,
+        schema,
+        supportsTransferables: false,
+        shutdown: Scope.close(scope, Exit.void),
+      } satisfies WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>
+
+      return { webChannel, from }
+    }).pipe(Effect.withSpanScoped('makeWebSocketEdge'), Effect.orDie),
+  )

package/dist/websocket-connection.d.ts

@@ -1,51 +0,0 @@
-import type { Scope } from '@livestore/utils/effect';
-import { Effect, Schedule, Schema, WebChannel } from '@livestore/utils/effect';
-import type NodeWebSocket from 'ws';
-import * as MeshSchema from './mesh-schema.js';
-import type { MeshNode } from './node.js';
-declare const WSConnectionInit_base: Schema.TaggedStruct<"WSConnectionInit", {
-    from: typeof Schema.String;
-}>;
-export declare class WSConnectionInit extends WSConnectionInit_base {
-}
-declare const WSConnectionPayload_base: Schema.TaggedStruct<"WSConnectionPayload", {
-    from: typeof Schema.String;
-    payload: typeof Schema.Any;
-}>;
-export declare class WSConnectionPayload extends WSConnectionPayload_base {
-}
-declare const WSConnectionMessage_base: Schema.Union<[typeof WSConnectionInit, typeof WSConnectionPayload]>;
-export declare class WSConnectionMessage extends WSConnectionMessage_base {
-}
-export declare const MessageMsgPack: Schema.transform<Schema.Schema<Uint8Array<ArrayBufferLike>, Uint8Array<ArrayBufferLike>, never>, Schema.Schema<{
-    readonly _tag: "WSConnectionInit";
-    readonly from: string;
-} | {
-    readonly _tag: "WSConnectionPayload";
-    readonly payload: any;
-    readonly from: string;
-}, {
-    readonly _tag: "WSConnectionInit";
-    readonly from: string;
-} | {
-    readonly _tag: "WSConnectionPayload";
-    readonly payload: any;
-    readonly from: string;
-}, never>>;
-export type SocketType = {
-    _tag: 'leaf';
-    from: string;
-} | {
-    _tag: 'relay';
-};
-export declare const connectViaWebSocket: ({ node, url, reconnect, }: {
-    node: MeshNode;
-    url: string;
-    reconnect?: Schedule.Schedule<unknown> | false;
-}) => Effect.Effect<void, never, Scope.Scope>;
-export declare const makeWebSocketConnection: (socket: globalThis.WebSocket | NodeWebSocket.WebSocket, socketType: SocketType) => Effect.Effect<{
-    webChannel: WebChannel.WebChannel<typeof MeshSchema.Packet.Type, typeof MeshSchema.Packet.Type>;
-    from: string;
-}, never, Scope.Scope>;
-export {};
-//# sourceMappingURL=websocket-connection.d.ts.map

package/dist/websocket-connection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-connection.d.ts","sourceRoot":"","sources":["../src/websocket-connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAEL,MAAM,EAIN,QAAQ,EACR,MAAM,EAEN,UAAU,EAEX,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,aAAa,MAAM,IAAI,CAAA;AAEnC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;;;;AAEzC,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;;;;AAEL,qBAAa,mBAAoB,SAAQ,wBAGvC;CAAG;;AAEL,qBAAa,mBAAoB,SAAQ,wBAAmD;CAAG;AAE/F,eAAO,MAAM,cAAc;;;;;;;;;;;;;;UAAsC,CAAA;AAEjE,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,GACD;IACE,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAEL,eAAO,MAAM,mBAAmB,8BAI7B;IACD,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,CAAA;CAC/C,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAkBtC,CAAA;AAEJ,eAAO,MAAM,uBAAuB,WAC1B,UAAU,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,cAC1C,UAAU,KACrB,MAAM,CAAC,MAAM,CACd;IACE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC/F,IAAI,EAAE,MAAM,CAAA;CACb,EACD,KAAK,EACL,KAAK,CAAC,KAAK,CAgFT,CAAA"}

package/dist/websocket-connection.js

@@ -1,74 +0,0 @@
-import { Deferred, Effect, Either, FiberHandle, Queue, Schedule, Schema, Stream, WebChannel, WebSocket, } from '@livestore/utils/effect';
-import * as MeshSchema from './mesh-schema.js';
-export class WSConnectionInit extends Schema.TaggedStruct('WSConnectionInit', {
-    from: Schema.String,
-}) {
-}
-export class WSConnectionPayload extends Schema.TaggedStruct('WSConnectionPayload', {
-    from: Schema.String,
-    payload: Schema.Any,
-}) {
-}
-export class WSConnectionMessage extends Schema.Union(WSConnectionInit, WSConnectionPayload) {
-}
-export const MessageMsgPack = Schema.MsgPack(WSConnectionMessage);
-export const connectViaWebSocket = ({ node, url, reconnect = Schedule.exponential(100), }) => Effect.gen(function* () {
-    const fiberHandle = yield* FiberHandle.make();
-    const connect = Effect.gen(function* () {
-        const socket = yield* WebSocket.makeWebSocket({ url, reconnect });
-        // NOTE we want to use `runFork` here so this Effect is not part of the fiber that will be interrupted
-        socket.addEventListener('close', () => FiberHandle.run(fiberHandle, connect).pipe(Effect.runFork));
-        const connection = yield* makeWebSocketConnection(socket, { _tag: 'leaf', from: node.nodeName });
-        yield* node.addConnection({ target: 'ws', connectionChannel: connection.webChannel, replaceIfExists: true });
-        yield* Effect.never;
-    }).pipe(Effect.scoped, Effect.withSpan('@livestore/webmesh:websocket-connection:connect'));
-    yield* FiberHandle.run(fiberHandle, connect);
-});
-export const makeWebSocketConnection = (socket, socketType) => Effect.gen(function* () {
-    socket.binaryType = 'arraybuffer';
-    const fromDeferred = yield* Deferred.make();
-    yield* Stream.fromEventListener(socket, 'message').pipe(Stream.map((msg) => Schema.decodeUnknownEither(MessageMsgPack)(new Uint8Array(msg.data))), Stream.flatten(), Stream.tap((msg) => Effect.gen(function* () {
-        if (msg._tag === 'WSConnectionInit') {
-            yield* Deferred.succeed(fromDeferred, msg.from);
-        }
-        else {
-            const decodedPayload = yield* Schema.decode(MeshSchema.Packet)(msg.payload);
-            yield* Queue.offer(listenQueue, decodedPayload);
-        }
-    })), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
-    const listenQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
-    const initHandshake = (from) => socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSConnectionInit', from }));
-    if (socketType._tag === 'leaf') {
-        initHandshake(socketType.from);
-    }
-    const deferredResult = yield* fromDeferred;
-    const from = socketType._tag === 'leaf' ? socketType.from : deferredResult;
-    if (socketType._tag === 'relay') {
-        initHandshake(from);
-    }
-    const isConnectedLatch = yield* Effect.makeLatch(true);
-    const closedDeferred = yield* Deferred.make();
-    yield* Effect.eventListener(socket, 'close', () => Effect.gen(function* () {
-        yield* isConnectedLatch.close;
-        yield* Deferred.succeed(closedDeferred, undefined);
-    }), { once: true });
-    const send = (message) => Effect.gen(function* () {
-        yield* isConnectedLatch.await;
-        const payload = yield* Schema.encode(MeshSchema.Packet)(message);
-        socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSConnectionPayload', payload, from }));
-    });
-    const listen = Stream.fromQueue(listenQueue).pipe(Stream.map(Either.right));
-    const webChannel = {
-        [WebChannel.WebChannelSymbol]: WebChannel.WebChannelSymbol,
-        send,
-        listen,
-        closedDeferred,
-        schema: { listen: MeshSchema.Packet, send: MeshSchema.Packet },
-        supportsTransferables: false,
-    };
-    return {
-        webChannel: webChannel,
-        from,
-    };
-});
-//# sourceMappingURL=websocket-connection.js.map

package/dist/websocket-connection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-connection.js","sourceRoot":"","sources":["../src/websocket-connection.ts"],"names":[],"mappings":"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"}

package/dist/websocket-server.d.ts

@@ -1,7 +0,0 @@
-import type { Scope } from '@livestore/utils/effect';
-import { Effect } from '@livestore/utils/effect';
-import * as WebSocket from 'ws';
-export declare const makeWebSocketServer: ({ relayNodeName, }: {
-    relayNodeName: string;
-}) => Effect.Effect<WebSocket.WebSocketServer, never, Scope.Scope>;
-//# sourceMappingURL=websocket-server.d.ts.map

package/dist/websocket-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../src/websocket-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAK/B,eAAO,MAAM,mBAAmB,uBAE7B;IACD,aAAa,EAAE,MAAM,CAAA;CACtB,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CA4B3D,CAAA"}

package/dist/websocket-server.js

@@ -1,24 +0,0 @@
-import { Effect } from '@livestore/utils/effect';
-import * as WebSocket from 'ws';
-import { makeMeshNode } from './node.js';
-import { makeWebSocketConnection } from './websocket-connection.js';
-export const makeWebSocketServer = ({ relayNodeName, }) => Effect.gen(function* () {
-    const server = new WebSocket.WebSocketServer({ noServer: true });
-    const node = yield* makeMeshNode(relayNodeName);
-    const runtime = yield* Effect.runtime();
-    // TODO handle node disconnects (i.e. remove respective connection)
-    server.on('connection', (socket) => {
-        Effect.gen(function* () {
-            const { webChannel, from } = yield* makeWebSocketConnection(socket, { _tag: 'relay' });
-            yield* node.addConnection({ target: from, connectionChannel: webChannel, replaceIfExists: true });
-            yield* Effect.log(`WS Relay ${relayNodeName}: added connection from '${from}'`);
-            socket.addEventListener('close', () => Effect.gen(function* () {
-                yield* node.removeConnection(from);
-                yield* Effect.log(`WS Relay ${relayNodeName}: removed connection from '${from}'`);
-            }).pipe(Effect.provide(runtime), Effect.runFork));
-            yield* Effect.never;
-        }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), Effect.runFork);
-    });
-    return server;
-});
-//# sourceMappingURL=websocket-server.js.map

package/dist/websocket-server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../src/websocket-server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,GAGd,EAAgE,EAAE,CACjE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAEhE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;IAE/C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAA;IAE9C,mEAAmE;IACnE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE;QACjC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;YAEtF,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;YACjG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,aAAa,4BAA4B,IAAI,GAAG,CAAC,CAAA;YAE/E,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CACpC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,KAAK,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBAClC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,aAAa,8BAA8B,IAAI,GAAG,CAAC,CAAA;YACnF,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CACjD,CAAA;YAED,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;QACrB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;IAC3F,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,CAAC,CAAA"}

package/src/websocket-connection.ts

@@ -1,158 +0,0 @@
-import type { Scope } from '@livestore/utils/effect'
-import {
-  Deferred,
-  Effect,
-  Either,
-  FiberHandle,
-  Queue,
-  Schedule,
-  Schema,
-  Stream,
-  WebChannel,
-  WebSocket,
-} from '@livestore/utils/effect'
-import type NodeWebSocket from 'ws'
-
-import * as MeshSchema from './mesh-schema.js'
-import type { MeshNode } from './node.js'
-
-export class WSConnectionInit extends Schema.TaggedStruct('WSConnectionInit', {
-  from: Schema.String,
-}) {}
-
-export class WSConnectionPayload extends Schema.TaggedStruct('WSConnectionPayload', {
-  from: Schema.String,
-  payload: Schema.Any,
-}) {}
-
-export class WSConnectionMessage extends Schema.Union(WSConnectionInit, WSConnectionPayload) {}
-
-export const MessageMsgPack = Schema.MsgPack(WSConnectionMessage)
-
-export type SocketType =
-  | {
-      _tag: 'leaf'
-      from: string
-    }
-  | {
-      _tag: 'relay'
-    }
-
-export const connectViaWebSocket = ({
-  node,
-  url,
-  reconnect = Schedule.exponential(100),
-}: {
-  node: MeshNode
-  url: string
-  reconnect?: Schedule.Schedule<unknown> | false
-}): Effect.Effect<void, never, Scope.Scope> =>
-  Effect.gen(function* () {
-    const fiberHandle = yield* FiberHandle.make()
-
-    const connect = Effect.gen(function* () {
-      const socket = yield* WebSocket.makeWebSocket({ url, reconnect })
-
-      // NOTE we want to use `runFork` here so this Effect is not part of the fiber that will be interrupted
-      socket.addEventListener('close', () => FiberHandle.run(fiberHandle, connect).pipe(Effect.runFork))
-
-      const connection = yield* makeWebSocketConnection(socket, { _tag: 'leaf', from: node.nodeName })
-
-      yield* node.addConnection({ target: 'ws', connectionChannel: connection.webChannel, replaceIfExists: true })
-
-      yield* Effect.never
-    }).pipe(Effect.scoped, Effect.withSpan('@livestore/webmesh:websocket-connection:connect'))
-
-    yield* FiberHandle.run(fiberHandle, connect)
-  })
-
-export const makeWebSocketConnection = (
-  socket: globalThis.WebSocket | NodeWebSocket.WebSocket,
-  socketType: SocketType,
-): Effect.Effect<
-  {
-    webChannel: WebChannel.WebChannel<typeof MeshSchema.Packet.Type, typeof MeshSchema.Packet.Type>
-    from: string
-  },
-  never,
-  Scope.Scope
-> =>
-  Effect.gen(function* () {
-    socket.binaryType = 'arraybuffer'
-
-    const fromDeferred = yield* Deferred.make<string>()
-
-    yield* Stream.fromEventListener<MessageEvent>(socket as any, 'message').pipe(
-      Stream.map((msg) => Schema.decodeUnknownEither(MessageMsgPack)(new Uint8Array(msg.data))),
-      Stream.flatten(),
-      Stream.tap((msg) =>
-        Effect.gen(function* () {
-          if (msg._tag === 'WSConnectionInit') {
-            yield* Deferred.succeed(fromDeferred, msg.from)
-          } else {
-            const decodedPayload = yield* Schema.decode(MeshSchema.Packet)(msg.payload)
-            yield* Queue.offer(listenQueue, decodedPayload)
-          }
-        }),
-      ),
-      Stream.runDrain,
-      Effect.tapCauseLogPretty,
-      Effect.forkScoped,
-    )
-
-    const listenQueue = yield* Queue.unbounded<typeof MeshSchema.Packet.Type>().pipe(
-      Effect.acquireRelease(Queue.shutdown),
-    )
-
-    const initHandshake = (from: string) =>
-      socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSConnectionInit', from }))
-
-    if (socketType._tag === 'leaf') {
-      initHandshake(socketType.from)
-    }
-
-    const deferredResult = yield* fromDeferred
-    const from = socketType._tag === 'leaf' ? socketType.from : deferredResult
-
-    if (socketType._tag === 'relay') {
-      initHandshake(from)
-    }
-
-    const isConnectedLatch = yield* Effect.makeLatch(true)
-
-    const closedDeferred = yield* Deferred.make<void>()
-
-    yield* Effect.eventListener<any>(
-      socket,
-      'close',
-      () =>
-        Effect.gen(function* () {
-          yield* isConnectedLatch.close
-          yield* Deferred.succeed(closedDeferred, undefined)
-        }),
-      { once: true },
-    )
-
-    const send = (message: typeof MeshSchema.Packet.Type) =>
-      Effect.gen(function* () {
-        yield* isConnectedLatch.await
-        const payload = yield* Schema.encode(MeshSchema.Packet)(message)
-        socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSConnectionPayload', payload, from }))
-      })
-
-    const listen = Stream.fromQueue(listenQueue).pipe(Stream.map(Either.right))
-
-    const webChannel = {
-      [WebChannel.WebChannelSymbol]: WebChannel.WebChannelSymbol,
-      send,
-      listen,
-      closedDeferred,
-      schema: { listen: MeshSchema.Packet, send: MeshSchema.Packet },
-      supportsTransferables: false,
-    } satisfies WebChannel.WebChannel<typeof MeshSchema.Packet.Type, typeof MeshSchema.Packet.Type>
-
-    return {
-      webChannel: webChannel as WebChannel.WebChannel<typeof MeshSchema.Packet.Type, typeof MeshSchema.Packet.Type>,
-      from,
-    }
-  })

package/src/websocket-server.ts

@@ -1,40 +0,0 @@
-import type { Scope } from '@livestore/utils/effect'
-import { Effect } from '@livestore/utils/effect'
-import * as WebSocket from 'ws'
-
-import { makeMeshNode } from './node.js'
-import { makeWebSocketConnection } from './websocket-connection.js'
-
-export const makeWebSocketServer = ({
-  relayNodeName,
-}: {
-  relayNodeName: string
-}): Effect.Effect<WebSocket.WebSocketServer, never, Scope.Scope> =>
-  Effect.gen(function* () {
-    const server = new WebSocket.WebSocketServer({ noServer: true })
-
-    const node = yield* makeMeshNode(relayNodeName)
-
-    const runtime = yield* Effect.runtime<never>()
-
-    // TODO handle node disconnects (i.e. remove respective connection)
-    server.on('connection', (socket) => {
-      Effect.gen(function* () {
-        const { webChannel, from } = yield* makeWebSocketConnection(socket, { _tag: 'relay' })
-
-        yield* node.addConnection({ target: from, connectionChannel: webChannel, replaceIfExists: true })
-        yield* Effect.log(`WS Relay ${relayNodeName}: added connection from '${from}'`)
-
-        socket.addEventListener('close', () =>
-          Effect.gen(function* () {
-            yield* node.removeConnection(from)
-            yield* Effect.log(`WS Relay ${relayNodeName}: removed connection from '${from}'`)
-          }).pipe(Effect.provide(runtime), Effect.runFork),
-        )
-
-        yield* Effect.never
-      }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), Effect.runFork)
-    })
-
-    return server
-  })