@ahqstore/cli 0.3.4 → 0.4.1

package/src/app/build/mod.rs

@@ -1,6 +1,5 @@
 use ahqstore_types::{
-  AHQStoreApplication, DownloadUrl, InstallType, InstallerFormat, InstallerOptions,
-  InstallerOptionsLinux, InstallerOptionsWin32, Str,
+  AHQStoreApplication, DownloadUrl, InstallerFormat, InstallerOptions, InstallerOptionsAndroid, InstallerOptionsLinux, InstallerOptionsWindows, Str
 };
 use lazy_static::lazy_static;
 use reqwest::blocking::{Client, ClientBuilder};
@@ -8,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::{from_str, to_string, to_string_pretty};
 use std::{collections::HashMap, env, fs, process};
 
-use crate::app::{ERR, WARN};
+use crate::app::ERR;
 
 use super::INFO;
 
@@ -19,6 +18,9 @@ use config::*;
 use icon::*;
 use release::*;
 
+#[macro_use]
+mod macros;
+
 lazy_static! {
   pub static ref CLIENT: Client = ClientBuilder::new()
     .user_agent("AHQ Store / App Builder")
@@ -91,94 +93,96 @@ pub fn build_config(upload: bool, gh_action: bool) {
     downloadUrls: HashMap::default(),
     icon,
     displayImages,
+    app_page: config.source,
+    license_or_tos: config.license_or_tos,
     install: InstallerOptions {
-      installType: config.platform.installType,
       linux: None,
+      android: None,
+      linuxArm64: None,
+      linuxArm7: None,
+      winarm: None,
       win32: None,
     },
     repo: config.repo,
     version,
-    site: None,
-    source: None
+    site: config.site,
+    source: config.redistributed,
   };
 
-  if let Some(platform) = config.platform.win32Platform {
-    match (&platform, &final_config.install.installType) {
-      (&InstallerFormat::WindowsZip, _) => {}
-      (_, &InstallType::PerUser | &InstallType::Computer) => {
-        WARN.println(
-          &"Setting PerUser or Computer in a non WindowsZip install type does not have any effect",
-        );
-        process::exit(1);
-      }
-      _ => {}
-    };
-    let Some(options) = config.platform.win32Options else {
-      ERR.println(&"Win32 Options not found!");
-      process::exit(1);
-    };
-    let Some(finder) = config.finder.windowsFinder else {
-      ERR.println(&"Win32 Finder Config not found!");
-      process::exit(1);
-    };
+  let mut num = 0;
+  // Win x86_64
+  windowsPlatform!(num, win32, config, gh_r, final_config, winAmd64Platform, winAmd64Options, windowsAmd64Finder);
 
-    let assets = find_assets(&gh_r, &finder);
+  // Win Arm64
+  windowsPlatform!(num, winarm, config, gh_r, final_config, winArm64Platform, winArm64Options, windowsArm64Finder);
 
-    if assets.len() > 1 {
-      ERR.println(&"Multiple assets found");
-      process::exit(1);
-    }
-    if assets.len() == 0 {
-      ERR.println(&"No assets found");
-      process::exit(1);
-    }
+  // Linux x86_64
+  linuxPlatform!(num, linux, config, gh_r, final_config, linuxAmd64Platform, linuxAmd64Finder);
 
-    final_config.downloadUrls.insert(
-      1,
-      DownloadUrl {
-        installerType: platform,
-        url: assets[0].browser_download_url.clone(),
-      },
-    );
+  // Linux Arm64
+  linuxPlatform!(num, linuxArm64, config, gh_r, final_config, linuxArm64Platform, linuxArm64Finder);
 
-    final_config.install.win32 = Some(InstallerOptionsWin32 {
-      assetId: 1,
-      deps: Some(options.deps),
-      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())),
-    });
-  }
+  // Linux Armv7
+  linuxPlatform!(num, linuxArm7, config, gh_r, final_config, linuxArm32Platform, linuxArm32Finder);
+
+  num += 1;
 
