w3wallets 1.0.0-beta.10 → 1.0.0-beta.11

package/dist/index.d.mts

@@ -108,6 +108,13 @@ declare class Metamask extends Wallet {
      */
     dismissPopups(): Promise<void>;
     private waitForPopupHidden;
+    /**
+     * MetaMask's MV3 service worker can fail to come up on cold-start
+     * (especially in fresh-extension CI runs), showing an error screen
+     * with a "Restart MetaMask" button. Detect and click it so the
+     * normal post-unlock flow can proceed.
+     */
+    private recoverFromStartupError;
     /**
      * After unlock, MetaMask may show onboarding screens, queued
      * notifications, or go straight to the wallet UI. Race all possible

package/dist/index.d.ts

@@ -108,6 +108,13 @@ declare class Metamask extends Wallet {
      */
     dismissPopups(): Promise<void>;
     private waitForPopupHidden;
+    /**
+     * MetaMask's MV3 service worker can fail to come up on cold-start
+     * (especially in fresh-extension CI runs), showing an error screen
+     * with a "Restart MetaMask" button. Detect and click it so the
+     * normal post-unlock flow can proceed.
+     */
+    private recoverFromStartupError;
     /**
      * After unlock, MetaMask may show onboarding screens, queued
      * notifications, or go straight to the wallet UI. Race all possible

package/dist/index.js

@@ -392,11 +392,23 @@ var Metamask = class extends Wallet {
     await passwordInputs.nth(1).fill(pwd);
     await this.page.getByRole("checkbox").click({ force: true });
     await this.page.getByRole("button", { name: "Create password" }).click();
+    const passkeyMaybeLater = this.page.getByTestId(
+      "passkey-maybe-later-button"
+    );
     const metametricsBtn = this.page.getByTestId("metametrics-i-agree");
-    await metametricsBtn.click();
-    const openWalletBtn = this.page.getByRole("button", {
-      name: /open wallet/i
+    const postPasswordState = await Promise.race([
+      passkeyMaybeLater.waitFor({ state: "visible", timeout: ONBOARD_VISIBLE_TIMEOUT }).then(() => "passkey"),
+      metametricsBtn.waitFor({ state: "visible", timeout: ONBOARD_VISIBLE_TIMEOUT }).then(() => "metametrics")
+    ]);
+    if (postPasswordState === "passkey") {
+      await passkeyMaybeLater.click();
+    }
+    await metametricsBtn.waitFor({
+      state: "visible",
+      timeout: ONBOARD_VISIBLE_TIMEOUT
     });
+    await metametricsBtn.click();
+    const openWalletBtn = this.page.getByTestId("onboarding-complete-done");
     await openWalletBtn.click();
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     await this.page.goto(
@@ -437,6 +449,26 @@ var Metamask = class extends Wallet {
       return false;
     }
   }
+  /**
+   * MetaMask's MV3 service worker can fail to come up on cold-start
+   * (especially in fresh-extension CI runs), showing an error screen
+   * with a "Restart MetaMask" button. Detect and click it so the
+   * normal post-unlock flow can proceed.
+   */
+  async recoverFromStartupError() {
+    const restartBtn = this.page.getByRole("button", {
+      name: "Restart MetaMask"
+    });
+    if (!await restartBtn.isVisible({ timeout: POPUP_VISIBILITY_TIMEOUT }).catch(() => false)) {
+      return;
+    }
+    debug("metamask.recoverFromStartupError: clicking Restart MetaMask");
+    await restartBtn.click();
+    await restartBtn.waitFor({
+      state: "hidden",
+      timeout: POST_UNLOCK_TIMEOUT
+    });
+  }
   /**
    * After unlock, MetaMask may show onboarding screens, queued
    * notifications, or go straight to the wallet UI. Race all possible
@@ -444,16 +476,19 @@ var Metamask = class extends Wallet {
    */
   async stabilizePostUnlock() {
     debug("metamask.stabilizePostUnlock: racing post-unlock states");
+    await this.recoverFromStartupError();
+    const passkeyMaybeLater = this.page.getByTestId(
+      "passkey-maybe-later-button"
+    );
     const metametricsBtn = this.page.getByTestId("metametrics-i-agree");
-    const openWalletBtn = this.page.getByRole("button", {
-      name: /open wallet/i
-    });
+    const openWalletBtn = this.page.getByTestId("onboarding-complete-done");
     const readyIndicator = this.page.getByTestId("account-options-menu-button");
     const rejectAllBtn = this.page.getByText("Reject all");
     const notificationCancelBtn = this.page.getByTestId(
       "confirmation-cancel-button"
     );
     const state = await Promise.race([
+      passkeyMaybeLater.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "passkey"),
       metametricsBtn.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "metametrics"),
       openWalletBtn.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "openWallet"),
       rejectAllBtn.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "rejectAll"),
