make recorder run a bit more consistently

SeleniumHQ · Dec 13, 2023 · a8420eb · a8420eb
1 parent d2c5c98
commit a8420eb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/packages/selenium-ide/package.json b/packages/selenium-ide/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/selenium-ide",
-  "version": "4.0.0-alpha.62",
+  "version": "4.0.0-alpha.63",
   "private": true,
   "description": "Selenium IDE electron app",
   "author": "Todd <[email protected]>",

diff --git a/packages/selenium-ide/src/browser/windows/PlaybackWindow/preload.ts b/packages/selenium-ide/src/browser/windows/PlaybackWindow/preload.ts
@@ -21,26 +21,27 @@ import preload from 'browser/helpers/preload'
 import { webFrame } from 'electron'
 import Recorder from './preload/recorder'
 
-(async () => {
+;(async () => {
+  console.log('Preloading?')
   const plugins = await preload({
     recorder: api.recorder,
     mutators: { recorder: apiMutators.recorder },
   })
-  window.addEventListener('DOMContentLoaded', async () => {
-    webFrame.executeJavaScript(`
+  console.log('Preloading!')
+  console.log('Executing webframe script?')
+  webFrame.executeJavaScript(`
       Object.defineProperty(navigator, 'webdriver', {
         get () {
           return true
         } 
       })
     `)
-    setTimeout(async () => {
-      console.debug('Initializing the recorder')
-      new Recorder(window, plugins.filter(Boolean) as PluginPreloadOutputShape[])
-    }, 500)
-  })
-})();
-
-/**
- * Expose it in the main context
- */
+  console.log('Executed webframe script?')
+  console.log('Initializing the recorder')
+  const recorder = new Recorder(
+    window,
+    plugins.filter(Boolean) as PluginPreloadOutputShape[]
+  )
+  recorder.attach()
+  console.log('Recorder initialized')
+})()
diff --git a/packages/selenium-ide/src/browser/windows/PlaybackWindow/preload/recorder.ts b/packages/selenium-ide/src/browser/windows/PlaybackWindow/preload/recorder.ts
@@ -24,7 +24,10 @@ import {
   ExpandedMutationObserver,
 } from 'browser/types'
 import initFindSelect from './find-select'
-import { PluginPreloadOutputShape, RecordNewCommandInput } from '@seleniumhq/side-api'
+import {
+  PluginPreloadOutputShape,
+  RecordNewCommandInput,
+} from '@seleniumhq/side-api'
 import LocatorBuilders from './locator-builders'
 
 export interface RecordingState {
@@ -56,41 +59,21 @@ export default class Recorder {
     this.getFrameLocation = this.getFrameLocation.bind(this)
     this.setWindowHandle = this.setWindowHandle.bind(this)
     // @ts-expect-error
-    this.window.addEventListener('message', this.setWindowHandle)
-    this.window.sideAPI.recorder.onFrameRecalculate.addListener(
-      this.getFrameLocation
-    )
-
-    this.window.addEventListener('beforeunload', () => {
-      try {
-        this.window.sideAPI.recorder.onFrameRecalculate.removeListener(
-          this.getFrameLocation
-        )
-      } catch (e) {
-        // ignore
-      }
-    })
-    // @ts-expect-error
     this.recordingState = {}
     this.addRecorderTracingAttribute()
     initFindSelect()
-    this.window.sideAPI.recorder.onLocatorOrderChanged.addListener(
-      LocatorBuilders.setPreferredOrder
-    )
     // e.g., once on load
     this.getFrameLocation()
 
     this.window.sideAPI.recorder.getWinHandleId().then((id) => {
       this.winHandleId = id
     })
-
     handlers.forEach((handler) => {
       this.addEventHandler(...handler)
     })
     observers.forEach((observer) => {
       this.addMutationObserver(...observer)
     })
-    this.attach()
   }
 
   winHandleId: string = ''
@@ -120,7 +103,7 @@ export default class Recorder {
       value,
       insertBeforeLastCommand,
       frameLocation: actualFrameLocation || this.frameLocation,
-      winHandleId: this.winHandleId
+      winHandleId: this.winHandleId,
     }
     const plugins = this.plugins
     for (let i = 0, ii = plugins.length; i !== ii; i++) {
@@ -172,6 +155,14 @@ export default class Recorder {
 
   attach() {
     if (!this.attached) {
+      // @ts-expect-error
+      this.window.addEventListener('message', this.setWindowHandle)
+      this.window.sideAPI.recorder.onFrameRecalculate.addListener(
+        this.getFrameLocation
+      )
+      this.window.sideAPI.recorder.onLocatorOrderChanged.addListener(
+        LocatorBuilders.setPreferredOrder
+      )
       for (let eventKey in this.eventHandlers) {
         const eventInfo = this.parseEventKey(eventKey)
         const eventName = eventInfo.eventName
@@ -213,6 +204,14 @@ export default class Recorder {
   }
 
   detach() {
+    // @ts-expect-error
+    this.window.removeEventListener('message', this.setWindowHandle)
+    this.window.sideAPI.recorder.onFrameRecalculate.removeListener(
+      this.getFrameLocation
+    )
+    this.window.sideAPI.recorder.onLocatorOrderChanged.removeListener(
+      LocatorBuilders.setPreferredOrder
+    )
     for (let eventKey in this.eventListeners) {
       const eventInfo = this.parseEventKey(eventKey)
       const eventName = eventInfo.eventName