@dxos/messaging 0.3.1-main.5e68e9d → 0.3.1-main.b9bb100

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

@@ -2,21 +2,19 @@
 // Copyright 2020 DXOS.org
 //
 
-import { Event, sleep, synchronized } from '@dxos/async';
+import { Event, synchronized } from '@dxos/async';
 import { 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 { RateLimitExceededError, trace } from '@dxos/protocols';
+import { trace } from '@dxos/protocols';
 import { Runtime } from '@dxos/protocols/proto/dxos/config';
 import { SwarmEvent } from '@dxos/protocols/proto/dxos/mesh/signal';
 
 import { SignalManager } from './signal-manager';
 import { CommandTrace, SignalClient, SignalStatus } from '../signal-client';
 
-const MAX_SERVER_FAILURES = 5;
-const WSS_SIGNAL_SERVER_REBOOT_DELAY = 3_000;
 /**
  * Manages connection to multiple Signal Servers over WebSocket
  */
@@ -26,7 +24,6 @@ export class WebsocketSignalManager implements SignalManager {
   private _ctx!: Context;
   private _opened = false;
 
-  readonly failureCount = new Map<string, number>();
   readonly statusChanged = new Event<SignalStatus[]>();
   readonly commandTrace = new Event<CommandTrace>();
   readonly swarmEvent = new Event<{
@@ -56,7 +53,6 @@ export class WebsocketSignalManager implements SignalManager {
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
 
       this._servers.set(host.server, server);
-      this.failureCount.set(host.server, 0);
       server.commandTrace.on((trace) => this.commandTrace.emit(trace));
     }
   }
@@ -77,7 +73,6 @@ export class WebsocketSignalManager implements SignalManager {
     log.trace('dxos.mesh.websocket-signal-manager.open', trace.end({ id: this._instanceId }));
   }
 
-  @synchronized
   async close() {
     if (!this._opened) {
       return;
@@ -89,18 +84,6 @@ export class WebsocketSignalManager implements SignalManager {
     await Promise.all(Array.from(this._servers.values()).map((server) => server.close()));
   }
 
-  async restartServer(serverName: string) {
-    log('Restarting server', { serverName });
-    invariant(this._opened, 'server already closed');
-
-    const server = this._servers.get(serverName);
-    invariant(server, 'server not found');
-
-    await server.close();
-    await sleep(WSS_SIGNAL_SERVER_REBOOT_DELAY);
-    await server.open();
-  }
-
   getStatus(): SignalStatus[] {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
@@ -129,33 +112,14 @@ export class WebsocketSignalManager implements SignalManager {
     recipient: PublicKey;
     payload: Any;
   }): Promise<void> {
-    log(`Signal ${recipient.truncate()}`);
+    log(`Signal ${recipient}`);
     invariant(this._opened, 'Closed');
 
-    void this._forEachServer(async (server, serverName) => {
-      void server.sendMessage({ author, recipient, payload }).catch((err) => {
-        if (err instanceof RateLimitExceededError) {
-          log('WSS rate limit exceeded', { err });
-        } else {
-          log(`error sending to ${serverName}`, { err });
-          void this.checkServerFailure(serverName);
-        }
-      });
+    void this._forEachServer(async (server) => {
+      void server.sendMessage({ author, recipient, payload }).catch((err) => log(err));
     });
   }
 
-  @synchronized
-  async checkServerFailure(serverName: string) {
-    const failureCount = this.failureCount.get(serverName!) ?? 0;
-    if (failureCount > MAX_SERVER_FAILURES) {
-      log.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`);
-      await this.restartServer(serverName!);
-      this.failureCount.set(serverName!, 0);
-      return;
-    }
-    this.failureCount.set(serverName!, (this.failureCount.get(serverName!) ?? 0) + 1);
-  }
-
   async subscribeMessages(peerId: PublicKey) {
     log(`Subscribed for message stream peerId=${peerId}`);
     invariant(this._opened, 'Closed');
@@ -176,9 +140,7 @@ export class WebsocketSignalManager implements SignalManager {
     });
   }
 
-  private async _forEachServer<ReturnType>(
-    fn: (server: SignalClient, serverName: string) => Promise<ReturnType>,
-  ): Promise<ReturnType[]> {
-    return Promise.all(Array.from(this._servers.entries()).map(([serverName, server]) => fn(server, serverName)));
+  private async _forEachServer<ReturnType>(fn: (server: SignalClient) => Promise<ReturnType>): Promise<ReturnType[]> {
+    return Promise.all(Array.from(this._servers.values()).map(fn));
   }
 }