appium-android-driver 7.1.0 → 7.1.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 (15) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/build/lib/commands/actions.js +2 -2
  3. package/build/lib/commands/actions.js.map +1 -1
  4. package/build/lib/commands/general.d.ts.map +1 -1
  5. package/build/lib/commands/general.js +17 -9
  6. package/build/lib/commands/general.js.map +1 -1
  7. package/build/lib/driver.d.ts +1 -1
  8. package/build/lib/driver.d.ts.map +1 -1
  9. package/build/lib/helpers/android.js +2 -2
  10. package/build/lib/helpers/android.js.map +1 -1
  11. package/lib/commands/actions.js +2 -2
  12. package/lib/commands/general.js +19 -9
  13. package/lib/driver.ts +1 -1
  14. package/lib/helpers/android.ts +2 -2
  15. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [7.1.2](https://github.com/appium/appium-android-driver/compare/v7.1.1...v7.1.2) (2023-10-17)
2
+
3
+
4
+ ### Miscellaneous Chores
5
+
6
+ * Make adb non-optional ([48d3105](https://github.com/appium/appium-android-driver/commit/48d310508177093ed5b881865a2a8173ad856a9a))
7
+
8
+ ## [7.1.1](https://github.com/appium/appium-android-driver/compare/v7.1.0...v7.1.1) (2023-10-17)
9
+
10
+
11
+ ### Miscellaneous Chores
12
+
13
+ * **deps:** bump appium-adb from 9.14.12 to 10.0.0 ([#868](https://github.com/appium/appium-android-driver/issues/868)) ([60486a4](https://github.com/appium/appium-android-driver/commit/60486a43826983b01695aa0f759ae55f90752c00))
14
+
1
15
  ## [7.1.0](https://github.com/appium/appium-android-driver/compare/v7.0.4...v7.1.0) (2023-10-17)
2
16
 
3
17
 
package/build/lib/commands/actions.js CHANGED
@@ -126,7 +126,7 @@ const ActionsMixin = {
126
126
  if (!this.isEmulator()) {
127
127
  this.log.errorAndThrow('gsmCall method is only available for emulators');
128
128
  }
129
- await /** @type {ADB} */ (this.adb).gsmCall(phoneNumber, action);
129
+ await /** @type {ADB} */ (this.adb).gsmCall(phoneNumber, /** @type {any} */ (action));
130
130
  },
131
131
  async mobileGsmCall(opts) {
132
132
  const { phoneNumber, action } = (0, utils_1.requireArgs)(['phoneNumber', 'action'], opts);
@@ -193,7 +193,7 @@ const ActionsMixin = {
193
193
  if (!this.isEmulator()) {
194
194
  this.log.errorAndThrow('sensorSet method is only available for emulators');
195
195
  }
196
- await /** @type {ADB} */ (this.adb).sensorSet(sensorType, value);
196
+ await /** @type {ADB} */ (this.adb).sensorSet(sensorType, /** @type {any} */ (value));
197
197
  },
198
198
  async getScreenshot() {
199
199
  throw new driver_1.errors.NotImplementedError('Not implemented');
package/build/lib/commands/actions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"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"}
package/build/lib/commands/general.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";kBAqVa,OAAO,YAAY,EAAE,GAAG;2BACxB,OAAO,eAAe,EAAE,YAAY;AA1UjD;;;GAGG;AACH,4BAHU,OAAO,UAAU,EAAE,YAAY,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CAiUrF"}
1
+ {"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";kBA+Va,OAAO,YAAY,EAAE,GAAG;2BACxB,OAAO,eAAe,EAAE,YAAY;AApVjD;;;GAGG;AACH,4BAHU,OAAO,UAAU,EAAE,YAAY,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA2UrF"}
package/build/lib/commands/general.js CHANGED
@@ -62,7 +62,9 @@ const GeneralMixin = {
62
62
  const adb = /** @type {ADB} */ (this.adb);
63
63
  let { appPackage, appActivity } = await adb.getFocusedPackageAndActivity();
64
64
  await adb.shell(['am', 'start', '-a', `android.settings.${setting}`]);
65
- await adb.waitForNotActivity(/** @type {string} */ (appPackage), appActivity, 5000);
65
+ await adb.waitForNotActivity(
66
+ /** @type {string} */ (appPackage),
67
+ /** @type {string} */ (appActivity), 5000);
66
68
  },
67
69
  async getWindowSize() {
68
70
  throw new driver_1.errors.NotImplementedError('Not implemented');
@@ -77,11 +79,17 @@ const GeneralMixin = {
77
79
  y: 0,
78
80
  };
79
81
  },
82
+ /**
83
+ * @returns {Promise<string>}
84
+ */
80
85
  async getCurrentActivity() {
81
- return (await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appActivity;
86
+ return /** @type {string} */ ((await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appActivity);
82
87
  },
88
+ /**
89
+ * @returns {Promise<string>}
90
+ */
83
91
  async getCurrentPackage() {
84
- return (await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appPackage;
92
+ return /** @type {string} */ ((await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appPackage);
85
93
  },
86
94
  async background(seconds) {
87
95
  const adb = /** @type {ADB} */ (this.adb);
@@ -129,12 +137,12 @@ const GeneralMixin = {
129
137
  ? {
130
138
  // the activity is the original session activity, so use the original args
131
139
  pkg: /** @type {string} */ (this.opts.appPackage),
132
- activity: this.opts.appActivity,
140
+ activity: this.opts.appActivity ?? undefined,
133
141
  action: this.opts.intentAction,
134
142
  category: this.opts.intentCategory,
135
143
  flags: this.opts.intentFlags,
136
- waitPkg: this.opts.appWaitPackage,
137
- waitActivity: this.opts.appWaitActivity,
144
+ waitPkg: this.opts.appWaitPackage ?? undefined,
145
+ waitActivity: this.opts.appWaitActivity ?? undefined,
138
146
  waitForLaunch: this.opts.appWaitForLaunch,
139
147
  waitDuration: this.opts.appWaitDuration,
140
148
  optionalIntentArguments: this.opts.optionalIntentArguments,
@@ -144,9 +152,9 @@ const GeneralMixin = {
144
152
  : {
145
153
  // the activity was started some other way, so use defaults
146
154
  pkg: /** @type {string} */ (appPackage),
147
- activity: appActivity,
148
- waitPkg: appPackage,
149
- waitActivity: appActivity,
155
+ activity: appActivity ?? undefined,
156
+ waitPkg: appPackage ?? undefined,
157
+ waitActivity: appActivity ?? undefined,
150
158
  stopApp: false,
151
159
  };
152
160
  }
package/build/lib/commands/general.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":";;;;;AAAA,YAAY;AACZ,6CAAqC;AACrC,uCAAmC;AACnC,oDAAuB;AACvB,oDAA4B;AAC5B,iEAAgD;AAChD,oCAAqC;AACrC,qCAA+B;AAC/B,0CAAqC;AAErC,MAAM,qBAAqB,GAAG,sBAAsB,CAAC;AAErD;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,mBAAmB,EAAE,EAAE;IACvB,KAAK,CAAC,IAAI,CAAC,IAAI;QACb,4CAA4C;QAC5C,IAAI,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9C;;WAEG;QACH,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,KAAK;SACf,CAAC;QACF,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YAC7B,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;SAC/B;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAM;QACrB,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAM,GAAG,qBAAqB;QAChD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,sDAAsD,GAAG,4BAA4B,MAAM,GAAG,CAC/F,CAAC;QACF,MAAM,eAAe,GAAG,CACtB,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CACtE,CAAC,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG,gBAAM,CAAC,GAAG,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;QAC7E,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE;YAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACtE,OAAO,eAAe,CAAC;SACxB;QACD,+BAA+B;QAC/B,OAAO,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAI,GAAG,EAAE;QACjC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,OAAO;QAChC,MAAM,GAAG,GAAG,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,EAAC,UAAU,EAAE,WAAW,EAAC,GAAG,MAAM,GAAG,CAAC,4BAA4B,EAAE,CAAC;QACzE,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,oBAAoB,OAAO,EAAE,CAAC,CAAC,CAAC;QACtE,MAAM,GAAG,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,UAAU;IACV,KAAK,CAAC,aAAa;QACjB,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO;YACL,KAAK;YACL,MAAM;YACN,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;SACL,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,OAAO,CAAC,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,4BAA4B,EAAE,CAAC,CAAC,WAAW,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,CAAC,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,4BAA4B,EAAE,CAAC,CAAC,UAAU,CAAC;IACzF,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAO;QACtB,MAAM,GAAG,GAAG,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,CAAC,EAAE;YACf,gFAAgF;YAChF,mCAAmC;YACnC,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,EAAC,UAAU,EAAE,WAAW,EAAC,GAAG,MAAM,GAAG,CAAC,4BAA4B,EAAE,CAAC;QACzE,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;QAErB,0FAA0F;QAC1F,yBAAyB;QACzB,MAAM,OAAO,GAAG,OAAO,GAAG,IAAI,CAAC;QAC/B,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,qDAAqD;QACpF,oFAAoF;QACpF,MAAM,UAAU,GAAG,gBAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E;;;WAGG;QACH,MAAM,UAAU,GAAG,CAAC,EAAC,SAAS,EAAE,QAAQ,EAAC,EAAE,EAAE;YAC3C,MAAM,QAAQ,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,QAAQ,aAAa,WAAW,IAAI,CAAC,CAAC;QACjE,CAAC,CAAC;QACF,MAAM,IAAA,oBAAS,EAAC,OAAO,EAAE,EAAC,WAAW,EAAE,UAAU,EAAE,UAAU,EAAC,CAAC,CAAC;QAEhE,mDAAmD;QACnD,IAAI,IAAI,CAAC;QACT,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC,EAAE;YACxF,8EAA8E;YAC9E,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,UAAU,IAAI,WAAW,EAAE,CAAC,CAAC;SACjE;aAAM;YACL,IAAI;gBACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,UAAU,0BAA0B,CAAC,CAAC;gBACxE,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC3D,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,GAAG,EAAE,GAAE;YAChB,IAAI;gBACF,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;oBAC9E,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,cAAc;wBACtC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;oBAC3E,CAAC,CAAC;wBACE,0EAA0E;wBAC1E,GAAG,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;wBACjD,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;wBAC/B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;wBAC9B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;wBAClC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;wBAC5B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;wBACjC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;wBACvC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB;wBACzC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;wBACvC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,uBAAuB;wBAC1D,OAAO,EAAE,KAAK;wBACd,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;qBAC5B;oBACH,CAAC,CAAC;wBACE,2DAA2D;wBAC3D,GAAG,EAAE,qBAAqB,CAAC,CAAC,UAAU,CAAC;wBACvC,QAAQ,EAAE,WAAW;wBACrB,OAAO,EAAE,UAAU;wBACnB,YAAY,EAAE,WAAW;wBACzB,OAAO,EAAE,KAAK;qBACf,CAAC;SACT;QACD,IAAI,GAAG,mDAAmD,CAAC,CACzD,gBAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,gBAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CACjD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2DAA2D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAClF,CAAC;QACF,OAAO,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAQ;QACvB,MAAM,GAAG,GAAG,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,MAAM,GAAG,CAAC,iBAAiB,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iDAAiD,QAAQ,EAAE,CAAC,CAAC;SAC5E;QAED,0DAA0D;QAC1D,4BAA4B;QAC5B,oCAAoC;QACpC,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,EAAE;YACvC,2BAA2B;YAC3B,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC7C,MAAM,CAAC,GAAG,CAAC,GAAG,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aACjE;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC7B,wBAAwB;YACxB,OAAO,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;SACxD;QAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,iBAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvF,OAAO,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,UAAU,EACV,WAAW,EACX,cAAc,EACd,eAAe,EACf,YAAY,EACZ,cAAc,EACd,WAAW,EACX,uBAAuB,EACvB,kBAAkB;QAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,UAAU,mBAAmB,WAAW,GAAG,CAAC,CAAC;QAEjF,wEAAwE;QACxE,wDAAwD;QACxD,IAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;YACtC,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;SACrD;QAED,mDAAmD;QACnD,IAAI,IAAI,GAAG;YACT,GAAG,EAAE,UAAU;YACf,QAAQ,EAAE,WAAW;YACrB,OAAO,EAAE,cAAc,IAAI,UAAU;YACrC,YAAY,EAAE,eAAe,IAAI,WAAW;YAC5C,MAAM,EAAE,YAAY;YACpB,QAAQ,EAAE,cAAc;YACxB,KAAK,EAAE,WAAW;YAClB,uBAAuB;YACvB,OAAO,EAAE,CAAC,kBAAkB;SAC7B,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC;QACxE,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,iBAAc,CAAC,QAAQ;QAC3B,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAC7B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAChD,CAAC;QACF,0FAA0F;QAC1F,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;YAC3C,GAAG,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YACjD,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAC/B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YAC9B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;YAClC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAC5B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;YACjC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;YACvC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB;YACzC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;YACvC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,uBAAuB;YAC1D,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB;YACtC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,+EAA+E;IAC/E,+CAA+C;IAC/C,KAAK,CAAC,MAAM,CAAC,GAAG;QACd,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,+BAA+B;IAC/B,KAAK,CAAC,QAAQ;QACZ,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5F,0FAA0F;QAC1F,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,qCAAqC;QACrC,IAAI,GAAG,GAAG,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC;QACtF,IAAI,GAAG,EAAE;YACP,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC5B,yDAAyD;YACzD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACf,OAAO,GAAG,CAAC;aACZ;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,GAAG,GAAG,CAAC,CAAC;SAC1D;QACD,4CAA4C;QAC5C,GAAG,GAAG,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACpF,IAAI,GAAG,EAAE;YACP,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACf,OAAO,GAAG,CAAC;aACZ;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,GAAG,GAAG,CAAC,CAAC;SAC1D;QACD,sCAAsC;QACtC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,yCAAyC,CAAC,CAAC;QAClE,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC,cAAc;IACnC,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,IAAI;QAClC,MAAM,EAAC,MAAM,EAAC,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7C,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,OAAO,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAI;QACtB,OAAO,MAAM,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAI,GAAG,EAAE;QAC1B,MAAM,EAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAC,GAAG,IAAI,CAAC;QAC9C,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE;YACjB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;SACrB;aAAM;YACL,0EAA0E;YAC1E,MAAM,iBAAc,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC/D,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,IAAI;gBAChB,cAAc,EAAE,QAAQ;gBACxB,oBAAoB,EAAE,SAAS;aAChC,CAAC,CAAC;SACJ;IACH,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,YAAY,CAAC,CAAC;AAEpB,kBAAe,YAAY,CAAC;AAE5B;;;GAGG"}
1
+ {"version":3,"file":"general.js","sourceRoot":"","sources":["../../../lib/commands/general.js"],"names":[],"mappings":"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"}
package/build/lib/driver.d.ts CHANGED
@@ -390,7 +390,7 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
390
390
  };
391
391
  };
392
392
  jwpProxyAvoid: RouteMatcher[];
393
- adb?: ADB;
393
+ adb: ADB;
394
394
  unlocker: typeof helpers.unlocker;
395
395
  apkStrings: StringRecord<StringRecord<string>>;
396
396
  proxyReqRes?: (...args: any) => any;
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,KAAK,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAmC,EAAC,wBAAwB,EAAC,MAAM,eAAe,CAAC;AACnF,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,wBAAwB,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC,wBAAwB,CAAC,CAAC;AAC3E,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,wBAAwB,CAAC,CAAC;AAErE,KAAK,qBAAqB,GAAG,cAAc,CAAC,wBAAwB,CAAC,CAAC;AACtE,cAAM,aACJ,SAAQ,UAAU,CAAC,wBAAwB,EAAE,YAAY,CACzD,YAAW,cAAc,CAAC,wBAAwB,EAAE,MAAM,EAAE,YAAY,CAAC;IAEzE,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IACnC,aAAa,EAAE,YAAY,EAAE,CAAC;IAE9B,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,QAAQ,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAElC,UAAU,EAAE,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/C,WAAW,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAEpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB,oBAAoB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAEvD,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAElC,YAAY,CAAC,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IACrD,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IAEnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,IAAI,EAAE,iBAAiB,CAAC;gBAEZ,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAoB5E,UAAU;IAIV,IAAI,eAAe,YAElB;CACF;AAED,OAAO,EAAC,QAAQ,IAAI,eAAe,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,CAAC"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,KAAK,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAmC,EAAC,wBAAwB,EAAC,MAAM,eAAe,CAAC;AACnF,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAGlC,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,wBAAwB,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC,wBAAwB,CAAC,CAAC;AAC3E,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,wBAAwB,CAAC,CAAC;AAErE,KAAK,qBAAqB,GAAG,cAAc,CAAC,wBAAwB,CAAC,CAAC;AACtE,cAAM,aACJ,SAAQ,UAAU,CAAC,wBAAwB,EAAE,YAAY,CACzD,YAAW,cAAc,CAAC,wBAAwB,EAAE,MAAM,EAAE,YAAY,CAAC;IAEzE,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IACnC,aAAa,EAAE,YAAY,EAAE,CAAC;IAE9B,GAAG,EAAE,GAAG,CAAC;IAET,QAAQ,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAElC,UAAU,EAAE,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/C,WAAW,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;IAEpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB,oBAAoB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAEvD,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAElC,YAAY,CAAC,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IACrD,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IAEnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,IAAI,EAAE,iBAAiB,CAAC;gBAEZ,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAoB5E,UAAU;IAIV,IAAI,eAAe,YAElB;CACF;AAED,OAAO,EAAC,QAAQ,IAAI,eAAe,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,CAAC"}
package/build/lib/helpers/android.js CHANGED
@@ -292,7 +292,7 @@ const AndroidHelpers = {
292
292
  // @ts-expect-error do not put arbitrary properties on opts
293
293
  const { udid, emPort } = opts ?? {};
294
294
  const adb = await AndroidHelpers.createBaseADB(opts);
295
- adb.setDeviceId(udid);
295
+ adb.setDeviceId(udid ?? '');
296
296
  if (emPort) {
297
297
  adb.setEmulatorPort(emPort);
298
298
  }
@@ -621,7 +621,7 @@ const AndroidHelpers = {
621
621
  const stringsTmpDir = node_path_1.default.resolve(opts.tmpDir, opts.appPackage);
622
622
  try {
623
623
  logger_1.default.debug('Extracting strings from apk', app, language, stringsTmpDir);
624
- const { apkStrings, localPath } = await adb.extractStringsFromApk(app, language, stringsTmpDir);
624
+ const { apkStrings, localPath } = await adb.extractStringsFromApk(app, language ?? null, stringsTmpDir);
625
625
  await adb.push(localPath, remoteDir);
626
626
  return apkStrings;
627
627
  }
package/build/lib/helpers/android.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"android.js","sourceRoot":"","sources":["../../../lib/helpers/android.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"android.js","sourceRoot":"","sources":["../../../lib/helpers/android.ts"],"names":[],"mappings":"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"}
package/lib/commands/actions.js CHANGED
@@ -148,7 +148,7 @@ const ActionsMixin = {
148
148
  if (!this.isEmulator()) {
149
149
  this.log.errorAndThrow('gsmCall method is only available for emulators');
150
150
  }
151
- await /** @type {ADB} */ (this.adb).gsmCall(phoneNumber, action);
151
+ await /** @type {ADB} */ (this.adb).gsmCall(phoneNumber, /** @type {any} */(action));
152
152
  },
153
153
 
154
154
  async mobileGsmCall(opts) {
@@ -227,7 +227,7 @@ const ActionsMixin = {
227
227
  if (!this.isEmulator()) {
228
228
  this.log.errorAndThrow('sensorSet method is only available for emulators');
229
229
  }
230
- await /** @type {ADB} */ (this.adb).sensorSet(sensorType, value);
230
+ await /** @type {ADB} */ (this.adb).sensorSet(sensorType, /** @type {any} */(value));
231
231
  },
232
232
 
233
233
  async getScreenshot() {
package/lib/commands/general.js CHANGED
@@ -69,7 +69,11 @@ const GeneralMixin = {
69
69
  const adb = /** @type {ADB} */ (this.adb);
70
70
  let {appPackage, appActivity} = await adb.getFocusedPackageAndActivity();
71
71
  await adb.shell(['am', 'start', '-a', `android.settings.${setting}`]);
72
- await adb.waitForNotActivity(/** @type {string} */ (appPackage), appActivity, 5000);
72
+ await adb.waitForNotActivity(
73
+ /** @type {string} */ (appPackage),
74
+ /** @type {string} */ (appActivity),
75
+ 5000
76
+ );
73
77
  },
74
78
 
75
79
  async getWindowSize() {
@@ -87,12 +91,18 @@ const GeneralMixin = {
87
91
  };
88
92
  },
89
93
 
94
+ /**
95
+ * @returns {Promise<string>}
96
+ */
90
97
  async getCurrentActivity() {
91
- return (await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appActivity;
98
+ return /** @type {string} */ ((await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appActivity);
92
99
  },
93
100
 
101
+ /**
102
+ * @returns {Promise<string>}
103
+ */
94
104
  async getCurrentPackage() {
95
- return (await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appPackage;
105
+ return /** @type {string} */ ((await /** @type {ADB} */ (this.adb).getFocusedPackageAndActivity()).appPackage);
96
106
  },
97
107
 
98
108
  async background(seconds) {
@@ -141,12 +151,12 @@ const GeneralMixin = {
141
151
  ? {
142
152
  // the activity is the original session activity, so use the original args
143
153
  pkg: /** @type {string} */ (this.opts.appPackage),
144
- activity: this.opts.appActivity,
154
+ activity: this.opts.appActivity ?? undefined,
145
155
  action: this.opts.intentAction,
146
156
  category: this.opts.intentCategory,
147
157
  flags: this.opts.intentFlags,
148
- waitPkg: this.opts.appWaitPackage,
149
- waitActivity: this.opts.appWaitActivity,
158
+ waitPkg: this.opts.appWaitPackage ?? undefined,
159
+ waitActivity: this.opts.appWaitActivity ?? undefined,
150
160
  waitForLaunch: this.opts.appWaitForLaunch,
151
161
  waitDuration: this.opts.appWaitDuration,
152
162
  optionalIntentArguments: this.opts.optionalIntentArguments,
@@ -156,9 +166,9 @@ const GeneralMixin = {
156
166
  : {
157
167
  // the activity was started some other way, so use defaults
158
168
  pkg: /** @type {string} */ (appPackage),
159
- activity: appActivity,
160
- waitPkg: appPackage,
161
- waitActivity: appActivity,
169
+ activity: appActivity ?? undefined,
170
+ waitPkg: appPackage ?? undefined,
171
+ waitActivity: appActivity ?? undefined,
162
172
  stopApp: false,
163
173
  };
164
174
  }
package/lib/driver.ts CHANGED
@@ -29,7 +29,7 @@ class AndroidDriver
29
29
  static newMethodMap = newMethodMap;
30
30
  jwpProxyAvoid: RouteMatcher[];
31
31
 
32
- adb?: ADB;
32
+ adb: ADB;
33
33
 
34
34
  unlocker: typeof helpers.unlocker;
35
35
 
package/lib/helpers/android.ts CHANGED
@@ -465,7 +465,7 @@ const AndroidHelpers: AndroidHelpers = {
465
465
  // @ts-expect-error do not put arbitrary properties on opts
466
466
  const {udid, emPort} = opts ?? {};
467
467
  const adb = await AndroidHelpers.createBaseADB(opts);
468
- adb.setDeviceId(udid);
468
+ adb.setDeviceId(udid ?? '');
469
469
  if (emPort) {
470
470
  adb.setEmulatorPort(emPort);
471
471
  }
@@ -882,7 +882,7 @@ const AndroidHelpers: AndroidHelpers = {
882
882
  logger.debug('Extracting strings from apk', app!, language, stringsTmpDir);
883
883
  const {apkStrings, localPath} = await adb.extractStringsFromApk(
884
884
  app!,
885
- language,
885
+ language ?? null,
886
886
  stringsTmpDir
887
887
  );
888
888
  await adb.push(localPath, remoteDir);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "7.1.0",
3
+ "version": "7.1.2",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "appium",
@@ -55,7 +55,7 @@
55
55
  "singleQuote": true
56
56
  },
57
57
  "dependencies": {
58
- "appium-adb": "^9.12.0",
58
+ "appium-adb": "^10.0.0",
59
59
  "appium-chromedriver": "^5.5.1",
60
60
  "asyncbox": "^2.8.0",
61
61
  "axios": "^1.x",