@ahqstore/cli 0.7.0 → 0.10.0

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ahqstore_cli_rs"
-version = "0.7.0"
+version = "0.10.0"
 description = "AHQ Store CLI"
 repository = "https://github.com/ahqstore/cli"
 homepage = "https://github.com/ahqstore/cli"
@@ -22,11 +22,6 @@ pkg-url = "{ repo }/releases/download/{ version }/{ name }-{ target }.zip"
 pkg-fmt = "zip"
 
 [dependencies]
-# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2", default-features = false, features = [
-  "napi4",
-], optional = true }
-napi-derive = { version = "2", optional = true }
 inquire = { version = "0", features = ["editor"] }
 chalk_rs = "1"
 lazy_static = "1"
@@ -39,17 +34,11 @@ image = { version = "0.25", default-features = false, features = [
   "rayon",
   "png",
 ] }
-rand = "0.8"
+rand = "0.9"
 
 [target.'cfg(unix)'.dependencies]
 openssl-sys = { version = "0.9", features = ["vendored"] }
 
-[build-dependencies]
-napi-build = { version = "2", optional = true }
-
 [profile.release]
 lto = true
 strip = "symbols"
-
-[features]
-node = ["dep:napi", "dep:napi-build", "dep:napi-derive"]

package/build.rs

@@ -1,8 +1,4 @@
-#[cfg(feature = "node")]
-extern crate napi_build;
-
+// Checking for targets
 fn main() {
-  // Ensures that users can download it too
-  #[cfg(feature = "node")]
-  napi_build::setup();
-}
+
+}

package/bundle.ps1

@@ -1,4 +1,13 @@
 mkdir dist
-cp ./target/release/ahqstore.exe ./dist/ahqstore.exe
-cp ./target/release/ahqstore.exe ./dist/ahqstore_cli_rs.exe
-compress-archive ./dist/* ./ahqstore_cli_rs-$env:TARGET
+
+Copy-Item "./target/$env:TARGET/release/ahqstore.exe" "./dist/ahqstore.exe" -ErrorAction Continue
+Copy-Item "./target/$env:TARGET/release/ahqstore.exe" "./dist/ahqstore_cli_rs.exe" -ErrorAction Continue
+
+Copy-Item "./target/$env:TARGET/release/ahqstore" "./dist/ahqstore" -ErrorAction Continue
+Copy-Item "./target/$env:TARGET/release/ahqstore" "./dist/ahqstore_cli_rs" -ErrorAction Continue
+
+compress-archive ./dist/* ./ahqstore_cli_rs-$env:TARGET
+
+Copy-Item "./target/$env:TARGET/release/ahqstore_cli_rs.dll" "./ahqstore_cli_rs-$env:TARGET.dll" -ErrorAction Continue
+Copy-Item "./target/$env:TARGET/release/libahqstore_cli_rs.so" "./libahqstore_cli_rs-$env:TARGET.so" -ErrorAction Continue
+Copy-Item "./target/$env:TARGET/release/libahqstore_cli_rs.dylib" "./libahqstore_cli_rs-$env:TARGET.dylib" -ErrorAction Continue

package/js/cli.js

@@ -0,0 +1,99 @@
+#! /usr/bin/env node
+// @ts-check
+
+import { existsSync, mkdirSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { argv, env, platform } from "node:process";
+
+import { downloadModuleWithProgress } from "./download.js";
+
+import c from "ansi-colors";
+
+import koffi from "koffi";
+
+import pkg from "../package.json" with { type: "json" };
+
+export function getPrefixSuffix() {
+  let prefix = "";
+  let suffix = "";
+
+  switch (platform) {
+    case "win32":
+      suffix = ".dll";
+      break;
+    case "darwin":
+      prefix = "lib";
+      suffix = ".dylib";
+      break;
+    case "linux":
+      prefix = "lib";
+      suffix = ".so";
+      break;
+    default:
+      prefix = "lib";
+      suffix = ".so";
+      console.warn(c.yellow("We're guessing a UNIX compatible system."));
+  }
+
+  return { prefix, suffix };
+}
+
+/**
+ * @param {string} name
+ */
+function getLibraryFilename(name) {
+  const { prefix, suffix } = getPrefixSuffix();
+
+  return `${prefix}${name}${suffix}`;
+}
+
+console.log(import.meta.dirname);
+
+const dylibDir = join(import.meta.dirname, "lib");
+
+if (!existsSync(dylibDir)) {
+  console.warn(
+    c.red.redBright(
+      "Binary not found, downloading AHQ Store CLI Binary for this version",
+    ),
+  );
+
+  mkdirSync(dylibDir);
+}
+
+const dylib = join(dylibDir, getLibraryFilename("ahqstore_cli_rs"));
+
+let dlib = koffi.load(dylib);
+
+const ver = dlib.func("get_ver", "str", []);
+
+/**
+ * Note that we've leaked some memory here
+ * @type {string}
+ */
+const output = ver();
+
+if (output != pkg.version) {
+  console.warn(c.red.yellowBright("We need to update binaries..."));
+
+  // Unload current one
+  dlib.unload();
+
+  rmSync(dylib);
+
+  /// Download
+  // TODO: Load newer
+
+  // Load newer
+  dlib = koffi.load(dylib);
+}
+
+dlib.func("init_args", "void", [])();
+
+const pushArg = dlib.func("add_arg", "void", ["str"]);
+
+argv.slice(2).forEach((a) => {
+  pushArg(a);
+});
+
+dlib.func("node_entrypoint", "void", ["bool"])(env["CI"] == "true");

