appium-chromedriver 9.0.1 → 9.0.3
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 +29 -43
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [9.0.3](https://github.com/appium/appium-chromedriver/compare/v9.0.2...v9.0.3) (2026-07-27)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Drop chai ([#608](https://github.com/appium/appium-chromedriver/issues/608)) ([e420c35](https://github.com/appium/appium-chromedriver/commit/e420c35309c65cbfb7e43916a099bb58f333f200))
|
|
6
|
+
|
|
7
|
+
## [9.0.2](https://github.com/appium/appium-chromedriver/compare/v9.0.1...v9.0.2) (2026-07-27)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* Integrate oxc and release configs ([#607](https://github.com/appium/appium-chromedriver/issues/607)) ([4ce6400](https://github.com/appium/appium-chromedriver/commit/4ce64004977eec754bef18a9acb2e58a195a7412))
|
|
12
|
+
|
|
1
13
|
## [9.0.1](https://github.com/appium/appium-chromedriver/compare/v9.0.0...v9.0.1) (2026-07-23)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import events from 'node:events';
|
|
2
2
|
import { JWProxy, PROTOCOLS } from '@appium/base-driver';
|
|
3
|
-
import { SubProcess, exec } from 'teen_process';
|
|
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
|
-
import type { ADB } from 'appium-adb';
|
|
8
3
|
import type { HTTPMethod, HTTPBody } from '@appium/types';
|
|
4
|
+
import type { ADB } from 'appium-adb';
|
|
9
5
|
import type { Request, Response } from 'express';
|
|
6
|
+
import { SubProcess, exec } from 'teen_process';
|
|
7
|
+
import { type SessionCapabilities } from './commands/session.js';
|
|
8
|
+
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from './constants.js';
|
|
9
|
+
import { ChromedriverStorageClient } from './storage-client/storage-client.js';
|
|
10
10
|
import type { ChromedriverOpts } from './types.js';
|
|
11
11
|
export type ChromedriverState = (typeof CHROMEDRIVER_STATES)[keyof typeof CHROMEDRIVER_STATES];
|
|
12
12
|
type ChromedriverEventMap = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromedriver.d.ts","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"chromedriver.d.ts","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAe,UAAU,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AACtE,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAU9C,OAAO,EAAuD,KAAK,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAErH,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAC,yBAAyB,EAAC,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,YAAY,CAAC;AAKjD,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,OAAO,mBAAmB,CAAC,CAAC;AAM/F,KAAK,oBAAoB,GAAG;IAC1B,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAAC,KAAK,EAAE,iBAAiB,CAAA;KAAC,CAAC,CAAC;CAC7D,CAAC;AAGF,qBAAa,YAAa,SAAQ,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC;IACzE,MAAM,CAAC,QAAQ,CAAC,WAAW,uBAA6B;IACxD,MAAM,CAAC,QAAQ,CAAC,aAAa,iBAA+B;IAC5D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAA+B;IAC5D,MAAM,CAAC,QAAQ,CAAC,cAAc,aAAgC;IAC9D,MAAM,CAAC,QAAQ,CAAC,YAAY,WAA8B;IAC1D,MAAM,CAAC,QAAQ,CAAC,cAAc,aAAgC;IAC9D,MAAM,CAAC,QAAQ,CAAC,gBAAgB,eAAkC;IAElE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,yBAAyB,GAAG,IAAI,CAAC;IACzD,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC/C,YAAY,EAAE,mBAAmB,CAAC;IAClC,gBAAgB,EAAE,MAAM,OAAO,SAAS,GAAG,IAAI,CAAC;IAChD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,qBAAqB,CAAyB;IACtD,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,oBAAoB,CAAwB;IACpD,OAAO,CAAC,yBAAyB,CAA6B;IAC9D,OAAO,CAAC,oBAAoB,CAAwB;IACpD,OAAO,CAAC,gBAAgB,CAAoC;IAC5D,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAiB;IACtC,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,YAAY,CAAgB;gBAExB,IAAI,GAAE,gBAAqB;IA0DvC,IAAI,GAAG,QAEN;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,IAAI,CAEjC;IAED;;;;;;OAMG;IACG,KAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkB9F;;;;OAIG;IACH,SAAS,IAAI,MAAM,GAAG,IAAI;IAI1B;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAU7C;;;;OAIG;IACG,IAAI,CAAC,UAAU,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5C;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAE,QAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI5F;;;;;OAKG;IACG,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D;;;;OAIG;IACG,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAS3C,OAAO,CAAC,kCAAkC;IAU1C,OAAO,CAAC,kCAAkC;YAuC5B,yBAAyB;IAavC,OAAO,CAAC,+BAA+B;YAiBzB,8BAA8B;CAe7C"}
|
|
@@ -2,13 +2,13 @@ import events from 'node:events';
|
|
|
2
2
|
import { JWProxy, PROTOCOLS } from '@appium/base-driver';
|
|
3
3
|
import { logger, util } from '@appium/support';
|
|
4
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
5
|
import { getDriversMapping, getChromedrivers, updateDriversMapping, getCompatibleChromedriver, initChromedriverPath, } from './commands/binary.js';
|
|
9
|
-
import { getChromeVersionForAutodetection } from './commands/version.js';
|
|
10
6
|
import { buildChromedriverArgs, waitForOnline, getStatus, killAll } from './commands/process.js';
|
|
11
|
-
import { syncProtocol, startSession, changeState, getCapValue
|
|
7
|
+
import { syncProtocol, startSession, changeState, getCapValue } from './commands/session.js';
|
|
8
|
+
import { getChromeVersionForAutodetection } from './commands/version.js';
|
|
9
|
+
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from './constants.js';
|
|
10
|
+
import { ChromedriverStorageClient } from './storage-client/storage-client.js';
|
|
11
|
+
import { getChromedriverDir, generateLogPrefix } from './utils.js';
|
|
12
12
|
// Keep this import marked as used at runtime when it is otherwise only referenced in type positions.
|
|
13
13
|
void PROTOCOLS;
|
|
14
14
|
const DEFAULT_HOST = '127.0.0.1';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromedriver.js","sourceRoot":"","sources":["../../lib/chromedriver.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;
|
|
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":"
|
|
1
|
+
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../lib/commands/binary.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,aAAa,CAAC;AAE5D,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,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA6B7G;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,0BAA0B,EAChC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAyE7B;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,CAmDjG;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,MAAM,CAAC,CAmB5F"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
1
2
|
import { fs, util } from '@appium/support';
|
|
2
3
|
import { asyncmap } from 'asyncbox';
|
|
3
4
|
import { compareVersions } from 'compare-versions';
|
|
4
|
-
import path from 'node:path';
|
|
5
5
|
import * as semver from 'semver';
|
|
6
6
|
import { CHROMEDRIVER_CHROME_MAPPING, getChromedriverBinaryPath } from '../utils.js';
|
|
7
7
|
const NEW_CD_VERSION_FORMAT_MAJOR_VERSION = 73;
|
|
@@ -53,10 +53,9 @@ export async function getChromedrivers(mapping) {
|
|
|
53
53
|
nodir: true,
|
|
54
54
|
absolute: true,
|
|
55
55
|
});
|
|
56
|
-
this.log.debug(`Found ${util.pluralize('executable', executables.length, true)} `
|
|
57
|
-
`in '${this.executableDir}'`);
|
|
56
|
+
this.log.debug(`Found ${util.pluralize('executable', executables.length, true)} in '${this.executableDir}'`);
|
|
58
57
|
const cds = (await asyncmap(executables, async (executable) => {
|
|
59
|
-
const logError = ({ message, stdout, stderr
|
|
58
|
+
const logError = ({ message, stdout, stderr }) => {
|
|
60
59
|
let errMsg = `Cannot retrieve version number from '${path.basename(executable)}' Chromedriver binary. ` +
|
|
61
60
|
`Make sure it returns a valid version string in response to '--version' command line argument. ${message}`;
|
|
62
61
|
if (stdout) {
|
|
@@ -77,8 +76,7 @@ export async function getChromedrivers(mapping) {
|
|
|
77
76
|
}
|
|
78
77
|
catch (e) {
|
|
79
78
|
const err = e;
|
|
80
|
-
if (!(err.message || '').includes('timed out') &&
|
|
81
|
-
!(err.stdout || '').includes('Starting ChromeDriver')) {
|
|
79
|
+
if (!(err.message || '').includes('timed out') && !(err.stdout || '').includes('Starting ChromeDriver')) {
|
|
82
80
|
return logError(err);
|
|
83
81
|
}
|
|
84
82
|
// timeouts may still contain the version banner in stdout
|
|
@@ -182,8 +180,7 @@ export async function getCompatibleChromedriver() {
|
|
|
182
180
|
}
|
|
183
181
|
return logChosenMatchingChromedriver(ctx, matchingDrivers, chromeVersion);
|
|
184
182
|
}
|
|
185
|
-
throw new Error(`Exceeded ${GET_COMPATIBLE_CHROMEDRIVER_MAX_ITERATIONS} iterations while selecting a
|
|
186
|
-
`compatible Chromedriver.`);
|
|
183
|
+
throw new Error(`Exceeded ${GET_COMPATIBLE_CHROMEDRIVER_MAX_ITERATIONS} iterations while selecting a compatible Chromedriver.`);
|
|
187
184
|
}
|
|
188
185
|
/**
|
|
189
186
|
* Resolves and verifies the effective Chromedriver executable path.
|
|
@@ -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":"
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../lib/commands/process.ts"],"names":[],"mappings":"AAKA,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,CAqC7E"}
|
|
@@ -65,12 +65,7 @@ export async function waitForOnline() {
|
|
|
65
65
|
export async function killAll() {
|
|
66
66
|
const cmd = system.isWindows() ? 'wmic' : 'pkill';
|
|
67
67
|
const args = system.isWindows()
|
|
68
|
-
? [
|
|
69
|
-
'process',
|
|
70
|
-
'where',
|
|
71
|
-
`commandline like '%chromedriver.exe%--port=${this.proxyPort}%'`,
|
|
72
|
-
'delete',
|
|
73
|
-
]
|
|
68
|
+
? ['process', 'where', `commandline like '%chromedriver.exe%--port=${this.proxyPort}%'`, 'delete']
|
|
74
69
|
: ['-15', '-f', `${this.chromedriver}.*--port=${this.proxyPort}`];
|
|
75
70
|
this.log.debug(`Killing any old chromedrivers, running: ${cmd} ${args.join(' ')}`);
|
|
76
71
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../lib/commands/process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../lib/commands/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../lib/commands/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAgB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../lib/commands/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAgB,MAAM,qBAAqB,CAAC;AAM7D,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAK3D,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEtD;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAIpD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAK,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,CAO1G;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAEzF;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAYjG;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,0BAA0B,GAAG,MAAM,OAAO,SAAS,CAkCrF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,0BAA0B,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAIjF"}
|
|
@@ -1,8 +1,8 @@
|
|
|
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
|
+
import { CHROMEDRIVER_EVENTS, CHROMEDRIVER_STATES } from '../constants.js';
|
|
5
|
+
import { generateLogPrefix } from '../utils.js';
|
|
6
6
|
const MIN_CD_VERSION_WITH_W3C_SUPPORT = 75;
|
|
7
7
|
const W3C_PREFIX = 'goog:';
|
|
8
8
|
/**
|
|
@@ -37,8 +37,7 @@ export async function startSession() {
|
|
|
37
37
|
const sessionCaps = this._desiredProtocol === PROTOCOLS.W3C
|
|
38
38
|
? { capabilities: { alwaysMatch: toW3cCapNames(this.capabilities) } }
|
|
39
39
|
: { desiredCapabilities: this.capabilities };
|
|
40
|
-
this.log.info(`Starting ${this._desiredProtocol} Chromedriver session with capabilities: ` +
|
|
41
|
-
JSON.stringify(sessionCaps, null, 2));
|
|
40
|
+
this.log.info(`Starting ${this._desiredProtocol} Chromedriver session with capabilities: ` + JSON.stringify(sessionCaps, null, 2));
|
|
42
41
|
const response = (await this.jwproxy.command('/session', 'POST', sessionCaps));
|
|
43
42
|
this.log.prefix = generateLogPrefix(this, this.jwproxy.sessionId);
|
|
44
43
|
changeState.call(this, CHROMEDRIVER_STATES.ONLINE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../lib/commands/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../lib/commands/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import type { EventEmitter } from 'node:events';
|
|
1
2
|
import { PROTOCOLS, type JWProxy } from '@appium/base-driver';
|
|
2
|
-
import type * as TeenProcess from 'teen_process';
|
|
3
|
-
import type { ADB } from 'appium-adb';
|
|
4
3
|
import type { AppiumLogger } from '@appium/types';
|
|
5
|
-
import type {
|
|
4
|
+
import type { ADB } from 'appium-adb';
|
|
5
|
+
import type * as TeenProcess from 'teen_process';
|
|
6
6
|
import type { ChromedriverStorageClient } from '../storage-client/storage-client.js';
|
|
7
|
-
import type {
|
|
7
|
+
import type { ChromedriverOpts } from '../types.js';
|
|
8
8
|
export interface ChromedriverCommandContext extends EventEmitter {
|
|
9
9
|
state: string;
|
|
10
10
|
proxyPort: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/commands/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/commands/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAI9C,OAAO,EAAC,SAAS,EAAE,KAAK,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,KAAK,WAAW,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,qCAAqC,CAAC;AACnF,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAElD,MAAM,WAAW,0BAA2B,SAAQ,YAAY;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACtC,aAAa,EAAE,yBAAyB,GAAG,IAAI,CAAC;IAChD,SAAS,EAAE,OAAO,WAAW,CAAC,IAAI,CAAC;IACnC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAC1C,gBAAgB,EAAE,MAAM,OAAO,SAAS,GAAG,IAAI,CAAC;IAChD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,YAAY,CAAC;IAClB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../lib/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../lib/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAO3D;;GAEG;AACH,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,0BAA0B,GAC/B,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,CAwB/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../lib/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../lib/commands/version.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,QAAQ,CAAC;AAC5C,eAAO,MAAM,cAAc,QAGoB,CAAC;AAChD,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,QAAQ,CAAC;AAC5C,eAAO,MAAM,cAAc,QAGoB,CAAC;AAChD,eAAO,MAAM,UAAU,WAAW,CAAC;AACnC,eAAO,MAAM,cAAc,QACkF,CAAC;AAC9G,eAAO,MAAM,EAAE;;;;CAIL,CAAC;AACX,eAAO,MAAM,IAAI;;;CAGP,CAAC;AACX,eAAO,MAAM,GAAG;;;CAGN,CAAC;AACX,eAAO,MAAM,kBAAkB,8BAA+B,CAAC;AAE/D,eAAO,MAAM,mBAAmB;;;CAGtB,CAAC;AAEX,eAAO,MAAM,mBAAmB;;;;;;CAMtB,CAAC"}
|
package/build/lib/constants.js
CHANGED
|
@@ -3,9 +3,7 @@ export const GOOGLEAPIS_CDN = process.env.npm_config_chromedriver_cdnurl ||
|
|
|
3
3
|
process.env.CHROMEDRIVER_CDNURL ||
|
|
4
4
|
'https://chromedriver.storage.googleapis.com';
|
|
5
5
|
export const USER_AGENT = 'appium';
|
|
6
|
-
export const CHROMELABS_URL = process.env.npm_config_chromelabs_url ||
|
|
7
|
-
process.env.CHROMELABS_URL ||
|
|
8
|
-
'https://googlechromelabs.github.io';
|
|
6
|
+
export const CHROMELABS_URL = process.env.npm_config_chromelabs_url || process.env.CHROMELABS_URL || 'https://googlechromelabs.github.io';
|
|
9
7
|
export const OS = {
|
|
10
8
|
LINUX: 'linux',
|
|
11
9
|
WINDOWS: 'win',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAC5C,MAAM,CAAC,MAAM,cAAc,GACzB,OAAO,CAAC,GAAG,CAAC,8BAA8B;IAC1C,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAC/B,6CAA6C,CAAC;AAChD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;AACnC,MAAM,CAAC,MAAM,cAAc,GACzB,OAAO,CAAC,GAAG,CAAC,yBAAyB
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../lib/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAC5C,MAAM,CAAC,MAAM,cAAc,GACzB,OAAO,CAAC,GAAG,CAAC,8BAA8B;IAC1C,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAC/B,6CAA6C,CAAC;AAChD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;AACnC,MAAM,CAAC,MAAM,cAAc,GACzB,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,oCAAoC,CAAC;AAC9G,MAAM,CAAC,MAAM,EAAE,GAAG;IAChB,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,KAAK;IACd,GAAG,EAAE,KAAK;CACF,CAAC;AACX,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,GAAG,EAAE,IAAI;IACT,GAAG,EAAE,IAAI;CACD,CAAC;AACX,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACF,CAAC;AACX,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAU,CAAC;AAE/D,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,KAAK,EAAE,oBAAoB;IAC3B,OAAO,EAAE,cAAc;CACf,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromelabs.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/chromelabs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chromelabs.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/chromelabs.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,aAAa,CAAC;AA+B5D;;;;;;;;GAQG;AACH,wBAAgB,uCAAuC,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B,CAqFnG;AAED;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAwBxE"}
|
|
@@ -18,7 +18,9 @@ export function parseKnownGoodVersionsWithDownloadsJson(jsonStr) {
|
|
|
18
18
|
json = JSON.parse(jsonStr);
|
|
19
19
|
}
|
|
20
20
|
catch (e) {
|
|
21
|
-
throw new Error(`Storage JSON cannot be parsed. Original error: ${e instanceof Error ? e.message : String(e)}`, {
|
|
21
|
+
throw new Error(`Storage JSON cannot be parsed. Original error: ${e instanceof Error ? e.message : String(e)}`, {
|
|
22
|
+
cause: e,
|
|
23
|
+
});
|
|
22
24
|
}
|
|
23
25
|
/**
|
|
24
26
|
* Example output:
|
|
@@ -79,8 +81,7 @@ export function parseKnownGoodVersionsWithDownloadsJson(jsonStr) {
|
|
|
79
81
|
log.debug(`The entry '${downloadEntry.url}' does not contain valid platform name. Skipping it`);
|
|
80
82
|
continue;
|
|
81
83
|
}
|
|
82
|
-
const key = `${path.basename(path.dirname(path.dirname(downloadEntry.url)))}/` +
|
|
83
|
-
`${path.basename(downloadEntry.url)}`;
|
|
84
|
+
const key = `${path.basename(path.dirname(path.dirname(downloadEntry.url)))}/` + `${path.basename(downloadEntry.url)}`;
|
|
84
85
|
mapping[key] = {
|
|
85
86
|
url: downloadEntry.url,
|
|
86
87
|
etag: null,
|
|
@@ -112,7 +113,9 @@ export function parseLatestKnownGoodVersionsJson(jsonStr) {
|
|
|
112
113
|
json = JSON.parse(jsonStr);
|
|
113
114
|
}
|
|
114
115
|
catch (e) {
|
|
115
|
-
throw new Error(`Storage JSON cannot be parsed. Original error: ${e instanceof Error ? e.message : String(e)}`, {
|
|
116
|
+
throw new Error(`Storage JSON cannot be parsed. Original error: ${e instanceof Error ? e.message : String(e)}`, {
|
|
117
|
+
cause: e,
|
|
118
|
+
});
|
|
116
119
|
}
|
|
117
120
|
/**
|
|
118
121
|
* Example output:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromelabs.js","sourceRoot":"","sources":["../../../lib/storage-client/chromelabs.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"chromelabs.js","sourceRoot":"","sources":["../../../lib/storage-client/chromelabs.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAC,IAAI,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AA8B1C,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,qCAAqC,CAAC,CAAC;AAEpE;;;;;;;;GAQG;AACH,MAAM,UAAU,uCAAuC,CAAC,OAAe;IACrE,IAAI,IAA2B,CAAC;IAChC,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9G,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCG;IACH,MAAM,OAAO,GAA+B,EAAE,CAAC;IAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IACD,KAAK,MAAM,EAAC,OAAO,EAAE,SAAS,EAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,CAAC;YAC5C,SAAS;QACX,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,SAAS;QACX,CAAC;QACD,KAAK,MAAM,aAAa,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YACnD,IAAI,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,CAAC;gBACpD,SAAS;YACX,CAAC;YACD,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,GAAG,CAAC,KAAK,CAAC,cAAc,aAAa,CAAC,GAAG,qDAAqD,CAAC,CAAC;gBAChG,SAAS;YACX,CAAC;YACD,MAAM,GAAG,GACP,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7G,OAAO,CAAC,GAAG,CAAC,GAAG;gBACb,GAAG,EAAE,aAAa,CAAC,GAAG;gBACtB,IAAI,EAAE,IAAI;gBACV,OAAO;gBACP,iBAAiB,EAAE,GAAG,UAAU,CAAC,KAAK,EAAE;gBACxC,EAAE,EAAE;oBACF,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;oBACpB,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG;oBACrE,GAAG,EAAE,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK;iBACpE;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,8CAA8C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IACtF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gCAAgC,CAAC,OAAe;IAC9D,IAAI,IAAiC,CAAC;IACtC,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9G,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IACD;;;;;;;;;OASG;IACH,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QACrC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;AACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleapis.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"googleapis.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,uBAAuB,EAAuB,0BAA0B,EAAC,MAAM,aAAa,CAAC;AAM1G;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,IAAI,GAAG,IAAI,EACnB,SAAS,GAAE,MAAM,GAAG,IAAW,EAC/B,IAAI,GAAE,MAAM,GAAG,IAAW,GACzB,IAAI,GAAG,IAAI,GAAG,IAAI,CA2BpB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,uBAAuB,CAWnE;AAED;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,GACtB,OAAO,CAAC,0BAA0B,CAAC,CA2ErC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path from 'node:path';
|
|
2
2
|
import { util, logger } from '@appium/support';
|
|
3
|
-
import { retrieveData } from '../utils.js';
|
|
4
|
-
import { asyncmap } from 'asyncbox';
|
|
5
|
-
import { STORAGE_REQ_TIMEOUT_MS, GOOGLEAPIS_CDN, ARCH, CPU, APPLE_ARM_SUFFIXES, } from '../constants.js';
|
|
6
3
|
import { DOMParser } from '@xmldom/xmldom';
|
|
7
|
-
import
|
|
4
|
+
import { asyncmap } from 'asyncbox';
|
|
5
|
+
import { select as xpathSelect } from 'xpath';
|
|
6
|
+
import { STORAGE_REQ_TIMEOUT_MS, GOOGLEAPIS_CDN, ARCH, CPU, APPLE_ARM_SUFFIXES } from '../constants.js';
|
|
7
|
+
import { retrieveData } from '../utils.js';
|
|
8
8
|
const log = logger.getLogger('ChromedriverGoogleapisStorageClient');
|
|
9
9
|
const MAX_PARALLEL_DOWNLOADS = 5;
|
|
10
10
|
/**
|
|
@@ -151,15 +151,12 @@ async function retrieveAdditionalDriverInfo(driverKey, notesUrl, infoDict, timeo
|
|
|
151
151
|
}, { timeout });
|
|
152
152
|
const { minBrowserVersion } = parseNotes(notes);
|
|
153
153
|
if (!minBrowserVersion) {
|
|
154
|
-
log.debug(`The driver '${driverKey}' does not contain valid release notes at ${notesUrl}. `
|
|
155
|
-
`Skipping it`);
|
|
154
|
+
log.debug(`The driver '${driverKey}' does not contain valid release notes at ${notesUrl}. Skipping it`);
|
|
156
155
|
return;
|
|
157
156
|
}
|
|
158
157
|
infoDict.minBrowserVersion = minBrowserVersion;
|
|
159
158
|
}
|
|
160
159
|
function extractNodeText(node) {
|
|
161
|
-
return !node?.firstChild || !util.hasValue(node.firstChild.nodeValue)
|
|
162
|
-
? null
|
|
163
|
-
: node.firstChild.nodeValue;
|
|
160
|
+
return !node?.firstChild || !util.hasValue(node.firstChild.nodeValue) ? null : node.firstChild.nodeValue;
|
|
164
161
|
}
|
|
165
162
|
//# sourceMappingURL=googleapis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleapis.js","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
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":"AAQA,OAAO,KAAK,EAAC,6BAA6B,EAAE,WAAW,EAAU,0BAA0B,EAAC,MAAM,aAAa,CAAC;AA2BhH,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;IAuCnF;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAwC5D;;;;;OAKG;IACG,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC;IAuBlD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;IAqH7B;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;;;;;;;;;;;;;OAcG;YACW,cAAc;IAgD5B;;;;;;OAMG;YACW,WAAW;CAoB1B"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { getChromedriverDir, retrieveData, getOsInfo, convertToInt, getCpuType } from '../utils.js';
|
|
2
1
|
import path from 'node:path';
|
|
3
|
-
import { asyncmap } from 'asyncbox';
|
|
4
2
|
import { system, fs, logger, tempDir, zip, util, net } from '@appium/support';
|
|
5
|
-
import {
|
|
6
|
-
import { parseGoogleapiStorageXml } from './googleapis.js';
|
|
7
|
-
import { parseKnownGoodVersionsWithDownloadsJson, parseLatestKnownGoodVersionsJson, } from './chromelabs.js';
|
|
3
|
+
import { asyncmap } from 'asyncbox';
|
|
8
4
|
import { compareVersions } from 'compare-versions';
|
|
9
5
|
import * as semver from 'semver';
|
|
6
|
+
import { STORAGE_REQ_TIMEOUT_MS, GOOGLEAPIS_CDN, USER_AGENT, CHROMELABS_URL, ARCH, OS, CPU } from '../constants.js';
|
|
7
|
+
import { getChromedriverDir, retrieveData, getOsInfo, convertToInt, getCpuType } from '../utils.js';
|
|
8
|
+
import { parseKnownGoodVersionsWithDownloadsJson, parseLatestKnownGoodVersionsJson } from './chromelabs.js';
|
|
9
|
+
import { parseGoogleapiStorageXml } from './googleapis.js';
|
|
10
10
|
const MAX_PARALLEL_DOWNLOADS = 5;
|
|
11
11
|
const STORAGE_INFOS = [
|
|
12
12
|
{
|
|
@@ -39,7 +39,7 @@ export class ChromedriverStorageClient {
|
|
|
39
39
|
* @returns Promise<ChromedriverDetailsMapping>
|
|
40
40
|
*/
|
|
41
41
|
async retrieveMapping(shouldParseNotes = true) {
|
|
42
|
-
const retrieveResponseSafely = async ({ url, accept
|
|
42
|
+
const retrieveResponseSafely = async ({ url, accept }) => {
|
|
43
43
|
try {
|
|
44
44
|
return await retrieveData(url, {
|
|
45
45
|
'user-agent': USER_AGENT,
|
|
@@ -88,8 +88,7 @@ export class ChromedriverStorageClient {
|
|
|
88
88
|
log.debug(`There are no drivers to sync. Exiting`);
|
|
89
89
|
return [];
|
|
90
90
|
}
|
|
91
|
-
log.debug(`Got ${util.pluralize('driver', driversToSync.length, true)} to sync: ` +
|
|
92
|
-
JSON.stringify(driversToSync, null, 2));
|
|
91
|
+
log.debug(`Got ${util.pluralize('driver', driversToSync.length, true)} to sync: ` + JSON.stringify(driversToSync, null, 2));
|
|
93
92
|
const synchronizedDrivers = [];
|
|
94
93
|
const archivesRoot = await tempDir.openDir();
|
|
95
94
|
try {
|
|
@@ -103,8 +102,7 @@ export class ChromedriverStorageClient {
|
|
|
103
102
|
await fs.rimraf(archivesRoot);
|
|
104
103
|
}
|
|
105
104
|
if (!util.isEmpty(synchronizedDrivers)) {
|
|
106
|
-
log.info(`Successfully synchronized ` +
|
|
107
|
-
`${util.pluralize('chromedriver', synchronizedDrivers.length, true)}`);
|
|
105
|
+
log.info(`Successfully synchronized ` + `${util.pluralize('chromedriver', synchronizedDrivers.length, true)}`);
|
|
108
106
|
}
|
|
109
107
|
else {
|
|
110
108
|
log.info(`No chromedrivers were synchronized`);
|