@corellium/corellium-cli 1.0.2 → 1.0.4

package/node_modules/yargs/package.json

@@ -1,41 +1,57 @@
 {
-  "_args": [
-    [
-      "yargs@17.5.1",
-      "/Users/haydenbleasel/GitHub/corellium-cli"
+  "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"
     ]
-  ],
-  "_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",
@@ -45,7 +61,6 @@
     "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",
@@ -70,50 +85,27 @@
     "which": "^2.0.0",
     "yargs-test-extends": "^1.0.1"
   },
-  "engines": {
-    "node": ">=12"
+  "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"
   },
-  "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"
-    ]
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/yargs/yargs.git"
   },
-  "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",
@@ -125,30 +117,11 @@
     "command"
   ],
   "license": "MIT",
-  "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"
-}
+  "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"
+}

package/node_modules/yargs-parser/package.json

@@ -1,40 +1,52 @@
 {
-  "_args": [
-    [
-      "yargs-parser@21.0.1",
-      "/Users/haydenbleasel/GitHub/corellium-cli"
+  "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"
     ]
-  ],
-  "_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"
   },
-  "_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"
+  "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"
   },
-  "bugs": {
-    "url": "https://github.com/yargs/yargs-parser/issues"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/yargs/yargs-parser.git"
   },
-  "description": "the mighty option parser used by yargs",
+  "keywords": [
+    "argument",
+    "parser",
+    "yargs",
+    "command",
+    "cli",
+    "parsing",
+    "option",
+    "args",
+    "argument"
+  ],
+  "author": "Ben Coe <ben@npmjs.com>",
+  "license": "ISC",
   "devDependencies": {
     "@types/chai": "^4.2.11",
     "@types/mocha": "^9.0.0",
@@ -60,64 +72,21 @@
     "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"
   ],
