lots of stuff and test fixes

Author: toddtarsi

Diff for: package.json

@@ -13,6 +13,7 @@
     "clean:deps": "rimraf packages/*/node_modules node_modules",
     "clean": "rimraf packages/*/build packages/*/dist packages/*/node_modules packages/*/tsconfig.tsbuildinfo node_modules",
     "clean:nuke": "git clean -fdx",
+    "start": "cd packages/selenium-ide && npm start",
     "test": "jest",
     "test:e2e": "jest --testMatch \"**/packages/**/__tests__/**/*.e2e.js\"",
     "lint": "pnpm run lint:scripts",

Diff for: packages/selenium-ide/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/selenium-ide",
-  "version": "4.0.0-alpha.47",
+  "version": "4.0.0-alpha.48",
   "private": true,
   "description": "Selenium IDE electron app",
   "author": "Todd <[email protected]>",
@@ -106,9 +106,9 @@
     "@seleniumhq/code-export-ruby-rspec": "^4.0.0-alpha.1",
     "side-code-export": "^4.0.0-alpha.11",
     "@seleniumhq/get-driver": "^4.0.0-alpha.1",
-    "@seleniumhq/side-api": "^4.0.0-alpha.29",
+    "@seleniumhq/side-api": "^4.0.0-alpha.30",
     "@seleniumhq/side-model": "^4.0.0-alpha.4",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.27",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.29",
     "dnd-core": "^16.0.1",
     "electron-chromedriver": "^25.3.0",
     "electron-log": "^4.4.8",

Diff for: packages/selenium-ide/scripts/ide-runner.js

@@ -36,7 +36,7 @@ main()
 
 async function main() {
   console.log('Starting webdriver backend')
-  const {proc, success} = await startWebdriverBackend({ driver: 'chrome' })
+  const { proc, success } = await startWebdriverBackend({ driver: 'chrome' })
   if (!success) {
     console.error('Failed to start webdriver backend')
     console.error(proc.error)
@@ -51,10 +51,7 @@ async function main() {
         'goog:chromeOptions': {
           // Here is the path to your Electron binary.
           binary: electronBinaryPath,
-          args: [
-            'app=' + pathToSeleniumIDE,
-            `side-file=${sideFile}`,
-          ],
+          args: ['app=' + pathToSeleniumIDE, `side-file=${sideFile}`],
           excludeSwitches: ['enable-logging'],
         },
       })
@@ -77,11 +74,6 @@ function startWebdriverBackend() {
         env: {},
         shell: false,
       })
