@livestore/webmesh 0.3.0-dev.21 → 0.3.0-dev.23

package/dist/mesh-schema.js

@@ -10,7 +10,7 @@ const defaultPacketFields = {
 };
 const remainingHopsUndefined = Schema.Undefined.pipe(Schema.optional);
 /**
- * Needs to go through already existing MessageChannel connections, times out otherwise
+ * Needs to go through already existing MessageChannel 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
@@ -73,16 +73,16 @@ export class ProxyChannelPayloadAck extends Schema.TaggedStruct('ProxyChannelPay
 }) {
 }
 /**
- * Broadcast to all nodes when a new connection is added.
+ * Broadcast to all nodes when a new edge is added.
  * Mostly used for auto-reconnect purposes.
  */
-export class NetworkConnectionAdded extends Schema.TaggedStruct('NetworkConnectionAdded', {
+export class NetworkEdgeAdded extends Schema.TaggedStruct('NetworkEdgeAdded', {
     id,
     source: Schema.String,
     target: Schema.String,
 }) {
 }
-export class NetworkConnectionTopologyRequest extends Schema.TaggedStruct('NetworkConnectionTopologyRequest', {
+export class NetworkTopologyRequest extends Schema.TaggedStruct('NetworkTopologyRequest', {
     id,
     hops: Schema.Array(Schema.String),
     /** Always fixed to who requested the topology */
@@ -90,12 +90,12 @@ export class NetworkConnectionTopologyRequest extends Schema.TaggedStruct('Netwo
     target: Schema.Literal('-'),
 }) {
 }
-export class NetworkConnectionTopologyResponse extends Schema.TaggedStruct('NetworkConnectionTopologyResponse', {
+export class NetworkTopologyResponse extends Schema.TaggedStruct('NetworkTopologyResponse', {
     id,
     reqId: Schema.String,
     remainingHops: Schema.Array(Schema.String),
     nodeName: Schema.String,
-    connections: Schema.Array(Schema.String),
+    edges: Schema.Array(Schema.String),
     /** Always fixed to who requested the topology */
     source: Schema.String,
     target: Schema.Literal('-'),
@@ -117,7 +117,7 @@ export class MessageChannelPacket extends Schema.Union(MessageChannelRequest, Me
 }
 export class ProxyChannelPacket extends Schema.Union(ProxyChannelRequest, ProxyChannelResponseSuccess, ProxyChannelPayload, ProxyChannelPayloadAck) {
 }
-export class Packet extends Schema.Union(MessageChannelPacket, ProxyChannelPacket, NetworkConnectionAdded, NetworkConnectionTopologyRequest, NetworkConnectionTopologyResponse, BroadcastChannelPacket) {
+export class Packet extends Schema.Union(MessageChannelPacket, ProxyChannelPacket, NetworkEdgeAdded, NetworkTopologyRequest, NetworkTopologyResponse, BroadcastChannelPacket) {
 }
 export class MessageChannelPing extends Schema.TaggedStruct('MessageChannelPing', {}) {
 }

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/mod.d.ts

@@ -1,5 +1,5 @@
-export * from './websocket-connection.js';
+export * from './websocket-edge.js';
 export * from './node.js';
 export * as WebmeshSchema from './mesh-schema.js';
-export { ConnectionAlreadyExistsError } from './common.js';
+export { EdgeAlreadyExistsError } from './common.js';
 //# sourceMappingURL=mod.d.ts.map

package/dist/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,WAAW,CAAA;AACzB,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA"}

package/dist/mod.js

@@ -1,5 +1,5 @@
-export * from './websocket-connection.js';
+export * from './websocket-edge.js';
 export * from './node.js';
 export * as WebmeshSchema from './mesh-schema.js';
-export { ConnectionAlreadyExistsError } from './common.js';
+export { EdgeAlreadyExistsError } from './common.js';
 //# sourceMappingURL=mod.js.map

package/dist/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,WAAW,CAAA;AACzB,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA"}

package/dist/node.d.ts

@@ -1,11 +1,11 @@
 import { Cause, Duration, Effect, Schema, Scope, WebChannel } from '@livestore/utils/effect';
 import type { MeshNodeName } from './common.js';
-import { ConnectionAlreadyExistsError } from './common.js';
+import { EdgeAlreadyExistsError } from './common.js';
 import * as WebmeshSchema from './mesh-schema.js';
-type ConnectionChannel = WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>;
+type EdgeChannel = WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>;
 export interface MeshNode<TName extends MeshNodeName = MeshNodeName> {
     nodeName: TName;
-    connectionKeys: Effect.Effect<Set<MeshNodeName>>;
+    edgeKeys: Effect.Effect<Set<MeshNodeName>>;
     debug: {
         print: () => void;
         /** Sends a ping message to all connected nodes and channels */
@@ -16,31 +16,31 @@ export interface MeshNode<TName extends MeshNodeName = MeshNodeName> {
         requestTopology: (timeoutMs?: number) => Promise<void>;
     };
     /**
-     * Manually adds a connection to get connected to the network of nodes with an existing WebChannel.
+     * Manually adds a edge to get connected to the network of nodes with an existing WebChannel.
      *
-     * Assumptions about the WebChannel connection:
-     * - 1:1 connection
+     * Assumptions about the WebChannel edge:
+     * - 1:1 edge
      * - Queues messages internally to never drop messages
      * - Automatically reconnects
      * - Ideally supports transferables
      */
-    addConnection: {
+    addEdge: {
         (options: {
             target: MeshNodeName;
-            connectionChannel: ConnectionChannel;
+            edgeChannel: EdgeChannel;
             replaceIfExists: true;
         }): Effect.Effect<void, never, Scope.Scope>;
         (options: {
             target: MeshNodeName;
-            connectionChannel: ConnectionChannel;
+            edgeChannel: EdgeChannel;
             replaceIfExists?: boolean;
-        }): Effect.Effect<void, ConnectionAlreadyExistsError, Scope.Scope>;
+        }): Effect.Effect<void, EdgeAlreadyExistsError, Scope.Scope>;
     };
-    removeConnection: (targetNodeName: MeshNodeName) => Effect.Effect<void, Cause.NoSuchElementException>;
+    removeEdge: (targetNodeName: MeshNodeName) => Effect.Effect<void, Cause.NoSuchElementException>;
     /**
-     * Tries to broker a MessageChannel connection between the nodes, otherwise will proxy messages via hop-nodes
+     * Tries to broker a MessageChannel edge between the nodes, otherwise will proxy messages via hop-nodes
      *
-     * For a channel to successfully open, both sides need to have a connection and call `makeChannel`.
+     * For a channel to successfully open, both sides need to have a edge and call `makeChannel`.
      *
      * Example:
      * ```ts
@@ -67,7 +67,7 @@ export interface MeshNode<TName extends MeshNodeName = MeshNodeName> {
          */
         mode: 'messagechannel' | 'proxy';
         /**
-         * Amount of time before we consider a channel creation failed and retry when a new connection is available
+         * Amount of time before we consider a channel creation failed and retry when a new edge is available
          *
          * @default 1 second
          */

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

@@ -2,14 +2,14 @@ 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 { makeProxyChannel } from './channel/proxy-channel.js';
-import { ConnectionAlreadyExistsError, packetAsOtelAttributes } from './common.js';
+import { EdgeAlreadyExistsError, packetAsOtelAttributes } from './common.js';
 import * as WebmeshSchema from './mesh-schema.js';
 import { TimeoutSet } from './utils.js';
 export const makeMeshNode = (nodeName) => Effect.gen(function* () {
-    const connectionChannels = new Map();
+    const edgeChannels = new Map();
     // To avoid unbounded memory growth, we automatically forget about packet ids after a while
     const handledPacketIds = new TimeoutSet({ timeout: Duration.minutes(1) });
-    const newConnectionAvailablePubSub = yield* PubSub.unbounded().pipe(Effect.acquireRelease(PubSub.shutdown));
+    const newEdgeAvailablePubSub = yield* PubSub.unbounded().pipe(Effect.acquireRelease(PubSub.shutdown));
     // const proxyPacketsToProcess = yield* Queue.unbounded<ProxyQueueItem>().pipe(Effect.acquireRelease(Queue.shutdown))
     // const messagePacketsToProcess = yield* Queue.unbounded<MessageQueueItem>().pipe(
     //   Effect.acquireRelease(Queue.shutdown),
@@ -17,13 +17,13 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
     const channelMap = new Map();
     const topologyRequestsMap = new Map();
     const broadcastChannelListenQueueMap = new Map();
-    const checkTransferableConnections = (packet) => {
+    const checkTransferableEdges = (packet) => {
         if ((packet._tag === 'MessageChannelRequest' &&
-            (connectionChannels.size === 0 ||
-                // Either if direct connection does not support transferables ...
-                connectionChannels.get(packet.target)?.channel.supportsTransferables === false)) ||
-            // ... or if no forward-connections support transferables
-            ![...connectionChannels.values()].some((c) => c.channel.supportsTransferables === true)) {
+            (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({
                 reqId: packet.id,
                 channelName: packet.channelName,
@@ -40,24 +40,24 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
     };
     const sendPacket = (packet) => Effect.gen(function* () {
         // yield* Effect.log(`${nodeName}: sendPacket:${packet._tag} [${packet.id}]`)
-        if (Schema.is(WebmeshSchema.NetworkConnectionAdded)(packet)) {
-            yield* Effect.spanEvent('NetworkConnectionAdded', { packet, nodeName });
-            yield* PubSub.publish(newConnectionAvailablePubSub, packet.target);
-            const connectionsToForwardTo = Array.from(connectionChannels)
+        if (Schema.is(WebmeshSchema.NetworkEdgeAdded)(packet)) {
+            yield* Effect.spanEvent('NetworkEdgeAdded', { packet, nodeName });
+            yield* PubSub.publish(newEdgeAvailablePubSub, packet.target);
+            const edgesToForwardTo = Array.from(edgeChannels)
                 .filter(([name]) => name !== packet.source)
                 .map(([_, con]) => con.channel);
-            yield* Effect.forEach(connectionsToForwardTo, (con) => con.send(packet), { concurrency: 'unbounded' });
+            yield* Effect.forEach(edgesToForwardTo, (con) => con.send(packet), { concurrency: 'unbounded' });
             return;
         }
         if (Schema.is(WebmeshSchema.BroadcastChannelPacket)(packet)) {
-            const connectionsToForwardTo = Array.from(connectionChannels)
+            const edgesToForwardTo = Array.from(edgeChannels)
                 .filter(([name]) => !packet.hops.includes(name))
                 .map(([_, con]) => con.channel);
             const adjustedPacket = {
                 ...packet,
                 hops: [...packet.hops, nodeName],
             };
-            yield* Effect.forEach(connectionsToForwardTo, (con) => con.send(adjustedPacket), { concurrency: 'unbounded' });
+            yield* Effect.forEach(edgesToForwardTo, (con) => con.send(adjustedPacket), { concurrency: 'unbounded' });
             // Don't emit the packet to the own node listen queue
             if (packet.source === nodeName) {
                 return;
@@ -69,109 +69,109 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             }
             return;
         }
-        if (Schema.is(WebmeshSchema.NetworkConnectionTopologyRequest)(packet)) {
+        if (Schema.is(WebmeshSchema.NetworkTopologyRequest)(packet)) {
             if (packet.source !== nodeName) {
-                const backConnectionName = packet.hops.at(-1) ?? shouldNeverHappen(`${nodeName}: Expected hops for packet`, packet);
-                const backConnectionChannel = connectionChannels.get(backConnectionName).channel;
-                // Respond with own connection info
-                const response = WebmeshSchema.NetworkConnectionTopologyResponse.make({
+                const backEdgeName = packet.hops.at(-1) ?? shouldNeverHappen(`${nodeName}: Expected hops for packet`, packet);
+                const backEdgeChannel = edgeChannels.get(backEdgeName).channel;
+                // Respond with own edge info
+                const response = WebmeshSchema.NetworkTopologyResponse.make({
                     reqId: packet.id,
                     source: packet.source,
                     target: packet.target,
                     remainingHops: packet.hops.slice(0, -1),
                     nodeName,
-                    connections: Array.from(connectionChannels.keys()),
+                    edges: Array.from(edgeChannels.keys()),
                 });
-                yield* backConnectionChannel.send(response);
+                yield* backEdgeChannel.send(response);
             }
-            // Forward the packet to all connections except the already visited ones
-            const connectionsToForwardTo = Array.from(connectionChannels)
+            // Forward the packet to all edges except the already visited ones
+            const edgesToForwardTo = Array.from(edgeChannels)
                 .filter(([name]) => !packet.hops.includes(name))
                 .map(([_, con]) => con.channel);
             const adjustedPacket = {
                 ...packet,
                 hops: [...packet.hops, nodeName],
             };
-            yield* Effect.forEach(connectionsToForwardTo, (con) => con.send(adjustedPacket), { concurrency: 'unbounded' });
+            yield* Effect.forEach(edgesToForwardTo, (con) => con.send(adjustedPacket), { concurrency: 'unbounded' });
             return;
         }
-        if (Schema.is(WebmeshSchema.NetworkConnectionTopologyResponse)(packet)) {
+        if (Schema.is(WebmeshSchema.NetworkTopologyResponse)(packet)) {
             if (packet.source === nodeName) {
                 const topologyRequestItem = topologyRequestsMap.get(packet.reqId);
-                topologyRequestItem.set(packet.nodeName, new Set(packet.connections));
+                topologyRequestItem.set(packet.nodeName, new Set(packet.edges));
             }
             else {
                 const remainingHops = packet.remainingHops;
                 // Forwarding the response to the original sender via the route back
                 const routeBack = remainingHops.at(-1) ?? shouldNeverHappen(`${nodeName}: Expected remaining hops for packet`, packet);
-                const connectionChannel = connectionChannels.get(routeBack)?.channel ??
-                    shouldNeverHappen(`${nodeName}: Expected connection channel (${routeBack}) for packet`, packet, 'Available connections:', Array.from(connectionChannels.keys()));
-                yield* connectionChannel.send({ ...packet, remainingHops: packet.remainingHops.slice(0, -1) });
+                const edgeChannel = edgeChannels.get(routeBack)?.channel ??
+                    shouldNeverHappen(`${nodeName}: Expected edge channel (${routeBack}) for packet`, packet, 'Available edges:', Array.from(edgeChannels.keys()));
+                yield* edgeChannel.send({ ...packet, remainingHops: packet.remainingHops.slice(0, -1) });
             }
             return;
         }
-        // We have a direct connection to the target node
-        if (connectionChannels.has(packet.target)) {
-            const connectionChannel = connectionChannels.get(packet.target).channel;
+        // We have a direct edge to the target node
+        if (edgeChannels.has(packet.target)) {
+            const edgeChannel = edgeChannels.get(packet.target).channel;
             const hops = packet.source === nodeName ? [] : [...packet.hops, nodeName];
-            yield* connectionChannel.send({ ...packet, hops });
+            yield* edgeChannel.send({ ...packet, hops });
         }
         // In this case we have an expected route back we should follow
         // eslint-disable-next-line unicorn/no-negated-condition
         else if (packet.remainingHops !== undefined) {
             const hopTarget = packet.remainingHops.at(-1) ?? shouldNeverHappen(`${nodeName}: Expected remaining hops for packet`, packet);
-            const connectionChannel = connectionChannels.get(hopTarget)?.channel;
-            if (connectionChannel === undefined) {
-                yield* Effect.logWarning(`${nodeName}: Expected to find hop target ${hopTarget} in connections. Dropping packet.`, packet);
+            const edgeChannel = edgeChannels.get(hopTarget)?.channel;
+            if (edgeChannel === undefined) {
+                yield* Effect.logWarning(`${nodeName}: Expected to find hop target ${hopTarget} in edges. Dropping packet.`, packet);
                 return;
             }
-            yield* connectionChannel.send({
+            yield* edgeChannel.send({
                 ...packet,
                 remainingHops: packet.remainingHops.slice(0, -1),
                 hops: [...packet.hops, nodeName],
             });
         }
-        // No route found, forward to all connections
+        // No route found, forward to all edges
         else {
             const hops = packet.source === nodeName ? [] : [...packet.hops, nodeName];
-            // Optimization: filter out connection where packet just came from
-            const connectionsToForwardTo = Array.from(connectionChannels)
+            // Optimization: filter out edge where packet just came from
+            const edgesToForwardTo = Array.from(edgeChannels)
                 .filter(([name]) => name !== packet.source)
                 .map(([_, con]) => con.channel);
             // TODO if hops-depth=0, we should fail right away with no route found
-            if (hops.length === 0 && connectionsToForwardTo.length === 0 && LS_DEV) {
+            if (hops.length === 0 && edgesToForwardTo.length === 0 && LS_DEV) {
                 console.log(nodeName, 'no route found', packet._tag, 'TODO handle better');
                 // TODO return a expected failure
             }
             const packetToSend = { ...packet, hops };
             // console.debug(nodeName, 'sendPacket:forwarding', packetToSend)
-            yield* Effect.forEach(connectionsToForwardTo, (con) => con.send(packetToSend), { concurrency: 'unbounded' });
+            yield* Effect.forEach(edgesToForwardTo, (con) => con.send(packetToSend), { concurrency: 'unbounded' });
         }
     }).pipe(Effect.withSpan(`sendPacket:${packet._tag}:${packet.source}→${packet.target}`, {
         attributes: packetAsOtelAttributes(packet),
     }), Effect.orDie);
-    const addConnection = ({ target: targetNodeName, connectionChannel, replaceIfExists = false, }) => Effect.gen(function* () {
-        if (connectionChannels.has(targetNodeName)) {
+    const addEdge = ({ target: targetNodeName, edgeChannel, replaceIfExists = false }) => Effect.gen(function* () {
+        if (edgeChannels.has(targetNodeName)) {
             if (replaceIfExists) {
-                yield* removeConnection(targetNodeName).pipe(Effect.orDie);
+                yield* removeEdge(targetNodeName).pipe(Effect.orDie);
                 // console.log('interrupting', targetNodeName)
-                // yield* Fiber.interrupt(connectionChannels.get(targetNodeName)!.listenFiber)
+                // yield* Fiber.interrupt(edgeChannels.get(targetNodeName)!.listenFiber)
             }
             else {
-                return yield* new ConnectionAlreadyExistsError({ target: targetNodeName });
+                return yield* new EdgeAlreadyExistsError({ target: targetNodeName });
             }
         }
-        // TODO use a priority queue instead to prioritize network-changes/connection-requests over payloads
-        const listenFiber = yield* connectionChannel.listen.pipe(Stream.flatten(), Stream.tap((message) => 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)
             if (handledPacketIds.has(packet.id))
                 return;
             handledPacketIds.add(packet.id);
             switch (packet._tag) {
-                case 'NetworkConnectionAdded':
-                case 'NetworkConnectionTopologyRequest':
-                case 'NetworkConnectionTopologyResponse': {
+                case 'NetworkEdgeAdded':
+                case 'NetworkTopologyRequest':
+                case 'NetworkTopologyResponse': {
                     yield* sendPacket(packet);
                     break;
                 }
@@ -183,7 +183,7 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
                             channelMap.set(channelKey, { queue, debugInfo: undefined });
                         }
                         const queue = channelMap.get(channelKey).queue;
-                        const respondToSender = (outgoingPacket) => connectionChannel
+                        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)) {
@@ -195,10 +195,10 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
                     }
                     else {
                         if (Schema.is(WebmeshSchema.MessageChannelPacket)(packet)) {
-                            const noTransferableResponse = checkTransferableConnections(packet);
+                            const noTransferableResponse = checkTransferableEdges(packet);
                             if (noTransferableResponse !== undefined) {
-                                yield* Effect.spanEvent(`No transferable connections found for ${packet.source}→${packet.target}`);
-                                return yield* connectionChannel.send(noTransferableResponse).pipe(Effect.withSpan(`sendNoTransferableResponse:${packet.source}→${packet.target}`, {
+                                yield* Effect.spanEvent(`No transferable edges found for ${packet.source}→${packet.target}`);
+                                return yield* edgeChannel.send(noTransferableResponse).pipe(Effect.withSpan(`sendNoTransferableResponse:${packet.source}→${packet.target}`, {
                                     attributes: packetAsOtelAttributes(noTransferableResponse),
                                 }));
                             }
@@ -208,23 +208,23 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
                 }
             }
         })), Stream.runDrain, Effect.orDie, Effect.tapCauseLogPretty, Effect.forkScoped);
-        connectionChannels.set(targetNodeName, { channel: connectionChannel, listenFiber });
-        const connectionAddedPacket = WebmeshSchema.NetworkConnectionAdded.make({
+        edgeChannels.set(targetNodeName, { channel: edgeChannel, listenFiber });
+        const edgeAddedPacket = WebmeshSchema.NetworkEdgeAdded.make({
             source: nodeName,
             target: targetNodeName,
         });
-        yield* sendPacket(connectionAddedPacket).pipe(Effect.orDie);
-    }).pipe(Effect.withSpan(`addConnection:${nodeName}→${targetNodeName}`, {
-        attributes: { supportsTransferables: connectionChannel.supportsTransferables },
+        yield* sendPacket(edgeAddedPacket).pipe(Effect.orDie);
+    }).pipe(Effect.withSpan(`addEdge:${nodeName}→${targetNodeName}`, {
+        attributes: { supportsTransferables: edgeChannel.supportsTransferables },
     })); // any-cast needed for error/never overload
-    const removeConnection = (targetNodeName) => Effect.gen(function* () {
-        if (!connectionChannels.has(targetNodeName)) {
-            yield* new Cause.NoSuchElementException(`No connection found for ${targetNodeName}`);
+    const removeEdge = (targetNodeName) => Effect.gen(function* () {
+        if (!edgeChannels.has(targetNodeName)) {
+            yield* new Cause.NoSuchElementException(`No edge found for ${targetNodeName}`);
         }
-        yield* Fiber.interrupt(connectionChannels.get(targetNodeName).listenFiber);
-        connectionChannels.delete(targetNodeName);
+        yield* Fiber.interrupt(edgeChannels.get(targetNodeName).listenFiber);
+        edgeChannels.delete(targetNodeName);
     });
-    // TODO add heartbeat to detect dead connections (for both e2e and proxying)
+    // 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
@@ -251,24 +251,24 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             // 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.tapCauseLogPretty, Effect.forkScoped);
             // NOTE already retries internally when transferables are required
-            const { webChannel, initialConnectionDeferred } = yield* makeMessageChannel({
+            const { webChannel, initialEdgeDeferred } = yield* makeMessageChannel({
                 nodeName,
                 incomingPacketsQueue,
-                newConnectionAvailablePubSub,
+                newEdgeAvailablePubSub,
                 target,
                 channelName,
                 schema,
                 sendPacket,
-                checkTransferableConnections,
+                checkTransferableEdges,
             });
             channelMap.set(channelKey, { queue, debugInfo: { channel: webChannel, target } });
-            yield* initialConnectionDeferred;
+            yield* initialEdgeDeferred;
             return webChannel;
         }
         else {
             const channel = yield* makeProxyChannel({
                 nodeName,
-                newConnectionAvailablePubSub,
+                newEdgeAvailablePubSub,
                 target,
                 channelName,
                 schema,
@@ -314,13 +314,13 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             debugInfo,
         };
     }));
-    const connectionKeys = Effect.sync(() => new Set(connectionChannels.keys()));
+    const edgeKeys = Effect.sync(() => new Set(edgeChannels.keys()));
     const runtime = yield* Effect.runtime();
     const debug = {
         print: () => {
             console.log('Webmesh debug info for node:', nodeName);
-            console.log('Connections:', connectionChannels.size);
-            for (const [key, value] of connectionChannels) {
+            console.log('Edges:', edgeChannels.size);
+            for (const [key, value] of edgeChannels) {
                 console.log(`  ${key}: supportsTransferables=${value.channel.supportsTransferables}`);
             }
             console.log('Channels:', channelMap.size);
@@ -340,10 +340,10 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
         },
         ping: (payload) => {
             Effect.gen(function* () {
-                const msg = (via) => WebChannel.DebugPingMessage.make({ message: `ping from ${nodeName} via connection ${via}`, payload });
-                for (const [channelName, con] of connectionChannels) {
-                    yield* Effect.logDebug(`sending ping via connection ${channelName}`);
-                    yield* con.channel.send(msg(`connection ${channelName}`));
+                const msg = (via) => WebChannel.DebugPingMessage.make({ message: `ping from ${nodeName} via edge ${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)
@@ -354,13 +354,13 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
             }).pipe(Effect.provide(runtime), Effect.tapCauseLogPretty, Effect.runFork);
         },
         requestTopology: (timeoutMs = 1000) => Effect.gen(function* () {
-            const packet = WebmeshSchema.NetworkConnectionTopologyRequest.make({
+            const packet = WebmeshSchema.NetworkTopologyRequest.make({
                 source: nodeName,
                 target: '-',
                 hops: [],
             });
             const item = new Map();
-            item.set(nodeName, new Set(connectionChannels.keys()));
+            item.set(nodeName, new Set(edgeChannels.keys()));
             topologyRequestsMap.set(packet.id, item);
             yield* sendPacket(packet);
             yield* Effect.logDebug(`Waiting ${timeoutMs}ms for topology response`);
@@ -372,11 +372,11 @@ export const makeMeshNode = (nodeName) => Effect.gen(function* () {
     };
     return {
         nodeName,
-        addConnection,
-        removeConnection,
+        addEdge,
+        removeEdge,
         makeChannel,
         makeBroadcastChannel,
-        connectionKeys,
+        edgeKeys,
         debug,
     };
 }).pipe(Effect.withSpan(`makeMeshNode:${nodeName}`));