appium-desktop-driver 1.7.2-preview.1 → 1.7.2

package/build/lib/commands/screen-recorder.js

@@ -4,7 +4,7 @@ exports.ScreenRecorder = exports.DEFAULT_EXT = void 0;
 exports.uploadRecordedMedia = uploadRecordedMedia;
 const support_1 = require("appium/support");
 const asyncbox_1 = require("asyncbox");
-const node_child_process_1 = require("node:child_process");
+const teen_process_1 = require("teen_process");
 const util_1 = require("../util");
 const RETRY_PAUSE = 300;
 const RETRY_TIMEOUT = 5000;
@@ -13,12 +13,12 @@ const PROCESS_SHUTDOWN_TIMEOUT = 10 * 1000;
 exports.DEFAULT_EXT = 'mp4';
 const DEFAULT_FPS = 15;
 const DEFAULT_PRESET = 'veryfast';
-async function requireFfmpegPath(driver) {
-    const bundled = await (0, util_1.getBundledFfmpegPath)(driver);
+async function requireFfmpegPath() {
+    const bundled = (0, util_1.getBundledFfmpegPath)();
     if (bundled) {
         return bundled;
     }
-    const ffmpegBinary = 'ffmpeg.exe';
+    const ffmpegBinary = `ffmpeg${support_1.system.isWindows() ? '.exe' : ''}`;
     try {
         return await support_1.fs.which(ffmpegBinary);
     }
@@ -45,7 +45,7 @@ async function uploadRecordedMedia(localFile, remotePath, uploadOptions = {}) {
     return '';
 }
 class ScreenRecorder {
-    _driver;
+    log;
     _videoPath;
     _process = null;
     _fps;
@@ -55,8 +55,8 @@ class ScreenRecorder {
     _preset;
     _videoFilter;
     _timeLimit;
-    constructor(videoPath, driver, opts = {}) {
-        this._driver = driver;
+    constructor(videoPath, log, opts = {}) {
+        this.log = log;
         this._videoPath = videoPath;
         this._fps = opts.fps && opts.fps > 0 ? opts.fps : DEFAULT_FPS;
         this._audioInput = opts.audioInput;
@@ -77,13 +77,13 @@ class ScreenRecorder {
         return this._videoPath;
     }
     isRunning() {
-        return !!this._process && !this._process.killed;
+        return !!this._process?.isRunning;
     }
     async _enforceTermination() {
         if (this._process && this.isRunning()) {
-            this._driver.log.debug('Force-stopping the currently running video recording');
+            this.log.debug('Force-stopping the currently running video recording');
             try {
-                this._process.kill('SIGKILL');
+                await this._process.stop('SIGKILL');
             }
             catch { }
         }
@@ -95,7 +95,7 @@ class ScreenRecorder {
         return '';
     }
     async start() {
-        const ffmpegPath = await requireFfmpegPath(this._driver);
+        const ffmpegPath = await requireFfmpegPath();
         const args = [
             '-loglevel', 'error',
             '-t', String(this._timeLimit),
@@ -115,34 +115,25 @@ class ScreenRecorder {
             ...(this._videoFilter ? ['-filter:v', this._videoFilter] : []),
             this._videoPath,
         ];
-        this._process = (0, node_child_process_1.spawn)(ffmpegPath, args, { windowsHide: true });
-        this._driver.log.debug(`Starting ffmpeg: ${support_1.util.quote([ffmpegPath, ...args])}`);
-        this._process.stdout.on('data', (data) => {
-            const out = data.toString();
-            if (out.trim()) {
-                this._driver.log.debug(`[ffmpeg] ${out.trim()}`);
-            }
-        });
-        this._process.stderr.on('data', (data) => {
-            const out = data.toString();
-            if (out.trim()) {
-                this._driver.log.debug(`[ffmpeg] ${out.trim()}`);
+        this._process = new teen_process_1.SubProcess(ffmpegPath, args, { windowsHide: true });
+        this.log.debug(`Starting ffmpeg: ${support_1.util.quote([ffmpegPath, ...args])}`);
+        this._process.on('output', (stdout, stderr) => {
+            const out = stdout || stderr;
+            if (out?.trim()) {
+                this.log.debug(`[ffmpeg] ${out}`);
             }
         });
         this._process.once('exit', async (code, signal) => {
             this._process = null;
             if (code === 0) {
-                this._driver.log.debug('Screen recording exited without errors');
+                this.log.debug('Screen recording exited without errors');
             }
             else {
                 await this._enforceTermination();
-                this._driver.log.warn(`Screen recording exited with error code ${code}, signal ${signal}`);
+                this.log.warn(`Screen recording exited with error code ${code}, signal ${signal}`);
             }
         });
-        await new Promise((resolve, reject) => {
-            this._process?.once('error', reject);
-            setTimeout(resolve, 50);
-        });
+        await this._process.start(0);
         try {
             await (0, asyncbox_1.waitForCondition)(async () => {
                 if (await this.getVideoPath()) {
@@ -159,14 +150,14 @@ class ScreenRecorder {
             throw new Error(`The expected screen record file '${this._videoPath}' does not exist. ` +
                 'Check the server log for more details');
         }
-        this._driver.log.info(`The video recording has started. Will timeout in ${support_1.util.pluralize('second', this._timeLimit, true)}`);
+        this.log.info(`The video recording has started. Will timeout in ${support_1.util.pluralize('second', this._timeLimit, true)}`);
     }
     async stop(force = false) {
         if (force) {
             return await this._enforceTermination();
         }
         if (!this.isRunning()) {
-            this._driver.log.debug('Screen recording is not running. Returning the recent result');
+            this.log.debug('Screen recording is not running. Returning the recent result');
             return await this.getVideoPath();
         }
         return new Promise((resolve, reject) => {
@@ -183,8 +174,8 @@ class ScreenRecorder {
                     reject(new Error(`Screen recording exited with error code ${code}, signal ${signal}`));
                 }
             });
-            this._process?.stdin?.write('q');
-            this._process?.stdin?.end();
+            this._process?.proc?.stdin?.write('q');
+            this._process?.proc?.stdin?.end();
         });
     }
 }

package/build/lib/commands/screen-recorder.js.map

@@ -1 +1 @@
-{"version":3,"file":"screen-recorder.js","sourceRoot":"","sources":["../../../lib/commands/screen-recorder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"screen-recorder.js","sourceRoot":"","sources":["../../../lib/commands/screen-recorder.ts"],"names":[],"mappings":"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"}

package/build/lib/constraints.d.ts

@@ -34,44 +34,25 @@ export declare const UI_AUTOMATION_DRIVER_CONSTRAINTS: {
     readonly isolatedScriptExecution: {
         readonly isBoolean: true;
     };
-    readonly deviceName: {
-        readonly isString: true;
-    };
-    readonly systemPort: {
-        readonly isNumber: true;
+    readonly appEnvironment: {
+        readonly isObject: true;
     };
     readonly 'ms:waitForAppLaunch': {
         readonly isNumber: true;
     };
-    readonly 'ms:experimental-webdriver': {
-        readonly isBoolean: true;
-    };
     readonly 'ms:forcequit': {
         readonly isBoolean: true;
     };
-    readonly logFile: {};
-    readonly webviewEnabled: {
+    readonly returnAllWindowHandles: {
         readonly isBoolean: true;
     };
-    readonly webviewDevtoolsPort: {
+    readonly 'ms:windowSwitchRetries': {
         readonly isNumber: true;
     };
-    readonly chromedriverCdnUrl: {
-        readonly isString: true;
-    };
-    readonly edgedriverCdnUrl: {
-        readonly isString: true;
-    };
-    readonly chromedriverExecutablePath: {
-        readonly isString: true;
-    };
-    readonly edgedriverExecutablePath: {
-        readonly isString: true;
-    };
-    readonly ffmpegExecutablePath: {
-        readonly isString: true;
+    readonly 'ms:windowSwitchInterval': {
+        readonly isNumber: true;
     };
 };
 export default UI_AUTOMATION_DRIVER_CONSTRAINTS;
-export type NovaWindowsDriverConstraints = typeof UI_AUTOMATION_DRIVER_CONSTRAINTS;
+export type AppiumDesktopDriverConstraints = typeof UI_AUTOMATION_DRIVER_CONSTRAINTS;
 //# sourceMappingURL=constraints.d.ts.map

package/build/lib/constraints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyEb,CAAC;AAEjC,eAAe,gCAAgC,CAAC;AAEhD,MAAM,MAAM,4BAA4B,GAAG,OAAO,gCAAgC,CAAC"}
+{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDb,CAAC;AAEjC,eAAe,gCAAgC,CAAC;AAEhD,MAAM,MAAM,8BAA8B,GAAG,OAAO,gCAAgC,CAAC"}

package/build/lib/constraints.js

@@ -37,42 +37,23 @@ exports.UI_AUTOMATION_DRIVER_CONSTRAINTS = {
     isolatedScriptExecution: {
         isBoolean: true,
     },
-    deviceName: {
-        isString: true,
-    },
-    systemPort: {
-        isNumber: true,
+    appEnvironment: {
+        isObject: true,
     },
     'ms:waitForAppLaunch': {
         isNumber: true,
     },
-    'ms:experimental-webdriver': {
-        isBoolean: true,
-    },
     'ms:forcequit': {
         isBoolean: true,
     },
-    logFile: {},
-    webviewEnabled: {
+    returnAllWindowHandles: {
         isBoolean: true,
     },
-    webviewDevtoolsPort: {
+    'ms:windowSwitchRetries': {
         isNumber: true,
     },
-    chromedriverCdnUrl: {
-        isString: true,
-    },
-    edgedriverCdnUrl: {
-        isString: true,
-    },
-    chromedriverExecutablePath: {
-        isString: true,
-    },
-    edgedriverExecutablePath: {
-        isString: true,
-    },
-    ffmpegExecutablePath: {
-        isString: true,
+    'ms:windowSwitchInterval': {
+        isNumber: true,
     },
 };
 exports.default = exports.UI_AUTOMATION_DRIVER_CONSTRAINTS;

package/build/lib/constraints.js.map

@@ -1 +1 @@
-{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":";;;AAEa,QAAA,gCAAgC,GAAG;IAC5C,YAAY,EAAE;QACV,QAAQ,EAAE,IAAI;QACd,wBAAwB,EAAE,CAAC,SAAS,CAAC;QACrC,QAAQ,EAAE,IAAI;KACjB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,IAAI;KACjB;IACD,gBAAgB,EAAE;QACd,QAAQ,EAAE,IAAI;KACjB;IACD,eAAe,EAAE;QACb,QAAQ,EAAE,IAAI;KACjB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,IAAI;KACjB;IACD,cAAc,EAAE;QACZ,SAAS,EAAE,IAAI;KAClB;IACD,YAAY,EAAE;QACV,QAAQ,EAAE,IAAI;KACjB;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,IAAI;KACjB;IACD,MAAM,EAAE;QACJ,QAAQ,EAAE,IAAI;KACjB;IACD,OAAO,EAAE;QACL,QAAQ,EAAE,IAAI;KACjB;IACD,uBAAuB,EAAE;QACrB,SAAS,EAAE,IAAI;KAClB;IACD,UAAU,EAAE;QACR,QAAQ,EAAE,IAAI;KACjB;IACD,UAAU,EAAE;QACR,QAAQ,EAAE,IAAI;KACjB;IACD,qBAAqB,EAAE;QACnB,QAAQ,EAAE,IAAI;KACjB;IACD,2BAA2B,EAAE;QACzB,SAAS,EAAE,IAAI;KAClB;IACD,cAAc,EAAE;QACZ,SAAS,EAAE,IAAI;KAClB;IACD,OAAO,EAAE,EAAE;IACX,cAAc,EAAE;QACZ,SAAS,EAAE,IAAI;KAClB;IACD,mBAAmB,EAAE;QACjB,QAAQ,EAAE,IAAI;KACjB;IACD,kBAAkB,EAAE;QAChB,QAAQ,EAAE,IAAI;KACjB;IACD,gBAAgB,EAAE;QACd,QAAQ,EAAE,IAAI;KACjB;IACD,0BAA0B,EAAE;QACxB,QAAQ,EAAE,IAAI;KACjB;IACD,wBAAwB,EAAE;QACtB,QAAQ,EAAE,IAAI;KACjB;IACD,oBAAoB,EAAE;QAClB,QAAQ,EAAE,IAAI;KACjB;CAC2B,CAAC;AAEjC,kBAAe,wCAAgC,CAAC"}
+{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":";;;AAEa,QAAA,gCAAgC,GAAG;IAC5C,YAAY,EAAE;QACV,QAAQ,EAAE,IAAI;QACd,wBAAwB,EAAE,CAAC,SAAS,CAAC;QACrC,QAAQ,EAAE,IAAI;KACjB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,IAAI;KACjB;IACD,gBAAgB,EAAE;QACd,QAAQ,EAAE,IAAI;KACjB;IACD,eAAe,EAAE;QACb,QAAQ,EAAE,IAAI;KACjB;IACD,iBAAiB,EAAE;QACf,QAAQ,EAAE,IAAI;KACjB;IACD,cAAc,EAAE;QACZ,SAAS,EAAE,IAAI;KAClB;IACD,YAAY,EAAE;QACV,QAAQ,EAAE,IAAI;KACjB;IACD,aAAa,EAAE;QACX,QAAQ,EAAE,IAAI;KACjB;IACD,MAAM,EAAE;QACJ,QAAQ,EAAE,IAAI;KACjB;IACD,OAAO,EAAE;QACL,QAAQ,EAAE,IAAI;KACjB;IACD,uBAAuB,EAAE;QACrB,SAAS,EAAE,IAAI;KAClB;IACD,cAAc,EAAE;QACZ,QAAQ,EAAE,IAAI;KACjB;IACD,qBAAqB,EAAE;QACnB,QAAQ,EAAE,IAAI;KACjB;IACD,cAAc,EAAE;QACZ,SAAS,EAAE,IAAI;KAClB;IACD,sBAAsB,EAAE;QACpB,SAAS,EAAE,IAAI;KAClB;IACD,wBAAwB,EAAE;QACtB,QAAQ,EAAE,IAAI;KACjB;IACD,yBAAyB,EAAE;QACvB,QAAQ,EAAE,IAAI;KACjB;CAC2B,CAAC;AAEjC,kBAAe,wCAAgC,CAAC"}

package/build/lib/driver.d.ts

@@ -1,12 +1,10 @@
 import { BaseDriver } from '@appium/base-driver';
+import { ChildProcessWithoutNullStreams } from 'node:child_process';
 import type { ScreenRecorder } from './commands/screen-recorder';
-import { NovaWindowsDriverConstraints } from './constraints';
-import { NovaUIAutomationClient } from './server/client';
-import { LogFileMirror } from './log-file';
-import type { Chromedriver } from 'appium-chromedriver';
-import type { DefaultCreateSessionResult, DriverData, Element, ExternalDriver, InitialOpts, RouteMatcher, StringRecord, W3CDriverCaps } from '@appium/types';
-type W3CNovaWindowsDriverCaps = W3CDriverCaps<NovaWindowsDriverConstraints>;
-type DefaultWindowsCreateSessionResult = DefaultCreateSessionResult<NovaWindowsDriverConstraints>;
+import { AppiumDesktopDriverConstraints } from './constraints';
+import type { DefaultCreateSessionResult, DriverData, Element, InitialOpts, StringRecord, W3CDriverCaps } from '@appium/types';
+type W3CAppiumDesktopDriverCaps = W3CDriverCaps<AppiumDesktopDriverConstraints>;
+type DefaultWindowsCreateSessionResult = DefaultCreateSessionResult<AppiumDesktopDriverConstraints>;
 type KeyboardState = {
     pressed: Set<string>;
     shift: boolean;
@@ -15,30 +13,23 @@ type KeyboardState = {
     alt: boolean;
 };
 declare const LOCATION_STRATEGIES: readonly ["id", "name", "xpath", "tag name", "class name", "accessibility id", "-windows uiautomation"];
-export declare class AppiumDesktopDriver extends BaseDriver<NovaWindowsDriverConstraints, StringRecord> {
-    serverClient?: NovaUIAutomationClient;
+export declare class AppiumDesktopDriver extends BaseDriver<AppiumDesktopDriverConstraints, StringRecord> {
+    isPowerShellSessionStarted: boolean;
+    powerShell?: ChildProcessWithoutNullStreams;
+    powerShellStdOut: string;
+    powerShellStdErr: string;
+    appProcessIds: number[];
     keyboardState: KeyboardState;
-    chromedriver: Chromedriver | null;
-    proxyReqRes: ((...args: any) => any) | null;
-    proxyCommand: ExternalDriver['proxyCommand'] | null;
-    contexts: string[];
-    jwpProxyActive: boolean;
-    currentContext: string | null;
+    mouseButtonsDown: Set<number>;
     _screenRecorder: ScreenRecorder | null;
-    _logFileMirror: LogFileMirror | null;
-    webviewDevtoolsPort: number | null;
     constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
-    sendCommand(method: string, params?: Record<string, unknown>): Promise<unknown>;
-    canProxy(): boolean;
-    proxyActive(): boolean;
-    getProxyAvoidList(): RouteMatcher[];
     findElement(strategy: string, selector: string): Promise<Element>;
     findElements(strategy: string, selector: string): Promise<Element[]>;
     findElementFromElement(strategy: string, selector: string, elementId: string): Promise<Element>;
     findElementsFromElement(strategy: string, selector: string, elementId: string): Promise<Element[]>;
     findElOrEls(strategy: typeof LOCATION_STRATEGIES[number], selector: string, mult: true, context?: string): Promise<Element[]>;
     findElOrEls(strategy: typeof LOCATION_STRATEGIES[number], selector: string, mult: false, context?: string): Promise<Element>;
-    createSession(jwpCaps: W3CNovaWindowsDriverCaps, reqCaps?: W3CNovaWindowsDriverCaps, w3cCaps?: W3CNovaWindowsDriverCaps, driverData?: DriverData[]): Promise<DefaultWindowsCreateSessionResult>;
+    createSession(jwpCaps: W3CAppiumDesktopDriverCaps, reqCaps?: W3CAppiumDesktopDriverCaps, w3cCaps?: W3CAppiumDesktopDriverCaps, driverData?: DriverData[]): Promise<DefaultWindowsCreateSessionResult>;
     deleteSession(sessionId?: string | null | undefined): Promise<void>;
     private processSelector;
 }

package/build/lib/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACH,8BAA8B,EAEjC,MAAM,eAAe,CAAC;AAoBvB,OAAO,KAAK,EACR,0BAA0B,EAC1B,UAAU,EACV,OAAO,EACP,WAAW,EACX,YAAY,EACZ,aAAa,EAChB,MAAM,eAAe,CAAC;AAEvB,KAAK,0BAA0B,GAAG,aAAa,CAAC,8BAA8B,CAAC,CAAC;AAChF,KAAK,iCAAiC,GAAG,0BAA0B,CAAC,8BAA8B,CAAC,CAAC;AAEpG,KAAK,aAAa,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;CAChB,CAAA;AAED,QAAA,MAAM,mBAAmB,yGAQd,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,UAAU,CAAC,8BAA8B,EAAE,YAAY,CAAC;IAC7F,0BAA0B,EAAE,OAAO,CAAS;IAC5C,UAAU,CAAC,EAAE,8BAA8B,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAM;IAC9B,gBAAgB,EAAE,MAAM,CAAM;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,aAAa,EAAE,aAAa,CAM1B;IACF,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC1C,eAAe,EAAE,cAAc,GAAG,IAAI,CAAQ;gBAElC,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAa7D,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKjE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKpE,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK/F,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKlG,WAAW,CAAC,QAAQ,EAAE,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7H,WAAW,CAAC,QAAQ,EAAE,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8C5H,aAAa,CACxB,OAAO,EAAE,0BAA0B,EACnC,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,0BAA0B,EACpC,UAAU,CAAC,EAAE,UAAU,EAAE,GAC1B,OAAO,CAAC,iCAAiC,CAAC;IA0D9B,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiClF,OAAO,CAAC,eAAe;CA4B1B"}

package/build/lib/driver.js

@@ -8,11 +8,7 @@ const base_driver_1 = require("@appium/base-driver");
 const support_1 = require("appium/support");
 const commands_1 = __importDefault(require("./commands"));
 const constraints_1 = require("./constraints");
-const converter_1 = require("./powershell/converter");
-const converter_bridge_1 = require("./server/converter-bridge");
-const conditions_1 = require("./server/conditions");
-const log_file_1 = require("./log-file");
-const version_1 = require("./version");
+const powershell_1 = require("./powershell");
 const util_1 = require("./util");
 const user32_1 = require("./winapi/user32");
 const xpath_1 = require("./xpath");
@@ -25,29 +21,12 @@ const LOCATION_STRATEGIES = Object.freeze([
     'accessibility id',
     '-windows uiautomation',
 ]);
-// This is a set of methods and paths that we never want to proxy to Chromedriver.
-const CHROMEDRIVER_NO_PROXY = [
-    ['GET', new RegExp('^/session/[^/]+/appium')],
-    ['GET', new RegExp('^/session/[^/]+/context')],
-    ['GET', new RegExp('^/session/[^/]+/element/[^/]+/rect')],
-    ['GET', new RegExp('^/session/[^/]+/orientation')],
-    ['POST', new RegExp('^/session/[^/]+/appium')],
-    ['POST', new RegExp('^/session/[^/]+/context')],
-    ['POST', new RegExp('^/session/[^/]+/orientation')],
-    // this is needed to make the windows: and powerShell commands work in web context
-    ['POST', new RegExp('^/session/[^/]+/execute$')],
-    ['POST', new RegExp('^/session/[^/]+/execute/sync')],
-    // MJSONWP commands
-    ['GET', new RegExp('^/session/[^/]+/log/types$')],
-    ['POST', new RegExp('^/session/[^/]+/log$')],
-    // W3C commands
-    // For Selenium v4 (W3C does not have this route)
-    ['GET', new RegExp('^/session/[^/]+/se/log/types$')],
-    // For Selenium v4 (W3C does not have this route)
-    ['POST', new RegExp('^/session/[^/]+/se/log$')],
-];
 class AppiumDesktopDriver extends base_driver_1.BaseDriver {
-    serverClient;
+    isPowerShellSessionStarted = false;
+    powerShell;
+    powerShellStdOut = '';
+    powerShellStdErr = '';
+    appProcessIds = [];
     keyboardState = {
         pressed: new Set(),
         alt: false,
@@ -55,40 +34,18 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
         meta: false,
         shift: false,
     };
-    chromedriver = null;
-    proxyReqRes = null;
-    proxyCommand = null;
-    contexts = [];
-    jwpProxyActive = false;
-    currentContext = null;
+    mouseButtonsDown = new Set();
     _screenRecorder = null;
-    _logFileMirror = null;
-    webviewDevtoolsPort = null;
     constructor(opts = {}, shouldValidateCaps = true) {
         super(opts, shouldValidateCaps);
         this.locatorStrategies = [...LOCATION_STRATEGIES];
         this.desiredCapConstraints = constraints_1.UI_AUTOMATION_DRIVER_CONSTRAINTS;
         // Bind commands to this instance (not prototype) so each driver instance uses its own
-        // server client and state when multiple sessions exist
+        // PowerShell session and state when multiple sessions exist
         for (const key in commands_1.default) { // TODO: create a decorator that will do that for the class
             this[key] = commands_1.default[key].bind(this);
         }
     }
-    async sendCommand(method, params = {}) {
-        if (!this.serverClient) {
-            throw new base_driver_1.errors.UnknownError('NovaUIAutomationServer is not running.');
-        }
-        return await this.serverClient.sendCommand(method, params);
-    }
-    canProxy() {
-        return true;
-    }
-    proxyActive() {
-        return this.jwpProxyActive;
-    }
-    getProxyAvoidList() {
-        return this.jwpProxyActive && this.chromedriver ? CHROMEDRIVER_NO_PROXY : [];
-    }
     async findElement(strategy, selector) {
         [strategy, selector] = this.processSelector(strategy, selector);
         return super.findElement(strategy, selector);
@@ -109,47 +66,40 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
         let condition;
         switch (strategy) {
             case 'id':
-                condition = (0, conditions_1.propertyCondition)('RuntimeId', selector.split('.').map(Number));
+                condition = new powershell_1.PropertyCondition(powershell_1.Property.RUNTIME_ID, new powershell_1.PSInt32Array(selector.split('.').map(Number)));
                 break;
             case 'tag name':
-                // WinAppDriver matches LocalizedControlType (lowercase, locale-dependent: "button", "edit").
-                // Nova historically matches ControlType (PascalCase: "Button", "Edit").
-                // Detect which style the selector uses to support both transparently.
-                condition = selector === selector.toLowerCase()
-                    ? (0, conditions_1.propertyCondition)('LocalizedControlType', selector)
-                    : (0, conditions_1.propertyCondition)('ControlType', selector);
+                condition = new powershell_1.PropertyCondition(powershell_1.Property.CONTROL_TYPE, new powershell_1.PSControlType(selector));
                 break;
             case 'accessibility id':
-                condition = (0, conditions_1.propertyCondition)('AutomationId', selector);
+                condition = new powershell_1.PropertyCondition(powershell_1.Property.AUTOMATION_ID, new powershell_1.PSString(selector));
                 break;
             case 'name':
-                condition = (0, conditions_1.propertyCondition)('Name', selector);
+                condition = new powershell_1.PropertyCondition(powershell_1.Property.NAME, new powershell_1.PSString(selector));
                 break;
             case 'class name':
-                condition = (0, conditions_1.propertyCondition)('ClassName', selector);
+                condition = new powershell_1.PropertyCondition(powershell_1.Property.CLASS_NAME, new powershell_1.PSString(selector));
                 break;
             case '-windows uiautomation':
-                condition = (0, converter_bridge_1.conditionToDto)((0, converter_1.convertStringToCondition)(selector));
+                condition = (0, powershell_1.convertStringToCondition)(selector);
                 break;
             case 'xpath':
-                return await (0, xpath_1.xpathToElIdOrIds)(selector, mult, context, this.sendCommand.bind(this));
+                return await (0, xpath_1.xpathToElIdOrIds)(selector, mult, context, this.sendPowerShellCommand.bind(this));
             default:
                 throw new base_driver_1.errors.InvalidArgumentError(`Invalid find strategy ${strategy}`);
         }
-        const params = {
-            scope: 'descendants',
-            condition,
-            contextElementId: context ?? null,
-        };
+        const searchContext = context ? new powershell_1.FoundAutomationElement(context) : powershell_1.AutomationElement.automationRoot;
         if (mult) {
-            const result = await this.sendCommand('findElements', params);
-            return (result ?? []).map((elId) => ({ [base_driver_1.W3C_ELEMENT_KEY]: elId }));
+            const result = await this.sendPowerShellCommand(searchContext.findAll(powershell_1.TreeScope.DESCENDANTS, condition).buildCommand());
+            const elIds = result.split('\n').map((elId) => elId.trim()).filter(Boolean);
+            return elIds.filter(Boolean).map((elId) => ({ [base_driver_1.W3C_ELEMENT_KEY]: elId }));
         }
-        const result = await this.sendCommand('findElement', params);
-        if (!result) {
+        const result = await this.sendPowerShellCommand(searchContext.findFirst(powershell_1.TreeScope.DESCENDANTS, condition).buildCommand());
+        const elId = result.trim();
+        if (!elId) {
             throw new base_driver_1.errors.NoSuchElementError();
         }
-        return { [base_driver_1.W3C_ELEMENT_KEY]: result };
+        return { [base_driver_1.W3C_ELEMENT_KEY]: elId };
     }
     async createSession(jwpCaps, reqCaps, w3cCaps, driverData) {
         if (!support_1.system.isWindows()) {
@@ -161,47 +111,33 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
         if (typeof w3cCaps?.firstMatch?.some['appium:appTopLevelWindow'] === 'number') {
             w3cCaps.firstMatch['appium:appTopLevelWindow'] = w3cCaps.firstMatch['appium:appTopLevelWindow'].map(String);
         }
-        // Warn when the same logical capability is sent under both prefixed and unprefixed keys with different values
-        if (w3cCaps?.alwaysMatch) {
-            const am = w3cCaps.alwaysMatch;
-            for (const cap of ['app', 'appArguments', 'appWorkingDir', 'appTopLevelWindow']) {
-                const unprefixed = am[cap];
-                const prefixed = am[`appium:${cap}`];
-                if (unprefixed !== undefined && prefixed !== undefined && unprefixed !== prefixed) {
-                    this.log.warn(`Conflicting values for '${cap}': unprefixed='${unprefixed}', appium:${cap}='${prefixed}'. The appium:-prefixed value takes precedence.`);
-                }
-            }
-        }
         try {
             this.log.debug('Creating AppiumDesktop driver session...');
             const [sessionId, caps] = await super.createSession(jwpCaps, reqCaps, w3cCaps, driverData);
-            if (caps.logFile !== undefined && caps.logFile !== false) {
-                try {
-                    this._logFileMirror = (0, log_file_1.attachLogFileMirror)(this.log, caps.logFile);
-                    this.log.info(`Driver log is being mirrored to ${this._logFileMirror.path}`);
-                }
-                catch (e) {
-                    const msg = e instanceof Error ? e.message : String(e);
-                    this.log.warn(`Failed to attach log file mirror: ${msg}`);
-                }
-            }
-            // Stamp the driver version in the log so we can tell which build is
-            // running — useful when testing across rebuilds. The C# server
-            // prints its own version banner shortly after via stderr → log.
-            this.log.info(`appium-desktop-driver v${version_1.DRIVER_VERSION} (session ${sessionId})`);
             if (caps.smoothPointerMove) {
                 (0, util_1.assertSupportedEasingFunction)(caps.smoothPointerMove);
             }
             if (caps.app && caps.appTopLevelWindow) {
                 throw new base_driver_1.errors.InvalidArgumentError('Invalid capabilities. Specify either app or appTopLevelWindow.');
             }
+            if (caps.appEnvironment) {
+                const invalidKeys = Object.entries(caps.appEnvironment)
+                    .filter(([, v]) => typeof v !== 'string')
+                    .map(([k]) => k);
+                if (invalidKeys.length > 0) {
+                    throw new base_driver_1.errors.InvalidArgumentError(`Invalid capabilities. 'appEnvironment' values must be strings. Invalid keys: ${invalidKeys.join(', ')}`);
+                }
+            }
+            if (caps['ms:windowSwitchRetries'] !== undefined) {
+                (0, util_1.assertIntegerCap)('ms:windowSwitchRetries', caps['ms:windowSwitchRetries'], 0);
+            }
+            if (caps['ms:windowSwitchInterval'] !== undefined) {
+                (0, util_1.assertIntegerCap)('ms:windowSwitchInterval', caps['ms:windowSwitchInterval'], 0);
+            }
             if (this.caps.shouldCloseApp === undefined) {
                 this.caps.shouldCloseApp = true; // set default value
             }
-            if (this.caps.systemPort) {
-                this.log.info(`systemPort capability (${this.caps.systemPort}) is ignored. NovaWindows uses stdin/stdout IPC.`);
-            }
-            await this.startServerSession();
+            await this.startPowerShellSession();
             if (this.caps.prerun) {
                 this.log.info('Executing prerun PowerShell script...');
                 await this.executePowerShellScript(this.caps.prerun);
@@ -217,34 +153,21 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
     }
     async deleteSession(sessionId) {
         this.log.debug('Deleting AppiumDesktop driver session...');
-        if (this.chromedriver) {
-            try {
-                await this.chromedriver.stop();
-            }
-            catch (e) {
-                const msg = e instanceof Error ? e.message : String(e);
-                this.log.warn(`Failed to stop chromedriver during session teardown: ${msg}`);
-            }
-            this.chromedriver = null;
-            this.jwpProxyActive = false;
-            this.proxyReqRes = null;
-            this.proxyCommand = null;
-            this.currentContext = null;
-        }
         if (this.caps.shouldCloseApp && this.caps.app && this.caps.app.toLowerCase() !== 'root') {
             try {
                 if (this.caps['ms:forcequit'] === true) {
-                    // Force quit the process
-                    const isNotNull = await this.sendCommand('checkRootElementNotNull', {});
-                    if (isNotNull) {
-                        const processId = await this.sendCommand('getProperty', { elementId: await this.sendCommand('saveRootElementToTable', {}), property: 'ProcessId' });
-                        await this.sendCommand('stopProcess', { pid: Number(processId), force: true });
-                    }
+                    await this.sendPowerShellCommand(/* ps1 */ `
+                        if ($null -ne $rootElement) {
+                            $processId = $rootElement.Current.ProcessId
+                            Stop-Process -Id $processId -Force -ErrorAction SilentlyContinue
+                        }
+                    `);
                 }
                 else {
-                    const rootId = await this.sendCommand('saveRootElementToTable', {});
-                    if (rootId) {
-                        await this.sendCommand('closeWindow', { elementId: rootId });
+                    const result = await this.sendPowerShellCommand(powershell_1.AutomationElement.automationRoot.buildCommand());
+                    const elementId = result.split('\n').map((id) => id.trim()).filter(Boolean)[0];
+                    if (elementId) {
+                        await this.sendPowerShellCommand(new powershell_1.FoundAutomationElement(elementId).buildCloseCommand());
                     }
                 }
             }
@@ -257,12 +180,8 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
             await this.executePowerShellScript(this.caps.postrun);
         }
         await this.releaseActions();
-        await this.terminateServerSession();
+        await this.terminatePowerShellSession();
         await super.deleteSession(sessionId);
-        if (this._logFileMirror) {
-            this._logFileMirror.detach();
-            this._logFileMirror = null;
-        }
     }
     processSelector(strategy, selector) {
         if (strategy !== 'css selector') {