@corellium/corellium-cli 1.0.4 → 1.0.7

package/node_modules/yargs/package.json

@@ -1,57 +1,41 @@
 {
-  "name": "yargs",
-  "version": "17.5.1",
-  "description": "yargs the modern, pirate-themed, successor to optimist.",
-  "main": "./index.cjs",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": [
-      {
-        "import": "./index.mjs",
-        "require": "./index.cjs"
-      },
-      "./index.cjs"
-    ],
-    "./helpers": {
-      "import": "./helpers/helpers.mjs",
-      "require": "./helpers/index.js"
-    },
-    "./browser": {
-      "import": "./browser.mjs",
-      "types": "./browser.d.ts"
-    },
-    "./yargs": [
-      {
-        "import": "./yargs.mjs",
-        "require": "./yargs"
-      },
-      "./yargs"
+  "_args": [
+    [
+      "yargs@17.5.1",
+      "/Users/haydenbleasel/GitHub/corellium-cli"
     ]
+  ],
+  "_from": "yargs@17.5.1",
+  "_id": "yargs@17.5.1",
+  "_inBundle": false,
+  "_integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+  "_location": "/yargs",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "yargs@17.5.1",
+    "name": "yargs",
+    "escapedName": "yargs",
+    "rawSpec": "17.5.1",
+    "saveSpec": null,
+    "fetchSpec": "17.5.1"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+  "_spec": "17.5.1",
+  "_where": "/Users/haydenbleasel/GitHub/corellium-cli",
+  "bugs": {
+    "url": "https://github.com/yargs/yargs/issues"
   },
-  "type": "module",
-  "module": "./index.mjs",
   "contributors": [
     {
       "name": "Yargs Contributors",
       "url": "https://github.com/yargs/yargs/graphs/contributors"
     }
   ],
-  "files": [
-    "browser.mjs",
-    "browser.d.ts",
-    "index.cjs",
-    "helpers/*.js",
-    "helpers/*",
-    "index.mjs",
-    "yargs",
-    "yargs.mjs",
-    "build",
-    "locales",
-    "LICENSE",
-    "lib/platform-shims/*.mjs",
-    "!*.d.ts",
-    "!**/*.d.ts"
-  ],
   "dependencies": {
     "cliui": "^7.0.2",
     "escalade": "^3.1.1",
@@ -61,6 +45,7 @@
     "y18n": "^5.0.5",
     "yargs-parser": "^21.0.0"
   },
+  "description": "yargs the modern, pirate-themed, successor to optimist.",
   "devDependencies": {
     "@types/chai": "^4.2.11",
     "@types/mocha": "^9.0.0",
@@ -85,27 +70,50 @@
     "which": "^2.0.0",
     "yargs-test-extends": "^1.0.1"
   },
-  "scripts": {
-    "fix": "gts fix && npm run fix:js",
-    "fix:js": "eslint . --ext cjs --ext mjs --ext js --fix",
-    "posttest": "npm run check",
-    "test": "c8 mocha --enable-source-maps ./test/*.cjs --require ./test/before.cjs --timeout=12000 --check-leaks",
-    "test:esm": "c8 mocha --enable-source-maps ./test/esm/*.mjs --check-leaks",
-    "coverage": "c8 report --check-coverage",
-    "prepare": "npm run compile",
-    "pretest": "npm run compile -- -p tsconfig.test.json && cross-env NODE_ENV=test npm run build:cjs",
-    "compile": "rimraf build && tsc",
-    "postcompile": "npm run build:cjs",
-    "build:cjs": "rollup -c rollup.config.cjs",
-    "postbuild:cjs": "rimraf ./build/index.cjs.d.ts",
-    "check": "gts lint && npm run check:js",
-    "check:js": "eslint . --ext cjs --ext mjs --ext js",
-    "clean": "gts clean"
+  "engines": {
+    "node": ">=12"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/yargs/yargs.git"
+  "exports": {
+    "./package.json": "./package.json",
+    ".": [
+      {
+        "import": "./index.mjs",
+        "require": "./index.cjs"
+      },
+      "./index.cjs"
+    ],
+    "./helpers": {
+      "import": "./helpers/helpers.mjs",
+      "require": "./helpers/index.js"
+    },
+    "./browser": {
+      "import": "./browser.mjs",
+      "types": "./browser.d.ts"
+    },
+    "./yargs": [
+      {
+        "import": "./yargs.mjs",
+        "require": "./yargs"
+      },
+      "./yargs"
+    ]
   },
+  "files": [
+    "browser.mjs",
+    "browser.d.ts",
+    "index.cjs",
+    "helpers/*.js",
+    "helpers/*",
+    "index.mjs",
+    "yargs",
+    "yargs.mjs",
+    "build",
+    "locales",
+    "LICENSE",
+    "lib/platform-shims/*.mjs",
+    "!*.d.ts",
+    "!**/*.d.ts"
+  ],
   "homepage": "https://yargs.js.org/",
   "keywords": [
     "argument",
@@ -117,11 +125,30 @@
     "command"
   ],
   "license": "MIT",
-  "engines": {
-    "node": ">=12"
-  }
-
-,"_resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"
-,"_integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="
-,"_from": "yargs@17.5.1"
-}
+  "main": "./index.cjs",
+  "module": "./index.mjs",
+  "name": "yargs",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yargs/yargs.git"
+  },
+  "scripts": {
+    "build:cjs": "rollup -c rollup.config.cjs",
+    "check": "gts lint && npm run check:js",
+    "check:js": "eslint . --ext cjs --ext mjs --ext js",
+    "clean": "gts clean",
+    "compile": "rimraf build && tsc",
+    "coverage": "c8 report --check-coverage",
+    "fix": "gts fix && npm run fix:js",
+    "fix:js": "eslint . --ext cjs --ext mjs --ext js --fix",
+    "postbuild:cjs": "rimraf ./build/index.cjs.d.ts",
+    "postcompile": "npm run build:cjs",
+    "posttest": "npm run check",
+    "prepare": "npm run compile",
+    "pretest": "npm run compile -- -p tsconfig.test.json && cross-env NODE_ENV=test npm run build:cjs",
+    "test": "c8 mocha --enable-source-maps ./test/*.cjs --require ./test/before.cjs --timeout=12000 --check-leaks",
+    "test:esm": "c8 mocha --enable-source-maps ./test/esm/*.mjs --check-leaks"
+  },
+  "type": "module",
+  "version": "17.5.1"
+}

