@livestore/webmesh 0.3.0-dev.22 → 0.3.0-dev.24

package/src/websocket-edge.ts

@@ -1,17 +1,18 @@
+import type { HttpClient } from '@livestore/utils/effect'
 import {
   Deferred,
   Effect,
   Either,
   Exit,
+  Layer,
   Queue,
   Schedule,
   Schema,
   Scope,
+  Socket,
   Stream,
   WebChannel,
-  WebSocket,
 } from '@livestore/utils/effect'
-import type * as NodeWebSocket from 'ws'
 
 import * as WebmeshSchema from './mesh-schema.js'
 import type { MeshNode } from './node.js'
@@ -41,41 +42,49 @@ export type SocketType =
 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.Effect<void, never, Scope.Scope | HttpClient.HttpClient> =>
   Effect.gen(function* () {
     const disconnected = yield* Deferred.make<void>()
 
-    const socket = yield* WebSocket.makeWebSocket({ url, reconnect })
+    const socket = yield* Socket.makeWebSocket(url, { openTimeout: 50 })
 
-    socket.addEventListener('close', () => Deferred.unsafeDone(disconnected, Exit.void))
+    const edgeChannel = yield* makeWebSocketEdge({
+      socket,
+      socketType: { _tag: 'leaf', from: node.nodeName },
+    })
 
-    const edgeChannel = yield* makeWebSocketEdge(socket, { _tag: 'leaf', from: node.nodeName })
-
-    yield* node.addEdge({ target: 'ws', edgeChannel: edgeChannel.webChannel, replaceIfExists: true })
+    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.catchTag('WebSocketError', Effect.orDie))
+  }).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: globalThis.WebSocket | NodeWebSocket.WebSocket,
-  socketType: SocketType,
-): Effect.Effect<
+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
+  Scope.Scope | HttpClient.HttpClient
 > =>
   Effect.scopeWithCloseable((scope) =>
     Effect.gen(function* () {
-      socket.binaryType = 'arraybuffer'
-
       const fromDeferred = yield* Deferred.make<string>()
 
       const listenQueue = yield* Queue.unbounded<typeof WebmeshSchema.Packet.Type>().pipe(
@@ -84,11 +93,32 @@ export const makeWebSocketEdge = (
 
       const schema = WebChannel.mapSchema(WebmeshSchema.Packet)
 
-      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* () {
+      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 {
@@ -99,45 +129,33 @@ export const makeWebSocketEdge = (
         ),
         Stream.runDrain,
         Effect.interruptible,
+        Effect.withSpan('makeWebSocketEdge:listen'),
         Effect.tapCauseLogPretty,
         Effect.forkScoped,
       )
 
+      const sendToSocket = yield* socket.writer
+
       const initHandshake = (from: string) =>
-        socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgeInit', from }))
+        sendToSocket(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgeInit', from }))
 
       if (socketType._tag === 'leaf') {
-        initHandshake(socketType.from)
+        yield* initHandshake(socketType.from)
       }
 
       const deferredResult = yield* fromDeferred
       const from = socketType._tag === 'leaf' ? socketType.from : deferredResult
 
       if (socketType._tag === 'relay') {
-        initHandshake(from)
+        yield* initHandshake(from)
       }
 
-      const isConnectedLatch = yield* Effect.makeLatch(true)
-
-      const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))
-
-      yield* Effect.eventListener<any>(
-        socket,
-        'close',
-        () =>
-          Effect.gen(function* () {
-            yield* isConnectedLatch.close
-            yield* Deferred.succeed(closedDeferred, undefined)
-          }),
-        { once: true },
-      )
-
       const send = (message: typeof WebmeshSchema.Packet.Type) =>
         Effect.gen(function* () {
           yield* isConnectedLatch.await
           const payload = yield* Schema.encode(schema.send)(message)
-          socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgePayload', payload, from }))
-        })
+          yield* sendToSocket(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgePayload', payload, from }))
+        }).pipe(Effect.orDie)
 
       const listen = Stream.fromQueue(listenQueue).pipe(
         Stream.map(Either.right),
@@ -155,5 +173,5 @@ export const makeWebSocketEdge = (
       } satisfies WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>
 
       return { webChannel, from }
-    }).pipe(Effect.withSpanScoped('makeWebSocketEdge')),
+    }).pipe(Effect.withSpanScoped('makeWebSocketEdge'), Effect.orDie),
   )

