w3wallets 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/index.d.mts

@@ -134,10 +134,6 @@ declare class Metamask extends Wallet {
      */
     lock(): Promise<void>;
     /**
-     * Unlock MetaMask with password.
-     * After unlocking, stabilizes the wallet UI by handling post-unlock
-     * screens (metametrics, onboarding completion) and dismissing queued
-     * notifications. Ends on home.html with the wallet UI ready.
      * Unlock MetaMask with password.
      * After unlocking, stabilizes the wallet UI by handling post-unlock
      * screens (metametrics, onboarding completion) and dismissing queued

package/dist/index.d.ts

@@ -134,10 +134,6 @@ declare class Metamask extends Wallet {
      */
     lock(): Promise<void>;
     /**
-     * Unlock MetaMask with password.
-     * After unlocking, stabilizes the wallet UI by handling post-unlock
-     * screens (metametrics, onboarding completion) and dismissing queued
-     * notifications. Ends on home.html with the wallet UI ready.
      * Unlock MetaMask with password.
      * After unlocking, stabilizes the wallet UI by handling post-unlock
      * screens (metametrics, onboarding completion) and dismissing queued

package/dist/index.js

@@ -98,12 +98,14 @@ var ARIA_CLOSE_TIMEOUT = 500;
 var POPUP_HIDDEN_TIMEOUT = 3e3;
 var POST_UNLOCK_TIMEOUT = 3e4;
 var NOTIFICATION_CHECK_TIMEOUT = 5e3;
-var CONFIRMATION_ROUTE_TIMEOUT = 15e3;
 var POST_CLICK_TIMEOUT = 1e4;
 var BUTTON_OR_POPUP_TIMEOUT = 3e4;
 var LAST_RESORT_CLICK_TIMEOUT = 1e4;
 var LOCK_SCREEN_TIMEOUT = 3e4;
 var MENU_BUTTON_TIMEOUT = 3e4;
+var ONBOARD_VISIBLE_TIMEOUT = 3e4;
+var ROUTE_RETRY_TIMEOUT = 5e3;
+var MAX_ROUTE_ATTEMPTS = 5;
 var MNEMONIC_KEY_DELAY = 5;
 var MNEMONIC_WORD_DELAY = 100;
 
@@ -176,7 +178,7 @@ function withWallets(test, ...wallets) {
   });
   const extensionPaths = extensionInfo.map((e) => e.path);
   const fixtures = {
-    context: async (_, use, testInfo) => {
+    context: async ({}, use, testInfo) => {
       const userDataDir = import_path3.default.join(
         process.cwd(),
         W3WALLETS_DIR,
@@ -293,7 +295,6 @@ async function findCachedExtension(context, ExtensionClass, expectedExtensionId,
   const page = await context.newPage();
   if (homeUrl) {
     await page.goto(`chrome-extension://${expectedExtensionId}/${homeUrl}`);
-    await page.goto(`chrome-extension://${expectedExtensionId}/${homeUrl}`);
   }
   const extension = new ExtensionClass(page, expectedExtensionId);
   return extension;
@@ -360,7 +361,7 @@ var Metamask = class extends Wallet {
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     await (0, import_test3.expect)(
       this.page.getByRole("button", { name: "I have an existing wallet" })
-    ).toBeVisible({ timeout: config.expectTimeout });
+    ).toBeVisible({ timeout: ONBOARD_VISIBLE_TIMEOUT });
   }
   /**
    * Onboard MetaMask with a mnemonic phrase
@@ -385,7 +386,6 @@ var Metamask = class extends Wallet {
     }
     const continueBtn = this.page.getByTestId("import-srp-confirm");
     await (0, import_test3.expect)(continueBtn).toBeEnabled({ timeout: config.expectTimeout });
-    await (0, import_test3.expect)(continueBtn).toBeEnabled({ timeout: config.expectTimeout });
     await continueBtn.click();
     const passwordInputs = this.page.locator('input[type="password"]');
     await passwordInputs.nth(0).fill(pwd);
@@ -399,7 +399,6 @@ var Metamask = class extends Wallet {
     });
     await openWalletBtn.click();
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
-    await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     await this.page.goto(
       `chrome-extension://${this.extensionId}/sidepanel.html`
     );
@@ -537,26 +536,26 @@ var Metamask = class extends Wallet {
       await btnLocator.first().waitFor({ state: "visible", timeout: BUTTON_OR_POPUP_TIMEOUT });
       await btnLocator.first().click();
     };
-    await this.page.goto(sidepanelUrl);
-    try {
-      await this.page.waitForURL(confirmRoutePattern, {
-        timeout: CONFIRMATION_ROUTE_TIMEOUT
-      });
-    } catch {
-      console.warn(
-        `[w3wallets] confirmation route not found, retrying. URL: ${this.page.url()}`
-      );
+    let routeFound = false;
+    for (let attempt = 0; attempt < MAX_ROUTE_ATTEMPTS; attempt++) {
       await this.page.goto(sidepanelUrl);
       try {
         await this.page.waitForURL(confirmRoutePattern, {
-          timeout: CONFIRMATION_ROUTE_TIMEOUT
+          timeout: ROUTE_RETRY_TIMEOUT
         });
+        routeFound = true;
+        break;
       } catch {
-        console.warn(
-          `[w3wallets] confirmation route not found after retry. URL: ${this.page.url()}`
+        debug(
+          `metamask.waitAndClickButton: route attempt ${attempt + 1}/${MAX_ROUTE_ATTEMPTS} failed. URL: ${this.page.url()}`
         );
       }
     }
+    if (!routeFound) {
+      console.warn(
+        `[w3wallets] confirmation route not found after ${MAX_ROUTE_ATTEMPTS} attempts. URL: ${this.page.url()}`
+      );
+    }
     const result = await waitForButtonOrPopup(BUTTON_OR_POPUP_TIMEOUT);
     debug(
       `metamask.waitAndClickButton: result=${result}, URL=${this.page.url()}`
@@ -610,14 +609,10 @@ var Metamask = class extends Wallet {
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     const menuBtn = this.page.getByTestId("account-options-menu-button");
     await menuBtn.waitFor({ state: "visible", timeout: MENU_BUTTON_TIMEOUT });
-    await menuBtn.click();
+    await menuBtn.click({ force: true });
     await this.page.locator("text=Log out").click();
   }
   /**
-   * Unlock MetaMask with password.
-   * After unlocking, stabilizes the wallet UI by handling post-unlock
-   * screens (metametrics, onboarding completion) and dismissing queued
-   * notifications. Ends on home.html with the wallet UI ready.
    * Unlock MetaMask with password.
    * After unlocking, stabilizes the wallet UI by handling post-unlock
    * screens (metametrics, onboarding completion) and dismissing queued
@@ -627,7 +622,6 @@ var Metamask = class extends Wallet {
     debug("metamask.unlock: starting");
     const pwd = password ?? this.defaultPassword;
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
-    await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     const passwordInput = this.page.getByTestId("unlock-password");
     await passwordInput.fill(pwd);
     await this.page.getByTestId("unlock-submit").click();
@@ -646,7 +640,7 @@ var Metamask = class extends Wallet {
     debug(`metamask.switchNetwork: ${networkName} (${networkType})`);
     await this.page.getByTestId("sort-by-networks").click();
     if (networkType === "Custom") {
-      await this.page.getByRole("tab", { name: "Custom" }).click();
+      await this.page.getByRole("tab", { name: "Custom" }).click({ force: true });
     }
     await this.page.getByText(networkName).click();
     await (0, import_test3.expect)(this.page.getByTestId("sort-by-networks")).toHaveText(
@@ -672,7 +666,7 @@ var Metamask = class extends Wallet {
     await this.page.getByRole("button", { name: /save/i }).click();
   }
   async addCustomNetwork(settings) {
-    await this.page.getByTestId("account-options-menu-button").click();
+    await this.page.getByTestId("account-options-menu-button").click({ force: true });
     await this.page.getByTestId("global-menu-networks").click();
     await this.page.getByRole("button", { name: "Add a custom network" }).click();
     await this.page.getByTestId("network-form-network-name").fill(settings.name);
@@ -683,11 +677,17 @@ var Metamask = class extends Wallet {
     await this.page.getByTestId("rpc-url-input-test").fill(settings.rpc);
     await this.page.getByRole("button", { name: "Add URL" }).click();
     await this.page.getByRole("button", { name: "Save" }).click();
+    await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
+    await this.page.waitForLoadState("domcontentloaded");
   }
   async enableTestNetworks() {
-    await this.page.getByTestId("account-options-menu-button").click();
+    await this.page.getByTestId("account-options-menu-button").click({ force: true });
     await this.page.getByTestId("global-menu-networks").click();
-    await this.page.locator("text=Show test networks >> xpath=following-sibling::label").click();
+    const toggle = this.page.locator(
+      "text=Show test networks >> xpath=following-sibling::label"
+    );
+    await (0, import_test3.expect)(toggle).toBeVisible({ timeout: config.expectTimeout });
+    await toggle.click();
     await this.page.keyboard.press("Escape");
   }
   async importAccount(privateKey) {

package/dist/index.mjs

@@ -1,6 +1,9 @@
-import {
-  __require
-} from "./chunk-HEBXNMVQ.mjs";
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 
 // src/withWallets.ts
 import path3 from "path";
@@ -59,12 +62,14 @@ var ARIA_CLOSE_TIMEOUT = 500;
 var POPUP_HIDDEN_TIMEOUT = 3e3;
 var POST_UNLOCK_TIMEOUT = 3e4;
 var NOTIFICATION_CHECK_TIMEOUT = 5e3;
-var CONFIRMATION_ROUTE_TIMEOUT = 15e3;
 var POST_CLICK_TIMEOUT = 1e4;
 var BUTTON_OR_POPUP_TIMEOUT = 3e4;
 var LAST_RESORT_CLICK_TIMEOUT = 1e4;
 var LOCK_SCREEN_TIMEOUT = 3e4;
 var MENU_BUTTON_TIMEOUT = 3e4;
+var ONBOARD_VISIBLE_TIMEOUT = 3e4;
+var ROUTE_RETRY_TIMEOUT = 5e3;
+var MAX_ROUTE_ATTEMPTS = 5;
 var MNEMONIC_KEY_DELAY = 5;
 var MNEMONIC_WORD_DELAY = 100;
 
@@ -137,7 +142,7 @@ function withWallets(test, ...wallets) {
   });
   const extensionPaths = extensionInfo.map((e) => e.path);
   const fixtures = {
-    context: async (_, use, testInfo) => {
+    context: async ({}, use, testInfo) => {
       const userDataDir = path3.join(
         process.cwd(),
         W3WALLETS_DIR,
@@ -254,7 +259,6 @@ async function findCachedExtension(context, ExtensionClass, expectedExtensionId,
   const page = await context.newPage();
   if (homeUrl) {
     await page.goto(`chrome-extension://${expectedExtensionId}/${homeUrl}`);
-    await page.goto(`chrome-extension://${expectedExtensionId}/${homeUrl}`);
   }
   const extension = new ExtensionClass(page, expectedExtensionId);
   return extension;
@@ -321,7 +325,7 @@ var Metamask = class extends Wallet {
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     await expect(
       this.page.getByRole("button", { name: "I have an existing wallet" })
-    ).toBeVisible({ timeout: config.expectTimeout });
+    ).toBeVisible({ timeout: ONBOARD_VISIBLE_TIMEOUT });
   }
   /**
    * Onboard MetaMask with a mnemonic phrase
@@ -346,7 +350,6 @@ var Metamask = class extends Wallet {
     }
     const continueBtn = this.page.getByTestId("import-srp-confirm");
     await expect(continueBtn).toBeEnabled({ timeout: config.expectTimeout });
-    await expect(continueBtn).toBeEnabled({ timeout: config.expectTimeout });
     await continueBtn.click();
     const passwordInputs = this.page.locator('input[type="password"]');
     await passwordInputs.nth(0).fill(pwd);
@@ -360,7 +363,6 @@ var Metamask = class extends Wallet {
     });
     await openWalletBtn.click();
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
-    await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     await this.page.goto(
       `chrome-extension://${this.extensionId}/sidepanel.html`
     );
@@ -498,26 +500,26 @@ var Metamask = class extends Wallet {
       await btnLocator.first().waitFor({ state: "visible", timeout: BUTTON_OR_POPUP_TIMEOUT });
       await btnLocator.first().click();
     };
-    await this.page.goto(sidepanelUrl);
-    try {
-      await this.page.waitForURL(confirmRoutePattern, {
-        timeout: CONFIRMATION_ROUTE_TIMEOUT
-      });
-    } catch {
-      console.warn(
-        `[w3wallets] confirmation route not found, retrying. URL: ${this.page.url()}`
-      );
+    let routeFound = false;
+    for (let attempt = 0; attempt < MAX_ROUTE_ATTEMPTS; attempt++) {
       await this.page.goto(sidepanelUrl);
       try {
         await this.page.waitForURL(confirmRoutePattern, {
-          timeout: CONFIRMATION_ROUTE_TIMEOUT
+          timeout: ROUTE_RETRY_TIMEOUT
         });
+        routeFound = true;
+        break;
       } catch {
-        console.warn(
-          `[w3wallets] confirmation route not found after retry. URL: ${this.page.url()}`
+        debug(
+          `metamask.waitAndClickButton: route attempt ${attempt + 1}/${MAX_ROUTE_ATTEMPTS} failed. URL: ${this.page.url()}`
         );
       }
     }
+    if (!routeFound) {
+      console.warn(
+        `[w3wallets] confirmation route not found after ${MAX_ROUTE_ATTEMPTS} attempts. URL: ${this.page.url()}`
+      );
+    }
     const result = await waitForButtonOrPopup(BUTTON_OR_POPUP_TIMEOUT);
     debug(
       `metamask.waitAndClickButton: result=${result}, URL=${this.page.url()}`
@@ -571,14 +573,10 @@ var Metamask = class extends Wallet {
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     const menuBtn = this.page.getByTestId("account-options-menu-button");
     await menuBtn.waitFor({ state: "visible", timeout: MENU_BUTTON_TIMEOUT });
-    await menuBtn.click();
+    await menuBtn.click({ force: true });
     await this.page.locator("text=Log out").click();
   }
   /**
-   * Unlock MetaMask with password.
-   * After unlocking, stabilizes the wallet UI by handling post-unlock
-   * screens (metametrics, onboarding completion) and dismissing queued
-   * notifications. Ends on home.html with the wallet UI ready.
    * Unlock MetaMask with password.
    * After unlocking, stabilizes the wallet UI by handling post-unlock
    * screens (metametrics, onboarding completion) and dismissing queued
@@ -588,7 +586,6 @@ var Metamask = class extends Wallet {
     debug("metamask.unlock: starting");
     const pwd = password ?? this.defaultPassword;
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
-    await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     const passwordInput = this.page.getByTestId("unlock-password");
     await passwordInput.fill(pwd);
     await this.page.getByTestId("unlock-submit").click();
@@ -607,7 +604,7 @@ var Metamask = class extends Wallet {
     debug(`metamask.switchNetwork: ${networkName} (${networkType})`);
     await this.page.getByTestId("sort-by-networks").click();
     if (networkType === "Custom") {
-      await this.page.getByRole("tab", { name: "Custom" }).click();
+      await this.page.getByRole("tab", { name: "Custom" }).click({ force: true });
     }
     await this.page.getByText(networkName).click();
     await expect(this.page.getByTestId("sort-by-networks")).toHaveText(
@@ -633,7 +630,7 @@ var Metamask = class extends Wallet {
     await this.page.getByRole("button", { name: /save/i }).click();
   }
   async addCustomNetwork(settings) {
-    await this.page.getByTestId("account-options-menu-button").click();
+    await this.page.getByTestId("account-options-menu-button").click({ force: true });
     await this.page.getByTestId("global-menu-networks").click();
     await this.page.getByRole("button", { name: "Add a custom network" }).click();
     await this.page.getByTestId("network-form-network-name").fill(settings.name);
@@ -644,11 +641,17 @@ var Metamask = class extends Wallet {
     await this.page.getByTestId("rpc-url-input-test").fill(settings.rpc);
     await this.page.getByRole("button", { name: "Add URL" }).click();
     await this.page.getByRole("button", { name: "Save" }).click();
+    await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
+    await this.page.waitForLoadState("domcontentloaded");
   }
   async enableTestNetworks() {
-    await this.page.getByTestId("account-options-menu-button").click();
+    await this.page.getByTestId("account-options-menu-button").click({ force: true });
     await this.page.getByTestId("global-menu-networks").click();
-    await this.page.locator("text=Show test networks >> xpath=following-sibling::label").click();
+    const toggle = this.page.locator(
+      "text=Show test networks >> xpath=following-sibling::label"
+    );
+    await expect(toggle).toBeVisible({ timeout: config.expectTimeout });
+    await toggle.click();
     await this.page.keyboard.press("Escape");
   }
   async importAccount(privateKey) {

package/dist/scripts/cache.js

@@ -231,7 +231,8 @@ async function buildAllCaches(directory, options2 = {}) {
     outDir: distDir,
     format: ["cjs"],
     clean: true,
-    silent: true
+    silent: true,
+    external: ["@playwright/test"]
   });
   let built = 0;
   let skipped = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "w3wallets",
   "description": "browser wallets for playwright",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/Maksandre/w3wallets",

package/dist/chunk-HEBXNMVQ.mjs

@@ -1,48 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-export {
-  __require,
-  __esm,
-  __commonJS,
-  __export,
-  __toESM,
-  __toCommonJS
-};