@dxos/network-manager 0.3.1 → 0.3.2-main.05033b7

package/src/connection-log.ts

@@ -5,12 +5,12 @@
 import { Event } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
-import { SwarmInfo, ConnectionInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
-import { MuxerStats } from '@dxos/teleport';
+import { type SwarmInfo, type ConnectionInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
+import { type MuxerStats } from '@dxos/teleport';
 import { ComplexMap } from '@dxos/util';
 
-import { ConnectionState, Swarm } from './swarm';
-import { WireProtocol } from './wire-protocol';
+import { ConnectionState, type Swarm } from './swarm';
+import { type WireProtocol } from './wire-protocol';
 
 export enum EventType {
   CONNECTION_STATE_CHANGED = 'CONNECTION_STATE_CHANGED',

package/src/network-manager.ts

@@ -6,17 +6,17 @@ import { Event } from '@dxos/async';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { Messenger, SignalManager } from '@dxos/messaging';
+import { Messenger, type SignalManager } from '@dxos/messaging';
 import { trace } from '@dxos/protocols';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { ComplexMap } from '@dxos/util';
 
 import { ConnectionLog } from './connection-log';
-import { SignalConnection } from './signal';
+import { type SignalConnection } from './signal';
 import { Swarm, SwarmMapper, ConnectionLimiter } from './swarm';
-import { Topology } from './topology';
-import { TransportFactory } from './transport';
-import { WireProtocolProvider } from './wire-protocol';
+import { type Topology } from './topology';
+import { type TransportFactory } from './transport';
+import { type WireProtocolProvider } from './wire-protocol';
 /**
  * Represents a single connection to a remote peer.
  */

package/src/signal/integration.test.ts

@@ -9,10 +9,10 @@ import waitForExpect from 'wait-for-expect';
 
 import { PublicKey } from '@dxos/keys';
 import { Messenger, WebsocketSignalManager } from '@dxos/messaging';
-import { runTestSignalServer, SignalServerRunner } from '@dxos/signal';
+import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
 import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
 
-import { SignalMessage } from './signal-messenger';
+import { type SignalMessage } from './signal-messenger';
 import { SwarmMessenger } from './swarm-messenger';
 
 describe('Signal Integration Test', () => {

package/src/signal/signal-connection.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 
 /**
  * Signal peer discovery interface.

package/src/signal/signal-messenger.ts

@@ -2,8 +2,8 @@
 // Copyright 2022 DXOS.org
 //
 
-import { PublicKey } from '@dxos/keys';
-import { Answer, Offer, Signal, SignalBatch } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type PublicKey } from '@dxos/keys';
+import { type Answer, type Offer, type Signal, type SignalBatch } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 export interface OfferMessage {
   author: PublicKey;

package/src/signal/swarm-messenger.test.ts

@@ -7,14 +7,14 @@
 import { expect } from 'earljs';
 import waitForExpect from 'wait-for-expect';
 
-import { Awaited } from '@dxos/async';
+import { type Awaited } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { Messenger, WebsocketSignalManager } from '@dxos/messaging';
-import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { runTestSignalServer } from '@dxos/signal';
 import { afterAll, beforeAll, describe, test, afterTest } from '@dxos/test';
 
-import { OfferMessage, SignalMessage } from './signal-messenger';
+import { type OfferMessage, type SignalMessage } from './signal-messenger';
 import { SwarmMessenger } from './swarm-messenger';
 
 describe('SwarmMessenger', () => {

package/src/signal/swarm-messenger.ts

@@ -2,16 +2,16 @@
 // Copyright 2020 DXOS.org
 //
 
-import { Any } from '@dxos/codec-protobuf';
+import { type Any } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { schema } from '@dxos/protocols';
-import { Answer, SwarmMessage } from '@dxos/protocols/proto/dxos/mesh/swarm';
-import { ComplexMap, MakeOptional } from '@dxos/util';
+import { type Answer, SwarmMessage } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { ComplexMap, type MakeOptional } from '@dxos/util';
 
-import { OfferMessage, SignalMessage, SignalMessenger } from './signal-messenger';
+import { type OfferMessage, type SignalMessage, type SignalMessenger } from './signal-messenger';
 
 interface OfferRecord {
   resolve: (answer: Answer) => void;

package/src/swarm/connection.ts

@@ -16,11 +16,11 @@ import {
   UnknownProtocolError,
   trace,
 } from '@dxos/protocols';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { SignalMessage, SignalMessenger } from '../signal';
-import { Transport, TransportFactory } from '../transport';
-import { WireProtocol } from '../wire-protocol';
+import { type SignalMessage, type SignalMessenger } from '../signal';
+import { type Transport, type TransportFactory } from '../transport';
+import { type WireProtocol } from '../wire-protocol';
 
 /**
  * How long to wait before sending the signal in case we receive another signal.

package/src/swarm/peer.ts

@@ -8,13 +8,13 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { CancelledError, SystemError } from '@dxos/protocols';
-import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 import { Connection, ConnectionState } from './connection';
-import { ConnectionLimiter } from './connection-limiter';
-import { OfferMessage, SignalMessage, SignalMessenger } from '../signal';
-import { TransportFactory } from '../transport';
-import { WireProtocolProvider } from '../wire-protocol';
+import { type ConnectionLimiter } from './connection-limiter';
+import { type OfferMessage, type SignalMessage, type SignalMessenger } from '../signal';
+import { type TransportFactory } from '../transport';
+import { type WireProtocolProvider } from '../wire-protocol';
 
 export class ConnectionDisplacedError extends SystemError {
   constructor() {

package/src/swarm/swarm-mapper.ts

@@ -7,8 +7,8 @@ import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { ComplexMap } from '@dxos/util';
 
-import { ConnectionState } from './connection';
-import { Swarm } from './swarm';
+import { type ConnectionState } from './connection';
+import { type Swarm } from './swarm';
 
 /**
  * State of the connection to the remote peer with additional info derived from network mapping.

package/src/swarm/swarm.test.ts

@@ -6,7 +6,7 @@ import { expect } from 'chai';
 
 import { asyncTimeout, sleep } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
-import { MemorySignalManager, MemorySignalManagerContext, Messenger, SignalManager } from '@dxos/messaging';
+import { MemorySignalManager, MemorySignalManagerContext, Messenger, type SignalManager } from '@dxos/messaging';
 import { afterTest, describe, test } from '@dxos/test';
 import { ComplexSet } from '@dxos/util';
 

package/src/swarm/swarm.ts

@@ -8,20 +8,20 @@ import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
-import { ListeningHandle, Messenger } from '@dxos/messaging';
+import { type ListeningHandle, type Messenger } from '@dxos/messaging';
 import { trace } from '@dxos/protocols';
-import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
-import { Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
+import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap, isNotNullOrUndefined } from '@dxos/util';
 
-import { Connection, ConnectionState } from './connection';
-import { ConnectionLimiter } from './connection-limiter';
+import { type Connection, ConnectionState } from './connection';
+import { type ConnectionLimiter } from './connection-limiter';
 import { Peer } from './peer';
-import { SwarmMessenger, OfferMessage, SignalMessage } from '../signal';
-import { SwarmController, Topology } from '../topology';
-import { TransportFactory } from '../transport';
-import { Topic } from '../types';
-import { WireProtocolProvider } from '../wire-protocol';
+import { SwarmMessenger, type OfferMessage, type SignalMessage } from '../signal';
+import { type SwarmController, type Topology } from '../topology';
+import { type TransportFactory } from '../transport';
+import { type Topic } from '../types';
+import { type WireProtocolProvider } from '../wire-protocol';
 
 const INITIATION_DELAY = 100;
 

package/src/testing/test-builder.ts

@@ -7,13 +7,13 @@ import { log } from '@dxos/log';
 import {
   MemorySignalManager,
   MemorySignalManagerContext,
-  SignalManager,
+  type SignalManager,
   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 { 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';
@@ -21,7 +21,7 @@ import { NetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
 import {
   MemoryTransportFactory,
-  TransportFactory,
+  type TransportFactory,
   SimplePeerTransportProxyFactory,
   SimplePeerTransportService,
   createSimplePeerTransportFactory,

package/src/tests/basic-test-suite.ts

@@ -12,7 +12,7 @@ import { afterTest, test } from '@dxos/test';
 import { range } from '@dxos/util';
 
 import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
-import { TestBuilder } from '../testing';
+import { type TestBuilder } from '../testing';
 import { FullyConnectedTopology, StarTopology } from '../topology';
 
 // TODO(burdon): Use PublicKey throughout (remove conversion to strings, from buffers, etc.)

package/src/tests/property-test-suite.ts

@@ -3,7 +3,7 @@
 //
 
 import * as fc from 'fast-check';
-import { ModelRunSetup } from 'fast-check';
+import { type ModelRunSetup } from 'fast-check';
 import waitForExpect from 'wait-for-expect';
 
 import { todo } from '@dxos/debug';
@@ -11,7 +11,7 @@ import { PublicKey } from '@dxos/keys';
 import { test } from '@dxos/test';
 import { ComplexMap, ComplexSet, range } from '@dxos/util';
 
-import { NetworkManager } from '../network-manager';
+import { type NetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
 
 /**

package/src/tests/utils.ts

@@ -3,12 +3,12 @@
 //
 
 import { asyncTimeout } from '@dxos/async';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { afterTest } from '@dxos/test';
-import { Provider } from '@dxos/util';
+import { type Provider } from '@dxos/util';
 
-import { TestPeer, TestSwarmConnection } from '../testing';
-import { Topology } from '../topology';
+import { type TestPeer, type TestSwarmConnection } from '../testing';
+import { type Topology } from '../topology';
 
 //
 // NOTE: Don't move to testing directory since not exportable outside of package.

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

@@ -3,9 +3,9 @@
 //
 
 import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 
-import { SwarmController, Topology } from './topology';
+import { type SwarmController, type Topology } from './topology';
 
 export class FullyConnectedTopology implements Topology {
   private _controller?: SwarmController;

package/src/topology/mmst-topology.ts

@@ -5,10 +5,10 @@
 import distance from 'xor-distance';
 
 import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 
-import { SwarmController, Topology } from './topology';
+import { type SwarmController, type Topology } from './topology';
 
 export interface MMSTTopologyOptions {
   /**

package/src/topology/star-topology.ts

@@ -3,10 +3,10 @@
 //
 
 import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 
-import { SwarmController, Topology } from './topology';
+import { type SwarmController, type Topology } from './topology';
 
 export class StarTopology implements Topology {
   private _controller?: SwarmController;

package/src/topology/topology.ts

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

package/src/transport/libdatachannel-transport.ts

@@ -7,10 +7,10 @@ import { Duplex } from 'stream';
 import { Event, Trigger, synchronized } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { log } from '@dxos/log';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 import { type PeerConnection } from './datachannel/rtc-peer-connection';
-import { Transport, TransportFactory } from './transport';
+import { type Transport, type TransportFactory } from './transport';
 
 export type LibDataChannelTransportParams = {
   initiator: boolean;

package/src/transport/memory-transport.ts

@@ -9,10 +9,10 @@ import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap } from '@dxos/util';
 
-import { Transport, TransportFactory, TransportOptions } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions } from './transport';
 
 // TODO(burdon): Make configurable.
 // Delay (in milliseconds) for data being sent through in-memory connections to simulate network latency.

package/src/transport/simplepeer-transport-proxy-test.ts

@@ -6,9 +6,9 @@
 
 import { TestStream } from '@dxos/async';
 import { schema } from '@dxos/protocols';
-import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
-import { createLinkedPorts, createProtoRpcPeer, ProtoRpcPeer } from '@dxos/rpc';
+import { type BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { createLinkedPorts, createProtoRpcPeer, type ProtoRpcPeer } from '@dxos/rpc';
 import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
 
 import { SimplePeerTransportProxy } from './simplepeer-transport-proxy';

package/src/transport/simplepeer-transport-proxy.ts

@@ -5,7 +5,7 @@
 import { Writable } from 'node:stream';
 
 import { Event } from '@dxos/async';
-import { Stream } from '@dxos/codec-protobuf';
+import { type Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
@@ -18,11 +18,11 @@ import {
   ConnectivityError,
   UnknownProtocolError,
 } from '@dxos/protocols';
-import { ConnectionState, BridgeEvent, BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { ConnectionState, type BridgeEvent, type BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { arrayToBuffer } from '@dxos/util';
 
-import { Transport, TransportFactory, TransportOptions } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions } from './transport';
 
 export type SimplePeerTransportProxyParams = {
   initiator: boolean;

package/src/transport/simplepeer-transport-service.ts

@@ -9,13 +9,13 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import {
-  BridgeService,
-  ConnectionRequest,
-  SignalRequest,
-  DataRequest,
-  BridgeEvent,
+  type BridgeService,
+  type ConnectionRequest,
+  type SignalRequest,
+  type DataRequest,
+  type BridgeEvent,
   ConnectionState,
-  CloseRequest,
+  type CloseRequest,
 } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { ComplexMap } from '@dxos/util';
 

package/src/transport/simplepeer-transport.ts

@@ -3,7 +3,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import SimplePeerConstructor, { Instance as SimplePeer } from 'simple-peer';
+import SimplePeerConstructor, { type Instance as SimplePeer } from 'simple-peer';
 import invariant from 'tiny-invariant';
 
 import { Event } from '@dxos/async';
@@ -11,9 +11,9 @@ import { ErrorStream, raise } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { ConnectionResetError, ConnectivityError, ProtocolError, UnknownProtocolError, trace } from '@dxos/protocols';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { Transport, TransportFactory } from './transport';
+import { type Transport, type TransportFactory } from './transport';
 import { wrtc } from './webrtc';
 
 export type SimplePeerTransportParams = {

package/src/transport/tcp-transport.browser.ts

@@ -5,7 +5,7 @@
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 
-import { Transport, TransportFactory } from './transport';
+import { type Transport, type TransportFactory } from './transport';
 
 // NOTE: Browser stub.
 

package/src/transport/tcp-transport.ts

@@ -2,14 +2,14 @@
 // Copyright 2020 DXOS.org
 //
 
-import { AddressInfo, Socket, type Server } from 'node:net';
+import { type AddressInfo, Socket, type Server } from 'node:net';
 
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { log } from '@dxos/log';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { Transport, TransportFactory, TransportOptions } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions } from './transport';
 
 export const TcpTransportFactory: TransportFactory = {
   createTransport: (params) => new TcpTransport(params),

package/src/transport/transport.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import { Event } from '@dxos/async';
-import { ErrorStream } from '@dxos/debug';
-import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type Event } from '@dxos/async';
+import { type ErrorStream } from '@dxos/debug';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 export enum TransportKind {
   SIMPLE_PEER = 'SIMPLE_PEER',

package/src/types.ts

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

package/src/wire-protocol.ts

@@ -2,9 +2,9 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Duplex } from 'node:stream';
+import { type Duplex } from 'node:stream';
 
-import { PublicKey } from '@dxos/keys';
+import { type PublicKey } from '@dxos/keys';
 import { Teleport } from '@dxos/teleport';
 
 export type WireProtocolParams = {