package/dist/websocket-connection.d.ts

@@ -1,50 +0,0 @@
-import { Effect, Schedule, Schema, Scope, WebChannel } from '@livestore/utils/effect';
-import type * as NodeWebSocket from 'ws';
-import * as WebmeshSchema 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<typeof Schema.Uint8ArrayFromSelf, 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 makeWebSocketEdge: (socket: globalThis.WebSocket | NodeWebSocket.WebSocket, socketType: SocketType) => Effect.Effect<{
-    webChannel: WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.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,EAEL,MAAM,EAIN,QAAQ,EACR,MAAM,EACN,KAAK,EAEL,UAAU,EAEX,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,KAAK,aAAa,MAAM,IAAI,CAAA;AAExC,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,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,GAAI,2BAIjC;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,CAa+C,CAAA;AAEzF,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,UAAU,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,EACtD,YAAY,UAAU,KACrB,MAAM,CAAC,MAAM,CACd;IACE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrG,IAAI,EAAE,MAAM,CAAA;CACb,EACD,KAAK,EACL,KAAK,CAAC,KAAK,CAsFV,CAAA"}

package/dist/websocket-connection.js

@@ -1,69 +0,0 @@
-import { Deferred, Effect, Either, Exit, Queue, Schedule, Schema, Scope, Stream, WebChannel, WebSocket, } from '@livestore/utils/effect';
-import * as WebmeshSchema 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 disconnected = yield* Deferred.make();
-    const socket = yield* WebSocket.makeWebSocket({ url, reconnect });
-    socket.addEventListener('close', () => Deferred.unsafeDone(disconnected, Exit.void));
-    const edgeChannel = yield* makeWebSocketEdge(socket, { _tag: 'leaf', from: node.nodeName });
-    yield* node.addEdge({ target: 'ws', edgeChannel: edgeChannel.webChannel, replaceIfExists: true });
-    yield* disconnected;
-}).pipe(Effect.scoped, Effect.forever, Effect.catchTag('WebSocketError', Effect.orDie));
-export const makeWebSocketEdge = (socket, socketType) => Effect.scopeWithCloseable((scope) => Effect.gen(function* () {
-    socket.binaryType = 'arraybuffer';
-    const fromDeferred = yield* Deferred.make();
-    const listenQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
-    const schema = WebChannel.mapSchema(WebmeshSchema.Packet);
-    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(schema.listen)(msg.payload);
-            yield* Queue.offer(listenQueue, decodedPayload);
-        }
-    })), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
-    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().pipe(Effect.acquireRelease(Deferred.done(Exit.void)));
-    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(schema.send)(message);
-        socket.send(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSConnectionPayload', payload, from }));
-    });
-    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),
-    };
-    return { webChannel, from };
-}).pipe(Effect.withSpanScoped('makeWebSocketEdge')));
-//# 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":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAY,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAK/B,eAAO,MAAM,mBAAmB,GAAI,oBAEjC;IACD,aAAa,EAAE,MAAM,CAAA;CACtB,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CA4C3D,CAAA"}

package/dist/websocket-server.js

