@dxos/messaging 0.1.58-main.9be790d → 0.1.58-main.ae92ec9

package/src/messenger.ts

@@ -2,14 +2,13 @@
 // Copyright 2022 DXOS.org
 //
 
-import { TimeoutError, scheduleExponentialBackoffTaskInterval, scheduleTask } from '@dxos/async';
+import { TimeoutError, scheduleExponentialBackoffTaskInterval, scheduleTask, scheduleTaskInterval } from '@dxos/async';
 import { Any } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
-import { TimeoutError as ProtocolTimeoutError } from '@dxos/errors';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { schema, trace } from '@dxos/protocols';
+import { TimeoutError as ProtocolTimeoutError, schema, trace } from '@dxos/protocols';
 import { ReliablePayload } from '@dxos/protocols/proto/dxos/mesh/messaging';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
@@ -30,6 +29,8 @@ const Acknowledgement = schema.getCodecForType('dxos.mesh.messaging.Acknowledgem
 const ERROR_LIMIT = 5;
 const NETWORK_REBOOT_DELAY = 3_000;
 
+const RECEIVED_MESSAGES_GC_INTERVAL = 120_000;
+
 /**
  * Reliable messenger that works trough signal network.
  */
@@ -45,7 +46,12 @@ export class Messenger {
 
   private readonly _onAckCallbacks = new ComplexMap<PublicKey, () => void>(PublicKey.hash);
 
-  private readonly _receivedMessages = new ComplexSet<PublicKey>((key) => key.toHex());
+  private readonly _receivedMessages = new ComplexSet<PublicKey>(PublicKey.hash);
+
+  /**
+   * Keys scheduled to be cleared from _receivedMessages on the next iteration.
+   */
+  private readonly _toClear = new ComplexSet<PublicKey>(PublicKey.hash);
 
   private _ctx!: Context;
   private _closed = true;
@@ -75,6 +81,16 @@ export class Messenger {
         await this._handleMessage(message);
       }),
     );
+
+    // Clear the map periodically.
+    scheduleTaskInterval(
+      this._ctx,
+      async () => {
+        this._performGc();
+      },
+      RECEIVED_MESSAGES_GC_INTERVAL,
+    );
+
     this._closed = false;
     log.trace('dxos.mesh.messenger.open', trace.end({ id: traceId }));
   }
@@ -318,6 +334,23 @@ export class Messenger {
       }
     }
   }
+
+  private _performGc() {
+    const start = performance.now();
+
+    for (const key of this._toClear.keys()) {
+      this._receivedMessages.delete(key);
+    }
+    this._toClear.clear();
+    for (const key of this._receivedMessages.keys()) {
+      this._toClear.add(key);
+    }
+
+    const elapsed = performance.now() - start;
+    if (elapsed > 100) {
+      log.warn('GC took too long', { elapsed });
+    }
+  }
 }
 
 export interface ListeningHandle {

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

@@ -12,8 +12,8 @@ import { trace } from '@dxos/protocols';
 import { Message as SignalMessage, SignalState, SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
-import { Message, SignalMethods } from '../signal-methods';
 import { SignalRPCClient } from './signal-rpc-client';
+import { Message, SignalMethods } from '../signal-methods';
 
 const DEFAULT_RECONNECT_TIMEOUT = 100;
 const MAX_RECONNECT_TIMEOUT = 5000;

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

@@ -12,8 +12,8 @@ import { schema } from '@dxos/protocols';
 import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 import { ComplexMap, ComplexSet } from '@dxos/util';
 
-import { CommandTrace, SignalStatus } from '../signal-client';
 import { SignalManager } from './signal-manager';
+import { CommandTrace, SignalStatus } from '../signal-client';
 
 /**
  * Common signaling context that connects multiple MemorySignalManager instances.
@@ -59,10 +59,7 @@ export class MemorySignalManager implements SignalManager {
   // TODO(dmaretskyi): Replace with callback.
   private readonly _freezeTrigger = new Trigger().wake();
 
-  // prettier-ignore
-  constructor(
-    private readonly _context: MemorySignalManagerContext
-  ) {
+  constructor(private readonly _context: MemorySignalManagerContext) {
     this._ctx = new Context();
 
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));

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

@@ -12,8 +12,8 @@ import { trace } from '@dxos/protocols';
 import { Runtime } from '@dxos/protocols/proto/dxos/config';
 import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 
-import { CommandTrace, SignalClient, SignalStatus } from '../signal-client';
 import { SignalManager } from './signal-manager';
+import { CommandTrace, SignalClient, SignalStatus } from '../signal-client';
 
 /**
  * Manages connection to multiple Signal Servers over WebSocket
@@ -39,10 +39,7 @@ export class WebsocketSignalManager implements SignalManager {
 
   private readonly _instanceId = PublicKey.random().toHex();
 
-  // prettier-ignore
-  constructor(
-    private readonly _hosts: Runtime.Services.Signal[]
-  ) {
+  constructor(private readonly _hosts: Runtime.Services.Signal[]) {
     log('Created WebsocketSignalManager', { hosts: this._hosts });
     for (const host of this._hosts) {
       if (this._servers.has(host.server)) {
@@ -51,7 +48,7 @@ export class WebsocketSignalManager implements SignalManager {
       const server = new SignalClient(
         host.server,
         async (message) => this.onMessage.emit(message),
-        async (data) => this.swarmEvent.emit(data)
+        async (data) => this.swarmEvent.emit(data),
       );
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));