-  "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"
+  "engines": {
+    "node": ">=12"
   },
   "standardx": {
     "ignore": [
       "build"
     ]
-  },
-  "type": "module",
-  "version": "21.0.1"
-}
+  }
+
+,"_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"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corellium/corellium-cli",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "description": "Corellium CLI Tool",
     "scripts": {
         "corellium-cli": "node index.js",
@@ -13,7 +13,6 @@
     },
     "bundleDependencies": [
         "@corellium/client-api",
-        "@corellium/corellium-api",
         "ascii-art",
         "axios",
         "dotenv",
@@ -25,7 +24,6 @@
     ],
     "dependencies": {
         "@corellium/client-api": "^0.1.0",
-        "@corellium/corellium-api": "^1.4.1",
         "ascii-art": "^2.8.5",
         "axios": "^0.27.2",
         "dotenv": "^16.0.1",
@@ -33,6 +31,7 @@
         "multi-progress": "^4.0.0",
         "progress": "^2.0.3",
         "uuid": "^8.3.2",
+        "xhr2": "^0.2.0",
         "yargs": "^17.5.1"
     },
     "husky": {

package/src/TrialAccount.js

@@ -0,0 +1,76 @@
+const Client = require('./commands/Client')
+const util = require('./utils')
+const { handler: login } = require('./commands/login')
+
+class TrialAccount extends Client {
+  constructor (argv) {
+    super(argv)
+    this.userEmail = argv['user-email']
+    this.adminName = argv['admin-user-name']
+    this.userPassword = argv['user-password']
+    this.adminPassword = argv['admin-password']
+    this.endpoint = argv.endpoint
+    this.name = argv['customer-name']
+    this.plan = util.planOptions(argv.plan)
+    this.duration = argv['trial-duration']
+    this.individual = !!this.plan.licenseType.includes('individual')
+    this.enterpriseDomainName = argv['enterprise-domain']
+  }
+
+  async getCouponCode () {
+    const parameters = {
+      email: this.userEmail,
+      name: this.name,
+      aggregate: !!this.individual,
+      domain: this.individual ? null : `${this.endpoint.replace('https://app', `${this.enterpriseDomainName}`)}`,
+      plan: this.plan,
+      coupon: null,
+      trial: { duration: this.duration },
+      skipEmail: true
+    }
+    /* eslint-disable camelcase */
+    const response = await this._fetch('POST', 'v1/billing/invites', parameters)
+    const { coupon_code } = response
+    return coupon_code
+  }
+
+  async subscribeTrial (coupon_code) {
+    const subscribeParams = {
+      termsOfService: true,
+      subscriberInviteCode: coupon_code,
+      skipEmail: true,
+      password: this.userPassword
+    }
+    const response = await this._fetch('POST', 'v1/billing/trials/subscribe', subscribeParams)
+    const { domainId } = response
+    return {
+      domainId,
+      password: this.userPassword
+    }
+  }
+
+  async setupTrialUser () {
+    await login({
+      username: this.adminName,
+      password: this.adminPassword,
+      endpoint: this.endpoint
+    })
+    const coupon_code = await this.getCouponCode(this.userEmail, this.endpoint)
+    const {
+      domainId,
+      password
+    } = await this.subscribeTrial(coupon_code)
+    await login({
+      username: this.userEmail,
+      password,
+      endpoint: this.endpoint
+    })
+    return {
+      user: this.userEmail,
+      password,
+      domainId
+    }
+  }
+}
+
+module.exports = TrialAccount

package/src/commands/agent/Agent.js

@@ -1,5 +1,4 @@
-const CorelliumAPI = require('../CorelliumAPI')
-const { getAxios } = require('../../utils')
+const Client = require('../Client')
 
 /**
  * @typedef {object} AppsResult
@@ -9,21 +8,19 @@ const { getAxios } = require('../../utils')
 /**
  * Agent class
  */
-class AgentCLI extends CorelliumAPI {
+class AgentCLI extends Client {
+  agentBasePath = () => `v1/instances/${this.instance}/agent/v1`
+
+  ready = async () => await this._fetch('GET', `${this.agentBasePath()}/app/ready/`, {})
+
   /**
    * List files on device
    * @returns {Promise<Array<{object}>>}
    */
   listFiles = async () => {
-    this.setToken()
-    await this.getProject()
-    await this.getInstance()
-    await this._instance.waitForAgentReady()
-    const filesUrl = `${this._profile.endpoint}/api/v1/instances/${this.instanceId}/agent/v1/file/device/`
-    const axios = await getAxios()
-    const result = (await axios.get(filesUrl)).data || []
+    const response = (await this._fetch('GET', `${this.agentBasePath()}/file/device/`, {}))
     // Trim whitespace from file names
-    return result.entries.map(f => { return { ...f, name: f.name.trim() } })
+    return response.entries.map(f => { return { ...f, name: f.name.trim() } })
   }
 
   /**
@@ -32,14 +29,8 @@ class AgentCLI extends CorelliumAPI {
    */
   listApps = async (options) => {
     const { loadIcons } = options
-    this.setToken()
-    await this.getProject()
-    await this.getInstance()
-    await this._instance.waitForAgentReady()
-    const appsUrl = `${this._profile.endpoint}/api/v1/instances/${this.instanceId}/agent/v1/app/apps?loadIcons=${loadIcons ? 1 : 0}`
-    const axios = await getAxios()
-    const result = (await axios.get(appsUrl)).data
-    return result ? result.apps : []
+    const response = (await this._fetch('GET', `${this.agentBasePath()}/app/apps?loadIcons=${loadIcons ? 1 : 0}`, {}))
+    return response ? response.apps : []
   }
 }
 

package/src/commands/agent/index.js

@@ -1,4 +1,5 @@
 const subcommands = [
+  require('./ready'),
   require('./file'),
   require('./apps')
 ]

package/src/commands/agent/ready.js

@@ -0,0 +1,42 @@
+const AgentCLI = require('./Agent')
+const { validateNonEmpty } = require('../../utils')
+const { getErrorMessage } = require('../../error')
+const log = require('../../logging')
+
+async function builder (yargs) {
+  yargs.option('detailed-errors', {
+    type: 'boolean',
+    describe: 'Console will receive verbose error output'
+  }).option('project', {
+    type: 'input',
+    describe: 'Project ID',
+    demandOption: true,
+    string: true,
+    validateNonEmpty
+  }).option('instance', {
+    type: 'input',
+    describe: 'Instance ID',
+    demandOption: true,
+    string: true,
+    validateNonEmpty
+  })
+}
+
+async function handler (argv) {
+  try {
+    const agent = new AgentCLI(argv)
+    const status = await agent.ready()
+    log.plain(JSON.stringify(status))
+  } catch (err) {
+    const errorMessage = getErrorMessage(err)
+    log.error(`Query agent ready status failed: ${errorMessage}`)
+    if (argv.detailedErrors) { log.error(err) }
+  }
+}
+
+module.exports = {
+  builder,
+  handler,
+  command: 'ready',
+  describe: 'Query agent ready status'
+}

package/src/commands/instances/list.js

@@ -20,9 +20,14 @@ async function builder (yargs) {
 async function handler (argv) {
   const api = await getApi()
   try {
-    const instances = await api.v1GetInstances(argv.project)
-    if (!instances.length) {
-      throw new Error('Found no matching Instances')
+    let instances
+    if (argv.project) {
+      instances = await api.v1GetProjectInstances(argv.project, {})
+    } else {
+      instances = await api.v1GetInstances()
+    }
+    if (!instances.length && argv.format !== 'json') {
+      console.error('Found no matching Instances')
     }
     await displayTable(argv.format, instances, [
       'id', 'flavor', 'type', 'state', 'os'

package/src/commands/signup.js

@@ -1,5 +1,7 @@
-const TrialAccount = require('../subscriberInvite')
+const TrialAccount = require('../TrialAccount')
 const { makePassword, validateNonEmpty } = require('../utils')
+const { getErrorMessage } = require('../error')
+const log = require('../logging')
 
 async function builder (yargs) {
   yargs.options({
@@ -86,10 +88,17 @@ async function builder (yargs) {
 }
 
 async function handler (argv) {
-  const trialAccount = new TrialAccount(argv)
-
-  const credentials = await trialAccount.setupTrialUser()
-  console.log(credentials)
+  try {
+    const trialAccount = new TrialAccount(argv)
+    const credentials = await trialAccount.setupTrialUser()
+    console.log(credentials)
+  } catch (err) {
+    const errorMessage = getErrorMessage(err)
+    log.error(`Create subscriber invite account: ${errorMessage}`)
+    if (argv.detailedErrors) {
+      log.error(err)
+    }
+  }
 }
 
 module.exports = {

package/src/commands/webplayer/WebPlayer.js

@@ -21,6 +21,7 @@ class WebPlayer extends Client {
    */
   createSession = async () => this._fetch('POST', 'v1/webplayer', {
     projectId: this.project,
+    instanceId: this.instance,
     features: this.features,
     permissions: this.permissions ? this.permissions : null,
     expiresIn: this.expiresIn
@@ -45,7 +46,7 @@ class WebPlayer extends Client {
   /**
    * Log into WebPlayer session by activating WebPlayer credentials
    * @param {string} sessionId
-   * @returns {Promise<Corellium>}
+   * @returns {Promise<void>}
    */
   login = async (sessionId) => {
     const { token, expiration } = (await this.listSessions()).filter(s => s.identifier === sessionId).shift()

package/src/commands/webplayer/create.js

@@ -14,6 +14,12 @@ async function builder (yargs) {
     demandOption: true,
     string: true,
     validateNonEmpty
+  }).option('instance', {
+    type: 'input',
+    describe: 'Instance ID',
+    demandOption: true,
+    string: true,
+    validateNonEmpty
   }).option('features', {
     type: 'input',
     describe: 'Enabled Feature Set',