package/node_modules/yargs-parser/package.json

@@ -1,52 +1,40 @@
 {
-  "name": "yargs-parser",
-  "version": "21.0.1",
-  "description": "the mighty option parser used by yargs",
-  "main": "build/index.cjs",
-  "exports": {
-    ".": [
-      {
-        "import": "./build/lib/index.js",
-        "require": "./build/index.cjs"
-      },
-      "./build/index.cjs"
+  "_args": [
+    [
+      "yargs-parser@21.0.1",
+      "/Users/haydenbleasel/GitHub/corellium-cli"
     ]
+  ],
+  "_from": "yargs-parser@21.0.1",
+  "_id": "yargs-parser@21.0.1",
+  "_inBundle": false,
+  "_integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+  "_location": "/yargs-parser",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "yargs-parser@21.0.1",
+    "name": "yargs-parser",
+    "escapedName": "yargs-parser",
+    "rawSpec": "21.0.1",
+    "saveSpec": null,
+    "fetchSpec": "21.0.1"
   },
-  "type": "module",
-  "module": "./build/lib/index.js",
-  "scripts": {
-    "check": "standardx '**/*.ts' && standardx '**/*.js' && standardx '**/*.cjs'",
-    "fix": "standardx --fix '**/*.ts' && standardx --fix '**/*.js' && standardx --fix '**/*.cjs'",
-    "pretest": "rimraf build && tsc -p tsconfig.test.json && cross-env NODE_ENV=test npm run build:cjs",
-    "test": "c8 --reporter=text --reporter=html mocha test/*.cjs",
-    "test:esm": "c8 --reporter=text --reporter=html mocha test/*.mjs",
-    "test:browser": "start-server-and-test 'serve ./ -p 8080' http://127.0.0.1:8080/package.json 'node ./test/browser/yargs-test.cjs'",
-    "pretest:typescript": "npm run pretest",
-    "test:typescript": "c8 mocha ./build/test/typescript/*.js",
-    "coverage": "c8 report --check-coverage",
-    "precompile": "rimraf build",
-    "compile": "tsc",
-    "postcompile": "npm run build:cjs",
-    "build:cjs": "rollup -c",
-    "prepare": "npm run compile"
+  "_requiredBy": [
+    "/yargs"
+  ],
+  "_resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+  "_spec": "21.0.1",
+  "_where": "/Users/haydenbleasel/GitHub/corellium-cli",
+  "author": {
+    "name": "Ben Coe",
+    "email": "ben@npmjs.com"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/yargs/yargs-parser.git"
+  "bugs": {
+    "url": "https://github.com/yargs/yargs-parser/issues"
   },
-  "keywords": [
-    "argument",
-    "parser",
-    "yargs",
-    "command",
-    "cli",
-    "parsing",
-    "option",
-    "args",
-    "argument"
-  ],
-  "author": "Ben Coe <ben@npmjs.com>",
-  "license": "ISC",
+  "description": "the mighty option parser used by yargs",
   "devDependencies": {
     "@types/chai": "^4.2.11",
     "@types/mocha": "^9.0.0",
@@ -72,21 +60,64 @@
     "ts-transform-default-export": "^1.0.2",
     "typescript": "^4.0.0"
   },
+  "engines": {
+    "node": ">=12"
+  },
+  "exports": {
+    ".": [
+      {
+        "import": "./build/lib/index.js",
+        "require": "./build/index.cjs"
+      },
+      "./build/index.cjs"
+    ]
+  },
   "files": [
     "browser.js",
     "build",
     "!*.d.ts"
   ],
-  "engines": {
-    "node": ">=12"
+  "homepage": "https://github.com/yargs/yargs-parser#readme",
+  "keywords": [
+    "argument",
+    "parser",
+    "yargs",
+    "command",
+    "cli",
+    "parsing",
+    "option",
+    "args",
+    "argument"
+  ],
+  "license": "ISC",
+  "main": "build/index.cjs",
+  "module": "./build/lib/index.js",
+  "name": "yargs-parser",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yargs/yargs-parser.git"
+  },
+  "scripts": {
+    "build:cjs": "rollup -c",
+    "check": "standardx '**/*.ts' && standardx '**/*.js' && standardx '**/*.cjs'",
+    "compile": "tsc",
+    "coverage": "c8 report --check-coverage",
+    "fix": "standardx --fix '**/*.ts' && standardx --fix '**/*.js' && standardx --fix '**/*.cjs'",
+    "postcompile": "npm run build:cjs",
+    "precompile": "rimraf build",
+    "prepare": "npm run compile",
+    "pretest": "rimraf build && tsc -p tsconfig.test.json && cross-env NODE_ENV=test npm run build:cjs",
+    "pretest:typescript": "npm run pretest",
+    "test": "c8 --reporter=text --reporter=html mocha test/*.cjs",
+    "test:browser": "start-server-and-test 'serve ./ -p 8080' http://127.0.0.1:8080/package.json 'node ./test/browser/yargs-test.cjs'",
+    "test:esm": "c8 --reporter=text --reporter=html mocha test/*.mjs",
+    "test:typescript": "c8 mocha ./build/test/typescript/*.js"
   },
   "standardx": {
     "ignore": [
       "build"
     ]
-  }
-
-,"_resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"
-,"_integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
-,"_from": "yargs-parser@21.0.1"
-}
+  },
+  "type": "module",
+  "version": "21.0.1"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corellium/corellium-cli",
-    "version": "1.0.4",
+    "version": "1.0.7",
     "description": "Corellium CLI Tool",
     "scripts": {
         "corellium-cli": "node index.js",
@@ -30,6 +30,7 @@
         "generate-password": "^1.7.0",
         "multi-progress": "^4.0.0",
         "progress": "^2.0.3",
+        "prompts": "^2.4.2",
         "uuid": "^8.3.2",
         "xhr2": "^0.2.0",
         "yargs": "^17.5.1"

package/src/commands/Client.js

@@ -7,8 +7,8 @@ const { readProfile } = require('../profile')
 class Client {
   constructor (argv) {
     this.argv = Object.assign({}, argv)
-    this.project = argv.project
-    this.instance = argv.instance
+    this.project = argv.project || argv.projectId
+    this.instance = argv.instance || argv.instanceId
     this._profile = readProfile()
   }
 

package/src/commands/agent/apps.js

@@ -5,7 +5,8 @@ const { getErrorMessage } = require('../../error')
 const log = require('../../logging')
 
 async function builder (yargs) {
-  yargs.option('detailed-errors', {
+  yargs.option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   }).option('project', {

package/src/commands/agent/file.js

@@ -5,7 +5,8 @@ const { getErrorMessage } = require('../../error')
 const log = require('../../logging')
 
 async function builder (yargs) {
-  yargs.option('detailed-errors', {
+  yargs.option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   }).option('project', {

package/src/commands/agent/ready.js

@@ -4,7 +4,8 @@ const { getErrorMessage } = require('../../error')
 const log = require('../../logging')
 
 async function builder (yargs) {
-  yargs.option('detailed-errors', {
+  yargs.option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   }).option('project', {

package/src/commands/extensions/delete.js

@@ -7,7 +7,8 @@ async function builder (yargs) {
     type: 'string',
     describe: 'Extension ID (UUID)',
     demandOption: true
-  }).option('detailed-errors', {
+  }).option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   })

package/src/commands/extensions/list.js

@@ -4,7 +4,8 @@ const { displayTable } = require('../../table')
 const { getAxios } = require('../../utils')
 
 async function builder (yargs) {
-  yargs.option('detailed-errors', {
+  yargs.option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   }).option('format', {

package/src/commands/extensions/load.js

@@ -11,7 +11,8 @@ async function builder (yargs) {
     type: 'string',
     describe: 'One or more extension file paths',
     demandOption: true
-  }).option('detailed-errors', {
+  }).option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   })

package/src/commands/extensions/validate.js

@@ -8,7 +8,8 @@ async function builder (yargs) {
     type: 'string',
     describe: 'Path to extension json',
     demandOption: true
-  }).option('detailed-errors', {
+  }).option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   })

package/src/commands/firmware/list.js

@@ -3,7 +3,8 @@ const { displayTable } = require('../../table')
 const { getApi } = require('../../utils')
 
 async function builder (yargs) {
-  yargs.option('detailed-errors', {
+  yargs.option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   }).option('format', {

package/src/commands/firmware/load.js

@@ -11,7 +11,8 @@ async function builder (yargs) {
     type: 'string',
     describe: 'One or more firmware file paths',
     demandOption: true
-  }).option('detailed-errors', {
+  }).option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   })

package/src/commands/images/create.js

@@ -15,7 +15,8 @@ async function builder (yargs) {
       string: true,
       choices: ['json', 'csv']
     })
-    .option('detailed-errors', {
+    .option('verbose', {
+      alias: 'v',
       type: 'boolean',
       describe: 'Console will receive verbose error output'
     })

package/src/commands/images/delete.js

@@ -7,7 +7,8 @@ async function builder (yargs) {
     type: 'string',
     describe: 'Image id',
     demandOption: true
-  }).option('detailed-errors', {
+  }).option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   })

package/src/commands/images/list.js

@@ -4,7 +4,8 @@ const { displayTable } = require('../../table')
 const { getApi } = require('../../utils')
 
 async function builder (yargs) {
-  yargs.option('detailed-errors', {
+  yargs.option('verbose', {
+    alias: 'v',
     type: 'boolean',
     describe: 'Console will receive verbose error output'
   }).option('format', {

package/src/commands/instances/Instance.js

@@ -0,0 +1,27 @@
+const Client = require('../Client')
+
+/**
+ * Instance class
+ */
+class InstanceCLI extends Client {
+  instanceBasePath = () => `v1/instances/${this.instance}`
+
+  /**
+   * Upgrade iOS version on instance
+   * @returns {Promise<any>}
+   */
+  upgrade = async (options) => {
+    const { os, osbuild } = options
+    return await this._fetch('POST', `${this.instanceBasePath()}/upgrade`, { os, osbuild })
+  }
+
+  /**
+   * Fetch instance information
+   * @returns {Promise<any>}
+   */
+  info = async () => {
+    return await this._fetch('GET', `${this.instanceBasePath()}`, {})
+  }
+}
+
+module.exports = InstanceCLI

package/src/commands/instances/create.js

@@ -3,7 +3,8 @@ const { getApi, waitForState } = require('../../utils')
 
 async function builder (yargs) {
   yargs
-    .option('detailed-errors', {
+    .option('verbose', {
+      alias: 'v',
       type: 'boolean',
       describe: 'Console will receive verbose error output'
     })
@@ -28,6 +29,11 @@ async function builder (yargs) {
       describe: 'Project ID to associate with instance',
       demandOption: true
     })
+    .option('name', {
+      type: 'string',
+      describe: 'Optional name of instance',
+      demandOption: false
+    })
     .option('wait', {
       type: 'boolean',
       describe: 'Wait for the instance to be ready',
@@ -39,10 +45,11 @@ async function handler (argv) {
   const flavor = argv.flavor
   const os = argv.os
   const project = argv.project
+  const name = argv.name
   const api = await getApi()
 
   try {
-    const instance = await api.v1CreateInstance({ flavor, os, project })
+    const instance = await api.v1CreateInstance({ flavor, os, project, name })
     // Wait 360 attempts for the instance to be created (30 minutes)
     if (argv.wait) {
       await waitForState(instance.id, api.v1GetInstance.bind(api), 'on', 360)
@@ -50,7 +57,7 @@ async function handler (argv) {
     console.log(instance.id)
   } catch (error) {
     const errorMessage = getErrorMessage(error)
-    console.error(`Failed to create image: ${errorMessage}`)
+    console.error(`Failed to create instance: ${errorMessage}`)
 
     if (argv.detailedErrors) {
       console.log(error)
@@ -61,6 +68,6 @@ async function handler (argv) {
 module.exports = {
   builder,
   handler,
-  command: 'create <flavor> <os> <project> [wait]',
+  command: 'create <flavor> <os> <project> [name] [wait]',
   describe: 'Create instance and associate with a project'
 }

package/src/commands/instances/delete.js

@@ -1,16 +1,23 @@
 const { getErrorMessage } = require('../../error')
 const asciiArt = require('ascii-art')
-const { getApi } = require('../../utils')
+const { getApi, sleep } = require('../../utils')
 
 async function builder (yargs) {
   yargs.positional('instanceId', {
     type: 'string',
     describe: 'Instance id',
     demandOption: true
-  }).option('detailed-errors', {
-    type: 'boolean',
-    describe: 'Console will receive verbose error output'
   })
+    .option('verbose', {
+      alias: 'v',
+      type: 'boolean',
+      describe: 'Console will receive verbose error output'
+    })
+    .option('wait', {
+      type: 'boolean',
+      describe: 'Wait for the instance delete to complete',
+      demandOption: false
+    })
 }
 
 async function handler (argv) {
@@ -18,6 +25,14 @@ async function handler (argv) {
   const instanceId = argv.instanceId
   try {
     await api.v1DeleteInstance(instanceId)
+    if (argv.wait) {
+      let remaining
+      do {
+        await sleep(1000)
+        const instances = await api.v1GetInstances()
+        remaining = instances.find((i) => i.id === instanceId)
+      } while (remaining)
+    }
     console.log(
       asciiArt.style(`Successfully deleted instance ${instanceId}`, 'green', true)
     )
@@ -34,6 +49,6 @@ async function handler (argv) {
 module.exports = {
   builder,
   handler,
-  command: 'delete <instanceId>',
+  command: 'delete <instanceId> [wait]',
   describe: 'Delete instance'
 }

package/src/commands/instances/index.js

@@ -3,7 +3,8 @@ const subcommands = [
   require('./list'),
   require('./delete'),
   require('./stop'),
-  require('./start')
+  require('./start'),
+  require('./upgrade')
 ]
 
 let _yargs