appium-android-driver 8.1.2 → 8.1.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 +7 -0
- package/build/lib/commands/device/common.js +1 -1
- package/build/lib/commands/device/common.js.map +1 -1
- package/build/lib/commands/device/utils.d.ts +2 -1
- package/build/lib/commands/device/utils.d.ts.map +1 -1
- package/build/lib/commands/device/utils.js +6 -4
- package/build/lib/commands/device/utils.js.map +1 -1
- package/lib/commands/device/common.js +1 -1
- package/lib/commands/device/utils.js +6 -4
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [8.1.3](https://github.com/appium/appium-android-driver/compare/v8.1.2...v8.1.3) (2024-01-25)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* prepareEmulator API ([#906](https://github.com/appium/appium-android-driver/issues/906)) ([cc4ff67](https://github.com/appium/appium-android-driver/commit/cc4ff6705517acf1eaf82d6457be1a77f6e764ad))
|
|
7
|
+
|
|
1
8
|
## [8.1.2](https://github.com/appium/appium-android-driver/compare/v8.1.1...v8.1.2) (2024-01-25)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -24,7 +24,7 @@ async function getDeviceInfoFromCaps() {
|
|
|
24
24
|
let emPort;
|
|
25
25
|
// a specific avd name was given. try to initialize with that
|
|
26
26
|
if (this.opts?.avd) {
|
|
27
|
-
await utils_1.prepareEmulator.bind(this)();
|
|
27
|
+
await utils_1.prepareEmulator.bind(this)(adb);
|
|
28
28
|
udid = adb.curDeviceId;
|
|
29
29
|
emPort = adb.emulatorPort;
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,oDAAuB;AACvB,gDAAqE;AACrE,2DAAsD;AACtD,0CAAwE;AACxE,mCAKiB;AAEjB;;;GAGG;AACI,KAAK,UAAU,qBAAqB;IACzC,yEAAyE;IACzE,+DAA+D;IAC/D,0EAA0E;IAC1E,oCAAoC;IACpC,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC1B,IAAI,MAAM,CAAC;IAEX,6DAA6D;IAC7D,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;QAClB,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,10 @@ export function ensureNetworkSpeed(this: import("../../driver").AndroidDriver, n
|
|
|
21
21
|
export function prepareAvdArgs(this: import("../../driver").AndroidDriver): string[];
|
|
22
22
|
/**
|
|
23
23
|
* @this {import('../../driver').AndroidDriver}
|
|
24
|
+
* @param {ADB} adb
|
|
24
25
|
* @returns {Promise<void>}
|
|
25
26
|
*/
|
|
26
|
-
export function prepareEmulator(this: import("../../driver").AndroidDriver): Promise<void>;
|
|
27
|
+
export function prepareEmulator(this: import("../../driver").AndroidDriver, adb: ADB): Promise<void>;
|
|
27
28
|
/**
|
|
28
29
|
* @param {import('../../driver').AndroidDriverOpts?} [opts=null]
|
|
29
30
|
* @returns {Promise<ADB>}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,oFAFW,MAAM,QAMhB;AAED;;;GAGG;AACH,0FAFa,IAAI,CAuBhB;AAED;;;;GAIG;AACH,6FAHW,MAAM,GACJ,MAAM,CAWlB;AAED;;;GAGG;AACH,4EAFa,MAAM,EAAE,CAmBpB;AAED
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,oFAFW,MAAM,QAMhB;AAED;;;GAGG;AACH,0FAFa,IAAI,CAuBhB;AAED;;;;GAIG;AACH,6FAHW,MAAM,GACJ,MAAM,CAWlB;AAED;;;GAGG;AACH,4EAFa,MAAM,EAAE,CAmBpB;AAED;;;;GAIG;AACH,iFAHW,GAAG,GACD,QAAQ,IAAI,CAAC,CA0CzB;AAED;;;GAGG;AACH,mGAFa,QAAQ,GAAG,CAAC,CAqCxB;AAED;;;;GAIG;AACH,0FAHW,OAAO,GACL,QAAQ,IAAI,CAAC,CA4EzB;AAED;;;;GAIG;AACH,iFAFa,QAAQ,MAAM,QAAE,CAa5B;AAED;;;GAGG;AACH,oFAFa,QAAQ,IAAI,CAAC,CAMzB;gBA5Re,YAAY"}
|
|
@@ -81,9 +81,10 @@ function prepareAvdArgs() {
|
|
|
81
81
|
exports.prepareAvdArgs = prepareAvdArgs;
|
|
82
82
|
/**
|
|
83
83
|
* @this {import('../../driver').AndroidDriver}
|
|
84
|
+
* @param {ADB} adb
|
|
84
85
|
* @returns {Promise<void>}
|
|
85
86
|
*/
|
|
86
|
-
async function prepareEmulator() {
|
|
87
|
+
async function prepareEmulator(adb) {
|
|
87
88
|
const { avd, avdEnv: env, language, locale: country, avdLaunchTimeout: launchTimeout, avdReadyTimeout: readyTimeout, } = this.opts;
|
|
88
89
|
if (!avd) {
|
|
89
90
|
throw new Error('Cannot launch AVD without AVD name');
|
|
@@ -91,7 +92,8 @@ async function prepareEmulator() {
|
|
|
91
92
|
const avdName = avd.replace('@', '');
|
|
92
93
|
let isEmulatorRunning = true;
|
|
93
94
|
try {
|
|
94
|
-
|
|
95
|
+
// This API implicitly modifies curDeviceId and emulatorPort properties of the adb instance
|
|
96
|
+
await adb.getRunningAVDWithRetry(avdName, 5000);
|
|
95
97
|
}
|
|
96
98
|
catch (e) {
|
|
97
99
|
this.log.debug(`Emulator '${avdName}' is not running: ${e.message}`);
|
|
@@ -101,14 +103,14 @@ async function prepareEmulator() {
|
|
|
101
103
|
if (isEmulatorRunning) {
|
|
102
104
|
if (args.includes('-wipe-data')) {
|
|
103
105
|
this.log.debug(`Killing '${avdName}' because it needs to be wiped at start.`);
|
|
104
|
-
await
|
|
106
|
+
await adb.killEmulator(avdName);
|
|
105
107
|
}
|
|
106
108
|
else {
|
|
107
109
|
this.log.debug('Not launching AVD because it is already running.');
|
|
108
110
|
return;
|
|
109
111
|
}
|
|
110
112
|
}
|
|
111
|
-
await
|
|
113
|
+
await adb.launchAVD(avd, {
|
|
112
114
|
args,
|
|
113
115
|
env,
|
|
114
116
|
language,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,6CAAqC;AACrC,4DAA6B;AAC7B,uCAAuC;AACvC,2DAK4B;AAC5B,wDAAyB;AAEzB,MAAM,0BAA0B,GAAG,CAAC,CAAC;AACrC,MAAM,iCAAiC,GAAG,IAAI,CAAC;AAE/C;;;GAGG;AACH,SAAgB,eAAe,CAAC,MAAM;IACpC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE;QACtB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;KAChC;AACH,CAAC;AAJD,0CAIC;AAED;;;GAGG;AACH,SAAgB,4BAA4B;IAC1C,KAAK,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,EAAE;QACpF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE;YACT,SAAS;SACV;QAED,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,EAAE;YACV,SAAS;SACV;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,eAAe,GAAG,sGAAsG,CACzH,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,kBAAkB,IAAI,yCAAyC,KAAK,CAAC,KAAK,MAAM,MAAM,CACpF,IAAI,CACL,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CACnC,CAAC;KACH;AACH,CAAC;AArBD,oEAqBC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,YAAY;IAC7C,IAAI,YAAY,CAAC,WAAW,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;QACxD,OAAO,YAAY,CAAC;KACrB;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,8BAA8B,YAAY,qBAAqB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI;QAC5F,qBAAqB,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAC1D,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC;AACrC,CAAC;AATD,gDASC;AAED;;;GAGG;AACH,SAAgB,cAAc;IAC5B,MAAM,EAAC,YAAY,EAAE,UAAU,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IACtD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,IAAI,OAAO,EAAE;QACX,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACtB,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;SACzB;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,GAAG,cAAI,CAAC,UAAU,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;SAC/C;KACF;IACD,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;KACvE;IACD,IAAI,UAAU,EAAE;QACd,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAC3B;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,wCAiBC;AAED
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export async function getDeviceInfoFromCaps() {
|
|
|
25
25
|
|
|
26
26
|
// a specific avd name was given. try to initialize with that
|
|
27
27
|
if (this.opts?.avd) {
|
|
28
|
-
await prepareEmulator.bind(this)();
|
|
28
|
+
await prepareEmulator.bind(this)(adb);
|
|
29
29
|
udid = adb.curDeviceId;
|
|
30
30
|
emPort = adb.emulatorPort;
|
|
31
31
|
} else {
|
|
@@ -91,9 +91,10 @@ export function prepareAvdArgs() {
|
|
|
91
91
|
|
|
92
92
|
/**
|
|
93
93
|
* @this {import('../../driver').AndroidDriver}
|
|
94
|
+
* @param {ADB} adb
|
|
94
95
|
* @returns {Promise<void>}
|
|
95
96
|
*/
|
|
96
|
-
export async function prepareEmulator() {
|
|
97
|
+
export async function prepareEmulator(adb) {
|
|
97
98
|
const {
|
|
98
99
|
avd,
|
|
99
100
|
avdEnv: env,
|
|
@@ -109,7 +110,8 @@ export async function prepareEmulator() {
|
|
|
109
110
|
const avdName = avd.replace('@', '');
|
|
110
111
|
let isEmulatorRunning = true;
|
|
111
112
|
try {
|
|
112
|
-
|
|
113
|
+
// This API implicitly modifies curDeviceId and emulatorPort properties of the adb instance
|
|
114
|
+
await adb.getRunningAVDWithRetry(avdName, 5000);
|
|
113
115
|
} catch (e) {
|
|
114
116
|
this.log.debug(`Emulator '${avdName}' is not running: ${e.message}`);
|
|
115
117
|
isEmulatorRunning = false;
|
|
@@ -118,13 +120,13 @@ export async function prepareEmulator() {
|
|
|
118
120
|
if (isEmulatorRunning) {
|
|
119
121
|
if (args.includes('-wipe-data')) {
|
|
120
122
|
this.log.debug(`Killing '${avdName}' because it needs to be wiped at start.`);
|
|
121
|
-
await
|
|
123
|
+
await adb.killEmulator(avdName);
|
|
122
124
|
} else {
|
|
123
125
|
this.log.debug('Not launching AVD because it is already running.');
|
|
124
126
|
return;
|
|
125
127
|
}
|
|
126
128
|
}
|
|
127
|
-
await
|
|
129
|
+
await adb.launchAVD(avd, {
|
|
128
130
|
args,
|
|
129
131
|
env,
|
|
130
132
|
language,
|