appium-espresso-driver 8.3.1 → 8.4.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 (69) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/commands/element.d.ts.map +1 -1
  3. package/build/lib/commands/element.js +2 -6
  4. package/build/lib/commands/element.js.map +1 -1
  5. package/build/lib/commands/screenshot.d.ts.map +1 -1
  6. package/build/lib/commands/screenshot.js +5 -7
  7. package/build/lib/commands/screenshot.js.map +1 -1
  8. package/build/lib/doctor/required-checks.js +1 -1
  9. package/build/lib/doctor/required-checks.js.map +1 -1
  10. package/build/lib/driver.d.ts +5 -11
  11. package/build/lib/driver.d.ts.map +1 -1
  12. package/build/lib/driver.js +42 -27
  13. package/build/lib/driver.js.map +1 -1
  14. package/build/lib/espresso-runner.d.ts.map +1 -1
  15. package/build/lib/espresso-runner.js +4 -5
  16. package/build/lib/espresso-runner.js.map +1 -1
  17. package/build/lib/server-builder.d.ts.map +1 -1
  18. package/build/lib/server-builder.js +14 -15
  19. package/build/lib/server-builder.js.map +1 -1
  20. package/build/lib/utils/app.d.ts +16 -0
  21. package/build/lib/utils/app.d.ts.map +1 -0
  22. package/build/lib/utils/app.js +32 -0
  23. package/build/lib/utils/app.js.map +1 -0
  24. package/build/lib/utils/gradle.d.ts +17 -0
  25. package/build/lib/utils/gradle.d.ts.map +1 -0
  26. package/build/lib/utils/gradle.js +55 -0
  27. package/build/lib/utils/gradle.js.map +1 -0
  28. package/build/lib/utils/index.d.ts +5 -0
  29. package/build/lib/utils/index.d.ts.map +1 -0
  30. package/build/lib/utils/index.js +21 -0
  31. package/build/lib/utils/index.js.map +1 -0
  32. package/build/lib/utils/package.d.ts +21 -0
  33. package/build/lib/utils/package.d.ts.map +1 -0
  34. package/build/lib/utils/package.js +77 -0
  35. package/build/lib/utils/package.js.map +1 -0
  36. package/build/lib/utils/predicates.d.ts +7 -0
  37. package/build/lib/utils/predicates.d.ts.map +1 -0
  38. package/build/lib/utils/predicates.js +34 -0
  39. package/build/lib/utils/predicates.js.map +1 -0
  40. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  41. package/espresso-server/buildSrc/.gradle/9.5.0/executionHistory/executionHistory.bin +0 -0
  42. package/espresso-server/buildSrc/.gradle/9.5.0/executionHistory/executionHistory.lock +0 -0
  43. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  44. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
  45. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  46. package/espresso-server/buildSrc/.gradle/file-system.probe +0 -0
  47. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
  48. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  49. package/lib/commands/element.ts +2 -3
  50. package/lib/commands/screenshot.ts +5 -4
  51. package/lib/constraints.ts +1 -1
  52. package/lib/doctor/required-checks.ts +1 -1
  53. package/lib/driver.ts +60 -41
  54. package/lib/espresso-runner.ts +17 -10
  55. package/lib/execute-method-map.ts +1 -1
  56. package/lib/server-builder.ts +19 -24
  57. package/lib/utils/app.ts +36 -0
  58. package/lib/utils/gradle.ts +62 -0
  59. package/lib/utils/index.ts +4 -0
  60. package/lib/utils/package.ts +75 -0
  61. package/lib/utils/predicates.ts +30 -0
  62. package/npm-shrinkwrap.json +124 -154
  63. package/package.json +5 -4
  64. package/scripts/build-espresso.mjs +2 -2
  65. package/build/lib/utils.d.ts +0 -45
  66. package/build/lib/utils.d.ts.map +0 -1
  67. package/build/lib/utils.js +0 -145
  68. package/build/lib/utils.js.map +0 -1
  69. package/lib/utils.ts +0 -160
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [8.4.0](https://github.com/appium/appium-espresso-driver/compare/v8.3.1...v8.4.0) (2026-05-12)
2
+
3
+ ### Features
4
+
5
+ * Ditch lodash ([#1160](https://github.com/appium/appium-espresso-driver/issues/1160)) ([1c3d3b4](https://github.com/appium/appium-espresso-driver/commit/1c3d3b48acb132cc06965188b92ae39b310a4c58))
6
+
1
7
  ## [8.3.1](https://github.com/appium/appium-espresso-driver/compare/v8.3.0...v8.3.1) (2026-05-06)
2
8
 
3
9
  ### Miscellaneous Chores
package/build/lib/commands/element.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAE9C;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,EACzB,cAAc,CAAC,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,GAAG,CAAC,CASd;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAMd;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAMd;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,GAAG,CAAC,CAUd;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,CASd;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,GAAG,CAAC,CAYd;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,mBAAmB,CAAC,EAAE,MAAM,EAC5B,kBAAkB,CAAC,EAAE,MAAM,EAC3B,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC,CAYd;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,GAAG,CAAC,CAyBd;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAEf"}
1
+ {"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAE9C;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,EACzB,cAAc,CAAC,EAAE,MAAM,EACvB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,GAAG,CAAC,CASd;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAMd;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAMd;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,GAAG,CAAC,CAUd;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,CASd;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,GAAG,CAAC,CAYd;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,mBAAmB,CAAC,EAAE,MAAM,EAC5B,kBAAkB,CAAC,EAAE,MAAM,EAC3B,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,GAAG,CAAC,CAYd;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,GAAG,CAAC,CAyBd;AAED;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAEf"}
package/build/lib/commands/element.js CHANGED
@@ -1,7 +1,4 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.mobileFlashElement = mobileFlashElement;
7
4
  exports.mobileDismissAutofill = mobileDismissAutofill;
@@ -14,7 +11,6 @@ exports.mobileNavigateTo = mobileNavigateTo;
14
11
  exports.mobileClickAction = mobileClickAction;
15
12
  exports.mobileScrollToPage = mobileScrollToPage;
16
13
  exports.mobilePerformEditorAction = mobilePerformEditorAction;
17
- const lodash_1 = __importDefault(require("lodash"));
18
14
  const driver_1 = require("appium/driver");
19
15
  const support_1 = require("appium/support");
20
16
  /**
@@ -122,7 +118,7 @@ async function mobileSetTime(elementId, hours, minutes) {
122
118
  */
123
119
  async function mobileNavigateTo(elementId, menuItemId) {
124
120
  const menuItemIdAsNumber = parseInt(`${menuItemId}`, 10);
125
- if (lodash_1.default.isNaN(menuItemIdAsNumber) || menuItemIdAsNumber < 0) {
121
+ if (Number.isNaN(menuItemIdAsNumber) || menuItemIdAsNumber < 0) {
126
122
  throw new driver_1.errors.InvalidArgumentError(`'menuItemId' must be a non-negative number. Found ${menuItemId}`);
127
123
  }
128
124
  return await this.espresso.jwproxy.command(`/appium/execute_mobile/${elementId}/navigate_to`, 'POST', { menuItemId });
@@ -160,7 +156,7 @@ async function mobileClickAction(elementId, tapper, coordinatesProvider, precisi
160
156
  */
161
157
  async function mobileScrollToPage(elementId, scrollTo, scrollToPage, smoothScroll) {
162
158
  const scrollToTypes = ['first', 'last', 'left', 'right'];
163
- if (scrollTo && !lodash_1.default.includes(scrollToTypes, scrollTo)) {
159
+ if (scrollTo && !scrollToTypes.includes(scrollTo)) {
164
160
  throw new driver_1.errors.InvalidArgumentError(`"scrollTo" must be one of "${scrollToTypes.join(', ')}" found '${scrollTo}'`);
165
161
  }
166
162
  if ((scrollToPage ?? 0) < 0) {
package/build/lib/commands/element.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"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"}
package/build/lib/commands/screenshot.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../../lib/commands/screenshot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAK7C;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,eAAe,CAAC,CAgD1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAEzE"}
1
+ {"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../../lib/commands/screenshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;AAK7C;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,eAAe,CAAC,CAkD1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAEzE"}
package/build/lib/commands/screenshot.js CHANGED
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.mobileScreenshots = mobileScreenshots;
7
4
  exports.getScreenshot = getScreenshot;
8
- const lodash_1 = __importDefault(require("lodash"));
9
5
  // Display 4619827259835644672 (HWC display 0): port=0 pnpId=GGL displayName="EMU_display_0"
10
6
  const DISPLAY_PATTERN = /^Display\s+(\d+)\s+\(.+display\s+(\d+)\).+displayName="([^"]*)/gm;
11
7
  /**
@@ -30,7 +26,7 @@ async function mobileScreenshots(displayId) {
30
26
  name: match[3],
31
27
  };
32
28
  }
33
- if (lodash_1.default.isEmpty(infos)) {
29
+ if (Object.keys(infos).length === 0) {
34
30
  this.log.debug(displaysInfo);
35
31
  throw new Error('Cannot determine the information about connected Android displays');
36
32
  }
@@ -49,10 +45,12 @@ async function mobileScreenshots(displayId) {
49
45
  },
50
46
  };
51
47
  }
52
- const allInfos = lodash_1.default.values(infos);
48
+ const allInfos = Object.values(infos);
53
49
  const screenshots = await Promise.all(allInfos.map(({ id }) => toB64Screenshot(id)));
54
50
  const result = {};
55
- for (const [info, payload] of lodash_1.default.zip(allInfos, screenshots)) {
51
+ for (let i = 0; i < allInfos.length; i++) {
52
+ const info = allInfos[i];
53
+ const payload = screenshots[i];
56
54
  if (info && payload) {
57
55
  result[info.id] = {
58
56
  ...info,
package/build/lib/commands/screenshot.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../../lib/commands/screenshot.ts"],"names":[],"mappings":";;;;;AAkBA,8CAmDC;AAWD,sCAEC;AAlFD,oDAAuB;AAIvB,4FAA4F;AAC5F,MAAM,eAAe,GAAG,kEAAkE,CAAC;AAE3F;;;;;;;;;;GAUG;AACI,KAAK,UAAU,iBAAiB,CAErC,SAA2B;IAE3B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC;IACzF,MAAM,KAAK,GAAmE,EAAE,CAAC;IACjF,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;QACpD,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG;YAChB,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;YACZ,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG;YAC3B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;SACf,CAAC;IACJ,CAAC;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAExE,MAAM,eAAe,GAAG,KAAK,EAAE,MAAc,EAAmB,EAAE,CAChE,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC;IACtE,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,oCAAoC,SAAS,kBAAkB;gBAC7D,mDAAmD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAC7E,CAAC;QACJ,CAAC;QACD,OAAO;YACL,CAAC,YAAY,CAAC,EAAE;gBACd,GAAG,KAAK,CAAC,YAAY,CAAC;gBACtB,OAAO,EAAE,MAAM,eAAe,CAAC,YAAY,CAAC;aAC7C;SACF,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,gBAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,gBAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;QAC3D,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;gBAChB,GAAG,IAAI;gBACP,OAAO;aACR,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,aAAa;IACjC,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;AAC3E,CAAC"}
1
+ {"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../../lib/commands/screenshot.ts"],"names":[],"mappings":"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"}
package/build/lib/doctor/required-checks.js CHANGED
@@ -22,7 +22,7 @@ class JavaVersionCheck {
22
22
  if (!javaHome || !(await support_1.fs.exists(fullJavaPath))) {
23
23
  return support_1.doctor.nok(`Cannot retrieve Java version. Is Java installed and JAVA_HOME set to a proper path?`);
24
24
  }
25
- let javaVerMatch = null;
25
+ let javaVerMatch;
26
26
  try {
27
27
  const { stderr } = await (0, teen_process_1.exec)(fullJavaPath, ['-XshowSettings:properties', '-version']);
28
28
  javaVerMatch = this.JAVA_VERSION_PATTERN.exec(stderr);
package/build/lib/doctor/required-checks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"required-checks.js","sourceRoot":"","sources":["../../../lib/doctor/required-checks.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6D;AAC7D,+CAAkC;AAClC,4CAAkD;AAClD,0DAA6B;AAGhB,QAAA,gBAAgB,GAAG,8BAAY,CAAC,gBAAgB,CAAC;AACjD,QAAA,aAAa,GAAG,8BAAY,CAAC,aAAa,CAAC;AAC3C,QAAA,kBAAkB,GAAG,8BAAY,CAAC,kBAAkB,CAAC;AACrD,QAAA,eAAe,GAAG,8BAAY,CAAC,eAAe,CAAC;AAE5D,MAAa,gBAAgB;IAC3B,GAAG,CAAgB;IACnB,gBAAgB,GAAG,EAAE,CAAC;IACtB,oBAAoB,GAAG,mCAAmC,CAAC;IAE3D,KAAK,CAAC,QAAQ;QACZ,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QACvC,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAC5B,QAAQ,IAAI,EAAE,EACd,KAAK,EACL,OAAO,gBAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1C,CAAC;QACF,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YAClD,OAAO,gBAAM,CAAC,GAAG,CACf,qFAAqF,CACtF,CAAC;QACJ,CAAC;QACD,IAAI,YAAY,GAA2B,IAAI,CAAC;QAChD,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,YAAY,EAAE,CAAC,2BAA2B,EAAE,UAAU,CAAC,CAAC,CAAC;YACrF,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,gBAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,gBAAM,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,OAAO,QAAQ,GAAG,IAAI,CAAC,gBAAgB;YACrC,CAAC,CAAC,gBAAM,CAAC,GAAG,CAAC,2BAA2B,YAAY,CAAC,CAAC,CAAC,iCAAiC,CAAC;YACzF,CAAC,CAAC,gBAAM,CAAC,EAAE,CAAC,oCAAoC,QAAQ,OAAO,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,CACL,mBAAmB,IAAI,CAAC,gBAAgB,cAAc;YACtD,+DAA+D,CAChE,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/CD,4CA+CC;AACY,QAAA,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC"}
1
+ {"version":3,"file":"required-checks.js","sourceRoot":"","sources":["../../../lib/doctor/required-checks.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6D;AAC7D,+CAAkC;AAClC,4CAAkD;AAClD,0DAA6B;AAGhB,QAAA,gBAAgB,GAAG,8BAAY,CAAC,gBAAgB,CAAC;AACjD,QAAA,aAAa,GAAG,8BAAY,CAAC,aAAa,CAAC;AAC3C,QAAA,kBAAkB,GAAG,8BAAY,CAAC,kBAAkB,CAAC;AACrD,QAAA,eAAe,GAAG,8BAAY,CAAC,eAAe,CAAC;AAE5D,MAAa,gBAAgB;IAC3B,GAAG,CAAgB;IACnB,gBAAgB,GAAG,EAAE,CAAC;IACtB,oBAAoB,GAAG,mCAAmC,CAAC;IAE3D,KAAK,CAAC,QAAQ;QACZ,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QACvC,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAC5B,QAAQ,IAAI,EAAE,EACd,KAAK,EACL,OAAO,gBAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1C,CAAC;QACF,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YAClD,OAAO,gBAAM,CAAC,GAAG,CACf,qFAAqF,CACtF,CAAC;QACJ,CAAC;QACD,IAAI,YAAoC,CAAC;QACzC,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,YAAY,EAAE,CAAC,2BAA2B,EAAE,UAAU,CAAC,CAAC,CAAC;YACrF,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,gBAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,gBAAM,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,OAAO,QAAQ,GAAG,IAAI,CAAC,gBAAgB;YACrC,CAAC,CAAC,gBAAM,CAAC,GAAG,CAAC,2BAA2B,YAAY,CAAC,CAAC,CAAC,iCAAiC,CAAC;YACzF,CAAC,CAAC,gBAAM,CAAC,EAAE,CAAC,oCAAoC,QAAQ,OAAO,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,CACL,mBAAmB,IAAI,CAAC,gBAAgB,cAAc;YACtD,+DAA+D,CAChE,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/CD,4CA+CC;AACY,QAAA,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC"}
package/build/lib/driver.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { DriverData, ExternalDriver, InitialOpts, StringRecord, SingularSessionData, RouteMatcher, SessionCapabilities } from '@appium/types';
1
+ import type { DriverData, ExternalDriver, InitialOpts, PostProcessOptions, PostProcessResult, StringRecord, SingularSessionData, RouteMatcher, SessionCapabilities } from '@appium/types';
2
2
  import type { EspressoConstraints } from './constraints';
3
3
  import { EspressoRunner } from './espresso-runner';
4
4
  import * as appManagementCmds from './commands/app-management';
@@ -441,13 +441,7 @@ export declare class EspressoDriver extends AndroidDriver implements ExternalDri
441
441
  * @throws Raise an exception if the zip did not have any SUPPORTED_EXTENSIONS packages.
442
442
  */
443
443
  unzipApp(appPath: string): Promise<string>;
444
- onPostConfigureApp({ cachedAppInfo, isUrl, appPath }: {
445
- cachedAppInfo: any;
446
- isUrl: any;
447
- appPath: any;
448
- }): Promise<false | {
449
- appPath: null;
450
- }>;
444
+ onPostConfigureApp(opts: PostProcessOptions): Promise<PostProcessResult | undefined>;
451
445
  startEspressoSession(): Promise<void>;
452
446
  /**
453
447
  * Turn on or off animation scale.
@@ -463,9 +457,9 @@ export declare class EspressoDriver extends AndroidDriver implements ExternalDri
463
457
  initAUT(): Promise<void>;
464
458
  deleteSession(): Promise<void>;
465
459
  onSettingsUpdate(): Promise<void>;
466
- proxyActive(sessionId: any): boolean;
467
- canProxy(sessionId: any): boolean;
468
- getProxyAvoidList(sessionId: any): RouteMatcher[];
460
+ proxyActive(sessionId?: string | null): boolean;
461
+ canProxy(sessionId?: string | null): boolean;
462
+ getProxyAvoidList(sessionId?: string | null): RouteMatcher[];
469
463
  }
470
464
  export default EspressoDriver;
471
465
  //# sourceMappingURL=driver.d.ts.map
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/driver.js CHANGED
@@ -37,7 +37,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.EspressoDriver = void 0;
40
- const lodash_1 = __importDefault(require("lodash"));
41
40
  const node_path_1 = __importDefault(require("node:path"));
42
41
  const driver_1 = require("appium/driver");
43
42
  const espresso_runner_1 = require("./espresso-runner");
@@ -256,7 +255,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
256
255
  adbPort: appium_adb_1.DEFAULT_ADB_PORT,
257
256
  androidInstallTimeout: 90000,
258
257
  };
259
- lodash_1.default.defaults(this.opts, defaultOpts);
258
+ this.opts = Object.assign({}, defaultOpts, this.opts);
260
259
  if (this.isChromeSession) {
261
260
  if (this.opts.app) {
262
261
  this.log.warn(`'browserName' capability will be ignored`);
@@ -300,16 +299,15 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
300
299
  }
301
300
  catch (e) {
302
301
  await this.deleteSession();
303
- e.message +=
304
- `${lodash_1.default.endsWith(e.message, '.') ? '' : '.'} Check ` +
302
+ const cause = e instanceof Error ? e : new Error(String(e));
303
+ cause.message +=
304
+ `${cause.message.endsWith('.') ? '' : '.'} Check ` +
305
305
  'https://github.com/appium/appium-espresso-driver#troubleshooting ' +
306
306
  'regarding advanced session startup troubleshooting.';
307
307
  if ((0, driver_1.isErrorType)(e, driver_1.errors.SessionNotCreatedError)) {
308
308
  throw e;
309
309
  }
310
- const err = new driver_1.errors.SessionNotCreatedError(e.message);
311
- err.stack = e.stack;
312
- throw err;
310
+ throw new driver_1.errors.SessionNotCreatedError(cause.message, cause);
313
311
  }
314
312
  }
315
313
  /**
@@ -322,7 +320,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
322
320
  */
323
321
  async unzipApp(appPath) {
324
322
  const useSystemUnzipEnv = process.env.APPIUM_PREFER_SYSTEM_UNZIP;
325
- const useSystemUnzip = lodash_1.default.isEmpty(useSystemUnzipEnv) || !['0', 'false'].includes(lodash_1.default.toLower(useSystemUnzipEnv));
323
+ const useSystemUnzip = !useSystemUnzipEnv || !['0', 'false'].includes(useSystemUnzipEnv.toLowerCase());
326
324
  const tmpRoot = await support_1.tempDir.openDir();
327
325
  await support_1.zip.extractAllTo(appPath, tmpRoot, { useSystemUnzip });
328
326
  const globPattern = `**/*.+(${SUPPORTED_EXTENSIONS.map((ext) => ext.replace(/^\./, '')).join('|')})`;
@@ -335,11 +333,15 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
335
333
  `extension packages. Please make sure the provided .zip archive contains at ` +
336
334
  `least one valid application package.`);
337
335
  }
338
- const unzippedAppPath = node_path_1.default.join(tmpRoot, lodash_1.default.first(sortedBundleItems));
336
+ const unzippedAppPath = node_path_1.default.join(tmpRoot, sortedBundleItems[0]);
339
337
  this.log.debug(`'${unzippedAppPath}' is the unzipped file from '${appPath}'`);
340
338
  return unzippedAppPath;
341
339
  }
342
- async onPostConfigureApp({ cachedAppInfo, isUrl, appPath }) {
340
+ async onPostConfigureApp(opts) {
341
+ const { cachedAppInfo, isUrl, appPath } = opts;
342
+ if (!appPath) {
343
+ return undefined;
344
+ }
343
345
  const presignApp = async (appLocation) => {
344
346
  if (this.opts.noSign) {
345
347
  this.log.info('Skipping application signing because noSign capability is set to true. ' +
@@ -350,12 +352,12 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
350
352
  await this.adb.sign(appLocation);
351
353
  }
352
354
  };
353
- const hasApkExt = (appPath) => lodash_1.default.endsWith(lodash_1.default.toLower(appPath), APK_EXT);
354
- const hasAabExt = (appPath) => lodash_1.default.endsWith(lodash_1.default.toLower(appPath), AAB_EXT);
355
- const extractUniversalApk = async (shouldExtract, appPath) => shouldExtract ? appPath : await this.adb.extractUniversalApk(appPath);
355
+ const hasApkExt = (p) => p.toLowerCase().endsWith(APK_EXT);
356
+ const hasAabExt = (p) => p.toLowerCase().endsWith(AAB_EXT);
357
+ const extractUniversalApk = async (shouldExtract, p) => shouldExtract ? p : await this.adb.extractUniversalApk(p);
356
358
  let pathInCache = null;
357
359
  let isResultAppPathAlreadyCached = false;
358
- if (lodash_1.default.isPlainObject(cachedAppInfo)) {
360
+ if ((0, utils_1.isCachedAppInfo)(cachedAppInfo)) {
359
361
  const packageHash = await support_1.fs.hash(appPath);
360
362
  if (packageHash === cachedAppInfo.packageHash && (await support_1.fs.exists(cachedAppInfo.fullPath))) {
361
363
  this.log.info(`Using '${cachedAppInfo.fullPath}' which is cached from '${appPath}'`);
@@ -384,9 +386,12 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
384
386
  // Clean up the temporarily downloaded .aab or .zip package
385
387
  await support_1.fs.rimraf(appPath);
386
388
  }
387
- if (hasAabExt(unzippedAppPath)) {
389
+ if (unzippedAppPath !== undefined && hasAabExt(unzippedAppPath)) {
388
390
  // Cleanup the local unzipped .aab file
389
- await support_1.fs.rimraf(/** @type {string} */ unzippedAppPath);
391
+ await support_1.fs.rimraf(unzippedAppPath);
392
+ }
393
+ if (pathInCache == null) {
394
+ throw this.log.errorWithException('Expected a cached app path after post-processing');
390
395
  }
391
396
  await presignApp(pathInCache);
392
397
  }
@@ -396,7 +401,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
396
401
  await presignApp(appPath);
397
402
  }
398
403
  }
399
- return shouldResultAppPathBeCached ? { appPath: pathInCache } : false;
404
+ return shouldResultAppPathBeCached && pathInCache != null ? { appPath: pathInCache } : undefined;
400
405
  }
401
406
  // TODO much of this logic is duplicated from uiautomator2
402
407
  async startEspressoSession() {
@@ -575,8 +580,15 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
575
580
  await this.adb.addToDeviceIdleWhitelist(io_appium_settings_1.SETTINGS_HELPER_ID, espresso_runner_1.TEST_APK_PKG);
576
581
  }
577
582
  catch (e) {
583
+ const stderr = typeof e === 'object' &&
584
+ e !== null &&
585
+ 'stderr' in e &&
586
+ typeof e.stderr === 'string'
587
+ ? e.stderr
588
+ : undefined;
589
+ const message = e instanceof Error ? e.message : String(e);
578
590
  this.log.warn(`Cannot add server packages to the Doze whitelist. Original error: ` +
579
- (e.stderr || e.message));
591
+ (stderr || message));
580
592
  }
581
593
  }
582
594
  }
@@ -584,7 +596,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
584
596
  this.log.debug('Deleting espresso session');
585
597
  const screenRecordingStopTasks = [
586
598
  async () => {
587
- if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
599
+ if (!(0, utils_1.isEmptyValue)(this._screenRecordingProperties)) {
588
600
  await this.stopRecordingScreen();
589
601
  }
590
602
  },
@@ -594,7 +606,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
594
606
  }
595
607
  },
596
608
  async () => {
597
- if (!lodash_1.default.isEmpty(this._screenStreamingProps)) {
609
+ if (!(0, utils_1.isEmptyValue)(this._screenStreamingProps)) {
598
610
  await this.mobileStopScreenStreaming();
599
611
  }
600
612
  },
@@ -618,7 +630,8 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
618
630
  await this.settingsApp.setAnimationState(true);
619
631
  }
620
632
  catch (err) {
621
- this.log.warn(`Unable to reset animation: ${err.message}`);
633
+ const message = err instanceof Error ? err.message : String(err);
634
+ this.log.warn(`Unable to reset animation: ${message}`);
622
635
  }
623
636
  }
624
637
  if (this._originalIme) {
@@ -626,7 +639,8 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
626
639
  await this.adb.setIME(this._originalIme);
627
640
  }
628
641
  catch (e) {
629
- this.log.warn(`Cannot restore the original IME: ${e.message}`);
642
+ const message = e instanceof Error ? e.message : String(e);
643
+ this.log.warn(`Cannot restore the original IME: ${message}`);
630
644
  }
631
645
  }