-  if let Some(platform) = config.platform.linuxPlatform {
-    let Some(finder) = config.finder.linuxFinder else {
-      ERR.println(&"Linux Finder Config not found!");
+  // Android Universal
+  if let Some(platform) = config.platform.androidUniversal {
+    if !matches!(platform, InstallerFormat::AndroidApkZip) {
+      ERR.println(&"Invalid File Format, expected AndroidApkZip");
+    }
+
+    let Some(finder) = config.finder.androidUniversalFinder else {
+      ERR.println(&"Android Finder Config not found!");
       process::exit(1);
     };
 
     let assets = find_assets(&gh_r, &finder);
-
+    
     if assets.len() > 1 {
-      ERR.println(&"Multiple assets found");
+      ERR.println(&"Multiple assets found while parsing android");
       process::exit(1);
     }
 
     final_config.downloadUrls.insert(
-      2,
+      num,
       DownloadUrl {
         installerType: platform,
         url: assets[0].browser_download_url.clone(),
       },
     );
 
-    final_config.install.linux = Some(InstallerOptionsLinux {
-      assetId: 2
+    final_config.install.android = Some(InstallerOptionsAndroid {
+      assetId: num
     });
   }
 
-  final_config.site = config.site;
-  final_config.source = config.redistributed;
+  // if let Some(platform) = config.platform.linuxArm64Platform {
+  //   let Some(finder) = config.finder.linuxFinder else {
+  //     ERR.println(&"Linux Finder Config not found!");
+  //     process::exit(1);
+  //   };
+
+  //   let assets = find_assets(&gh_r, &finder);
+
+  //   if assets.len() > 1 {
+  //     ERR.println(&"Multiple assets found");
+  //     process::exit(1);
+  //   }
+
+  //   final_config.downloadUrls.insert(
+  //     2,
+  //     DownloadUrl {
+  //       installerType: platform,
+  //       url: assets[0].browser_download_url.clone(),
+  //     },
+  //   );
+
+  //   final_config.install.linux = Some(InstallerOptionsLinux {
+  //     assetId: 2
+  //   });
+  // }
 
   let config_file = to_string_pretty(&final_config).unwrap();
   let config_file = to_string(config_file.as_bytes()).unwrap();

package/src/app/create/inquire.rs

@@ -1,15 +1,13 @@
 use std::process;
 
-use ahqstore_types::{AppRepo, InstallerFormat};
+use ahqstore_types::AppRepo;
 use inquire::{
-  list_option::ListOption,
   validator::{ErrorMessage, Validation},
-  Editor, MultiSelect, Text,
+  Editor, Text,
 };
 use serde::{Deserialize, Serialize};
 
 use crate::app::{
-  build::CLIENT,
   shared::{Config, IMetadata, IPlatform},
   ERR, INFO,
 };
@@ -78,78 +76,33 @@ pub fn inquire<'a>() -> (String, Config<'a>) {
 
   INFO.println(&"Validating author id & repo");
 
-  let val: Option<()> = (|| {
-    let data: ServerUserResp = CLIENT
-      .get(format!(
-        "https://ahqstore-server.onrender.com/users/{}",
-        &user_id
-      ))
-      .send()
-      .ok()?
-      .json()
-      .ok()?;
-
-    if data.linked_acc.contains(&owner.into()) {
-      return Some(());
-    }
-    None
-  })();
-
-  if let None = val {
-    ERR.println(
-      &r#"Could not validate author id with github username. It may be because:
-- The account id provided is not valid
-- The account id has developer mode disabled
-- The GitHub repo owner doesn't seem to be in the list of linked_accounts
-- The GitHub repo is invalid"#,
-    );
-    process::exit(1);
-  }
-
-  let validator = |input: &[ListOption<&InstallerFormat>]| {
-    if input.len() == 0 {
-      return Ok(Validation::Invalid(
-        "You must select at least one target".into(),
-      ));
-    }
-    if input.len() > 2 {
-      return Ok(Validation::Invalid(
-        "You can only select two targets".into(),
-      ));
-    }
-
-    let flagged = vec![0, 1, 2, 3];
-    if input
-      .iter()
-      .filter(|a| flagged.contains(&a.index))
-      .collect::<Vec<_>>()
-      .len()
-      > 1
-    {
-      return Ok(Validation::Invalid(
-        "You can only select one bundle target for a platform".into(),
-      ));
-    }
-
-    Ok(Validation::Valid)
-  };
-
-  let Ok(platforms) = MultiSelect::new(
-    "Which platforms do you intend to support?",
-    vec![
-      InstallerFormat::WindowsZip,
-      InstallerFormat::WindowsInstallerMsi,
-      InstallerFormat::WindowsInstallerExe,
-      InstallerFormat::WindowsUWPMsix,
-      InstallerFormat::LinuxAppImage,
-    ],
-  )
-  .with_default(&[0])
-  .with_validator(validator)
-  .prompt() else {
-    ERR.println(&"Must Select a platform");
-    process::exit(1);
-  };
+//   let val: Option<()> = (|| {
+//     let data: ServerUserResp = CLIENT
+//       .get(format!(
+//         "https://ahqstore-server.onrender.com/users/{}",
+//         &user_id
+//       ))
+//       .send()
+//       .ok()?
+//       .json()
+//       .ok()?;
+
+//     if data.linked_acc.contains(&owner.into()) {
+//       return Some(());
+//     }
+//     None
+//   })();
+
+//   if let None = val {
+//     ERR.println(
+//       &r#"Could not validate author id with github username. It may be because:
+// - The account id provided is not valid
+// - The account id has developer mode disabled
+// - The GitHub repo owner doesn't seem to be in the list of linked_accounts
+// - The GitHub repo is invalid"#,
+//     );
+//     process::exit(1);
+//   }
 
   (
     app_id.clone(),
@@ -163,7 +116,7 @@ pub fn inquire<'a>() -> (String, Config<'a>) {
         author: owner.into(),
         repo: repo.into(),
       },
-      IPlatform::new(platforms),
+      IPlatform::new()
     ),
   )
 }

package/src/app/create/mod.rs

@@ -23,7 +23,13 @@ pub fn create(force: bool) {
     fs::write(format!("{}/icon.png", &base_img), icon).ok()?;
 
     let readme = include_str!("./readme.md");
-    fs::write("./.ahqstore/README.md", readme).ok()
+    fs::write("./.ahqstore/README.md", readme).ok()?;
+
+    let readme = include_str!("./readme.es.md");
+    fs::write("./.ahqstore/README.es.md", readme).ok()?;
+
+    let readme = include_str!("./readme.hi.md");
+    fs::write("./.ahqstore/README.hi.md", readme).ok()
   })()
   .is_some();
 

