@dynamic-labs-wallet/forward-mpc-client 0.4.0 → 0.5.1

package/dist/index.d.ts

@@ -216,7 +216,7 @@ interface ForwardMPCClientV2Options {
 }
 interface ClientV2Events {
     connected: () => void;
-    disconnected: () => void;
+    disconnected: (closeCode: number) => void;
     error: (error: Error) => void;
 }
 declare class ForwardMPCClientV2 extends EventEmitter$1<ClientV2Events> {
@@ -270,10 +270,11 @@ declare class ForwardMPCClientV2 extends EventEmitter$1<ClientV2Events> {
     private onTransportDisconnected;
 }
 
+/**
+ * @deprecated Use {@link ForwardMPCClientV2} directly and manage the instance
+ * lifecycle yourself. This class will be removed in a future version.
+ */
 declare class ForwardMPCClientSingleton extends ForwardMPCClientV2 {
-    private static _instance;
-    constructor(url: string, options?: ForwardMPCClientV2Options);
-    disconnect(): void;
 }
 
 declare const ErrorCode: {

package/dist/index.js

@@ -1,6 +1,6 @@
 import EventEmitter2, { EventEmitter } from 'eventemitter3';
 import * as ws from 'ws';
-import { messageRegistry, generateMlKem768Keypair, HandshakeV1RequestMessage, decapsulateMlKem768, encryptKeyshare, SignMessageV1RequestMessage, encryptKeygenInit, KeygenV1RequestMessage, decryptKeygenResult, ReceiveKeyV1RequestMessage, fromDynamicSigningAlgorithm } from '@dynamic-labs-wallet/forward-mpc-shared';
+import { messageRegistry, generateMlKem768Keypair, HandshakeV1RequestMessage, decapsulateMlKem768, encryptKeyshare, SignMessageV1RequestMessage, encryptKeygenInit, KeygenV1RequestMessage, decryptKeygenResult, ReceiveKeyV1RequestMessage, WebSocketCloseCode, fromDynamicSigningAlgorithm } from '@dynamic-labs-wallet/forward-mpc-shared';
 import init, { PCRs, validateAttestationDocPcrs, getUserData, getNonce } from '@evervault/wasm-attestation-bindings';
 import { sha256 } from '@noble/hashes/sha2.js';
 import { randomBytes, hexToBytes } from '@noble/hashes/utils.js';
@@ -563,8 +563,6 @@ var ForwardMPCClient = class extends EventEmitter {
     }
   }
 };
-
-// src/client-v2/errors.ts
 var ErrorCode = {
   // Transport
   CONNECTION_FAILED: "CONNECTION_FAILED",
@@ -805,7 +803,7 @@ var ForwardMPCTransport = class extends EventEmitter2 {
       this.ws = null;
     }
     this._isConnected = false;
-    this.emit("disconnected");
+    this.emit("disconnected", WebSocketCloseCode.NORMAL);
   }
   send(data) {
     if (!this._isConnected || !this.ws) {
@@ -863,23 +861,35 @@ var ForwardMPCTransport = class extends EventEmitter2 {
         });
         this.emit("message", event.data);
       };
-      this.ws.onclose = () => {
+      this.ws.onclose = (event) => {
         this._isConnected = false;
+        this.logger?.warn("WebSocket closed", {
+          url: this.url,
+          closeCode: event.code
+        });
         if (!this._destroyed) {
-          this.emit("disconnected");
+          this.emit("disconnected", event.code);
         }
-        this.maybeReconnect();
+        this.maybeReconnect(event.code);
       };
     });
   }
   /**
   * Attempts mid-session reconnects after a drop, up to `reconnectAttempts`
-  * times. Only fires when a successful connection was previously established.
+  * times. Only fires when a successful connection was previously established
+  * and the close was unexpected (not a normal or idle-timeout close).
   */