package/js/download.js

@@ -0,0 +1,29 @@
+// @ts-check
+
+import { SingleBar } from "cli-progress";
+import c from "ansi-colors";
+
+import pkg from "../package.json" with { type: "json" };
+import { getPrefixSuffix } from "./cli.js";
+import { getRustTarget } from "./rust.js";
+
+const bar = new SingleBar({
+  format:
+    "Downloading |" + c.cyan("{bar}") + "| {percentage}% || {value}/{total} KB",
+  barCompleteChar: "\u2588",
+  barIncompleteChar: "\u2591",
+  hideCursor: true,
+});
+
+bar.start(300, 0);
+
+bar.increment();
+bar.update(20);
+
+async function getDownload() {
+  const { prefix, suffix } = getPrefixSuffix();
+
+  return `https://github.com/ahqstore/cli/releases/download/${pkg.version}/${prefix}ahqstore_cli_rs-${getRustTarget()}.${suffix}`;
+}
+
+export async function downloadModuleWithProgress() {}

package/js/postinstall.js

@@ -0,0 +1,29 @@
+import { getRustTarget } from "./rust.js";
+
+import { platform, arch } from "node:process";
+
+import c from "ansi-colors";
+
+try {
+  const target = getRustTarget();
+
+  console.log(c.green(`Supported Target found: `) + c.yellow(`${target}`));
+  console.warn(
+    c.yellow(
+      "The cli will download the supported binaries the first time it loads."
+    )
+  );
+} catch (_) {
+  console.error(
+    c.redBright(
+      `ERROR: Your OS is not supported for the cli: ${platform}-${arch} has no binaries available right now`
+    )
+  );
+  console.error(
+    c.yellowBright(
+      `Want to get support for your target? Head over to https://github.com/ahqstore/cli/issues`
+    )
+  );
+
+  process.exit(1);
+}

package/js/rust.js

@@ -0,0 +1,37 @@
+/**
+ * Maps the Node.js platform and architecture to a Rust target triple.
+ * @returns {string} The Rust target triple (e.g., 'x86_64-pc-windows-msvc').
+ * @throws {Error} If the platform/architecture combination is not supported.
+ */
+export function getRustTarget() {
+  const os = process.platform;
+  const arch = process.arch;
+
+  if (os === "win32") {
+    if (arch === "ia32") {
+      return "i686-pc-windows-msvc";
+    } else if (arch === "x64") {
+      return "x86_64-pc-windows-msvc";
+    } else if (arch === "arm64") {
+      return "aarch64-pc-windows-msvc";
+    }
+  } else if (os === "darwin") {
+    if (arch === "x64") {
+      return "x86_64-apple-darwin";
+    } else if (arch === "arm64") {
+      return "aarch64-apple-darwin";
+    }
+  } else if (os === "linux") {
+    if (arch === "ia32") {
+      return "i686-unknown-linux-gnu";
+    } else if (arch === "x64") {
+      return "x86_64-unknown-linux-gnu";
+    } else if (arch === "arm") {
+      return "armv7-unknown-linux-gnueabihf";
+    } else if (arch === "arm64") {
+      return "aarch64-unknown-linux-gnu";
+    }
+  }
+
+  throw new Error(`Unsupported platform: ${os} ${arch}`);
+}

package/package.json

