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

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

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

package/dist/websocket-connection.js

@@ -1,4 +1,4 @@
-import { Deferred, Effect, Either, FiberHandle, Queue, Schedule, Schema, Stream, WebChannel, WebSocket, } from '@livestore/utils/effect';
+import { Deferred, Effect, Either, Exit, FiberHandle, Queue, Schedule, Schema, Scope, Stream, WebChannel, WebSocket, } from '@livestore/utils/effect';
 import * as MeshSchema from './mesh-schema.js';
 export class WSConnectionInit extends Schema.TaggedStruct('WSConnectionInit', {
     from: Schema.String,
@@ -24,7 +24,7 @@ export const connectViaWebSocket = ({ node, url, reconnect = Schedule.exponentia
     }).pipe(Effect.scoped, Effect.withSpan('@livestore/webmesh:websocket-connection:connect'));
     yield* FiberHandle.run(fiberHandle, connect);
 });
-export const makeWebSocketConnection = (socket, socketType) => Effect.gen(function* () {
+export const makeWebSocketConnection = (socket, socketType) => Effect.scopeWithCloseable((scope) => Effect.gen(function* () {
     socket.binaryType = 'arraybuffer';
     const fromDeferred = yield* Deferred.make();
     yield* Stream.fromEventListener(socket, 'message').pipe(Stream.map((msg) => Schema.decodeUnknownEither(MessageMsgPack)(new Uint8Array(msg.data))), Stream.flatten(), Stream.tap((msg) => Effect.gen(function* () {
@@ -47,7 +47,7 @@ export const makeWebSocketConnection = (socket, socketType) => Effect.gen(functi
         initHandshake(from);
     }
     const isConnectedLatch = yield* Effect.makeLatch(true);
-    const closedDeferred = yield* Deferred.make();
+    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);
@@ -65,10 +65,11 @@ export const makeWebSocketConnection = (socket, socketType) => Effect.gen(functi
         closedDeferred,
         schema: { listen: MeshSchema.Packet, send: MeshSchema.Packet },
         supportsTransferables: false,
+        shutdown: Scope.close(scope, Exit.void),
     };
     return {
         webChannel: webChannel,
         from,
     };
-});
+}).pipe(Effect.withSpanScoped('makeWebSocketConnection')));
 //# sourceMappingURL=websocket-connection.js.map

package/dist/websocket-connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-connection.js","sourceRoot":"","sources":["../src/websocket-connection.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,MAAM,EACN,MAAM,EACN,WAAW,EACX,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,EACN,UAAU,EACV,SAAS,GACV,MAAM,yBAAyB,CAAA;AAGhC,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAA;AAG9C,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE;IAC5E,IAAI,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,YAAY,CAAC,qBAAqB,EAAE;IAClF,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC,GAAG;CACpB,CAAC;CAAG;AAEL,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;CAAG;AAE/F,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAWjE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,IAAI,EACJ,GAAG,EACH,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAKtC,EAA2C,EAAE,CAC5C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;IAE7C,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;QAEjE,sGAAsG;QACtG,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QAElG,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QAEhG,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,CAAC,UAAU,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;QAE5G,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CAAC,CAAC,CAAA;IAE1F,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC9C,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,MAAsD,EACtD,UAAsB,EAQtB,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,CAAC,UAAU,GAAG,aAAa,CAAA;IAEjC,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAU,CAAA;IAEnD,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAe,MAAa,EAAE,SAAS,CAAC,CAAC,IAAI,CAC1E,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EACzF,MAAM,CAAC,OAAO,EAAE,EAChB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACjB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACpC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACjD,CAAC;aAAM,CAAC;YACN,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3E,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;QACjD,CAAC;IACH,CAAC,CAAC,CACH,EACD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,UAAU,CAClB,CAAA;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,EAAiC,CAAC,IAAI,CAC9E,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CACtC,CAAA;IAED,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CACrC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEpF,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC/B,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,YAAY,CAAA;IAC1C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAA;IAE1E,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAChC,aAAa,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAEtD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;IAEnD,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CACzB,MAAM,EACN,OAAO,EACP,GAAG,EAAE,CACH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAA;QAC7B,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;IACpD,CAAC,CAAC,EACJ,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAA;IAED,MAAM,IAAI,GAAG,CAAC,OAAsC,EAAE,EAAE,CACtD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAA;QAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAA;QAChE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAChG,CAAC,CAAC,CAAA;IAEJ,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAE3E,MAAM,UAAU,GAAG;QACjB,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,UAAU,CAAC,gBAAgB;QAC1D,IAAI;QACJ,MAAM;QACN,cAAc;QACd,MAAM,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE;QAC9D,qBAAqB,EAAE,KAAK;KACiE,CAAA;IAE/F,OAAO;QACL,UAAU,EAAE,UAAiG;QAC7G,IAAI;KACL,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"websocket-connection.js","sourceRoot":"","sources":["../src/websocket-connection.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/webmesh",
-  "version": "0.0.0-snapshot-1d99fea7d2ce2c7a5d9ed0a3752f8a7bda6bc3db",
+  "version": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -16,8 +16,8 @@
   "types": "./dist/mod.d.ts",
   "dependencies": {
     "ws": "8.18.0",
-    "@livestore/common": "0.0.0-snapshot-1d99fea7d2ce2c7a5d9ed0a3752f8a7bda6bc3db",
-    "@livestore/utils": "0.0.0-snapshot-1d99fea7d2ce2c7a5d9ed0a3752f8a7bda6bc3db"
+    "@livestore/common": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230",
+    "@livestore/utils": "0.0.0-snapshot-aed277ba0960f72b8d464508961ab4aec1881230"
   },
   "devDependencies": {
     "@types/ws": "^8.5.12",

package/src/channel/message-channel-internal.ts

@@ -0,0 +1,337 @@
+import { casesHandled, shouldNeverHappen } from '@livestore/utils'
+import type { PubSub } from '@livestore/utils/effect'
+import {
+  Deferred,
+  Effect,
+  Exit,
+  OtelTracer,
+  Predicate,
+  Queue,
+  Schema,
+  Scope,
+  Stream,
+  WebChannel,
+} from '@livestore/utils/effect'
+
+import { type ChannelName, type MeshNodeName, type MessageQueueItem, packetAsOtelAttributes } 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>
+}
+
+const makeDeferredResult = Deferred.make<
+  WebChannel.WebChannel<any, any>,
+  typeof MeshSchema.MessageChannelResponseNoTransferables.Type
+>
+
+/**
+ * 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,
+}: 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
+> =>
+  Effect.gen(function* () {
+    // yield* Effect.addFinalizer((exit) =>
+    //   Effect.spanEvent(`shutdown:${exit._tag === 'Success' ? 'Success' : Cause.pretty(exit.cause)}`),
+    // )
+
+    type ChannelState =
+      | {
+          _tag: 'Initial'
+        }
+      | {
+          _tag: 'RequestSent'
+          reqPacketId: string
+        }
+      | {
+          _tag: 'winner:ResponseSent'
+          channel: WebChannel.WebChannel<any, any>
+          otherSourceId: string
+        }
+      | {
+          _tag: 'loser:WaitingForResponse'
+          otherSourceId: string
+        }
+      | {
+          _tag: 'Established'
+          otherSourceId: string
+        }
+
+    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: ChannelState } = {
+      current: { _tag: 'Initial' },
+    }
+
+    const processMessagePacket = ({ packet, respondToSender }: MessageQueueItem) =>
+      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}`))