@corellium/corellium-cli 1.2.0 → 1.2.1

package/coverage/lcov-report/sorter.js

@@ -0,0 +1,196 @@
+/* eslint-disable */
+var addSorting = (function() {
+    'use strict';
+    var cols,
+        currentSort = {
+            index: 0,
+            desc: false
+        };
+
+    // returns the summary table element
+    function getTable() {
+        return document.querySelector('.coverage-summary');
+    }
+    // returns the thead element of the summary table
+    function getTableHeader() {
+        return getTable().querySelector('thead tr');
+    }
+    // returns the tbody element of the summary table
+    function getTableBody() {
+        return getTable().querySelector('tbody');
+    }
+    // returns the th element for nth column
+    function getNthColumn(n) {
+        return getTableHeader().querySelectorAll('th')[n];
+    }
+
+    function onFilterInput() {
+        const searchValue = document.getElementById('fileSearch').value;
+        const rows = document.getElementsByTagName('tbody')[0].children;
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            if (
+                row.textContent
+                    .toLowerCase()
+                    .includes(searchValue.toLowerCase())
+            ) {
+                row.style.display = '';
+            } else {
+                row.style.display = 'none';
+            }
+        }
+    }
+
+    // loads the search box
+    function addSearchBox() {
+        var template = document.getElementById('filterTemplate');
+        var templateClone = template.content.cloneNode(true);
+        templateClone.getElementById('fileSearch').oninput = onFilterInput;
+        template.parentElement.appendChild(templateClone);
+    }
+
+    // loads all columns
+    function loadColumns() {
+        var colNodes = getTableHeader().querySelectorAll('th'),
+            colNode,
+            cols = [],
+            col,
+            i;
+
+        for (i = 0; i < colNodes.length; i += 1) {
+            colNode = colNodes[i];
+            col = {
+                key: colNode.getAttribute('data-col'),
+                sortable: !colNode.getAttribute('data-nosort'),
+                type: colNode.getAttribute('data-type') || 'string'
+            };
+            cols.push(col);
+            if (col.sortable) {
+                col.defaultDescSort = col.type === 'number';
+                colNode.innerHTML =
+                    colNode.innerHTML + '<span class="sorter"></span>';
+            }
+        }
+        return cols;
+    }
+    // attaches a data attribute to every tr element with an object
+    // of data values keyed by column name
+    function loadRowData(tableRow) {
+        var tableCols = tableRow.querySelectorAll('td'),
+            colNode,
+            col,
+            data = {},
+            i,
+            val;
+        for (i = 0; i < tableCols.length; i += 1) {
+            colNode = tableCols[i];
+            col = cols[i];
+            val = colNode.getAttribute('data-value');
+            if (col.type === 'number') {
+                val = Number(val);
+            }
+            data[col.key] = val;
+        }
+        return data;
+    }
+    // loads all row data
+    function loadData() {
+        var rows = getTableBody().querySelectorAll('tr'),
+            i;
+
+        for (i = 0; i < rows.length; i += 1) {
+            rows[i].data = loadRowData(rows[i]);
+        }
+    }
+    // sorts the table using the data for the ith column
+    function sortByIndex(index, desc) {
+        var key = cols[index].key,
+            sorter = function(a, b) {
+                a = a.data[key];
+                b = b.data[key];
+                return a < b ? -1 : a > b ? 1 : 0;
+            },
+            finalSorter = sorter,
+            tableBody = document.querySelector('.coverage-summary tbody'),
+            rowNodes = tableBody.querySelectorAll('tr'),
+            rows = [],
+            i;
+
+        if (desc) {
+            finalSorter = function(a, b) {
+                return -1 * sorter(a, b);
+            };
+        }
+
+        for (i = 0; i < rowNodes.length; i += 1) {
+            rows.push(rowNodes[i]);
+            tableBody.removeChild(rowNodes[i]);
+        }
+
+        rows.sort(finalSorter);
+
+        for (i = 0; i < rows.length; i += 1) {
+            tableBody.appendChild(rows[i]);
+        }
+    }
+    // removes sort indicators for current column being sorted
+    function removeSortIndicators() {
+        var col = getNthColumn(currentSort.index),
+            cls = col.className;
+
+        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
+        col.className = cls;
+    }
+    // adds sort indicators for current column being sorted
+    function addSortIndicators() {
+        getNthColumn(currentSort.index).className += currentSort.desc
+            ? ' sorted-desc'
+            : ' sorted';
+    }
+    // adds event listeners for all sorter widgets
+    function enableUI() {
+        var i,
+            el,
+            ithSorter = function ithSorter(i) {
+                var col = cols[i];
+
+                return function() {
+                    var desc = col.defaultDescSort;
+
+                    if (currentSort.index === i) {
+                        desc = !currentSort.desc;
+                    }
+                    sortByIndex(i, desc);
+                    removeSortIndicators();
+                    currentSort.index = i;
+                    currentSort.desc = desc;
+                    addSortIndicators();
+                };
+            };
+        for (i = 0; i < cols.length; i += 1) {
+            if (cols[i].sortable) {
+                // add the click event handler on the th so users
+                // dont have to click on those tiny arrows
+                el = getNthColumn(i).querySelector('.sorter').parentElement;
+                if (el.addEventListener) {
+                    el.addEventListener('click', ithSorter(i));
+                } else {
+                    el.attachEvent('onclick', ithSorter(i));
+                }
+            }
+        }
+    }
+    // adds sorting functionality to the UI
+    return function() {
+        if (!getTable()) {
+            return;
+        }
+        cols = loadColumns();
+        loadData();
+        addSearchBox();
+        addSortIndicators();
+        enableUI();
+    };
+})();
+
+window.addEventListener('load', addSorting);

