appium-xcuitest-driver 7.24.8 → 7.24.9

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 (7) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/commands/context.d.ts.map +1 -1
  3. package/build/lib/commands/context.js +53 -34
  4. package/build/lib/commands/context.js.map +1 -1
  5. package/lib/commands/context.js +51 -36
  6. package/npm-shrinkwrap.json +30 -8
  7. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [7.24.9](https://github.com/appium/appium-xcuitest-driver/compare/v7.24.8...v7.24.9) (2024-08-01)
2
+
3
+ ### Bug Fixes
4
+
5
+ * Streamline page selection ([#2440](https://github.com/appium/appium-xcuitest-driver/issues/2440)) ([2564829](https://github.com/appium/appium-xcuitest-driver/commit/2564829b05aa4a1d784b65ddb4b3792734320489))
6
+
1
7
  ## [7.24.8](https://github.com/appium/appium-xcuitest-driver/compare/v7.24.7...v7.24.8) (2024-08-01)
2
8
 
3
9
  ### Bug Fixes
package/build/lib/commands/context.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";IAybE;;;OAGG;IAEH,sEAHa,OAAO,CAAC,MAAM,CAAC,CAQ3B;IAED;;;;;;;;OAQG;IACH,oEANW,MAAM,GAAC,OAAO,aACd,GAAG,yCAGD,OAAO,CAAC,IAAI,CAAC,CA6FzB;IACD;;;OAGG;IACH,gEAFa,OAAO,CAAC,MAAM,EAAE,GAAC,WAAW,EAAE,CAAC,CAiB3C;IAED;;;;;OAKG;IACH,mEAJW,MAAM,yCAEJ,OAAO,CAAC,IAAI,CAAC,CASzB;IACD;;;OAGG;IAEH,oEAHa,OAAO,CAAC,MAAM,CAAC,CAY3B;IACD;;;OAGG;IACH,qEAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAoB7B;IArmBD;;;;OAIG;IACH,sGAFa,OAAO,CAAC,OAAO,SAAS,EAAE,WAAW,CAAC,OAAO,UAAU,CAAC,EAAE,CAAC,CAevE;IAED;;;;;;OAMG;IACH,iEAFa,OAAO,CAInB;IAED;;;OAGG;IACH,0EAFa,OAAO,CAAC,IAAI,CAAC,CAiBzB;IACD;;;OAGG;IACH,oFAFa,OAAO,CAAC,OAAO,UAAU,EAAE,IAAI,EAAE,CAAC,CA4B9C;IACD;;;OAGG;IACH,4EAFa,OAAO,CAAC,IAAI,CAAC,CAuBzB;IAED;;;;;;;;;;;;;;OAcG;IACH,6GAHa,OAAO,CAAC,OAAO,EAAE,CAAC,CAmC9B;IACD;;;;OAIG;IACH,wFAHW,OAAO,SAAS,EAAE,sBAAsB,GACtC,OAAO,CAAC,IAAI,CAAC,CA2JzB;IAID;;;OAGG;IACH,yGAFa,OAAO,CAAC,IAAI,CAAC,CAczB;IACD;;;OAGG;IACH,sEAFW,MAAM,GAAC,SAAS,GAAC,IAAI,QAI/B;IACD;;;OAGG;IACH,kEAFa,MAAM,GAAC,SAAS,GAAC,IAAI,CAIjC;IACD;;;;;OAKG;IACH,0FALW,MAAM,aACN,MAAM,GAEJ,OAAO,CAAC,MAAM,GAAC,SAAS,CAAC,CAuBrC;IACD;;;OAGG;IACH,iEAFa,OAAO,CAInB;IACD;;;OAGG;IACH,8DAFa,OAAO,CAInB;IACD;;;OAGG;IACH,yEAFa,OAAO,CAAC,cAAc,CAAC,CA8BnC;;;6BAmMU,OAAO,WAAW,EAAE,cAAc;sBAClC,OAAO,SAAS,EAAE,OAAO;0BACzB,OAAO,SAAS,EAAE,WAAW;AApnB1C,uCAAgC;+BANmB,wBAAwB"}
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";IAuaE;;;OAGG;IAEH,sEAHa,OAAO,CAAC,MAAM,CAAC,CAQ3B;IAED;;;;;;;;OAQG;IACH,oEANW,MAAM,GAAC,OAAO,aACd,GAAG,yCAGD,OAAO,CAAC,IAAI,CAAC,CA6FzB;IACD;;;OAGG;IACH,gEAFa,OAAO,CAAC,MAAM,EAAE,GAAC,WAAW,EAAE,CAAC,CAiB3C;IAED;;;;;OAKG;IACH,mEAJW,MAAM,yCAEJ,OAAO,CAAC,IAAI,CAAC,CASzB;IACD;;;OAGG;IAEH,oEAHa,OAAO,CAAC,MAAM,CAAC,CAY3B;IACD;;;OAGG;IACH,qEAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAoB7B;IAnlBD;;;;OAIG;IACH,sGAFa,OAAO,CAAC,OAAO,SAAS,EAAE,WAAW,CAAC,OAAO,UAAU,CAAC,EAAE,CAAC,CAevE;IAED;;;;;;OAMG;IACH,iEAFa,OAAO,CAInB;IAED;;;OAGG;IACH,0EAFa,OAAO,CAAC,IAAI,CAAC,CAiBzB;IACD;;;OAGG;IACH,oFAFa,OAAO,CAAC,OAAO,UAAU,EAAE,IAAI,EAAE,CAAC,CA4B9C;IACD;;;OAGG;IACH,4EAFa,OAAO,CAAC,IAAI,CAAC,CAuBzB;IAED;;;;;;;;;;;;;;OAcG;IACH,6GAHa,OAAO,CAAC,OAAO,EAAE,CAAC,CAmC9B;IACD;;;;OAIG;IACH,wFAHW,OAAO,SAAS,EAAE,sBAAsB,GACtC,OAAO,CAAC,IAAI,CAAC,CAyIzB;IAID;;;OAGG;IACH,yGAFa,OAAO,CAAC,IAAI,CAAC,CAczB;IACD;;;OAGG;IACH,sEAFW,MAAM,GAAC,SAAS,GAAC,IAAI,QAI/B;IACD;;;OAGG;IACH,kEAFa,MAAM,GAAC,SAAS,GAAC,IAAI,CAIjC;IACD;;;;;OAKG;IACH,0FALW,MAAM,aACN,MAAM,GAEJ,OAAO,CAAC,MAAM,GAAC,SAAS,CAAC,CAuBrC;IACD;;;OAGG;IACH,iEAFa,OAAO,CAInB;IACD;;;OAGG;IACH,8DAFa,OAAO,CAInB;IACD;;;OAGG;IACH,yEAFa,OAAO,CAAC,cAAc,CAAC,CA8BnC;;;6BAoOU,OAAO,WAAW,EAAE,cAAc;sBAClC,OAAO,SAAS,EAAE,OAAO;0BACzB,OAAO,SAAS,EAAE,WAAW;AAnoB1C,uCAAgC;+BANmB,wBAAwB"}
package/build/lib/commands/context.js CHANGED
@@ -158,38 +158,17 @@ const extensions = {
158
158
  this.log.debug('We are in the middle of selecting a page, ignoring');
159
159
  return;
160
160
  }
161
- if (!this.remote || !this.remote.isConnected) {
161
+ if (!this.remote?.isConnected) {
162
162
  this.log.debug('We have not yet connected, ignoring');
163
163
  return;
164
164
  }
165
165
  const { appIdKey, pageArray } = pageChangeNotification;
166
- let newIds = [];
167
- let newPages = [];
166
+ /** @type {string[]} */
167
+ const newIds = [];
168
+ /** @type {string[]} */
169
+ const newPages = [];
170
+ /** @type {string|null} */
168
171
  let keyId = null;
169
- // Checks if a URL is blacklisted in the 'safariIgnoreWebHostnames' capability
170
- function isUrlIgnored(url, safariIgnoreWebHostnames) {
171
- const ignoredHosts = (safariIgnoreWebHostnames || '')
172
- .split(',')
173
- .map((b) => b.trim())
174
- .filter((b) => !lodash_1.default.isEmpty(b));
175
- for (const ignoredHost of ignoredHosts) {
176
- if (ignoredHost === 'about:blank' && url === 'about:blank') {
177
- return true;
178
- }
179
- else {
180
- try {
181
- const hostname = new URL(url).hostname;
182
- if (hostname === ignoredHost) {
183
- return true;
184
- }
185
- }
186
- catch (ign) {
187
- // do nothing if invalid URL
188
- }
189
- }
190
- }
191
- return false;
192
- }
193
172
  for (const page of pageArray) {
194
173
  const id = page.id.toString();
195
174
  newIds.push(id);
@@ -224,9 +203,10 @@ const extensions = {
224
203
  this.log.debug('Page change not referring to currently selected app, ignoring.');
225
204
  return;
226
205
  }
206
+ /** @type {string|null} */
227
207
  let newPage = null;
228
208
  if (newPages.length) {
229
- newPage = lodash_1.default.last(newPages);
209
+ newPage = /** @type {string} */ (lodash_1.default.last(newPages));
230
210
  this.log.debug(`We have new pages, selecting page '${newPage}'`);
231
211
  }
232
212
  else if (!lodash_1.default.includes(newIds, curPageIdKey)) {
@@ -274,12 +254,18 @@ const extensions = {
274
254
  const oldContext = this.curContext;
275
255
  this.curContext = `${appIdKey}.${newPage}`;
276
256
  // do not wait, as this can take a long time, and the response is not necessary
277
- // eslint-disable-next-line promise/prefer-await-to-callbacks, promise/prefer-await-to-then
278
- this.remote.selectPage(appIdKey, parseInt(newPage, 10)).catch((err) => {
279
- this.log.warn(`Failed to select page: ${err.message}`);
280
- this.curContext = oldContext;
281
- });
282
- this.selectingNewPage = false;
257
+ (async () => {
258
+ try {
259
+ await /** @type {RemoteDebugger} */ (this.remote).selectPage(appIdKey, parseInt(newPage, 10));
260
+ }
261
+ catch (e) {
262
+ this.log.warn(`Failed to select page: ${e.message}`);
263
+ this.curContext = oldContext;
264
+ }
265
+ finally {
266
+ this.selectingNewPage = false;
267
+ }
268
+ })();
283
269
  }
284
270
  this.windowHandleCache = pageArray;
285
271
  },
@@ -543,6 +529,39 @@ const commands = {
543
529
  */ (context.view.id).toString()));
544
530
  },
545
531
  };
