@criticalmanufacturing/cli 5.8.0 → 5.9.0-1

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@criticalmanufacturing/cli",
-  "version": "5.8.0",
+  "version": "5.9.0-1",
   "description": "Critical Manufacturing command line client",
   "bin": {
     "cmf": "./run.js"
   },
   "scripts": {
     "postinstall": "node postinstall.js install",
-    "preuninstall": "node postinstall.js uninstall"
+    "preuninstall": "node postinstall.js uninstall",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:integration": "node integration-test.js"
   },
   "author": "Critical Manufacturing, SA",
   "license": "BSD-3-Clause",
@@ -37,5 +41,11 @@
     "node_modules-path": "^2.0.7",
     "rimraf": "^3.0.2",
     "tmp": "0.2.1"
+  },
+  "devDependencies": {
+    "jest": "^27.5.1",
+    "http-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^5.0.1",
+    "proxy-from-env": "^1.1.0"
   }
 }

package/postinstall.js

@@ -7,8 +7,8 @@ const path = require('path'),
     rimraf = require('rimraf'),
     fs = require('fs'),
     axios = require('axios'),
-    httpsProxyAgent = require('https-proxy-agent'),
-    httpProxyAgent = require('http-proxy-agent'),
+    HttpsProxyAgent = require('https-proxy-agent'),
+    HttpProxyAgent = require('http-proxy-agent'),
     proxyFromEnv = require('proxy-from-env'),
     AdmZip = require("adm-zip"),
     tmp = require('tmp'),
@@ -33,6 +33,41 @@ async function verifyAndPlaceBinary(binName, binPath, callback) {
     return callback(null);
 }
 
+/**
+ * Downloads and extracts a zip file from the given URL to the destination path
+ * @param {string} pkgUrl - The URL to download from
+ * @param {string} dest - The destination path to extract to
+ * @returns {Promise<void>}
+ */
+async function downloadAndExtract(pkgUrl, dest) {
+    console.info(`Fetching release archive from ${pkgUrl}`);
+    
+    // support for http/s proxies through env vars
+    const proxy = proxyFromEnv.getProxyForUrl(pkgUrl);
+    let httpAgent, httpsAgent;
+    if (proxy) {
+        httpAgent = new HttpProxyAgent(proxy);
+        httpsAgent = new 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',
+    });
+    
+    const zip = tmp.tmpNameSync();
+    debug(`Writing temporary zip file to ${zip}`);
+    fs.writeFileSync(zip, response.data);
+    debug(`Extracting zip file ${zip} to ${dest}`);
+    (new AdmZip(zip)).extractAllTo(dest);
+    rimraf.sync(zip);
+}
+
 /**
  * Reads the configuration from application's package.json,
  * validates properties, copied the binary from the package and stores at
@@ -49,36 +84,37 @@ async function install(callback) {
     const src= `./dist/${PLATFORM_MAPPING[process.platform]}-${ARCH_MAPPING[process.arch]}`;
 
     if (!fs.existsSync("./dist")) {
-        // download respective release zip from github
-        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);
+        // 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`;
+        const legacyFallbackName = `cmf-cli.${PLATFORM_MAPPING[process.platform]}-${ARCH_MAPPING[process.arch]}.zip`;
+        
+        // Fallback URLs for alternative repositories
+        const fallbackUrls = [
+            `https://criticalmanufacturing.io/repository/tools/${versionedFallbackName}`,
+            `https://criticalmanufacturing.io/repository/tools/${legacyFallbackName}`,
+            `https://repository.criticalmanufacturing.com.cn/repository/tools/${versionedFallbackName}`,
+            `https://repository.criticalmanufacturing.com.cn/repository/tools/${legacyFallbackName}`
+        ];
+        
+        // Try downloading from primary URL and fallbacks
+        const allUrls = [primaryUrl, ...fallbackUrls];
+        let downloadSucceeded = false;
+        
+        for (const pkgUrl of allUrls) {
+            try {
+                await downloadAndExtract(pkgUrl, src);
+                console.info(`Package downloaded successfully from ${pkgUrl}`);
+                downloadSucceeded = true;
+                break;
+            } catch (e) {
+                error(`Failed to download from ${pkgUrl}: ${e.message}`);
             }
-
-            // 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();
-            debug(`Writing temporary zip file to ${zip}`);
-            fs.writeFileSync(zip, response.data);
-            debug(`Extracting zip file ${zip} to ${src}`);
-            (new AdmZip(zip)).extractAllTo(src);
-            rimraf.sync(zip);
-        } catch (e) {
-            error(e);
-            callback(`Could not install version ${opts.version} on your platform ${process.platform}/${process.arch}: ${e.message}`);
+        }
+        
+        if (!downloadSucceeded) {
+            callback(`Could not install version ${opts.version} on your platform ${process.platform}/${process.arch} from any repository.`);
+            return;
         }
     }