@appium/base-driver 9.14.1 → 9.15.0

package/build/lib/basedriver/core.d.ts

@@ -1,8 +1,9 @@
-import type { AppiumLogger, Constraints, Core, Driver, DriverOpts, EventHistory, HTTPMethod, InitialOpts, Protocol, RouteMatcher, StringRecord, BidiModuleMap, BiDiResultData } from '@appium/types';
+import type { AppiumLogger, Constraints, Core, Driver, DriverOpts, EventHistory, HTTPMethod, InitialOpts, Protocol, RouteMatcher, StringRecord } from '@appium/types';
 import AsyncLock from 'async-lock';
 import { DeviceSettings } from './device-settings';
 import * as helpers from './helpers';
-export declare class DriverCore<const C extends Constraints, Settings extends StringRecord = StringRecord> implements Core<C, Settings> {
+import { ExtensionCore } from './extension-core';
+export declare class DriverCore<const C extends Constraints, Settings extends StringRecord = StringRecord> extends ExtensionCore implements Core<C, Settings> {
     /**
      * Make the basedriver version available so for any driver which inherits from this package, we
      * know which version of basedriver it inherited from
@@ -31,9 +32,8 @@ export declare class DriverCore<const C extends Constraints, Settings extends St
     managedDrivers: Driver[];
     noCommandTimer: NodeJS.Timeout | null;
     protected _eventHistory: EventHistory;
-    eventEmitter: NodeJS.EventEmitter;
     /**
-     * @privateRemarks XXX: unsure why this is wrapped in a getter when nothing else is
+     * TODO: remove this._log and use this.log instead
      */
     protected _log: AppiumLogger;
     shutdownUnexpectedly: boolean;
@@ -47,11 +47,7 @@ export declare class DriverCore<const C extends Constraints, Settings extends St
      */
     settings: DeviceSettings<Settings>;
     protocol?: Protocol;
-    bidiEventSubs: Record<string, string[]>;
-    doesSupportBidi: boolean;
-    bidiCommands: BidiModuleMap;
     constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
-    get log(): AppiumLogger;
     /**
      * Set a callback handler if needed to execute a custom piece of code
      * when the driver is shut down unexpectedly. Multiple calls to this method
@@ -160,7 +156,5 @@ export declare class DriverCore<const C extends Constraints, Settings extends St
     addManagedDriver(driver: Driver): void;
     getManagedDrivers(): Driver<Constraints, StringRecord, StringRecord, import("@appium/types").DefaultCreateSessionResult<Constraints>, void, StringRecord>[];
     clearNewCommandTimeout(): Promise<void>;
-    updateBidiCommands(cmds: BidiModuleMap): void;
-    executeBidiCommand(bidiCmd: string, bidiParams: StringRecord): Promise<BiDiResultData>;
 }
 //# sourceMappingURL=core.d.ts.map

package/build/lib/basedriver/core.d.ts.map

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

package/build/lib/basedriver/core.js

@@ -37,24 +37,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriverCore = void 0;
-const support_1 = require("@appium/support");
 const async_lock_1 = __importDefault(require("async-lock"));
 const lodash_1 = __importDefault(require("lodash"));
-const node_events_1 = require("node:events");
 const node_os_1 = __importDefault(require("node:os"));
 const constants_1 = require("../constants");
 const protocol_1 = require("../protocol");
 const device_settings_1 = require("./device-settings");
 const helpers = __importStar(require("./helpers"));
-const bidi_commands_1 = require("../protocol/bidi-commands");
+const extension_core_1 = require("./extension-core");
 const NEW_COMMAND_TIMEOUT_MS = 60 * 1000;
 const ON_UNEXPECTED_SHUTDOWN_EVENT = 'onUnexpectedShutdown';
 const ALL_DRIVERS_MATCH = '*';
 const FEATURE_NAME_SEPARATOR = ':';
-class DriverCore {
+class DriverCore extends extension_core_1.ExtensionCore {
     constructor(opts = {}, shouldValidateCaps = true) {
-        this.bidiCommands = bidi_commands_1.BIDI_COMMANDS;
-        this._log = support_1.logger.getLogger(helpers.generateDriverLogPrefix(this));
+        super();
+        this._log = this.log; // TODO: remove references to this._log and use this.log instead
         // setup state
         this.opts = opts;
         // use a custom tmp dir to avoid losing data and app when computer is
@@ -77,15 +75,9 @@ class DriverCore {
         this.managedDrivers = [];
         this.noCommandTimer = null;
         this._eventHistory = { commands: [] };
-        this.eventEmitter = new node_events_1.EventEmitter();
         this.shutdownUnexpectedly = false;
         this.commandsQueueGuard = new async_lock_1.default();
         this.settings = new device_settings_1.DeviceSettings();
-        this.bidiEventSubs = {};
-        this.doesSupportBidi = false;
-    }
-    get log() {
-        return this._log;
     }
     /**
      * Set a callback handler if needed to execute a custom piece of code
@@ -332,62 +324,6 @@ class DriverCore {
             this.noCommandTimer = null;
         }
     }
-    updateBidiCommands(cmds) {
-        const overlappingKeys = lodash_1.default.intersection(Object.keys(cmds), Object.keys(this.bidiCommands));
-        if (overlappingKeys.length) {
-            this.log.warn(`Overwriting existing bidi modules: ${JSON.stringify(overlappingKeys)}. This may not be intended!`);
-        }
-        this.bidiCommands = {
-            ...this.bidiCommands,
-            ...cmds,
-        };
-    }
-    async executeBidiCommand(bidiCmd, bidiParams) {
-        const [moduleName, methodName] = bidiCmd.split('.');
-        // if we don't get a valid format for bidi command name, reject
-        if (!moduleName || !methodName) {
-            throw new protocol_1.errors.UnknownCommandError(`Did not receive a valid BiDi module and method name ` +
-                `of the form moduleName.methodName. Instead received ` +
-                `'${moduleName}.${methodName}'`);
-        }
-        // if the command module or method isn't part of our spec, reject
-        if (!this.bidiCommands[moduleName] || !this.bidiCommands[moduleName][methodName]) {
-            throw new protocol_1.errors.UnknownCommandError();
-        }
-        const { command, params } = this.bidiCommands[moduleName][methodName];
-        // if the command method isn't part of our spec, also reject
-        if (!command) {
-            throw new protocol_1.errors.UnknownCommandError();
-        }
-        // If the driver doesn't have this command, it must not be implemented
-        if (!this[command]) {
-            throw new protocol_1.errors.NotYetImplementedError();
-        }
-        // TODO improve param parsing and error messages along the lines of what we have in the http
-        // handlers
-        const args = [];
-        if (params?.required?.length) {
-            for (const requiredParam of params.required) {
-                if (lodash_1.default.isUndefined(bidiParams[requiredParam])) {
-                    throw new protocol_1.errors.InvalidArgumentError(`The ${requiredParam} parameter was required but you omitted it`);
-                }
-                args.push(bidiParams[requiredParam]);
-            }
-        }
-        if (params?.optional?.length) {
-            for (const optionalParam of params.optional) {
-                args.push(bidiParams[optionalParam]);
-            }
-        }
-        const logParams = lodash_1.default.truncate(JSON.stringify(bidiParams), { length: constants_1.MAX_LOG_BODY_LENGTH });
-        this.log.debug(`Executing bidi command '${bidiCmd}' with params ${logParams} by passing to driver ` +
-            `method '${command}'`);
-        const response = await this[command](...args);
-        const finalResponse = lodash_1.default.isUndefined(response) ? {} : response;
-        this.log.debug(`Responding to bidi command '${bidiCmd}' with ` +
-            `${lodash_1.default.truncate(JSON.stringify(finalResponse), { length: constants_1.MAX_LOG_BODY_LENGTH })}`);
-        return finalResponse;
-    }
 }
 exports.DriverCore = DriverCore;
 /**

package/build/lib/basedriver/core.js.map

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

package/build/lib/basedriver/extension-core.d.ts

@@ -0,0 +1,16 @@
+import type { AppiumLogger, BidiModuleMap, BiDiResultData, StringRecord } from '@appium/types';
+export declare class ExtensionCore {
+    bidiEventSubs: Record<string, string[]>;
+    bidiCommands: BidiModuleMap;
+    _logPrefix?: string;
+    protected _log: AppiumLogger;
+    readonly eventEmitter: NodeJS.EventEmitter;
+    constructor(logPrefix?: string);
+    get log(): AppiumLogger;
+    updateLogPrefix(logPrefix: string): void;
+    updateBidiCommands(cmds: BidiModuleMap): void;
+    doesBidiCommandExist(moduleName: string, methodName: string): boolean;
+    ensureBidiCommandExists(moduleName: string, methodName: string): void;
+    executeBidiCommand(bidiCmd: string, bidiParams: StringRecord, next?: () => Promise<any>, driver?: ExtensionCore): Promise<BiDiResultData>;
+}
+//# sourceMappingURL=extension-core.d.ts.map

package/build/lib/basedriver/extension-core.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-core.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/extension-core.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,eAAe,CAAC;AASvB,qBAAa,aAAa;IACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,YAAY,EAAE,aAAa,CAAkC;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC;IAE7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC;gBAG/B,SAAS,CAAC,EAAE,MAAM;IAM9B,IAAI,GAAG,IAAI,YAAY,CAKtB;IAED,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAW7C,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO;IASrE,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IA2B/D,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;CAsChJ"}

package/build/lib/basedriver/extension-core.js

@@ -0,0 +1,103 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExtensionCore = void 0;
+const support_1 = require("@appium/support");
+const node_events_1 = require("node:events");
+const constants_1 = require("../constants");
+const protocol_1 = require("../protocol");
+const bidi_commands_1 = require("../protocol/bidi-commands");
+const lodash_1 = __importDefault(require("lodash"));
+const helpers_1 = require("./helpers");
+class ExtensionCore {
+    constructor(logPrefix) {
+        this.bidiCommands = bidi_commands_1.BIDI_COMMANDS;
+        this._logPrefix = logPrefix;
+        this.bidiEventSubs = {};
+        this.eventEmitter = new node_events_1.EventEmitter();
+    }
+    get log() {
+        if (!this._log) {
+            this.updateLogPrefix(this._logPrefix ?? (0, helpers_1.generateDriverLogPrefix)(this));
+        }
+        return this._log;
+    }
+    updateLogPrefix(logPrefix) {
+        this._log = support_1.logger.getLogger(logPrefix);
+    }
+    updateBidiCommands(cmds) {
+        const overlappingKeys = lodash_1.default.intersection(Object.keys(cmds), Object.keys(this.bidiCommands));
+        if (overlappingKeys.length) {
+            this.log.warn(`Overwriting existing bidi modules: ${JSON.stringify(overlappingKeys)}. This may not be intended!`);
+        }
+        this.bidiCommands = {
+            ...this.bidiCommands,
+            ...cmds,
+        };
+    }
+    doesBidiCommandExist(moduleName, methodName) {
+        try {
+            this.ensureBidiCommandExists(moduleName, methodName);
+        }
+        catch {
+            return false;
+        }
+        return true;
+    }
+    ensureBidiCommandExists(moduleName, methodName) {
+        // if we don't get a valid format for bidi command name, reject
+        if (!moduleName || !methodName) {
+            throw new protocol_1.errors.UnknownCommandError(`Did not receive a valid BiDi module and method name ` +
+                `of the form moduleName.methodName. Instead received ` +
+                `'${moduleName}.${methodName}'`);
+        }
+        // if the command module or method isn't part of our spec, reject
+        if (!this.bidiCommands[moduleName] || !this.bidiCommands[moduleName][methodName]) {
+            throw new protocol_1.errors.UnknownCommandError();
+        }
+        const { command } = this.bidiCommands[moduleName][methodName];
+        // if the command method isn't part of our spec, also reject
+        if (!command) {
+            throw new protocol_1.errors.UnknownCommandError();
+        }
+        // If the driver doesn't have this command, it must not be implemented
+        if (!this[command]) {
+            throw new protocol_1.errors.NotYetImplementedError();
+        }
+    }
+    async executeBidiCommand(bidiCmd, bidiParams, next, driver) {
+        const handlerType = (next && driver) ? 'plugin' : 'driver';
+        const [moduleName, methodName] = bidiCmd.split('.');
+        this.ensureBidiCommandExists(moduleName, methodName);
+        const { command, params } = this.bidiCommands[moduleName][methodName];
+        // TODO improve param parsing and error messages along the lines of what we have in the http
+        // handlers
+        const args = [];
+        if (params?.required?.length) {
+            for (const requiredParam of params.required) {
+                if (lodash_1.default.isUndefined(bidiParams[requiredParam])) {
+                    throw new protocol_1.errors.InvalidArgumentError(`The ${requiredParam} parameter was required but you omitted it`);
+                }
+                args.push(bidiParams[requiredParam]);
+            }
+        }
+        if (params?.optional?.length) {
+            for (const optionalParam of params.optional) {
+                args.push(bidiParams[optionalParam]);
+            }
+        }
+        const logParams = lodash_1.default.truncate(JSON.stringify(bidiParams), { length: constants_1.MAX_LOG_BODY_LENGTH });
+        this.log.debug(`Executing bidi command '${bidiCmd}' with params ${logParams} by passing to ${handlerType} ` +
+            `method '${command}'`);
+        // call the handler with the signature appropriate to extension type (plugin or driver)
+        const response = (next && driver) ? await this[command](next, driver, ...args) : await this[command](...args);
+        const finalResponse = lodash_1.default.isUndefined(response) ? {} : response;
+        this.log.debug(`Responding to bidi command '${bidiCmd}' with ` +
+            `${lodash_1.default.truncate(JSON.stringify(finalResponse), { length: constants_1.MAX_LOG_BODY_LENGTH })}`);
+        return finalResponse;
+    }
+}
+exports.ExtensionCore = ExtensionCore;
+//# sourceMappingURL=extension-core.js.map

package/build/lib/basedriver/extension-core.js.map

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

package/build/lib/basedriver/helpers.d.ts

@@ -30,12 +30,12 @@ export function parseCapsArray(cap: string | Array<string>): any[];
 /**
  * Generate a string that uniquely describes driver instance
  *
- * @param {import('@appium/types').Core} obj driver instance
+ * @param {object} obj driver instance
  * @param {string?} [sessionId=null] session identifier (if exists).
  * This parameter is deprecated and is not used.
  * @returns {string}
  */
-export function generateDriverLogPrefix(obj: import("@appium/types").Core<any, import("@appium/types").StringRecord>, sessionId?: string | null): string;
+export function generateDriverLogPrefix(obj: object, sessionId?: string | null): string;
 export const BASEDRIVER_VER: string;
 declare const _default: {
     configureApp: typeof configureApp;

package/build/lib/basedriver/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"AA+DA;;;;GAIG;AACH,kCAHW,MAAM,YACN,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,mBAAmB,gBAuQrE;AAED;;;GAGG;AACH,uCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;;;GASG;AACH,qCAJW,GAAC,4CA2BX;AAED;;;;;GAKG;AACH,oCAFW,MAAM,GAAC,KAAK,QAAQ,SAoB9B;AAED;;;;;;;GAOG;AAEH,kIALW,MAAM,OAAC,GAEL,MAAM,CAKlB;;;;;;;;;;;kBAwTa,IAAI,OAAC;eACL,OAAO;YACP,MAAM,OAAC;UACP,MAAM,OAAC;;;;;;;;;YAKP,MAAM;;;;YACN,OAAO,QAAQ,EAAE,QAAQ;;;;aACzB,OAAO,OAAO,EAAE,uBAAuB,GAAG,OAAO,OAAO,EAAE,oBAAoB"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.js"],"names":[],"mappings":"AA+DA;;;;GAIG;AACH,kCAHW,MAAM,YACN,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,mBAAmB,gBAuQrE;AAED;;;GAGG;AACH,uCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;;;GASG;AACH,qCAJW,GAAC,4CA2BX;AAED;;;;;GAKG;AACH,oCAFW,MAAM,GAAC,KAAK,QAAQ,SAoB9B;AAED;;;;;;;GAOG;AAEH,6CANW,MAAM,cACN,MAAM,OAAC,GAEL,MAAM,CAKlB;;;;;;;;;;;kBAwTa,IAAI,OAAC;eACL,OAAO;YACP,MAAM,OAAC;UACP,MAAM,OAAC;;;;;;;;;YAKP,MAAM;;;;YACN,OAAO,QAAQ,EAAE,QAAQ;;;;aACzB,OAAO,OAAO,EAAE,uBAAuB,GAAG,OAAO,OAAO,EAAE,oBAAoB"}

package/build/lib/basedriver/helpers.js

@@ -379,7 +379,7 @@ function parseCapsArray(cap) {
 /**
  * Generate a string that uniquely describes driver instance
  *
- * @param {import('@appium/types').Core} obj driver instance
+ * @param {object} obj driver instance
  * @param {string?} [sessionId=null] session identifier (if exists).
  * This parameter is deprecated and is not used.
  * @returns {string}

package/build/lib/index.d.ts

@@ -1,3 +1,4 @@
+export { ExtensionCore } from "./basedriver/extension-core";
 export { DriverCore } from "./basedriver/core";
 export { DeviceSettings } from "./basedriver/device-settings";
 export { BaseDriver };
@@ -6,6 +7,7 @@ export * from "./protocol";
 export { errorFromMJSONWPStatusCode as errorFromCode } from "./protocol";
 export { STATIC_DIR } from "./express/static";
 export { DEFAULT_WS_PATHNAME_PREFIX } from "./express/websocket";
+export { generateDriverLogPrefix } from "./basedriver/helpers";
 export type ServerOpts = import("./express/server").ServerOpts;
 import { BaseDriver } from './basedriver/driver';
 export { MAX_LOG_BODY_LENGTH, DEFAULT_BASE_PATH, PROTOCOLS, W3C_ELEMENT_KEY } from "./constants";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;yBAmDa,OAAO,kBAAkB,EAAE,UAAU;2BAvCzB,qBAAqB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;;yBAsDa,OAAO,kBAAkB,EAAE,UAAU;2BAzCzB,qBAAqB"}

package/build/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_WS_PATHNAME_PREFIX = exports.promoteAppiumOptionsForObject = exports.promoteAppiumOptions = exports.validateCaps = exports.isStandardCap = exports.processCapabilities = exports.STANDARD_CAPS = exports.PREFIXED_APPIUM_OPTS_CAP = exports.statusCodes = exports.getSummaryByCode = exports.WebDriverProxy = exports.JWProxy = exports.normalizeBasePath = exports.server = exports.STATIC_DIR = exports.errorFromCode = exports.W3C_ELEMENT_KEY = exports.PROTOCOLS = exports.DEFAULT_BASE_PATH = exports.MAX_LOG_BODY_LENGTH = exports.BaseDriver = exports.DeviceSettings = exports.DriverCore = void 0;
+exports.generateDriverLogPrefix = exports.DEFAULT_WS_PATHNAME_PREFIX = exports.promoteAppiumOptionsForObject = exports.promoteAppiumOptions = exports.validateCaps = exports.isStandardCap = exports.processCapabilities = exports.STANDARD_CAPS = exports.PREFIXED_APPIUM_OPTS_CAP = exports.statusCodes = exports.getSummaryByCode = exports.WebDriverProxy = exports.JWProxy = exports.normalizeBasePath = exports.server = exports.STATIC_DIR = exports.errorFromCode = exports.W3C_ELEMENT_KEY = exports.PROTOCOLS = exports.DEFAULT_BASE_PATH = exports.MAX_LOG_BODY_LENGTH = exports.BaseDriver = exports.DeviceSettings = exports.DriverCore = exports.ExtensionCore = void 0;
 const bluebird_1 = __importDefault(require("bluebird"));
 try {
     bluebird_1.default.config({
@@ -29,6 +29,8 @@ catch {
     // cancellation not being able to be enabled after promise has been configured
 }
 // BaseDriver exports
+var extension_core_1 = require("./basedriver/extension-core");
+Object.defineProperty(exports, "ExtensionCore", { enumerable: true, get: function () { return extension_core_1.ExtensionCore; } });
 const driver_1 = require("./basedriver/driver");
 Object.defineProperty(exports, "BaseDriver", { enumerable: true, get: function () { return driver_1.BaseDriver; } });
 var core_1 = require("./basedriver/core");
@@ -73,6 +75,8 @@ Object.defineProperty(exports, "promoteAppiumOptionsForObject", { enumerable: tr
 // Web socket helpers
 var websocket_1 = require("./express/websocket");
 Object.defineProperty(exports, "DEFAULT_WS_PATHNAME_PREFIX", { enumerable: true, get: function () { return websocket_1.DEFAULT_WS_PATHNAME_PREFIX; } });
+var helpers_1 = require("./basedriver/helpers");
+Object.defineProperty(exports, "generateDriverLogPrefix", { enumerable: true, get: function () { return helpers_1.generateDriverLogPrefix; } });
 /**
  * @typedef {import('./express/server').ServerOpts} ServerOpts
  */

package/build/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wDAAyB;AAEzB,IAAI,CAAC;IACH,kBAAC,CAAC,MAAM,CAAC;QACP,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAAC,MAAM,CAAC;IACP,0FAA0F;IAC1F,8EAA8E;AAChF,CAAC;AAED,qBAAqB;AACrB,gDAA+C;AAIvC,2FAJA,mBAAU,OAIA;AAHlB,0CAA6C;AAArC,kGAAA,UAAU,OAAA;AAClB,gEAA4D;AAApD,iHAAA,cAAc,OAAA;AAGtB,kBAAe,mBAAU,CAAC;AAC1B,yCAA+F;AAAvF,gHAAA,mBAAmB,OAAA;AAAE,8GAAA,iBAAiB,OAAA;AAAE,sGAAA,SAAS,OAAA;AAAE,4GAAA,eAAe,OAAA;AAE1E,kBAAkB;AAClB,6CAA2B;AAC3B,uCAAuE;AAA/D,yGAAA,0BAA0B,OAAiB;AAEnD,kBAAkB;AAClB,2CAA4C;AAApC,oGAAA,UAAU,OAAA;AAClB,2CAA2D;AAAnD,gGAAA,MAAM,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AAEjC,uBAAuB;AACvB,sFAAsF;AACtF,8CAA6C;AAArC,gGAAA,OAAO,OAAA;AACf,8CAA+D;AAAvD,uGAAA,OAAO,OAAkB;AAEjC,wBAAwB;AACxB,iDAA8E;AAAtE,0GAAA,gBAAgB,OAAA;AAAE,qGAAA,KAAK,OAAe;AAE9C,0BAA0B;AAC1B,0DAQmC;AAPjC,wHAAA,wBAAwB,OAAA;AACxB,6GAAA,aAAa,OAAA;AACb,mHAAA,mBAAmB,OAAA;AACnB,6GAAA,aAAa,OAAA;AACb,4GAAA,YAAY,OAAA;AACZ,oHAAA,oBAAoB,OAAA;AACpB,6HAAA,6BAA6B,OAAA;AAG/B,qBAAqB;AACrB,iDAA+D;AAAvD,uHAAA,0BAA0B,OAAA;AAElC;;GAEG"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,wDAAyB;AAEzB,IAAI,CAAC;IACH,kBAAC,CAAC,MAAM,CAAC;QACP,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAAC,MAAM,CAAC;IACP,0FAA0F;IAC1F,8EAA8E;AAChF,CAAC;AAED,qBAAqB;AACrB,8DAA0D;AAAlD,+GAAA,aAAa,OAAA;AACrB,gDAA+C;AAIvC,2FAJA,mBAAU,OAIA;AAHlB,0CAA6C;AAArC,kGAAA,UAAU,OAAA;AAClB,gEAA4D;AAApD,iHAAA,cAAc,OAAA;AAGtB,kBAAe,mBAAU,CAAC;AAC1B,yCAA+F;AAAvF,gHAAA,mBAAmB,OAAA;AAAE,8GAAA,iBAAiB,OAAA;AAAE,sGAAA,SAAS,OAAA;AAAE,4GAAA,eAAe,OAAA;AAE1E,kBAAkB;AAClB,6CAA2B;AAC3B,uCAAuE;AAA/D,yGAAA,0BAA0B,OAAiB;AAEnD,kBAAkB;AAClB,2CAA4C;AAApC,oGAAA,UAAU,OAAA;AAClB,2CAA2D;AAAnD,gGAAA,MAAM,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AAEjC,uBAAuB;AACvB,sFAAsF;AACtF,8CAA6C;AAArC,gGAAA,OAAO,OAAA;AACf,8CAA+D;AAAvD,uGAAA,OAAO,OAAkB;AAEjC,wBAAwB;AACxB,iDAA8E;AAAtE,0GAAA,gBAAgB,OAAA;AAAE,qGAAA,KAAK,OAAe;AAE9C,0BAA0B;AAC1B,0DAQmC;AAPjC,wHAAA,wBAAwB,OAAA;AACxB,6GAAA,aAAa,OAAA;AACb,mHAAA,mBAAmB,OAAA;AACnB,6GAAA,aAAa,OAAA;AACb,4GAAA,YAAY,OAAA;AACZ,oHAAA,oBAAoB,OAAA;AACpB,6HAAA,6BAA6B,OAAA;AAG/B,qBAAqB;AACrB,iDAA+D;AAAvD,uHAAA,0BAA0B,OAAA;AAElC,gDAA6D;AAArD,kHAAA,uBAAuB,OAAA;AAE/B;;GAEG"}

package/lib/basedriver/core.ts

@@ -1,4 +1,3 @@
-import {logger} from '@appium/support';
 import type {
   AppiumLogger,
   Constraints,
@@ -11,22 +10,18 @@ import type {
   Protocol,
   RouteMatcher,
   StringRecord,
-  BidiModuleMap,
-  BiDiResultData,
 } from '@appium/types';
 import AsyncLock from 'async-lock';
 import _ from 'lodash';
-import {EventEmitter} from 'node:events';
 import os from 'node:os';
 import {
   DEFAULT_BASE_PATH,
   PROTOCOLS,
-  MAX_LOG_BODY_LENGTH,
 } from '../constants';
 import {errors} from '../protocol';
 import {DeviceSettings} from './device-settings';
 import * as helpers from './helpers';
-import {BIDI_COMMANDS} from '../protocol/bidi-commands';
+import {ExtensionCore} from './extension-core';
 
 const NEW_COMMAND_TIMEOUT_MS = 60 * 1000;
 
@@ -36,7 +31,7 @@ const ALL_DRIVERS_MATCH = '*';
 const FEATURE_NAME_SEPARATOR = ':';
 
 export class DriverCore<const C extends Constraints, Settings extends StringRecord = StringRecord>
-  implements Core<C, Settings>
+  extends ExtensionCore implements Core<C, Settings>
 {
   /**
    * Make the basedriver version available so for any driver which inherits from this package, we
@@ -82,11 +77,8 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
 
   protected _eventHistory: EventHistory;
 
-  // used to handle driver events
-  eventEmitter: NodeJS.EventEmitter;
-
   /**
-   * @privateRemarks XXX: unsure why this is wrapped in a getter when nothing else is
+   * TODO: remove this._log and use this.log instead
    */
   protected _log: AppiumLogger;
 
@@ -106,14 +98,10 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
 
   protocol?: Protocol;
 
-  bidiEventSubs: Record<string, string[]>;
-
-  doesSupportBidi: boolean;
-
-  bidiCommands: BidiModuleMap = BIDI_COMMANDS as BidiModuleMap;
-
   constructor(opts: InitialOpts = <InitialOpts>{}, shouldValidateCaps = true) {
-    this._log = logger.getLogger(helpers.generateDriverLogPrefix(this as Core<C>));
+    super();
+    this._log = this.log; // TODO: remove references to this._log and use this.log instead
+
 
     // setup state
     this.opts = opts as DriverOpts<C>;
@@ -141,16 +129,9 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
     this.managedDrivers = [];
     this.noCommandTimer = null;
     this._eventHistory = {commands: []};
-    this.eventEmitter = new EventEmitter();
     this.shutdownUnexpectedly = false;
     this.commandsQueueGuard = new AsyncLock();
     this.settings = new DeviceSettings();
-    this.bidiEventSubs = {};
-    this.doesSupportBidi = false;
-  }
-
-  get log() {
-    return this._log;
   }
 
   /**
@@ -433,75 +414,4 @@ export class DriverCore<const C extends Constraints, Settings extends StringReco
     }
   }
 
-  updateBidiCommands(cmds: BidiModuleMap): void {
-    const overlappingKeys = _.intersection(Object.keys(cmds), Object.keys(this.bidiCommands));
-    if (overlappingKeys.length) {
-      this.log.warn(`Overwriting existing bidi modules: ${JSON.stringify(overlappingKeys)}. This may not be intended!`);
-    }
-    this.bidiCommands = {
-      ...this.bidiCommands,
-      ...cmds,
-    };
-  }
-
-  async executeBidiCommand(bidiCmd: string, bidiParams: StringRecord): Promise<BiDiResultData> {
-    const [moduleName, methodName] = bidiCmd.split('.');
-
-    // if we don't get a valid format for bidi command name, reject
-    if (!moduleName || !methodName) {
-      throw new errors.UnknownCommandError(
-        `Did not receive a valid BiDi module and method name ` +
-          `of the form moduleName.methodName. Instead received ` +
-          `'${moduleName}.${methodName}'`,
-      );
-    }
-
-
-    // if the command module or method isn't part of our spec, reject
-    if (!this.bidiCommands[moduleName] || !this.bidiCommands[moduleName][methodName]) {
-      throw new errors.UnknownCommandError();
-    }
-
-    const {command, params} = this.bidiCommands[moduleName][methodName];
-    // if the command method isn't part of our spec, also reject
-    if (!command) {
-      throw new errors.UnknownCommandError();
-    }
-
-    // If the driver doesn't have this command, it must not be implemented
-    if (!this[command]) {
-      throw new errors.NotYetImplementedError();
-    }
-
-    // TODO improve param parsing and error messages along the lines of what we have in the http
-    // handlers
-    const args: any[] = [];
-    if (params?.required?.length) {
-      for (const requiredParam of params.required) {
-        if (_.isUndefined(bidiParams[requiredParam])) {
-          throw new errors.InvalidArgumentError(
-            `The ${requiredParam} parameter was required but you omitted it`,
-          );
-        }
-        args.push(bidiParams[requiredParam]);
-      }
-    }
-    if (params?.optional?.length) {
-      for (const optionalParam of params.optional) {
-        args.push(bidiParams[optionalParam]);
-      }
-    }
-    const logParams = _.truncate(JSON.stringify(bidiParams), {length: MAX_LOG_BODY_LENGTH});
-    this.log.debug(
-      `Executing bidi command '${bidiCmd}' with params ${logParams} by passing to driver ` +
-        `method '${command}'`,
-    );
-    const response = await this[command](...args);
-    const finalResponse = _.isUndefined(response) ? {} : response;
-    this.log.debug(
-      `Responding to bidi command '${bidiCmd}' with ` +
-      `${_.truncate(JSON.stringify(finalResponse), {length: MAX_LOG_BODY_LENGTH})}`
-    );
-    return finalResponse;
-  }
 }

package/lib/basedriver/extension-core.ts

@@ -0,0 +1,128 @@
+import {logger} from '@appium/support';
+import {EventEmitter} from 'node:events';
+import type {
+  AppiumLogger,
+  BidiModuleMap,
+  BiDiResultData,
+  StringRecord,
+} from '@appium/types';
+import {
+  MAX_LOG_BODY_LENGTH,
+} from '../constants';
+import {errors} from '../protocol';
+import {BIDI_COMMANDS} from '../protocol/bidi-commands';
+import _ from 'lodash';
+import {generateDriverLogPrefix} from './helpers';
+
+export class ExtensionCore {
+  bidiEventSubs: Record<string, string[]>;
+  bidiCommands: BidiModuleMap = BIDI_COMMANDS as BidiModuleMap;
+  _logPrefix?: string;
+  protected _log: AppiumLogger;
+  // used to handle driver events
+  readonly eventEmitter: NodeJS.EventEmitter;
+
+
+  constructor(logPrefix?: string) {
+    this._logPrefix = logPrefix;
+    this.bidiEventSubs = {};
+    this.eventEmitter = new EventEmitter();
+  }
+
+  get log(): AppiumLogger {
+    if (!this._log) {
+      this.updateLogPrefix(this._logPrefix ?? generateDriverLogPrefix(this));
+    }
+    return this._log;
+  }
+
+  updateLogPrefix(logPrefix: string) {
+    this._log = logger.getLogger(logPrefix);
+  }
+
+  updateBidiCommands(cmds: BidiModuleMap): void {
+    const overlappingKeys = _.intersection(Object.keys(cmds), Object.keys(this.bidiCommands));
+    if (overlappingKeys.length) {
+      this.log.warn(`Overwriting existing bidi modules: ${JSON.stringify(overlappingKeys)}. This may not be intended!`);
+    }
+    this.bidiCommands = {
+      ...this.bidiCommands,
+      ...cmds,
+    };
+  }
+
+  doesBidiCommandExist(moduleName: string, methodName: string): boolean {
+    try {
+      this.ensureBidiCommandExists(moduleName, methodName);
+    } catch {
+      return false;
+    }
+    return true;
+  }
+
+  ensureBidiCommandExists(moduleName: string, methodName: string): void {
+    // if we don't get a valid format for bidi command name, reject
+    if (!moduleName || !methodName) {
+      throw new errors.UnknownCommandError(
+        `Did not receive a valid BiDi module and method name ` +
+          `of the form moduleName.methodName. Instead received ` +
+          `'${moduleName}.${methodName}'`,
+      );
+    }
+
+    // if the command module or method isn't part of our spec, reject
+    if (!this.bidiCommands[moduleName] || !this.bidiCommands[moduleName][methodName]) {
+      throw new errors.UnknownCommandError();
+    }
+
+    const {command} = this.bidiCommands[moduleName][methodName];
+    // if the command method isn't part of our spec, also reject
+    if (!command) {
+      throw new errors.UnknownCommandError();
+    }
+
+    // If the driver doesn't have this command, it must not be implemented
+    if (!this[command]) {
+      throw new errors.NotYetImplementedError();
+    }
+  }
+
+  async executeBidiCommand(bidiCmd: string, bidiParams: StringRecord, next?: () => Promise<any>, driver?: ExtensionCore): Promise<BiDiResultData> {
+    const handlerType = (next && driver) ? 'plugin' : 'driver';
+    const [moduleName, methodName] = bidiCmd.split('.');
+    this.ensureBidiCommandExists(moduleName, methodName);
+    const {command, params} = this.bidiCommands[moduleName][methodName];
+
+    // TODO improve param parsing and error messages along the lines of what we have in the http
+    // handlers
+    const args: any[] = [];
+    if (params?.required?.length) {
+      for (const requiredParam of params.required) {
+        if (_.isUndefined(bidiParams[requiredParam])) {
+          throw new errors.InvalidArgumentError(
+            `The ${requiredParam} parameter was required but you omitted it`,
+          );
+        }
+        args.push(bidiParams[requiredParam]);
+      }
+    }
+    if (params?.optional?.length) {
+      for (const optionalParam of params.optional) {
+        args.push(bidiParams[optionalParam]);
+      }
+    }
+    const logParams = _.truncate(JSON.stringify(bidiParams), {length: MAX_LOG_BODY_LENGTH});
+    this.log.debug(
+      `Executing bidi command '${bidiCmd}' with params ${logParams} by passing to ${handlerType} ` +
+        `method '${command}'`,
+    );
+    // call the handler with the signature appropriate to extension type (plugin or driver)
+    const response = (next && driver) ? await this[command](next, driver, ...args) : await this[command](...args);
+    const finalResponse = _.isUndefined(response) ? {} : response;
+    this.log.debug(
+      `Responding to bidi command '${bidiCmd}' with ` +
+      `${_.truncate(JSON.stringify(finalResponse), {length: MAX_LOG_BODY_LENGTH})}`
+    );
+    return finalResponse;
+  }
+}

package/lib/basedriver/helpers.js

@@ -401,7 +401,7 @@ export function parseCapsArray(cap) {
 /**
  * Generate a string that uniquely describes driver instance
  *
- * @param {import('@appium/types').Core} obj driver instance
+ * @param {object} obj driver instance
  * @param {string?} [sessionId=null] session identifier (if exists).
  * This parameter is deprecated and is not used.
  * @returns {string}

package/lib/index.js

@@ -10,6 +10,7 @@ try {
 }
 
 // BaseDriver exports
+export {ExtensionCore} from './basedriver/extension-core';
 import {BaseDriver} from './basedriver/driver';
 export {DriverCore} from './basedriver/core';
 export {DeviceSettings} from './basedriver/device-settings';
@@ -48,6 +49,8 @@ export {
 // Web socket helpers
 export {DEFAULT_WS_PATHNAME_PREFIX} from './express/websocket';
 
+export {generateDriverLogPrefix} from './basedriver/helpers';
+
 /**
  * @typedef {import('./express/server').ServerOpts} ServerOpts
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appium/base-driver",
-  "version": "9.14.1",
+  "version": "9.15.0",
   "description": "Base driver class for Appium drivers",
   "keywords": [
     "automation",
@@ -44,8 +44,8 @@
     "test:types": "tsd"
   },
   "dependencies": {
-    "@appium/support": "^6.0.2",
-    "@appium/types": "^0.23.0",
+    "@appium/support": "^6.0.3",
+    "@appium/types": "^0.24.0",
     "@colors/colors": "1.6.0",
     "@types/async-lock": "1.4.2",
     "@types/bluebird": "3.5.42",
@@ -80,7 +80,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3467f32c8e3618db05b6b210544cfdc6a57bb73c",
+  "gitHead": "a7ce83e169e101ae497bab11204a73703fd54e99",
   "tsd": {
     "directory": "test/types"
   }