@criticalmanufacturing/cli 5.1.0 → 5.2.0-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@criticalmanufacturing/cli",
-  "version": "5.1.0",
+  "version": "5.2.0-1",
   "description": "Critical Manufacturing command line client",
   "bin": {
     "cmf": "./run.js"
@@ -29,12 +29,10 @@
   ],
   "dependencies": {
     "adm-zip": "^0.5.12",
-    "axios": "^1.6.8",
+    "axios": "^1.7.9",
+    "proxy-agent": "^5.0.0",
     "debug": "^4.3.4",
-    "env-paths": "^2.2.1",
     "global-dirs": "3.0.0",
-    "is-installed-globally": "^0.4.0",
-    "is-path-inside": "^3.0.3",
     "mkdirp": "^2.1.6",
     "node_modules-path": "^2.0.7",
     "rimraf": "^3.0.2",

package/postinstall.js

@@ -4,42 +4,28 @@
 
 const path = require('path'),
     mkdirp = require('mkdirp'),
-    envPaths = require('env-paths'),
     rimraf = require('rimraf'),
     fs = require('fs'),
     axios = require('axios'),
+    httpsProxyAgent = require('https-proxy-agent'),
+    httpProxyAgent = require('http-proxy-agent'),
+    proxyFromEnv = require('proxy-from-env'),
     AdmZip = require("adm-zip"),
     tmp = require('tmp'),
-    dbg= require('debug'),
+    dbg = require('debug'),
     node_modules = require('node_modules-path'),
     { parsePackageJson, PLATFORM_MAPPING, ARCH_MAPPING } = require('./utils');
 
-
 const debug = dbg("cmf:debug");
 const error = dbg("cmf:debug:error");
 
 async function getInstallationPath() {
     debug("Getting installation path...");
-    if (!!process.env.npm_config_global) {
-        debug("Install is global, so targeting home directory for binaries");
-        // install into home:
-        // win: /AppData/Local/CMF/cmf-cli
-        // linux: ~/.local/share/cmf-cli
-        // osx: ~/Library/Application Support/cmf-cli
-        const paths = envPaths("cmf-cli", {suffix: ""});
-        debug(`Install at ${paths.data}. Making sure path exists...`);
-        await mkdirp(paths.data);
-        debug(`Install path exists!`);
-        return paths.data;
-    } else {
-        debug("Install is local, so targeting node_modules/.bin/cmf-cli. Making sure path exists...");
-        // install into node_modules/.bin/cmf-cli
-        const value = path.join(node_modules(), ".bin");
-        const dir = path.join(value, "cmf-cli");
-        await mkdirp(dir);
-        debug(`Install path exists!`);
-        return dir;
-    }
+    debug("Targeting node_modules/.bin/cmf-cli. Making sure path exists...");
+    const dir = path.join(node_modules(), ".bin", "cmf-cli");
+    await mkdirp(dir);
+    debug(`Install path exists!`);
+    return dir;
 }
 
 async function verifyAndPlaceBinary(binName, binPath, callback) {
@@ -57,7 +43,6 @@ async function verifyAndPlaceBinary(binName, binPath, callback) {
  */
 var INVALID_INPUT = "Invalid inputs";
 async function install(callback) {
-
     var opts = parsePackageJson(".");
     if (!opts) return callback(INVALID_INPUT);
     console.info(`Copying the relevant binary for your platform ${process.platform}`);
@@ -68,9 +53,21 @@ async function install(callback) {
         const pkgUrl = opts.binUrl.replace("{{version}}", opts.version).replace("{{platform}}", PLATFORM_MAPPING[process.platform]).replace("{{arch}}", ARCH_MAPPING[process.arch]);
         console.info(`Getting release archive from ${pkgUrl} into ${path.resolve(src)}`);
         try {
+            // support for http/s proxies through env vars
+            const proxy = proxyFromEnv.getProxyForUrl(pkgUrl);
+            let httpAgent, httpsAgent;
+            if (proxy) {
+                httpAgent = new httpProxyAgent.HttpProxyAgent(proxy);
+                httpsAgent = new httpsProxyAgent.HttpsProxyAgent(proxy);
+            }
+
+            // make req (override axios automatic proxy since it is not working properly)
             const response = await axios({
                 url: pkgUrl,
                 method: 'GET',
+                proxy: false,
+                httpAgent: httpAgent,
+                httpsAgent: httpsAgent,
                 responseType: 'arraybuffer', // to do this with streaming we must deal with chunking
             });
             const zip = tmp.tmpNameSync();
@@ -94,16 +91,14 @@ async function install(callback) {
         await execShellCommand(`cp -r ${src}/** "${installPath}"`);
         await execShellCommand(`chmod +x "${installPath}/cmf"`);
     }
-    
     await verifyAndPlaceBinary(opts.binName, installPath, callback);
 }
 
 async function uninstall(callback) {
-    var opts = parsePackageJson(".");
     try {
-        const installationPath = await getInstallationPath();
-        debug("Deleting binaries from " + installationPath);
-        rimraf.sync(installationPath);
+        const installPath = await getInstallationPath();
+        debug("Deleting binaries from " + installPath);
+        rimraf.sync(installPath);
     } catch (ex) {
         console.log(ex);
         callback(ex);
@@ -118,6 +113,7 @@ var actions = {
     "install": install,
     "uninstall": uninstall
 };
+
 /**
  * Executes a shell command and return it as a Promise.
  * @param cmd {string}

package/run.js

@@ -1,10 +1,9 @@
 #! /usr/bin/env node
+
 "use strict";
+
 const { spawn } = require('child_process');
-const envPaths = require('env-paths');
 const path = require('path');
-const isInstalledGlobally = require('is-installed-globally');
-const isPathInside = require('is-path-inside');
 const node_modules = require('node_modules-path');
 const dbg = require('debug');
 const { parsePackageJson } = require('./utils');
@@ -13,21 +12,8 @@ const opts = parsePackageJson(__dirname);
 const debug = dbg("cmf:debug");
 
 debug("Executing cmf-cli");
-let exePath = null;
-debug("Determining if cli is installed globally or locally...");
-/**
- * we need to check if we are installed globally. 
- * However, this does not cover some cases, depending on how Node was installed, that we need to check manually:
- * - in windows, Node was installed in Program Files but NPM is installed in the user profile (AppData/Roaming)
- */
-if (isInstalledGlobally || isPathInside(__dirname, process.env.APPDATA || "dummy") || isPathInside(__dirname, "/usr/local")) {
-  debug("cli is installed globally. Getting binary location from user profile...");
-  const paths = envPaths("cmf-cli", {suffix: ""});
-  exePath = path.join(paths.data, opts.binName);
-} else {
-  debug("cli is installed locally. Getting binary from node_modules/.bin/cmf-cli...");
-  exePath = path.join(node_modules(), ".bin", "cmf-cli", opts.binName);
-}
+debug("Getting binary from node_modules/.bin/cmf-cli...");
+const exePath = path.join(node_modules(), ".bin", "cmf-cli", opts.binName);
 debug("Obtained binary path: " + exePath);
 
 debug(`Spawning cmf-cli from ${exePath} with args ${process.argv.slice(2)} and piping.`);
@@ -35,4 +21,4 @@ const child = spawn(exePath, process.argv.slice(2), {stdio: "inherit"});
 child.on('close', (code) => {
   debug("Process exited with code " + code);
   process.exitCode = code;
-});
+});