@livestore/webmesh 0.0.0-snapshot-1d99fea7d2ce2c7a5d9ed0a3752f8a7bda6bc3db → 0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230

package/dist/channel/message-channel-internal.d.ts

@@ -0,0 +1,26 @@
+import type { PubSub } from '@livestore/utils/effect';
+import { Effect, Queue, Scope, WebChannel } from '@livestore/utils/effect';
+import { type ChannelName, type MeshNodeName, type MessageQueueItem } from '../common.js';
+import * as MeshSchema from '../mesh-schema.js';
+export interface MakeMessageChannelArgs {
+    nodeName: MeshNodeName;
+    /** Queue of incoming messages for this channel */
+    incomingPacketsQueue: Queue.Queue<MessageQueueItem>;
+    newConnectionAvailablePubSub: PubSub.PubSub<MeshNodeName>;
+    channelName: ChannelName;
+    target: MeshNodeName;
+    sendPacket: (packet: typeof MeshSchema.MessageChannelPacket.Type) => Effect.Effect<void>;
+    checkTransferableConnections: (packet: typeof MeshSchema.MessageChannelPacket.Type) => typeof MeshSchema.MessageChannelResponseNoTransferables.Type | undefined;
+    schema: WebChannel.OutputSchema<any, any, any, any>;
+}
+/**
+ * The channel version is important here, as a channel will only be established once both sides have the same version.
+ * The version is used to avoid concurrency issues where both sides have different incompatible message ports.
+ */
+export declare const makeMessageChannelInternal: ({ nodeName, incomingPacketsQueue, target, checkTransferableConnections, channelName, schema: schema_, sendPacket, channelVersion, scope, sourceId, }: MakeMessageChannelArgs & {
+    channelVersion: number;
+    /** We're passing in the closeable scope from the wrapping message channel */
+    scope: Scope.CloseableScope;
+    sourceId: string;
+}) => Effect.Effect<WebChannel.WebChannel<any, any>, typeof MeshSchema.MessageChannelResponseNoTransferables.Type, Scope.Scope>;
+//# sourceMappingURL=message-channel-internal.d.ts.map

package/dist/channel/message-channel-internal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-channel-internal.d.ts","sourceRoot":"","sources":["../../src/channel/message-channel-internal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAEL,MAAM,EAIN,KAAK,EAEL,KAAK,EAEL,UAAU,EACX,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAA0B,MAAM,cAAc,CAAA;AACjH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,YAAY,CAAA;IACtB,kDAAkD;IAClD,oBAAoB,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACnD,4BAA4B,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IACzD,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,YAAY,CAAA;IACpB,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,UAAU,CAAC,oBAAoB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxF,4BAA4B,EAAE,CAC5B,MAAM,EAAE,OAAO,UAAU,CAAC,oBAAoB,CAAC,IAAI,KAChD,OAAO,UAAU,CAAC,qCAAqC,CAAC,IAAI,GAAG,SAAS,CAAA;IAC7E,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;CACpD;AAOD;;;GAGG;AACH,eAAO,MAAM,0BAA0B,yJAWpC,sBAAsB,GAAG;IAC1B,cAAc,EAAE,MAAM,CAAA;IACtB,6EAA6E;IAC7E,KAAK,EAAE,KAAK,CAAC,cAAc,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;CACjB,KAAG,MAAM,CAAC,MAAM,CACf,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAC/B,OAAO,UAAU,CAAC,qCAAqC,CAAC,IAAI,EAC5D,KAAK,CAAC,KAAK,CAoR2D,CAAA"}

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

