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

package/dist/channel/message-channel.js

@@ -1,175 +1,140 @@
-import { casesHandled, shouldNeverHappen } from '@livestore/utils';
-import { Deferred, Effect, Either, Fiber, FiberHandle, Queue, Schedule, Stream, SubscriptionRef, WebChannel, } from '@livestore/utils/effect';
-import { packetAsOtelAttributes } from '../common.js';
-import * as MeshSchema from '../mesh-schema.js';
-export const makeMessageChannel = ({ nodeName, queue, newConnectionAvailablePubSub, target, checkTransferableConnections, channelName, schema, sendPacket, }) => Effect.gen(function* () {
-    const reconnectTriggerQueue = yield* Queue.unbounded();
-    const reconnect = Queue.offer(reconnectTriggerQueue, void 0);
-    const makeInitialState = Effect.gen(function* () {
-        const deferred = yield* Deferred.make();
-        return { _tag: 'Initial', deferred };
-    });
-    const channelStateRef = { current: yield* makeInitialState };
-    const makeMessageChannelInternal = Effect.gen(function* () {
-        const processMessagePacket = ({ packet, respondToSender }) => Effect.gen(function* () {
-            const channelState = channelStateRef.current;
-            // yield* Effect.log(`${nodeName}:processing packet ${packet._tag}, channel state: ${channelState._tag}`)
-            switch (packet._tag) {
-                // Since there can be concurrent MessageChannel responses from both sides,
-                // we need to decide which side's port we want to use and which side's port we want to ignore.
-                // This is only relevant in the case where both sides already sent their responses.
-                // In this case we're using the target name as a "tie breaker" to decide which side's port to use.
-                // We do this by sorting the target names lexicographically and use the first one as the winner.
-                case 'MessageChannelResponseSuccess': {
-                    if (channelState._tag === 'Initial') {
-                        return shouldNeverHappen(`Expected to find message channel request from ${target}, but was in ${channelState._tag} state`);
-                    }
-                    if (channelState._tag === 'Established') {
-                        const deferred = yield* Deferred.make();
-                        channelStateRef.current = { _tag: 'RequestSent', deferred };
-                        yield* reconnect;
-                        return;
+import { Cause, Deferred, Effect, Either, Exit, Option, Queue, Schema, Scope, Stream, TQueue, WebChannel, } from '@livestore/utils/effect';
+import { nanoid } from '@livestore/utils/nanoid';
+import * as WebmeshSchema from '../mesh-schema.js';
+import { makeMessageChannelInternal } from './message-channel-internal.js';
+/**
+ * Behaviour:
+ * - Waits until there is an initial edge
+ * - Automatically reconnects on disconnect
+ *
+ * Implementation notes:
+ * - We've split up the functionality into a wrapper channel and an internal channel.
+ * - The wrapper channel is responsible for:
+ *   - Forwarding send/listen messages to the internal channel (via a queue)
+ *   - Establishing the initial channel and reconnecting on disconnect
+ *     - Listening for new edges as a hint to reconnect if not already connected
+ *     - The wrapper channel maintains a edge counter which is used as the channel version
+ *
+ * If needed we can also implement further functionality (like heartbeat) in this wrapper channel.
+ */
+export const makeMessageChannel = ({ schema, newEdgeAvailablePubSub, channelName, checkTransferableEdges, nodeName, incomingPacketsQueue, target, sendPacket, }) => Effect.scopeWithCloseable((scope) => Effect.gen(function* () {
+    /** Only used to identify whether a source is the same instance to know when to reconnect */
+    const sourceId = nanoid();
+    const listenQueue = yield* Queue.unbounded();
+    const sendQueue = yield* TQueue.unbounded();
+    const initialEdgeDeferred = yield* Deferred.make();
+    const debugInfo = {
+        pendingSends: 0,
+        totalSends: 0,
+        connectCounter: 0,
+        isConnected: false,
+        innerChannelRef: { current: undefined },
+    };
+    // #region reconnect-loop
+    yield* Effect.gen(function* () {
+        const resultDeferred = yield* Deferred.make();
+        while (true) {
+            debugInfo.connectCounter++;
+            const channelVersion = debugInfo.connectCounter;
+            yield* Effect.spanEvent(`Connecting#${channelVersion}`);
+            const makeMessageChannelScope = yield* Scope.make();
+            // Attach the new scope to the parent scope
+            yield* Effect.addFinalizer((ex) => Scope.close(makeMessageChannelScope, ex));
+            /**
+             * Expected concurrency behaviour:
+             * - We're concurrently running the edge setup and the waitForNewEdgeFiber
+             * - Happy path:
+             *   - The edge setup succeeds and we can interrupt the waitForNewEdgeFiber
+             * - Tricky paths:
+             *   - While a edge is still being setup, we want to re-try when there is a new edge
+             *   - If the edge setup returns a `MessageChannelResponseNoTransferables` error,
+             *     we want to wait for a new edge and then re-try
+             * - Further notes:
+             *   - If the parent scope closes, we want to also interrupt both the edge setup and the waitForNewEdgeFiber
+             *   - We're creating a separate scope for each edge attempt, which
+             *     - we'll use to fork the message channel in which allows us to interrupt it later
+             *   - We need to make sure that "interruption" isn't "bubbling out"
+             */
+            const waitForNewEdgeFiber = yield* Stream.fromPubSub(newEdgeAvailablePubSub).pipe(Stream.tap((edgeName) => Effect.spanEvent(`new-conn:${edgeName}`)), Stream.take(1), Stream.runDrain, Effect.as('new-edge'), Effect.fork);
+            const makeChannel = makeMessageChannelInternal({
+                nodeName,
+                sourceId,
+                incomingPacketsQueue,
+                target,
+                checkTransferableEdges,
+                channelName,
+                schema,
+                channelVersion,
+                newEdgeAvailablePubSub,
+                sendPacket,
+                scope: makeMessageChannelScope,
+            }).pipe(Scope.extend(makeMessageChannelScope), Effect.forkIn(makeMessageChannelScope), 
+            // Given we only call `Effect.exit` later when joining the fiber,
+            // we don't want Effect to produce a "unhandled error" log message
+            Effect.withUnhandledErrorLogLevel(Option.none()));
+            const raceResult = yield* Effect.raceFirst(makeChannel, waitForNewEdgeFiber.pipe(Effect.disconnect));
+            if (raceResult === 'new-edge') {
+                yield* Scope.close(makeMessageChannelScope, Exit.fail('new-edge'));
+                // We'll try again
+            }
+            else {
+                const channelExit = yield* raceResult.pipe(Effect.exit);
+                if (channelExit._tag === 'Failure') {
+                    yield* Scope.close(makeMessageChannelScope, channelExit);
+                    if (Cause.isFailType(channelExit.cause) &&
+                        Schema.is(WebmeshSchema.MessageChannelResponseNoTransferables)(channelExit.cause.error)) {
+                        // Only retry when there is a new edge available
+                        yield* waitForNewEdgeFiber.pipe(Effect.exit);
                     }
-                    const thisSideAlsoResponded = channelState._tag === 'ResponseSent';
-                    const usePortFromThisSide = thisSideAlsoResponded && nodeName > target;
-                    yield* Effect.annotateCurrentSpan({ usePortFromThisSide });
-                    const winnerPort = usePortFromThisSide ? channelState.locallyCreatedPort : packet.port;
-                    yield* Deferred.succeed(channelState.deferred, winnerPort);
-                    return;
                 }
-                case 'MessageChannelResponseNoTransferables': {
-                    if (channelState._tag === 'Established')
-                        return;
-                    yield* Deferred.fail(channelState.deferred, packet);
-                    channelStateRef.current = yield* makeInitialState;
-                    return;
-                }
-                case 'MessageChannelRequest': {
-                    const mc = new MessageChannel();
-                    const shouldReconnect = channelState._tag === 'Established';
-                    const deferred = channelState._tag === 'Established'
-                        ? yield* Deferred.make()
-                        : channelState.deferred;
-                    channelStateRef.current = { _tag: 'ResponseSent', locallyCreatedPort: mc.port1, deferred };
-                    yield* respondToSender(MeshSchema.MessageChannelResponseSuccess.make({
-                        reqId: packet.id,
-                        target,
-                        source: nodeName,
-                        channelName: packet.channelName,
-                        hops: [],
-                        remainingHops: packet.hops,
-                        port: mc.port2,
-                    }));
-                    // If there's an established channel, we use the new request as a signal
-                    // to drop the old channel and use the new one
-                    if (shouldReconnect) {
-                        yield* reconnect;
-                    }
+                else {
+                    const channel = channelExit.value;
+                    yield* Deferred.succeed(resultDeferred, { channel, makeMessageChannelScope, channelVersion });
                     break;
                 }
-                default: {
-                    return casesHandled(packet);
-                }
-            }
-        }).pipe(Effect.withSpan(`handleMessagePacket:${packet._tag}:${packet.source}→${packet.target}`, {
-            attributes: packetAsOtelAttributes(packet),
-        }));
-        yield* Stream.fromQueue(queue).pipe(Stream.tap(processMessagePacket), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
-        const channelFromPort = (port) => Effect.gen(function* () {
-            channelStateRef.current = { _tag: 'Established' };
-            // NOTE to support re-connects we need to ack each message
-            const channel = yield* WebChannel.messagePortChannelWithAck({ port, schema });
-            return channel;
-        });
-        const channelState = channelStateRef.current;
-        if (channelState._tag === 'Initial' || channelState._tag === 'RequestSent') {
-            // Important to make a new deferred here as the old one might have been used already
-            // TODO model this better
-            const deferred = channelState._tag === 'RequestSent'
-                ? yield* Deferred.make()
-                : channelState.deferred;
-            channelStateRef.current = { _tag: 'RequestSent', deferred };
-            const connectionRequest = Effect.gen(function* () {
-                const packet = MeshSchema.MessageChannelRequest.make({ source: nodeName, target, channelName, hops: [] });
-                const noTransferableResponse = checkTransferableConnections(packet);
-                if (noTransferableResponse !== undefined) {
-                    yield* Effect.spanEvent(`No transferable connections found for ${packet.source}→${packet.target}`);
-                    yield* Deferred.fail(deferred, noTransferableResponse);
-                    return;
-                }
-                yield* sendPacket(packet);
-            });
-            yield* connectionRequest;
-            const retryOnNewConnectionFiber = yield* Stream.fromPubSub(newConnectionAvailablePubSub).pipe(Stream.tap(() => Effect.spanEvent(`RetryOnNewConnection`)), Stream.tap(() => connectionRequest), Stream.runDrain, Effect.forkScoped);
-            const portResult = yield* deferred.pipe(Effect.either);
-            yield* Fiber.interrupt(retryOnNewConnectionFiber);
-            if (portResult._tag === 'Right') {
-                return yield* channelFromPort(portResult.right);
-            }
-            else {
-                // We'll keep retrying with a new connection
-                yield* Stream.fromPubSub(newConnectionAvailablePubSub).pipe(Stream.take(1), Stream.runDrain);
-                yield* reconnect;
-                return yield* Effect.interrupt;
             }
         }
-        else {
-            // In this case we've already received a request from the other side (before we had a chance to send our request),
-            // so we already created a MessageChannel,responded with one port
-            // and are now using the other port to create the channel.
-            if (channelState._tag === 'ResponseSent') {
-                return yield* channelFromPort(channelState.locallyCreatedPort);
-            }
-            else {
-                return shouldNeverHappen(`Expected pending message channel to be in ResponseSent state, but was in ${channelState._tag} state`);
+        // Now we wait until the first channel is established
+        const { channel, makeMessageChannelScope, channelVersion } = yield* resultDeferred;
+        yield* Effect.spanEvent(`Connected#${channelVersion}`);
+        debugInfo.isConnected = true;
+        debugInfo.innerChannelRef.current = channel;
+        yield* Deferred.succeed(initialEdgeDeferred, void 0);
+        // We'll now forward all incoming messages to the listen queue
+        yield* channel.listen.pipe(Stream.flatten(), 
+        // Stream.tap((msg) => Effect.log(`${target}→${channelName}→${nodeName}:message:${msg.message}`)),
+        Stream.tapChunk((chunk) => Queue.offerAll(listenQueue, chunk)), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkIn(makeMessageChannelScope));
+        yield* Effect.gen(function* () {
+            while (true) {
+                const [msg, deferred] = yield* TQueue.peek(sendQueue);
+                // NOTE we don't need an explicit retry flow here since in case of the channel being closed,
+                // the send will never succeed. Meanwhile the send-loop fiber will be interrupted and
+                // given we only peeked at the queue, the message to send is still there.
+                yield* channel.send(msg);
+                yield* Deferred.succeed(deferred, void 0);
+                yield* TQueue.take(sendQueue); // Remove the message from the queue
             }
-        }
-    });
-    const internalChannelSref = yield* SubscriptionRef.make(false);
-    const listenQueue = yield* Queue.unbounded();
-    let connectCounter = 0;
-    const connect = Effect.gen(function* () {
-        const connectCount = ++connectCounter;
-        yield* Effect.spanEvent(`Connecting#${connectCount}`);
-        yield* SubscriptionRef.set(internalChannelSref, false);
-        yield* Effect.addFinalizer(() => Effect.spanEvent(`Disconnected#${connectCount}`));
-        const internalChannel = yield* makeMessageChannelInternal;
-        yield* SubscriptionRef.set(internalChannelSref, internalChannel);
-        yield* Effect.spanEvent(`Connected#${connectCount}`);
-        yield* internalChannel.listen.pipe(Stream.flatten(), Stream.tap((msg) => Queue.offer(listenQueue, msg)), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
-        yield* Effect.never;
-    }).pipe(Effect.scoped);
-    const fiberHandle = yield* FiberHandle.make();
-    const runConnect = Effect.gen(function* () {
-        // Cleanly shutdown the previous connection first
-        // Otherwise the old and new connection will "overlap"
-        yield* FiberHandle.clear(fiberHandle);
-        yield* FiberHandle.run(fiberHandle, connect);
-    });
-    yield* runConnect;
-    // Then listen for reconnects
-    yield* Stream.fromQueue(reconnectTriggerQueue).pipe(Stream.tap(() => runConnect), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
-    // Wait for the initial connection to be established or for an error to occur
-    yield* Effect.raceFirst(SubscriptionRef.waitUntil(internalChannelSref, (channel) => channel !== false), FiberHandle.join(fiberHandle));
+        }).pipe(Effect.forkIn(makeMessageChannelScope));
+        // Wait until the channel is closed and then try to reconnect
+        yield* channel.closedDeferred;
+        yield* Scope.close(makeMessageChannelScope, Exit.succeed('channel-closed'));
+        yield* Effect.spanEvent(`Disconnected#${channelVersion}`);
+        debugInfo.isConnected = false;
+        debugInfo.innerChannelRef.current = undefined;
+    }).pipe(Effect.scoped, // Additionally scoping here to clean up finalizers after each loop run
+    Effect.forever, Effect.tapCauseLogPretty, Effect.forkScoped);
+    // #endregion reconnect-loop
     const parentSpan = yield* Effect.currentSpan.pipe(Effect.orDie);
     const send = (message) => Effect.gen(function* () {
-        const sendFiberHandle = yield* FiberHandle.make();
         const sentDeferred = yield* Deferred.make();
-        const trySend = Effect.gen(function* () {
-            const channel = (yield* SubscriptionRef.waitUntil(internalChannelSref, (channel) => channel !== false));
-            const innerSend = Effect.gen(function* () {
-                yield* channel.send(message);
-                yield* Deferred.succeed(sentDeferred, void 0);
-            });
-            yield* innerSend.pipe(Effect.timeout(100), Effect.retry(Schedule.exponential(100)), Effect.orDie);
-        }).pipe(Effect.tapErrorCause(Effect.logError));
-        const rerunOnNewChannelFiber = yield* internalChannelSref.changes.pipe(Stream.filter((_) => _ === false), Stream.tap(() => FiberHandle.run(sendFiberHandle, trySend)), Stream.runDrain, Effect.fork);
-        yield* FiberHandle.run(sendFiberHandle, trySend);
+        debugInfo.pendingSends++;
+        debugInfo.totalSends++;
+        yield* TQueue.offer(sendQueue, [message, sentDeferred]);
         yield* sentDeferred;
-        yield* Fiber.interrupt(rerunOnNewChannelFiber);
+        debugInfo.pendingSends--;
     }).pipe(Effect.scoped, Effect.withParentSpan(parentSpan));
-    const listen = Stream.fromQueue(listenQueue).pipe(Stream.map(Either.right));
-    const closedDeferred = yield* Deferred.make();
+    const listen = Stream.fromQueue(listenQueue, { maxChunkSize: 1 }).pipe(Stream.map(Either.right));
+    const closedDeferred = yield* Deferred.make().pipe(Effect.acquireRelease(Deferred.done(Exit.void)));
     const webChannel = {
         [WebChannel.WebChannelSymbol]: WebChannel.WebChannelSymbol,
         send,
@@ -177,7 +142,12 @@ export const makeMessageChannel = ({ nodeName, queue, newConnectionAvailablePubS
         closedDeferred,
         supportsTransferables: true,
         schema,
+        debugInfo,
+        shutdown: Scope.close(scope, Exit.succeed('shutdown')),
+    };
+    return {
+        webChannel: webChannel,
+        initialEdgeDeferred,
     };
-    return webChannel;
-}).pipe(Effect.withSpanScoped('makeMessageChannel'));
+}));
 //# sourceMappingURL=message-channel.js.map

package/dist/channel/message-channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-channel.js","sourceRoot":"","sources":["../../src/channel/message-channel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message-channel.js","sourceRoot":"","sources":["../../src/channel/message-channel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,EACN,IAAI,EACJ,MAAM,EACN,KAAK,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,GACX,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AAE1E;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,MAAM,EACN,sBAAsB,EACtB,WAAW,EACX,sBAAsB,EACtB,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,UAAU,GACa,EAAE,EAAE,CAC3B,MAAM,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,EAAE,CAClC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,4FAA4F;IAC5F,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAA;IAEzB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,EAAO,CAAA;IACjD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,EAAiD,CAAA;IAE1F,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;IAExD,MAAM,SAAS,GAAG;QAChB,YAAY,EAAE,CAAC;QACf,UAAU,EAAE,CAAC;QACb,cAAc,EAAE,CAAC;QACjB,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,EAAE,OAAO,EAAE,SAAwD,EAAE;KACvF,CAAA;IAED,yBAAyB;IACzB,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAIvC,CAAA;QAEJ,OAAO,IAAI,EAAE,CAAC;YACZ,SAAS,CAAC,cAAc,EAAE,CAAA;YAC1B,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,CAAA;YAE/C,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,cAAc,EAAE,CAAC,CAAA;YAEvD,MAAM,uBAAuB,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;YACnD,2CAA2C;YAC3C,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAA;YAE5E;;;;;;;;;;;;;;eAcG;YACH,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAC/E,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC,EAClE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EACd,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,EAAE,CAAC,UAAmB,CAAC,EAC9B,MAAM,CAAC,IAAI,CACZ,CAAA;YAED,MAAM,WAAW,GAAG,0BAA0B,CAAC;gBAC7C,QAAQ;gBACR,QAAQ;gBACR,oBAAoB;gBACpB,MAAM;gBACN,sBAAsB;gBACtB,WAAW;gBACX,MAAM;gBACN,cAAc;gBACd,sBAAsB;gBACtB,UAAU;gBACV,KAAK,EAAE,uBAAuB;aAC/B,CAAC,CAAC,IAAI,CACL,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,EACrC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;YACtC,iEAAiE;YACjE,kEAAkE;YAClE,MAAM,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CACjD,CAAA;YAED,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;YAEpG,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;gBAC9B,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;gBAClE,kBAAkB;YACpB,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACvD,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACnC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAA;oBAExD,IACE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC;wBACnC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,qCAAqC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,EACvF,CAAC;wBACD,gDAAgD;wBAChD,KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBAC9C,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAA;oBAEjC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,CAAC,CAAA;oBAC7F,MAAK;gBACP,CAAC;YACH,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,CAAC,cAAc,CAAA;QAElF,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,cAAc,EAAE,CAAC,CAAA;QACtD,SAAS,CAAC,WAAW,GAAG,IAAI,CAAA;QAC5B,SAAS,CAAC,eAAe,CAAC,OAAO,GAAG,OAAO,CAAA;QAE3C,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAA;QAEpD,8DAA8D;QAC9D,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CACxB,MAAM,CAAC,OAAO,EAAE;QAChB,kGAAkG;QAClG,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,EAC9D,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CACvC,CAAA;QAED,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACzB,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACrD,4FAA4F;gBAC5F,qFAAqF;gBACrF,yEAAyE;gBACzE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACxB,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;gBACzC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA,CAAC,oCAAoC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAA;QAE/C,6DAA6D;QAC7D,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAA;QAE7B,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAA;QAE3E,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,cAAc,EAAE,CAAC,CAAA;QACzD,SAAS,CAAC,WAAW,GAAG,KAAK,CAAA;QAC7B,SAAS,CAAC,eAAe,CAAC,OAAO,GAAG,SAAS,CAAA;IAC/C,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM,EAAE,uEAAuE;IACtF,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,UAAU,CAClB,CAAA;IACD,4BAA4B;IAE5B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAE/D,MAAM,IAAI,GAAG,CAAC,OAAY,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;QAEjD,SAAS,CAAC,YAAY,EAAE,CAAA;QACxB,SAAS,CAAC,UAAU,EAAE,CAAA;QAEtB,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;QAEvD,KAAK,CAAC,CAAC,YAAY,CAAA;QAEnB,SAAS,CAAC,YAAY,EAAE,CAAA;IAC1B,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAA;IAE3D,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAEhG,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAEzG,MAAM,UAAU,GAAG;QACjB,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAC,gBAAgB;QAC1D,IAAI;QACJ,MAAM;QACN,cAAc;QACd,qBAAqB,EAAE,IAAI;QAC3B,MAAM;QACN,SAAS;QACT,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KACb,CAAA;IAE3C,OAAO;QACL,UAAU,EAAE,UAA6C;QACzD,mBAAmB;KACpB,CAAA;AACH,CAAC,CAAC,CACH,CAAA"}

package/dist/channel/proxy-channel.d.ts

@@ -1,11 +1,11 @@
 import type { PubSub } from '@livestore/utils/effect';
-import { Effect, Queue, Schema, WebChannel } from '@livestore/utils/effect';
+import { Effect, Queue, Schema, Scope, WebChannel } from '@livestore/utils/effect';
 import { type ChannelName, type MeshNodeName, type ProxyQueueItem } from '../common.js';
 import * as MeshSchema from '../mesh-schema.js';
 interface MakeProxyChannelArgs {
     queue: Queue.Queue<ProxyQueueItem>;
     nodeName: MeshNodeName;
-    newConnectionAvailablePubSub: PubSub.PubSub<MeshNodeName>;
+    newEdgeAvailablePubSub: PubSub.PubSub<MeshNodeName>;
     sendPacket: (packet: typeof MeshSchema.ProxyChannelPacket.Type) => Effect.Effect<void>;
     channelName: ChannelName;
     target: MeshNodeName;
@@ -14,6 +14,6 @@ interface MakeProxyChannelArgs {
         listen: Schema.Schema<any, any>;
     };
 }
-export declare const makeProxyChannel: ({ queue, nodeName, newConnectionAvailablePubSub, sendPacket, target, channelName, schema, }: MakeProxyChannelArgs) => Effect.Effect<WebChannel.WebChannel<any, any, never>, never, import("effect/Scope").Scope>;
+export declare const makeProxyChannel: ({ queue, nodeName, newEdgeAvailablePubSub, sendPacket, target, channelName, schema, }: MakeProxyChannelArgs) => Effect.Effect<WebChannel.WebChannel<any, any, never>, never, Scope.Scope>;
 export {};
 //# sourceMappingURL=proxy-channel.d.ts.map

package/dist/channel/proxy-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-channel.d.ts","sourceRoot":"","sources":["../../src/channel/proxy-channel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAEL,MAAM,EAIN,KAAK,EAEL,MAAM,EAGN,UAAU,EACX,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,YAAY,EAEjB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,UAAU,oBAAoB;IAC5B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAClC,QAAQ,EAAE,YAAY,CAAA;IACtB,4BAA4B,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IACzD,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,UAAU,CAAC,kBAAkB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACtF,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KAChC,CAAA;CACF;AAED,eAAO,MAAM,gBAAgB,gGAQ1B,oBAAoB,+FA4R6B,CAAA"}
+{"version":3,"file":"proxy-channel.d.ts","sourceRoot":"","sources":["../../src/channel/proxy-channel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAEL,MAAM,EAKN,KAAK,EAEL,MAAM,EACN,KAAK,EAGL,UAAU,EACX,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,YAAY,EAEjB,KAAK,cAAc,EACpB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,UAAU,oBAAoB;IAC5B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;IAClC,QAAQ,EAAE,YAAY,CAAA;IACtB,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IACnD,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,UAAU,CAAC,kBAAkB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACtF,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KAChC,CAAA;CACF;AAED,eAAO,MAAM,gBAAgB,GAAI,uFAQ9B,oBAAoB,8EAsTpB,CAAA"}

package/dist/channel/proxy-channel.js

@@ -1,10 +1,16 @@
 import { casesHandled, shouldNeverHappen } from '@livestore/utils';
-import { Deferred, Effect, Either, Fiber, FiberHandle, Queue, Schedule, Schema, Stream, SubscriptionRef, WebChannel, } from '@livestore/utils/effect';
+import { Deferred, Effect, Either, Exit, Fiber, FiberHandle, Queue, Schedule, Schema, Scope, Stream, SubscriptionRef, WebChannel, } from '@livestore/utils/effect';
 import { nanoid } from '@livestore/utils/nanoid';
 import { packetAsOtelAttributes, } from '../common.js';
 import * as MeshSchema from '../mesh-schema.js';
-export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub, sendPacket, target, channelName, schema, }) => Effect.gen(function* () {
+export const makeProxyChannel = ({ queue, nodeName, newEdgeAvailablePubSub, sendPacket, target, channelName, schema, }) => Effect.scopeWithCloseable((scope) => Effect.gen(function* () {
     const channelStateRef = { current: { _tag: 'Initial' } };
+    const debugInfo = {
+        pendingSends: 0,
+        totalSends: 0,
+        connectCounter: 0,
+        isConnected: false,
+    };
     /**
      * We need to unique identify a channel as multiple channels might exist between the same two nodes.
      * We do this by letting each channel end generate a unique id and then combining them in a deterministic way.
@@ -18,7 +24,7 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
         return state;
     });
     const setStateToEstablished = (channelId) => Effect.gen(function* () {
-        // TODO avoid "double" `Connected` events (we might call `setStateToEstablished` twice during initial connection)
+        // TODO avoid "double" `Connected` events (we might call `setStateToEstablished` twice during initial edge)
         yield* Effect.spanEvent(`Connected (${channelId})`).pipe(Effect.withParentSpan(channelSpan));
         channelStateRef.current = {
             _tag: 'Established',
@@ -28,13 +34,14 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
             combinedChannelId: channelId,
         };
         yield* SubscriptionRef.set(connectedStateRef, channelStateRef.current);
+        debugInfo.isConnected = true;
     });
-    const connectionRequest = Effect.suspend(() => sendPacket(MeshSchema.ProxyChannelRequest.make({ channelName, hops: [], source: nodeName, target, channelIdCandidate })));
+    const edgeRequest = Effect.suspend(() => sendPacket(MeshSchema.ProxyChannelRequest.make({ channelName, hops: [], source: nodeName, target, channelIdCandidate })));
     const getCombinedChannelId = (otherSideChannelIdCandidate) => [channelIdCandidate, otherSideChannelIdCandidate].sort().join('_');
     const processProxyPacket = ({ packet, respondToSender }) => Effect.gen(function* () {
         // yield* Effect.log(`${nodeName}:processing packet ${packet._tag} from ${packet.source}`)
         const otherSideName = packet.source;
-        const channelKey = `${otherSideName}-${packet.channelName}`;
+        const channelKey = `target:${otherSideName}, channelName:${packet.channelName}`;
         const channelState = channelStateRef.current;
         switch (packet._tag) {
             case 'ProxyChannelRequest': {
@@ -43,9 +50,11 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
                     yield* SubscriptionRef.set(connectedStateRef, false);
                     channelStateRef.current = { _tag: 'Pending', initiatedVia: 'incoming-request' };
                     yield* Effect.spanEvent(`Reconnecting`).pipe(Effect.withParentSpan(channelSpan));
-                    // If we're already connected, we need to re-establish the connection
+                    debugInfo.isConnected = false;
+                    debugInfo.connectCounter++;
+                    // If we're already connected, we need to re-establish the edge
                     if (channelState._tag === 'Established' && channelState.combinedChannelId !== combinedChannelId) {
-                        yield* connectionRequest;
+                        yield* edgeRequest;
                     }
                 }
                 yield* respondToSender(MeshSchema.ProxyChannelResponseSuccess.make({
@@ -63,8 +72,9 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
             case 'ProxyChannelResponseSuccess': {
                 if (channelState._tag !== 'Pending') {
                     // return shouldNeverHappen(`Expected proxy channel to be pending but got ${channelState._tag}`)
-                    if (channelState._tag === 'Established' && channelState.combinedChannelId !== packet.combinedChannelId) {
-                        return shouldNeverHappen(`Expected proxy channel to have the same combinedChannelId as the packet:\n${channelState.combinedChannelId} (channel) === ${packet.combinedChannelId} (packet)`);
+                    if (channelState._tag === 'Established' &&
+                        channelState.combinedChannelId !== packet.combinedChannelId) {
+                        return shouldNeverHappen(`ProxyChannel[${channelKey}]: Expected proxy channel to have the same combinedChannelId as the packet:\n${channelState.combinedChannelId} (channel) === ${packet.combinedChannelId} (packet)`);
                     }
                     else {
                         // for now just ignore it but should be looked into (there seems to be some kind of race condition/inefficiency)
@@ -72,7 +82,7 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
                 }
                 const combinedChannelId = getCombinedChannelId(packet.channelIdCandidate);
                 if (combinedChannelId !== packet.combinedChannelId) {
-                    return yield* Effect.die(`Expected proxy channel to have the same combinedChannelId as the packet:\n${combinedChannelId} (channel) === ${packet.combinedChannelId} (packet)`);
+                    return yield* Effect.die(`ProxyChannel[${channelKey}]: Expected proxy channel to have the same combinedChannelId as the packet:\n${combinedChannelId} (channel) === ${packet.combinedChannelId} (packet)`);
                 }
                 yield* setStateToEstablished(packet.combinedChannelId);
                 return;
@@ -84,7 +94,7 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
                     return;
                 }
                 if (channelState.combinedChannelId !== packet.combinedChannelId) {
-                    return yield* Effect.die(`Expected proxy channel to have the same combinedChannelId as the packet:\n${channelState.combinedChannelId} (channel) === ${packet.combinedChannelId} (packet)`);
+                    return yield* Effect.die(`ProxyChannel[${channelKey}]: Expected proxy channel to have the same combinedChannelId as the packet:\n${channelState.combinedChannelId} (channel) === ${packet.combinedChannelId} (packet)`);
                 }
                 yield* respondToSender(MeshSchema.ProxyChannelPayloadAck.make({
                     reqId: packet.id,
@@ -105,7 +115,7 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
                     return;
                 }
                 const ack = channelState.ackMap.get(packet.reqId) ??
-                    shouldNeverHappen(`Expected ack for ${packet.reqId} in proxy channel ${channelKey}`);
+                    shouldNeverHappen(`[ProxyChannel[${channelKey}]] Expected ack for ${packet.reqId}`);
                 yield* Deferred.succeed(ack, void 0);
                 channelState.ackMap.delete(packet.reqId);
                 return;
@@ -122,23 +132,25 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
     yield* Effect.spanEvent(`Connecting`);
     const ackMap = new Map();
     // check if already established via incoming `ProxyChannelRequest` from other side
-    // which indicates we already have a connection to the target node
+    // which indicates we already have a edge to the target node
     // const channelState = channelStateRef.current
     {
         if (channelStateRef.current._tag !== 'Initial') {
             return shouldNeverHappen('Expected proxy channel to be Initial');
         }
         channelStateRef.current = { _tag: 'Pending', initiatedVia: 'outgoing-request' };
-        yield* connectionRequest;
-        const retryOnNewConnectionFiber = yield* Stream.fromPubSub(newConnectionAvailablePubSub).pipe(Stream.tap(() => connectionRequest), Stream.runDrain, Effect.forkScoped);
+        yield* edgeRequest;
+        const retryOnNewEdgeFiber = yield* Stream.fromPubSub(newEdgeAvailablePubSub).pipe(Stream.tap(() => edgeRequest), Stream.runDrain, Effect.forkScoped);
         const { combinedChannelId: channelId } = yield* waitForEstablished;
-        yield* Fiber.interrupt(retryOnNewConnectionFiber);
+        yield* Fiber.interrupt(retryOnNewEdgeFiber);
         yield* setStateToEstablished(channelId);
     }
     const send = (message) => Effect.gen(function* () {
         const payload = yield* Schema.encodeUnknown(schema.send)(message);
         const sendFiberHandle = yield* FiberHandle.make();
         const sentDeferred = yield* Deferred.make();
+        debugInfo.pendingSends++;
+        debugInfo.totalSends++;
         const trySend = Effect.gen(function* () {
             const { combinedChannelId } = (yield* SubscriptionRef.waitUntil(connectedStateRef, (channel) => channel !== false));
             const innerSend = Effect.gen(function* () {
@@ -152,12 +164,17 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
                     target,
                     combinedChannelId,
                 });
+                // TODO consider handling previous ackMap entries which might leak/fill-up memory
+                // as only successful acks are removed from the map
                 ackMap.set(packet.id, ack);
                 yield* sendPacket(packet);
                 yield* ack;
                 yield* Deferred.succeed(sentDeferred, void 0);
+                debugInfo.pendingSends--;
             });
-            yield* innerSend.pipe(Effect.timeout(100), Effect.retry(Schedule.exponential(100)), Effect.orDie);
+            // TODO make this configurable
+            // Schedule.exponential(10): 10, 20, 40, 80, 160, 320, ...
+            yield* innerSend.pipe(Effect.timeout(100), Effect.retry(Schedule.exponential(10)), Effect.orDie);
         }).pipe(Effect.tapErrorCause(Effect.logError));
         const rerunOnNewChannelFiber = yield* connectedStateRef.changes.pipe(Stream.filter((_) => _ === false), Stream.tap(() => FiberHandle.run(sendFiberHandle, trySend)), Stream.runDrain, Effect.fork);
         yield* FiberHandle.run(sendFiberHandle, trySend);
@@ -165,7 +182,7 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
         yield* Fiber.interrupt(rerunOnNewChannelFiber);
     }).pipe(Effect.scoped, Effect.withSpan(`sendAckWithRetry:ProxyChannelPayload`), Effect.withParentSpan(channelSpan));
     const listen = Stream.fromQueue(listenQueue).pipe(Stream.map(Either.right));
-    const closedDeferred = yield* Deferred.make();
+    const closedDeferred = yield* Deferred.make().pipe(Effect.acquireRelease(Deferred.done(Exit.void)));
     const webChannel = {
         [WebChannel.WebChannelSymbol]: WebChannel.WebChannelSymbol,
         send,
@@ -173,7 +190,9 @@ export const makeProxyChannel = ({ queue, nodeName, newConnectionAvailablePubSub
         closedDeferred,
         supportsTransferables: true,
         schema,
+        shutdown: Scope.close(scope, Exit.void),
+        debugInfo,
     };
     return webChannel;
-}).pipe(Effect.withSpanScoped('makeProxyChannel'));
+}).pipe(Effect.withSpanScoped('makeProxyChannel')));
 //# sourceMappingURL=proxy-channel.js.map