@@ -1,53 +1,36 @@
 {
   "name": "@ahqstore/cli",
-  "version": "0.7.0",
-  "readme": "./README.md",
-  "napi": {
-    "name": "cli",
-    "triples": {
-      "additional": [
-        "aarch64-apple-darwin",
-        "aarch64-unknown-linux-gnu",
-        "aarch64-pc-windows-msvc",
-        "i686-pc-windows-msvc",
-        "universal-apple-darwin",
-        "riscv64gc-unknown-linux-gnu"
-      ]
-    }
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "@napi-rs/cli": "^2.18.4"
-  },
-  "ava": {
-    "timeout": "3m"
-  },
-  "engines": {
-    "node": ">= 10"
+  "version": "0.10.0",
+  "description": "AHQ Store Official CLI, A port of the rust version to NodeJS",
+  "keywords": [
+    "cli",
+    "ahqstore",
+    "management"
+  ],
+  "homepage": "https://github.com/ahqstore/cli#readme",
+  "bugs": {
+    "url": "https://github.com/ahqstore/cli/issues"
   },
   "repository": {
-    "url": "https://github.com/ahqstore/cli"
+    "type": "git",
+    "url": "git+https://github.com/ahqstore/cli.git"
   },
+  "license": "MIT",
+  "author": "AHQ Softwares <ahqsecret@gmail.com>",
+  "type": "module",
   "bin": {
-    "ahqstore": "./index.js"
+    "ahqstore": "./js/cli.js"
   },
+  "readme": "README.md",
   "scripts": {
-    "artifacts": "napi artifacts",
-    "build": "napi build --platform --release --features node",
-    "build:debug": "napi build --platform --features node",
-    "prepublishOnly": "napi prepublish -t npm",
-    "universal": "napi universal",
-    "version": "napi version"
+    "postinstall": "node js/postinstall.js"
   },
-  "optionalDependencies": {
-    "@ahqstore/cli-win32-x64-msvc": "0.7.0",
-    "@ahqstore/cli-darwin-x64": "0.7.0",
-    "@ahqstore/cli-linux-x64-gnu": "0.7.0",
-    "@ahqstore/cli-darwin-arm64": "0.7.0",
-    "@ahqstore/cli-linux-arm64-gnu": "0.7.0",
-    "@ahqstore/cli-win32-arm64-msvc": "0.7.0",
-    "@ahqstore/cli-win32-ia32-msvc": "0.7.0",
-    "@ahqstore/cli-darwin-universal": "0.7.0",
-    "@ahqstore/cli-linux-riscv64-gnu": "0.7.0"
+  "dependencies": {
+    "ansi-colors": "^4.1.3",
+    "cli-progress": "^3.12.0",
+    "koffi": "^2.14.0"
+  },
+  "engines": {
+    "node": ">=22"
   }
-}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - koffi

package/index.js

@@ -1,182 +0,0 @@
-#!/usr/bin/env node
-
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-/* auto-generated by NAPI-RS */
-/* and modified by @ahqsoftwares */
-
-const { existsSync, readFileSync } = require('fs')
-const { join } = require("path");
-
-const { platform, arch } = process;
-
-let nativeBinding = null;
-let localFileExisted = false;
-let loadError = null;
-
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== "function") {
-    try {
-      const lddPath = require("child_process")
-        .execSync("which ldd")
-        .toString()
-        .trim();
-      return readFileSync(lddPath, "utf8").includes("musl");
-    } catch (e) {
-      return true;
-    }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header;
-    return !glibcVersionRuntime;
-  }
-}
-
-switch (platform) {
-  case "win32":
-    switch (arch) {
-      case "x64":
-        localFileExisted = existsSync(
-          join(__dirname, "cli.win32-x64-msvc.node")
-        );
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.win32-x64-msvc.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-win32-x64-msvc");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      case "ia32":
-        localFileExisted = existsSync(
-          join(__dirname, "cli.win32-ia32-msvc.node")
-        );
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.win32-ia32-msvc.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-win32-ia32-msvc");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      case "arm64":
-        localFileExisted = existsSync(
-          join(__dirname, "cli.win32-arm64-msvc.node")
-        );
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.win32-arm64-msvc.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-win32-arm64-msvc");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`);
-    }
-    break;
-  case "darwin":
-    localFileExisted = existsSync(join(__dirname, "cli.darwin-universal.node"));
-    try {
-      if (localFileExisted) {
-        nativeBinding = require("./cli.darwin-universal.node");
-      } else {
-        nativeBinding = require("@ahqstore/cli-darwin-universal");
-      }
-      break;
-    } catch {}
-    switch (arch) {
-      case "x64":
-        localFileExisted = existsSync(join(__dirname, "cli.darwin-x64.node"));
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.darwin-x64.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-darwin-x64");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      case "arm64":
-        localFileExisted = existsSync(join(__dirname, "cli.darwin-arm64.node"));
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.darwin-arm64.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-darwin-arm64");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`);
-    }
-    break;
-  case "linux":
-    switch (arch) {
-      case "x64":
-        if (isMusl()) {
-          throw new Error("MUSL Bindings are not supported!");
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, "cli.linux-x64-gnu.node")
-          );
-          try {
-            if (localFileExisted) {
-              nativeBinding = require("./cli.linux-x64-gnu.node");
-            } else {
-              nativeBinding = require("@ahqstore/cli-linux-x64-gnu");
-            }
-          } catch (e) {
-            loadError = e;
-          }
-        }
-        break;
-      case "arm64":
-        if (isMusl()) {
-          throw new Error("MUSL Bindings are not supported!");
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, "cli.linux-arm64-gnu.node")
-          );
-          try {
-            if (localFileExisted) {
-              nativeBinding = require("./cli.linux-arm64-gnu.node");
-            } else {
-              nativeBinding = require("@ahqstore/cli-linux-arm64-gnu");
-            }
-          } catch (e) {
-            loadError = e;
-          }
-        }
-        break;
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`);
-    }
-    break;
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
-}
-
-if (!nativeBinding) {
-  if (loadError) {
-    throw loadError;
-  }
-  throw new Error(`Failed to load native binding`);
-}
-
-const { nodeEntrypoint } = nativeBinding;
-
-const args = process.argv.slice(2) || [];
-
-nodeEntrypoint(args, process.env["GH_ACTION"] != null);

package/src/app/build/config.rs

@@ -1,54 +0,0 @@
-use std::{env, fs, process};
-
-use serde_json::from_str;
-
-use crate::app::{
-  shared::{Config, Finder, IMetadata},
-  ERR,
-};
-
-use super::{GHAsset, GHRelease};
-
-pub fn get_config<'a>() -> IMetadata<'a> {
-  let Ok(config) = fs::read_to_string("./.ahqstore/config.json") else {
-    ERR.println(&"Unable to read config file!");
-    process::exit(1);
-  };
-  let config = config.leak();
-  let Ok(mut config) = from_str::<'a, Config>(config) else {
-    ERR.println(&"Unable to read config file!");
-    process::exit(1);
-  };
-
-  if let Ok(app_id) = env::var("APP_ID") {
-    config.remove(&app_id).expect("Key not present in JSON")
-  } else {
-    config.into_values().nth(0).expect("No Key present in JSON")
-  }
-}
-
-pub fn find_assets<'a>(gh_r: &'a GHRelease, finder: &'a Finder) -> Vec<&'a GHAsset> {
-  gh_r
-    .assets
-    .iter()
-    .filter(|a| {
-      if let Some(x) = finder.startsWith {
-        if !a.name.starts_with(&x) {
-          return false;
-        }
-      }
-      if let Some(x) = finder.contains {
-        if !a.name.contains(&x) {
-          return false;
-        }
-      }
-      if let Some(x) = finder.endsWith {
-        if !a.name.ends_with(&x) {
-          return false;
-        }
-      }
-
-      true
-    })
-    .collect::<Vec<_>>()
-}

package/src/app/build/icon.rs

@@ -1,47 +0,0 @@
-use crate::app::ERR;
-use image::{load_from_memory_with_format as load_img, ImageFormat};
-use std::fs;
-use std::process;
-
-pub fn get_icon(uid: &str) -> Vec<u8> {
-  let base_img = format!("./.ahqstore/images/{uid}/icon.png");
-
-  let Ok(icon) = fs::read(&base_img) else {
-    ERR.println(&"Unable to read icon file!");
-    process::exit(1);
-  };
-
-  validate_png(&icon);
-
-  icon
-}
-
-pub fn get_images(uid: &str) -> Vec<Vec<u8>> {
-  let base_img = format!("./.ahqstore/images/{uid}");
-
-  let Ok(image_dir) = fs::read_dir(&base_img) else {
-    ERR.println(&"Unable to read image dir!");
-    process::exit(1);
-  };
-
-  let mut entries = image_dir
-    .map(|res| res.expect("Unable to unwrap dir entry").path())
-    .filter(|f| !f.ends_with("icon.png"))
-    .map(|res| fs::read(res).expect("Unable to read bytes"))
-    .map(|img| {
-      validate_png(&img);
-      return img;
-    })
-    .collect::<Vec<_>>();
-
-  entries.truncate(10);
-
-  entries
-}
-
-pub fn validate_png(data: &Vec<u8>) {
-  let Ok(_) = load_img(&data, ImageFormat::Png) else {
-    ERR.println(&"Invalid PNG");
-    process::exit(1);
-  };
-}