Feature/UI sideload (#2658)

* ui sideloading

* remove subtlecrypto import

* fix parser

* misc fixes

* allow docker pull during compat conversion

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

@@ -3,7 +3,6 @@ use std::panic::UnwindSafe;
 use std::path::PathBuf;
 
 use clap::Parser;
-use helpers::NonDetachingJoinHandle;
 use imbl_value::InternedString;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerArgs, HandlerExt, ParentHandler};
@@ -13,7 +12,7 @@ use url::Url;
 
 use crate::context::CliContext;
 use crate::prelude::*;
-use crate::progress::{FullProgressTracker, PhasedProgressBar};
+use crate::progress::{FullProgressTracker};
 use crate::registry::asset::RegistryAsset;
 use crate::registry::context::RegistryContext;
 use crate::registry::os::index::OsVersionInfo;
@@ -25,6 +24,7 @@ use crate::s9pk::merkle_archive::hash::VerifyingWriter;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 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;
 
@@ -184,7 +184,7 @@ pub async fn cli_add_asset(
         }
     };
 
-    let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
+    let file = MultiCursorFile::from(open_file(&path).await?);
 
     let progress = FullProgressTracker::new();
     let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(10));

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

@@ -20,6 +20,7 @@ use crate::registry::os::SIG_CONTEXT;
 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> {
@@ -158,9 +159,7 @@ async fn cli_get_os_asset(
         if let Some(mut reverify_phase) = reverify_phase {
             reverify_phase.start();
             res.commitment
-                .check(&MultiCursorFile::from(
-                    tokio::fs::File::open(download).await?,
-                ))
+                .check(&MultiCursorFile::from(open_file(download).await?))
                 .await?;
             reverify_phase.complete();
         }

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

@@ -21,6 +21,7 @@ use crate::registry::signer::sign::ed25519::Ed25519;
 use crate::registry::signer::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
 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;
 
@@ -166,7 +167,7 @@ pub async fn cli_sign_asset(
         }
     };
 
-    let file = MultiCursorFile::from(tokio::fs::File::open(&path).await?);
+    let file = MultiCursorFile::from(open_file(&path).await?);
 
     let progress = FullProgressTracker::new();
     let mut sign_phase = progress.add_phase(InternedString::intern("Signing File"), Some(10));

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

@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use emver::VersionRange;
+use exver::VersionRange;
 use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;

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

@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use chrono::Utc;
 use clap::Parser;
-use emver::VersionRange;
+use exver::VersionRange;
 use itertools::Itertools;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -148,10 +148,11 @@ pub async fn get_version(
     if let (Some(pool), Some(server_id), Some(arch)) = (&ctx.pool, server_id, arch) {
         let created_at = Utc::now();
 
-        query!("INSERT INTO user_activity (created_at, server_id, arch) VALUES ($1, $2, $3)",
-        created_at,
-        server_id,
-        arch
+        query!(
+            "INSERT INTO user_activity (created_at, server_id, arch) VALUES ($1, $2, $3)",
+            created_at,
+            server_id,
+            arch
         )
         .execute(pool)
         .await?;