appium-android-driver 7.0.3 → 7.0.4
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
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [7.0.4](https://github.com/appium/appium-android-driver/compare/v7.0.3...v7.0.4) (2023-10-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Miscellaneous Chores
|
|
5
|
+
|
|
6
|
+
* Only use portscanner for port-related operations ([#865](https://github.com/appium/appium-android-driver/issues/865)) ([73eb574](https://github.com/appium/appium-android-driver/commit/73eb574056430e6f49f6b03a824c3f468dce7142))
|
|
7
|
+
|
|
1
8
|
## [7.0.3](https://github.com/appium/appium-android-driver/compare/v7.0.2...v7.0.3) (2023-10-16)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";AAyfA,gMAAsE;kBAGzD,OAAO,YAAY,EAAE,GAAG;AAndrC;;;GAGG;AACH,4BAHU,OAAO,UAAU,EAAE,YAAY,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA0crF;yBAjfuB,qBAAqB"}
|
|
@@ -9,12 +9,32 @@ exports.setupNewChromedriver = void 0;
|
|
|
9
9
|
const support_1 = require("@appium/support");
|
|
10
10
|
const appium_chromedriver_1 = __importDefault(require("appium-chromedriver"));
|
|
11
11
|
const driver_1 = require("appium/driver");
|
|
12
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
13
12
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
|
-
const portfinder_1 = __importDefault(require("portfinder"));
|
|
15
13
|
const helpers_1 = require("../helpers");
|
|
16
14
|
const mixins_1 = require("./mixins");
|
|
15
|
+
const node_net_1 = __importDefault(require("node:net"));
|
|
16
|
+
const portscanner_1 = require("portscanner");
|
|
17
17
|
const CHROMEDRIVER_AUTODOWNLOAD_FEATURE = 'chromedriver_autodownload';
|
|
18
|
+
/**
|
|
19
|
+
* @returns {Promise<number>}
|
|
20
|
+
*/
|
|
21
|
+
async function getFreePort() {
|
|
22
|
+
return await new Promise((resolve, reject) => {
|
|
23
|
+
const srv = node_net_1.default.createServer();
|
|
24
|
+
srv.listen(0, () => {
|
|
25
|
+
const address = srv.address();
|
|
26
|
+
let port;
|
|
27
|
+
if (lodash_1.default.has(address, 'port')) {
|
|
28
|
+
// @ts-ignore The above condition covers possible errors
|
|
29
|
+
port = address.port;
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
reject(new Error('Cannot determine any free port number'));
|
|
33
|
+
}
|
|
34
|
+
srv.close(() => resolve(port));
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
}
|
|
18
38
|
/**
|
|
19
39
|
* @type {import('./mixins').ContextMixin & ThisType<import('../driver').AndroidDriver>}
|
|
20
40
|
* @satisfies {import('@appium/types').ExternalDriver}
|
|
@@ -307,11 +327,10 @@ const ContextMixin = {
|
|
|
307
327
|
return chromedriver;
|
|
308
328
|
},
|
|
309
329
|
async getChromedriverPort(portSpec, log) {
|
|
310
|
-
const getPort = /** @type {(opts?: import('portfinder').PortFinderOptions) => B<number>} */ (bluebird_1.default.promisify(portfinder_1.default.getPort, { context: portfinder_1.default }));
|
|
311
330
|
// if the user didn't give us any specific information about chromedriver
|
|
312
331
|
// port ranges, just find any free port
|
|
313
332
|
if (!portSpec) {
|
|
314
|
-
const port = await
|
|
333
|
+
const port = await getFreePort();
|
|
315
334
|
log?.debug(`A port was not given, using random free port: ${port}`);
|
|
316
335
|
return port;
|
|
317
336
|
}
|
|
@@ -330,9 +349,9 @@ const ContextMixin = {
|
|
|
330
349
|
port = parseInt(String(potentialPort), 10); // ensure we have a number and not a string
|
|
331
350
|
stopPort = port;
|
|
332
351
|
}
|
|
352
|
+
log?.debug(`Checking port range ${port}:${stopPort}`);
|
|
333
353
|
try {
|
|
334
|
-
|
|
335
|
-
foundPort = await getPort({ port, stopPort });
|
|
354
|
+
foundPort = await (0, portscanner_1.findAPortNotInUse)(port, stopPort);
|
|
336
355
|
break;
|
|
337
356
|
}
|
|
338
357
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
|
package/lib/commands/context.js
CHANGED
|
@@ -3,9 +3,7 @@
|
|
|
3
3
|
import {util} from '@appium/support';
|
|
4
4
|
import Chromedriver from 'appium-chromedriver';
|
|
5
5
|
import {errors} from 'appium/driver';
|
|
6
|
-
import B from 'bluebird';
|
|
7
6
|
import _ from 'lodash';
|
|
8
|
-
import PortFinder from 'portfinder';
|
|
9
7
|
import {
|
|
10
8
|
APP_STATE,
|
|
11
9
|
CHROMIUM_WIN,
|
|
@@ -16,9 +14,31 @@ import {
|
|
|
16
14
|
WebviewHelpers,
|
|
17
15
|
} from '../helpers';
|
|
18
16
|
import {mixin} from './mixins';
|
|
17
|
+
import net from 'node:net';
|
|
18
|
+
import {findAPortNotInUse} from 'portscanner';
|
|
19
19
|
|
|
20
20
|
const CHROMEDRIVER_AUTODOWNLOAD_FEATURE = 'chromedriver_autodownload';
|
|
21
21
|
|
|
22
|
+
/**
|
|
23
|
+
* @returns {Promise<number>}
|
|
24
|
+
*/
|
|
25
|
+
async function getFreePort() {
|
|
26
|
+
return await new Promise((resolve, reject) => {
|
|
27
|
+
const srv = net.createServer();
|
|
28
|
+
srv.listen(0, () => {
|
|
29
|
+
const address = srv.address();
|
|
30
|
+
let port;
|
|
31
|
+
if (_.has(address, 'port')) {
|
|
32
|
+
// @ts-ignore The above condition covers possible errors
|
|
33
|
+
port = address.port;
|
|
34
|
+
} else {
|
|
35
|
+
reject(new Error('Cannot determine any free port number'));
|
|
36
|
+
}
|
|
37
|
+
srv.close(() => resolve(port));
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
|
|
22
42
|
/**
|
|
23
43
|
* @type {import('./mixins').ContextMixin & ThisType<import('../driver').AndroidDriver>}
|
|
24
44
|
* @satisfies {import('@appium/types').ExternalDriver}
|
|
@@ -362,14 +382,10 @@ const ContextMixin = {
|
|
|
362
382
|
},
|
|
363
383
|
|
|
364
384
|
async getChromedriverPort(portSpec, log) {
|
|
365
|
-
const getPort = /** @type {(opts?: import('portfinder').PortFinderOptions) => B<number>} */ (
|
|
366
|
-
B.promisify(PortFinder.getPort, {context: PortFinder})
|
|
367
|
-
);
|
|
368
|
-
|
|
369
385
|
// if the user didn't give us any specific information about chromedriver
|
|
370
386
|
// port ranges, just find any free port
|
|
371
387
|
if (!portSpec) {
|
|
372
|
-
const port = await
|
|
388
|
+
const port = await getFreePort();
|
|
373
389
|
log?.debug(`A port was not given, using random free port: ${port}`);
|
|
374
390
|
return port;
|
|
375
391
|
}
|
|
@@ -388,9 +404,9 @@ const ContextMixin = {
|
|
|
388
404
|
port = parseInt(String(potentialPort), 10); // ensure we have a number and not a string
|
|
389
405
|
stopPort = port;
|
|
390
406
|
}
|
|
407
|
+
log?.debug(`Checking port range ${port}:${stopPort}`);
|
|
391
408
|
try {
|
|
392
|
-
|
|
393
|
-
foundPort = await getPort({port, stopPort});
|
|
409
|
+
foundPort = await findAPortNotInUse(port, stopPort);
|
|
394
410
|
break;
|
|
395
411
|
} catch (e) {
|
|
396
412
|
log?.debug(`Nothing in port range ${port}:${stopPort} was available`);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.4",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -65,8 +65,7 @@
|
|
|
65
65
|
"lru-cache": "^10.0.1",
|
|
66
66
|
"moment": "^2.24.0",
|
|
67
67
|
"moment-timezone": "^0.5.26",
|
|
68
|
-
"
|
|
69
|
-
"portscanner": "2.2.0",
|
|
68
|
+
"portscanner": "^2.2.0",
|
|
70
69
|
"semver": "^7.0.0",
|
|
71
70
|
"source-map-support": "^0.x",
|
|
72
71
|
"teen_process": "^2.0.0",
|