@mistydemeo/cargodisttest 0.2.249 → 0.2.251

package/binary-install.js

@@ -1,11 +1,10 @@
-const { createWriteStream, existsSync, mkdirSync, mkdtemp } = require("fs");
-const { join, sep } = require("path");
+const { existsSync, mkdirSync } = require("fs");
+const { join } = require("path");
 const { spawnSync } = require("child_process");
-const { tmpdir } = require("os");
 
 const axios = require("axios");
+const tar = require("tar");
 const rimraf = require("rimraf");
-const tmpDir = tmpdir();
 
 const error = (msg) => {
   console.error(msg);
@@ -13,7 +12,7 @@ const error = (msg) => {
 };
 
 class Package {
-  constructor(name, url, filename, zipExt, binaries) {
+  constructor(name, url, binaries) {
     let errors = [];
     if (typeof url !== "string") {
       errors.push("url must be a string");
@@ -49,8 +48,6 @@ class Package {
     }
     this.url = url;
     this.name = name;
-    this.filename = filename;
-    this.zipExt = zipExt;
     this.installDirectory = join(__dirname, "node_modules", ".bin_real");
     this.binaries = binaries;
 
@@ -93,59 +90,11 @@ class Package {
     return axios({ ...fetchOptions, url: this.url, responseType: "stream" })
       .then((res) => {
         return new Promise((resolve, reject) => {
-          mkdtemp(`${tmpDir}${sep}`, (err, directory) => {
-            let tempFile = join(directory, this.filename);
-            const sink = res.data.pipe(createWriteStream(tempFile));
-            sink.on("error", (err) => reject(err));
-            sink.on("close", () => {
-              if (/\.tar\.*/.test(this.zipExt)) {
-                const result = spawnSync("tar", [
-                  "xf",
-                  tempFile,
-                  // The tarballs are stored with a leading directory
-                  // component; we strip one component in the
-                  // shell installers too.
-                  "--strip-components",
-                  "1",
-                  "-C",
-                  this.installDirectory,
-                ]);
-                if (result.status == 0) {
-                  resolve();
-                } else if (result.error) {
-                  reject(result.error);
-                } else {
-                  reject(
-                    new Error(
-                      `An error occurred untarring the artifact: stdout: ${result.stdout}; stderr: ${result.stderr}`,
-                    ),
-                  );
-                }
-              } else if (this.zipExt == ".zip") {
-                const result = spawnSync("unzip", [
-                  "-q",
-                  tempFile,
-                  "-d",
-                  this.installDirectory,
-                ]);
-                if (result.status == 0) {
-                  resolve();
-                } else if (result.error) {
-                  reject(result.error);
-                } else {
-                  reject(
-                    new Error(
-                      `An error occurred unzipping the artifact: stdout: ${result.stdout}; stderr: ${result.stderr}`,
-                    ),
-                  );
-                }
-              } else {
-                reject(
-                  new Error(`Unrecognized file extension: ${this.zipExt}`),
-                );
-              }
-            });
-          });
+          const sink = res.data.pipe(
+            tar.x({ strip: 1, C: this.installDirectory }),
+          );
+          sink.on("finish", () => resolve());
+          sink.on("error", (err) => reject(err));
         });
       })
       .then(() => {

package/binary.js

@@ -94,9 +94,7 @@ const getPlatform = () => {
 const getPackage = () => {
   const platform = getPlatform();
   const url = `${artifactDownloadUrl}/${platform.artifactName}`;
-  let filename = platform.artifactName;
-  let ext = platform.zipExt;
-  let binary = new Package(name, url, filename, ext, platform.bins);
+  let binary = new Package(name, url, platform.bins);
 
   return binary;
 };

package/npm-shrinkwrap.json

@@ -11,7 +11,8 @@
         "axios-proxy-builder": "^0.1.2",
         "console.table": "^0.10.0",
         "detect-libc": "^2.0.3",
-        "rimraf": "^5.0.8"
+        "rimraf": "^5.0.8",
+        "tar": "^7.4.3"
       },
       "devDependencies": {
         "prettier": "^3.3.3"
@@ -23,7 +24,7 @@
       "hasInstallScript": true,
       "license": "MIT OR Apache-2.0",
       "name": "@mistydemeo/cargodisttest",
-      "version": "0.2.249"
+      "version": "0.2.251"
     },
     "node_modules/@isaacs/cliui": {
       "dependencies": {
@@ -42,6 +43,18 @@
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "version": "8.0.2"
     },
+    "node_modules/@isaacs/fs-minipass": {
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "version": "4.0.1"
+    },
     "node_modules/@pkgjs/parseargs": {
       "engines": {
         "node": ">=14"
@@ -116,6 +129,15 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "version": "2.0.1"
     },
+    "node_modules/chownr": {
+      "engines": {
+        "node": ">=18"
+      },
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "license": "BlueOak-1.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "version": "3.0.0"
+    },
     "node_modules/clone": {
       "engines": {
         "node": ">=0.8"
@@ -392,6 +414,34 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
       "version": "7.1.2"
     },
+    "node_modules/minizlib": {
+      "dependencies": {
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
+      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+      "version": "3.0.1"
+    },
+    "node_modules/mkdirp": {
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "version": "3.0.1"
+    },
     "node_modules/path-key": {
       "engines": {
         "node": ">=8"
@@ -584,6 +634,22 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "version": "5.0.1"
     },
+    "node_modules/tar": {
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "version": "7.4.3"
+    },
     "node_modules/tunnel": {
       "engines": {
         "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
@@ -708,8 +774,17 @@
       "license": "MIT",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "version": "6.0.1"
+    },
+    "node_modules/yallist": {
+      "engines": {
+        "node": ">=18"
+      },
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "license": "BlueOak-1.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "version": "5.0.0"
     }
   },
   "requires": true,
-  "version": "0.2.249"
+  "version": "0.2.251"
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "artifactDownloadUrl": "https://mistydemeo.artifacts.axodotdev.host/axolotlsay/ax_i5eHdMynHaZRNC42FPsCF",
+  "artifactDownloadUrl": "https://mistydemeo.artifacts.axodotdev.host/axolotlsay/ax_gciyAxKLvicVUQTvh_0ac",
   "bin": {
     "axolotlsay": "run-axolotlsay.js"
   },
@@ -8,7 +8,8 @@
     "axios-proxy-builder": "^0.1.2",
     "console.table": "^0.10.0",
     "detect-libc": "^2.0.3",
-    "rimraf": "^5.0.8"
+    "rimraf": "^5.0.8",
+    "tar": "^7.4.3"
   },
   "description": "💬 a CLI for learning to distribute CLIs in rust",
   "devDependencies": {
@@ -76,7 +77,7 @@
       "zipExt": ".tar.gz"
     }
   },
-  "version": "0.2.249",
+  "version": "0.2.251",
   "volta": {
     "node": "18.14.1",
     "npm": "9.5.0"