Merge branch 'dev' into phantom-e2e-tests

Author: zgz2020

examples/ethereum-wallet-mock/CHANGELOG.md

@@ -1,5 +1,19 @@
 # example-ethereum-wallet-mock
 
+## 0.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @synthetixio/synpress@4.0.8
+
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @synthetixio/synpress@4.0.7
+
 ## 0.0.7
 
 ### Patch Changes

examples/ethereum-wallet-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/ethereum-wallet-mock",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "private": true,
   "homepage": "https://synpress.io",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@metamask/test-dapp": "8.1.0",
-    "@synthetixio/synpress-tsconfig": "0.0.7",
+    "@synthetixio/synpress-tsconfig": "0.0.9",
     "@types/node": "20.11.17",
     "cypress": "13.15.1",
     "serve": "14.2.1",

examples/metamask/CHANGELOG.md

@@ -1,5 +1,19 @@
 # example-metamask
 
+## 0.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @synthetixio/synpress@4.0.8
+
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @synthetixio/synpress@4.0.7
+
 ## 0.0.7
 
 ### Patch Changes

examples/metamask/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examples/metamask",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "private": true,
   "homepage": "https://synpress.io",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@metamask/test-dapp": "8.1.0",
-    "@synthetixio/synpress-tsconfig": "0.0.7",
+    "@synthetixio/synpress-tsconfig": "0.0.9",
     "@types/node": "20.11.17",
     "cypress": "13.15.1",
     "serve": "14.2.1",

packages/cache/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @synthetixio/synpress-cache
 
+## 0.0.9
+
+### Patch Changes
+
+- Release
+
+## 0.0.8
+
+### Patch Changes
+
+- Release
+
 ## 0.0.7
 
 ### Patch Changes

packages/cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synthetixio/synpress-cache",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "homepage": "https://synpress.io",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "zod": "3.22.4"
   },
   "devDependencies": {
-    "@synthetixio/synpress-tsconfig": "0.0.7",
+    "@synthetixio/synpress-tsconfig": "0.0.9",
     "@types/archiver": "6.0.2",
     "@types/fs-extra": "11.0.4",
     "@types/gradient-string": "1.1.5",

packages/cache/src/cli/cliEntrypoint.ts

@@ -1,3 +1,4 @@
+import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import chalk from 'chalk'
@@ -17,6 +18,16 @@ interface CliFlags {
   phantom: boolean
 }
 
+// Helper function to check if running in WSL
+const isRunningInWsl = (): boolean => {
+  try {
+    const releaseContent = fs.readFileSync('/proc/version', 'utf8').toLowerCase()
+    return releaseContent.includes('microsoft') || releaseContent.includes('wsl')
+  } catch (error) {
+    return false
+  }
+}
+
 // TODO: Add unit tests for the CLI!
 export const cliEntrypoint = async () => {
   console.log(`⚠️ ${chalk.yellowBright`The CLI is in alpha so expect breaking changes!`} ⚠️\n`)
@@ -61,7 +72,7 @@ export const cliEntrypoint = async () => {
     )
   }
 
-  if (os.platform() === 'win32') {
+  if (os.platform() === 'win32' && !isRunningInWsl()) {
     console.log(
       [
         chalk.redBright('🚨 Sorry, Windows is currently not supported. Please use WSL instead! 🚨'),

packages/cache/src/utils/waitForExtensionOnLoadPage.ts

@@ -1,13 +1,36 @@
 import { type BrowserContext, errors as playwrightErrors } from 'playwright-core'
 
+const EXTENSION_LOAD_TIMEOUT = 10000
+const MAX_RETRIES = 2
+
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
 export async function waitForExtensionOnLoadPage(context: BrowserContext) {
-  try {
-    return await context.waitForEvent('page', { timeout: 5000 }) // TODO: Extract & Make this timeout configurable.
-  } catch (e) {
-    if (e instanceof playwrightErrors.TimeoutError) {
-      throw new Error('[WaitForExtensionOnLoadPage] Extension did not load in time!')
-    }
+  let retries = 0
+
+  while (retries <= MAX_RETRIES) {
+    try {
+      // Attempt to wait for the extension to load
+      return await context.waitForEvent('page', { timeout: EXTENSION_LOAD_TIMEOUT })
+    } catch (e) {
+      if (e instanceof playwrightErrors.TimeoutError) {
+        retries++
 
-    throw e
+        if (retries <= MAX_RETRIES) {
+          console.warn(
+            `[WaitForExtensionOnLoadPage] Extension did not load in time, retrying (attempt ${retries}/${MAX_RETRIES})...`
+          )
+
+          await sleep(1000 * retries)
+          continue
+        }
+
+        throw new Error('[WaitForExtensionOnLoadPage] Extension failed to load after multiple attempts!')
+      }
+      throw e
+    }
   }
+
+  // This should never be reached
+  throw new Error('[WaitForExtensionOnLoadPage] Unexpected end of function reached')
 }

packages/cache/test/utils/waitForExtensionOnLoadPage.test.ts

@@ -34,14 +34,14 @@ describe('waitForExtensionOnLoadPage', () => {
     await waitForExtensionOnLoadPage(context)
 
     expect(waitForEventSpy).toHaveBeenCalledOnce()
-    expect(waitForEventSpy).toHaveBeenCalledWith('page', { timeout: 5000 })
+    expect(waitForEventSpy).toHaveBeenCalledWith('page', { timeout: 10000 })
   })
 
   it('throws with custom error if waitForEvent throws due to timeout', async () => {
     const context = createTimeoutContext()
 
     await expect(waitForExtensionOnLoadPage(context)).rejects.toThrowError(
-      '[WaitForExtensionOnLoadPage] Extension did not load in time!'
+      '[WaitForExtensionOnLoadPage] Extension failed to load after multiple attempts!'
     )
   })
 

packages/core/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @synthetixio/synpress-core
 
+## 0.0.9
+
+### Patch Changes
+
+- Release
+
+## 0.0.8
+
+### Patch Changes
+
+- Release
+
 ## 0.0.7
 
 ### Patch Changes