package/src/app/create/readme.es.md

@@ -0,0 +1,80 @@
+# AHQ Store Cli
+
+Edita el archivo config.json
+
+El esquema se muestra a continuación
+
+## config.json
+
+```ts
+type Platform =
+  // Plataformas Windows + Soporte para Actualizador y Desinstalador
+  | "WindowsZip"
+  | "WindowsInstallerMsi"
+
+  // No Implementado
+  | "WindowsInstallerExe"
+  | "WindowsUWPMsix"
+
+  // Plataforma Linux + Soporte para Actualizador y Desinstalador
+  | "LinuxAppImage"
+
+  // Android (En Desarrollo)
+  | "AndroidLinuxZip";
+
+interface ConfigJSON {
+  [key: string]: {
+    appId: string; // ID de la aplicación proporcionado por los desarrolladores de AHQ Store
+    appInstalledName: string; // Nombre de la entrada en el menú de inicio + acceso directo en el escritorio
+    appDisplayName: string; // Nombre de la aplicación
+    authorId: string; // Tu ID de usuario
+    shortDesc: string; // Descripción corta (máximo 48 palabras)
+    description: string; // Descripción de la aplicación en varias líneas
+    repo: {
+      author: string; // Tu nombre de usuario en GitHub
+      repo: string; // URL del repositorio
+    };
+    finder: {
+      [platform: ""]: {
+        startsWith?: string; // ¿Con qué debe comenzar la aplicación empaquetada?
+        contains?: string; // ¿Qué debe incluir la aplicación empaquetada?
+        endsWith?: string; // ¿Con qué debe terminar la aplicación empaquetada?
+      };
+    };
+    platform: {
+      // Debe ser "WindowsZip"| "WindowsInstallerMsi" |"WindowsInstallerExe" | "WindowsUWPMsix"
+      winAmd64Platform?: Platform; // ¿Qué tipo de binario proporciona tu aplicación a AHQ Store?
+      winArm64Platform?: Platform; // <-- Igual que winAmd64Platform -->
+
+      linuxAmd64Platform?: Platform; // Debe ser LinuxAppImage
+      linuxArm64Platform?: Platform; // Debe ser LinuxAppImage
+      linuxArm64Platform?: Platform; // Debe ser LinuxAppImage
+      linuxArm32Platform?: Platform; // Debe ser LinuxAppImage
+
+      androidUniversalPlatform?: Platform; // Debe ser AndroidApkZip
+
+      winAmd64Options?: {
+        zip_file_exec?: string; // Exe para enlazar a través de nuestro instalador (WindowsZIP)
+        exe_installer_args?: string[]; // Argumentos para ejecutar tu instalador personalizado (WindowsInstallerExe)
+      };
+
+      winArm64Options?: {
+        zip_file_exec?: string; // Exe para enlazar a través de nuestro instalador (WindowsZIP)
+        exe_installer_args?: string[]; // Argumentos para ejecutar tu instalador personalizado (WindowsInstallerExe)
+      };
+    };
+    site?: string; // Sitio web de tu aplicación
+    source?: string; // Sitio web de tu aplicación (que contiene el código fuente)
+    redistributed?: string; // No puedes establecer esto
+    license_or_tos?: string; // Nombre de la licencia o sitio de los términos de servicio
+  };
+}
+```
+
+## images/<app-id>/icon.png
+
+El icono de tu aplicación que se incluirá en el archivo de metadatos de la aplicación
+
+## images/<app-id>/\*
+
+Coloca cualquier imagen (hasta 10) que se colocará en el modal de la aplicación en AHQ Store

