@dxos/network-manager 0.4.8-main.05fda5d → 0.4.8-main.06fa7e4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.4.8-main.05fda5d",
+  "version": "0.4.8-main.06fa7e4",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,28 +24,28 @@
     "@koush/wrtc": "^0.5.3",
     "isomorphic-ws": "^4.0.1",
     "nanomessage-rpc": "^3.0.0",
-    "node-datachannel": "^0.5.2",
+    "node-datachannel": "^0.5.4",
     "p-defer": "^3.0.0",
     "simple-peer": "9.11.1",
     "stream": "^0.0.2",
     "tiny-invariant": "^1.3.1",
     "ws": "^8.14.2",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.4.8-main.05fda5d",
-    "@dxos/codec-protobuf": "0.4.8-main.05fda5d",
-    "@dxos/context": "0.4.8-main.05fda5d",
-    "@dxos/crypto": "0.4.8-main.05fda5d",
-    "@dxos/credentials": "0.4.8-main.05fda5d",
-    "@dxos/debug": "0.4.8-main.05fda5d",
-    "@dxos/invariant": "0.4.8-main.05fda5d",
-    "@dxos/keys": "0.4.8-main.05fda5d",
-    "@dxos/messaging": "0.4.8-main.05fda5d",
-    "@dxos/node-std": "0.4.8-main.05fda5d",
-    "@dxos/log": "0.4.8-main.05fda5d",
-    "@dxos/rpc": "0.4.8-main.05fda5d",
-    "@dxos/teleport": "0.4.8-main.05fda5d",
-    "@dxos/protocols": "0.4.8-main.05fda5d",
-    "@dxos/util": "0.4.8-main.05fda5d"
+    "@dxos/codec-protobuf": "0.4.8-main.06fa7e4",
+    "@dxos/context": "0.4.8-main.06fa7e4",
+    "@dxos/crypto": "0.4.8-main.06fa7e4",
+    "@dxos/async": "0.4.8-main.06fa7e4",
+    "@dxos/debug": "0.4.8-main.06fa7e4",
+    "@dxos/invariant": "0.4.8-main.06fa7e4",
+    "@dxos/log": "0.4.8-main.06fa7e4",
+    "@dxos/credentials": "0.4.8-main.06fa7e4",
+    "@dxos/keys": "0.4.8-main.06fa7e4",
+    "@dxos/messaging": "0.4.8-main.06fa7e4",
+    "@dxos/rpc": "0.4.8-main.06fa7e4",
+    "@dxos/node-std": "0.4.8-main.06fa7e4",
+    "@dxos/protocols": "0.4.8-main.06fa7e4",
+    "@dxos/teleport": "0.4.8-main.06fa7e4",
+    "@dxos/util": "0.4.8-main.06fa7e4"
   },
   "devDependencies": {
     "@swc-node/register": "1.6.8",
@@ -54,7 +54,7 @@
     "earljs": "~0.1.10",
     "fast-check": "^3.15.1",
     "typescript": "^5.2.2",
-    "@dxos/signal": "0.4.8-main.05fda5d"
+    "@dxos/signal": "0.4.8-main.06fa7e4"
   },
   "publishConfig": {
     "access": "public"

package/src/swarm/connection.test.ts

@@ -9,7 +9,7 @@ import { describe, test } from '@dxos/test';
 
 import { Connection } from './connection';
 import { TestWireProtocol } from '../testing/test-wire-protocol';
-import { createSimplePeerTransportFactory } from '../transport';
+import { createLibDataChannelTransportFactory, createSimplePeerTransportFactory } from '../transport';
 
 describe('Connection', () => {
   test('initiator opens after responder', async () => {
@@ -37,8 +37,8 @@ describe('Connection', () => {
         remotePeerId: peerId2,
         topic,
       }),
-      // TODO(nf): configure?
-      createSimplePeerTransportFactory(),
+      // TODO(nf): configure better
+      process.env.MOCHA_ENV === 'nodejs' ? createLibDataChannelTransportFactory() : createSimplePeerTransportFactory(),
     );
 
     const protocol2 = new TestWireProtocol(peerId2);
@@ -59,8 +59,8 @@ describe('Connection', () => {
         },
       },
       protocol2.factory({ initiator: false, localPeerId: peerId2, remotePeerId: peerId1, topic }),
-      // TODO(nf): configure?
-      createSimplePeerTransportFactory(),
+      // TODO(nf): configure better
+      process.env.MOCHA_ENV === 'nodejs' ? createLibDataChannelTransportFactory() : createSimplePeerTransportFactory(),
     );
 
     connection2.initiate();

package/src/swarm/swarm.test.ts

@@ -15,7 +15,7 @@ import { ConnectionLimiter } from './connection-limiter';
 import { Swarm } from './swarm';
 import { TestWireProtocol } from '../testing/test-wire-protocol';
 import { FullyConnectedTopology } from '../topology';
-import { createSimplePeerTransportFactory } from '../transport';
+import { createLibDataChannelTransportFactory, createSimplePeerTransportFactory } from '../transport';
 
 type TestPeer = {
   swarm: Swarm;
@@ -48,8 +48,8 @@ describe('Swarm', () => {
       new FullyConnectedTopology(),
       protocol.factory,
       new Messenger({ signalManager }),
-      // TODO(nf): configure?
-      createSimplePeerTransportFactory(),
+      // TODO(nf): configure better
+      process.env.MOCHA_ENV === 'nodejs' ? createLibDataChannelTransportFactory() : createSimplePeerTransportFactory(),
       undefined,
       connectionLimiter,
       initiationDelay,

package/src/testing/test-builder.ts

@@ -16,16 +16,16 @@ import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { createLinkedPorts, createProtoRpcPeer, type ProtoRpcPeer } from '@dxos/rpc';
 import { ComplexMap } from '@dxos/util';
 
-import { TestWireProtocol, type TestTeleportExtensionFactory } from './test-wire-protocol';
+import { type TestTeleportExtensionFactory, TestWireProtocol } from './test-wire-protocol';
 import { NetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
 import {
+  createLibDataChannelTransportFactory,
+  createSimplePeerTransportFactory,
   MemoryTransportFactory,
-  type TransportFactory,
   SimplePeerTransportProxyFactory,
   SimplePeerTransportService,
-  createSimplePeerTransportFactory,
-  createLibDataChannelTransportFactory,
+  type TransportFactory,
   TransportKind,
 } from '../transport';
 import { TcpTransportFactory } from '../transport/tcp-transport';
@@ -90,7 +90,8 @@ export class TestPeer {
     this._signalManager = this.testBuilder.createSignalManager();
     if (!transport) {
       if (this.testBuilder.options.signalHosts) {
-        transport = TransportKind.SIMPLE_PEER;
+        // TODO(nf): configure better
+        transport = process.env.MOCHA_ENV === 'nodejs' ? TransportKind.LIBDATACHANNEL : TransportKind.SIMPLE_PEER;
       } else {
         transport = TransportKind.MEMORY;
       }

package/src/transport/libdatachannel-transport.ts

@@ -28,6 +28,7 @@ const MAX_MESSAGE_SIZE = 64 * 1024;
  * Transport
  */
 export class LibDataChannelTransport implements Transport {
+  private static _instanceCount = 0;
   private _closed = false;
   readonly closed = new Event();
   private _connected = false;
@@ -56,6 +57,7 @@ export class LibDataChannelTransport implements Transport {
         params.webrtcConfig = { iceServers: [] };
       }
       const peer = new RTCPeerConnection(params.webrtcConfig);
+      LibDataChannelTransport._instanceCount++;
 
       peer.onicecandidateerror = (event) => {
         log.error('peer.onicecandidateerror', { event });
@@ -312,9 +314,11 @@ export class LibDataChannelTransport implements Transport {
     };
   }
 
-  // TODO(nf): add classmethod to call node-datachannel.cleanup() when all instances have been destroyed?
   async destroy(): Promise<void> {
     await this._close();
+    if (--LibDataChannelTransport._instanceCount === 0) {
+      (await importESM('node-datachannel')).cleanup();
+    }
   }
 
   private async _disconnectStreams() {