@@ -1,38 +0,0 @@
-import { UnexpectedError } from '@livestore/common';
-import { Effect, FiberSet } from '@livestore/utils/effect';
-import * as WebSocket from 'ws';
-import { makeMeshNode } from './node.js';
-import { makeWebSocketEdge } from './websocket-edge.js';
-export const makeWebSocketServer = ({ relayNodeName, }) => Effect.gen(function* () {
-    const server = new WebSocket.WebSocketServer({ noServer: true });
-    yield* Effect.addFinalizer(() => Effect.async((cb) => {
-        server.close((cause) => {
-            if (cause) {
-                cb(Effect.fail(UnexpectedError.make({ cause })));
-            }
-            else {
-                server.removeAllListeners();
-                server.clients.forEach((client) => client.terminate());
-                cb(Effect.succeed(undefined));
-            }
-        });
-    }).pipe(Effect.orDie));
-    const node = yield* makeMeshNode(relayNodeName);
-    const runtime = yield* Effect.runtime();
-    const fiberSet = yield* FiberSet.make();
-    // TODO handle node disconnects (i.e. remove respective connection)
-    server.on('connection', (socket) => {
-        Effect.gen(function* () {
-            const { webChannel, from } = yield* makeWebSocketEdge(socket, { _tag: 'relay' });
-            yield* node.addEdge({ target: from, edgeChannel: webChannel, replaceIfExists: true });
-            yield* Effect.log(`WS Relay ${relayNodeName}: added edge from '${from}'`);
-            socket.addEventListener('close', () => Effect.gen(function* () {
-                yield* node.removeEdge(from);
-                yield* Effect.log(`WS Relay ${relayNodeName}: removed edge from '${from}'`);
-            }).pipe(Effect.provide(runtime), Effect.tapCauseLogPretty, Effect.runFork));
-            yield* Effect.never;
-        }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), FiberSet.run(fiberSet), 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":"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"}

package/src/websocket-server.ts

@@ -1,57 +0,0 @@
-import { UnexpectedError } from '@livestore/common'
-import type { Scope } from '@livestore/utils/effect'
-import { Effect, FiberSet } from '@livestore/utils/effect'
-import * as WebSocket from 'ws'
-
-import { makeMeshNode } from './node.js'
-import { makeWebSocketEdge } from './websocket-edge.js'
-
-export const makeWebSocketServer = ({
-  relayNodeName,
-}: {
-  relayNodeName: string
-}): Effect.Effect<WebSocket.WebSocketServer, never, Scope.Scope> =>
-  Effect.gen(function* () {
-    const server = new WebSocket.WebSocketServer({ noServer: true })
-
-    yield* Effect.addFinalizer(() =>
-      Effect.async<void, UnexpectedError>((cb) => {
-        server.close((cause) => {
-          if (cause) {
-            cb(Effect.fail(UnexpectedError.make({ cause })))
-          } else {
-            server.removeAllListeners()
-            server.clients.forEach((client) => client.terminate())
-            cb(Effect.succeed(undefined))
-          }
-        })
-      }).pipe(Effect.orDie),
-    )
-
-    const node = yield* makeMeshNode(relayNodeName)
-
-    const runtime = yield* Effect.runtime<never>()
-
-    const fiberSet = yield* FiberSet.make()
-
-    // TODO handle node disconnects (i.e. remove respective connection)
-    server.on('connection', (socket) => {
-      Effect.gen(function* () {
-        const { webChannel, from } = yield* makeWebSocketEdge(socket, { _tag: 'relay' })
-
-        yield* node.addEdge({ target: from, edgeChannel: webChannel, replaceIfExists: true })
-        yield* Effect.log(`WS Relay ${relayNodeName}: added edge from '${from}'`)
-
-        socket.addEventListener('close', () =>
-          Effect.gen(function* () {
-            yield* node.removeEdge(from)
-            yield* Effect.log(`WS Relay ${relayNodeName}: removed edge from '${from}'`)
-          }).pipe(Effect.provide(runtime), Effect.tapCauseLogPretty, Effect.runFork),
-        )
-
-        yield* Effect.never
-      }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), FiberSet.run(fiberSet), Effect.runFork)
-    })
-
-    return server
-  })