@livestore/webmesh 0.3.0-dev.14 → 0.3.0-dev.16

package/package.json

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

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

@@ -1,9 +0,0 @@
-import { 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
- */
-export declare const makeMessageChannel: ({ schema, newConnectionAvailablePubSub, channelName, checkTransferableConnections, nodeName, incomingPacketsQueue, target, sendPacket, }: MakeMessageChannelArgs) => Effect.Effect<WebChannel.WebChannel<any, any, never>, never, Scope.Scope>;
-//# sourceMappingURL=message-channel%20copy.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"message-channel copy.d.ts","sourceRoot":"","sources":["../../src/channel/message-channel copy.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAKN,KAAK,EAGL,UAAU,EACX,MAAM,yBAAyB,CAAA;AAIhC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AAE3E;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,6IAS5B,sBAAsB,8EAwLtB,CAAA"}

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

@@ -1,137 +0,0 @@
-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
- */
-export const makeMessageChannel = ({ schema, newConnectionAvailablePubSub, channelName, checkTransferableConnections, nodeName, incomingPacketsQueue, target, sendPacket, }) => Effect.scopeWithCloseable((scope) => Effect.gen(function* () {
-    // const internalChannelSref = yield* SubscriptionRef.make<WebChannel.WebChannel<any, any> | false>(false)
-    // const state: 'connecting' | 'connected' = 'connecting'
-    const sourceId = nanoid();
-    const listenQueue = yield* Queue.unbounded();
-    const sendQueue = yield* TQueue.unbounded();
-    const initialConnectionDeferred = yield* Deferred.make();
-    let connectionCounter = 0;
-    // #region reconnect-loop
-    yield* Effect.gen(function* () {
-        const resultDeferred = yield* Deferred.make();
-        while (true) {
-            connectionCounter++;
-            const channelVersion = connectionCounter;
-            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);
-                    }
-                    // yield* Effect.log('result.fail', { nodeName, channelVersion }, Cause.pretty(result.cause))
-                }
-                else {
-                    const channel = result.value;
-                    yield* Deferred.succeed(resultDeferred, { channel, makeMessageChannelScope, channelVersion });
-                    break;
-                }
-            }
-        }
-        // Now we wait until the first channel is established
-        const { channel, makeMessageChannelScope, channelVersion } = yield* resultDeferred;
-        yield* Effect.spanEvent(`Connected#${channelVersion}`);
-        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
-            }
-        }).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}`);
-    }).pipe(Effect.scoped, // Additionally scoping here to clean up finalizers after each loop run
-    Effect.forever, 
-    // Effect.withSpan('makeMessageChannelManaged:connect-loop'),
-    Effect.tapCauseLogPretty, Effect.forkScoped);
-    // #endregion reconnect-loop
-    const debugInfo = {
-        pendingSends: 0,
-        totalSends: 0,
-        connectCounter: 1,
-    };
-    const parentSpan = yield* Effect.currentSpan.pipe(Effect.orDie);
-    const send = (message) => Effect.gen(function* () {
-        // const sendFiberHandle = yield* FiberHandle.make<void, never>()
-        const sentDeferred = yield* Deferred.make();
-        debugInfo.pendingSends++;
-        debugInfo.totalSends++;
-        yield* TQueue.offer(sendQueue, [message, sentDeferred]);
-        yield* sentDeferred;
-        debugInfo.pendingSends--;
-    }).pipe(Effect.scoped, Effect.withParentSpan(parentSpan));
-    const listen = Stream.fromQueue(listenQueue, { maxChunkSize: 1 }).pipe(Stream.map(Either.right));
-    const closedDeferred = yield* Deferred.make().pipe(Effect.acquireRelease(Deferred.done(Exit.void)));
-    yield* initialConnectionDeferred;
-    const webChannel = {
-        [WebChannel.WebChannelSymbol]: WebChannel.WebChannelSymbol,
-        send,
-        listen,
-        closedDeferred,
-        supportsTransferables: true,
-        schema,
-        debugInfo,
-        shutdown: Scope.close(scope, Exit.succeed('shutdown')),
-    };
-    return webChannel;
-}));
-//# sourceMappingURL=message-channel%20copy.js.map

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

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

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

@@ -1,42 +0,0 @@
-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>;
-}
-/**
- * `makeChannel` needs to be called on both sides to establish a connection ("symmetrically")
- *
- * Implementation notes:
- * - There is an internal web channel and a wrapping "proxy channel"
- * - Reasons for outside proxy channel:
- *   - Re-try to establish initial channel when there are new connections available
- *   - Re-connect if the connection is lost
- * - Create a separate layer as "channel wrapper" which is responsible for:
- *   - initial connection based on new connection available
- *   - re-connect on disconnect
- *   - heartbeat
- *   - ...
- *
- * Channel connection init process:
- * - Both sides send a `MessageChannelRequest` packet which includes a channel version
- * - The other side responds with a `MessageChannelResponseSuccess` packet which includes
- *   the max version of both sides as the agreed upon version for the channel
- * - The channel starts listening on the port of the side with the highest version (or with the "larger" name as tie-breaker)
- *
- */
-export declare const makeMessageChannelInternal: ({ nodeName, incomingPacketsQueue, target, checkTransferableConnections, channelName, schema: schema_, sendPacket, channelVersion, scope, sourceId, }: MakeMessageChannelArgs & {
-    channelVersion: number;
-    scope: Scope.CloseableScope;
-    sourceId: string;
-}) => Effect.Effect<WebChannel.WebChannel<any, any>, typeof MeshSchema.MessageChannelResponseNoTransferables.Type, Scope.Scope>;
-//# sourceMappingURL=message-channel-internal%20copy.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"message-channel-internal copy.d.ts","sourceRoot":"","sources":["../../src/channel/message-channel-internal copy.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;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,0BAA0B,yJAWpC,sBAAsB,GAAG;IAC1B,cAAc,EAAE,MAAM,CAAA;IACtB,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,CA0S2D,CAAA"}

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

@@ -1,239 +0,0 @@
-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);
-/**
- * `makeChannel` needs to be called on both sides to establish a connection ("symmetrically")
- *
- * Implementation notes:
- * - There is an internal web channel and a wrapping "proxy channel"
- * - Reasons for outside proxy channel:
- *   - Re-try to establish initial channel when there are new connections available
- *   - Re-connect if the connection is lost
- * - Create a separate layer as "channel wrapper" which is responsible for:
- *   - initial connection based on new connection available
- *   - re-connect on disconnect
- *   - heartbeat
- *   - ...
- *
- * Channel connection init process:
- * - Both sides send a `MessageChannelRequest` packet which includes a channel version
- * - The other side responds with a `MessageChannelResponseSuccess` packet which includes
- *   the max version of both sides as the agreed upon version for the channel
- * - The channel starts listening on the port of the side with the highest version (or with the "larger" name as tie-breaker)
- *
- */
-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;
-        }
-        // Ignore further incoming packets if the channel is already established
-        // if (channelState._tag === 'Established') return
-        if (channelState._tag === 'Established' && packet._tag === 'MessageChannelRequest') {
-            if (packet.sourceId === channelState.otherSourceId) {
-                return;
-            }
-            else {
-                span?.addEvent(`force-new-channel`);
-                yield* Scope.close(scope, Exit.succeed('force-new-channel'));
-                return 'close';
-            }
-        }
-        switch (packet._tag) {
-            case 'MessageChannelRequest': {
-                /*
-                  New impl idea:
-                  - For request that has a lower version, send its own request as a signal
-                  - Determine "winner" in request handler and only the winner is sending a response
-                  - The loser will instead listen for a response on the channel itself
-    
-                  How to avoid request loops / circuit-breakering
-                  - we need to gurantee that each side has received the request
-                    - each other side needs to know it
-                  - idea: use the request packet id from A as a reference when sending a request back from B to A
-                    - this way A knows that
-    
-    
-                  Assumptions:
-                  - each side has sent their request which has to arrive at the other side
-                  */
-                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();
-                    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;
-            }
-            // 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 !== 'loser:WaitingForResponse') {
-                    return shouldNeverHappen(`Expected to find message channel response from ${target}, but was in ${channelState._tag} state`);
-                }
-                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* Stream.fromQueue(queue).pipe(
-    //   Stream.tap(processMessagePacket),
-    //   Stream.runDrain,
-    //   Effect.interruptible,
-    //   Effect.tapCauseLogPretty,
-    //   Effect.forkScoped,
-    // )
-    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%20copy.js.map

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

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