near-cli-rs 0.14.1 → 0.14.3

package/.gitignore

@@ -1 +1,2 @@
 /node_modules
+

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.14.3](https://github.com/near/near-cli-rs/compare/v0.14.2...v0.14.3) - 2024-08-21
+
+### Fixed
+- Fixed the fallback legacy keychain path ([#398](https://github.com/near/near-cli-rs/pull/398))
+
+## [0.14.2](https://github.com/near/near-cli-rs/compare/v0.14.1...v0.14.2) - 2024-08-21
+
+### Added
+- Upgraded cargo-dist to 0.21.1 and enabled Linux ARM64 build ([#397](https://github.com/near/near-cli-rs/pull/397))
+- Prioritize searching an access key in the signer account subfolder (<credentials-dir>/<network>/<account-id>/*.json) in legacy keychain and then fallback to <credentials-dir>/<network>/<account-id>.json instead of the other way around ([#396](https://github.com/near/near-cli-rs/pull/396))
+
+### Other
+- Fixed the one-liner curl installation command
+
 ## [0.14.1](https://github.com/near/near-cli-rs/compare/v0.14.0...v0.14.1) - 2024-08-15
 
 ### Fixed

package/README.md

@@ -35,7 +35,7 @@ https://github.com/user-attachments/assets/7d5d090e-4885-4c27-9d0f-045905952071
   <summary>Install via shell script (macOS, Linux, Windows/WSL)</summary>
 
 ```sh
-irm https://github.com/near/near-cli-rs/releases/latest/download/near-cli-rs-installer.ps1 | iex
+curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/latest/download/near-cli-rs-installer.sh | sh
 ```
 </details>
 

package/binary-install.js

@@ -0,0 +1,141 @@
+const { existsSync, mkdirSync } = require("fs");
+const { join } = require("path");
+const { spawnSync } = require("child_process");
+
+const axios = require("axios");
+const tar = require("tar");
+const rimraf = require("rimraf");
+
+const error = (msg) => {
+  console.error(msg);
+  process.exit(1);
+};
+
+class Package {
+  constructor(name, url, binaries) {
+    let errors = [];
+    if (typeof url !== "string") {
+      errors.push("url must be a string");
+    } else {
+      try {
+        new URL(url);
+      } catch (e) {
+        errors.push(e);
+      }
+    }
+    if (name && typeof name !== "string") {
+      errors.push("package name must be a string");
+    }
+    if (!name) {
+      errors.push("You must specify the name of your package");
+    }
+    if (binaries && typeof binaries !== "object") {
+      errors.push("binaries must be a string => string map");
+    }
+    if (!binaries) {
+      errors.push("You must specify the binaries in the package");
+    }
+
+    if (errors.length > 0) {
+      let errorMsg =
+        "One or more of the parameters you passed to the Binary constructor are invalid:\n";
+      errors.forEach((error) => {
+        errorMsg += error;
+      });
+      errorMsg +=
+        '\n\nCorrect usage: new Package("my-binary", "https://example.com/binary/download.tar.gz", {"my-binary": "my-binary"})';
+      error(errorMsg);
+    }
+    this.url = url;
+    this.name = name;
+    this.installDirectory = join(__dirname, "node_modules", ".bin_real");
+    this.binaries = binaries;
+
+    if (!existsSync(this.installDirectory)) {
+      mkdirSync(this.installDirectory, { recursive: true });
+    }
+  }
+
+  exists() {
+    for (const binaryName in this.binaries) {
+      const binRelPath = this.binaries[binaryName];
+      const binPath = join(this.installDirectory, binRelPath);
+      if (!existsSync(binPath)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  install(fetchOptions, suppressLogs = false) {
+    if (this.exists()) {
+      if (!suppressLogs) {
+        console.error(
+          `${this.name} is already installed, skipping installation.`,
+        );
+      }
+      return Promise.resolve();
+    }
+
+    if (existsSync(this.installDirectory)) {
+      rimraf.sync(this.installDirectory);
+    }
+
+    mkdirSync(this.installDirectory, { recursive: true });
+
+    if (!suppressLogs) {
+      console.error(`Downloading release from ${this.url}`);
+    }
+
+    return axios({ ...fetchOptions, url: this.url, responseType: "stream" })
+      .then((res) => {
+        return new Promise((resolve, reject) => {
+          const sink = res.data.pipe(
+            tar.x({ strip: 1, C: this.installDirectory }),
+          );
+          sink.on("finish", () => resolve());
+          sink.on("error", (err) => reject(err));
+        });
+      })
+      .then(() => {
+        if (!suppressLogs) {
+          console.error(`${this.name} has been installed!`);
+        }
+      })
+      .catch((e) => {
+        error(`Error fetching release: ${e.message}`);
+      });
+  }
+
+  run(binaryName, fetchOptions) {
+    const promise = !this.exists()
+      ? this.install(fetchOptions, true)
+      : Promise.resolve();
+
+    promise
+      .then(() => {
+        const [, , ...args] = process.argv;
+
+        const options = { cwd: process.cwd(), stdio: "inherit" };
+
+        const binRelPath = this.binaries[binaryName];
+        if (!binRelPath) {
+          error(`${binaryName} is not a known binary in ${this.name}`);
+        }
+        const binPath = join(this.installDirectory, binRelPath);
+        const result = spawnSync(binPath, args, options);
+
+        if (result.error) {
+          error(result.error);
+        }
+
+        process.exit(result.status);
+      })
+      .catch((e) => {
+        error(e.message);
+        process.exit(1);
+      });
+  }
+}
+
+module.exports.Package = Package;

package/binary.js

@@ -1,4 +1,4 @@
-const { Binary } = require("binary-install");
+const { Package } = require("./binary-install");
 const os = require("os");
 const cTable = require("console.table");
 const libc = require("detect-libc");
@@ -9,57 +9,37 @@ const error = (msg) => {
   process.exit(1);
 };
 
-const { version } = require("./package.json");
-const name = "near-cli-rs";
-const artifact_download_url = "https://github.com/near/near-cli-rs/releases/download/v0.14.1";
-
-const builder_glibc_major_version = 2;
-const builder_glibc_minor_version = 31;
-
-const supportedPlatforms = {
-  "aarch64-apple-darwin": {
-    "artifact_name": "near-cli-rs-aarch64-apple-darwin.tar.gz",
-    "bins": ["near"],
-    "zip_ext": ".tar.gz"
-  },
-  "x86_64-apple-darwin": {
-    "artifact_name": "near-cli-rs-x86_64-apple-darwin.tar.gz",
-    "bins": ["near"],
-    "zip_ext": ".tar.gz"
-  },
-  "x86_64-pc-windows-msvc": {
-    "artifact_name": "near-cli-rs-x86_64-pc-windows-msvc.tar.gz",
-    "bins": ["near.exe"],
-    "zip_ext": ".tar.gz"
-  },
-  "x86_64-unknown-linux-gnu": {
-    "artifact_name": "near-cli-rs-x86_64-unknown-linux-gnu.tar.gz",
-    "bins": ["near"],
-    "zip_ext": ".tar.gz"
-  }
-};
+const {
+  name,
+  artifactDownloadUrl,
+  supportedPlatforms,
+  glibcMinimum,
+} = require("./package.json");
+
+const builderGlibcMajorVersion = glibcMinimum.major;
+const builderGlibcMInorVersion = glibcMinimum.series;
 
 const getPlatform = () => {
-  const raw_os_type = os.type();
-  const raw_architecture = os.arch();
+  const rawOsType = os.type();
+  const rawArchitecture = os.arch();
 
   // We want to use rust-style target triples as the canonical key
   // for a platform, so translate the "os" library's concepts into rust ones
-  let os_type = "";
-  switch (raw_os_type) {
+  let osType = "";
+  switch (rawOsType) {
     case "Windows_NT":
-      os_type = "pc-windows-msvc";
+      osType = "pc-windows-msvc";
       break;
     case "Darwin":
-      os_type = "apple-darwin";
+      osType = "apple-darwin";
       break;
     case "Linux":
-      os_type = "unknown-linux-gnu"
+      osType = "unknown-linux-gnu";
       break;
   }
 
   let arch = "";
-  switch (raw_architecture) {
+  switch (rawArchitecture) {
     case "x64":
       arch = "x86_64";
       break;
@@ -68,70 +48,77 @@ const getPlatform = () => {
       break;
   }
 
-  if (raw_os_type === "Linux") {
-    if (libc.familySync() == 'musl') {
-      os_type = "unknown-linux-musl-dynamic";
+  if (rawOsType === "Linux") {
+    if (libc.familySync() == "musl") {
+      osType = "unknown-linux-musl-dynamic";
     } else if (libc.isNonGlibcLinuxSync()) {
-        console.warn("Your libc is neither glibc nor musl; trying static musl binary instead");
-        os_type = "unknown-linux-musl-static";
+      console.warn(
+        "Your libc is neither glibc nor musl; trying static musl binary instead",
+      );
+      osType = "unknown-linux-musl-static";
     } else {
-      let libc_version = libc.versionSync();
-      let split_libc_version = libc_version.split(".");
-      let libc_major_version = split_libc_version[0];
-      let libc_minor_version = split_libc_version[1];
+      let libcVersion = libc.versionSync();
+      let splitLibcVersion = libcVersion.split(".");
+      let libcMajorVersion = splitLibcVersion[0];
+      let libcMinorVersion = splitLibcVersion[1];
       if (
-        libc_major_version != builder_glibc_major_version ||
-        libc_minor_version < builder_glibc_minor_version
+        libcMajorVersion != builderGlibcMajorVersion ||
+        libcMinorVersion < builderGlibcMInorVersion
       ) {
         // We can't run the glibc binaries, but we can run the static musl ones
         // if they exist
-        console.warn("Your glibc isn't compatible; trying static musl binary instead");
-        os_type = "unknown-linux-musl-static";
+        console.warn(
+          "Your glibc isn't compatible; trying static musl binary instead",
+        );
+        osType = "unknown-linux-musl-static";
       }
     }
   }
 
   // Assume the above succeeded and build a target triple to look things up with.
   // If any of it failed, this lookup will fail and we'll handle it like normal.
-  let target_triple = `${arch}-${os_type}`;
-  let platform = supportedPlatforms[target_triple];
+  let targetTriple = `${arch}-${osType}`;
+  let platform = supportedPlatforms[targetTriple];
 
   if (!platform) {
     error(
-      `Platform with type "${raw_os_type}" and architecture "${raw_architecture}" is not supported by ${name}.\nYour system must be one of the following:\n\n${Object.keys(supportedPlatforms).join(",")}`
+      `Platform with type "${rawOsType}" and architecture "${rawArchitecture}" is not supported by ${name}.\nYour system must be one of the following:\n\n${Object.keys(
+        supportedPlatforms,
+      ).join(",")}`,
     );
   }
 
   return platform;
 };
 
-const getBinary = () => {
+const getPackage = () => {
   const platform = getPlatform();
-  const url = `${artifact_download_url}/${platform.artifact_name}`;
-
-  if (platform.bins.length > 1) {
-    // Not yet supported
-    error("this app has multiple binaries, which isn't yet implemented");
-  }
-  let binary = new Binary(platform.bins[0], url);
+  const url = `${artifactDownloadUrl}/${platform.artifactName}`;
+  let binary = new Package(name, url, platform.bins);
 
   return binary;
 };
 
 const install = (suppressLogs) => {
-  const binary = getBinary();
-  const proxy = configureProxy(binary.url);
+  if (!artifactDownloadUrl || artifactDownloadUrl.length === 0) {
+    console.warn("in demo mode, not installing binaries");
+    return;
+  }
+  const package = getPackage();
+  const proxy = configureProxy(package.url);
 
-  return binary.install(proxy, suppressLogs);
+  return package.install(proxy, suppressLogs);
 };
 
-const run = () => {
-  const binary = getBinary();
-  binary.run();
+const run = (binaryName) => {
+  const package = getPackage();
+  const proxy = configureProxy(package.url);
+
+  package.run(binaryName, proxy);
 };
 
 module.exports = {
   install,
   run,
-  getBinary,
+  getPackage,
 };