532
+ /**
533
+ * Checks if a URL is blacklisted in the 'safariIgnoreWebHostnames' capability
534
+ *
535
+ * @param {string} url
536
+ * @param {string} [safariIgnoreWebHostnames]
537
+ * @returns {boolean}
538
+ */
539
+ function isUrlIgnored(url, safariIgnoreWebHostnames) {
540
+ if (!safariIgnoreWebHostnames || lodash_1.default.isEmpty(safariIgnoreWebHostnames)) {
541
+ return false;
542
+ }
543
+ const ignoredHosts = safariIgnoreWebHostnames
544
+ .split(',')
545
+ .map((b) => b.trim())
546
+ .filter((b) => !lodash_1.default.isEmpty(b));
547
+ for (const ignoredHost of ignoredHosts) {
548
+ if (ignoredHost === 'about:blank' && url === 'about:blank') {
549
+ return true;
550
+ }
551
+ else {
552
+ try {
553
+ const hostname = new URL(url).hostname;
554
+ if (hostname === ignoredHost) {
555
+ return true;
556
+ }
557
+ }
558
+ catch (ign) {
559
+ // do nothing if invalid URL
560
+ }
561
+ }
562
+ }
563
+ return false;
564
+ }
546
565
  exports.default = { ...helpers, ...extensions, ...commands };
