@dxos/network-manager 0.1.39 → 0.1.40

package/dist/types/src/testing/test-builder.d.ts

@@ -1,11 +1,12 @@
 import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, WebsocketSignalManager } from '@dxos/messaging';
+import { Runtime } from '@dxos/protocols/proto/dxos/config';
 import { NetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
 import { TestWireProtocol } from './test-wire-protocol';
-export declare const TEST_SIGNAL_URL = "ws://localhost:4000/.well-known/dx/signal";
+export declare const TEST_SIGNAL_HOSTS: Runtime.Services.Signal[];
 export declare type TestBuilderOptions = {
-    signalHosts?: string[];
+    signalHosts?: Runtime.Services.Signal[];
     bridge?: boolean;
 };
 /**

package/dist/types/src/testing/test-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAA8B,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAM1G,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAQrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,eAAe,8CAA8C,CAAC;AAE3E,oBAAY,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;aAGM,OAAO,EAAE,kBAAkB;IAFvD,OAAO,CAAC,cAAc,CAAoC;gBAE9B,OAAO,GAAE,kBAAuB;IAE5D,mBAAmB;IAQnB,UAAU;CAGX;AAED;;GAEG;AACH,qBAAa,QAAQ;IAaP,OAAO,CAAC,QAAQ,CAAC,WAAW;IAZxC,QAAQ,CAAC,MAAM,YAAsB;IAErC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkE;IAO1F,OAAO,CAAC,MAAM,CAAC,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;gBAER,WAAW,EAAE,WAAW;IAKrD,oBAAoB;IA6Cd,IAAI;IAMJ,KAAK;IASX,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB;IAS/C,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB;IAW5C,SAAS;IAIT,QAAQ;CAGf;AAGD,qBAAa,mBAAmB;IAGlB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS;IAF9D,QAAQ,EAAE,gBAAgB,CAAC;gBAEN,IAAI,EAAE,QAAQ,EAAW,KAAK,EAAE,SAAS;IAQxD,IAAI,CAAC,QAAQ,yBAA+B;IAW5C,KAAK;CAIZ"}
+{"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAA8B,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAG1G,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAI5D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAQrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAA8D,CAAC;AAEtH,oBAAY,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;aAGM,OAAO,EAAE,kBAAkB;IAFvD,OAAO,CAAC,cAAc,CAAoC;gBAE9B,OAAO,GAAE,kBAAuB;IAE5D,mBAAmB;IAQnB,UAAU;CAGX;AAED;;GAEG;AACH,qBAAa,QAAQ;IAaP,OAAO,CAAC,QAAQ,CAAC,WAAW;IAZxC,QAAQ,CAAC,MAAM,YAAsB;IAErC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkE;IAO1F,OAAO,CAAC,MAAM,CAAC,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;gBAER,WAAW,EAAE,WAAW;IAKrD,oBAAoB;IA6Cd,IAAI;IAMJ,KAAK;IASX,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB;IAS/C,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB;IAW5C,SAAS;IAIT,QAAQ;CAGf;AAGD,qBAAa,mBAAmB;IAGlB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS;IAF9D,QAAQ,EAAE,gBAAgB,CAAC;gBAEN,IAAI,EAAE,QAAQ,EAAW,KAAK,EAAE,SAAS;IAQxD,IAAI,CAAC,QAAQ,yBAA+B;IAW5C,KAAK;CAIZ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,20 +25,20 @@
     "simple-peer": "9.11.0",
     "ws": "^7.4.4",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.1.39",
-    "@dxos/codec-protobuf": "0.1.39",
-    "@dxos/context": "0.1.39",
-    "@dxos/credentials": "0.1.39",
-    "@dxos/crypto": "0.1.39",
-    "@dxos/debug": "0.1.39",
-    "@dxos/keys": "0.1.39",
-    "@dxos/log": "0.1.39",
-    "@dxos/messaging": "0.1.39",
-    "@dxos/node-std": "0.1.39",
-    "@dxos/protocols": "0.1.39",
-    "@dxos/rpc": "0.1.39",
-    "@dxos/teleport": "0.1.39",
-    "@dxos/util": "0.1.39"
+    "@dxos/async": "0.1.40",
+    "@dxos/codec-protobuf": "0.1.40",
+    "@dxos/context": "0.1.40",
+    "@dxos/credentials": "0.1.40",
+    "@dxos/crypto": "0.1.40",
+    "@dxos/debug": "0.1.40",
+    "@dxos/keys": "0.1.40",
+    "@dxos/log": "0.1.40",
+    "@dxos/messaging": "0.1.40",
+    "@dxos/node-std": "0.1.40",
+    "@dxos/protocols": "0.1.40",
+    "@dxos/rpc": "0.1.40",
+    "@dxos/teleport": "0.1.40",
+    "@dxos/util": "0.1.40"
   },
   "devDependencies": {
     "@swc-node/register": "1.5.4",
@@ -48,7 +48,7 @@
     "earljs": "~0.1.10",
     "fast-check": "~3.3.0",
     "typescript": "^4.8.4",
-    "@dxos/signal": "0.1.39"
+    "@dxos/signal": "0.1.40"
   },
   "publishConfig": {
     "access": "public"

package/src/signal/integration.test.ts

@@ -27,7 +27,7 @@ describe('Signal Integration Test', () => {
   });
 
   const setupPeer = async ({ peerId, topic = PublicKey.random() }: { peerId: PublicKey; topic?: PublicKey }) => {
-    const signalManager = new WebsocketSignalManager([broker.url()]);
+    const signalManager = new WebsocketSignalManager([{ server: broker.url() }]);
     await signalManager.open();
     afterTest(() => signalManager.close());
 

package/src/signal/message-router.test.ts

@@ -46,7 +46,7 @@ describe('MessageRouter', () => {
     topic: PublicKey;
   }) => {
     const peerId = PublicKey.random();
-    const signalManager = new WebsocketSignalManager([signalApiUrl]);
+    const signalManager = new WebsocketSignalManager([{ server: signalApiUrl }]);
     await signalManager.open();
     afterTest(() => signalManager.close());
 

package/src/testing/test-builder.ts

@@ -6,6 +6,7 @@ import { PublicKey } from '@dxos/keys';
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
 import { schema } from '@dxos/protocols';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
+import { Runtime } from '@dxos/protocols/proto/dxos/config';
 import { createLinkedPorts, createProtoRpcPeer, ProtoRpcPeer } from '@dxos/rpc';
 import { ComplexMap } from '@dxos/util';
 
@@ -21,10 +22,10 @@ import {
 import { TestWireProtocol } from './test-wire-protocol';
 
 // Signal server will be started by the setup script.
-export const TEST_SIGNAL_URL = 'ws://localhost:4000/.well-known/dx/signal';
+export const TEST_SIGNAL_HOSTS: Runtime.Services.Signal[] = [{ server: 'ws://localhost:4000/.well-known/dx/signal' }];
 
 export type TestBuilderOptions = {
-  signalHosts?: string[];
+  signalHosts?: Runtime.Services.Signal[];
   bridge?: boolean;
 };
 

package/src/tests/webrtc-transport.test.ts

@@ -2,15 +2,15 @@
 // Copyright 2021 DXOS.org
 //
 
-import { TEST_SIGNAL_URL, TestBuilder } from '../testing';
+import { TEST_SIGNAL_HOSTS, TestBuilder } from '../testing';
 import { basicTestSuite } from './basic-test-suite';
 
 describe('WebRTC transport', () => {
-  const testBuilder = new TestBuilder({ signalHosts: [TEST_SIGNAL_URL] });
+  const testBuilder = new TestBuilder({ signalHosts: TEST_SIGNAL_HOSTS });
   basicTestSuite(testBuilder);
 }).timeout(10_000);
 
 describe('WebRTC transport proxy', () => {
-  const testBuilder = new TestBuilder({ signalHosts: [TEST_SIGNAL_URL], bridge: true });
+  const testBuilder = new TestBuilder({ signalHosts: TEST_SIGNAL_HOSTS, bridge: true });
   basicTestSuite(testBuilder);
 }).timeout(10_000);