package/src/app/create/readme.hi.md

@@ -0,0 +1,80 @@
+# AHQ Store Cli
+
+config.json को संपादित करें
+
+नीचे स्कीमा दिखाया गया है
+
+## config.json
+
+```ts
+type Platform =
+  // विंडोज प्लेटफॉर्म + अपडेटर और अनइंस्टॉलर समर्थन
+  | "WindowsZip"
+  | "WindowsInstallerMsi"
+
+  // लागू नहीं किया गया
+  | "WindowsInstallerExe"
+  | "WindowsUWPMsix"
+
+  // लिनक्स प्लेटफॉर्म + अपडेटर और अनइंस्टॉलर समर्थन
+  | "LinuxAppImage"
+
+  // एंड्रॉइड (विकासाधीन)
+  | "AndroidLinuxZip";
+
+interface ConfigJSON {
+  [key: string]: {
+    appId: string; // AHQ स्टोर DEVS द्वारा प्रदान किया गया एप्लिकेशन आईडी
+    appInstalledName: string; // ऐप स्टार्ट मेनू एंट्री + डेस्कटॉप शॉर्टकट नाम
+    appDisplayName: string; // ऐप डिस्प्ले नाम
+    authorId: string; // आपका यूजर आईडी
+    shortDesc: string; // संक्षिप्त विवरण (अधिकतम 48 शब्द)
+    description: string; // बहु-लाइन ऐप विवरण
+    repo: {
+      author: string; // आपका GitHub उपयोगकर्ता नाम
+      repo: string; // रिपो URL
+    };
+    finder: {
+      [platform: ""]: {
+        startsWith?: string; // बंडल किया गया ऐप किससे शुरू होना चाहिए?
+        contains?: string; // बंडल किया गया ऐप क्या शामिल होना चाहिए?
+        endsWith?: string; // बंडल किया गया ऐप किससे समाप्त होना चाहिए?
+      };
+    };
+    platform: {
+      // "WindowsZip"| "WindowsInstallerMsi" |"WindowsInstallerExe" | "WindowsUWPMsix" होना चाहिए
+      winAmd64Platform?: Platform; // आपका ऐप AHQ स्टोर को किस प्रकार का बाइनरी प्रदान करता है
+      winArm64Platform?: Platform; // <-- winAmd64Platform के समान -->
+
+      linuxAmd64Platform?: Platform; // LinuxAppImage होना चाहिए
+      linuxArm64Platform?: Platform; // LinuxAppImage होना चाहिए
+      linuxArm64Platform?: Platform; // LinuxAppImage होना चाहिए
+      linuxArm32Platform?: Platform; // LinuxAppImage होना चाहिए
+
+      androidUniversalPlatform?: Platform; // AndroidApkZip होना चाहिए
+
+      winAmd64Options?: {
+        zip_file_exec?: string; // हमारे इंस्टॉलर के माध्यम से लिंक करने के लिए Exe (WindowsZIP)
+        exe_installer_args?: string[]; // आपके कस्टम इंस्टॉलर को चलाने के लिए Args (WindowsInstallerExe)
+      };
+
+      winArm64Options?: {
+        zip_file_exec?: string; // हमारे इंस्टॉलर के माध्यम से लिंक करने के लिए Exe (WindowsZIP)
+        exe_installer_args?: string[]; // आपके कस्टम इंस्टॉलर को चलाने के लिए Args (WindowsInstallerExe)
+      };
+    };
+    site?: string; // आपके ऐप की वेबसाइट
+    source?: string; // आपके ऐप की वेबसाइट (जिसमें स्रोत कोड शामिल है)
+    redistributed?: string; // आप इसे सेट नहीं कर सकते
+    license_or_tos?: string; // लाइसेंस का नाम या TOS की साइट
+  };
+}
+```
+
+## images/<app-id>/icon.png
+
+आपका एप्लिकेशन आइकन जो ऐप मेटाडेटा फ़ाइल में बंडल किया जाएगा
+
+## images/<app-id>/\*
+
+कोई भी छवि (अधिकतम 10) रखें जो AHQ स्टोर में ऐप मोडल में रखी जाएगी

