update/alpha.9 (#2988)

* import marketplac preview for sideload

* fix: improve state service (#2977)

* fix: fix sideload DI

* fix: update Angular

* fix: cleanup

* fix: fix version selection

* Bump node version to fix build for Angular

* misc fixes
- update node to v22
- fix chroot-and-upgrade access to prune-images
- don't self-migrate legacy packages
- #2985
- move dataVersion to volume folder
- remove "instructions.md" from s9pk
- add "docsUrl" to manifest

* version bump

* include flavor when clicking view listing from updates tab

* closes #2980

* fix: fix select button

* bring back ssh keys

* fix: drop 'portal' from all routes

* fix: implement longtap action to select table rows

* fix description for ssh page

* replace instructions with docsLink and refactor marketplace preview

* delete unused translations

* fix patchdb diffing algorithm

* continue refactor of marketplace lib show components

* Booting StartOS instead of Setting up your server on init

* misc fixes
- closes #2990
- closes #2987

* fix build

* docsUrl and clickable service headers

* don't cleanup after update until new service install succeeds

* update types

* misc fixes

* beta.35

* sdkversion, githash for sideload, correct logs for init, startos pubkey display

* bring back reboot button on install

* misc fixes

* beta.36

* better handling of setup and init for websocket errors

* reopen init and setup logs even on graceful closure

* better logging, misc fixes

* fix build

* dont let package stats hang

* dont show docsurl in marketplace if no docsurl

* re-add needs-config

* show error if init fails, shorten hover state on header icons

* fix operator precedemce

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>
Co-authored-by: Alex Inkin <alexander@inkin.ru>
Co-authored-by: Mariusz Kogen <k0gen@pm.me>

core/startos/src/net/static_server.rs

@@ -22,6 +22,7 @@ use http::request::Parts as RequestParts;
 use http::{HeaderValue, Method, StatusCode};
 use imbl_value::InternedString;
 use include_dir::Dir;
+use models::PackageId;
 use new_mime_guess::MimeGuess;
 use openssl::hash::MessageDigest;
 use openssl::x509::X509;
@@ -32,7 +33,6 @@ use url::Url;
 
 use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::hostname::Hostname;
-use crate::install::PKG_ARCHIVE_DIR;
 use crate::middleware::auth::{Auth, HasValidSession};
 use crate::middleware::cors::Cors;
 use crate::middleware::db::SyncDb;
@@ -46,7 +46,7 @@ use crate::s9pk::S9pk;
 use crate::util::io::open_file;
 use crate::util::net::SyncBody;
 use crate::util::serde::BASE64;
-use crate::{diagnostic_api, init_api, install_api, main_api, setup_api, DATA_DIR};
+use crate::{diagnostic_api, init_api, install_api, main_api, setup_api};
 
 const NOT_FOUND: &[u8] = b"Not Found";
 const METHOD_NOT_ALLOWED: &[u8] = b"Method Not Allowed";
@@ -263,13 +263,22 @@ fn s9pk_router(ctx: RpcContext) -> Router {
             any(
                 |x::Path(s9pk): x::Path<String>, request: Request| async move {
                     if_authorized(&ctx, request, |request| async {
+                        let id = s9pk
+                            .strip_suffix(".s9pk")
+                            .unwrap_or(&s9pk)
+                            .parse::<PackageId>()?;
                         let (parts, _) = request.into_parts();
                         match FileData::from_path(
                             &parts,
-                            &Path::new(DATA_DIR)
-                                .join(PKG_ARCHIVE_DIR)
-                                .join("installed")
-                                .join(s9pk),
+                            &ctx.db
+                                .peek()
+                                .await
+                                .into_public()
+                                .into_package_data()
+                                .into_idx(&id)
+                                .or_not_found(&id)?
+                                .into_s9pk()
+                                .de()?,
                         )
                         .await?
                         {
@@ -289,13 +298,22 @@ fn s9pk_router(ctx: RpcContext) -> Router {
                  x::RawQuery(query): x::RawQuery,
                  request: Request| async move {
                     if_authorized(&ctx, request, |request| async {
+                        let id = s9pk
+                            .strip_suffix(".s9pk")
+                            .unwrap_or(&s9pk)
+                            .parse::<PackageId>()?;
                         let s9pk = S9pk::deserialize(
                             &MultiCursorFile::from(
                                 open_file(
-                                    Path::new(DATA_DIR)
-                                        .join(PKG_ARCHIVE_DIR)
-                                        .join("installed")
-                                        .join(s9pk),
+                                    ctx.db
+                                        .peek()
+                                        .await
+                                        .into_public()
+                                        .into_package_data()
+                                        .into_idx(&id)
+                                        .or_not_found(&id)?
+                                        .into_s9pk()
+                                        .de()?,
                                 )
                                 .await?,
                             ),