@asseteragmbh/wallet-connector 0.2.4 → 0.2.6

package/dist/index.cjs

@@ -10,6 +10,7 @@ function isSignInHint(value) {
   return SIGN_IN_HINTS.includes(value);
 }
 var MESSAGE_PREFIX = "assetera-wallet:";
+var HOLD_MAX_MS = 3e5;
 var SUPPORTED_METHODS = [
   "eth_requestAccounts",
   "eth_accounts",
@@ -95,6 +96,9 @@ function isRequestMessage(value) {
 function isDisconnectMessage(value) {
   return hasType(value, "disconnect");
 }
+function isHoldMessage(value) {
+  return hasType(value, "hold") && typeof value.hold === "boolean";
+}
 var EVM_ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
 function isOnboardedMessage(value) {
   return hasType(value, "onboarded") && typeof value.address === "string" && EVM_ADDRESS_RE.test(value.address) && typeof value.chain === "string" && // `created` is new; an older wallet sent `status` instead and always created or reused a wallet.
@@ -106,11 +110,12 @@ function isOnboardCancelledMessage(value) {
 function isCaip2EvmChain(value) {
   return /^eip155:\d{1,32}$/.test(value);
 }
-function connectUrl(walletUrl, partnerOrigin, signIn) {
+function connectUrl(walletUrl, partnerOrigin, signIn, chainId) {
   const url = new URL(CONNECT_PATH, walletUrl);
   url.searchParams.set("origin", partnerOrigin);
   url.searchParams.set("v", String(PROTOCOL_VERSION));
   if (signIn !== void 0) url.searchParams.set("signIn", signIn);
+  if (chainId !== void 0) url.searchParams.set("chainId", chainId);
   return url.toString();
 }
 function onboardUrl(walletUrl, partnerOrigin, options) {
@@ -180,6 +185,9 @@ function createAsseteraWalletProvider(options) {
   const listeners = /* @__PURE__ */ new Map();
   let closeTimer = null;
   let requestsSent = 0;
+  let popupReady = false;
+  const holds = /* @__PURE__ */ new Set();
+  const preparedHolds = /* @__PURE__ */ new Map();
   function currentChainId() {
     return chainIdHex ?? toHexChainId(defaultChainId);
   }
@@ -214,6 +222,34 @@ function createAsseteraWalletProvider(options) {
   function removeEventListener(event, listener) {
     listeners.get(event)?.delete(listener);
   }
+  function postHold(hold) {
+    const active = popup;
+    if (!active || active.closed || !popupReady) return;
+    const message = {
+      type: `${MESSAGE_PREFIX}hold`,
+      v: PROTOCOL_VERSION,
+      hold
+    };
+    active.postMessage(message, walletOrigin);
+  }
+  function addHold(token) {
+    const wasEmpty = holds.size === 0;
+    holds.add(token);
+    if (wasEmpty) postHold(true);
+  }
+  function removeHold(token) {
+    if (!holds.delete(token)) return false;
+    return holds.size === 0;
+  }
+  function endPreparedHolds(sequence) {
+    let emptied = false;
+    for (const [token, registeredAt] of preparedHolds) {
+      if (registeredAt >= sequence) continue;
+      preparedHolds.delete(token);
+      if (removeHold(token)) emptied = true;
+    }
+    if (emptied) postHold(false);
+  }
   function stopClosePolling() {
     if (closeTimer !== null) {
       clearInterval(closeTimer);
@@ -227,7 +263,10 @@ function createAsseteraWalletProvider(options) {
     }, CLOSE_POLL_MS);
   }
   function rejectAllPending(error) {
-    for (const request2 of pending.values()) request2.reject(error);
+    for (const request2 of pending.values()) {
+      request2.reject(error);
+      endPreparedHolds(request2.sequence);
+    }
     pending.clear();
   }
   function handlePopupClosed() {
@@ -235,6 +274,7 @@ function createAsseteraWalletProvider(options) {
     stopClosePolling();
     const closedPopup = popup;
     popup = null;
+    popupReady = false;
     const closedReady = ready;
     ready = createDeferred();
     const error = disconnectedError();
@@ -251,18 +291,19 @@ function createAsseteraWalletProvider(options) {
     }
     if (typeof window === "undefined") return null;
     const opened = window.open(
-      connectUrl(options.walletUrl, window.location.origin, options.signIn),
+      connectUrl(options.walletUrl, window.location.origin, options.signIn, currentChainId()),
       POPUP_NAME,
       popupFeatures
     );
     if (!opened) return null;
     popup = opened;
+    popupReady = false;
     ready = createDeferred();
     walletDisconnected = false;
     startClosePolling();
     return opened;
   }
-  function sendRequest(method, params) {
+  function sendRequest(method, params, sequence) {
     const active = popup;
     if (!active || active.closed) return Promise.reject(disconnectedError());
     const id = crypto.randomUUID();
@@ -274,7 +315,7 @@ function createAsseteraWalletProvider(options) {
       ...params === void 0 ? {} : { params }
     };
     return new Promise((resolve, reject) => {
-      pending.set(id, { resolve, reject });
+      pending.set(id, { resolve, reject, sequence });
       active.postMessage(message, walletOrigin);
     });
   }
@@ -282,6 +323,7 @@ function createAsseteraWalletProvider(options) {
     const request2 = pending.get(message.id);
     if (!request2) return;
     pending.delete(message.id);
+    endPreparedHolds(request2.sequence);
     if ("error" in message) {
       request2.reject(new ProviderRpcError(message.error.code, message.error.message, message.error.data));
     } else {
@@ -322,6 +364,8 @@ function createAsseteraWalletProvider(options) {
     if (popup === null || event.source !== popup) return;
     const data = event.data;
     if (isReadyMessage(data)) {
+      popupReady = true;
+      if (holds.size > 0) postHold(true);
       ready.resolve(void 0);
       return;
     }
@@ -361,9 +405,10 @@ function createAsseteraWalletProvider(options) {
     if (method === "eth_chainId") return Promise.resolve(currentChainId());
     if (method === "eth_requestAccounts") {
       requestsSent += 1;
+      const sequence2 = requestsSent;
       const active2 = openPopup();
       if (!active2) return Promise.reject(blockedError());
-      return ready.promise.then(() => sendRequest("eth_requestAccounts", params)).then((result) => {
+      return ready.promise.then(() => sendRequest("eth_requestAccounts", params, sequence2)).then((result) => {
         accounts = Array.isArray(result) ? result : [];
         emit("accountsChanged", [...accounts]);
         emit("connect", { chainId: currentChainId() });
@@ -379,10 +424,11 @@ function createAsseteraWalletProvider(options) {
       );
     }
     requestsSent += 1;
+    const sequence = requestsSent;
     const active = openPopup();
     if (!active) return Promise.reject(blockedError());
     if (SIGNING_METHODS.has(method)) active.focus();
-    return ready.promise.then(() => sendRequest(method, params));
+    return ready.promise.then(() => sendRequest(method, params, sequence));
   }
   function disconnect() {
     const active = popup;
@@ -396,6 +442,9 @@ function createAsseteraWalletProvider(options) {
     }
     stopClosePolling();
     popup = null;
+    popupReady = false;
+    holds.clear();
+    preparedHolds.clear();
     const closedReady = ready;
     ready = createDeferred();
     closedReady.reject(disconnectedError("Disconnected from the Assetera Wallet."));
@@ -411,16 +460,49 @@ function createAsseteraWalletProvider(options) {
     if (!active) return { opened: false, release: () => {
     } };
     const sentAtPrepare = requestsSent;
+    const token = /* @__PURE__ */ Symbol("assetera-wallet-prepare");
+    preparedHolds.set(token, sentAtPrepare);
+    addHold(token);
     let released = false;
     return {
       opened: true,
       release() {
         if (released) return;
         released = true;
-        if (existed || popup !== active || active.closed) return;
-        if (requestsSent !== sentAtPrepare || pending.size > 0) return;
-        active.close();
-        handlePopupClosed();
+        preparedHolds.delete(token);
+        const emptied = removeHold(token);
+        const canClose = emptied && !existed && popup === active && !active.closed && requestsSent === sentAtPrepare && pending.size === 0;
+        if (canClose) {
+          active.close();
+          handlePopupClosed();
+          return;
+        }
+        if (emptied) postHold(false);
+      }
+    };
+  }
+  function holdPopup() {
+    const existed = popup !== null && !popup.closed;
+    const active = typeof window === "undefined" ? null : openPopup();
+    if (!active) return { opened: false, release: () => {
+    } };
+    const token = /* @__PURE__ */ Symbol("assetera-wallet-hold");
+    const sentAtHold = requestsSent;
+    addHold(token);
+    let released = false;
+    return {
+      opened: true,
+      release() {
+        if (released) return;
+        released = true;
+        const emptied = removeHold(token);
+        const canClose = emptied && !existed && popup === active && !active.closed && requestsSent === sentAtHold && pending.size === 0;
+        if (canClose) {
+          active.close();
+          handlePopupClosed();
+          return;
+        }
+        if (emptied) postHold(false);
       }
     };
   }
@@ -443,7 +525,8 @@ function createAsseteraWalletProvider(options) {
     disconnect,
     lastSecurityStatus,
     lastAccountNames,
-    prepareSigning
+    prepareSigning,
+    holdPopup
   };
 }
 
@@ -896,6 +979,7 @@ function openAsseteraWalletManager(options) {
 }
 
 exports.CONNECT_PATH = CONNECT_PATH;
+exports.HOLD_MAX_MS = HOLD_MAX_MS;
 exports.MANAGE_PATH = MANAGE_PATH;
 exports.MESSAGE_PREFIX = MESSAGE_PREFIX;
 exports.ManagerError = ManagerError;
@@ -912,6 +996,7 @@ exports.isAccountsMessage = isAccountsMessage;
 exports.isCaip2EvmChain = isCaip2EvmChain;
 exports.isDisconnectMessage = isDisconnectMessage;
 exports.isEventMessage = isEventMessage;
+exports.isHoldMessage = isHoldMessage;
 exports.isOnboardCancelledMessage = isOnboardCancelledMessage;
 exports.isOnboardedMessage = isOnboardedMessage;
 exports.isReadyMessage = isReadyMessage;