appium-remote-debugger 15.9.1 → 15.10.1

package/build/lib/utils/javascript.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RESPONSE_LOG_LENGTH = void 0;
+exports.simpleStringify = simpleStringify;
+exports.convertJavascriptEvaluationResult = convertJavascriptEvaluationResult;
+const base_driver_1 = require("@appium/base-driver");
+const support_1 = require("@appium/support");
+exports.RESPONSE_LOG_LENGTH = 100;
+/**
+ * Converts a value to a best-effort JSON string for logging, removing noisy
+ * function properties from cloneable objects when possible.
+ *
+ * Falls back to `String(value)` when JSON serialization returns `undefined`
+ * or throws (for example, for functions, symbols, or circular structures).
+ *
+ * @param value - The value to stringify.
+ * @param multiline - If true, formats JSON output with indentation. Defaults to false.
+ * @returns A string representation suitable for logging.
+ */
+function simpleStringify(value, multiline = false) {
+    const stringify = (val) => {
+        try {
+            return multiline
+                ? (JSON.stringify(val, null, 2) ?? String(val))
+                : (JSON.stringify(val) ?? String(val));
+        }
+        catch {
+            return String(val);
+        }
+    };
+    if (!value) {
+        return stringify(value);
+    }
+    let cleanValue = value;
+    if (typeof value === 'object' && value !== null) {
+        try {
+            cleanValue = removeNoisyProperties(structuredClone(value));
+        }
+        catch {
+            // Fall back to the original value when cloning fails (e.g., non-cloneable graph entries).
+            cleanValue = value;
+        }
+    }
+    return stringify(cleanValue);
+}
+/**
+ * Converts the result from a JavaScript evaluation in the remote debugger
+ * into a usable format. Handles errors, serialization, and cleans up noisy
+ * function properties.
+ *
+ * @param res - The raw result from the remote debugger's JavaScript evaluation.
+ * @returns The cleaned and converted result value.
+ * @throws Error if the result is undefined, has an unexpected type, or contains
+ *               an error status code.
+ */
+function convertJavascriptEvaluationResult(res) {
+    if (res === undefined) {
+        throw new Error(`Did not get OK result from remote debugger. Result was: ${support_1.util.truncateString(simpleStringify(res), exports.RESPONSE_LOG_LENGTH)}`);
+    }
+    else if (typeof res === 'string') {
+        try {
+            res = JSON.parse(res);
+        }
+        catch {
+            // we might get a serialized object, but we might not
+            // if we get here, it is just a value
+        }
+    }
+    else if ((typeof res !== 'object' && typeof res !== 'function') || res === null) {
+        throw new Error(`Result has unexpected type: (${typeof res}).`);
+    }
+    if (Object.hasOwn(res, 'status') && res.status !== 0) {
+        // we got some form of error.
+        throw (0, base_driver_1.errorFromMJSONWPStatusCode)(res.status, res.value.message || res.value);
+    }
+    // with either have an object with a `value` property (even if `null`),
+    // or a plain object
+    const value = Object.hasOwn(res, 'value') ? res.value : res;
+    return removeNoisyProperties(value);
+}
+function removeNoisyProperties(obj) {
+    if (obj && typeof obj === 'object') {
+        const record = obj;
+        for (const property of ['ceil', 'clone', 'floor', 'round', 'scale', 'toString']) {
+            delete record[property];
+        }
+    }
+    return obj;
+}
+//# sourceMappingURL=javascript.js.map

package/build/lib/utils/javascript.js.map

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

package/build/lib/utils/module.d.ts

@@ -0,0 +1,20 @@
+import type { StringRecord } from '@appium/types';
+declare function resolveModuleRoot(): string;
+/**
+ * Calculates the path to the current module's root folder.
+ * The result is memoized for performance.
+ *
+ * @returns The full path to the module root directory.
+ * @throws Error if the module root folder cannot be determined.
+ */
+export declare const getModuleRoot: typeof resolveModuleRoot & {
+    cache: Map<unknown, string>;
+};
+/**
+ * Reads and parses the package.json file from the module root.
+ *
+ * @returns The parsed package.json contents as a StringRecord.
+ */
+export declare function getModuleProperties(): StringRecord;
+export {};
+//# sourceMappingURL=module.d.ts.map

