appium-chromedriver 8.2.29 → 8.3.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 +17 -0
- package/build/lib/chromedriver.d.ts +21 -16
- package/build/lib/chromedriver.d.ts.map +1 -1
- package/build/lib/chromedriver.js +108 -92
- package/build/lib/chromedriver.js.map +1 -1
- package/build/lib/commands/binary.d.ts.map +1 -1
- package/build/lib/commands/binary.js +118 -91
- package/build/lib/commands/binary.js.map +1 -1
- package/build/lib/commands/session.d.ts +2 -5
- package/build/lib/commands/session.d.ts.map +1 -1
- package/build/lib/commands/session.js +1 -1
- package/build/lib/commands/session.js.map +1 -1
- package/build/lib/commands/version.d.ts.map +1 -1
- package/build/lib/commands/version.js +63 -42
- package/build/lib/commands/version.js.map +1 -1
- package/build/lib/storage-client/chromelabs.d.ts.map +1 -1
- 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 +8 -11
- 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 +10 -21
- package/build/lib/storage-client/storage-client.js.map +1 -1
- package/config/mapping.json +1 -0
- package/lib/chromedriver.ts +133 -101
- package/lib/commands/binary.ts +181 -117
- package/lib/commands/session.ts +3 -5
- package/lib/commands/version.ts +73 -44
- package/lib/storage-client/chromelabs.ts +27 -27
- package/lib/storage-client/googleapis.ts +12 -13
- package/lib/storage-client/storage-client.ts +16 -25
- package/package.json +1 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
## [8.3.0](https://github.com/appium/appium-chromedriver/compare/v8.2.30...v8.3.0) (2026-05-04)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Ditch bluebird ([#571](https://github.com/appium/appium-chromedriver/issues/571)) ([3b1c857](https://github.com/appium/appium-chromedriver/commit/3b1c8572484f4a511d7c07c0cc892fed192bd204))
|
|
6
|
+
|
|
7
|
+
## [8.2.30](https://github.com/appium/appium-chromedriver/compare/v8.2.29...v8.2.30) (2026-04-30)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* ChromeDriver Bump to v148.0.7778.97 ([#570](https://github.com/appium/appium-chromedriver/issues/570)) ([fc5dd88](https://github.com/appium/appium-chromedriver/commit/fc5dd8867e82830bb88e48b1ca12a568193a6998))
|
|
12
|
+
|
|
13
|
+
### Code Refactoring
|
|
14
|
+
|
|
15
|
+
* Make the `start` method more readable ([#567](https://github.com/appium/appium-chromedriver/issues/567)) ([1f619c6](https://github.com/appium/appium-chromedriver/commit/1f619c65f3b70c16178ce0e62d7c07f382526b6f))
|
|
16
|
+
* simplify getCompatibleChromedriver and getChromeVersionForAutodetection methods ([#569](https://github.com/appium/appium-chromedriver/issues/569)) ([2f12709](https://github.com/appium/appium-chromedriver/commit/2f127096b363741b13eda0a06eba1ca36b839828))
|
|
17
|
+
|
|
1
18
|
## [8.2.29](https://github.com/appium/appium-chromedriver/compare/v8.2.28...v8.2.29) (2026-04-24)
|
|
2
19
|
|
|
3
20
|
### Miscellaneous Chores
|
|
@@ -3,11 +3,11 @@ import { JWProxy, PROTOCOLS } from '@appium/base-driver';
|
|
|
3
3
|
import { SubProcess, exec } from 'teen_process';
|
|
4
4
|
import { ChromedriverStorageClient } from './storage-client/storage-client';
|
|
5
5
|
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from './constants';
|
|
6
|
+
import { type SessionCapabilities } from './commands/session';
|
|
6
7
|
import type { ADB } from 'appium-adb';
|
|
7
8
|
import type { HTTPMethod, HTTPBody } from '@appium/types';
|
|
8
9
|
import type { Request, Response } from 'express';
|
|
9
10
|
import type { ChromedriverOpts } from './types';
|
|
10
|
-
type SessionCapabilities = Record<string, any>;
|
|
11
11
|
type ChromedriverState = (typeof CHROMEDRIVER_STATES)[keyof typeof CHROMEDRIVER_STATES];
|
|
12
12
|
type ChromedriverEventMap = {
|
|
13
13
|
[CHROMEDRIVER_EVENTS.ERROR]: [Error];
|
|
@@ -23,8 +23,6 @@ export declare class Chromedriver extends events.EventEmitter<ChromedriverEventM
|
|
|
23
23
|
static readonly STATE_ONLINE: "online";
|
|
24
24
|
static readonly STATE_STOPPING: "stopping";
|
|
25
25
|
static readonly STATE_RESTARTING: "restarting";
|
|
26
|
-
private readonly _log;
|
|
27
|
-
private readonly proxyHost;
|
|
28
26
|
readonly proxyPort: number;
|
|
29
27
|
readonly adb?: ADB;
|
|
30
28
|
readonly cmdArgs?: string[];
|
|
@@ -48,6 +46,21 @@ export declare class Chromedriver extends events.EventEmitter<ChromedriverEventM
|
|
|
48
46
|
_desiredProtocol: keyof typeof PROTOCOLS | null;
|
|
49
47
|
_driverVersion: string | null;
|
|
50
48
|
_onlineStatus: Record<string, any> | null;
|
|
49
|
+
private readonly _log;
|
|
50
|
+
private readonly proxyHost;
|
|
51
|
+
private buildChromedriverArgs;
|
|
52
|
+
private getDriversMapping;
|
|
53
|
+
private getChromedrivers;
|
|
54
|
+
private updateDriversMapping;
|
|
55
|
+
private getCompatibleChromedriver;
|
|
56
|
+
private initChromedriverPath;
|
|
57
|
+
private getChromeVersion;
|
|
58
|
+
private syncProtocol;
|
|
59
|
+
private waitForOnline;
|
|
60
|
+
private getStatus;
|
|
61
|
+
private killAll;
|
|
62
|
+
private changeState;
|
|
63
|
+
private startSession;
|
|
51
64
|
constructor(args?: ChromedriverOpts);
|
|
52
65
|
get log(): any;
|
|
53
66
|
get driverVersion(): string | null;
|
|
@@ -99,19 +112,11 @@ export declare class Chromedriver extends events.EventEmitter<ChromedriverEventM
|
|
|
99
112
|
* @returns `true` if `/url` command succeeds, otherwise `false`.
|
|
100
113
|
*/
|
|
101
114
|
hasWorkingWebview(): Promise<boolean>;
|
|
102
|
-
private
|
|
103
|
-
private
|
|
104
|
-
private
|
|
105
|
-
private
|
|
106
|
-
private
|
|
107
|
-
private initChromedriverPath;
|
|
108
|
-
private getChromeVersion;
|
|
109
|
-
private syncProtocol;
|
|
110
|
-
private waitForOnline;
|
|
111
|
-
private getStatus;
|
|
112
|
-
private killAll;
|
|
113
|
-
private changeState;
|
|
114
|
-
private startSession;
|
|
115
|
+
private prepareCapabilitiesForSessionStart;
|
|
116
|
+
private attachChromedriverProcessListeners;
|
|
117
|
+
private launchChromedriverProcess;
|
|
118
|
+
private formatChromeVersionMismatchHint;
|
|
119
|
+
private handleChromedriverStartFailure;
|
|
115
120
|
}
|
|
116
121
|
export {};
|
|
117
122
|
//# sourceMappingURL=chromedriver.d.ts.map
|
|
@@ -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;AAG9C,OAAO,EAAC,yBAAyB,EAAC,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"chromedriver.d.ts","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ const process_1 = require("./commands/process");
|
|
|
18
18
|
const session_1 = require("./commands/session");
|
|
19
19
|
const DEFAULT_HOST = '127.0.0.1';
|
|
20
20
|
const DEFAULT_PORT = 9515;
|
|
21
|
+
// consider chromedriver ready once startup banner appears
|
|
22
|
+
const chromedriverStdoutStartDetector = (stdout) => stdout.startsWith('Starting ');
|
|
21
23
|
class Chromedriver extends node_events_1.default.EventEmitter {
|
|
22
24
|
static EVENT_ERROR = constants_1.CHROMEDRIVER_EVENTS.ERROR;
|
|
23
25
|
static EVENT_CHANGED = constants_1.CHROMEDRIVER_EVENTS.CHANGED;
|
|
@@ -26,8 +28,6 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
26
28
|
static STATE_ONLINE = constants_1.CHROMEDRIVER_STATES.ONLINE;
|
|
27
29
|
static STATE_STOPPING = constants_1.CHROMEDRIVER_STATES.STOPPING;
|
|
28
30
|
static STATE_RESTARTING = constants_1.CHROMEDRIVER_STATES.RESTARTING;
|
|
29
|
-
_log;
|
|
30
|
-
proxyHost;
|
|
31
31
|
proxyPort;
|
|
32
32
|
adb;
|
|
33
33
|
cmdArgs;
|
|
@@ -51,6 +51,21 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
51
51
|
_desiredProtocol;
|
|
52
52
|
_driverVersion;
|
|
53
53
|
_onlineStatus;
|
|
54
|
+
_log;
|
|
55
|
+
proxyHost;
|
|
56
|
+
buildChromedriverArgs = process_1.buildChromedriverArgs;
|
|
57
|
+
getDriversMapping = binary_1.getDriversMapping;
|
|
58
|
+
getChromedrivers = binary_1.getChromedrivers;
|
|
59
|
+
updateDriversMapping = binary_1.updateDriversMapping;
|
|
60
|
+
getCompatibleChromedriver = binary_1.getCompatibleChromedriver;
|
|
61
|
+
initChromedriverPath = binary_1.initChromedriverPath;
|
|
62
|
+
getChromeVersion = version_1.getChromeVersionForAutodetection;
|
|
63
|
+
syncProtocol = session_1.syncProtocol;
|
|
64
|
+
waitForOnline = process_1.waitForOnline;
|
|
65
|
+
getStatus = process_1.getStatus;
|
|
66
|
+
killAll = process_1.killAll;
|
|
67
|
+
changeState = session_1.changeState;
|
|
68
|
+
startSession = session_1.startSession;
|
|
54
69
|
constructor(args = {}) {
|
|
55
70
|
super();
|
|
56
71
|
const { host = DEFAULT_HOST, port = DEFAULT_PORT, useSystemExecutable = false, executable, executableDir, bundleId, mappingPath, cmdArgs, adb, verbose, logPath, disableBuildCheck, details, isAutodownloadEnabled = false, reqBasePath, } = args;
|
|
@@ -106,89 +121,19 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
106
121
|
* @returns Session capabilities returned by Chromedriver.
|
|
107
122
|
*/
|
|
108
123
|
async start(caps, emitStartingState = true) {
|
|
109
|
-
this.capabilities =
|
|
110
|
-
// set the logging preferences to ALL browser console logs by default
|
|
111
|
-
this.capabilities.loggingPrefs = lodash_1.default.cloneDeep((0, session_1.getCapValue)(caps, 'loggingPrefs', {}));
|
|
112
|
-
if (lodash_1.default.isEmpty(this.capabilities.loggingPrefs.browser)) {
|
|
113
|
-
this.capabilities.loggingPrefs.browser = 'ALL';
|
|
114
|
-
}
|
|
124
|
+
this.capabilities = this.prepareCapabilitiesForSessionStart(caps);
|
|
115
125
|
if (emitStartingState) {
|
|
116
126
|
this.changeState(Chromedriver.STATE_STARTING);
|
|
117
127
|
}
|
|
118
128
|
const args = this.buildChromedriverArgs();
|
|
119
|
-
|
|
120
|
-
const startDetector = (stdout) => stdout.startsWith('Starting ');
|
|
121
|
-
let processIsAlive = false;
|
|
122
|
-
let webviewVersion;
|
|
129
|
+
const webviewVersionHolder = {};
|
|
123
130
|
try {
|
|
124
|
-
|
|
125
|
-
// remove stale chromedriver/adb-forward leftovers before launching
|
|
126
|
-
await this.killAll();
|
|
127
|
-
this.proc = new teen_process_1.SubProcess(chromedriverPath, args);
|
|
128
|
-
processIsAlive = true;
|
|
129
|
-
for (const streamName of ['stderr', 'stdout']) {
|
|
130
|
-
this.proc.on(`line-${streamName}`, (line) => {
|
|
131
|
-
// if chromedriver does not print explicit Chrome version support,
|
|
132
|
-
// infer webview version from DevTools banner for better errors
|
|
133
|
-
if (!webviewVersion) {
|
|
134
|
-
const match = /"Browser": "([^"]+)"/.exec(line);
|
|
135
|
-
if (match) {
|
|
136
|
-
webviewVersion = match[1];
|
|
137
|
-
this.log.debug(`Webview version: '${webviewVersion}'`);
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
if (this.verbose) {
|
|
141
|
-
this.log.debug(`[${streamName.toUpperCase()}] ${line}`);
|
|
142
|
-
}
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
this.proc.once('exit', (code, signal) => {
|
|
146
|
-
this._driverVersion = null;
|
|
147
|
-
this._desiredProtocol = null;
|
|
148
|
-
this._onlineStatus = null;
|
|
149
|
-
processIsAlive = false;
|
|
150
|
-
if (this.state !== Chromedriver.STATE_STOPPED &&
|
|
151
|
-
this.state !== Chromedriver.STATE_STOPPING &&
|
|
152
|
-
this.state !== Chromedriver.STATE_RESTARTING) {
|
|
153
|
-
this.log.error(`Chromedriver exited unexpectedly with code ${code}, signal ${signal}`);
|
|
154
|
-
this.changeState(Chromedriver.STATE_STOPPED);
|
|
155
|
-
}
|
|
156
|
-
this.proc?.removeAllListeners();
|
|
157
|
-
this.proc = null;
|
|
158
|
-
});
|
|
159
|
-
this.log.info(`Spawning Chromedriver with: ${this.chromedriver} ${args.join(' ')}`);
|
|
160
|
-
await this.proc.start(startDetector);
|
|
161
|
-
// wait until /status says ready, then negotiate protocol and start session
|
|
162
|
-
await this.waitForOnline();
|
|
131
|
+
await this.launchChromedriverProcess(args, webviewVersionHolder);
|
|
163
132
|
this.syncProtocol();
|
|
164
133
|
return await this.startSession();
|
|
165
134
|
}
|
|
166
135
|
catch (e) {
|
|
167
|
-
|
|
168
|
-
this.log.debug(err);
|
|
169
|
-
this.emit(Chromedriver.EVENT_ERROR, err);
|
|
170
|
-
// an error does not always mean subprocess has already exited
|
|
171
|
-
if (processIsAlive) {
|
|
172
|
-
await this.proc?.stop();
|
|
173
|
-
}
|
|
174
|
-
this.proc?.removeAllListeners();
|
|
175
|
-
this.proc = null;
|
|
176
|
-
let message = '';
|
|
177
|
-
// enrich the common version-mismatch error with actionable context
|
|
178
|
-
if (err.message.includes('Chrome version must be')) {
|
|
179
|
-
message +=
|
|
180
|
-
'Unable to automate Chrome version because it is not supported by this version of Chromedriver.\n';
|
|
181
|
-
if (webviewVersion) {
|
|
182
|
-
message += `Chrome version on the device: ${webviewVersion}\n`;
|
|
183
|
-
}
|
|
184
|
-
const versionsSupportedByDriver = /Chrome version must be (.+)/.exec(err.message)?.[1] || '';
|
|
185
|
-
if (versionsSupportedByDriver) {
|
|
186
|
-
message += `Chromedriver supports Chrome version(s): ${versionsSupportedByDriver}\n`;
|
|
187
|
-
}
|
|
188
|
-
message += 'Check the driver tutorial for troubleshooting.\n';
|
|
189
|
-
}
|
|
190
|
-
message += err.message;
|
|
191
|
-
throw this.log.errorWithException(message);
|
|
136
|
+
return await this.handleChromedriverStartFailure(e, webviewVersionHolder.version);
|
|
192
137
|
}
|
|
193
138
|
}
|
|
194
139
|
/**
|
|
@@ -233,8 +178,8 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
233
178
|
}
|
|
234
179
|
};
|
|
235
180
|
await runSafeStep(() => this.jwproxy.command('', 'DELETE'));
|
|
236
|
-
await runSafeStep(() => {
|
|
237
|
-
this.proc?.stop('SIGTERM', 20000);
|
|
181
|
+
await runSafeStep(async () => {
|
|
182
|
+
await this.proc?.stop('SIGTERM', 20000);
|
|
238
183
|
this.proc?.removeAllListeners();
|
|
239
184
|
this.proc = null;
|
|
240
185
|
});
|
|
@@ -277,20 +222,91 @@ class Chromedriver extends node_events_1.default.EventEmitter {
|
|
|
277
222
|
return false;
|
|
278
223
|
}
|
|
279
224
|
}
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
225
|
+
prepareCapabilitiesForSessionStart(caps) {
|
|
226
|
+
const capabilities = lodash_1.default.cloneDeep(caps);
|
|
227
|
+
// set the logging preferences to ALL browser console logs by default
|
|
228
|
+
capabilities.loggingPrefs = lodash_1.default.cloneDeep((0, session_1.getCapValue)(caps, 'loggingPrefs', {}));
|
|
229
|
+
if (lodash_1.default.isEmpty(capabilities.loggingPrefs.browser)) {
|
|
230
|
+
capabilities.loggingPrefs.browser = 'ALL';
|
|
231
|
+
}
|
|
232
|
+
return capabilities;
|
|
233
|
+
}
|
|
234
|
+
attachChromedriverProcessListeners(webviewVersionHolder) {
|
|
235
|
+
const proc = this.proc;
|
|
236
|
+
if (!proc) {
|
|
237
|
+
throw new Error('Chromedriver subprocess must be assigned before attaching listeners');
|
|
238
|
+
}
|
|
239
|
+
for (const streamName of ['stderr', 'stdout']) {
|
|
240
|
+
proc.on(`line-${streamName}`, (line) => {
|
|
241
|
+
// if chromedriver does not print explicit Chrome version support,
|
|
242
|
+
// infer webview version from DevTools banner for better errors
|
|
243
|
+
if (!webviewVersionHolder.version) {
|
|
244
|
+
const match = /"Browser": "([^"]+)"/.exec(line);
|
|
245
|
+
if (match) {
|
|
246
|
+
webviewVersionHolder.version = match[1];
|
|
247
|
+
this.log.debug(`Webview version: '${webviewVersionHolder.version}'`);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
if (this.verbose) {
|
|
251
|
+
this.log.debug(`[${streamName.toUpperCase()}] ${line}`);
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
}
|
|
255
|
+
proc.once('exit', (code, signal) => {
|
|
256
|
+
this._driverVersion = null;
|
|
257
|
+
this._desiredProtocol = null;
|
|
258
|
+
this._onlineStatus = null;
|
|
259
|
+
if (this.state !== Chromedriver.STATE_STOPPED &&
|
|
260
|
+
this.state !== Chromedriver.STATE_STOPPING &&
|
|
261
|
+
this.state !== Chromedriver.STATE_RESTARTING) {
|
|
262
|
+
this.log.error(`Chromedriver exited unexpectedly with code ${code}, signal ${signal}`);
|
|
263
|
+
this.changeState(Chromedriver.STATE_STOPPED);
|
|
264
|
+
}
|
|
265
|
+
this.proc?.removeAllListeners();
|
|
266
|
+
this.proc = null;
|
|
267
|
+
});
|
|
268
|
+
}
|
|
269
|
+
async launchChromedriverProcess(args, webviewVersionHolder) {
|
|
270
|
+
const chromedriverPath = await this.initChromedriverPath();
|
|
271
|
+
// remove stale chromedriver/adb-forward leftovers before launching
|
|
272
|
+
await this.killAll();
|
|
273
|
+
this.proc = new teen_process_1.SubProcess(chromedriverPath, args);
|
|
274
|
+
this.attachChromedriverProcessListeners(webviewVersionHolder);
|
|
275
|
+
this.log.info(`Spawning Chromedriver with: ${this.chromedriver} ${args.join(' ')}`);
|
|
276
|
+
await this.proc.start(chromedriverStdoutStartDetector);
|
|
277
|
+
// wait until /status says ready, then negotiate protocol and start session
|
|
278
|
+
await this.waitForOnline();
|
|
279
|
+
}
|
|
280
|
+
formatChromeVersionMismatchHint(err, webviewVersion) {
|
|
281
|
+
if (!err.message.includes('Chrome version must be')) {
|
|
282
|
+
return '';
|
|
283
|
+
}
|
|
284
|
+
// enrich the common version-mismatch error with actionable context
|
|
285
|
+
let message = 'Unable to automate Chrome version because it is not supported by this version of Chromedriver.\n';
|
|
286
|
+
if (webviewVersion) {
|
|
287
|
+
message += `Chrome version on the device: ${webviewVersion}\n`;
|
|
288
|
+
}
|
|
289
|
+
const versionsSupportedByDriver = /Chrome version must be (.+)/.exec(err.message)?.[1] || '';
|
|
290
|
+
if (versionsSupportedByDriver) {
|
|
291
|
+
message += `Chromedriver supports Chrome version(s): ${versionsSupportedByDriver}\n`;
|
|
292
|
+
}
|
|
293
|
+
message += 'Check the driver tutorial for troubleshooting.\n';
|
|
294
|
+
return message;
|
|
295
|
+
}
|
|
296
|
+
async handleChromedriverStartFailure(err, webviewVersion) {
|
|
297
|
+
this.log.debug(err);
|
|
298
|
+
this.emit(Chromedriver.EVENT_ERROR, err);
|
|
299
|
+
// an error does not always mean subprocess has already exited
|
|
300
|
+
if (this.proc) {
|
|
301
|
+
try {
|
|
302
|
+
await this.proc.stop();
|
|
303
|
+
}
|
|
304
|
+
catch { }
|
|
305
|
+
}
|
|
306
|
+
this.proc?.removeAllListeners();
|
|
307
|
+
this.proc = null;
|
|
308
|
+
const message = this.formatChromeVersionMismatchHint(err, webviewVersion) + err.message;
|
|
309
|
+
throw new Error(message);
|
|
294
310
|
}
|
|
295
311
|
}
|
|
296
312
|
exports.Chromedriver = Chromedriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromedriver.js","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAiC;AACjC,qDAAuD;AACvD,6CAAuC;AACvC,+CAA8C;AAC9C,mCAA8D;AAC9D,oDAAuB;AACvB,oEAA0E;AAC1E,2CAAqE;AACrE,8CAM2B;AAC3B,gDAAoE;AACpE,gDAA4F;AAC5F,
|
|
1
|
+
{"version":3,"file":"chromedriver.js","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,UAAU,CAAC;AACzD,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,UAAU,CAAC;AACzD,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAMxD,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"}
|