rename some types exported from rust

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

@@ -11,12 +11,18 @@ use crate::net::acme::AcmeProvider;
 use crate::prelude::*;
 use crate::util::serde::{display_serializable, HandlerExtSerde};
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, TS)]
+#[serde(rename_all = "kebab-case")]
+#[serde(rename_all_fields = "camelCase")]
+#[serde(tag = "kind")]
+#[ts(export)]
 pub enum HostAddress {
     Onion {
+        #[ts(type = "string")]
         address: OnionAddressV3,
     },
     Domain {
+        #[ts(type = "string")]
         address: InternedString,
         public: bool,
         acme: Option<AcmeProvider>,

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

@@ -221,20 +221,21 @@ pub async fn list_bindings(
         .de()
 }
 
-#[derive(Deserialize, Serialize, Parser)]
+#[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
-pub struct SetPublicParams {
+#[ts(export)]
+pub struct BindingSetPublicParams {
     internal_port: u16,
     #[arg(long)]
     public: Option<bool>,
 }
 
 pub async fn set_public(
     ctx: RpcContext,
-    SetPublicParams {
+    BindingSetPublicParams {
         internal_port,
         public,
-    }: SetPublicParams,
+    }: BindingSetPublicParams,
     (package, host): (PackageId, HostId),
 ) -> Result<(), Error> {
     ctx.db

core/startos/src/net/network_interface.rs

@@ -114,15 +114,15 @@ async fn list_interfaces(
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 #[ts(export)]
-struct SetPublicParams {
+struct NetworkInterfaceSetPublicParams {
     #[ts(type = "string")]
     interface: InternedString,
     public: Option<bool>,
 }
 
 async fn set_public(
     ctx: RpcContext,
-    SetPublicParams { interface, public }: SetPublicParams,
+    NetworkInterfaceSetPublicParams { interface, public }: NetworkInterfaceSetPublicParams,
 ) -> Result<(), Error> {
     ctx.net_controller
         .net_iface

sdk/base/lib/osBindings/SetPublicParams.ts → sdk/base/lib/osBindings/BindingSetPublicParams.ts

@@ -1,3 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type SetPublicParams = { interface: string; public: boolean | null }
+export type BindingSetPublicParams = {
+  internalPort: number
+  public: boolean | null
+}

sdk/base/lib/osBindings/HostAddress.ts

@@ -0,0 +1,11 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AcmeProvider } from "./AcmeProvider"
+
+export type HostAddress =
+  | { kind: "onion"; address: string }
+  | {
+      kind: "domain"
+      address: string
+      public: boolean
+      acme: AcmeProvider | null
+    }

sdk/base/lib/osBindings/NetworkInterfaceSetPublicParams.ts

@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type NetworkInterfaceSetPublicParams = {
+  interface: string
+  public: boolean | null
+}

sdk/base/lib/osBindings/index.ts

@@ -38,6 +38,7 @@ export { BackupTargetFS } from "./BackupTargetFS"
 export { Base64 } from "./Base64"
 export { BindId } from "./BindId"
 export { BindInfo } from "./BindInfo"
+export { BindingSetPublicParams } from "./BindingSetPublicParams"
 export { BindOptions } from "./BindOptions"
 export { BindParams } from "./BindParams"
 export { Blake3Commitment } from "./Blake3Commitment"
@@ -97,6 +98,7 @@ export { Governor } from "./Governor"
 export { Guid } from "./Guid"
 export { HardwareRequirements } from "./HardwareRequirements"
 export { HealthCheckId } from "./HealthCheckId"
+export { HostAddress } from "./HostAddress"
 export { HostId } from "./HostId"
 export { HostKind } from "./HostKind"
 export { HostnameInfo } from "./HostnameInfo"
@@ -131,6 +133,7 @@ export { NamedHealthCheckResult } from "./NamedHealthCheckResult"
 export { NamedProgress } from "./NamedProgress"
 export { NetInfo } from "./NetInfo"
 export { NetworkInterfaceInfo } from "./NetworkInterfaceInfo"
+export { NetworkInterfaceSetPublicParams } from "./NetworkInterfaceSetPublicParams"
 export { NetworkInterfaceType } from "./NetworkInterfaceType"
 export { OnionHostname } from "./OnionHostname"
 export { OsIndex } from "./OsIndex"
@@ -176,7 +179,6 @@ export { SetIconParams } from "./SetIconParams"
 export { SetMainStatusStatus } from "./SetMainStatusStatus"
 export { SetMainStatus } from "./SetMainStatus"
 export { SetNameParams } from "./SetNameParams"
-export { SetPublicParams } from "./SetPublicParams"
 export { SetStoreParams } from "./SetStoreParams"
 export { SetupExecuteParams } from "./SetupExecuteParams"
 export { SetupProgress } from "./SetupProgress"