@corellium/corellium-cli 1.2.0 → 1.2.1

package/src/commands/projects/list.js

@@ -9,9 +9,9 @@ async function builder (yargs) {
     describe: 'Console will receive verbose error output'
   }).option('format', {
     type: 'input',
-    describe: 'Output format (default is table) e.g. json',
+    describe: 'Output format (default is json) e.g. table',
     string: true,
-    choices: ['json', 'csv']
+    choices: ['table', 'json', 'csv']
   })
 }
 
@@ -29,5 +29,6 @@ module.exports = {
   builder,
   handler,
   command: 'list',
+  aliases: ['ls'],
   describe: 'List projects'
 }

package/src/commands/webplayer/create.js

@@ -40,9 +40,9 @@ async function builder (yargs) {
     validateNonEmpty
   }).option('format', {
     type: 'input',
-    describe: 'Output format (default is json)',
+    describe: 'Output format (default is json) e.g. table',
     string: true,
-    choices: ['json', 'csv']
+    choices: ['table', 'json', 'csv']
   })
 }
 

package/src/commands/webplayer/list.js

@@ -21,9 +21,9 @@ async function builder (yargs) {
     string: true
   }).option('format', {
     type: 'input',
-    describe: 'Output format (default is table) e.g. json',
+    describe: 'Output format (default is json) e.g. table',
     string: true,
-    choices: ['json', 'csv']
+    choices: ['table', 'json', 'csv']
   })
 }
 

package/src/error.js

@@ -12,18 +12,24 @@ function getUserErrorMessage (body) {
   }
   return ''
 }
+
 function getErrorMessage (error) {
-  return (error.body && error.body.error)
-    ? `${error.body.error} ${getUserErrorMessage(error.body)}`
-    : (error.error && error.error.message)
-        ? error.error.message
-        : error
+  const { body, response, error: errorObject } = error
+  if (body && body.error) {
+    return `${body.error} ${getUserErrorMessage(body)}`
+  } else if (response && response.data && response.data.error) {
+    return `${response.data.error} ${getUserErrorMessage(response.data)}`
+  } else if (errorObject && errorObject.message) {
+    return errorObject.message
+  } else {
+    return error.message
+  }
 }
 
 function handleError (error, customMessage, detailed) {
   const errorMessage = getErrorMessage(error)
   console.error(`${customMessage}: ${errorMessage}`)
-  if (detailed) { log.error(error) }
+  if (detailed) { log.error(JSON.stringify(error.body || error.response?.data || error.message, null, 2)) }
   process.exit(1)
 }
 

package/src/table.js

@@ -1,7 +1,7 @@
 const { table } = require('table')
 const log = require('./logging')
 