-      process.on('exit', () => {
-        if (!proc.killed) {
-          proc.kill()
-        }
-      })
       proc.stdout.on('data', (out) => {
         const outStr = `${out}`
         WebdriverDebugLog(outStr)

Diff for: packages/selenium-ide/src/browser/windows/PlaybackWindow/preload/recorder.ts

@@ -24,7 +24,7 @@ import {
   ExpandedMutationObserver,
 } from 'browser/types'
 import initFindSelect from './find-select'
-import { PluginPreloadOutputShape } from '@seleniumhq/side-api'
+import { PluginPreloadOutputShape, RecordNewCommandInput } from '@seleniumhq/side-api'
 
 export interface RecordingState {
   typeTarget: HTMLElement | null
@@ -110,7 +110,7 @@ export default class Recorder {
     insertBeforeLastCommand: boolean = false,
     actualFrameLocation?: string
   ) {
-    let newCommand = {
+    let newCommand: RecordNewCommandInput = {
       command,
       target,
       value,

Diff for: packages/selenium-ide/src/browser/windows/ProjectEditor/tabs/Tests/TestCommandEditor.tsx

@@ -37,7 +37,6 @@ const CommandEditor: FC<CommandEditorProps> = ({
     selectedCommandIndexes.length !== 1 ||
     !commands[correctedCommand.command]
   ) {
-    console.log(selectedCommandIndexes)
     return (
       <Stack className="p-4" spacing={1}>
         <Typography className="centered py-4" variant="body2">

Diff for: packages/selenium-ide/src/main/session/controllers/Driver/index.ts

@@ -142,7 +142,7 @@ export default class DriverController extends BaseController {
 
   async stopProcess(): Promise<null | string> {
     if (this.driverProcess) {
-      const procKilled = this.driverProcess.kill(9)
+      const procKilled = await this.driverProcess.kill(9)
       WebdriverDebugLog('Killed driver?', procKilled)
     }
     return null

Diff for: packages/selenium-ide/src/main/session/controllers/Driver/start.ts

@@ -59,13 +59,14 @@ const getDriver = ({ browser, version }: BrowserInfo) =>
 export type StartDriver = (
   session: Session
 ) => (info: BrowserInfo) => Promise<DriverStartSuccess | DriverStartFailure>
+
 const startDriver: StartDriver = () => (info) =>
   new Promise((resolve) => {
     let initialized = false
     const args = ['--verbose', `--port=${port}`]
     const driverPath = getDriver(info)
     if (fs.existsSync(driverPath)) {
-      const driver = spawn(driverPath.replace(/\s/g, '\ '), args, {
+      const driver = spawn(driverPath.replace(/\s/g, ' '), args, {
         env: {},
         shell: false,
       })
@@ -77,6 +78,16 @@ const startDriver: StartDriver = () => (info) =>
           initialized = true
           WebdriverDebugLog('Driver has initialized!')
           resolve({ success: true, driver: driver })
+          process.on('beforeExit', async () => {
+            console.log('Exiting?');
+            try {
+              if (!driver.killed) {
+                await driver.kill(9)
+              }
+            } catch (e) {
+              console.warn('Failed ot kill driver', e)
+            }
+          })
         }
       })
       driver.stderr.on('data', (err: string) => {

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

@@ -60,6 +60,9 @@ export default class PluginsController extends BaseController {
       ipcMain.on(key, handler)
       this.pluginHooks[index][key] = handler
     })
+    if (plugin.hooks?.onLoad) {
+      await plugin.hooks.onLoad(this.session.api)
+    }
   }
 
   async unload(plugin: PluginShape) {
@@ -69,6 +72,9 @@ export default class PluginsController extends BaseController {
     Object.entries(hooks).forEach(([key, handler]) => {
       ipcMain.off(key, handler)
     })
+    if (plugin.hooks?.onUnload) {
+      await plugin.hooks.onUnload(this.session.api)
+    }
   }
   // This needs to build before commands
   priority = 3

Diff for: packages/selenium-ide/src/main/session/controllers/Projects/index.ts

@@ -174,9 +174,9 @@ export default class ProjectsController {
     let project: ProjectShape
     try {
       project = JSON.parse(fileContents)
-      project.plugins = project.plugins.filter(
+      project.plugins = project?.plugins?.filter(
         (plugin) => typeof plugin === 'string'
-      )
+      ) ?? []
       return project
     } catch (e) {
       console.log((e as Error).message)

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

@@ -1,6 +1,6 @@
 import { CommandShape } from '@seleniumhq/side-model'
 import { getActiveCommand, getActiveTest, getActiveCommandIndex } from '@seleniumhq/side-api/dist/helpers/getActiveData'
-import { LocatorFields, CoreSessionData } from '@seleniumhq/side-api'
+import { LocatorFields, CoreSessionData, RecordNewCommandInput } from '@seleniumhq/side-api'
 import { randomInt, randomUUID } from 'crypto'
 import { relative } from 'path'
 import BaseController from '../Base'
@@ -61,15 +61,6 @@ const getLastActiveWindowHandleId = (session: CoreSessionData): string => {
 
   return 'root'
 }
-export interface RecordNewCommandInput {
-  command: string
-  target: string | [string, string][]
-  value: string | [string, string][]
-  insertBeforeLastCommand?: boolean
-  frameLocation?: string
-  winHandleId?: string
-}
-
 export default class RecorderController extends BaseController {
   windowIDs: number[] = []
 

Diff for: packages/selenium-ide/src/main/session/controllers/System/index.ts

@@ -47,12 +47,13 @@ export default class SystemController extends BaseController {
       message: error,
       type: 'error',
     })
-    await this.shutdown()
     await this.quit()
+    throw new Error(error)
   }
 
   async quit() {
     await this.shutdown()
+    await this.session.windows.closeAll()
     if (this.isDown) {
       this.session.app.quit()
     }

Diff for: packages/side-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-api",
-  "version": "4.0.0-alpha.29",
+  "version": "4.0.0-alpha.30",
   "private": false,
   "description": "Selenium IDE API command shapes and such",
   "author": "Todd Tarsi <[email protected]>",
@@ -20,7 +20,7 @@
     "@seleniumhq/browser-info": "^4.0.0-alpha.1",
     "@seleniumhq/get-driver": "^4.0.0-alpha.2",
     "@seleniumhq/side-model": "^4.0.0-alpha.4",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.28",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.29",
     "lodash": "^4.17.21"
   },
   "devDependencies": {

Diff for: packages/side-api/src/classes/ProxyTrap.ts

@@ -1,5 +1,5 @@
 import set from 'lodash/fp/set'
-import { ApiHandler } from '../types'
+import { ApiHandler } from '../types/base'
 
 type NotVagueShape = null | boolean | string | number
 type MaybeVagueShape = VagueShape | NotVagueShape

Diff for: packages/side-api/src/commands/driver/download.ts

@@ -1,4 +1,4 @@
-import { BrowserInfo } from '../../types'
+import { BrowserInfo } from '../../types/base'
 
 /**
  * Download a driver needed to instrument an available browser.

Diff for: packages/side-api/src/commands/driver/listBrowsers.ts

@@ -1,4 +1,4 @@
-import { BrowsersInfo } from '../../types'
+import { BrowsersInfo } from '../../types/base'
 
 /**
  * List available browsers to be driven.

Diff for: packages/side-api/src/commands/driver/selectBrowser.ts

@@ -1,4 +1,4 @@
-import { BrowserInfo } from '../../types'
+import { BrowserInfo } from '../../types/base'
 
 /**
  * Select a browser to run. Currently only Electron is allowed.

Diff for: packages/side-api/src/commands/driver/startProcess.ts

@@ -1,4 +1,4 @@
-import { BrowserInfo } from '../../types'
+import { BrowserInfo } from '../../types/base'
 
 /**
  * Start the driver process for the browser, eg Chromedriver etc..

Diff for: packages/side-api/src/commands/playback/onAfter.ts

@@ -1,4 +1,4 @@
-import { BaseListener } from '../../types'
+import { BaseListener } from '../../types/base'
 
 /**
  * Runs after a test completes

Diff for: packages/side-api/src/commands/playback/onAfterAll.ts

@@ -1,4 +1,4 @@
-import { BaseListener } from '../../types'
+import { BaseListener } from '../../types/base'
 
 /**
  * Runs after a suite completes

Diff for: packages/side-api/src/commands/playback/onBefore.ts

@@ -1,4 +1,4 @@
-import { BaseListener } from '../../types'
+import { BaseListener } from '../../types/base'
 
 /**
  * Runs before a test begins

Diff for: packages/side-api/src/commands/playback/onPlayUpdate.ts

@@ -4,7 +4,7 @@ import {
   CoreSessionData,
   EventMutator,
   StateShape,
-} from '../../types'
+} from '../../types/base'
 import { badIndex } from '../../constants/badIndex'
 
 /**

Diff for: packages/side-api/src/commands/playback/onStepUpdate.ts

@@ -2,7 +2,7 @@ import { TestShape } from '@seleniumhq/side-model'
 import { PlaybackEventShapes } from '@seleniumhq/side-runtime'
 import merge from 'lodash/fp/merge'
 import { getActiveTest, getCommandIndex } from '../../helpers/getActiveData'
-import { BaseListener, EventMutator, StateShape } from '../../types'
+import { BaseListener, EventMutator, StateShape } from '../../types/base'
 import { EditorStateShape, PlaybackStateShape } from '../../models/state'
 
 /**

Diff for: packages/side-api/src/commands/playback/pause.ts

@@ -1,5 +1,5 @@
 import set from 'lodash/fp/set'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Pause a running test. Can be resumed.

Diff for: packages/side-api/src/commands/playback/play.ts

@@ -1,5 +1,5 @@
 import { defaultPlaybackState } from '../../models'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Start a running test, using a range to optionally control start

Diff for: packages/side-api/src/commands/playback/playSuite.ts

@@ -1,6 +1,6 @@
 import set from 'lodash/fp/set'
 import { defaultPlaybackState } from '../../models'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Start running a test suite. Results should be processed using

Diff for: packages/side-api/src/commands/playback/resume.ts

@@ -1,5 +1,5 @@
 import set from 'lodash/fp/set'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Resume running a paused test

Diff for: packages/side-api/src/commands/playback/stop.ts

@@ -1,5 +1,5 @@
 import set from 'lodash/fp/set'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Abort a test. Can not be resumed

Diff for: packages/side-api/src/commands/plugins/projectCreate.ts

@@ -1,5 +1,5 @@
 import update from 'lodash/fp/update'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Add a plugin to the current project

Diff for: packages/side-api/src/commands/plugins/projectDelete.ts

@@ -1,5 +1,5 @@
 import update from 'lodash/fp/update'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Remove a plugin from the current project

Diff for: packages/side-api/src/commands/plugins/projectEdit.ts

@@ -1,5 +1,5 @@
 import update from 'lodash/fp/update'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Update the path to a plugin on the current project

Diff for: packages/side-api/src/commands/projects/load.ts

@@ -1,5 +1,5 @@
 import { loadingID } from '../../constants/loadingID'
-import { CoreSessionData, Mutator } from '../../types'
+import { CoreSessionData, Mutator } from '../../types/base'
 
 /**
  * Loads the project editor for a path

Diff for: packages/side-api/src/commands/projects/new.ts

@@ -1,5 +1,5 @@
 import { ProjectShape } from '@seleniumhq/side-model'
-import { Mutator } from '../../types'
+import { Mutator } from '../../types/base'
 
 /**
  * Creates a new project

Diff for: packages/side-api/src/commands/projects/update.ts

@@ -1,7 +1,7 @@
 import { ProjectShape } from '@seleniumhq/side-model'
 import merge from 'lodash/fp/merge'
 import update from 'lodash/fp/update'
-import { CoreSessionData, Mutator } from '../../types'
+import { CoreSessionData, Mutator } from '../../types/base'
 
 /**
  * Edits project level config flags, like name or url.

Diff for: packages/side-api/src/commands/recorder/onFrameDeleted.ts

@@ -1,4 +1,4 @@
-import { BaseListener } from '../../types'
+import { BaseListener } from '../../types/base'
 
 export type OnFrameDeletedRecorder = []
 

Diff for: packages/side-api/src/commands/recorder/onFrameRecalculate.ts

@@ -1,4 +1,4 @@
-import { BaseListener } from '../../types'
+import { BaseListener } from '../../types/base'
 
 export type OnFrameRecalculateRecorder = []
 

Diff for: packages/side-api/src/commands/recorder/onHighlightElement.ts

@@ -1,4 +1,4 @@
-import { BaseListener } from '../../types'
+import { BaseListener } from '../../types/base'
 
 /**
  * Called when the project editor asks the recorder to highlight an element

Diff for: packages/side-api/src/commands/recorder/onNewWindow.ts

@@ -1,5 +1,9 @@
 import { CommandShape } from '@seleniumhq/side-model'
-import { BaseListener, EventMutator, RecordNewCommandInput } from '../../types'
+import {
+  BaseListener,
+  EventMutator,
+  RecordNewCommandInput,
+} from '../../types/base'
 import { mutator as recordNewCommandMutator } from './recordNewCommand'
 import { mutator as updateStepTestsMutator } from '../tests/updateStep'
 import { getActiveCommand } from '../../helpers/getActiveData'

Diff for: packages/side-api/src/commands/recorder/onRequestSelectElement.ts

@@ -1,4 +1,4 @@
-import { BaseListener, LocatorFields } from '../../types'
+import { BaseListener, LocatorFields } from '../../types/base'
 
 /**
  * Called when the project editor asks the recorder to select an element.