node-simctl - npm Package Compare versions

Comparing version 3.5.1 to 3.5.2

build/lib/simctl.js

@@ -5,2 +5,4 @@ 'use strict';
 
+var _slicedToArray = require('babel-runtime/helpers/sliced-to-array')['default'];
+
 var _regeneratorRuntime = require('babel-runtime/regenerator')['default'];
@@ -271,2 +273,5 @@
   var logErrors = arguments.length <= 2 || arguments[2] === undefined ? true : arguments[2];
+
+  var _ref, stdout;
+
   return _regeneratorRuntime.async(function getAppContainer$(context$1$0) {
@@ -276,8 +281,10 @@ while (1) switch (context$1$0.prev = context$1$0.next) {
         context$1$0.next = 2;
-        return _regeneratorRuntime.awrap(simExec('get_app_container', 0, [udid, bundleId], {}, logErrors).stdout.trim());
+        return _regeneratorRuntime.awrap(simExec('get_app_container', 0, [udid, bundleId], {}, logErrors));
 
       case 2:
-        return context$1$0.abrupt('return', context$1$0.sent);
+        _ref = context$1$0.sent;
+        stdout = _ref.stdout;
+        return context$1$0.abrupt('return', (stdout || '').trim());
 
-      case 3:
+      case 5:
       case 'end':
@@ -531,10 +538,8 @@ return context$1$0.stop();
 
-function getDevices() {
-  var forSdk = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
-
-  var _ref,
+function getDevicesByParsing() {
+  var _ref2,
   // get the list of devices
   stdout, deviceSectionRe, matches, match, devices, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _iterator3, _step3, sdk, _iteratorNormalCompletion4, _didIteratorError4, _iteratorError4, _iterator4, _step4, line, lineRe, lineMatch;
 
-  return _regeneratorRuntime.async(function getDevices$(context$1$0) {
+  return _regeneratorRuntime.async(function getDevicesByParsing$(context$1$0) {
     while (1) switch (context$1$0.prev = context$1$0.next) {
@@ -546,4 +551,4 @@ case 0:
       case 2:
-        _ref = context$1$0.sent;
-        stdout = _ref.stdout;
+        _ref2 = context$1$0.sent;
+        stdout = _ref2.stdout;
         deviceSectionRe = /-- iOS (.+) --(\n    .+)*/mg;
@@ -693,4 +698,132 @@ matches = [];
       case 65:
+        return context$1$0.abrupt('return', devices);
+
+      case 66:
+      case 'end':
+        return context$1$0.stop();
+    }
+  }, null, this, [[13, 53, 57, 65], [22, 36, 40, 48], [41,, 43, 47], [58,, 60, 64]]);
+}
+
+function getDevices() {
+  var forSdk = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
+
+  var devices, _ref3, stdout, _iteratorNormalCompletion5, _didIteratorError5, _iteratorError5, _iterator5, _step5, _step5$value, sdkName, entries, sdk;
+
+  return _regeneratorRuntime.async(function getDevices$(context$1$0) {
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        devices = undefined;
+        context$1$0.prev = 1;
+        context$1$0.next = 4;
+        return _regeneratorRuntime.awrap(simExec('list', 0, ['devices', '-j']));
+
+      case 4:
+        _ref3 = context$1$0.sent;
+        stdout = _ref3.stdout;
+
+        /* JSON should be
+         * {
+         *   "devices" : {
+         *     "iOS <sdk>" : [
+         *       {
+         *         "state" : "Booted",
+         *         "availability" : "(available)",
+         *         "name" : "iPhone 6",
+         *         "udid" : "75E34140-18E8-4D1A-9F45-AAC735DF75DF"
+         *       }
+         *     ]
+         *   }
+         * }
+         */
+        devices = {};
+        _iteratorNormalCompletion5 = true;
+        _didIteratorError5 = false;
+        _iteratorError5 = undefined;
+        context$1$0.prev = 10;
+        _iterator5 = _getIterator(_lodash2['default'].toPairs(JSON.parse(stdout).devices));
+
+      case 12:
+        if (_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done) {
+          context$1$0.next = 23;
+          break;
+        }
+
+        _step5$value = _slicedToArray(_step5.value, 2);
+        sdkName = _step5$value[0];
+        entries = _step5$value[1];
+
+        if (!(sdkName.indexOf('iOS') !== 0)) {
+          context$1$0.next = 18;
+          break;
+        }
+
+        return context$1$0.abrupt('continue', 20);
+
+      case 18:
+        sdk = sdkName.replace('iOS ', '');
+
+        devices[sdk] = entries.map(function (el) {
+          delete el.availability;
+          return el;
+        });
+
+      case 20:
+        _iteratorNormalCompletion5 = true;
+        context$1$0.next = 12;
+        break;
+
+      case 23:
+        context$1$0.next = 29;
+        break;
+
+      case 25:
+        context$1$0.prev = 25;
+        context$1$0.t0 = context$1$0['catch'](10);
+        _didIteratorError5 = true;
+        _iteratorError5 = context$1$0.t0;
+
+      case 29:
+        context$1$0.prev = 29;
+        context$1$0.prev = 30;
+
+        if (!_iteratorNormalCompletion5 && _iterator5['return']) {
+          _iterator5['return']();
+        }
+
+      case 32:
+        context$1$0.prev = 32;
+
+        if (!_didIteratorError5) {
+          context$1$0.next = 35;
+          break;
+        }
+
+        throw _iteratorError5;
+
+      case 35:
+        return context$1$0.finish(32);
+
+      case 36:
+        return context$1$0.finish(29);
+
+      case 37:
+        context$1$0.next = 46;
+        break;
+
+      case 39:
+        context$1$0.prev = 39;
+        context$1$0.t1 = context$1$0['catch'](1);
+
+        console.log(context$1$0.t1);
+        log.debug('Unable to get JSON device list. Falling back to manually parsing');
+        context$1$0.next = 45;
+        return _regeneratorRuntime.awrap(getDevicesByParsing());
+
+      case 45:
+        devices = context$1$0.sent;
+
+      case 46:
         if (!forSdk) {
-          context$1$0.next = 69;
+          context$1$0.next = 50;
           break;
@@ -700,3 +833,3 @@ }
         if (devices[forSdk]) {
-          context$1$0.next = 68;
+          context$1$0.next = 49;
           break;
@@ -707,13 +840,13 @@ }
 
-      case 68:
+      case 49:
         return context$1$0.abrupt('return', devices[forSdk]);
 
-      case 69:
+      case 50:
         return context$1$0.abrupt('return', devices);
 
-      case 70:
+      case 51:
       case 'end':
         return context$1$0.stop();
     }
-  }, null, this, [[13, 53, 57, 65], [22, 36, 40, 48], [41,, 43, 47], [58,, 60, 64]]);
+  }, null, this, [[1, 39], [10, 25, 29, 37], [30,, 32, 36]]);
 }
@@ -766,3 +899,3 @@
 
-// otherwise return all the sdk -> device mappings.
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/simctl.js"],"names":[],"mappings":"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","file":"lib/simctl.js","sourcesContent":["import { exec, SubProcess } from 'teen_process';\nimport { retryInterval } from 'asyncbox';\nimport { getLogger } from 'appium-logger';\nimport _ from 'lodash';\n\n\nconst log = getLogger('simctl');\n\nasync function simCommand (command:string, timeout:number, args:Array = [], env = {}, executingFunction = exec, logErrors = true) {\n  // run a particular simctl command\n  args = ['simctl', command, ...args];\n  // Prefix all passed in environment variables with 'SIMCTL_CHILD_', simctl\n  // will then pass these to the child (spawned) process.\n  env = _.defaults(_.mapKeys(env, function(value, key) {\n    return `SIMCTL_CHILD_${key}`;\n  }), process.env);\n\n  try {\n    return await executingFunction('xcrun', args, {timeout, env});\n  } catch (e) {\n    if (!logErrors) {\n      // if we don't want to see the errors, just throw and allow the calling\n      // code do what it wants\n      throw e;\n    } else if (e.stderr) {\n      log.errorAndThrow(`simctl error running '${command}': ${e.stderr.trim()}`);\n    } else {\n      log.errorAndThrow(e);\n    }\n  }\n}\n\nasync function simExec (command:string, timeout:number, args:Array = [], env = {}, logErrors = true) {\n  return await simCommand(command, timeout, args, env, async (c, a, ob) => {\n    return await exec(c, a, ob);\n  }, logErrors);\n}\n\nasync function simSubProcess (command:string, timeout:number, args:Array = [], env = {}) {\n  return await simCommand(command, timeout, args, env, async (c, a, ob) => {\n    return new SubProcess(c, a, ob);\n  });\n}\n\nasync function installApp (udid:string, appPath:string):void {\n  await simExec('install', 0, [udid, appPath]);\n}\n\nasync function removeApp (udid:string, bundleId:string):void {\n  await simExec('uninstall', 0, [udid, bundleId]);\n}\n\nasync function launch (udid:string, bundleId:string, tries:int = 5):void {\n  await retryInterval(tries, 1000, async () => {\n    await simExec('launch', 0, [udid, bundleId]);\n  });\n}\n\nasync function spawn (udid:string, executablePath:string, env = {}):void {\n  return await simExec('spawn', 0, [udid, executablePath], env);\n}\n\nasync function spawnSubProcess (udid:string, executablePath:string, env = {}):void {\n  return await simSubProcess('spawn', 0, [udid, executablePath], env);\n}\n\nasync function openUrl (udid:string, url:string):void {\n  return await simExec('openurl', 0, [udid, url]);\n}\n\nasync function terminate (udid:string, bundleId:string):void {\n  await simExec('terminate', 0, [udid, bundleId]);\n}\n\nasync function getAppContainer (udid:string, bundleId:string, logErrors = true) {\n  return await simExec('get_app_container', 0, [udid, bundleId], {}, logErrors).stdout.trim();\n}\n\nasync function shutdown (udid:string):void {\n  await simExec('shutdown', 0, [udid]);\n}\n\nasync function createDevice (name:string, deviceTypeId:string,\n    runtimeId:string, timeout:int = 10000):void {\n  let udid;\n  try {\n    let out = await simExec('create', 0, [name, deviceTypeId, runtimeId]);\n    udid = out.stdout.trim();\n  } catch (e) {\n    if (e.stderr) {\n      log.errorAndThrow(`Could not create simulator. Reason: ${e.stderr.trim()}`);\n    } else {\n      log.errorAndThrow(e);\n    }\n\n  }\n\n  // make sure that it gets out of the \"Creating\" state\n  let retries = parseInt(timeout / 1000, 10);\n  await retryInterval(retries, 1000, async () => {\n    let devices = await getDevices();\n    for (let deviceArr of _.values(devices)) {\n      for (let device of deviceArr) {\n        if (device.udid === udid) {\n          if (device.state === 'Creating') {\n            // need to retry\n            throw new Error('Device still being created');\n          } else {\n            // stop looking, we're done\n            return;\n          }\n        }\n      }\n    }\n  });\n\n  return udid;\n}\n\nasync function deleteDevice (udid:string):void {\n  await simExec('delete', 0, [udid]);\n}\n\nasync function eraseDevice (udid:string, timeout:int = 1000):void {\n  let loopFn:Function = async () => {\n    await simExec('erase', 10000, [udid]);\n  };\n  // retry erase with a sleep in between because it's flakey\n  let retries = parseInt(timeout / 200, 10);\n  await retryInterval(retries, 200, loopFn);\n}\n\nasync function getDevices (forSdk:string = null):Object {\n  // get the list of devices\n  let {stdout} = await simExec('list', 0, ['devices']);\n\n  // expect to get a listing like\n  // -- iOS 8.1 --\n  //     iPhone 4s (3CA6E7DD-220E-45E5-B716-1E992B3A429C) (Shutdown)\n  //     ...\n  // -- iOS 8.2 --\n  //     iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n  //     ...\n  // so, get the `-- iOS X.X --` line to find the sdk (X.X)\n  // and the rest of the listing in order to later find the devices\n  let deviceSectionRe:RegExp = /-- iOS (.+) --(\\n    .+)*/mg;\n  let matches:Array = [];\n  let match:Object = deviceSectionRe.exec(stdout);\n\n  // make an entry for each sdk version\n  while (match !== null) {\n    matches.push(match);\n    match = deviceSectionRe.exec(stdout);\n  }\n  if (matches.length < 1) {\n    log.errorAndThrow('Could not find device section');\n  }\n\n  // get all the devices for each sdk\n  let devices:Object = {};\n  for (match of matches) {\n    let sdk:string = match[1];\n    devices[sdk] = [];\n    // split the full match into lines and remove the first\n    for (let line:string of match[0].split('\\n').slice(1)) {\n      // a line is something like\n      //    iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n      // retrieve:\n      //   iPhone 4s\n      //   A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E\n      //   Shutdown\n      let lineRe:RegExp = /([^\\s].+) \\((\\w+-.+\\w+)\\) \\((\\w+\\s?\\w+)\\)/; // https://regex101.com/r/lG7mK6/3\n      let lineMatch:Object = lineRe.exec(line);\n      if (lineMatch === null) {\n        throw new Error(`Could not match line: ${line}`);\n      }\n      // save the whole thing as ab object in the list for this sdk\n\n      devices[sdk].push({\n        name: lineMatch[1],\n        udid: lineMatch[2],\n        state: lineMatch[3],\n        sdk,\n      });\n    }\n  }\n\n  // if a `forSdk` was passed in, return only the corresponding list\n  if (forSdk) {\n    if (!devices[forSdk]) {\n      throw new Error(`Sdk '${forSdk}' was not in list of simctl sdks`);\n    }\n    return devices[forSdk];\n  }\n\n  // otherwise return all the sdk -> device mappings.\n  return devices;\n}\n\nexport { installApp, removeApp, launch, spawn, spawnSubProcess, openUrl, terminate, shutdown, createDevice,\n         getAppContainer, deleteDevice, eraseDevice, getDevices };\n"],"sourceRoot":"../.."}
+// otherwise return everything
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/simctl.js"],"names":[],"mappings":"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","file":"lib/simctl.js","sourcesContent":["import { exec, SubProcess } from 'teen_process';\nimport { retryInterval } from 'asyncbox';\nimport { getLogger } from 'appium-logger';\nimport _ from 'lodash';\n\n\nconst log = getLogger('simctl');\n\nasync function simCommand (command:string, timeout:number, args:Array = [], env = {}, executingFunction = exec, logErrors = true) {\n  // run a particular simctl command\n  args = ['simctl', command, ...args];\n  // Prefix all passed in environment variables with 'SIMCTL_CHILD_', simctl\n  // will then pass these to the child (spawned) process.\n  env = _.defaults(_.mapKeys(env, function(value, key) {\n    return `SIMCTL_CHILD_${key}`;\n  }), process.env);\n\n  try {\n    return await executingFunction('xcrun', args, {timeout, env});\n  } catch (e) {\n    if (!logErrors) {\n      // if we don't want to see the errors, just throw and allow the calling\n      // code do what it wants\n      throw e;\n    } else if (e.stderr) {\n      log.errorAndThrow(`simctl error running '${command}': ${e.stderr.trim()}`);\n    } else {\n      log.errorAndThrow(e);\n    }\n  }\n}\n\nasync function simExec (command:string, timeout:number, args:Array = [], env = {}, logErrors = true) {\n  return await simCommand(command, timeout, args, env, async (c, a, ob) => {\n    return await exec(c, a, ob);\n  }, logErrors);\n}\n\nasync function simSubProcess (command:string, timeout:number, args:Array = [], env = {}) {\n  return await simCommand(command, timeout, args, env, async (c, a, ob) => {\n    return new SubProcess(c, a, ob);\n  });\n}\n\nasync function installApp (udid:string, appPath:string):void {\n  await simExec('install', 0, [udid, appPath]);\n}\n\nasync function removeApp (udid:string, bundleId:string):void {\n  await simExec('uninstall', 0, [udid, bundleId]);\n}\n\nasync function launch (udid:string, bundleId:string, tries:int = 5):void {\n  await retryInterval(tries, 1000, async () => {\n    await simExec('launch', 0, [udid, bundleId]);\n  });\n}\n\nasync function spawn (udid:string, executablePath:string, env = {}):void {\n  return await simExec('spawn', 0, [udid, executablePath], env);\n}\n\nasync function spawnSubProcess (udid:string, executablePath:string, env = {}):void {\n  return await simSubProcess('spawn', 0, [udid, executablePath], env);\n}\n\nasync function openUrl (udid:string, url:string):void {\n  return await simExec('openurl', 0, [udid, url]);\n}\n\nasync function terminate (udid:string, bundleId:string):void {\n  await simExec('terminate', 0, [udid, bundleId]);\n}\n\nasync function getAppContainer (udid:string, bundleId:string, logErrors = true) {\n  let {stdout} = await simExec('get_app_container', 0, [udid, bundleId], {}, logErrors);\n  return (stdout || '').trim();\n}\n\nasync function shutdown (udid:string):void {\n  await simExec('shutdown', 0, [udid]);\n}\n\nasync function createDevice (name:string, deviceTypeId:string,\n    runtimeId:string, timeout:int = 10000):void {\n  let udid;\n  try {\n    let out = await simExec('create', 0, [name, deviceTypeId, runtimeId]);\n    udid = out.stdout.trim();\n  } catch (e) {\n    if (e.stderr) {\n      log.errorAndThrow(`Could not create simulator. Reason: ${e.stderr.trim()}`);\n    } else {\n      log.errorAndThrow(e);\n    }\n\n  }\n\n  // make sure that it gets out of the \"Creating\" state\n  let retries = parseInt(timeout / 1000, 10);\n  await retryInterval(retries, 1000, async () => {\n    let devices = await getDevices();\n    for (let deviceArr of _.values(devices)) {\n      for (let device of deviceArr) {\n        if (device.udid === udid) {\n          if (device.state === 'Creating') {\n            // need to retry\n            throw new Error('Device still being created');\n          } else {\n            // stop looking, we're done\n            return;\n          }\n        }\n      }\n    }\n  });\n\n  return udid;\n}\n\nasync function deleteDevice (udid:string):void {\n  await simExec('delete', 0, [udid]);\n}\n\nasync function eraseDevice (udid:string, timeout:int = 1000):void {\n  let loopFn:Function = async () => {\n    await simExec('erase', 10000, [udid]);\n  };\n  // retry erase with a sleep in between because it's flakey\n  let retries = parseInt(timeout / 200, 10);\n  await retryInterval(retries, 200, loopFn);\n}\n\nasync function getDevicesByParsing ():Object {\n  // get the list of devices\n  let {stdout} = await simExec('list', 0, ['devices']);\n\n  // expect to get a listing like\n  // -- iOS 8.1 --\n  //     iPhone 4s (3CA6E7DD-220E-45E5-B716-1E992B3A429C) (Shutdown)\n  //     ...\n  // -- iOS 8.2 --\n  //     iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n  //     ...\n  // so, get the `-- iOS X.X --` line to find the sdk (X.X)\n  // and the rest of the listing in order to later find the devices\n  let deviceSectionRe:RegExp = /-- iOS (.+) --(\\n    .+)*/mg;\n  let matches:Array = [];\n  let match:Object = deviceSectionRe.exec(stdout);\n\n  // make an entry for each sdk version\n  while (match !== null) {\n    matches.push(match);\n    match = deviceSectionRe.exec(stdout);\n  }\n  if (matches.length < 1) {\n    log.errorAndThrow('Could not find device section');\n  }\n\n  // get all the devices for each sdk\n  let devices:Object = {};\n  for (match of matches) {\n    let sdk:string = match[1];\n    devices[sdk] = [];\n    // split the full match into lines and remove the first\n    for (let line:string of match[0].split('\\n').slice(1)) {\n      // a line is something like\n      //    iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n      // retrieve:\n      //   iPhone 4s\n      //   A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E\n      //   Shutdown\n      let lineRe:RegExp = /([^\\s].+) \\((\\w+-.+\\w+)\\) \\((\\w+\\s?\\w+)\\)/; // https://regex101.com/r/lG7mK6/3\n      let lineMatch:Object = lineRe.exec(line);\n      if (lineMatch === null) {\n        throw new Error(`Could not match line: ${line}`);\n      }\n      // save the whole thing as ab object in the list for this sdk\n\n      devices[sdk].push({\n        name: lineMatch[1],\n        udid: lineMatch[2],\n        state: lineMatch[3],\n        sdk,\n      });\n    }\n  }\n\n  return devices;\n}\n\nasync function getDevices (forSdk:string = null):Object {\n  let devices:Object;\n  try {\n    let {stdout} = await simExec('list', 0, ['devices', '-j']);\n    /* JSON should be\n     * {\n     *   \"devices\" : {\n     *     \"iOS <sdk>\" : [\n     *       {\n     *         \"state\" : \"Booted\",\n     *         \"availability\" : \"(available)\",\n     *         \"name\" : \"iPhone 6\",\n     *         \"udid\" : \"75E34140-18E8-4D1A-9F45-AAC735DF75DF\"\n     *       }\n     *     ]\n     *   }\n     * }\n     */\n    devices = {};\n    for (let [sdkName, entries]  of _.toPairs(JSON.parse(stdout).devices)) {\n      if (sdkName.indexOf('iOS') !== 0) {\n        continue;\n      }\n      let sdk = sdkName.replace('iOS ', '');\n      devices[sdk] = entries.map((el) => {\n        delete el.availability;\n        return el;\n      });\n    }\n  } catch (err) {\n    console.log(err);\n    log.debug('Unable to get JSON device list. Falling back to manually parsing');\n    devices = await getDevicesByParsing();\n  }\n\n  // if a `forSdk` was passed in, return only the corresponding list\n  if (forSdk) {\n    if (!devices[forSdk]) {\n      throw new Error(`Sdk '${forSdk}' was not in list of simctl sdks`);\n    }\n    return devices[forSdk];\n  }\n\n  // otherwise return everything\n  return devices;\n}\n\nexport { installApp, removeApp, launch, spawn, spawnSubProcess, openUrl, terminate, shutdown, createDevice,\n         getAppContainer, deleteDevice, eraseDevice, getDevices };\n"],"sourceRoot":"../.."}

lib/simctl.js

@@ -76,3 +76,4 @@ import { exec, SubProcess } from 'teen_process';
 async function getAppContainer (udid:string, bundleId:string, logErrors = true) {
-  return await simExec('get_app_container', 0, [udid, bundleId], {}, logErrors).stdout.trim();
+  let {stdout} = await simExec('get_app_container', 0, [udid, bundleId], {}, logErrors);
+  return (stdout || '').trim();
 }
@@ -134,3 +135,3 @@
 
-async function getDevices (forSdk:string = null):Object {
+async function getDevicesByParsing ():Object {
   // get the list of devices
@@ -190,2 +191,40 @@ let {stdout} = await simExec('list', 0, ['devices']);
 
+  return devices;
+}
+
+async function getDevices (forSdk:string = null):Object {
+  let devices:Object;
+  try {
+    let {stdout} = await simExec('list', 0, ['devices', '-j']);
+    /* JSON should be
+     * {
+     *   "devices" : {
+     *     "iOS <sdk>" : [
+     *       {
+     *         "state" : "Booted",
+     *         "availability" : "(available)",
+     *         "name" : "iPhone 6",
+     *         "udid" : "75E34140-18E8-4D1A-9F45-AAC735DF75DF"
+     *       }
+     *     ]
+     *   }
+     * }
+     */
+    devices = {};
+    for (let [sdkName, entries]  of _.toPairs(JSON.parse(stdout).devices)) {
+      if (sdkName.indexOf('iOS') !== 0) {
+        continue;
+      }
+      let sdk = sdkName.replace('iOS ', '');
+      devices[sdk] = entries.map((el) => {
+        delete el.availability;
+        return el;
+      });
+    }
+  } catch (err) {
+    console.log(err);
+    log.debug('Unable to get JSON device list. Falling back to manually parsing');
+    devices = await getDevicesByParsing();
+  }
+
   // if a `forSdk` was passed in, return only the corresponding list
@@ -199,3 +238,3 @@ if (forSdk) {
 
-  // otherwise return all the sdk -> device mappings.
+  // otherwise return everything
   return devices;
@@ -202,0 +241,0 @@ }

package.json

@@ -9,3 +9,3 @@ {
   ],
-  "version": "3.5.1",
+  "version": "3.5.2",
   "author": "https://github.com/appium",
@@ -12,0 +12,0 @@ "license": "Apache-2.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

78519

increased by9.67%

Lines of code

1323

increased by12.79%

No dependency changes