@dxos/network-manager 0.1.4 → 0.1.6

package/dist/src/transport/webrtc-transport.js

@@ -47,15 +47,12 @@ class WebRTCTransport {
             await this.close();
         });
     }
-    get peer() {
-        return this._peer;
-    }
     async close() {
-        (0, log_1.log)('closing...', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 69 });
+        (0, log_1.log)('closing...', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 65 });
         await this._disconnectStreams();
         this._peer.destroy();
         this.closed.emit();
-        (0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 73 });
+        (0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 69 });
     }
     async signal(signal) {
         (0, node_assert_1.default)(this._peer, 'Connection not ready to accept signals.');

package/dist/src/transport/webrtc-transport.js.map

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

package/dist/src/transport/webrtc-transport.test.js

@@ -41,7 +41,7 @@ describe('WebRTCTransport', function () {
         const peer1Id = keys_1.PublicKey.random();
         const peer2Id = keys_1.PublicKey.random();
         const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
-        const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
+        const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id, plugin1);
         const connection1 = new webrtc_transport_1.WebRTCTransport({
             initiator: true,
             stream: protocolProvider1({
@@ -56,7 +56,7 @@ describe('WebRTCTransport', function () {
         (0, testutils_1.afterTest)(() => connection1.close());
         (0, testutils_1.afterTest)(() => connection1.errors.assertNoUnhandledErrors());
         const plugin2 = new testing_1.TestProtocolPlugin(peer2Id.asBuffer());
-        const protocolProvider2 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer2Id.asBuffer(), plugin2);
+        const protocolProvider2 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer2Id, plugin2);
         const connection2 = new webrtc_transport_1.WebRTCTransport({
             initiator: false,
             stream: protocolProvider2({

package/dist/src/transport/webrtc-transport.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -17,19 +17,19 @@
     "README.md"
   ],
   "dependencies": {
-    "@dxos/async": "0.1.4",
-    "@dxos/codec-protobuf": "0.1.4",
-    "@dxos/credentials": "0.1.4",
-    "@dxos/crypto": "0.1.4",
-    "@dxos/debug": "0.1.4",
-    "@dxos/keys": "0.1.4",
-    "@dxos/log": "0.1.4",
-    "@dxos/mesh-protocol": "0.1.4",
-    "@dxos/messaging": "0.1.4",
-    "@dxos/protocol-plugin-presence": "0.1.4",
-    "@dxos/protocols": "0.1.4",
-    "@dxos/rpc": "0.1.4",
-    "@dxos/util": "0.1.4",
+    "@dxos/async": "0.1.6",
+    "@dxos/codec-protobuf": "0.1.6",
+    "@dxos/credentials": "0.1.6",
+    "@dxos/crypto": "0.1.6",
+    "@dxos/debug": "0.1.6",
+    "@dxos/keys": "0.1.6",
+    "@dxos/log": "0.1.6",
+    "@dxos/mesh-protocol": "0.1.6",
+    "@dxos/messaging": "0.1.6",
+    "@dxos/protocol-plugin-presence": "0.1.6",
+    "@dxos/protocols": "0.1.6",
+    "@dxos/rpc": "0.1.6",
+    "@dxos/util": "0.1.6",
     "@koush/wrtc": "^0.5.3",
     "assert": "^2.0.0",
     "isomorphic-ws": "^4.0.1",
@@ -39,8 +39,8 @@
     "xor-distance": "^2.0.0"
   },
   "devDependencies": {
-    "@dxos/signal": "0.1.4",
-    "@dxos/testutils": "0.1.4",
+    "@dxos/signal": "0.1.6",
+    "@dxos/testutils": "0.1.6",
     "@swc-node/register": "^1.5.4",
     "@swc/core": "^1.3.9",
     "@types/simple-peer": "9.11.3",

package/src/network-manager.test.ts

@@ -11,7 +11,6 @@ import { Event, latch, sleep } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { Protocol } from '@dxos/mesh-protocol';
-import { MemorySignalManagerContext, MemorySignalManager, WebsocketSignalManager } from '@dxos/messaging';
 import { PresencePlugin } from '@dxos/protocol-plugin-presence';
 import { schema } from '@dxos/protocols';
 import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
@@ -21,8 +20,8 @@ import { range, ComplexMap, ComplexSet } from '@dxos/util';
 
 import { NetworkManager } from './network-manager';
 import { createProtocolFactory } from './protocol-factory';
-import { TestProtocolPlugin, testProtocolProvider } from './testing';
-import { FullyConnectedTopology, StarTopology, Topology } from './topology';
+import { createPeer, TEST_SIGNAL_URL, TestBuilder, TestProtocolPlugin, testProtocolProvider } from './testing';
+import { FullyConnectedTopology, StarTopology } from './topology';
 import {
   createWebRTCTransportFactory,
   MemoryTransportFactory,
@@ -31,67 +30,6 @@ import {
   WebRTCTransportService
 } from './transport';
 
-// Signal server will be started by the setup script.
-const SIGNAL_URL = 'ws://localhost:4000/.well-known/dx/signal';
-
-// TODO(burdon): Remove global and replace with factories.
-const signalContext = new MemorySignalManagerContext();
-
-// const createMemoryNetworkManager = (signalContext: MemorySignalManagerContext) => {
-//   return new NetworkManager({
-//     signalManager: new MemorySignalManager(signalContext),
-//     transportFactory: MemoryTransportFactory
-//   });
-// };
-
-// const createWebRTCNetworkManager = async (config: any, peerId: PublicKey) => {
-//   const signalManager = new WebsocketSignalManager(signalHosts!);
-//   await signalManager.subscribeMessages(peerId);
-//
-//   return new NetworkManager({
-//     signalManager,
-//     transportFactory: createWebRTCTransportFactory(config)
-//   });
-// };
-
-interface CreatePeerOptions {
-  topic: PublicKey;
-  peerId: PublicKey;
-  topology?: Topology;
-  signalHosts?: string[];
-  transportFactory: TransportFactory;
-}
-
-/**
- * @deprecated
- */
-// TODO(burdon): Builder pattern.
-const createPeer = async ({
-  topic,
-  peerId,
-  topology = new FullyConnectedTopology(),
-  signalHosts,
-  transportFactory
-}: CreatePeerOptions) => {
-  const signalManager = signalHosts ? new WebsocketSignalManager(signalHosts!) : new MemorySignalManager(signalContext);
-  await signalManager.subscribeMessages(peerId);
-  const networkManager = new NetworkManager({
-    signalManager,
-    transportFactory
-  });
-
-  afterTest(() => networkManager.destroy());
-
-  const plugin = new TestProtocolPlugin(peerId.asBuffer());
-  const protocolProvider = testProtocolProvider(topic.asBuffer(), peerId.asBuffer(), plugin);
-  await networkManager.openSwarmConnection({ topic, peerId, protocol: protocolProvider, topology });
-
-  return {
-    networkManager,
-    plugin
-  };
-};
-
 describe('NetworkManager', function () {
   describe('WebRTC transport', function () {
     let topic: PublicKey;
@@ -106,7 +44,7 @@ describe('NetworkManager', function () {
 
     sharedTests({
       inMemory: false,
-      signalUrl: SIGNAL_URL,
+      signalUrl: TEST_SIGNAL_URL,
       getTransportFactory: async () => createWebRTCTransportFactory()
     });
 
@@ -235,7 +173,7 @@ describe('NetworkManager', function () {
 
     sharedTests({
       inMemory: false,
-      signalUrl: SIGNAL_URL,
+      signalUrl: TEST_SIGNAL_URL,
       getTransportFactory: createTransportFactory
     });
   });
@@ -291,9 +229,12 @@ describe('NetworkManager', function () {
       );
     });
 
+    // TODO(burdon): Remove flaky tests.
     // This test performs random actions in the real system and compares it's state with a simplified model.
     // TODO(dmaretskyi): Run this on with actual webrtc and signal servers.
-    it('property-based tests', async function () {
+    it.skip('property-based tests', async function () {
+      const testBuilder = new TestBuilder();
+
       /**
        * The simplified model of the system.
        */
@@ -345,6 +286,8 @@ describe('NetworkManager', function () {
         );
       };
 
+      // TODO(burdon): Factor out to TestBuilder.
+
       class CreatePeerCommand implements fc.AsyncCommand<Model, Real> {
         constructor(readonly peerId: PublicKey) {}
 
@@ -352,10 +295,7 @@ describe('NetworkManager', function () {
         async run(model: Model, real: Real) {
           model.peers.add(this.peerId);
 
-          const networkManager = new NetworkManager({
-            signalManager: new MemorySignalManager(signalContext),
-            transportFactory: MemoryTransportFactory
-          });
+          const networkManager = testBuilder.createNetworkManager();
           afterTest(() => networkManager.destroy());
 
           real.peers.set(this.peerId, {
@@ -501,6 +441,7 @@ describe('NetworkManager', function () {
   }).timeout(30_000);
 });
 
+// TODO(burdon): Factor out test-suite.
 function sharedTests({
   inMemory,
   signalUrl,
@@ -631,7 +572,7 @@ function sharedTests({
     await networkManager2.openSwarmConnection({
       topic,
       peerId: newPeer2Id,
-      protocol: testProtocolProvider(topic.asBuffer(), peer2Id.asBuffer(), plugin2),
+      protocol: testProtocolProvider(topic.asBuffer(), peer2Id, plugin2),
       topology: new FullyConnectedTopology()
     });
 
@@ -646,28 +587,28 @@ function sharedTests({
     .timeout(10_000)
     .retries(10);
 
-  it('join 2 swarms', async function () {
+  it.skip('join two swarms', async function () {
+    const testBuilder = new TestBuilder({ signalUrl: !inMemory ? signalUrl : undefined });
+
     const peerId = PublicKey.random();
     const plugin1 = new TestProtocolPlugin(peerId.asBuffer());
     const plugin2 = new TestProtocolPlugin(peerId.asBuffer());
 
-    const signalManager = inMemory ? new MemorySignalManager(signalContext) : new WebsocketSignalManager([signalUrl!]);
-    const networkManager = new NetworkManager({
-      signalManager,
-      transportFactory: await getTransportFactory()
-    });
+    const signalManager = testBuilder.createSignalManager();
+    const networkManager = new NetworkManager({ signalManager, transportFactory: await getTransportFactory() });
     afterTest(() => networkManager.destroy());
 
     // Joining first swarm.
     {
       const topic = PublicKey.random();
-      const protocolProvider = testProtocolProvider(topic.asBuffer(), peerId.asBuffer(), plugin1);
+      const protocolProvider = testProtocolProvider(topic.asBuffer(), peerId, plugin1);
       await networkManager.openSwarmConnection({
         topic,
         peerId,
         protocol: protocolProvider,
         topology: new FullyConnectedTopology()
       });
+
       // Creating and joining second peer.
       await createPeer({
         topic,
@@ -680,13 +621,14 @@ function sharedTests({
     // Joining second swarm with same peerId.
     {
       const topic = PublicKey.random();
-      const protocolProvider = testProtocolProvider(topic.asBuffer(), peerId.asBuffer(), plugin2);
+      const protocolProvider = testProtocolProvider(topic.asBuffer(), peerId, plugin2);
       await networkManager.openSwarmConnection({
         topic,
         peerId,
         protocol: protocolProvider,
         topology: new FullyConnectedTopology()
       });
+
       // Creating and joining second peer.
       await createPeer({
         topic,
@@ -696,7 +638,11 @@ function sharedTests({
       });
     }
 
-    await Promise.all([Event.wrap(plugin1, 'connect').waitForCount(1), Event.wrap(plugin2, 'connect').waitForCount(1)]);
+    // prettier-ignore
+    await Promise.all([
+      Event.wrap(plugin1, 'connect').waitForCount(1),
+      Event.wrap(plugin2, 'connect').waitForCount(1)
+    ]);
   });
 
   it('two swarms at the same time', async function () {

package/src/network-manager.ts

@@ -23,7 +23,7 @@ export type SwarmConnection = {
   close(): Promise<void>;
 };
 
-// TODO(burdon): Timeout.
+// TODO(burdon): Add timeout.
 export type SwarmOptions = {
   /**
    * Swarm topic.
@@ -51,7 +51,8 @@ export type SwarmOptions = {
   presence?: any;
 
   /**
-   * Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
+   * Custom label assigned to this swarm.
+   * Used in devtools to display human-readable names for swarms.
    */
   label?: string;
 };
@@ -59,7 +60,7 @@ export type SwarmOptions = {
 export type NetworkManagerOptions = {
   transportFactory: TransportFactory;
   signalManager: SignalManager;
-  log?: boolean; // TODO(burdon): Remove.
+  log?: boolean; // Log to devtools.
 };
 
 /**

package/src/protocol-factory.ts

@@ -34,6 +34,7 @@ export const protocolFactory = ({
   assert(getTopics);
   // eslint-disable-next-line no-unused-vars
   return ({ channel, initiator }) => {
+    log('creating protocol');
     const protocol = new Protocol({
       streamOptions: { live: true },
       discoveryToPublicKey: (dk) => {
@@ -51,7 +52,6 @@ export const protocolFactory = ({
 
     protocol.setExtensions(plugins.map((plugin) => plugin.createExtension())).init();
 
-    log('Created protocol');
     return protocol;
   };
 };

package/src/swarm/swarm.test.ts

@@ -4,58 +4,64 @@
 
 // @dxos/mocha platform=nodejs
 
-import { expect, mockFn } from 'earljs';
+import { expect } from 'earljs';
 import waitForExpect from 'wait-for-expect';
 
 import { sleep, asyncTimeout } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { Protocol } from '@dxos/mesh-protocol';
 import { MemorySignalManager, MemorySignalManagerContext, Messenger } from '@dxos/messaging';
 import { afterTest } from '@dxos/testutils';
 
+import { TestProtocolPlugin, testProtocolProvider } from '../testing';
 import { FullyConnectedTopology } from '../topology';
-import { createWebRTCTransportFactory, WebRTCTransport } from '../transport';
+import { createWebRTCTransportFactory } from '../transport';
 import { Swarm } from './swarm';
 
 describe('Swarm', function () {
   const context = new MemorySignalManagerContext();
+  let signalManager: MemorySignalManager;
 
-  const setupSwarm = () => {
-    const topic = PublicKey.random();
-    const peerId1 = PublicKey.random();
-    const peerId2 = PublicKey.random();
+  beforeEach(function () {
+    signalManager = new MemorySignalManager(context);
+    afterTest(() => signalManager.destroy());
+  });
 
-    const swarm1 = new Swarm(
+  const setupSwarm = ({ topic, peerId }: { topic: PublicKey; peerId: PublicKey }) => {
+    const plugin = new TestProtocolPlugin(peerId.asBuffer());
+    const swarm = new Swarm(
       topic,
-      peerId1,
+      peerId,
       new FullyConnectedTopology(),
-      () => new Protocol(),
-      new Messenger({ signalManager: new MemorySignalManager(context) }),
-      createWebRTCTransportFactory(),
-      undefined
-    );
-
-    const swarm2 = new Swarm(
-      topic,
-      peerId2,
-      new FullyConnectedTopology(),
-      () => new Protocol(),
-      new Messenger({ signalManager: new MemorySignalManager(context) }),
+      testProtocolProvider(topic.asBuffer(), peerId, plugin),
+      new Messenger({ signalManager }),
       createWebRTCTransportFactory(),
       undefined
     );
 
     afterTest(async () => {
-      await swarm1.destroy();
-      await swarm2.destroy();
+      await swarm.destroy();
     });
 
-    return { swarm1, swarm2, peerId1, peerId2 };
+    return { swarm, plugin };
   };
 
   it('connects two peers in a swarm', async function () {
-    const { swarm1, swarm2, peerId1, peerId2 } = setupSwarm();
+    const topic = PublicKey.random();
+    const peerId1 = PublicKey.random();
+    const peerId2 = PublicKey.random();
+    const data = 'Hello';
+
+    const { swarm: swarm1, plugin: plugin1 } = setupSwarm({ topic, peerId: peerId1 });
+    let receivedData: string;
+    plugin1.on('receive', async (_, payload) => {
+      receivedData = payload;
+    });
+
+    const { swarm: swarm2, plugin: plugin2 } = setupSwarm({ topic, peerId: peerId2 });
+    plugin2.on('connect', async () => {
+      await plugin2.send(peerId1.asBuffer(), data);
+    });
 
     expect(swarm1.connections.length).toEqual(0);
     expect(swarm2.connections.length).toEqual(0);
@@ -84,20 +90,18 @@ describe('Swarm', function () {
     await promise;
     log('Swarms connected');
 
-    const swarm1Connection = swarm1.connections[0];
-    const swarm2Connection = swarm2.connections[0];
-    const onData = mockFn<(data: Buffer) => void>().returns(undefined);
-    (swarm2Connection.transport as WebRTCTransport).peer!.on('data', onData);
-
-    const data = Buffer.from('1234');
-    (swarm1Connection.transport as WebRTCTransport).peer!.send(data);
     await waitForExpect(() => {
-      expect(onData).toHaveBeenCalledWith([data]);
+      expect(receivedData).toEqual(data);
     });
   }).timeout(5_000);
 
   it('two peers try to originate connections to each other simultaneously', async function () {
-    const { swarm1, swarm2, peerId1, peerId2 } = setupSwarm();
+    const topic = PublicKey.random();
+    const peerId1 = PublicKey.random();
+    const peerId2 = PublicKey.random();
+
+    const { swarm: swarm1 } = setupSwarm({ topic, peerId: peerId1 });
+    const { swarm: swarm2 } = setupSwarm({ topic, peerId: peerId2 });
 
     expect(swarm1.connections.length).toEqual(0);
     expect(swarm2.connections.length).toEqual(0);
@@ -122,7 +126,21 @@ describe('Swarm', function () {
   }).timeout(5_000);
 
   it('second peer discovered after delay', async function () {
-    const { swarm1, swarm2, peerId1, peerId2 } = setupSwarm();
+    const topic = PublicKey.random();
+    const peerId1 = PublicKey.random();
+    const peerId2 = PublicKey.random();
+    const data = 'Hello';
+
+    const { swarm: swarm1, plugin: plugin1 } = setupSwarm({ topic, peerId: peerId1 });
+    let receivedData: string;
+    plugin1.on('receive', async (_, payload) => {
+      receivedData = payload;
+    });
+
+    const { swarm: swarm2, plugin: plugin2 } = setupSwarm({ topic, peerId: peerId2 });
+    plugin2.on('connect', async () => {
+      await plugin2.send(peerId1.asBuffer(), data);
+    });
 
     expect(swarm1.connections.length).toEqual(0);
     expect(swarm2.connections.length).toEqual(0);
@@ -145,48 +163,8 @@ describe('Swarm', function () {
 
     await connectPromises;
 
-    const swarm1Connection = swarm1.connections[0];
-    const swarm2Connection = swarm2.connections[0];
-    const onData = mockFn<(data: Buffer) => void>().returns(undefined);
-    (swarm2Connection.transport as WebRTCTransport).peer!.on('data', onData);
-
-    const data = Buffer.from('1234');
-    (swarm1Connection.transport as WebRTCTransport).peer!.send(data);
     await waitForExpect(() => {
-      expect(onData).toHaveBeenCalledWith([data]);
+      expect(receivedData).toEqual(data);
     });
   }).timeout(10_000);
-
-  it('swarming with message router', async function () {
-    const { swarm1, swarm2, peerId2 } = setupSwarm();
-
-    const promise = Promise.all([
-      asyncTimeout(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
-      asyncTimeout(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
-    ]);
-
-    swarm1.onSwarmEvent({
-      peerAvailable: {
-        peer: peerId2.asUint8Array(),
-        since: new Date()
-      }
-    });
-
-    log('Candidates changed');
-    await promise;
-    log('Swarms connected');
-
-    const swarm1Connection = swarm1.connections[0];
-    const swarm2Connection = swarm2.connections[0];
-    const onData = mockFn<(data: Buffer) => void>().returns(undefined);
-    (swarm2Connection.transport as WebRTCTransport).peer!.on('data', onData);
-
-    const data = Buffer.from('1234');
-    (swarm1Connection.transport as WebRTCTransport).peer!.send(data);
-    await waitForExpect(() => {
-      expect(onData).toHaveBeenCalledWith([data]);
-    });
-    await swarm1.destroy();
-    await swarm2.destroy();
-  }).timeout(5_000);
 });

package/src/testing/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2020 DXOS.org
 //
 
+export * from './test-builder';
 export * from './test-protocol';