dprint 0.34.0 → 0.34.4

package/bin.js

@@ -10,7 +10,11 @@ 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(1);

package/info.json

@@ -1,11 +1,11 @@
 {
-  "version": "0.34.0",
+  "version": "0.34.4",
   "checksums": {
-    "windows-x86_64": "29da4f68d07cab10d0d90fdcf671c3ccdda15503ac5aa5c23c72534064b0e0b4",
-    "darwin-x86_64": "e9907275ab476897a72f99e279f137df0cea81b63a78da9367d3027ff072b18e",
-    "darwin-aarch64": "21a43b89adc42fc563371b6807642c8eb8669e75471a57bef67de99bd1bb7b75",
-    "linux-x86_64-gnu": "9bf233635ed8f0871fa7285ab40ea78c9216650073ad25ffec097b57738da268",
-    "linux-x86_64-musl": "227572fbcb761310dd21c2286fdc56a033f408919706895f7bf3913f241cf63a",
-    "linux-aarch64": "ef75ba1e02064a1f22184aab1888d0040e795e996c27c5339694e45cbad0500e"
+    "x86_64-pc-windows-msvc": "209e751b693f1c076fbd3d204af01bcb5c10be3f9dd99106bd14145e98de01fc",
+    "x86_64-apple-darwin": "74a1751e335ffde8385fb415365290b81d26f3509007a0cead1f62f8bb6d0e37",
+    "aarch64-apple-darwin": "bb052fa8f0cc995c09563adb07fb554a5386c2ed1152ba97a76734ed6ac55c4e",
+    "x86_64-unknown-linux-gnu": "3019e6bb9f1d97b1529e37808556715b38d43753bffeb12396fa06ea72156d9f",
+    "x86_64-unknown-linux-musl": "088d41a1b13b4623148119af9a3c2f618794170484294c210d5acd64f94a5cc6",
+    "aarch64-unknown-linux-gnu": "80607da90a920448d4361ad4993f7c5e770f3e8b6062d492ac00dd2eb558f256"
   }
 }

package/install_api.js

@@ -26,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";
 
@@ -38,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?
@@ -94,7 +94,7 @@ function install() {
       }
 
       https.get(url, options, function(response) {
-        if (response.statusCode >= 200 && response.statusCode <= 299) {
+        if (response.statusCode != null && response.statusCode >= 200 && response.statusCode <= 299) {
           downloadResponse(response).then(resolve).catch(reject);
         } else if (response.headers.location) {
           downloadZipFile(response.headers.location).then(resolve).catch(reject);
@@ -121,7 +121,7 @@ function install() {
             if (err) {
               reject(err);
             } else {
-              resolve();
+              resolve(undefined);
             }
           });
         });
@@ -130,18 +130,23 @@ function install() {
   }
 
   function getProxyUrl(requestUrl) {
-    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) {
+    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 (host == null || noProxyAddresses.indexOf(host) >= 0) {
+          return undefined;
+        }
+      }
+      return proxyUrl;
+    } catch (err) {
+      console.error("[dprint]: Error getting proxy url.", err);
+      return undefined;
     }
-    return proxyUrl;
   }
 
   function verifyZipChecksum() {
@@ -160,14 +165,11 @@ function install() {
     }
 
     function getExpectedZipChecksum() {
-      switch (os.platform()) {
-        case "win32":
-          return info.checksums["windows-x86_64"];
-        case "darwin":
-          return info.checksums[`darwin-${getArch()}`];
-        default:
-          return info.checksums[`linux-${getArch()}-${getLinuxFamily()}`];
+      const checksum = info.checksums[getTarget()];
+      if (checksum == null) {
+        throw new Error("Could not find checksum for target: " + checksum);
       }
+      return checksum;
     }
   }
 
@@ -202,7 +204,7 @@ function install() {
                     reject(err);
                   });
                   writeStream.on("finish", () => {
-                    resolve();
+                    resolve(undefined);
                   });
                 });
               }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dprint",
-  "version": "0.34.0",
+  "version": "0.34.4",
   "description": "Pluggable and configurable code formatting platform written in Rust.",
   "bin": "bin.js",
   "scripts": {