appium-ios-simulator 8.0.1 → 8.0.3

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 CHANGED
@@ -1,3 +1,15 @@
1
+ ## [8.0.3](https://github.com/appium/appium-ios-simulator/compare/v8.0.2...v8.0.3) (2025-12-06)
2
+
3
+ ### Miscellaneous Chores
4
+
5
+ * Migrate utils to typescript ([#462](https://github.com/appium/appium-ios-simulator/issues/462)) ([0b2f77d](https://github.com/appium/appium-ios-simulator/commit/0b2f77dd7e1228d2bc0b75892b824978287ae1ca))
6
+
7
+ ## [8.0.2](https://github.com/appium/appium-ios-simulator/compare/v8.0.1...v8.0.2) (2025-12-02)
8
+
9
+ ### Miscellaneous Chores
10
+
11
+ * **deps:** Bump actions/setup-node from 3 to 6 ([#461](https://github.com/appium/appium-ios-simulator/issues/461)) ([8fcaaa7](https://github.com/appium/appium-ios-simulator/commit/8fcaaa734f2cec5e504b0f60265125544822da6a))
12
+
1
13
  ## [8.0.1](https://github.com/appium/appium-ios-simulator/compare/v8.0.0...v8.0.1) (2025-12-02)
2
14
 
3
15
  ### Miscellaneous Chores
@@ -3,36 +3,36 @@
3
3
  * XML representation, which is ready for further usage
4
4
  * with `defaults` command line tool arguments
5
5
  *
6
- * @param {any} value The value to be serialized
7
- * @param {boolean} serialize [true] Whether to serialize the resulting
6
+ * @param value The value to be serialized
7
+ * @param serialize Whether to serialize the resulting
8
8
  * XML to string or to return raw HTMLElement instance
9
- * @returns {HTMLElement|string} Either string or raw node representation of
9
+ * @returns Either string or raw node representation of
10
10
  * the given value
11
11
  * @throws {TypeError} If it is not known how to serialize the given value
12
12
  */
13
- export function toXmlArg(value: any, serialize?: boolean): HTMLElement | string;
13
+ export declare function toXmlArg(value: any, serialize?: boolean): string | Element;
14
14
  /**
15
15
  * Generates command line args for the `defaults`
16
16
  * command line utility based on the given preference values mapping.
17
17
  * See https://shadowfile.inode.link/blog/2018/06/advanced-defaults1-usage/
18
18
  * for more details.
19
19
  *
20
- * @param {Object} valuesMap Preferences mapping
21
- * @param {Boolean} replace [false] Whether to generate arguments that replace
20
+ * @param valuesMap Preferences mapping
21
+ * @param replace Whether to generate arguments that replace
22
22
  * complex typed values like arrays or dictionaries in the current plist or
23
23
  * update them (the default settings)
24
- * @returns {string[][]} Each item in the array
24
+ * @returns Each item in the array
25
25
  * is the `defaults write <plist>` command suffix
26
26
  */
27
- export function generateDefaultsCommandArgs(valuesMap: any, replace?: boolean): string[][];
28
- export class NSUserDefaults {
29
- constructor(plist: any);
30
- plist: any;
27
+ export declare function generateDefaultsCommandArgs(valuesMap: Record<string, any>, replace?: boolean): string[][];
28
+ export declare class NSUserDefaults {
29
+ plist: string;
30
+ constructor(plist: string);
31
31
  /**
32
32
  * Reads the content of the given plist file using plutil command line tool
33
33
  * and serializes it to a JSON representation
34
34
  *
35
- * @returns {Promise<Record<string, any>>} The serialized plist content
35
+ * @returns The serialized plist content
36
36
  * @throws {Error} If there was an error during serialization
37
37
  */
38
38
  asJson(): Promise<Record<string, any>>;
@@ -40,13 +40,13 @@ export class NSUserDefaults {
40
40
  * Updates the content of the given plist file.
41
41
  * If the plist does not exist yet then it is going to be created.
42
42
  *
43
- * @param {Object} valuesMap Mapping of preference values to update.
43
+ * @param valuesMap Mapping of preference values to update.
44
44
  * If any of item values are of dictionary type then only the first level dictionary gets
45
45
  * updated. Everything below this level will be replaced. This is the known limitation
46
46
  * of the `defaults` command line tool. A workaround for it would be to read the current
47
47
  * preferences mapping first and merge it with this value.
48
48
  * @throws {Error} If there was an error while updating the plist
49
49
  */
50
- update(valuesMap: any): Promise<void>;
50
+ update(valuesMap: Record<string, any>): Promise<void>;
51
51
  }
52
52
  //# sourceMappingURL=defaults-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"defaults-utils.d.ts","sourceRoot":"","sources":["../../lib/defaults-utils.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,gCAPW,GAAG,cACH,OAAO,GAEL,WAAW,GAAC,MAAM,CA6C9B;AAED;;;;;;;;;;;;GAYG;AACH,gFAHa,MAAM,EAAE,EAAE,CAmCtB;AAED;IACE,wBAEC;IADC,WAAkB;IAGpB;;;;;;OAMG;IACH,UAHa,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAUxC;IAED;;;;;;;;;;OAUG;IACH,sCAcC;CACF"}
1
+ {"version":3,"file":"defaults-utils.d.ts","sourceRoot":"","sources":["../../lib/defaults-utils.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,GAAE,OAAc,GAAG,MAAM,GAAG,OAAO,CAuChF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,GAAE,OAAe,GAAG,MAAM,EAAE,EAAE,CA4BhH;AAED,qBAAa,cAAc;IACzB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM;IAIzB;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAS5C;;;;;;;;;;OAUG;IACG,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAe5D"}
@@ -16,10 +16,10 @@ const logger_1 = require("./logger");
16
16
  * XML representation, which is ready for further usage
17
17
  * with `defaults` command line tool arguments
18
18
  *
19
- * @param {any} value The value to be serialized
20
- * @param {boolean} serialize [true] Whether to serialize the resulting
19
+ * @param value The value to be serialized
20
+ * @param serialize Whether to serialize the resulting
21
21
  * XML to string or to return raw HTMLElement instance
22
- * @returns {HTMLElement|string} Either string or raw node representation of
22
+ * @returns Either string or raw node representation of
23
23
  * the given value
24
24
  * @throws {TypeError} If it is not known how to serialize the given value
25
25
  */
@@ -32,7 +32,6 @@ function toXmlArg(value, serialize = true) {
32
32
  const keyTextEl = xmlDoc.createTextNode(subKey);
33
33
  keyEl.appendChild(keyTextEl);
34
34
  xmlDoc.documentElement.appendChild(keyEl);
35
- // @ts-ignore The typecast here is fine
36
35
  const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);
37
36
  xmlDoc.documentElement.appendChild(subValueEl);
38
37
  }
@@ -40,7 +39,6 @@ function toXmlArg(value, serialize = true) {
40
39
  else if (lodash_1.default.isArray(value)) {
41
40
  xmlDoc = new xmldom_1.DOMParser().parseFromString('<array></array>', 'text/xml');
42
41
  for (const subValue of value) {
43
- // @ts-ignore The typecast here is fine
44
42
  const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);
45
43
  xmlDoc.documentElement.appendChild(subValueEl);
46
44
  }
@@ -73,22 +71,20 @@ function toXmlArg(value, serialize = true) {
73
71
  * See https://shadowfile.inode.link/blog/2018/06/advanced-defaults1-usage/
74
72
  * for more details.
75
73
  *
76
- * @param {Object} valuesMap Preferences mapping
77
- * @param {Boolean} replace [false] Whether to generate arguments that replace
74
+ * @param valuesMap Preferences mapping
75
+ * @param replace Whether to generate arguments that replace
78
76
  * complex typed values like arrays or dictionaries in the current plist or
79
77
  * update them (the default settings)
80
- * @returns {string[][]} Each item in the array
78
+ * @returns Each item in the array
81
79
  * is the `defaults write <plist>` command suffix
82
80
  */
83
81
  function generateDefaultsCommandArgs(valuesMap, replace = false) {
84
- /** @type {string[][]} */
85
82
  const resultArgs = [];
86
83
  for (const [key, value] of lodash_1.default.toPairs(valuesMap)) {
87
84
  try {
88
85
  if (!replace && lodash_1.default.isPlainObject(value)) {
89
86
  const dictArgs = [key, '-dict-add'];
90
87
  for (const [subKey, subValue] of lodash_1.default.toPairs(value)) {
91
- // @ts-ignore The typecast here is fine
92
88
  dictArgs.push(subKey, toXmlArg(subValue));
93
89
  }
94
90
  resultArgs.push(dictArgs);
@@ -96,13 +92,11 @@ function generateDefaultsCommandArgs(valuesMap, replace = false) {
96
92
  else if (!replace && lodash_1.default.isArray(value)) {
97
93
  const arrayArgs = [key, '-array-add'];
98
94
  for (const subValue of value) {
99
- // @ts-ignore The typecast here is fine
100
95
  arrayArgs.push(toXmlArg(subValue));
101
96
  }
102
97
  resultArgs.push(arrayArgs);
103
98
  }
104
99
  else {
105
- // @ts-ignore The typecast here is fine
106
100
  resultArgs.push([key, toXmlArg(value)]);
107
101
  }
108
102
  }
@@ -118,6 +112,7 @@ function generateDefaultsCommandArgs(valuesMap, replace = false) {
118
112
  return resultArgs;
119
113
  }
120
114
  class NSUserDefaults {
115
+ plist;
121
116
  constructor(plist) {
122
117
  this.plist = plist;
123
118
  }
@@ -125,7 +120,7 @@ class NSUserDefaults {
125
120
  * Reads the content of the given plist file using plutil command line tool
126
121
  * and serializes it to a JSON representation
127
122
  *
128
- * @returns {Promise<Record<string, any>>} The serialized plist content
123
+ * @returns The serialized plist content
129
124
  * @throws {Error} If there was an error during serialization
130
125
  */
131
126
  async asJson() {
@@ -141,7 +136,7 @@ class NSUserDefaults {
141
136
  * Updates the content of the given plist file.
142
137
  * If the plist does not exist yet then it is going to be created.
143
138
  *
144
- * @param {Object} valuesMap Mapping of preference values to update.
139
+ * @param valuesMap Mapping of preference values to update.
145
140
  * If any of item values are of dictionary type then only the first level dictionary gets
146
141
  * updated. Everything below this level will be replaced. This is the known limitation
147
142
  * of the `defaults` command line tool. A workaround for it would be to read the current
@@ -1 +1 @@
1
- {"version":3,"file":"defaults-utils.js","sourceRoot":"","sources":["../../lib/defaults-utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defaults-utils.js","sourceRoot":"","sources":["../../lib/defaults-utils.ts"],"names":[],"mappings":";;;;;;AAkBA,4BAuCC;AAeD,kEA4BC;AApGD,oDAAuB;AACvB,2CAA0D;AAC1D,+CAAoC;AACpC,wDAAyB;AACzB,qCAA+B;AAE/B;;;;;;;;;;;GAWG;AACH,SAAgB,QAAQ,CAAC,KAAU,EAAE,YAAqB,IAAI;IAC5D,IAAI,MAAM,GAAoB,IAAI,CAAC;IAEnC,IAAI,gBAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACtE,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAChD,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAC7B,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAY,EAAE,IAAI,CAAC,CAAC;YACjF,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;SAAM,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QACxE,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAY,EAAE,IAAI,CAAC,CAAC;YACjF,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;SAAM,IAAI,gBAAC,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACvF,CAAC;SAAM,IAAI,gBAAC,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,YAAY,KAAK,YAAY,EAAE,UAAU,CAAC,CAAC;IACtF,CAAC;SAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,SAAS,KAAK,SAAS,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;SAAM,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,SAAS,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,sBAAsB;YACnF,gDAAgD,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,SAAS;QACd,CAAC,CAAC,IAAI,sBAAa,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/D,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;AAC7B,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,2BAA2B,CAAC,SAA8B,EAAE,UAAmB,KAAK;IAClG,MAAM,UAAU,GAAe,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAChD,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,IAAI,gBAAC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;gBACpC,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClD,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAW,CAAC,CAAC;gBACtD,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,CAAC,OAAO,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxC,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;gBACtC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;oBAC7B,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAW,CAAC,CAAC;gBAC/C,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAW,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;gBAC3B,YAAG,CAAC,IAAI,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAa,cAAc;IACzB,KAAK,CAAS;IAEd,YAAY,KAAa;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM;QACV,IAAI,CAAC;YACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACnF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,kDAAkD,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3G,CAAC;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,MAAM,CAAC,SAA8B;QACzC,IAAI,CAAC,gBAAC,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,SAAS,CAAC,gCAAgC,SAAS,oBAAoB,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC;YACH,MAAM,kBAAC,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mBAAI,EAAC,UAAU,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,KAAK,sBAAsB,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7G,CAAC;IACH,CAAC;CACF;AAjDD,wCAiDC"}
@@ -1,3 +1,2 @@
1
- export const log: import("@appium/types").AppiumLogger;
2
- export default log;
1
+ export declare const log: import("@appium/types").AppiumLogger;
3
2
  //# sourceMappingURL=logger.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":"AAEA,uDAAiD"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,sCAAgC,CAAC"}
@@ -3,5 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.log = void 0;
4
4
  const support_1 = require("@appium/support");
5
5
  exports.log = support_1.logger.getLogger('Simulator');
6
- exports.default = exports.log;
7
6
  //# sourceMappingURL=logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";;;AAAA,6CAAyC;AAE5B,QAAA,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAEjD,kBAAe,WAAG,CAAC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAE5B,QAAA,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC"}
@@ -41,11 +41,11 @@ const support_1 = require("@appium/support");
41
41
  const asyncbox_1 = require("asyncbox");
42
42
  const utils_1 = require("./utils");
43
43
  const teen_process_1 = require("teen_process");
44
- const logger_1 = __importDefault(require("./logger"));
44
+ const logger_1 = require("./logger");
45
45
  const events_1 = __importDefault(require("events"));
46
46
  const async_lock_1 = __importDefault(require("async-lock"));
47
47
  const lodash_1 = __importDefault(require("lodash"));
48
- const path_1 = __importDefault(require("path"));
48
+ const node_path_1 = __importDefault(require("node:path"));
49
49
  const bluebird_1 = __importDefault(require("bluebird"));
50
50
  const appium_xcode_1 = require("appium-xcode");
51
51
  const node_simctl_1 = require("node-simctl");
@@ -88,7 +88,7 @@ class SimulatorXcode14 extends events_1.default {
88
88
  // it will be set when it is needed
89
89
  this._platformVersion = null;
90
90
  this._webInspectorSocket = null;
91
- this._log = log ?? logger_1.default;
91
+ this._log = log ?? logger_1.log;
92
92
  }
93
93
  /**
94
94
  * @returns The unique device identifier (UDID) of the simulator.
@@ -112,7 +112,7 @@ class SimulatorXcode14 extends events_1.default {
112
112
  * @returns The full path to the keychain directory for this simulator.
113
113
  */
114
114
  get keychainPath() {
115
- return path_1.default.resolve(this.getDir(), 'Library', 'Keychains');
115
+ return node_path_1.default.resolve(this.getDir(), 'Library', 'Keychains');
116
116
  }
117
117
  /**
118
118
  * @returns The logger instance used by this simulator.
@@ -155,7 +155,7 @@ class SimulatorXcode14 extends events_1.default {
155
155
  * @returns The path string.
156
156
  */
157
157
  getRootDir() {
158
- return path_1.default.resolve(process.env.HOME ?? '', 'Library', 'Developer', 'CoreSimulator', 'Devices');
158
+ return node_path_1.default.resolve(process.env.HOME ?? '', 'Library', 'Developer', 'CoreSimulator', 'Devices');
159
159
  }
160
160
  /**
161
161
  * Retrieve the full path to the directory where Simulator applications data is located.
@@ -163,7 +163,7 @@ class SimulatorXcode14 extends events_1.default {
163
163
  * @returns The path string.
164
164
  */
165
165
  getDir() {
166
- return path_1.default.resolve(this.getRootDir(), this.udid, 'data');
166
+ return node_path_1.default.resolve(this.getRootDir(), this.udid, 'data');
167
167
  }
168
168
  /**
169
169
  * Retrieve the full path to the directory where Simulator logs are stored.
@@ -171,7 +171,7 @@ class SimulatorXcode14 extends events_1.default {
171
171
  * @returns The path string.
172
172
  */
173
173
  getLogDir() {
174
- return path_1.default.resolve(process.env.HOME ?? '', 'Library', 'Logs', 'CoreSimulator', this.udid);
174
+ return node_path_1.default.resolve(process.env.HOME ?? '', 'Library', 'Logs', 'CoreSimulator', this.udid);
175
175
  }
176
176
  /**
177
177
  * Get the state and specifics of this simulator.
@@ -202,7 +202,7 @@ class SimulatorXcode14 extends events_1.default {
202
202
  * @returns True if the current Simulator has never been started before.
203
203
  */
204
204
  async isFresh() {
205
- const cachesRoot = path_1.default.resolve(this.getDir(), 'Library', 'Caches');
205
+ const cachesRoot = node_path_1.default.resolve(this.getDir(), 'Library', 'Caches');
206
206
  return (await support_1.fs.exists(cachesRoot))
207
207
  ? (await support_1.fs.glob('*', { cwd: cachesRoot })).length === 0
208
208
  : true;
@@ -389,7 +389,7 @@ class SimulatorXcode14 extends events_1.default {
389
389
  lodash_1.default.defaultsDeep(opts, {
390
390
  startupTimeout: this.startupTimeout,
391
391
  });
392
- const simulatorApp = path_1.default.resolve(await (0, appium_xcode_1.getPath)(), 'Applications', utils_1.SIMULATOR_APP_NAME);
392
+ const simulatorApp = node_path_1.default.resolve(await (0, appium_xcode_1.getPath)(), 'Applications', utils_1.SIMULATOR_APP_NAME);
393
393
  const args = ['-Fn', simulatorApp];
394
394
  this.log.info(`Starting Simulator UI: ${support_1.util.quote(['open', ...args])}`);
395
395
  try {
@@ -556,7 +556,7 @@ class SimulatorXcode14 extends events_1.default {
556
556
  */
557
557
  async getLaunchDaemonsRoot() {
558
558
  const devRoot = await (0, utils_1.getDeveloperRoot)();
559
- return path_1.default.resolve(devRoot, 'Platforms', 'iPhoneOS.platform', 'Library', 'Developer', 'CoreSimulator', 'Profiles', 'Runtimes', 'iOS.simruntime', 'Contents', 'Resources', 'RuntimeRoot', 'System', 'Library', 'LaunchDaemons');
559
+ return node_path_1.default.resolve(devRoot, 'Platforms', 'iPhoneOS.platform', 'Library', 'Developer', 'CoreSimulator', 'Profiles', 'Runtimes', 'iOS.simruntime', 'Contents', 'Resources', 'RuntimeRoot', 'System', 'Library', 'LaunchDaemons');
560
560
  }
561
561
  /**
562
562
  * Sets the geolocation for the simulator.
@@ -1 +1 @@
1
- {"version":3,"file":"simulator-xcode-14.js","sourceRoot":"","sources":["../../lib/simulator-xcode-14.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"simulator-xcode-14.js","sourceRoot":"","sources":["../../lib/simulator-xcode-14.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { XcodeVersion } from 'appium-xcode';
2
+ import type { StringRecord } from '@appium/types';
2
3
  export declare const SAFARI_STARTUP_TIMEOUT_MS: number;
3
4
  export declare const MOBILE_SAFARI_BUNDLE_ID = "com.apple.mobilesafari";
4
5
  export declare const SIMULATOR_APP_NAME = "Simulator.app";
@@ -35,4 +36,9 @@ export declare function getDeveloperRoot(): Promise<string>;
35
36
  * @throws {Error} If the Xcode version is below the minimum supported version.
36
37
  */
37
38
  export declare function assertXcodeVersion<V extends XcodeVersion>(xcodeVersion: V): V;
39
+ /**
40
+ * @param simctlOpts - Optional simctl options
41
+ * @returns Promise that resolves to a record of devices grouped by SDK version
42
+ */
43
+ export declare function getDevices(simctlOpts?: StringRecord): Promise<Record<string, any[]>>;
38
44
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,eAAO,MAAM,yBAAyB,QAAY,CAAC;AACnD,eAAO,MAAM,uBAAuB,2BAA2B,CAAC;AAChE,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAClD,eAAO,MAAM,2BAA2B,KAAK,CAAC;AA2B9C;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,MAAwC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyExG;AAED,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CASlG;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE9D;AAED;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAGxD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,YAAY,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC,CAQ7E"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAKlD,eAAO,MAAM,yBAAyB,QAAY,CAAC;AACnD,eAAO,MAAM,uBAAuB,2BAA2B,CAAC;AAChE,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAClD,eAAO,MAAM,2BAA2B,KAAK,CAAC;AA2B9C;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,MAAwC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyExG;AAED,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CASlG;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE9D;AAED;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAGxD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,YAAY,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC,CAQ7E;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,UAAU,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAE1F"}
@@ -1,4 +1,37 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
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
+ })();
2
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
37
  };
@@ -9,13 +42,16 @@ exports.getSimulatorInfo = getSimulatorInfo;
9
42
  exports.simExists = simExists;
10
43
  exports.getDeveloperRoot = getDeveloperRoot;
11
44
  exports.assertXcodeVersion = assertXcodeVersion;
45
+ exports.getDevices = getDevices;
12
46
  const logger_1 = require("./logger");
13
47
  const lodash_1 = __importDefault(require("lodash"));
14
48
  const teen_process_1 = require("teen_process");
15
49
  const asyncbox_1 = require("asyncbox");
16
50
  const appium_xcode_1 = require("appium-xcode");
17
51
  const path_1 = __importDefault(require("path"));
18
- const device_utils_1 = require("./device-utils");
52
+ const node_simctl_1 = require("node-simctl");
53
+ // it's a hack needed to stub getDevices in tests
54
+ const utilsModule = __importStar(require("./utils"));
19
55
  const DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS = 30000;
20
56
  exports.SAFARI_STARTUP_TIMEOUT_MS = 25 * 1000;
21
57
  exports.MOBILE_SAFARI_BUNDLE_ID = 'com.apple.mobilesafari';
@@ -97,8 +133,8 @@ async function killAllSimulators(timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS) {
97
133
  let remainingDevices = [];
98
134
  async function allSimsAreDown() {
99
135
  remainingDevices = [];
100
- let devices = await (0, device_utils_1.getDevices)();
101
- devices = lodash_1.default.flatten(lodash_1.default.values(devices));
136
+ const devicesRecord = await utilsModule.getDevices();
137
+ const devices = lodash_1.default.flatten(lodash_1.default.values(devicesRecord));
102
138
  return lodash_1.default.every(devices, (sim) => {
103
139
  const state = sim.state.toLowerCase();
104
140
  const done = ['shutdown', 'unavailable', 'disconnected'].includes(state);
@@ -132,7 +168,7 @@ async function killAllSimulators(timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS) {
132
168
  async function getSimulatorInfo(udid, opts = {}) {
133
169
  const { devicesSetPath } = opts;
134
170
  // see the README for github.com/appium/node-simctl for example output of getDevices()
135
- const devices = lodash_1.default.toPairs(await (0, device_utils_1.getDevices)({ devicesSetPath }))
171
+ const devices = lodash_1.default.toPairs(await utilsModule.getDevices({ devicesSetPath }))
136
172
  .map((pair) => pair[1])
137
173
  .reduce((a, b) => a.concat(b), []);
138
174
  return lodash_1.default.find(devices, (sim) => sim.udid === udid);
@@ -166,4 +202,11 @@ function assertXcodeVersion(xcodeVersion) {
166
202
  }
167
203
  return xcodeVersion;
168
204
  }
205
+ /**
206
+ * @param simctlOpts - Optional simctl options
207
+ * @returns Promise that resolves to a record of devices grouped by SDK version
208
+ */
209
+ async function getDevices(simctlOpts) {
210
+ return await new node_simctl_1.Simctl(simctlOpts).getDevices();
211
+ }
169
212
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
@@ -9,15 +9,15 @@ import { log } from './logger';
9
9
  * XML representation, which is ready for further usage
10
10
  * with `defaults` command line tool arguments
11
11
  *
12
- * @param {any} value The value to be serialized
13
- * @param {boolean} serialize [true] Whether to serialize the resulting
12
+ * @param value The value to be serialized
13
+ * @param serialize Whether to serialize the resulting
14
14
  * XML to string or to return raw HTMLElement instance
15
- * @returns {HTMLElement|string} Either string or raw node representation of
15
+ * @returns Either string or raw node representation of
16
16
  * the given value
17
17
  * @throws {TypeError} If it is not known how to serialize the given value
18
18
  */
19
- export function toXmlArg (value, serialize = true) {
20
- let xmlDoc = null;
19
+ export function toXmlArg(value: any, serialize: boolean = true): string | Element {
20
+ let xmlDoc: Document | null = null;
21
21
 
22
22
  if (_.isPlainObject(value)) {
23
23
  xmlDoc = new DOMParser().parseFromString('<dict></dict>', 'text/xml');
@@ -26,15 +26,13 @@ export function toXmlArg (value, serialize = true) {
26
26
  const keyTextEl = xmlDoc.createTextNode(subKey);
27
27
  keyEl.appendChild(keyTextEl);
28
28
  xmlDoc.documentElement.appendChild(keyEl);
29
- // @ts-ignore The typecast here is fine
30
- const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);
29
+ const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false) as Element, true);
31
30
  xmlDoc.documentElement.appendChild(subValueEl);
32
31
  }
33
32
  } else if (_.isArray(value)) {
34
33
  xmlDoc = new DOMParser().parseFromString('<array></array>', 'text/xml');
35
34
  for (const subValue of value) {
36
- // @ts-ignore The typecast here is fine
37
- const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false), true);
35
+ const subValueEl = xmlDoc.importNode(toXmlArg(subValue, false) as Element, true);
38
36
  xmlDoc.documentElement.appendChild(subValueEl);
39
37
  }
40
38
  } else if (_.isBoolean(value)) {
@@ -65,39 +63,35 @@ export function toXmlArg (value, serialize = true) {
65
63
  * See https://shadowfile.inode.link/blog/2018/06/advanced-defaults1-usage/
66
64
  * for more details.
67
65
  *
68
- * @param {Object} valuesMap Preferences mapping
69
- * @param {Boolean} replace [false] Whether to generate arguments that replace
66
+ * @param valuesMap Preferences mapping
67
+ * @param replace Whether to generate arguments that replace
70
68
  * complex typed values like arrays or dictionaries in the current plist or
71
69
  * update them (the default settings)
72
- * @returns {string[][]} Each item in the array
70
+ * @returns Each item in the array
73
71
  * is the `defaults write <plist>` command suffix
74
72
  */
75
- export function generateDefaultsCommandArgs (valuesMap, replace = false) {
76
- /** @type {string[][]} */
77
- const resultArgs = [];
73
+ export function generateDefaultsCommandArgs(valuesMap: Record<string, any>, replace: boolean = false): string[][] {
74
+ const resultArgs: string[][] = [];
78
75
  for (const [key, value] of _.toPairs(valuesMap)) {
79
76
  try {
80
77
  if (!replace && _.isPlainObject(value)) {
81
78
  const dictArgs = [key, '-dict-add'];
82
79
  for (const [subKey, subValue] of _.toPairs(value)) {
83
- // @ts-ignore The typecast here is fine
84
- dictArgs.push(subKey, toXmlArg(subValue));
80
+ dictArgs.push(subKey, toXmlArg(subValue) as string);
85
81
  }
86
82
  resultArgs.push(dictArgs);
87
83
  } else if (!replace && _.isArray(value)) {
88
84
  const arrayArgs = [key, '-array-add'];
89
85
  for (const subValue of value) {
90
- // @ts-ignore The typecast here is fine
91
- arrayArgs.push(toXmlArg(subValue));
86
+ arrayArgs.push(toXmlArg(subValue) as string);
92
87
  }
93
88
  resultArgs.push(arrayArgs);
94
89
  } else {
95
- // @ts-ignore The typecast here is fine
96
- resultArgs.push([key, toXmlArg(value)]);
90
+ resultArgs.push([key, toXmlArg(value) as string]);
97
91
  }
98
92
  } catch (e) {
99
93
  if (e instanceof TypeError) {
100
- log.warn(e.message);
94
+ log.warn((e as Error).message);
101
95
  } else {
102
96
  throw e;
103
97
  }
@@ -107,7 +101,9 @@ export function generateDefaultsCommandArgs (valuesMap, replace = false) {
107
101
  }
108
102
 
109
103
  export class NSUserDefaults {
110
- constructor (plist) {
104
+ plist: string;
105
+
106
+ constructor(plist: string) {
111
107
  this.plist = plist;
112
108
  }
113
109
 
@@ -115,14 +111,14 @@ export class NSUserDefaults {
115
111
  * Reads the content of the given plist file using plutil command line tool
116
112
  * and serializes it to a JSON representation
117
113
  *
118
- * @returns {Promise<Record<string, any>>} The serialized plist content
114
+ * @returns The serialized plist content
119
115
  * @throws {Error} If there was an error during serialization
120
116
  */
121
- async asJson () {
117
+ async asJson(): Promise<Record<string, any>> {
122
118
  try {
123
119
  const {stdout} = await exec('plutil', ['-convert', 'json', '-o', '-', this.plist]);
124
120
  return JSON.parse(stdout);
125
- } catch (e) {
121
+ } catch (e: any) {
126
122
  throw new Error(`'${this.plist}' cannot be converted to JSON. Original error: ${e.stderr || e.message}`);
127
123
  }
128
124
  }
@@ -131,14 +127,14 @@ export class NSUserDefaults {
131
127
  * Updates the content of the given plist file.
132
128
  * If the plist does not exist yet then it is going to be created.
133
129
  *
134
- * @param {Object} valuesMap Mapping of preference values to update.
130
+ * @param valuesMap Mapping of preference values to update.
135
131
  * If any of item values are of dictionary type then only the first level dictionary gets
136
132
  * updated. Everything below this level will be replaced. This is the known limitation
137
133
  * of the `defaults` command line tool. A workaround for it would be to read the current
138
134
  * preferences mapping first and merge it with this value.
139
135
  * @throws {Error} If there was an error while updating the plist
140
136
  */
141
- async update (valuesMap) {
137
+ async update(valuesMap: Record<string, any>): Promise<void> {
142
138
  if (!_.isPlainObject(valuesMap)) {
143
139
  throw new TypeError(`plist values must be a map. '${valuesMap}' is given instead`);
144
140
  }
@@ -149,8 +145,9 @@ export class NSUserDefaults {
149
145
  const commandArgs = generateDefaultsCommandArgs(valuesMap);
150
146
  try {
151
147
  await B.all(commandArgs.map((args) => exec('defaults', ['write', this.plist, ...args])));
152
- } catch (e) {
148
+ } catch (e: any) {
153
149
  throw new Error(`Could not write defaults into '${this.plist}'. Original error: ${e.stderr || e.message}`);
154
150
  }
155
151
  }
156
152
  }
153
+
@@ -1,5 +1,3 @@
1
1
  import { logger } from '@appium/support';
2
2
 
3
3
  export const log = logger.getLogger('Simulator');
4
-
5
- export default log;
@@ -2,11 +2,11 @@ import { fs, timing, util } from '@appium/support';
2
2
  import { waitForCondition, retryInterval } from 'asyncbox';
3
3
  import { getDeveloperRoot, SIMULATOR_APP_NAME} from './utils';
4
4
  import { exec } from 'teen_process';
5
- import defaultLog from './logger';
5
+ import { log as defaultLog } from './logger';
6
6
  import EventEmitter from 'events';
7
7
  import AsyncLock from 'async-lock';
8
8
  import _ from 'lodash';
9
- import path from 'path';
9
+ import path from 'node:path';
10
10
  import B from 'bluebird';
11
11
  import { getPath as getXcodePath } from 'appium-xcode';
12
12
  import { Simctl } from 'node-simctl';
package/lib/utils.ts CHANGED
@@ -5,7 +5,10 @@ import { waitForCondition } from 'asyncbox';
5
5
  import { getVersion } from 'appium-xcode';
6
6
  import type { XcodeVersion } from 'appium-xcode';
7
7
  import path from 'path';
8
- import { getDevices } from './device-utils';
8
+ import { Simctl } from 'node-simctl';
9
+ import type { StringRecord } from '@appium/types';
10
+ // it's a hack needed to stub getDevices in tests
11
+ import * as utilsModule from './utils';
9
12
 
10
13
  const DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS = 30000;
11
14
  export const SAFARI_STARTUP_TIMEOUT_MS = 25 * 1000;
@@ -90,8 +93,8 @@ export async function killAllSimulators(timeout: number = DEFAULT_SIM_SHUTDOWN_T
90
93
  let remainingDevices: string[] = [];
91
94
  async function allSimsAreDown(): Promise<boolean> {
92
95
  remainingDevices = [];
93
- let devices = await getDevices();
94
- devices = _.flatten(_.values(devices));
96
+ const devicesRecord = await utilsModule.getDevices();
97
+ const devices = _.flatten(_.values(devicesRecord));
95
98
  return _.every(devices, (sim: any) => {
96
99
  const state = sim.state.toLowerCase();
97
100
  const done = ['shutdown', 'unavailable', 'disconnected'].includes(state);
@@ -131,7 +134,7 @@ export async function getSimulatorInfo(udid: string, opts: SimulatorInfoOptions
131
134
  devicesSetPath
132
135
  } = opts;
133
136
  // see the README for github.com/appium/node-simctl for example output of getDevices()
134
- const devices = _.toPairs(await getDevices({devicesSetPath}))
137
+ const devices = _.toPairs(await utilsModule.getDevices({devicesSetPath}))
135
138
  .map((pair) => pair[1])
136
139
  .reduce((a, b) => a.concat(b), []);
137
140
  return _.find(devices, (sim: any) => sim.udid === udid);
@@ -171,3 +174,10 @@ export function assertXcodeVersion<V extends XcodeVersion>(xcodeVersion: V): V {
171
174
  return xcodeVersion;
172
175
  }
173
176
 
177
+ /**
178
+ * @param simctlOpts - Optional simctl options
179
+ * @returns Promise that resolves to a record of devices grouped by SDK version
180
+ */
181
+ export async function getDevices(simctlOpts?: StringRecord): Promise<Record<string, any[]>> {
182
+ return await new Simctl(simctlOpts).getDevices();
183
+ }
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "ios",
8
8
  "simctl"
9
9
  ],
10
- "version": "8.0.1",
10
+ "version": "8.0.3",
11
11
  "author": "Appium Contributors",
12
12
  "license": "Apache-2.0",
13
13
  "repository": {
@@ -1,6 +0,0 @@
1
- /**
2
- * @param {import('@appium/types').StringRecord} [simctlOpts]
3
- * @returns {Promise<any[]>}
4
- */
5
- export function getDevices(simctlOpts?: import("@appium/types").StringRecord): Promise<any[]>;
6
- //# sourceMappingURL=device-utils.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"device-utils.d.ts","sourceRoot":"","sources":["../../lib/device-utils.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wCAHW,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,GAAG,EAAE,CAAC,CAI1B"}
@@ -1,12 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getDevices = getDevices;
4
- const node_simctl_1 = require("node-simctl");
5
- /**
6
- * @param {import('@appium/types').StringRecord} [simctlOpts]
7
- * @returns {Promise<any[]>}
8
- */
9
- async function getDevices(simctlOpts) {
10
- return await new node_simctl_1.Simctl(simctlOpts).getDevices();
11
- }
12
- //# sourceMappingURL=device-utils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"device-utils.js","sourceRoot":"","sources":["../../lib/device-utils.js"],"names":[],"mappings":";;AAMA,gCAEC;AARD,6CAAqC;AAErC;;;GAGG;AACI,KAAK,UAAU,UAAU,CAAC,UAAU;IACzC,OAAO,MAAM,IAAI,oBAAM,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,CAAC;AACnD,CAAC"}
@@ -1,9 +0,0 @@
1
- import { Simctl } from 'node-simctl';
2
-
3
- /**
4
- * @param {import('@appium/types').StringRecord} [simctlOpts]
5
- * @returns {Promise<any[]>}
6
- */
7
- export async function getDevices(simctlOpts) {
8
- return await new Simctl(simctlOpts).getDevices();
9
- }