fix:waitForNewWindow with timeout

Author: smildlzj

packages/selenium-ide/package.json

@@ -110,7 +110,7 @@
     "@seleniumhq/side-api": "^4.0.0-alpha.16",
     "@seleniumhq/side-model": "^4.0.0-alpha.2",
     "@seleniumhq/side-plugin-example": "^4.0.0-alpha.1",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.16",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.17",
     "dnd-core": "16.0.1",
     "electron-chromedriver": "^18.0.0",
     "electron-log": "^4.4.8",

packages/side-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-runtime",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.17",
   "description": "Selenium IDE playback and execution",
   "author": "Tomer <[email protected]>",
   "homepage": "http://github.com/SeleniumHQ/selenium-ide",

packages/side-runtime/src/webdriver.ts

@@ -257,10 +257,7 @@ export default class WebDriverExecutor {
   async afterCommand(commandObject: CommandShape) {
     this.cancellable = undefined
     if (commandObject.opensWindow) {
-      const handle = await this.wait<string | undefined>(
-        this.waitForNewWindow(),
-        commandObject.windowTimeout
-      )
+      const handle = await this.waitForNewWindow(commandObject.windowTimeout)
       this.variables.set(commandObject.windowHandleName as string, handle)
 
       await this.executeHook('onWindowAppeared', {
@@ -273,11 +270,31 @@ export default class WebDriverExecutor {
     await this.executeHook('onAfterCommand', { command: commandObject })
   }
 
-  async waitForNewWindow() {
-    const currentHandles = await this.driver.getAllWindowHandles()
-    return currentHandles.find(
-      (handle) => !this[state].openedWindows.includes(handle)
-    )
+  async waitForNewWindow(timeout: number = 2000) {
+    const finder = new Promise<string | undefined>((resolve) => {
+      const start = Date.now()
+      const findHandle = async () => {
+        if (Date.now() - start > timeout) {
+          resolve(undefined)
+          return
+        }
+
+        const currentHandles = await this.driver.getAllWindowHandles()
+        const newHandle = currentHandles.find(
+          (handle) => !this[state].openedWindows.includes(handle)
+        )
+        if (newHandle) {
+          resolve(newHandle)
+          return
+        }
+        // cant find, wait next time.
+        setTimeout(findHandle, 200)
+      }
+
+      findHandle()
+    })
+
+    return this.wait(finder, timeout)
   }
 
   registerCommand(commandName: string, fn: Fn) {