appium-chromedriver 9.0.1 → 9.0.2

package/lib/storage-client/storage-client.ts

@@ -1,29 +1,15 @@
-import {getChromedriverDir, retrieveData, getOsInfo, convertToInt, getCpuType} from '../utils.js';
 import path from 'node:path';
-import {asyncmap} from 'asyncbox';
+
 import {system, fs, logger, tempDir, zip, util, net} from '@appium/support';
-import {
-  STORAGE_REQ_TIMEOUT_MS,
-  GOOGLEAPIS_CDN,
-  USER_AGENT,
-  CHROMELABS_URL,
-  ARCH,
-  OS,
-  CPU,
-} from '../constants.js';
-import {parseGoogleapiStorageXml} from './googleapis.js';
-import {
-  parseKnownGoodVersionsWithDownloadsJson,
-  parseLatestKnownGoodVersionsJson,
-} from './chromelabs.js';
+import {asyncmap} from 'asyncbox';
 import {compareVersions} from 'compare-versions';
 import * as semver from 'semver';
-import type {
-  ChromedriverStorageClientOpts,
-  SyncOptions,
-  OSInfo,
-  ChromedriverDetailsMapping,
-} from '../types.js';
+
+import {STORAGE_REQ_TIMEOUT_MS, GOOGLEAPIS_CDN, USER_AGENT, CHROMELABS_URL, ARCH, OS, CPU} from '../constants.js';
+import type {ChromedriverStorageClientOpts, SyncOptions, OSInfo, ChromedriverDetailsMapping} from '../types.js';
+import {getChromedriverDir, retrieveData, getOsInfo, convertToInt, getCpuType} from '../utils.js';
+import {parseKnownGoodVersionsWithDownloadsJson, parseLatestKnownGoodVersionsJson} from './chromelabs.js';
+import {parseGoogleapiStorageXml} from './googleapis.js';
 
 const MAX_PARALLEL_DOWNLOADS = 5;
 