package/src/app/create/readme.md

@@ -8,7 +8,7 @@ The schema has been shown below
 
 ```ts
 type Platform =
-  // Windows Platforms + Updater & UnInstaller Support
+  // Windows Platforms + Updater & Uninstaller Support
   | "WindowsZip"
   | "WindowsInstallerMsi"
 
@@ -16,10 +16,11 @@ type Platform =
   | "WindowsInstallerExe"
   | "WindowsUWPMsix"
 
-  // Linux Platform + Updater & UnInstaller Support
-  | "LinuxAppImage";
+  // Linux Platform + Updater & Uninstaller Support
+  | "LinuxAppImage"
 
-type Win32Deps = "AHQStoreAPI" | "Node21" | "Node18";
+  // Android (Under Development)
+  | "AndroidLinuxZip";
 
 interface ConfigJSON {
   [key: string]: {
@@ -34,35 +35,43 @@ interface ConfigJSON {
       repo: string; //Repo URL
     };
     finder: {
-      windowsFinder?: {
-        startsWith?: string; // The Windows Bundled app should startWith?
-        contains?: string; // The Windows Bundled app should include?
-        endsWith?: string; // The Windows Bundled app should endWith?
-      };
-      linuxFinder?: {
-        startsWith?: string; // The Linux Bundled app should startWith?
-        contains?: string; // The Linux Bundled app should include?
-        endsWith?: string; // The Linux Bundled app should endWith?
+      [platform: ""]: {
+        startsWith?: string; // The Bundled app should startWith?
+        contains?: string; // The Bundled app should include?
+        endsWith?: string; // The Bundled app should endWith?
       };
     };
     platform: {
-      installType: "Both" | "PerUser" | "Computer"; // Install Type
-      win32Platform?: Platform; // What type of binary does your app provide to AHQ Store
-      linuxPlatform?: Platform; // <-- Same as win32Platform -->
-      win32Options?: {
-        deps: Win32Deps[]; // Win32 Custom Deps
+      // Must be "WindowsZip"| "WindowsInstallerMsi" |"WindowsInstallerExe" | "WindowsUWPMsix"
+      winAmd64Platform?: Platform; // What type of binary does your app provide to AHQ Store
+      winArm64Platform?: Platform; // <-- Same as winAmd64Platform -->
+
+      linuxAmd64Platform?: Platform; // Must be LinuxAppImage
+      linuxArm64Platform?: Platform; // Must be LinuxAppImage
+      linuxArm64Platform?: Platform; // Must be LinuxAppImage
+      linuxArm32Platform?: Platform; // Must be LinuxAppImage
+
+      androidUniversalPlatform?: Platform; // Must be AndroidApkZip
+
+      winAmd64Options?: {
+        zip_file_exec?: string; // Exe to Link via our installer (WindowsZIP)
+        exe_installer_args?: string[]; // Args to run to your custom installer (WindowsInstallerExe)
+      };
+
+      winArm64Options?: {
         zip_file_exec?: string; // Exe to Link via our installer (WindowsZIP)
         exe_installer_args?: string[]; // Args to run to your custom installer (WindowsInstallerExe)
       };
-      linuxOptions?: {};
     };
     site?: string; // Your app's website
-    redistributed?: string; // Redistributed page (not for public)
+    source?: string; // Your app's website (that contains source code)
+    redistributed?: string; // You just **cannot** set this
+    license_or_tos?: string; // Name of License or site of TOS
   };
 }
 ```
 
