@livestore/webmesh 0.3.0-dev.36 → 0.3.0-dev.38

package/dist/common.d.ts

@@ -1,12 +1,12 @@
 import { type Effect, Schema } from '@livestore/utils/effect';
-import type { MessageChannelPacket, Packet, ProxyChannelPacket } from './mesh-schema.js';
+import type { DirectChannelPacket, Packet, ProxyChannelPacket } from './mesh-schema.js';
 export type ProxyQueueItem = {
     packet: typeof ProxyChannelPacket.Type;
     respondToSender: (msg: typeof ProxyChannelPacket.Type) => Effect.Effect<void>;
 };
 export type MessageQueueItem = {
-    packet: typeof MessageChannelPacket.Type;
-    respondToSender: (msg: typeof MessageChannelPacket.Type) => Effect.Effect<void>;
+    packet: typeof DirectChannelPacket.Type;
+    respondToSender: (msg: typeof DirectChannelPacket.Type) => Effect.Effect<void>;
 };
 export type MeshNodeName = string;
 export type ChannelName = string;
@@ -29,7 +29,7 @@ export declare const packetAsOtelAttributes: (packet: typeof Packet.Type) => {
         readonly source: string;
         readonly channelName: string;
         readonly hops: readonly string[];
-        readonly _tag: "MessageChannelRequest";
+        readonly _tag: "DirectChannelRequest";
     } | {
         readonly remainingHops: readonly string[];
         readonly reqId: string;
@@ -38,7 +38,7 @@ export declare const packetAsOtelAttributes: (packet: typeof Packet.Type) => {
         readonly source: string;
         readonly channelName: string;
         readonly hops: readonly string[];
-        readonly _tag: "MessageChannelResponseNoTransferables";
+        readonly _tag: "DirectChannelResponseNoTransferables";
     } | {
         readonly remainingHops?: undefined;
         readonly id: string;
@@ -101,5 +101,11 @@ export declare const packetAsOtelAttributes: (packet: typeof Packet.Type) => {
     packetId: string;
     'span.label': string;
 };
+export declare const ListenForChannelResult: Schema.Struct<{
+    channelName: typeof Schema.String;
+    source: typeof Schema.String;
+    mode: Schema.Union<[Schema.Literal<["proxy"]>, Schema.Literal<["direct"]>]>;
+}>;
+export type ListenForChannelResult = typeof ListenForChannelResult.Type;
 export {};
 //# sourceMappingURL=common.d.ts.map

package/dist/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAExF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,OAAO,kBAAkB,CAAC,IAAI,CAAA;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,kBAAkB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAC9E,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,oBAAoB,CAAC,IAAI,CAAA;IACxC,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,oBAAoB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAChF,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAEjC,MAAM,MAAM,WAAW,GAAG,MAAM,CAAA;AAChC,MAAM,MAAM,UAAU,GAAG,UAAU,YAAY,iBAAiB,WAAW,EAAE,CAAA;;;;;;AAQ7E,qBAAa,sBAAuB,SAAQ,2BAE1C;CAAG;AAEL,eAAO,MAAM,sBAAsB,GAAI,QAAQ,OAAO,MAAM,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAK/D,CAAA"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAExE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAEvF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,OAAO,kBAAkB,CAAC,IAAI,CAAA;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,kBAAkB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAC9E,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAA;IACvC,eAAe,EAAE,CAAC,GAAG,EAAE,OAAO,mBAAmB,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAC/E,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAEjC,MAAM,MAAM,WAAW,GAAG,MAAM,CAAA;AAChC,MAAM,MAAM,UAAU,GAAG,UAAU,YAAY,iBAAiB,WAAW,EAAE,CAAA;;;;;;AAQ7E,qBAAa,sBAAuB,SAAQ,2BAE1C;CAAG;AAEL,eAAO,MAAM,sBAAsB,GAAI,QAAQ,OAAO,MAAM,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAK/D,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;EAIjC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC,IAAI,CAAA"}

package/dist/common.js

@@ -11,6 +11,11 @@ export class EdgeAlreadyExistsError extends Schema.TaggedError()('EdgeAlreadyExi
 export const packetAsOtelAttributes = (packet) => ({
     packetId: packet.id,
     'span.label': packet.id + (Predicate.hasProperty(packet, 'reqId') && packet.reqId !== undefined ? ` for ${packet.reqId}` : ''),
-    ...(packet._tag !== 'MessageChannelResponseSuccess' && packet._tag !== 'ProxyChannelPayload' ? { packet } : {}),
+    ...(packet._tag !== 'DirectChannelResponseSuccess' && packet._tag !== 'ProxyChannelPayload' ? { packet } : {}),
+});
+export const ListenForChannelResult = Schema.Struct({
+    channelName: Schema.String,
+    source: Schema.String,
+    mode: Schema.Union(Schema.Literal('proxy'), Schema.Literal('direct')),
 });
 //# sourceMappingURL=common.js.map

package/dist/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAmBxE,4DAA4D;AAC5D,8FAA8F;AAC9F,+BAA+B;AAC/B,QAAQ;AACR,OAAO;AAEP,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC,WAAW,EAA0B,CAAC,wBAAwB,EAAE;IACjH,MAAM,EAAE,MAAM,CAAC,MAAM;CACtB,CAAC;CAAG;AAEL,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAA0B,EAAE,EAAE,CAAC,CAAC;IACrE,QAAQ,EAAE,MAAM,CAAC,EAAE;IACnB,YAAY,EACV,MAAM,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClH,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,+BAA+B,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAChH,CAAC,CAAA"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAmBxE,4DAA4D;AAC5D,8FAA8F;AAC9F,+BAA+B;AAC/B,QAAQ;AACR,OAAO;AAEP,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC,WAAW,EAA0B,CAAC,wBAAwB,EAAE;IACjH,MAAM,EAAE,MAAM,CAAC,MAAM;CACtB,CAAC;CAAG;AAEL,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAA0B,EAAE,EAAE,CAAC,CAAC;IACrE,QAAQ,EAAE,MAAM,CAAC,EAAE;IACnB,YAAY,EACV,MAAM,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClH,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,8BAA8B,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAqB,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAC/G,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;CACtE,CAAC,CAAA"}

package/dist/mesh-schema.d.ts

@@ -1,5 +1,5 @@
 import { Schema } from '@livestore/utils/effect';
-declare const MessageChannelRequest_base: Schema.TaggedStruct<"MessageChannelRequest", {
+declare const DirectChannelRequest_base: Schema.TaggedStruct<"DirectChannelRequest", {
     remainingHops: Schema.optional<Schema.Array$<typeof Schema.String>>;
     channelVersion: typeof Schema.Number;
     /** Only set if the request is in response to an incoming request */
@@ -16,15 +16,15 @@ declare const MessageChannelRequest_base: Schema.TaggedStruct<"MessageChannelReq
     hops: Schema.Array$<typeof Schema.String>;
 }>;
 /**
- * Needs to go through already existing MessageChannel edges, times out otherwise
+ * Needs to go through already existing DirectChannel edges, times out otherwise
  *
  * Can't yet contain the `port` because the request might be duplicated while forwarding to multiple nodes.
  * We need a clear path back to the sender to avoid this, thus we respond with a separate
- * `MessageChannelResponseSuccess` which contains the `port`.
+ * `DirectChannelResponseSuccess` which contains the `port`.
  */
-export declare class MessageChannelRequest extends MessageChannelRequest_base {
+export declare class DirectChannelRequest extends DirectChannelRequest_base {
 }
-declare const MessageChannelResponseSuccess_base: Schema.TaggedStruct<"MessageChannelResponseSuccess", {
+declare const DirectChannelResponseSuccess_base: Schema.TaggedStruct<"DirectChannelResponseSuccess", {
     reqId: typeof Schema.String;
     port: Schema.Schema<MessagePort, MessagePort, never>;
     remainingHops: Schema.Array$<typeof Schema.String>;
@@ -35,9 +35,9 @@ declare const MessageChannelResponseSuccess_base: Schema.TaggedStruct<"MessageCh
     channelName: typeof Schema.String;
     hops: Schema.Array$<typeof Schema.String>;
 }>;
-export declare class MessageChannelResponseSuccess extends MessageChannelResponseSuccess_base {
+export declare class DirectChannelResponseSuccess extends DirectChannelResponseSuccess_base {
 }
-declare const MessageChannelResponseNoTransferables_base: Schema.TaggedStruct<"MessageChannelResponseNoTransferables", {
+declare const DirectChannelResponseNoTransferables_base: Schema.TaggedStruct<"DirectChannelResponseNoTransferables", {
     reqId: typeof Schema.String;
     remainingHops: Schema.Array$<typeof Schema.String>;
     id: Schema.PropertySignature<":", string, never, "?:", string | undefined, true, never>;
@@ -46,7 +46,7 @@ declare const MessageChannelResponseNoTransferables_base: Schema.TaggedStruct<"M
     channelName: typeof Schema.String;
     hops: Schema.Array$<typeof Schema.String>;
 }>;
-export declare class MessageChannelResponseNoTransferables extends MessageChannelResponseNoTransferables_base {
+export declare class DirectChannelResponseNoTransferables extends DirectChannelResponseNoTransferables_base {
 }
 declare const ProxyChannelRequest_base: Schema.TaggedStruct<"ProxyChannelRequest", {
     remainingHops: Schema.optional<typeof Schema.Undefined>;
@@ -140,13 +140,13 @@ export declare const BroadcastChannelPacket: Schema.TaggedStruct<"BroadcastChann
     source: typeof Schema.String;
     target: Schema.Literal<["-"]>;
 }>;
-declare const MessageChannelPacket_base: Schema.Union<[typeof MessageChannelRequest, typeof MessageChannelResponseSuccess, typeof MessageChannelResponseNoTransferables]>;
-export declare class MessageChannelPacket extends MessageChannelPacket_base {
+declare const DirectChannelPacket_base: Schema.Union<[typeof DirectChannelRequest, typeof DirectChannelResponseSuccess, typeof DirectChannelResponseNoTransferables]>;
+export declare class DirectChannelPacket extends DirectChannelPacket_base {
 }
 declare const ProxyChannelPacket_base: Schema.Union<[typeof ProxyChannelRequest, typeof ProxyChannelResponseSuccess, typeof ProxyChannelPayload, typeof ProxyChannelPayloadAck]>;
 export declare class ProxyChannelPacket extends ProxyChannelPacket_base {
 }
-declare const Packet_base: Schema.Union<[typeof MessageChannelPacket, typeof ProxyChannelPacket, typeof NetworkEdgeAdded, typeof NetworkTopologyRequest, typeof NetworkTopologyResponse, Schema.TaggedStruct<"BroadcastChannelPacket", {
+declare const Packet_base: Schema.Union<[typeof DirectChannelPacket, typeof ProxyChannelPacket, typeof NetworkEdgeAdded, typeof NetworkTopologyRequest, typeof NetworkTopologyResponse, Schema.TaggedStruct<"BroadcastChannelPacket", {
     id: Schema.PropertySignature<":", string, never, "?:", string | undefined, true, never>;
     channelName: typeof Schema.String;
     /**
@@ -160,11 +160,11 @@ declare const Packet_base: Schema.Union<[typeof MessageChannelPacket, typeof Pro
 }>]>;
 export declare class Packet extends Packet_base {
 }
-declare const MessageChannelPing_base: Schema.TaggedStruct<"MessageChannelPing", {}>;
-export declare class MessageChannelPing extends MessageChannelPing_base {
+declare const DirectChannelPing_base: Schema.TaggedStruct<"DirectChannelPing", {}>;
+export declare class DirectChannelPing extends DirectChannelPing_base {
 }
-declare const MessageChannelPong_base: Schema.TaggedStruct<"MessageChannelPong", {}>;
-export declare class MessageChannelPong extends MessageChannelPong_base {
+declare const DirectChannelPong_base: Schema.TaggedStruct<"DirectChannelPong", {}>;
+export declare class DirectChannelPong extends DirectChannelPong_base {
 }
 export {};
 //# sourceMappingURL=mesh-schema.d.ts.map

package/dist/mesh-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-schema.d.ts","sourceRoot":"","sources":["../src/mesh-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,yBAAyB,CAAA;;;;IA6B5D,oEAAoE;;IAEpE;;;OAGG;;;;;;;;AAhBL;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,0BAWzC;CAAG;;;;;;;;;;;;AAEL,qBAAa,6BAA8B,SAAQ,kCAOjD;CAAG;;;;;;;;;;AAEL,qBAAa,qCAAsC,SAAQ,0CAO1D;CAAG;;;;;;;;;;AAEJ,qBAAa,mBAAoB,SAAQ,wBAIvC;CAAG;;;;;;;;;;;;AAEL,qBAAa,2BAA4B,SAAQ,gCAM/C;CAAG;;;;;;;;;;;AAEL,qBAAa,mBAAoB,SAAQ,wBAKvC;CAAG;;;;;;;;;;;AAEL,qBAAa,sBAAuB,SAAQ,2BAK1C;CAAG;;;;;;AAEL;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAIpC;CAAG;;;;IAKH,iDAAiD;;;;AAHnD,qBAAa,sBAAuB,SAAQ,2BAM1C;CAAG;;;;;;;IAQH,iDAAiD;;;;AANnD,qBAAa,uBAAwB,SAAQ,4BAS3C;CAAG;AAEL,eAAO,MAAM,sBAAsB;;;IAGjC;;;OAGG;;;;;EAKH,CAAA;;AAEF,qBAAa,oBAAqB,SAAQ,yBAIzC;CAAG;;AAEJ,qBAAa,kBAAmB,SAAQ,uBAKvC;CAAG;;;;IArBF;;;OAGG;;;;;;AAoBL,qBAAa,MAAO,SAAQ,WAO3B;CAAG;;AAEJ,qBAAa,kBAAmB,SAAQ,uBAA6C;CAAG;;AACxF,qBAAa,kBAAmB,SAAQ,uBAA6C;CAAG"}
+{"version":3,"file":"mesh-schema.d.ts","sourceRoot":"","sources":["../src/mesh-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,yBAAyB,CAAA;;;;IA6B5D,oEAAoE;;IAEpE;;;OAGG;;;;;;;;AAhBL;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,yBAWxC;CAAG;;;;;;;;;;;;AAEL,qBAAa,4BAA6B,SAAQ,iCAOhD;CAAG;;;;;;;;;;AAEL,qBAAa,oCAAqC,SAAQ,yCAIxD;CAAG;;;;;;;;;;AAEL,qBAAa,mBAAoB,SAAQ,wBAIvC;CAAG;;;;;;;;;;;;AAEL,qBAAa,2BAA4B,SAAQ,gCAM/C;CAAG;;;;;;;;;;;AAEL,qBAAa,mBAAoB,SAAQ,wBAKvC;CAAG;;;;;;;;;;;AAEL,qBAAa,sBAAuB,SAAQ,2BAK1C;CAAG;;;;;;AAEL;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAIpC;CAAG;;;;IAKH,iDAAiD;;;;AAHnD,qBAAa,sBAAuB,SAAQ,2BAM1C;CAAG;;;;;;;IAQH,iDAAiD;;;;AANnD,qBAAa,uBAAwB,SAAQ,4BAS3C;CAAG;AAEL,eAAO,MAAM,sBAAsB;;;IAGjC;;;OAGG;;;;;EAKH,CAAA;;AAEF,qBAAa,mBAAoB,SAAQ,wBAIxC;CAAG;;AAEJ,qBAAa,kBAAmB,SAAQ,uBAKvC;CAAG;;;;IArBF;;;OAGG;;;;;;AAoBL,qBAAa,MAAO,SAAQ,WAO3B;CAAG;;AAEJ,qBAAa,iBAAkB,SAAQ,sBAA4C;CAAG;;AACtF,qBAAa,iBAAkB,SAAQ,sBAA4C;CAAG"}

package/dist/mesh-schema.js

@@ -10,13 +10,13 @@ const defaultPacketFields = {
 };
 const remainingHopsUndefined = Schema.Undefined.pipe(Schema.optional);
 /**
- * Needs to go through already existing MessageChannel edges, times out otherwise
+ * Needs to go through already existing DirectChannel edges, times out otherwise
  *
  * Can't yet contain the `port` because the request might be duplicated while forwarding to multiple nodes.
  * We need a clear path back to the sender to avoid this, thus we respond with a separate
- * `MessageChannelResponseSuccess` which contains the `port`.
+ * `DirectChannelResponseSuccess` which contains the `port`.
  */
-export class MessageChannelRequest extends Schema.TaggedStruct('MessageChannelRequest', {
+export class DirectChannelRequest extends Schema.TaggedStruct('DirectChannelRequest', {
     ...defaultPacketFields,
     remainingHops: Schema.Array(Schema.String).pipe(Schema.optional),
     channelVersion: Schema.Number,
@@ -29,7 +29,7 @@ export class MessageChannelRequest extends Schema.TaggedStruct('MessageChannelRe
     sourceId: Schema.String,
 }) {
 }
-export class MessageChannelResponseSuccess extends Schema.TaggedStruct('MessageChannelResponseSuccess', {
+export class DirectChannelResponseSuccess extends Schema.TaggedStruct('DirectChannelResponseSuccess', {
     ...defaultPacketFields,
     reqId: Schema.String,
     port: Transferable.MessagePort,
@@ -38,7 +38,7 @@ export class MessageChannelResponseSuccess extends Schema.TaggedStruct('MessageC
     channelVersion: Schema.Number,
 }) {
 }
-export class MessageChannelResponseNoTransferables extends Schema.TaggedStruct('MessageChannelResponseNoTransferables', {
+export class DirectChannelResponseNoTransferables extends Schema.TaggedStruct('DirectChannelResponseNoTransferables', {
     ...defaultPacketFields,
     reqId: Schema.String,
     remainingHops: Schema.Array(Schema.String),
@@ -113,14 +113,14 @@ export const BroadcastChannelPacket = Schema.TaggedStruct('BroadcastChannelPacke
     source: Schema.String,
     target: Schema.Literal('-'),
 });
-export class MessageChannelPacket extends Schema.Union(MessageChannelRequest, MessageChannelResponseSuccess, MessageChannelResponseNoTransferables) {
+export class DirectChannelPacket extends Schema.Union(DirectChannelRequest, DirectChannelResponseSuccess, DirectChannelResponseNoTransferables) {
 }
 export class ProxyChannelPacket extends Schema.Union(ProxyChannelRequest, ProxyChannelResponseSuccess, ProxyChannelPayload, ProxyChannelPayloadAck) {
 }
-export class Packet extends Schema.Union(MessageChannelPacket, ProxyChannelPacket, NetworkEdgeAdded, NetworkTopologyRequest, NetworkTopologyResponse, BroadcastChannelPacket) {
+export class Packet extends Schema.Union(DirectChannelPacket, ProxyChannelPacket, NetworkEdgeAdded, NetworkTopologyRequest, NetworkTopologyResponse, BroadcastChannelPacket) {
 }
-export class MessageChannelPing extends Schema.TaggedStruct('MessageChannelPing', {}) {
+export class DirectChannelPing extends Schema.TaggedStruct('DirectChannelPing', {}) {
 }
-export class MessageChannelPong extends Schema.TaggedStruct('MessageChannelPong', {}) {
+export class DirectChannelPong extends Schema.TaggedStruct('DirectChannelPong', {}) {
 }
 //# sourceMappingURL=mesh-schema.js.map

package/dist/mesh-schema.js.map

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

package/dist/node.d.ts

@@ -1,5 +1,5 @@
-import { Cause, Duration, Effect, Schema, Scope, WebChannel } from '@livestore/utils/effect';
-import type { MeshNodeName } from './common.js';
+import { Cause, Duration, Effect, Schema, Scope, Stream, WebChannel } from '@livestore/utils/effect';
+import type { ListenForChannelResult, MeshNodeName } from './common.js';
 import { EdgeAlreadyExistsError } from './common.js';
 import * as WebmeshSchema from './mesh-schema.js';
 type EdgeChannel = WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>;
@@ -37,8 +37,12 @@ export interface MeshNode<TName extends MeshNodeName = MeshNodeName> {
         }): Effect.Effect<void, EdgeAlreadyExistsError, Scope.Scope>;
     };
     removeEdge: (targetNodeName: MeshNodeName) => Effect.Effect<void, Cause.NoSuchElementException>;
+    hasChannel: ({ target, channelName, }: {
+        target: MeshNodeName;
+        channelName: string;
+    }) => Effect.Effect<boolean, never, Scope.Scope>;
     /**
-     * Tries to broker a MessageChannel edge between the nodes, otherwise will proxy messages via hop-nodes
+     * Tries to broker a DirectChannel edge between the nodes, otherwise will proxy messages via hop-nodes
      *
      * For a channel to successfully open, both sides need to have a edge and call `makeChannel`.
      *
@@ -63,9 +67,9 @@ export interface MeshNode<TName extends MeshNodeName = MeshNodeName> {
             send: Schema.Schema<MsgSend, any>;
         };
         /**
-         * If possible, prefer using a MessageChannel with transferables (i.e. transferring memory instead of copying it).
+         * If possible, prefer using a DirectChannel with transferables (i.e. transferring memory instead of copying it).
          */
-        mode: 'messagechannel' | 'proxy';
+        mode: 'direct' | 'proxy';
         /**
          * Amount of time before we consider a channel creation failed and retry when a new edge is available
          *
@@ -73,6 +77,7 @@ export interface MeshNode<TName extends MeshNodeName = MeshNodeName> {
          */
         timeout?: Duration.DurationInput;
     }) => Effect.Effect<WebChannel.WebChannel<MsgListen, MsgSend>, never, Scope.Scope>;
+    listenForChannel: Stream.Stream<ListenForChannelResult>;
     /**
      * Creates a WebChannel that is broadcasted to all connected nodes.
      * Messages won't be buffered for nodes that join the network after the broadcast channel has been created.

package/dist/node.d.ts.map

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

package/dist/node.js

@@ -1,6 +1,6 @@
 import { indent, LS_DEV, shouldNeverHappen } from '@livestore/utils';
 import { Cause, Deferred, Duration, Effect, Exit, Fiber, Option, PubSub, Queue, Schema, Scope, Stream, WebChannel, } from '@livestore/utils/effect';
-import { makeMessageChannel } from './channel/message-channel.js';
+import { makeDirectChannel } from './channel/direct-channel.js';
 import { makeProxyChannel } from './channel/proxy-channel.js';
 import { EdgeAlreadyExistsError, packetAsOtelAttributes } from './common.js';
 import * as WebmeshSchema from './mesh-schema.js';
@@ -15,16 +15,17 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
     //   Effect.acquireRelease(Queue.shutdown),
     // )
     const channelMap = new Map();
+    const channelRequestsQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
     const topologyRequestsMap = new Map();
     const broadcastChannelListenQueueMap = new Map();
     const checkTransferableEdges = (packet) => {
-        if ((packet._tag === 'MessageChannelRequest' &&
+        if ((packet._tag === 'DirectChannelRequest' &&
             (edgeChannels.size === 0 ||
                 // Either if direct edge does not support transferables ...
                 edgeChannels.get(packet.target)?.channel.supportsTransferables === false)) ||
             // ... or if no forward-edges support transferables
             ![...edgeChannels.values()].some((c) => c.channel.supportsTransferables === true)) {
-            return WebmeshSchema.MessageChannelResponseNoTransferables.make({
+            return WebmeshSchema.DirectChannelResponseNoTransferables.make({
                 reqId: packet.id,
                 channelName: packet.channelName,
                 // NOTE for now we're "pretending" that the message is coming from the target node
@@ -113,6 +114,7 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
         if (edgeChannels.has(packet.target)) {
             const edgeChannel = edgeChannels.get(packet.target).channel;
             const hops = packet.source === nodeName ? [] : [...packet.hops, nodeName];
+            yield* Effect.annotateCurrentSpan({ hasDirectEdge: true });
             yield* edgeChannel.send({ ...packet, hops });
         }
         // In this case we have an expected route back we should follow
@@ -136,15 +138,18 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             // Optimization: filter out edge where packet just came from
             const edgesToForwardTo = Array.from(edgeChannels)
                 .filter(([name]) => name !== packet.source)
-                .map(([_, con]) => con.channel);
+                .map(([name, con]) => ({ name, channel: con.channel }));
             // TODO if hops-depth=0, we should fail right away with no route found
             if (hops.length === 0 && edgesToForwardTo.length === 0 && LS_DEV) {
-                console.log(nodeName, 'no route found', packet._tag, 'TODO handle better');
+                yield* Effect.logWarning(nodeName, 'no route found to', packet.target, packet._tag, 'TODO handle better');
                 // TODO return a expected failure
             }
             const packetToSend = { ...packet, hops };
             // console.debug(nodeName, 'sendPacket:forwarding', packetToSend)
-            yield* Effect.forEach(edgesToForwardTo, (con) => con.send(packetToSend), { concurrency: 'unbounded' });
+            yield* Effect.annotateCurrentSpan({ edgesToForwardTo: edgesToForwardTo.map(({ name }) => name) });
+            yield* Effect.forEach(edgesToForwardTo, ({ channel }) => channel.send(packetToSend), {
+                concurrency: 'unbounded',
+            });
         }
     }).pipe(Effect.withSpan(`sendPacket:${packet._tag}:${packet.source}→${packet.target}`, {
         attributes: packetAsOtelAttributes(packet),
@@ -161,7 +166,7 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
         // TODO use a priority queue instead to prioritize network-changes/edge-requests over payloads
         const listenFiber = yield* edgeChannel.listen.pipe(Stream.flatten(), Stream.tap((message) => Effect.gen(function* () {
             const packet = yield* Schema.decodeUnknown(WebmeshSchema.Packet)(message);
-            // console.debug(nodeName, 'received', packet._tag, packet.source, packet.target)
+            // console.debug(nodeName, 'recv', packet._tag, packet.source, packet.target)
             if (handledPacketIds.has(packet.id))
                 return;
             handledPacketIds.add(packet.id);
@@ -176,22 +181,29 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
                     if (packet.target === nodeName) {
                         const channelKey = `target:${packet.source}, channelName:${packet.channelName}`;
                         if (!channelMap.has(channelKey)) {
-                            const queue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
-                            channelMap.set(channelKey, { queue, debugInfo: undefined });
+                            const channelQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
+                            channelMap.set(channelKey, { queue: channelQueue, debugInfo: undefined });
                         }
-                        const queue = channelMap.get(channelKey).queue;
+                        const channelQueue = channelMap.get(channelKey).queue;
                         const respondToSender = (outgoingPacket) => edgeChannel
                             .send(outgoingPacket)
                             .pipe(Effect.withSpan(`respondToSender:${outgoingPacket._tag}:${outgoingPacket.source}→${outgoingPacket.target}`, { attributes: packetAsOtelAttributes(outgoingPacket) }), Effect.orDie);
                         if (Schema.is(WebmeshSchema.ProxyChannelPacket)(packet)) {
-                            yield* Queue.offer(queue, { packet, respondToSender });
+                            yield* Queue.offer(channelQueue, { packet, respondToSender });
                         }
-                        else if (Schema.is(WebmeshSchema.MessageChannelPacket)(packet)) {
-                            yield* Queue.offer(queue, { packet, respondToSender });
+                        else if (Schema.is(WebmeshSchema.DirectChannelPacket)(packet)) {
+                            yield* Queue.offer(channelQueue, { packet, respondToSender });
+                        }
+                        if (packet._tag === 'ProxyChannelRequest' || packet._tag === 'DirectChannelRequest') {
+                            yield* Queue.offer(channelRequestsQueue, {
+                                channelName: packet.channelName,
+                                source: packet.source,
+                                mode: packet._tag === 'ProxyChannelRequest' ? 'proxy' : 'direct',
+                            });
                         }
                     }
                     else {
-                        if (Schema.is(WebmeshSchema.MessageChannelPacket)(packet)) {
+                        if (Schema.is(WebmeshSchema.DirectChannelPacket)(packet)) {
                             const noTransferableResponse = checkTransferableEdges(packet);
                             if (noTransferableResponse !== undefined) {
                                 yield* Effect.spanEvent(`No transferable edges found for ${packet.source}→${packet.target}`);
@@ -211,7 +223,7 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             target: targetNodeName,
         });
         yield* sendPacket(edgeAddedPacket).pipe(Effect.orDie);
-    }).pipe(Effect.annotateLogs({ 'addEdge:target': targetNodeName }), Effect.withSpan(`addEdge:${nodeName}→${targetNodeName}`, {
+    }).pipe(Effect.annotateLogs({ 'addEdge:target': targetNodeName, nodeName }), Effect.withSpan(`addEdge:${nodeName}→${targetNodeName}`, {
         attributes: { supportsTransferables: edgeChannel.supportsTransferables },
     })); // any-cast needed for error/never overload
     const removeEdge = (targetNodeName) => Effect.gen(function* () {
@@ -221,10 +233,11 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
         yield* Fiber.interrupt(edgeChannels.get(targetNodeName).listenFiber);
         edgeChannels.delete(targetNodeName);
     });
+    const hasChannel = ({ target, channelName }) => Effect.sync(() => channelMap.has(`target:${target}, channelName:${channelName}`));
     // TODO add heartbeat to detect dead edges (for both e2e and proxying)
     // TODO when a channel is established in the same origin, we can use a weblock to detect disconnects
     const makeChannel = ({ target, channelName, schema: inputSchema, 
-    // TODO in the future we could have a mode that prefers messagechannels and then falls back to proxies if needed
+    // TODO in the future we could have a mode that prefers directs and then falls back to proxies if needed
     mode, timeout = Duration.seconds(1), }) => Effect.gen(function* () {
         const schema = WebChannel.mapSchema(inputSchema);
         const channelKey = `target:${target}, channelName:${channelName}`;
@@ -235,20 +248,20 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             }
         }
         else {
-            const queue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
-            channelMap.set(channelKey, { queue, debugInfo: undefined });
+            const channelQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
+            channelMap.set(channelKey, { queue: channelQueue, debugInfo: undefined });
         }
-        const queue = channelMap.get(channelKey).queue;
+        const channelQueue = channelMap.get(channelKey).queue;
         yield* Effect.addFinalizer(() => Effect.sync(() => channelMap.delete(channelKey)));
-        if (mode === 'messagechannel') {
+        if (mode === 'direct') {
             const incomingPacketsQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
             // We're we're draining the queue into another new queue.
             // It's a bit of a mystery why this is needed, since the unit tests also work without it.
             // But for the LiveStore devtools to actually work, we need to do this.
             // We should figure out some day why this is needed and further simplify if possible.
-            yield* Queue.takeBetween(queue, 1, 10).pipe(Effect.tap((_) => Queue.offerAll(incomingPacketsQueue, _)), Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
+            yield* Queue.takeBetween(channelQueue, 1, 10).pipe(Effect.tap((_) => Queue.offerAll(incomingPacketsQueue, _)), Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
             // NOTE already retries internally when transferables are required
-            const { webChannel, initialEdgeDeferred } = yield* makeMessageChannel({
+            const { webChannel, initialEdgeDeferred } = yield* makeDirectChannel({
                 nodeName,
                 incomingPacketsQueue,
                 newEdgeAvailablePubSub,
@@ -258,7 +271,7 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
                 sendPacket,
                 checkTransferableEdges,
             });
-            channelMap.set(channelKey, { queue, debugInfo: { channel: webChannel, target } });
+            channelMap.set(channelKey, { queue: channelQueue, debugInfo: { channel: webChannel, target } });
             yield* initialEdgeDeferred;
             return webChannel;
         }
@@ -269,17 +282,36 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
                 target,
                 channelName,
                 schema,
-                queue,
+                queue: channelQueue,
                 sendPacket,
             });
-            channelMap.set(channelKey, { queue, debugInfo: { channel, target } });
+            channelMap.set(channelKey, { queue: channelQueue, debugInfo: { channel, target } });
             return channel;
         }
     }).pipe(
     // Effect.timeout(timeout),
     Effect.withSpanScoped(`makeChannel:${nodeName}→${target}(${channelName})`, {
         attributes: { target, channelName, mode, timeout },
-    }), Effect.annotateLogs({ nodeName }));
+    }), Effect.annotateLogs({ nodeName, target, channelName }));
+    // TODO consider supporting multiple listeners
+    // TODO also provide a way to allow for reconnects
+    let listenAlreadyStarted = false;
+    const listenForChannel = Stream.suspend(() => {
+        if (listenAlreadyStarted) {
+            return shouldNeverHappen('listenForChannel already started');
+        }
+        listenAlreadyStarted = true;
+        const hash = (res) => `${res.channelName}:${res.source}:${res.mode}`;
+        const seen = new Set();
+        return Stream.fromQueue(channelRequestsQueue).pipe(Stream.filter((res) => {
+            const hashed = hash(res);
+            if (seen.has(hashed)) {
+                return false;
+            }
+            seen.add(hashed);
+            return true;
+        }));
+    });
     const makeBroadcastChannel = ({ channelName, schema }) => Effect.scopeWithCloseable((scope) => Effect.gen(function* () {
         if (broadcastChannelListenQueueMap.has(channelName)) {
             return shouldNeverHappen(`Broadcast channel ${channelName} already exists`, broadcastChannelListenQueueMap.get(channelName));
@@ -305,7 +337,7 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             send,
             listen,
             closedDeferred,
-            supportsTransferables: true,
+            supportsTransferables: false,
             schema: { listen: schema, send: schema },
             shutdown: Scope.close(scope, Exit.void),
             debugInfo,
@@ -337,14 +369,17 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
         },
         ping: (payload) => {
             Effect.gen(function* () {
-                const msg = (via) => WebChannel.DebugPingMessage.make({ message: `ping from ${nodeName} via edge ${via}`, payload });
+                const msg = (via) => WebChannel.DebugPingMessage.make({ message: `ping from ${nodeName} via ${via}`, payload });
                 for (const [channelName, con] of edgeChannels) {
                     yield* Effect.logDebug(`sending ping via edge ${channelName}`);
                     yield* con.channel.send(msg(`edge ${channelName}`));
                 }
                 for (const [channelKey, channel] of channelMap) {
-                    if (channel.debugInfo === undefined)
+                    if (channel.debugInfo === undefined) {
+                        yield* Effect.logDebug(`channel ${channelKey} has no debug info`);
                         continue;
+                    }
+                    // if (channel.debugInfo === undefined) continue
                     yield* Effect.logDebug(`sending ping via channel ${channelKey}`);
                     yield* channel.debugInfo.channel.send(msg(`channel ${channelKey}`));
                 }
@@ -362,8 +397,9 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             yield* sendPacket(packet);
             yield* Effect.logDebug(`Waiting ${timeoutMs}ms for topology response`);
             yield* Effect.sleep(timeoutMs);
+            yield* Effect.logDebug(`Topology response (from ${nodeName}):`);
             for (const [key, value] of item) {
-                yield* Effect.logDebug(`node '${key}' is connected to: ${Array.from(value.values()).join(', ')}`);
+                yield* Effect.logDebug(`  node '${key}' has edge to: ${Array.from(value.values()).join(', ')}`);
             }
         }).pipe(Effect.provide(runtime), Effect.tapCauseLogPretty, Effect.runPromise),
     };
@@ -371,7 +407,9 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
         nodeName,
         addEdge,
         removeEdge,
+        hasChannel,
         makeChannel,
+        listenForChannel,
         makeBroadcastChannel,
         edgeKeys,
         debug,