@ahqstore/cli 0.5.2 → 0.6.0

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ahqstore_cli_rs"
-version = "0.5.2"
+version = "0.6.0"
 description = "AHQ Store CLI"
 repository = "https://github.com/ahqstore/cli"
 homepage = "https://github.com/ahqstore/cli"
@@ -32,7 +32,7 @@ chalk_rs = "1"
 lazy_static = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-ahqstore-types = "3.1.0"
+ahqstore-types = { version = "3", features = ["apps_repo"] }
 reqwest = { version = "0.12", features = ["json", "blocking"] }
 sha2 = "0.10"
 image = { version = "0.25", default-features = false, features = [
@@ -42,7 +42,7 @@ image = { version = "0.25", default-features = false, features = [
 rand = "0.8"
 
 [target.'cfg(unix)'.dependencies]
-openssl-sys = { version = "0.9.103", features = ["vendored"] }
+openssl-sys = { version = "0.9", features = ["vendored"] }
 
 [build-dependencies]
 napi-build = { version = "2", optional = true }

package/README.md

@@ -4,6 +4,20 @@ Read more about it [here](https://ahqstore.github.io)
 
 # Changelog
 
+## 0.6.0 **(m)** 05-Sep-2024 10:37PM IST
+
+- Introduced ahqstore-types apps validation
+- Now you can view schemas in [docs.rs](https://docs.rs/ahqstore_cli_rs)
+- Update Dependencies
+
+## 0.5.5 03-Sep-2024 10:20PM IST
+
+- update ahqstore-types
+
+## 0.5.4 01-Sep-2024 10:07PM IST
+
+- **[CRITICAL]** Fixes invalid config files being generated
+
 ## 0.5.1 23-Aug-2024 10:09PM IST
 
 - Fix NPM Publish error

package/build.rs

@@ -1,8 +1,8 @@
-#[cfg(feature = "node")]
-extern crate napi_build;
-
-fn main() {
-  // Ensures that users can download it too
-  #[cfg(feature = "node")]
-  napi_build::setup();
-}
+#[cfg(feature = "node")]
+extern crate napi_build;
+
+fn main() {
+  // Ensures that users can download it too
+  #[cfg(feature = "node")]
+  napi_build::setup();
+}

package/index.js

@@ -1,182 +1,182 @@
-#!/usr/bin/env node
-
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-/* auto-generated by NAPI-RS */
-/* and modified by @ahqsoftwares */
-
-const { existsSync, readFileSync } = require('fs')
-const { join } = require("path");
-
-const { platform, arch } = process;
-
-let nativeBinding = null;
-let localFileExisted = false;
-let loadError = null;
-
-function isMusl() {
-  // For Node 10
-  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");
-    } catch (e) {
-      return true;
-    }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header;
-    return !glibcVersionRuntime;
-  }
-}
-
-switch (platform) {
-  case "win32":
-    switch (arch) {
-      case "x64":
-        localFileExisted = existsSync(
-          join(__dirname, "cli.win32-x64-msvc.node")
-        );
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.win32-x64-msvc.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-win32-x64-msvc");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      case "ia32":
-        localFileExisted = existsSync(
-          join(__dirname, "cli.win32-ia32-msvc.node")
-        );
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.win32-ia32-msvc.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-win32-ia32-msvc");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      case "arm64":
-        localFileExisted = existsSync(
-          join(__dirname, "cli.win32-arm64-msvc.node")
-        );
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.win32-arm64-msvc.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-win32-arm64-msvc");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`);
-    }
-    break;
-  case "darwin":
-    localFileExisted = existsSync(join(__dirname, "cli.darwin-universal.node"));
-    try {
-      if (localFileExisted) {
-        nativeBinding = require("./cli.darwin-universal.node");
-      } else {
-        nativeBinding = require("@ahqstore/cli-darwin-universal");
-      }
-      break;
-    } catch {}
-    switch (arch) {
-      case "x64":
-        localFileExisted = existsSync(join(__dirname, "cli.darwin-x64.node"));
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.darwin-x64.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-darwin-x64");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      case "arm64":
-        localFileExisted = existsSync(join(__dirname, "cli.darwin-arm64.node"));
-        try {
-          if (localFileExisted) {
-            nativeBinding = require("./cli.darwin-arm64.node");
-          } else {
-            nativeBinding = require("@ahqstore/cli-darwin-arm64");
-          }
-        } catch (e) {
-          loadError = e;
-        }
-        break;
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`);
-    }
-    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":
-        if (isMusl()) {
-          throw new Error("MUSL Bindings are not supported!");
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, "cli.linux-arm64-gnu.node")
-          );
-          try {
-            if (localFileExisted) {
-              nativeBinding = require("./cli.linux-arm64-gnu.node");
-            } else {
-              nativeBinding = require("@ahqstore/cli-linux-arm64-gnu");
-            }
-          } catch (e) {
-            loadError = e;
-          }
-        }
-        break;
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`);
-    }
-    break;
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
-}
-
-if (!nativeBinding) {
-  if (loadError) {
-    throw loadError;
-  }
-  throw new Error(`Failed to load native binding`);
-}
-
-const { nodeEntrypoint } = nativeBinding;
-
-const args = process.argv.slice(2) || [];
-
-nodeEntrypoint(args, process.env["GH_ACTION"] != null);
+#!/usr/bin/env node
+
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+/* and modified by @ahqsoftwares */
+
+const { existsSync, readFileSync } = require('fs')
+const { join } = require("path");
+
+const { platform, arch } = process;
+
+let nativeBinding = null;
+let localFileExisted = false;
+let loadError = null;
+
+function isMusl() {
+  // For Node 10
+  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");
+    } catch (e) {
+      return true;
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header;
+    return !glibcVersionRuntime;
+  }
+}
+
+switch (platform) {
+  case "win32":
+    switch (arch) {
+      case "x64":
+        localFileExisted = existsSync(
+          join(__dirname, "cli.win32-x64-msvc.node")
+        );
+        try {
+          if (localFileExisted) {
+            nativeBinding = require("./cli.win32-x64-msvc.node");
+          } else {
+            nativeBinding = require("@ahqstore/cli-win32-x64-msvc");
+          }
+        } catch (e) {
+          loadError = e;
+        }
+        break;
+      case "ia32":
+        localFileExisted = existsSync(
+          join(__dirname, "cli.win32-ia32-msvc.node")
+        );
+        try {
+          if (localFileExisted) {
+            nativeBinding = require("./cli.win32-ia32-msvc.node");
+          } else {
+            nativeBinding = require("@ahqstore/cli-win32-ia32-msvc");
+          }
+        } catch (e) {
+          loadError = e;
+        }
+        break;
+      case "arm64":
+        localFileExisted = existsSync(
+          join(__dirname, "cli.win32-arm64-msvc.node")
+        );
+        try {
+          if (localFileExisted) {
+            nativeBinding = require("./cli.win32-arm64-msvc.node");
+          } else {
+            nativeBinding = require("@ahqstore/cli-win32-arm64-msvc");
+          }
+        } catch (e) {
+          loadError = e;
+        }
+        break;
+      default:
+        throw new Error(`Unsupported architecture on Windows: ${arch}`);
+    }
+    break;
+  case "darwin":
+    localFileExisted = existsSync(join(__dirname, "cli.darwin-universal.node"));
+    try {
+      if (localFileExisted) {
+        nativeBinding = require("./cli.darwin-universal.node");
+      } else {
+        nativeBinding = require("@ahqstore/cli-darwin-universal");
+      }
+      break;
+    } catch {}
+    switch (arch) {
+      case "x64":
+        localFileExisted = existsSync(join(__dirname, "cli.darwin-x64.node"));
+        try {
+          if (localFileExisted) {
+            nativeBinding = require("./cli.darwin-x64.node");
+          } else {
+            nativeBinding = require("@ahqstore/cli-darwin-x64");
+          }
+        } catch (e) {
+          loadError = e;
+        }
+        break;
+      case "arm64":
+        localFileExisted = existsSync(join(__dirname, "cli.darwin-arm64.node"));
+        try {
+          if (localFileExisted) {
+            nativeBinding = require("./cli.darwin-arm64.node");
+          } else {
+            nativeBinding = require("@ahqstore/cli-darwin-arm64");
+          }
+        } catch (e) {
+          loadError = e;
+        }
+        break;
+      default:
+        throw new Error(`Unsupported architecture on macOS: ${arch}`);
+    }
+    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":
+        if (isMusl()) {
+          throw new Error("MUSL Bindings are not supported!");
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, "cli.linux-arm64-gnu.node")
+          );
+          try {
+            if (localFileExisted) {
+              nativeBinding = require("./cli.linux-arm64-gnu.node");
+            } else {
+              nativeBinding = require("@ahqstore/cli-linux-arm64-gnu");
+            }
+          } catch (e) {
+            loadError = e;
+          }
+        }
+        break;
+      default:
+        throw new Error(`Unsupported architecture on Linux: ${arch}`);
+    }
+    break;
+  default:
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
+}
+
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError;
+  }
+  throw new Error(`Failed to load native binding`);
+}
+
+const { nodeEntrypoint } = nativeBinding;
+
+const args = process.argv.slice(2) || [];
+
+nodeEntrypoint(args, process.env["GH_ACTION"] != null);

