appium-chromedriver 9.0.0 → 9.0.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 +12 -0
- package/build/lib/chromedriver.d.ts +5 -5
- package/build/lib/chromedriver.d.ts.map +1 -1
- package/build/lib/chromedriver.js +5 -5
- package/build/lib/chromedriver.js.map +1 -1
- package/build/lib/commands/binary.d.ts.map +1 -1
- package/build/lib/commands/binary.js +5 -8
- 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 +1 -6
- 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 +3 -4
- package/build/lib/commands/session.js.map +1 -1
- package/build/lib/commands/types.d.ts +4 -4
- package/build/lib/commands/types.d.ts.map +1 -1
- package/build/lib/commands/version.d.ts.map +1 -1
- package/build/lib/commands/version.js.map +1 -1
- package/build/lib/constants.d.ts.map +1 -1
- package/build/lib/constants.js +1 -3
- package/build/lib/constants.js.map +1 -1
- package/build/lib/storage-client/chromelabs.d.ts.map +1 -1
- package/build/lib/storage-client/chromelabs.js +7 -4
- 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 +7 -10
- 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 +8 -10
- package/build/lib/storage-client/storage-client.js.map +1 -1
- package/build/lib/utils.d.ts +1 -1
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +6 -8
- package/build/lib/utils.js.map +1 -1
- package/config/mapping.json +1 -1
- package/lib/chromedriver.ts +13 -24
- package/lib/commands/binary.ts +19 -56
- package/lib/commands/process.ts +2 -6
- package/lib/commands/session.ts +7 -16
- package/lib/commands/types.ts +6 -4
- package/lib/commands/version.ts +4 -9
- package/lib/constants.ts +1 -3
- package/lib/storage-client/chromelabs.ts +11 -16
- package/lib/storage-client/googleapis.ts +11 -26
- package/lib/storage-client/storage-client.ts +17 -50
- package/lib/utils.ts +11 -16
- package/package.json +30 -40
|
@@ -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,6 +1,6 @@
|
|
|
1
|
+
import type { ADB } from 'appium-adb';
|
|
1
2
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
3
|
import { OS, CPU } from './constants.js';
|
|
3
|
-
import type { ADB } from 'appium-adb';
|
|
4
4
|
import type { ChromedriverVersionMapping, OSInfo } from './types.js';
|
|
5
5
|
export declare const CHROMEDRIVER_CHROME_MAPPING: ChromedriverVersionMapping;
|
|
6
6
|
export declare const CD_BASE_DIR: string;
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,OAAO,CAAC;AAG9C,OAAO,EAAC,EAAE,EAAE,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,EAAC,0BAA0B,EAAE,MAAM,EAAC,MAAM,YAAY,CAAC;AAmBnE,eAAO,MAAM,2BAA2B,EAAE,0BAEzC,CAAC;AACF,eAAO,MAAM,WAAW,QAA6C,CAAC;AAEtE;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,0BAAwD,GAAG,MAAM,CAMnH;AAED,eAAO,MAAM,MAAM,EAAE,MAC2F,CAAC;AAEjH;;;;;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,CAEnF;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAWtD"}
|
package/build/lib/utils.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { system, fs, node, util } from '@appium/support';
|
|
2
|
-
import { BaseDriver } from '@appium/base-driver';
|
|
3
|
-
import path from 'node:path';
|
|
4
1
|
import { readFileSync } from 'node:fs';
|
|
2
|
+
import os from 'node:os';
|
|
3
|
+
import path from 'node:path';
|
|
5
4
|
import { fileURLToPath } from 'node:url';
|
|
6
|
-
import {
|
|
5
|
+
import { BaseDriver } from '@appium/base-driver';
|
|
6
|
+
import { system, fs, node, util } from '@appium/support';
|
|
7
7
|
import axios from 'axios';
|
|
8
|
-
import
|
|
8
|
+
import { compareVersions } from 'compare-versions';
|
|
9
9
|
import { OS, CPU } from './constants.js';
|
|
10
10
|
const CD_EXECUTABLE_PREFIX = 'chromedriver';
|
|
11
11
|
const MODULE_NAME = 'appium-chromedriver';
|
|
@@ -37,9 +37,7 @@ export function getMostRecentChromedriver(mapping = CHROMEDRIVER_CHROME_MAPPING)
|
|
|
37
37
|
const sorted = Object.keys(mapping).sort(compareVersions);
|
|
38
38
|
return sorted.at(-1);
|
|
39
39
|
}
|
|
40
|
-
export const CD_VER = process.env.npm_config_chromedriver_version ||
|
|
41
|
-
process.env.CHROMEDRIVER_VERSION ||
|
|
42
|
-
getMostRecentChromedriver();
|
|
40
|
+
export const CD_VER = process.env.npm_config_chromedriver_version || process.env.CHROMEDRIVER_VERSION || getMostRecentChromedriver();
|
|
43
41
|
/**
|
|
44
42
|
* Gets the Chrome version for a given bundle ID using ADB.
|
|
45
43
|
* @param adb - The ADB instance to use.
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
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,10 +1,12 @@
|
|
|
1
1
|
import events from 'node:events';
|
|
2
|
+
|
|
2
3
|
import {JWProxy, PROTOCOLS} from '@appium/base-driver';
|
|
3
4
|
import {logger, util} from '@appium/support';
|
|
5
|
+
import type {ProxyOptions, HTTPMethod, HTTPBody} from '@appium/types';
|
|
6
|
+
import type {ADB} from 'appium-adb';
|
|
7
|
+
import type {Request, Response} from 'express';
|
|
4
8
|
import {SubProcess, exec} from 'teen_process';
|
|
5
|
-
|
|
6
|
-
import {ChromedriverStorageClient} from './storage-client/storage-client.js';
|
|
7
|
-
import {CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES} from './constants.js';
|
|
9
|
+
|
|
8
10
|
import {
|
|
9
11
|
getDriversMapping,
|
|
10
12
|
getChromedrivers,
|
|
@@ -12,19 +14,13 @@ import {
|
|
|
12
14
|
getCompatibleChromedriver,
|
|
13
15
|
initChromedriverPath,
|
|
14
16
|
} from './commands/binary.js';
|
|
15
|
-
import {getChromeVersionForAutodetection} from './commands/version.js';
|
|
16
17
|
import {buildChromedriverArgs, waitForOnline, getStatus, killAll} from './commands/process.js';
|
|
17
|
-
import {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
getCapValue,
|
|
22
|
-
type SessionCapabilities,
|
|
23
|
-
} from './commands/session.js';
|
|
24
|
-
import type {ADB} from 'appium-adb';
|
|
25
|
-
import type {ProxyOptions, HTTPMethod, HTTPBody} from '@appium/types';
|
|
26
|
-
import type {Request, Response} from 'express';
|
|
18
|
+
import {syncProtocol, startSession, changeState, getCapValue, type SessionCapabilities} from './commands/session.js';
|
|
19
|
+
import {getChromeVersionForAutodetection} from './commands/version.js';
|
|
20
|
+
import {CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES} from './constants.js';
|
|
21
|
+
import {ChromedriverStorageClient} from './storage-client/storage-client.js';
|
|
27
22
|
import type {ChromedriverOpts} from './types.js';
|
|
23
|
+
import {getChromedriverDir, generateLogPrefix} from './utils.js';
|
|
28
24
|
|
|
29
25
|
// Keep this import marked as used at runtime when it is otherwise only referenced in type positions.
|
|
30
26
|
void PROTOCOLS;
|
|
@@ -320,10 +316,7 @@ export class Chromedriver extends events.EventEmitter<ChromedriverEventMap> {
|
|
|
320
316
|
});
|
|
321
317
|
}
|
|
322
318
|
|
|
323
|
-
private async launchChromedriverProcess(
|
|
324
|
-
args: string[],
|
|
325
|
-
webviewVersionHolder: WebviewVersionCapture,
|
|
326
|
-
): Promise<void> {
|
|
319
|
+
private async launchChromedriverProcess(args: string[], webviewVersionHolder: WebviewVersionCapture): Promise<void> {
|
|
327
320
|
const chromedriverPath = await this.initChromedriverPath();
|
|
328
321
|
// remove stale chromedriver/adb-forward leftovers before launching
|
|
329
322
|
await this.killAll();
|
|
@@ -341,8 +334,7 @@ export class Chromedriver extends events.EventEmitter<ChromedriverEventMap> {
|
|
|
341
334
|
return '';
|
|
342
335
|
}
|
|
343
336
|
// enrich the common version-mismatch error with actionable context
|
|
344
|
-
let message =
|
|
345
|
-
'Unable to automate Chrome version because it is not supported by this version of Chromedriver.\n';
|
|
337
|
+
let message = 'Unable to automate Chrome version because it is not supported by this version of Chromedriver.\n';
|
|
346
338
|
if (webviewVersion) {
|
|
347
339
|
message += `Chrome version on the device: ${webviewVersion}\n`;
|
|
348
340
|
}
|
|
@@ -354,10 +346,7 @@ export class Chromedriver extends events.EventEmitter<ChromedriverEventMap> {
|
|
|
354
346
|
return message;
|
|
355
347
|
}
|
|
356
348
|
|
|
357
|
-
private async handleChromedriverStartFailure(
|
|
358
|
-
err: Error,
|
|
359
|
-
webviewVersion?: string,
|
|
360
|
-
): Promise<never> {
|
|
349
|
+
private async handleChromedriverStartFailure(err: Error, webviewVersion?: string): Promise<never> {
|
|
361
350
|
this.log.debug(err);
|
|
362
351
|
this.emit(Chromedriver.EVENT_ERROR, err);
|
|
363
352
|
// an error does not always mean subprocess has already exited
|
package/lib/commands/binary.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
|
|
1
3
|
import {fs, util} from '@appium/support';
|
|
2
4
|
import {asyncmap} from 'asyncbox';
|
|
3
5
|
import {compareVersions} from 'compare-versions';
|
|
4
|
-
import {type ExecError} from 'teen_process';
|
|
5
|
-
import path from 'node:path';
|
|
6
6
|
import * as semver from 'semver';
|
|
7
|
-
import {
|
|
7
|
+
import {type ExecError} from 'teen_process';
|
|
8
|
+
|
|
8
9
|
import type {ChromedriverVersionMapping} from '../types.js';
|
|
10
|
+
import {CHROMEDRIVER_CHROME_MAPPING, getChromedriverBinaryPath} from '../utils.js';
|
|
9
11
|
import type {ChromedriverCommandContext} from './types.js';
|
|
10
12
|
|
|
11
13
|
const NEW_CD_VERSION_FORMAT_MAJOR_VERSION = 73;
|
|
@@ -29,9 +31,7 @@ type ChromedriverSelectionSelf = ChromedriverCommandContext & {
|
|
|
29
31
|
/**
|
|
30
32
|
* Loads and normalizes Chromedriver-to-Chrome version mapping.
|
|
31
33
|
*/
|
|
32
|
-
export async function getDriversMapping(
|
|
33
|
-
this: ChromedriverCommandContext,
|
|
34
|
-
): Promise<ChromedriverVersionMapping> {
|
|
34
|
+
export async function getDriversMapping(this: ChromedriverCommandContext): Promise<ChromedriverVersionMapping> {
|
|
35
35
|
let mapping = structuredClone(CHROMEDRIVER_CHROME_MAPPING);
|
|
36
36
|
if (this.mappingPath) {
|
|
37
37
|
this.log.debug(`Attempting to use Chromedriver->Chrome mapping from '${this.mappingPath}'`);
|
|
@@ -75,21 +75,10 @@ export async function getChromedrivers(
|
|
|
75
75
|
nodir: true,
|
|
76
76
|
absolute: true,
|
|
77
77
|
});
|
|
78
|
-
this.log.debug(
|
|
79
|
-
`Found ${util.pluralize('executable', executables.length, true)} ` +
|
|
80
|
-
`in '${this.executableDir}'`,
|
|
81
|
-
);
|
|
78
|
+
this.log.debug(`Found ${util.pluralize('executable', executables.length, true)} in '${this.executableDir}'`);
|
|
82
79
|
const cds = (
|
|
83
80
|
await asyncmap(executables, async (executable: string) => {
|
|
84
|
-
const logError = ({
|
|
85
|
-
message,
|
|
86
|
-
stdout,
|
|
87
|
-
stderr,
|
|
88
|
-
}: {
|
|
89
|
-
message: string;
|
|
90
|
-
stdout?: string;
|
|
91
|
-
stderr?: string;
|
|
92
|
-
}): null => {
|
|
81
|
+
const logError = ({message, stdout, stderr}: {message: string; stdout?: string; stderr?: string}): null => {
|
|
93
82
|
let errMsg =
|
|
94
83
|
`Cannot retrieve version number from '${path.basename(executable)}' Chromedriver binary. ` +
|
|
95
84
|
`Make sure it returns a valid version string in response to '--version' command line argument. ${message}`;
|
|
@@ -111,10 +100,7 @@ export async function getChromedrivers(
|
|
|
111
100
|
}));
|
|
112
101
|
} catch (e) {
|
|
113
102
|
const err = e as ExecError;
|
|
114
|
-
if (
|
|
115
|
-
!(err.message || '').includes('timed out') &&
|
|
116
|
-
!(err.stdout || '').includes('Starting ChromeDriver')
|
|
117
|
-
) {
|
|
103
|
+
if (!(err.message || '').includes('timed out') && !(err.stdout || '').includes('Starting ChromeDriver')) {
|
|
118
104
|
return logError(err);
|
|
119
105
|
}
|
|
120
106
|
// timeouts may still contain the version banner in stdout
|
|
@@ -225,9 +211,7 @@ export async function getCompatibleChromedriver(this: ChromedriverCommandContext
|
|
|
225
211
|
}
|
|
226
212
|
} catch (e) {
|
|
227
213
|
const err = e as Error;
|
|
228
|
-
ctx.log.warn(
|
|
229
|
-
`Cannot synchronize local chromedrivers with the remote storage: ${err.message}`,
|
|
230
|
-
);
|
|
214
|
+
ctx.log.warn(`Cannot synchronize local chromedrivers with the remote storage: ${err.message}`);
|
|
231
215
|
if (err.stack) {
|
|
232
216
|
ctx.log.debug(err.stack);
|
|
233
217
|
}
|
|
@@ -240,8 +224,7 @@ export async function getCompatibleChromedriver(this: ChromedriverCommandContext
|
|
|
240
224
|
}
|
|
241
225
|
|
|
242
226
|
throw new Error(
|
|
243
|
-
`Exceeded ${GET_COMPATIBLE_CHROMEDRIVER_MAX_ITERATIONS} iterations while selecting a
|
|
244
|
-
`compatible Chromedriver.`,
|
|
227
|
+
`Exceeded ${GET_COMPATIBLE_CHROMEDRIVER_MAX_ITERATIONS} iterations while selecting a compatible Chromedriver.`,
|
|
245
228
|
);
|
|
246
229
|
}
|
|
247
230
|
|
|
@@ -262,9 +245,7 @@ export async function initChromedriverPath(this: ChromedriverCommandContext): Pr
|
|
|
262
245
|
throw new Error('Cannot determine a valid Chromedriver executable path');
|
|
263
246
|
}
|
|
264
247
|
if (!(await fs.exists(chromedriver))) {
|
|
265
|
-
throw new Error(
|
|
266
|
-
`Trying to use a chromedriver binary at the path ${chromedriver}, but it doesn't exist!`,
|
|
267
|
-
);
|
|
248
|
+
throw new Error(`Trying to use a chromedriver binary at the path ${chromedriver}, but it doesn't exist!`);
|
|
268
249
|
}
|
|
269
250
|
this.executableVerified = true;
|
|
270
251
|
this.log.info(`Set chromedriver binary as: ${chromedriver}`);
|
|
@@ -303,10 +284,7 @@ async function mergeDiscoveredMappingGaps(
|
|
|
303
284
|
await ctx.updateDriversMapping(Object.assign(mapping, missingVersions));
|
|
304
285
|
}
|
|
305
286
|
|
|
306
|
-
function pickChromedriverWithBuildCheckDisabled(
|
|
307
|
-
ctx: ChromedriverSelectionSelf,
|
|
308
|
-
cds: ChromedriverInfo[],
|
|
309
|
-
): string {
|
|
287
|
+
function pickChromedriverWithBuildCheckDisabled(ctx: ChromedriverSelectionSelf, cds: ChromedriverInfo[]): string {
|
|
310
288
|
if (cds.length === 0) {
|
|
311
289
|
throw ctx.log.errorWithException(
|
|
312
290
|
`There must be at least one Chromedriver executable available for use if ` +
|
|
@@ -314,17 +292,12 @@ function pickChromedriverWithBuildCheckDisabled(
|
|
|
314
292
|
);
|
|
315
293
|
}
|
|
316
294
|
const {version, executable} = cds[0];
|
|
317
|
-
ctx.log.warn(
|
|
318
|
-
`Chrome build check disabled. Using most recent Chromedriver version (${version}, at '${executable}')`,
|
|
319
|
-
);
|
|
295
|
+
ctx.log.warn(`Chrome build check disabled. Using most recent Chromedriver version (${version}, at '${executable}')`);
|
|
320
296
|
ctx.log.warn(`If this is wrong, set 'chromedriverDisableBuildCheck' capability to 'false'`);
|
|
321
297
|
return executable;
|
|
322
298
|
}
|
|
323
299
|
|
|
324
|
-
function pickChromedriverWhenChromeUnknown(
|
|
325
|
-
ctx: ChromedriverSelectionSelf,
|
|
326
|
-
cds: ChromedriverInfo[],
|
|
327
|
-
): string {
|
|
300
|
+
function pickChromedriverWhenChromeUnknown(ctx: ChromedriverSelectionSelf, cds: ChromedriverInfo[]): string {
|
|
328
301
|
if (cds.length === 0) {
|
|
329
302
|
throw ctx.log.errorWithException(
|
|
330
303
|
`There must be at least one Chromedriver executable available for use if ` +
|
|
@@ -332,16 +305,11 @@ function pickChromedriverWhenChromeUnknown(
|
|
|
332
305
|
);
|
|
333
306
|
}
|
|
334
307
|
const {version, executable} = cds[0];
|
|
335
|
-
ctx.log.warn(
|
|
336
|
-
`Unable to discover Chrome version. Using Chromedriver ${version} at '${executable}'`,
|
|
337
|
-
);
|
|
308
|
+
ctx.log.warn(`Unable to discover Chrome version. Using Chromedriver ${version} at '${executable}'`);
|
|
338
309
|
return executable;
|
|
339
310
|
}
|
|
340
311
|
|
|
341
|
-
function filterChromedriversMatchingChrome(
|
|
342
|
-
cds: ChromedriverInfo[],
|
|
343
|
-
chromeVersion: semver.SemVer,
|
|
344
|
-
): ChromedriverInfo[] {
|
|
312
|
+
function filterChromedriversMatchingChrome(cds: ChromedriverInfo[], chromeVersion: semver.SemVer): ChromedriverInfo[] {
|
|
345
313
|
return cds.filter(({minChromeVersion}) => {
|
|
346
314
|
const minChromeVersionS = minChromeVersion && semver.coerce(minChromeVersion);
|
|
347
315
|
if (!minChromeVersionS) {
|
|
@@ -388,10 +356,7 @@ async function attemptChromedriverStorageSync(
|
|
|
388
356
|
return true;
|
|
389
357
|
}
|
|
390
358
|
|
|
391
|
-
function makeNoMatchingChromedriverError(
|
|
392
|
-
ctx: ChromedriverSelectionSelf,
|
|
393
|
-
chromeVersion: semver.SemVer,
|
|
394
|
-
): Error {
|
|
359
|
+
function makeNoMatchingChromedriverError(ctx: ChromedriverSelectionSelf, chromeVersion: semver.SemVer): Error {
|
|
395
360
|
const autodownloadSuggestion =
|
|
396
361
|
'You could also try to enable automated chromedrivers download as a possible workaround.';
|
|
397
362
|
return new Error(
|
|
@@ -410,8 +375,6 @@ function logChosenMatchingChromedriver(
|
|
|
410
375
|
`Found ${util.pluralize('executable', matchingDrivers.length, true)} ` +
|
|
411
376
|
`capable of automating Chrome '${chromeVersion}'.\nChoosing the most recent, '${binPath}'.`,
|
|
412
377
|
);
|
|
413
|
-
ctx.log.debug(
|
|
414
|
-
`If a specific version is required, specify it with the 'chromedriverExecutable' capability.`,
|
|
415
|
-
);
|
|
378
|
+
ctx.log.debug(`If a specific version is required, specify it with the 'chromedriverExecutable' capability.`);
|
|
416
379
|
return binPath;
|
|
417
380
|
}
|
package/lib/commands/process.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {system, util} from '@appium/support';
|
|
2
2
|
import {retryInterval} from 'asyncbox';
|
|
3
3
|
import {exec} from 'teen_process';
|
|
4
|
+
|
|
4
5
|
import {CHROMEDRIVER_STATES} from '../constants.js';
|
|
5
6
|
import type {ChromedriverCommandContext} from './types.js';
|
|
6
7
|
|
|
@@ -72,12 +73,7 @@ export async function waitForOnline(this: ChromedriverCommandContext): Promise<v
|
|
|
72
73
|
export async function killAll(this: ChromedriverCommandContext): Promise<void> {
|
|
73
74
|
const cmd = system.isWindows() ? 'wmic' : 'pkill';
|
|
74
75
|
const args = system.isWindows()
|
|
75
|
-
? [
|
|
76
|
-
'process',
|
|
77
|
-
'where',
|
|
78
|
-
`commandline like '%chromedriver.exe%--port=${this.proxyPort}%'`,
|
|
79
|
-
'delete',
|
|
80
|
-
]
|
|
76
|
+
? ['process', 'where', `commandline like '%chromedriver.exe%--port=${this.proxyPort}%'`, 'delete']
|
|
81
77
|
: ['-15', '-f', `${this.chromedriver}.*--port=${this.proxyPort}`];
|
|
82
78
|
this.log.debug(`Killing any old chromedrivers, running: ${cmd} ${args.join(' ')}`);
|
|
83
79
|
try {
|
package/lib/commands/session.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import {PROTOCOLS, isStandardCap} from '@appium/base-driver';
|
|
2
2
|
import {util} from '@appium/support';
|
|
3
|
-
import {generateLogPrefix} from '../utils.js';
|
|
4
|
-
import {CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES} from '../constants.js';
|
|
5
3
|
import * as semver from 'semver';
|
|
4
|
+
|
|
5
|
+
import {CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES} from '../constants.js';
|
|
6
|
+
import {generateLogPrefix} from '../utils.js';
|
|
6
7
|
import type {ChromedriverCommandContext} from './types.js';
|
|
7
8
|
|
|
8
9
|
const MIN_CD_VERSION_WITH_W3C_SUPPORT = 75;
|
|
@@ -22,11 +23,7 @@ export function toW3cCapName(capName: string): string {
|
|
|
22
23
|
/**
|
|
23
24
|
* Gets a capability value from a capabilities object, handling both standard and W3C format names.
|
|
24
25
|
*/
|
|
25
|
-
export function getCapValue(
|
|
26
|
-
allCaps: Record<string, any> = {},
|
|
27
|
-
rawCapName: string,
|
|
28
|
-
defaultValue?: any,
|
|
29
|
-
): any {
|
|
26
|
+
export function getCapValue(allCaps: Record<string, any> = {}, rawCapName: string, defaultValue?: any): any {
|
|
30
27
|
for (const [capName, capValue] of Object.entries(allCaps)) {
|
|
31
28
|
if (toW3cCapName(capName) === toW3cCapName(rawCapName)) {
|
|
32
29
|
return capValue;
|
|
@@ -39,9 +36,7 @@ export function getCapValue(
|
|
|
39
36
|
* Converts all capability names in an object to W3C format.
|
|
40
37
|
*/
|
|
41
38
|
export function toW3cCapNames(originalCaps: Record<string, any> = {}): Record<string, any> {
|
|
42
|
-
return Object.fromEntries(
|
|
43
|
-
Object.entries(originalCaps).map(([key, value]) => [toW3cCapName(key), value]),
|
|
44
|
-
);
|
|
39
|
+
return Object.fromEntries(Object.entries(originalCaps).map(([key, value]) => [toW3cCapName(key), value]));
|
|
45
40
|
}
|
|
46
41
|
|
|
47
42
|
/**
|
|
@@ -53,13 +48,9 @@ export async function startSession(this: ChromedriverCommandContext): Promise<Se
|
|
|
53
48
|
? {capabilities: {alwaysMatch: toW3cCapNames(this.capabilities)}}
|
|
54
49
|
: {desiredCapabilities: this.capabilities};
|
|
55
50
|
this.log.info(
|
|
56
|
-
`Starting ${this._desiredProtocol} Chromedriver session with capabilities: ` +
|
|
57
|
-
JSON.stringify(sessionCaps, null, 2),
|
|
51
|
+
`Starting ${this._desiredProtocol} Chromedriver session with capabilities: ` + JSON.stringify(sessionCaps, null, 2),
|
|
58
52
|
);
|
|
59
|
-
const response = (await this.jwproxy.command('/session', 'POST', sessionCaps)) as Record<
|
|
60
|
-
string,
|
|
61
|
-
any
|
|
62
|
-
>;
|
|
53
|
+
const response = (await this.jwproxy.command('/session', 'POST', sessionCaps)) as Record<string, any>;
|
|
63
54
|
this.log.prefix = generateLogPrefix(this, this.jwproxy.sessionId);
|
|
64
55
|
changeState.call(this, CHROMEDRIVER_STATES.ONLINE);
|
|
65
56
|
return response?.capabilities ?? response;
|
package/lib/commands/types.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
|
+
import type {EventEmitter} from 'node:events';
|
|
2
|
+
|
|
1
3
|
// `keyof typeof PROTOCOLS` requires the runtime `PROTOCOLS` binding (not `import type`).
|
|
2
4
|
// eslint-disable-next-line @typescript-eslint/consistent-type-imports -- see above
|
|
3
5
|
import {PROTOCOLS, type JWProxy} from '@appium/base-driver';
|
|
4
|
-
import type * as TeenProcess from 'teen_process';
|
|
5
|
-
import type {ADB} from 'appium-adb';
|
|
6
6
|
import type {AppiumLogger} from '@appium/types';
|
|
7
|
-
import type {
|
|
7
|
+
import type {ADB} from 'appium-adb';
|
|
8
|
+
import type * as TeenProcess from 'teen_process';
|
|
9
|
+
|
|
8
10
|
import type {ChromedriverStorageClient} from '../storage-client/storage-client.js';
|
|
9
|
-
import type {
|
|
11
|
+
import type {ChromedriverOpts} from '../types.js';
|
|
10
12
|
|
|
11
13
|
export interface ChromedriverCommandContext extends EventEmitter {
|
|
12
14
|
state: string;
|
package/lib/commands/version.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as semver from 'semver';
|
|
2
|
+
|
|
2
3
|
import {getChromeVersion} from '../utils.js';
|
|
3
4
|
import type {ChromedriverCommandContext} from './types.js';
|
|
4
5
|
|
|
@@ -49,9 +50,7 @@ function tryCoerceVersionFromCdpDetails(ctx: ChromedriverCommandContext): semver
|
|
|
49
50
|
return semver.coerce(versionMatch[1]);
|
|
50
51
|
}
|
|
51
52
|
|
|
52
|
-
async function resolveChromeVersionForWebviewShell(
|
|
53
|
-
ctx: ChromedriverCommandContext,
|
|
54
|
-
): Promise<semver.SemVer | null> {
|
|
53
|
+
async function resolveChromeVersionForWebviewShell(ctx: ChromedriverCommandContext): Promise<semver.SemVer | null> {
|
|
55
54
|
if (!ctx.adb) {
|
|
56
55
|
return null;
|
|
57
56
|
}
|
|
@@ -70,9 +69,7 @@ async function remapLegacyWebviewBundleId(ctx: ChromedriverCommandContext): Prom
|
|
|
70
69
|
return;
|
|
71
70
|
}
|
|
72
71
|
const apiLevel = await ctx.adb.getApiLevel();
|
|
73
|
-
const isLegacyWebviewBundle = [WEBVIEW_SHELL_BUNDLE_ID, ...WEBVIEW_BUNDLE_IDS].includes(
|
|
74
|
-
ctx.bundleId ?? '',
|
|
75
|
-
);
|
|
72
|
+
const isLegacyWebviewBundle = [WEBVIEW_SHELL_BUNDLE_ID, ...WEBVIEW_BUNDLE_IDS].includes(ctx.bundleId ?? '');
|
|
76
73
|
if (apiLevel >= 24 && apiLevel <= 28 && isLegacyWebviewBundle) {
|
|
77
74
|
ctx.bundleId = CHROME_BUNDLE_ID;
|
|
78
75
|
}
|
|
@@ -82,9 +79,7 @@ async function remapLegacyWebviewBundleId(ctx: ChromedriverCommandContext): Prom
|
|
|
82
79
|
* When no bundle id is set, default to Chrome and probe known WebView providers.
|
|
83
80
|
* Returns a version string if a WebView package reports one; otherwise leaves bundleId as Chrome.
|
|
84
81
|
*/
|
|
85
|
-
async function resolveChromeVersionByProbingWebviews(
|
|
86
|
-
ctx: ChromedriverCommandContext,
|
|
87
|
-
): Promise<string | null> {
|
|
82
|
+
async function resolveChromeVersionByProbingWebviews(ctx: ChromedriverCommandContext): Promise<string | null> {
|
|
88
83
|
if (ctx.bundleId) {
|
|
89
84
|
return null;
|
|
90
85
|
}
|
package/lib/constants.ts
CHANGED
|
@@ -5,9 +5,7 @@ export const GOOGLEAPIS_CDN =
|
|
|
5
5
|
'https://chromedriver.storage.googleapis.com';
|
|
6
6
|
export const USER_AGENT = 'appium';
|
|
7
7
|
export const CHROMELABS_URL =
|
|
8
|
-
process.env.npm_config_chromelabs_url ||
|
|
9
|
-
process.env.CHROMELABS_URL ||
|
|
10
|
-
'https://googlechromelabs.github.io';
|
|
8
|
+
process.env.npm_config_chromelabs_url || process.env.CHROMELABS_URL || 'https://googlechromelabs.github.io';
|
|
11
9
|
export const OS = {
|
|
12
10
|
LINUX: 'linux',
|
|
13
11
|
WINDOWS: 'win',
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
+
|
|
2
3
|
import {logger} from '@appium/support';
|
|
3
4
|
import * as semver from 'semver';
|
|
5
|
+
|
|
4
6
|
import {ARCH, CPU} from '../constants.js';
|
|
5
7
|
import type {ChromedriverDetailsMapping} from '../types.js';
|
|
6
8
|
|
|
@@ -42,17 +44,14 @@ const log = logger.getLogger('ChromedriverChromelabsStorageClient');
|
|
|
42
44
|
* @returns A mapping of chromedriver entry keys to their details
|
|
43
45
|
* @throws {Error} if the JSON cannot be parsed or has an unsupported format
|
|
44
46
|
*/
|
|
45
|
-
export function parseKnownGoodVersionsWithDownloadsJson(
|
|
46
|
-
jsonStr: string,
|
|
47
|
-
): ChromedriverDetailsMapping {
|
|
47
|
+
export function parseKnownGoodVersionsWithDownloadsJson(jsonStr: string): ChromedriverDetailsMapping {
|
|
48
48
|
let json: KnownGoodVersionsJson;
|
|
49
49
|
try {
|
|
50
50
|
json = JSON.parse(jsonStr);
|
|
51
51
|
} catch (e) {
|
|
52
|
-
throw new Error(
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
);
|
|
52
|
+
throw new Error(`Storage JSON cannot be parsed. Original error: ${e instanceof Error ? e.message : String(e)}`, {
|
|
53
|
+
cause: e,
|
|
54
|
+
});
|
|
56
55
|
}
|
|
57
56
|
/**
|
|
58
57
|
* Example output:
|
|
@@ -110,14 +109,11 @@ export function parseKnownGoodVersionsWithDownloadsJson(
|
|
|
110
109
|
}
|
|
111
110
|
const osNameMatch = /^[a-z]+/i.exec(downloadEntry.platform);
|
|
112
111
|
if (!osNameMatch) {
|
|
113
|
-
log.debug(
|
|
114
|
-
`The entry '${downloadEntry.url}' does not contain valid platform name. Skipping it`,
|
|
115
|
-
);
|
|
112
|
+
log.debug(`The entry '${downloadEntry.url}' does not contain valid platform name. Skipping it`);
|
|
116
113
|
continue;
|
|
117
114
|
}
|
|
118
115
|
const key =
|
|
119
|
-
`${path.basename(path.dirname(path.dirname(downloadEntry.url)))}/` +
|
|
120
|
-
`${path.basename(downloadEntry.url)}`;
|
|
116
|
+
`${path.basename(path.dirname(path.dirname(downloadEntry.url)))}/` + `${path.basename(downloadEntry.url)}`;
|
|
121
117
|
mapping[key] = {
|
|
122
118
|
url: downloadEntry.url,
|
|
123
119
|
etag: null,
|
|
@@ -149,10 +145,9 @@ export function parseLatestKnownGoodVersionsJson(jsonStr: string): string {
|
|
|
149
145
|
try {
|
|
150
146
|
json = JSON.parse(jsonStr);
|
|
151
147
|
} catch (e) {
|
|
152
|
-
throw new Error(
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
);
|
|
148
|
+
throw new Error(`Storage JSON cannot be parsed. Original error: ${e instanceof Error ? e.message : String(e)}`, {
|
|
149
|
+
cause: e,
|
|
150
|
+
});
|
|
156
151
|
}
|
|
157
152
|
/**
|
|
158
153
|
* Example output:
|
|
@@ -1,21 +1,13 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
|
|
2
3
|
import {util, logger} from '@appium/support';
|
|
3
|
-
import {retrieveData} from '../utils.js';
|
|
4
|
-
import {asyncmap} from 'asyncbox';
|
|
5
|
-
import {
|
|
6
|
-
STORAGE_REQ_TIMEOUT_MS,
|
|
7
|
-
GOOGLEAPIS_CDN,
|
|
8
|
-
ARCH,
|
|
9
|
-
CPU,
|
|
10
|
-
APPLE_ARM_SUFFIXES,
|
|
11
|
-
} from '../constants.js';
|
|
12
4
|
import {DOMParser} from '@xmldom/xmldom';
|
|
13
|
-
import
|
|
14
|
-
import
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
} from '../
|
|
5
|
+
import {asyncmap} from 'asyncbox';
|
|
6
|
+
import {select as xpathSelect} from 'xpath';
|
|
7
|
+
|
|
8
|
+
import {STORAGE_REQ_TIMEOUT_MS, GOOGLEAPIS_CDN, ARCH, CPU, APPLE_ARM_SUFFIXES} from '../constants.js';
|
|
9
|
+
import type {AdditionalDriverDetails, ChromedriverDetails, ChromedriverDetailsMapping} from '../types.js';
|
|
10
|
+
import {retrieveData} from '../utils.js';
|
|
19
11
|
|
|
20
12
|
const log = logger.getLogger('ChromedriverGoogleapisStorageClient');
|
|
21
13
|
const MAX_PARALLEL_DOWNLOADS = 5;
|
|
@@ -96,9 +88,7 @@ export async function parseGoogleapiStorageXml(
|
|
|
96
88
|
shouldParseNotes = true,
|
|
97
89
|
): Promise<ChromedriverDetailsMapping> {
|
|
98
90
|
const doc = new DOMParser().parseFromString(xml, 'text/xml');
|
|
99
|
-
const driverNodes = xpathSelect(`//*[local-name(.)='Contents']`, doc as unknown as Node) as Array<
|
|
100
|
-
Node | Attr
|
|
101
|
-
>;
|
|
91
|
+
const driverNodes = xpathSelect(`//*[local-name(.)='Contents']`, doc as unknown as Node) as Array<Node | Attr>;
|
|
102
92
|
log.debug(`Parsed ${driverNodes.length} entries from storage XML`);
|
|
103
93
|
if (driverNodes.length === 0) {
|
|
104
94
|
throw new Error('Cannot retrieve any valid Chromedriver entries from the storage config');
|
|
@@ -198,17 +188,12 @@ async function retrieveAdditionalDriverInfo(
|
|
|
198
188
|
);
|
|
199
189
|
const {minBrowserVersion} = parseNotes(notes);
|
|
200
190
|
if (!minBrowserVersion) {
|
|
201
|
-
log.debug(
|
|
202
|
-
`The driver '${driverKey}' does not contain valid release notes at ${notesUrl}. ` +
|
|
203
|
-
`Skipping it`,
|
|
204
|
-
);
|
|
191
|
+
log.debug(`The driver '${driverKey}' does not contain valid release notes at ${notesUrl}. Skipping it`);
|
|
205
192
|
return;
|
|
206
193
|
}
|
|
207
194
|
infoDict.minBrowserVersion = minBrowserVersion;
|
|
208
195
|
}
|
|
209
196
|
|
|
210
197
|
function extractNodeText(node: Node | null | undefined): string | null {
|
|
211
|
-
return !node?.firstChild || !util.hasValue(node.firstChild.nodeValue)
|
|
212
|
-
? null
|
|
213
|
-
: node.firstChild.nodeValue;
|
|
198
|
+
return !node?.firstChild || !util.hasValue(node.firstChild.nodeValue) ? null : node.firstChild.nodeValue;
|
|
214
199
|
}
|