appium-chromedriver 8.4.22 → 9.0.0
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 +10 -0
- package/build/lib/chromedriver.d.ts +4 -4
- package/build/lib/chromedriver.d.ts.map +1 -1
- package/build/lib/chromedriver.js +42 -49
- package/build/lib/chromedriver.js.map +1 -1
- package/build/lib/commands/binary.d.ts +2 -2
- package/build/lib/commands/binary.d.ts.map +1 -1
- package/build/lib/commands/binary.js +29 -72
- package/build/lib/commands/binary.js.map +1 -1
- package/build/lib/commands/process.d.ts +1 -1
- package/build/lib/commands/process.d.ts.map +1 -1
- package/build/lib/commands/process.js +14 -20
- package/build/lib/commands/process.js.map +1 -1
- package/build/lib/commands/session.d.ts +1 -1
- package/build/lib/commands/session.d.ts.map +1 -1
- package/build/lib/commands/session.js +25 -66
- package/build/lib/commands/session.js.map +1 -1
- package/build/lib/commands/types.d.ts +2 -2
- package/build/lib/commands/types.d.ts.map +1 -1
- package/build/lib/commands/types.js +1 -2
- package/build/lib/commands/version.d.ts +1 -1
- package/build/lib/commands/version.d.ts.map +1 -1
- package/build/lib/commands/version.js +6 -42
- package/build/lib/commands/version.js.map +1 -1
- package/build/lib/constants.js +10 -13
- package/build/lib/constants.js.map +1 -1
- package/build/lib/index.d.ts +3 -3
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +4 -8
- package/build/lib/index.js.map +1 -1
- package/build/lib/storage-client/chromelabs.d.ts +1 -1
- package/build/lib/storage-client/chromelabs.d.ts.map +1 -1
- package/build/lib/storage-client/chromelabs.js +11 -51
- package/build/lib/storage-client/chromelabs.js.map +1 -1
- package/build/lib/storage-client/googleapis.d.ts +1 -1
- package/build/lib/storage-client/googleapis.d.ts.map +1 -1
- package/build/lib/storage-client/googleapis.js +22 -30
- package/build/lib/storage-client/googleapis.js.map +1 -1
- package/build/lib/storage-client/storage-client.d.ts +1 -1
- package/build/lib/storage-client/storage-client.d.ts.map +1 -1
- package/build/lib/storage-client/storage-client.js +65 -105
- package/build/lib/storage-client/storage-client.js.map +1 -1
- package/build/lib/types.js +1 -2
- package/build/lib/utils.d.ts +2 -2
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +41 -52
- package/build/lib/utils.js.map +1 -1
- package/lib/chromedriver.ts +8 -8
- package/lib/commands/binary.ts +3 -3
- package/lib/commands/process.ts +2 -2
- package/lib/commands/session.ts +3 -3
- package/lib/commands/types.ts +2 -2
- package/lib/commands/version.ts +2 -2
- package/lib/index.ts +3 -3
- package/lib/storage-client/chromelabs.ts +2 -2
- package/lib/storage-client/googleapis.ts +9 -3
- package/lib/storage-client/storage-client.ts +5 -5
- package/lib/utils.ts +7 -5
- package/package.json +12 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
## [9.0.0](https://github.com/appium/appium-chromedriver/compare/v8.4.22...v9.0.0) (2026-07-23)
|
|
2
|
+
|
|
3
|
+
### ⚠ BREAKING CHANGES
|
|
4
|
+
|
|
5
|
+
* Consumers using require('appium-chromedriver') must switch to import/dynamic import() — the package no longer ships a CommonJS entry point.
|
|
6
|
+
|
|
7
|
+
### Features
|
|
8
|
+
|
|
9
|
+
* Migrate the package to ESM ([#604](https://github.com/appium/appium-chromedriver/issues/604)) ([ba53d68](https://github.com/appium/appium-chromedriver/commit/ba53d68d91dd74a5ffd4c0f6cd727b58eaa2e27b))
|
|
10
|
+
|
|
1
11
|
## [8.4.22](https://github.com/appium/appium-chromedriver/compare/v8.4.21...v8.4.22) (2026-07-23)
|
|
2
12
|
|
|
3
13
|
### Miscellaneous Chores
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import events from 'node:events';
|
|
2
2
|
import { JWProxy, PROTOCOLS } from '@appium/base-driver';
|
|
3
3
|
import { SubProcess, exec } from 'teen_process';
|
|
4
|
-
import { ChromedriverStorageClient } from './storage-client/storage-client';
|
|
5
|
-
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from './constants';
|
|
6
|
-
import { type SessionCapabilities } from './commands/session';
|
|
4
|
+
import { ChromedriverStorageClient } from './storage-client/storage-client.js';
|
|
5
|
+
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from './constants.js';
|
|
6
|
+
import { type SessionCapabilities } from './commands/session.js';
|
|
7
7
|
import type { ADB } from 'appium-adb';
|
|
8
8
|
import type { HTTPMethod, HTTPBody } from '@appium/types';
|
|
9
9
|
import type { Request, Response } from 'express';
|
|
10
|
-
import type { ChromedriverOpts } from './types';
|
|
10
|
+
import type { ChromedriverOpts } from './types.js';
|
|
11
11
|
export type ChromedriverState = (typeof CHROMEDRIVER_STATES)[keyof typeof CHROMEDRIVER_STATES];
|
|
12
12
|
type ChromedriverEventMap = {
|
|
13
13
|
[CHROMEDRIVER_EVENTS.ERROR]: [Error];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromedriver.d.ts","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAC,yBAAyB,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"chromedriver.d.ts","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,34 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
const storage_client_1 = require("./storage-client/storage-client");
|
|
13
|
-
const constants_1 = require("./constants");
|
|
14
|
-
const binary_1 = require("./commands/binary");
|
|
15
|
-
const version_1 = require("./commands/version");
|
|
16
|
-
const process_1 = require("./commands/process");
|
|
17
|
-
const session_1 = require("./commands/session");
|
|
1
|
+
import events from 'node:events';
|
|
2
|
+
import { JWProxy, PROTOCOLS } from '@appium/base-driver';
|
|
3
|
+
import { logger, util } from '@appium/support';
|
|
4
|
+
import { SubProcess, exec } from 'teen_process';
|
|
5
|
+
import { getChromedriverDir, generateLogPrefix } from './utils.js';
|
|
6
|
+
import { ChromedriverStorageClient } from './storage-client/storage-client.js';
|
|
7
|
+
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from './constants.js';
|
|
8
|
+
import { getDriversMapping, getChromedrivers, updateDriversMapping, getCompatibleChromedriver, initChromedriverPath, } from './commands/binary.js';
|
|
9
|
+
import { getChromeVersionForAutodetection } from './commands/version.js';
|
|
10
|
+
import { buildChromedriverArgs, waitForOnline, getStatus, killAll } from './commands/process.js';
|
|
11
|
+
import { syncProtocol, startSession, changeState, getCapValue, } from './commands/session.js';
|
|
18
12
|
// Keep this import marked as used at runtime when it is otherwise only referenced in type positions.
|
|
19
|
-
void
|
|
13
|
+
void PROTOCOLS;
|
|
20
14
|
const DEFAULT_HOST = '127.0.0.1';
|
|
21
15
|
const DEFAULT_PORT = 9515;
|
|
22
16
|
// consider chromedriver ready once startup banner appears
|
|
23
17
|
const chromedriverStdoutStartDetector = (stdout) => stdout.startsWith('Starting ');
|
|
24
|
-
class Chromedriver extends
|
|
25
|
-
static EVENT_ERROR =
|
|
26
|
-
static EVENT_CHANGED =
|
|
27
|
-
static STATE_STOPPED =
|
|
28
|
-
static STATE_STARTING =
|
|
29
|
-
static STATE_ONLINE =
|
|
30
|
-
static STATE_STOPPING =
|
|
31
|
-
static STATE_RESTARTING =
|
|
18
|
+
export class Chromedriver extends events.EventEmitter {
|
|
19
|
+
static EVENT_ERROR = CHROMEDRIVER_EVENTS.ERROR;
|
|
20
|
+
static EVENT_CHANGED = CHROMEDRIVER_EVENTS.CHANGED;
|
|
21
|
+
static STATE_STOPPED = CHROMEDRIVER_STATES.STOPPED;
|
|
22
|
+
static STATE_STARTING = CHROMEDRIVER_STATES.STARTING;
|
|
23
|
+
static STATE_ONLINE = CHROMEDRIVER_STATES.ONLINE;
|
|
24
|
+
static STATE_STOPPING = CHROMEDRIVER_STATES.STOPPING;
|
|
25
|
+
static STATE_RESTARTING = CHROMEDRIVER_STATES.RESTARTING;
|
|
32
26
|
proxyPort;
|
|
33
27
|
adb;
|
|
34
28
|
cmdArgs;
|
|
@@ -54,23 +48,23 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
54
48
|
_onlineStatus;
|
|
55
49
|
_log;
|
|
56
50
|
proxyHost;
|
|
57
|
-
buildChromedriverArgs =
|
|
58
|
-
getDriversMapping =
|
|
59
|
-
getChromedrivers =
|
|
60
|
-
updateDriversMapping =
|
|
61
|
-
getCompatibleChromedriver =
|
|
62
|
-
initChromedriverPath =
|
|
63
|
-
getChromeVersion =
|
|
64
|
-
syncProtocol =
|
|
65
|
-
waitForOnline =
|
|
66
|
-
getStatus =
|
|
67
|
-
killAll =
|
|
68
|
-
changeState =
|
|
69
|
-
startSession =
|
|
51
|
+
buildChromedriverArgs = buildChromedriverArgs;
|
|
52
|
+
getDriversMapping = getDriversMapping;
|
|
53
|
+
getChromedrivers = getChromedrivers;
|
|
54
|
+
updateDriversMapping = updateDriversMapping;
|
|
55
|
+
getCompatibleChromedriver = getCompatibleChromedriver;
|
|
56
|
+
initChromedriverPath = initChromedriverPath;
|
|
57
|
+
getChromeVersion = getChromeVersionForAutodetection;
|
|
58
|
+
syncProtocol = syncProtocol;
|
|
59
|
+
waitForOnline = waitForOnline;
|
|
60
|
+
getStatus = getStatus;
|
|
61
|
+
killAll = killAll;
|
|
62
|
+
changeState = changeState;
|
|
63
|
+
startSession = startSession;
|
|
70
64
|
constructor(args = {}) {
|
|
71
65
|
super();
|
|
72
66
|
const { host = DEFAULT_HOST, port = DEFAULT_PORT, useSystemExecutable = false, executable, executableDir, bundleId, mappingPath, cmdArgs, adb, verbose, logPath, disableBuildCheck, details, isAutodownloadEnabled = false, reqBasePath, } = args;
|
|
73
|
-
this._log =
|
|
67
|
+
this._log = logger.getLogger(generateLogPrefix(this));
|
|
74
68
|
this.proxyHost = host;
|
|
75
69
|
this.proxyPort = parseInt(String(port), 10);
|
|
76
70
|
this.adb = adb;
|
|
@@ -82,25 +76,25 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
82
76
|
this.bundleId = bundleId;
|
|
83
77
|
this.executableVerified = false;
|
|
84
78
|
this.state = Chromedriver.STATE_STOPPED;
|
|
85
|
-
this._execFunc =
|
|
79
|
+
this._execFunc = exec;
|
|
86
80
|
const proxyOpts = { server: this.proxyHost, port: this.proxyPort, log: this._log };
|
|
87
81
|
if (reqBasePath) {
|
|
88
82
|
proxyOpts.reqBasePath = reqBasePath;
|
|
89
83
|
}
|
|
90
|
-
this.jwproxy = new
|
|
84
|
+
this.jwproxy = new JWProxy(proxyOpts);
|
|
91
85
|
if (executableDir) {
|
|
92
86
|
this.executableDir = executableDir;
|
|
93
87
|
this.isCustomExecutableDir = true;
|
|
94
88
|
}
|
|
95
89
|
else {
|
|
96
|
-
this.executableDir =
|
|
90
|
+
this.executableDir = getChromedriverDir();
|
|
97
91
|
this.isCustomExecutableDir = false;
|
|
98
92
|
}
|
|
99
93
|
this.verbose = verbose;
|
|
100
94
|
this.logPath = logPath;
|
|
101
95
|
this.disableBuildCheck = !!disableBuildCheck;
|
|
102
96
|
this.storageClient = isAutodownloadEnabled
|
|
103
|
-
? new
|
|
97
|
+
? new ChromedriverStorageClient({ chromedriverDir: this.executableDir })
|
|
104
98
|
: null;
|
|
105
99
|
this.details = details;
|
|
106
100
|
this.capabilities = {};
|
|
@@ -184,7 +178,7 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
184
178
|
this.proc?.removeAllListeners();
|
|
185
179
|
this.proc = null;
|
|
186
180
|
});
|
|
187
|
-
this.log.prefix =
|
|
181
|
+
this.log.prefix = generateLogPrefix(this);
|
|
188
182
|
if (emitStates) {
|
|
189
183
|
this.changeState(Chromedriver.STATE_STOPPED);
|
|
190
184
|
}
|
|
@@ -226,8 +220,8 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
226
220
|
prepareCapabilitiesForSessionStart(caps) {
|
|
227
221
|
const capabilities = structuredClone(caps);
|
|
228
222
|
// set the logging preferences to ALL browser console logs by default
|
|
229
|
-
capabilities.loggingPrefs = structuredClone(
|
|
230
|
-
if (
|
|
223
|
+
capabilities.loggingPrefs = structuredClone(getCapValue(caps, 'loggingPrefs', {}));
|
|
224
|
+
if (util.isEmpty(capabilities.loggingPrefs.browser)) {
|
|
231
225
|
capabilities.loggingPrefs.browser = 'ALL';
|
|
232
226
|
}
|
|
233
227
|
return capabilities;
|
|
@@ -271,7 +265,7 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
271
265
|
const chromedriverPath = await this.initChromedriverPath();
|
|
272
266
|
// remove stale chromedriver/adb-forward leftovers before launching
|
|
273
267
|
await this.killAll();
|
|
274
|
-
this.proc = new
|
|
268
|
+
this.proc = new SubProcess(chromedriverPath, args);
|
|
275
269
|
this.attachChromedriverProcessListeners(webviewVersionHolder);
|
|
276
270
|
this.log.info(`Spawning Chromedriver with: ${this.chromedriver} ${args.join(' ')}`);
|
|
277
271
|
await this.proc.start(chromedriverStdoutStartDetector);
|
|
@@ -310,5 +304,4 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
310
304
|
throw new Error(message);
|
|
311
305
|
}
|
|
312
306
|
}
|
|
313
|
-
exports.Chromedriver = Chromedriver;
|
|
314
307
|
//# sourceMappingURL=chromedriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromedriver.js","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chromedriver.js","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ChromedriverVersionMapping } from '../types';
|
|
2
|
-
import type { ChromedriverCommandContext } from './types';
|
|
1
|
+
import type { ChromedriverVersionMapping } from '../types.js';
|
|
2
|
+
import type { ChromedriverCommandContext } from './types.js';
|
|
3
3
|
export interface ChromedriverInfo {
|
|
4
4
|
executable: string;
|
|
5
5
|
version: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAM3D,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAUD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,0BAA0B,GAC/B,OAAO,CAAC,0BAA0B,CAAC,CA6BrC;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,0BAA0B,EAChC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAuF7B;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,0BAA0B,EAChC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,MAAM,CAAC,CAsDjG;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,MAAM,CAAC,CAqB5F"}
|
|
@@ -1,69 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.getDriversMapping = getDriversMapping;
|
|
40
|
-
exports.getChromedrivers = getChromedrivers;
|
|
41
|
-
exports.updateDriversMapping = updateDriversMapping;
|
|
42
|
-
exports.getCompatibleChromedriver = getCompatibleChromedriver;
|
|
43
|
-
exports.initChromedriverPath = initChromedriverPath;
|
|
44
|
-
const support_1 = require("@appium/support");
|
|
45
|
-
const asyncbox_1 = require("asyncbox");
|
|
46
|
-
const compare_versions_1 = require("compare-versions");
|
|
47
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
48
|
-
const semver = __importStar(require("semver"));
|
|
49
|
-
const utils_1 = require("../utils");
|
|
1
|
+
import { fs, util } from '@appium/support';
|
|
2
|
+
import { asyncmap } from 'asyncbox';
|
|
3
|
+
import { compareVersions } from 'compare-versions';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import * as semver from 'semver';
|
|
6
|
+
import { CHROMEDRIVER_CHROME_MAPPING, getChromedriverBinaryPath } from '../utils.js';
|
|
50
7
|
const NEW_CD_VERSION_FORMAT_MAJOR_VERSION = 73;
|
|
51
8
|
const CD_VERSION_TIMEOUT = 5000;
|
|
52
9
|
const GET_COMPATIBLE_CHROMEDRIVER_MAX_ITERATIONS = 10;
|
|
53
10
|
/**
|
|
54
11
|
* Loads and normalizes Chromedriver-to-Chrome version mapping.
|
|
55
12
|
*/
|
|
56
|
-
async function getDriversMapping() {
|
|
57
|
-
let mapping = structuredClone(
|
|
13
|
+
export async function getDriversMapping() {
|
|
14
|
+
let mapping = structuredClone(CHROMEDRIVER_CHROME_MAPPING);
|
|
58
15
|
if (this.mappingPath) {
|
|
59
16
|
this.log.debug(`Attempting to use Chromedriver->Chrome mapping from '${this.mappingPath}'`);
|
|
60
|
-
if (!(await
|
|
17
|
+
if (!(await fs.exists(this.mappingPath))) {
|
|
61
18
|
this.log.warn(`No file found at '${this.mappingPath}'`);
|
|
62
19
|
this.log.info('Defaulting to the static Chromedriver->Chrome mapping');
|
|
63
20
|
}
|
|
64
21
|
else {
|
|
65
22
|
try {
|
|
66
|
-
mapping = JSON.parse(await
|
|
23
|
+
mapping = JSON.parse(await fs.readFile(this.mappingPath, 'utf8'));
|
|
67
24
|
}
|
|
68
25
|
catch (e) {
|
|
69
26
|
const err = e;
|
|
@@ -89,18 +46,18 @@ async function getDriversMapping() {
|
|
|
89
46
|
/**
|
|
90
47
|
* Discovers available Chromedriver binaries and parses their versions.
|
|
91
48
|
*/
|
|
92
|
-
async function getChromedrivers(mapping) {
|
|
49
|
+
export async function getChromedrivers(mapping) {
|
|
93
50
|
// enumerate available executables in configured chromedriver directory
|
|
94
|
-
const executables = await
|
|
51
|
+
const executables = await fs.glob('*', {
|
|
95
52
|
cwd: this.executableDir,
|
|
96
53
|
nodir: true,
|
|
97
54
|
absolute: true,
|
|
98
55
|
});
|
|
99
|
-
this.log.debug(`Found ${
|
|
56
|
+
this.log.debug(`Found ${util.pluralize('executable', executables.length, true)} ` +
|
|
100
57
|
`in '${this.executableDir}'`);
|
|
101
|
-
const cds = (await
|
|
58
|
+
const cds = (await asyncmap(executables, async (executable) => {
|
|
102
59
|
const logError = ({ message, stdout, stderr, }) => {
|
|
103
|
-
let errMsg = `Cannot retrieve version number from '${
|
|
60
|
+
let errMsg = `Cannot retrieve version number from '${path.basename(executable)}' Chromedriver binary. ` +
|
|
104
61
|
`Make sure it returns a valid version string in response to '--version' command line argument. ${message}`;
|
|
105
62
|
if (stdout) {
|
|
106
63
|
errMsg += `\nStdout: ${stdout}`;
|
|
@@ -146,7 +103,7 @@ async function getChromedrivers(mapping) {
|
|
|
146
103
|
return { executable, version, minChromeVersion };
|
|
147
104
|
}))
|
|
148
105
|
.filter((cd) => !!cd)
|
|
149
|
-
.sort((a, b) =>
|
|
106
|
+
.sort((a, b) => compareVersions(b.version, a.version));
|
|
150
107
|
if (cds.length === 0) {
|
|
151
108
|
this.log.info(`No Chromedrivers were found in '${this.executableDir}'`);
|
|
152
109
|
return cds;
|
|
@@ -160,15 +117,15 @@ async function getChromedrivers(mapping) {
|
|
|
160
117
|
/**
|
|
161
118
|
* Persists updated version mapping to disk or falls back to in-memory update.
|
|
162
119
|
*/
|
|
163
|
-
async function updateDriversMapping(newMapping) {
|
|
120
|
+
export async function updateDriversMapping(newMapping) {
|
|
164
121
|
let shouldUpdateStaticMapping = true;
|
|
165
122
|
if (!this.mappingPath) {
|
|
166
123
|
this.log.warn('No mapping path provided');
|
|
167
124
|
return;
|
|
168
125
|
}
|
|
169
|
-
if (await
|
|
126
|
+
if (await fs.exists(this.mappingPath)) {
|
|
170
127
|
try {
|
|
171
|
-
await
|
|
128
|
+
await fs.writeFile(this.mappingPath, JSON.stringify(newMapping, null, 2), 'utf8');
|
|
172
129
|
shouldUpdateStaticMapping = false;
|
|
173
130
|
}
|
|
174
131
|
catch (e) {
|
|
@@ -178,19 +135,19 @@ async function updateDriversMapping(newMapping) {
|
|
|
178
135
|
}
|
|
179
136
|
}
|
|
180
137
|
if (shouldUpdateStaticMapping) {
|
|
181
|
-
Object.assign(
|
|
138
|
+
Object.assign(CHROMEDRIVER_CHROME_MAPPING, newMapping);
|
|
182
139
|
}
|
|
183
140
|
}
|
|
184
141
|
/**
|
|
185
142
|
* Selects the most suitable Chromedriver binary for current environment.
|
|
186
143
|
*/
|
|
187
|
-
async function getCompatibleChromedriver() {
|
|
144
|
+
export async function getCompatibleChromedriver() {
|
|
188
145
|
if (usesDesktopChromedriverDefault(this)) {
|
|
189
|
-
return await
|
|
146
|
+
return await getChromedriverBinaryPath();
|
|
190
147
|
}
|
|
191
148
|
const ctx = this;
|
|
192
149
|
const mapping = await ctx.getDriversMapping();
|
|
193
|
-
if (!
|
|
150
|
+
if (!util.isEmpty(mapping)) {
|
|
194
151
|
ctx.log.debug(`The most recent known Chrome version: ${Object.values(mapping)[0]}`);
|
|
195
152
|
}
|
|
196
153
|
const syncState = { didStorageSync: false };
|
|
@@ -231,20 +188,20 @@ async function getCompatibleChromedriver() {
|
|
|
231
188
|
/**
|
|
232
189
|
* Resolves and verifies the effective Chromedriver executable path.
|
|
233
190
|
*/
|
|
234
|
-
async function initChromedriverPath() {
|
|
191
|
+
export async function initChromedriverPath() {
|
|
235
192
|
if (this.executableVerified && this.chromedriver) {
|
|
236
193
|
return this.chromedriver;
|
|
237
194
|
}
|
|
238
195
|
let chromedriver = this.chromedriver;
|
|
239
196
|
if (!chromedriver) {
|
|
240
197
|
chromedriver = this.chromedriver = this.useSystemExecutable
|
|
241
|
-
? await
|
|
198
|
+
? await getChromedriverBinaryPath()
|
|
242
199
|
: await this.getCompatibleChromedriver();
|
|
243
200
|
}
|
|
244
201
|
if (!chromedriver) {
|
|
245
202
|
throw new Error('Cannot determine a valid Chromedriver executable path');
|
|
246
203
|
}
|
|
247
|
-
if (!(await
|
|
204
|
+
if (!(await fs.exists(chromedriver))) {
|
|
248
205
|
throw new Error(`Trying to use a chromedriver binary at the path ${chromedriver}, but it doesn't exist!`);
|
|
249
206
|
}
|
|
250
207
|
this.executableVerified = true;
|
|
@@ -270,7 +227,7 @@ async function mergeDiscoveredMappingGaps(ctx, cds, mapping) {
|
|
|
270
227
|
if (missingCount === 0) {
|
|
271
228
|
return;
|
|
272
229
|
}
|
|
273
|
-
ctx.log.info(`Found ${
|
|
230
|
+
ctx.log.info(`Found ${util.pluralize('Chromedriver', missingCount, true)}, ` +
|
|
274
231
|
`which ${missingCount === 1 ? 'is' : 'are'} missing in the list of known versions: ` +
|
|
275
232
|
JSON.stringify(missingVersions));
|
|
276
233
|
await ctx.updateDriversMapping(Object.assign(mapping, missingVersions));
|
|
@@ -316,7 +273,7 @@ async function attemptChromedriverStorageSync(ctx, mapping, chromeVersion, syncS
|
|
|
316
273
|
}
|
|
317
274
|
const retrievedMapping = await ctx.storageClient.retrieveMapping();
|
|
318
275
|
ctx.log.debug('Got chromedrivers mapping from the storage: ' +
|
|
319
|
-
|
|
276
|
+
util.truncateString(JSON.stringify(retrievedMapping, null, 2), { length: 500 }));
|
|
320
277
|
const driverKeys = await ctx.storageClient.syncDrivers({
|
|
321
278
|
minBrowserVersion: chromeVersion.major,
|
|
322
279
|
});
|
|
@@ -339,7 +296,7 @@ function makeNoMatchingChromedriverError(ctx, chromeVersion) {
|
|
|
339
296
|
}
|
|
340
297
|
function logChosenMatchingChromedriver(ctx, matchingDrivers, chromeVersion) {
|
|
341
298
|
const binPath = matchingDrivers[0].executable;
|
|
342
|
-
ctx.log.debug(`Found ${
|
|
299
|
+
ctx.log.debug(`Found ${util.pluralize('executable', matchingDrivers.length, true)} ` +
|
|
343
300
|
`capable of automating Chrome '${chromeVersion}'.\nChoosing the most recent, '${binPath}'.`);
|
|
344
301
|
ctx.log.debug(`If a specific version is required, specify it with the 'chromedriverExecutable' capability.`);
|
|
345
302
|
return binPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary.js","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"binary.js","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../lib/commands/process.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../lib/commands/process.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAI3D;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,0BAA0B,GAAG,MAAM,EAAE,CAgBhF;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC,CAE9E;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BnF;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7E"}
|
|
@@ -1,18 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
exports.waitForOnline = waitForOnline;
|
|
6
|
-
exports.killAll = killAll;
|
|
7
|
-
const support_1 = require("@appium/support");
|
|
8
|
-
const asyncbox_1 = require("asyncbox");
|
|
9
|
-
const teen_process_1 = require("teen_process");
|
|
10
|
-
const constants_1 = require("../constants");
|
|
1
|
+
import { system, util } from '@appium/support';
|
|
2
|
+
import { retryInterval } from 'asyncbox';
|
|
3
|
+
import { exec } from 'teen_process';
|
|
4
|
+
import { CHROMEDRIVER_STATES } from '../constants.js';
|
|
11
5
|
const VERSION_PATTERN = /([\d.]+)/;
|
|
12
6
|
/**
|
|
13
7
|
* Builds command-line arguments for the Chromedriver subprocess.
|
|
14
8
|
*/
|
|
15
|
-
function buildChromedriverArgs() {
|
|
9
|
+
export function buildChromedriverArgs() {
|
|
16
10
|
const args = [`--port=${this.proxyPort}`];
|
|
17
11
|
if (this.adb?.adbPort) {
|
|
18
12
|
args.push(`--adb-port=${this.adb.adbPort}`);
|
|
@@ -32,22 +26,22 @@ function buildChromedriverArgs() {
|
|
|
32
26
|
/**
|
|
33
27
|
* Retrieves Chromedriver `/status` payload through the active proxy.
|
|
34
28
|
*/
|
|
35
|
-
async function getStatus() {
|
|
29
|
+
export async function getStatus() {
|
|
36
30
|
return await this.jwproxy.command('/status', 'GET');
|
|
37
31
|
}
|
|
38
32
|
/**
|
|
39
33
|
* Polls Chromedriver until it reports ready and captures runtime metadata.
|
|
40
34
|
*/
|
|
41
|
-
async function waitForOnline() {
|
|
35
|
+
export async function waitForOnline() {
|
|
42
36
|
const self = this;
|
|
43
37
|
let chromedriverStopped = false;
|
|
44
|
-
await
|
|
45
|
-
if (this.state ===
|
|
38
|
+
await retryInterval(20, 200, async () => {
|
|
39
|
+
if (this.state === CHROMEDRIVER_STATES.STOPPED) {
|
|
46
40
|
chromedriverStopped = true;
|
|
47
41
|
return;
|
|
48
42
|
}
|
|
49
43
|
const status = await self.getStatus();
|
|
50
|
-
if (!
|
|
44
|
+
if (!util.isPlainObject(status) || !status.ready) {
|
|
51
45
|
throw new Error(`The response to the /status API is not valid: ${JSON.stringify(status)}`);
|
|
52
46
|
}
|
|
53
47
|
const statusPayload = status;
|
|
@@ -68,9 +62,9 @@ async function waitForOnline() {
|
|
|
68
62
|
/**
|
|
69
63
|
* Cleans up stale Chromedriver processes and leftover adb forwarded ports.
|
|
70
64
|
*/
|
|
71
|
-
async function killAll() {
|
|
72
|
-
const cmd =
|
|
73
|
-
const args =
|
|
65
|
+
export async function killAll() {
|
|
66
|
+
const cmd = system.isWindows() ? 'wmic' : 'pkill';
|
|
67
|
+
const args = system.isWindows()
|
|
74
68
|
? [
|
|
75
69
|
'process',
|
|
76
70
|
'where',
|
|
@@ -80,7 +74,7 @@ async function killAll() {
|
|
|
80
74
|
: ['-15', '-f', `${this.chromedriver}.*--port=${this.proxyPort}`];
|
|
81
75
|
this.log.debug(`Killing any old chromedrivers, running: ${cmd} ${args.join(' ')}`);
|
|
82
76
|
try {
|
|
83
|
-
await
|
|
77
|
+
await exec(cmd, args);
|
|
84
78
|
this.log.debug('Successfully cleaned up old chromedrivers');
|
|
85
79
|
}
|
|
86
80
|
catch {
|