package/latest.md

@@ -1 +1 @@
-- Just a clone of 0.4.2
+Binaries for the release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahqstore/cli",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "readme": "./README.md",
   "napi": {
     "name": "cli",
@@ -40,14 +40,14 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@ahqstore/cli-win32-x64-msvc": "0.5.2",
-    "@ahqstore/cli-darwin-x64": "0.5.2",
-    "@ahqstore/cli-linux-x64-gnu": "0.5.2",
-    "@ahqstore/cli-darwin-arm64": "0.5.2",
-    "@ahqstore/cli-linux-arm64-gnu": "0.5.2",
-    "@ahqstore/cli-win32-arm64-msvc": "0.5.2",
-    "@ahqstore/cli-win32-ia32-msvc": "0.5.2",
-    "@ahqstore/cli-darwin-universal": "0.5.2",
-    "@ahqstore/cli-linux-riscv64-gnu": "0.5.2"
+    "@ahqstore/cli-win32-x64-msvc": "0.6.0",
+    "@ahqstore/cli-darwin-x64": "0.6.0",
+    "@ahqstore/cli-linux-x64-gnu": "0.6.0",
+    "@ahqstore/cli-darwin-arm64": "0.6.0",
+    "@ahqstore/cli-linux-arm64-gnu": "0.6.0",
+    "@ahqstore/cli-win32-arm64-msvc": "0.6.0",
+    "@ahqstore/cli-win32-ia32-msvc": "0.6.0",
+    "@ahqstore/cli-darwin-universal": "0.6.0",
+    "@ahqstore/cli-linux-riscv64-gnu": "0.6.0"
   }
 }

package/src/app/build/config.rs

@@ -1,54 +1,54 @@
-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<_>>()
-}
+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/src/app/build/icon.rs

@@ -1,47 +1,47 @@
-use crate::app::ERR;
-use image::{load_from_memory_with_format as load_img, ImageFormat};
-use std::fs;
-use std::process;
-
-pub fn get_icon(uid: &str) -> Vec<u8> {
-  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);
-
-  icon
-}
-
-pub fn get_images(uid: &str) -> Vec<Vec<u8>> {
-  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 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);
-  };
-}
+use crate::app::ERR;
+use image::{load_from_memory_with_format as load_img, ImageFormat};
+use std::fs;
+use std::process;
+
+pub fn get_icon(uid: &str) -> Vec<u8> {
+  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);
+
+  icon
+}
+
+pub fn get_images(uid: &str) -> Vec<Vec<u8>> {
+  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 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);
+  };
+}