@ahqstore/cli 0.3.4 → 0.4.1

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ahqstore_cli_rs"
-version = "0.3.4"
+version = "0.4.1"
 description = "AHQ Store CLI"
 repository = "https://github.com/ahqstore/cli"
 homepage = "https://github.com/ahqstore/cli"
@@ -17,32 +17,40 @@ path = "src/lib.rs"
 name = "ahqstore"
 path = "src/main.rs"
 
+[package.metadata.binstall]
+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.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"
-lazy_static = "1.4.0"
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
-ahqstore-types = "2.0.0"
+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"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+ahqstore-types = "2.3.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"]}
-rand = "0.8.5"
+sha2 = "0.10"
+base64 = "0.22"
+image = { version = "0.25", default-features = false, features = [
+  "rayon",
+  "png",
+] }
+rand = "0.8"
 
 [target.'cfg(unix)'.dependencies]
 openssl-sys = { version = "0.9.102", features = ["vendored"] }
 
-
 [build-dependencies]
-napi-build = {version = "2.0.1", optional = true}
+napi-build = { version = "2", 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/bundle

@@ -0,0 +1,4 @@
+mkdir dist
+cp ./target/release/ahqstore ./dist/ahqstore
+cp ./target/release/ahqstore ./dist/ahqstore_cli_rs
+zip -r ahqstore_cli_rs-$TARGET ./dist 

package/bundle.ps1

@@ -0,0 +1,4 @@
+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

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/latest.md

@@ -0,0 +1,3 @@
+# AHQ Store CLI v0.4.1
+
+- Test adding cargo b(inary)install support

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahqstore/cli",
-  "version": "0.3.4",
+  "version": "0.4.1",
   "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.4.1",
+    "@ahqstore/cli-darwin-x64": "0.4.1",
+    "@ahqstore/cli-linux-x64-gnu": "0.4.1",
+    "@ahqstore/cli-darwin-arm64": "0.4.1",
+    "@ahqstore/cli-linux-arm64-gnu": "0.4.1",
+    "@ahqstore/cli-win32-arm64-msvc": "0.4.1",
+    "@ahqstore/cli-win32-ia32-msvc": "0.4.1",
+    "@ahqstore/cli-darwin-universal": "0.4.1",
+    "@ahqstore/cli-linux-riscv64-gnu": "0.4.1"
   }
 }

package/src/app/build/macros.rs

@@ -0,0 +1,95 @@
+macro_rules! f {
+    ($($x:tt)*) => {
+        format!($($x)*)
+    };
+}
+
+macro_rules! s {
+    ($($x:tt)*) => {
+        stringify!($($x)*)
+    };
+}
+
+#[macro_export]
+macro_rules! windowsPlatform {
+  ($num: ident, $win: ident, $config: ident, $gh_r: ident, $final_config: ident, $platform: ident, $options: ident, $finder: ident) => {
+    $num += 1;
+    if let Some(platform) = $config.platform.$platform {
+      if !matches!(&platform, &InstallerFormat::LinuxAppImage | &InstallerFormat::AndroidApkZip) {
+        ERR.println(&"Invalid File Format, expected a valid windows format");
+      } 
+
+      let Some(options) = $config.platform.$options else {
+        ERR.println(&f!("{} Options not found!", s!($win)));
+        process::exit(1);
+      };
+      let Some(finder) = $config.finder.$finder else {
+        ERR.println(&f!("{} Finder config not found!", s!($win)));
+        process::exit(1);
+      };
+  
+      let assets = crate::app::build::find_assets(&$gh_r, &finder);
+  
+      if assets.len() > 1 {
+        ERR.println(&f!("Multiple assets found while parsing {}", s!($win)));
+        process::exit(1);
+      }
+      if assets.len() == 0 {
+        ERR.println(&f!("No assets found while parsing {}", s!($win)));
+        process::exit(1);
+      }
+  
+      $final_config.downloadUrls.insert(
+        $num,
+        DownloadUrl {
+          installerType: platform,
+          url: assets[0].browser_download_url.clone(),
+        },
+      );
+  
+      $final_config.install.$win = Some(InstallerOptionsWindows {
+        assetId: $num,
+        exec: options.zip_file_exec.map_or(None, |a| Some(a.to_string())),
+        installerArgs: options
+          .exe_installer_args
+          .map_or(None, |a| Some(a.iter().map(|x| x.to_string()).collect())),
+      });
+    }
+  };
+}
+
+#[macro_export]
+macro_rules! linuxPlatform {
+    ($num: ident, $linux: ident, $config: ident, $gh_r: ident, $final_config: ident, $platform: ident, $finder: ident) => {
+      $num += 1;
+      if let Some(platform) = $config.platform.$platform {
+        if !matches!(&platform, &InstallerFormat::LinuxAppImage) {
+          ERR.println(&"Invalid File Format, expected LinuxAppImage");
+        }
+
+        let Some(finder) = $config.finder.$finder else {
+          ERR.println(&f!("{} Finder Config not found!", s!($linux)));
+          process::exit(1);
+        };
+    
+        let assets = find_assets(&$gh_r, &finder);
+    
+        if assets.len() > 1 {
+          ERR.println(&f!("Multiple assets found while parsing {}", s!($linux)));
+          process::exit(1);
+        }
+    
+        $final_config.downloadUrls.insert(
+          $num,
+          DownloadUrl {
+            installerType: platform,
+            url: assets[0].browser_download_url.clone(),
+          },
+        );
+    
+        $final_config.install.$linux = Some(InstallerOptionsLinux {
+          assetId: $num
+        });
+      }
+    };  
+}