@dxos/network-manager 2.33.7-dev.c2ba88fb → 2.33.8-dev.6bc74570

package/src/presence.test.ts

@@ -5,8 +5,8 @@
 import expect from 'expect';
 import waitForExpect from 'wait-for-expect';
 
-import { PublicKey } from '@dxos/crypto';
 import { PresencePlugin } from '@dxos/protocol-plugin-presence';
+import { PublicKey } from '@dxos/protocols';
 import { afterTest } from '@dxos/testutils';
 
 import { NetworkManager } from './network-manager';

package/src/protocol-factory.ts

@@ -5,8 +5,9 @@
 import assert from 'assert';
 import debug from 'debug';
 
-import { discoveryKey, keyToString, PublicKey } from '@dxos/crypto';
+import { discoveryKey } from '@dxos/crypto';
 import { Extension, Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 
 import { ProtocolProvider } from './network-manager';
 
@@ -36,7 +37,7 @@ export const protocolFactory = ({ session = {}, plugins = [], getTopics }: Proto
       discoveryToPublicKey: (dk) => {
         const publicKey = getTopics().find(topic => discoveryKey(topic).equals(dk));
         if (publicKey) {
-          protocol.setContext({ topic: keyToString(publicKey) });
+          protocol.setContext({ topic: PublicKey.stringify(publicKey) });
         }
         assert(publicKey, 'PublicKey not found in discovery.');
         return publicKey;
@@ -61,7 +62,7 @@ export interface Plugin {
 
 export const createProtocolFactory = (topic: PublicKey, peerId: PublicKey, plugins: Plugin[]) => protocolFactory({
   getTopics: () => [topic.asBuffer()],
-  session: { peerId: keyToString(peerId.asBuffer()) },
+  session: { peerId: PublicKey.stringify(peerId.asBuffer()) },
   plugins
 });
 
@@ -71,6 +72,6 @@ export const createProtocolFactory = (topic: PublicKey, peerId: PublicKey, plugi
  */
 export const transportProtocolProvider = (rendezvousKey: Buffer, peerId: Buffer, protocolPlugin: any): ProtocolProvider => protocolFactory({
   getTopics: () => [rendezvousKey],
-  session: { peerId: keyToString(peerId) },
+  session: { peerId: PublicKey.stringify(peerId) },
   plugins: [protocolPlugin]
 });

package/src/signal/in-memory-signal-manager.ts

@@ -5,7 +5,7 @@
 import assert from 'assert';
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
 import { SignalApi } from './signal-api';

package/src/signal/signal-api.ts

@@ -4,7 +4,7 @@
 
 import { SignalData } from 'simple-peer';
 
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 // TODO(burdon): Define message types as protobuf.
 

package/src/signal/signal-client.test.ts

@@ -7,7 +7,7 @@ import { it as test, describe } from 'mocha';
 import waitForExpect from 'wait-for-expect';
 
 import { Awaited, sleep } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 import { createTestBroker } from '@dxos/signal';
 import { randomInt } from '@dxos/util';
 

package/src/signal/signal-client.ts

@@ -5,7 +5,7 @@
 import debug from 'debug';
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 import { SignalApi } from './signal-api';
 import { WebsocketRpc } from './websocket-rpc';

package/src/signal/signal-manager.ts

@@ -3,7 +3,7 @@
 //
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 import { SignalApi } from './signal-api';
 

package/src/signal/websocket-signal-manager.ts

@@ -6,7 +6,7 @@ import assert from 'assert';
 import debug from 'debug';
 
 import { Event, synchronized } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 import { ComplexMap } from '@dxos/util';
 
 import { SignalApi } from './signal-api';

package/src/swarm/connection.ts

@@ -6,9 +6,9 @@ import assert from 'assert';
 import debug from 'debug';
 
 import { Event, synchronized } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { ErrorStream } from '@dxos/debug';
 import { Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 
 import { SignalApi } from '../signal';
 import { Transport, TransportFactory } from '../transport';

package/src/swarm/swarm-mapper.ts

@@ -5,8 +5,8 @@
 import debug from 'debug';
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { PresencePlugin } from '@dxos/protocol-plugin-presence';
+import { PublicKey } from '@dxos/protocols';
 import { ComplexMap, SubscriptionGroup } from '@dxos/util';
 
 import { ConnectionState } from './connection';

package/src/swarm/swarm.test.ts

@@ -8,8 +8,8 @@ import { it as test } from 'mocha';
 import waitForExpect from 'wait-for-expect';
 
 import { sleep, promiseTimeout } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 import { afterTest } from '@dxos/testutils';
 
 import { SignalApi, SignalConnection } from '../signal';

package/src/swarm/swarm.ts

@@ -6,8 +6,9 @@ import assert from 'assert';
 import debug from 'debug';
 
 import { Event } from '@dxos/async';
-import { discoveryKey, PublicKey } from '@dxos/crypto';
+import { discoveryKey } from '@dxos/crypto';
 import { ErrorStream } from '@dxos/debug';
+import { PublicKey } from '@dxos/protocols';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
 import { ProtocolProvider } from '../network-manager';

package/src/testing/test-protocol.ts

@@ -8,8 +8,8 @@ import assert from 'assert';
 import debug from 'debug';
 import { EventEmitter } from 'events';
 
-import { keyToBuffer, keyToString } from '@dxos/crypto';
 import { Extension, Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 
 import { protocolFactory } from '../protocol-factory';
 
@@ -20,7 +20,7 @@ const EXTENSION_NAME = 'test';
 // TODO(dboreham): This method should be added to Protocol (and one for "my ID"?).
 export const getPeerId = (protocol: Protocol) => {
   const { peerId } = protocol.getSession() ?? {};
-  return keyToBuffer(peerId);
+  return PublicKey.bufferize(peerId);
 };
 
 /**
@@ -97,7 +97,7 @@ export class TestProtocolPlugin extends EventEmitter {
    */
   async send (peerId: Buffer, payload: string): Promise<string> {
     assert(Buffer.isBuffer(peerId));
-    const peerIdStr = keyToString(peerId);
+    const peerIdStr = PublicKey.stringify(peerId);
     const peer = this._peers.get(peerIdStr);
     // TODO(dboreham): Throw fatal error if peer not found.
     const extension = peer.getExtension(EXTENSION_NAME);
@@ -111,7 +111,7 @@ export class TestProtocolPlugin extends EventEmitter {
   }
 
   async _receive (protocol: Protocol, data: any) {
-    const peerIdStr = keyToString(getPeerId(protocol));
+    const peerIdStr = PublicKey.stringify(getPeerId(protocol));
     let payload = data.data.toString();
     if (this._uppercase) {
       payload = payload.toUpperCase();
@@ -125,7 +125,7 @@ export class TestProtocolPlugin extends EventEmitter {
     if (peerId === undefined) {
       return;
     }
-    const peerIdStr = keyToString(peerId);
+    const peerIdStr = PublicKey.stringify(peerId);
     if (this._peers.has(peerIdStr)) {
       return;
     }
@@ -140,7 +140,7 @@ export class TestProtocolPlugin extends EventEmitter {
       return;
     }
 
-    this._peers.delete(keyToString(peerId));
+    this._peers.delete(PublicKey.stringify(peerId));
     this.emit('disconnect', peerId);
   }
 }
@@ -151,6 +151,6 @@ export class TestProtocolPlugin extends EventEmitter {
 // TODO(dboreham): Try to encapsulate swarmKey, nodeId.
 export const testProtocolProvider = (swarmKey: Buffer, nodeId: Buffer, protocolPlugin: any) => protocolFactory({
   getTopics: () => [swarmKey],
-  session: { peerId: keyToString(nodeId) },
+  session: { peerId: PublicKey.stringify(nodeId) },
   plugins: [protocolPlugin]
 });

package/src/topology/fully-connected-topology.ts

@@ -4,7 +4,7 @@
 
 import assert from 'assert';
 
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 import { SwarmController, Topology } from './topology';
 

package/src/topology/mmst-topology.ts

@@ -6,7 +6,7 @@ import assert from 'assert';
 import debug from 'debug';
 import distance from 'xor-distance';
 
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 import { SwarmController, Topology } from './topology';
 

package/src/topology/star-topology.ts

@@ -5,7 +5,7 @@
 import assert from 'assert';
 import debug from 'debug';
 
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 import { SwarmController, Topology } from './topology';
 

package/src/topology/topology.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 export interface SwarmController {
   /**

package/src/transport/in-memory-transport.test.ts

@@ -5,8 +5,9 @@
 import expect from 'expect';
 import waitForExpect from 'wait-for-expect';
 
-import { discoveryKey, PublicKey } from '@dxos/crypto';
+import { discoveryKey } from '@dxos/crypto';
 import { Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 import { afterTest } from '@dxos/testutils';
 import { range } from '@dxos/util';
 

package/src/transport/in-memory-transport.ts

@@ -7,8 +7,8 @@ import debug from 'debug';
 import { Transform } from 'stream';
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { ErrorStream } from '@dxos/debug';
+import { PublicKey } from '@dxos/protocols';
 import { ComplexMap } from '@dxos/util';
 
 import { SignalApi } from '../signal';

package/src/transport/transport.ts

@@ -3,8 +3,8 @@
 //
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { ErrorStream } from '@dxos/debug';
+import { PublicKey } from '@dxos/protocols';
 
 import { SignalApi } from '../signal';
 

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

@@ -8,8 +8,9 @@ import { Duplex } from 'stream';
 import waitForExpect from 'wait-for-expect';
 
 import { sleep } from '@dxos/async';
-import { discoveryKey, PublicKey } from '@dxos/crypto';
+import { discoveryKey } from '@dxos/crypto';
 import { Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 import { afterTest } from '@dxos/testutils';
 
 import { TestProtocolPlugin, testProtocolProvider } from '../testing/test-protocol';

package/src/transport/webrtc-transport.ts

@@ -8,8 +8,8 @@ import debug from 'debug';
 import SimplePeerConstructor, { Instance as SimplePeer } from 'simple-peer';
 
 import { Event } from '@dxos/async';
-import { PublicKey } from '@dxos/crypto';
 import { ErrorStream } from '@dxos/debug';
+import { PublicKey } from '@dxos/protocols';
 
 import { SignalApi } from '../signal';
 import { Transport, TransportFactory } from './transport';

package/src/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import { PublicKey } from '@dxos/crypto';
+import { PublicKey } from '@dxos/protocols';
 
 /**
  * Swarm topic.