-## icon.png
+## images/<app-id>/icon.png
 
 Your application icon that'll be bundled in the app metadata file
 

package/src/app/shared/file_sorter.rs

@@ -1,15 +1,23 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Default)]
 #[allow(non_snake_case)]
 pub struct FileFinder<'a> {
   #[serde(borrow)]
-  pub windowsFinder: Option<Finder<'a>>,
+  pub windowsAmd64Finder: Option<Finder<'a>>,
   #[serde(borrow)]
-  pub linuxFinder: Option<Finder<'a>>,
+  pub windowsArm64Finder: Option<Finder<'a>>,
+  #[serde(borrow)]
+  pub linuxAmd64Finder: Option<Finder<'a>>,
+  #[serde(borrow)]
+  pub linuxArm64Finder: Option<Finder<'a>>,
+  #[serde(borrow)]
+  pub linuxArm32Finder: Option<Finder<'a>>,
+  #[serde(borrow)]
+  pub androidUniversalFinder: Option<Finder<'a>>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Default)]
 #[allow(non_snake_case)]
 pub struct Finder<'a> {
   #[serde(borrow)]
@@ -23,12 +31,12 @@ pub struct Finder<'a> {
 impl<'a> FileFinder<'a> {
   pub fn new() -> Self {
     Self {
-      windowsFinder: Some(Finder {
+      windowsAmd64Finder: Some(Finder {
         startsWith: Some("This-is"),
         contains: Some("an"),
         endsWith: Some(".example"),
       }),
-      linuxFinder: None,
+      ..Default::default()
     }
   }
 }

package/src/app/shared/mod.rs

@@ -25,7 +25,9 @@ pub struct IMetadata<'a> {
   #[serde[borrow]]
   pub finder: FileFinder<'a>,
   pub site: Option<Str>,
+  pub source: Option<Str>,
   pub redistributed: Option<Str>,
+  pub license_or_tos: Option<Str>,
 }
 
 impl<'a> IMetadata<'a> {
@@ -53,7 +55,9 @@ impl<'a> IMetadata<'a> {
         platform,
         finder: FileFinder::new(),
         site: None,
-        redistributed: None
+        source: None,
+        redistributed: None,
+        license_or_tos: None
       },
     );