diff --git a/core/startos/bindings/ActionParams.ts b/core/startos/bindings/ActionParams.ts deleted file mode 100644 index a57d7f72d..000000000 --- a/core/startos/bindings/ActionParams.ts +++ /dev/null @@ -1,9 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ActionId } from "./ActionId"; -import type { PackageId } from "./PackageId"; - -export type ActionParams = { - id: PackageId; - actionId: ActionId; - input: { [key: string]: any } | null; -}; diff --git a/core/startos/bindings/AddImageParams.ts b/core/startos/bindings/AddImageParams.ts deleted file mode 100644 index 628c73354..000000000 --- a/core/startos/bindings/AddImageParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ImageId } from "./ImageId"; - -export type AddImageParams = { id: ImageId; image: string }; diff --git a/core/startos/bindings/AddParams.ts b/core/startos/bindings/AddParams.ts deleted file mode 100644 index 03a4ea947..000000000 --- a/core/startos/bindings/AddParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { SshPubKey } from "./SshPubKey"; - -export type AddParams = { key: SshPubKey }; diff --git a/core/startos/bindings/ApplyParams.ts b/core/startos/bindings/ApplyParams.ts deleted file mode 100644 index 5ace9cd38..000000000 --- a/core/startos/bindings/ApplyParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ApplyParams = { expr: string; path: string | null }; diff --git a/core/startos/bindings/AttachParams.ts b/core/startos/bindings/AttachParams.ts deleted file mode 100644 index b3f7a23e7..000000000 --- a/core/startos/bindings/AttachParams.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EncryptedWire } from "./EncryptedWire"; - -export type AttachParams = { - startOsPassword: EncryptedWire | null; - guid: string; -}; diff --git a/core/startos/bindings/BackupParams.ts b/core/startos/bindings/BackupParams.ts deleted file mode 100644 index d10e47425..000000000 --- a/core/startos/bindings/BackupParams.ts +++ /dev/null @@ -1,11 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BackupTargetId } from "./BackupTargetId"; -import type { PackageId } from "./PackageId"; -import type { PasswordType } from "./PasswordType"; - -export type BackupParams = { - targetId: BackupTargetId; - oldPassword: PasswordType | null; - packageIds: Array | null; - password: PasswordType; -}; diff --git a/core/startos/bindings/BackupTargetFS.ts b/core/startos/bindings/BackupTargetFS.ts deleted file mode 100644 index 99a56c3e4..000000000 --- a/core/startos/bindings/BackupTargetFS.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BlockDev } from "./BlockDev"; -import type { Cifs } from "./Cifs"; - -export type BackupTargetFS = - | ({ type: "disk" } & BlockDev) - | ({ type: "cifs" } & Cifs); diff --git a/core/startos/bindings/BackupTargetId.ts b/core/startos/bindings/BackupTargetId.ts deleted file mode 100644 index e62366d97..000000000 --- a/core/startos/bindings/BackupTargetId.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type BackupTargetId = string; diff --git a/core/startos/bindings/BlockDev.ts b/core/startos/bindings/BlockDev.ts deleted file mode 100644 index f98a545cb..000000000 --- a/core/startos/bindings/BlockDev.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type BlockDev = { logicalname: string }; diff --git a/core/startos/bindings/Cifs.ts b/core/startos/bindings/Cifs.ts deleted file mode 100644 index 98c18afc7..000000000 --- a/core/startos/bindings/Cifs.ts +++ /dev/null @@ -1,8 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type Cifs = { - hostname: string; - path: string; - username: string; - password: string | null; -}; diff --git a/core/startos/bindings/ConfigParams.ts b/core/startos/bindings/ConfigParams.ts deleted file mode 100644 index 6c81b4691..000000000 --- a/core/startos/bindings/ConfigParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PackageId } from "./PackageId"; - -export type ConfigParams = { id: PackageId }; diff --git a/core/startos/bindings/ConfigureParams.ts b/core/startos/bindings/ConfigureParams.ts deleted file mode 100644 index 931e8b52e..000000000 --- a/core/startos/bindings/ConfigureParams.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PackageId } from "./PackageId"; - -export type ConfigureParams = { - dependentId: PackageId; - dependencyId: PackageId; -}; diff --git a/core/startos/bindings/ConnectParams.ts b/core/startos/bindings/ConnectParams.ts deleted file mode 100644 index df5f5c779..000000000 --- a/core/startos/bindings/ConnectParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PackageId } from "./PackageId"; - -export type ConnectParams = { id: PackageId }; diff --git a/core/startos/bindings/ControlParams.ts b/core/startos/bindings/ControlParams.ts deleted file mode 100644 index 32739363f..000000000 --- a/core/startos/bindings/ControlParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PackageId } from "./PackageId"; - -export type ControlParams = { id: PackageId }; diff --git a/core/startos/bindings/CreateParams.ts b/core/startos/bindings/CreateParams.ts deleted file mode 100644 index 4889f2ddf..000000000 --- a/core/startos/bindings/CreateParams.ts +++ /dev/null @@ -1,10 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { NotificationLevel } from "./NotificationLevel"; -import type { PackageId } from "./PackageId"; - -export type CreateParams = { - package: PackageId | null; - level: NotificationLevel; - title: string; - message: string; -}; diff --git a/core/startos/bindings/DeleteBeforeParams.ts b/core/startos/bindings/DeleteBeforeParams.ts deleted file mode 100644 index 55297106a..000000000 --- a/core/startos/bindings/DeleteBeforeParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type DeleteBeforeParams = { before: number }; diff --git a/core/startos/bindings/DeleteParams.ts b/core/startos/bindings/DeleteParams.ts deleted file mode 100644 index 34161c3b9..000000000 --- a/core/startos/bindings/DeleteParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type DeleteParams = { fingerprint: string }; diff --git a/core/startos/bindings/DumpParams.ts b/core/startos/bindings/DumpParams.ts deleted file mode 100644 index 88402caf4..000000000 --- a/core/startos/bindings/DumpParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type DumpParams = {}; diff --git a/core/startos/bindings/EchoParams.ts b/core/startos/bindings/EchoParams.ts deleted file mode 100644 index 16638a940..000000000 --- a/core/startos/bindings/EchoParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type EchoParams = { message: string }; diff --git a/core/startos/bindings/EditManifestParams.ts b/core/startos/bindings/EditManifestParams.ts deleted file mode 100644 index 19fda62bf..000000000 --- a/core/startos/bindings/EditManifestParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type EditManifestParams = { expression: string }; diff --git a/core/startos/bindings/ExecuteParams.ts b/core/startos/bindings/ExecuteParams.ts deleted file mode 100644 index eba6e1023..000000000 --- a/core/startos/bindings/ExecuteParams.ts +++ /dev/null @@ -1,10 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EncryptedWire } from "./EncryptedWire"; -import type { RecoverySource } from "./RecoverySource"; - -export type ExecuteParams = { - startOsLogicalname: string; - startOsPassword: EncryptedWire; - recoverySource: RecoverySource | null; - recoveryPassword: EncryptedWire | null; -}; diff --git a/core/startos/bindings/GetParams.ts b/core/startos/bindings/GetParams.ts deleted file mode 100644 index cc045a267..000000000 --- a/core/startos/bindings/GetParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type GetParams = { url: string }; diff --git a/core/startos/bindings/GovernorParams.ts b/core/startos/bindings/GovernorParams.ts deleted file mode 100644 index 2af25b061..000000000 --- a/core/startos/bindings/GovernorParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Governor } from "./Governor"; - -export type GovernorParams = { set: Governor | null }; diff --git a/core/startos/bindings/InfoParams.ts b/core/startos/bindings/InfoParams.ts deleted file mode 100644 index ae217103e..000000000 --- a/core/startos/bindings/InfoParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BackupTargetId } from "./BackupTargetId"; - -export type InfoParams = { targetId: BackupTargetId; password: string }; diff --git a/core/startos/bindings/InstallParams.ts b/core/startos/bindings/InstallParams.ts deleted file mode 100644 index 394647cff..000000000 --- a/core/startos/bindings/InstallParams.ts +++ /dev/null @@ -1,10 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { MinMax } from "./MinMax"; -import type { PackageId } from "./PackageId"; - -export type InstallParams = { - id: PackageId; - marketplaceUrl: string | null; - versionSpec: string | null; - versionPriority: MinMax | null; -}; diff --git a/core/startos/bindings/KernelLogsParams.ts b/core/startos/bindings/KernelLogsParams.ts deleted file mode 100644 index a820d7b74..000000000 --- a/core/startos/bindings/KernelLogsParams.ts +++ /dev/null @@ -1,8 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type KernelLogsParams = { - limit: number | null; - cursor: string | null; - before: boolean; - follow: boolean; -}; diff --git a/core/startos/bindings/KillParams.ts b/core/startos/bindings/KillParams.ts deleted file mode 100644 index 75bf6a02e..000000000 --- a/core/startos/bindings/KillParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type KillParams = { ids: Array }; diff --git a/core/startos/bindings/ListParams.ts b/core/startos/bindings/ListParams.ts deleted file mode 100644 index 759bf0667..000000000 --- a/core/startos/bindings/ListParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ListParams = { before: number | null; limit: number | null }; diff --git a/core/startos/bindings/LoginParams.ts b/core/startos/bindings/LoginParams.ts deleted file mode 100644 index 82765e23c..000000000 --- a/core/startos/bindings/LoginParams.ts +++ /dev/null @@ -1,8 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PasswordType } from "./PasswordType"; - -export type LoginParams = { - password: PasswordType | null; - userAgent: string | null; - metadata: any; -}; diff --git a/core/startos/bindings/LogoutParams.ts b/core/startos/bindings/LogoutParams.ts deleted file mode 100644 index f11b9780e..000000000 --- a/core/startos/bindings/LogoutParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type LogoutParams = { session: string }; diff --git a/core/startos/bindings/LogsParams.ts b/core/startos/bindings/LogsParams.ts deleted file mode 100644 index c6a74ec71..000000000 --- a/core/startos/bindings/LogsParams.ts +++ /dev/null @@ -1,8 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type LogsParams = { - limit: number | null; - cursor: string | null; - before: boolean; - follow: boolean; -}; diff --git a/core/startos/bindings/MinMax.ts b/core/startos/bindings/MinMax.ts deleted file mode 100644 index d5df4aa68..000000000 --- a/core/startos/bindings/MinMax.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type MinMax = "min" | "max"; diff --git a/core/startos/bindings/NotificationLevel.ts b/core/startos/bindings/NotificationLevel.ts deleted file mode 100644 index 8844083d4..000000000 --- a/core/startos/bindings/NotificationLevel.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type NotificationLevel = "success" | "info" | "warning" | "error"; diff --git a/core/startos/bindings/RecoverySource.ts b/core/startos/bindings/RecoverySource.ts deleted file mode 100644 index 7b4e9365a..000000000 --- a/core/startos/bindings/RecoverySource.ts +++ /dev/null @@ -1,6 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BackupTargetFS } from "./BackupTargetFS"; - -export type RecoverySource = - | { type: "migrate"; guid: string } - | { type: "backup"; target: BackupTargetFS }; diff --git a/core/startos/bindings/RemoveParams.ts b/core/startos/bindings/RemoveParams.ts deleted file mode 100644 index 1424d6ffd..000000000 --- a/core/startos/bindings/RemoveParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type RemoveParams = { guid: string }; diff --git a/core/startos/bindings/ResetParams.ts b/core/startos/bindings/ResetParams.ts deleted file mode 100644 index c8a585681..000000000 --- a/core/startos/bindings/ResetParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ResetParams = { wipeState: boolean; reason: string }; diff --git a/core/startos/bindings/ResetPasswordParams.ts b/core/startos/bindings/ResetPasswordParams.ts deleted file mode 100644 index c7899206d..000000000 --- a/core/startos/bindings/ResetPasswordParams.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PasswordType } from "./PasswordType"; - -export type ResetPasswordParams = { - oldPassword: PasswordType | null; - newPassword: PasswordType | null; -}; diff --git a/core/startos/bindings/RestorePackageParams.ts b/core/startos/bindings/RestorePackageParams.ts deleted file mode 100644 index 95d34b5c1..000000000 --- a/core/startos/bindings/RestorePackageParams.ts +++ /dev/null @@ -1,9 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BackupTargetId } from "./BackupTargetId"; -import type { PackageId } from "./PackageId"; - -export type RestorePackageParams = { - ids: Array; - targetId: BackupTargetId; - password: string; -}; diff --git a/core/startos/bindings/SetCountryParams.ts b/core/startos/bindings/SetCountryParams.ts deleted file mode 100644 index a3bfb3b24..000000000 --- a/core/startos/bindings/SetCountryParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type SetCountryParams = { country: string }; diff --git a/core/startos/bindings/SetParams.ts b/core/startos/bindings/SetParams.ts deleted file mode 100644 index 1d7a835b6..000000000 --- a/core/startos/bindings/SetParams.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Duration } from "./Duration"; - -export type SetParams = { - timeout: Duration | null; - config: { [key: string]: any } | null; -}; diff --git a/core/startos/bindings/SshPubKey.ts b/core/startos/bindings/SshPubKey.ts deleted file mode 100644 index edd45d0dc..000000000 --- a/core/startos/bindings/SshPubKey.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type SshPubKey = string; diff --git a/core/startos/bindings/SsidParams.ts b/core/startos/bindings/SsidParams.ts deleted file mode 100644 index e5e0793ce..000000000 --- a/core/startos/bindings/SsidParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type SsidParams = { ssid: string }; diff --git a/core/startos/bindings/UiParams.ts b/core/startos/bindings/UiParams.ts deleted file mode 100644 index 678723e08..000000000 --- a/core/startos/bindings/UiParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type UiParams = { pointer: string; value: any }; diff --git a/core/startos/bindings/UmountParams.ts b/core/startos/bindings/UmountParams.ts deleted file mode 100644 index e473af15f..000000000 --- a/core/startos/bindings/UmountParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { BackupTargetId } from "./BackupTargetId"; - -export type UmountParams = { targetId: BackupTargetId | null }; diff --git a/core/startos/bindings/UninstallParams.ts b/core/startos/bindings/UninstallParams.ts deleted file mode 100644 index fd8c6fba7..000000000 --- a/core/startos/bindings/UninstallParams.ts +++ /dev/null @@ -1,4 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PackageId } from "./PackageId"; - -export type UninstallParams = { id: PackageId }; diff --git a/core/startos/bindings/UpdateParams.ts b/core/startos/bindings/UpdateParams.ts deleted file mode 100644 index 2c64f7dd8..000000000 --- a/core/startos/bindings/UpdateParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type UpdateParams = { interface: string }; diff --git a/core/startos/bindings/UpdateSystemParams.ts b/core/startos/bindings/UpdateSystemParams.ts deleted file mode 100644 index 4e266ffdc..000000000 --- a/core/startos/bindings/UpdateSystemParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type UpdateSystemParams = { marketplaceUrl: string }; diff --git a/core/startos/bindings/VerifyCifsParams.ts b/core/startos/bindings/VerifyCifsParams.ts deleted file mode 100644 index 6516243ad..000000000 --- a/core/startos/bindings/VerifyCifsParams.ts +++ /dev/null @@ -1,9 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EncryptedWire } from "./EncryptedWire"; - -export type VerifyCifsParams = { - hostname: string; - path: string; - username: string; - password: EncryptedWire | null; -}; diff --git a/core/startos/bindings/VerifyParams.ts b/core/startos/bindings/VerifyParams.ts deleted file mode 100644 index 49e963750..000000000 --- a/core/startos/bindings/VerifyParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type VerifyParams = { path: string }; diff --git a/core/startos/bindings/ZramParams.ts b/core/startos/bindings/ZramParams.ts deleted file mode 100644 index b69c21349..000000000 --- a/core/startos/bindings/ZramParams.ts +++ /dev/null @@ -1,3 +0,0 @@ -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. - -export type ZramParams = { enable: boolean }; diff --git a/core/startos/bindings/index.ts b/core/startos/bindings/index.ts index d9c75c2d6..4ce0ab643 100644 --- a/core/startos/bindings/index.ts +++ b/core/startos/bindings/index.ts @@ -1,8 +1,5 @@ export { ActionId } from "./ActionId"; export { ActionMetadata } from "./ActionMetadata"; -export { ActionParams } from "./ActionParams"; -export { AddImageParams } from "./AddImageParams"; -export { AddParams } from "./AddParams"; export { AddressInfo } from "./AddressInfo"; export { AddSslOptions } from "./AddSslOptions"; export { Alerts } from "./Alerts"; @@ -10,30 +7,16 @@ export { Algorithm } from "./Algorithm"; export { AllowedStatuses } from "./AllowedStatuses"; export { AllPackageData } from "./AllPackageData"; export { AlpnInfo } from "./AlpnInfo"; -export { ApplyParams } from "./ApplyParams"; -export { AttachParams } from "./AttachParams"; -export { BackupParams } from "./BackupParams"; export { BackupProgress } from "./BackupProgress"; -export { BackupTargetFS } from "./BackupTargetFS"; -export { BackupTargetId } from "./BackupTargetId"; export { BindInfo } from "./BindInfo"; export { BindOptions } from "./BindOptions"; export { BindParams } from "./BindParams"; -export { BlockDev } from "./BlockDev"; export { Callback } from "./Callback"; export { ChrootParams } from "./ChrootParams"; -export { Cifs } from "./Cifs"; -export { ConfigParams } from "./ConfigParams"; -export { ConfigureParams } from "./ConfigureParams"; -export { ConnectParams } from "./ConnectParams"; -export { ControlParams } from "./ControlParams"; export { CreateOverlayedImageParams } from "./CreateOverlayedImageParams"; -export { CreateParams } from "./CreateParams"; export { CurrentDependencies } from "./CurrentDependencies"; export { CurrentDependencyInfo } from "./CurrentDependencyInfo"; export { DataUrl } from "./DataUrl"; -export { DeleteBeforeParams } from "./DeleteBeforeParams"; -export { DeleteParams } from "./DeleteParams"; export { Dependencies } from "./Dependencies"; export { DependencyConfigErrors } from "./DependencyConfigErrors"; export { DependencyKind } from "./DependencyKind"; @@ -41,13 +24,9 @@ export { DependencyRequirement } from "./DependencyRequirement"; export { DepInfo } from "./DepInfo"; export { Description } from "./Description"; export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams"; -export { DumpParams } from "./DumpParams"; export { Duration } from "./Duration"; -export { EchoParams } from "./EchoParams"; -export { EditManifestParams } from "./EditManifestParams"; export { EncryptedWire } from "./EncryptedWire"; export { ExecuteAction } from "./ExecuteAction"; -export { ExecuteParams } from "./ExecuteParams"; export { ExportActionParams } from "./ExportActionParams"; export { ExportedHostInfo } from "./ExportedHostInfo"; export { ExportedHostnameInfo } from "./ExportedHostnameInfo"; @@ -58,7 +37,6 @@ export { ExposeForDependentsParams } from "./ExposeForDependentsParams"; export { FullProgress } from "./FullProgress"; export { GetHostInfoParamsKind } from "./GetHostInfoParamsKind"; export { GetHostInfoParams } from "./GetHostInfoParams"; -export { GetParams } from "./GetParams"; export { GetPrimaryUrlParams } from "./GetPrimaryUrlParams"; export { GetServiceInterfaceParams } from "./GetServiceInterfaceParams"; export { GetServicePortForwardParams } from "./GetServicePortForwardParams"; @@ -66,7 +44,6 @@ export { GetSslCertificateParams } from "./GetSslCertificateParams"; export { GetSslKeyParams } from "./GetSslKeyParams"; export { GetStoreParams } from "./GetStoreParams"; export { GetSystemSmtpParams } from "./GetSystemSmtpParams"; -export { GovernorParams } from "./GovernorParams"; export { Governor } from "./Governor"; export { HardwareRequirements } from "./HardwareRequirements"; export { HealthCheckId } from "./HealthCheckId"; @@ -77,27 +54,17 @@ export { HostInfo } from "./HostInfo"; export { HostKind } from "./HostKind"; export { Host } from "./Host"; export { ImageId } from "./ImageId"; -export { InfoParams } from "./InfoParams"; export { InstalledState } from "./InstalledState"; export { InstallingInfo } from "./InstallingInfo"; export { InstallingState } from "./InstallingState"; -export { InstallParams } from "./InstallParams"; export { IpInfo } from "./IpInfo"; -export { KernelLogsParams } from "./KernelLogsParams"; -export { KillParams } from "./KillParams"; -export { ListParams } from "./ListParams"; export { ListServiceInterfacesParams } from "./ListServiceInterfacesParams"; -export { LoginParams } from "./LoginParams"; -export { LogoutParams } from "./LogoutParams"; -export { LogsParams } from "./LogsParams"; export { MainStatus } from "./MainStatus"; export { Manifest } from "./Manifest"; export { MaybeUtf8String } from "./MaybeUtf8String"; -export { MinMax } from "./MinMax"; export { MountParams } from "./MountParams"; export { MountTarget } from "./MountTarget"; export { NamedProgress } from "./NamedProgress"; -export { NotificationLevel } from "./NotificationLevel"; export { PackageDataEntry } from "./PackageDataEntry"; export { PackageId } from "./PackageId"; export { PackageState } from "./PackageState"; @@ -106,13 +73,8 @@ export { ParamsPackageId } from "./ParamsPackageId"; export { PasswordType } from "./PasswordType"; export { Progress } from "./Progress"; export { Public } from "./Public"; -export { RecoverySource } from "./RecoverySource"; export { RemoveActionParams } from "./RemoveActionParams"; export { RemoveAddressParams } from "./RemoveAddressParams"; -export { RemoveParams } from "./RemoveParams"; -export { ResetParams } from "./ResetParams"; -export { ResetPasswordParams } from "./ResetPasswordParams"; -export { RestorePackageParams } from "./RestorePackageParams"; export { ReverseProxyBind } from "./ReverseProxyBind"; export { ReverseProxyDestination } from "./ReverseProxyDestination"; export { ReverseProxyHttp } from "./ReverseProxyHttp"; @@ -129,24 +91,12 @@ export { SessionList } from "./SessionList"; export { Sessions } from "./Sessions"; export { Session } from "./Session"; export { SetConfigured } from "./SetConfigured"; -export { SetCountryParams } from "./SetCountryParams"; export { SetDependenciesParams } from "./SetDependenciesParams"; export { SetHealth } from "./SetHealth"; export { SetMainStatus } from "./SetMainStatus"; -export { SetParams } from "./SetParams"; export { SetStoreParams } from "./SetStoreParams"; -export { SshPubKey } from "./SshPubKey"; -export { SsidParams } from "./SsidParams"; export { Status } from "./Status"; -export { UiParams } from "./UiParams"; -export { UmountParams } from "./UmountParams"; -export { UninstallParams } from "./UninstallParams"; -export { UpdateParams } from "./UpdateParams"; export { UpdateProgress } from "./UpdateProgress"; -export { UpdateSystemParams } from "./UpdateSystemParams"; export { UpdatingState } from "./UpdatingState"; -export { VerifyCifsParams } from "./VerifyCifsParams"; -export { VerifyParams } from "./VerifyParams"; export { VolumeId } from "./VolumeId"; export { WifiInfo } from "./WifiInfo"; -export { ZramParams } from "./ZramParams"; diff --git a/core/startos/src/action.rs b/core/startos/src/action.rs index 1a32856c2..396e7ed50 100644 --- a/core/startos/src/action.rs +++ b/core/startos/src/action.rs @@ -51,7 +51,6 @@ pub fn display_action_result(params: WithIoFormat, result: ActionR #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ActionParams { #[arg(id = "id")] #[serde(rename = "id")] diff --git a/core/startos/src/auth.rs b/core/startos/src/auth.rs index f8e2d25a0..915ac10bd 100644 --- a/core/startos/src/auth.rs +++ b/core/startos/src/auth.rs @@ -183,7 +183,6 @@ pub fn check_password_against_db(db: &DatabaseModel, password: &str) -> Result<( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct LoginParams { password: Option, #[serde(default)] @@ -226,7 +225,6 @@ pub async fn login_impl( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct LogoutParams { #[ts(type = "string")] session: InternedString, @@ -320,7 +318,6 @@ fn display_sessions(params: WithIoFormat, arg: SessionList) { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ListParams { #[arg(skip)] #[ts(skip)] @@ -357,7 +354,6 @@ impl AsLogoutSessionId for KillSessionId { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct KillParams { ids: Vec, } @@ -371,7 +367,6 @@ pub async fn kill(ctx: RpcContext, KillParams { ids }: KillParams) -> Result<(), #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ResetPasswordParams { old_password: Option, new_password: Option, diff --git a/core/startos/src/backup/backup_bulk.rs b/core/startos/src/backup/backup_bulk.rs index 9a2784161..928e4811a 100644 --- a/core/startos/src/backup/backup_bulk.rs +++ b/core/startos/src/backup/backup_bulk.rs @@ -33,7 +33,6 @@ use crate::version::VersionT; #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct BackupParams { target_id: BackupTargetId, #[arg(long = "old-password")] diff --git a/core/startos/src/backup/restore.rs b/core/startos/src/backup/restore.rs index 277d4390d..4753a4290 100644 --- a/core/startos/src/backup/restore.rs +++ b/core/startos/src/backup/restore.rs @@ -28,7 +28,6 @@ use crate::util::serde::IoFormat; #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct RestorePackageParams { pub ids: Vec, pub target_id: BackupTargetId, diff --git a/core/startos/src/backup/target/cifs.rs b/core/startos/src/backup/target/cifs.rs index b50004dc6..ab2e91c0e 100644 --- a/core/startos/src/backup/target/cifs.rs +++ b/core/startos/src/backup/target/cifs.rs @@ -71,7 +71,6 @@ pub fn cifs() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct AddParams { pub hostname: String, pub path: PathBuf, @@ -126,7 +125,6 @@ pub async fn add( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct UpdateParams { pub id: BackupTargetId, pub hostname: String, @@ -191,7 +189,6 @@ pub async fn update( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct RemoveParams { pub id: BackupTargetId, } diff --git a/core/startos/src/backup/target/mod.rs b/core/startos/src/backup/target/mod.rs index 7925cadff..c0f2ef10e 100644 --- a/core/startos/src/backup/target/mod.rs +++ b/core/startos/src/backup/target/mod.rs @@ -247,7 +247,6 @@ fn display_backup_info(params: WithIoFormat, info: BackupInfo) { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct InfoParams { target_id: BackupTargetId, password: String, @@ -282,7 +281,6 @@ lazy_static::lazy_static! { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct MountParams { target_id: BackupTargetId, password: String, @@ -318,7 +316,6 @@ pub async fn mount( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct UmountParams { target_id: Option, } diff --git a/core/startos/src/config/mod.rs b/core/startos/src/config/mod.rs index 484d13b02..c600f590c 100644 --- a/core/startos/src/config/mod.rs +++ b/core/startos/src/config/mod.rs @@ -129,7 +129,6 @@ pub enum MatchError { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ConfigParams { pub id: PackageId, } @@ -160,7 +159,6 @@ pub async fn get(ctx: RpcContext, _: Empty, id: PackageId) -> Result, diff --git a/core/startos/src/control.rs b/core/startos/src/control.rs index 11036858a..3ef7d6030 100644 --- a/core/startos/src/control.rs +++ b/core/startos/src/control.rs @@ -13,7 +13,6 @@ use crate::Error; #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ControlParams { pub id: PackageId, } diff --git a/core/startos/src/db/mod.rs b/core/startos/src/db/mod.rs index 8e28c0f3c..ab5d23efb 100644 --- a/core/startos/src/db/mod.rs +++ b/core/startos/src/db/mod.rs @@ -219,7 +219,6 @@ async fn cli_dump( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct DumpParams { #[arg(long = "include-private", short = 'p')] #[serde(default)] @@ -277,7 +276,6 @@ async fn cli_apply( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ApplyParams { expr: String, path: Option, @@ -316,7 +314,6 @@ pub fn put() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct UiParams { #[ts(type = "string")] pointer: JsonPointer, diff --git a/core/startos/src/dependencies.rs b/core/startos/src/dependencies.rs index 936d1788b..69e4cad59 100644 --- a/core/startos/src/dependencies.rs +++ b/core/startos/src/dependencies.rs @@ -46,7 +46,6 @@ pub struct DepInfo { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ConfigureParams { dependent_id: PackageId, dependency_id: PackageId, diff --git a/core/startos/src/diagnostic.rs b/core/startos/src/diagnostic.rs index 86c3a4dd5..1cef6d7ef 100644 --- a/core/startos/src/diagnostic.rs +++ b/core/startos/src/diagnostic.rs @@ -44,7 +44,6 @@ pub fn error(ctx: DiagnosticContext) -> Result, Error> { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct LogsParams { #[ts(type = "number | null")] limit: Option, diff --git a/core/startos/src/inspect.rs b/core/startos/src/inspect.rs index 3e95faa6c..6d24fc32a 100644 --- a/core/startos/src/inspect.rs +++ b/core/startos/src/inspect.rs @@ -26,7 +26,6 @@ pub fn inspect() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct HashParams { path: PathBuf, } @@ -42,7 +41,6 @@ pub async fn hash(_: CliContext, HashParams { path }: HashParams) -> Result Result<() #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct UninstallParams { id: PackageId, } diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs index c048ae61c..448db9ff2 100644 --- a/core/startos/src/lib.rs +++ b/core/startos/src/lib.rs @@ -83,7 +83,6 @@ use crate::util::serde::HandlerExtSerde; #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct EchoParams { message: String, } diff --git a/core/startos/src/lxc/mod.rs b/core/startos/src/lxc/mod.rs index 26d2d6a37..0ebefdd96 100644 --- a/core/startos/src/lxc/mod.rs +++ b/core/startos/src/lxc/mod.rs @@ -353,7 +353,6 @@ pub async fn list(ctx: RpcContext) -> Result, Error> { } #[derive(Deserialize, Serialize, Parser, TS)] -#[ts(export)] pub struct RemoveParams { #[ts(type = "string")] pub guid: InternedString, @@ -367,7 +366,6 @@ pub async fn remove(ctx: RpcContext, RemoveParams { guid }: RemoveParams) -> Res } #[derive(Deserialize, Serialize, Parser, TS)] -#[ts(export)] pub struct ConnectParams { #[ts(type = "string")] pub guid: InternedString, diff --git a/core/startos/src/net/dhcp.rs b/core/startos/src/net/dhcp.rs index ce5de96ba..b0d538e81 100644 --- a/core/startos/src/net/dhcp.rs +++ b/core/startos/src/net/dhcp.rs @@ -64,7 +64,6 @@ pub fn dhcp() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct UpdateParams { interface: String, } diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs index 7b5e848f1..dfca0fc0b 100644 --- a/core/startos/src/net/tor.rs +++ b/core/startos/src/net/tor.rs @@ -108,7 +108,6 @@ pub fn tor() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ResetParams { #[arg(name = "wipe-state", short = 'w', long = "wipe-state")] wipe_state: bool, @@ -147,7 +146,6 @@ pub async fn list_services(ctx: RpcContext, _: Empty) -> Result ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct AddParams { ssid: String, password: String, @@ -143,7 +142,6 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct SsidParams { ssid: String, } @@ -408,7 +406,6 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct SetCountryParams { #[arg(value_parser = CountryCodeParser)] #[ts(type = "string")] diff --git a/core/startos/src/notifications.rs b/core/startos/src/notifications.rs index 8daf42f59..8a5732462 100644 --- a/core/startos/src/notifications.rs +++ b/core/startos/src/notifications.rs @@ -52,7 +52,6 @@ pub fn notification() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ListParams { #[ts(type = "number | null")] before: Option, @@ -117,7 +116,6 @@ pub async fn list( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct DeleteParams { #[ts(type = "number")] id: u32, @@ -134,7 +132,6 @@ pub async fn delete(ctx: RpcContext, DeleteParams { id }: DeleteParams) -> Resul #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct DeleteBeforeParams { #[ts(type = "number")] before: u32, @@ -159,7 +156,6 @@ pub async fn delete_before( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct CreateParams { package: Option, level: NotificationLevel, diff --git a/core/startos/src/os_install/mod.rs b/core/startos/src/os_install/mod.rs index e35cab617..0abd1d23e 100644 --- a/core/startos/src/os_install/mod.rs +++ b/core/startos/src/os_install/mod.rs @@ -116,7 +116,6 @@ async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result Url { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct GetParams { #[ts(type = "string")] url: Url, diff --git a/core/startos/src/s9pk/rpc.rs b/core/startos/src/s9pk/rpc.rs index b3203bd47..582a0a9d9 100644 --- a/core/startos/src/s9pk/rpc.rs +++ b/core/startos/src/s9pk/rpc.rs @@ -69,7 +69,6 @@ fn inspect() -> ParentHandler { } #[derive(Deserialize, Serialize, Parser, TS)] -#[ts(export)] struct AddImageParams { id: ImageId, image: String, @@ -186,7 +185,6 @@ async fn add_image( } #[derive(Deserialize, Serialize, Parser, TS)] -#[ts(export)] struct EditManifestParams { expression: String, } diff --git a/core/startos/src/s9pk/v1/mod.rs b/core/startos/src/s9pk/v1/mod.rs index 9623d7f36..173921a75 100644 --- a/core/startos/src/s9pk/v1/mod.rs +++ b/core/startos/src/s9pk/v1/mod.rs @@ -16,7 +16,6 @@ pub const SIG_CONTEXT: &[u8] = b"s9pk"; #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct VerifyParams { pub path: PathBuf, } diff --git a/core/startos/src/service/mod.rs b/core/startos/src/service/mod.rs index dcac05ce3..95d507bfa 100644 --- a/core/startos/src/service/mod.rs +++ b/core/startos/src/service/mod.rs @@ -501,7 +501,6 @@ impl Actor for ServiceActor { } #[derive(Deserialize, Serialize, Parser, TS)] -#[ts(export)] pub struct ConnectParams { pub id: PackageId, } diff --git a/core/startos/src/setup.rs b/core/startos/src/setup.rs index 18c33d423..9120544e3 100644 --- a/core/startos/src/setup.rs +++ b/core/startos/src/setup.rs @@ -102,7 +102,6 @@ async fn setup_init( #[derive(Deserialize, Serialize, TS)] #[serde(rename_all = "camelCase")] -#[ts(export)] pub struct AttachParams { #[serde(rename = "startOsPassword")] password: Option, @@ -214,7 +213,6 @@ pub fn cifs() -> ParentHandler { #[derive(Deserialize, Serialize, TS)] #[serde(rename_all = "camelCase")] -#[ts(export)] pub struct VerifyCifsParams { hostname: String, path: PathBuf, @@ -258,7 +256,6 @@ pub enum RecoverySource { #[derive(Deserialize, Serialize, TS)] #[serde(rename_all = "camelCase")] -#[ts(export)] pub struct ExecuteParams { start_os_logicalname: PathBuf, start_os_password: EncryptedWire, diff --git a/core/startos/src/ssh.rs b/core/startos/src/ssh.rs index b7c2fef3c..787d54056 100644 --- a/core/startos/src/ssh.rs +++ b/core/startos/src/ssh.rs @@ -107,7 +107,6 @@ pub fn ssh() -> ParentHandler { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct AddParams { key: SshPubKey, } @@ -141,7 +140,6 @@ pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result Result<(), Error> { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct ZramParams { enable: bool, } @@ -140,7 +139,6 @@ fn display_governor_info(params: WithIoFormat, result: GovernorI #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct GovernorParams { set: Option, } @@ -235,7 +233,6 @@ pub async fn time(ctx: RpcContext, _: Empty) -> Result { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct LogsParams { #[arg(short = 'l', long = "limit")] #[ts(type = "number | null")] @@ -321,7 +318,6 @@ pub async fn logs_follow( #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct KernelLogsParams { #[arg(short = 'l', long = "limit")] #[ts(type = "number | null")] diff --git a/core/startos/src/update/mod.rs b/core/startos/src/update/mod.rs index beb756179..05303182d 100644 --- a/core/startos/src/update/mod.rs +++ b/core/startos/src/update/mod.rs @@ -38,7 +38,6 @@ lazy_static! { #[derive(Deserialize, Serialize, Parser, TS)] #[serde(rename_all = "camelCase")] #[command(rename_all = "kebab-case")] -#[ts(export)] pub struct UpdateSystemParams { #[ts(type = "string")] marketplace_url: Url, diff --git a/web/projects/marketplace/src/types.ts b/web/projects/marketplace/src/types.ts index bc7c70f80..7b99c7b80 100644 --- a/web/projects/marketplace/src/types.ts +++ b/web/projects/marketplace/src/types.ts @@ -1,5 +1,5 @@ import { Url } from '@start9labs/shared' -import { Manifest } from '../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' export type StoreURL = string export type StoreName = string @@ -26,7 +26,7 @@ export interface MarketplacePkg { icon: Url license: Url instructions: Url - manifest: Manifest + manifest: T.Manifest categories: string[] versions: string[] dependencyMetadata: { diff --git a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts index 62038e78b..082f8aa0d 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts @@ -18,7 +18,7 @@ import { ActionSuccessPage } from 'src/app/modals/action-success/action-success. import { hasCurrentDeps } from 'src/app/util/has-deps' import { getAllPackages, getManifest } from 'src/app/util/get-package-data' import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types' -import { Status } from '../../../../../../../../core/startos/bindings/Status' +import { T } from '@start9labs/start-sdk' @Component({ selector: 'app-actions', @@ -42,7 +42,7 @@ export class AppActionsPage { ) {} async handleAction( - status: Status, + status: T.Status, action: { key: string; value: ActionMetadata }, ) { if ( diff --git a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts index 5f7227464..8baa0bfde 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts @@ -7,11 +7,9 @@ import { DataModel } from 'src/app/services/patch-db/data-model' import { PatchDB } from 'patch-db-client' import { QRComponent } from 'src/app/components/qr/qr.component' import { map } from 'rxjs' -import { types as T } from '@start9labs/start-sdk' -import { ServiceInterface } from '../../../../../../../../core/startos/bindings/ServiceInterface' -import { ServiceInterfaceWithHostInfo } from '../../../../../../../../core/startos/bindings/ServiceInterfaceWithHostInfo' +import { T } from '@start9labs/start-sdk' -type MappedInterface = ServiceInterface & { +type MappedInterface = T.ServiceInterface & { addresses: MappedAddress[] } type MappedAddress = { @@ -101,7 +99,7 @@ export class AppInterfacesItemComponent { } function getAddresses( - serviceInterface: ServiceInterfaceWithHostInfo, + serviceInterface: T.ServiceInterfaceWithHostInfo, ): MappedAddress[] { const host = serviceInterface.hostInfo const addressInfo = serviceInterface.addressInfo diff --git a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts index b1c62618d..35bf99f8f 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-list/app-list-pkg/app-list-pkg.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core' import { PackageDataEntry } from 'src/app/services/patch-db/data-model' import { PkgInfo } from 'src/app/util/get-package-info' import { UiLauncherService } from 'src/app/services/ui-launcher.service' -import { MainStatus } from '../../../../../../../../../core/startos/bindings/MainStatus' +import { T } from '@start9labs/start-sdk' @Component({ selector: 'app-list-pkg', @@ -15,7 +15,7 @@ export class AppListPkgComponent { constructor(private readonly launcherService: UiLauncherService) {} - get pkgMainStatus(): MainStatus { + get pkgMainStatus(): T.MainStatus { return ( this.pkg.entry.status.main || { status: 'stopped', diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts index 3ee4e1b2d..010a7473c 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.ts @@ -25,7 +25,7 @@ import { isRestoring, isUpdating, } from 'src/app/util/get-package-data' -import { Manifest } from '../../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' export interface DependencyInfo { id: string @@ -91,7 +91,7 @@ export class AppShowPage { private getDepValues( pkg: PackageDataEntry, - manifest: Manifest, + manifest: T.Manifest, depId: string, depErrors: PkgDependencyErrors, ): DependencyInfo { @@ -120,7 +120,7 @@ export class AppShowPage { private getDepErrors( pkg: PackageDataEntry, - manifest: Manifest, + manifest: T.Manifest, depId: string, depErrors: PkgDependencyErrors, ) { @@ -162,7 +162,7 @@ export class AppShowPage { private async fixDep( pkg: PackageDataEntry, - pkgManifest: Manifest, + pkgManifest: T.Manifest, action: 'install' | 'update' | 'configure', id: string, ): Promise { @@ -177,7 +177,7 @@ export class AppShowPage { private async installDep( pkg: PackageDataEntry, - pkgManifest: Manifest, + pkgManifest: T.Manifest, depId: string, ): Promise { const dependentInfo: DependentInfo = { @@ -196,7 +196,7 @@ export class AppShowPage { } private async configureDep( - pkgManifest: Manifest, + pkgManifest: T.Manifest, dependencyId: string, ): Promise { const dependentInfo: DependentInfo = { diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts index b639b216f..278fa3d88 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-additional/app-show-additional.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core' import { ModalController, ToastController } from '@ionic/angular' import { copyToClipboard, MarkdownComponent } from '@start9labs/shared' +import { T } from '@start9labs/start-sdk' import { from } from 'rxjs' import { ApiService } from 'src/app/services/api/embassy-api.service' -import { Manifest } from '../../../../../../../../../../core/startos/bindings/Manifest' @Component({ selector: 'app-show-additional', @@ -12,7 +12,7 @@ import { Manifest } from '../../../../../../../../../../core/startos/bindings/Ma }) export class AppShowAdditionalComponent { @Input() - manifest!: Manifest + manifest!: T.Manifest constructor( private readonly modalCtrl: ModalController, diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts index ccf46a6e8..f3db08063 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core' +import { T } from '@start9labs/start-sdk' import { ConnectionService } from 'src/app/services/connection.service' -import { HealthCheckResult } from '../../../../../../../../../../core/startos/bindings/HealthCheckResult' @Component({ selector: 'app-show-health-checks', @@ -10,17 +10,17 @@ import { HealthCheckResult } from '../../../../../../../../../../core/startos/bi }) export class AppShowHealthChecksComponent { @Input() - healthChecks!: Record + healthChecks!: Record readonly connected$ = this.connectionService.connected$ constructor(private readonly connectionService: ConnectionService) {} - isLoading(result: HealthCheckResult['result']): boolean { + isLoading(result: T.HealthCheckResult['result']): boolean { return result === 'starting' || result === 'loading' } - isReady(result: HealthCheckResult['result']): boolean { + isReady(result: T.HealthCheckResult['result']): boolean { return result !== 'failure' && result !== 'loading' } diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts index 474b62f62..b6d259553 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-progress/app-show-progress.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core' -import { FullProgress } from '../../../../../../../../../../core/startos/bindings/FullProgress' +import { T } from '@start9labs/start-sdk' @Component({ selector: 'app-show-progress', @@ -9,5 +9,5 @@ import { FullProgress } from '../../../../../../../../../../core/startos/binding }) export class AppShowProgressComponent { @Input() - phases!: FullProgress['phases'] + phases!: T.FullProgress['phases'] } diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts index 23d9affd4..4bc1bc464 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts @@ -20,8 +20,7 @@ import { getAllPackages, } from 'src/app/util/get-package-data' import { PatchDB } from 'patch-db-client' -import { Status } from '../../../../../../../../../../core/startos/bindings/Status' -import { Manifest } from '../../../../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' @Component({ selector: 'app-show-status', @@ -57,11 +56,11 @@ export class AppShowStatusComponent { return this.pkg.serviceInterfaces } - get pkgStatus(): Status { + get pkgStatus(): T.Status { return this.pkg.status } - get manifest(): Manifest { + get manifest(): T.Manifest { return getManifest(this.pkg) } diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts index a676c28f7..30d71d427 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/health-color.pipe.ts @@ -1,11 +1,11 @@ import { Pipe, PipeTransform } from '@angular/core' -import { HealthCheckResult } from '../../../../../../../../../core/startos/bindings/HealthCheckResult' +import { T } from '@start9labs/start-sdk' @Pipe({ name: 'healthColor', }) export class HealthColorPipe implements PipeTransform { - transform(val: HealthCheckResult['result']): string { + transform(val: T.HealthCheckResult['result']): string { switch (val) { case 'success': return 'success' diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts index c51b4cac7..f7ae9f973 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts @@ -11,7 +11,7 @@ import { ModalService } from 'src/app/services/modal.service' import { ApiService } from 'src/app/services/api/embassy-api.service' import { from, map, Observable } from 'rxjs' import { PatchDB } from 'patch-db-client' -import { Manifest } from '../../../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' export interface Button { title: string @@ -99,7 +99,7 @@ export class ToButtonsPipe implements PipeTransform { ] } - private async presentModalInstructions(manifest: Manifest) { + private async presentModalInstructions(manifest: T.Manifest) { this.apiService .setDbValue(['ack-instructions', manifest.id], true) .catch(e => console.error('Failed to mark instructions as seen', e)) diff --git a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts index 63c31263a..f66773f2c 100644 --- a/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts +++ b/web/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-health-checks.pipe.ts @@ -4,8 +4,7 @@ import { isEmptyObject } from '@start9labs/shared' import { map, startWith } from 'rxjs/operators' import { PatchDB } from 'patch-db-client' import { Observable } from 'rxjs' -import { HealthCheckResult } from '../../../../../../../../../core/startos/bindings/HealthCheckResult' -import { Manifest } from '../../../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' @Pipe({ name: 'toHealthChecks', @@ -14,8 +13,8 @@ export class ToHealthChecksPipe implements PipeTransform { constructor(private readonly patch: PatchDB) {} transform( - manifest: Manifest, - ): Observable | null> { + manifest: T.Manifest, + ): Observable | null> { return this.patch.watch$('packageData', manifest.id, 'status', 'main').pipe( map(main => { return main.status === 'running' && !isEmptyObject(main.health) diff --git a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts index 4a5d8951d..d88ab8838 100644 --- a/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts +++ b/web/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.ts @@ -8,7 +8,7 @@ import { PatchDB } from 'patch-db-client' import { take } from 'rxjs/operators' import { DataModel } from 'src/app/services/patch-db/data-model' import { Observable } from 'rxjs' -import { MainStatus } from '../../../../../../../../../core/startos/bindings/MainStatus' +import { T } from '@start9labs/start-sdk' @Component({ selector: 'backing-up', @@ -30,7 +30,7 @@ export class BackingUpComponent { name: 'pkgMainStatus', }) export class PkgMainStatusPipe implements PipeTransform { - transform(pkgId: string): Observable { + transform(pkgId: string): Observable { return this.patch.watch$('packageData', pkgId, 'status', 'main', 'status') } diff --git a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts index 242b94172..4026d5183 100644 --- a/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts +++ b/web/projects/ui/src/app/pages/server-routes/sideload/sideload.page.ts @@ -4,7 +4,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service' import { ConfigService } from 'src/app/services/config.service' import cbor from 'cbor' import { ErrorToastService } from '@start9labs/shared' -import { Manifest } from '../../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' interface Positions { [key: string]: [bigint, bigint] // [position, length] @@ -21,7 +21,7 @@ const VERSION = new Uint8Array([1]) export class SideloadPage { isMobile = isPlatform(window, 'ios') || isPlatform(window, 'android') toUpload: { - manifest: Manifest | null + manifest: T.Manifest | null icon: string | null file: File | null } = { diff --git a/web/projects/ui/src/app/pages/updates/updates.page.ts b/web/projects/ui/src/app/pages/updates/updates.page.ts index a77dcb34f..d1ffc4829 100644 --- a/web/projects/ui/src/app/pages/updates/updates.page.ts +++ b/web/projects/ui/src/app/pages/updates/updates.page.ts @@ -24,7 +24,7 @@ import { isUpdating, } from 'src/app/util/get-package-data' import { dryUpdate } from 'src/app/util/dry-update' -import { Manifest } from '../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' interface UpdatesData { hosts: StoreIdentity[] @@ -70,7 +70,7 @@ export class UpdatesPage { }) } - async tryUpdate(manifest: Manifest, url: string, e: Event): Promise { + async tryUpdate(manifest: T.Manifest, url: string, e: Event): Promise { e.stopPropagation() const { id, version } = manifest @@ -86,7 +86,7 @@ export class UpdatesPage { } } - private async dryInstall(manifest: Manifest, url: string) { + private async dryInstall(manifest: T.Manifest, url: string) { const { id, version, title } = manifest const breakages = dryUpdate( diff --git a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts index 7d6a646d0..8eb0a57ec 100644 --- a/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts +++ b/web/projects/ui/src/app/pipes/install-progress/install-progress.pipe.ts @@ -1,11 +1,11 @@ import { Pipe, PipeTransform } from '@angular/core' -import { Progress } from '../../../../../../../core/startos/bindings/Progress' +import { T } from '@start9labs/start-sdk' @Pipe({ name: 'installingProgressString', }) export class InstallingProgressDisplayPipe implements PipeTransform { - transform(progress: Progress): string { + transform(progress: T.Progress): string { if (progress === true) return 'finalizing' if (progress === false || !progress.total) return 'unknown %' const percentage = Math.round((100 * progress.done) / progress.total) @@ -18,7 +18,7 @@ export class InstallingProgressDisplayPipe implements PipeTransform { name: 'installingProgress', }) export class InstallingProgressPipe implements PipeTransform { - transform(progress: Progress): number | null { + transform(progress: T.Progress): number | null { if (progress === true) return 1 if (progress === false || !progress.total) return null return Number((progress.done / progress.total).toFixed(2)) diff --git a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts index d99e69c87..9077c5215 100644 --- a/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts +++ b/web/projects/ui/src/app/pipes/launchable/launchable.pipe.ts @@ -1,7 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core' import { ConfigService } from '../../services/config.service' -import { PackageState } from '../../../../../../../core/startos/bindings/PackageState' -import { MainStatus } from '../../../../../../../core/startos/bindings/MainStatus' +import { T } from '@start9labs/start-sdk' @Pipe({ name: 'isLaunchable', @@ -10,8 +9,8 @@ export class LaunchablePipe implements PipeTransform { constructor(private configService: ConfigService) {} transform( - state: PackageState['state'], - status: MainStatus['status'], + state: T.PackageState['state'], + status: T.MainStatus['status'], ): boolean { return this.configService.isLaunchable(state, status) } diff --git a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts index 49ad380ad..6994d1a30 100644 --- a/web/projects/ui/src/app/pipes/ui/ui.pipe.ts +++ b/web/projects/ui/src/app/pipes/ui/ui.pipe.ts @@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core' import { PackageDataEntry } from '../../services/patch-db/data-model' import { hasUi } from '../../services/config.service' import { getManifest } from 'src/app/util/get-package-data' -import { Manifest } from '../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' @Pipe({ name: 'hasUi', @@ -17,7 +17,7 @@ export class UiPipe implements PipeTransform { name: 'toManifest', }) export class ToManifestPipe implements PipeTransform { - transform(pkg: PackageDataEntry): Manifest { + transform(pkg: PackageDataEntry): T.Manifest { return getManifest(pkg) } } diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts index 61866b39a..f06980f20 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -6,11 +6,10 @@ import { Metric, NotificationLevel, RR, ServerNotifications } from './api.types' import { BTC_ICON, LND_ICON, PROXY_ICON } from './api-icons' import { DependencyMetadata, MarketplacePkg } from '@start9labs/marketplace' import { Log } from '@start9labs/shared' -import { ServerStatus } from '../../../../../../../core/startos/bindings/ServerStatus' -import { Manifest } from '../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' export module Mock { - export const ServerUpdated: ServerStatus = { + export const ServerUpdated: T.ServerStatus = { backupProgress: null, updateProgress: null, updated: true, @@ -43,7 +42,7 @@ export module Mock { '0.19.0': 'release notes for Bitcoin 0.19.0', } - export const MockManifestBitcoind: Manifest = { + export const MockManifestBitcoind: T.Manifest = { id: 'bitcoind', title: 'Bitcoin Core', version: '0.21.0', @@ -81,7 +80,7 @@ export module Mock { }, } - export const MockManifestLnd: Manifest = { + export const MockManifestLnd: T.Manifest = { id: 'lnd', title: 'Lightning Network Daemon', version: '0.11.1', @@ -129,7 +128,7 @@ export module Mock { }, } - export const MockManifestBitcoinProxy: Manifest = { + export const MockManifestBitcoinProxy: T.Manifest = { id: 'btc-rpc-proxy', title: 'Bitcoin Proxy', version: '0.2.2', diff --git a/web/projects/ui/src/app/services/api/api.types.ts b/web/projects/ui/src/app/services/api/api.types.ts index 38c80187d..1d9ce3de3 100644 --- a/web/projects/ui/src/app/services/api/api.types.ts +++ b/web/projects/ui/src/app/services/api/api.types.ts @@ -4,8 +4,7 @@ import { PackagePropertiesVersioned } from 'src/app/util/properties.util' import { ConfigSpec } from 'src/app/pkg-config/config-types' import { DataModel } from 'src/app/services/patch-db/data-model' import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared' -import { HealthCheckResult } from '../../../../../../../core/startos/bindings/HealthCheckResult' -import { Manifest } from '../../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' export module RR { // DB @@ -245,7 +244,7 @@ export module RR { } export type SideloadPackageReq = { - manifest: Manifest + manifest: T.Manifest icon: string // base64 } export type SideloadPacakgeRes = string //guid @@ -515,7 +514,7 @@ export interface DependencyErrorConfigUnsatisfied { export interface DependencyErrorHealthChecksFailed { type: 'healthChecksFailed' - check: HealthCheckResult + check: T.HealthCheckResult } export interface DependencyErrorTransitive { diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts index 5cbc841ef..31ab11201 100644 --- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts +++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts @@ -37,10 +37,9 @@ import { WebSocketSubjectConfig } from 'rxjs/webSocket' import { AuthService } from '../auth.service' import { ConnectionService } from '../connection.service' import { StoreInfo } from '@start9labs/marketplace' -import { FullProgress } from '../../../../../../../core/startos/bindings/FullProgress' -import { ServerStatus } from '../../../../../../../core/startos/bindings/ServerStatus' +import { T } from '@start9labs/start-sdk' -const PROGRESS: FullProgress = { +const PROGRESS: T.FullProgress = { overall: { done: 0, total: 120, diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts index eb53dd385..3eca4f48d 100644 --- a/web/projects/ui/src/app/services/config.service.ts +++ b/web/projects/ui/src/app/services/config.service.ts @@ -1,13 +1,8 @@ import { DOCUMENT } from '@angular/common' import { Inject, Injectable } from '@angular/core' import { WorkspaceConfig } from '@start9labs/shared' -import { types } from '@start9labs/start-sdk' -import { PackageDataEntry } from 'src/app/services/patch-db/data-model' -import { PackageState } from '../../../../../../core/startos/bindings/PackageState' -import { MainStatus } from '../../../../../../core/startos/bindings/MainStatus' -import { ExportedOnionHostname } from '../../../../../../core/startos/bindings/ExportedOnionHostname' -import { ExportedIpHostname } from '../../../../../../core/startos/bindings/ExportedIpHostname' -import { ExportedHostnameInfo } from '../../../../../../core/startos/bindings/ExportedHostnameInfo' +import { T } from '@start9labs/start-sdk' +import { PackageDataEntry } from './patch-db/data-model' const { gitHash, @@ -55,8 +50,8 @@ export class ConfigService { } isLaunchable( - state: PackageState['state'], - status: MainStatus['status'], + state: T.PackageState['state'], + status: T.MainStatus['status'], ): boolean { return state === 'installed' && status === 'running' } @@ -76,13 +71,13 @@ export class ConfigService { if (host.kind === 'multi') { const onionHostname = host.hostnames.find(h => h.kind === 'onion') - ?.hostname as ExportedOnionHostname + ?.hostname as T.ExportedOnionHostname if (this.isTor() && onionHostname) { url.hostname = onionHostname.value } else { const ipHostname = host.hostnames.find(h => h.kind === 'ip') - ?.hostname as ExportedIpHostname + ?.hostname as T.ExportedIpHostname if (!ipHostname) return '' @@ -91,16 +86,16 @@ export class ConfigService { } } else { throw new Error('unimplemented') - const hostname = {} as ExportedHostnameInfo // host.hostname + // const hostname = {} as T.ExportedHostnameInfo // host.hostname - if (!hostname) return '' + // if (!hostname) return '' - if (this.isTor() && hostname.kind === 'onion') { - url.hostname = (hostname.hostname as ExportedOnionHostname).value - } else { - url.hostname = this.hostname - url.port = String(hostname.hostname.sslPort || hostname.hostname.port) - } + // if (this.isTor() && hostname.kind === 'onion') { + // url.hostname = (hostname.hostname as T.ExportedOnionHostname).value + // } else { + // url.hostname = this.hostname + // url.port = String(hostname.hostname.sslPort || hostname.hostname.port) + // } } return url.href diff --git a/web/projects/ui/src/app/services/patch-db/data-model.ts b/web/projects/ui/src/app/services/patch-db/data-model.ts index b2446892e..33daecda7 100644 --- a/web/projects/ui/src/app/services/patch-db/data-model.ts +++ b/web/projects/ui/src/app/services/patch-db/data-model.ts @@ -1,13 +1,6 @@ -import { Url } from '@start9labs/shared' -import { types } from '@start9labs/start-sdk' -import { ActionMetadata } from '@start9labs/start-sdk/cjs/sdk/lib/types' -import { Public } from '../../../../../../../core/startos/bindings/Public' -import { PackageDataEntry as PDE } from '../../../../../../../core/startos/bindings/PackageDataEntry' -import { FullProgress } from '../../../../../../../core/startos/bindings/FullProgress' -import { Manifest } from '../../../../../../../core/startos/bindings/Manifest' -type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo +import { T } from '@start9labs/start-sdk' -export type DataModel = Public & { +export type DataModel = T.Public & { ui: UIData packageData: Record } @@ -52,15 +45,16 @@ export interface UIStore { name?: string } -export type PackageDataEntry = PDE & { - stateInfo: T -} +export type PackageDataEntry = + T.PackageDataEntry & { + stateInfo: T + } export type StateInfo = InstalledState | InstallingState | UpdatingState export type InstalledState = { state: 'installed' | 'removing' - manifest: Manifest + manifest: T.Manifest installingInfo?: undefined } @@ -73,10 +67,10 @@ export type InstallingState = { export type UpdatingState = { state: 'updating' installingInfo: InstallingInfo - manifest: Manifest + manifest: T.Manifest } export type InstallingInfo = { - progress: FullProgress - newManifest: Manifest + progress: T.FullProgress + newManifest: T.Manifest } diff --git a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts index a3f19b18f..d73a9afe1 100644 --- a/web/projects/ui/src/app/services/pkg-status-rendering.service.ts +++ b/web/projects/ui/src/app/services/pkg-status-rendering.service.ts @@ -1,6 +1,5 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model' import { PkgDependencyErrors } from './dep-error.service' -import { Status } from '../../../../../../core/startos/bindings/Status' import { T } from '@start9labs/start-sdk' export interface PackageStatus { @@ -28,7 +27,7 @@ export function renderPkgStatus( return { primary, dependency, health } } -function getInstalledPrimaryStatus(status: Status): PrimaryStatus { +function getInstalledPrimaryStatus(status: T.Status): PrimaryStatus { if (!status.configured) { return 'needsConfig' } else { @@ -40,7 +39,7 @@ function getDependencyStatus(depErrors: PkgDependencyErrors): DependencyStatus { return Object.values(depErrors).some(err => !!err) ? 'warning' : 'satisfied' } -function getHealthStatus(status: Status): T.HealthStatus | null { +function getHealthStatus(status: T.Status): T.HealthStatus | null { if (status.main.status !== 'running' || !status.main.health) { return null } diff --git a/web/projects/ui/src/app/util/get-package-data.ts b/web/projects/ui/src/app/util/get-package-data.ts index 08fbdd2df..c4d0cc046 100644 --- a/web/projects/ui/src/app/util/get-package-data.ts +++ b/web/projects/ui/src/app/util/get-package-data.ts @@ -7,7 +7,7 @@ import { UpdatingState, } from 'src/app/services/patch-db/data-model' import { firstValueFrom } from 'rxjs' -import { Manifest } from '../../../../../../core/startos/bindings/Manifest' +import { T } from '@start9labs/start-sdk' export async function getPackage( patch: PatchDB, @@ -22,7 +22,7 @@ export async function getAllPackages( return firstValueFrom(patch.watch$('packageData')) } -export function getManifest(pkg: PackageDataEntry): Manifest { +export function getManifest(pkg: PackageDataEntry): T.Manifest { if (isInstalled(pkg) || isRemoving(pkg)) return pkg.stateInfo.manifest return (pkg.stateInfo as InstallingState).installingInfo.newManifest diff --git a/web/projects/ui/src/app/util/get-server-info.ts b/web/projects/ui/src/app/util/get-server-info.ts index ba4bf0dbf..b5d5e819e 100644 --- a/web/projects/ui/src/app/util/get-server-info.ts +++ b/web/projects/ui/src/app/util/get-server-info.ts @@ -1,10 +1,10 @@ import { PatchDB } from 'patch-db-client' import { DataModel } from 'src/app/services/patch-db/data-model' import { firstValueFrom } from 'rxjs' -import { ServerInfo } from '../../../../../../core/startos/bindings/ServerInfo' +import { T } from '@start9labs/start-sdk' export async function getServerInfo( patch: PatchDB, -): Promise { +): Promise { return firstValueFrom(patch.watch$('serverInfo')) }