@dxos/network-manager 2.33.9-dev.9246a07b → 2.33.9-dev.9bbef4e2

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

@@ -11,15 +11,9 @@ import { SwarmController, Topology } from './topology';
 export class FullyConnectedTopology implements Topology {
   private _controller?: SwarmController;
 
-  private _intervalId?: NodeJS.Timeout;
-
   init (controller: SwarmController): void {
     assert(!this._controller, 'Already initialized');
     this._controller = controller;
-
-    this._intervalId = setInterval(() => {
-      controller.lookup();
-    }, 10_000);
   }
 
   update (): void {
@@ -35,9 +29,7 @@ export class FullyConnectedTopology implements Topology {
   }
 
   async destroy (): Promise<void> {
-    if (this._intervalId !== undefined) {
-      clearInterval(this._intervalId);
-    }
+    // Nothing to do.
   }
 
   toString () {

package/src/topology/mmst-topology.ts

@@ -36,8 +36,6 @@ export class MMSTTopology implements Topology {
 
   private _controller?: SwarmController;
 
-  private _lookupIntervalId?: NodeJS.Timeout;
-
   private _sampleCollected = false;
 
   constructor ({
@@ -53,10 +51,6 @@ export class MMSTTopology implements Topology {
   init (controller: SwarmController): void {
     assert(!this._controller, 'Already initialized');
     this._controller = controller;
-
-    this._lookupIntervalId = setInterval(() => {
-      controller.lookup();
-    }, 10_000);
   }
 
   update (): void {
@@ -79,9 +73,7 @@ export class MMSTTopology implements Topology {
   }
 
   async destroy (): Promise<void> {
-    if (this._lookupIntervalId !== undefined) {
-      clearInterval(this._lookupIntervalId);
-    }
+    // Nothing to do.
   }
 
   private _runAlgorithm () {

package/src/topology/star-topology.ts

@@ -13,7 +13,6 @@ const log = debug('dxos:network-manager:topology:star');
 
 export class StarTopology implements Topology {
   private _controller?: SwarmController;
-  private _intervalId?: NodeJS.Timeout;
 
   constructor (
     private readonly _centralPeer: PublicKey
@@ -26,9 +25,6 @@ export class StarTopology implements Topology {
   init (controller: SwarmController): void {
     assert(!this._controller, 'Already initialized.');
     this._controller = controller;
-    this._intervalId = setInterval(() => {
-      controller.lookup();
-    }, 10_000);
   }
 
   update (): void {
@@ -62,8 +58,6 @@ export class StarTopology implements Topology {
   }
 
   async destroy (): Promise<void> {
-    if (this._intervalId !== undefined) {
-      clearInterval(this._intervalId);
-    }
+    // Nothing to do.
   }
 }

package/src/topology/topology.ts

@@ -19,13 +19,6 @@ export interface SwarmController {
    * Disconnect from a peer.
    */
   disconnect(peer: PublicKey): void;
-
-  /**
-   * Trigger a lookup of any other peers swarming on this topic.
-   *
-   * Updates will be propagated through `update` method.
-   */
-  lookup(): void;
 }
 
 export interface SwarmState {

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

@@ -11,7 +11,7 @@ import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 import { ComplexMap } from '@dxos/util';
 
-import { Message } from '../proto/gen/dxos/mesh/signal';
+import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { Transport, TransportFactory } from './transport';
 
 const log = debug('dxos:network-manager:swarm:transport:in-memory-transport');
@@ -79,7 +79,7 @@ export class InMemoryTransport implements Transport {
     return this._sessionId;
   }
 
-  async signal (msg: Message) {
+  async signal (msg: SignalMessage) {
     // No-op.
   }
 

package/src/transport/transport.ts

@@ -6,7 +6,7 @@ import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 
-import { Message } from '../proto/gen/dxos/mesh/signal';
+import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 
 /**
  * Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
@@ -15,7 +15,7 @@ export interface Transport {
   closed: Event
   connected: Event
   errors: ErrorStream
-  signal (msg: Message): Promise<void> // TODO(burdon): Remove async?
+  signal (msg: SignalMessage): Promise<void> // TODO(burdon): Remove async?
   close (): Promise<void>
 }
 
@@ -38,7 +38,7 @@ export interface TransportOptions {
   /**
    * Send a signal message to remote peer.
    */
-  sendSignal: (msg: Message) => Promise<void> // TODO(burdon): Remove async?
+  sendSignal: (msg: SignalMessage) => Promise<void> // TODO(burdon): Remove async?
 }
 
 export type TransportFactory = (options: TransportOptions) => Transport

package/src/transport/webrtc-transport.ts

@@ -11,7 +11,7 @@ import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { PublicKey } from '@dxos/protocols';
 
-import { Message } from '../proto/gen/dxos/mesh/signal';
+import { SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
 import { Transport, TransportFactory } from './transport';
 
 const log = debug('dxos:network-manager:swarm:transport:webrtc');
@@ -35,7 +35,7 @@ export class WebRTCTransport implements Transport {
     private readonly _remoteId: PublicKey,
     private readonly _sessionId: PublicKey,
     private readonly _topic: PublicKey,
-    private readonly _sendSignal: (msg: Message) => void,
+    private readonly _sendSignal: (msg: SignalMessage) => void,
     private readonly _webrtcConfig?: any
   ) {
     log(`Created WebRTC connection ${this._ownId} -> ${this._remoteId} initiator=${this._initiator}`);
@@ -89,7 +89,7 @@ export class WebRTCTransport implements Transport {
     return this._peer;
   }
 
-  async signal (msg: Message) {
+  async signal (msg: SignalMessage) {
     assert(this._peer, 'Connection not ready to accept signals.');
     assert(msg.data?.signal?.json, 'Signal message must contain signal data.');
     this._peer.signal(JSON.parse(msg.data.signal.json));