632
646
  if (!this.isChromeSession && this.opts.appPackage && !this.opts.dontStopAppOnReset) {
@@ -648,7 +662,8 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
648
662
  await this.adb.removePortForward(this.opts.systemPort);
649
663
  }
650
664
  catch (error) {
651
- this.log.warn(`Unable to remove port forward '${error.message}'`);
665
+ const message = error instanceof Error ? error.message : String(error);
666
+ this.log.warn(`Unable to remove port forward '${message}'`);
652
667
  //Ignore, this block will also be called when we fall in catch block
653
668
  // and before even port forward.
654
669
  }
@@ -658,21 +673,21 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
658
673
  // intentionally do nothing here, since commands.updateSettings proxies
659
674
  // settings to the espresso server already
660
675
  }
661
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
662
676
  proxyActive(sessionId) {
677
+ void sessionId;
663
678
  // we always have an active proxy to the espresso server
664
679
  return true;
665
680
  }
666
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
667
681
  canProxy(sessionId) {
682
+ void sessionId;
668
683
  // we can always proxy to the espresso server
669
684
  return true;
670
685
  }
671
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
672
686
  getProxyAvoidList(sessionId) {
687
+ void sessionId;
673
688
  // we are maintaining two sets of NO_PROXY lists, one for chromedriver(CHROME_NO_PROXY)
674
689
  // and one for Espresso(NO_PROXY), based on current context will return related NO_PROXY list
675
- this.jwpProxyAvoid = lodash_1.default.isNil(this.chromedriver) ? NO_PROXY : CHROME_NO_PROXY;
690
+ this.jwpProxyAvoid = this.chromedriver == null ? NO_PROXY : CHROME_NO_PROXY;
676
691
  if (this.opts.nativeWebScreenshot) {
677
692
  this.jwpProxyAvoid = [
678
693
  ...this.jwpProxyAvoid,
package/build/lib/driver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/espresso-runner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"espresso-runner.d.ts","sourceRoot":"","sources":["../../lib/espresso-runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"espresso-runner.d.ts","sourceRoot":"","sources":["../../lib/espresso-runner.ts"],"names":[],"mappings":"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"}
package/build/lib/espresso-runner.js CHANGED
@@ -42,7 +42,6 @@ const asyncbox_1 = require("asyncbox");
42
42
  const server_builder_1 = require("./server-builder");
43
43
  const node_path_1 = __importDefault(require("node:path"));
44
44
  const support_1 = require("appium/support");
45
- const lodash_1 = __importDefault(require("lodash"));
46
45
  const utils_1 = require("./utils");
47
46
  const axios_1 = __importDefault(require("axios"));
48
47
  const semver = __importStar(require("semver"));
@@ -228,7 +227,7 @@ class EspressoRunner {
228
227
  this.log.info(`Building espresso server in '${serverPath}'`);
229
228
  this.log.debug(`The build folder root could be customized by changing the 'tmpDir' capability`);
230
229
  await support_1.fs.rimraf(serverPath);
231
- await (0, support_1.mkdirp)(serverPath);
230
+ await support_1.fs.mkdirp(serverPath);
232
231
  this.log.debug(`Copying espresso server template from ('${TEST_SERVER_ROOT}' to '${serverPath}')`);
233
232
  await (0, utils_1.copyGradleProjectRecursively)(TEST_SERVER_ROOT, serverPath);
234
233
  this.log.debug('Bulding espresso server');
@@ -257,7 +256,7 @@ class EspressoRunner {
257
256
  'disableAnalytics',
258
257
  'true', // To avoid unexpected error by google analytics
259
258
  ];
260
- if (lodash_1.default.isBoolean(this.disableSuppressAccessibilityService)) {
259
+ if (typeof this.disableSuppressAccessibilityService === 'boolean') {
261
260
  cmd.push('-e', 'DISABLE_SUPPRESS_ACCESSIBILITY_SERVICES', String(this.disableSuppressAccessibilityService));
262
261
  }
263
262
  cmd.push(`${exports.TEST_APK_PKG}/androidx.test.runner.AndroidJUnitRunner`);
@@ -276,7 +275,7 @@ class EspressoRunner {
276
275
  });
277
276
  this.instProcess.on('output', (stdout, stderr) => {
278
277
  const line = stdout || stderr;
279
- if (lodash_1.default.isEmpty(line.trim())) {
278
+ if (!line.trim()) {
280
279
  // Do not print empty lines into the system log
281
280
  return;
282
281
  }
@@ -381,7 +380,7 @@ class EspressoRunner {
381
380
  this.log.info(`Recorded the target application package '${this.appPackage}' to ${TARGET_PACKAGE_CONTAINER}`);
382
381
  }
383
382
  async _verifyServerStatus(driverVersion, serverStatus) {
384
- if (!lodash_1.default.isPlainObject(serverStatus) || !lodash_1.default.isPlainObject(serverStatus.build)) {
383
+ if (!(0, utils_1.isPlainObject)(serverStatus) || !(0, utils_1.isPlainObject)(serverStatus.build)) {
385
384
  throw this.log.errorWithException(`The Espresso server version integrated with the application under test is not compatible ` +
386
385
  `with the current driver version '${driverVersion}'.`);
387
386
  }