dprint 0.26.0 → 0.28.0

package/info.json

@@ -1,9 +1,9 @@
 {
-  "version": "0.26.0",
+  "version": "0.28.0",
   "checksums": {
-    "windows-x86_64": "40a128d102db1e74d65c33d497eaa4d85963b2ea21245dd29d6ade06bb93bbda",
-    "darwin-x86_64": "b7c2acc90f4cb5647e1c8130420d72253797793f3decca16153fef3f17eef2e3",
-    "darwin-aarch64": "fec96023e3be1646d44f890b0458e99b4caced6e3d79e185c62f012100f987af",
-    "linux-x86_64": "d192142a310044178be97064f858f5a9327d73e6ee0ed6bc6b5a90378bf0f606"
+    "windows-x86_64": "7a9ebfdd87e31b67432315364430a4b07792bc1aa2ce21ef53b1eb92fcbf060a",
+    "darwin-x86_64": "ecabf3729a31f8d8c64d14e8ce841c1638f0b6a60bdc28c147a8462b6b9f1aad",
+    "darwin-aarch64": "3d05c3825cdaa3b091c7a768c06b432159f4eba56d6c0ddcf2632198c74afd7b",
+    "linux-x86_64": "c53ff412c826749a3ff7a1c13265bd2012e03130600868656bb3d43c23e9768c"
   }
 }

package/install.js

@@ -1,40 +1,170 @@
 // @ts-check
 "use strict";
 
+const https = require("https");
 const fs = require("fs");
+const crypto = require("crypto");
 const os = require("os");
 const path = require("path");
-const child_process = require("child_process");
+const yauzl = require("yauzl");
+
 const info = JSON.parse(fs.readFileSync(path.join(__dirname, "info.json"), "utf8"));
+const executableFilePath = path.join(
+  __dirname,
+  os.platform() === "win32" ? "dprint.exe" : "dprint",
+);
+const zipFilePath = path.join(__dirname, "dprint.zip");
 
-if (!isM1Mac() && os.arch() !== "x64") {
-  throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and M1 binaries are available.");
+if (fs.existsSync(executableFilePath)) {
+  process.exit(0);
 }
 
-if (os.platform() === "win32") {
-  if (!fs.existsSync("dprint.exe")) {
-    const result = child_process.spawnSync("powershell.exe", [
-      "-noprofile",
-      "-file",
-      path.join(__dirname, "install.ps1"),
-      info.version,
-    ], {
-      stdio: "inherit",
-      cwd: __dirname,
-    });
-    process.exitCode = result.status;
+const target = getTarget();
+const url = "https://github.com/dprint/dprint/releases/download/"
+  + info.version
+  + "/dprint-" + target + ".zip";
+
+// remove the old zip file if it exists
+try {
+  fs.unlinkSync(zipFilePath);
+} catch (err) {
+  // ignore
+}
+
+// now try to download it
+downloadZipFile(url).then(() => {
+  verifyZipChecksum();
+  extractZipFile().then(() => {
+    // todo: how to just +x? does it matter?
+    fs.chmodSync(executableFilePath, 0o755);
+
+    // delete the zip file
+    try {
+      fs.unlinkSync(zipFilePath);
+    } catch (err) {
+      // ignore
+    }
+  }).catch(err => {
+    console.error("Error extracting dprint zip file.", err);
+    process.exit(1);
+  });
+}).catch(err => {
+  console.error("Error downloading dprint zip file.", err);
+  process.exit(1);
+});
+
+function getTarget() {
+  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.");
+    }
+  } else {
+    return "x86_64-unknown-linux-gnu";
   }
-} else {
-  if (!fs.existsSync("dprint")) {
-    const installScriptPath = path.join(__dirname, "install.sh");
-    fs.chmodSync(installScriptPath, "755");
-    child_process.execSync(`"${installScriptPath}" ${info.version}`, {
-      stdio: "inherit",
-      cwd: __dirname,
+}
+
+function downloadZipFile(url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, function(response) {
+      if (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);
+      } else {
+        reject(new Error("Unknown status code " + response.statusCode + " : " + response.statusMessage));
+      }
+    }).on("error", function(err) {
+      try {
+        fs.unlinkSync(zipFilePath);
+      } catch (err) {
+        // ignore
+      }
+      reject(err);
+    });
+  });
+
+  /** @param response {import("http").IncomingMessage} */
+  function downloadResponse(response) {
+    return new Promise((resolve, reject) => {
+      const file = fs.createWriteStream(zipFilePath);
+      response.pipe(file);
+      file.on("finish", function() {
+        file.close((err) => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve();
+          }
+        });
+      });
     });
   }
 }
 
