appium-xcuitest-driver 7.22.1 → 7.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/commands/certificate.js +4 -4
  3. package/build/lib/commands/certificate.js.map +1 -1
  4. package/build/lib/commands/log.d.ts.map +1 -1
  5. package/build/lib/commands/log.js +2 -1
  6. package/build/lib/commands/log.js.map +1 -1
  7. package/build/lib/commands/memory.js +1 -1
  8. package/build/lib/commands/memory.js.map +1 -1
  9. package/build/lib/commands/pcap.d.ts.map +1 -1
  10. package/build/lib/commands/pcap.js +3 -7
  11. package/build/lib/commands/pcap.js.map +1 -1
  12. package/build/lib/device-log/helpers.d.ts +4 -0
  13. package/build/lib/device-log/helpers.d.ts.map +1 -1
  14. package/build/lib/device-log/helpers.js +22 -0
  15. package/build/lib/device-log/helpers.js.map +1 -1
  16. package/build/lib/device-log/ios-crash-log.d.ts +30 -38
  17. package/build/lib/device-log/ios-crash-log.d.ts.map +1 -1
  18. package/build/lib/device-log/ios-crash-log.js +97 -100
  19. package/build/lib/device-log/ios-crash-log.js.map +1 -1
  20. package/build/lib/device-log/ios-log.d.ts +1 -1
  21. package/build/lib/device-log/ios-log.d.ts.map +1 -1
  22. package/build/lib/device-log/ios-log.js +2 -1
  23. package/build/lib/device-log/ios-log.js.map +1 -1
  24. package/build/lib/driver.d.ts +4 -2
  25. package/build/lib/driver.d.ts.map +1 -1
  26. package/build/lib/driver.js +2 -2
  27. package/build/lib/driver.js.map +1 -1
  28. package/build/lib/real-device-clients/base-device-client.d.ts +22 -0
  29. package/build/lib/real-device-clients/base-device-client.d.ts.map +1 -0
  30. package/build/lib/real-device-clients/base-device-client.js +13 -0
  31. package/build/lib/real-device-clients/base-device-client.js.map +1 -0
  32. package/build/lib/real-device-clients/devicectl.d.ts.map +1 -0
  33. package/build/lib/real-device-clients/devicectl.js.map +1 -0
  34. package/build/lib/real-device-clients/py-ios-device-client.d.ts +21 -0
  35. package/build/lib/real-device-clients/py-ios-device-client.d.ts.map +1 -0
  36. package/build/lib/{py-ios-device-client.js → real-device-clients/py-ios-device-client.js} +53 -84
  37. package/build/lib/real-device-clients/py-ios-device-client.js.map +1 -0
  38. package/build/lib/real-device.d.ts +1 -1
  39. package/build/lib/real-device.d.ts.map +1 -1
  40. package/build/lib/real-device.js +1 -1
  41. package/build/lib/real-device.js.map +1 -1
  42. package/lib/commands/certificate.js +1 -1
  43. package/lib/commands/log.js +2 -1
  44. package/lib/commands/memory.js +1 -1
  45. package/lib/commands/pcap.js +3 -4
  46. package/lib/device-log/helpers.ts +27 -0
  47. package/lib/device-log/ios-crash-log.ts +167 -0
  48. package/lib/device-log/ios-log.ts +2 -1
  49. package/lib/driver.js +1 -1
  50. package/lib/real-device-clients/base-device-client.ts +34 -0
  51. package/lib/real-device-clients/py-ios-device-client.ts +149 -0
  52. package/lib/real-device.js +1 -1
  53. package/npm-shrinkwrap.json +9 -9
  54. package/package.json +1 -1
  55. package/build/lib/devicectl.d.ts.map +0 -1
  56. package/build/lib/devicectl.js.map +0 -1
  57. package/build/lib/py-ios-device-client.d.ts +0 -76
  58. package/build/lib/py-ios-device-client.d.ts.map +0 -1
  59. package/build/lib/py-ios-device-client.js.map +0 -1
  60. package/lib/device-log/ios-crash-log.js +0 -146
  61. package/lib/py-ios-device-client.js +0 -167
  62. /package/build/lib/{devicectl.d.ts → real-device-clients/devicectl.d.ts} +0 -0
  63. /package/build/lib/{devicectl.js → real-device-clients/devicectl.js} +0 -0
  64. /package/lib/{devicectl.js → real-device-clients/devicectl.js} +0 -0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [7.23.0](https://github.com/appium/appium-xcuitest-driver/compare/v7.22.1...v7.23.0) (2024-07-04)
2
+
3
+ ### Features
4
+
5
+ * Rewrite py-ios-device client and crash reports logger into typescript ([#2423](https://github.com/appium/appium-xcuitest-driver/issues/2423)) ([8d405e8](https://github.com/appium/appium-xcuitest-driver/commit/8d405e8081eb0c4a09217717eb380ab4076a9736))
6
+
1
7
  ## [7.22.1](https://github.com/appium/appium-xcuitest-driver/compare/v7.22.0...v7.22.1) (2024-07-03)
2
8
 
3
9
  ### Miscellaneous Chores
@@ -13,7 +13,7 @@ const path_1 = __importDefault(require("path"));
13
13
  const http_1 = __importDefault(require("http"));
14
14
  const teen_process_1 = require("teen_process");
15
15
  const portscanner_1 = require("portscanner");
16
- const py_ios_device_client_1 = __importDefault(require("../py-ios-device-client"));
16
+ const py_ios_device_client_1 = require("../real-device-clients/py-ios-device-client");
17
17
  const driver_1 = require("appium/driver");
18
18
  const CONFIG_EXTENSION = 'mobileconfig';
19
19
  const HOST_PORT_RANGE = [38200, 38299];
@@ -278,7 +278,7 @@ exports.default = {
278
278
  }
279
279
  }
280
280
  else {
281
- const client = new py_ios_device_client_1.default(this.opts.udid);
281
+ const client = new py_ios_device_client_1.Pyidevice(this.opts.udid);
282
282
  if (await client.assertExists(false)) {
283
283
  await client.installProfile({ payload: Buffer.from(content, 'base64') });
284
284
  return;
@@ -403,7 +403,7 @@ exports.default = {
403
403
  if (!this.isRealDevice()) {
404
404
  throw new driver_1.errors.NotImplementedError('This extension is only supported on real devices');
405
405
  }
406
- const client = new py_ios_device_client_1.default(this.opts.udid);
406
+ const client = new py_ios_device_client_1.Pyidevice(this.opts.udid);
407
407
  await client.assertExists(true);
408
408
  return await client.removeProfile(name);
409
409
  },
@@ -421,7 +421,7 @@ exports.default = {
421
421
  if (!this.isRealDevice()) {
422
422
  throw new driver_1.errors.NotImplementedError('This extension is only supported on real devices');
423
423
  }
424
- const client = new py_ios_device_client_1.default(this.opts.udid);
424
+ const client = new py_ios_device_client_1.Pyidevice(this.opts.udid);
425
425
  await client.assertExists(true);
426
426
  return await client.listProfiles();
427
427
  },
@@ -1 +1 @@
1
- {"version":3,"file":"certificate.js","sourceRoot":"","sources":["../../../lib/commands/certificate.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"certificate.js","sourceRoot":"","sources":["../../../lib/commands/certificate.js"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;IAsEE;;;;;OAKG;IACH,+EAJW,sBAAsB;mBAC4B,OAAO,CAAC,GAAG,CAAC;mCAwBxE;IAED;;OAEG;IACH,4FAsDC;IAED;;;;;;;;;;;OAWG;IACH,oFAHa,OAAO,CAAC,IAAI,CAAC,CA8DzB;IAED;;;;;OAKG;IACH,mFAFa,OAAO,CAAC,IAAI,CAAC,CAUzB;;;6BAIU,OAAO,WAAW,EAAE,cAAc;qCAIlC,MAAM,OAAO,mBAAmB;2BAIhC,OAAO,eAAe,EAAE,YAAY;AA3OjD;;;GAGG;AACH,mCAHU,OAAO,eAAe,EAAE,YAAY,CAqC5C"}
1
+ {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;IAsEE;;;;;OAKG;IACH,+EAJW,sBAAsB;mBAC4B,OAAO,CAAC,GAAG,CAAC;mCAwBxE;IAED;;OAEG;IACH,4FAuDC;IAED;;;;;;;;;;;OAWG;IACH,oFAHa,OAAO,CAAC,IAAI,CAAC,CA8DzB;IAED;;;;;OAKG;IACH,mFAFa,OAAO,CAAC,IAAI,CAAC,CAUzB;;;6BAIU,OAAO,WAAW,EAAE,cAAc;qCAIlC,MAAM,OAAO,mBAAmB;2BAIhC,OAAO,eAAe,EAAE,YAAY;AA5OjD;;;GAGG;AACH,mCAHU,OAAO,eAAe,EAAE,YAAY,CAqC5C"}
@@ -99,8 +99,9 @@ exports.default = {
99
99
  }
100
100
  if (lodash_1.default.isUndefined(this.logs.syslog)) {
101
101
  this.logs.crashlog = new ios_crash_log_1.IOSCrashLog({
102
- sim: this.device,
102
+ sim: /** @type {import('appium-ios-simulator').Simulator} */ (this.device),
103
103
  udid: this.isRealDevice() ? this.opts.udid : undefined,
104
+ log: this.log,
104
105
  });
105
106
  this.logs.syslog = this.isRealDevice()
106
107
  ? new ios_device_log_1.IOSDeviceLog({
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ exports.default = {
19
19
  throw new Error('Memory warning simulation is only supported on real devices');
20
20
  }
21
21
  const device = /** @type {import('../real-device').RealDevice} */ (this.device);
22
- /** @type {import('../devicectl').AppInfo[]} */
22
+ /** @type {import('../real-device-clients/devicectl').AppInfo[]} */
23
23
  const appInfos = await device.devicectl.listApps(bundleId);
24
24
  if (lodash_1.default.isEmpty(appInfos)) {
25
25
  throw new driver_1.errors.InvalidArgumentError(`The application identified by ${bundleId} cannot be found on the device. Is it installed?`);
@@ -1 +1 @@
1
- {"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../lib/commands/memory.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,0CAAuC;AAEvC,kBAAe;IACb;;;;;;;OAOG;IACH,KAAK,CAAC,uBAAuB,CAAC,QAAQ;QACpC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,MAAM,GAAG,kDAAkD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhF,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,iCAAiC,QAAQ,kDAAkD,CAC5F,CAAC;QACJ,CAAC;QAED,6EAA6E;QAC7E,gDAAgD;QAChD,uGAAuG;QACvG,gDAAgD;QAChD,6GAA6G;QAC7G,oJAAoJ;QACpJ,4CAA4C;QAC5C,iEAAiE;QACjE,gDAAgD;QAChD,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,gBAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxE,uBAAuB;QACvB,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;aAClD,MAAM,CAAC,CAAC,EAAC,UAAU,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAClD,GAAG,CAAC,CAAC,EAAC,iBAAiB,EAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,iCAAiC,QAAQ,8DAA8D,CACxG,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mDAAmD,IAAI,CAAC,CAAC,CAAC,eAAe,QAAQ,EAAE,CAAC,CAAC;QACnG,MAAM,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;CACF,CAAC;AAEF;;GAEG"}
1
+ {"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../lib/commands/memory.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,0CAAuC;AAEvC,kBAAe;IACb;;;;;;;OAOG;IACH,KAAK,CAAC,uBAAuB,CAAC,QAAQ;QACpC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,MAAM,GAAG,kDAAkD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhF,mEAAmE;QACnE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,iCAAiC,QAAQ,kDAAkD,CAC5F,CAAC;QACJ,CAAC;QAED,6EAA6E;QAC7E,gDAAgD;QAChD,uGAAuG;QACvG,gDAAgD;QAChD,6GAA6G;QAC7G,oJAAoJ;QACpJ,4CAA4C;QAC5C,iEAAiE;QACjE,gDAAgD;QAChD,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,gBAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxE,uBAAuB;QACvB,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;aAClD,MAAM,CAAC,CAAC,EAAC,UAAU,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAClD,GAAG,CAAC,CAAC,EAAC,iBAAiB,EAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,iCAAiC,QAAQ,8DAA8D,CACxG,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mDAAmD,IAAI,CAAC,CAAC,CAAC,eAAe,QAAQ,EAAE,CAAC,CAAC;QACnG,MAAM,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;CACF,CAAC;AAEF;;GAEG"}
@@ -1 +1 @@
1
- {"version":3,"file":"pcap.d.ts","sourceRoot":"","sources":["../../../lib/commands/pcap.js"],"names":[],"mappings":"AASA;IAGE,kDAKC;IAPD,qDAAqD;IACrD,aADW,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CACrC;IAEV,UAAgB;IAChB,SAAc;IACd,gBAA4B;IAI9B,0CAgBC;IAED,uBAEC;IAED,6CAgBC;IAED,uBAGC;IAED,yBAIC;CACF;;IAGC;;;;;;;;OAQG;IACH,kFANW,MAAM,iBACN,OAAO,GAEL,OAAO,CAAC,IAAI,CAAC,CAgDzB;IAED;;;;;;;;;;;OAWG;IACH,mEAJa,OAAO,CAAC,MAAM,CAAC,CA0B3B;;;6BAIU,OAAO,WAAW,EAAE,cAAc"}
1
+ {"version":3,"file":"pcap.d.ts","sourceRoot":"","sources":["../../../lib/commands/pcap.js"],"names":[],"mappings":"AAQA;IAGE,kDAKC;IAPD,qDAAqD;IACrD,aADW,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CACrC;IAEV,UAAgB;IAChB,SAAc;IACd,gBAA4B;IAI9B,0CAgBC;IAED,uBAEC;IAED,6CAgBC;IAED,uBAGC;IAED,yBAIC;CACF;;IAGC;;;;;;;;OAQG;IACH,kFANW,MAAM,iBACN,OAAO,GAEL,OAAO,CAAC,IAAI,CAAC,CAgDzB;IAED;;;;;;;;;;;OAWG;IACH,mEAJa,OAAO,CAAC,MAAM,CAAC,CA0B3B;;;6BAIU,OAAO,WAAW,EAAE,cAAc"}
@@ -1,16 +1,12 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.TrafficCapture = void 0;
7
- const py_ios_device_client_1 = __importDefault(require("../py-ios-device-client"));
4
+ const py_ios_device_client_1 = require("../real-device-clients/py-ios-device-client");
8
5
  const support_1 = require("appium/support");
9
6
  const utils_1 = require("../utils");
10
7
  const driver_1 = require("appium/driver");
11
8
  const MAX_CAPTURE_TIME_SEC = 60 * 60 * 12;
12
9
  const DEFAULT_EXT = '.pcap';
13
- const pcapLogger = support_1.logger.getLogger('pcapd');
14
10
  class TrafficCapture {
15
11
  constructor(udid, log, resultPath) {
16
12
  this.udid = udid;
@@ -19,8 +15,8 @@ class TrafficCapture {
19
15
  this.mainProcess = null;
20
16
  }
21
17
  async start(timeoutSeconds) {
22
- this.mainProcess = /** @type {import('teen_process').SubProcess} */ (await new py_ios_device_client_1.default(this.udid).collectPcap(this.resultPath));
23
- this.mainProcess.on('line-stderr', (line) => pcapLogger.info(line));
18
+ this.mainProcess = /** @type {import('teen_process').SubProcess} */ (await new py_ios_device_client_1.Pyidevice(this.udid).collectPcap(this.resultPath));
19
+ this.mainProcess.on('line-stderr', (line) => this.log.info(`[Pcap] ${line}`));
24
20
  this.log.info(`Starting network traffic capture session on the device '${this.udid}'. ` +
25
21
  `Will timeout in ${timeoutSeconds}s`);
26
22
  setTimeout(async () => await this.interrupt(), timeoutSeconds * 1000);
@@ -1 +1 @@
1
- {"version":3,"file":"pcap.js","sourceRoot":"","sources":["../../../lib/commands/pcap.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pcap.js","sourceRoot":"","sources":["../../../lib/commands/pcap.js"],"names":[],"mappings":"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"}
@@ -3,4 +3,8 @@ export declare const DEFAULT_LOG_LEVEL = "ALL";
3
3
  export declare const MAX_JSON_LOG_LENGTH = 200;
4
4
  export declare const MAX_BUFFERED_EVENTS_COUNT = 5000;
5
5
  export declare function toLogEntry(message: string, timestamp: number, level?: string): LogEntry;
6
+ export interface GrepOptions {
7
+ caseInsensitive?: boolean;
8
+ }
9
+ export declare function grepFile(fullPath: string, str: string, opts?: GrepOptions): Promise<boolean>;
6
10
  //# sourceMappingURL=helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/device-log/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,eAAO,MAAM,iBAAiB,QAAQ,CAAC;AACvC,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAE9C,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,MAA0B,GAAG,QAAQ,CAM1G"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/device-log/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAKlD,eAAO,MAAM,iBAAiB,QAAQ,CAAC;AACvC,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAE9C,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,MAA0B,GAAG,QAAQ,CAM1G;AAED,MAAM,WAAW,WAAW;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,OAAO,CAAC,CAclB"}
@@ -1,7 +1,14 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.MAX_BUFFERED_EVENTS_COUNT = exports.MAX_JSON_LOG_LENGTH = exports.DEFAULT_LOG_LEVEL = void 0;
4
7
  exports.toLogEntry = toLogEntry;
8
+ exports.grepFile = grepFile;
9
+ const support_1 = require("appium/support");
10
+ const node_readline_1 = require("node:readline");
11
+ const lodash_1 = __importDefault(require("lodash"));
5
12
  exports.DEFAULT_LOG_LEVEL = 'ALL';
6
13
  exports.MAX_JSON_LOG_LENGTH = 200;
7
14
  exports.MAX_BUFFERED_EVENTS_COUNT = 5000;
@@ -12,4 +19,19 @@ function toLogEntry(message, timestamp, level = exports.DEFAULT_LOG_LEVEL) {
12
19
  message,
13
20
  };
14
21
  }
22
+ async function grepFile(fullPath, str, opts = {}) {
23
+ const input = support_1.fs.createReadStream(fullPath);
24
+ const rl = (0, node_readline_1.createInterface)({ input });
25
+ return await new Promise((resolve, reject) => {
26
+ input.once('error', reject);
27
+ rl.on('line', (line) => {
28
+ if (opts.caseInsensitive && lodash_1.default.toLower(line).includes(lodash_1.default.toLower(str))
29
+ || !opts.caseInsensitive && line.includes(str)) {
30
+ resolve(true);
31
+ input.close();
32
+ }
33
+ });
34
+ input.once('end', () => resolve(false));
35
+ });
36
+ }
15
37
  //# sourceMappingURL=helpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/device-log/helpers.ts"],"names":[],"mappings":";;;AAMA,gCAMC;AAVY,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAC1B,QAAA,mBAAmB,GAAG,GAAG,CAAC;AAC1B,QAAA,yBAAyB,GAAG,IAAI,CAAC;AAE9C,SAAgB,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,QAAgB,yBAAiB;IAC9F,OAAO;QACL,SAAS;QACT,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/device-log/helpers.ts"],"names":[],"mappings":";;;;;;AASA,gCAMC;AAMD,4BAkBC;AAtCD,4CAAoC;AACpC,iDAAgD;AAChD,oDAAuB;AAEV,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAC1B,QAAA,mBAAmB,GAAG,GAAG,CAAC;AAC1B,QAAA,yBAAyB,GAAG,IAAI,CAAC;AAE9C,SAAgB,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,QAAgB,yBAAiB;IAC9F,OAAO;QACL,SAAS;QACT,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAMM,KAAK,UAAU,QAAQ,CAC5B,QAAgB,EAChB,GAAW,EACX,OAAoB,EAAE;IAEtB,MAAM,KAAK,GAAG,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,IAAA,+BAAe,EAAC,EAAC,KAAK,EAAC,CAAC,CAAC;IACpC,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,IAAI,CAAC,eAAe,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;mBAC7D,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnD,OAAO,CAAC,IAAI,CAAC,CAAC;gBACd,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -1,42 +1,34 @@
1
- export default IOSCrashLog;
2
- export class IOSCrashLog {
3
- constructor(opts?: {});
4
- udid: any;
5
- pyideviceClient: Pyidevice | null;
6
- logDir: string;
7
- prevLogs: any[];
8
- logsSinceLastRequest: any[];
9
- phoneName: any;
10
- sim: any;
11
- /**
12
- * @returns {Promise<string[]>}
13
- */
14
- _gatherFromRealDevice(): Promise<string[]>;
15
- /**
16
- * @returns {Promise<string[]>}
17
- */
18
- _gatherFromSimulator(): Promise<string[]>;
19
- /**
20
- * @returns {Promise<string[]>}
21
- */
22
- getCrashes(): Promise<string[]>;
23
- /**
24
- * @returns {Promise<void>}
25
- */
1
+ import IOSLog from './ios-log';
2
+ import type { AppiumLogger } from '@appium/types';
3
+ import type { Simulator } from 'appium-ios-simulator';
4
+ import type { LogEntry } from '../commands/types';
5
+ type TSerializedEntry = [string, number];
6
+ export interface IOSCrashLogOptions {
7
+ /** UDID of a real device */
8
+ udid?: string;
9
+ /** Simulator instance */
10
+ sim?: Simulator;
11
+ log: AppiumLogger;
12
+ }
13
+ export declare class IOSCrashLog extends IOSLog<TSerializedEntry, TSerializedEntry> {
14
+ private readonly _udid;
15
+ private readonly _realDeviceClient;
16
+ private readonly _logDir;
17
+ private readonly _sim;
18
+ private _recentCrashFiles;
19
+ private _started;
20
+ constructor(opts: IOSCrashLogOptions);
26
21
  startCapture(): Promise<void>;
27
- /**
28
- * @returns {Promise<void>}
29
- */
30
22
  stopCapture(): Promise<void>;
31
- /**
32
- * @returns {Promise<import('../commands/types').LogEntry[]>}
33
- */
34
- getLogs(): Promise<import("../commands/types").LogEntry[]>;
35
- /**
36
- * @param {string[]} paths
37
- * @returns {Promise<import('../commands/types').LogEntry[]>}
38
- */
39
- filesToJSON(paths: string[]): Promise<import("../commands/types").LogEntry[]>;
23
+ get isCapturing(): boolean;
24
+ getLogs(): Promise<LogEntry[]>;
25
+ protected _serializeEntry(value: TSerializedEntry): TSerializedEntry;
26
+ protected _deserializeEntry(value: TSerializedEntry): LogEntry;
27
+ private _serializeCrashes;
28
+ private _gatherFromRealDevice;
29
+ private _gatherFromSimulator;
30
+ private _listCrashFiles;
31
+ private _isRealDevice;
40
32
  }
41
- import Pyidevice from '../py-ios-device-client';
33
+ export default IOSCrashLog;
42
34
  //# sourceMappingURL=ios-crash-log.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ios-crash-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-crash-log.js"],"names":[],"mappings":";AAaA;IACE,uBAYC;IAXC,UAAqB;IACrB,kCAAkE;IAKlE,eAAkF;IAClF,gBAAkB;IAClB,4BAA8B;IAC9B,eAAqB;IACrB,SAAmB;IAGrB;;OAEG;IACH,yBAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAsB7B;IAED;;OAEG;IACH,wBAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAoB7B;IAED;;OAEG;IACH,cAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAI7B;IAED;;OAEG;IACH,gBAFa,OAAO,CAAC,IAAI,CAAC,CAIzB;IAED;;OAEG;IACH,eAFa,OAAO,CAAC,IAAI,CAAC,CAIzB;IAED;;OAEG;IACH,WAFa,OAAO,CAAC,OAAO,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAO3D;IAED;;;OAGG;IACH,mBAHW,MAAM,EAAE,GACN,OAAO,CAAC,OAAO,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAgC3D;CACF;sBAxIqB,yBAAyB"}
1
+ {"version":3,"file":"ios-crash-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-crash-log.ts"],"names":[],"mappings":"AAKA,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzC,MAAM,WAAW,kBAAkB;IACjC,4BAA4B;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,qBAAa,WAAY,SAAQ,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACzE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0B;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAwB;IAC7C,OAAO,CAAC,iBAAiB,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAU;gBAEd,IAAI,EAAE,kBAAkB;IAoBrB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAM7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C,IAAa,WAAW,IAAI,OAAO,CAElC;IAEc,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;cAa1B,eAAe,CAAC,KAAK,EAAE,gBAAgB,GAAG,gBAAgB;cAI1D,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,QAAQ;YAKzD,iBAAiB;YA0BjB,qBAAqB;YAerB,oBAAoB;YAsBpB,eAAe;IAM7B,OAAO,CAAC,aAAa;CAGtB;AAED,eAAe,WAAW,CAAC"}
@@ -6,133 +6,130 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.IOSCrashLog = void 0;
7
7
  const support_1 = require("appium/support");
8
8
  const bluebird_1 = __importDefault(require("bluebird"));
9
- const logger_1 = __importDefault(require("../logger"));
10
- const appium_ios_device_1 = require("appium-ios-device");
11
9
  const path_1 = __importDefault(require("path"));
12
10
  const lodash_1 = __importDefault(require("lodash"));
13
- const py_ios_device_client_1 = __importDefault(require("../py-ios-device-client"));
14
- const REAL_DEVICE_MAGIC = '3620bbb0-fb9f-4b62-a668-896f2edc4d88';
15
- const MAGIC_SEP = '/';
11
+ const py_ios_device_client_1 = require("../real-device-clients/py-ios-device-client");
12
+ const ios_log_1 = __importDefault(require("./ios-log"));
13
+ const helpers_1 = require("./helpers");
16
14
  // The file format has been changed from '.crash' to '.ips' since Monterey.
17
15
  const CRASH_REPORTS_GLOB_PATTERN = '**/*.@(crash|ips)';
18
- class IOSCrashLog {
19
- constructor(opts = {}) {
20
- this.udid = opts.udid;
21
- this.pyideviceClient = this.udid ? new py_ios_device_client_1.default(this.udid) : null;
22
- const root = process.env.HOME || '/';
23
- const logDir = opts.udid
24
- ? path_1.default.resolve(root, 'Library', 'Logs', 'CrashReporter', 'MobileDevice')
25
- : path_1.default.resolve(root, 'Library', 'Logs', 'DiagnosticReports');
26
- this.logDir = logDir || path_1.default.resolve(root, 'Library', 'Logs', 'DiagnosticReports');
27
- this.prevLogs = [];
28
- this.logsSinceLastRequest = [];
29
- this.phoneName = null;
30
- this.sim = opts.sim;
31
- }
32
- /**
33
- * @returns {Promise<string[]>}
34
- */
35
- async _gatherFromRealDevice() {
36
- if (await this.pyideviceClient?.assertExists(false)) {
37
- return (await /** @type {Pyidevice} */ (this.pyideviceClient).listCrashes()).map((x) => `${REAL_DEVICE_MAGIC}${MAGIC_SEP}${x}`);
38
- }
39
- let crashLogsRoot = this.logDir;
40
- if (this.udid) {
41
- this.phoneName = this.phoneName || (await appium_ios_device_1.utilities.getDeviceName(this.udid));
42
- crashLogsRoot = path_1.default.resolve(crashLogsRoot, this.phoneName);
43
- }
44
- if (!(await support_1.fs.exists(crashLogsRoot))) {
45
- logger_1.default.debug(`Crash reports root '${crashLogsRoot}' does not exist. Got nothing to gather.`);
46
- return [];
47
- }
48
- return await support_1.fs.glob(CRASH_REPORTS_GLOB_PATTERN, {
49
- cwd: crashLogsRoot,
50
- absolute: true,
51
- });
52
- }
53
- /**
54
- * @returns {Promise<string[]>}
55
- */
56
- async _gatherFromSimulator() {
57
- if (!(await support_1.fs.exists(this.logDir))) {
58
- logger_1.default.debug(`Crash reports root '${this.logDir}' does not exist. Got nothing to gather.`);
59
- return [];
60
- }
61
- const foundFiles = await support_1.fs.glob(CRASH_REPORTS_GLOB_PATTERN, {
62
- cwd: this.logDir,
63
- absolute: true,
64
- });
65
- // For Simulator only include files, that contain current UDID
66
- return await bluebird_1.default.filter(foundFiles, async (x) => {
67
- try {
68
- const content = await support_1.fs.readFile(x, 'utf8');
69
- return content.toUpperCase().includes(this.sim.udid.toUpperCase());
70
- }
71
- catch (err) {
72
- return false;
73
- }
16
+ // The size of a single diagnostic report might be hundreds of kilobytes.
17
+ // Thus we do not want to store too many items in the memory at once.
18
+ const MAX_RECENT_ITEMS = 20;
19
+ class IOSCrashLog extends ios_log_1.default {
20
+ constructor(opts) {
21
+ super({
22
+ log: opts.log,
23
+ maxBufferSize: MAX_RECENT_ITEMS,
74
24
  });
25
+ this._udid = opts.udid;
26
+ this._sim = opts.sim;
27
+ this._realDeviceClient = this._isRealDevice()
28
+ ? new py_ios_device_client_1.Pyidevice({
29
+ udid: this._udid,
30
+ log: opts.log,
31
+ })
32
+ : null;
33
+ this._logDir = this._isRealDevice()
34
+ ? null
35
+ : path_1.default.resolve(process.env.HOME || '/', 'Library', 'Logs', 'DiagnosticReports');
36
+ this._recentCrashFiles = [];
37
+ this._started = false;
75
38
  }
76
- /**
77
- * @returns {Promise<string[]>}
78
- */
79
- async getCrashes() {
80
- return this.udid ? await this._gatherFromRealDevice() : await this._gatherFromSimulator();
81
- }
82
- /**
83
- * @returns {Promise<void>}
84
- */
85
39
  async startCapture() {
86
- this.prevLogs = await this.getCrashes();
40
+ this._recentCrashFiles = await this._listCrashFiles(false);
41
+ this._started = true;
87
42
  }
88
- /**
89
- * @returns {Promise<void>}
90
- */
43
+ // eslint-disable-next-line require-await
91
44
  async stopCapture() {
92
- // needed for consistent API with other logs
45
+ this._started = false;
46
+ }
47
+ get isCapturing() {
48
+ return this._started;
93
49
  }
94
- /**
95
- * @returns {Promise<import('../commands/types').LogEntry[]>}
96
- */
97
50
  async getLogs() {
98
- let crashFiles = await this.getCrashes();
99
- let diff = lodash_1.default.difference(crashFiles, this.prevLogs, this.logsSinceLastRequest);
100
- this.logsSinceLastRequest = lodash_1.default.union(this.logsSinceLastRequest, diff);
101
- return await this.filesToJSON(diff);
51
+ const crashFiles = (await this._listCrashFiles(true)).slice(-MAX_RECENT_ITEMS);
52
+ const diffFiles = lodash_1.default.difference(crashFiles, this._recentCrashFiles);
53
+ if (lodash_1.default.isEmpty(diffFiles)) {
54
+ return [];
55
+ }
56
+ this.log.debug(`Found ${support_1.util.pluralize('fresh crash report', diffFiles.length, true)}`);
57
+ await this._serializeCrashes(diffFiles);
58
+ this._recentCrashFiles = crashFiles;
59
+ return super.getLogs();
102
60
  }
103
- /**
104
- * @param {string[]} paths
105
- * @returns {Promise<import('../commands/types').LogEntry[]>}
106
- */
107
- async filesToJSON(paths) {
61
+ _serializeEntry(value) {
62
+ return value;
63
+ }
64
+ _deserializeEntry(value) {
65
+ const [message, timestamp] = value;
66
+ return (0, helpers_1.toLogEntry)(message, timestamp);
67
+ }
68
+ async _serializeCrashes(paths) {
108
69
  const tmpRoot = await support_1.tempDir.openDir();
109
70
  try {
110
- return /** @type {import('../commands/types').LogEntry[]} */ ((await bluebird_1.default.map(paths, async (fullPath) => {
111
- if (lodash_1.default.includes(fullPath, REAL_DEVICE_MAGIC)) {
112
- const fileName = /** @type {string} */ (lodash_1.default.last(fullPath.split(MAGIC_SEP)));
71
+ for (const filePath of paths) {
72
+ let fullPath = filePath;
73
+ if (this._isRealDevice()) {
74
+ const fileName = filePath;
113
75
  try {
114
- // @ts-expect-error If pyideviceClient is not defined, then the exception will be caught below
115
- await this.pyideviceClient.exportCrash(fileName, tmpRoot);
76
+ await this._realDeviceClient.exportCrash(fileName, tmpRoot);
116
77
  }
117
78
  catch (e) {
118
- logger_1.default.warn(`Cannot export the crash report '${fileName}'. Skipping it. ` +
79
+ this.log.warn(`Cannot export the crash report '${fileName}'. Skipping it. ` +
119
80
  `Original error: ${e.message}`);
120
81
  return;
121
82
  }
122
83
  fullPath = path_1.default.join(tmpRoot, fileName);
123
84
  }
124
- const stat = await support_1.fs.stat(fullPath);
125
- return {
126
- timestamp: stat.ctime.getTime(),
127
- level: 'ALL',
128
- message: await support_1.fs.readFile(fullPath, 'utf8'),
129
- };
130
- })).filter(Boolean));
85
+ const { ctime } = await support_1.fs.stat(fullPath);
86
+ this.broadcast([await support_1.fs.readFile(fullPath, 'utf8'), ctime.getTime()]);
87
+ }
131
88
  }
132
89
  finally {
133
90
  await support_1.fs.rimraf(tmpRoot);
134
91
  }
135
92
  }
93
+ async _gatherFromRealDevice(strict) {
94
+ if (!this._realDeviceClient) {
95
+ return [];
96
+ }
97
+ if (!await this._realDeviceClient.assertExists(strict)) {
98
+ this.log.info(`The ${lodash_1.default.toLower(this._realDeviceClient.constructor.name)} tool is not present in PATH. ` +
99
+ `Skipping crash logs collection for real devices.`);
100
+ return [];
101
+ }
102
+ return await this._realDeviceClient.listCrashes();
103
+ }
104
+ async _gatherFromSimulator() {
105
+ if (!this._logDir || !this._sim || !(await support_1.fs.exists(this._logDir))) {
106
+ this.log.debug(`Crash reports root '${this._logDir}' does not exist. Got nothing to gather.`);
107
+ return [];
108
+ }
109
+ const foundFiles = await support_1.fs.glob(CRASH_REPORTS_GLOB_PATTERN, {
110
+ cwd: this._logDir,
111
+ absolute: true,
112
+ });
113
+ const simUdid = this._sim.udid;
114
+ // For Simulator only include files, that contain current UDID
115
+ return await bluebird_1.default.filter(foundFiles, async (filePath) => {
116
+ try {
117
+ return await (0, helpers_1.grepFile)(filePath, simUdid, { caseInsensitive: true });
118
+ }
119
+ catch (err) {
120
+ this.log.warn(err);
121
+ return false;
122
+ }
123
+ });
124
+ }
125
+ async _listCrashFiles(strict) {
126
+ return this._isRealDevice()
127
+ ? await this._gatherFromRealDevice(strict)
128
+ : await this._gatherFromSimulator();
129
+ }
130
+ _isRealDevice() {
131
+ return Boolean(this._udid);
132
+ }
136
133
  }
137
134
  exports.IOSCrashLog = IOSCrashLog;
138
135
  exports.default = IOSCrashLog;