package/index.js

@@ -2,12 +2,14 @@
 const yargs = require('yargs/yargs')
 const { hideBin } = require('yargs/helpers')
 const commands = require('./src/commands')
+const { subcommands } = require('./src/commands/instances')
 
 require('dotenv').config()
 
 async function run () {
   return yargs(hideBin(process.argv))
     .command(commands)
+    .command(subcommands)
     .scriptName('corellium')
     .usage('Usage: corellium [OPTIONS]')
     .demandCommand(1, '') // empty string overrides yargs nag message about specifying a command

package/package.json

@@ -1,67 +1,65 @@
 {
-    "name": "@corellium/corellium-cli",
-    "version": "1.2.0",
-    "description": "Corellium CLI Tool",
-    "scripts": {
-        "corellium": "node index.js",
-        "lint": "eslint .",
-        "lint-staged": "lint-staged",
-        "lint:fix": "eslint --fix .",
-        "test:ci": "npx nyc report"
-    },
-    "bin": {
-        "corellium": "index.sh"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://git.corellium.co/middleware/corellium-cli.git"
-    },
-    "bundleDependencies": [
-        "@corellium/client-api",
-        "axios",
-        "dotenv",
-        "generate-password",
-        "multi-progress",
-        "progress",
-        "uuid",
-        "yargs"
-    ],
-    "dependencies": {
-        "@corellium/client-api": "^0.1.0",
-        "@corellium/corellium-api": "^1.7.3",
-        "axios": "^0.27.2",
-        "chalk": "^4.1.2",
-        "cli-progress": "^3.12.0",
-        "dotenv": "^16.0.1",
-        "generate-password": "^1.7.0",
-        "multi-progress": "^4.0.0",
-        "progress": "^2.0.3",
-        "prompts": "^2.4.2",
-        "table": "^6.8.1",
-        "uuid": "^8.3.2",
-        "websocket-stream": "^5.5.2",
-        "xhr2": "^0.2.0",
-        "yargs": "^17.5.1"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "./node_modules/.bin/lint-staged"
-        }
-    },
-    "devDependencies": {
-        "@types/node": "^12.20.55",
-        "@typescript-eslint/eslint-plugin": "5.27.1",
-        "@typescript-eslint/parser": "5.27.1",
-        "eslint": "7.24.0",
-        "eslint-config-standard": "16.0.2",
-        "eslint-plugin-import": "2.22.1",
-        "eslint-plugin-mocha": "8.1.0",
-        "eslint-plugin-no-floating-promise": "1.0.2",
-        "eslint-plugin-node": "11.1.0",
-        "eslint-plugin-promise": "4.3.1",
-        "husky": "^4.3.8",
-        "lint-staged": "^10.5.4",
-        "prettier": "^2.3.2",
-        "typescript": "^4.7.4"
+  "name": "@corellium/corellium-cli",
+  "version": "1.2.1",
+  "description": "Corellium CLI Tool",
+  "scripts": {
+    "corellium": "node index.js",
+    "lint": "eslint .",
+    "lint-staged": "lint-staged",
+    "lint:fix": "eslint --fix .",
+    "test:ci": "npx nyc report"
+  },
+  "bin": {
+    "corellium": "index.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.corellium.co/middleware/corellium-cli.git"
+  },
+  "bundleDependencies": [
+    "@corellium/client-api",
+    "axios",
+    "dotenv",
+    "multi-progress",
+    "progress",
+    "uuid",
+    "yargs"
+  ],
+  "dependencies": {
+    "@corellium/client-api": "^0.1.0",
+    "@corellium/corellium-api": "^1.7.3",
+    "axios": "^0.27.2",
+    "chalk": "^4.1.2",
+    "cli-progress": "^3.12.0",
+    "dotenv": "^16.0.1",
+    "multi-progress": "^4.0.0",
+    "progress": "^2.0.3",
+    "prompts": "^2.4.2",
+    "table": "^6.8.1",
+    "uuid": "^8.3.2",
+    "websocket-stream": "^5.5.2",
+    "xhr2": "^0.2.0",
+    "yargs": "^17.5.1"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "./node_modules/.bin/lint-staged"
     }
+  },
+  "devDependencies": {
+    "@types/node": "^12.20.55",
+    "@typescript-eslint/eslint-plugin": "5.27.1",
+    "@typescript-eslint/parser": "5.27.1",
+    "eslint": "7.24.0",
+    "eslint-config-standard": "16.0.2",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-mocha": "8.1.0",
+    "eslint-plugin-no-floating-promise": "1.0.2",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "4.3.1",
+    "husky": "^4.3.8",
+    "lint-staged": "^10.5.4",
+    "prettier": "^2.3.2",
+    "typescript": "^4.7.4"
+  }
 }