package/build/lib/utils/module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../lib/utils/module.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAIhD,iBAAS,iBAAiB,IAAI,MAAM,CAMnC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,aAAa;;CAAkC,CAAC;AAE7D;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,YAAY,CAGlD"}

package/build/lib/utils/module.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getModuleRoot = void 0;
+exports.getModuleProperties = getModuleProperties;
+const support_1 = require("@appium/support");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const MODULE_NAME = 'appium-remote-debugger';
+function resolveModuleRoot() {
+    const root = support_1.node.getModuleRootSync(MODULE_NAME, __filename);
+    if (!root) {
+        throw new Error(`Cannot find the root folder of the ${MODULE_NAME} Node.js module`);
+    }
+    return root;
+}
+/**
+ * Calculates the path to the current module's root folder.
+ * The result is memoized for performance.
+ *
+ * @returns The full path to the module root directory.
+ * @throws Error if the module root folder cannot be determined.
+ */
+exports.getModuleRoot = support_1.util.memoize(resolveModuleRoot);
+/**
+ * Reads and parses the package.json file from the module root.
+ *
+ * @returns The parsed package.json contents as a StringRecord.
+ */
+function getModuleProperties() {
+    const fullPath = node_path_1.default.resolve((0, exports.getModuleRoot)(), 'package.json');
+    return JSON.parse(node_fs_1.default.readFileSync(fullPath, 'utf8'));
+}
+//# sourceMappingURL=module.js.map

package/build/lib/utils/module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../lib/utils/module.ts"],"names":[],"mappings":";;;;;;AA6BA,kDAGC;AAhCD,6CAA2C;AAC3C,sDAA6B;AAC7B,0DAA6B;AAG7B,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAE7C,SAAS,iBAAiB;IACxB,MAAM,IAAI,GAAG,cAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,sCAAsC,WAAW,iBAAiB,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACU,QAAA,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE7D;;;;GAIG;AACH,SAAgB,mBAAmB;IACjC,MAAM,QAAQ,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAA,qBAAa,GAAE,EAAE,cAAc,CAAC,CAAC;IAC/D,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAC3D,CAAC"}

package/build/lib/utils/object.d.ts

@@ -0,0 +1,29 @@
+import type { StringRecord } from '@appium/types';
+/**
+ * Creates a shallow object where undefined keys from `target` are filled
+ * from `defaultsObj`.
+ *
+ * @param target - The object with priority values.
+ * @param defaultsObj - The object providing fallback values.
+ * @returns A new object containing merged defaulted values.
+ */
+export declare function defaults<T extends Record<string, any>, U extends Record<string, any>>(target: T, defaultsObj: U): T & U;
+/**
+ * Performs deep strict equality comparison.
+ *
+ * @param a - First value.
+ * @param b - Second value.
+ * @returns True when both values are deeply equal.
+ */
+export declare function deepEqual(a: unknown, b: unknown): boolean;
+/**
+ * Validates that all parameters in the provided object have non-nil values.
+ * Throws an error if any parameters are missing (null or undefined).
+ *
+ * @template T - The type of the parameters object.
+ * @param params - An object containing parameters to validate.
+ * @returns The same parameters object if all values are valid.
+ * @throws Error if any parameters are missing, listing all missing parameter names.
+ */
+export declare function checkParams<T extends StringRecord>(params: T): T;
+//# sourceMappingURL=object.d.ts.map

package/build/lib/utils/object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../lib/utils/object.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnF,MAAM,EAAE,CAAC,EACT,WAAW,EAAE,CAAC,GACb,CAAC,GAAG,CAAC,CAQP;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAEzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAShE"}

