@criticalmanufacturing/cli 5.10.8-0 → 6.0.0-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@criticalmanufacturing/cli",
-  "version": "5.10.8-0",
+  "version": "6.0.0-1",
   "description": "Critical Manufacturing command line client",
   "bin": {
     "cmf": "run.js"
@@ -36,17 +36,17 @@
   "dependencies": {
     "adm-zip": "^0.5.12",
     "axios": "^1.7.9",
-    "proxy-agent": "^5.0.0",
     "debug": "^4.3.4",
     "global-dirs": "3.0.0",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
     "mkdirp": "^2.1.6",
+    "proxy-agent": "^6.5.0",
+    "proxy-from-env": "^1.1.0",
     "rimraf": "^3.0.2",
-    "tmp": "0.2.1",
-    "http-proxy-agent": "^5.0.0",
-    "https-proxy-agent": "^5.0.1"
+    "tmp": "^0.2.5"
   },
   "devDependencies": {
-    "jest": "^27.5.1",
-    "proxy-from-env": "^1.1.0"
+    "jest": "^30.3.0"
   }
 }

package/postinstall.js

@@ -7,14 +7,17 @@ const path = require('path'),
     rimraf = require('rimraf'),
     fs = require('fs'),
     axios = require('axios'),
-    HttpsProxyAgent = require('https-proxy-agent'),
-    HttpProxyAgent = require('http-proxy-agent'),
+    HttpsProxyAgentModule = require('https-proxy-agent'),
+    HttpProxyAgentModule = require('http-proxy-agent'),
     proxyFromEnv = require('proxy-from-env'),
     AdmZip = require("adm-zip"),
     tmp = require('tmp'),
     dbg = require('debug'),
     { parsePackageJson, PLATFORM_MAPPING, ARCH_MAPPING } = require('./utils');
 
+const HttpsProxyAgent = HttpsProxyAgentModule.HttpsProxyAgent || HttpsProxyAgentModule;
+const HttpProxyAgent = HttpProxyAgentModule.HttpProxyAgent || HttpProxyAgentModule;
+
 const debug = dbg("cmf:debug");
 const error = dbg("cmf:debug:error");
 
@@ -83,9 +86,12 @@ async function install(callback) {
     var opts = parsePackageJson(".");
     if (!opts) return callback(INVALID_INPUT);
     console.info(`Copying the relevant binary for your platform ${process.platform}`);
-    const src= `./dist/${PLATFORM_MAPPING[process.platform]}-${ARCH_MAPPING[process.arch]}`;
+    const src = `./dist/${PLATFORM_MAPPING[process.platform]}-${ARCH_MAPPING[process.arch]}`;
+    const sourceBinaryPath = path.join(src, opts.binName);
 
-    if (!fs.existsSync("./dist")) {
+    // If dist exists but does not contain the expected binary for this platform,
+    // fetch the release archive and hydrate the platform folder.
+    if (!fs.existsSync(sourceBinaryPath)) {
         // download respective release zip from github or fallback repositories
         const primaryUrl = opts.binUrl.replace("{{version}}", opts.version).replace("{{platform}}", PLATFORM_MAPPING[process.platform]).replace("{{arch}}", ARCH_MAPPING[process.arch]);
         const versionedFallbackName = `cmf-cli.${PLATFORM_MAPPING[process.platform]}-${ARCH_MAPPING[process.arch]}-${opts.version}.zip`;
@@ -126,7 +132,7 @@ async function install(callback) {
         await execShellCommand(`robocopy ${src.replace(/\//g, "\\")} "${installPath}" /e /is /it`, [1]);
     } else {
         debug("Installing for *NIX: " + process.platform);
-        await execShellCommand(`cp -r ${src}/** "${installPath}"`);
+        await execShellCommand(`cp -r ${src}/. "${installPath}"`);
         await execShellCommand(`chmod +x "${installPath}/cmf"`);
     }
     await verifyAndPlaceBinary(opts.binName, installPath, callback);