add a typed chainId field to the WalletAdapter interface (#249)

Author: LawalRahman

src/adapters/types.ts

@@ -43,4 +43,5 @@ export interface WalletAdapter {
    * Disconnects the wallet session if applicable.
    */
   disconnect?(): Promise<void>;
+  chainId?: string;
 }

src/adapters/walletconnect.ts

@@ -31,7 +31,7 @@ export interface WalletConnectAdapterOptions {
    * Must be one of: 'stellar:pubnet', 'stellar:testnet', 'stellar:local'.
    * Defaults to 'stellar:pubnet'.
    */
-  chainId?: string;
+  chainId?: string | undefined;
   /** DApp metadata for WalletConnect modal/handshake */
   metadata?: WalletConnectAppMetadata;
   /** Optional pre-existing WalletConnect SignClient or provider instance */
@@ -60,7 +60,7 @@ const SUPPORTED_CAIP2_CHAINS: Readonly<Record<string, string>> = {
  */
 export class WalletConnectAdapter implements WalletAdapter {
   private readonly projectId?: string | undefined;
-  private readonly chainId: string;
+  public readonly chainId: string;
   private readonly metadata?: WalletConnectAppMetadata | undefined;
   private client: WalletConnectSignClient | null;
   private session: WalletConnectSession | null;

src/client.ts

@@ -36,7 +36,7 @@ function assertWalletNetworkMatch(
   wallet: WalletAdapter,
   expectedNetwork: string,
 ): void {
-  const raw = (wallet as unknown as { chainId?: unknown }).chainId;
+  const raw = wallet.chainId;
   if (raw === undefined || raw === null) return;
 
   const caip2 = String(raw);

src/relayer/WebSocketRelayer.ts

@@ -93,6 +93,16 @@ export class WebSocketRelayer {
     if (this.isDestroyed) {
       throw new Error('WebSocketRelayer has been destroyed');
     }
+    return this.connectPromise ?? (this.connectPromise = (async () => {
+      try {
+        await this.acquireLock();
+        if (this.ws && this.ws.readyState === 1) return;
+        await this.establishConnection();
+      } finally {
+        this.connectPromise = null;
+        this.releaseLock();
+      }
+    })());
     this.reconnectEnabled = true;
     if (this.connectPromise) {
       return this.connectPromise;
@@ -132,17 +142,18 @@ export class WebSocketRelayer {
 
     return new Promise((resolve, reject) => {
       try {
-        let ws: WebSocket;
+        let wsInstance: any;
         try {
-          ws = new WebSocketCtor(this.url);
+          wsInstance = new (WebSocketCtor as any)(this.url);
         } catch {
-          ws = (WebSocketCtor as unknown as (url: string) => WebSocket)(this.url);
+          // Fallback for mocks that are plain functions.
+          wsInstance = (WebSocketCtor as any)(this.url);
         }
+        const ws = wsInstance;
         if (!ws) {
           resolve();
           return;
         }
-
         let settled = false;
 
         ws.onopen = () => {
@@ -164,6 +175,7 @@ export class WebSocketRelayer {
             settled = true;
             reject(new Error(`WebSocket connection closed before opening: ${this.url}`));
           }
+          if (!settled && !this.isDestroyed) {
           this.emitStateChange('disconnected');
           if (!this.isDestroyed && this.reconnectEnabled) {
             this.attemptReconnect();