@@ -68,10 +54,7 @@ export class ChromedriverStorageClient {
    * @returns Promise<ChromedriverDetailsMapping>
    */
   async retrieveMapping(shouldParseNotes = true): Promise<ChromedriverDetailsMapping> {
-    const retrieveResponseSafely = async ({
-      url,
-      accept,
-    }: StorageInfo): Promise<string | undefined> => {
+    const retrieveResponseSafely = async ({url, accept}: StorageInfo): Promise<string | undefined> => {
       try {
         return await retrieveData(
           url,
@@ -130,8 +113,7 @@ export class ChromedriverStorageClient {
       return [];
     }
     log.debug(
-      `Got ${util.pluralize('driver', driversToSync.length, true)} to sync: ` +
-        JSON.stringify(driversToSync, null, 2),
+      `Got ${util.pluralize('driver', driversToSync.length, true)} to sync: ` + JSON.stringify(driversToSync, null, 2),
     );
 
     const synchronizedDrivers: string[] = [];
@@ -150,10 +132,7 @@ export class ChromedriverStorageClient {
       await fs.rimraf(archivesRoot);
     }
     if (!util.isEmpty(synchronizedDrivers)) {
-      log.info(
-        `Successfully synchronized ` +
-          `${util.pluralize('chromedriver', synchronizedDrivers.length, true)}`,
-      );
+      log.info(`Successfully synchronized ` + `${util.pluralize('chromedriver', synchronizedDrivers.length, true)}`);
     } else {
       log.info(`No chromedrivers were synchronized`);
     }
@@ -204,9 +183,7 @@ export class ChromedriverStorageClient {
     if (!util.isEmpty(versions)) {
       // Handle only selected versions if requested
       log.debug(`Selecting chromedrivers whose versions match to ${versions}`);
-      driversToSync = driversToSync.filter((cdName) =>
-        versions.includes(`${this.mapping[cdName].version}`),
-      );
+      driversToSync = driversToSync.filter((cdName) => versions.includes(`${this.mapping[cdName].version}`));
 
       log.debug(`Got ${util.pluralize('item', driversToSync.length, true)}`);
       if (util.isEmpty(driversToSync)) {
@@ -217,16 +194,11 @@ export class ChromedriverStorageClient {
     const minBrowserVersionInt = convertToInt(minBrowserVersion);
     if (minBrowserVersionInt !== null) {
       // Only select drivers that support the current browser whose major version number equals to `minBrowserVersion`
-      log.debug(
-        `Selecting chromedrivers whose minimum supported browser version matches to ${minBrowserVersionInt}`,
-      );
+      log.debug(`Selecting chromedrivers whose minimum supported browser version matches to ${minBrowserVersionInt}`);
       let closestMatchedVersionNumber = 0;
       // Select the newest available and compatible chromedriver
       for (const cdName of driversToSync) {
-        const currentMinBrowserVersion = parseInt(
-          String(this.mapping[cdName].minBrowserVersion),
-          10,
-        );
+        const currentMinBrowserVersion = parseInt(String(this.mapping[cdName].minBrowserVersion), 10);
         if (
           !Number.isNaN(currentMinBrowserVersion) &&
           currentMinBrowserVersion <= minBrowserVersionInt &&
@@ -314,9 +286,7 @@ export class ChromedriverStorageClient {
         for (const sortedVersions of Object.values(patchesMap)) {
           selectedVersions.add(sortedVersions[0]);
         }
-        driversToSync = driversToSync.filter((cdName) =>
-          selectedVersions.has(this.mapping[cdName].version),
-        );
+        driversToSync = driversToSync.filter((cdName) => selectedVersions.has(this.mapping[cdName].version));
       }
     }
 
@@ -423,13 +393,10 @@ export class ChromedriverStorageClient {
       const chromedriverPath = await fs.walkDir(
         tmpRoot,
         true,
-        (itemPath, isDirectory) =>
-          !isDirectory && path.parse(itemPath).name.toLowerCase() === 'chromedriver',
+        (itemPath, isDirectory) => !isDirectory && path.parse(itemPath).name.toLowerCase() === 'chromedriver',
       );
       if (!chromedriverPath) {
-        throw new Error(
-          'The archive was unzipped properly, but we could not find any chromedriver executable',
-        );
+        throw new Error('The archive was unzipped properly, but we could not find any chromedriver executable');
       }
       log.debug(`Moving the extracted '${path.basename(chromedriverPath)}' to '${dst}'`);
       await fs.mv(chromedriverPath, dst, {

package/lib/utils.ts

@@ -1,14 +1,16 @@
-import {system, fs, node, util} from '@appium/support';
-import {BaseDriver} from '@appium/base-driver';
-import path from 'node:path';
 import {readFileSync} from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import {fileURLToPath} from 'node:url';
-import {compareVersions} from 'compare-versions';
+
+import {BaseDriver} from '@appium/base-driver';
+import {system, fs, node, util} from '@appium/support';
+import type {ADB} from 'appium-adb';
 import axios from 'axios';
 import type {AxiosRequestConfig} from 'axios';
-import os from 'node:os';
+import {compareVersions} from 'compare-versions';
+
 import {OS, CPU} from './constants.js';
-import type {ADB} from 'appium-adb';
 import type {ChromedriverVersionMapping, OSInfo} from './types.js';
 
 const CD_EXECUTABLE_PREFIX = 'chromedriver';
@@ -39,9 +41,7 @@ export const CD_BASE_DIR = path.join(getModuleRoot(), 'chromedriver');
  * @returns The most recent version string.
  * @throws {Error} If the mapping is empty.
  */
-export function getMostRecentChromedriver(
-  mapping: ChromedriverVersionMapping = CHROMEDRIVER_CHROME_MAPPING,
-): string {
+export function getMostRecentChromedriver(mapping: ChromedriverVersionMapping = CHROMEDRIVER_CHROME_MAPPING): string {
   if (util.isEmpty(mapping)) {
     throw new Error('Unable to get most recent Chromedriver version from empty mapping');
   }
@@ -50,9 +50,7 @@ export function getMostRecentChromedriver(
 }
 
 export const CD_VER: string =
-  process.env.npm_config_chromedriver_version ||
-  process.env.CHROMEDRIVER_VERSION ||
-  getMostRecentChromedriver();
+  process.env.npm_config_chromedriver_version || process.env.CHROMEDRIVER_VERSION || getMostRecentChromedriver();
 
 /**
  * Gets the Chrome version for a given bundle ID using ADB.
@@ -160,10 +158,7 @@ const getBaseDriverInstance = util.memoize(() => new BaseDriver({}, false));
  * @returns The generated log prefix string.
  */
 export function generateLogPrefix(obj: any, sessionId: string | null = null): string {
-  return getBaseDriverInstance().helpers.generateDriverLogPrefix(
-    obj,
-    sessionId ? sessionId : undefined,
-  );
+  return getBaseDriverInstance().helpers.generateDriverLogPrefix(obj, sessionId ? sessionId : undefined);
 }
 
 /**

package/package.json

@@ -1,32 +1,21 @@
 {
   "name": "appium-chromedriver",
+  "version": "9.0.2",
   "description": "Node.js wrapper around chromedriver.",
   "keywords": [
+    "android",
     "appium",
-    "chrome",
-    "android"
+    "chrome"
   ],
-  "version": "9.0.1",
-  "author": "Appium Contributors",
+  "bugs": {
+    "url": "https://github.com/appium/appium/issues"
+  },
   "license": "Apache-2.0",
+  "author": "Appium Contributors",
   "repository": {
     "type": "git",
     "url": "https://github.com/appium/appium-chromedriver.git"
   },
-  "bugs": {
-    "url": "https://github.com/appium/appium/issues"
-  },
-  "engines": {
-    "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
-    "npm": ">=10"
-  },
-  "prettier": {
-    "bracketSpacing": false,
-    "printWidth": 100,
-    "singleQuote": true
-  },
-  "main": "./build/lib/index.js",
-  "type": "module",
   "directories": {
     "lib": "lib"
   },
@@ -36,6 +25,8 @@
     "build/lib",
     "CHANGELOG.md"
   ],
+  "type": "module",
+  "main": "./build/lib/index.js",
   "types": "./build/lib/index.d.ts",
   "exports": {
     ".": {
@@ -44,6 +35,18 @@
     },
     "./package.json": "./package.json"
   },
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "tsc -b --clean",
+    "dev": "npm run build -- --watch",
+    "lint": "oxlint -c oxlint.config.mjs .",
+    "lint:fix": "oxlint -c oxlint.config.mjs --fix .",
+    "prepare": "npm run build",
+    "format": "oxfmt -c oxfmt.config.mjs .",
+    "format:check": "oxfmt -c oxfmt.config.mjs --check .",
+    "test": "node --enable-source-maps --test --test-force-exit --test-timeout=60000 \"./build/test/unit/**/*.spec.js\"",
+    "e2e-test": "node --enable-source-maps --test --test-force-exit --test-concurrency=1 --test-timeout=600000 \"./build/test/functional/**/*.spec.js\""
+  },
   "dependencies": {
     "@appium/base-driver": "^10.0.0-rc.2",
     "@appium/support": "^7.2.2",
@@ -56,23 +59,10 @@
     "teen_process": "^4.0.4",
     "xpath": "^0.x"
   },
-  "scripts": {
-    "build": "tsc -b",
-    "clean": "tsc -b --clean",
-    "dev": "npm run build -- --watch",
-    "lint": "eslint .",
-    "lint:fix": "npm run lint -- --fix",
-    "prepare": "npm run build",
-    "format": "prettier -w ./lib ./test",
-    "format:check": "prettier --check ./lib ./test",
-    "test": "node --enable-source-maps --test --test-force-exit --test-timeout=60000 \"./build/test/unit/**/*.spec.js\"",
-    "e2e-test": "node --enable-source-maps --test --test-force-exit --test-concurrency=1 --test-timeout=600000 \"./build/test/functional/**/*.spec.js\""
-  },
   "devDependencies": {
-    "@appium/eslint-config-appium-ts": "^3.0.0",
-    "@appium/tsconfig": "^1.0.0-rc.1",
-    "@semantic-release/changelog": "^6.0.1",
-    "@semantic-release/git": "^10.0.1",
+    "@appium/oxc-config": "^1.1.0",
+    "@appium/semantic-release-config": "^1.1.0",
+    "@appium/tsconfig": "^1.2.0",
     "@types/chai": "^5.2.3",
     "@types/chai-as-promised": "^8.0.2",
     "@types/express": "^5.0.6",
@@ -81,11 +71,11 @@
     "@types/sinon": "^22.0.0",
     "chai": "^6.0.0",
     "chai-as-promised": "^8.0.0",
-    "conventional-changelog-conventionalcommits": "^9.3.1",
     "esmock": "^2.7.6",
-    "prettier": "^3.0.0",
-    "semantic-release": "^25.0.2",
-    "sinon": "^22.0.0",
-    "typescript": "^6.0.2"
+    "sinon": "^22.0.0"
+  },
+  "engines": {
+    "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
+    "npm": ">=10"
   }
 }