@ahqstore/cli 0.10.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.10.0"
+version = "0.10.1"
 description = "AHQ Store CLI"
 repository = "https://github.com/ahqstore/cli"
 homepage = "https://github.com/ahqstore/cli"

package/bundle.ps1

@@ -1,13 +1,13 @@
 mkdir dist
 
-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.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 Continue
-Copy-Item "./target/$env:TARGET/release/ahqstore" "./dist/ahqstore_cli_rs" -ErrorAction Continue
+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 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
+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

@@ -1,8 +1,8 @@
 #! /usr/bin/env node
 // @ts-check
 
-import { existsSync, mkdirSync, rmSync } from "node:fs";
 import { join } from "node:path";
+import { existsSync, mkdirSync, rmSync } from "node:fs";
 import { argv, env, platform } from "node:process";
 
 import { downloadModuleWithProgress } from "./download.js";
@@ -47,23 +47,48 @@ function getLibraryFilename(name) {
   return `${prefix}${name}${suffix}`;
 }
 
-console.log(import.meta.dirname);
-
 const dylibDir = join(import.meta.dirname, "lib");
+const dylib = join(dylibDir, getLibraryFilename("ahqstore_cli_rs"));
 
-if (!existsSync(dylibDir)) {
+if (!(existsSync(dylibDir) && existsSync(dylib))) {
   console.warn(
     c.red.redBright(
       "Binary not found, downloading AHQ Store CLI Binary for this version",
     ),
   );
 
-  mkdirSync(dylibDir);
+  try {
+    rmSync(dylib);
+  } catch(_) {}
+  try {
+    mkdirSync(dylibDir);
+  } catch (_) {}
+
+  await downloadModuleWithProgress(dylib);
 }
 
-const dylib = join(dylibDir, getLibraryFilename("ahqstore_cli_rs"));
+let dlib;
 
-let dlib = koffi.load(dylib);
+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", []);
 
@@ -79,10 +104,15 @@ if (output != pkg.version) {
   // Unload current one
   dlib.unload();
 
-  rmSync(dylib);
+  try {
+    rmSync(dylib);
+  } catch(_) {}
+  try {
+    mkdirSync(dylibDir);
+  } catch (_) {}
 
   /// Download
-  // TODO: Load newer
+  await downloadModuleWithProgress(dylib);
 
   // Load newer
   dlib = koffi.load(dylib);
@@ -96,4 +126,7 @@ 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

@@ -1,29 +1,87 @@
 // @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";
+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",
+    "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() {
+function getDownload() {
   const { prefix, suffix } = getPrefixSuffix();
 
-  return `https://github.com/ahqstore/cli/releases/download/${pkg.version}/${prefix}ahqstore_cli_rs-${getRustTarget()}.${suffix}`;
+  return `https://github.com/ahqstore/cli/releases/download/${pkg.version}/${prefix}ahqstore_cli_rs-${getRustTarget()}${suffix}`;
 }
 
-export async function downloadModuleWithProgress() {}
+/**
+ * 
+ * @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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahqstore/cli",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "AHQ Store Official CLI, A port of the rust version to NodeJS",
   "keywords": [
     "cli",

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()