export patchdb types

core/startos/src/db/model/mod.rs

@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 
 use patch_db::HasModel;
 use serde::{Deserialize, Serialize};
+use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::auth::Sessions;

core/startos/src/db/model/package.rs

@@ -10,13 +10,15 @@ use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+use crate::net::host::HostInfo;
 use crate::prelude::*;
 use crate::progress::FullProgress;
 use crate::s9pk::manifest::Manifest;
 use crate::status::Status;
-use crate::{net::host::HostInfo, util::serde::Pem};
+use crate::util::serde::Pem;
 
-#[derive(Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize, TS)]
+#[ts(export)]
 pub struct AllPackageData(pub BTreeMap<PackageId, PackageDataEntry>);
 impl Map for AllPackageData {
     type Key = PackageId;
@@ -35,10 +37,11 @@ pub enum ManifestPreference {
     New,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "state")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub enum PackageState {
     Installing(InstallingState),
     Restoring(InstallingState),
@@ -257,51 +260,57 @@ impl Model<PackageState> {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct InstallingState {
     pub installing_info: InstallingInfo,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct UpdatingState {
     pub manifest: Manifest,
     pub installing_info: InstallingInfo,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct InstalledState {
     pub manifest: Manifest,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct InstallingInfo {
     pub new_manifest: Manifest,
     pub progress: FullProgress,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct PackageDataEntry {
     pub state_info: PackageState,
     pub status: Status,
+    #[ts(type = "string | null")]
     pub marketplace_url: Option<Url>,
+    #[ts(type = "string")]
     pub developer_key: Pem<ed25519_dalek::VerifyingKey>,
     pub icon: DataUrl<'static>,
+    #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
-    pub dependency_info: BTreeMap<PackageId, StaticDependencyInfo>,
     pub current_dependencies: CurrentDependencies,
-    pub interface_addresses: InterfaceAddressMap,
     pub hosts: HostInfo,
-    pub store_exposed_ui: StoreExposedUI,
+    #[ts(type = "string[]")]
     pub store_exposed_dependents: Vec<JsonPointer>,
 }
 impl AsRef<PackageDataEntry> for PackageDataEntry {
@@ -310,52 +319,8 @@ impl AsRef<PackageDataEntry> for PackageDataEntry {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
-#[model = "Model<Self>"]
-pub struct ExposedDependent {
-    path: String,
-    title: String,
-    description: Option<String>,
-    masked: Option<bool>,
-    copyable: Option<bool>,
-    qr: Option<bool>,
-}
-#[derive(Default, Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct StoreExposedUI(pub BTreeMap<InternedString, ExposedUI>);
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[serde(tag = "type")]
+#[derive(Debug, Clone, Default, Deserialize, Serialize, TS)]
 #[ts(export)]
-pub enum ExposedUI {
-    Object {
-        #[ts(type = "{[key: string]: ExposedUI}")]
-        value: BTreeMap<String, ExposedUI>,
-        #[serde(default)]
-        #[ts(type = "string | null")]
-        description: String,
-    },
-    String {
-        #[ts(type = "string")]
-        path: JsonPointer,
-        description: Option<String>,
-        masked: bool,
-        copyable: Option<bool>,
-        qr: Option<bool>,
-    },
-}
-
-impl Default for ExposedUI {
-    fn default() -> Self {
-        ExposedUI::Object {
-            value: BTreeMap::new(),
-            description: "".to_string(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct CurrentDependencies(pub BTreeMap<PackageId, CurrentDependencyInfo>);
 impl CurrentDependencies {
     pub fn map(
@@ -379,31 +344,26 @@ impl Map for CurrentDependencies {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
-#[model = "Model<Self>"]
-pub struct StaticDependencyInfo {
+pub struct CurrentDependencyInfo {
+    #[serde(flatten)]
+    pub kind: CurrentDependencyKind,
     pub title: String,
     pub icon: DataUrl<'static>,
+    #[ts(type = "string")]
+    pub registry: Url,
+    #[ts(type = "string")]
+    pub version_spec: VersionRange,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "kind")]
-pub enum CurrentDependencyInfo {
-    #[serde(rename_all = "camelCase")]
-    Exists {
-        #[ts(type = "string")]
-        url: Url,
-        #[ts(type = "string")]
-        version_spec: VersionRange,
-    },
+pub enum CurrentDependencyKind {
+    Exists,
     #[serde(rename_all = "camelCase")]
     Running {
-        #[ts(type = "string")]
-        url: Url,
-        #[ts(type = "string")]
-        version_spec: VersionRange,
         #[serde(default)]
         #[ts(type = "string[]")]
         health_checks: BTreeSet<HealthCheckId>,

core/startos/src/db/model/public.rs

@@ -13,6 +13,7 @@ use patch_db::{HasModel, Value};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use torut::onion::OnionAddressV3;
+use ts_rs::TS;
 
 use crate::account::AccountInfo;
 use crate::db::model::package::AllPackageData;
@@ -23,13 +24,14 @@ use crate::util::Version;
 use crate::version::{Current, VersionT};
 use crate::{ARCH, PLATFORM};
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
-// #[macro_debug]
+#[ts(export)]
 pub struct Public {
     pub server_info: ServerInfo,
     pub package_data: AllPackageData,
+    #[ts(type = "any")]
     pub ui: Value,
 }
 impl Public {
@@ -101,24 +103,34 @@ fn get_platform() -> InternedString {
     (&*PLATFORM).into()
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct ServerInfo {
     #[serde(default = "get_arch")]
+    #[ts(type = "string")]
     pub arch: InternedString,
     #[serde(default = "get_platform")]
+    #[ts(type = "string")]
     pub platform: InternedString,
     pub id: String,
     pub hostname: String,
+    #[ts(type = "string")]
     pub version: Version,
+    #[ts(type = "string | null")]
     pub last_backup: Option<DateTime<Utc>>,
     /// Used in the wifi to determine the region to set the system to
+    #[ts(type = "string | null")]
     pub last_wifi_region: Option<CountryCode>,
+    #[ts(type = "string")]
     pub eos_version_compat: VersionRange,
+    #[ts(type = "string")]
     pub lan_address: Url,
+    #[ts(type = "string")]
     pub onion_address: OnionAddressV3,
     /// for backwards compatibility
+    #[ts(type = "string")]
     pub tor_address: Url,
     pub ip_info: BTreeMap<String, IpInfo>,
     #[serde(default)]
@@ -136,12 +148,15 @@ pub struct ServerInfo {
     pub governor: Option<Governor>,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct IpInfo {
+    #[ts(type = "string | null")]
     pub ipv4_range: Option<Ipv4Net>,
     pub ipv4: Option<Ipv4Addr>,
+    #[ts(type = "string | null")]
     pub ipv6_range: Option<Ipv6Net>,
     pub ipv6: Option<Ipv6Addr>,
 }
@@ -158,15 +173,17 @@ impl IpInfo {
     }
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct BackupProgress {
     pub complete: bool,
 }
 
-#[derive(Debug, Default, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct ServerStatus {
     pub backup_progress: Option<BTreeMap<PackageId, BackupProgress>>,
     pub updated: bool,
@@ -177,33 +194,37 @@ pub struct ServerStatus {
     pub restarting: bool,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct UpdateProgress {
     pub size: Option<u64>,
     pub downloaded: u64,
 }
 
-#[derive(Debug, Deserialize, Serialize, HasModel)]
+#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
+#[ts(export)]
 pub struct WifiInfo {
     pub ssids: Vec<String>,
     pub selected: Option<String>,
     pub connected: Option<String>,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct ServerSpecs {
     pub cpu: String,
     pub disk: String,
     pub memory: String,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct ConnectionAddresses {
     pub tor: Vec<String>,
     pub clearnet: Vec<String>,