547
566
  /**
548
567
  * @typedef {import('../driver').XCUITestDriver} XCUITestDriver
package/build/lib/commands/context.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
package/lib/commands/context.js CHANGED
@@ -183,40 +183,19 @@ const extensions = {
183
183
  this.log.debug('We are in the middle of selecting a page, ignoring');
184
184
  return;
185
185
  }
186
- if (!this.remote || !this.remote.isConnected) {
186
+ if (!this.remote?.isConnected) {
187
187
  this.log.debug('We have not yet connected, ignoring');
188
188
  return;
189
189
  }
190
190
 
191
191
  const {appIdKey, pageArray} = pageChangeNotification;
192
192
 
193
- let newIds = [];
194
- let newPages = [];
193
+ /** @type {string[]} */
194
+ const newIds = [];
195
+ /** @type {string[]} */
196
+ const newPages = [];
197
+ /** @type {string|null} */
195
198
  let keyId = null;
196
-
197
- // Checks if a URL is blacklisted in the 'safariIgnoreWebHostnames' capability
198
- function isUrlIgnored(url, safariIgnoreWebHostnames) {
199
- const ignoredHosts = (safariIgnoreWebHostnames || '')
200
- .split(',')
201
- .map((b) => b.trim())
202
- .filter((b) => !_.isEmpty(b));
203
- for (const ignoredHost of ignoredHosts) {
204
- if (ignoredHost === 'about:blank' && url === 'about:blank') {
205
- return true;
206
- } else {
207
- try {
208
- const hostname = new URL(url).hostname;
209
- if (hostname === ignoredHost) {
210
- return true;
211
- }
212
- } catch (ign) {
213
- // do nothing if invalid URL
214
- }
215
- }
216
- }
217
- return false;
218
- }
219
-
220
199
  for (const page of pageArray) {
221
200
  const id = page.id.toString();
222
201
  newIds.push(id);
@@ -250,17 +229,16 @@ const extensions = {
250
229
  this.log.debug('We do not appear to have window set yet, ignoring');
251
230
  return;
252
231
  }
253
-
254
232
  const [curAppIdKey, curPageIdKey] = this.curContext.split('.');
255
-
256
233
  if (curAppIdKey !== appIdKey) {
257
234
  this.log.debug('Page change not referring to currently selected app, ignoring.');
258
235
  return;
259
236
  }
260
237
 
238
+ /** @type {string|null} */
261
239
  let newPage = null;
262
240
  if (newPages.length) {
263
- newPage = _.last(newPages);
241
+ newPage = /** @type {string} */ (_.last(newPages));
264
242
  this.log.debug(`We have new pages, selecting page '${newPage}'`);
265
243
  } else if (!_.includes(newIds, curPageIdKey)) {
266
244
  this.log.debug(
@@ -318,12 +296,16 @@ const extensions = {
318
296
  const oldContext = this.curContext;
319
297
  this.curContext = `${appIdKey}.${newPage}`;
320
298
  // do not wait, as this can take a long time, and the response is not necessary
321
- // eslint-disable-next-line promise/prefer-await-to-callbacks, promise/prefer-await-to-then
322
- this.remote.selectPage(appIdKey, parseInt(newPage, 10)).catch((err) => {
323
- this.log.warn(`Failed to select page: ${err.message}`);
324
- this.curContext = oldContext;
325
- });
326
- this.selectingNewPage = false;
299
+ (async () => {
300
+ try {
301
+ await /** @type {RemoteDebugger} */ (this.remote).selectPage(appIdKey, parseInt(newPage, 10));
302
+ } catch (e) {
303
+ this.log.warn(`Failed to select page: ${e.message}`);
304
+ this.curContext = oldContext;
305
+ } finally {
306
+ this.selectingNewPage = false;
307
+ }
308
+ })();
327
309
  }
328
310
  this.windowHandleCache = pageArray;
329
311
  },
@@ -627,6 +609,39 @@ const commands = {
627
609
  },
628
610
  };
629
611
 
612
+ /**
613
+ * Checks if a URL is blacklisted in the 'safariIgnoreWebHostnames' capability
614
+ *
615
+ * @param {string} url
616
+ * @param {string} [safariIgnoreWebHostnames]
617
+ * @returns {boolean}
618
+ */
619
+ function isUrlIgnored(url, safariIgnoreWebHostnames) {
620
+ if (!safariIgnoreWebHostnames || _.isEmpty(safariIgnoreWebHostnames)) {
621
+ return false;
622
+ }
623
+
624
+ const ignoredHosts = safariIgnoreWebHostnames
625
+ .split(',')
626
+ .map((b) => b.trim())
627
+ .filter((b) => !_.isEmpty(b));
628
+ for (const ignoredHost of ignoredHosts) {
629
+ if (ignoredHost === 'about:blank' && url === 'about:blank') {
630
+ return true;
631
+ } else {
632
+ try {
633
+ const hostname = new URL(url).hostname;
634
+ if (hostname === ignoredHost) {
635
+ return true;
636
+ }
637
+ } catch (ign) {
638
+ // do nothing if invalid URL
639
+ }
640
+ }
641
+ }
642
+ return false;
643
+ }
644
+
630
645
  export default {...helpers, ...extensions, ...commands};
631
646
 
632
647
  /**
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "appium-xcuitest-driver",
3
- "version": "7.24.8",
3
+ "version": "7.24.9",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-xcuitest-driver",
9
- "version": "7.24.8",
9
+ "version": "7.24.9",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "@colors/colors": "^1.6.0",
@@ -119,6 +119,17 @@
119
119
  "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==",
120
120
  "license": "MIT"
121
121
  },
122
+ "node_modules/@appium/base-driver/node_modules/axios": {
123
+ "version": "1.7.2",
124
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
125
+ "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
126
+ "license": "MIT",
127
+ "dependencies": {
128
+ "follow-redirects": "^1.15.6",
129
+ "form-data": "^4.0.0",
130
+ "proxy-from-env": "^1.1.0"
131
+ }
132
+ },
122
133
  "node_modules/@appium/base-driver/node_modules/lru-cache": {
123
134
  "version": "10.3.0",
124
135
  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
@@ -333,6 +344,17 @@
333
344
  "sharp": "0.33.4"
334
345
  }
335
346
  },
347
+ "node_modules/@appium/support/node_modules/axios": {
348
+ "version": "1.7.2",
349
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
350
+ "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
351
+ "license": "MIT",
352
+ "dependencies": {
353
+ "follow-redirects": "^1.15.6",
354
+ "form-data": "^4.0.0",
355
+ "proxy-from-env": "^1.1.0"
356
+ }
357
+ },
336
358
  "node_modules/@appium/support/node_modules/semver": {
337
359
  "version": "7.6.2",
338
360
  "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
@@ -1098,9 +1120,9 @@
1098
1120
  }
1099
1121
  },
1100
1122
  "node_modules/appium-xcode": {
1101
- "version": "5.2.17",
1102
- "resolved": "https://registry.npmjs.org/appium-xcode/-/appium-xcode-5.2.17.tgz",
1103
- "integrity": "sha512-9pxQNGw5MZFJs9yfdjCFrIe+2DEaMEupMz5/DXzGffVGod315pTKpSDe2HJZaPpH/ztRtlrxmg67rccS6GzbNw==",
1123
+ "version": "5.2.18",
1124
+ "resolved": "https://registry.npmjs.org/appium-xcode/-/appium-xcode-5.2.18.tgz",
1125
+ "integrity": "sha512-d38wD91Mg1NaRVGjoxA6M2q/gwScP1eRBKX+KH0QW7v3y2Vcp33AoQCHbsbyYqWgba1QG8bO0x7nYVe59bttLg==",
1104
1126
  "license": "Apache-2.0",
1105
1127
  "dependencies": {
1106
1128
  "@appium/support": "^5.0.3",
@@ -1207,9 +1229,9 @@
1207
1229
  "license": "MIT"
1208
1230
  },
1209
1231
  "node_modules/axios": {
1210
- "version": "1.7.2",
1211
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
1212
- "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
1232
+ "version": "1.7.3",
1233
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
1234
+ "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
1213
1235
  "license": "MIT",
1214
1236
  "dependencies": {
1215
1237
  "follow-redirects": "^1.15.6",
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "xcuitest",
9
9
  "xctest"
10
10
  ],
11
- "version": "7.24.8",
11
+ "version": "7.24.9",
12
12
  "author": "Appium Contributors",
13
13
  "license": "Apache-2.0",
14
14
  "repository": {