package/src/clients/Instance.js

@@ -71,6 +71,10 @@ class InstanceCLI extends Client {
   info = async () => {
     return await this._fetch('GET', `${this.instanceBasePath()}`, {})
   }
+
+  input = async (data) => {
+    return await this._fetch('POST', `${this.instanceBasePath()}/input`, data)
+  }
 }
 
 module.exports = InstanceCLI

package/src/commands/extensions/delete.js

@@ -44,6 +44,7 @@ async function handler (argv) {
 module.exports = {
   builder,
   handler,
-  command: 'delete [extensionId]',
+  command: 'delete <extensionId>',
+  aliases: ['rm', 'del'],
   describe: 'Delete extension by id'
 }

package/src/commands/extensions/list.js

@@ -10,9 +10,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']
   })
 }
 
@@ -38,5 +38,6 @@ module.exports = {
   builder,
   handler,
   command: 'list',
+  aliases: ['ls'],
   describe: 'List all extensions'
 }

package/src/commands/firmware/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']
   })
 }
 
@@ -55,5 +55,6 @@ module.exports = {
   builder,
   handler,
   command: 'list',
+  aliases: ['ls'],
   describe: 'List all firmware'
 }

package/src/commands/images/create.js

@@ -11,9 +11,9 @@ async function builder (yargs) {
   })
     .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']
     })
     .option('verbose', {
       alias: 'v',

package/src/commands/images/delete.js

@@ -31,5 +31,6 @@ module.exports = {
   builder,
   handler,
   command: 'delete <imageId>',
+  aliases: ['rm', 'del'],
   describe: 'Delete image'
 }

package/src/commands/images/list.js

@@ -10,9 +10,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']
   })
 }
 
@@ -30,5 +30,6 @@ module.exports = {
   builder,
   handler,
   command: 'list',
+  aliases: ['ls'],
   describe: 'List images'
 }

package/src/commands/index.js

@@ -1,13 +1,11 @@
 module.exports = [
   require('./login'),
   require('./logout'),
-  require('./signup'),
   require('./extensions'),
   require('./instances'),
   require('./firmware'),
   require('./images'),
   require('./projects'),
-  require('./agent'),
   require('./webplayer'),
   require('./mast')
 ]

package/src/commands/{agent → instances}/apps/index.js