-function isM1Mac() {
-  return os.arch() === "arm64" && os.platform() === "darwin";
+function verifyZipChecksum() {
+  const fileData = fs.readFileSync(zipFilePath);
+  const actualZipChecksum = crypto.createHash("sha256").update(fileData).digest("hex").toLowerCase();
+  const expectedZipChecksum = getExpectedZipChecksum().toLowerCase();
+
+  if (actualZipChecksum !== expectedZipChecksum) {
+    console.error(
+      "Downloaded dprint zip checksum did not match the expected checksum (Actual: "
+        + actualZipChecksum
+        + ", Expected: "
+        + expectedZipChecksum
+        + ").",
+    );
+    process.exit(1);
+  }
+
+  function getExpectedZipChecksum() {
+    switch (os.platform()) {
+      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"];
+        }
+      default:
+        return info.checksums["linux-x86_64"];
+    }
+  }
+}
+
+function extractZipFile() {
+  return new Promise((resolve, reject) => {
+    // code adapted from: https://github.com/thejoshwolfe/yauzl#usage
+    yauzl.open(zipFilePath, { autoClose: true }, (err, zipFile) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+
+      zipFile.on("entry", (entry) => {
+        if (!/\/$/.test(entry.fileName)) {
+          // file entry
+          zipFile.openReadStream(entry, (err, readStream) => {
+            if (err) {
+              reject(err);
+              return;
+            }
+            const destination = path.join(__dirname, entry.fileName);
+            readStream.pipe(fs.createWriteStream(destination));
+          });
+        }
+      });
+
+      zipFile.once("close", function() {
+        resolve();
+      });
+    });
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dprint",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "description": "Pluggable and configurable code formatting platform written in Rust.",
   "bin": "bin.js",
   "scripts": {
@@ -19,5 +19,8 @@
   "bugs": {
     "url": "https://github.com/dprint/dprint/issues"
   },
-  "homepage": "https://github.com/dprint/dprint#readme"
+  "homepage": "https://github.com/dprint/dprint#readme",
+  "dependencies": {
+    "yauzl": "=2.10.0"
+  }
 }

package/install.ps1

@@ -1,33 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = 'Stop'
-
-$Version = $args.Get(0)
-$DprintZip = "dprint.zip"
-$DprintExe = "dprint.exe"
-$Target = 'x86_64-pc-windows-msvc'
-$DprintUri = "https://github.com/dprint/dprint/releases/download/$Version/dprint-${Target}.zip"
-
-# GitHub requires TLS 1.2
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-# download zip
-Invoke-WebRequest $DprintUri -OutFile $DprintZip -UseBasicParsing
-
-# verify zip checksum
-& node install_verify_checksum.js
-if ($LASTEXITCODE -ne 0) { throw "[dprint]: Checksum verification failed." }
-
-# extract executable
-if (Get-Command Expand-Archive -ErrorAction SilentlyContinue) {
-  Expand-Archive $DprintZip -Destination $PSScriptRoot -Force
-} else {
-  if (Test-Path $DprintExe) {
-    Remove-Item $DprintExe
-  }
-  Add-Type -AssemblyName System.IO.Compression.FileSystem
-  [IO.Compression.ZipFile]::ExtractToDirectory($DprintZip)
-}
-
-# remove zip
-Remove-Item $DprintZip

package/install.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-
-if ! command -v unzip >/dev/null; then
-	echo "Error: unzip is required to install dprint." 1>&2
-	exit 1
-fi
-
-case $(uname -sm) in
-"Darwin x86_64") target="x86_64-apple-darwin" ;;
-"Darwin arm64") target="aarch64-apple-darwin" ;;
-*) target="x86_64-unknown-linux-gnu" ;;
-esac
-
-dprint_uri="https://github.com/dprint/dprint/releases/download/${1}/dprint-${target}.zip"
-exe="dprint"
-
-# download
-curl --fail --location --progress-bar --output "$exe.zip" "$dprint_uri"
-
-# verify zip checksum
-node install_verify_checksum.js
-
-# unzip
-unzip -o "$exe.zip"
-chmod +x "$exe"
-rm "$exe.zip"

package/install_verify_checksum.js

@@ -1,38 +0,0 @@
-// @ts-check
-"use strict";
-
-const fs = require("fs");
-const crypto = require("crypto");
-const os = require("os");
-const path = require("path");
-
-const info = JSON.parse(fs.readFileSync(path.join(__dirname, "info.json"), "utf8"));
-const fileData = fs.readFileSync("dprint.zip");
-const actualZipChecksum = crypto.createHash("sha256").update(fileData).digest("hex").toLowerCase();
-const expectedZipChecksum = getExpectedZipChecksum().toLowerCase();
-
-if (actualZipChecksum !== expectedZipChecksum) {
-  console.error(
-    "Downloaded dprint zip checksum did not match the expected checksum (Actual: "
-      + actualZipChecksum
-      + ", Expected: "
-      + expectedZipChecksum
-      + ").",
-  );
-  process.exit(1);
-}
-
-function getExpectedZipChecksum() {
-  switch (os.platform()) {
-    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"];
-      }
-    default:
-      return info.checksums["linux-x86_64"];
-  }
-}