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

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, keyToString } from '@dxos/crypto';
 import { Extension, Protocol } from '@dxos/mesh-protocol';
+import { PublicKey } from '@dxos/protocols';
 
 import { ProtocolProvider } from './network-manager';
 

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/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.