@ahqstore/cli 0.10.0 → 0.10.2

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.2"
 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/ahqstore.go

@@ -0,0 +1,166 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"runtime"
+
+	"github.com/ebitengine/purego"
+	"github.com/schollz/progressbar/v3"
+)
+
+const version = "0.10.2"
+
+func main() {
+	var bin = getBinary()
+
+	var libahqstore, err = openLibrary(bin)
+
+	if err != nil {
+		Download(bin)
+		libahqstore, err = openLibrary(bin)
+
+		if err != nil {
+			os.Exit(1)
+		}
+	}
+
+	var get_ver func() string
+	purego.RegisterLibFunc(&get_ver, libahqstore, "get_ver")
+
+	if get_ver() != version {
+		unloadLibrary(libahqstore)
+
+		os.Remove(bin)
+
+		Download(bin)
+		libahqstore, err = openLibrary(bin)
+
+		if err != nil {
+			os.Exit(1)
+		}
+	}
+
+	var init_args func()
+	purego.RegisterLibFunc(&init_args, libahqstore, "init_args")
+
+	init_args()
+
+	var add_arg func(string)
+	purego.RegisterLibFunc(&add_arg, libahqstore, "add_arg")
+
+	for i := 1; i < len(os.Args); i++ {
+		add_arg(os.Args[i])
+	}
+
+	var node_entrypoint func(bool)
+	purego.RegisterLibFunc(&node_entrypoint, libahqstore, "node_entrypoint")
+
+	node_entrypoint(
+		os.Getenv("CI") == "true",
+	)
+}
+
+func Download(file string) {
+	var prefix, suffix = GetPrefixSuffix()
+	var triple, _ = GetRustTargetTriple()
+
+	var url = fmt.Sprintf("https://github.com/ahqstore/cli/releases/download/%s/%sahqstore_cli_rs-%s%s", version, prefix, triple, suffix)
+
+	var req, _ = http.NewRequest("GET", url, nil)
+	var resp, err = http.DefaultClient.Do(req)
+
+	if err != nil {
+		fmt.Println("Could not connect to download the required dynamic library")
+		os.Exit(1)
+	}
+	defer resp.Body.Close()
+
+	bar := progressbar.DefaultBytes(
+		resp.ContentLength,
+		"Downloading...",
+	)
+
+	defer bar.Finish()
+
+	var f, _ = os.OpenFile(file, os.O_WRONLY|os.O_CREATE, os.ModePerm)
+	defer f.Close()
+
+	io.Copy(io.MultiWriter(f, bar), resp.Body)
+}
+
+func GetPrefixSuffix() (string, string) {
+	switch runtime.GOOS {
+	case "windows":
+		return "", ".dll"
+	case "darwin":
+		return "lib", ".dylib"
+	default:
+		return "lib", ".so"
+	}
+}
+
+func GetRustTargetTriple() (string, error) {
+	// Use runtime.GOOS for the operating system and runtime.GOARCH for the architecture.
+	switch runtime.GOOS {
+	case "windows":
+		switch runtime.GOARCH {
+		case "386":
+			return "i686-pc-windows-msvc", nil
+		case "amd64":
+			return "x86_64-pc-windows-msvc", nil
+		case "arm64":
+			return "aarch64-pc-windows-msvc", nil
+		}
+	case "darwin":
+		switch runtime.GOARCH {
+		case "amd64":
+			return "x86_64-apple-darwin", nil
+		case "arm64":
+			return "aarch64-apple-darwin", nil
+		}
+	case "linux":
+		switch runtime.GOARCH {
+		case "386":
+			return "i686-unknown-linux-gnu", nil
+		case "amd64":
+			return "x86_64-unknown-linux-gnu", nil
+		case "arm":
+			return "armv7-unknown-linux-gnueabihf", nil
+		case "arm64":
+			return "aarch64-unknown-linux-gnu", nil
+		}
+	}
+
+	return "", fmt.Errorf("whoa there, this platform is not on the list: %s %s", runtime.GOOS, runtime.GOARCH)
+}
+
+func binName() string {
+	var prefix, suffix = GetPrefixSuffix()
+
+	return fmt.Sprintf("%sahqstore_cli_rs%s", prefix, suffix)
+}
+
+func getBinary() string {
+	var dir, err = os.UserHomeDir()
+
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	dir = path.Join(dir, "ahqstore-go")
+
+	_, err = os.ReadDir(dir)
+
+	if err != nil {
+		os.MkdirAll(dir, os.ModePerm)
+	}
+
+	var file = path.Join(dir, binName())
+
+	return file
+}

package/go/ahqstore_unix.go

@@ -0,0 +1,17 @@
+//go:build darwin || freebsd || linux || netbsd
+
+package main
+
+import (
+	"syscall"
+
+	"github.com/ebitengine/purego"
+)
+
+func openLibrary(name string) (uintptr, error) {
+	return purego.Dlopen(name, purego.RTLD_NOW|purego.RTLD_GLOBAL)
+}
+
+func unloadLibrary(library uintptr) {
+	purego.Dlclose(syscall.Handle(library))
+}

package/go/ahqstore_windows.go

@@ -0,0 +1,16 @@
+//go:build windows
+
+package main
+
+import "syscall"
+
+func openLibrary(name string) (uintptr, error) {
+	// Use [syscall.LoadLibrary] here to avoid external dependencies (#270).
+	// For actual use cases, [golang.org/x/sys/windows.NewLazySystemDLL] is recommended.
+	handle, err := syscall.LoadLibrary(name)
+	return uintptr(handle), err
+}
+
+func unloadLibrary(library uintptr) {
+	syscall.FreeLibrary(syscall.Handle(library))
+}

package/go/go.mod

@@ -0,0 +1,15 @@
+module github.com/ahqstore
+
+go 1.25.1
+
+require (
+	github.com/ebitengine/purego v0.8.4
+	github.com/schollz/progressbar/v3 v3.18.0
+)
+
+require (
+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/term v0.35.0 // indirect
+)

package/go/go.sum

@@ -0,0 +1,28 @@
+github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
+github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
+github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
+github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
+github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
+golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

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.2",
   "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.2"
+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()