dappress 0.5.1 → 0.6.0

package/CHANGELOG.md

@@ -4,6 +4,13 @@ What changes for the users of Dappress, version by version. The format follows [
 
 ## [Unreleased]
 
+## [0.6.0] - 2026-10-05
+
+### Fixed
+
+- The peer dependency on Cypress asks for 15.10 or later, the first version with `Cypress.expose()`, which the commands read their options with. Earlier versions were accepted at install, then failed as soon as the support file loaded.
+- A command sent right after another was answered in the popup no longer fails on "Timed out waiting for confirm-footer-button". The popup closes a moment after its button goes, and the next command could find it, still listed on the request just answered, then lose it. A decision now waits for the popup to close, and a confirmation that closes before it is acted on is looked for again.
+
 ## [0.5.1] - 2026-10-05
 
 ### Changed
@@ -85,7 +92,8 @@ What changes for the users of Dappress, version by version. The format follows [
 - The wallet setup file, `cypress/wallet.setup.ts`, and the opt-in profile cache.
 - TypeScript declarations.
 
-[Unreleased]: https://github.com/blassaut/dappress/compare/v0.5.1...HEAD
+[Unreleased]: https://github.com/blassaut/dappress/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/blassaut/dappress/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/blassaut/dappress/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/blassaut/dappress/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/blassaut/dappress/compare/v0.3.3...v0.4.0

package/dist/actions.js

@@ -86,16 +86,27 @@ function createTasks(options) {
             await metamask.leaveUnlockForm(page, options);
         return state;
     }
-    /** Approve the prompt a network change raised: "Add network" or the permission to switch. */
-    async function approveNetworkChange(browser) {
-        const page = await (0, metamask_pages_1.getConfirmationPage)(browser, await metamaskId(browser), options.timeout);
-        await metamask.approveNetworkChange(page, options.timeout);
+    /**
+     * Find the confirmation and act on it. One that closes before it is acted
+     * on was the popup of the request before, found as it closed: the request's
+     * own is looked for once more.
+     */
+    async function onConfirmation(browser, act) {
+        for (let attempt = 0;; attempt++) {
+            const page = await (0, metamask_pages_1.getConfirmationPage)(browser, await metamaskId(browser), options.timeout);
+            try {
+                return await act(page);
+            }
+            catch (error) {
+                if (attempt > 0 || !(error instanceof metamask.ConfirmationClosed))
+                    throw error;
+            }
+        }
     }
+    /** Approve the prompt a network change raised: "Add network" or the permission to switch. */
+    const approveNetworkChange = (browser) => onConfirmation(browser, (page) => metamask.approveNetworkChange(page, options.timeout));
     /** The task for a decision: find the confirmation, press its button. */
-    const decide = (decision) => async (browser, argument) => {
-        const page = await (0, metamask_pages_1.getConfirmationPage)(browser, await metamaskId(browser), options.timeout);
-        await metamask.decide(decision, page, options.timeout, argument);
-    };
+    const decide = (decision) => (browser, argument) => onConfirmation(browser, (page) => metamask.decide(decision, page, options.timeout, argument));
     const actions = {
         setupWallet,
         approveNetworkChange,

package/dist/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 // Connects Puppeteer to the browser Cypress launched, through the debugging
-// URL Cypress hands out in after:browser:launch (Cypress 13.6+).
+// URL Cypress hands out in after:browser:launch (Cypress 15.10+).
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,7 +20,7 @@ function captureDebuggerUrl(on) {
  */
 async function withBrowser(action) {
     if (!debuggerUrl) {
-        throw new Error('[dappress] No browser to connect to. Is configureDappress() called in setupNodeEvents, with Cypress 13.6 or later?');
+        throw new Error('[dappress] No browser to connect to. Is configureDappress() called in setupNodeEvents, with Cypress 15.10 or later?');
     }
     const browser = await puppeteer_core_1.default.connect({ browserWSEndpoint: debuggerUrl, defaultViewport: null });
     try {

package/dist/metamask-pages.d.ts

@@ -12,6 +12,16 @@ export declare function getRequestPages(browser: Browser, extensionId: string):
  * The page a dapp request is shown on. Waits for the popup to open, or takes
  * the side panel. A popup still on its home route is one closing after the
  * previous request, or one that hasn't routed to the request yet: skipped.
+ * The route is read from the page, which follows a change of hash at once,
+ * where the target can still name the request just answered.
  */
 export declare function getConfirmationPage(browser: Browser, extensionId: string, timeout: number): Promise<Page>;
+/**
+ * Once the request shown on a popup is answered, wait for the popup to close,
+ * at most `timeout` ms. MetaMask closes it a moment after its button goes, and
+ * left to close on its own, the next command could find it, still listed on
+ * `request`, and act on a page that vanishes under it. A popup that goes on
+ * to another request instead is left to it; so is the side panel, which stays.
+ */
+export declare function waitForDismissal(page: Page, request: string, timeout: number): Promise<void>;
 export declare function withUsableWindow(page: Page): Promise<Page>;

package/dist/metamask-pages.js

@@ -7,6 +7,7 @@ exports.findExtensionId = findExtensionId;
 exports.getHomePage = getHomePage;
 exports.getRequestPages = getRequestPages;
 exports.getConfirmationPage = getConfirmationPage;
+exports.waitForDismissal = waitForDismissal;
 exports.withUsableWindow = withUsableWindow;
 const page_helpers_1 = require("./page-helpers");
 const HOME_PATH = '/home.html';
@@ -97,14 +98,20 @@ async function getRequestPages(browser, extensionId) {
  * The page a dapp request is shown on. Waits for the popup to open, or takes
  * the side panel. A popup still on its home route is one closing after the
  * previous request, or one that hasn't routed to the request yet: skipped.
+ * The route is read from the page, which follows a change of hash at once,
+ * where the target can still name the request just answered.
  */
 async function getConfirmationPage(browser, extensionId, timeout) {
     const deadline = Date.now() + timeout;
     while (Date.now() < deadline) {
         for (const pathname of CONFIRMATION_PATHS) {
-            const [target] = pagesOf(browser, extensionId, pathname).filter((candidate) => !isHomeRoute(candidate.url()));
-            if (target)
-                return pathname === '/notification.html' ? withUsableWindow(await pageOf(target)) : pageOf(target);
+            for (const target of pagesOf(browser, extensionId, pathname)) {
+                // A target closing while its page is taken has none: not a confirmation either
+                const page = await target.page().catch(() => null);
+                if (!page || page.isClosed() || isHomeRoute(page.url()))
+                    continue;
+                return pathname === '/notification.html' ? withUsableWindow(page) : page;
+            }
         }
         await (0, page_helpers_1.sleep)(250);
     }
@@ -115,6 +122,26 @@ async function getConfirmationPage(browser, extensionId, timeout) {
         .join(', ');
     throw new Error(`[dappress] MetaMask showed no confirmation within ${timeout}ms. Did the dapp send a request? MetaMask pages seen: ${seen || 'none'}`);
 }
+/**
+ * Once the request shown on a popup is answered, wait for the popup to close,
+ * at most `timeout` ms. MetaMask closes it a moment after its button goes, and
+ * left to close on its own, the next command could find it, still listed on
+ * `request`, and act on a page that vanishes under it. A popup that goes on
+ * to another request instead is left to it; so is the side panel, which stays.
+ */
+async function waitForDismissal(page, request, timeout) {
+    if (!request.includes('/notification.html'))
+        return;
+    const deadline = Date.now() + timeout;
+    while (Date.now() < deadline) {
+        if (page.isClosed())
+            return;
+        const url = page.url();
+        if (url !== request && !isHomeRoute(url))
+            return;
+        await (0, page_helpers_1.sleep)(100);
+    }
+}
 // MetaMask asks Chrome for a 400x620 popup. Under Xvfb on a GitHub runner the
 // window it gets is 1x1: nothing is laid out, the pane of a confirmation that
 // must be read to the end has no height, so it can never be scrolled there and

package/dist/metamask.d.ts

@@ -48,6 +48,13 @@ export declare function disconnectSite(page: Page, origin: string): Promise<void
 type CommandOptions = ConnectOptions & TransactionOptions;
 /** Press the button of `decision` on the confirmation shown on `page`, once it is set as `options` ask. */
 export declare function decide(decision: Decision, page: Page, timeout: number, options?: CommandOptions): Promise<void>;
+/**
+ * Thrown when the confirmation page closed before its button was pressed: it
+ * was the popup of the request before, found as it closed. The request's own
+ * popup is there to be looked for.
+ */
+export declare class ConfirmationClosed extends Error {
+}
 /** wallet_addEthereumChain on a network MetaMask knows behaves like a switch: either prompt may show. */
 export declare function approveNetworkChange(page: Page, timeout: number): Promise<void>;
 export {};

package/dist/metamask.js

@@ -7,7 +7,7 @@
 // first, then a fallback on the button's English text. When a MetaMask release
 // moves something, this is the file to fix.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decisions = void 0;
+exports.ConfirmationClosed = exports.decisions = void 0;
 exports.walletState = walletState;
 exports.onboard = onboard;
 exports.unlock = unlock;
@@ -20,6 +20,7 @@ exports.disconnectSite = disconnectSite;
 exports.decide = decide;
 exports.approveNetworkChange = approveNetworkChange;
 const page_helpers_1 = require("./page-helpers");
+const metamask_pages_1 = require("./metamask-pages");
 const testId = (id) => `[data-testid="${id}"]`;
 // XPath rather than Puppeteer's ::-p-text(): the latter needs MutationObserver,
 // which MetaMask's sandbox (LavaMoat) blocks in its pages.
@@ -553,11 +554,30 @@ async function decide(decision, page, timeout, options) {
         const adjust = adjustments[decision];
         if (!adjust)
             throw new Error(`[dappress] ${decision} takes no options`);
-        await (0, page_helpers_1.waitFor)(page, exports.decisions[decision], { timeout });
+        await waitForButton(page, exports.decisions[decision], timeout);
         await adjust(page, options, timeout);
     }
     return pressAndWaitForDismissal(page, exports.decisions[decision], timeout);
 }
+/**
+ * Thrown when the confirmation page closed before its button was pressed: it
+ * was the popup of the request before, found as it closed. The request's own
+ * popup is there to be looked for.
+ */
+class ConfirmationClosed extends Error {
+}
+exports.ConfirmationClosed = ConfirmationClosed;
+// The button of a confirmation, or ConfirmationClosed if the page went meanwhile
+async function waitForButton(page, button, timeout) {
+    try {
+        await (0, page_helpers_1.waitFor)(page, button, { timeout });
+    }
+    catch (error) {
+        if (page.isClosed())
+            throw new ConfirmationClosed(`[dappress] The confirmation closed before "${(0, page_helpers_1.describe)(button)}" was pressed`);
+        throw error;
+    }
+}
 /** wallet_addEthereumChain on a network MetaMask knows behaves like a switch: either prompt may show. */
 function approveNetworkChange(page, timeout) {
     return pressAndWaitForDismissal(page, [...selectors.confirmation.confirm, ...selectors.pageContainer.confirm], timeout);
@@ -741,7 +761,7 @@ async function textOf(page, selector) {
  * what MetaMask logged.
  */
 async function pressAndWaitForDismissal(page, button, timeout) {
-    await (0, page_helpers_1.waitFor)(page, button, { timeout });
+    await waitForButton(page, button, timeout);
     await dismissModal(page);
     const logged = recordErrors(page);
     const request = page.url();
@@ -751,7 +771,7 @@ async function pressAndWaitForDismissal(page, button, timeout) {
             if (await (0, page_helpers_1.isVisible)(page, selectors.alert.acknowledge, 500))
                 await (0, page_helpers_1.click)(page, selectors.alert.acknowledge);
             if (await (0, page_helpers_1.isGone)(page, button, 3000))
-                return;
+                return (0, metamask_pages_1.waitForDismissal)(page, request, 3000);
             await dismissModal(page);
             await (0, page_helpers_1.dispatchClick)(page, button, { timeout: 3000 }).catch(() => { });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dappress",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "MetaMask automation for Cypress: load the real extension, import a test wallet, answer dapp requests with cy.* commands. Tracks the latest MetaMask release.",
   "license": "MIT",
   "author": "Benjamin Lassaut",
@@ -61,7 +61,7 @@
     "format:check": "prettier --check ."
   },
   "peerDependencies": {
-    "cypress": ">=13.6.0"
+    "cypress": ">=15.10.0"
   },
   "dependencies": {
     "@scure/bip39": "^1.6.0",