@@ -463,9 +498,18 @@ var Metamask = class extends Wallet {
     debug(`metamask.stabilizePostUnlock: state=${state}`);
     if (state === "timeout") {
       debug(
-        `metamask.stabilizePostUnlock: timeout after ${POST_UNLOCK_TIMEOUT}ms. URL: ${this.page.url()}. Checked: metametrics-i-agree, open-wallet button, Reject all, confirmation-cancel-button, account-options-menu-button`
+        `metamask.stabilizePostUnlock: timeout after ${POST_UNLOCK_TIMEOUT}ms. URL: ${this.page.url()}. Checked: passkey-maybe-later-button, metametrics-i-agree, onboarding-complete-done, Reject all, confirmation-cancel-button, account-options-menu-button`
       );
     }
+    if (state === "passkey") {
+      await passkeyMaybeLater.click();
+      if (await metametricsBtn.isVisible({ timeout: POST_UNLOCK_TIMEOUT }).catch(() => false)) {
+        await metametricsBtn.click();
+      }
+      if (await openWalletBtn.isVisible({ timeout: POPUP_HIDDEN_TIMEOUT }).catch(() => false)) {
+        await openWalletBtn.click();
+      }
+    }
     if (state === "metametrics") {
       await metametricsBtn.click();
       if (await openWalletBtn.isVisible({ timeout: POPUP_HIDDEN_TIMEOUT }).catch(() => false)) {
@@ -493,6 +537,7 @@ var Metamask = class extends Wallet {
       "confirmation-cancel-button"
     );
     await this.page.goto(homeUrl);
+    await this.recoverFromStartupError();
     for (let i = 0; i < 10; i++) {
       const state = await Promise.race([
         readyIndicator.waitFor({ state: "visible", timeout: NOTIFICATION_CHECK_TIMEOUT }).then(() => "ready"),
@@ -538,8 +583,8 @@ var Metamask = class extends Wallet {
     };
     let routeFound = false;
     for (let attempt = 0; attempt < MAX_ROUTE_ATTEMPTS; attempt++) {
-      await this.page.goto(sidepanelUrl);
       try {
+        await this.page.goto(sidepanelUrl, { timeout: ROUTE_RETRY_TIMEOUT });
         await this.page.waitForURL(confirmRoutePattern, {
           timeout: ROUTE_RETRY_TIMEOUT
         });
@@ -610,7 +655,7 @@ var Metamask = class extends Wallet {
     const menuBtn = this.page.getByTestId("account-options-menu-button");
     await menuBtn.waitFor({ state: "visible", timeout: MENU_BUTTON_TIMEOUT });
     await menuBtn.click({ force: true });
-    await this.page.locator("text=Log out").click();
+    await this.page.getByTestId("global-menu-lock").click();
   }
   /**
    * Unlock MetaMask with password.

package/dist/index.mjs

@@ -356,11 +356,23 @@ var Metamask = class extends Wallet {
     await passwordInputs.nth(1).fill(pwd);
     await this.page.getByRole("checkbox").click({ force: true });
     await this.page.getByRole("button", { name: "Create password" }).click();
+    const passkeyMaybeLater = this.page.getByTestId(
+      "passkey-maybe-later-button"
+    );
     const metametricsBtn = this.page.getByTestId("metametrics-i-agree");
-    await metametricsBtn.click();
-    const openWalletBtn = this.page.getByRole("button", {
-      name: /open wallet/i
+    const postPasswordState = await Promise.race([
+      passkeyMaybeLater.waitFor({ state: "visible", timeout: ONBOARD_VISIBLE_TIMEOUT }).then(() => "passkey"),
+      metametricsBtn.waitFor({ state: "visible", timeout: ONBOARD_VISIBLE_TIMEOUT }).then(() => "metametrics")
+    ]);
+    if (postPasswordState === "passkey") {
+      await passkeyMaybeLater.click();
+    }
+    await metametricsBtn.waitFor({
+      state: "visible",
+      timeout: ONBOARD_VISIBLE_TIMEOUT
     });
+    await metametricsBtn.click();
+    const openWalletBtn = this.page.getByTestId("onboarding-complete-done");
     await openWalletBtn.click();
     await this.page.goto(`chrome-extension://${this.extensionId}/home.html`);
     await this.page.goto(
@@ -401,6 +413,26 @@ var Metamask = class extends Wallet {
       return false;
     }
   }
+  /**
+   * MetaMask's MV3 service worker can fail to come up on cold-start
+   * (especially in fresh-extension CI runs), showing an error screen
+   * with a "Restart MetaMask" button. Detect and click it so the
+   * normal post-unlock flow can proceed.
+   */
+  async recoverFromStartupError() {
+    const restartBtn = this.page.getByRole("button", {
+      name: "Restart MetaMask"
+    });
+    if (!await restartBtn.isVisible({ timeout: POPUP_VISIBILITY_TIMEOUT }).catch(() => false)) {
+      return;
+    }
+    debug("metamask.recoverFromStartupError: clicking Restart MetaMask");
+    await restartBtn.click();
+    await restartBtn.waitFor({
+      state: "hidden",
+      timeout: POST_UNLOCK_TIMEOUT
+    });
+  }
   /**
    * After unlock, MetaMask may show onboarding screens, queued
    * notifications, or go straight to the wallet UI. Race all possible
@@ -408,16 +440,19 @@ var Metamask = class extends Wallet {
    */
   async stabilizePostUnlock() {
     debug("metamask.stabilizePostUnlock: racing post-unlock states");
+    await this.recoverFromStartupError();
+    const passkeyMaybeLater = this.page.getByTestId(
+      "passkey-maybe-later-button"
+    );
     const metametricsBtn = this.page.getByTestId("metametrics-i-agree");
-    const openWalletBtn = this.page.getByRole("button", {
-      name: /open wallet/i
-    });
+    const openWalletBtn = this.page.getByTestId("onboarding-complete-done");
     const readyIndicator = this.page.getByTestId("account-options-menu-button");
     const rejectAllBtn = this.page.getByText("Reject all");
     const notificationCancelBtn = this.page.getByTestId(
       "confirmation-cancel-button"
     );
     const state = await Promise.race([
+      passkeyMaybeLater.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "passkey"),
       metametricsBtn.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "metametrics"),
       openWalletBtn.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "openWallet"),
       rejectAllBtn.waitFor({ state: "visible", timeout: POST_UNLOCK_TIMEOUT }).then(() => "rejectAll"),
@@ -427,9 +462,18 @@ var Metamask = class extends Wallet {
     debug(`metamask.stabilizePostUnlock: state=${state}`);
     if (state === "timeout") {
       debug(
-        `metamask.stabilizePostUnlock: timeout after ${POST_UNLOCK_TIMEOUT}ms. URL: ${this.page.url()}. Checked: metametrics-i-agree, open-wallet button, Reject all, confirmation-cancel-button, account-options-menu-button`
+        `metamask.stabilizePostUnlock: timeout after ${POST_UNLOCK_TIMEOUT}ms. URL: ${this.page.url()}. Checked: passkey-maybe-later-button, metametrics-i-agree, onboarding-complete-done, Reject all, confirmation-cancel-button, account-options-menu-button`
       );
     }
+    if (state === "passkey") {
+      await passkeyMaybeLater.click();
+      if (await metametricsBtn.isVisible({ timeout: POST_UNLOCK_TIMEOUT }).catch(() => false)) {
+        await metametricsBtn.click();
+      }
+      if (await openWalletBtn.isVisible({ timeout: POPUP_HIDDEN_TIMEOUT }).catch(() => false)) {
+        await openWalletBtn.click();
+      }
+    }
     if (state === "metametrics") {
       await metametricsBtn.click();
       if (await openWalletBtn.isVisible({ timeout: POPUP_HIDDEN_TIMEOUT }).catch(() => false)) {
@@ -457,6 +501,7 @@ var Metamask = class extends Wallet {
       "confirmation-cancel-button"
     );
     await this.page.goto(homeUrl);
+    await this.recoverFromStartupError();
     for (let i = 0; i < 10; i++) {
       const state = await Promise.race([
         readyIndicator.waitFor({ state: "visible", timeout: NOTIFICATION_CHECK_TIMEOUT }).then(() => "ready"),
@@ -502,8 +547,8 @@ var Metamask = class extends Wallet {
     };
     let routeFound = false;
     for (let attempt = 0; attempt < MAX_ROUTE_ATTEMPTS; attempt++) {
-      await this.page.goto(sidepanelUrl);
       try {
+        await this.page.goto(sidepanelUrl, { timeout: ROUTE_RETRY_TIMEOUT });
         await this.page.waitForURL(confirmRoutePattern, {
           timeout: ROUTE_RETRY_TIMEOUT
         });
@@ -574,7 +619,7 @@ var Metamask = class extends Wallet {
     const menuBtn = this.page.getByTestId("account-options-menu-button");
     await menuBtn.waitFor({ state: "visible", timeout: MENU_BUTTON_TIMEOUT });
     await menuBtn.click({ force: true });
-    await this.page.locator("text=Log out").click();
+    await this.page.getByTestId("global-menu-lock").click();
   }
   /**
    * Unlock MetaMask with password.

package/package.json

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