appium-chromedriver 8.4.21 → 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 +16 -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/config/mapping.json +1 -0
- 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
|
@@ -1,19 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const xpath_1 = require("xpath");
|
|
10
|
-
const support_1 = require("@appium/support");
|
|
11
|
-
const utils_1 = require("../utils");
|
|
12
|
-
const asyncbox_1 = require("asyncbox");
|
|
13
|
-
const constants_1 = require("../constants");
|
|
14
|
-
const xmldom_1 = require("@xmldom/xmldom");
|
|
15
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
16
|
-
const log = support_1.logger.getLogger('ChromedriverGoogleapisStorageClient');
|
|
1
|
+
import { select as xpathSelect } from 'xpath';
|
|
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
|
+
import { DOMParser } from '@xmldom/xmldom';
|
|
7
|
+
import path from 'node:path';
|
|
8
|
+
const log = logger.getLogger('ChromedriverGoogleapisStorageClient');
|
|
17
9
|
const MAX_PARALLEL_DOWNLOADS = 5;
|
|
18
10
|
/**
|
|
19
11
|
* Finds a child node in an XML node by name and/or text content
|
|
@@ -23,7 +15,7 @@ const MAX_PARALLEL_DOWNLOADS = 5;
|
|
|
23
15
|
* @param text - Optional text content to match
|
|
24
16
|
* @returns The matching child node or null if not found
|
|
25
17
|
*/
|
|
26
|
-
function findChildNode(parent, childName = null, text = null) {
|
|
18
|
+
export function findChildNode(parent, childName = null, text = null) {
|
|
27
19
|
if (!childName && !text) {
|
|
28
20
|
return null;
|
|
29
21
|
}
|
|
@@ -57,7 +49,7 @@ function findChildNode(parent, childName = null, text = null) {
|
|
|
57
49
|
* @param content - Release notes of the corresponding chromedriver
|
|
58
50
|
* @returns AdditionalDriverDetails
|
|
59
51
|
*/
|
|
60
|
-
function parseNotes(content) {
|
|
52
|
+
export function parseNotes(content) {
|
|
61
53
|
const result = {};
|
|
62
54
|
const versionMatch = /^\s*[-]+ChromeDriver[\D]+([\d.]+)/im.exec(content);
|
|
63
55
|
if (versionMatch) {
|
|
@@ -79,9 +71,9 @@ function parseNotes(content) {
|
|
|
79
71
|
* and assigned to `this.mapping`
|
|
80
72
|
* @returns Promise<ChromedriverDetailsMapping>
|
|
81
73
|
*/
|
|
82
|
-
async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
83
|
-
const doc = new
|
|
84
|
-
const driverNodes = (
|
|
74
|
+
export async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
75
|
+
const doc = new DOMParser().parseFromString(xml, 'text/xml');
|
|
76
|
+
const driverNodes = xpathSelect(`//*[local-name(.)='Contents']`, doc);
|
|
85
77
|
log.debug(`Parsed ${driverNodes.length} entries from storage XML`);
|
|
86
78
|
if (driverNodes.length === 0) {
|
|
87
79
|
throw new Error('Cannot retrieve any valid Chromedriver entries from the storage config');
|
|
@@ -103,21 +95,21 @@ async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
|
103
95
|
log.debug(`The entry '${key}' does not contain the checksum. Skipping it`);
|
|
104
96
|
continue;
|
|
105
97
|
}
|
|
106
|
-
const filename =
|
|
98
|
+
const filename = path.basename(key);
|
|
107
99
|
const osNameMatch = /_([a-z]+)/i.exec(filename);
|
|
108
100
|
if (!osNameMatch) {
|
|
109
101
|
log.debug(`The entry '${key}' does not contain valid OS name. Skipping it`);
|
|
110
102
|
continue;
|
|
111
103
|
}
|
|
112
104
|
const cdInfo = {
|
|
113
|
-
url: `${
|
|
105
|
+
url: `${GOOGLEAPIS_CDN}/${key}`,
|
|
114
106
|
etag: etag.replace(/^"+|"+$/g, ''),
|
|
115
107
|
version: versionSegment,
|
|
116
108
|
minBrowserVersion: null,
|
|
117
109
|
os: {
|
|
118
110
|
name: osNameMatch[1],
|
|
119
|
-
arch: filename.includes(
|
|
120
|
-
cpu:
|
|
111
|
+
arch: filename.includes(ARCH.X64) ? ARCH.X64 : ARCH.X86,
|
|
112
|
+
cpu: APPLE_ARM_SUFFIXES.some((suffix) => filename.includes(suffix)) ? CPU.ARM : CPU.INTEL,
|
|
121
113
|
},
|
|
122
114
|
};
|
|
123
115
|
mapping[key] = cdInfo;
|
|
@@ -134,10 +126,10 @@ async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
|
134
126
|
continue;
|
|
135
127
|
}
|
|
136
128
|
infoParsers.push(async () => {
|
|
137
|
-
await retrieveAdditionalDriverInfo(key, `${
|
|
129
|
+
await retrieveAdditionalDriverInfo(key, `${GOOGLEAPIS_CDN}/${notesPath}`, cdInfo);
|
|
138
130
|
});
|
|
139
131
|
}
|
|
140
|
-
await
|
|
132
|
+
await asyncmap(infoParsers, async (parseInfo) => {
|
|
141
133
|
await parseInfo();
|
|
142
134
|
}, { concurrency: MAX_PARALLEL_DOWNLOADS });
|
|
143
135
|
log.info(`The total count of entries in the mapping: ${Object.keys(mapping).length}`);
|
|
@@ -152,8 +144,8 @@ async function parseGoogleapiStorageXml(xml, shouldParseNotes = true) {
|
|
|
152
144
|
* @param infoDict - The dictionary containing driver info (will be mutated)
|
|
153
145
|
* @param timeout - Request timeout in milliseconds
|
|
154
146
|
*/
|
|
155
|
-
async function retrieveAdditionalDriverInfo(driverKey, notesUrl, infoDict, timeout =
|
|
156
|
-
const notes = await
|
|
147
|
+
async function retrieveAdditionalDriverInfo(driverKey, notesUrl, infoDict, timeout = STORAGE_REQ_TIMEOUT_MS) {
|
|
148
|
+
const notes = await retrieveData(notesUrl, {
|
|
157
149
|
'user-agent': 'appium',
|
|
158
150
|
accept: '*/*',
|
|
159
151
|
}, { timeout });
|
|
@@ -166,7 +158,7 @@ async function retrieveAdditionalDriverInfo(driverKey, notesUrl, infoDict, timeo
|
|
|
166
158
|
infoDict.minBrowserVersion = minBrowserVersion;
|
|
167
159
|
}
|
|
168
160
|
function extractNodeText(node) {
|
|
169
|
-
return !node?.firstChild || !
|
|
161
|
+
return !node?.firstChild || !util.hasValue(node.firstChild.nodeValue)
|
|
170
162
|
? null
|
|
171
163
|
: node.firstChild.nodeValue;
|
|
172
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"googleapis.js","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"googleapis.js","sourceRoot":"","sources":["../../../lib/storage-client/googleapis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ChromedriverStorageClientOpts, SyncOptions, ChromedriverDetailsMapping } from '../types';
|
|
1
|
+
import type { ChromedriverStorageClientOpts, SyncOptions, ChromedriverDetailsMapping } from '../types.js';
|
|
2
2
|
export declare class ChromedriverStorageClient {
|
|
3
3
|
readonly chromedriverDir: string;
|
|
4
4
|
readonly timeout: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-client.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,6BAA6B,EAC7B,WAAW,EAEX,0BAA0B,EAC3B,MAAM,
|
|
1
|
+
{"version":3,"file":"storage-client.d.ts","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EACV,6BAA6B,EAC7B,WAAW,EAEX,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AAwBrB,qBAAa,yBAAyB;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,OAAO,CAA6B;gBAEhC,IAAI,GAAE,6BAAkC;IAOpD;;;;;;;OAOG;IACG,eAAe,CAAC,gBAAgB,UAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA0CnF;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA4C5D;;;;;OAKG;IACG,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC;IAuBlD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;IA8H7B;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;;;;;;;;;;;;;OAcG;YACW,cAAc;IAgD5B;;;;;;OAMG;YACW,WAAW;CAuB1B"}
|
|
@@ -1,70 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
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.ChromedriverStorageClient = void 0;
|
|
40
|
-
const utils_1 = require("../utils");
|
|
41
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
42
|
-
const asyncbox_1 = require("asyncbox");
|
|
43
|
-
const support_1 = require("@appium/support");
|
|
44
|
-
const constants_1 = require("../constants");
|
|
45
|
-
const googleapis_1 = require("./googleapis");
|
|
46
|
-
const chromelabs_1 = require("./chromelabs");
|
|
47
|
-
const compare_versions_1 = require("compare-versions");
|
|
48
|
-
const semver = __importStar(require("semver"));
|
|
1
|
+
import { getChromedriverDir, retrieveData, getOsInfo, convertToInt, getCpuType } from '../utils.js';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { asyncmap } from 'asyncbox';
|
|
4
|
+
import { system, fs, logger, tempDir, zip, util, net } from '@appium/support';
|
|
5
|
+
import { STORAGE_REQ_TIMEOUT_MS, GOOGLEAPIS_CDN, USER_AGENT, CHROMELABS_URL, ARCH, OS, CPU, } from '../constants.js';
|
|
6
|
+
import { parseGoogleapiStorageXml } from './googleapis.js';
|
|
7
|
+
import { parseKnownGoodVersionsWithDownloadsJson, parseLatestKnownGoodVersionsJson, } from './chromelabs.js';
|
|
8
|
+
import { compareVersions } from 'compare-versions';
|
|
9
|
+
import * as semver from 'semver';
|
|
49
10
|
const MAX_PARALLEL_DOWNLOADS = 5;
|
|
50
11
|
const STORAGE_INFOS = [
|
|
51
12
|
{
|
|
52
|
-
url:
|
|
13
|
+
url: GOOGLEAPIS_CDN,
|
|
53
14
|
accept: 'application/xml',
|
|
54
15
|
},
|
|
55
16
|
{
|
|
56
|
-
url: `${
|
|
17
|
+
url: `${CHROMELABS_URL}/chrome-for-testing/known-good-versions-with-downloads.json`,
|
|
57
18
|
accept: 'application/json',
|
|
58
19
|
},
|
|
59
20
|
];
|
|
60
|
-
const CHROME_FOR_TESTING_LAST_GOOD_VERSIONS = `${
|
|
61
|
-
const log =
|
|
62
|
-
class ChromedriverStorageClient {
|
|
21
|
+
const CHROME_FOR_TESTING_LAST_GOOD_VERSIONS = `${CHROMELABS_URL}/chrome-for-testing/last-known-good-versions.json`;
|
|
22
|
+
const log = logger.getLogger('ChromedriverStorageClient');
|
|
23
|
+
export class ChromedriverStorageClient {
|
|
63
24
|
chromedriverDir;
|
|
64
25
|
timeout;
|
|
65
26
|
mapping;
|
|
66
27
|
constructor(args = {}) {
|
|
67
|
-
const { chromedriverDir =
|
|
28
|
+
const { chromedriverDir = getChromedriverDir(), timeout = STORAGE_REQ_TIMEOUT_MS } = args;
|
|
68
29
|
this.chromedriverDir = chromedriverDir;
|
|
69
30
|
this.timeout = timeout;
|
|
70
31
|
this.mapping = {};
|
|
@@ -80,8 +41,8 @@ class ChromedriverStorageClient {
|
|
|
80
41
|
async retrieveMapping(shouldParseNotes = true) {
|
|
81
42
|
const retrieveResponseSafely = async ({ url, accept, }) => {
|
|
82
43
|
try {
|
|
83
|
-
return await
|
|
84
|
-
'user-agent':
|
|
44
|
+
return await retrieveData(url, {
|
|
45
|
+
'user-agent': USER_AGENT,
|
|
85
46
|
accept: `${accept}, */*`,
|
|
86
47
|
}, { timeout: this.timeout });
|
|
87
48
|
}
|
|
@@ -102,9 +63,9 @@ class ChromedriverStorageClient {
|
|
|
102
63
|
`within your local network, check Appium server logs and/or ` +
|
|
103
64
|
`consult the driver troubleshooting guide.`);
|
|
104
65
|
}
|
|
105
|
-
this.mapping = xmlStr ? await
|
|
66
|
+
this.mapping = xmlStr ? await parseGoogleapiStorageXml(xmlStr, shouldParseNotes) : {};
|
|
106
67
|
if (jsonStr) {
|
|
107
|
-
Object.assign(this.mapping,
|
|
68
|
+
Object.assign(this.mapping, parseKnownGoodVersionsWithDownloadsJson(jsonStr));
|
|
108
69
|
}
|
|
109
70
|
return this.mapping;
|
|
110
71
|
}
|
|
@@ -116,34 +77,34 @@ class ChromedriverStorageClient {
|
|
|
116
77
|
* @returns The list of successfully synchronized driver keys
|
|
117
78
|
*/
|
|
118
79
|
async syncDrivers(opts = {}) {
|
|
119
|
-
if (
|
|
80
|
+
if (util.isEmpty(this.mapping)) {
|
|
120
81
|
await this.retrieveMapping(!!opts.minBrowserVersion);
|
|
121
82
|
}
|
|
122
|
-
if (
|
|
83
|
+
if (util.isEmpty(this.mapping)) {
|
|
123
84
|
throw new Error('Cannot retrieve chromedrivers mapping from Google storage');
|
|
124
85
|
}
|
|
125
|
-
const driversToSync = this.selectMatchingDrivers(opts.osInfo ?? (await
|
|
126
|
-
if (
|
|
86
|
+
const driversToSync = this.selectMatchingDrivers(opts.osInfo ?? (await getOsInfo()), opts);
|
|
87
|
+
if (util.isEmpty(driversToSync)) {
|
|
127
88
|
log.debug(`There are no drivers to sync. Exiting`);
|
|
128
89
|
return [];
|
|
129
90
|
}
|
|
130
|
-
log.debug(`Got ${
|
|
91
|
+
log.debug(`Got ${util.pluralize('driver', driversToSync.length, true)} to sync: ` +
|
|
131
92
|
JSON.stringify(driversToSync, null, 2));
|
|
132
93
|
const synchronizedDrivers = [];
|
|
133
|
-
const archivesRoot = await
|
|
94
|
+
const archivesRoot = await tempDir.openDir();
|
|
134
95
|
try {
|
|
135
|
-
await
|
|
136
|
-
if (await this.retrieveDriver(idx, driverKey, archivesRoot, !
|
|
96
|
+
await asyncmap([...driversToSync.entries()], async ([idx, driverKey]) => {
|
|
97
|
+
if (await this.retrieveDriver(idx, driverKey, archivesRoot, !util.isEmpty(opts))) {
|
|
137
98
|
synchronizedDrivers.push(driverKey);
|
|
138
99
|
}
|
|
139
100
|
}, { concurrency: MAX_PARALLEL_DOWNLOADS });
|
|
140
101
|
}
|
|
141
102
|
finally {
|
|
142
|
-
await
|
|
103
|
+
await fs.rimraf(archivesRoot);
|
|
143
104
|
}
|
|
144
|
-
if (!
|
|
105
|
+
if (!util.isEmpty(synchronizedDrivers)) {
|
|
145
106
|
log.info(`Successfully synchronized ` +
|
|
146
|
-
`${
|
|
107
|
+
`${util.pluralize('chromedriver', synchronizedDrivers.length, true)}`);
|
|
147
108
|
}
|
|
148
109
|
else {
|
|
149
110
|
log.info(`No chromedrivers were synchronized`);
|
|
@@ -159,10 +120,10 @@ class ChromedriverStorageClient {
|
|
|
159
120
|
async getLatestKnownGoodVersion() {
|
|
160
121
|
let jsonStr;
|
|
161
122
|
try {
|
|
162
|
-
jsonStr = await
|
|
163
|
-
'user-agent':
|
|
123
|
+
jsonStr = await retrieveData(CHROME_FOR_TESTING_LAST_GOOD_VERSIONS, {
|
|
124
|
+
'user-agent': USER_AGENT,
|
|
164
125
|
accept: `application/json, */*`,
|
|
165
|
-
}, { timeout:
|
|
126
|
+
}, { timeout: STORAGE_REQ_TIMEOUT_MS });
|
|
166
127
|
}
|
|
167
128
|
catch (e) {
|
|
168
129
|
const detail = e instanceof Error ? e.message : String(e);
|
|
@@ -170,7 +131,7 @@ class ChromedriverStorageClient {
|
|
|
170
131
|
`Make sure you can access ${CHROME_FOR_TESTING_LAST_GOOD_VERSIONS} from your machine or provide a mirror by setting ` +
|
|
171
132
|
`a custom value to CHROMELABS_URL environment variable. Original error: ${detail}`, { cause: e });
|
|
172
133
|
}
|
|
173
|
-
return
|
|
134
|
+
return parseLatestKnownGoodVersionsJson(jsonStr);
|
|
174
135
|
}
|
|
175
136
|
/**
|
|
176
137
|
* Filters `this.mapping` to only select matching chromedriver entries
|
|
@@ -183,16 +144,16 @@ class ChromedriverStorageClient {
|
|
|
183
144
|
selectMatchingDrivers(osInfo, opts = {}) {
|
|
184
145
|
const { minBrowserVersion, versions = [] } = opts;
|
|
185
146
|
let driversToSync = Object.keys(this.mapping);
|
|
186
|
-
if (!
|
|
147
|
+
if (!util.isEmpty(versions)) {
|
|
187
148
|
// Handle only selected versions if requested
|
|
188
149
|
log.debug(`Selecting chromedrivers whose versions match to ${versions}`);
|
|
189
150
|
driversToSync = driversToSync.filter((cdName) => versions.includes(`${this.mapping[cdName].version}`));
|
|
190
|
-
log.debug(`Got ${
|
|
191
|
-
if (
|
|
151
|
+
log.debug(`Got ${util.pluralize('item', driversToSync.length, true)}`);
|
|
152
|
+
if (util.isEmpty(driversToSync)) {
|
|
192
153
|
return [];
|
|
193
154
|
}
|
|
194
155
|
}
|
|
195
|
-
const minBrowserVersionInt =
|
|
156
|
+
const minBrowserVersionInt = convertToInt(minBrowserVersion);
|
|
196
157
|
if (minBrowserVersionInt !== null) {
|
|
197
158
|
// Only select drivers that support the current browser whose major version number equals to `minBrowserVersion`
|
|
198
159
|
log.debug(`Selecting chromedrivers whose minimum supported browser version matches to ${minBrowserVersionInt}`);
|
|
@@ -208,39 +169,39 @@ class ChromedriverStorageClient {
|
|
|
208
169
|
}
|
|
209
170
|
driversToSync = driversToSync.filter((cdName) => `${this.mapping[cdName].minBrowserVersion}` ===
|
|
210
171
|
`${closestMatchedVersionNumber > 0 ? closestMatchedVersionNumber : minBrowserVersionInt}`);
|
|
211
|
-
log.debug(`Got ${
|
|
212
|
-
if (
|
|
172
|
+
log.debug(`Got ${util.pluralize('item', driversToSync.length, true)}`);
|
|
173
|
+
if (util.isEmpty(driversToSync)) {
|
|
213
174
|
return [];
|
|
214
175
|
}
|
|
215
|
-
log.debug(`Will select candidate ${
|
|
216
|
-
`versioned as '${
|
|
176
|
+
log.debug(`Will select candidate ${util.pluralize('driver', driversToSync.length)} ` +
|
|
177
|
+
`versioned as '${util.uniq(driversToSync.map((cdName) => this.mapping[cdName].version))}'`);
|
|
217
178
|
}
|
|
218
|
-
if (!
|
|
179
|
+
if (!util.isEmpty(osInfo)) {
|
|
219
180
|
// Filter out drivers for unsupported system architectures
|
|
220
|
-
const { name, arch, cpu =
|
|
181
|
+
const { name, arch, cpu = getCpuType() } = osInfo;
|
|
221
182
|
log.debug(`Selecting chromedrivers whose platform matches to ${name}:${cpu}${arch}`);
|
|
222
183
|
let result = driversToSync.filter((cdName) => this.doesMatchForOsInfo(cdName, osInfo));
|
|
223
|
-
if (
|
|
184
|
+
if (util.isEmpty(result) && arch === ARCH.X64 && cpu === CPU.INTEL) {
|
|
224
185
|
// Fallback to X86 if X64 architecture is not available for this driver
|
|
225
186
|
result = driversToSync.filter((cdName) => this.doesMatchForOsInfo(cdName, {
|
|
226
187
|
name,
|
|
227
|
-
arch:
|
|
188
|
+
arch: ARCH.X86,
|
|
228
189
|
cpu,
|
|
229
190
|
}));
|
|
230
191
|
}
|
|
231
|
-
if (
|
|
192
|
+
if (util.isEmpty(result) && (name === OS.MAC || name === OS.WINDOWS) && cpu === CPU.ARM) {
|
|
232
193
|
// Fallback to Intel (Rosetta on macOS, x64 emulation on Windows ARM):
|
|
233
194
|
// https://github.com/appium/appium-chromedriver/issues/562
|
|
234
195
|
result = driversToSync.filter((cdName) => this.doesMatchForOsInfo(cdName, {
|
|
235
196
|
name,
|
|
236
197
|
arch,
|
|
237
|
-
cpu:
|
|
198
|
+
cpu: CPU.INTEL,
|
|
238
199
|
}));
|
|
239
200
|
}
|
|
240
201
|
driversToSync = result;
|
|
241
|
-
log.debug(`Got ${
|
|
202
|
+
log.debug(`Got ${util.pluralize('item', driversToSync.length, true)}`);
|
|
242
203
|
}
|
|
243
|
-
if (!
|
|
204
|
+
if (!util.isEmpty(driversToSync)) {
|
|
244
205
|
log.debug('Excluding older patches if present');
|
|
245
206
|
const patchesMap = {};
|
|
246
207
|
// Older chromedrivers must not be excluded as they follow a different
|
|
@@ -266,9 +227,9 @@ class ChromedriverStorageClient {
|
|
|
266
227
|
if (patchesMap[majorVersion].length <= 1) {
|
|
267
228
|
continue;
|
|
268
229
|
}
|
|
269
|
-
patchesMap[majorVersion].sort((a, b) =>
|
|
230
|
+
patchesMap[majorVersion].sort((a, b) => compareVersions(b, a));
|
|
270
231
|
}
|
|
271
|
-
if (!
|
|
232
|
+
if (!util.isEmpty(patchesMap)) {
|
|
272
233
|
log.debug('Versions mapping: ' + JSON.stringify(patchesMap, null, 2));
|
|
273
234
|
for (const sortedVersions of Object.values(patchesMap)) {
|
|
274
235
|
selectedVersions.add(sortedVersions[0]);
|
|
@@ -315,12 +276,12 @@ class ChromedriverStorageClient {
|
|
|
315
276
|
*/
|
|
316
277
|
async retrieveDriver(index, driverKey, archivesRoot, isStrict = false) {
|
|
317
278
|
const { url, etag, version } = this.mapping[driverKey];
|
|
318
|
-
const archivePath =
|
|
279
|
+
const archivePath = path.resolve(archivesRoot, `${index}.zip`);
|
|
319
280
|
log.debug(`Retrieving '${url}' to '${archivePath}'`);
|
|
320
281
|
try {
|
|
321
|
-
await
|
|
282
|
+
await net.downloadFile(url, archivePath, {
|
|
322
283
|
isMetered: false,
|
|
323
|
-
timeout:
|
|
284
|
+
timeout: STORAGE_REQ_TIMEOUT_MS,
|
|
324
285
|
});
|
|
325
286
|
}
|
|
326
287
|
catch (e) {
|
|
@@ -340,11 +301,11 @@ class ChromedriverStorageClient {
|
|
|
340
301
|
log.error(msg);
|
|
341
302
|
return false;
|
|
342
303
|
}
|
|
343
|
-
const fileName = `${
|
|
344
|
-
const targetPath =
|
|
304
|
+
const fileName = `${path.parse(url).name}_v${version}` + (system.isWindows() ? '.exe' : '');
|
|
305
|
+
const targetPath = path.resolve(this.chromedriverDir, fileName);
|
|
345
306
|
try {
|
|
346
307
|
await this.unzipDriver(archivePath, targetPath);
|
|
347
|
-
await
|
|
308
|
+
await fs.chmod(targetPath, 0o755);
|
|
348
309
|
log.debug(`Permissions of the file '${targetPath}' have been changed to 755`);
|
|
349
310
|
}
|
|
350
311
|
catch (e) {
|
|
@@ -365,26 +326,25 @@ class ChromedriverStorageClient {
|
|
|
365
326
|
* @param dst - The destination chromedriver path
|
|
366
327
|
*/
|
|
367
328
|
async unzipDriver(src, dst) {
|
|
368
|
-
const tmpRoot = await
|
|
329
|
+
const tmpRoot = await tempDir.openDir();
|
|
369
330
|
try {
|
|
370
|
-
await
|
|
371
|
-
const chromedriverPath = await
|
|
331
|
+
await zip.extractAllTo(src, tmpRoot);
|
|
332
|
+
const chromedriverPath = await fs.walkDir(tmpRoot, true, (itemPath, isDirectory) => !isDirectory && path.parse(itemPath).name.toLowerCase() === 'chromedriver');
|
|
372
333
|
if (!chromedriverPath) {
|
|
373
334
|
throw new Error('The archive was unzipped properly, but we could not find any chromedriver executable');
|
|
374
335
|
}
|
|
375
|
-
log.debug(`Moving the extracted '${
|
|
376
|
-
await
|
|
336
|
+
log.debug(`Moving the extracted '${path.basename(chromedriverPath)}' to '${dst}'`);
|
|
337
|
+
await fs.mv(chromedriverPath, dst, {
|
|
377
338
|
mkdirp: true,
|
|
378
339
|
});
|
|
379
340
|
}
|
|
380
341
|
finally {
|
|
381
|
-
await
|
|
342
|
+
await fs.rimraf(tmpRoot);
|
|
382
343
|
}
|
|
383
344
|
}
|
|
384
345
|
}
|
|
385
|
-
exports.ChromedriverStorageClient = ChromedriverStorageClient;
|
|
386
346
|
async function isCrcOk(src, checksum) {
|
|
387
|
-
const md5 = await
|
|
347
|
+
const md5 = await fs.hash(src, 'md5');
|
|
388
348
|
return md5.toLowerCase() === checksum.toLowerCase();
|
|
389
349
|
}
|
|
390
350
|
//# sourceMappingURL=storage-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-client.js","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA+F;AAC/F,0DAA6B;AAC7B,uCAAkC;AAClC,6CAA4E;AAC5E,4CAQsB;AACtB,6CAAsD;AACtD,6CAGsB;AACtB,uDAAiD;AACjD,+CAAiC;AAQjC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAOjC,MAAM,aAAa,GAA2B;IAC5C;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,iBAAiB;KAC1B;IACD;QACE,GAAG,EAAE,GAAG,0BAAc,6DAA6D;QACnF,MAAM,EAAE,kBAAkB;KAC3B;CACF,CAAC;AAEF,MAAM,qCAAqC,GAAG,GAAG,0BAAc,mDAAmD,CAAC;AAEnH,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;AAE1D,MAAa,yBAAyB;IAC3B,eAAe,CAAS;IACxB,OAAO,CAAS;IACjB,OAAO,CAA6B;IAE5C,YAAY,OAAsC,EAAE;QAClD,MAAM,EAAC,eAAe,GAAG,IAAA,0BAAkB,GAAE,EAAE,OAAO,GAAG,kCAAsB,EAAC,GAAG,IAAI,CAAC;QACxF,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,eAAe,CAAC,gBAAgB,GAAG,IAAI;QAC3C,MAAM,sBAAsB,GAAG,KAAK,EAAE,EACpC,GAAG,EACH,MAAM,GACM,EAA+B,EAAE;YAC7C,IAAI,CAAC;gBACH,OAAO,MAAM,IAAA,oBAAY,EACvB,GAAG,EACH;oBACE,YAAY,EAAE,sBAAU;oBACxB,MAAM,EAAE,GAAG,MAAM,OAAO;iBACzB,EACD,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAC,CACxB,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,GAAG,GAAG,CAAU,CAAC;gBACvB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACrB,GAAG,CAAC,IAAI,CACN,2CAA2C,GAAG,IAAI;oBAChD,sDAAsD;oBACtD,mBAAmB,GAAG,CAAC,OAAO,EAAE,CACnC,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QACF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACvF,6FAA6F;QAC7F,2EAA2E;QAC3E,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,qEAAqE;gBACnE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE,CAAC,GAAG,CAAC,8CAA8C;gBAClF,6DAA6D;gBAC7D,2CAA2C,CAC9C,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAA,qCAAwB,EAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAA,oDAAuC,EAAC,OAAO,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,OAAoB,EAAE;QACtC,IAAI,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC/E,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAA,iBAAS,GAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3F,IAAI,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,GAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YACnD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,GAAG,CAAC,KAAK,CACP,OAAO,cAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY;YACrE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CACzC,CAAC;QAEF,MAAM,mBAAmB,GAAa,EAAE,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,iBAAO,CAAC,OAAO,EAAE,CAAC;QAC7C,IAAI,CAAC;YACH,MAAM,IAAA,mBAAQ,EACZ,CAAC,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,EAC5B,KAAK,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE;gBACzB,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;oBACjF,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC,EACD,EAAC,WAAW,EAAE,sBAAsB,EAAC,CACtC,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,MAAM,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACvC,GAAG,CAAC,IAAI,CACN,4BAA4B;gBAC1B,GAAG,cAAI,CAAC,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CACxE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,yBAAyB;QAC7B,IAAI,OAAe,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAA,oBAAY,EAC1B,qCAAqC,EACrC;gBACE,YAAY,EAAE,sBAAU;gBACxB,MAAM,EAAE,uBAAuB;aAChC,EACD,EAAC,OAAO,EAAE,kCAAsB,EAAC,CAClC,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,IAAI,KAAK,CACb,gDAAgD;gBAC9C,4BAA4B,qCAAqC,oDAAoD;gBACrH,0EAA0E,MAAM,EAAE,EACpF,EAAC,KAAK,EAAE,CAAC,EAAC,CACX,CAAC;QACJ,CAAC;QACD,OAAO,IAAA,6CAAgC,EAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;OAOG;IACK,qBAAqB,CAAC,MAAc,EAAE,OAAoB,EAAE;QAClE,MAAM,EAAC,iBAAiB,EAAE,QAAQ,GAAG,EAAE,EAAC,GAAG,IAAI,CAAC;QAChD,IAAI,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,6CAA6C;YAC7C,GAAG,CAAC,KAAK,CAAC,mDAAmD,QAAQ,EAAE,CAAC,CAAC;YACzE,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9C,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CACrD,CAAC;YAEF,GAAG,CAAC,KAAK,CAAC,OAAO,cAAI,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACvE,IAAI,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBAChC,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAA,oBAAY,EAAC,iBAAiB,CAAC,CAAC;QAC7D,IAAI,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAClC,gHAAgH;YAChH,GAAG,CAAC,KAAK,CACP,8EAA8E,oBAAoB,EAAE,CACrG,CAAC;YACF,IAAI,2BAA2B,GAAG,CAAC,CAAC;YACpC,0DAA0D;YAC1D,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;gBACnC,MAAM,wBAAwB,GAAG,QAAQ,CACvC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,EAC9C,EAAE,CACH,CAAC;gBACF,IACE,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC;oBACvC,wBAAwB,IAAI,oBAAoB;oBAChD,2BAA2B,GAAG,wBAAwB,EACtD,CAAC;oBACD,2BAA2B,GAAG,wBAAwB,CAAC;gBACzD,CAAC;YACH,CAAC;YACD,aAAa,GAAG,aAAa,CAAC,MAAM,CAClC,CAAC,MAAM,EAAE,EAAE,CACT,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE;gBAC3C,GAAG,2BAA2B,GAAG,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAC5F,CAAC;YAEF,GAAG,CAAC,KAAK,CAAC,OAAO,cAAI,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACvE,IAAI,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBAChC,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,GAAG,CAAC,KAAK,CACP,yBAAyB,cAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG;gBACxE,iBAAiB,cAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAC7F,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,0DAA0D;YAC1D,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,IAAA,kBAAU,GAAE,EAAC,GAAG,MAAM,CAAC;YAChD,GAAG,CAAC,KAAK,CAAC,qDAAqD,IAAI,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC;YACrF,IAAI,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YACvF,IAAI,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,gBAAI,CAAC,GAAG,IAAI,GAAG,KAAK,eAAG,CAAC,KAAK,EAAE,CAAC;gBACnE,uEAAuE;gBACvE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CACvC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;oBAC9B,IAAI;oBACJ,IAAI,EAAE,gBAAI,CAAC,GAAG;oBACd,GAAG;iBACJ,CAAC,CACH,CAAC;YACJ,CAAC;YACD,IAAI,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,cAAE,CAAC,GAAG,IAAI,IAAI,KAAK,cAAE,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,eAAG,CAAC,GAAG,EAAE,CAAC;gBACxF,sEAAsE;gBACtE,2DAA2D;gBAC3D,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CACvC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;oBAC9B,IAAI;oBACJ,IAAI;oBACJ,GAAG,EAAE,eAAG,CAAC,KAAK;iBACf,CAAC,CACH,CAAC;YACJ,CAAC;YACD,aAAa,GAAG,MAAM,CAAC;YACvB,GAAG,CAAC,KAAK,CAAC,OAAO,cAAI,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAChD,MAAM,UAAU,GAA8B,EAAE,CAAC;YACjD,sEAAsE;YACtE,qBAAqB;YACrB,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;YACrD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC3C,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;gBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBAC/C,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC7C,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAChC,SAAS;gBACX,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;gBACtD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,SAAS;gBACX,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC7C,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAChC,CAAC;gBACD,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;YACD,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnD,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBACzC,SAAS;gBACX,CAAC;gBACD,UAAU,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,IAAA,kCAAe,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACjF,CAAC;YACD,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACtE,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBACvD,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9C,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CACnD,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;;OAMG;IACK,kBAAkB,CAAC,MAAc,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAS;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;YAChE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACK,KAAK,CAAC,cAAc,CAC1B,KAAa,EACb,SAAiB,EACjB,YAAoB,EACpB,QAAQ,GAAG,KAAK;QAEhB,MAAM,EAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,WAAW,GAAG,mBAAI,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC;QAC/D,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,SAAS,WAAW,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC;YACH,MAAM,aAAG,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE;gBACvC,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,kCAAsB;aAChC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,CAAU,CAAC;YACvB,MAAM,GAAG,GAAG,yDAAyD,GAAG,CAAC,OAAO,EAAE,CAAC;YACnF,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,GAAG,EAAE,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;YACnC,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;YAChD,MAAM,GAAG,GAAG,iDAAiD,SAAS,iBAAiB,CAAC;YACxF,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,mBAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,GAAG,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5F,MAAM,UAAU,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAChE,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAChD,MAAM,YAAE,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAClC,GAAG,CAAC,KAAK,CAAC,4BAA4B,UAAU,4BAA4B,CAAC,CAAC;QAChF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,CAAU,CAAC;YACvB,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,WAAW,CAAC,GAAW,EAAE,GAAW;QAChD,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,aAAG,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACrC,MAAM,gBAAgB,GAAG,MAAM,YAAE,CAAC,OAAO,CACvC,OAAO,EACP,IAAI,EACJ,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,CACxB,CAAC,WAAW,IAAI,mBAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,cAAc,CAC7E,CAAC;YACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CACb,sFAAsF,CACvF,CAAC;YACJ,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,yBAAyB,mBAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;YACnF,MAAM,YAAE,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;gBACjC,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,YAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAxYD,8DAwYC;AAED,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,QAAgB;IAClD,MAAM,GAAG,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;AACtD,CAAC"}
|
|
1
|
+
{"version":3,"file":"storage-client.js","sourceRoot":"","sources":["../../../lib/storage-client/storage-client.ts"],"names":[],"mappings":"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"}
|
package/build/lib/types.js
CHANGED
package/build/lib/utils.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
|
-
import { OS, CPU } from './constants';
|
|
2
|
+
import { OS, CPU } from './constants.js';
|
|
3
3
|
import type { ADB } from 'appium-adb';
|
|
4
|
-
import type { ChromedriverVersionMapping, OSInfo } from './types';
|
|
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;
|
|
7
7
|
/**
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,OAAO,CAAC;AAE9C,OAAO,EAAC,EAAE,EAAE,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,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,CACvC,OAAO,GAAE,0BAAwD,GAChE,MAAM,CAMR;AAED,eAAO,MAAM,MAAM,EAAE,MAGQ,CAAC;AAE9B;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG9F;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAoB,GAAG,MAAM,CAEvE;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,GAAE,MAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAU7F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACvC,IAAI,GAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,cAAc,CAAM,GAC9D,OAAO,CAAC,GAAG,CAAC,CAUd;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,SAAsC,CAAC,OAAO,EAAE,EAAE,MAAM,OAAO,EAAE,CAAC;;CAQtF,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,SAAuC,CAAC,OAAO,GAAG,EAAE,MAAM,OAAO,GAAG,CAAC;;CAE1F,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,SAAS,SAA4C,OAAO,CAAC,MAAM,CAAC;;CAM/E,CAAC;AAOH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,GAAE,MAAM,GAAG,IAAW,GAAG,MAAM,CAKnF;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAWtD"}
|