appium-adb 11.0.8 → 11.1.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.
Files changed (7) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/build/lib/tools/settings-client-commands.d.ts +15 -1
  3. package/build/lib/tools/settings-client-commands.d.ts.map +1 -1
  4. package/build/lib/tools/settings-client-commands.js +28 -3
  5. package/build/lib/tools/settings-client-commands.js.map +1 -1
  6. package/lib/tools/settings-client-commands.js +32 -3
  7. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [11.1.0](https://github.com/appium/appium-adb/compare/v11.0.9...v11.1.0) (2024-01-09)
2
+
3
+
4
+ ### Features
5
+
6
+ * add isSettingsAppServiceRunningInForeground to check the settings' service existence better ([#715](https://github.com/appium/appium-adb/issues/715)) ([be0502e](https://github.com/appium/appium-adb/commit/be0502e28a15916bd4bcb079d569aa7b7d5803fe))
7
+
8
+ ## [11.0.9](https://github.com/appium/appium-adb/compare/v11.0.8...v11.0.9) (2023-12-27)
9
+
10
+
11
+ ### Miscellaneous Chores
12
+
13
+ * Bump @types/ini from 1.3.34 to 4.1.0 ([#713](https://github.com/appium/appium-adb/issues/713)) ([d68cb79](https://github.com/appium/appium-adb/commit/d68cb798061cd4a0ebdad211bcea1aced9029962))
14
+
1
15
  ## [11.0.8](https://github.com/appium/appium-adb/compare/v11.0.7...v11.0.8) (2023-11-19)
2
16
 
3
17
 
package/build/lib/tools/settings-client-commands.d.ts CHANGED
@@ -61,6 +61,16 @@ export type SmsListResultItem = {
61
61
  };
62
62
  export type SettingsClientCommands = typeof commands;
63
63
  declare namespace commands {
64
+ /**
65
+ * If the io.appium.settings package has running foreground service.
66
+ * It returns the io.appium.settings's process existence for api level 25 and lower
67
+ * since it does not have the foreground service.
68
+ *
69
+ * @this {import('../adb.js').ADB}
70
+ * @throws {Error} If the method gets an error in the adb shell execution.
71
+ * @returns {Promise<boolean>} Return true if the device has running settings app foreground service.
72
+ */
73
+ function isSettingsAppServiceRunningInForeground(this: import("../adb.js").ADB): Promise<boolean>;
64
74
  /**
65
75
  * @typedef {Object} SettingsAppStartupOptions
66
76
  * @property {number} [timeout=5000] The maximum number of milliseconds
@@ -70,7 +80,11 @@ declare namespace commands {
70
80
  */
71
81
  /**
72
82
  * Ensures that Appium Settings helper application is running
73
- * and starts it if necessary
83
+ * and starts it if necessary.
84
+ *
85
+ * The settings app process could keep working by 'android.service.notification.NotificationListenerService cmp=io.appium.settings/.NLService'
86
+ * while the app process was killed, or forcefully stopped, or the app was just installed.
87
+ * In the case, the io.appium.settings process exists but the foreground service hasn't been started yet.
74
88
  *
75
89
  * @this {import('../adb.js').ADB}
76
90
  * @param {SettingsAppStartupOptions} [opts={}]
package/build/lib/tools/settings-client-commands.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings-client-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/settings-client-commands.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;eAgOc,MAAM,GAAC,MAAM;;;;cACb,MAAM,GAAC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;WAsUb,iBAAiB,EAAE;WACnB,MAAM;;;QAMN,MAAM;aACN,MAAM;YACN,MAAM,GAAC,IAAI;UACX,MAAM;UACN,MAAM;YACN,MAAM;UACN,MAAM;aACN,MAAM,GAAC,IAAI;UACX,MAAM;mBACN,MAAM,GAAC,IAAI;;qCAsHZ,eAAe;;IAloB5B;;;;;;OAMG;IAEH;;;;;;;;OAQG;IACH,kJA0CC;IAED;;;;;;;OAOG;IACH,mHAyBC;IAED;;;;;;;OAOG;IACH,mHAsBC;IAED;;;;;;;;;;;;;OAaG;IACH,sFAOC;IAED;;;;;;;;;;OAUG;IACH,8JAcC;IAGD;;;;;;;;;;OAUG;IAEH;;;;;;;;OAQG;IACH,4HA+DC;IAED;;;;;;OAMG;IACH,0EA2BC;IAED;;;;;;;;;;;;;OAaG;IACH,mGAyDC;IAED;;;;;;;;;;OAUG;IACH,oGAIC;IAED;;;;;;;;;;;;;OAaG;IACH,sEAwBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+CG;IACH,6GAmBC;IAED;;;;OAIG;IAEH;;;;OAIG;IAEH;;;;;;;;;;;;;OAaG;IAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAwCG;IACH,kGAoBC;IAED;;;;;;;;OAQG;IACH,oFAcC;IAED;;;;;;;;OAQG;IACH,sFAaC"}
1
+ {"version":3,"file":"settings-client-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/settings-client-commands.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;eA6Pc,MAAM,GAAC,MAAM;;;;cACb,MAAM,GAAC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;WAsUb,iBAAiB,EAAE;WACnB,MAAM;;;QAMN,MAAM;aACN,MAAM;YACN,MAAM,GAAC,IAAI;UACX,MAAM;UACN,MAAM;YACN,MAAM;UACN,MAAM;aACN,MAAM,GAAC,IAAI;UACX,MAAM;mBACN,MAAM,GAAC,IAAI;;qCAsHZ,eAAe;;IA7pB5B;;;;;;;;OAQG;IACH,kGAYC;IAED;;;;;;OAMG;IAEH;;;;;;;;;;;;OAYG;IACH,kJA0CC;IAED;;;;;;;OAOG;IACH,mHAyBC;IAED;;;;;;;OAOG;IACH,mHAsBC;IAED;;;;;;;;;;;;;OAaG;IACH,sFAOC;IAED;;;;;;;;;;OAUG;IACH,8JAcC;IAGD;;;;;;;;;;OAUG;IAEH;;;;;;;;OAQG;IACH,4HA+DC;IAED;;;;;;OAMG;IACH,0EA2BC;IAED;;;;;;;;;;;;;OAaG;IACH,mGAyDC;IAED;;;;;;;;;;OAUG;IACH,oGAIC;IAED;;;;;;;;;;;;;OAaG;IACH,sEAwBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+CG;IACH,6GAmBC;IAED;;;;OAIG;IAEH;;;;OAIG;IAEH;;;;;;;;;;;;;OAaG;IAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAwCG;IACH,kGAoBC;IAED;;;;;;;;OAQG;IACH,oFAcC;IAED;;;;;;;;OAQG;IACH,sFAaC"}
package/build/lib/tools/settings-client-commands.js CHANGED
@@ -41,7 +41,28 @@ const GPS_CACHE_REFRESHED_LOGS = [
41
41
  'The current location has been successfully retrieved from Location Manager'
42
42
  ];
43
43
  const GPS_COORDINATES_PATTERN = /data="(-?[\d.]+)\s+(-?[\d.]+)\s+(-?[\d.]+)"/;
44
+ const FOREGROUND_APP_KEYWORD = 'isForeground=true';
44
45
  const commands = {};
46
+ /**
47
+ * If the io.appium.settings package has running foreground service.
48
+ * It returns the io.appium.settings's process existence for api level 25 and lower
49
+ * since it does not have the foreground service.
50
+ *
51
+ * @this {import('../adb.js').ADB}
52
+ * @throws {Error} If the method gets an error in the adb shell execution.
53
+ * @returns {Promise<boolean>} Return true if the device has running settings app foreground service.
54
+ */
55
+ commands.isSettingsAppServiceRunningInForeground = async function isSettingsAppServiceRunningInForeground() {
56
+ if (await this.getApiLevel() < 26) {
57
+ return await this.processExists(SETTINGS_HELPER_ID);
58
+ }
59
+ // The foreground service is available since api level 26,
60
+ // thus this method works only for api level 26+.
61
+ // 'dumpsys activity services <package>' had slightly better performance
62
+ // than 'dumpsys activity services' and parsing the foreground apps.
63
+ const output = await this.shell(['dumpsys', 'activity', 'services', SETTINGS_HELPER_ID]);
64
+ return output.includes(FOREGROUND_APP_KEYWORD);
65
+ };
45
66
  /**
46
67
  * @typedef {Object} SettingsAppStartupOptions
47
68
  * @property {number} [timeout=5000] The maximum number of milliseconds
@@ -51,7 +72,11 @@ const commands = {};
51
72
  */
52
73
  /**
53
74
  * Ensures that Appium Settings helper application is running
54
- * and starts it if necessary
75
+ * and starts it if necessary.
76
+ *
77
+ * The settings app process could keep working by 'android.service.notification.NotificationListenerService cmp=io.appium.settings/.NLService'
78
+ * while the app process was killed, or forcefully stopped, or the app was just installed.
79
+ * In the case, the io.appium.settings process exists but the foreground service hasn't been started yet.
55
80
  *
56
81
  * @this {import('../adb.js').ADB}
57
82
  * @param {SettingsAppStartupOptions} [opts={}]
@@ -59,7 +84,7 @@ const commands = {};
59
84
  * @returns {Promise<import('../adb.js').ADB>} self instance for chaining
60
85
  */
61
86
  commands.requireRunningSettingsApp = async function requireRunningSettingsApp(opts = {}) {
62
- if (await this.processExists(SETTINGS_HELPER_ID)) {
87
+ if (await this.isSettingsAppServiceRunningInForeground()) {
63
88
  return this;
64
89
  }
65
90
  logger_js_1.default.debug('Starting Appium Settings app');
@@ -82,7 +107,7 @@ commands.requireRunningSettingsApp = async function requireRunningSettingsApp(op
82
107
  waitForLaunch: false,
83
108
  });
84
109
  try {
85
- await (0, asyncbox_1.waitForCondition)(async () => await this.processExists(SETTINGS_HELPER_ID), {
110
+ await (0, asyncbox_1.waitForCondition)(async () => await this.isSettingsAppServiceRunningInForeground(), {
86
111
  waitMs: timeout,
87
112
  intervalMs: 300,
88
113
  });
package/build/lib/tools/settings-client-commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings-client-commands.js","sourceRoot":"","sources":["../../../lib/tools/settings-client-commands.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"settings-client-commands.js","sourceRoot":"","sources":["../../../lib/tools/settings-client-commands.js"],"names":[],"mappings":"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"}
package/lib/tools/settings-client-commands.js CHANGED
@@ -39,8 +39,33 @@ const GPS_CACHE_REFRESHED_LOGS = [
39
39
 
40
40
  const GPS_COORDINATES_PATTERN = /data="(-?[\d.]+)\s+(-?[\d.]+)\s+(-?[\d.]+)"/;
41
41
 
42
+ const FOREGROUND_APP_KEYWORD = 'isForeground=true';
43
+
42
44
  const commands = {};
43
45
 
46
+ /**
47
+ * If the io.appium.settings package has running foreground service.
48
+ * It returns the io.appium.settings's process existence for api level 25 and lower
49
+ * since it does not have the foreground service.
50
+ *
51
+ * @this {import('../adb.js').ADB}
52
+ * @throws {Error} If the method gets an error in the adb shell execution.
53
+ * @returns {Promise<boolean>} Return true if the device has running settings app foreground service.
54
+ */
55
+ commands.isSettingsAppServiceRunningInForeground = async function isSettingsAppServiceRunningInForeground () {
56
+ if (await this.getApiLevel() < 26) {
57
+ return await this.processExists(SETTINGS_HELPER_ID);
58
+ }
59
+
60
+ // The foreground service is available since api level 26,
61
+ // thus this method works only for api level 26+.
62
+
63
+ // 'dumpsys activity services <package>' had slightly better performance
64
+ // than 'dumpsys activity services' and parsing the foreground apps.
65
+ const output = await this.shell(['dumpsys', 'activity', 'services', SETTINGS_HELPER_ID]);
66
+ return output.includes(FOREGROUND_APP_KEYWORD);
67
+ };
68
+
44
69
  /**
45
70
  * @typedef {Object} SettingsAppStartupOptions
46
71
  * @property {number} [timeout=5000] The maximum number of milliseconds
@@ -51,7 +76,11 @@ const commands = {};
51
76
 
52
77
  /**
53
78
  * Ensures that Appium Settings helper application is running
54
- * and starts it if necessary
79
+ * and starts it if necessary.
80
+ *
81
+ * The settings app process could keep working by 'android.service.notification.NotificationListenerService cmp=io.appium.settings/.NLService'
82
+ * while the app process was killed, or forcefully stopped, or the app was just installed.
83
+ * In the case, the io.appium.settings process exists but the foreground service hasn't been started yet.
55
84
  *
56
85
  * @this {import('../adb.js').ADB}
57
86
  * @param {SettingsAppStartupOptions} [opts={}]
@@ -59,7 +88,7 @@ const commands = {};
59
88
  * @returns {Promise<import('../adb.js').ADB>} self instance for chaining
60
89
  */
61
90
  commands.requireRunningSettingsApp = async function requireRunningSettingsApp (opts = {}) {
62
- if (await this.processExists(SETTINGS_HELPER_ID)) {
91
+ if (await this.isSettingsAppServiceRunningInForeground()) {
63
92
  return this;
64
93
  }
65
94
 
@@ -85,7 +114,7 @@ commands.requireRunningSettingsApp = async function requireRunningSettingsApp (o
85
114
  waitForLaunch: false,
86
115
  });
87
116
  try {
88
- await waitForCondition(async () => await this.processExists(SETTINGS_HELPER_ID), {
117
+ await waitForCondition(async () => await this.isSettingsAppServiceRunningInForeground(), {
89
118
  waitMs: timeout,
90
119
  intervalMs: 300,
91
120
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-adb",
3
- "version": "11.0.8",
3
+ "version": "11.1.0",
4
4
  "description": "Android Debug Bridge interface",
5
5
  "main": "./build/index.js",
6
6
  "scripts": {
@@ -78,7 +78,7 @@
78
78
  "@types/bluebird": "^3.5.38",
79
79
  "@types/chai": "^4.3.5",
80
80
  "@types/chai-as-promised": "^7.1.5",
81
- "@types/ini": "^1.3.31",
81
+ "@types/ini": "^4.1.0",
82
82
  "@types/lodash": "^4.14.195",
83
83
  "@types/mocha": "^10.0.1",
84
84
  "@types/node": "^20.2.5",