export patchdb ts types from rust

core/startos/src/net/host/binding.rs

@@ -16,7 +16,7 @@ pub struct BindInfo {
 impl BindInfo {
     pub fn new(available_ports: &mut AvailablePorts, options: BindOptions) -> Result<Self, Error> {
         let mut assigned_lan_port = None;
-        if options.add_ssl.is_some() || options.secure {
+        if options.add_ssl.is_some() || options.secure.is_some() {
             assigned_lan_port = Some(available_ports.alloc()?);
         }
         Ok(Self {
@@ -33,7 +33,7 @@ impl BindInfo {
             mut assigned_lan_port,
             ..
         } = self;
-        if options.add_ssl.is_some() || options.secure {
+        if options.add_ssl.is_some() || options.secure.is_some() {
             assigned_lan_port = if let Some(port) = assigned_lan_port.take() {
                 Some(port)
             } else {
@@ -51,24 +51,30 @@ impl BindInfo {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, TS)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct Security {
+    pub ssl: bool,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct BindOptions {
-    #[ts(type = "string")]
-    pub scheme: InternedString,
+    #[ts(type = "string | null")]
+    pub scheme: Option<InternedString>,
     pub preferred_external_port: u16,
     pub add_ssl: Option<AddSslOptions>,
-    pub secure: bool,
-    pub ssl: bool,
+    pub secure: Option<Security>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddSslOptions {
-    #[ts(type = "string")]
-    pub scheme: InternedString,
+    #[ts(type = "string | null")]
+    pub scheme: Option<InternedString>,
     pub preferred_external_port: u16,
     // #[serde(default)]
     // pub add_x_forwarded_headers: bool, // TODO

core/startos/src/net/host/mod.rs

@@ -39,7 +39,7 @@ impl Host {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, TS)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub enum HostKind {

core/startos/src/net/mod.rs

@@ -7,6 +7,7 @@ pub mod host;
 pub mod keys;
 pub mod mdns;
 pub mod net_controller;
+pub mod service_interface;
 pub mod ssl;
 pub mod static_server;
 pub mod tor;

core/startos/src/net/net_controller.rs

@@ -247,7 +247,7 @@ impl NetService {
                                     None,
                                     external,
                                     (self.ip, *port).into(),
-                                    if bind.options.ssl {
+                                    if bind.options.secure.as_ref().map_or(false, |s| s.ssl) {
                                         Ok(())
                                     } else {
                                         Err(ssl.alpn.clone())

core/startos/src/net/service_interface.rs

@@ -0,0 +1,115 @@
+use std::net::{Ipv4Addr, Ipv6Addr};
+
+use models::{HostId, ServiceInterfaceId};
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::net::host::binding::BindOptions;
+use crate::net::host::HostKind;
+use crate::prelude::*;
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ServiceInterfaceWithHostInfo {
+    #[serde(flatten)]
+    pub service_interface: ServiceInterface,
+    pub host_info: ExportedHostInfo,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ExportedHostInfo {
+    pub id: HostId,
+    pub kind: HostKind,
+    pub hostnames: Vec<ExportedHostnameInfo>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "kind")]
+pub enum ExportedHostnameInfo {
+    Ip {
+        network_interface_id: String,
+        public: bool,
+        hostname: ExportedIpHostname,
+    },
+    Onion {
+        hostname: ExportedOnionHostname,
+    },
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ExportedOnionHostname {
+    pub value: String,
+    pub port: Option<u16>,
+    pub ssl_port: Option<u16>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "kind")]
+pub enum ExportedIpHostname {
+    Ipv4 {
+        value: Ipv4Addr,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+    Ipv6 {
+        value: Ipv6Addr,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+    Local {
+        value: String,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+    Domain {
+        domain: String,
+        subdomain: Option<String>,
+        port: Option<u16>,
+        ssl_port: Option<u16>,
+    },
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ServiceInterface {
+    pub id: ServiceInterfaceId,
+    pub name: String,
+    pub description: String,
+    pub has_primary: bool,
+    pub disabled: bool,
+    pub masked: bool,
+    pub address_info: AddressInfo,
+    #[serde(rename = "type")]
+    pub interface_type: ServiceInterfaceType,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub enum ServiceInterfaceType {
+    Ui,
+    P2p,
+    Api,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct AddressInfo {
+    pub username: Option<String>,
+    pub host_id: HostId,
+    pub bind_options: BindOptions,
+    pub suffix: String,
+}