-  maybeReconnect() {
+  maybeReconnect(closeCode) {
     if (this._destroyed) return;
     if (!this._hadSuccessfulConnection) return;
     if (this._midSessionReconnectCount >= this.options.reconnectAttempts) return;
+    if (closeCode === WebSocketCloseCode.NORMAL || closeCode === WebSocketCloseCode.IDLE_TIMEOUT) {
+      this.logger?.info("WebSocket closed gracefully \u2014 not reconnecting", {
+        url: this.url,
+        closeCode
+      });
+      return;
+    }
     this._midSessionReconnectCount++;
     this.logger?.warn("WebSocket disconnected \u2014 attempting reconnect", {
       url: this.url,
@@ -1169,7 +1179,7 @@ var ForwardMPCClientV2 = class extends EventEmitter2 {
       requestTimeout: options.requestTimeout
     };
     this.transport.on("connected", () => this.onTransportConnected());
-    this.transport.on("disconnected", () => this.onTransportDisconnected());
+    this.transport.on("disconnected", (closeCode) => this.onTransportDisconnected(closeCode));
     this.transport.on("error", (error) => this.emit("error", error));
   }
   get connected() {
@@ -1328,7 +1338,7 @@ var ForwardMPCClientV2 = class extends EventEmitter2 {
     }, "doHandshake");
     this._connectPromise = doHandshake();
   }
-  onTransportDisconnected() {
+  onTransportDisconnected(closeCode) {
     const intentional = this._disconnectedIntentionally;
     this._disconnectedIntentionally = false;
     this.session?.dispose();
@@ -1336,54 +1346,15 @@ var ForwardMPCClientV2 = class extends EventEmitter2 {
     if (!intentional) {
       this.logger.warn("Unexpected WebSocket disconnect");
     }
-    this.emit("disconnected");
+    this.emit("disconnected", closeCode);
   }
 };
 
-// src/client-v2/utils.ts
-function deepEqual(obj1, obj2) {
-  if (obj1 === obj2) return true;
-  if (typeof obj1 !== "object" || obj1 === null || typeof obj2 !== "object" || obj2 === null) {
-    return false;
-  }
-  const keys1 = Object.keys(obj1);
-  const keys2 = Object.keys(obj2);
-  if (keys1.length !== keys2.length) return false;
-  for (const key of keys1) {
-    if (!keys2.includes(key) || !deepEqual(obj1[key], obj2[key])) {
-      return false;
-    }
-  }
-  return true;
-}
-__name(deepEqual, "deepEqual");
-
 // src/client-v2/singleton.ts
-var ForwardMPCClientSingleton = class _ForwardMPCClientSingleton extends ForwardMPCClientV2 {
+var ForwardMPCClientSingleton = class extends ForwardMPCClientV2 {
   static {
     __name(this, "ForwardMPCClientSingleton");
   }
-  static _instance = null;
-  constructor(url, options) {
-    const existing = _ForwardMPCClientSingleton._instance;
-    if (existing !== null) {
-      if (existing.url !== url) {
-        throw new Error(`ForwardMPCClientSingleton already exists for "${existing.url}". Call disconnect() first to create a new instance.`);
-      }
-      if (!deepEqual(options, existing.options)) {
-        throw new Error(`ForwardMPCClientSingleton already exists for the same URL but with different options.Call disconnect() first to create a new instance.`);
-      }
-      return existing;
-    }
-    super(url, options);
-    _ForwardMPCClientSingleton._instance = this;
-  }
-  disconnect() {
-    super.disconnect();
-    if (_ForwardMPCClientSingleton._instance === this) {
-      _ForwardMPCClientSingleton._instance = null;
-    }
-  }
 };
 
 export { ClientError, ClientSessionEstablishFailedError, ClientUnsupportedAlgorithmError, ErrorCode, ForwardMPCClient, ForwardMPCClientSingleton, ForwardMPCClientV2, ForwardMPCError, ForwardMPCErrorType, NitroAttestationVerifier, SessionAttestationError, SessionAttestationNonceMissingError, SessionDisposedError, SessionError, SessionHandshakeError, SessionHandshakeInvalidResponseError, SessionMessageParseError, SessionRemoteError, SessionRequestTimeoutError, SessionServerError, TransportConnectionError, TransportConnectionTimeoutError, TransportError, TransportNotConnectedError };