Feature/UI sideload (#2658)

* ui sideloading

* remove subtlecrypto import

* fix parser

* misc fixes

* allow docker pull during compat conversion

core/startos/src/service/mod.rs

@@ -11,7 +11,6 @@ use persistent_container::PersistentContainer;
 use rpc_toolkit::{from_fn_async, CallRemoteHandler, Empty, HandlerArgs, HandlerFor};
 use serde::{Deserialize, Serialize};
 use start_stop::StartStop;
-use tokio::fs::File;
 use tokio::sync::Notify;
 use ts_rs::TS;
 
@@ -33,6 +32,7 @@ use crate::status::MainStatus;
 use crate::util::actor::background::BackgroundJobQueue;
 use crate::util::actor::concurrent::ConcurrentActor;
 use crate::util::actor::Actor;
+use crate::util::io::create_file;
 use crate::util::serde::Pem;
 use crate::volume::data_dir;
 
@@ -403,7 +403,7 @@ impl Service {
     #[instrument(skip_all)]
     pub async fn backup(&self, guard: impl GenericMountGuard) -> Result<(), Error> {
         let id = &self.seed.id;
-        let mut file = File::create(guard.path().join(id).with_extension("s9pk")).await?;
+        let mut file = create_file(guard.path().join(id).with_extension("s9pk")).await?;
         self.seed
             .persistent_container
             .s9pk

core/startos/src/service/persistent_container.rs

@@ -9,14 +9,12 @@ use helpers::NonDetachingJoinHandle;
 use models::{ImageId, ProcedureName, VolumeId};
 use rpc_toolkit::{Empty, Server, ShutdownHandle};
 use serde::de::DeserializeOwned;
-use tokio::fs::File;
 use tokio::process::Command;
 use tokio::sync::{oneshot, watch, Mutex, OnceCell};
 use tracing::instrument;
 
 use super::service_effect_handler::{service_effect_handler, EffectContext};
 use super::transition::{TransitionKind, TransitionState};
-use super::ServiceActorSeed;
 use crate::context::RpcContext;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::idmapped::IdMapped;
@@ -32,6 +30,7 @@ use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
 use crate::service::start_stop::StartStop;
 use crate::service::{rpc, RunningStatus, Service};
+use crate::util::io::create_file;
 use crate::util::rpc_client::UnixRpcClient;
 use crate::util::Invoke;
 use crate::volume::{asset_dir, data_dir};
@@ -237,7 +236,7 @@ impl PersistentContainer {
                 .get_path(Path::new("images").join(arch).join(&env_filename))
                 .and_then(|e| e.as_file())
             {
-                env.copy(&mut File::create(image_path.join(&env_filename)).await?)
+                env.copy(&mut create_file(image_path.join(&env_filename)).await?)
                     .await?;
             }
             let json_filename = Path::new(image.as_ref()).with_extension("json");
@@ -247,7 +246,7 @@ impl PersistentContainer {
                 .get_path(Path::new("images").join(arch).join(&json_filename))
                 .and_then(|e| e.as_file())
             {
-                json.copy(&mut File::create(image_path.join(&json_filename)).await?)
+                json.copy(&mut create_file(image_path.join(&json_filename)).await?)
                     .await?;
             }
         }

core/startos/src/service/service_effect_handler.rs

@@ -7,8 +7,8 @@ use std::str::FromStr;
 use std::sync::{Arc, Weak};
 
 use clap::builder::ValueParserFactory;
-use clap::{CommandFactory, FromArgMatches, Parser};
-use emver::VersionRange;
+use clap::Parser;
+use exver::VersionRange;
 use imbl_value::json;
 use itertools::Itertools;
 use models::{
@@ -1383,7 +1383,7 @@ struct CheckDependenciesResult {
     is_running: bool,
     health_checks: Vec<HealthCheckResult>,
     #[ts(type = "string | null")]
-    version: Option<emver::Version>,
+    version: Option<exver::ExtendedVersion>,
 }
 
 async fn check_dependencies(

core/startos/src/service/service_map.rs

@@ -94,12 +94,19 @@ impl ServiceMap {
     }
 
     #[instrument(skip_all)]
-    pub async fn install<S: FileSource + Clone>(
+    pub async fn install<F, Fut, S: FileSource + Clone>(
         &self,
         ctx: RpcContext,
-        mut s9pk: S9pk<S>,
+        s9pk: F,
         recovery_source: Option<impl GenericMountGuard>,
-    ) -> Result<DownloadInstallFuture, Error> {
+        progress: Option<FullProgressTracker>,
+    ) -> Result<DownloadInstallFuture, Error>
+    where
+        F: FnOnce() -> Fut,
+        Fut: Future<Output = Result<S9pk<S>, Error>>,
+        S: FileSource + Clone,
+    {
+        let mut s9pk = s9pk().await?;
         s9pk.validate_and_filter(ctx.s9pk_arch)?;
         let manifest = s9pk.as_manifest().clone();
         let id = manifest.id.clone();
@@ -118,7 +125,7 @@ impl ServiceMap {
         };
 
         let size = s9pk.size();
-        let progress = FullProgressTracker::new();
+        let progress = progress.unwrap_or_else(|| FullProgressTracker::new());
         let download_progress_contribution = size.unwrap_or(60);
         let mut download_progress = progress.add_phase(
             InternedString::intern("Download"),