@ahqstore/cli 0.4.3 → 0.5.2

package/Cargo.toml

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

package/README.md

@@ -0,0 +1,25 @@
+# AHQ Store CLI
+
+Read more about it [here](https://ahqstore.github.io)
+
+# Changelog
+
+## 0.5.1 23-Aug-2024 10:09PM IST
+
+- Fix NPM Publish error
+
+## 0.5.0 **(I)** 23-Aug-2024 10:05PM IST
+
+- Update to the new resources scheme (ahqstore-types v3.1.0)
+- Update Dependencies
+
+## 0.4.x **(m)**
+
+- Update to ahqstore-types 2.3.0
+
+**NOTE:**
+
+- **I** Internal Breaking Changes
+- **m** Minor Breaking / Minor Addition Changes
+- **B** Breaking Changes
+- **P** Patch Changes

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@ahqstore/cli",
-  "version": "0.4.3",
+  "version": "0.5.2",
+  "readme": "./README.md",
   "napi": {
     "name": "cli",
     "triples": {
@@ -16,7 +17,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.3"
+    "@napi-rs/cli": "^2.18.4"
   },
   "ava": {
     "timeout": "3m"
@@ -39,14 +40,14 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@ahqstore/cli-win32-x64-msvc": "0.4.3",
-    "@ahqstore/cli-darwin-x64": "0.4.3",
-    "@ahqstore/cli-linux-x64-gnu": "0.4.3",
-    "@ahqstore/cli-darwin-arm64": "0.4.3",
-    "@ahqstore/cli-linux-arm64-gnu": "0.4.3",
-    "@ahqstore/cli-win32-arm64-msvc": "0.4.3",
-    "@ahqstore/cli-win32-ia32-msvc": "0.4.3",
-    "@ahqstore/cli-darwin-universal": "0.4.3",
-    "@ahqstore/cli-linux-riscv64-gnu": "0.4.3"
+    "@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"
   }
 }

package/src/app/build/icon.rs

@@ -1,10 +1,9 @@
 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 {
+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 {
@@ -14,10 +13,10 @@ pub fn get_icon(uid: &str) -> String {
 
   validate_png(&icon);
 
-  STANDARD.encode(&icon)
+  icon
 }
 
-pub fn get_images(uid: &str) -> Vec<String> {
+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 {
@@ -31,7 +30,7 @@ pub fn get_images(uid: &str) -> Vec<String> {
     .map(|res| fs::read(res).expect("Unable to read bytes"))
     .map(|img| {
       validate_png(&img);
-      return STANDARD.encode(&img);
+      return img;
     })
     .collect::<Vec<_>>();
 

package/src/app/build/macros.rs

@@ -43,7 +43,8 @@ macro_rules! windowsPlatform {
         $num,
         DownloadUrl {
           installerType: platform,
-          url: assets[0].browser_download_url.clone(),
+          asset: assets[0].name.clone(),
+          url: "".into(),
         },
       );
   
@@ -83,7 +84,8 @@ macro_rules! linuxPlatform {
           $num,
           DownloadUrl {
             installerType: platform,
-            url: assets[0].browser_download_url.clone(),
+            asset: assets[0].name.clone(),
+            url: "".into()
           },
         );
     

package/src/app/build/mod.rs

@@ -30,6 +30,7 @@ lazy_static! {
 
 #[derive(Debug, Deserialize, Serialize)]
 struct GHRelease {
+  pub tag_name: String,
   pub upload_url: String,
   pub assets: Vec<GHAsset>,
 }
@@ -79,20 +80,30 @@ pub fn build_config(upload: bool, gh_action: bool) {
   let (version, gh_r) = fetch_release(&repo, &r_id, &gh_token);
 
   let icon = get_icon(&config.appId);
+  let dspl_images = get_images(&config.appId);
+
+  let mut resources = HashMap::new();
+  resources.insert(0, icon);
+
   #[allow(non_snake_case)]
-  let displayImages = get_images(&config.appId);
+  let displayImages = dspl_images.into_iter().enumerate().map(|(uid, icon)| {
+    resources.insert(uid as u8 + 1u8, icon);
+
+    uid as u8
+  }).collect();
 
   let app_id = config.appId.clone();
 
   let mut final_config: AHQStoreApplication = AHQStoreApplication {
+    releaseTagName: gh_r.tag_name.clone(),
     appDisplayName: config.appDisplayName,
     appId: config.appId,
     appShortcutName: config.appShortcutName,
     authorId: config.authorId,
     description: config.description,
     downloadUrls: HashMap::default(),
-    icon,
     displayImages,
+    resources: Some(resources),
     app_page: config.source,
     license_or_tos: config.license_or_tos,
     install: InstallerOptions {
@@ -149,7 +160,8 @@ pub fn build_config(upload: bool, gh_action: bool) {
       num,
       DownloadUrl {
         installerType: platform,
-        url: assets[0].browser_download_url.clone(),
+        asset: assets[0].name.clone(),
+        url: "".into()
       },
     );