@@ -0,0 +1,202 @@
+import { casesHandled, shouldNeverHappen } from '@livestore/utils';
+import { Deferred, Effect, Exit, OtelTracer, Predicate, Queue, Schema, Scope, Stream, WebChannel, } from '@livestore/utils/effect';
+import { packetAsOtelAttributes } from '../common.js';
+import * as MeshSchema from '../mesh-schema.js';
+const makeDeferredResult = (Deferred.make);
+/**
+ * The channel version is important here, as a channel will only be established once both sides have the same version.
+ * The version is used to avoid concurrency issues where both sides have different incompatible message ports.
+ */
+export const makeMessageChannelInternal = ({ nodeName, incomingPacketsQueue, target, checkTransferableConnections, channelName, schema: schema_, sendPacket, channelVersion, scope, sourceId, }) => Effect.gen(function* () {
+    // yield* Effect.addFinalizer((exit) =>
+    //   Effect.spanEvent(`shutdown:${exit._tag === 'Success' ? 'Success' : Cause.pretty(exit.cause)}`),
+    // )
+    const deferred = yield* makeDeferredResult();
+    const span = yield* OtelTracer.currentOtelSpan.pipe(Effect.catchAll(() => Effect.succeed(undefined)));
+    const schema = {
+        send: Schema.Union(schema_.send, MeshSchema.MessageChannelPing, MeshSchema.MessageChannelPong),
+        listen: Schema.Union(schema_.listen, MeshSchema.MessageChannelPing, MeshSchema.MessageChannelPong),
+    };
+    const channelStateRef = {
+        current: { _tag: 'Initial' },
+    };
+    const processMessagePacket = ({ packet, respondToSender }) => Effect.gen(function* () {
+        const channelState = channelStateRef.current;
+        span?.addEvent(`process:${packet._tag}`, {
+            channelState: channelState._tag,
+            packetId: packet.id,
+            packetReqId: packet.reqId,
+            packetChannelVersion: Predicate.hasProperty('channelVersion')(packet) ? packet.channelVersion : undefined,
+        });
+        // yield* Effect.log(
+        //   `${nodeName}→${channelName}→${target}:process packet ${packet._tag} [${channelVersion}], channel state: ${channelState._tag}`,
+        // )
+        if (channelState._tag === 'Initial')
+            return shouldNeverHappen();
+        if (packet._tag === 'MessageChannelResponseNoTransferables') {
+            yield* Deferred.fail(deferred, packet);
+            return 'close';
+        }
+        // If the other side has a higher version, we need to close this channel and
+        // recreate it with the new version
+        if (packet.channelVersion > channelVersion) {
+            span?.addEvent(`incoming packet has higher version (${packet.channelVersion}), closing channel`);
+            yield* Scope.close(scope, Exit.succeed('higher-version-expected'));
+            // TODO include expected version in the error so the channel gets recreated with the new version
+            return 'close';
+        }
+        // If this channel has a higher version, we need to signal the other side to close
+        // and recreate the channel with the new version
+        if (packet.channelVersion < channelVersion) {
+            const newPacket = MeshSchema.MessageChannelRequest.make({
+                source: nodeName,
+                sourceId,
+                target,
+                channelName,
+                channelVersion,
+                hops: [],
+                remainingHops: packet.hops,
+                reqId: undefined,
+            });
+            span?.addEvent(`incoming packet has lower version (${packet.channelVersion}), sending request to reconnect (${newPacket.id})`);
+            yield* sendPacket(newPacket);
+            return;
+        }
+        if (channelState._tag === 'Established' && packet._tag === 'MessageChannelRequest') {
+            if (packet.sourceId === channelState.otherSourceId) {
+                return;
+            }
+            else {
+                // In case the instance of the source has changed, we need to close the channel
+                // and reconnect with a new channel
+                span?.addEvent(`force-new-channel`);
+                yield* Scope.close(scope, Exit.succeed('force-new-channel'));
+                return 'close';
+            }
+        }
+        switch (packet._tag) {
+            // Assumption: Each side has sent an initial request and another request as a response for an incoming request
+            case 'MessageChannelRequest': {
+                if (channelState._tag !== 'RequestSent') {
+                    // We can safely ignore further incoming requests as we're already creating a channel
+                    return;
+                }
+                if (packet.reqId === channelState.reqPacketId) {
+                    // Circuit-breaker: We've already sent a request so we don't need to send another one
+                }
+                else {
+                    const newRequestPacket = MeshSchema.MessageChannelRequest.make({
+                        source: nodeName,
+                        sourceId,
+                        target,
+                        channelName,
+                        channelVersion,
+                        hops: [],
+                        remainingHops: packet.hops,
+                        reqId: packet.id,
+                    });
+                    span?.addEvent(`Re-sending new request (${newRequestPacket.id}) for incoming request (${packet.id})`);
+                    yield* sendPacket(newRequestPacket);
+                }
+                const isWinner = nodeName > target;
+                if (isWinner) {
+                    span?.addEvent(`winner side: creating message channel and sending response`);
+                    const mc = new MessageChannel();
+                    // We're using a message channel with acks here to make sure messages are not lost
+                    // which might happen during re-connection scenarios.
+                    // Also we need to eagerly start listening since we're using the channel "ourselves"
+                    // for the initial ping-pong sequence.
+                    const channel = yield* WebChannel.messagePortChannelWithAck({
+                        port: mc.port1,
+                        schema,
+                        debugId: channelVersion,
+                    }).pipe(Effect.andThen(WebChannel.toOpenChannel));
+                    yield* respondToSender(MeshSchema.MessageChannelResponseSuccess.make({
+                        reqId: packet.id,
+                        target,
+                        source: nodeName,
+                        channelName: packet.channelName,
+                        hops: [],
+                        remainingHops: packet.hops,
+                        port: mc.port2,
+                        channelVersion,
+                    }));
+                    channelStateRef.current = { _tag: 'winner:ResponseSent', channel, otherSourceId: packet.sourceId };
+                    // Now we wait for the other side to respond via the channel
+                    yield* channel.listen.pipe(Stream.flatten(), Stream.filter(Schema.is(MeshSchema.MessageChannelPing)), Stream.take(1), Stream.runDrain);
+                    yield* channel.send(MeshSchema.MessageChannelPong.make({}));
+                    span?.addEvent(`winner side: established`);
+                    channelStateRef.current = { _tag: 'Established', otherSourceId: packet.sourceId };
+                    yield* Deferred.succeed(deferred, channel);
+                }
+                else {
+                    span?.addEvent(`loser side: waiting for response`);
+                    // Wait for `MessageChannelResponseSuccess` packet
+                    channelStateRef.current = { _tag: 'loser:WaitingForResponse', otherSourceId: packet.sourceId };
+                }
+                break;
+            }
+            case 'MessageChannelResponseSuccess': {
+                if (channelState._tag !== 'loser:WaitingForResponse') {
+                    return shouldNeverHappen(`Expected to find message channel response from ${target}, but was in ${channelState._tag} state`);
+                }
+                // See message-channel notes above
+                const channel = yield* WebChannel.messagePortChannelWithAck({
+                    port: packet.port,
+                    schema,
+                    debugId: channelVersion,
+                }).pipe(Effect.andThen(WebChannel.toOpenChannel));
+                const waitForPongFiber = yield* channel.listen.pipe(Stream.flatten(), Stream.filter(Schema.is(MeshSchema.MessageChannelPong)), Stream.take(1), Stream.runDrain, Effect.fork);
+                yield* channel.send(MeshSchema.MessageChannelPing.make({}));
+                yield* waitForPongFiber;
+                span?.addEvent(`loser side: established`);
+                channelStateRef.current = { _tag: 'Established', otherSourceId: channelState.otherSourceId };
+                yield* Deferred.succeed(deferred, channel);
+                return;
+            }
+            default: {
+                return casesHandled(packet);
+            }
+        }
+    }).pipe(Effect.withSpan(`handleMessagePacket:${packet._tag}:${packet.source}→${packet.target}`, {
+        attributes: packetAsOtelAttributes(packet),
+    }));
+    yield* Effect.gen(function* () {
+        while (true) {
+            const packet = yield* Queue.take(incomingPacketsQueue);
+            const res = yield* processMessagePacket(packet);
+            // We want to give requests another chance to be processed
+            if (res === 'close') {
+                return;
+            }
+        }
+    }).pipe(Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
+    const channelState = channelStateRef.current;
+    if (channelState._tag !== 'Initial') {
+        return shouldNeverHappen(`Expected channel to be in Initial state, but was in ${channelState._tag} state`);
+    }
+    const connectionRequest = Effect.gen(function* () {
+        const packet = MeshSchema.MessageChannelRequest.make({
+            source: nodeName,
+            sourceId,
+            target,
+            channelName,
+            channelVersion,
+            hops: [],
+            reqId: undefined,
+        });
+        channelStateRef.current = { _tag: 'RequestSent', reqPacketId: packet.id };
+        // yield* Effect.log(`${nodeName}→${channelName}→${target}:connectionRequest [${channelVersion}]`)
+        const noTransferableResponse = checkTransferableConnections(packet);
+        if (noTransferableResponse !== undefined) {
+            yield* Effect.spanEvent(`No transferable connections found for ${packet.source}→${packet.target}`);
+            return yield* Effect.fail(noTransferableResponse);
+        }
+        yield* sendPacket(packet);
+        span?.addEvent(`initial connection request sent (${packet.id})`);
+    });
+    yield* connectionRequest;
+    const channel = yield* deferred;
+    return channel;
+}).pipe(Effect.withSpanScoped(`makeMessageChannel:${channelVersion}`));
+//# sourceMappingURL=message-channel-internal.js.map

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

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

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

@@ -1,20 +1,22 @@
-import type { PubSub, Schema, Scope } from '@livestore/utils/effect';
-import { Effect, Queue, WebChannel } from '@livestore/utils/effect';
-import { type ChannelName, type MeshNodeName, type MessageQueueItem } from '../common.js';
-import * as MeshSchema from '../mesh-schema.js';
-interface MakeMessageChannelArgs {
-    nodeName: MeshNodeName;
-    queue: Queue.Queue<MessageQueueItem>;
-    newConnectionAvailablePubSub: PubSub.PubSub<MeshNodeName>;
-    channelName: ChannelName;
-    target: MeshNodeName;
-    sendPacket: (packet: typeof MeshSchema.MessageChannelPacket.Type) => Effect.Effect<void>;
-    checkTransferableConnections: (packet: typeof MeshSchema.MessageChannelPacket.Type) => typeof MeshSchema.MessageChannelResponseNoTransferables.Type | undefined;
-    schema: {
-        send: Schema.Schema<any, any>;
-        listen: Schema.Schema<any, any>;
-    };
-}
-export declare const makeMessageChannel: ({ nodeName, queue, newConnectionAvailablePubSub, target, checkTransferableConnections, channelName, schema, sendPacket, }: MakeMessageChannelArgs) => Effect.Effect<WebChannel.WebChannel<any, any, never>, never, Scope.Scope>;
-export {};
+import { Deferred, Effect, Scope, WebChannel } from '@livestore/utils/effect';
+import type { MakeMessageChannelArgs } from './message-channel-internal.js';
+/**
+ * Behaviour:
+ * - Waits until there is an initial connection
+ * - 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 connections as a hint to reconnect if not already connected
+ *     - The wrapper channel maintains a connection counter which is used as the channel version
+ *
+ * If needed we can also implement further functionality (like heartbeat) in this wrapper channel.
+ */
+export declare const makeMessageChannel: ({ schema, newConnectionAvailablePubSub, channelName, checkTransferableConnections, nodeName, incomingPacketsQueue, target, sendPacket, }: MakeMessageChannelArgs) => Effect.Effect<{
+    webChannel: WebChannel.WebChannel<any, any>;
+    initialConnectionDeferred: Deferred.Deferred<void, never>;
+}, never, Scope.Scope>;
 //# sourceMappingURL=message-channel.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"message-channel.d.ts","sourceRoot":"","sources":["../../src/channel/message-channel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAEL,MAAM,EAIN,KAAK,EAIL,UAAU,EACX,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAA0B,MAAM,cAAc,CAAA;AACjH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IACpC,4BAA4B,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IACzD,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,YAAY,CAAA;IACpB,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,UAAU,CAAC,oBAAoB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxF,4BAA4B,EAAE,CAC5B,MAAM,EAAE,OAAO,UAAU,CAAC,oBAAoB,CAAC,IAAI,KAChD,OAAO,UAAU,CAAC,qCAAqC,CAAC,IAAI,GAAG,SAAS,CAAA;IAC7E,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,kBAAkB,8HAS5B,sBAAsB,8EAsT6B,CAAA"}
+{"version":3,"file":"message-channel.d.ts","sourceRoot":"","sources":["../../src/channel/message-channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,MAAM,EAKN,KAAK,EAGL,UAAU,EACX,MAAM,yBAAyB,CAAA;AAIhC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAG3E;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,kBAAkB,6IAS5B,sBAAsB;gBA+KS,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC;;sBAI9D,CAAA"}

package/dist/channel/message-channel.js

@@ -1,175 +1,133 @@
-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, Queue, Schema, Scope, Stream, TQueue, WebChannel, } from '@livestore/utils/effect';
+import { nanoid } from '@livestore/utils/nanoid';
+import { WebmeshSchema } from '../mod.js';
+import { makeMessageChannelInternal } from './message-channel-internal.js';
+/**
+ * Behaviour:
+ * - Waits until there is an initial connection
+ * - 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 connections as a hint to reconnect if not already connected
+ *     - The wrapper channel maintains a connection 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, newConnectionAvailablePubSub, channelName, checkTransferableConnections, 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 initialConnectionDeferred = yield* Deferred.make();
+    const debugInfo = {
+        pendingSends: 0,
+        totalSends: 0,
+        connectCounter: 1,
+        isConnected: false,
+    };
+    // #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 connection setup and the waitForNewConnectionFiber
+             * - Happy path:
+             *   - The connection setup succeeds and we can interrupt the waitForNewConnectionFiber
+             * - Tricky paths:
+             *   - While a connection is still being setup, we want to re-try when there is a new connection
+             *   - If the connection setup returns a `MessageChannelResponseNoTransferables` error,
+             *     we want to wait for a new connection and then re-try
+             * - Further notes:
+             *   - If the parent scope closes, we want to also interrupt both the connection setup and the waitForNewConnectionFiber
+             *   - We're creating a separate scope for each connection 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 waitForNewConnectionFiber = yield* Stream.fromPubSub(newConnectionAvailablePubSub).pipe(Stream.tap((connectionName) => Effect.spanEvent(`new-conn:${connectionName}`)), Stream.take(1), Stream.runDrain, Effect.as('new-connection'), Effect.fork);
+            const makeChannel = makeMessageChannelInternal({
+                nodeName,
+                sourceId,
+                incomingPacketsQueue,
+                target,
+                checkTransferableConnections,
+                channelName,
+                schema,
+                channelVersion,
+                newConnectionAvailablePubSub,
+                sendPacket,
+                scope: makeMessageChannelScope,
+            }).pipe(Scope.extend(makeMessageChannelScope), Effect.forkIn(makeMessageChannelScope));
+            const res = yield* Effect.raceFirst(makeChannel, waitForNewConnectionFiber.pipe(Effect.disconnect));
+            if (res === 'new-connection') {
+                yield* Scope.close(makeMessageChannelScope, Exit.fail('new-connection'));
+                // We'll try again
+            }
+            else {
+                const result = yield* res.pipe(Effect.exit);
+                if (result._tag === 'Failure') {
+                    yield* Scope.close(makeMessageChannelScope, result);
+                    if (Cause.isFailType(result.cause) &&
+                        Schema.is(WebmeshSchema.MessageChannelResponseNoTransferables)(result.cause.error)) {
+                        yield* waitForNewConnectionFiber.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 = result.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;
+        yield* Deferred.succeed(initialConnectionDeferred, 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;
+    }).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 +135,12 @@ export const makeMessageChannel = ({ nodeName, queue, newConnectionAvailablePubS
         closedDeferred,
         supportsTransferables: true,
         schema,
+        debugInfo,
+        shutdown: Scope.close(scope, Exit.succeed('shutdown')),
+    };
+    return {
+        webChannel: webChannel,
+        initialConnectionDeferred,
     };
-    return webChannel;
-}).pipe(Effect.withSpanScoped('makeMessageChannel'));
+}));
 //# sourceMappingURL=message-channel.js.map