@corellium/corellium-cli 1.1.1 → 1.1.2

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.1.1",
+    "version": "1.1.2",
     "description": "Corellium CLI Tool",
     "scripts": {
         "corellium": "node index.js",

package/src/clients/Client.js

@@ -55,7 +55,14 @@ class Client {
    * @returns {wsstream.WebSocketDuplex}
    */
   _fetchWSS = (token) => {
-    const url = `wss://${this._profile.endpoint}/api/v1/agent/${token}`
+    /** @type {string} */
+    const endpoint = this._profile.endpoint
+    const match = endpoint.match(/^https?:\/\/([^/]+)$/)
+    if (!match) {
+      throw new Error('Unable to extract hostname from endpoint')
+    }
+    const host = match[1]
+    const url = `wss://${host}/api/v1/agent/${token}`
     return wsstream(url, ['binary'])
   }
 

package/src/clients/Instance.js

@@ -56,20 +56,12 @@ class InstanceCLI extends Client {
     return await this._fetch('POST', `${this.instanceBasePath()}/netdump/disable`)
   }
 
-  /**
-   * Authorize pcap download
-   * @returns {Promise<any>}
-   */
-  authorizePcap = async () => {
-    return await this._fetch('POST', `${this.instanceBasePath()}/netdump-authorize`)
-  }
-
   /**
    * Download file
    * @returns {Promise<any>}
    */
-  download = async (token, file, outputFile) => {
-    return await this._fetchStream(`${this.preauthedBasePath()}/${token}/${file}`, outputFile)
+  download = async (file, outputFile) => {
+    return await this._fetchStream(`${this.instanceBasePath()}/${file}`, outputFile)
   }
 
   /**

package/src/commands/instances/netmon/download.js

@@ -24,8 +24,7 @@ async function builder (yargs) {
 async function handler (argv) {
   try {
     const instance = new InstanceCLI(argv)
-    const { token } = await instance.authorizePcap()
-    await instance.download(token, 'netdump.pcap', argv.outputFile)
+    await instance.download('netdump.pcap', argv.outputFile)
     log.info(`Success, pcap saved to ${argv.outputFile}`)
   } catch (e) {
     if (e.response) {