appium-espresso-driver 3.2.1 → 3.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 +6 -0
- package/build/lib/espresso-runner.d.ts +6 -0
- package/build/lib/espresso-runner.d.ts.map +1 -1
- package/build/lib/espresso-runner.js +46 -4
- package/build/lib/espresso-runner.js.map +1 -1
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
- package/lib/espresso-runner.js +66 -6
- package/npm-shrinkwrap.json +15 -9
- package/package.json +3 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [3.3.0](https://github.com/appium/appium-espresso-driver/compare/v3.2.1...v3.3.0) (2024-07-16)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Introduce server status validation ([#1024](https://github.com/appium/appium-espresso-driver/issues/1024)) ([392a5d4](https://github.com/appium/appium-espresso-driver/commit/392a5d46fb261e0e4232ef153c693f3f57d3b8ba))
|
|
6
|
+
|
|
1
7
|
## [3.2.1](https://github.com/appium/appium-espresso-driver/compare/v3.2.0...v3.2.1) (2024-07-15)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
|
@@ -39,6 +39,12 @@ export class EspressoRunner {
|
|
|
39
39
|
installTestApk(): Promise<void>;
|
|
40
40
|
buildNewModServer(): Promise<void>;
|
|
41
41
|
cleanupSessionLeftovers(): Promise<void>;
|
|
42
|
+
/**
|
|
43
|
+
* @param {string} driverVersion
|
|
44
|
+
* @param {import('@appium/types').StringRecord} serverStatus
|
|
45
|
+
* @returns {Promise<boolean>}
|
|
46
|
+
*/
|
|
47
|
+
_verifyServerStatus(driverVersion: string, serverStatus: import("@appium/types").StringRecord): Promise<boolean>;
|
|
42
48
|
startSession(caps: any): Promise<void>;
|
|
43
49
|
instProcess: import("teen_process").SubProcess | undefined;
|
|
44
50
|
recordTargetAppPackage(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"espresso-runner.d.ts","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"espresso-runner.d.ts","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":";AA4CA;IAoBE,iCA+CC;IAjED,qBAAqB;IACrB,MADW,MAAM,CACZ;IAEL,qBAAqB;IACrB,YADW,MAAM,CACN;IAEX,qBAAqB;IACrB,YADW,MAAM,CACN;IAEX,uCAAuC;IACvC,KADW,OAAO,YAAY,EAAE,GAAG,CAC/B;IAEJ,qBAAqB;IACrB,QADW,MAAM,CACV;IAEP,qBAAqB;IACrB,sBADU,OAAO,CACI;IASnB,SAAc;IACd,uBAME;IACF,iBAA8D;IAC9D,kBAA2D;IAW3D,sBAA6D;IAC7D,mBAAuC;IACvC,yBAAmD;IAEnD,yBAAwF;IACxF,2BAAuD;IAEvD,yCAAmF;IAIjF;;;;;;aAKE;IAMN,wCASC;IAED;;;OAGG;IACH,+BA6BC;IAED,gCAyBC;IAED,mCAsCC;IAED,yCA0BC;IAED;;;;OAIG;IACH,mCAJW,MAAM,gBACN,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,OAAO,CAAC,CA+C5B;IAED,uCAkGC;IAvEC,2DAAiD;IAyEnD,wCAGC;IAED,+BAcC;CACF;AA5ZD,uCAQE;AATF,2DAAqD;AAarD;IAEE;;OAEG;IACH,sBAFU;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAC,CAExB;IAErB,+DAQC;CACF;wBA1C+B,eAAe"}
|
|
@@ -13,6 +13,7 @@ const bluebird_1 = __importDefault(require("bluebird"));
|
|
|
13
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
14
|
const utils_1 = require("./utils");
|
|
15
15
|
const axios_1 = __importDefault(require("axios"));
|
|
16
|
+
const semver_1 = __importDefault(require("semver"));
|
|
16
17
|
const TEST_SERVER_ROOT = path_1.default.resolve(__dirname, '..', '..', 'espresso-server');
|
|
17
18
|
const TEST_APK_PKG = 'io.appium.espressoserver.test';
|
|
18
19
|
exports.TEST_APK_PKG = TEST_APK_PKG;
|
|
@@ -217,6 +218,46 @@ class EspressoRunner {
|
|
|
217
218
|
this.log.debug(`No obsolete sessions have been detected (${e.message})`);
|
|
218
219
|
}
|
|
219
220
|
}
|
|
221
|
+
/**
|
|
222
|
+
* @param {string} driverVersion
|
|
223
|
+
* @param {import('@appium/types').StringRecord} serverStatus
|
|
224
|
+
* @returns {Promise<boolean>}
|
|
225
|
+
*/
|
|
226
|
+
async _verifyServerStatus(driverVersion, serverStatus) {
|
|
227
|
+
if (!lodash_1.default.isPlainObject(serverStatus) || !lodash_1.default.isPlainObject(serverStatus.build)) {
|
|
228
|
+
throw this.log.errorWithException(`The Espresso server version integrated with the application under test is not compatible ` +
|
|
229
|
+
`with the current driver version '${driverVersion}'.`);
|
|
230
|
+
}
|
|
231
|
+
const { build: { version: serverVersion, packageName: serverPackageName, } } = serverStatus;
|
|
232
|
+
const appLabel = serverPackageName ? `'${serverPackageName}' application` : 'application under test';
|
|
233
|
+
const parsedServerVersion = semver_1.default.coerce(serverVersion);
|
|
234
|
+
const parsedDriverVersion = semver_1.default.coerce(driverVersion);
|
|
235
|
+
if (parsedServerVersion && parsedDriverVersion) {
|
|
236
|
+
if (parsedServerVersion.major !== parsedDriverVersion.major) {
|
|
237
|
+
throw this.log.errorWithException(`The Espresso server version '${serverVersion}' integrated with the ${appLabel} is not compatible ` +
|
|
238
|
+
`with the current driver version '${driverVersion}'.`);
|
|
239
|
+
}
|
|
240
|
+
else if (parsedServerVersion.minor < parsedDriverVersion.minor) {
|
|
241
|
+
this.log.warn(`The Espresso server version integrated with the ${appLabel} might not be compatible ` +
|
|
242
|
+
`with the current driver version (${serverVersion} < ${driverVersion})'.`);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
else {
|
|
246
|
+
const warnMessage = parsedServerVersion
|
|
247
|
+
? `The Espresso driver version '${driverVersion}' ` +
|
|
248
|
+
`cannot be parsed. It might be incompatible with the current server '${serverVersion}' ` +
|
|
249
|
+
`integrated with the ${appLabel} .`
|
|
250
|
+
: `The Espresso server version '${serverVersion}' integrated with the ${appLabel} ` +
|
|
251
|
+
`cannot be parsed. It might be incompatible with the current driver ` +
|
|
252
|
+
`version '${driverVersion}'.`;
|
|
253
|
+
this.log.warn(warnMessage);
|
|
254
|
+
}
|
|
255
|
+
if (this.appPackage && serverPackageName && this.appPackage !== serverPackageName) {
|
|
256
|
+
throw this.log.errorWithException(`The Espresso server that is listening on the device under tests is built for a different ` +
|
|
257
|
+
`application package (${serverPackageName} !== ${this.appPackage}).`);
|
|
258
|
+
}
|
|
259
|
+
return true;
|
|
260
|
+
}
|
|
220
261
|
async startSession(caps) {
|
|
221
262
|
await this.cleanupSessionLeftovers();
|
|
222
263
|
/** @type {string[]} */
|
|
@@ -266,21 +307,22 @@ class EspressoRunner {
|
|
|
266
307
|
try {
|
|
267
308
|
await (0, asyncbox_1.waitForCondition)(async () => {
|
|
268
309
|
if (hasSocketError) {
|
|
269
|
-
this.log.
|
|
310
|
+
throw this.log.errorWithException(`Espresso server has failed to start due to an unexpected exception. ` +
|
|
270
311
|
`Make sure the 'INTERNET' permission is requested in the Android manifest of your ` +
|
|
271
312
|
`application under test (<uses-permission android:name="android.permission.INTERNET" />)`);
|
|
272
313
|
}
|
|
273
314
|
else if (this.jwproxy.instrumentationState.exited) {
|
|
274
|
-
this.log.
|
|
315
|
+
throw this.log.errorWithException(`Espresso server process has been unexpectedly terminated. ` +
|
|
275
316
|
`Check the Appium server log and the logcat output for more details`);
|
|
276
317
|
}
|
|
318
|
+
let serverStatus;
|
|
277
319
|
try {
|
|
278
|
-
await this.jwproxy.command('/status', 'GET');
|
|
279
|
-
return true;
|
|
320
|
+
(serverStatus = /** @type {import('@appium/types').StringRecord} */ (await this.jwproxy.command('/status', 'GET')));
|
|
280
321
|
}
|
|
281
322
|
catch (e) {
|
|
282
323
|
return false;
|
|
283
324
|
}
|
|
325
|
+
return await this._verifyServerStatus(manifestPayload.version, serverStatus);
|
|
284
326
|
}, {
|
|
285
327
|
waitMs: this.serverLaunchTimeout,
|
|
286
328
|
intervalMs: 500,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"espresso-runner.js","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"espresso-runner.js","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":"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"}
|
package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt
CHANGED
|
@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
|
|
|
2
2
|
|
|
3
3
|
// This value is updated automatically by the NPM versioning script
|
|
4
4
|
// It should be in sync with the NPM module version from package.json
|
|
5
|
-
private const val VERSION = "3.
|
|
5
|
+
private const val VERSION = "3.3.0"
|
|
6
6
|
|
|
7
7
|
fun getEspressoServerVersion() = VERSION
|
package/lib/espresso-runner.js
CHANGED
|
@@ -7,6 +7,7 @@ import B from 'bluebird';
|
|
|
7
7
|
import _ from 'lodash';
|
|
8
8
|
import { copyGradleProjectRecursively, getPackageInfoSync, getPackageInfo } from './utils';
|
|
9
9
|
import axios from 'axios';
|
|
10
|
+
import semver from 'semver';
|
|
10
11
|
|
|
11
12
|
|
|
12
13
|
const TEST_SERVER_ROOT = path.resolve(__dirname, '..', '..', 'espresso-server');
|
|
@@ -251,6 +252,58 @@ class EspressoRunner {
|
|
|
251
252
|
}
|
|
252
253
|
}
|
|
253
254
|
|
|
255
|
+
/**
|
|
256
|
+
* @param {string} driverVersion
|
|
257
|
+
* @param {import('@appium/types').StringRecord} serverStatus
|
|
258
|
+
* @returns {Promise<boolean>}
|
|
259
|
+
*/
|
|
260
|
+
async _verifyServerStatus(driverVersion, serverStatus) {
|
|
261
|
+
if (!_.isPlainObject(serverStatus) || !_.isPlainObject(serverStatus.build)) {
|
|
262
|
+
throw this.log.errorWithException(
|
|
263
|
+
`The Espresso server version integrated with the application under test is not compatible ` +
|
|
264
|
+
`with the current driver version '${driverVersion}'.`
|
|
265
|
+
);
|
|
266
|
+
}
|
|
267
|
+
const {
|
|
268
|
+
build: {
|
|
269
|
+
version: serverVersion,
|
|
270
|
+
packageName: serverPackageName,
|
|
271
|
+
}
|
|
272
|
+
} = serverStatus;
|
|
273
|
+
const appLabel = serverPackageName ? `'${serverPackageName}' application` : 'application under test';
|
|
274
|
+
const parsedServerVersion = semver.coerce(serverVersion);
|
|
275
|
+
const parsedDriverVersion = semver.coerce(driverVersion);
|
|
276
|
+
if (parsedServerVersion && parsedDriverVersion) {
|
|
277
|
+
if (parsedServerVersion.major !== parsedDriverVersion.major) {
|
|
278
|
+
throw this.log.errorWithException(
|
|
279
|
+
`The Espresso server version '${serverVersion}' integrated with the ${appLabel} is not compatible ` +
|
|
280
|
+
`with the current driver version '${driverVersion}'.`
|
|
281
|
+
);
|
|
282
|
+
} else if (parsedServerVersion.minor < parsedDriverVersion.minor) {
|
|
283
|
+
this.log.warn(
|
|
284
|
+
`The Espresso server version integrated with the ${appLabel} might not be compatible ` +
|
|
285
|
+
`with the current driver version (${serverVersion} < ${driverVersion})'.`
|
|
286
|
+
);
|
|
287
|
+
}
|
|
288
|
+
} else {
|
|
289
|
+
const warnMessage = parsedServerVersion
|
|
290
|
+
? `The Espresso driver version '${driverVersion}' ` +
|
|
291
|
+
`cannot be parsed. It might be incompatible with the current server '${serverVersion}' ` +
|
|
292
|
+
`integrated with the ${appLabel} .`
|
|
293
|
+
: `The Espresso server version '${serverVersion}' integrated with the ${appLabel} ` +
|
|
294
|
+
`cannot be parsed. It might be incompatible with the current driver ` +
|
|
295
|
+
`version '${driverVersion}'.`;
|
|
296
|
+
this.log.warn(warnMessage);
|
|
297
|
+
}
|
|
298
|
+
if (this.appPackage && serverPackageName && this.appPackage !== serverPackageName) {
|
|
299
|
+
throw this.log.errorWithException(
|
|
300
|
+
`The Espresso server that is listening on the device under tests is built for a different ` +
|
|
301
|
+
`application package (${serverPackageName} !== ${this.appPackage}).`
|
|
302
|
+
);
|
|
303
|
+
}
|
|
304
|
+
return true;
|
|
305
|
+
}
|
|
306
|
+
|
|
254
307
|
async startSession (caps) {
|
|
255
308
|
await this.cleanupSessionLeftovers();
|
|
256
309
|
|
|
@@ -306,19 +359,26 @@ class EspressoRunner {
|
|
|
306
359
|
try {
|
|
307
360
|
await waitForCondition(async () => {
|
|
308
361
|
if (hasSocketError) {
|
|
309
|
-
this.log.
|
|
362
|
+
throw this.log.errorWithException(
|
|
363
|
+
`Espresso server has failed to start due to an unexpected exception. ` +
|
|
310
364
|
`Make sure the 'INTERNET' permission is requested in the Android manifest of your ` +
|
|
311
|
-
`application under test (<uses-permission android:name="android.permission.INTERNET" />)`
|
|
365
|
+
`application under test (<uses-permission android:name="android.permission.INTERNET" />)`
|
|
366
|
+
);
|
|
312
367
|
} else if (this.jwproxy.instrumentationState.exited) {
|
|
313
|
-
this.log.
|
|
314
|
-
`
|
|
368
|
+
throw this.log.errorWithException(
|
|
369
|
+
`Espresso server process has been unexpectedly terminated. ` +
|
|
370
|
+
`Check the Appium server log and the logcat output for more details`
|
|
371
|
+
);
|
|
315
372
|
}
|
|
373
|
+
let serverStatus;
|
|
316
374
|
try {
|
|
317
|
-
|
|
318
|
-
|
|
375
|
+
(serverStatus = /** @type {import('@appium/types').StringRecord} */ (
|
|
376
|
+
await this.jwproxy.command('/status', 'GET')
|
|
377
|
+
));
|
|
319
378
|
} catch (e) {
|
|
320
379
|
return false;
|
|
321
380
|
}
|
|
381
|
+
return await this._verifyServerStatus(manifestPayload.version, serverStatus);
|
|
322
382
|
}, {
|
|
323
383
|
waitMs: this.serverLaunchTimeout,
|
|
324
384
|
intervalMs: 500,
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-espresso-driver",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "appium-espresso-driver",
|
|
9
|
-
"version": "3.
|
|
9
|
+
"version": "3.3.0",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"appium-adb": "^12.4.0",
|
|
13
13
|
"appium-android-driver": "^9.8.0",
|
|
14
14
|
"asyncbox": "^3.0.0",
|
|
15
|
+
"axios": "^1.7.2",
|
|
15
16
|
"bluebird": "^3.5.0",
|
|
16
17
|
"io.appium.settings": "^5.12.0",
|
|
17
18
|
"lodash": "^4.17.11",
|
|
18
19
|
"portscanner": "^2.1.1",
|
|
20
|
+
"semver": "^7.6.2",
|
|
19
21
|
"source-map-support": "^0.x",
|
|
20
22
|
"teen_process": "^2.2.0"
|
|
21
23
|
},
|
|
@@ -96,6 +98,11 @@
|
|
|
96
98
|
"spdy": "4.0.2"
|
|
97
99
|
}
|
|
98
100
|
},
|
|
101
|
+
"node_modules/@appium/base-driver/node_modules/@types/lodash": {
|
|
102
|
+
"version": "4.17.6",
|
|
103
|
+
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz",
|
|
104
|
+
"integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA=="
|
|
105
|
+
},
|
|
99
106
|
"node_modules/@appium/logger": {
|
|
100
107
|
"version": "1.6.0",
|
|
101
108
|
"resolved": "https://registry.npmjs.org/@appium/logger/-/logger-1.6.0.tgz",
|
|
@@ -555,11 +562,6 @@
|
|
|
555
562
|
"resolved": "https://registry.npmjs.org/@types/lockfile/-/lockfile-1.0.4.tgz",
|
|
556
563
|
"integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ=="
|
|
557
564
|
},
|
|
558
|
-
"node_modules/@types/lodash": {
|
|
559
|
-
"version": "4.17.6",
|
|
560
|
-
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz",
|
|
561
|
-
"integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA=="
|
|
562
|
-
},
|
|
563
565
|
"node_modules/@types/method-override": {
|
|
564
566
|
"version": "0.0.35",
|
|
565
567
|
"resolved": "https://registry.npmjs.org/@types/method-override/-/method-override-0.0.35.tgz",
|
|
@@ -1199,6 +1201,7 @@
|
|
|
1199
1201
|
"version": "1.9.1",
|
|
1200
1202
|
"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
|
|
1201
1203
|
"integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
|
|
1204
|
+
"optional": true,
|
|
1202
1205
|
"dependencies": {
|
|
1203
1206
|
"color-name": "^1.0.0",
|
|
1204
1207
|
"simple-swizzle": "^0.2.2"
|
|
@@ -1355,7 +1358,7 @@
|
|
|
1355
1358
|
"version": "4.3.5",
|
|
1356
1359
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
|
|
1357
1360
|
"integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
|
|
1358
|
-
"
|
|
1361
|
+
"optional": true,
|
|
1359
1362
|
"dependencies": {
|
|
1360
1363
|
"ms": "2.1.2"
|
|
1361
1364
|
},
|
|
@@ -3270,6 +3273,7 @@
|
|
|
3270
3273
|
"version": "0.2.2",
|
|
3271
3274
|
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
|
|
3272
3275
|
"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
|
|
3276
|
+
"optional": true,
|
|
3273
3277
|
"dependencies": {
|
|
3274
3278
|
"is-arrayish": "^0.3.1"
|
|
3275
3279
|
}
|
|
@@ -3277,7 +3281,8 @@
|
|
|
3277
3281
|
"node_modules/simple-swizzle/node_modules/is-arrayish": {
|
|
3278
3282
|
"version": "0.3.2",
|
|
3279
3283
|
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
|
|
3280
|
-
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
|
|
3284
|
+
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
|
|
3285
|
+
"optional": true
|
|
3281
3286
|
},
|
|
3282
3287
|
"node_modules/source-map": {
|
|
3283
3288
|
"version": "0.6.1",
|
|
@@ -3609,6 +3614,7 @@
|
|
|
3609
3614
|
"version": "5.5.3",
|
|
3610
3615
|
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
|
|
3611
3616
|
"integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
|
|
3617
|
+
"dev": true,
|
|
3612
3618
|
"bin": {
|
|
3613
3619
|
"tsc": "bin/tsc",
|
|
3614
3620
|
"tsserver": "bin/tsserver"
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"automated testing",
|
|
8
8
|
"android"
|
|
9
9
|
],
|
|
10
|
-
"version": "3.
|
|
10
|
+
"version": "3.3.0",
|
|
11
11
|
"author": "Appium Contributors",
|
|
12
12
|
"license": "Apache-2.0",
|
|
13
13
|
"repository": {
|
|
@@ -77,10 +77,12 @@
|
|
|
77
77
|
"appium-adb": "^12.4.0",
|
|
78
78
|
"appium-android-driver": "^9.8.0",
|
|
79
79
|
"asyncbox": "^3.0.0",
|
|
80
|
+
"axios": "^1.7.2",
|
|
80
81
|
"bluebird": "^3.5.0",
|
|
81
82
|
"io.appium.settings": "^5.12.0",
|
|
82
83
|
"lodash": "^4.17.11",
|
|
83
84
|
"portscanner": "^2.1.1",
|
|
85
|
+
"semver": "^7.6.2",
|
|
84
86
|
"source-map-support": "^0.x",
|
|
85
87
|
"teen_process": "^2.2.0"
|
|
86
88
|
},
|