@ahqstore/cli 0.3.4 → 0.3.5

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ahqstore_cli_rs"
-version = "0.3.4"
+version = "0.3.5"
 description = "AHQ Store CLI"
 repository = "https://github.com/ahqstore/cli"
 homepage = "https://github.com/ahqstore/cli"
@@ -19,7 +19,9 @@ path = "src/main.rs"
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.12.2", default-features = false, features = ["napi4"], optional = true }
+napi = { version = "2.12.2", default-features = false, features = [
+  "napi4",
+], optional = true }
 napi-derive = { version = "2.12.2", optional = true }
 inquire = { version = "0.7.5", features = ["editor"] }
 chalk_rs = "1.0.1"
@@ -30,7 +32,10 @@ ahqstore-types = "2.0.0"
 reqwest = { version = "0.12", features = ["json", "blocking"] }
 sha2 = "0.10.8"
 base64 = "0.22.1"
-image = { version = "0.25", default-features = false, features = ["rayon", "png"]}
+image = { version = "0.25", default-features = false, features = [
+  "rayon",
+  "png",
+] }
 rand = "0.8.5"
 
 [target.'cfg(unix)'.dependencies]
@@ -38,11 +43,11 @@ openssl-sys = { version = "0.9.102", features = ["vendored"] }
 
 
 [build-dependencies]
-napi-build = {version = "2.0.1", optional = true}
+napi-build = { version = "2.0.1", optional = true }
 
 [profile.release]
 lto = true
 strip = "symbols"
 
 [features]
-node = ["dep:napi", "dep:napi-build", "dep:napi-derive"]
+node = ["dep:napi", "dep:napi-build", "dep:napi-derive"]

package/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahqstore/cli",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "napi": {
     "name": "cli",
     "triples": {
@@ -16,8 +16,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.3",
-    "ava": "^6.0.1"
+    "@napi-rs/cli": "^2.18.3"
   },
   "ava": {
     "timeout": "3m"
@@ -36,19 +35,18 @@
     "build": "napi build --platform --release --features node",
     "build:debug": "napi build --platform --features node",
     "prepublishOnly": "napi prepublish -t npm",
-    "test": "ava",
     "universal": "napi universal",
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@ahqstore/cli-win32-x64-msvc": "0.3.4",
-    "@ahqstore/cli-darwin-x64": "0.3.4",
-    "@ahqstore/cli-linux-x64-gnu": "0.3.4",
-    "@ahqstore/cli-darwin-arm64": "0.3.4",
-    "@ahqstore/cli-linux-arm64-gnu": "0.3.4",
-    "@ahqstore/cli-win32-arm64-msvc": "0.3.4",
-    "@ahqstore/cli-win32-ia32-msvc": "0.3.4",
-    "@ahqstore/cli-darwin-universal": "0.3.4",
-    "@ahqstore/cli-linux-riscv64-gnu": "0.3.4"
+    "@ahqstore/cli-win32-x64-msvc": "0.3.5",
+    "@ahqstore/cli-darwin-x64": "0.3.5",
+    "@ahqstore/cli-linux-x64-gnu": "0.3.5",
+    "@ahqstore/cli-darwin-arm64": "0.3.5",
+    "@ahqstore/cli-linux-arm64-gnu": "0.3.5",
+    "@ahqstore/cli-win32-arm64-msvc": "0.3.5",
+    "@ahqstore/cli-win32-ia32-msvc": "0.3.5",
+    "@ahqstore/cli-darwin-universal": "0.3.5",
+    "@ahqstore/cli-linux-riscv64-gnu": "0.3.5"
   }
 }

package/cli-rs/Cargo.toml