@@ -21,16 +21,16 @@ async function builder (yargs) {
     demandOption: true,
     string: true,
     validateNonEmpty
-  }).option('loadIcons', {
+  }).option('load-icons', {
     type: 'input',
     describe: 'Toggle loading of icons',
     demandOption: false,
     boolean: 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']
   }).command(InstallCommand)
 }
 

package/src/commands/instances/create.js

@@ -1,5 +1,9 @@
 const { handleError } = require('../../error')
-const { getApi, waitForState } = require('../../utils')
+const {
+  getApi, waitForState,
+  waitForAgentReady
+} = require('../../utils')
+const AgentCLI = require('../../clients/Agent')
 
 async function builder (yargs) {
   yargs
@@ -10,9 +14,9 @@ async function builder (yargs) {
     })
     .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']
     })
     .positional('flavor', {
       type: 'string',
@@ -53,6 +57,8 @@ async function handler (argv) {
     // Wait 360 attempts for the instance to be created (30 minutes)
     if (argv.wait) {
       await waitForState(instance.id, api.v1GetInstance.bind(api), 'on', 360)
+      const agent = new AgentCLI({ instance: instance.id })
+      await waitForAgentReady(agent, 360)
     }
     console.log(instance.id)
   } catch (err) {

package/src/commands/{agent → instances}/file.js

@@ -22,9 +22,9 @@ async function builder (yargs) {
     validateNonEmpty
   }).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/commands/instances/index.js

@@ -6,7 +6,11 @@ const subcommands = [
   require('./start'),
   require('./upgrade'),
   require('./netmon'),
-  require('./restoreBackup')
+  require('./restoreBackup'),
+  require('./ready'),
+  require('./file'),
+  require('./apps'),
+  require('./input')
 ]
 
 let _yargs
@@ -17,3 +21,4 @@ module.exports = {
   command: 'instance',
   describe: 'Instance related commands'
 }
+module.exports.subcommands = subcommands

package/src/commands/instances/input.js

@@ -0,0 +1,52 @@
+
+const { readFile } = require('node:fs/promises')
+const InstanceCLI = require('../../clients/Instance')
+const { handleError } = require('../../error')
+const chalk = require('chalk')
+
+/**
+ * Upload input to a device.
+ *
+ * @param yargs
+ * @returns {Promise<void>}
+ */
+async function builder (yargs) {
+  yargs
+    .positional('instance', {
+      type: 'string',
+      demandOption: true,
+      describe: 'virtual device id',
+      default: process.env.INSTANCE
+    })
+    .positional('file', {
+      type: 'string',
+      demandOption: true,
+      describe: 'JSON file of device inputs'
+      // Input specification https://app.corellium.com/api/docs#post-/v1/instances/-instanceId-/input
+    })
+    .option('verbose', {
+      alias: 'v',
+      type: 'boolean',
+      describe: 'console will receive verbose error output',
+      default: false
+    })
+}
+
+async function handler (argv) {
+  const { file, verbose } = argv
+  const client = new InstanceCLI(argv)
+  try {
+    const json = JSON.parse((await readFile(file)).toString())
+    await client.input(json)
+    console.log(chalk.green('Successfully uploaded inputs'))
+  } catch (error) {
+    handleError(error, 'input failed', verbose)
+  }
+}
+
+module.exports = {
+  builder,
+  handler,
+  command: 'input <instance> <file>',
+  describe: 'Upload a series of inputs to a device.'
+}

package/src/commands/instances/list.js

@@ -12,9 +12,9 @@ async function builder (yargs) {
     describe: 'Optionally filter by project name'
   }).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']
   })
 }
 
@@ -42,5 +42,6 @@ module.exports = {
   builder,
   handler,
   command: 'list',
+  aliases: ['ls'],
   describe: 'List instances'
 }

package/src/commands/instances/upgrade.js

@@ -30,9 +30,9 @@ async function builder (yargs) {
     })
     .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'],
       demandOption: false
     })
     .option('wait', {

package/src/commands/projects/create.js

@@ -11,9 +11,9 @@ async function builder (yargs) {
   })
     .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']
     })
     .positional('name', {
       type: 'input',

package/src/commands/projects/delete.js

@@ -44,6 +44,7 @@ async function handler (argv) {
 module.exports = {
   builder,
   handler,
-  command: 'delete [projectId]',
+  command: 'delete <projectId>',
+  aliases: ['rm', 'del'],
   describe: 'Delete project by id'
 }