Feature/new registry (#2612)

* wip

* overhaul boot process

* wip: new registry

* wip

* wip

* wip

* wip

* wip

* wip

* os registry complete

* ui fixes

* fixes

* fixes

* more fixes

* fix merkle archive

core/startos/src/install/mod.rs

@@ -6,11 +6,12 @@ use clap::{value_parser, CommandFactory, FromArgMatches, Parser};
 use color_eyre::eyre::eyre;
 use emver::VersionRange;
 use futures::{FutureExt, StreamExt};
+use itertools::Itertools;
 use patch_db::json_ptr::JsonPointer;
 use reqwest::header::{HeaderMap, CONTENT_LENGTH};
 use reqwest::Url;
 use rpc_toolkit::yajrc::RpcError;
-use rpc_toolkit::CallRemote;
+use rpc_toolkit::HandlerArgs;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tokio::sync::oneshot;
@@ -18,10 +19,10 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::context::{CliContext, RpcContext};
-use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::db::model::package::{ManifestPreference, PackageState, PackageStateMatchModelRef};
 use crate::prelude::*;
 use crate::progress::{FullProgress, PhasedProgressBar};
+use crate::rpc_continuations::{RequestGuid, RpcContinuation};
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::http::HttpSource;
 use crate::s9pk::S9pk;
@@ -110,7 +111,7 @@ pub struct InstallParams {
     id: PackageId,
     #[arg(short = 'm', long = "marketplace-url")]
     #[ts(type = "string | null")]
-    marketplace_url: Option<Url>,
+    registry: Option<Url>,
     #[arg(short = 'v', long = "version-spec")]
     version_spec: Option<String>,
     #[arg(long = "version-priority")]
@@ -125,7 +126,7 @@ pub async fn install(
     ctx: RpcContext,
     InstallParams {
         id,
-        marketplace_url,
+        registry,
         version_spec,
         version_priority,
     }: InstallParams,
@@ -135,15 +136,14 @@ pub async fn install(
         Some(v) => &*v,
     };
     let version: VersionRange = version_str.parse()?;
-    let marketplace_url =
-        marketplace_url.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
+    let registry = registry.unwrap_or_else(|| crate::DEFAULT_MARKETPLACE.parse().unwrap());
     let version_priority = version_priority.unwrap_or_default();
     let s9pk = S9pk::deserialize(
         &HttpSource::new(
             ctx.client.clone(),
             format!(
                 "{}/package/v0/{}.s9pk?spec={}&version-priority={}",
-                marketplace_url, id, version, version_priority,
+                registry, id, version, version_priority,
             )
             .parse()?,
         )
@@ -188,7 +188,7 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                 .with_kind(ErrorKind::Database)?,
         )
         .await;
-    ctx.add_continuation(
+    ctx.rpc_continuations.add(
         progress.clone(),
         RpcContinuation::ws(
             Box::new(|mut ws| {
@@ -203,28 +203,26 @@ pub async fn sideload(ctx: RpcContext) -> Result<SideloadResponse, Error> {
                         })?;
                         tokio::select! {
                             res = async {
-                                while let Some(rev) = sub.recv().await {
-                                    if !rev.patch.0.is_empty() { // TODO: don't send empty patches?
-                                        ws.send(Message::Text(
-                                            serde_json::to_string(&if let Some(p) = db
-                                                .peek()
-                                                .await
-                                                .as_public()
-                                                .as_package_data()
-                                                .as_idx(&id)
-                                                .and_then(|e| e.as_state_info().as_installing_info()).map(|i| i.as_progress())
-                                            {
-                                                Ok::<_, ()>(p.de()?)
-                                            } else {
-                                                let mut p = FullProgress::new();
-                                                p.overall.complete();
-                                                Ok(p)
-                                            })
-                                            .with_kind(ErrorKind::Serialization)?,
-                                        ))
-                                        .await
-                                        .with_kind(ErrorKind::Network)?;
-                                    }
+                                while let Some(_) = sub.recv().await {
+                                    ws.send(Message::Text(
+                                        serde_json::to_string(&if let Some(p) = db
+                                            .peek()
+                                            .await
+                                            .as_public()
+                                            .as_package_data()
+                                            .as_idx(&id)
+                                            .and_then(|e| e.as_state_info().as_installing_info()).map(|i| i.as_progress())
+                                        {
+                                            Ok::<_, ()>(p.de()?)
+                                        } else {
+                                            let mut p = FullProgress::new();
+                                            p.overall.complete();
+                                            Ok(p)
+                                        })
+                                        .with_kind(ErrorKind::Serialization)?,
+                                    ))
+                                    .await
+                                    .with_kind(ErrorKind::Network)?;
                                 }
                                 Ok::<_, Error>(())
                             } => res?,
@@ -322,15 +320,30 @@ impl FromArgMatches for CliInstallParams {
 }
 
 #[instrument(skip_all)]
-pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<(), RpcError> {
+pub async fn cli_install(
+    HandlerArgs {
+        context: ctx,
+        parent_method,
+        method,
+        params,
+        ..
+    }: HandlerArgs<CliContext, CliInstallParams>,
+) -> Result<(), RpcError> {
+    let method = parent_method.into_iter().chain(method).collect_vec();
     match params {
         CliInstallParams::Sideload(path) => {
             let file = crate::s9pk::load(&ctx, path).await?;
 
             // rpc call remote sideload
             let SideloadResponse { upload, progress } = from_value::<SideloadResponse>(
-                ctx.call_remote("package.sideload", imbl_value::json!({}))
-                    .await?,
+                ctx.call_remote::<RpcContext>(
+                    &method[..method.len() - 1]
+                        .into_iter()
+                        .chain(std::iter::once(&"sideload"))
+                        .join("."),
+                    imbl_value::json!({}),
+                )
+                .await?,
             )?;
 
             let upload = async {
@@ -387,7 +400,7 @@ pub async fn cli_install(ctx: CliContext, params: CliInstallParams) -> Result<()
             upload?;
         }
         CliInstallParams::Marketplace(params) => {
-            ctx.call_remote("package.install", to_value(&params)?)
+            ctx.call_remote::<RpcContext>(&method.join("."), to_value(&params)?)
                 .await?;
         }
     }