@enbox/browser 0.3.77 → 0.3.78

package/dist/esm/dweb-connect-wallet.js

@@ -53,7 +53,9 @@ const DEFAULT_ACK_TIMEOUT_MS = 5000;
  */
 export class WalletPostMessageTransport {
     constructor(params) {
+        this._closed = false;
         this._requestReceived = false;
+        this._requestSettled = false;
         this._dappOrigin = params.dappOrigin;
         this._dappWindow = params.dappWindow;
         this._recipientPrivateKey = params.recipientPrivateKey;
@@ -66,8 +68,7 @@ export class WalletPostMessageTransport {
         this._messageListener = (event) => { this.onMessage(event); };
         window.addEventListener('message', this._messageListener);
         this._timeoutId = setTimeout(() => {
-            this.close();
-            this._rejectRequest(new Error('[@enbox/browser] Timed out waiting for the connect request from the dapp.'));
+            this.settleRequest(new Error('[@enbox/browser] Timed out waiting for the connect request from the dapp.'));
         }, params.timeoutMs);
     }
     /**
@@ -97,12 +98,18 @@ export class WalletPostMessageTransport {
                 recipientPrivateKey,
                 timeoutMs: (_b = options.timeoutMs) !== null && _b !== void 0 ? _b : DEFAULT_REQUEST_TIMEOUT_MS,
             });
-            // The listener is registered, so the beacon cannot race the request.
-            dappWindow.postMessage({
-                type: DWEB_CONNECT_LOADED_MESSAGE_TYPE,
-                walletEpk,
-                walletOrigin: globalThis.location.origin,
-            }, dappOrigin);
+            try {
+                // The listener is registered, so the beacon cannot race the request.
+                dappWindow.postMessage({
+                    type: DWEB_CONNECT_LOADED_MESSAGE_TYPE,
+                    walletEpk,
+                    walletOrigin: globalThis.location.origin,
+                }, dappOrigin);
+            }
+            catch (error) {
+                transport.close();
+                throw error;
+            }
             return transport;
         });
     }
@@ -130,11 +137,13 @@ export class WalletPostMessageTransport {
      * @param idToken - The sealed response JWE, or the literal deny token.
      */
     sendResponse(idToken) {
-        this._dappWindow.postMessage({
-            type: DWEB_CONNECT_RESPONSE_MESSAGE_TYPE,
-            payload: idToken,
-        }, this._dappOrigin);
-        this.close();
+        this.assertOpen();
+        try {
+            this.postResponse(idToken);
+        }
+        finally {
+            this.close();
+        }
     }
     /**
      * Posts the sealed response JWE back to the dapp like
@@ -155,38 +164,59 @@ export class WalletPostMessageTransport {
     sendResponseAwaitingAck(idToken_1) {
         return __awaiter(this, arguments, void 0, function* (idToken, options = {}) {
             var _a;
+            this.assertOpen();
+            if (this._resolveAck !== undefined) {
+                throw new Error('[@enbox/browser] A connect response is already awaiting acknowledgement.');
+            }
             const ackPromise = new Promise((resolve) => {
                 this._resolveAck = resolve;
             });
-            this._dappWindow.postMessage({
-                type: DWEB_CONNECT_RESPONSE_MESSAGE_TYPE,
-                payload: idToken,
-            }, this._dappOrigin);
-            const ackTimeoutId = setTimeout(() => {
-                var _a;
-                (_a = this._resolveAck) === null || _a === void 0 ? void 0 : _a.call(this, false);
-            }, (_a = options.timeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_ACK_TIMEOUT_MS);
-            const acked = yield ackPromise;
-            clearTimeout(ackTimeoutId);
-            this._resolveAck = undefined;
-            this.close();
-            return acked;
+            let ackTimeoutId;
+            try {
+                this.postResponse(idToken);
+                ackTimeoutId = setTimeout(() => {
+                    var _a;
+                    (_a = this._resolveAck) === null || _a === void 0 ? void 0 : _a.call(this, false);
+                }, (_a = options.timeoutMs) !== null && _a !== void 0 ? _a : DEFAULT_ACK_TIMEOUT_MS);
+                return yield ackPromise;
+            }
+            finally {
+                clearTimeout(ackTimeoutId);
+                this.close();
+            }
         });
     }
     /** Posts the deny token back to the dapp — the user rejected the request. */
     deny() {
         this.sendResponse(CONNECT_DENIED_TOKEN);
     }
-    /** Stops listening and releases the session's timers. Idempotent. */
+    /**
+     * Stops listening and releases the session's timers. A request or response
+     * acknowledgement still pending at close is settled immediately. Idempotent.
+     */
     close() {
+        if (this._closed) {
+            return;
+        }
+        this._closed = true;
         clearTimeout(this._timeoutId);
         if (this._messageListener !== undefined) {
             window.removeEventListener('message', this._messageListener);
             this._messageListener = undefined;
         }
+        if (!this._requestSettled) {
+            this._requestSettled = true;
+            this._rejectRequest(new Error('[@enbox/browser] Wallet connect transport closed before receiving a request.'));
+        }
+        const resolveAck = this._resolveAck;
+        this._resolveAck = undefined;
+        resolveAck === null || resolveAck === void 0 ? void 0 : resolveAck(false);
     }
     onMessage(event) {
         var _a;
+        if (this._closed) {
+            return;
+        }
         const message = getTrustedMessage(event, this._dappOrigin, this._dappWindow);
         if (message === undefined) {
             return;
@@ -228,6 +258,10 @@ export class WalletPostMessageTransport {
         });
     }
     settleRequest(outcome) {
+        if (this._requestSettled) {
+            return;
+        }
+        this._requestSettled = true;
         clearTimeout(this._timeoutId);
         if (outcome instanceof Error) {
             this.close();
@@ -236,6 +270,17 @@ export class WalletPostMessageTransport {
         }
         this._resolveRequest(outcome);
     }
+    assertOpen() {
+        if (this._closed) {
+            throw new Error('[@enbox/browser] Wallet connect transport is closed.');
+        }
+    }
+    postResponse(idToken) {
+        this._dappWindow.postMessage({
+            type: DWEB_CONNECT_RESPONSE_MESSAGE_TYPE,
+            payload: idToken,
+        }, this._dappOrigin);
+    }
 }
 /**
  * Resolves the dapp origin to pin: the explicit option when provided,

package/dist/esm/dweb-connect-wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"dweb-connect-wallet.js","sourceRoot":"","sources":["../../src/dweb-connect-wallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dweb-connect-wallet.js","sourceRoot":"","sources":["../../src/dweb-connect-wallet.ts"],"names":[],"mappings":"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"}

package/dist/types/dweb-connect-wallet.d.ts

@@ -58,7 +58,9 @@ export declare class WalletPostMessageTransport {
     private readonly _dappOrigin;
     private readonly _dappWindow;
     private readonly _recipientPrivateKey;
+    private _closed;
     private _requestReceived;
+    private _requestSettled;
     private readonly _timeoutId?;
     private _messageListener?;
     private _resolveAck?;
@@ -114,10 +116,15 @@ export declare class WalletPostMessageTransport {
     }): Promise<boolean>;
     /** Posts the deny token back to the dapp — the user rejected the request. */
     deny(): void;
-    /** Stops listening and releases the session's timers. Idempotent. */
+    /**
+     * Stops listening and releases the session's timers. A request or response
+     * acknowledgement still pending at close is settled immediately. Idempotent.
+     */
     close(): void;
     private onMessage;
     private openRequest;
     private settleRequest;
+    private assertOpen;
+    private postResponse;
 }
 //# sourceMappingURL=dweb-connect-wallet.d.ts.map

package/dist/types/dweb-connect-wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dweb-connect-wallet.d.ts","sourceRoot":"","sources":["../../src/dweb-connect-wallet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAqBrD,iEAAiE;AACjE,MAAM,MAAM,iCAAiC,GAAG;IAC9C;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAM;IAE3C,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAgC;IAC5D,OAAO,CAAC,gBAAgB,CAAC,CAAgC;IACzD,OAAO,CAAC,WAAW,CAAC,CAA2B;IAE/C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAC1D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IACpE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IAExD,OAAO;IAqBP;;;;;;;OAOG;WACiB,MAAM,CAAC,OAAO,GAAE,iCAAsC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAgChH,4EAA4E;IAC5E,IAAW,UAAU,IAAI,MAAM,CAE9B;IAED;;;;;;OAMG;IACU,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC;IAIpD;;;;;;OAMG;IACI,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAQ1C;;;;;;;;;;;;;;;OAeG;IACU,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB7G,6EAA6E;IACtE,IAAI,IAAI,IAAI;IAInB,qEAAqE;IAC9D,KAAK,IAAI,IAAI;IAQpB,OAAO,CAAC,SAAS;YAoBH,WAAW;IAsBzB,OAAO,CAAC,aAAa;CAStB"}
+{"version":3,"file":"dweb-connect-wallet.d.ts","sourceRoot":"","sources":["../../src/dweb-connect-wallet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAqBrD,iEAAiE;AACjE,MAAM,MAAM,iCAAiC,GAAG;IAC9C;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAM;IAE3C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAgC;IAC5D,OAAO,CAAC,gBAAgB,CAAC,CAAgC;IACzD,OAAO,CAAC,WAAW,CAAC,CAA2B;IAE/C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAC1D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IACpE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IAExD,OAAO;IAoBP;;;;;;;OAOG;WACiB,MAAM,CAAC,OAAO,GAAE,iCAAsC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAqChH,4EAA4E;IAC5E,IAAW,UAAU,IAAI,MAAM,CAE9B;IAED;;;;;;OAMG;IACU,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC;IAIpD;;;;;;OAMG;IACI,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAS1C;;;;;;;;;;;;;;;OAeG;IACU,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7G,6EAA6E;IACtE,IAAI,IAAI,IAAI;IAInB;;;OAGG;IACI,KAAK,IAAI,IAAI;IAkBpB,OAAO,CAAC,SAAS;YAqBH,WAAW;IAsBzB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,YAAY;CAMrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enbox/browser",
-  "version": "0.3.77",
+  "version": "0.3.78",
   "description": "Enbox tools and features to use in the browser",
   "type": "module",
   "main": "./dist/esm/index.js",
@@ -66,15 +66,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@enbox/agent": "0.8.46",
-    "@enbox/api": "0.6.85",
-    "@enbox/auth": "0.6.92",
-    "@enbox/common": "0.1.7",
-    "@enbox/connect": "0.1.22",
-    "@enbox/crypto": "0.1.10",
-    "@enbox/dids": "0.1.11",
-    "@enbox/dwn-sdk-js": "0.4.26",
-    "@enbox/protocols": "0.2.112"
+    "@enbox/agent": "0.8.47",
+    "@enbox/api": "0.6.86",
+    "@enbox/auth": "0.6.93",
+    "@enbox/common": "0.1.8",
+    "@enbox/connect": "0.1.23",
+    "@enbox/crypto": "0.1.11",
+    "@enbox/dids": "0.1.12",
+    "@enbox/dwn-sdk-js": "0.4.27",
+    "@enbox/protocols": "0.2.113"
   },
   "devDependencies": {
     "@types/qrcode": "^1.5.6",

package/src/dweb-connect-wallet.ts

@@ -83,7 +83,9 @@ export class WalletPostMessageTransport {
   private readonly _dappWindow: Window;
   private readonly _recipientPrivateKey: Jwk;
 
+  private _closed = false;
   private _requestReceived = false;
+  private _requestSettled = false;
   private readonly _timeoutId?: ReturnType<typeof setTimeout>;
   private _messageListener?: (event: MessageEvent) => void;
   private _resolveAck?: (acked: boolean) => void;
@@ -108,8 +110,7 @@ export class WalletPostMessageTransport {
     window.addEventListener('message', this._messageListener);
 
     this._timeoutId = setTimeout((): void => {
-      this.close();
-      this._rejectRequest(new Error('[@enbox/browser] Timed out waiting for the connect request from the dapp.'));
+      this.settleRequest(new Error('[@enbox/browser] Timed out waiting for the connect request from the dapp.'));
     }, params.timeoutMs);
   }
 
@@ -143,12 +144,17 @@ export class WalletPostMessageTransport {
       timeoutMs: options.timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS,
     });
 
-    // The listener is registered, so the beacon cannot race the request.
-    dappWindow.postMessage({
-      type         : DWEB_CONNECT_LOADED_MESSAGE_TYPE,
-      walletEpk,
-      walletOrigin : globalThis.location.origin,
-    }, dappOrigin);
+    try {
+      // The listener is registered, so the beacon cannot race the request.
+      dappWindow.postMessage({
+        type         : DWEB_CONNECT_LOADED_MESSAGE_TYPE,
+        walletEpk,
+        walletOrigin : globalThis.location.origin,
+      }, dappOrigin);
+    } catch (error) {
+      transport.close();
+      throw error;
+    }
 
     return transport;
   }
@@ -177,11 +183,12 @@ export class WalletPostMessageTransport {
    * @param idToken - The sealed response JWE, or the literal deny token.
    */
   public sendResponse(idToken: string): void {
-    this._dappWindow.postMessage({
-      type    : DWEB_CONNECT_RESPONSE_MESSAGE_TYPE,
-      payload : idToken,
-    }, this._dappOrigin);
-    this.close();
+    this.assertOpen();
+    try {
+      this.postResponse(idToken);
+    } finally {
+      this.close();
+    }
   }
 
   /**
@@ -201,24 +208,28 @@ export class WalletPostMessageTransport {
    * @returns Whether the dapp acknowledged completion within the budget.
    */
   public async sendResponseAwaitingAck(idToken: string, options: { timeoutMs?: number } = {}): Promise<boolean> {
+    this.assertOpen();
+    if (this._resolveAck !== undefined) {
+      throw new Error('[@enbox/browser] A connect response is already awaiting acknowledgement.');
+    }
+
     const ackPromise = new Promise<boolean>((resolve): void => {
       this._resolveAck = resolve;
     });
 
-    this._dappWindow.postMessage({
-      type    : DWEB_CONNECT_RESPONSE_MESSAGE_TYPE,
-      payload : idToken,
-    }, this._dappOrigin);
+    let ackTimeoutId: ReturnType<typeof setTimeout> | undefined;
+    try {
+      this.postResponse(idToken);
 
-    const ackTimeoutId = setTimeout((): void => {
-      this._resolveAck?.(false);
-    }, options.timeoutMs ?? DEFAULT_ACK_TIMEOUT_MS);
+      ackTimeoutId = setTimeout((): void => {
+        this._resolveAck?.(false);
+      }, options.timeoutMs ?? DEFAULT_ACK_TIMEOUT_MS);
 
-    const acked = await ackPromise;
-    clearTimeout(ackTimeoutId);
-    this._resolveAck = undefined;
-    this.close();
-    return acked;
+      return await ackPromise;
+    } finally {
+      clearTimeout(ackTimeoutId);
+      this.close();
+    }
   }
 
   /** Posts the deny token back to the dapp — the user rejected the request. */
@@ -226,16 +237,30 @@ export class WalletPostMessageTransport {
     this.sendResponse(CONNECT_DENIED_TOKEN);
   }
 
-  /** Stops listening and releases the session's timers. Idempotent. */
+  /**
+   * Stops listening and releases the session's timers. A request or response
+   * acknowledgement still pending at close is settled immediately. Idempotent.
+   */
   public close(): void {
+    if (this._closed) { return; }
+    this._closed = true;
     clearTimeout(this._timeoutId);
     if (this._messageListener !== undefined) {
       window.removeEventListener('message', this._messageListener);
       this._messageListener = undefined;
     }
+
+    if (!this._requestSettled) {
+      this._requestSettled = true;
+      this._rejectRequest(new Error('[@enbox/browser] Wallet connect transport closed before receiving a request.'));
+    }
+    const resolveAck = this._resolveAck;
+    this._resolveAck = undefined;
+    resolveAck?.(false);
   }
 
   private onMessage(event: MessageEvent): void {
+    if (this._closed) { return; }
     const message = getTrustedMessage(event, this._dappOrigin, this._dappWindow);
     if (message === undefined) { return; }
 
@@ -278,6 +303,8 @@ export class WalletPostMessageTransport {
   }
 
   private settleRequest(outcome: ConnectRequest | Error): void {
+    if (this._requestSettled) { return; }
+    this._requestSettled = true;
     clearTimeout(this._timeoutId);
     if (outcome instanceof Error) {
       this.close();
@@ -286,6 +313,19 @@ export class WalletPostMessageTransport {
     }
     this._resolveRequest(outcome);
   }
+
+  private assertOpen(): void {
+    if (this._closed) {
+      throw new Error('[@enbox/browser] Wallet connect transport is closed.');
+    }
+  }
+
+  private postResponse(idToken: string): void {
+    this._dappWindow.postMessage({
+      type    : DWEB_CONNECT_RESPONSE_MESSAGE_TYPE,
+      payload : idToken,
+    }, this._dappOrigin);
+  }
 }
 
 /**