@ahqstore/cli 0.7.0 → 0.10.1

package/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "python-envs.defaultEnvManager": "ms-python.python:system",
+  "python-envs.pythonProjects": []
+}

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ahqstore_cli_rs"
-version = "0.7.0"
+version = "0.10.1"
 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 SilentlyContinue
+Copy-Item "./target/$env:TARGET/release/ahqstore.exe" "./dist/ahqstore_cli_rs.exe" -ErrorAction SilentlyContinue
+
+Copy-Item "./target/$env:TARGET/release/ahqstore" "./dist/ahqstore" -ErrorAction SilentlyContinue
+Copy-Item "./target/$env:TARGET/release/ahqstore" "./dist/ahqstore_cli_rs" -ErrorAction SilentlyContinue
+
+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 SilentlyContinue
+Copy-Item "./target/$env:TARGET/release/libahqstore_cli_rs.so" "./libahqstore_cli_rs-$env:TARGET.so" -ErrorAction SilentlyContinue
+Copy-Item "./target/$env:TARGET/release/libahqstore_cli_rs.dylib" "./libahqstore_cli_rs-$env:TARGET.dylib" -ErrorAction SilentlyContinue

package/go/go.mod

@@ -0,0 +1,3 @@
+module ahqstore/cli/go
+
+go 1.25.1

package/go/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("Welcome from Go")
+}

package/js/cli.js

@@ -0,0 +1,132 @@
+#! /usr/bin/env node
+// @ts-check
+
+import { join } from "node:path";
+import { existsSync, mkdirSync, rmSync } from "node:fs";
+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}`;
+}
+
+const dylibDir = join(import.meta.dirname, "lib");
+const dylib = join(dylibDir, getLibraryFilename("ahqstore_cli_rs"));
+
+if (!(existsSync(dylibDir) && existsSync(dylib))) {
+  console.warn(
+    c.red.redBright(
+      "Binary not found, downloading AHQ Store CLI Binary for this version",
+    ),
+  );
+
+  try {
+    rmSync(dylib);
+  } catch(_) {}
+  try {
+    mkdirSync(dylibDir);
+  } catch (_) {}
+
+  await downloadModuleWithProgress(dylib);
+}
+
+let dlib;
+
+try {
+  dlib = koffi.load(dylib);
+} catch (_) {
+  console.warn(
+    c.red.redBright(
+      "Binary is corrupted, downloading AHQ Store CLI Binary for this version",
+    ),
+  );
+
+    try {
+    rmSync(dylib);
+  } catch(_) {}
+  try {
+    mkdirSync(dylibDir);
+  } catch (_) {}
+
+  await downloadModuleWithProgress(dylib);
+
+  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();
+
+  try {
+    rmSync(dylib);
+  } catch(_) {}
+  try {
+    mkdirSync(dylibDir);
+  } catch (_) {}
+
+  /// Download
+  await downloadModuleWithProgress(dylib);
+
+  // 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);
+});
+
+// Clear the console output
+console.clear();
+
+dlib.func("node_entrypoint", "void", ["bool"])(env["CI"] == "true");

package/js/download.js

@@ -0,0 +1,87 @@
+// @ts-check
+
+import { SingleBar } from "cli-progress";
+import { getPrefixSuffix } from "./cli.js";
+import { getRustTarget } from "./rust.js";
+import { createWriteStream } from "node:fs";
+
+import c from "ansi-colors";
+import pkg from "../package.json" with { type: "json" };
+
+const bar = new SingleBar({
+  format:
+    "Downloading |" + c.cyan("{bar}") + "| {percentage}% | {value}/{total} KB",
+  barCompleteChar: "\u2588",
+  barIncompleteChar: "\u2591",
+  hideCursor: true,
+});
+
+function getDownload() {
+  const { prefix, suffix } = getPrefixSuffix();
+
+  return `https://github.com/ahqstore/cli/releases/download/${pkg.version}/${prefix}ahqstore_cli_rs-${getRustTarget()}${suffix}`;
+}
+
+/**
+ * 
+ * @param {number} ms 
+ * @returns {Promise<undefined>}
+ */
+const delay = (ms) => new Promise((resolve) => setTimeout(() => resolve(undefined), ms));
+
+/**
+ * 
+ * @param {string} file 
+ * @returns {Promise<undefined>}
+ */
+export async function downloadModuleWithProgress(file) {
+  const download = getDownload();
+
+  const stream = createWriteStream(file, {
+    autoClose: true,
+    flush: true
+  });
+
+  const res = await fetch(
+    download,
+    {
+      headers: {
+        "user-agent": "Downloader"
+      }
+    }
+  );
+
+  const bytes = parseInt(res.headers.get("content-length") || "0");
+  const kb = Math.round(bytes / 1024);
+
+  bar.start(kb, 0);
+
+  const reader = res.body?.getReader()
+
+  let curr = 0;
+
+  while (true) {
+    const buf = await reader?.read();
+
+    if (!buf || !buf.value) {
+      bar.update(kb);
+      bar.stop();
+
+      await new Promise((resolve) => {
+        stream.on('close', () => resolve(undefined));
+        stream.end();
+      });
+      break;
+    }
+
+    const toAdd = buf.value.length || 0;
+
+    curr += Math.round(toAdd / 1024);
+
+    bar.update(curr);
+
+    stream.write(buf.value);
+
+    await delay(1);
+  }
+}

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.1",
+  "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/python/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "python-envs.defaultEnvManager": "ms-python.python:system",
+  "python-envs.pythonProjects": []
+}