@@ -1,45 +0,0 @@
-[package]
-name = "ahqstore_cli_rs"
-version = "0.2.8"
-edition = "2021"
-description = "AHQ Store CLI"
-repository = "https://github.com/ahqstore/cli"
-homepage = "https://github.com/ahqstore/cli"
-license = "MIT"
-exclude = ["dist/**", ".ahqstore/**", "finalize.js", "tslink.toml"]
-readme = "README.md"
-
-[lib]
-name = "ahqstore_cli_rs"
-crate-type = ["cdylib"]
-path = "src/lib.rs"
-
-[[bin]]
-name = "ahqstore"
-path = "src/main.rs"
-
-[dependencies]
-node-bindgen = { version = "6.0.1", optional = true }
-tslink = { version = "0.1.3", optional = true }
-inquire = { version = "0.7.5", features = ["editor"] }
-chalk_rs = "1.0.1"
-lazy_static = "1.4.0"
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
-ahqstore-types = "2.0.0"
-reqwest = { version = "0.12", features = ["json", "blocking"] }
-sha2 = "0.10.8"
-base64 = "0.22.1"
-image = "0.25"
-rand = "0.8.5"
-
-[target.aarch64-unknown-linux-gnu.dependencies]
-openssl = { version = "0.10.64", features = ["vendored"] }
-
-[build-dependencies]
-node-bindgen = { version = "6.0.1", default-features = false, features = [
-  "build",
-], optional = true }
-
-[features]
-node = ["dep:node-bindgen", "dep:tslink"]

package/cli-rs/README.md

@@ -1,41 +0,0 @@
-# AHQ Store CLI
-
-The CLI for devs making AHQ Store Apps
-
-This version: CARGO
-
-Install
-
-```sh
-$ cargo install ahqstore_cli_rs
-```
-
-## Help Command
-
-The help command shows all available commands
-
-```sh
-$ ahqstore --help
-```
-
-## Create .ahqstore config
-
-Creates the .ahqstore/\* config files to make your app ready to be built
-
-```sh
-$ ahqstore --create {--force}
-```
-
-## Build a project
-
-Builds your app based on the config files and environment variables
-ENV:
-
-> `APP_ID` (Optional) Application Id (only required if your config has more than 1 appIds)
-> `RELEASE_ID` GitHub Release Id
-> `GH_TOKEN` GitHub Personal Access Token / GitHub Actions Token
-> `GITHUB_REPOSITORY` GitHub owner & repo name, eg ahqstore/app
-
-```sh
-$ ahqstore build
-```

package/cli-rs/build.rs

@@ -1,4 +0,0 @@
-fn main() {
-  #[cfg(feature = "node")]
-  node_bindgen::build::configure();
-}

package/cli-rs/finalize.js

@@ -1,25 +0,0 @@
-const { writeFileSync, readFileSync } = require("fs");
-const { join } = require("path");
-let arch = process.env.arch || require("process").arch;
-
-if (arch == "arm64" && process.platform == "win32") {
-  arch = "ia32";
-}
-
-const packageJson = join(__dirname, "dist", "package.json");
-
-let json = JSON.parse(readFileSync(packageJson));
-
-json.name = `@ahqstore/cli-rs-${process.platform}-${arch}`;
-
-json.description = `AHQ Store CLI Binaries for ${process.platform}-${arch}`;
-json.repository = {
-  type: "git",
-  url: "git+https://github.com/ahqstore/cli.git",
-};
-json.bugs = {
-  url: "https://github.com/ahqstore/cli/issues",
-};
-json.homepage = "https://github.com/ahqstore/cli#readme";
-
-writeFileSync(packageJson, JSON.stringify(json, null, 2));

package/cli-rs/rust-toolchain.toml

@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"

package/cli-rs/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/cli-rs/src/app/build/icon.rs

@@ -1,48 +0,0 @@
-use crate::app::ERR;
-use base64::engine::{general_purpose::STANDARD, Engine};
-use image::{load_from_memory_with_format as load_img, ImageFormat};
-use std::fs;
-use std::process;
-
-pub fn get_icon(uid: &str) -> String {
-  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);
-
-  STANDARD.encode(&icon)
-}
-
-pub fn get_images(uid: &str) -> Vec<String> {
-  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 STANDARD.encode(&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);
-  };
-}