appium-espresso-driver 3.5.1 → 3.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/commands/app-management.d.ts +1 -1
  3. package/build/lib/commands/app-management.d.ts.map +1 -1
  4. package/build/lib/commands/misc.d.ts +1 -1
  5. package/build/lib/commands/misc.d.ts.map +1 -1
  6. package/build/lib/commands/screenshot.d.ts +1 -1
  7. package/build/lib/commands/screenshot.d.ts.map +1 -1
  8. package/build/lib/doctor/required-checks.d.ts.map +1 -1
  9. package/build/lib/driver.d.ts.map +1 -1
  10. package/build/lib/driver.js +23 -13
  11. package/build/lib/driver.js.map +1 -1
  12. package/build/lib/espresso-runner.d.ts.map +1 -1
  13. package/build/lib/espresso-runner.js +2 -2
  14. package/build/lib/espresso-runner.js.map +1 -1
  15. package/build/lib/server-builder.d.ts.map +1 -1
  16. package/build/lib/server-builder.js +1 -1
  17. package/build/lib/server-builder.js.map +1 -1
  18. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  19. package/lib/driver.ts +15 -7
  20. package/lib/espresso-runner.js +5 -3
  21. package/lib/server-builder.js +1 -1
  22. package/npm-shrinkwrap.json +255 -142
  23. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [3.5.2](https://github.com/appium/appium-espresso-driver/compare/v3.5.1...v3.5.2) (2024-12-13)
2
+
3
+ ### Miscellaneous Chores
4
+
5
+ * Replace occurrences of the deprecated errorAndThrow API ([#1035](https://github.com/appium/appium-espresso-driver/issues/1035)) ([3694dbc](https://github.com/appium/appium-espresso-driver/commit/3694dbce3c2054d7116144a3fb03169a9c6c9545))
6
+
1
7
  ## [3.5.1](https://github.com/appium/appium-espresso-driver/compare/v3.5.0...v3.5.1) (2024-11-11)
2
8
 
3
9
  ### Miscellaneous Chores
package/build/lib/commands/app-management.d.ts CHANGED
@@ -11,7 +11,7 @@
11
11
  * @this {import('../driver').EspressoDriver}
12
12
  * @param {BackgroundAppOptions} [opts={}]
13
13
  */
14
- export function mobileBackgroundApp(this: import("../driver").EspressoDriver, opts?: BackgroundAppOptions | undefined): Promise<string | true>;
14
+ export function mobileBackgroundApp(this: import("../driver").EspressoDriver, opts?: BackgroundAppOptions): Promise<string | true>;
15
15
  /**
16
16
  * @overload
17
17
  * @typedef {Object} StartActivityOptions
package/build/lib/commands/app-management.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH;;;;;;;GAOG;AACH,+IAGC;;;;;;;;;AAGE,2CACA;;;;;;;;;;AAYA,0CACQ,oBAAoB,GAClB,OAAO,CAAC,MAAM,CAAC,CAC3B;AAkBD;;;;;;;GAOG;AACH,oFALW,MAAM,eACN,MAAM,kBACN,MAAM,mBACN,MAAM,iBAiBhB;;;;;;;;;iBAvDa,MAAM"}
1
+ {"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH;;;;;;;GAOG;AACH,qFAFW,oBAAoB,0BAK9B;;;;;;;;;AAGE,2CACA;;;;;;;;;;AAYA,0CACQ,oBAAoB,GAClB,OAAO,CAAC,MAAM,CAAC,CAC3B;AAkBD;;;;;;;GAOG;AACH,oFALW,MAAM,eACN,MAAM,kBACN,MAAM,mBACN,MAAM,iBAiBhB;;;;;;;;;iBAvDa,MAAM"}
package/build/lib/commands/misc.d.ts CHANGED
@@ -14,7 +14,7 @@
14
14
  * @this {import('../driver').EspressoDriver}
15
15
  * @param {PressKeyOptions} [opts={}]
16
16
  */
17
- export function mobilePressKey(this: import("../driver").EspressoDriver, opts?: PressKeyOptions | undefined): Promise<void>;
17
+ export function mobilePressKey(this: import("../driver").EspressoDriver, opts?: PressKeyOptions): Promise<void>;
18
18
  /**
19
19
  * @this {import('../driver').EspressoDriver}
20
20
  * @returns {Promise<import('../types').DeviceInfo>}
package/build/lib/commands/misc.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/commands/misc.js"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,4HAKC;AAED;;;GAGG;AACH,+EAFa,OAAO,CAAC,OAAO,UAAU,EAAE,UAAU,CAAC,CAIlD;AAED;;GAEG;AACH,4GASC;AAED;;;GAGG;AACH,6EAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qFAHY,OAAO,CAAC,GAAG,CAAC,CAUvB;AAED;;;;;;;;;;GAUG;AACH,yGAGC;AAED;;;;;GAKG;AACH,uFAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;AAED;;;;GAIG;AAEH;;;;;GAKG;AACH,mFAHW,eAAe,iBAUzB;AAED;;GAEG;AACH;;GAMC;;;;;;;;;;;;;;;;;;;;;;;;;;;YA5Ba,MAAO,GAAC,MAAM,GAAC,OAAO"}
1
+ {"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/commands/misc.js"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,gFAFW,eAAe,iBAOzB;AAED;;;GAGG;AACH,+EAFa,OAAO,CAAC,OAAO,UAAU,EAAE,UAAU,CAAC,CAIlD;AAED;;GAEG;AACH,4GASC;AAED;;;GAGG;AACH,6EAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qFAHY,OAAO,CAAC,GAAG,CAAC,CAUvB;AAED;;;;;;;;;;GAUG;AACH,yGAGC;AAED;;;;;GAKG;AACH,uFAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;AAED;;;;GAIG;AAEH;;;;;GAKG;AACH,mFAHW,eAAe,iBAUzB;AAED;;GAEG;AACH;;GAMC;;;;;;;;;;;;;;;;;;;;;;;;;;;YA5Ba,MAAO,GAAC,MAAM,GAAC,OAAO"}
package/build/lib/commands/screenshot.d.ts CHANGED
@@ -22,7 +22,7 @@
22
22
  * @param {ScreenshotsOpts} [opts={}]
23
23
  * @returns {Promise<ScreenshotsInfo>}
24
24
  */
25
- export function mobileScreenshots(this: import("../driver").EspressoDriver, opts?: ScreenshotsOpts | undefined): Promise<ScreenshotsInfo>;
25
+ export function mobileScreenshots(this: import("../driver").EspressoDriver, opts?: ScreenshotsOpts): Promise<ScreenshotsInfo>;
26
26
  /**
27
27
  * Return the base 64 encoded screenshot data.
28
28
  * This method is called only when `appium:nativeWebScreenshot` is enabled
package/build/lib/commands/screenshot.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../../lib/commands/screenshot.js"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,iHAFa,OAAO,CAAC,eAAe,CAAC,CA8CpC;AAED;;;;;;;;;GASG;AACH,yEAFa,OAAO,QAAQ,CAQ3B"}
1
+ {"version":3,"file":"screenshot.d.ts","sourceRoot":"","sources":["../../../lib/commands/screenshot.js"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,mFAHW,eAAe,GACb,OAAO,CAAC,eAAe,CAAC,CA8CpC;AAED;;;;;;;;;GASG;AACH,yEAFa,OAAO,QAAQ,CAQ3B"}
package/build/lib/doctor/required-checks.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"required-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/required-checks.js"],"names":[],"mappings":"AAKA;;;+BA8CivB,eAAe;;;;EA9ClsB;AAC9D;;;;;;;EAAwD;AACxD,iEAAkE;AAClE,2DAA4D;AAE5D,wDAAwD;AACxD;IACE,yBAAsB;IACtB,6BAA2D;IAE3D,+DAoBC;IAED,uBAGC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,gDAAuD;uCAlDhB,uBAAuB"}
1
+ {"version":3,"file":"required-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/required-checks.js"],"names":[],"mappings":"AAKA;;;+BA8CquB,eAAe;;;;EA9CtrB;AAC9D;;;+BA6CquB,eAAe;;;;EA7C5rB;AACxD,iEAAkE;AAClE,2DAA4D;AAE5D,wDAAwD;AACxD;IACE,yBAAsB;IACtB,6BAA2D;IAE3D,+DAoBC;IAED,uBAGC;IAED,sBAEC;IAED,sBAEC;CACF;AACD,gDAAuD;uCAlDhB,uBAAuB"}
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,UAAU,EACV,cAAc,EACd,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,EAAE,cAAc,EAAgB,MAAM,mBAAmB,CAAC;AAEjE,OAAO,KAAK,iBAAiB,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,mBAAmB,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,aAAa,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAS,MAAM,uBAAuB,CAAC;AAO7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AA8G7F,qBAAa,cAAe,SAAQ,aAAc,YAAW,cAAc,CACzE,mBAAmB,EACnB,MAAM,EACN,YAAY,CACb;IACC,YAAY,EAAE,MAAM,GAAC,IAAI,CAAC;IAE1B,QAAQ,EAAE,cAAc,CAAC;IAEzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IAE1B,IAAI,EAAE,kBAAkB,CAAC;IAEzB,IAAI,EAAE,kBAAkB,CAAC;IAEzB,qBAAqB,EAAE,mBAAmB,CAAC;gBAEvC,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAsB9D,UAAU,IAAI,OAAO,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAIxE,aAAa,CACjB,QAAQ,EAAE,qBAAqB,EAC/B,QAAQ,CAAC,EAAE,qBAAqB,EAChC,QAAQ,CAAC,EAAE,qBAAqB,EAChC,UAAU,CAAC,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,GAAG,CAAC;IA6Ff;;;;;;;OAOG;IACG,QAAQ,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwB3C,kBAAkB,CAAE,EAAC,aAAa,EAAE,KAAK,EAAE,OAAO,EAAC;;;;KAAA;;;IAkEzD,IAAI,UAAU,OAGb;IAGK,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8F3C;;;;;;OAMG;IACG,uBAAuB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB1D,WAAW,IAAK,OAAO,CAAC,IAAI,CAAC;IAO7B,mBAAmB,IAAK,OAAO,CAAC,IAAI,CAAC;IAiB3C,kBAAkB,IAAK,IAAI;IA8BrB,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;IAwChB,aAAa;IAwEtB,gBAAgB;IAMtB,WAAW,CAAE,SAAS,KAAA;IAMtB,QAAQ,CAAE,SAAS,KAAA;IAMnB,iBAAiB,CAAE,SAAS,KAAA,GAAG,YAAY,EAAE;IAc7C,IAAI,WAAW,IAAK,OAAO,CAE1B;IAED,cAAc,oCAA8B;IAE5C,qBAAqB,2CAAqC;IAE1D,mBAAmB,+CAAyC;IAC5D,aAAa,yCAAmC;IAChD,mBAAmB,+CAAyC;IAE5D,cAAc,oCAA8B;IAC5C,wBAAwB,8CAAwC;IAEhE,yBAAyB,+CAAyC;IAClE,WAAW,iCAA2B;IACtC,gBAAgB,sCAAgC;IAChD,iBAAiB,uCAAiC;IAClD,aAAa,mCAA6B;IAC1C,aAAa,mCAA6B;IAC1C,gBAAgB,sCAAgC;IAChD,kBAAkB,wCAAkC;IACpD,kBAAkB,wCAAkC;IACpD,iBAAiB,uCAAiC;IAClD,qBAAqB,2CAAqC;IAE1D,cAAc,iCAA2B;IACzC,mBAAmB,sCAAgC;IACnD,oBAAoB,uCAAiC;IACrD,iBAAiB,oCAA8B;IAC/C,cAAc,iCAA2B;IACzC,iBAAiB,oCAA8B;IAC/C,2BAA2B,8CAAwC;IACnE,cAAc,iCAA2B;IACzC,WAAW,8BAAwB;IAEnC,YAAY,oCAA8B;IAC1C,iBAAiB,oCAA8B;IAC/C,iBAAiB,0CAAoC;IAErD,kBAAkB,yCAAmC;IACrD,iBAAiB,wCAAkC;IAEnD,aAAa,sCAAgC;IAC7C,iBAAiB,0CAAoC;IAErD,6BAA6B,2DAAqD;IAClF,+BAA+B,6DAAuD;IACtF,yBAAyB,uDAAiD;IAC1E,qBAAqB,mDAA6C;CACnE;AAED,eAAe,cAAc,CAAC"}
package/build/lib/driver.js CHANGED
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
37
  };
@@ -238,7 +248,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
238
248
  `have permission to access Chrome`);
239
249
  }
240
250
  else {
241
- this.log.errorAndThrow(`Chrome browser sessions cannot be run in Espresso because Espresso ` +
251
+ throw this.log.errorWithException(`Chrome browser sessions cannot be run in Espresso because Espresso ` +
242
252
  `automation doesn't have permission to access Chrome`);
243
253
  }
244
254
  }
@@ -266,8 +276,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
266
276
  this.log.info(`App file was not listed, instead we're going to run ` +
267
277
  `${this.opts.appPackage} directly on the device`);
268
278
  if (!await this.adb.isAppInstalled(this.opts.appPackage)) {
269
- this.log.errorAndThrow(`Could not find the package '${this.opts.appPackage}' ` +
270
- `installed on the device`);
279
+ throw this.log.errorWithException(`Could not find the package '${this.opts.appPackage}' installed on the device`);
271
280
  }
272
281
  }
273
282
  await this.startEspressoSession();
@@ -306,8 +315,9 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
306
315
  })).sort((a, b) => a.split(path_1.default.sep).length - b.split(path_1.default.sep).length);
307
316
  if (sortedBundleItems.length === 0) {
308
317
  // no expected packages in the zip
309
- throw this.log.errorAndThrow(`${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
310
- `extension packages. Please make sure the provided .zip archive contains at least one valid application package.`);
318
+ throw this.log.errorWithException(`${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
319
+ `extension packages. Please make sure the provided .zip archive contains at ` +
320
+ `least one valid application package.`);
311
321
  }
312
322
  const unzippedAppPath = path_1.default.join(tmpRoot, lodash_1.default.first(sortedBundleItems));
313
323
  this.log.debug(`'${unzippedAppPath}' is the unzipped file from '${appPath}'`);
@@ -533,7 +543,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
533
543
  }
534
544
  if (!this.opts.app) {
535
545
  if (this.opts.fullReset) {
536
- this.log.errorAndThrow('Full reset requires an app capability, use fastReset if app is not provided');
546
+ throw this.log.errorWithException('Full reset requires an app capability, use fastReset if app is not provided');
537
547
  }
538
548
  this.log.debug('No app capability. Assuming it is already on the device');
539
549
  if (this.opts.fastReset) {
package/build/lib/driver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/espresso-runner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"espresso-runner.d.ts","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":";AA4CA;IAoBE,iCA+CC;IAjED,qBAAqB;IACrB,MADW,MAAM,CACZ;IAEL,qBAAqB;IACrB,YADW,MAAM,CACN;IAEX,qBAAqB;IACrB,YADW,MAAM,CACN;IAEX,uCAAuC;IACvC,KADW,OAAO,YAAY,EAAE,GAAG,CAC/B;IAEJ,qBAAqB;IACrB,QADW,MAAM,CACV;IAEP,qBAAqB;IACrB,sBADU,OAAO,CACI;IASnB,SAAc;IACd,uBAME;IACF,iBAA8D;IAC9D,kBAA2D;IAW3D,sBAA6D;IAC7D,mBAAuC;IACvC,yBAAmD;IAEnD,yBAAwF;IACxF,2BAAuD;IAEvD,yCAAmF;IAIjF;;;;;;aAKE;IAMN,wCASC;IAED;;;OAGG;IACH,+BA6BC;IAED,gCAyBC;IAED,mCAsCC;IAED,yCA0BC;IAED;;;;OAIG;IACH,mCAJW,MAAM,gBACN,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,OAAO,CAAC,CA+C5B;IAED,uCAkGC;IAvEC,2DAAiD;IAyEnD,wCAGC;IAED,+BAcC;CACF;AA5ZD,uCAQE;AATF,2DAAqD;AAarD;IAEE;;OAEG;IACH,sBAFU;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAC,CAExB;IAErB,+DAQC;CACF;wBA1C+B,eAAe"}
1
+ {"version":3,"file":"espresso-runner.d.ts","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":";AA4CA;IAoBE,iCA+CC;IAjED,qBAAqB;IACrB,MADW,MAAM,CACZ;IAEL,qBAAqB;IACrB,YADW,MAAM,CACN;IAEX,qBAAqB;IACrB,YADW,MAAM,CACN;IAEX,uCAAuC;IACvC,KADW,OAAO,YAAY,EAAE,GAAG,CAC/B;IAEJ,qBAAqB;IACrB,QADW,MAAM,CACV;IAEP,qBAAqB;IACrB,sBADU,OAAO,CACI;IASnB,SAAc;IACd,uBAME;IACF,iBAA8D;IAC9D,kBAA2D;IAW3D,sBAA6D;IAC7D,mBAAuC;IACvC,yBAAmD;IAEnD,yBAAwF;IACxF,2BAAuD;IAEvD,yCAAmF;IAIjF;;;;;;aAKE;IAMN,wCASC;IAED;;;OAGG;IACH,+BA6BC;IAED,gCAyBC;IAED,mCAsCC;IAED,yCA0BC;IAED;;;;OAIG;IACH,mCAJW,MAAM,gBACN,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,OAAO,CAAC,CA+C5B;IAED,uCAoGC;IAzEC,2DAAiD;IA2EnD,wCAGC;IAED,+BAcC;CACF;AA9ZD,uCAQE;AATF,2BAAqB,+BAA+B,CAAC;AAarD;IAEE;;OAEG;IACH,sBAFU;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAC,CAExB;IAErB,+DAQC;CACF;wBA1C+B,eAAe"}
package/build/lib/espresso-runner.js CHANGED
@@ -122,7 +122,7 @@ class EspressoRunner {
122
122
  this.log.info(`Installed Espresso Test Server apk '${this.modServerPath}' (pkg: '${TEST_APK_PKG}')`);
123
123
  }
124
124
  catch (err) {
125
- this.log.errorAndThrow(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
125
+ throw this.log.errorWithException(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
126
126
  }
127
127
  }
128
128
  }
@@ -330,7 +330,7 @@ class EspressoRunner {
330
330
  }
331
331
  catch (e) {
332
332
  if (/Condition unmet/.test(e.message)) {
333
- this.log.errorAndThrow(`Timed out waiting for Espresso server to be ` +
333
+ throw this.log.errorWithException(`Timed out waiting for Espresso server to be ` +
334
334
  `online within ${this.serverLaunchTimeout}ms. The timeout value could be ` +
335
335
  `customized using 'espressoServerLaunchTimeout' capability`);
336
336
  }
package/build/lib/espresso-runner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"espresso-runner.js","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"espresso-runner.js","sourceRoot":"","sources":["../../lib/espresso-runner.js"],"names":[],"mappings":"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"}
package/build/lib/server-builder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-builder.d.ts","sourceRoot":"","sources":["../../lib/server-builder.js"],"names":[],"mappings":";AAsCA;IACE,iCAuBC;IAtBC,SAAc;IACd,gBAAiC;IACjC,mBAAuC;IAKvC,mBAOM;IAEN,oBAAyC;IACzC,mBAAuC;IAOzC,uBAQC;IAED;;OAEG;IACH,cAFa;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAC,CAiCzC;IAED,qDAKC;IAED,+DAKC;IAED,8CAuCC;IAED,iCAgCC;CACF;AA1LD,oCAcE;AAjBF,uGAAiG;AAmBjG;;;;;;EAQC"}
1
+ {"version":3,"file":"server-builder.d.ts","sourceRoot":"","sources":["../../lib/server-builder.js"],"names":[],"mappings":";AAsCA;IACE,iCAuBC;IAtBC,SAAc;IACd,gBAAiC;IACjC,mBAAuC;IAKvC,mBAOM;IAEN,oBAAyC;IACzC,mBAAuC;IAOzC,uBAQC;IAED;;OAEG;IACH,cAFa;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAC,CAiCzC;IAED,qDAKC;IAED,+DAKC;IAED,8CAuCC;IAED,iCAgCC;CACF;AA1LD,oCAcE;AAjBF,kCAA4B,oEAAoE,CAAC;AAmBjG;;;;;;EAQC"}
package/build/lib/server-builder.js CHANGED
@@ -173,7 +173,7 @@ class ServerBuilder {
173
173
  catch (err) {
174
174
  const msg = `Unable to build Espresso server - ${err.message}\n` +
175
175
  `Gradle error message:${os_1.EOL}${gradleError.join('\n')}`;
176
- this.log.errorAndThrow(msg);
176
+ throw this.log.errorWithException(msg);
177
177
  }
178
178
  finally {
179
179
  gradlebuild.removeAllListeners();
package/build/lib/server-builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-builder.js","sourceRoot":"","sources":["../../lib/server-builder.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-builder.js","sourceRoot":"","sources":["../../lib/server-builder.js"],"names":[],"mappings":"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"}
package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt CHANGED
@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
2
2
 
3
3
  // This value is updated automatically by the NPM versioning script
4
4
  // It should be in sync with the NPM module version from package.json
5
- private const val VERSION = "3.5.1"
5
+ private const val VERSION = "3.5.2"
6
6
 
7
7
  fun getEspressoServerVersion() = VERSION
package/lib/driver.ts CHANGED
@@ -233,8 +233,10 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
233
233
  this.log.warn(`Chrome browser cannot be run in Espresso sessions because Espresso automation doesn't ` +
234
234
  `have permission to access Chrome`);
235
235
  } else {
236
- this.log.errorAndThrow(`Chrome browser sessions cannot be run in Espresso because Espresso ` +
237
- `automation doesn't have permission to access Chrome`);
236
+ throw this.log.errorWithException(
237
+ `Chrome browser sessions cannot be run in Espresso because Espresso ` +
238
+ `automation doesn't have permission to access Chrome`
239
+ );
238
240
  }
239
241
  }
240
242
 
@@ -262,8 +264,9 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
262
264
  this.log.info(`App file was not listed, instead we're going to run ` +
263
265
  `${this.opts.appPackage} directly on the device`);
264
266
  if (!await this.adb.isAppInstalled(this.opts.appPackage!)) {
265
- this.log.errorAndThrow(`Could not find the package '${this.opts.appPackage}' ` +
266
- `installed on the device`);
267
+ throw this.log.errorWithException(
268
+ `Could not find the package '${this.opts.appPackage}' installed on the device`
269
+ );
267
270
  }
268
271
  }
269
272
 
@@ -304,8 +307,11 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
304
307
  })).sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
305
308
  if (sortedBundleItems.length === 0) {
306
309
  // no expected packages in the zip
307
- throw this.log.errorAndThrow(`${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
308
- `extension packages. Please make sure the provided .zip archive contains at least one valid application package.`);
310
+ throw this.log.errorWithException(
311
+ `${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
312
+ `extension packages. Please make sure the provided .zip archive contains at ` +
313
+ `least one valid application package.`
314
+ );
309
315
  }
310
316
  const unzippedAppPath = path.join(tmpRoot, _.first(sortedBundleItems)!);
311
317
  this.log.debug(`'${unzippedAppPath}' is the unzipped file from '${appPath}'`);
@@ -568,7 +574,9 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
568
574
 
569
575
  if (!this.opts.app) {
570
576
  if (this.opts.fullReset) {
571
- this.log.errorAndThrow('Full reset requires an app capability, use fastReset if app is not provided');
577
+ throw this.log.errorWithException(
578
+ 'Full reset requires an app capability, use fastReset if app is not provided'
579
+ );
572
580
  }
573
581
  this.log.debug('No app capability. Assuming it is already on the device');
574
582
  if (this.opts.fastReset) {
package/lib/espresso-runner.js CHANGED
@@ -152,7 +152,7 @@ class EspressoRunner {
152
152
  await this.adb.install(this.modServerPath, { replace: false, timeout: this.androidInstallTimeout });
153
153
  this.log.info(`Installed Espresso Test Server apk '${this.modServerPath}' (pkg: '${TEST_APK_PKG}')`);
154
154
  } catch (err) {
155
- this.log.errorAndThrow(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
155
+ throw this.log.errorWithException(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
156
156
  }
157
157
  }
158
158
  }
@@ -385,9 +385,11 @@ class EspressoRunner {
385
385
  });
386
386
  } catch (e) {
387
387
  if (/Condition unmet/.test(e.message)) {
388
- this.log.errorAndThrow(`Timed out waiting for Espresso server to be ` +
388
+ throw this.log.errorWithException(
389
+ `Timed out waiting for Espresso server to be ` +
389
390
  `online within ${this.serverLaunchTimeout}ms. The timeout value could be ` +
390
- `customized using 'espressoServerLaunchTimeout' capability`);
391
+ `customized using 'espressoServerLaunchTimeout' capability`
392
+ );
391
393
  }
392
394
  throw e;
393
395
  }
package/lib/server-builder.js CHANGED
@@ -191,7 +191,7 @@ class ServerBuilder {
191
191
  } catch (err) {
192
192
  const msg = `Unable to build Espresso server - ${err.message}\n` +
193
193
  `Gradle error message:${EOL}${gradleError.join('\n')}`;
194
- this.log.errorAndThrow(msg);
194
+ throw this.log.errorWithException(msg);
195
195
  } finally {
196
196
  gradlebuild.removeAllListeners();
197
197
  }
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "3.5.1",
3
+ "version": "3.5.2",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-espresso-driver",
9
- "version": "3.5.1",
9
+ "version": "3.5.2",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "appium-adb": "^12.5.2",
@@ -60,23 +60,23 @@
60
60
  }
61
61
  },
62
62
  "node_modules/@appium/base-driver": {
63
- "version": "9.12.1",
64
- "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.12.1.tgz",
65
- "integrity": "sha512-lUOI/r0jrT1EVR16D31OH2m2FgEQAfYzJTsuDCohqI9caA8vHd4ChkWELnhMG/PdfhigxUoIpyvTlImG4XtbVQ==",
63
+ "version": "9.13.1",
64
+ "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.13.1.tgz",
65
+ "integrity": "sha512-djaBha+EsWdRUEC0o8gqpkzYQ8/5l1YUsySe9WfJD5khJCSa7e6RmmuAI6BNDscnFsuriomoHa1eKl0LdkrJUg==",
66
66
  "license": "Apache-2.0",
67
67
  "dependencies": {
68
- "@appium/support": "^5.1.6",
69
- "@appium/types": "^0.22.0",
68
+ "@appium/support": "^6.0.0",
69
+ "@appium/types": "^0.22.3",
70
70
  "@colors/colors": "1.6.0",
71
71
  "@types/async-lock": "1.4.2",
72
72
  "@types/bluebird": "3.5.42",
73
73
  "@types/express": "5.0.0",
74
- "@types/lodash": "4.17.12",
75
- "@types/method-override": "0.0.35",
74
+ "@types/lodash": "4.17.13",
75
+ "@types/method-override": "3.0.0",
76
76
  "@types/serve-favicon": "2.5.7",
77
77
  "async-lock": "1.4.1",
78
78
  "asyncbox": "3.0.0",
79
- "axios": "1.7.7",
79
+ "axios": "1.7.9",
80
80
  "bluebird": "3.7.2",
81
81
  "body-parser": "1.20.3",
82
82
  "express": "4.21.1",
@@ -88,7 +88,7 @@
88
88
  "path-to-regexp": "8.2.0",
89
89
  "serve-favicon": "2.5.0",
90
90
  "source-map-support": "0.5.21",
91
- "type-fest": "4.26.1",
91
+ "type-fest": "4.30.0",
92
92
  "validate.js": "0.13.1"
93
93
  },
94
94
  "engines": {
@@ -99,12 +99,6 @@
99
99
  "spdy": "4.0.2"
100
100
  }
101
101
  },
102
- "node_modules/@appium/base-driver/node_modules/@types/lodash": {
103
- "version": "4.17.12",
104
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
105
- "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
106
- "license": "MIT"
107
- },
108
102
  "node_modules/@appium/logger": {
109
103
  "version": "1.6.1",
110
104
  "resolved": "https://registry.npmjs.org/@appium/logger/-/logger-1.6.1.tgz",
@@ -137,14 +131,14 @@
137
131
  }
138
132
  },
139
133
  "node_modules/@appium/support": {
140
- "version": "5.1.6",
141
- "resolved": "https://registry.npmjs.org/@appium/support/-/support-5.1.6.tgz",
142
- "integrity": "sha512-BtWnVkIGUOHLDWkuBKSm15C5t2g5qv2+NOguAJ6ujPwDn2VLL86usk82DZF3IJ3Yujn0IrLGUrDLvtlG/uqXUg==",
134
+ "version": "6.0.0",
135
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-6.0.0.tgz",
136
+ "integrity": "sha512-zlcTdOFhMSvCaR5j9dcnX3kXh0XAolnJd/MmvS7S7xFAdezX90yMsxNegTgvPnCEu+k2Gjv4Ddk6JC+KK1TZhQ==",
143
137
  "license": "Apache-2.0",
144
138
  "dependencies": {
145
139
  "@appium/logger": "^1.6.1",
146
140
  "@appium/tsconfig": "^0.3.3",
147
- "@appium/types": "^0.22.0",
141
+ "@appium/types": "^0.22.3",
148
142
  "@colors/colors": "1.6.0",
149
143
  "@types/archiver": "6.0.3",
150
144
  "@types/base64-stream": "1.0.5",
@@ -162,7 +156,7 @@
162
156
  "@types/uuid": "10.0.0",
163
157
  "@types/which": "3.0.4",
164
158
  "archiver": "7.0.1",
165
- "axios": "1.7.7",
159
+ "axios": "1.7.9",
166
160
  "base64-stream": "1.0.0",
167
161
  "bluebird": "3.7.2",
168
162
  "bplist-creator": "0.1.1",
@@ -186,14 +180,14 @@
186
180
  "resolve-from": "5.0.0",
187
181
  "sanitize-filename": "1.6.3",
188
182
  "semver": "7.6.3",
189
- "shell-quote": "1.8.1",
183
+ "shell-quote": "1.8.2",
190
184
  "source-map-support": "0.5.21",
191
185
  "supports-color": "8.1.1",
192
- "teen_process": "2.2.0",
193
- "type-fest": "4.26.1",
194
- "uuid": "10.0.0",
186
+ "teen_process": "2.2.2",
187
+ "type-fest": "4.30.0",
188
+ "uuid": "11.0.3",
195
189
  "which": "4.0.0",
196
- "yauzl": "3.1.3"
190
+ "yauzl": "3.2.0"
197
191
  },
198
192
  "engines": {
199
193
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -217,17 +211,17 @@
217
211
  }
218
212
  },
219
213
  "node_modules/@appium/types": {
220
- "version": "0.22.0",
221
- "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.22.0.tgz",
222
- "integrity": "sha512-2EWAN9Mnjh0ob0n/gTQSpqcflFivBPF/Bh4MLL2Fz09GoiiPCDeILKzdutGo6ZQH9PMEjDd7W//o8b3GwzNfhg==",
214
+ "version": "0.22.3",
215
+ "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.22.3.tgz",
216
+ "integrity": "sha512-mPAfaPl1poVjDVPLkE18zESVHkAPKKijBnGNtXCmkvcMFXK8k8tNjAAVPm58Cmk5JlCKljArAR2N8jMFl6r/Yw==",
223
217
  "license": "Apache-2.0",
224
218
  "dependencies": {
225
219
  "@appium/logger": "^1.6.1",
226
220
  "@appium/schema": "^0.7.0",
227
221
  "@appium/tsconfig": "^0.3.3",
228
222
  "@types/express": "5.0.0",
229
- "@types/ws": "8.5.12",
230
- "type-fest": "4.26.1"
223
+ "@types/ws": "8.5.13",
224
+ "type-fest": "4.30.0"
231
225
  },
232
226
  "engines": {
233
227
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -443,9 +437,9 @@
443
437
  }
444
438
  },
445
439
  "node_modules/@types/express-serve-static-core": {
446
- "version": "5.0.1",
447
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
448
- "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==",
440
+ "version": "5.0.2",
441
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz",
442
+ "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==",
449
443
  "license": "MIT",
450
444
  "dependencies": {
451
445
  "@types/node": "*",
@@ -496,12 +490,18 @@
496
490
  "integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ==",
497
491
  "license": "MIT"
498
492
  },
493
+ "node_modules/@types/lodash": {
494
+ "version": "4.17.13",
495
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
496
+ "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
497
+ "license": "MIT"
498
+ },
499
499
  "node_modules/@types/method-override": {
500
- "version": "0.0.35",
501
- "resolved": "https://registry.npmjs.org/@types/method-override/-/method-override-0.0.35.tgz",
502
- "integrity": "sha512-HdhM5xiIV8fwsZ3B8e9IKWJOqEgmXXBJ/qQzhs5Z8idjsszqEX4j/7/QAcso27ArZ1tSBXg2XMlI1cIHAsCTXA==",
500
+ "version": "3.0.0",
501
+ "resolved": "https://registry.npmjs.org/@types/method-override/-/method-override-3.0.0.tgz",
502
+ "integrity": "sha512-7XFHR6j7JljprBpzzRZatakUXm1kEGAM3PL/GSsGRHtDvOAKYCdmnXX/5YSl1eQrpJymGs9tRekSWEGaG+Ntjw==",
503
503
  "license": "MIT",
504
- "dependencies": {
504
+ "peerDependencies": {
505
505
  "@types/express": "*"
506
506
  }
507
507
  },
@@ -527,9 +527,9 @@
527
527
  }
528
528
  },
529
529
  "node_modules/@types/node": {
530
- "version": "20.17.6",
531
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.6.tgz",
532
- "integrity": "sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==",
530
+ "version": "20.17.10",
531
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.10.tgz",
532
+ "integrity": "sha512-/jrvh5h6NXhEauFFexRin69nA0uHJ5gwk4iDivp/DeoEua3uwCUto6PC86IpRITBOs4+6i2I56K5x5b6WYGXHA==",
533
533
  "license": "MIT",
534
534
  "dependencies": {
535
535
  "undici-types": "~6.19.2"
@@ -638,18 +638,18 @@
638
638
  "license": "MIT"
639
639
  },
640
640
  "node_modules/@types/ws": {
641
- "version": "8.5.12",
642
- "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
643
- "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
641
+ "version": "8.5.13",
642
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
643
+ "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
644
644
  "license": "MIT",
645
645
  "dependencies": {
646
646
  "@types/node": "*"
647
647
  }
648
648
  },
649
649
  "node_modules/@xmldom/xmldom": {
650
- "version": "0.9.5",
651
- "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.5.tgz",
652
- "integrity": "sha512-6g1EwSs8cr8JhP1iBxzyVAWM6BIDvx9Y3FZRIQiMDzgG43Pxi8YkWOZ0nQj2NHgNzgXDZbJewFx/n+YAvMZrfg==",
650
+ "version": "0.9.6",
651
+ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.6.tgz",
652
+ "integrity": "sha512-Su4xcxR0CPGwlDHNmVP09fqET9YxbyDXHaSob6JlBH7L6reTYaeim6zbk9o08UarO0L5GTRo3uzl0D+9lSxmvw==",
653
653
  "license": "MIT",
654
654
  "engines": {
655
655
  "node": ">=14.6"
@@ -708,12 +708,12 @@
708
708
  }
709
709
  },
710
710
  "node_modules/appium-adb": {
711
- "version": "12.7.0",
712
- "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-12.7.0.tgz",
713
- "integrity": "sha512-+IhWiYJ8CujfLFY4O985yJVFkJbiMa7mJX0vbIB7lZToUKHj7YzW5v4MYfFObgiRjhppkcP/o4w6spmFexlmEg==",
711
+ "version": "12.7.4",
712
+ "resolved": "https://registry.npmjs.org/appium-adb/-/appium-adb-12.7.4.tgz",
713
+ "integrity": "sha512-qn5fdfV8voJs/0P8SuMjZIaPBtwF/n9YS93ibsV1Ljp0vk4xjcikwFd/bkVvT7YBfdS3UO1XKZSeFeQaWGUWDQ==",
714
714
  "license": "Apache-2.0",
715
715
  "dependencies": {
716
- "@appium/support": "^5.0.3",
716
+ "@appium/support": "^6.0.0",
717
717
  "async-lock": "^1.0.0",
718
718
  "asyncbox": "^3.0.0",
719
719
  "bluebird": "^3.4.7",
@@ -730,12 +730,12 @@
730
730
  }
731
731
  },
732
732
  "node_modules/appium-android-driver": {
733
- "version": "9.12.3",
734
- "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.12.3.tgz",
735
- "integrity": "sha512-tGYP41rjqRn/qh0YXbX1NQK7XslnEV8ZnvfUZrS+bgZwHO64KX6qPZWAfnXC4C11n7eyy5XrL0HU9PLe2jfwSA==",
733
+ "version": "9.14.6",
734
+ "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-9.14.6.tgz",
735
+ "integrity": "sha512-JqHsB8ddUKopbqgvNyaP71TvbFGycmhRGEGDPZ6NvpgsUpcpM+tDPOOi3QQWpCkbc65w6RHNUP1bqAP95RFYBw==",
736
736
  "license": "Apache-2.0",
737
737
  "dependencies": {
738
- "@appium/support": "^5.0.3",
738
+ "@appium/support": "^6.0.0",
739
739
  "@colors/colors": "^1.6.0",
740
740
  "appium-adb": "^12.7.0",
741
741
  "appium-chromedriver": "^6.0.1",
@@ -763,13 +763,13 @@
763
763
  }
764
764
  },
765
765
  "node_modules/appium-android-driver/node_modules/appium-chromedriver": {
766
- "version": "6.1.4",
767
- "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-6.1.4.tgz",
768
- "integrity": "sha512-6s289vPkP7kfftMG/o/bCK08lLEwqxErfBQYM5lY1x7H0Asy7xusXBpOuIuZZbqolVRUFu+EBTTJWDuXiNXgqg==",
766
+ "version": "6.1.11",
767
+ "resolved": "https://registry.npmjs.org/appium-chromedriver/-/appium-chromedriver-6.1.11.tgz",
768
+ "integrity": "sha512-oXWCzkHznZ/K9RHGtGV/HS3KPqqsNqs3xyHuIeYaCgAPLqz9qNuAjpA/kp0n0PAlj6c65lODpUtT/oe9qLpISw==",
769
769
  "license": "Apache-2.0",
770
770
  "dependencies": {
771
771
  "@appium/base-driver": "^9.1.0",
772
- "@appium/support": "^5.1.1",
772
+ "@appium/support": "^6.0.0",
773
773
  "@xmldom/xmldom": "^0.x",
774
774
  "appium-adb": "^12.0.0",
775
775
  "asyncbox": "^3.0.0",
@@ -876,9 +876,9 @@
876
876
  "license": "MIT"
877
877
  },
878
878
  "node_modules/axios": {
879
- "version": "1.7.7",
880
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
881
- "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
879
+ "version": "1.7.9",
880
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
881
+ "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
882
882
  "license": "MIT",
883
883
  "dependencies": {
884
884
  "follow-redirects": "^1.15.6",
@@ -1083,16 +1083,44 @@
1083
1083
  }
1084
1084
  },
1085
1085
  "node_modules/call-bind": {
1086
- "version": "1.0.7",
1087
- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
1088
- "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
1086
+ "version": "1.0.8",
1087
+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
1088
+ "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
1089
1089
  "license": "MIT",
1090
1090
  "dependencies": {
1091
+ "call-bind-apply-helpers": "^1.0.0",
1091
1092
  "es-define-property": "^1.0.0",
1092
- "es-errors": "^1.3.0",
1093
- "function-bind": "^1.1.2",
1094
1093
  "get-intrinsic": "^1.2.4",
1095
- "set-function-length": "^1.2.1"
1094
+ "set-function-length": "^1.2.2"
1095
+ },
1096
+ "engines": {
1097
+ "node": ">= 0.4"
1098
+ },
1099
+ "funding": {
1100
+ "url": "https://github.com/sponsors/ljharb"
1101
+ }
1102
+ },
1103
+ "node_modules/call-bind-apply-helpers": {
1104
+ "version": "1.0.1",
1105
+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
1106
+ "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
1107
+ "license": "MIT",
1108
+ "dependencies": {
1109
+ "es-errors": "^1.3.0",
1110
+ "function-bind": "^1.1.2"
1111
+ },
1112
+ "engines": {
1113
+ "node": ">= 0.4"
1114
+ }
1115
+ },
1116
+ "node_modules/call-bound": {
1117
+ "version": "1.0.2",
1118
+ "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.2.tgz",
1119
+ "integrity": "sha512-0lk0PHFe/uz0vl527fG9CgdE9WdafjDbCXvBbs+LUv000TVt2Jjhqbs4Jwm8gz070w8xXyEAxrPOMullsxXeGg==",
1120
+ "license": "MIT",
1121
+ "dependencies": {
1122
+ "call-bind": "^1.0.8",
1123
+ "get-intrinsic": "^1.2.5"
1096
1124
  },
1097
1125
  "engines": {
1098
1126
  "node": ">= 0.4"
@@ -1330,9 +1358,9 @@
1330
1358
  "license": "MIT"
1331
1359
  },
1332
1360
  "node_modules/cross-spawn": {
1333
- "version": "7.0.5",
1334
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
1335
- "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
1361
+ "version": "7.0.6",
1362
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
1363
+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
1336
1364
  "license": "MIT",
1337
1365
  "dependencies": {
1338
1366
  "path-key": "^3.1.0",
@@ -1365,9 +1393,9 @@
1365
1393
  }
1366
1394
  },
1367
1395
  "node_modules/debug": {
1368
- "version": "4.3.7",
1369
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
1370
- "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
1396
+ "version": "4.4.0",
1397
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
1398
+ "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
1371
1399
  "license": "MIT",
1372
1400
  "optional": true,
1373
1401
  "dependencies": {
@@ -1444,6 +1472,20 @@
1444
1472
  "license": "MIT",
1445
1473
  "optional": true
1446
1474
  },
1475
+ "node_modules/dunder-proto": {
1476
+ "version": "1.0.0",
1477
+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.0.tgz",
1478
+ "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==",
1479
+ "license": "MIT",
1480
+ "dependencies": {
1481
+ "call-bind-apply-helpers": "^1.0.0",
1482
+ "es-errors": "^1.3.0",
1483
+ "gopd": "^1.2.0"
1484
+ },
1485
+ "engines": {
1486
+ "node": ">= 0.4"
1487
+ }
1488
+ },
1447
1489
  "node_modules/duplexer": {
1448
1490
  "version": "0.1.2",
1449
1491
  "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -1487,13 +1529,10 @@
1487
1529
  }
1488
1530
  },
1489
1531
  "node_modules/es-define-property": {
1490
- "version": "1.0.0",
1491
- "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
1492
- "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
1532
+ "version": "1.0.1",
1533
+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
1534
+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
1493
1535
  "license": "MIT",
1494
- "dependencies": {
1495
- "get-intrinsic": "^1.2.4"
1496
- },
1497
1536
  "engines": {
1498
1537
  "node": ">= 0.4"
1499
1538
  }
@@ -1507,6 +1546,18 @@
1507
1546
  "node": ">= 0.4"
1508
1547
  }
1509
1548
  },
1549
+ "node_modules/es-object-atoms": {
1550
+ "version": "1.0.0",
1551
+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
1552
+ "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
1553
+ "license": "MIT",
1554
+ "dependencies": {
1555
+ "es-errors": "^1.3.0"
1556
+ },
1557
+ "engines": {
1558
+ "node": ">= 0.4"
1559
+ }
1560
+ },
1510
1561
  "node_modules/escalade": {
1511
1562
  "version": "3.2.0",
1512
1563
  "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -1803,16 +1854,21 @@
1803
1854
  }
1804
1855
  },
1805
1856
  "node_modules/get-intrinsic": {
1806
- "version": "1.2.4",
1807
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
1808
- "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
1857
+ "version": "1.2.6",
1858
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
1859
+ "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
1809
1860
  "license": "MIT",
1810
1861
  "dependencies": {
1862
+ "call-bind-apply-helpers": "^1.0.1",
1863
+ "dunder-proto": "^1.0.0",
1864
+ "es-define-property": "^1.0.1",
1811
1865
  "es-errors": "^1.3.0",
1866
+ "es-object-atoms": "^1.0.0",
1812
1867
  "function-bind": "^1.1.2",
1813
- "has-proto": "^1.0.1",
1814
- "has-symbols": "^1.0.3",
1815
- "hasown": "^2.0.0"
1868
+ "gopd": "^1.2.0",
1869
+ "has-symbols": "^1.1.0",
1870
+ "hasown": "^2.0.2",
1871
+ "math-intrinsics": "^1.0.0"
1816
1872
  },
1817
1873
  "engines": {
1818
1874
  "node": ">= 0.4"
@@ -1854,12 +1910,12 @@
1854
1910
  }
1855
1911
  },
1856
1912
  "node_modules/gopd": {
1857
- "version": "1.0.1",
1858
- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
1859
- "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
1913
+ "version": "1.2.0",
1914
+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
1915
+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
1860
1916
  "license": "MIT",
1861
- "dependencies": {
1862
- "get-intrinsic": "^1.1.3"
1917
+ "engines": {
1918
+ "node": ">= 0.4"
1863
1919
  },
1864
1920
  "funding": {
1865
1921
  "url": "https://github.com/sponsors/ljharb"
@@ -1899,22 +1955,10 @@
1899
1955
  "url": "https://github.com/sponsors/ljharb"
1900
1956
  }
1901
1957
  },
1902
- "node_modules/has-proto": {
1903
- "version": "1.0.3",
1904
- "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
1905
- "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
1906
- "license": "MIT",
1907
- "engines": {
1908
- "node": ">= 0.4"
1909
- },
1910
- "funding": {
1911
- "url": "https://github.com/sponsors/ljharb"
1912
- }
1913
- },
1914
1958
  "node_modules/has-symbols": {
1915
- "version": "1.0.3",
1916
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
1917
- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
1959
+ "version": "1.1.0",
1960
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
1961
+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
1918
1962
  "license": "MIT",
1919
1963
  "engines": {
1920
1964
  "node": ">= 0.4"
@@ -2082,9 +2126,9 @@
2082
2126
  }
2083
2127
  },
2084
2128
  "node_modules/io.appium.settings": {
2085
- "version": "5.12.17",
2086
- "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-5.12.17.tgz",
2087
- "integrity": "sha512-yUmAO4x7AkYmHuEorSe7sGc7Q6JR7/JblHHbwkHRug66jWK7ihk+5esOy6XFyIefdVUp+zGXcYDYx40cqlUW8Q==",
2129
+ "version": "5.12.19",
2130
+ "resolved": "https://registry.npmjs.org/io.appium.settings/-/io.appium.settings-5.12.19.tgz",
2131
+ "integrity": "sha512-UOD2IsdqERfqnx++Ol6gIC20PifcyMlaO1kT0C0j3mUC0wCAJaUWkUFxHYNfmlhiBOHrTZelH64Aws/Uy0KVOA==",
2088
2132
  "license": "Apache-2.0",
2089
2133
  "dependencies": {
2090
2134
  "@appium/logger": "^1.3.0",
@@ -2375,6 +2419,15 @@
2375
2419
  "extraneous": true,
2376
2420
  "license": "ISC"
2377
2421
  },
2422
+ "node_modules/math-intrinsics": {
2423
+ "version": "1.0.0",
2424
+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.0.0.tgz",
2425
+ "integrity": "sha512-4MqMiKP90ybymYvsut0CH2g4XWbfLtmlCkXmtmdcDCxNB+mQcu1w/1+L/VD7vi/PSv7X2JYV7SCcR+jiPXnQtA==",
2426
+ "license": "MIT",
2427
+ "engines": {
2428
+ "node": ">= 0.4"
2429
+ }
2430
+ },
2378
2431
  "node_modules/media-typer": {
2379
2432
  "version": "0.3.0",
2380
2433
  "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -3426,24 +3479,81 @@
3426
3479
  }
3427
3480
  },
3428
3481
  "node_modules/shell-quote": {
3429
- "version": "1.8.1",
3430
- "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
3431
- "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
3482
+ "version": "1.8.2",
3483
+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
3484
+ "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
3432
3485
  "license": "MIT",
3486
+ "engines": {
3487
+ "node": ">= 0.4"
3488
+ },
3433
3489
  "funding": {
3434
3490
  "url": "https://github.com/sponsors/ljharb"
3435
3491
  }
3436
3492
  },
3437
3493
  "node_modules/side-channel": {
3438
- "version": "1.0.6",
3439
- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
3440
- "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
3494
+ "version": "1.1.0",
3495
+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
3496
+ "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
3441
3497
  "license": "MIT",
3442
3498
  "dependencies": {
3443
- "call-bind": "^1.0.7",
3444
3499
  "es-errors": "^1.3.0",
3445
- "get-intrinsic": "^1.2.4",
3446
- "object-inspect": "^1.13.1"
3500
+ "object-inspect": "^1.13.3",
3501
+ "side-channel-list": "^1.0.0",
3502
+ "side-channel-map": "^1.0.1",
3503
+ "side-channel-weakmap": "^1.0.2"
3504
+ },
3505
+ "engines": {
3506
+ "node": ">= 0.4"
3507
+ },
3508
+ "funding": {
3509
+ "url": "https://github.com/sponsors/ljharb"
3510
+ }
3511
+ },
3512
+ "node_modules/side-channel-list": {
3513
+ "version": "1.0.0",
3514
+ "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
3515
+ "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
3516
+ "license": "MIT",
3517
+ "dependencies": {
3518
+ "es-errors": "^1.3.0",
3519
+ "object-inspect": "^1.13.3"
3520
+ },
3521
+ "engines": {
3522
+ "node": ">= 0.4"
3523
+ },
3524
+ "funding": {
3525
+ "url": "https://github.com/sponsors/ljharb"
3526
+ }
3527
+ },
3528
+ "node_modules/side-channel-map": {
3529
+ "version": "1.0.1",
3530
+ "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
3531
+ "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
3532
+ "license": "MIT",
3533
+ "dependencies": {
3534
+ "call-bound": "^1.0.2",
3535
+ "es-errors": "^1.3.0",
3536
+ "get-intrinsic": "^1.2.5",
3537
+ "object-inspect": "^1.13.3"
3538
+ },
3539
+ "engines": {
3540
+ "node": ">= 0.4"
3541
+ },
3542
+ "funding": {
3543
+ "url": "https://github.com/sponsors/ljharb"
3544
+ }
3545
+ },
3546
+ "node_modules/side-channel-weakmap": {
3547
+ "version": "1.0.2",
3548
+ "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
3549
+ "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
3550
+ "license": "MIT",
3551
+ "dependencies": {
3552
+ "call-bound": "^1.0.2",
3553
+ "es-errors": "^1.3.0",
3554
+ "get-intrinsic": "^1.2.5",
3555
+ "object-inspect": "^1.13.3",
3556
+ "side-channel-map": "^1.0.1"
3447
3557
  },
3448
3558
  "engines": {
3449
3559
  "node": ">= 0.4"
@@ -3602,9 +3712,9 @@
3602
3712
  }
3603
3713
  },
3604
3714
  "node_modules/streamx": {
3605
- "version": "2.20.1",
3606
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.1.tgz",
3607
- "integrity": "sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==",
3715
+ "version": "2.21.1",
3716
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz",
3717
+ "integrity": "sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==",
3608
3718
  "license": "MIT",
3609
3719
  "dependencies": {
3610
3720
  "fast-fifo": "^1.3.2",
@@ -3759,9 +3869,9 @@
3759
3869
  }
3760
3870
  },
3761
3871
  "node_modules/teen_process": {
3762
- "version": "2.2.0",
3763
- "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.2.0.tgz",
3764
- "integrity": "sha512-YYHdMnRGAMXrP+KmUH3/WBelsR+OZUfdqCZEXHfhN/2Bn2eTVP11NyB4FeMOjlmtZB/Y5CiZnRKQqu2lJzzlVw==",
3872
+ "version": "2.2.2",
3873
+ "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.2.2.tgz",
3874
+ "integrity": "sha512-Qs9JCzsKcbuBtbZxY9WVoYs3GG+WFfxoIDGpkj8AJ/BpWnh+pdLK+x1+E1bDlQuASs+CTQmykYPGAkzxFjqcaA==",
3765
3875
  "license": "Apache-2.0",
3766
3876
  "dependencies": {
3767
3877
  "bluebird": "^3.7.2",
@@ -3775,10 +3885,13 @@
3775
3885
  }
3776
3886
  },
3777
3887
  "node_modules/text-decoder": {
3778
- "version": "1.2.1",
3779
- "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.1.tgz",
3780
- "integrity": "sha512-x9v3H/lTKIJKQQe7RPQkLfKAnc9lUTkWDypIQgTzPJAq+5/GCDHonmshfvlsNSj58yyshbIJJDLmU15qNERrXQ==",
3781
- "license": "Apache-2.0"
3888
+ "version": "1.2.2",
3889
+ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.2.tgz",
3890
+ "integrity": "sha512-/MDslo7ZyWTA2vnk1j7XoDVfXsGk3tp+zFEJHJGm0UjIlQifonVFwlVbQDFh8KJzTBnT8ie115TYqir6bclddA==",
3891
+ "license": "Apache-2.0",
3892
+ "dependencies": {
3893
+ "b4a": "^1.6.4"
3894
+ }
3782
3895
  },
3783
3896
  "node_modules/through": {
3784
3897
  "version": "2.3.8",
@@ -3812,9 +3925,9 @@
3812
3925
  "license": "0BSD"
3813
3926
  },
3814
3927
  "node_modules/type-fest": {
3815
- "version": "4.26.1",
3816
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
3817
- "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
3928
+ "version": "4.30.0",
3929
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.30.0.tgz",
3930
+ "integrity": "sha512-G6zXWS1dLj6eagy6sVhOMQiLtJdxQBHIA9Z6HFUNLOlr6MFOgzV8wvmidtPONfPtEUv0uZsy77XJNzTAfwPDaA==",
3818
3931
  "license": "(MIT OR CC0-1.0)",
3819
3932
  "engines": {
3820
3933
  "node": ">=16"
@@ -3837,9 +3950,9 @@
3837
3950
  }
3838
3951
  },
3839
3952
  "node_modules/typescript": {
3840
- "version": "5.6.3",
3841
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
3842
- "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
3953
+ "version": "5.7.2",
3954
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
3955
+ "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
3843
3956
  "dev": true,
3844
3957
  "license": "Apache-2.0",
3845
3958
  "bin": {
@@ -3896,16 +4009,16 @@
3896
4009
  }
3897
4010
  },
3898
4011
  "node_modules/uuid": {
3899
- "version": "10.0.0",
3900
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
3901
- "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
4012
+ "version": "11.0.3",
4013
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",
4014
+ "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==",
3902
4015
  "funding": [
3903
4016
  "https://github.com/sponsors/broofa",
3904
4017
  "https://github.com/sponsors/ctavan"
3905
4018
  ],
3906
4019
  "license": "MIT",
3907
4020
  "bin": {
3908
- "uuid": "dist/bin/uuid"
4021
+ "uuid": "dist/esm/bin/uuid"
3909
4022
  }
3910
4023
  },
3911
4024
  "node_modules/validate-npm-package-license": {
@@ -4143,9 +4256,9 @@
4143
4256
  }
4144
4257
  },
4145
4258
  "node_modules/yauzl": {
4146
- "version": "3.1.3",
4147
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.3.tgz",
4148
- "integrity": "sha512-JCCdmlJJWv7L0q/KylOekyRaUrdEoUxWkWVcgorosTROCFWiS9p2NNPE9Yb91ak7b1N5SxAZEliWpspbZccivw==",
4259
+ "version": "3.2.0",
4260
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz",
4261
+ "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==",
4149
4262
  "license": "MIT",
4150
4263
  "dependencies": {
4151
4264
  "buffer-crc32": "~0.2.3",
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "automated testing",
8
8
  "android"
9
9
  ],
10
- "version": "3.5.1",
10
+ "version": "3.5.2",
11
11
  "author": "Appium Contributors",
12
12
  "license": "Apache-2.0",
13
13
  "repository": {