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

package/dist/websocket-edge.js.map

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

package/dist/websocket-server.d.ts

@@ -1,7 +1,7 @@
-import type { Scope } from '@livestore/utils/effect';
+import type { HttpClient, Scope } from '@livestore/utils/effect';
 import { Effect } from '@livestore/utils/effect';
 import * as WebSocket from 'ws';
 export declare const makeWebSocketServer: ({ relayNodeName, }: {
     relayNodeName: string;
-}) => Effect.Effect<WebSocket.WebSocketServer, never, Scope.Scope>;
+}) => Effect.Effect<WebSocket.WebSocketServer, never, Scope.Scope | HttpClient.HttpClient>;
 //# sourceMappingURL=websocket-server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../src/websocket-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAY,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAK/B,eAAO,MAAM,mBAAmB,GAAI,oBAEjC;IACD,aAAa,EAAE,MAAM,CAAA;CACtB,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CA4C3D,CAAA"}
+{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../src/websocket-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAY,MAAM,yBAAyB,CAAA;AAC1D,OAAO,KAAK,SAAS,MAAM,IAAI,CAAA;AAK/B,eAAO,MAAM,mBAAmB,GAAI,oBAEjC;IACD,aAAa,EAAE,MAAM,CAAA;CACtB,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CA4CnF,CAAA"}

package/dist/websocket-server.js

@@ -2,7 +2,7 @@ import { UnexpectedError } from '@livestore/common';
 import { Effect, FiberSet } from '@livestore/utils/effect';
 import * as WebSocket from 'ws';
 import { makeMeshNode } from './node.js';
-import { makeWebSocketConnection } from './websocket-connection.js';
+import { makeWebSocketEdge } from './websocket-edge.js';
 export const makeWebSocketServer = ({ relayNodeName, }) => Effect.gen(function* () {
     const server = new WebSocket.WebSocketServer({ noServer: true });
     yield* Effect.addFinalizer(() => Effect.async((cb) => {
@@ -23,12 +23,12 @@ export const makeWebSocketServer = ({ relayNodeName, }) => Effect.gen(function*
     // TODO handle node disconnects (i.e. remove respective connection)
     server.on('connection', (socket) => {
         Effect.gen(function* () {
-            const { webChannel, from } = yield* makeWebSocketConnection(socket, { _tag: 'relay' });
-            yield* node.addConnection({ target: from, connectionChannel: webChannel, replaceIfExists: true });
-            yield* Effect.log(`WS Relay ${relayNodeName}: added connection from '${from}'`);
+            const { webChannel, from } = yield* makeWebSocketEdge(socket, { _tag: 'relay' });
+            yield* node.addEdge({ target: from, edgeChannel: webChannel, replaceIfExists: true });
+            yield* Effect.log(`WS Relay ${relayNodeName}: added edge from '${from}'`);
             socket.addEventListener('close', () => Effect.gen(function* () {
-                yield* node.removeConnection(from);
-                yield* Effect.log(`WS Relay ${relayNodeName}: removed connection from '${from}'`);
+                yield* node.removeEdge(from);
+                yield* Effect.log(`WS Relay ${relayNodeName}: removed edge from '${from}'`);
             }).pipe(Effect.provide(runtime), Effect.tapCauseLogPretty, Effect.runFork));
             yield* Effect.never;
         }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.provide(runtime), FiberSet.run(fiberSet), Effect.runFork);

package/dist/websocket-server.js.map

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

package/package.json

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

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

@@ -20,11 +20,11 @@ export interface MakeMessageChannelArgs {
   nodeName: MeshNodeName
   /** Queue of incoming messages for this channel */
   incomingPacketsQueue: Queue.Queue<MessageQueueItem>
-  newConnectionAvailablePubSub: PubSub.PubSub<MeshNodeName>
+  newEdgeAvailablePubSub: PubSub.PubSub<MeshNodeName>
   channelName: ChannelName
   target: MeshNodeName
   sendPacket: (packet: typeof MeshSchema.MessageChannelPacket.Type) => Effect.Effect<void>
-  checkTransferableConnections: (
+  checkTransferableEdges: (
     packet: typeof MeshSchema.MessageChannelPacket.Type,
   ) => typeof MeshSchema.MessageChannelResponseNoTransferables.Type | undefined
   schema: WebChannel.OutputSchema<any, any, any, any>
@@ -43,7 +43,7 @@ export const makeMessageChannelInternal = ({
   nodeName,
   incomingPacketsQueue,
   target,
-  checkTransferableConnections,
+  checkTransferableEdges,
   channelName,
   schema: schema_,
   sendPacket,
@@ -203,7 +203,7 @@ export const makeMessageChannelInternal = ({
               const mc = new MessageChannel()
 
               // We're using a message channel with acks here to make sure messages are not lost
-              // which might happen during re-connection scenarios.
+              // which might happen during re-edge scenarios.
               // Also we need to eagerly start listening since we're using the channel "ourselves"
               // for the initial ping-pong sequence.
               const channel = yield* WebChannel.messagePortChannelWithAck({
@@ -323,7 +323,7 @@ export const makeMessageChannelInternal = ({
       return shouldNeverHappen(`Expected channel to be in Initial state, but was in ${channelState._tag} state`)
     }
 
-    const connectionRequest = Effect.gen(function* () {
+    const edgeRequest = Effect.gen(function* () {
       const packet = MeshSchema.MessageChannelRequest.make({
         source: nodeName,
         sourceId,
@@ -336,19 +336,19 @@ export const makeMessageChannelInternal = ({
 
       channelStateRef.current = { _tag: 'RequestSent', reqPacketId: packet.id }
 
-      // yield* Effect.log(`${nodeName}→${channelName}→${target}:connectionRequest [${channelVersion}]`)
+      // yield* Effect.log(`${nodeName}→${channelName}→${target}:edgeRequest [${channelVersion}]`)
 
-      const noTransferableResponse = checkTransferableConnections(packet)
+      const noTransferableResponse = checkTransferableEdges(packet)
       if (noTransferableResponse !== undefined) {
-        yield* Effect.spanEvent(`No transferable connections found for ${packet.source}→${packet.target}`)
+        yield* Effect.spanEvent(`No transferable edges found for ${packet.source}→${packet.target}`)
         return yield* Effect.fail(noTransferableResponse)
       }
 
       yield* sendPacket(packet)
-      span?.addEvent(`initial connection request sent (${packet.id})`)
+      span?.addEvent(`initial edge request sent (${packet.id})`)
     })
 
-    yield* connectionRequest
+    yield* edgeRequest
 
     const channel = yield* deferred
 

package/src/channel/message-channel.ts

@@ -20,7 +20,7 @@ import { makeMessageChannelInternal } from './message-channel-internal.js'
 
 /**
  * Behaviour:
- * - Waits until there is an initial connection
+ * - Waits until there is an initial edge
  * - Automatically reconnects on disconnect
  *
  * Implementation notes:
@@ -28,16 +28,16 @@ import { makeMessageChannelInternal } from './message-channel-internal.js'
  * - The wrapper channel is responsible for:
  *   - Forwarding send/listen messages to the internal channel (via a queue)
  *   - Establishing the initial channel and reconnecting on disconnect
- *     - Listening for new connections as a hint to reconnect if not already connected
- *     - The wrapper channel maintains a connection counter which is used as the channel version
+ *     - Listening for new edges as a hint to reconnect if not already connected
+ *     - The wrapper channel maintains a edge counter which is used as the channel version
  *
  * If needed we can also implement further functionality (like heartbeat) in this wrapper channel.
  */
 export const makeMessageChannel = ({
   schema,
-  newConnectionAvailablePubSub,
+  newEdgeAvailablePubSub,
   channelName,
-  checkTransferableConnections,
+  checkTransferableEdges,
   nodeName,
   incomingPacketsQueue,
   target,
@@ -51,7 +51,7 @@ export const makeMessageChannel = ({
       const listenQueue = yield* Queue.unbounded<any>()
       const sendQueue = yield* TQueue.unbounded<[msg: any, deferred: Deferred.Deferred<void>]>()
 
-      const initialConnectionDeferred = yield* Deferred.make<void>()
+      const initialEdgeDeferred = yield* Deferred.make<void>()
 
       const debugInfo = {
         pendingSends: 0,
@@ -81,24 +81,24 @@ export const makeMessageChannel = ({
 
           /**
            * Expected concurrency behaviour:
-           * - We're concurrently running the connection setup and the waitForNewConnectionFiber
+           * - We're concurrently running the edge setup and the waitForNewEdgeFiber
            * - Happy path:
-           *   - The connection setup succeeds and we can interrupt the waitForNewConnectionFiber
+           *   - The edge setup succeeds and we can interrupt the waitForNewEdgeFiber
            * - 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
+           *   - While a edge is still being setup, we want to re-try when there is a new edge
+           *   - If the edge setup returns a `MessageChannelResponseNoTransferables` error,
+           *     we want to wait for a new edge 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
+           *   - If the parent scope closes, we want to also interrupt both the edge setup and the waitForNewEdgeFiber
+           *   - We're creating a separate scope for each edge 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}`)),
+          const waitForNewEdgeFiber = yield* Stream.fromPubSub(newEdgeAvailablePubSub).pipe(
+            Stream.tap((edgeName) => Effect.spanEvent(`new-conn:${edgeName}`)),
             Stream.take(1),
             Stream.runDrain,
-            Effect.as('new-connection' as const),
+            Effect.as('new-edge' as const),
             Effect.fork,
           )
 
@@ -107,11 +107,11 @@ export const makeMessageChannel = ({
             sourceId,
             incomingPacketsQueue,
             target,
-            checkTransferableConnections,
+            checkTransferableEdges,
             channelName,
             schema,
             channelVersion,
-            newConnectionAvailablePubSub,
+            newEdgeAvailablePubSub,
             sendPacket,
             scope: makeMessageChannelScope,
           }).pipe(
@@ -122,10 +122,10 @@ export const makeMessageChannel = ({
             Effect.withUnhandledErrorLogLevel(Option.none()),
           )
 
-          const raceResult = yield* Effect.raceFirst(makeChannel, waitForNewConnectionFiber.pipe(Effect.disconnect))
+          const raceResult = yield* Effect.raceFirst(makeChannel, waitForNewEdgeFiber.pipe(Effect.disconnect))
 
-          if (raceResult === 'new-connection') {
-            yield* Scope.close(makeMessageChannelScope, Exit.fail('new-connection'))
+          if (raceResult === 'new-edge') {
+            yield* Scope.close(makeMessageChannelScope, Exit.fail('new-edge'))
             // We'll try again
           } else {
             const channelExit = yield* raceResult.pipe(Effect.exit)
@@ -136,8 +136,8 @@ export const makeMessageChannel = ({
                 Cause.isFailType(channelExit.cause) &&
                 Schema.is(WebmeshSchema.MessageChannelResponseNoTransferables)(channelExit.cause.error)
               ) {
-                // Only retry when there is a new connection available
-                yield* waitForNewConnectionFiber.pipe(Effect.exit)
+                // Only retry when there is a new edge available
+                yield* waitForNewEdgeFiber.pipe(Effect.exit)
               }
             } else {
               const channel = channelExit.value
@@ -155,7 +155,7 @@ export const makeMessageChannel = ({
         debugInfo.isConnected = true
         debugInfo.innerChannelRef.current = channel
 
-        yield* Deferred.succeed(initialConnectionDeferred, void 0)
+        yield* Deferred.succeed(initialEdgeDeferred, void 0)
 
         // We'll now forward all incoming messages to the listen queue
         yield* channel.listen.pipe(
@@ -228,7 +228,7 @@ export const makeMessageChannel = ({
 
       return {
         webChannel: webChannel as WebChannel.WebChannel<any, any>,
-        initialConnectionDeferred,
+        initialEdgeDeferred,
       }
     }),
   )

package/src/channel/proxy-channel.ts

@@ -29,7 +29,7 @@ import * as MeshSchema from '../mesh-schema.js'
 interface MakeProxyChannelArgs {
   queue: Queue.Queue<ProxyQueueItem>
   nodeName: MeshNodeName
-  newConnectionAvailablePubSub: PubSub.PubSub<MeshNodeName>
+  newEdgeAvailablePubSub: PubSub.PubSub<MeshNodeName>
   sendPacket: (packet: typeof MeshSchema.ProxyChannelPacket.Type) => Effect.Effect<void>
   channelName: ChannelName
   target: MeshNodeName
@@ -42,7 +42,7 @@ interface MakeProxyChannelArgs {
 export const makeProxyChannel = ({
   queue,
   nodeName,
-  newConnectionAvailablePubSub,
+  newEdgeAvailablePubSub,
   sendPacket,
   target,
   channelName,
@@ -96,7 +96,7 @@ export const makeProxyChannel = ({
 
       const setStateToEstablished = (channelId: string) =>
         Effect.gen(function* () {
-          // TODO avoid "double" `Connected` events (we might call `setStateToEstablished` twice during initial connection)
+          // TODO avoid "double" `Connected` events (we might call `setStateToEstablished` twice during initial edge)
           yield* Effect.spanEvent(`Connected (${channelId})`).pipe(Effect.withParentSpan(channelSpan))
           channelStateRef.current = {
             _tag: 'Established',
@@ -109,7 +109,7 @@ export const makeProxyChannel = ({
           debugInfo.isConnected = true
         })
 
-      const connectionRequest = Effect.suspend(() =>
+      const edgeRequest = Effect.suspend(() =>
         sendPacket(
           MeshSchema.ProxyChannelRequest.make({ channelName, hops: [], source: nodeName, target, channelIdCandidate }),
         ),
@@ -137,9 +137,9 @@ export const makeProxyChannel = ({
                 debugInfo.isConnected = false
                 debugInfo.connectCounter++
 
-                // If we're already connected, we need to re-establish the connection
+                // If we're already connected, we need to re-establish the edge
                 if (channelState._tag === 'Established' && channelState.combinedChannelId !== combinedChannelId) {
-                  yield* connectionRequest
+                  yield* edgeRequest
                 }
               }
 
@@ -254,7 +254,7 @@ export const makeProxyChannel = ({
       const ackMap = new Map<string, Deferred.Deferred<void, never>>()
 
       // check if already established via incoming `ProxyChannelRequest` from other side
-      // which indicates we already have a connection to the target node
+      // which indicates we already have a edge to the target node
       // const channelState = channelStateRef.current
       {
         if (channelStateRef.current._tag !== 'Initial') {
@@ -263,17 +263,17 @@ export const makeProxyChannel = ({
 
         channelStateRef.current = { _tag: 'Pending', initiatedVia: 'outgoing-request' }
 
-        yield* connectionRequest
+        yield* edgeRequest
 
-        const retryOnNewConnectionFiber = yield* Stream.fromPubSub(newConnectionAvailablePubSub).pipe(
-          Stream.tap(() => connectionRequest),
+        const retryOnNewEdgeFiber = yield* Stream.fromPubSub(newEdgeAvailablePubSub).pipe(
+          Stream.tap(() => edgeRequest),
           Stream.runDrain,
           Effect.forkScoped,
         )
 
         const { combinedChannelId: channelId } = yield* waitForEstablished
 
-        yield* Fiber.interrupt(retryOnNewConnectionFiber)
+        yield* Fiber.interrupt(retryOnNewEdgeFiber)
 
         yield* setStateToEstablished(channelId)
       }

package/src/common.ts

@@ -18,17 +18,14 @@ export type ChannelName = string
 export type ChannelKey = `target:${MeshNodeName}, channelName:${ChannelName}`
 
 // TODO actually use this to avoid timeouts in certain cases
-export class NoConnectionRouteSignal extends Schema.TaggedError<NoConnectionRouteSignal>()(
-  'NoConnectionRouteSignal',
-  {},
-) {}
-
-export class ConnectionAlreadyExistsError extends Schema.TaggedError<ConnectionAlreadyExistsError>()(
-  'ConnectionAlreadyExistsError',
-  {
-    target: Schema.String,
-  },
-) {}
+// export class NoConnectionRouteSignal extends Schema.TaggedError<NoConnectionRouteSignal>()(
+//   'NoConnectionRouteSignal',
+//   {},
+// ) {}
+
+export class EdgeAlreadyExistsError extends Schema.TaggedError<EdgeAlreadyExistsError>()('EdgeAlreadyExistsError', {
+  target: Schema.String,
+}) {}
 
 export const packetAsOtelAttributes = (packet: typeof Packet.Type) => ({
   packetId: packet.id,

package/src/mesh-schema.ts

@@ -17,7 +17,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
@@ -83,16 +83,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 */
@@ -100,12 +100,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('-'),
@@ -140,9 +140,9 @@ export class ProxyChannelPacket extends Schema.Union(
 export class Packet extends Schema.Union(
   MessageChannelPacket,
   ProxyChannelPacket,
-  NetworkConnectionAdded,
-  NetworkConnectionTopologyRequest,
-  NetworkConnectionTopologyResponse,
+  NetworkEdgeAdded,
+  NetworkTopologyRequest,
+  NetworkTopologyResponse,
   BroadcastChannelPacket,
 ) {}
 

package/src/mod.ts

@@ -1,4 +1,4 @@
-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'

package/src/node.test.ts

@@ -24,7 +24,7 @@ import { makeMeshNode } from './node.js'
 
 // TODO test cases where in-between node only comes online later
 // TODO test cases where other side tries to reconnect
-// TODO test combination of connection types (message, proxy)
+// TODO test combination of channel types (message, proxy)
 // TODO test "diamond shape" topology (A <> B1, A <> B2, B1 <> C, B2 <> C)
 // TODO test cases where multiple entities try to claim to be the same channel end (e.g. A,B,B)
 // TODO write tests with worker threads
@@ -37,14 +37,14 @@ const connectNodesViaMessageChannel = (nodeA: MeshNode, nodeB: MeshNode, options
     const meshChannelAToB = yield* WebChannel.messagePortChannel({ port: mc.port1, schema: Packet })
     const meshChannelBToA = yield* WebChannel.messagePortChannel({ port: mc.port2, schema: Packet })
 
-    yield* nodeA.addConnection({
+    yield* nodeA.addEdge({
       target: nodeB.nodeName,
-      connectionChannel: meshChannelAToB,
+      edgeChannel: meshChannelAToB,
       replaceIfExists: options?.replaceIfExists,
     })
-    yield* nodeB.addConnection({
+    yield* nodeB.addEdge({
       target: nodeA.nodeName,
-      connectionChannel: meshChannelBToA,
+      edgeChannel: meshChannelBToA,
       replaceIfExists: options?.replaceIfExists,
     })
   }).pipe(Effect.withSpan(`connectNodesViaMessageChannel:${nodeA.nodeName}↔${nodeB.nodeName}`))
@@ -62,14 +62,14 @@ const connectNodesViaBroadcastChannel = (nodeA: MeshNode, nodeB: MeshNode, optio
       schema: Packet,
     })
 
-    yield* nodeA.addConnection({
+    yield* nodeA.addEdge({
       target: nodeB.nodeName,
-      connectionChannel: broadcastWebChannelA,
+      edgeChannel: broadcastWebChannelA,
       replaceIfExists: options?.replaceIfExists,
     })
-    yield* nodeB.addConnection({
+    yield* nodeB.addEdge({
       target: nodeA.nodeName,
-      connectionChannel: broadcastWebChannelB,
+      edgeChannel: broadcastWebChannelB,
       replaceIfExists: options?.replaceIfExists,
     })
   }).pipe(Effect.withSpan(`connectNodesViaBroadcastChannel:${nodeA.nodeName}↔${nodeB.nodeName}`))
@@ -239,7 +239,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
               const { mode, connectNodes } = fromChannelType(channelType)
 
-              // TODO also optionally delay the connection
+              // TODO also optionally delay the edge
               yield* connectNodes(nodeA, nodeB)
 
               const waitForBToBeOffline =
@@ -350,16 +350,16 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
       // test: Shrunk 0 time(s)
       // test: Got AssertionError: expected { _tag: 'MessageChannelPing' } to deeply equal { message: 'A1' }
       // test:     at next (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/webmesh/src/node.test.ts:376:59)
-      // test:     at prop tests:replace connection while keeping the channel:channelType=messagechannel nodeNames=A,B (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/webmesh/src/node.test.ts:801:14)
+      // test:     at prop tests:replace edge while keeping the channel:channelType=messagechannel nodeNames=A,B (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/webmesh/src/node.test.ts:801:14)
       // test: Hint: Enable verbose mode in order to have the list of all failing values encountered during the run
       // test:    ✓ webmesh node > A <> B > prop tests > TODO improve latency > concurrent messages 2110ms
       // test: ⎯⎯⎯⎯⎯⎯⎯ Failed Tests 1 ⎯⎯⎯⎯⎯⎯⎯
-      // test:  FAIL  src/node.test.ts > webmesh node > A <> B > prop tests > replace connection while keeping the channel
+      // test:  FAIL  src/node.test.ts > webmesh node > A <> B > prop tests > replace edge while keeping the channel
       // test: Error: Property failed after 2 tests
       // test: { seed: -964670352, path: "1", endOnFailure: true }
       // test: Counterexample: ["messagechannel",["A","B"]]
       Vitest.scopedLive.prop(
-        'replace connection while keeping the channel',
+        'replace edge while keeping the channel',
         [ChannelTypeWithoutMessageChannelProxy, NodeNames],
         ([channelType, nodeNames], test) =>
           Effect.gen(function* () {
@@ -372,7 +372,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
             yield* connectNodes(nodeX, nodeY)
 
-            const waitForConnectionReplacement = yield* Deferred.make<void>()
+            const waitForEdgeReplacement = yield* Deferred.make<void>()
 
             const nodeXCode = Effect.gen(function* () {
               const channelXToY = yield* createChannel(nodeX, nodeLabel.y, { mode })
@@ -380,7 +380,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
               yield* channelXToY.send({ message: `${nodeLabel.x}1` })
               expect(yield* getFirstMessage(channelXToY)).toEqual({ message: `${nodeLabel.y}1` })
 
-              yield* waitForConnectionReplacement
+              yield* waitForEdgeReplacement
 
               yield* channelXToY.send({ message: `${nodeLabel.x}2` })
               expect(yield* getFirstMessage(channelXToY)).toEqual({ message: `${nodeLabel.y}2` })
@@ -392,11 +392,11 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
               yield* channelYToX.send({ message: `${nodeLabel.y}1` })
               expect(yield* getFirstMessage(channelYToX)).toEqual({ message: `${nodeLabel.x}1` })
 
-              // Switch out connection while keeping the channel
-              yield* nodeX.removeConnection(nodeLabel.y)
-              yield* nodeY.removeConnection(nodeLabel.x)
+              // Switch out edge while keeping the channel
+              yield* nodeX.removeEdge(nodeLabel.y)
+              yield* nodeY.removeEdge(nodeLabel.x)
               yield* connectNodes(nodeX, nodeY)
-              yield* Deferred.succeed(waitForConnectionReplacement, void 0)
+              yield* Deferred.succeed(waitForEdgeReplacement, void 0)
 
               yield* channelYToX.send({ message: `${nodeLabel.y}2` })
               expect(yield* getFirstMessage(channelYToX)).toEqual({ message: `${nodeLabel.x}2` })
@@ -472,7 +472,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
     })
 
     Vitest.describe('message channel specific tests', () => {
-      Vitest.scopedLive('differing initial connection counter', (test) =>
+      Vitest.scopedLive('differing initial edge counter', (test) =>
         Effect.gen(function* () {
           const nodeA = yield* makeMeshNode('A')
           const nodeB = yield* makeMeshNode('B')
@@ -533,7 +533,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
       }).pipe(withCtx(test)),
     )
 
-    Vitest.scopedLive('broadcast connection with message channel', (test) =>
+    Vitest.scopedLive('broadcast edge with message channel', (test) =>
       Effect.gen(function* () {
         const nodeA = yield* makeMeshNode('A')
         const nodeB = yield* makeMeshNode('B')
@@ -577,7 +577,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
       }).pipe(withCtx(test)),
     )
 
-    Vitest.scopedLive('should work - delayed connection', (test) =>
+    Vitest.scopedLive('should work - delayed edge', (test) =>
       Effect.gen(function* () {
         const nodeA = yield* makeMeshNode('A')
         const nodeB = yield* makeMeshNode('B')
@@ -637,7 +637,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
       }).pipe(withCtx(test)),
     )
 
-    Vitest.scopedLive('should fail with timeout due to missing connection', (test) =>
+    Vitest.scopedLive('should fail with timeout due to missing edge', (test) =>
       Effect.gen(function* () {
         const nodeA = yield* makeMeshNode('A')
         const nodeB = yield* makeMeshNode('B')
@@ -805,7 +805,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
     )
   })
 
-  Vitest.describe('mixture of messagechannel and proxy connections', () => {
+  Vitest.describe('mixture of messagechannel and proxy edge connections', () => {
     // TODO test case to better guard against case where side A tries to create a proxy channel to B
     // and side B tries to create a messagechannel to A
     Vitest.scopedLive('should work for proxy channels', (test) =>
@@ -816,7 +816,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         yield* connectNodesViaMessageChannel(nodeB, nodeA)
         const err = yield* connectNodesViaBroadcastChannel(nodeA, nodeB).pipe(Effect.flip)
 
-        expect(err._tag).toBe('ConnectionAlreadyExistsError')
+        expect(err._tag).toBe('EdgeAlreadyExistsError')
       }).pipe(withCtx(test)),
     )