package/python/cli.py

@@ -0,0 +1,124 @@
+from cffi import FFI
+from pathlib import Path
+from requests import get
+
+import importlib.metadata
+
+import os
+import platform
+import sys
+
+ffi = FFI()
+
+ffi.cdef("""
+  char* get_ver();
+  void init_args();
+  void add_arg(char*);
+  void node_entrypoint(bool);
+""")
+
+ver = importlib.metadata.version("ahqstore-cli")
+
+def rust_target():
+  os = platform.system().lower()
+  arch = platform.machine().lower()
+
+  if os == "windows":
+    if arch == "i686":
+      return "i686-pc-windows-msvc"
+    elif arch in ("x86_64", "amd64"):
+      return "x86_64-pc-windows-msvc"
+    elif arch == "aarch64":
+      return "aarch64-pc-windows-msvc"
+  elif os == "darwin":
+    if arch in ("x86_64", "amd64"):
+      return "x86_64-apple-darwin"
+    elif arch == "aarch64":
+      return "aarch64-apple-darwin"
+  elif os == "linux":
+    if arch == "i686":
+      return "i686-unknown-linux-gnu"
+    elif arch in ("x86_64", "amd64"):
+      return "x86_64-unknown-linux-gnu"
+    elif arch == "armv7l":
+      return "armv7-unknown-linux-gnueabihf"
+    elif arch == "aarch64":
+      return "aarch64-unknown-linux-gnu"
+  
+  # Error out for unsupported systems
+  print(f"Error: Unsupported platform: {os} {arch}")
+  sys.exit(1)
+
+def get_prefix_suffix():
+  os = platform.system().lower()
+  prefix = ""
+  suffix = ""
+  
+  if os == "windows":
+    suffix = ".dll"
+  elif os == "darwin":
+    prefix = "lib"
+    suffix = ".dylib"
+  elif os == "linux":
+    prefix = "lib"
+    suffix = ".so"
+  else:
+    # Default to a generic UNIX-like system
+    prefix = "lib"
+    suffix = ".so"
+
+  return (prefix, suffix)
+
+def dlib():
+  (prefix, suffix) = get_prefix_suffix()
+
+  return f"{prefix}ahqstore_cli_rs{suffix}"
+
+dylib = Path.home().joinpath("ahqstore-py")
+
+if not dylib.exists():
+  dylib.mkdir()
+
+dylib = dylib.joinpath(dlib())
+
+def dwnl():
+  (prefix, suffix) = get_prefix_suffix()
+
+  return f"https://github.com/ahqstore/cli/releases/download/{ver}/{prefix}ahqstore_cli_rs-{rust_target()}{suffix}"
+
+def dwn():
+  url = dwnl()
+
+  resp = get(url)
+
+  resp.raise_for_status()
+
+  with open(dylib, "wb") as f:
+    f.write(resp.content)
+
+def main():
+  C = None
+
+  try:
+    C = ffi.dlopen(str(dylib))
+
+    ver_ptr = C.get_ver()
+
+    version = ffi.string(ver_ptr)
+
+    if not version == bytes(ver, "utf-8"):
+      raise BufferError("This was an error comapring them")
+  except:
+    dwn()
+    C = ffi.dlopen(str(dylib))
+
+  C.init_args()
+
+  for item in sys.argv[1:]:
+    arg = ffi.new("char[]", bytes(item, "ascii"))
+
+    C.add_arg(arg)
+
+  C.node_entrypoint(
+    os.environ.get("CI") == "true"
+  )

package/python/pyproject.toml

@@ -0,0 +1,27 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "ahqstore-cli"
+version = "0.10.1"
+authors = [{ name = "AHQ Softwares", email = "ahqsecret@gmail.com" }]
+description = "A modern Python wrapper for the ahqstore CLI"
+readme = "../README.md"
+requires-python = ">=3.8"
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+]
+dependencies = [
+  # List your Python dependencies here, e.g.,
+  "requests>=2.25.1",
+  "cffi>=1.17.0",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["."]
+
+[project.scripts]
+ahqstore = "cli:main"

package/python/setup.py

@@ -0,0 +1,3 @@
+import setuptools
+
+setuptools.setup()