appium-android-driver 9.8.1 → 9.8.2

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.
Files changed (6) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/commands/app-management.d.ts.map +1 -1
  3. package/build/lib/commands/app-management.js +25 -5
  4. package/build/lib/commands/app-management.js.map +1 -1
  5. package/lib/commands/app-management.js +29 -5
  6. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [9.8.2](https://github.com/appium/appium-android-driver/compare/v9.8.1...v9.8.2) (2024-08-02)
2
+
3
+ ### Bug Fixes
4
+
5
+ * Tune application termination condition ([#953](https://github.com/appium/appium-android-driver/issues/953)) ([970085a](https://github.com/appium/appium-android-driver/commit/970085a2712c7dd1e8e3f731dbe349e47f584e9a))
6
+
1
7
  ## [9.8.1](https://github.com/appium/appium-android-driver/compare/v9.8.0...v9.8.1) (2024-07-29)
2
8
 
3
9
  ### Miscellaneous Chores
package/build/lib/commands/app-management.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"AAmBA;;;GAGG;AAEH;;;;;GAKG;AACH,+EAJW,MAAM,6CAEJ,OAAO,CAAC,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,oFAHW,OAAO,SAAS,EAAE,kBAAkB,GAClC,OAAO,CAAC,OAAO,CAAC,CAS5B;AAED;;;;GAIG;AACH,8EAHW,MAAM,GACJ,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,CAAC,CAiB/C;AAED;;;;GAIG;AACH,mFAHW,OAAO,SAAS,EAAE,iBAAiB,GACjC,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,CAAC,CAK/C;AAED;;;;GAIG;AACH,4EAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAsDzB;AAED;;;;GAIG;AACH,iFAHW,OAAO,SAAS,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC,CAKzB;AAED;;;;;GAKG;AACH,0EAJW,MAAM,SACN,IAAI,CAAC,OAAO,YAAY,EAAE,gBAAgB,EAAE,OAAO,CAAC,GAClD,OAAO,CAAC,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,+EAHW,OAAO,SAAS,EAAE,aAAa,GAC7B,OAAO,CAAC,OAAO,CAAC,CAK5B;AAED;;;;;GAKG;AACH,6EAJW,MAAM,4EAEJ,OAAO,CAAC,OAAO,CAAC,CAgC5B;AAED;;;;GAIG;AACH,kFAHW,OAAO,SAAS,EAAE,gBAAgB,GAChC,OAAO,CAAC,OAAO,CAAC,CAK5B;AAED;;;;;GAKG;AACH,6EAJW,MAAM,QACN,IAAI,CAAC,OAAO,YAAY,EAAE,cAAc,EAAE,OAAO,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,CAKzB;AAED;;;;GAIG;AACH,gFAHW,OAAO,SAAS,EAAE,cAAc,GAC9B,OAAO,CAAC,IAAI,CAAC,CAWzB;AAED;;;;GAIG;AACH,8EAHW,OAAO,SAAS,EAAE,YAAY,GAC5B,OAAO,CAAC,IAAI,CAAC,CAKzB;AAED;;;GAGG;AACH,6EAFa,OAAO,CAAC,MAAM,CAAC,CAI3B;AAED;;;GAGG;AACH,4EAFa,OAAO,CAAC,MAAM,CAAC,CAI3B;AAED;;;;GAIG;AACH,6EAHW,MAAM,GACJ,OAAO,CAAC,MAAM,GAAC,IAAI,CAAC,CAyEhC;AAED;;;;GAIG;AACH,oIAFa,OAAO,CAAC,IAAI,CAAC,CA8DzB;AAED;;;;GAIG;AACH,sIAFa,OAAO,CAAC,IAAI,CAAC,CAqCzB;AAED;;;;;GAKG;AACH,qFAJW,MAAM,EAAE,oEAEN,OAAO,CAAC,IAAI,CAAC,CAoBzB;AAED;;;;;GAKG;AACH,6FAJW,MAAM,EAAE,0CAEN,OAAO,CAAC,IAAI,CAAC,CAUzB;AAED;;;;GAIG;AACH,uHAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAe7B;;;;;;;;;;;;;4BAGY,OAAO,WAAW,EAAE,aAAa"}
1
+ {"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"AAmBA;;;GAGG;AAEH;;;;;GAKG;AACH,+EAJW,MAAM,6CAEJ,OAAO,CAAC,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,oFAHW,OAAO,SAAS,EAAE,kBAAkB,GAClC,OAAO,CAAC,OAAO,CAAC,CAS5B;AAED;;;;GAIG;AACH,8EAHW,MAAM,GACJ,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,CAAC,CAiB/C;AAED;;;;GAIG;AACH,mFAHW,OAAO,SAAS,EAAE,iBAAiB,GACjC,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,CAAC,CAK/C;AAED;;;;GAIG;AACH,4EAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAsDzB;AAED;;;;GAIG;AACH,iFAHW,OAAO,SAAS,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC,CAKzB;AAED;;;;;GAKG;AACH,0EAJW,MAAM,SACN,IAAI,CAAC,OAAO,YAAY,EAAE,gBAAgB,EAAE,OAAO,CAAC,GAClD,OAAO,CAAC,OAAO,CAAC,CAI5B;AAED;;;;GAIG;AACH,+EAHW,OAAO,SAAS,EAAE,aAAa,GAC7B,OAAO,CAAC,OAAO,CAAC,CAK5B;AAED;;;;;GAKG;AACH,6EAJW,MAAM,4EAEJ,OAAO,CAAC,OAAO,CAAC,CAwD5B;AAED;;;;GAIG;AACH,kFAHW,OAAO,SAAS,EAAE,gBAAgB,GAChC,OAAO,CAAC,OAAO,CAAC,CAK5B;AAED;;;;;GAKG;AACH,6EAJW,MAAM,QACN,IAAI,CAAC,OAAO,YAAY,EAAE,cAAc,EAAE,OAAO,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC,CAKzB;AAED;;;;GAIG;AACH,gFAHW,OAAO,SAAS,EAAE,cAAc,GAC9B,OAAO,CAAC,IAAI,CAAC,CAWzB;AAED;;;;GAIG;AACH,8EAHW,OAAO,SAAS,EAAE,YAAY,GAC5B,OAAO,CAAC,IAAI,CAAC,CAKzB;AAED;;;GAGG;AACH,6EAFa,OAAO,CAAC,MAAM,CAAC,CAI3B;AAED;;;GAGG;AACH,4EAFa,OAAO,CAAC,MAAM,CAAC,CAI3B;AAED;;;;GAIG;AACH,6EAHW,MAAM,GACJ,OAAO,CAAC,MAAM,GAAC,IAAI,CAAC,CAyEhC;AAED;;;;GAIG;AACH,oIAFa,OAAO,CAAC,IAAI,CAAC,CA8DzB;AAED;;;;GAIG;AACH,sIAFa,OAAO,CAAC,IAAI,CAAC,CAqCzB;AAED;;;;;GAKG;AACH,qFAJW,MAAM,EAAE,oEAEN,OAAO,CAAC,IAAI,CAAC,CAoBzB;AAED;;;;;GAKG;AACH,6FAJW,MAAM,EAAE,0CAEN,OAAO,CAAC,IAAI,CAAC,CAUzB;AAED;;;;GAIG;AACH,uHAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAe7B;;;;;;;;;;;;;4BAGY,OAAO,WAAW,EAAE,aAAa"}
package/build/lib/commands/app-management.js CHANGED
@@ -186,7 +186,8 @@ async function mobileRemoveApp(opts) {
186
186
  */
187
187
  async function terminateApp(appId, options = {}) {
188
188
  this.log.info(`Terminating '${appId}'`);
189
- if (!(await this.adb.processExists(appId))) {
189
+ const pids = await this.adb.getPIDsByName(appId);
190
+ if (lodash_1.default.isEmpty(pids)) {
190
191
  this.log.info(`The app '${appId}' is not running`);
191
192
  return false;
192
193
  }
@@ -195,18 +196,37 @@ async function terminateApp(appId, options = {}) {
195
196
  ? parseInt(String(options.timeout), 10)
196
197
  : 500;
197
198
  if (timeout <= 0) {
198
- this.log.info(`'${appId}' has been terminated. Skip checking the application process state ` +
199
- `since the timeout was set as ${timeout}ms`);
199
+ this.log.info(`'${appId}' has been terminated. Skipping checking of the application process state ` +
200
+ `since the timeout was set to ${timeout}ms`);
200
201
  return true;
201
202
  }
203
+ /** @type {number[]} */
204
+ let currentPids = [];
202
205
  try {
203
- await (0, asyncbox_1.waitForCondition)(async () => (await this.queryAppState(appId)) <= exports.APP_STATE.NOT_RUNNING, {
206
+ await (0, asyncbox_1.waitForCondition)(async () => {
207
+ if (await this.queryAppState(appId) <= exports.APP_STATE.NOT_RUNNING) {
208
+ return true;
209
+ }
210
+ currentPids = await this.adb.getPIDsByName(appId);
211
+ if (lodash_1.default.isEmpty(currentPids) || lodash_1.default.isEmpty(lodash_1.default.intersection(pids, currentPids))) {
212
+ this.log.info(`The application '${appId}' was reported running, ` +
213
+ `although all process ids belonging to it have been changed: ` +
214
+ `(${JSON.stringify(pids)} -> ${JSON.stringify(currentPids)}). ` +
215
+ `Assuming the termination was successful.`);
216
+ return true;
217
+ }
218
+ return false;
219
+ }, {
204
220
  waitMs: timeout,
205
221
  intervalMs: 100,
206
222
  });
207
223
  }
208
224
  catch (e) {
209
- this.log.errorAndThrow(`'${appId}' is still running after ${timeout}ms timeout`);
225
+ if (!lodash_1.default.isEmpty(currentPids) && !lodash_1.default.isEmpty(lodash_1.default.difference(pids, currentPids))) {
226
+ this.log.warn(`Some of processes belonging to the '${appId}' applcation are still running ` +
227
+ `after ${timeout}ms (${JSON.stringify(pids)} -> ${JSON.stringify(currentPids)})`);
228
+ }
229
+ throw this.log.errorWithException(`'${appId}' is still running after ${timeout}ms timeout`);
210
230
  }
211
231
  this.log.info(`'${appId}' has been successfully terminated`);
212
232
  return true;
package/build/lib/commands/app-management.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"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"}
package/lib/commands/app-management.js CHANGED
@@ -175,7 +175,8 @@ export async function mobileRemoveApp(opts) {
175
175
  */
176
176
  export async function terminateApp(appId, options = {}) {
177
177
  this.log.info(`Terminating '${appId}'`);
178
- if (!(await this.adb.processExists(appId))) {
178
+ const pids = await this.adb.getPIDsByName(appId);
179
+ if (_.isEmpty(pids)) {
179
180
  this.log.info(`The app '${appId}' is not running`);
180
181
  return false;
181
182
  }
@@ -187,19 +188,42 @@ export async function terminateApp(appId, options = {}) {
187
188
 
188
189
  if (timeout <= 0) {
189
190
  this.log.info(
190
- `'${appId}' has been terminated. Skip checking the application process state ` +
191
- `since the timeout was set as ${timeout}ms`,
191
+ `'${appId}' has been terminated. Skipping checking of the application process state ` +
192
+ `since the timeout was set to ${timeout}ms`,
192
193
  );
193
194
  return true;
194
195
  }
195
196
 
197
+ /** @type {number[]} */
198
+ let currentPids = [];
196
199
  try {
197
- await waitForCondition(async () => (await this.queryAppState(appId)) <= APP_STATE.NOT_RUNNING, {
200
+ await waitForCondition(async () => {
201
+ if (await this.queryAppState(appId) <= APP_STATE.NOT_RUNNING) {
202
+ return true;
203
+ }
204
+ currentPids = await this.adb.getPIDsByName(appId);
205
+ if (_.isEmpty(currentPids) || _.isEmpty(_.intersection(pids, currentPids))) {
206
+ this.log.info(
207
+ `The application '${appId}' was reported running, ` +
208
+ `although all process ids belonging to it have been changed: ` +
209
+ `(${JSON.stringify(pids)} -> ${JSON.stringify(currentPids)}). ` +
210
+ `Assuming the termination was successful.`
211
+ );
212
+ return true;
213
+ }
214
+ return false;
215
+ }, {
198
216
  waitMs: timeout,
199
217
  intervalMs: 100,
200
218
  });
201
219
  } catch (e) {
202
- this.log.errorAndThrow(`'${appId}' is still running after ${timeout}ms timeout`);
220
+ if (!_.isEmpty(currentPids) && !_.isEmpty(_.difference(pids, currentPids))) {
221
+ this.log.warn(
222
+ `Some of processes belonging to the '${appId}' applcation are still running ` +
223
+ `after ${timeout}ms (${JSON.stringify(pids)} -> ${JSON.stringify(currentPids)})`
224
+ );
225
+ }
226
+ throw this.log.errorWithException(`'${appId}' is still running after ${timeout}ms timeout`);
203
227
  }
204
228
  this.log.info(`'${appId}' has been successfully terminated`);
205
229
  return true;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "9.8.1",
3
+ "version": "9.8.2",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "appium",