fixing recording

Author: toddtarsi

packages/selenium-ide/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/selenium-ide",
-  "version": "4.0.0-alpha.41",
+  "version": "4.0.0-alpha.42",
   "private": true,
   "description": "Selenium IDE electron app",
   "author": "Todd <[email protected]>",
@@ -107,7 +107,7 @@
     "@seleniumhq/code-export-ruby-rspec": "^4.0.0-alpha.1",
     "side-code-export": "^4.0.0-alpha.10",
     "@seleniumhq/get-driver": "^4.0.0-alpha.1",
-    "@seleniumhq/side-api": "^4.0.0-alpha.24",
+    "@seleniumhq/side-api": "^4.0.0-alpha.25",
     "@seleniumhq/side-model": "^4.0.0-alpha.4",
     "@seleniumhq/side-runtime": "^4.0.0-alpha.25",
     "dnd-core": "16.0.1",

packages/selenium-ide/src/browser/windows/PlaybackWindow/preload.ts

@@ -18,12 +18,9 @@ import api from 'browser/api'
 import apiMutators from 'browser/api/mutator'
 import { contextBridge, ipcRenderer, webFrame } from 'electron'
 import { identity } from 'lodash/fp'
-import path from 'path'
 import Recorder from './preload/recorder'
 
-const pluginFromPath = (pluginPath: string) => {
-  const actualPluginPath = __non_webpack_require__.resolve(pluginPath)
-  const preloadPath = path.join(actualPluginPath, '..', 'preload', 'index.js')
+const pluginFromPath = ([pluginPath, preloadPath]: [string, string]) => {
   try {
     const pluginPreload = __non_webpack_require__(preloadPath)
     const pluginHandler =
@@ -43,7 +40,6 @@ const pluginFromPath = (pluginPath: string) => {
  * Expose it in the main context
  */
 window.addEventListener('DOMContentLoaded', async () => {
-  contextBridge.exposeInMainWorld('sideAPI', true)
   webFrame.executeJavaScript(`
     Object.defineProperty(navigator, 'webdriver', {
       get () {
@@ -57,7 +53,11 @@ window.addEventListener('DOMContentLoaded', async () => {
     mutators: { recorder: apiMutators.recorder },
   }
   const pluginPaths = await api.plugins.list()
-  const plugins = pluginPaths.map(pluginFromPath).filter(identity)
+  const preloadPaths = await api.plugins.listPreloadPaths()
+  const richPlugins: [string, string][] = pluginPaths.map((p, i) => [p, preloadPaths[i]])
+  const plugins = richPlugins.map(pluginFromPath).filter(identity)
+
+  contextBridge.exposeInMainWorld('sideAPI', window.sideAPI)
   setTimeout(async () => {
     console.debug('Initializing the recorder')
     new Recorder(window, plugins)

packages/selenium-ide/src/main/api/classes/Handler.ts

@@ -64,7 +64,9 @@ const Handler =
       apiDebugLog('Received API Request', path, args)
       const result = await doAPI(...(args as Parameters<HANDLER>))
       apiDebugLog('Resolved API Request', path, result)
-      event.senderFrame.send(`${path}.complete`, result)
+      if (event.senderFrame) {
+        event.senderFrame.send(`${path}.complete`, result)
+      }
     })
     return doAPI
   }

packages/selenium-ide/src/main/session/controllers/Plugins/index.ts

@@ -2,6 +2,7 @@ import { correctPluginPaths, loadPlugins, PluginShape } from '@seleniumhq/side-r
 import { ipcMain } from 'electron'
 import storage from 'main/store'
 import BaseController from '../Base'
+import path from 'path'
 
 export type PluginMessageHandler = (
   event: Electron.IpcMainEvent,
@@ -21,6 +22,15 @@ export default class PluginsController extends BaseController {
       .concat(correctPluginPaths(projectPath, activeProject.plugins))
   }
 
+  async listPreloadPaths() {
+    const list = await this.list();
+    return list.map((pluginPath) => {
+      const actualPluginPath = __non_webpack_require__.resolve(pluginPath)
+      const preloadPath = path.join(actualPluginPath, '..', 'preload', 'index.js')
+      return preloadPath
+    })
+  }
+
   async onProjectLoaded() {
     const pluginPaths = await this.list()
     const plugins = await loadPlugins(

packages/selenium-ide/src/main/session/controllers/Recorder/index.ts

@@ -46,11 +46,10 @@ const getFrameTraversalCommands = (
 const getLastActiveWindowHandleId = (session: CoreSessionData): string => {
   const activeTest = getActiveTest(session)
   const activeIndex = getActiveCommandIndex(session)
-
+  console.log(activeTest, activeIndex)
   const commands = activeTest.commands
   for (let i = activeIndex; i >= 0; i--) {
     let item = commands[i]
-
     if (item.command == 'selectWindow') {
       let target = item.target as string
       return target.substring('handle=${'.length, target.length - 1)

packages/side-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-api",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.25",
   "private": false,
   "description": "Selenium IDE API command shapes and such",
   "author": "Todd Tarsi <[email protected]>",

packages/side-api/src/commands/plugins/index.ts

@@ -1,15 +1,18 @@
 import type { Shape as List } from './list'
+import type { Shape as ListPreloadPaths } from './listPreloadPaths'
 import type { Shape as ProjectCreate } from './projectCreate'
 import type { Shape as ProjectDelete } from './projectDelete'
 import type { Shape as ProjectEdit } from './projectEdit'
 
 import * as list from './list'
+import * as listPreloadPaths from './listPreloadPaths'
 import * as projectCreate from './projectCreate'
 import * as projectDelete from './projectDelete'
 import * as projectEdit from './projectEdit'
 
 export const commands = {
   list,
+  listPreloadPaths,
   projectCreate,
   projectDelete,
   projectEdit,
@@ -19,6 +22,7 @@ export const commands = {
  */
 export type Shape = {
   list: List
+  listPreloadPaths: ListPreloadPaths
   projectCreate: ProjectCreate
   projectDelete: ProjectDelete
   projectEdit: ProjectEdit

packages/side-api/src/commands/plugins/listPreloadPaths.ts

@@ -0,0 +1,4 @@
+/**
+ * Get a list of active plugin preload paths
+ */
+export type Shape = () => Promise<string[]>