appium-xcuitest-driver 10.4.0 → 10.4.2

package/lib/real-device-management.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import {buildSafariPreferences} from './app-utils';
-import {utilities} from 'appium-ios-device';
+import { getConnectedDevices } from './real-device';
 
 const DEFAULT_APP_INSTALLATION_TIMEOUT_MS = 8 * 60 * 1000;
 
@@ -114,11 +114,11 @@ export function applySafariStartupArgs() {
  */
 export async function detectUdid() {
   this.log.debug('Auto-detecting real device udid...');
-  const udids = await utilities.getConnectedDevices();
+  const udids = await getConnectedDevices();
   if (_.isEmpty(udids)) {
     throw new Error('No real devices are connected to the host');
   }
-  const udid = _.last(udids);
+  const udid = udids[udids.length - 1];
   if (udids.length > 1) {
     this.log.info(`Multiple devices found: ${udids.join(', ')}`);
     this.log.info(`Choosing '${udid}'. Consider settings the 'udid' capability if another device must be selected`);

package/lib/real-device.js

@@ -16,6 +16,11 @@ const INSTALLATION_STAGING_DIR = 'PublicStaging';
  * @returns {Promise<string[]>}
  */
 export async function getConnectedDevices() {
+  if (['yes', 'true', '1'].includes(_.toLower(process.env.APPIUM_XCUITEST_PREFER_DEVICECTL))) {
+    return (await new Devicectl('').listDevices())
+      .map(({hardwareProperties}) => hardwareProperties?.udid)
+      .filter(Boolean);
+  }
   return await utilities.getConnectedDevices();
 }
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "10.4.0",
+  "version": "10.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "10.4.0",
+      "version": "10.4.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/strongbox": "^1.0.0-rc.1",
@@ -27,7 +27,7 @@
         "lru-cache": "^11.1.0",
         "moment": "^2.29.4",
         "moment-timezone": "^0.x",
-        "node-devicectl": "^1.0.1",
+        "node-devicectl": "^1.1.0",
         "node-simctl": "^8.0.0",
         "portscanner": "^2.2.0",
         "semver": "^7.5.4",
@@ -666,9 +666,9 @@
       }
     },
     "node_modules/appium-ios-remotexpc": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/appium-ios-remotexpc/-/appium-ios-remotexpc-0.10.0.tgz",
-      "integrity": "sha512-dSLG+TecmCUhy6wkr5H/rXgB3q1k52MsTKffAh6EKtLqe3PxoXJoXFkirLQYA4BH+kmq96aE60522cjHmhuRYg==",
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/appium-ios-remotexpc/-/appium-ios-remotexpc-0.10.1.tgz",
+      "integrity": "sha512-SK1ttF2j/EuEqtJwMBxUYQIUyAqLJEDyZPrXW7t5EXsc0b88buCcBcakBvpl5gXf1SVnGmO3upQRwu2/blU6/g==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
@@ -2985,9 +2985,9 @@
       }
     },
     "node_modules/node-devicectl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/node-devicectl/-/node-devicectl-1.0.1.tgz",
-      "integrity": "sha512-x1h3FBgiCI6bhUWvUKWhPfEajc36+2NmHJU1X1l648MZCFDnyMrwHvvI1/zLmRN8MTpheyjshovL2cKX/sBxmA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/node-devicectl/-/node-devicectl-1.1.0.tgz",
+      "integrity": "sha512-dK+ZNyPchi+hTUmSKJv1YlcJ9czzVNWFd+/mzCtmU/xzum2DWOmPI09hhNuAqF/ZUR83pjh4S8iLfzxYsVLb9g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/logger": "^2.0.0-rc.1",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "10.4.0",
+  "version": "10.4.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -98,7 +98,7 @@
     "lru-cache": "^11.1.0",
     "moment": "^2.29.4",
     "moment-timezone": "^0.x",
-    "node-devicectl": "^1.0.1",
+    "node-devicectl": "^1.1.0",
     "node-simctl": "^8.0.0",
     "portscanner": "^2.2.0",
     "semver": "^7.5.4",

package/build/lib/cookies.d.ts

@@ -1,15 +0,0 @@
-declare namespace _default {
-    export { createJSCookie };
-    export { createJWPCookie };
-    export { getValue };
-    export { expireCookie };
-}
-export default _default;
-export function createJSCookie(key: any, value: any, options?: {}): string;
-export function createJWPCookie(key: any, cookieString: any, converter?: null): {
-    name: any;
-    value: any;
-};
-export function getValue(key: any, cookieString: any, converter?: null): any;
-export function expireCookie(key: any, options: any): string;
-//# sourceMappingURL=cookies.d.ts.map

package/build/lib/cookies.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../lib/cookies.js"],"names":[],"mappings":";;;;;;;AAiCA,2EAUC;AAGD;;;EAoBC;AAGD,6EAKC;AAID,6DASC"}

package/build/lib/cookies.js

