appium-chromedriver 8.3.1 → 8.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/build/lib/chromedriver.d.ts +1 -1
- package/build/lib/chromedriver.d.ts.map +1 -1
- package/build/lib/chromedriver.js +5 -4
- package/build/lib/chromedriver.js.map +1 -1
- package/build/lib/commands/binary.d.ts.map +1 -1
- package/build/lib/commands/binary.js +14 -14
- package/build/lib/commands/binary.js.map +1 -1
- package/build/lib/commands/process.d.ts.map +1 -1
- package/build/lib/commands/process.js +5 -8
- package/build/lib/commands/process.js.map +1 -1
- package/build/lib/commands/session.d.ts.map +1 -1
- package/build/lib/commands/session.js +9 -16
- package/build/lib/commands/session.js.map +1 -1
- package/build/lib/commands/types.d.ts +3 -2
- package/build/lib/commands/types.d.ts.map +1 -1
- package/build/lib/storage-client/chromelabs.d.ts.map +1 -1
- package/build/lib/storage-client/chromelabs.js +5 -8
- package/build/lib/storage-client/chromelabs.js.map +1 -1
- package/build/lib/storage-client/googleapis.d.ts.map +1 -1
- package/build/lib/storage-client/googleapis.js +9 -6
- package/build/lib/storage-client/googleapis.js.map +1 -1
- package/build/lib/storage-client/storage-client.d.ts.map +1 -1
- package/build/lib/storage-client/storage-client.js +23 -24
- package/build/lib/storage-client/storage-client.js.map +1 -1
- package/build/lib/utils.d.ts +11 -5
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +10 -12
- package/build/lib/utils.js.map +1 -1
- package/config/mapping.json +2 -0
- package/lib/chromedriver.ts +8 -6
- package/lib/commands/binary.ts +14 -14
- package/lib/commands/process.ts +7 -7
- package/lib/commands/session.ts +10 -16
- package/lib/commands/types.ts +5 -2
- package/lib/storage-client/chromelabs.ts +11 -8
- package/lib/storage-client/googleapis.ts +9 -6
- package/lib/storage-client/storage-client.ts +24 -24
- package/lib/utils.ts +14 -15
- package/package.json +3 -5
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.findChildNode = findChildNode;
|
|
7
7
|
exports.parseNotes = parseNotes;
|
|
8
8
|
exports.parseGoogleapiStorageXml = parseGoogleapiStorageXml;
|
|
9
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const xpath_1 = require("xpath");
|
|
11
10
|
const support_1 = require("@appium/support");
|
|
12
11
|
const utils_1 = require("../utils");
|
|
@@ -84,17 +83,21 @@ async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
|
84
83
|
const doc = new xmldom_1.DOMParser().parseFromString(xml, 'text/xml');
|
|
85
84
|
const driverNodes = (0, xpath_1.select)(`//*[local-name(.)='Contents']`, doc);
|
|
86
85
|
log.debug(`Parsed ${driverNodes.length} entries from storage XML`);
|
|
87
|
-
if (
|
|
86
|
+
if (driverNodes.length === 0) {
|
|
88
87
|
throw new Error('Cannot retrieve any valid Chromedriver entries from the storage config');
|
|
89
88
|
}
|
|
90
89
|
const infoParsers = [];
|
|
91
90
|
const mapping = {};
|
|
92
91
|
for (const driverNode of driverNodes) {
|
|
93
92
|
const k = extractNodeText(findChildNode(driverNode, 'Key'));
|
|
94
|
-
if (!
|
|
93
|
+
if (!String(k).includes('/chromedriver_')) {
|
|
95
94
|
continue;
|
|
96
95
|
}
|
|
97
96
|
const key = String(k);
|
|
97
|
+
const versionSegment = key.split('/')[0];
|
|
98
|
+
if (!versionSegment) {
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
98
101
|
const etag = extractNodeText(findChildNode(driverNode, 'ETag'));
|
|
99
102
|
if (!etag) {
|
|
100
103
|
log.debug(`The entry '${key}' does not contain the checksum. Skipping it`);
|
|
@@ -108,8 +111,8 @@ async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
|
108
111
|
}
|
|
109
112
|
const cdInfo = {
|
|
110
113
|
url: `${constants_1.GOOGLEAPIS_CDN}/${key}`,
|
|
111
|
-
etag:
|
|
112
|
-
version:
|
|
114
|
+
etag: etag.replace(/^"+|"+$/g, ''),
|
|
115
|
+
version: versionSegment,
|
|
113
116
|
minBrowserVersion: null,
|
|
114
117
|
os: {
|
|
115
118
|
name: osNameMatch[1],
|
|
@@ -137,7 +140,7 @@ async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
|
137
140
|
await (0, asyncbox_1.asyncmap)(infoParsers, async (parseInfo) => {
|
|
138
141
|
await parseInfo();
|
|
139
142
|
}, { concurrency: MAX_PARALLEL_DOWNLOADS });
|
|
140
|
-
log.info(`The total count of entries in the mapping: ${
|
|
143
|
+
log.info(`The total count of entries in the mapping: ${Object.keys(mapping).length}`);
|
|
141
144
|
return mapping;
|
|
142
145
|
}
|
|
143
146
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleapis.js","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"googleapis.js","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-client.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage-client.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,6BAA6B,EAC7B,WAAW,EAEX,0BAA0B,EAC3B,MAAM,UAAU,CAAC;AAwBlB,qBAAa,yBAAyB;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,OAAO,CAA6B;gBAEhC,IAAI,GAAE,6BAAkC;IAOpD;;;;;;;OAOG;IACG,eAAe,CAAC,gBAAgB,UAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA0CnF;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA4C5D;;;;;OAKG;IACG,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC;IAuBlD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;IA8H7B;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;;;;;;;;;;;;;OAcG;YACW,cAAc;IAgD5B;;;;;;OAMG;YACW,WAAW;CAuB1B"}
|
|
@@ -38,7 +38,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.ChromedriverStorageClient = void 0;
|
|
40
40
|
const utils_1 = require("../utils");
|
|
41
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
42
41
|
const node_path_1 = __importDefault(require("node:path"));
|
|
43
42
|
const asyncbox_1 = require("asyncbox");
|
|
44
43
|
const support_1 = require("@appium/support");
|
|
@@ -117,14 +116,14 @@ class ChromedriverStorageClient {
|
|
|
117
116
|
* @returns The list of successfully synchronized driver keys
|
|
118
117
|
*/
|
|
119
118
|
async syncDrivers(opts = {}) {
|
|
120
|
-
if (
|
|
119
|
+
if (support_1.util.isEmpty(this.mapping)) {
|
|
121
120
|
await this.retrieveMapping(!!opts.minBrowserVersion);
|
|
122
121
|
}
|
|
123
|
-
if (
|
|
122
|
+
if (support_1.util.isEmpty(this.mapping)) {
|
|
124
123
|
throw new Error('Cannot retrieve chromedrivers mapping from Google storage');
|
|
125
124
|
}
|
|
126
125
|
const driversToSync = this.selectMatchingDrivers(opts.osInfo ?? (await (0, utils_1.getOsInfo)()), opts);
|
|
127
|
-
if (
|
|
126
|
+
if (support_1.util.isEmpty(driversToSync)) {
|
|
128
127
|
log.debug(`There are no drivers to sync. Exiting`);
|
|
129
128
|
return [];
|
|
130
129
|
}
|
|
@@ -134,7 +133,7 @@ class ChromedriverStorageClient {
|
|
|
134
133
|
const archivesRoot = await support_1.tempDir.openDir();
|
|
135
134
|
try {
|
|
136
135
|
await (0, asyncbox_1.asyncmap)([...driversToSync.entries()], async ([idx, driverKey]) => {
|
|
137
|
-
if (await this.retrieveDriver(idx, driverKey, archivesRoot, !
|
|
136
|
+
if (await this.retrieveDriver(idx, driverKey, archivesRoot, !support_1.util.isEmpty(opts))) {
|
|
138
137
|
synchronizedDrivers.push(driverKey);
|
|
139
138
|
}
|
|
140
139
|
}, { concurrency: MAX_PARALLEL_DOWNLOADS });
|
|
@@ -142,7 +141,7 @@ class ChromedriverStorageClient {
|
|
|
142
141
|
finally {
|
|
143
142
|
await support_1.fs.rimraf(archivesRoot);
|
|
144
143
|
}
|
|
145
|
-
if (!
|
|
144
|
+
if (!support_1.util.isEmpty(synchronizedDrivers)) {
|
|
146
145
|
log.info(`Successfully synchronized ` +
|
|
147
146
|
`${support_1.util.pluralize('chromedriver', synchronizedDrivers.length, true)}`);
|
|
148
147
|
}
|
|
@@ -166,10 +165,10 @@ class ChromedriverStorageClient {
|
|
|
166
165
|
}, { timeout: constants_1.STORAGE_REQ_TIMEOUT_MS });
|
|
167
166
|
}
|
|
168
167
|
catch (e) {
|
|
169
|
-
const
|
|
168
|
+
const detail = e instanceof Error ? e.message : String(e);
|
|
170
169
|
throw new Error(`Cannot fetch the latest Chromedriver version. ` +
|
|
171
170
|
`Make sure you can access ${CHROME_FOR_TESTING_LAST_GOOD_VERSIONS} from your machine or provide a mirror by setting ` +
|
|
172
|
-
`a custom value to CHROMELABS_URL environment variable. Original error: ${
|
|
171
|
+
`a custom value to CHROMELABS_URL environment variable. Original error: ${detail}`, { cause: e });
|
|
173
172
|
}
|
|
174
173
|
return (0, chromelabs_1.parseLatestKnownGoodVersionsJson)(jsonStr);
|
|
175
174
|
}
|
|
@@ -183,13 +182,13 @@ class ChromedriverStorageClient {
|
|
|
183
182
|
*/
|
|
184
183
|
selectMatchingDrivers(osInfo, opts = {}) {
|
|
185
184
|
const { minBrowserVersion, versions = [] } = opts;
|
|
186
|
-
let driversToSync =
|
|
187
|
-
if (!
|
|
185
|
+
let driversToSync = Object.keys(this.mapping);
|
|
186
|
+
if (!support_1.util.isEmpty(versions)) {
|
|
188
187
|
// Handle only selected versions if requested
|
|
189
188
|
log.debug(`Selecting chromedrivers whose versions match to ${versions}`);
|
|
190
189
|
driversToSync = driversToSync.filter((cdName) => versions.includes(`${this.mapping[cdName].version}`));
|
|
191
190
|
log.debug(`Got ${support_1.util.pluralize('item', driversToSync.length, true)}`);
|
|
192
|
-
if (
|
|
191
|
+
if (support_1.util.isEmpty(driversToSync)) {
|
|
193
192
|
return [];
|
|
194
193
|
}
|
|
195
194
|
}
|
|
@@ -210,18 +209,18 @@ class ChromedriverStorageClient {
|
|
|
210
209
|
driversToSync = driversToSync.filter((cdName) => `${this.mapping[cdName].minBrowserVersion}` ===
|
|
211
210
|
`${closestMatchedVersionNumber > 0 ? closestMatchedVersionNumber : minBrowserVersionInt}`);
|
|
212
211
|
log.debug(`Got ${support_1.util.pluralize('item', driversToSync.length, true)}`);
|
|
213
|
-
if (
|
|
212
|
+
if (support_1.util.isEmpty(driversToSync)) {
|
|
214
213
|
return [];
|
|
215
214
|
}
|
|
216
215
|
log.debug(`Will select candidate ${support_1.util.pluralize('driver', driversToSync.length)} ` +
|
|
217
|
-
`versioned as '${
|
|
216
|
+
`versioned as '${support_1.util.uniq(driversToSync.map((cdName) => this.mapping[cdName].version))}'`);
|
|
218
217
|
}
|
|
219
|
-
if (!
|
|
218
|
+
if (!support_1.util.isEmpty(osInfo)) {
|
|
220
219
|
// Filter out drivers for unsupported system architectures
|
|
221
220
|
const { name, arch, cpu = (0, utils_1.getCpuType)() } = osInfo;
|
|
222
221
|
log.debug(`Selecting chromedrivers whose platform matches to ${name}:${cpu}${arch}`);
|
|
223
222
|
let result = driversToSync.filter((cdName) => this.doesMatchForOsInfo(cdName, osInfo));
|
|
224
|
-
if (
|
|
223
|
+
if (support_1.util.isEmpty(result) && arch === constants_1.ARCH.X64 && cpu === constants_1.CPU.INTEL) {
|
|
225
224
|
// Fallback to X86 if X64 architecture is not available for this driver
|
|
226
225
|
result = driversToSync.filter((cdName) => this.doesMatchForOsInfo(cdName, {
|
|
227
226
|
name,
|
|
@@ -229,7 +228,7 @@ class ChromedriverStorageClient {
|
|
|
229
228
|
cpu,
|
|
230
229
|
}));
|
|
231
230
|
}
|
|
232
|
-
if (
|
|
231
|
+
if (support_1.util.isEmpty(result) && (name === constants_1.OS.MAC || name === constants_1.OS.WINDOWS) && cpu === constants_1.CPU.ARM) {
|
|
233
232
|
// Fallback to Intel (Rosetta on macOS, x64 emulation on Windows ARM):
|
|
234
233
|
// https://github.com/appium/appium-chromedriver/issues/562
|
|
235
234
|
result = driversToSync.filter((cdName) => this.doesMatchForOsInfo(cdName, {
|
|
@@ -241,7 +240,7 @@ class ChromedriverStorageClient {
|
|
|
241
240
|
driversToSync = result;
|
|
242
241
|
log.debug(`Got ${support_1.util.pluralize('item', driversToSync.length, true)}`);
|
|
243
242
|
}
|
|
244
|
-
if (!
|
|
243
|
+
if (!support_1.util.isEmpty(driversToSync)) {
|
|
245
244
|
log.debug('Excluding older patches if present');
|
|
246
245
|
const patchesMap = {};
|
|
247
246
|
// Older chromedrivers must not be excluded as they follow a different
|
|
@@ -258,20 +257,20 @@ class ChromedriverStorageClient {
|
|
|
258
257
|
if (!verObj) {
|
|
259
258
|
continue;
|
|
260
259
|
}
|
|
261
|
-
if (!
|
|
260
|
+
if (!Array.isArray(patchesMap[verObj.major])) {
|
|
262
261
|
patchesMap[verObj.major] = [];
|
|
263
262
|
}
|
|
264
263
|
patchesMap[verObj.major].push(cdVersion);
|
|
265
264
|
}
|
|
266
|
-
for (const majorVersion of
|
|
265
|
+
for (const majorVersion of Object.keys(patchesMap)) {
|
|
267
266
|
if (patchesMap[majorVersion].length <= 1) {
|
|
268
267
|
continue;
|
|
269
268
|
}
|
|
270
269
|
patchesMap[majorVersion].sort((a, b) => (0, compare_versions_1.compareVersions)(b, a));
|
|
271
270
|
}
|
|
272
|
-
if (!
|
|
271
|
+
if (!support_1.util.isEmpty(patchesMap)) {
|
|
273
272
|
log.debug('Versions mapping: ' + JSON.stringify(patchesMap, null, 2));
|
|
274
|
-
for (const sortedVersions of
|
|
273
|
+
for (const sortedVersions of Object.values(patchesMap)) {
|
|
275
274
|
selectedVersions.add(sortedVersions[0]);
|
|
276
275
|
}
|
|
277
276
|
driversToSync = driversToSync.filter((cdName) => selectedVersions.has(this.mapping[cdName].version));
|
|
@@ -328,7 +327,7 @@ class ChromedriverStorageClient {
|
|
|
328
327
|
const err = e;
|
|
329
328
|
const msg = `Cannot download chromedriver archive. Original error: ${err.message}`;
|
|
330
329
|
if (isStrict) {
|
|
331
|
-
throw new Error(msg);
|
|
330
|
+
throw new Error(msg, { cause: e });
|
|
332
331
|
}
|
|
333
332
|
log.error(msg);
|
|
334
333
|
return false;
|
|
@@ -369,7 +368,7 @@ class ChromedriverStorageClient {
|
|
|
369
368
|
const tmpRoot = await support_1.tempDir.openDir();
|
|
370
369
|
try {
|
|
371
370
|
await support_1.zip.extractAllTo(src, tmpRoot);
|
|
372
|
-
const chromedriverPath = await support_1.fs.walkDir(tmpRoot, true, (itemPath, isDirectory) => !isDirectory &&
|
|
371
|
+
const chromedriverPath = await support_1.fs.walkDir(tmpRoot, true, (itemPath, isDirectory) => !isDirectory && node_path_1.default.parse(itemPath).name.toLowerCase() === 'chromedriver');
|
|
373
372
|
if (!chromedriverPath) {
|
|
374
373
|
throw new Error('The archive was unzipped properly, but we could not find any chromedriver executable');
|
|
375
374
|
}
|
|
@@ -386,6 +385,6 @@ class ChromedriverStorageClient {
|
|
|
386
385
|
exports.ChromedriverStorageClient = ChromedriverStorageClient;
|
|
387
386
|
async function isCrcOk(src, checksum) {
|
|
388
387
|
const md5 = await support_1.fs.hash(src, 'md5');
|
|
389
|
-
return
|
|
388
|
+
return md5.toLowerCase() === checksum.toLowerCase();
|
|
390
389
|
}
|
|
391
390
|
//# sourceMappingURL=storage-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-client.js","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"storage-client.js","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"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"}
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import type { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import { OS, CPU } from './constants';
|
|
3
3
|
import type { ADB } from 'appium-adb';
|
|
4
4
|
import type { ChromedriverVersionMapping, OSInfo } from './types';
|
|
@@ -38,22 +38,28 @@ export declare function getChromedriverBinaryPath(osName?: string): Promise<stri
|
|
|
38
38
|
* @param opts - Optional configuration (timeout, responseType).
|
|
39
39
|
* @returns The response data.
|
|
40
40
|
*/
|
|
41
|
-
export declare function retrieveData(url: string, headers?:
|
|
41
|
+
export declare function retrieveData(url: string, headers?: AxiosRequestConfig['headers'], opts?: Pick<AxiosRequestConfig, 'timeout' | 'responseType'>): Promise<any>;
|
|
42
42
|
/**
|
|
43
43
|
* Gets the OS name for the current system.
|
|
44
44
|
* @returns The OS name ('win', 'mac', or 'linux').
|
|
45
45
|
*/
|
|
46
|
-
export declare const getOsName: (() => (typeof OS)[keyof typeof OS]) &
|
|
46
|
+
export declare const getOsName: (() => (typeof OS)[keyof typeof OS]) & {
|
|
47
|
+
cache: Map<unknown, "linux" | "win" | "mac">;
|
|
48
|
+
};
|
|
47
49
|
/**
|
|
48
50
|
* Gets the CPU type for the current system.
|
|
49
51
|
* @returns The CPU type ('intel' or 'arm').
|
|
50
52
|
*/
|
|
51
|
-
export declare const getCpuType: (() => (typeof CPU)[keyof typeof CPU]) &
|
|
53
|
+
export declare const getCpuType: (() => (typeof CPU)[keyof typeof CPU]) & {
|
|
54
|
+
cache: Map<unknown, "intel" | "arm">;
|
|
55
|
+
};
|
|
52
56
|
/**
|
|
53
57
|
* Gets OS information including name, architecture, and CPU type.
|
|
54
58
|
* @returns A promise that resolves to OS information.
|
|
55
59
|
*/
|
|
56
|
-
export declare const getOsInfo: (() => Promise<OSInfo>) &
|
|
60
|
+
export declare const getOsInfo: (() => Promise<OSInfo>) & {
|
|
61
|
+
cache: Map<unknown, Promise<OSInfo>>;
|
|
62
|
+
};
|
|
57
63
|
/**
|
|
58
64
|
* Generates log prefix string.
|
|
59
65
|
* @param obj - Log owner instance.
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,OAAO,CAAC;AAE9C,OAAO,EAAC,EAAE,EAAE,GAAG,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAC,0BAA0B,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AAmBhE,eAAO,MAAM,2BAA2B,EAAE,0BAEzC,CAAC;AACF,eAAO,MAAM,WAAW,QAA6C,CAAC;AAEtE;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,GAAE,0BAAwD,GAChE,MAAM,CAMR;AAED,eAAO,MAAM,MAAM,EAAE,MAGQ,CAAC;AAE9B;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG9F;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAoB,GAAG,MAAM,CAEvE;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,GAAE,MAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAU7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACvC,IAAI,GAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,cAAc,CAAM,GAC9D,OAAO,CAAC,GAAG,CAAC,CAUd;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAsC,CAAC,OAAO,EAAE,EAAE,MAAM,OAAO,EAAE,CAAC;;CAQtF,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,SAAuC,CAAC,OAAO,GAAG,EAAE,MAAM,OAAO,GAAG,CAAC;;CAE1F,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,SAAS,SAA4C,OAAO,CAAC,MAAM,CAAC;;CAM/E,CAAC;AAOH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,GAAE,MAAM,GAAG,IAAW,GAAG,MAAM,CAKnF;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAWtD"}
|
package/build/lib/utils.js
CHANGED
|
@@ -11,7 +11,6 @@ exports.getChromedriverBinaryPath = getChromedriverBinaryPath;
|
|
|
11
11
|
exports.retrieveData = retrieveData;
|
|
12
12
|
exports.generateLogPrefix = generateLogPrefix;
|
|
13
13
|
exports.convertToInt = convertToInt;
|
|
14
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
15
14
|
const support_1 = require("@appium/support");
|
|
16
15
|
const base_driver_1 = require("@appium/base-driver");
|
|
17
16
|
const node_path_1 = __importDefault(require("node:path"));
|
|
@@ -26,7 +25,7 @@ const MODULE_NAME = 'appium-chromedriver';
|
|
|
26
25
|
* @returns The full path to module root
|
|
27
26
|
* @throws {Error} If the current module root folder cannot be determined
|
|
28
27
|
*/
|
|
29
|
-
const getModuleRoot =
|
|
28
|
+
const getModuleRoot = support_1.util.memoize(function getModuleRoot() {
|
|
30
29
|
const root = support_1.node.getModuleRootSync(MODULE_NAME, __filename);
|
|
31
30
|
if (!root) {
|
|
32
31
|
throw new Error(`Cannot find the root folder of the ${MODULE_NAME} Node.js module`);
|
|
@@ -43,10 +42,11 @@ exports.CD_BASE_DIR = node_path_1.default.join(getModuleRoot(), 'chromedriver');
|
|
|
43
42
|
* @throws {Error} If the mapping is empty.
|
|
44
43
|
*/
|
|
45
44
|
function getMostRecentChromedriver(mapping = exports.CHROMEDRIVER_CHROME_MAPPING) {
|
|
46
|
-
if (
|
|
45
|
+
if (support_1.util.isEmpty(mapping)) {
|
|
47
46
|
throw new Error('Unable to get most recent Chromedriver version from empty mapping');
|
|
48
47
|
}
|
|
49
|
-
|
|
48
|
+
const sorted = Object.keys(mapping).sort(compare_versions_1.compareVersions);
|
|
49
|
+
return sorted.at(-1);
|
|
50
50
|
}
|
|
51
51
|
exports.CD_VER = process.env.npm_config_chromedriver_version ||
|
|
52
52
|
process.env.CHROMEDRIVER_VERSION ||
|
|
@@ -83,9 +83,7 @@ async function getChromedriverBinaryPath(osName = (0, exports.getOsName)()) {
|
|
|
83
83
|
nocase: true,
|
|
84
84
|
nodir: true,
|
|
85
85
|
});
|
|
86
|
-
return
|
|
87
|
-
? node_path_1.default.resolve(rootDir, `${CD_EXECUTABLE_PREFIX}${pathSuffix}`)
|
|
88
|
-
: lodash_1.default.first(paths);
|
|
86
|
+
return paths[0] ?? node_path_1.default.resolve(rootDir, `${CD_EXECUTABLE_PREFIX}${pathSuffix}`);
|
|
89
87
|
}
|
|
90
88
|
/**
|
|
91
89
|
* Retrieves data from a URL using axios.
|
|
@@ -107,7 +105,7 @@ async function retrieveData(url, headers, opts = {}) {
|
|
|
107
105
|
* Gets the OS name for the current system.
|
|
108
106
|
* @returns The OS name ('win', 'mac', or 'linux').
|
|
109
107
|
*/
|
|
110
|
-
exports.getOsName =
|
|
108
|
+
exports.getOsName = support_1.util.memoize(function getOsName() {
|
|
111
109
|
if (support_1.system.isWindows()) {
|
|
112
110
|
return constants_1.OS.WINDOWS;
|
|
113
111
|
}
|
|
@@ -120,14 +118,14 @@ exports.getOsName = lodash_1.default.memoize(function getOsName() {
|
|
|
120
118
|
* Gets the CPU type for the current system.
|
|
121
119
|
* @returns The CPU type ('intel' or 'arm').
|
|
122
120
|
*/
|
|
123
|
-
exports.getCpuType =
|
|
124
|
-
return
|
|
121
|
+
exports.getCpuType = support_1.util.memoize(function getCpuType() {
|
|
122
|
+
return node_os_1.default.cpus()[0]?.model.toLowerCase().includes('apple') ? constants_1.CPU.ARM : constants_1.CPU.INTEL;
|
|
125
123
|
});
|
|
126
124
|
/**
|
|
127
125
|
* Gets OS information including name, architecture, and CPU type.
|
|
128
126
|
* @returns A promise that resolves to OS information.
|
|
129
127
|
*/
|
|
130
|
-
exports.getOsInfo =
|
|
128
|
+
exports.getOsInfo = support_1.util.memoize(async function getOsInfo() {
|
|
131
129
|
return {
|
|
132
130
|
name: (0, exports.getOsName)(),
|
|
133
131
|
arch: String(await support_1.system.arch()),
|
|
@@ -137,7 +135,7 @@ exports.getOsInfo = lodash_1.default.memoize(async function getOsInfo() {
|
|
|
137
135
|
// @ts-expect-error to avoid error
|
|
138
136
|
// TS2345: Argument of type '{}' is not assignable to parameter of type 'DriverOpts<Readonly<Record<string, Constraint>>>'
|
|
139
137
|
// Type '{}' is missing the following properties from type 'ServerArgs': address, allowCors, allowInsecure, basePath, and 26 more.
|
|
140
|
-
const getBaseDriverInstance =
|
|
138
|
+
const getBaseDriverInstance = support_1.util.memoize(() => new base_driver_1.BaseDriver({}, false));
|
|
141
139
|
/**
|
|
142
140
|
* Generates log prefix string.
|
|
143
141
|
* @param obj - Log owner instance.
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;;;;;AAuCA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
|
package/config/mapping.json
CHANGED
package/lib/chromedriver.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import events from 'node:events';
|
|
2
2
|
import {JWProxy, PROTOCOLS} from '@appium/base-driver';
|
|
3
|
-
import {logger} from '@appium/support';
|
|
3
|
+
import {logger, util} from '@appium/support';
|
|
4
4
|
import {SubProcess, exec} from 'teen_process';
|
|
5
5
|
import {getChromedriverDir, generateLogPrefix} from './utils';
|
|
6
|
-
import _ from 'lodash';
|
|
7
6
|
import {ChromedriverStorageClient} from './storage-client/storage-client';
|
|
8
7
|
import {CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES} from './constants';
|
|
9
8
|
import {
|
|
@@ -27,11 +26,14 @@ import type {ProxyOptions, HTTPMethod, HTTPBody} from '@appium/types';
|
|
|
27
26
|
import type {Request, Response} from 'express';
|
|
28
27
|
import type {ChromedriverOpts} from './types';
|
|
29
28
|
|
|
29
|
+
// Keep this import marked as used at runtime when it is otherwise only referenced in type positions.
|
|
30
|
+
void PROTOCOLS;
|
|
31
|
+
export type ChromedriverState = (typeof CHROMEDRIVER_STATES)[keyof typeof CHROMEDRIVER_STATES];
|
|
32
|
+
|
|
30
33
|
const DEFAULT_HOST = '127.0.0.1';
|
|
31
34
|
const DEFAULT_PORT = 9515;
|
|
32
35
|
// consider chromedriver ready once startup banner appears
|
|
33
36
|
const chromedriverStdoutStartDetector = (stdout: string): boolean => stdout.startsWith('Starting ');
|
|
34
|
-
type ChromedriverState = (typeof CHROMEDRIVER_STATES)[keyof typeof CHROMEDRIVER_STATES];
|
|
35
37
|
type ChromedriverEventMap = {
|
|
36
38
|
[CHROMEDRIVER_EVENTS.ERROR]: [Error];
|
|
37
39
|
[CHROMEDRIVER_EVENTS.CHANGED]: [{state: ChromedriverState}];
|
|
@@ -270,10 +272,10 @@ export class Chromedriver extends events.EventEmitter<ChromedriverEventMap> {
|
|
|
270
272
|
}
|
|
271
273
|
|
|
272
274
|
private prepareCapabilitiesForSessionStart(caps: SessionCapabilities): SessionCapabilities {
|
|
273
|
-
const capabilities =
|
|
275
|
+
const capabilities = structuredClone(caps);
|
|
274
276
|
// set the logging preferences to ALL browser console logs by default
|
|
275
|
-
capabilities.loggingPrefs =
|
|
276
|
-
if (
|
|
277
|
+
capabilities.loggingPrefs = structuredClone(getCapValue(caps, 'loggingPrefs', {}));
|
|
278
|
+
if (util.isEmpty(capabilities.loggingPrefs.browser)) {
|
|
277
279
|
capabilities.loggingPrefs.browser = 'ALL';
|
|
278
280
|
}
|
|
279
281
|
return capabilities;
|
package/lib/commands/binary.ts
CHANGED
|
@@ -2,7 +2,6 @@ import {fs, util} from '@appium/support';
|
|
|
2
2
|
import {asyncmap} from 'asyncbox';
|
|
3
3
|
import {compareVersions} from 'compare-versions';
|
|
4
4
|
import {type ExecError} from 'teen_process';
|
|
5
|
-
import _ from 'lodash';
|
|
6
5
|
import path from 'node:path';
|
|
7
6
|
import * as semver from 'semver';
|
|
8
7
|
import {CHROMEDRIVER_CHROME_MAPPING, getChromedriverBinaryPath} from '../utils';
|
|
@@ -33,7 +32,7 @@ type ChromedriverSelectionSelf = ChromedriverCommandContext & {
|
|
|
33
32
|
export async function getDriversMapping(
|
|
34
33
|
this: ChromedriverCommandContext,
|
|
35
34
|
): Promise<ChromedriverVersionMapping> {
|
|
36
|
-
let mapping =
|
|
35
|
+
let mapping = structuredClone(CHROMEDRIVER_CHROME_MAPPING);
|
|
37
36
|
if (this.mappingPath) {
|
|
38
37
|
this.log.debug(`Attempting to use Chromedriver->Chrome mapping from '${this.mappingPath}'`);
|
|
39
38
|
if (!(await fs.exists(this.mappingPath))) {
|
|
@@ -52,7 +51,7 @@ export async function getDriversMapping(
|
|
|
52
51
|
this.log.debug('Using the static Chromedriver->Chrome mapping');
|
|
53
52
|
}
|
|
54
53
|
|
|
55
|
-
for (const [cdVersion, chromeVersion] of
|
|
54
|
+
for (const [cdVersion, chromeVersion] of Object.entries(mapping)) {
|
|
56
55
|
const coercedVersion = semver.coerce(chromeVersion);
|
|
57
56
|
if (coercedVersion) {
|
|
58
57
|
mapping[cdVersion] = coercedVersion.version;
|
|
@@ -143,7 +142,7 @@ export async function getChromedrivers(
|
|
|
143
142
|
)
|
|
144
143
|
.filter((cd): cd is ChromedriverInfo => !!cd)
|
|
145
144
|
.sort((a, b) => compareVersions(b.version, a.version));
|
|
146
|
-
if (
|
|
145
|
+
if (cds.length === 0) {
|
|
147
146
|
this.log.info(`No Chromedrivers were found in '${this.executableDir}'`);
|
|
148
147
|
return cds;
|
|
149
148
|
}
|
|
@@ -197,8 +196,8 @@ export async function getCompatibleChromedriver(this: ChromedriverCommandContext
|
|
|
197
196
|
|
|
198
197
|
const ctx = this as ChromedriverSelectionSelf;
|
|
199
198
|
const mapping = await ctx.getDriversMapping();
|
|
200
|
-
if (!
|
|
201
|
-
ctx.log.debug(`The most recent known Chrome version: ${
|
|
199
|
+
if (!util.isEmpty(mapping)) {
|
|
200
|
+
ctx.log.debug(`The most recent known Chrome version: ${Object.values(mapping)[0]}`);
|
|
202
201
|
}
|
|
203
202
|
|
|
204
203
|
const syncState = {didStorageSync: false};
|
|
@@ -218,7 +217,7 @@ export async function getCompatibleChromedriver(this: ChromedriverCommandContext
|
|
|
218
217
|
ctx.log.debug(`Found Chrome bundle '${ctx.bundleId}' version '${chromeVersion}'`);
|
|
219
218
|
|
|
220
219
|
const matchingDrivers = filterChromedriversMatchingChrome(cds, chromeVersion);
|
|
221
|
-
if (
|
|
220
|
+
if (matchingDrivers.length === 0) {
|
|
222
221
|
if (ctx.storageClient && !syncState.didStorageSync) {
|
|
223
222
|
try {
|
|
224
223
|
if (await attemptChromedriverStorageSync(ctx, mapping, chromeVersion, syncState)) {
|
|
@@ -292,12 +291,13 @@ async function mergeDiscoveredMappingGaps(
|
|
|
292
291
|
}
|
|
293
292
|
missingVersions[version] = minChromeVersion;
|
|
294
293
|
}
|
|
295
|
-
|
|
294
|
+
const missingCount = Object.keys(missingVersions).length;
|
|
295
|
+
if (missingCount === 0) {
|
|
296
296
|
return;
|
|
297
297
|
}
|
|
298
298
|
ctx.log.info(
|
|
299
|
-
`Found ${util.pluralize('Chromedriver',
|
|
300
|
-
`which ${
|
|
299
|
+
`Found ${util.pluralize('Chromedriver', missingCount, true)}, ` +
|
|
300
|
+
`which ${missingCount === 1 ? 'is' : 'are'} missing in the list of known versions: ` +
|
|
301
301
|
JSON.stringify(missingVersions),
|
|
302
302
|
);
|
|
303
303
|
await ctx.updateDriversMapping(Object.assign(mapping, missingVersions));
|
|
@@ -307,7 +307,7 @@ function pickChromedriverWithBuildCheckDisabled(
|
|
|
307
307
|
ctx: ChromedriverSelectionSelf,
|
|
308
308
|
cds: ChromedriverInfo[],
|
|
309
309
|
): string {
|
|
310
|
-
if (
|
|
310
|
+
if (cds.length === 0) {
|
|
311
311
|
throw ctx.log.errorWithException(
|
|
312
312
|
`There must be at least one Chromedriver executable available for use if ` +
|
|
313
313
|
`'chromedriverDisableBuildCheck' capability is set to 'true'`,
|
|
@@ -325,7 +325,7 @@ function pickChromedriverWhenChromeUnknown(
|
|
|
325
325
|
ctx: ChromedriverSelectionSelf,
|
|
326
326
|
cds: ChromedriverInfo[],
|
|
327
327
|
): string {
|
|
328
|
-
if (
|
|
328
|
+
if (cds.length === 0) {
|
|
329
329
|
throw ctx.log.errorWithException(
|
|
330
330
|
`There must be at least one Chromedriver executable available for use if ` +
|
|
331
331
|
`the current Chrome version cannot be determined`,
|
|
@@ -370,12 +370,12 @@ async function attemptChromedriverStorageSync(
|
|
|
370
370
|
const retrievedMapping = await ctx.storageClient.retrieveMapping();
|
|
371
371
|
ctx.log.debug(
|
|
372
372
|
'Got chromedrivers mapping from the storage: ' +
|
|
373
|
-
|
|
373
|
+
util.truncateString(JSON.stringify(retrievedMapping, null, 2), {length: 500}),
|
|
374
374
|
);
|
|
375
375
|
const driverKeys = await ctx.storageClient.syncDrivers({
|
|
376
376
|
minBrowserVersion: chromeVersion.major,
|
|
377
377
|
});
|
|
378
|
-
if (
|
|
378
|
+
if (driverKeys.length === 0) {
|
|
379
379
|
return false;
|
|
380
380
|
}
|
|
381
381
|
const synchronizedDriversMapping = driverKeys.reduce((acc, x) => {
|