appium-adb 14.1.0 → 14.1.1
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 +6 -0
- package/build/lib/adb.d.ts.map +1 -1
- package/build/lib/adb.js.map +1 -1
- package/build/lib/helpers.d.ts.map +1 -1
- package/build/lib/helpers.js +3 -3
- package/build/lib/helpers.js.map +1 -1
- package/build/lib/logcat.d.ts.map +1 -1
- package/build/lib/logcat.js +16 -6
- package/build/lib/logcat.js.map +1 -1
- package/build/lib/logger.js.map +1 -1
- package/build/lib/tools/aab-utils.d.ts.map +1 -1
- package/build/lib/tools/aab-utils.js +25 -18
- package/build/lib/tools/aab-utils.js.map +1 -1
- package/build/lib/tools/android-manifest.d.ts.map +1 -1
- package/build/lib/tools/android-manifest.js +36 -24
- package/build/lib/tools/android-manifest.js.map +1 -1
- package/build/lib/tools/apk-signing.d.ts.map +1 -1
- package/build/lib/tools/apk-signing.js +58 -37
- package/build/lib/tools/apk-signing.js.map +1 -1
- package/build/lib/tools/apk-utils.d.ts.map +1 -1
- package/build/lib/tools/apk-utils.js +46 -38
- package/build/lib/tools/apk-utils.js.map +1 -1
- package/build/lib/tools/apks-utils.d.ts.map +1 -1
- package/build/lib/tools/apks-utils.js +21 -14
- package/build/lib/tools/apks-utils.js.map +1 -1
- package/build/lib/tools/app-commands.d.ts.map +1 -1
- package/build/lib/tools/app-commands.js +44 -45
- package/build/lib/tools/app-commands.js.map +1 -1
- package/build/lib/tools/device-settings.d.ts.map +1 -1
- package/build/lib/tools/device-settings.js +38 -32
- package/build/lib/tools/device-settings.js.map +1 -1
- package/build/lib/tools/emu-constants.d.ts.map +1 -1
- package/build/lib/tools/emu-constants.js +4 -4
- package/build/lib/tools/emu-constants.js.map +1 -1
- package/build/lib/tools/emulator-commands.d.ts.map +1 -1
- package/build/lib/tools/emulator-commands.js +20 -17
- package/build/lib/tools/emulator-commands.js.map +1 -1
- package/build/lib/tools/fs-commands.d.ts.map +1 -1
- package/build/lib/tools/fs-commands.js +2 -1
- package/build/lib/tools/fs-commands.js.map +1 -1
- package/build/lib/tools/general-commands.d.ts.map +1 -1
- package/build/lib/tools/general-commands.js +11 -15
- package/build/lib/tools/general-commands.js.map +1 -1
- package/build/lib/tools/keyboard-commands.d.ts.map +1 -1
- package/build/lib/tools/keyboard-commands.js.map +1 -1
- package/build/lib/tools/lockmgmt.d.ts.map +1 -1
- package/build/lib/tools/lockmgmt.js +24 -23
- package/build/lib/tools/lockmgmt.js.map +1 -1
- package/build/lib/tools/logcat-commands.d.ts.map +1 -1
- package/build/lib/tools/logcat-commands.js.map +1 -1
- package/build/lib/tools/network-commands.d.ts.map +1 -1
- package/build/lib/tools/network-commands.js +0 -1
- package/build/lib/tools/network-commands.js.map +1 -1
- package/build/lib/tools/process-commands.d.ts.map +1 -1
- package/build/lib/tools/process-commands.js +1 -1
- package/build/lib/tools/process-commands.js.map +1 -1
- package/build/lib/tools/system-calls.d.ts.map +1 -1
- package/build/lib/tools/system-calls.js +30 -36
- package/build/lib/tools/system-calls.js.map +1 -1
- package/build/lib/tools/types.d.ts +6 -6
- package/build/lib/tools/types.d.ts.map +1 -1
- package/lib/adb.ts +20 -25
- package/lib/helpers.ts +48 -36
- package/lib/logcat.ts +32 -22
- package/lib/logger.ts +1 -2
- package/lib/tools/aab-utils.js +42 -33
- package/lib/tools/android-manifest.js +78 -54
- package/lib/tools/apk-signing.ts +123 -89
- package/lib/tools/apk-utils.ts +206 -109
- package/lib/tools/apks-utils.js +50 -40
- package/lib/tools/app-commands.ts +220 -135
- package/lib/tools/device-settings.ts +154 -124
- package/lib/tools/emu-constants.ts +4 -5
- package/lib/tools/emulator-commands.ts +113 -65
- package/lib/tools/fs-commands.js +9 -8
- package/lib/tools/general-commands.js +48 -51
- package/lib/tools/keyboard-commands.js +22 -20
- package/lib/tools/lockmgmt.js +80 -51
- package/lib/tools/logcat-commands.js +6 -6
- package/lib/tools/network-commands.js +11 -12
- package/lib/tools/process-commands.ts +28 -15
- package/lib/tools/system-calls.ts +319 -221
- package/lib/tools/types.ts +19 -10
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [14.1.1](https://github.com/appium/appium-adb/compare/v14.1.0...v14.1.1) (2025-12-07)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* apply npm run format ([#847](https://github.com/appium/appium-adb/issues/847)) ([c6244da](https://github.com/appium/appium-adb/commit/c6244da8364bb0bcdd14cf3618f6bb93e099a49b))
|
|
6
|
+
|
|
1
7
|
## [14.1.0](https://github.com/appium/appium-adb/compare/v14.0.7...v14.1.0) (2025-12-06)
|
|
2
8
|
|
|
3
9
|
### Features
|
package/build/lib/adb.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../../lib/adb.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../../lib/adb.ts"],"names":[],"mappings":"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"}
|
package/build/lib/adb.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adb.js","sourceRoot":"","sources":["../../lib/adb.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adb.js","sourceRoot":"","sources":["../../lib/adb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,sDAAyB;AACzB,uCAAsF;AACtF,qCAA6B;AAO7B,0EAA4D;AAC5D,2EAA6D;AAC7D,qEAAuD;AACvD,qEAAuD;AACvD,mEAAqD;AACrD,qEAAuD;AACvD,mEAAqD;AACrD,uEAAyD;AACzD,oEAAsD;AACtD,yEAA2D;AAC3D,4EAA8D;AAC9D,gFAAkE;AAClE,gEAAkD;AAClD,kEAAoD;AACpD,0EAA4D;AAC5D,wEAA0D;AAC1D,0EAA4D;AAE/C,QAAA,gBAAgB,GAAG,IAAI,CAAC;AACxB,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE,IAAA,2BAAiB,GAAE;IAC5B,UAAU,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAC;IAC1C,MAAM,EAAE,iBAAE,CAAC,MAAM,EAAE;IACnB,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,wBAAgB;IACzB,cAAc,EAAE,kCAAwB;IACxC,oBAAoB,EAAE,EAAE;IACxB,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,IAAI;IACnB,gBAAgB,EAAE,KAAK;CACf,CAAC;AAEX,MAAa,GAAG;IACd,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,SAAS,CAAqB;IAC9B,oBAAoB,CAAyB;IAC7C,qBAAqB,CAAsB;IAC3C,iBAAiB,CAAsB;IACvC,6BAA6B,CAAsB;IACnD,iBAAiB,CAAsB;IACvC,iBAAiB,CAAsC;IACvD,8BAA8B,CAAsB;IACpD,eAAe,CAAuC;IACtD,0BAA0B,CAAsB;IAEhD,OAAO,CAAU;IACjB,IAAI,CAAU;IACd,WAAW,CAAW;IACtB,YAAY,CAAU;IACtB,gBAAgB,CAAU;IAC1B,QAAQ,CAAU;IAClB,WAAW,CAAU;IACrB,UAAU,CAAgB;IAC1B,MAAM,CAAU;IAChB,WAAW,CAAU;IACrB,YAAY,CAAU;IACtB,MAAM,CAAU;IAChB,QAAQ,CAAgB;IACxB,kBAAkB,CAAW;IAC7B,cAAc,CAAU;IACxB,oBAAoB,CAAU;IAC9B,iBAAiB,CAAU;IAC3B,mBAAmB,CAAW;IAC9B,aAAa,CAAW;IACxB,aAAa,CAAU;IACvB,aAAa,CAAU;IACvB,sBAAsB,CAAW;IACjC,gBAAgB,CAAW;IAE3B,YAAY,OAAmB,EAAgB;QAC7C,MAAM,OAAO,GAAe,gBAAC,CAAC,YAAY,CAAC,IAAI,EAAE,gBAAC,CAAC,SAAS,CAAC,oBAAY,CAAC,CAAC,CAAC;QAC5E,gBAAC,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE9B,sFAAsF;QACtF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAA2B,CAAC;QAEtD,gEAAgE;QAChE,IAAI,OAAO,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5E,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC/B,CAAC;QAED,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;QACvC,CAAC;QAED,sEAAsE;QACtE,oEAAoE;QACpE,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAmB,EAAgB;QACvC,MAAM,eAAe,GAAG,gBAAC,CAAC,SAAS,CAAC,gBAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAC,CAAC,CAAC,CAAC;QAC7E,MAAM,YAAY,GAAG,gBAAC,CAAC,YAAY,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE3D,sDAAsD;QACtD,gFAAgF;QAChF,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;QACxD,IAAI,YAAY,CAAC,aAAa,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAmB,EAAgB;QACxD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1B,GAAG,CAAC,OAAO,GAAG,MAAM,IAAA,wBAAc,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,GAAG,CAAC,wBAAwB,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACtC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,GAAG,GAAG,CAAc,CAAC;gBAC3B,YAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,wBAAwB,GAAG,eAAe,CAAC,wBAAwB,CAAC;IACpE,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;IACpC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IACtC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;IAC5C,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IAChD,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAC1C,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC;IACtD,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IAChD,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;IAC5B,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;IACpC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IACxC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;IAClC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IACtC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;IAC5C,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;IAC5C,0BAA0B,GAAG,eAAe,CAAC,0BAA0B,CAAC;IACxE,6BAA6B,GAAG,eAAe,CAAC,6BAA6B,CAAC;IAC9E,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IAEhD,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;IACzC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IACvC,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;IAC7C,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;IACrD,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,CAAC;IAE3D,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IAChD,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAC1C,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IACtC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;IAC5B,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;IAC1D,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC;IACtD,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAC1C,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;IAChD,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC;IAEtD,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;IACpD,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;IAC1D,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;IACxD,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;IAC5B,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;IAC1C,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;IAC5C,eAAe,GAAG,eAAe,CAAC,eAAe,CAAC;IAElD,mBAAmB,GAAG,WAAW,CAAC,mBAAmB,CAAC;IACtD,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;IAChD,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;IAC9C,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;IAChD,qBAAqB,GAAG,WAAW,CAAC,qBAAqB,CAAC;IAC1D,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC;IACxD,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAClD,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IACxC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IACxC,yBAAyB,GAAG,WAAW,CAAC,yBAAyB,CAAC;IAClE,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IAClC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IACtC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;IACjB,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAC3D,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;IAC5C,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IAChC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IAChC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IACtC,4BAA4B,GAAG,WAAW,CAAC,4BAA4B,CAAC;IACxE,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC;IACxD,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;IAC9C,kBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;IACpD,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;IAC5C,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAC9B,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IACtC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAClD,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IACxC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IAElC,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC;IACtD,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;IACxD,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;IAC1D,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;IAC1D,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;IACpD,aAAa,GAAG,eAAe,CAAC,aAAa,CAAC;IAE9C,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;IAC5C,qBAAqB,GAAG,eAAe,CAAC,qBAAqB,CAAC;IAC9D,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;IACpC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;IAClC,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;IACpD,qBAAqB,GAAG,eAAe,CAAC,qBAAqB,CAAC;IAC9D,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IACxC,0BAA0B,GAAG,eAAe,CAAC,0BAA0B,CAAC;IAExE,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;IAC7C,qBAAqB,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;IAC/D,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IACrC,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC;IAC/C,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC;IAC3C,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;IACvC,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAC;IACzC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;IACjC,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAC;IACzC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;IACvC,eAAe,GAAG,gBAAgB,CAAC,eAAe,CAAC;IAEnD,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC;IACnC,yBAAyB,GAAG,sBAAsB,CAAC,yBAAyB,CAAC;IAC7E,oBAAoB,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;IACnE,mBAAmB,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;IACjE,aAAa,GAAG,sBAAsB,CAAC,aAAa,CAAC;IACrD,iBAAiB,GAAG,sBAAsB,CAAC,iBAAiB,CAAC;IAC7D,cAAc,GAAG,sBAAsB,CAAC,cAAc,CAAC;IACvD,eAAe,GAAG,sBAAsB,CAAC,eAAe,CAAC;IACzD,WAAW,GAAG,sBAAsB,CAAC,WAAW,CAAC;IAEjD,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,CAAC;IACnD,kBAAkB,GAAG,cAAc,CAAC,kBAAkB,CAAC;IACvD,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,CAAC;IAC3D,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;IACrD,mBAAmB,GAAG,cAAc,CAAC,mBAAmB,CAAC;IACzD,mBAAmB,GAAG,cAAc,CAAC,mBAAmB,CAAC;IACzD,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;IACrC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IACvC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IACvC,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,CAAC;IAC3D,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IACvC,kBAAkB,GAAG,cAAc,CAAC,kBAAkB,CAAC;IACvD,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;IACjC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IAC7B,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;IACzC,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,CAAC;IACnD,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,CAAC;IACnD,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;IACjD,yBAAyB,GAAG,cAAc,CAAC,yBAAyB,CAAC;IACrE,qBAAqB,GAAG,cAAc,CAAC,qBAAqB,CAAC;IAC7D,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;IACjD,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;IACzC,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;IACrC,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;IAC7C,sBAAsB,GAAG,cAAc,CAAC,sBAAsB,CAAC;IAC/D,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,CAAC;IACnD,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC;IAC3C,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC;IACrC,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;IACvC,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,CAAC;IAC3D,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;IAC7C,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;IAC/B,oBAAoB,GAAG,cAAc,CAAC,oBAAoB,CAAC;IAC3D,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;IAC3B,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;IAC/B,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;IAC/B,sBAAsB,GAAG,cAAc,CAAC,sBAAsB,CAAC;IAC/D,0BAA0B,GAAG,cAAc,CAAC,0BAA0B,CAAC;IAEvE,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;IACjD,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC;IAC/C,mBAAmB,GAAG,gBAAgB,CAAC,mBAAmB,CAAC;IAC3D,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC;IAC3C,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;IACjD,kBAAkB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;IACzD,sBAAsB,GAAG,gBAAgB,CAAC,sBAAsB,CAAC;IAEjE,oCAAoC,GAAG,gBAAgB,CAAC,oCAAoC,CAAC;IAC7F,4BAA4B,GAAG,gBAAgB,CAAC,4BAA4B,CAAC;IAC7E,wBAAwB,GAAG,gBAAgB,CAAC,wBAAwB,CAAC;IACrE,eAAe,GAAG,gBAAgB,CAAC,eAAe,CAAC;IACnD,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;IACjD,iCAAiC,GAAG,gBAAgB,CAAC,iCAAiC,CAAC;IAEvF,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;IAE1D,mBAAmB,GAAG,WAAW,CAAC,mBAAmB,CAAC;IACtD,uBAAuB,GAAG,WAAW,CAAC,uBAAuB,CAAC;IAC9D,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IACtC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IAC5B,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAC9B,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IAClC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAC1C,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IAChC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAC9B,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAC9B,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC;IAClC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IAChC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IACxC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAClD,qBAAqB,GAAG,WAAW,CAAC,qBAAqB,CAAC;IAC1D,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAClD,qBAAqB,GAAG,WAAW,CAAC,qBAAqB,CAAC;IAC1D,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IACjC,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IAC/C,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;IACjD,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;IACjD,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CAAC;IACzD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;IAC3C,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IAExC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IACnC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;IACnB,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;IAC/B,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC3B,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IACvB,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IACvB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IAEzB,iBAAiB,GAAG,sBAAsB,CAAC,iBAAiB,CAAC;IAC7D,iBAAiB,GAAG,sBAAsB,CAAC,iBAAiB,CAAC;IAC7D,oBAAoB,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;IACnE,mBAAmB,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;IACjE,kBAAkB,GAAG,sBAAsB,CAAC,kBAAkB,CAAC;IAC/D,wBAAwB,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;IAC3E,uBAAuB,GAAG,sBAAsB,CAAC,uBAAuB,CAAC;IACzE,sBAAsB,GAAG,sBAAsB,CAAC,sBAAsB,CAAC;IACvE,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC;IAC3C,eAAe,GAAG,sBAAsB,CAAC,eAAe,CAAC;IACzD,aAAa,GAAG,sBAAsB,CAAC,aAAa,CAAC;IACrD,gBAAgB,GAAG,sBAAsB,CAAC,gBAAgB,CAAC;IAC3D,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC;IACnD,eAAe,GAAG,sBAAsB,CAAC,eAAe,CAAC;IACzD,UAAU,GAAG,sBAAsB,CAAC,UAAU,CAAC;IAC/C,UAAU,GAAG,sBAAsB,CAAC,UAAU,CAAC;IAC/C,WAAW,GAAG,sBAAsB,CAAC,WAAW,CAAC;IACjD,kBAAkB,GAAG,sBAAsB,CAAC,kBAAkB,CAAC;IAC/D,oBAAoB,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;IACnE,yBAAyB,GAAG,sBAAsB,CAAC,yBAAyB,CAAC;IAC7E,kBAAkB,GAAG,sBAAsB,CAAC,kBAAkB,CAAC;IAC/D,yBAAyB,GAAG,sBAAsB,CAAC,yBAAyB,CAAC;IAC7E,iBAAiB,GAAG,sBAAsB,CAAC,iBAAiB,CAAC;IAC7D,gBAAgB,GAAG,sBAAsB,CAAC,gBAAgB,CAAC;IAC3D,eAAe,GAAG,sBAAsB,CAAC,eAAe,CAAC;IACzD,mBAAmB,GAAG,sBAAsB,CAAC,mBAAmB,CAAC;IACjE,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC;IACnD,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC;IACnD,sBAAsB,GAAG,sBAAsB,CAAC,sBAAsB,CAAC;IACvE,wBAAwB,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;IAC3E,gBAAgB,GAAG,sBAAsB,CAAC,gBAAgB,CAAC;IAC3D,eAAe,GAAG,sBAAsB,CAAC,eAAe,CAAC;IACzD,cAAc,GAAG,sBAAsB,CAAC,cAAc,CAAC;IACvD,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC;IAC3C,qBAAqB,GAAG,sBAAsB,CAAC,qBAAqB,CAAC;IACrE,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC;IAC3C,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC;IAC3C,aAAa,GAAG,sBAAsB,CAAC,aAAa,CAAC;IACrD,iBAAiB,GAAG,sBAAsB,CAAC,iBAAiB,CAAC;IAC7D,oBAAoB,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;CACpE;AA1VD,kBA0VC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAMlD,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AACzC,eAAO,MAAM,wBAAwB,QAAQ,CAAC;AAK9C;;GAEG;AACH,eAAO,MAAM,eAAe,aACjB,MAAM,KACd,OAAO,CAAC,MAAM,CAAC,sBAUhB,CAAC;AAEH;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBtF;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAA8B,GACtC,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,eAAO,MAAM,WAAW,SAA2C,OAAO,CAAC,MAAM,CAAC,sBAahF,CAAC;AAEH,eAAO,MAAM,YAAY,SAA4C,OAAO,CAAC,MAAM,CAAC,sBAyBlF,CAAC;AAEH;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,uBAA4B,GACpC,MAAM,EAAE,CA6BV;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAgH1F;AAmCD;;GAEG;AACH,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B"}
|
package/build/lib/helpers.js
CHANGED
|
@@ -27,7 +27,7 @@ const MODULE_NAME = 'appium-adb';
|
|
|
27
27
|
exports.getResourcePath = lodash_1.default.memoize(async function getResourcePath(relPath) {
|
|
28
28
|
const moduleRoot = await getModuleRoot();
|
|
29
29
|
const resultPath = path_1.default.resolve(moduleRoot, relPath);
|
|
30
|
-
if (!await support_1.fs.exists(resultPath)) {
|
|
30
|
+
if (!(await support_1.fs.exists(resultPath))) {
|
|
31
31
|
throw new Error(`Cannot find the resource '${relPath}' under the '${moduleRoot}' ` +
|
|
32
32
|
`folder of ${MODULE_NAME} Node.js module`);
|
|
33
33
|
}
|
|
@@ -48,7 +48,7 @@ async function requireSdkRoot(customRoot = null) {
|
|
|
48
48
|
if (!sdkRoot || lodash_1.default.isEmpty(sdkRoot)) {
|
|
49
49
|
throw new Error(`Neither ANDROID_HOME nor ANDROID_SDK_ROOT environment variable was exported. ${docMsg}`);
|
|
50
50
|
}
|
|
51
|
-
if (!await support_1.fs.exists(sdkRoot)) {
|
|
51
|
+
if (!(await support_1.fs.exists(sdkRoot))) {
|
|
52
52
|
throw new Error(`The Android SDK root folder '${sdkRoot}' does not exist on the local file system. ${docMsg}`);
|
|
53
53
|
}
|
|
54
54
|
const stats = await support_1.fs.stat(sdkRoot);
|
|
@@ -72,7 +72,7 @@ exports.getJavaHome = lodash_1.default.memoize(async function getJavaHome() {
|
|
|
72
72
|
if (!result) {
|
|
73
73
|
throw new Error('The JAVA_HOME environment variable is not set for the current process');
|
|
74
74
|
}
|
|
75
|
-
if (!await support_1.fs.exists(result)) {
|
|
75
|
+
if (!(await support_1.fs.exists(result))) {
|
|
76
76
|
throw new Error(`The JAVA_HOME location '${result}' must exist`);
|
|
77
77
|
}
|
|
78
78
|
const stats = await support_1.fs.stat(result);
|
package/build/lib/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logcat.d.ts","sourceRoot":"","sources":["../../lib/logcat.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"logcat.d.ts","sourceRoot":"","sources":["../../lib/logcat.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAIzC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAC,QAAQ,EAAE,UAAU,IAAI,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAsB/E,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,aAAa,CAAC;IACnB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,MAAO,SAAQ,YAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqC;IAC1D,OAAO,CAAC,wBAAwB,CAAgB;IAChD,OAAO,CAAC,IAAI,CAAoB;gBAEpB,IAAI,EAAE,aAAa;IAczB,YAAY,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoD3D,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAYlC,OAAO,IAAI,QAAQ,EAAE;IAuBrB,UAAU,IAAI,QAAQ,EAAE;IAYlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,OAAO,CAAC,aAAa;CAetB;AAED,eAAe,MAAM,CAAC"}
|
package/build/lib/logcat.js
CHANGED
|
@@ -13,7 +13,16 @@ const lru_cache_1 = require("lru-cache");
|
|
|
13
13
|
const log = support_1.logger.getLogger('Logcat');
|
|
14
14
|
const MAX_BUFFER_SIZE = 10000;
|
|
15
15
|
const LOGCAT_PROC_STARTUP_TIMEOUT = 10000;
|
|
16
|
-
const SUPPORTED_FORMATS = [
|
|
16
|
+
const SUPPORTED_FORMATS = [
|
|
17
|
+
'brief',
|
|
18
|
+
'process',
|
|
19
|
+
'tag',
|
|
20
|
+
'thread',
|
|
21
|
+
'raw',
|
|
22
|
+
'time',
|
|
23
|
+
'threadtime',
|
|
24
|
+
'long',
|
|
25
|
+
];
|
|
17
26
|
const SUPPORTED_PRIORITIES = ['v', 'd', 'i', 'w', 'e', 'f', 's'];
|
|
18
27
|
const DEFAULT_PRIORITY = 'v';
|
|
19
28
|
const DEFAULT_TAG = '*';
|
|
@@ -56,11 +65,12 @@ class Logcat extends node_events_1.EventEmitter {
|
|
|
56
65
|
if (this.clearLogs) {
|
|
57
66
|
await this.clear();
|
|
58
67
|
}
|
|
59
|
-
const { format = DEFAULT_FORMAT, filterSpecs = []
|
|
68
|
+
const { format = DEFAULT_FORMAT, filterSpecs = [] } = opts;
|
|
60
69
|
const cmd = [
|
|
61
70
|
...this.adb.defaultArgs,
|
|
62
71
|
'logcat',
|
|
63
|
-
'-v',
|
|
72
|
+
'-v',
|
|
73
|
+
requireFormat(format),
|
|
64
74
|
...formatFilterSpecs(filterSpecs),
|
|
65
75
|
];
|
|
66
76
|
log.debug(`Starting logs capture with command: ${support_1.util.quote([this.adb.path, ...cmd])}`);
|
|
@@ -110,8 +120,8 @@ class Logcat extends node_events_1.EventEmitter {
|
|
|
110
120
|
continue;
|
|
111
121
|
}
|
|
112
122
|
const [message, timestamp] = value;
|
|
113
|
-
if (this.logIndexSinceLastRequest && index > this.logIndexSinceLastRequest
|
|
114
|
-
|
|
123
|
+
if ((this.logIndexSinceLastRequest && index > this.logIndexSinceLastRequest) ||
|
|
124
|
+
!this.logIndexSinceLastRequest) {
|
|
115
125
|
recentLogIndex = index;
|
|
116
126
|
result.push(toLogEntry(message, timestamp));
|
|
117
127
|
}
|
|
@@ -201,6 +211,6 @@ function formatFilterSpecs(filterSpecs) {
|
|
|
201
211
|
}
|
|
202
212
|
return filterSpecs
|
|
203
213
|
.filter((spec) => spec && lodash_1.default.isString(spec) && !spec.startsWith('-'))
|
|
204
|
-
.map((spec) => spec.includes(':') ? requireSpec(spec) : spec);
|
|
214
|
+
.map((spec) => (spec.includes(':') ? requireSpec(spec) : spec));
|
|
205
215
|
}
|
|
206
216
|
//# sourceMappingURL=logcat.js.map
|
package/build/lib/logcat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logcat.js","sourceRoot":"","sources":["../../lib/logcat.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"logcat.js","sourceRoot":"","sources":["../../lib/logcat.ts"],"names":[],"mappings":"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"}
|
package/build/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAE1B,QAAA,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aab-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/aab-utils.js"],"names":[],"mappings":"AAoCA;;;;;;;;;;;GAWG;AACH,4EANW,MAAM,SACN,OAAO,SAAS,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"aab-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/aab-utils.js"],"names":[],"mappings":"AAoCA;;;;;;;;;;;GAWG;AACH,4EANW,MAAM,SACN,OAAO,SAAS,EAAE,kBAAkB,mBAwG9C"}
|
|
@@ -24,15 +24,14 @@ process.on('exit', () => {
|
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
26
26
|
const paths = /** @type {string[]} */ ([...AAB_CACHE.values()]);
|
|
27
|
-
logger_js_1.log.debug(`Performing cleanup of ${paths.length} cached .aab ` +
|
|
28
|
-
support_1.util.pluralize('package', paths.length));
|
|
27
|
+
logger_js_1.log.debug(`Performing cleanup of ${paths.length} cached .aab ` + support_1.util.pluralize('package', paths.length));
|
|
29
28
|
for (const appPath of paths) {
|
|
30
29
|
try {
|
|
31
30
|
// Asynchronous calls are not supported in onExit handler
|
|
32
31
|
support_1.fs.rimrafSync(appPath);
|
|
33
32
|
}
|
|
34
33
|
catch (e) {
|
|
35
|
-
logger_js_1.log.warn(
|
|
34
|
+
logger_js_1.log.warn(/** @type {Error} */ (e).message);
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
37
|
});
|
|
@@ -49,7 +48,7 @@ process.on('exit', () => {
|
|
|
49
48
|
* @throws {Error} If there was an error while creating the universal .apk
|
|
50
49
|
*/
|
|
51
50
|
async function extractUniversalApk(aabPath, opts = {}) {
|
|
52
|
-
if (!await support_1.fs.exists(aabPath)) {
|
|
51
|
+
if (!(await support_1.fs.exists(aabPath))) {
|
|
53
52
|
throw new Error(`The file at '${aabPath}' either does not exist or is not accessible`);
|
|
54
53
|
}
|
|
55
54
|
const aabName = path_1.default.basename(aabPath);
|
|
@@ -59,12 +58,11 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
59
58
|
try {
|
|
60
59
|
return await AAB_CACHE_GUARD.acquire(aabPath, async () => {
|
|
61
60
|
const aabHash = await support_1.fs.hash(aabPath);
|
|
62
|
-
const { keystore, keystorePassword, keyAlias, keyPassword
|
|
61
|
+
const { keystore, keystorePassword, keyAlias, keyPassword } = opts;
|
|
63
62
|
let cacheHash = aabHash;
|
|
64
63
|
if (keystore) {
|
|
65
|
-
if (!await support_1.fs.exists(keystore)) {
|
|
66
|
-
throw new Error(`The keystore file at '${keystore}' either does not exist ` +
|
|
67
|
-
`or is not accessible`);
|
|
64
|
+
if (!(await support_1.fs.exists(keystore))) {
|
|
65
|
+
throw new Error(`The keystore file at '${keystore}' either does not exist ` + `or is not accessible`);
|
|
68
66
|
}
|
|
69
67
|
if (!keystorePassword || !keyAlias || !keyPassword) {
|
|
70
68
|
throw new Error('It is mandatory to also provide keystore password, key alias, ' +
|
|
@@ -86,16 +84,25 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
86
84
|
await this.initAapt2();
|
|
87
85
|
const args = [
|
|
88
86
|
'build-apks',
|
|
89
|
-
'--aapt2',
|
|
90
|
-
'
|
|
91
|
-
'--
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
87
|
+
'--aapt2',
|
|
88
|
+
/** @type {import('./types').StringRecord} */ (this.binaries).aapt2,
|
|
89
|
+
'--bundle',
|
|
90
|
+
aabPath,
|
|
91
|
+
'--output',
|
|
92
|
+
tmpApksPath,
|
|
93
|
+
...(keystore
|
|
94
|
+
? [
|
|
95
|
+
'--ks',
|
|
96
|
+
keystore,
|
|
97
|
+
'--ks-pass',
|
|
98
|
+
`pass:${keystorePassword}`,
|
|
99
|
+
'--ks-key-alias',
|
|
100
|
+
keyAlias,
|
|
101
|
+
'--key-pass',
|
|
102
|
+
`pass:${keyPassword}`,
|
|
103
|
+
]
|
|
104
|
+
: []),
|
|
105
|
+
'--mode=universal',
|
|
99
106
|
];
|
|
100
107
|
logger_js_1.log.debug(`Preparing universal .apks bundle from '${aabPath}'`);
|
|
101
108
|
await this.execBundletool(args, `Cannot build a universal .apks bundle from '${aabPath}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.js"],"names":[],"mappings":";;;;;AAgDA,
|
|
1
|
+
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-manifest.d.ts","sourceRoot":"","sources":["../../../lib/tools/android-manifest.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"android-manifest.d.ts","sourceRoot":"","sources":["../../../lib/tools/android-manifest.js"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,6FALW,MAAM,GACL,OAAO,CAAC,OAAO,SAAS,EAAE,OAAO,CAAC,CAgB7C;AAED;;;;;;;;GAQG;AACH,qFALW,MAAM,GACL,OAAO,CAAC,MAAM,CAAC,CAmB1B;AAED;;;;;;;;GAQG;AACH,6EALW,MAAM,cACN,MAAM,OAAC,GAEN,OAAO,CAAC,MAAM,CAAC,CAQ1B;AAED;;;;;;;;;GASG;AACH,yEAJW,MAAM,mBACN,MAAM,iBACN,MAAM,iBAyEhB;AAED;;;;;;;;;;;;;GAaG;AACH,wEATW,MAAM,UAGN,MAAM,UAGN,MAAM,iBA+ChB;AAED;;;;;;GAMG;AACH,0FAHW,MAAM,GACL,OAAO,CAAC,OAAO,CAAC,CAY3B;AAID;;;;;GAKG;AACH,mDAHW,MAAM,GACL,OAAO,CAAC,OAAO,SAAS,EAAE,YAAY,CAAC,CAsClD"}
|
|
@@ -29,7 +29,7 @@ async function packageAndLaunchActivityFromManifest(appPath) {
|
|
|
29
29
|
if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
|
|
30
30
|
appPath = await this.extractBaseApk(appPath);
|
|
31
31
|
}
|
|
32
|
-
const { name: apkPackage, launchableActivity: { name: apkActivity
|
|
32
|
+
const { name: apkPackage, launchableActivity: { name: apkActivity }, } = await helpers_js_1.readPackageManifest.bind(this)(appPath);
|
|
33
33
|
logger_js_1.log.info(`Package name: '${apkPackage}'`);
|
|
34
34
|
logger_js_1.log.info(`Main activity name: '${apkActivity}'`);
|
|
35
35
|
return { apkPackage, apkActivity };
|
|
@@ -66,7 +66,7 @@ async function targetSdkVersionFromManifest(appPath) {
|
|
|
66
66
|
* @return {Promise<number>} The version of the target SDK.
|
|
67
67
|
*/
|
|
68
68
|
async function targetSdkVersionUsingPKG(pkg, cmdOutput = null) {
|
|
69
|
-
const stdout = cmdOutput || await this.shell(['dumpsys', 'package', pkg]);
|
|
69
|
+
const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
|
|
70
70
|
const targetSdkVersionMatch = new RegExp(/targetSdk=([^\s\s]+)/g).exec(stdout);
|
|
71
71
|
return targetSdkVersionMatch && targetSdkVersionMatch.length >= 2
|
|
72
72
|
? parseInt(targetSdkVersionMatch[1], 10)
|
|
@@ -83,7 +83,8 @@ async function targetSdkVersionUsingPKG(pkg, cmdOutput = null) {
|
|
|
83
83
|
* @param {string} targetPackage - The name of the destination package
|
|
84
84
|
*/
|
|
85
85
|
async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
86
|
-
const { platform, platformPath } = await getAndroidPlatformAndPath(
|
|
86
|
+
const { platform, platformPath } = await getAndroidPlatformAndPath(
|
|
87
|
+
/** @type {string} */ (this.sdkRoot));
|
|
87
88
|
if (!platform || !platformPath) {
|
|
88
89
|
throw new Error('Cannot compile the manifest. The required platform does not exist (API level >= 17)');
|
|
89
90
|
}
|
|
@@ -97,18 +98,23 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
97
98
|
// https://developer.android.com/studio/command-line/aapt2
|
|
98
99
|
const args = [
|
|
99
100
|
'link',
|
|
100
|
-
'-o',
|
|
101
|
-
|
|
102
|
-
'--
|
|
103
|
-
|
|
104
|
-
'-
|
|
101
|
+
'-o',
|
|
102
|
+
resultPath,
|
|
103
|
+
'--manifest',
|
|
104
|
+
manifest,
|
|
105
|
+
'--rename-manifest-package',
|
|
106
|
+
manifestPackage,
|
|
107
|
+
'--rename-instrumentation-target-package',
|
|
108
|
+
targetPackage,
|
|
109
|
+
'-I',
|
|
110
|
+
androidJarPath,
|
|
105
111
|
'-v',
|
|
106
112
|
];
|
|
107
113
|
logger_js_1.log.debug(`Compiling the manifest using '${support_1.util.quote([
|
|
108
|
-
|
|
109
|
-
...args
|
|
114
|
+
/** @type {import('./types').StringRecord} */ (this.binaries).aapt2,
|
|
115
|
+
...args,
|
|
110
116
|
])}'`);
|
|
111
|
-
await (0, teen_process_1.exec)(
|
|
117
|
+
await (0, teen_process_1.exec)(/** @type {import('./types').StringRecord} */ (this.binaries).aapt2, args);
|
|
112
118
|
}
|
|
113
119
|
catch (e) {
|
|
114
120
|
logger_js_1.log.debug('Cannot compile the manifest using aapt2. Defaulting to aapt. ' +
|
|
@@ -116,19 +122,24 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
116
122
|
await this.initAapt();
|
|
117
123
|
const args = [
|
|
118
124
|
'package',
|
|
119
|
-
'-M',
|
|
120
|
-
|
|
121
|
-
'--rename-
|
|
122
|
-
|
|
123
|
-
'-
|
|
125
|
+
'-M',
|
|
126
|
+
manifest,
|
|
127
|
+
'--rename-manifest-package',
|
|
128
|
+
manifestPackage,
|
|
129
|
+
'--rename-instrumentation-target-package',
|
|
130
|
+
targetPackage,
|
|
131
|
+
'-I',
|
|
132
|
+
androidJarPath,
|
|
133
|
+
'-F',
|
|
134
|
+
resultPath,
|
|
124
135
|
'-f',
|
|
125
136
|
];
|
|
126
137
|
logger_js_1.log.debug(`Compiling the manifest using '${support_1.util.quote([
|
|
127
|
-
|
|
128
|
-
...args
|
|
138
|
+
/** @type {import('./types').StringRecord} */ (this.binaries).aapt,
|
|
139
|
+
...args,
|
|
129
140
|
])}'`);
|
|
130
141
|
try {
|
|
131
|
-
await (0, teen_process_1.exec)(
|
|
142
|
+
await (0, teen_process_1.exec)(/** @type {import('./types').StringRecord} */ (this.binaries).aapt, args);
|
|
132
143
|
}
|
|
133
144
|
catch (e1) {
|
|
134
145
|
throw new Error(`Cannot compile the manifest. Original error: ${e1.stderr || e1.message}`);
|
|
@@ -160,14 +171,15 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
160
171
|
await support_1.fs.copyFile(srcApk, dstApk);
|
|
161
172
|
logger_js_1.log.debug('Moving manifest');
|
|
162
173
|
try {
|
|
163
|
-
await (0, teen_process_1.exec)(
|
|
164
|
-
'remove',
|
|
174
|
+
await (0, teen_process_1.exec)(/** @type {import('./types').StringRecord} */ (this.binaries).aapt, [
|
|
175
|
+
'remove',
|
|
176
|
+
dstApk,
|
|
177
|
+
manifestName,
|
|
165
178
|
]);
|
|
166
179
|
}
|
|
167
180
|
catch { }
|
|
168
|
-
await (0, teen_process_1.exec)(
|
|
169
|
-
|
|
170
|
-
], { cwd: path_1.default.dirname(manifest) });
|
|
181
|
+
await (0, teen_process_1.exec)(
|
|
182
|
+
/** @type {import('./types').StringRecord} */ (this.binaries).aapt, ['add', dstApk, manifestName], { cwd: path_1.default.dirname(manifest) });
|
|
171
183
|
}
|
|
172
184
|
catch (e) {
|
|
173
185
|
logger_js_1.log.debug('Cannot insert manifest using aapt. Defaulting to zip. ' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apk-signing.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apk-signing.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAoC,gBAAgB,EAAE,YAAY,EAAC,MAAM,YAAY,CAAC;AAkBlG;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA8BjF;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB/E;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE9E;AAED;;;;;;;GAOG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBpE;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiC1E;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,OAAO,CAAC,CAsFlB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAgDtE;AAID;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAElE;AAED;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BjE"}
|