@@ -1,84 +0,0 @@
-"use strict";
-/*
- * derived from jQuery Cookie Plugin v1.4.1
- * https://github.com/carhartl/jquery-cookie
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createJSCookie = createJSCookie;
-exports.createJWPCookie = createJWPCookie;
-exports.getValue = getValue;
-exports.expireCookie = expireCookie;
-// needed to communicate/translate between JSONWire cookies and regular JavaScript cookies
-const lodash_1 = __importDefault(require("lodash"));
-const support_1 = require("appium/support");
-const log = support_1.logger.getLogger('Cookie');
-// parses the value if needed and converts the value if a converter is provided
-// internal function, not exported
-function convertCookie(value, converter) {
-    if (value.indexOf('"') === 0) {
-        // this is a quoted cookied according to RFC2068
-        // remove enclosing quotes and internal quotes and backslashes
-        value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-    }
-    let parsedValue;
-    try {
-        parsedValue = decodeURIComponent(value.replace(/\+/g, ' '));
-    }
-    catch (e) {
-        // no need to fail if we can't decode
-        log.warn(e);
-    }
-    return converter ? converter(parsedValue) : parsedValue;
-}
-// takes arguments given and creates a JavaScript Cookie
-function createJSCookie(key, value, options = {}) {
-    return [
-        encodeURIComponent(key),
-        '=',
-        value,
-        options.expires ? `; expires=${options.expires}` : '',
-        options.path ? `; path=${options.path}` : '',
-        options.domain ? `; domain=${options.domain}` : '',
-        options.secure ? '; secure' : '',
-    ].join('');
-}
-// takes the JavaScript cookieString and translates it into a JSONWire formatted cookie
-function createJWPCookie(key, cookieString, converter = null) {
-    let result = {};
-    let cookies = cookieString ? cookieString.split('; ') : [];
-    for (let cookie of cookies) {
-        let parts = cookie.split('=');
-        // get the first and second element as name and value
-        let name = decodeURIComponent(parts.shift());
-        let val = parts[0];
-        // if name is key, this is the central element of the cookie, so add as `name`
-        // otherwise it is an optional element
-        if (key && key === name) {
-            result.name = key;
-            result.value = convertCookie(val, converter);
-        }
-        else {
-            result[name] = convertCookie(val, converter);
-        }
-    }
-    return result;
-}
-// takes a JavaScript cookiestring and parses it for the value given the key
-function getValue(key, cookieString, converter = null) {
-    let result = createJWPCookie(key, cookieString, converter);
-    // if `key` is undefined we want the entire cookie
-    return lodash_1.default.isUndefined(key) ? result : result.value;
-}
-// returns a cookie that expires on 01 Jan 1970
-// assign the returned cookie to an existing cookie to delete that cookie
-function expireCookie(key, options) {
-    // override `expires` in `options`, and then make the cookie
-    return createJSCookie(key, '', lodash_1.default.assign({}, options, {
-        expires: 'Thu, 01 Jan 1970 00:00:00 GMT',
-    }));
-}
-exports.default = { createJSCookie, createJWPCookie, getValue, expireCookie };
-//# sourceMappingURL=cookies.js.map

package/build/lib/cookies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../lib/cookies.js"],"names":[],"mappings":"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"}

package/lib/cookies.js

@@ -1,92 +0,0 @@
-/*
- * derived from jQuery Cookie Plugin v1.4.1
- * https://github.com/carhartl/jquery-cookie
- */
-
-// needed to communicate/translate between JSONWire cookies and regular JavaScript cookies
-
-import _ from 'lodash';
-import {logger} from 'appium/support';
-
-const log = logger.getLogger('Cookie');
-
-// parses the value if needed and converts the value if a converter is provided
-// internal function, not exported
-function convertCookie(value, converter) {
-  if (value.indexOf('"') === 0) {
-    // this is a quoted cookied according to RFC2068
-    // remove enclosing quotes and internal quotes and backslashes
-    value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-  }
-
-  let parsedValue;
-  try {
-    parsedValue = decodeURIComponent(value.replace(/\+/g, ' '));
-  } catch (e) {
-    // no need to fail if we can't decode
-    log.warn(e);
-  }
-
-  return converter ? converter(parsedValue) : parsedValue;
-}
-
-// takes arguments given and creates a JavaScript Cookie
-function createJSCookie(key, value, options = {}) {
-  return [
-    encodeURIComponent(key),
-    '=',
-    value,
-    options.expires ? `; expires=${options.expires}` : '',
-    options.path ? `; path=${options.path}` : '',
-    options.domain ? `; domain=${options.domain}` : '',
-    options.secure ? '; secure' : '',
-  ].join('');
-}
-
-// takes the JavaScript cookieString and translates it into a JSONWire formatted cookie
-function createJWPCookie(key, cookieString, converter = null) {
-  let result = {};
-  let cookies = cookieString ? cookieString.split('; ') : [];
-  for (let cookie of cookies) {
-    let parts = cookie.split('=');
-
-    // get the first and second element as name and value
-    let name = decodeURIComponent(parts.shift());
-    let val = parts[0];
-
-    // if name is key, this is the central element of the cookie, so add as `name`
-    // otherwise it is an optional element
-    if (key && key === name) {
-      result.name = key;
-      result.value = convertCookie(val, converter);
-    } else {
-      result[name] = convertCookie(val, converter);
-    }
-  }
-  return result;
-}
-
-// takes a JavaScript cookiestring and parses it for the value given the key
-function getValue(key, cookieString, converter = null) {
-  let result = createJWPCookie(key, cookieString, converter);
-
-  // if `key` is undefined we want the entire cookie
-  return _.isUndefined(key) ? result : result.value;
-}
-
-// returns a cookie that expires on 01 Jan 1970
-// assign the returned cookie to an existing cookie to delete that cookie
-function expireCookie(key, options) {
-  // override `expires` in `options`, and then make the cookie
-  return createJSCookie(
-    key,
-    '',
-    _.assign({}, options, {
-      expires: 'Thu, 01 Jan 1970 00:00:00 GMT',
-    }),
-  );
-}
-
-// export individually and also (as default) as an object
-export {createJSCookie, createJWPCookie, getValue, expireCookie};
-export default {createJSCookie, createJWPCookie, getValue, expireCookie};