appium-android-driver 9.8.3 → 9.10.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.
- package/CHANGELOG.md +12 -0
- package/build/lib/commands/context/helpers.d.ts.map +1 -1
- package/build/lib/commands/context/helpers.js +9 -0
- package/build/lib/commands/context/helpers.js.map +1 -1
- package/build/lib/commands/device/common.d.ts.map +1 -1
- package/build/lib/commands/device/common.js +13 -0
- package/build/lib/commands/device/common.js.map +1 -1
- package/build/lib/commands/log.d.ts +19 -10
- package/build/lib/commands/log.d.ts.map +1 -1
- package/build/lib/commands/log.js +44 -21
- package/build/lib/commands/log.js.map +1 -1
- package/build/lib/driver.d.ts +5 -11
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +6 -0
- package/build/lib/driver.js.map +1 -1
- package/build/lib/utils.d.ts +18 -0
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +32 -1
- package/build/lib/utils.js.map +1 -1
- package/lib/commands/context/helpers.js +11 -0
- package/lib/commands/device/common.js +18 -0
- package/lib/commands/log.js +55 -25
- package/lib/driver.ts +10 -0
- package/lib/utils.js +34 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [9.10.0](https://github.com/appium/appium-android-driver/compare/v9.9.0...v9.10.0) (2024-09-08)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Emit logs over BiDi socket ([#955](https://github.com/appium/appium-android-driver/issues/955)) ([4f7045b](https://github.com/appium/appium-android-driver/commit/4f7045bc76b1550c925a73b80ffdc7de88acf176))
|
|
6
|
+
|
|
7
|
+
## [9.9.0](https://github.com/appium/appium-android-driver/compare/v9.8.3...v9.9.0) (2024-08-29)
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* support 'goog:loggingPrefs' value when creating a session ([#954](https://github.com/appium/appium-android-driver/issues/954)) ([8392b89](https://github.com/appium/appium-android-driver/commit/8392b8940870db53378546ccac422fd648f8b7a7))
|
|
12
|
+
|
|
1
13
|
## [9.8.3](https://github.com/appium/appium-android-driver/compare/v9.8.2...v9.8.3) (2024-08-06)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"AAiIA;;;;GAIG;AACH,sCAHW,MAAM,GACJ,OAAO,WAAW,EAAE,OAAO,CAAC,OAAO,+BAA+B,CAAC,CAO/E;AA4GD;;;;;;;GAOG;AACH,+FAJW,OAAO,UAAU,EAAE,eAAe,EAAE,iDACpC,OAAO,UAAU,EAAE,eAAe,GAChC,MAAM,EAAE,CA4BpB;AAiID;;;;;;;;;;;;;;;;GAgBG;AACH,2PAFa,OAAO,CAAC,OAAO,UAAU,EAAE,eAAe,EAAE,CAAC,CAsEzD;AAwLD;;;;;;GAMG;AACH,uFALW,OAAO,cAAc,EAAE,iBAAiB,eACxC,MAAM,iCAEJ,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"AAiIA;;;;GAIG;AACH,sCAHW,MAAM,GACJ,OAAO,WAAW,EAAE,OAAO,CAAC,OAAO,+BAA+B,CAAC,CAO/E;AA4GD;;;;;;;GAOG;AACH,+FAJW,OAAO,UAAU,EAAE,eAAe,EAAE,iDACpC,OAAO,UAAU,EAAE,eAAe,GAChC,MAAM,EAAE,CA4BpB;AAiID;;;;;;;;;;;;;;;;GAgBG;AACH,2PAFa,OAAO,CAAC,OAAO,UAAU,EAAE,eAAe,EAAE,CAAC,CAsEzD;AAwLD;;;;;;GAMG;AACH,uFALW,OAAO,cAAc,EAAE,iBAAiB,eACxC,MAAM,iCAEJ,OAAO,CAAC,YAAY,CAAC,CAyEjC;AAED;;;;;GAKG;AACH,0CAJ4B,CAAC,SAAf,YAAa,4DAChB,CAAC,GACC,OAAO,CAAC,CAAC,CAAC,CAUtB;AAED;;;GAGG;AACH,wFAFa,OAAO,CAQnB;AAED;;;GAGG;AACH,kFAFa,OAAO,CAAC,IAAI,CAAC,CAqBzB;AA5xBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BG;AACH,uDAAwD;AACxD,kDAKE;AAIF,sCAAuC;AACvC,oCAAqC;AACrC,sCAAuC;AACvC,sCAA8C;AAC9C,6CAAqF;kBAmvBxE,OAAO,YAAY,EAAE,GAAG;yBAnyBZ,qBAAqB"}
|
|
@@ -657,6 +657,15 @@ async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
657
657
|
lodash_1.default.merge(opts.chromeOptions, opts[opt]);
|
|
658
658
|
}
|
|
659
659
|
}
|
|
660
|
+
// Ensure there are logging preferences
|
|
661
|
+
opts.chromeLoggingPrefs = opts.chromeLoggingPrefs ?? {};
|
|
662
|
+
// Strip the prefix and store it
|
|
663
|
+
for (const opt of lodash_1.default.keys(opts)) {
|
|
664
|
+
if (opt.endsWith(':loggingPrefs')) {
|
|
665
|
+
this.log.warn(`Merging '${opt}' into 'chromeLoggingPrefs'. This may cause unexpected behavior`);
|
|
666
|
+
lodash_1.default.merge(opts.chromeLoggingPrefs, opts[opt]);
|
|
667
|
+
}
|
|
668
|
+
}
|
|
660
669
|
const caps = /** @type {any} */ (createChromedriverCaps.bind(this)(opts, curDeviceId, details));
|
|
661
670
|
this.log.debug(`Before starting chromedriver, androidPackage is '${caps.chromeOptions.androidPackage}'`);
|
|
662
671
|
await chromedriver.start(caps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":";;;;;;AAsIA,oCAKC;AAoHD,8CA0BC;AAkJD,gDAoEC;AA+LD,oDAuEC;AAQD,8DAQC;AAMD,gEAMC;AAMD,oDAmBC;AA1yBD,6CAA6C;AAC7C,oDAAuB;AACvB,kDAA0B;AAC1B,wDAA2B;AAC3B,6CAA8C;AAC9C,uCAA+B;AAC/B,wDAAyB;AACzB,sDAAyB;AACzB,0DAA6B;AAC7B,0DAA6B;AAC7B,8EAA+C;AAC/C,mCAAqF;AAErF,mGAAmG;AACtF,QAAA,+BAA+B,GAAwB,CAAC;IACnE,MAAM,EAAE;QACN,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,qCAAqC;KAChD;IACD,QAAQ,EAAE;QACR,GAAG,EAAE,2BAA2B;QAChC,QAAQ,EAAE,sBAAsB;KACjC;IACD,UAAU,EAAE;QACV,GAAG,EAAE,iBAAiB;QACtB,QAAQ,EAAE,qCAAqC;KAChD;IACD,OAAO,EAAE;QACP,GAAG,EAAE,qBAAqB;QAC1B,QAAQ,EAAE,qCAAqC;KAChD;IACD,kBAAkB,EAAE;QAClB,GAAG,EAAE,qBAAqB;QAC1B,QAAQ,EAAE,qCAAqC;KAChD;IACD,kBAAkB,EAAE;QAClB,GAAG,EAAE,4BAA4B;QACjC,QAAQ,EAAE,mDAAmD;KAC9D;IACD,OAAO,EAAE;QACP,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,qCAAqC;KAChD;CACF,CAAC,CAAC;AACU,QAAA,mBAAmB,GAAG,oBAAoB,CAAC;AAC3C,QAAA,0BAA0B,GAAG;IACxC,2BAAmB;IACnB,iBAAiB;IACjB,gBAAgB;IAChB,mBAAmB;CACpB,CAAC;AACF,MAAM,iCAAiC,GAAG,2BAA2B,CAAC;AACtE,MAAM,wBAAwB,GAAG,6BAA6B,CAAC;AAC/D,MAAM,wBAAwB,GAAG,wBAAwB,CAAC;AAC7C,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,YAAY,GAAG,UAAU,CAAC;AAC1B,QAAA,YAAY,GAAG,GAAG,mBAAW,GAAG,CAAC;AACjC,QAAA,uBAAuB,GAAG,6CAA6C,CAAC;AACrF,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,oBAAY,QAAQ,CAAC,CAAC;AACjE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,oBAAY,oBAAoB,CAAC,CAAC;AAC7E,MAAM,wBAAwB,GAAG,GAAG,CAAC;AACrC,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,KAAK;AACnC,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC5C,MAAM,8BAA8B,GAAG,cAAI,CAAC,gBAAgB,CAC1D,mBAAI,CAAC,OAAO,CAAC,iBAAE,CAAC,MAAM,EAAE,EAAE,6BAA6B,CAAC,EACxD,EAAC,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAC,CAChC,CAAC;AAEF;;GAEG;AACH,KAAK,UAAU,WAAW;IACxB,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,kBAAG,CAAC,YAAY,EAAE,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE;YACjB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC;YACT,IAAI,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC3B,wDAAwD;gBACxD,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ;IAC/C,OAAO,CACL,MAAM,IAAA,eAAK,EAAC;QACV,GAAG,EAAE,UAAU,IAAI,IAAI,IAAI,GAAG,QAAQ,EAAE;QACxC,OAAO,EAAE,eAAe;QACxB,gDAAgD;QAChD,kDAAkD;QAClD,iFAAiF;QACjF,6FAA6F;QAC7F,SAAS,EAAE,IAAI,mBAAI,CAAC,KAAK,CAAC,EAAC,SAAS,EAAE,KAAK,EAAC,CAAC;KAC9C,CAAC,CACH,CAAC,IAAI,CAAC;AACT,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,OAAO,CAAC,IAAI,EAAE,IAAI;IAC/B,OAAO,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;AACjD,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,OAAO,CAAC,IAAI,EAAE,IAAI;IAC/B,OAAO,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;AACpD,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,OAAO;IAClC,OAAO,CACL,uCAA+B,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACtD,uCAA+B,CAAC,OAAO,CACxC,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,sBAAsB,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc;IAC5D,MAAM,IAAI,GAAG,EAAC,aAAa,EAAE,EAAE,EAAC,CAAC;IAEjC,MAAM,cAAc,GAClB,IAAI,CAAC,aAAa,EAAE,cAAc;QAClC,IAAI,CAAC,UAAU;QACf,cAAc,EAAE,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC5C,IAAI,cAAc,EAAE,CAAC;QACnB,8EAA8E;QAE9E,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC;IACrD,CAAC;IACD,IAAI,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,aAAa,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC;IACrE,CAAC;IACD,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAChE,CAAC;IACD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC;IAClE,CAAC;IACD,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAChE,CAAC;SAAM,IAAI,cAAc,EAAE,OAAO,EAAE,IAAI,IAAI,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACxE,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;IAClE,CAAC;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,kBAAkB,EAAE,CAAC;QACvD,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;IACxD,CAAC;IACD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAChD,CAAC;IACD,MAAM,QAAQ,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,QAAQ,CAAC;IAC3E,IAAI,gBAAC,CAAC,QAAQ,CAAC,kCAA0B,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1F,2EAA2E;QAC3E,0EAA0E;QAC1E,sCAAsC;QACtC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,2BAAmB,CAAC;QAC1D,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;IAC3C,CAAC;IACD,yBAAyB;IACzB,IAAI,CAAC,aAAa,CAAC,mBAAmB,GAAG,QAAQ,CAAC;IAElD,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACnF,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,gFAAgF,CACjF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,YAAY,CAAC;IACnE,CAAC;IACD,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,+DAA+D;YAC7D,6EAA6E,CAChF,CAAC;QACF,MAAM,OAAO,GAAG,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC;QACrC,2EAA2E;QAC3E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAClG,CAAC;IAED,IAAI,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC;QAClC,+BAA+B;QAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAChG,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2CAA2C,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAC1F,CAAC;IAEF,uBAAuB;IACvB,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACvD,IAAI,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,+DAA+D;YAC7D,gCAAgC,CACnC,CAAC;QACF,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,iBAAiB,CAC/B,eAAe,EACf,EAAC,uBAAuB,GAAG,IAAI,EAAE,eAAe,GAAG,KAAK,EAAC,GAAG,EAAE;IAE9D,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,CAAC,oBAAY,CAAC,CAAC;IACxB,CAAC;IAED,uBAAuB;IACvB,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,IAAI,eAAe,EAAE,CAAC;QAClE,IAAI,uBAAuB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YAC9C,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,yBAAyB,OAAO,SAAS,IAAI,IAAI;gBAC/C,yCAAyC,CAC5C,CAAC;YACF,SAAS;QACX,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,SAAS,cAAI,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CACrF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,uBAAuB,CAAC,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAC3E,4EAA4E;IAC5E,4BAA4B;IAC5B,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAAC;IAChD,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,GAAG,mBAAmB,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;QACtD,SAAS,GAAG,mBAAmB,CAAC;IAClC,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,0BAA0B,UAAU,cAAc,GAAG,iBAAiB,SAAS,KAAK,OAAO,EAAE,CAC9F,CAAC;IACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,kEAAkE;YAChE,0BAA0B,CAC7B,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,8BAA8B,CAAC,KAAK,IAAI,EAAE;QAC3D,IAAI,SAAS,CAAC;QACd,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,IAAA,+BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACb,2DAA2D;gBACzD,YAAY,SAAS,KAAK,OAAO,2CAA2C;gBAC5E,4DAA4D,CAC/D,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,SAAS,EAAE,EAAE,iBAAiB,UAAU,EAAE,CAAC,CAAC,CAAC;QACvF,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,sBAAsB,CAAC,eAAe,EAAE,IAAI,GAAG,EAAE;IAC9D,IAAI,gBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,EACJ,mBAAmB,GAAG,IAAI,EAC1B,uBAAuB,GAAG,IAAI,EAC9B,8BAA8B,GAAG,IAAI,GACtC,GAAG,IAAI,CAAC;IAET,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,2DAA2D;YACzD,qDAAqD,CACxD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,iEAAiE;YAC/D,6FAA6F;YAC7F,mBAAmB,CACtB,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,uBAAuB,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAChE,OAAO;IACT,CAAC;IAED,gEAAgE;IAChE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,0BAA0B,cAAI,CAAC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CACpF,CAAC;IACF,MAAM,gBAAgB,GAAG,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;QACnC,gBAAgB,CAAC,IAAI,CACnB,CAAC,KAAK,IAAI,EAAE;YACV,IAAI,IAAI,CAAC;YACT,IAAI,IAAI,CAAC;YACT,IAAI,CAAC;gBACH,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;gBACxF,IAAI,8BAA8B,EAAE,CAAC;oBACnC,IAAI,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACxC,CAAC;gBACD,IAAI,uBAAuB,EAAE,CAAC;oBAC5B,IAAI,CAAC,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;oBAAS,CAAC;gBACT,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;oBACzC,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACpB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,EAAE,CACL,CAAC;IACJ,CAAC;IACD,MAAM,kBAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,kBAAkB,CAAC,EACvC,mBAAmB,GAAG,IAAI,EAC1B,uBAAuB,GAAG,IAAI,EAC9B,mBAAmB,GAAG,IAAI,EAC1B,8BAA8B,GAAG,IAAI,EACrC,gBAAgB,GAAG,CAAC,GACrB,GAAG,EAAE;IACJ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAEvD,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,gBAAgB,GAAG,QAAQ,CAAC,GAAG,gBAAgB,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,mDAAmD;IACnD,IAAI,eAAe,CAAC;IACpB,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,GAAG,CAAC;QACF,eAAe,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAE1E,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM;QACR,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1F,MAAM,IAAA,gBAAK,EAAC,wBAAwB,CAAC,CAAC;IACxC,CAAC,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,GAAG,gBAAgB,EAAE;IAEhE,MAAM,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE;QACvD,uBAAuB;QACvB,8BAA8B;QAC9B,mBAAmB;KACpB,CAAC,CAAC;IAEH,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC7C,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,cAAc,CAAC;QACvC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;QAElC,IAAI,MAAM,GAAG,OAAO,CAAC;QACrB,4DAA4D;QAC5D,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI,CAAC;gBACH,sEAAsE;gBACtE,6CAA6C;gBAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC/E,MAAM,GAAG,GAAG,oBAAY,GAAG,GAAG,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnD,OAAO,GAAG;oBACR,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;iBAClC,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACzB,SAAS;YACX,CAAC;QACH,CAAC;QAED,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC;QACpC,MAAM,GAAG,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YACpB,8BAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,8BAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3C,8BAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,eAAe,CAAC,OAAO;IACpC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,OAAO,kBAAkB,GAAG,EAAE,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;IAC7C,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,wBAAwB;IACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC5D,uBAAuB;IACvB,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,uBAAuB;IACvB,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,iDAAiD;QACjD,MAAM,CAAC,EAAE,AAAD,EAAG,AAAD,EAAG,KAAK,EAAE,AAAD,EAAG,EAAE,EAAE,AAAD,EAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,KAAK,KAAK,UAAU,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QACD,IAAI,CAAC,+BAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5C,SAAS;QACX,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACnD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,UAAU,KAAK,CAAC,MAAM,oBAAoB,cAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI;YACzF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACxB,CAAC;IACJ,CAAC;IACD,gEAAgE;IAChE,OAAO,gBAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,iBAAiB,CAAC,YAAY,GAAG,IAAI;IAClD,MAAM,WAAW,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAChE,gDAAgD;IAChD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,YAAY,KAAK,wBAAwB,IAAI,UAAU,KAAK,IAAI,YAAY,EAAE,EAAE,CAAC;YACnF,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,oBAAY;aACtB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,MAAM,eAAe,GAAG,+BAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QACD,MAAM,iBAAiB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,cAAc,GAAG,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,iBAAiB,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QAED,IAAI,CAAC,YAAY,IAAI,UAAU,KAAK,IAAI,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACzE,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,iBAAiB;oBACxB,CAAC,CAAC,GAAG,oBAAY,GAAG,iBAAiB,EAAE;oBACvC,CAAC,CAAC,8DAA8D;wBAC9D,GAAG,oBAAY,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE;aAC1C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,mBAAmB,CAAC,QAAQ;IACzC,yEAAyE;IACzE,uCAAuC;IACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,MAAM,WAAW,EAAE,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,IAAI,EAAE,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6EAA6E;IAC7E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC9F,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,KAAK,MAAM,aAAa,IAAI,QAAQ,EAAE,CAAC;QACrC,qBAAqB;QACrB,IAAI,IAAI,CAAC;QACT,qBAAqB;QACrB,IAAI,QAAQ,CAAC;QACb,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,2CAA2C;YACvF,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,IAAI,QAAQ,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,IAAA,+BAAiB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACpD,MAAM;QACR,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,IAAI,QAAQ,gBAAgB,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,oDAAoD;YAClD,0BAA0B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CACvD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,SAAS,mBAAmB,CAAC,CAAC;IAChE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,SAAS,iCAAiC;IACxC,IAAI,IAAI,CAAC,gBAAgB,CAAC,iCAAiC,CAAC,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,+CAA+C;QAC7C,QAAQ,iCAAiC,+BAA+B,CAC3E,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO;IACnE,qCAAqC;IACrC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wFAAwF,CACzF,CAAC;QACF,qCAAqC;QACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAChD,CAAC;IAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,gBAAgB,mBAAmB,CAAC,CAAC;IACxF,CAAC;SAAM,CAAC;QACN,2DAA2D;QAC3D,IAAI,CAAC,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4DAA4D;YAC1D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CACnC,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,6BAAY,CAAC;QACpC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;QACnC,UAAU,EAAE,IAAI,CAAC,sBAAsB;QACvC,4CAA4C;QAC5C,GAAG,EAAE,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,OAAO,EAAE,uBAAuB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;QACxD,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,mBAAmB;QACnC,aAAa,EAAE,IAAI,CAAC,yBAAyB;QAC7C,WAAW,EAAE,IAAI,CAAC,6BAA6B;QAC/C,kCAAkC;QAClC,QAAQ,EAAE,IAAI,CAAC,cAAc;QAC7B,mBAAmB,EAAE,IAAI,CAAC,+BAA+B;QACzD,iBAAiB,EAAE,IAAI,CAAC,6BAA6B;QACrD,wBAAwB;QACxB,OAAO;QACP,qBAAqB,EAAE,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;KACtE,CAAC,CAAC;IAEH,oCAAoC;IACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;IAC9C,sCAAsC;IACtC,uBAAuB;IACvB,KAAK,MAAM,GAAG,IAAI,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,IAAI,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,GAAG,4DAA4D,CAAC,CAAC;YAC7F,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,uCAAuC;IACvC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC;IAExD,gCAAgC;IAChC,KAAK,MAAM,GAAG,IAAI,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,iEAAiE,CAAC,CAAC;YAChG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAChG,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,oDAAoD,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,CACzF,CAAC;IACF,MAAM,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,yBAAyB,CAAC,YAAY;IAC1D,4EAA4E;IAC5E,qEAAqE;IACrE,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAC7F,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,SAAgB,0BAA0B;IACxC,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa;QACzB,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CACxD,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,oBAAoB;IACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;IAClD,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC/C,IAAI,QAAQ,KAAK,uDAAuD,EAAE,CAAC;QACzE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;QACnE,OAAO;IACT,CAAC;IACD,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACnF,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,IAAI,CAAC;QACH,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,uCAAuC,EAAE,KAAK,CAAC,CAAC;QACtF,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,yDAAyD;QACzD,8BAA8B;QAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,kDAAkD,CAAA,oBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CACrF,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,mFAFa,OAAO,CAAC,OAAO,UAAU,EAAE,aAAa,CAAC,CA8GrD;AAED;;;GAGG;AACH,uEAFa,OAAO,CAAC,OAAO,YAAY,EAAE,GAAG,CAAC,CAW7C;AAED;;;GAGG;AACH,2EAFa,OAAO,CAAC,OAAO,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC,CAgCjE;AAED;;;GAGG;AACH,wEAFa,OAAO,CAAC,IAAI,CAAC,CA4GzB;4BAGY,OAAO,cAAc,EAAE,aAAa"}
|
|
@@ -16,6 +16,7 @@ const keyboard_1 = require("../keyboard");
|
|
|
16
16
|
const utils_1 = require("./utils");
|
|
17
17
|
const time_1 = require("../time");
|
|
18
18
|
const asyncbox_1 = require("asyncbox");
|
|
19
|
+
const utils_2 = require("../../utils");
|
|
19
20
|
/**
|
|
20
21
|
* @this {AndroidDriver}
|
|
21
22
|
* @returns {Promise<import('../types').ADBDeviceInfo>}
|
|
@@ -216,6 +217,11 @@ async function initDevice() {
|
|
|
216
217
|
filterSpecs: logcatFilterSpecs,
|
|
217
218
|
});
|
|
218
219
|
this.eventEmitter.emit('syslogStarted', this.adb.logcat);
|
|
220
|
+
if (this.adb.logcat) {
|
|
221
|
+
this.assignBiDiLogListener(this.adb.logcat, {
|
|
222
|
+
type: 'syslog',
|
|
223
|
+
});
|
|
224
|
+
}
|
|
219
225
|
};
|
|
220
226
|
setupPromises.push(logcatStartupPromise());
|
|
221
227
|
}
|
|
@@ -240,6 +246,13 @@ async function initDevice() {
|
|
|
240
246
|
if (timeZone) {
|
|
241
247
|
setupPromises.push(time_1.adjustTimeZone.bind(this)(timeZone));
|
|
242
248
|
}
|
|
249
|
+
if (this.isFeatureEnabled(utils_2.GET_SERVER_LOGS_FEATURE)) {
|
|
250
|
+
[, this._bidiServerLogListener] = this.assignBiDiLogListener(this.log.unwrap(), {
|
|
251
|
+
type: 'server',
|
|
252
|
+
srcEventName: 'log',
|
|
253
|
+
entryTransformer: utils_2.nativeLogEntryToSeleniumEntry,
|
|
254
|
+
});
|
|
255
|
+
}
|
|
243
256
|
await bluebird_1.default.all(setupPromises);
|
|
244
257
|
}
|
|
245
258
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,16 @@ export function mobileStopLogsBroadcast(this: import("../driver").AndroidDriver)
|
|
|
26
26
|
* @returns {Promise<string[]>}
|
|
27
27
|
*/
|
|
28
28
|
export function getLogTypes(this: import("../driver").AndroidDriver): Promise<string[]>;
|
|
29
|
+
/**
|
|
30
|
+
* https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
|
|
31
|
+
*
|
|
32
|
+
* @template {import('node:events').EventEmitter} EE
|
|
33
|
+
* @this {import('../driver').AndroidDriver}
|
|
34
|
+
* @param {EE} logEmitter
|
|
35
|
+
* @param {BiDiListenerProperties} properties
|
|
36
|
+
* @returns {[EE, LogListener]}
|
|
37
|
+
*/
|
|
38
|
+
export function assignBiDiLogListener<EE extends import("node:events").EventEmitter>(this: import("../driver").AndroidDriver, logEmitter: EE, properties: BiDiListenerProperties): [EE, LogListener];
|
|
29
39
|
/**
|
|
30
40
|
* @this {import('../driver').AndroidDriver}
|
|
31
41
|
* @param {string} logType
|
|
@@ -40,23 +50,22 @@ export namespace supportedLogTypes {
|
|
|
40
50
|
namespace bugreport {
|
|
41
51
|
let description_1: string;
|
|
42
52
|
export { description_1 as description };
|
|
43
|
-
export function getter_1(self: import("../driver").AndroidDriver): Promise<
|
|
44
|
-
timestamp: number;
|
|
45
|
-
level: string;
|
|
46
|
-
message: string;
|
|
47
|
-
}[]>;
|
|
53
|
+
export function getter_1(self: import("../driver").AndroidDriver): Promise<import("appium-adb").LogcatRecord[]>;
|
|
48
54
|
export { getter_1 as getter };
|
|
49
55
|
}
|
|
50
56
|
namespace server {
|
|
51
57
|
let description_2: string;
|
|
52
58
|
export { description_2 as description };
|
|
53
|
-
export function getter_2(self: import("../driver").AndroidDriver):
|
|
54
|
-
timestamp: number;
|
|
55
|
-
level: string;
|
|
56
|
-
message: string;
|
|
57
|
-
}[];
|
|
59
|
+
export function getter_2(self: import("../driver").AndroidDriver): import("appium-adb").LogcatRecord[];
|
|
58
60
|
export { getter_2 as getter };
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
export type ADB = import("appium-adb").ADB;
|
|
64
|
+
export type BiDiListenerProperties = {
|
|
65
|
+
type: string;
|
|
66
|
+
srcEventName?: string | undefined;
|
|
67
|
+
context?: string | undefined;
|
|
68
|
+
entryTransformer?: ((x: any) => import("../utils").LogEntry) | undefined;
|
|
69
|
+
};
|
|
70
|
+
export type LogListener = (logEntry: import("../utils").LogEntry) => any;
|
|
62
71
|
//# sourceMappingURL=log.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":"AAiDA;;;;;;;;;;GAUG;AACH,mFAFa,OAAO,CAAC,IAAI,CAAC,CAwDzB;;IA3BK,+FAIC;;AAyBP;;;;;;GAMG;AACH,kFAFa,OAAO,CAAC,IAAI,CAAC,CAczB;AAED;;;GAGG;AACH,sEAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAc7B;AAED;;;;;;;;GAQG;AACH,sCANkD,EAAE,SAAvC,OAAQ,aAAa,EAAE,YAAa,uDAEtC,EAAE,cACF,sBAAsB,GACpB,CAAC,EAAE,EAAE,WAAW,CAAC,CA2B7B;AAED;;;;GAIG;AACH,yEAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAUxB;;;;QAxLW,sBAHG,OAAO,WAAW,EAAE,aAAa,mCAGmB;;;;;QASvD,+BAHG,OAAO,WAAW,EAAE,aAAa,gDAO3C;;;;;;QASO,+BAHG,OAAO,WAAW,EAAE,aAAa,uCAM3C;;;;kBA8KQ,OAAO,YAAY,EAAE,GAAG;;UAKvB,MAAM;;;oCAGS,OAAO,UAAU,EAAE,QAAQ;;0BAG1C,CAAC,QAAQ,EAAE,OAAO,UAAU,EAAE,QAAQ,KAAK,GAAG"}
|
|
@@ -7,12 +7,14 @@ exports.supportedLogTypes = void 0;
|
|
|
7
7
|
exports.mobileStartLogsBroadcast = mobileStartLogsBroadcast;
|
|
8
8
|
exports.mobileStopLogsBroadcast = mobileStopLogsBroadcast;
|
|
9
9
|
exports.getLogTypes = getLogTypes;
|
|
10
|
+
exports.assignBiDiLogListener = assignBiDiLogListener;
|
|
10
11
|
exports.getLog = getLog;
|
|
11
12
|
const driver_1 = require("appium/driver");
|
|
12
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
13
14
|
const node_os_1 = __importDefault(require("node:os"));
|
|
14
15
|
const ws_1 = __importDefault(require("ws"));
|
|
15
|
-
const
|
|
16
|
+
const utils_1 = require("../utils");
|
|
17
|
+
const helpers_1 = require("./context/helpers");
|
|
16
18
|
exports.supportedLogTypes = {
|
|
17
19
|
logcat: {
|
|
18
20
|
description: 'Logs for Android applications on real device and emulators via ADB',
|
|
@@ -33,7 +35,7 @@ exports.supportedLogTypes = {
|
|
|
33
35
|
getter: async (self) => {
|
|
34
36
|
const output = await /** @type {ADB} */ (self.adb).bugreport();
|
|
35
37
|
const timestamp = Date.now();
|
|
36
|
-
return output.split(node_os_1.default.EOL).map((x) => toLogRecord(timestamp,
|
|
38
|
+
return output.split(node_os_1.default.EOL).map((x) => (0, utils_1.toLogRecord)(timestamp, x));
|
|
37
39
|
},
|
|
38
40
|
},
|
|
39
41
|
server: {
|
|
@@ -44,11 +46,8 @@ exports.supportedLogTypes = {
|
|
|
44
46
|
* @returns
|
|
45
47
|
*/
|
|
46
48
|
getter: (self) => {
|
|
47
|
-
self.ensureFeatureEnabled(GET_SERVER_LOGS_FEATURE);
|
|
48
|
-
return self.log
|
|
49
|
-
.unwrap()
|
|
50
|
-
.record.map((x) => toLogRecord(
|
|
51
|
-
/** @type {any} */ (x).timestamp ?? Date.now(), 'ALL', lodash_1.default.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`));
|
|
49
|
+
self.ensureFeatureEnabled(utils_1.GET_SERVER_LOGS_FEATURE);
|
|
50
|
+
return self.log.unwrap().record.map(utils_1.nativeLogEntryToSeleniumEntry);
|
|
52
51
|
},
|
|
53
52
|
},
|
|
54
53
|
};
|
|
@@ -144,6 +143,36 @@ async function getLogTypes() {
|
|
|
144
143
|
}
|
|
145
144
|
return nativeLogTypes;
|
|
146
145
|
}
|
|
146
|
+
/**
|
|
147
|
+
* https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
|
|
148
|
+
*
|
|
149
|
+
* @template {import('node:events').EventEmitter} EE
|
|
150
|
+
* @this {import('../driver').AndroidDriver}
|
|
151
|
+
* @param {EE} logEmitter
|
|
152
|
+
* @param {BiDiListenerProperties} properties
|
|
153
|
+
* @returns {[EE, LogListener]}
|
|
154
|
+
*/
|
|
155
|
+
function assignBiDiLogListener(logEmitter, properties) {
|
|
156
|
+
const { type, context = helpers_1.NATIVE_WIN, srcEventName = 'output', entryTransformer, } = properties;
|
|
157
|
+
const listener = (/** @type {import('../utils').LogEntry} */ logEntry) => {
|
|
158
|
+
const finalEntry = entryTransformer ? entryTransformer(logEntry) : logEntry;
|
|
159
|
+
this.eventEmitter.emit(utils_1.BIDI_EVENT_NAME, {
|
|
160
|
+
context,
|
|
161
|
+
method: 'log.entryAdded',
|
|
162
|
+
params: {
|
|
163
|
+
type,
|
|
164
|
+
level: finalEntry.level,
|
|
165
|
+
source: {
|
|
166
|
+
realm: '',
|
|
167
|
+
},
|
|
168
|
+
text: finalEntry.message,
|
|
169
|
+
timestamp: finalEntry.timestamp,
|
|
170
|
+
},
|
|
171
|
+
});
|
|
172
|
+
};
|
|
173
|
+
logEmitter.on(srcEventName, listener);
|
|
174
|
+
return [logEmitter, listener];
|
|
175
|
+
}
|
|
147
176
|
/**
|
|
148
177
|
* @this {import('../driver').AndroidDriver}
|
|
149
178
|
* @param {string} logType
|
|
@@ -162,22 +191,16 @@ async function getLog(logType) {
|
|
|
162
191
|
* @returns {string}
|
|
163
192
|
*/
|
|
164
193
|
const WEBSOCKET_ENDPOINT = (sessionId) => `${driver_1.DEFAULT_WS_PATHNAME_PREFIX}/session/${sessionId}/appium/device/logcat`;
|
|
165
|
-
/**
|
|
166
|
-
*
|
|
167
|
-
* @see {@link https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java}
|
|
168
|
-
* @param {number} timestamp
|
|
169
|
-
* @param {string} level
|
|
170
|
-
* @param {string} message
|
|
171
|
-
*/
|
|
172
|
-
function toLogRecord(timestamp, level, message) {
|
|
173
|
-
return {
|
|
174
|
-
timestamp,
|
|
175
|
-
level,
|
|
176
|
-
message,
|
|
177
|
-
};
|
|
178
|
-
}
|
|
179
194
|
// #endregion
|
|
180
195
|
/**
|
|
181
196
|
* @typedef {import('appium-adb').ADB} ADB
|
|
182
197
|
*/
|
|
198
|
+
/**
|
|
199
|
+
* @typedef {Object} BiDiListenerProperties
|
|
200
|
+
* @property {string} type
|
|
201
|
+
* @property {string} [srcEventName='output']
|
|
202
|
+
* @property {string} [context=NATIVE_WIN]
|
|
203
|
+
* @property {(x: Object) => import('../utils').LogEntry} [entryTransformer]
|
|
204
|
+
*/
|
|
205
|
+
/** @typedef {(logEntry: import('../utils').LogEntry) => any} LogListener */
|
|
183
206
|
//# sourceMappingURL=log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":"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"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ import { isIMEActivated, availableIMEEngines, getActiveIMEEngine, activateIMEEng
|
|
|
23
23
|
import { mobileStartActivity, mobileBroadcast, mobileStartService, mobileStopService } from './commands/intent';
|
|
24
24
|
import { hideKeyboard, isKeyboardShown, keys, doSendKeys, pressKeyCode, longPressKeyCode, mobilePerformEditorAction } from './commands/keyboard';
|
|
25
25
|
import { lock, unlock, mobileLock, mobileUnlock, isLocked } from './commands/lock/exports';
|
|
26
|
-
import { mobileStartLogsBroadcast, mobileStopLogsBroadcast, getLogTypes, getLog } from './commands/log';
|
|
26
|
+
import { mobileStartLogsBroadcast, mobileStopLogsBroadcast, getLogTypes, getLog, assignBiDiLogListener } from './commands/log';
|
|
27
27
|
import { mobileIsMediaProjectionRecordingRunning, mobileStartMediaProjectionRecording, mobileStopMediaProjectionRecording } from './commands/media-projection';
|
|
28
28
|
import { mobileSendTrimMemory } from './commands/memory';
|
|
29
29
|
import { mobileNfc } from './commands/nfc';
|
|
@@ -360,6 +360,7 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
|
|
|
360
360
|
_screenStreamingProps?: StringRecord;
|
|
361
361
|
_screenRecordingProperties?: StringRecord;
|
|
362
362
|
_logcatWebsocketListener?: LogcatListener;
|
|
363
|
+
_bidiServerLogListener?: (...args: any[]) => void;
|
|
363
364
|
opts: AndroidDriverOpts;
|
|
364
365
|
constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
|
|
365
366
|
get settingsApp(): SettingsApp;
|
|
@@ -491,25 +492,18 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
|
|
|
491
492
|
};
|
|
492
493
|
bugreport: {
|
|
493
494
|
description: string;
|
|
494
|
-
getter: (self: import("./driver").AndroidDriver) => Promise<
|
|
495
|
-
timestamp: number;
|
|
496
|
-
level: string;
|
|
497
|
-
message: string;
|
|
498
|
-
}[]>;
|
|
495
|
+
getter: (self: import("./driver").AndroidDriver) => Promise<import("appium-adb").LogcatRecord[]>;
|
|
499
496
|
};
|
|
500
497
|
server: {
|
|
501
498
|
description: string;
|
|
502
|
-
getter: (self: import("./driver").AndroidDriver) =>
|
|
503
|
-
timestamp: number;
|
|
504
|
-
level: string;
|
|
505
|
-
message: string;
|
|
506
|
-
}[];
|
|
499
|
+
getter: (self: import("./driver").AndroidDriver) => import("appium-adb").LogcatRecord[];
|
|
507
500
|
};
|
|
508
501
|
};
|
|
509
502
|
mobileStartLogsBroadcast: typeof mobileStartLogsBroadcast;
|
|
510
503
|
mobileStopLogsBroadcast: typeof mobileStopLogsBroadcast;
|
|
511
504
|
getLogTypes: typeof getLogTypes;
|
|
512
505
|
getLog: typeof getLog;
|
|
506
|
+
assignBiDiLogListener: typeof assignBiDiLogListener;
|
|
513
507
|
mobileIsMediaProjectionRecordingRunning: typeof mobileIsMediaProjectionRecordingRunning;
|
|
514
508
|
mobileStartMediaProjectionRecording: typeof mobileStartMediaProjectionRecording;
|
|
515
509
|
mobileStopMediaProjectionRecording: typeof mobileStopMediaProjectionRecording;
|
|
@@ -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
|
@@ -172,6 +172,7 @@ class AndroidDriver extends driver_1.BaseDriver {
|
|
|
172
172
|
this.mobileStopLogsBroadcast = log_1.mobileStopLogsBroadcast;
|
|
173
173
|
this.getLogTypes = log_1.getLogTypes;
|
|
174
174
|
this.getLog = log_1.getLog;
|
|
175
|
+
this.assignBiDiLogListener = log_1.assignBiDiLogListener;
|
|
175
176
|
this.mobileIsMediaProjectionRecordingRunning = media_projection_1.mobileIsMediaProjectionRecordingRunning;
|
|
176
177
|
this.mobileStartMediaProjectionRecording = media_projection_1.mobileStartMediaProjectionRecording;
|
|
177
178
|
this.mobileStopMediaProjectionRecording = media_projection_1.mobileStopMediaProjectionRecording;
|
|
@@ -227,6 +228,7 @@ class AndroidDriver extends driver_1.BaseDriver {
|
|
|
227
228
|
this.curContext = this.defaultContextName();
|
|
228
229
|
this.opts = opts;
|
|
229
230
|
this._cachedActivityArgs = {};
|
|
231
|
+
this.doesSupportBidi = true;
|
|
230
232
|
}
|
|
231
233
|
get settingsApp() {
|
|
232
234
|
if (!this._settingsApp || this._settingsApp.adb !== this.adb) {
|
|
@@ -269,11 +271,15 @@ class AndroidDriver extends driver_1.BaseDriver {
|
|
|
269
271
|
await (0, utils_1.removeAllSessionWebSocketHandlers)(this.server, sessionId);
|
|
270
272
|
}
|
|
271
273
|
try {
|
|
274
|
+
this.adb?.logcat?.removeAllListeners();
|
|
272
275
|
await this.adb?.stopLogcat();
|
|
273
276
|
}
|
|
274
277
|
catch (e) {
|
|
275
278
|
this.log.warn(`Cannot stop the logcat process. Original error: ${e.message}`);
|
|
276
279
|
}
|
|
280
|
+
if (this._bidiServerLogListener) {
|
|
281
|
+
this.log.unwrap().off('log', this._bidiServerLogListener);
|
|
282
|
+
}
|
|
277
283
|
await super.deleteSession(sessionId);
|
|
278
284
|
}
|
|
279
285
|
}
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":";AAAA,6DAA6D;;;;;;AAW7D,oDAAuB;AAIvB,0CAAyC;AACzC,gEAAmF;AACnF,6CAA0C;AAC1C,2DAA+C;AAC/C,mCAAsE;AACtE,wDAA2E;AAC3E,wDAgBoC;AACpC,qDAKkC;AAClC,yEAkB4C;AAC5C,yEAA+E;AAC/E,8DAsBmC;AACnC,sDAAuE;AACvE,sDAAuD;AACvD,oDAAuD;AACvD,gDAgB4B;AAC5B,gDAI4B;AAC5B,0DAQiC;AACjC,0CAAgE;AAChE,wDAMgC;AAChC,kDAE6B;AAC7B,wCAMwB;AACxB,8CAM2B;AAC3B,kDAQ6B;AAC7B,qDAAyF;AACzF,
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -18,5 +18,23 @@ export function parseArray(cap: string | string[]): string[];
|
|
|
18
18
|
* @returns {Promise<void>}
|
|
19
19
|
*/
|
|
20
20
|
export function removeAllSessionWebSocketHandlers(server: import("@appium/types").AppiumServer, sessionId?: string | null | undefined): Promise<void>;
|
|
21
|
+
/**
|
|
22
|
+
*
|
|
23
|
+
* @param {Object} x
|
|
24
|
+
* @returns {LogEntry}
|
|
25
|
+
*/
|
|
26
|
+
export function nativeLogEntryToSeleniumEntry(x: any): LogEntry;
|
|
27
|
+
/**
|
|
28
|
+
*
|
|
29
|
+
* @see {@link https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java}
|
|
30
|
+
* @param {number} timestamp
|
|
31
|
+
* @param {string} message
|
|
32
|
+
* @param {string} [level='ALL']
|
|
33
|
+
* @returns {LogEntry}
|
|
34
|
+
*/
|
|
35
|
+
export function toLogRecord(timestamp: number, message: string, level?: string | undefined): LogEntry;
|
|
21
36
|
export const ADB_SHELL_FEATURE: "adb_shell";
|
|
37
|
+
export const BIDI_EVENT_NAME: "bidiEvent";
|
|
38
|
+
export const GET_SERVER_LOGS_FEATURE: "get_server_logs";
|
|
39
|
+
export type LogEntry = import("appium-adb").LogcatRecord;
|
|
22
40
|
//# sourceMappingURL=utils.d.ts.map
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,sCAJW,MAAM,GAAC,MAAM,EAAE,QACf,GAAG,GACD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAS/B;AAED;;;;GAIG;AACH,gCAHW,MAAM,GAAG,MAAM,EAAE,GACf,MAAM,EAAE,CAgBpB;AAED;;;;GAIG;AACH,0DAJW,OAAO,eAAe,EAAE,YAAY,0CAElC,OAAO,CAAC,IAAI,CAAC,CAWzB;AAED;;;;GAIG;AACH,uDAFa,QAAQ,CAOpB;AAED;;;;;;;GAOG;AACH,uCALW,MAAM,WACN,MAAM,+BAEJ,QAAQ,CAQpB;AAnFD,4CAA6C;AAC7C,0CAA2C;AAC3C,wDAAyD;uBAoF5C,OAAO,YAAY,EAAE,YAAY"}
|
package/build/lib/utils.js
CHANGED
|
@@ -3,13 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ADB_SHELL_FEATURE = void 0;
|
|
6
|
+
exports.GET_SERVER_LOGS_FEATURE = exports.BIDI_EVENT_NAME = exports.ADB_SHELL_FEATURE = void 0;
|
|
7
7
|
exports.requireArgs = requireArgs;
|
|
8
8
|
exports.parseArray = parseArray;
|
|
9
9
|
exports.removeAllSessionWebSocketHandlers = removeAllSessionWebSocketHandlers;
|
|
10
|
+
exports.nativeLogEntryToSeleniumEntry = nativeLogEntryToSeleniumEntry;
|
|
11
|
+
exports.toLogRecord = toLogRecord;
|
|
10
12
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
13
|
const driver_1 = require("appium/driver");
|
|
12
14
|
exports.ADB_SHELL_FEATURE = 'adb_shell';
|
|
15
|
+
exports.BIDI_EVENT_NAME = 'bidiEvent';
|
|
16
|
+
exports.GET_SERVER_LOGS_FEATURE = 'get_server_logs';
|
|
13
17
|
/**
|
|
14
18
|
* Assert the presence of particular keys in the given object
|
|
15
19
|
*
|
|
@@ -59,4 +63,31 @@ async function removeAllSessionWebSocketHandlers(server, sessionId) {
|
|
|
59
63
|
await server.removeWebSocketHandler(pathname);
|
|
60
64
|
}
|
|
61
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
*
|
|
68
|
+
* @param {Object} x
|
|
69
|
+
* @returns {LogEntry}
|
|
70
|
+
*/
|
|
71
|
+
function nativeLogEntryToSeleniumEntry(x) {
|
|
72
|
+
return toLogRecord(lodash_1.default.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`,
|
|
73
|
+
/** @type {any} */ (x).timestamp ?? Date.now());
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
*
|
|
77
|
+
* @see {@link https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java}
|
|
78
|
+
* @param {number} timestamp
|
|
79
|
+
* @param {string} message
|
|
80
|
+
* @param {string} [level='ALL']
|
|
81
|
+
* @returns {LogEntry}
|
|
82
|
+
*/
|
|
83
|
+
function toLogRecord(timestamp, message, level = 'ALL') {
|
|
84
|
+
return {
|
|
85
|
+
timestamp,
|
|
86
|
+
level,
|
|
87
|
+
message,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* @typedef {import('appium-adb').LogcatRecord} LogEntry
|
|
92
|
+
*/
|
|
62
93
|
//# sourceMappingURL=utils.js.map
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;AAcA,kCAOC;AAOD,gCAcC;AAOD,8EASC;AAOD,sEAKC;AAUD,kCAMC;AAtFD,oDAAuB;AACvB,0CAAqC;AAExB,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAChC,QAAA,eAAe,GAAG,WAAW,CAAC;AAC9B,QAAA,uBAAuB,GAAG,iBAAiB,CAAC;AAEzD;;;;;;GAMG;AACH,SAAgB,WAAW,CAAC,QAAQ,EAAE,IAAI;IACxC,KAAK,MAAM,OAAO,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,IAAI,OAAO,6BAA6B,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,GAAG;IAC5B,IAAI,UAAU,CAAC;IACf,IAAI,CAAC;QACH,0BAA0B;QAC1B,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;IAEhB,IAAI,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;SAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,iDAAiD,GAAG,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,iCAAiC,CAAC,MAAM,EAAE,SAAS;IACvE,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAC,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC1D,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACpE,KAAK,MAAM,QAAQ,IAAI,gBAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9C,MAAM,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAgB,6BAA6B,CAAE,CAAC;IAC9C,OAAO,WAAW,CAChB,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,OAAO,EAAE;IAC9D,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAC/C,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,KAAK;IAC3D,OAAO;QACL,SAAS;QACT,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED;;GAEG"}
|
|
@@ -738,6 +738,17 @@ export async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
738
738
|
}
|
|
739
739
|
}
|
|
740
740
|
|
|
741
|
+
// Ensure there are logging preferences
|
|
742
|
+
opts.chromeLoggingPrefs = opts.chromeLoggingPrefs ?? {};
|
|
743
|
+
|
|
744
|
+
// Strip the prefix and store it
|
|
745
|
+
for (const opt of _.keys(opts)) {
|
|
746
|
+
if (opt.endsWith(':loggingPrefs')) {
|
|
747
|
+
this.log.warn(`Merging '${opt}' into 'chromeLoggingPrefs'. This may cause unexpected behavior`);
|
|
748
|
+
_.merge(opts.chromeLoggingPrefs, opts[opt]);
|
|
749
|
+
}
|
|
750
|
+
}
|
|
751
|
+
|
|
741
752
|
const caps = /** @type {any} */ (createChromedriverCaps.bind(this)(opts, curDeviceId, details));
|
|
742
753
|
this.log.debug(
|
|
743
754
|
`Before starting chromedriver, androidPackage is '${caps.chromeOptions.androidPackage}'`,
|
|
@@ -12,6 +12,10 @@ import {
|
|
|
12
12
|
} from './utils';
|
|
13
13
|
import {adjustTimeZone} from '../time';
|
|
14
14
|
import { retryInterval } from 'asyncbox';
|
|
15
|
+
import {
|
|
16
|
+
GET_SERVER_LOGS_FEATURE,
|
|
17
|
+
nativeLogEntryToSeleniumEntry
|
|
18
|
+
} from '../../utils';
|
|
15
19
|
|
|
16
20
|
/**
|
|
17
21
|
* @this {AndroidDriver}
|
|
@@ -247,6 +251,11 @@ export async function initDevice() {
|
|
|
247
251
|
filterSpecs: logcatFilterSpecs,
|
|
248
252
|
});
|
|
249
253
|
this.eventEmitter.emit('syslogStarted', this.adb.logcat);
|
|
254
|
+
if (this.adb.logcat) {
|
|
255
|
+
this.assignBiDiLogListener(this.adb.logcat, {
|
|
256
|
+
type: 'syslog',
|
|
257
|
+
});
|
|
258
|
+
}
|
|
250
259
|
};
|
|
251
260
|
setupPromises.push(logcatStartupPromise());
|
|
252
261
|
}
|
|
@@ -272,6 +281,15 @@ export async function initDevice() {
|
|
|
272
281
|
if (timeZone) {
|
|
273
282
|
setupPromises.push(adjustTimeZone.bind(this)(timeZone));
|
|
274
283
|
}
|
|
284
|
+
if (this.isFeatureEnabled(GET_SERVER_LOGS_FEATURE)) {
|
|
285
|
+
[, this._bidiServerLogListener] = this.assignBiDiLogListener(
|
|
286
|
+
this.log.unwrap(), {
|
|
287
|
+
type: 'server',
|
|
288
|
+
srcEventName: 'log',
|
|
289
|
+
entryTransformer: nativeLogEntryToSeleniumEntry,
|
|
290
|
+
}
|
|
291
|
+
);
|
|
292
|
+
}
|
|
275
293
|
|
|
276
294
|
await B.all(setupPromises);
|
|
277
295
|
}
|
package/lib/commands/log.js
CHANGED
|
@@ -2,8 +2,13 @@ import {DEFAULT_WS_PATHNAME_PREFIX, BaseDriver} from 'appium/driver';
|
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import os from 'node:os';
|
|
4
4
|
import WebSocket from 'ws';
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
import {
|
|
6
|
+
BIDI_EVENT_NAME,
|
|
7
|
+
GET_SERVER_LOGS_FEATURE,
|
|
8
|
+
toLogRecord,
|
|
9
|
+
nativeLogEntryToSeleniumEntry,
|
|
10
|
+
} from '../utils';
|
|
11
|
+
import { NATIVE_WIN } from './context/helpers';
|
|
7
12
|
|
|
8
13
|
export const supportedLogTypes = {
|
|
9
14
|
logcat: {
|
|
@@ -25,7 +30,7 @@ export const supportedLogTypes = {
|
|
|
25
30
|
getter: async (self) => {
|
|
26
31
|
const output = await /** @type {ADB} */ (self.adb).bugreport();
|
|
27
32
|
const timestamp = Date.now();
|
|
28
|
-
return output.split(os.EOL).map((x) => toLogRecord(timestamp,
|
|
33
|
+
return output.split(os.EOL).map((x) => toLogRecord(timestamp, x));
|
|
29
34
|
},
|
|
30
35
|
},
|
|
31
36
|
server: {
|
|
@@ -37,14 +42,7 @@ export const supportedLogTypes = {
|
|
|
37
42
|
*/
|
|
38
43
|
getter: (self) => {
|
|
39
44
|
self.ensureFeatureEnabled(GET_SERVER_LOGS_FEATURE);
|
|
40
|
-
return self.log
|
|
41
|
-
.unwrap()
|
|
42
|
-
.record.map((x) => toLogRecord(
|
|
43
|
-
/** @type {any} */ (x).timestamp ?? Date.now(),
|
|
44
|
-
'ALL',
|
|
45
|
-
_.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`,
|
|
46
|
-
),
|
|
47
|
-
);
|
|
45
|
+
return self.log.unwrap().record.map(nativeLogEntryToSeleniumEntry);
|
|
48
46
|
},
|
|
49
47
|
},
|
|
50
48
|
};
|
|
@@ -155,6 +153,42 @@ export async function getLogTypes() {
|
|
|
155
153
|
return nativeLogTypes;
|
|
156
154
|
}
|
|
157
155
|
|
|
156
|
+
/**
|
|
157
|
+
* https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
|
|
158
|
+
*
|
|
159
|
+
* @template {import('node:events').EventEmitter} EE
|
|
160
|
+
* @this {import('../driver').AndroidDriver}
|
|
161
|
+
* @param {EE} logEmitter
|
|
162
|
+
* @param {BiDiListenerProperties} properties
|
|
163
|
+
* @returns {[EE, LogListener]}
|
|
164
|
+
*/
|
|
165
|
+
export function assignBiDiLogListener (logEmitter, properties) {
|
|
166
|
+
const {
|
|
167
|
+
type,
|
|
168
|
+
context = NATIVE_WIN,
|
|
169
|
+
srcEventName = 'output',
|
|
170
|
+
entryTransformer,
|
|
171
|
+
} = properties;
|
|
172
|
+
const listener = (/** @type {import('../utils').LogEntry} */ logEntry) => {
|
|
173
|
+
const finalEntry = entryTransformer ? entryTransformer(logEntry) : logEntry;
|
|
174
|
+
this.eventEmitter.emit(BIDI_EVENT_NAME, {
|
|
175
|
+
context,
|
|
176
|
+
method: 'log.entryAdded',
|
|
177
|
+
params: {
|
|
178
|
+
type,
|
|
179
|
+
level: finalEntry.level,
|
|
180
|
+
source: {
|
|
181
|
+
realm: '',
|
|
182
|
+
},
|
|
183
|
+
text: finalEntry.message,
|
|
184
|
+
timestamp: finalEntry.timestamp,
|
|
185
|
+
},
|
|
186
|
+
});
|
|
187
|
+
};
|
|
188
|
+
logEmitter.on(srcEventName, listener);
|
|
189
|
+
return [logEmitter, listener];
|
|
190
|
+
}
|
|
191
|
+
|
|
158
192
|
/**
|
|
159
193
|
* @this {import('../driver').AndroidDriver}
|
|
160
194
|
* @param {string} logType
|
|
@@ -179,23 +213,19 @@ export async function getLog(logType) {
|
|
|
179
213
|
const WEBSOCKET_ENDPOINT = (sessionId) =>
|
|
180
214
|
`${DEFAULT_WS_PATHNAME_PREFIX}/session/${sessionId}/appium/device/logcat`;
|
|
181
215
|
|
|
182
|
-
/**
|
|
183
|
-
*
|
|
184
|
-
* @see {@link https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java}
|
|
185
|
-
* @param {number} timestamp
|
|
186
|
-
* @param {string} level
|
|
187
|
-
* @param {string} message
|
|
188
|
-
*/
|
|
189
|
-
function toLogRecord(timestamp, level, message) {
|
|
190
|
-
return {
|
|
191
|
-
timestamp,
|
|
192
|
-
level,
|
|
193
|
-
message,
|
|
194
|
-
};
|
|
195
|
-
}
|
|
196
216
|
|
|
197
217
|
// #endregion
|
|
198
218
|
|
|
199
219
|
/**
|
|
200
220
|
* @typedef {import('appium-adb').ADB} ADB
|
|
201
221
|
*/
|
|
222
|
+
|
|
223
|
+
/**
|
|
224
|
+
* @typedef {Object} BiDiListenerProperties
|
|
225
|
+
* @property {string} type
|
|
226
|
+
* @property {string} [srcEventName='output']
|
|
227
|
+
* @property {string} [context=NATIVE_WIN]
|
|
228
|
+
* @property {(x: Object) => import('../utils').LogEntry} [entryTransformer]
|
|
229
|
+
*/
|
|
230
|
+
|
|
231
|
+
/** @typedef {(logEntry: import('../utils').LogEntry) => any} LogListener */
|
package/lib/driver.ts
CHANGED
|
@@ -160,6 +160,7 @@ import {
|
|
|
160
160
|
mobileStopLogsBroadcast,
|
|
161
161
|
getLogTypes,
|
|
162
162
|
getLog,
|
|
163
|
+
assignBiDiLogListener,
|
|
163
164
|
} from './commands/log';
|
|
164
165
|
import {
|
|
165
166
|
mobileIsMediaProjectionRecordingRunning,
|
|
@@ -252,6 +253,8 @@ class AndroidDriver
|
|
|
252
253
|
|
|
253
254
|
_logcatWebsocketListener?: LogcatListener;
|
|
254
255
|
|
|
256
|
+
_bidiServerLogListener?: (...args: any[]) => void;
|
|
257
|
+
|
|
255
258
|
opts: AndroidDriverOpts;
|
|
256
259
|
|
|
257
260
|
constructor(opts: InitialOpts = {} as InitialOpts, shouldValidateCaps = true) {
|
|
@@ -271,6 +274,7 @@ class AndroidDriver
|
|
|
271
274
|
this.curContext = this.defaultContextName();
|
|
272
275
|
this.opts = opts as AndroidDriverOpts;
|
|
273
276
|
this._cachedActivityArgs = {};
|
|
277
|
+
this.doesSupportBidi = true;
|
|
274
278
|
}
|
|
275
279
|
|
|
276
280
|
get settingsApp(): SettingsApp {
|
|
@@ -330,11 +334,16 @@ class AndroidDriver
|
|
|
330
334
|
}
|
|
331
335
|
|
|
332
336
|
try {
|
|
337
|
+
this.adb?.logcat?.removeAllListeners();
|
|
333
338
|
await this.adb?.stopLogcat();
|
|
334
339
|
} catch (e) {
|
|
335
340
|
this.log.warn(`Cannot stop the logcat process. Original error: ${e.message}`);
|
|
336
341
|
}
|
|
337
342
|
|
|
343
|
+
if (this._bidiServerLogListener) {
|
|
344
|
+
this.log.unwrap().off('log', this._bidiServerLogListener);
|
|
345
|
+
}
|
|
346
|
+
|
|
338
347
|
await super.deleteSession(sessionId);
|
|
339
348
|
}
|
|
340
349
|
|
|
@@ -488,6 +497,7 @@ class AndroidDriver
|
|
|
488
497
|
mobileStopLogsBroadcast = mobileStopLogsBroadcast;
|
|
489
498
|
getLogTypes = getLogTypes;
|
|
490
499
|
getLog = getLog;
|
|
500
|
+
assignBiDiLogListener = assignBiDiLogListener;
|
|
491
501
|
|
|
492
502
|
mobileIsMediaProjectionRecordingRunning = mobileIsMediaProjectionRecordingRunning;
|
|
493
503
|
mobileStartMediaProjectionRecording = mobileStartMediaProjectionRecording;
|
package/lib/utils.js
CHANGED
|
@@ -2,6 +2,8 @@ import _ from 'lodash';
|
|
|
2
2
|
import {errors} from 'appium/driver';
|
|
3
3
|
|
|
4
4
|
export const ADB_SHELL_FEATURE = 'adb_shell';
|
|
5
|
+
export const BIDI_EVENT_NAME = 'bidiEvent';
|
|
6
|
+
export const GET_SERVER_LOGS_FEATURE = 'get_server_logs';
|
|
5
7
|
|
|
6
8
|
/**
|
|
7
9
|
* Assert the presence of particular keys in the given object
|
|
@@ -55,3 +57,35 @@ export async function removeAllSessionWebSocketHandlers(server, sessionId) {
|
|
|
55
57
|
await server.removeWebSocketHandler(pathname);
|
|
56
58
|
}
|
|
57
59
|
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
*
|
|
63
|
+
* @param {Object} x
|
|
64
|
+
* @returns {LogEntry}
|
|
65
|
+
*/
|
|
66
|
+
export function nativeLogEntryToSeleniumEntry (x) {
|
|
67
|
+
return toLogRecord(
|
|
68
|
+
_.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`,
|
|
69
|
+
/** @type {any} */ (x).timestamp ?? Date.now()
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
*
|
|
75
|
+
* @see {@link https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java}
|
|
76
|
+
* @param {number} timestamp
|
|
77
|
+
* @param {string} message
|
|
78
|
+
* @param {string} [level='ALL']
|
|
79
|
+
* @returns {LogEntry}
|
|
80
|
+
*/
|
|
81
|
+
export function toLogRecord(timestamp, message, level = 'ALL') {
|
|
82
|
+
return {
|
|
83
|
+
timestamp,
|
|
84
|
+
level,
|
|
85
|
+
message,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* @typedef {import('appium-adb').LogcatRecord} LogEntry
|
|
91
|
+
*/
|