Feature/callbacks (#2678)

* wip

* initialize callbacks

* wip

* smtp

* list_service_interfaces

* wip

* wip

* fix domains

* fix hostname handling in NetService

* misc fixes

* getInstalledPackages

* misc fixes

* publish v6 lib

* refactor service effects

* fix import

* fix container runtime

* fix tests

* apply suggestions from review

core/startos/src/registry/os/asset/add.rs

@@ -4,6 +4,7 @@ use std::path::PathBuf;
 
 use chrono::Utc;
 use clap::Parser;
+use exver::Version;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -27,7 +28,6 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::open_file;
 use crate::util::serde::Base64;
-use crate::util::VersionString;
 
 pub fn add_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -55,7 +55,8 @@ pub fn add_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddAssetParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     #[ts(type = "string")]
     pub platform: InternedString,
     #[ts(type = "string")]
@@ -154,7 +155,7 @@ pub struct CliAddAssetParams {
     #[arg(short = 'p', long = "platform")]
     pub platform: InternedString,
     #[arg(short = 'v', long = "version")]
-    pub version: VersionString,
+    pub version: Version,
     pub file: PathBuf,
     pub url: Url,
 }
@@ -209,11 +210,18 @@ pub async fn cli_add_asset(
         hash: Base64(*blake3.as_bytes()),
         size,
     };
-    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
+    let signature = AnySignature::Ed25519(Ed25519.sign_commitment(
+        ctx.developer_key()?,
+        &commitment,
+        SIG_CONTEXT,
+    )?);
     sign_phase.complete();
 
     verify_phase.start();
     let src = HttpSource::new(ctx.client.clone(), url.clone()).await?;
+    if let Some(size) = src.size().await {
+        verify_phase.set_total(size);
+    }
     let mut writer = verify_phase.writer(VerifyingWriter::new(
         tokio::io::sink(),
         Some((blake3::Hash::from_bytes(*commitment.hash), commitment.size)),

core/startos/src/registry/os/asset/get.rs

@@ -3,6 +3,7 @@ use std::panic::UnwindSafe;
 use std::path::{Path, PathBuf};
 
 use clap::Parser;
+use exver::Version;
 use helpers::AtomicFile;
 use imbl_value::{json, InternedString};
 use itertools::Itertools;
@@ -21,7 +22,6 @@ use crate::registry::signer::commitment::blake3::Blake3Commitment;
 use crate::registry::signer::commitment::Commitment;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::util::io::open_file;
-use crate::util::VersionString;
 
 pub fn get_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -37,7 +37,8 @@ pub fn get_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct GetOsAssetParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     #[ts(type = "string")]
     pub platform: InternedString,
 }
@@ -91,7 +92,7 @@ pub async fn get_squashfs(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliGetOsAssetParams {
-    pub version: VersionString,
+    pub version: Version,
     pub platform: InternedString,
     #[arg(long = "download", short = 'd')]
     pub download: Option<PathBuf>,

core/startos/src/registry/os/asset/sign.rs

@@ -3,6 +3,7 @@ use std::panic::UnwindSafe;
 use std::path::PathBuf;
 
 use clap::Parser;
+use exver::Version;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -23,7 +24,6 @@ use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
 use crate::s9pk::merkle_archive::source::ArchiveSource;
 use crate::util::io::open_file;
 use crate::util::serde::Base64;
-use crate::util::VersionString;
 
 pub fn sign_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -51,7 +51,8 @@ pub fn sign_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SignAssetParams {
-    version: VersionString,
+    #[ts(type = "string")]
+    version: Version,
     #[ts(type = "string")]
     platform: InternedString,
     #[ts(skip)]
@@ -137,7 +138,7 @@ pub struct CliSignAssetParams {
     #[arg(short = 'p', long = "platform")]
     pub platform: InternedString,
     #[arg(short = 'v', long = "version")]
-    pub version: VersionString,
+    pub version: Version,
     pub file: PathBuf,
 }
 
@@ -189,7 +190,11 @@ pub async fn cli_sign_asset(
         hash: Base64(*blake3.as_bytes()),
         size,
     };
-    let signature = Ed25519.sign_commitment(ctx.developer_key()?, &commitment, SIG_CONTEXT)?;
+    let signature = AnySignature::Ed25519(Ed25519.sign_commitment(
+        ctx.developer_key()?,
+        &commitment,
+        SIG_CONTEXT,
+    )?);
     sign_phase.complete();
 
     index_phase.start();

core/startos/src/registry/os/index.rs

@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use exver::VersionRange;
+use exver::{Version, VersionRange};
 use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
@@ -10,14 +10,28 @@ use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::signer::commitment::blake3::Blake3Commitment;
 use crate::rpc_continuations::Guid;
-use crate::util::VersionString;
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 #[ts(export)]
 pub struct OsIndex {
-    pub versions: BTreeMap<VersionString, OsVersionInfo>,
+    pub versions: OsVersionInfoMap,
+}
+
+#[derive(Debug, Default, Deserialize, Serialize, TS)]
+pub struct OsVersionInfoMap(
+    #[ts(as = "BTreeMap::<String, OsVersionInfo>")] pub BTreeMap<Version, OsVersionInfo>,
+);
+impl Map for OsVersionInfoMap {
+    type Key = Version;
+    type Value = OsVersionInfo;
+    fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
+        Ok(InternedString::from_display(key))
+    }
+    fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
+        Ok(InternedString::from_display(key))
+    }
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]

core/startos/src/registry/os/version/mod.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use chrono::Utc;
 use clap::Parser;
-use exver::VersionRange;
+use exver::{Version, VersionRange};
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -15,7 +15,6 @@ use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
 use crate::registry::signer::sign::AnyVerifyingKey;
 use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
-use crate::util::VersionString;
 
 pub mod signer;
 
@@ -53,7 +52,8 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddVersionParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     pub headline: String,
     pub release_notes: String,
     #[ts(type = "string")]
@@ -99,7 +99,8 @@ pub async fn add_version(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemoveVersionParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
 }
 
 pub async fn remove_version(
@@ -124,7 +125,7 @@ pub async fn remove_version(
 pub struct GetOsVersionParams {
     #[ts(type = "string | null")]
     #[arg(long = "src")]
-    pub source: Option<VersionString>,
+    pub source: Option<Version>,
     #[ts(type = "string | null")]
     #[arg(long = "target")]
     pub target: Option<VersionRange>,
@@ -144,7 +145,7 @@ pub async fn get_version(
         server_id,
         arch,
     }: GetOsVersionParams,
-) -> Result<BTreeMap<VersionString, OsVersionInfo>, Error> {
+) -> Result<BTreeMap<Version, OsVersionInfo>, Error> {
     if let (Some(pool), Some(server_id), Some(arch)) = (&ctx.pool, server_id, arch) {
         let created_at = Utc::now();
 
@@ -176,10 +177,7 @@ pub async fn get_version(
         .collect()
 }
 
-pub fn display_version_info<T>(
-    params: WithIoFormat<T>,
-    info: BTreeMap<VersionString, OsVersionInfo>,
-) {
+pub fn display_version_info<T>(params: WithIoFormat<T>, info: BTreeMap<Version, OsVersionInfo>) {
     use prettytable::*;
 
     if let Some(format) = params.format {
@@ -197,7 +195,7 @@ pub fn display_version_info<T>(
     ]);
     for (version, info) in &info {
         table.add_row(row![
-            version.as_str(),
+            &version.to_string(),
             &info.headline,
             &info.release_notes,
             &info.iso.keys().into_iter().join(", "),

core/startos/src/registry/os/version/signer.rs

@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 
 use clap::Parser;
+use exver::Version;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
@@ -12,7 +13,6 @@ use crate::registry::context::RegistryContext;
 use crate::registry::signer::SignerInfo;
 use crate::rpc_continuations::Guid;
 use crate::util::serde::HandlerExtSerde;
-use crate::util::VersionString;
 
 pub fn signer_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
@@ -44,7 +44,8 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct VersionSignerParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
     pub signer: Guid,
 }
 
@@ -104,7 +105,8 @@ pub async fn remove_version_signer(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct ListVersionSignersParams {
-    pub version: VersionString,
+    #[ts(type = "string")]
+    pub version: Version,
 }
 
 pub async fn list_version_signers(