dprint 0.33.0 → 0.34.1

package/bin.js

@@ -10,32 +10,32 @@ const exePath = path.join(__dirname, os.platform() === "win32" ? "dprint.exe" :
 
 if (!fs.existsSync(exePath)) {
   require("./install_api").runInstall().then(() => {
-    runDprintExe();
+    // I'm not sure why (I think due zip extraction), but the executable
+    // doesn't seem fully ready unless waiting for the next tick
+    setTimeout(() => {
+      runDprintExe();
+    }, 0);
   }).catch(err => {
     console.error(err);
-    process.exit(child_process.exitCode || 1);
+    process.exit(1);
   });
 } else {
   runDprintExe();
 }
 
 function runDprintExe() {
-  try {
-    const result = child_process.spawnSync(
-      exePath,
-      process.argv.slice(2),
-      { stdio: "inherit" },
-    );
-    if (result.error) {
-      throw result.error;
-    }
+  const result = child_process.spawnSync(
+    exePath,
+    process.argv.slice(2),
+    { stdio: "inherit" },
+  );
+  if (result.error) {
+    throw result.error;
+  }
 
-    throwIfNoExePath();
+  throwIfNoExePath();
 
-    process.exitCode = result.status;
-  } catch (err) {
-    throw err;
-  }
+  process.exitCode = result.status;
 }
 
 function throwIfNoExePath() {

package/info.json

@@ -1,10 +1,11 @@
 {
-  "version": "0.33.0",
+  "version": "0.34.1",
   "checksums": {
-    "windows-x86_64": "98d3e6616e23cb9b2a969975b9c34b4b571e40725b0348d19cebedcb9c584be5",
-    "darwin-x86_64": "d4b502bb00bd4e3e19657092648883e8d8270de32f61a0ff78af7709dc70b9b2",
-    "darwin-aarch64": "df3a99c68d7229125040e720990d70fcec0e16b64e7ccba266f5771e2e9e7edd",
-    "linux-x86_64": "77c52e21df129e96a7860163029e267f38e705bc7be014b79668ad15f6e0c8e2",
-    "linux-aarch64": "9762ae7b175d68d853daed32a17580b0662a3a46402053d1770ee6e7f355b2e5"
+    "windows-x86_64": "a3a06a8d1a6a2801db11c605b603401c0e5ba8dbc0e65a55c666bdd89fbecddc",
+    "darwin-x86_64": "b7d1a456d34cffcf010820e3986b3ebd5d22614556a532dc57f4a25ed8bab6a1",
+    "darwin-aarch64": "1aae5c10fcdf4e554b8e75a0e2992eac731e15b8de0d9a2f6ed77d26524e5d5f",
+    "linux-x86_64-gnu": "43dd4bab71f3a70738670ef51f1e54c84b89405d9dfe5bec6ae5199ca20c93fe",
+    "linux-x86_64-musl": "dd5833178a7986acaeea8abbac687754f3ee7ce39371ac55c3e17113938027c9",
+    "linux-aarch64": "105c982071ae43c1e207231cd1516f714d29efd79d050f4415e3707d3baecd54"
   }
 }

package/install_api.js

@@ -1,12 +1,16 @@
 // @ts-check
 "use strict";
 
-const https = require("https");
-const fs = require("fs");
 const crypto = require("crypto");
+const fs = require("fs");
+const https = require("https");
 const os = require("os");
 const path = require("path");
+const url = require("url");
+const HttpsProxyAgent = require("https-proxy-agent");
 const yauzl = require("yauzl");
+/** @type {string | undefined} */
+let cachedIsMusl = undefined;
 
 function install() {
   const executableFilePath = path.join(
@@ -22,7 +26,7 @@ function install() {
   const zipFilePath = path.join(__dirname, "dprint.zip");
 
   const target = getTarget();
-  const url = "https://github.com/dprint/dprint/releases/download/"
+  const downloadUrl = "https://github.com/dprint/dprint/releases/download/"
     + info.version
     + "/dprint-" + target + ".zip";
 
@@ -34,7 +38,7 @@ function install() {
   }
 
   // now try to download it
-  return downloadZipFileWithRetries(url).then(() => {
+  return downloadZipFileWithRetries(downloadUrl).then(() => {
     verifyZipChecksum();
     return extractZipFile().then(() => {
       // todo: how to just +x? does it matter?
@@ -57,21 +61,9 @@ function install() {
     if (os.platform() === "win32") {
       return "x86_64-pc-windows-msvc";
     } else if (os.platform() === "darwin") {
-      if (os.arch() === "arm64") {
-        return "aarch64-apple-darwin";
-      } else if (os.arch() === "x64") {
-        return "x86_64-apple-darwin";
-      } else {
-        throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and M1 binaries are available.");
-      }
+      return `${getArch()}-apple-darwin`;
     } else {
-      if (os.arch() === "arm64") {
-        return "aarch64-unknown-linux-gnu";
-      } else if (os.arch() === "x64") {
-        return "x86_64-unknown-linux-gnu";
-      } else {
-        throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and aarch64 binaries are available.");
-      }
+      return `${getArch()}-unknown-linux-${getLinuxFamily()}`;
     }
   }
 
@@ -95,7 +87,13 @@ function install() {
 
   function downloadZipFile(url) {
     return new Promise((resolve, reject) => {
-      https.get(url, function(response) {
+      const options = {};
+      const proxyUrl = getProxyUrl(url);
+      if (proxyUrl != null) {
+        options.agent = new HttpsProxyAgent(proxyUrl);
+      }
+
+      https.get(url, options, function(response) {
         if (response.statusCode >= 200 && response.statusCode <= 299) {
           downloadResponse(response).then(resolve).catch(reject);
         } else if (response.headers.location) {
@@ -131,6 +129,26 @@ function install() {
     }
   }
 
+  function getProxyUrl(requestUrl) {
+    try {
+      const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+      if (typeof proxyUrl !== "string" || proxyUrl.length === 0) {
+        return undefined;
+      }
+      if (typeof process.env.NO_PROXY === "string") {
+        const noProxyAddresses = process.env.NO_PROXY.split(",");
+        const host = url.parse(requestUrl).host;
+        if (noProxyAddresses.indexOf(host) >= 0) {
+          return undefined;
+        }
+      }
+      return proxyUrl;
+    } catch (err) {
+      console.error("[dprint]: Error getting proxy url.", err);
+      return undefined;
+    }
+  }
+
   function verifyZipChecksum() {
     const fileData = fs.readFileSync(zipFilePath);
     const actualZipChecksum = crypto.createHash("sha256").update(fileData).digest("hex").toLowerCase();
@@ -151,17 +169,9 @@ function install() {
         case "win32":
           return info.checksums["windows-x86_64"];
         case "darwin":
-          if (os.arch() === "arm64") {
-            return info.checksums["darwin-aarch64"];
-          } else {
-            return info.checksums["darwin-x86_64"];
-          }
+          return info.checksums[`darwin-${getArch()}`];
         default:
-          if (os.arch() === "arm64") {
-            return info.checksums["linux-aarch64"];
-          } else {
-            return info.checksums["linux-x86_64"];
-          }
+          return info.checksums[`linux-${getArch()}-${getLinuxFamily()}`];
       }
     }
   }
@@ -211,6 +221,68 @@ function install() {
       });
     });
   }
+
+  function getArch() {
+    if (os.arch() === "arm64") {
+      return "aarch64";
+    } else if (os.arch() === "x64") {
+      return "x86_64";
+    } else {
+      throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and aarch64 binaries are available.");
+    }
+  }
+
+  function getLinuxFamily() {
+    return getIsMusl() ? "musl" : "gnu";
+
+    function getIsMusl() {
+      // code adapted from https://github.com/lovell/detect-libc
+      // Copyright Apache 2.0 license, the detect-libc maintainers
+      if (cachedIsMusl == null) {
+        cachedIsMusl = innerGet();
+      }
+      return cachedIsMusl;
+
+      function innerGet() {
+        try {
+          if (os.platform() !== "linux") {
+            return false;
+          }
+          return isProcessReportMusl() || isConfMusl();
+        } catch (err) {
+          // just in case
+          console.warn("Error checking if musl.", err);
+          return false;
+        }
+      }
+
+      function isProcessReportMusl() {
+        if (!process.report) {
+          return false;
+        }
+        const report = process.report.getReport();
+        if (!report || !(report.sharedObjects instanceof Array)) {
+          return false;
+        }
+        return report.sharedObjects.some(o => o.includes("libc.musl-") || o.includes("ld-musl-"));
+      }
+
+      function isConfMusl() {
+        const output = getCommandOutput();
+        const [_, ldd1] = output.split(/[\r\n]+/);
+        return ldd1 && ldd1.includes("musl");
+      }
+
+      function getCommandOutput() {
+        try {
+          const command = "getconf GNU_LIBC_VERSION 2>&1 || true; ldd --version 2>&1 || true";
+          return require("child_process").execSync(command, { encoding: "utf8" });
+        } catch (_err) {
+          return "";
+        }
+      }
+    }
+  }
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dprint",
-  "version": "0.33.0",
+  "version": "0.34.1",
   "description": "Pluggable and configurable code formatting platform written in Rust.",
   "bin": "bin.js",
   "scripts": {
@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/dprint/dprint#readme",
   "dependencies": {
+    "https-proxy-agent": "=5.0.1",
     "yauzl": "=2.10.0"
   }
 }