package/build/lib/utils/object.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaults = defaults;
+exports.deepEqual = deepEqual;
+exports.checkParams = checkParams;
+const support_1 = require("@appium/support");
+const node_util_1 = require("node:util");
+/**
+ * Creates a shallow object where undefined keys from `target` are filled
+ * from `defaultsObj`.
+ *
+ * @param target - The object with priority values.
+ * @param defaultsObj - The object providing fallback values.
+ * @returns A new object containing merged defaulted values.
+ */
+function defaults(target, defaultsObj) {
+    const result = { ...target };
+    for (const [key, value] of Object.entries(defaultsObj)) {
+        if (result[key] === undefined) {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+/**
+ * Performs deep strict equality comparison.
+ *
+ * @param a - First value.
+ * @param b - Second value.
+ * @returns True when both values are deeply equal.
+ */
+function deepEqual(a, b) {
+    return (0, node_util_1.isDeepStrictEqual)(a, b);
+}
+/**
+ * Validates that all parameters in the provided object have non-nil values.
+ * Throws an error if any parameters are missing (null or undefined).
+ *
+ * @template T - The type of the parameters object.
+ * @param params - An object containing parameters to validate.
+ * @returns The same parameters object if all values are valid.
+ * @throws Error if any parameters are missing, listing all missing parameter names.
+ */
+function checkParams(params) {
+    // check if all parameters have a value
+    const errors = Object.entries(params)
+        .filter(([, value]) => value == null)
+        .map(([param]) => param);
+    if (errors.length) {
+        throw new Error(`Missing ${support_1.util.pluralize('parameter', errors.length)}: ${errors.join(', ')}`);
+    }
+    return params;
+}
+//# sourceMappingURL=object.js.map

package/build/lib/utils/object.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../lib/utils/object.ts"],"names":[],"mappings":";;AAYA,4BAWC;AASD,8BAEC;AAWD,kCASC;AAtDD,6CAAqC;AACrC,yCAA4C;AAG5C;;;;;;;GAOG;AACH,SAAgB,QAAQ,CACtB,MAAS,EACT,WAAc;IAEd,MAAM,MAAM,GAAG,EAAC,GAAG,MAAM,EAAU,CAAC;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACvD,IAAI,MAAM,CAAC,GAAoB,CAAC,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,SAAS,CAAC,CAAU,EAAE,CAAU;IAC9C,OAAO,IAAA,6BAAiB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACjC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,WAAW,CAAyB,MAAS;IAC3D,uCAAuC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,WAAW,cAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/build/lib/utils/platform.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Determines if the WebInspector shim can be used based on the provided iOS platform version.
+ * @param platformVersion - The iOS platform version string (e.g., "18.0", "17.5.1"), or undefined/null when unknown.
+ * @returns true if the WebInspector shim can be used, false otherwise
+ */
+export declare function canUseWebInspectorShim(platformVersion: string | undefined | null): boolean;
+//# sourceMappingURL=platform.d.ts.map

package/build/lib/utils/platform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../lib/utils/platform.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAE1F"}

package/build/lib/utils/platform.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canUseWebInspectorShim = canUseWebInspectorShim;
+const support_1 = require("@appium/support");
+/**
+ * Determines if the WebInspector shim can be used based on the provided iOS platform version.
+ * @param platformVersion - The iOS platform version string (e.g., "18.0", "17.5.1"), or undefined/null when unknown.
+ * @returns true if the WebInspector shim can be used, false otherwise
+ */
+function canUseWebInspectorShim(platformVersion) {
+    return !!platformVersion && support_1.util.compareVersions(platformVersion, '>=', '18.0');
+}
+//# sourceMappingURL=platform.js.map

package/build/lib/utils/platform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../../lib/utils/platform.ts"],"names":[],"mappings":";;AAOA,wDAEC;AATD,6CAAqC;AAErC;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,eAA0C;IAC/E,OAAO,CAAC,CAAC,eAAe,IAAI,cAAI,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAClF,CAAC"}

package/lib/appium-ios-device.d.ts

@@ -0,0 +1,12 @@
+declare module 'appium-ios-device' {
+  export const services: {
+    startWebInspectorService(
+      udid: string,
+      opts: Record<string, unknown>,
+    ): Promise<{
+      listenMessage: (handler: (data: Buffer) => void) => void;
+      sendMessage: (cmd: Buffer) => void;
+      close?: () => void | Promise<void>;
+    }>;
+  };
+}

package/lib/mixins/connect.ts

@@ -1,4 +1,4 @@
-import {isEmpty, pageArrayFromDict, uniq, WEB_CONTENT_BUNDLE_ID, appIdsForBundle} from '../utils';
+import {pageArrayFromDict, WEB_CONTENT_BUNDLE_ID, appIdsForBundle} from '../utils';
 import {events} from './events';
 import {timing, util} from '@appium/support';
 import {retryInterval, waitForCondition} from 'asyncbox';
@@ -84,7 +84,7 @@ export async function connect(
       const timer = new timing.Timer().start();
       this.log.debug(`Waiting up to ${timeout}ms for applications to be reported`);
       try {
-        await waitForCondition(() => !isEmpty(getAppDict(this)), {
+        await waitForCondition(() => !util.isEmpty(getAppDict(this)), {
           waitMs: timeout,
           intervalMs: APP_CONNECT_INTERVAL_MS,
         });
@@ -138,7 +138,7 @@ export async function selectApp(
   this.log.debug('Selecting application');
 
   const timer = new timing.Timer().start();
-  if (isEmpty(getAppDict(this))) {
+  if (util.isEmpty(getAppDict(this))) {
     this.log.debug('No applications currently connected.');
     return [];
   }
@@ -236,7 +236,7 @@ export function getPossibleDebuggerAppKeys(this: RemoteDebugger, bundleIds: stri
   }
 
   // go through the possible bundle identifiers
-  const possibleBundleIds = uniq([
+  const possibleBundleIds = util.uniq([
     WEB_CONTENT_BUNDLE_ID,
     WEB_CONTENT_PROCESS_BUNDLE_ID,
     SAFARI_VIEW_PROCESS_BUNDLE_ID,
@@ -273,7 +273,7 @@ export function getPossibleDebuggerAppKeys(this: RemoteDebugger, bundleIds: stri
       `capability to match other applications. Add a wildcard ('*') to match all apps.`,
   );
 
-  return uniq(proxiedAppIds);
+  return util.uniq(proxiedAppIds);
 }
 
 /**
@@ -361,7 +361,7 @@ async function searchForApp(
     throw new Error(
       `Could not connect to a valid webapp. Make sure it is debuggable and has at least one active page.`,
     );
-  })) as Promise<AppPage>;
+  })) as AppPage;
 }
 
 /**

package/lib/mixins/execute.ts

@@ -4,7 +4,6 @@ import {
   simpleStringify,
   convertJavascriptEvaluationResult,
   RESPONSE_LOG_LENGTH,
-  truncateString,
 } from '../utils';
 import {getScriptForAtom} from '../atoms';
 import {util, timing} from '@appium/support';
@@ -35,7 +34,7 @@ export async function executeAtom(
   const script = await getScriptForAtom(atom, args, frames);
   const value = await this.execute(script);
   this.log.debug(
-    `Received result for atom '${atom}' execution: ${truncateString(simpleStringify(value), RESPONSE_LOG_LENGTH)}`,
+    `Received result for atom '${atom}' execution: ${util.truncateString(simpleStringify(value), RESPONSE_LOG_LENGTH)}`,
   );
   return value;
 }
@@ -175,7 +174,7 @@ export async function execute(
 
   const rpcClient = this.requireRpcClient(true);
   await rpcClient.waitForPage(appIdKey as AppIdKey, pageIdKey as PageIdKey);
-  this.log.debug(`Sending javascript command: '${truncateString(command, 50)}'`);
+  this.log.debug(`Sending javascript command: '${util.truncateString(command, 50)}'`);
   const res = await rpcClient.send('Runtime.evaluate', {
     expression: command,
     returnByValue: true,

package/lib/mixins/message-handlers.ts

@@ -1,5 +1,6 @@
+import {util} from '@appium/support';
 import {events} from './events';
-import {deepEqual, defaults, isEmpty, pageArrayFromDict, appInfoFromDict} from '../utils';
+import {deepEqual, defaults, pageArrayFromDict, appInfoFromDict} from '../utils';
 import {
   setAppIdKey,
   getAppDict,
@@ -34,7 +35,7 @@ export async function onPageChange(
   appIdKey: string,
   pageDict: StringRecord,
 ): Promise<void> {
-  if (isEmpty(pageDict)) {
+  if (util.isEmpty(pageDict)) {
     return;
   }
 
@@ -115,7 +116,7 @@ export function onAppDisconnect(
     setAppIdKey(this, getDebuggerAppKey.bind(this)(getBundleId(this) as string));
   }
 
-  if (isEmpty(getAppDict(this))) {
+  if (util.isEmpty(getAppDict(this))) {
     // this means we no longer have any apps. what the what?
     this.log.debug('Main app disconnected. Disconnecting altogether.');
     this.emit(events.EVENT_DISCONNECT, true);

package/lib/mixins/misc.ts

@@ -1,6 +1,8 @@
-import {checkParams, TimeoutError, withTimeout} from '../utils';
+import {withTimeout} from 'asyncbox';
+import {checkParams, TimeoutError} from '../utils';
 import {getAppIdKey, getPageIdKey} from './property-accessors';
 import type {RemoteDebugger} from '../remote-debugger';
+import type {EventListener} from '../types';
 
 const SAFARI_BUNDLE_ID = 'com.apple.mobilesafari';
 const GARBAGE_COLLECT_TIMEOUT_MS = 5000;
@@ -22,10 +24,7 @@ export async function launchSafari(this: RemoteDebugger): Promise<void> {
  * @param fn - Event listener function that will be called when timeline events are recorded.
  * @returns A promise that resolves when the timeline recording has started.
  */
-export async function startTimeline(
-  this: RemoteDebugger,
-  fn: import('../types').EventListener,
-): Promise<any> {
+export async function startTimeline(this: RemoteDebugger, fn: EventListener): Promise<any> {
   this.log.debug('Starting to record the timeline');
   this.requireRpcClient().on('Timeline.eventRecorded', fn);
   return await this.requireRpcClient().send('Timeline.start', {
@@ -84,6 +83,7 @@ export async function isJavascriptExecutionBlocked(
         pageIdKey: getPageIdKey(this),
       }),
       timeoutMs,
+      new TimeoutError(`Operation timed out after ${timeoutMs}ms`),
     );
     return false;
   } catch {
@@ -122,6 +122,7 @@ export async function garbageCollect(
         pageIdKey: getPageIdKey(this),
       }),
       timeoutMs,
+      new TimeoutError(`Operation timed out after ${timeoutMs}ms`),
     );
     this.log.debug(`Garbage collection successful`);
   } catch (e: any) {

package/lib/mixins/navigate.ts

@@ -1,4 +1,5 @@
-import {cancellableDelay, checkParams, delay, TimeoutError, withTimeout} from '../utils';
+import {sleep, withTimeout} from 'asyncbox';
+import {DelayCancellation, checkParams, TimeoutError} from '../utils';
 import {events} from './events';
 import {timing} from '@appium/support';
 import {
@@ -86,7 +87,7 @@ export async function waitForDom(
 
   let isPageLoading = true;
   setPageLoading(this, true);
-  setPageLoadDelay(this, cancellableDelay(readinessTimeoutMs));
+  setPageLoadDelay(this, sleep({ms: readinessTimeoutMs, cancelError: new DelayCancellation()}));
   const pageReadinessPromise = (async () => {
     let retry = 0;
     while (isPageLoading) {
@@ -97,7 +98,7 @@ export async function waitForDom(
         PAGE_READINESS_CHECK_INTERVAL_MS * Math.pow(2, retry),
         readinessTimeoutMs - elapsedMs,
       );
-      await delay(intervalMs);
+      await sleep(intervalMs);
       // we can get this called in the middle of trying to find a new app
       if (!getAppIdKey(this)) {
         this.log.debug('Not connected to an application. Ignoring page readiess check');
@@ -153,7 +154,11 @@ export async function checkPageIsReady(this: RemoteDebugger, timeoutMs?: number)
   const readyCmd = 'document.readyState;';
   const actualTimeoutMs = timeoutMs ?? getPageReadyTimeout(this);
   try {
-    const readyState = await withTimeout(this.execute(readyCmd), actualTimeoutMs);
+    const readyState = await withTimeout(
+      this.execute(readyCmd),
+      actualTimeoutMs,
+      new TimeoutError(`Operation timed out after ${actualTimeoutMs}ms`),
+    );
     this.log.debug(
       JSON.stringify({
         readyState,
@@ -199,7 +204,7 @@ export async function navToUrl(this: RemoteDebugger, url: string): Promise<void>
   const readinessTimeoutMs = this.pageLoadMs;
   let onPageLoaded: (() => void) | undefined;
   let onPageLoadedTimeout: NodeJS.Timeout | undefined | null;
-  setPageLoadDelay(this, cancellableDelay(readinessTimeoutMs));
+  setPageLoadDelay(this, sleep({ms: readinessTimeoutMs, cancelError: new DelayCancellation()}));
   setPageLoading(this, true);
   let isPageLoading = true;
   const start = new timing.Timer().start();

package/lib/remote-debugger-real-device.ts

@@ -34,7 +34,7 @@ export class RemoteDebuggerRealDevice extends RemoteDebugger {
       pageLoadTimeoutMs: this._pageLoadMs,
     };
 
-    this._useWebInspectorShim = canUseWebInspectorShim(this._platformVersion as string);
+    this._useWebInspectorShim = canUseWebInspectorShim(this._platformVersion);
     if (this._useWebInspectorShim) {
       const shimClient = new RpcClientRealDeviceShim(commonOpts);
       try {

package/lib/remote-debugger.ts

@@ -10,7 +10,7 @@ import * as cookieMixins from './mixins/cookies';
 import * as screenshotMixins from './mixins/screenshot';
 import * as eventMixins from './mixins/events';
 import * as miscellaneousMixins from './mixins/misc';
-import type {CancellableDelay} from './utils';
+import type {CancellablePromise} from 'asyncbox';
 import type {RemoteDebuggerOptions, AppDict, EventListener, PageIdKey, AppIdKey} from './types';
 import type {AppiumLogger, StringRecord} from '@appium/types';
 import type {RpcClient} from './rpc/rpc-client';
@@ -67,16 +67,16 @@ export class RemoteDebugger extends EventEmitter {
   frameDetached = navigationMixins.frameDetached;
 
   protected _skippedApps: string[];
-  protected _clientEventListeners: StringRecord<EventListener[]>;
-  protected _appDict: AppDict;
+  protected _clientEventListeners!: StringRecord<EventListener[]>;
+  protected _appDict: AppDict = {};
   protected _appIdKey?: AppIdKey;
   protected _pageIdKey?: PageIdKey;
   protected _connectedDrivers?: StringRecord[];
   protected _currentState?: string;
-  protected _pageLoadDelay?: CancellableDelay;
-  protected _rpcClient: RpcClient | null;
-  protected _pageLoading: boolean;
-  protected _navigatingToPage: boolean;
+  protected _pageLoadDelay?: CancellablePromise<void>;
+  protected _rpcClient: RpcClient | null = null;
+  protected _pageLoading: boolean = false;
+  protected _navigatingToPage: boolean = false;
   protected _allowNavigationWithoutReload: boolean;
   protected _pageLoadMs?: number;
   protected readonly _pageLoadStrategy?: string;
@@ -263,8 +263,6 @@ export class RemoteDebugger extends EventEmitter {
   }
 }
 
-for (const [name, event] of Object.entries(eventMixins.events)) {
-  RemoteDebugger[name] = event;
-}
+Object.assign(RemoteDebugger, eventMixins.events);
 
 export default RemoteDebugger;

package/lib/rpc/rpc-client-real-device-shim.ts

@@ -1,5 +1,5 @@
+import {util} from '@appium/support';
 import {log} from '../logger';
-import {isPlainObject} from '../utils';
 import {RpcClient} from './rpc-client';
 import type {RemoteCommand, RpcClientOptions} from '../types';
 import type {StringRecord} from '@appium/types';
@@ -190,7 +190,7 @@ export class RpcClientRealDeviceShim extends RpcClient {
     };
 
     // Convert buffer data to strings where necessary
-    if (isPlainObject(message.__argument)) {
+    if (util.isPlainObject(message.__argument)) {
       const args = {...message.__argument};
 
       // Handle WIRMessageDataKey and WIRSocketDataKey which may be buffers
@@ -213,7 +213,7 @@ export class RpcClientRealDeviceShim extends RpcClient {
    * @returns The translated arguments for the shim service.
    */
   private translateArguments(args: any): StringRecord {
-    if (!isPlainObject(args)) {
+    if (!util.isPlainObject(args)) {
       return {};
     }