-async function displayTable (format, data, filteredFields, columnWidths) {
+async function displayTable (format = 'json', data, filteredFields, columnWidths) {
   if (format === 'json') {
     const displayJson = JSON.stringify(data, null, 2)
     log.plain(displayJson)

package/src/utils.js

@@ -1,4 +1,3 @@
-const generator = require('generate-password')
 const CorelliumClient = require('@corellium/client-api')
 const {
   readProfile,
@@ -11,43 +10,6 @@ const https = require('https')
 
 const waitForIntervalMilliSec = 5000
 
-const planOptions = (planId) => {
-  let usageBased = false
-  let cores, licenseType
-  let m = /^(individual)-cloud-(\d+)-device(?:-(\d+)-month){0,1}$/.exec(planId)
-  if (m) {
-    licenseType = m[1]
-    const devicesStr = m[2]
-    cores = parseInt(devicesStr) * 2
-  } else if (m = /^(enterprise|standard)-cloud-(\d+)-core(?:-(\d+)-month){0,1}$/.exec(planId)) { /* eslint-disable-line no-cond-assign */
-    licenseType = m[1]
-    const coresStr = m[2]
-    cores = parseInt(coresStr)
-  } else if (m = /^(enterprise|individual)-cloud-usage-based$/.exec(planId)) { /* eslint-disable-line no-cond-assign */
-    usageBased = true
-    if (m[1] === 'enterprise') {
-      licenseType = 'enterprise-usage'
-      cores = 200
-    } else if (m[1] === 'individual') {
-      licenseType = 'individual-usage'
-      cores = 100
-    }
-  }
-  return {
-    licenseType: /** @type {LicenseType} */ (licenseType),
-    cores,
-    usageBased
-  }
-}
-
-const makePassword = () => {
-  return generator.generate({
-    length: 15,
-    numbers: true,
-    excludeSimilarCharacters: true
-  })
-}
-
 const sleep = (milliseconds) => {
   return new Promise((resolve) => setTimeout(resolve, milliseconds))
 }
@@ -63,6 +25,24 @@ const waitForState = async (instanceId, fn, state, attempts = 20, reporterFn = n
   }
 }
 
+const waitForAgentReady = async (agent, attempts = 20) => {
+  while (attempts > 0) {
+    try {
+      const status = await agent.ready()
+      if (status.ready) {
+        return // Agent is ready, exit the function
+      }
+    } catch (error) {
+      // We don't need to log any errors
+    }
+    // Wait before retrying
+    await sleep(waitForIntervalMilliSec)
+    attempts--
+  }
+  // If max attempts reached and agent is still not ready, throw an error
+  throw new Error('Agent did not become ready within the specified number of attempts.')
+}
+
 const waitForTaskState = async (instanceId, fn, taskState, attempts = 20) => {
   let response = await fn(instanceId)
 
@@ -162,10 +142,9 @@ async function reRequestInsecure (endpoint) {
 const validateNonEmpty = (input) => input !== ''
 
 module.exports = {
-  planOptions,
-  makePassword,
   waitForState,
   waitForTaskState,
+  waitForAgentReady,
   getApi,
   getAxios,
   validateNonEmpty,

package/node_modules/@babel/cli/LICENSE

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/node_modules/@babel/cli/README.md

@@ -1,19 +0,0 @@
-# @babel/cli
-
-> Babel command line.
-
-See our website [@babel/cli](https://babeljs.io/docs/en/babel-cli) for more information or the [issues](https://github.com/babel/babel/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22pkg%3A%20cli%22+is%3Aopen) associated with this package.
-
-## Install
-
-Using npm:
-
-```sh
-npm install --save-dev @babel/cli
-```
-
-or using yarn:
-
-```sh
-yarn add @babel/cli --dev
-```

package/node_modules/@babel/cli/bin/babel-external-helpers.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../lib/babel-external-helpers");

package/node_modules/@babel/cli/bin/babel.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../lib/babel");

package/node_modules/@babel/cli/index.js

@@ -1 +0,0 @@
-throw new Error("Use the `@babel/core` package instead of `@babel/cli`.");

package/node_modules/@babel/cli/lib/babel/dir.js

@@ -1,285 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-function _slash() {
-  const data = require("slash");
-
-  _slash = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _path() {
-  const data = require("path");
-
-  _path = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _fs() {
-  const data = require("fs");
-
-  _fs = function () {
-    return data;
-  };
-
-  return data;
-}
-
-var util = require("./util");
-
-var watcher = require("./watcher");
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-const FILE_TYPE = Object.freeze({
-  NON_COMPILABLE: "NON_COMPILABLE",
-  COMPILED: "COMPILED",
-  IGNORED: "IGNORED",
-  ERR_COMPILATION: "ERR_COMPILATION"
-});
-
-function outputFileSync(filePath, data) {
-  (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "10.12") ? _fs().mkdirSync : require("make-dir").sync)(_path().dirname(filePath), {
-    recursive: true
-  });
-
-  _fs().writeFileSync(filePath, data);
-}
-
-function _default(_x) {
-  return _ref.apply(this, arguments);
-}
-
-function _ref() {
-  _ref = _asyncToGenerator(function* ({
-    cliOptions,
-    babelOptions
-  }) {
-    function write(_x2, _x3) {
-      return _write.apply(this, arguments);
-    }
-
-    function _write() {
-      _write = _asyncToGenerator(function* (src, base) {
-        let relative = _path().relative(base, src);
-
-        if (!util.isCompilableExtension(relative, cliOptions.extensions)) {
-          return FILE_TYPE.NON_COMPILABLE;
-        }
-
-        relative = util.withExtension(relative, cliOptions.keepFileExtension ? _path().extname(relative) : cliOptions.outFileExtension);
-        const dest = getDest(relative, base);
-
-        try {
-          const res = yield util.compile(src, Object.assign({}, babelOptions, {
-            sourceFileName: _slash()(_path().relative(dest + "/..", src))
-          }));
-          if (!res) return FILE_TYPE.IGNORED;
-
-          if (res.map && babelOptions.sourceMaps && babelOptions.sourceMaps !== "inline") {
-            const mapLoc = dest + ".map";
-            res.code = util.addSourceMappingUrl(res.code, mapLoc);
-            res.map.file = _path().basename(relative);
-            outputFileSync(mapLoc, JSON.stringify(res.map));
-          }
-
-          outputFileSync(dest, res.code);
-          util.chmod(src, dest);
-
-          if (cliOptions.verbose) {
-            console.log(_path().relative(process.cwd(), src) + " -> " + dest);
-          }
-
-          return FILE_TYPE.COMPILED;
-        } catch (err) {
-          if (cliOptions.watch) {
-            console.error(err);
-            return FILE_TYPE.ERR_COMPILATION;
-          }
-
-          throw err;
-        }
-      });
-      return _write.apply(this, arguments);
-    }
-
-    function getDest(filename, base) {
-      if (cliOptions.relative) {
-        return _path().join(base, cliOptions.outDir, filename);
-      }
-
-      return _path().join(cliOptions.outDir, filename);
-    }
-
-    function handleFile(_x4, _x5) {
-      return _handleFile.apply(this, arguments);
-    }
-
-    function _handleFile() {
-      _handleFile = _asyncToGenerator(function* (src, base) {
-        const written = yield write(src, base);
-
-        if (cliOptions.copyFiles && written === FILE_TYPE.NON_COMPILABLE || cliOptions.copyIgnored && written === FILE_TYPE.IGNORED) {
-          const filename = _path().relative(base, src);
-
-          const dest = getDest(filename, base);
-          outputFileSync(dest, _fs().readFileSync(src));
-          util.chmod(src, dest);
-        }
-
-        return written === FILE_TYPE.COMPILED;
-      });
-      return _handleFile.apply(this, arguments);
-    }
-
-    function handle(_x6) {
-      return _handle.apply(this, arguments);
-    }
-
-    function _handle() {
-      _handle = _asyncToGenerator(function* (filenameOrDir) {
-        if (!_fs().existsSync(filenameOrDir)) return 0;
-
-        const stat = _fs().statSync(filenameOrDir);
-
-        if (stat.isDirectory()) {
-          const dirname = filenameOrDir;
-          let count = 0;
-          const files = util.readdir(dirname, cliOptions.includeDotfiles);
-
-          for (const filename of files) {
-            const src = _path().join(dirname, filename);
-
-            const written = yield handleFile(src, dirname);
-            if (written) count += 1;
-          }
-
-          return count;
-        } else {
-          const filename = filenameOrDir;
-          const written = yield handleFile(filename, _path().dirname(filename));
-          return written ? 1 : 0;
-        }
-      });
-      return _handle.apply(this, arguments);
-    }
-
-    let compiledFiles = 0;
-    let startTime = null;
-    const logSuccess = util.debounce(function () {
-      if (startTime === null) {
-        return;
-      }
-
-      const diff = process.hrtime(startTime);
-      console.log(`Successfully compiled ${compiledFiles} ${compiledFiles !== 1 ? "files" : "file"} with Babel (${diff[0] * 1e3 + Math.round(diff[1] / 1e6)}ms).`);
-      compiledFiles = 0;
-      startTime = null;
-    }, 100);
-    if (cliOptions.watch) watcher.enable({
-      enableGlobbing: true
-    });
-
-    if (!cliOptions.skipInitialBuild) {
-      if (cliOptions.deleteDirOnStart) {
-        util.deleteDir(cliOptions.outDir);
-      }
-
-      (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "10.12") ? _fs().mkdirSync : require("make-dir").sync)(cliOptions.outDir, {
-        recursive: true
-      });
-      startTime = process.hrtime();
-
-      for (const filename of cliOptions.filenames) {
-        compiledFiles += yield handle(filename);
-      }
-
-      if (!cliOptions.quiet) {
-        logSuccess();
-        logSuccess.flush();
-      }
-    }
-
-    if (cliOptions.watch) {
-      let processing = 0;
-      const {
-        filenames
-      } = cliOptions;
-      let getBase;
-
-      if (filenames.length === 1) {
-        const base = filenames[0];
-
-        const absoluteBase = _path().resolve(base);
-
-        getBase = filename => {
-          return filename === absoluteBase ? _path().dirname(base) : base;
-        };
-      } else {
-        const filenameToBaseMap = new Map(filenames.map(filename => {
-          const absoluteFilename = _path().resolve(filename);
-
-          return [absoluteFilename, _path().dirname(filename)];
-        }));
-        const absoluteFilenames = new Map(filenames.map(filename => {
-          const absoluteFilename = _path().resolve(filename);
-
-          return [absoluteFilename, filename];
-        }));
-
-        const {
-          sep
-        } = _path();
-
-        getBase = filename => {
-          const base = filenameToBaseMap.get(filename);
-
-          if (base !== undefined) {
-            return base;
-          }
-
-          for (const [absoluteFilenameOrDir, relative] of absoluteFilenames) {
-            if (filename.startsWith(absoluteFilenameOrDir + sep)) {
-              filenameToBaseMap.set(filename, relative);
-              return relative;
-            }
-          }
-
-          return "";
-        };
-      }
-
-      filenames.forEach(filenameOrDir => {
-        watcher.watch(filenameOrDir);
-      });
-      watcher.startWatcher();
-      watcher.onFilesChange(_asyncToGenerator(function* (filenames) {
-        processing++;
-        if (startTime === null) startTime = process.hrtime();
-
-        try {
-          const written = yield Promise.all(filenames.map(filename => handleFile(filename, getBase(filename))));
-          compiledFiles += written.filter(Boolean).length;
-        } catch (err) {
-          console.error(err);
-        }
-
-        processing--;
-        if (processing === 0 && !cliOptions.quiet) logSuccess();
-      }));
-    }
-  });
-  return _ref.apply(this, arguments);
-}