mirror of
https://github.com/uqbar-dao/nectar.git
synced 2024-12-20 23:21:36 +03:00
Merge pull request #624 from kinode-dao/bp/app_ui_fixes
app_store UI fixes
This commit is contained in:
commit
03928c413b
@ -297,6 +297,9 @@ interface downloads {
|
||||
blob-not-found,
|
||||
vfs-error,
|
||||
handling-error(string),
|
||||
timeout,
|
||||
invalid-manifest,
|
||||
offline,
|
||||
}
|
||||
|
||||
/// Notification that a download is complete
|
||||
@ -306,12 +309,26 @@ interface downloads {
|
||||
err: option<download-error>,
|
||||
}
|
||||
|
||||
/// Request for an auto-download complete
|
||||
record auto-download-complete-request {
|
||||
download-info: download-complete-request,
|
||||
/// Variant for an auto-download complete
|
||||
variant auto-download-complete-request {
|
||||
success(auto-download-success),
|
||||
err(auto-download-error),
|
||||
}
|
||||
|
||||
/// Auto-download success
|
||||
record auto-download-success {
|
||||
package-id: package-id,
|
||||
version-hash: string,
|
||||
manifest-hash: string,
|
||||
}
|
||||
|
||||
/// Auto-download error
|
||||
record auto-download-error {
|
||||
package-id: package-id,
|
||||
version-hash: string,
|
||||
tries: list<tuple<string, download-error>>, // (mirror, error)
|
||||
}
|
||||
|
||||
/// Represents a hash mismatch error
|
||||
record hash-mismatch {
|
||||
desired: string,
|
||||
|
@ -3,11 +3,13 @@
|
||||
//! and sends back http_responses.
|
||||
//!
|
||||
use crate::{
|
||||
kinode::process::chain::{ChainRequests, ChainResponses},
|
||||
kinode::process::downloads::{
|
||||
DownloadRequests, DownloadResponses, Entry, LocalDownloadRequest, RemoveFileRequest,
|
||||
kinode::process::{
|
||||
chain::{ChainRequests, ChainResponses},
|
||||
downloads::{
|
||||
DownloadRequests, DownloadResponses, Entry, LocalDownloadRequest, RemoveFileRequest,
|
||||
},
|
||||
},
|
||||
state::{MirrorCheck, PackageState, State},
|
||||
state::{MirrorCheck, PackageState, State, Updates},
|
||||
};
|
||||
use kinode_process_lib::{
|
||||
http::{self, server, Method, StatusCode},
|
||||
@ -28,6 +30,7 @@ pub fn init_frontend(our: &Address, http_server: &mut server::HttpServer) {
|
||||
"/downloads", // all downloads
|
||||
"/installed", // all installed apps
|
||||
"/ourapps", // all apps we've published
|
||||
"/updates", // all auto_updates
|
||||
"/apps/:id", // detail about an on-chain app
|
||||
"/downloads/:id", // local downloads for an app
|
||||
"/installed/:id", // detail about an installed app
|
||||
@ -38,6 +41,7 @@ pub fn init_frontend(our: &Address, http_server: &mut server::HttpServer) {
|
||||
"/downloads/:id/mirror", // start mirroring a version of a downloaded app
|
||||
"/downloads/:id/remove", // remove a downloaded app
|
||||
"/apps/:id/auto-update", // set auto-updating a version of a downloaded app
|
||||
"/updates/:id/clear", // clear update info for an app.
|
||||
"/mirrorcheck/:node", // check if a node/mirror is online/offline
|
||||
] {
|
||||
http_server
|
||||
@ -207,9 +211,10 @@ fn make_widget() -> String {
|
||||
pub fn handle_http_request(
|
||||
our: &Address,
|
||||
state: &mut State,
|
||||
updates: &mut Updates,
|
||||
req: &server::IncomingHttpRequest,
|
||||
) -> (server::HttpResponse, Option<LazyLoadBlob>) {
|
||||
match serve_paths(our, state, req) {
|
||||
match serve_paths(our, state, updates, req) {
|
||||
Ok((status_code, _headers, body)) => (
|
||||
server::HttpResponse::new(status_code).header("Content-Type", "application/json"),
|
||||
Some(LazyLoadBlob {
|
||||
@ -248,13 +253,13 @@ fn gen_package_info(id: &PackageId, state: &PackageState) -> serde_json::Value {
|
||||
"our_version_hash": state.our_version_hash,
|
||||
"verified": state.verified,
|
||||
"caps_approved": state.caps_approved,
|
||||
"pending_update_hash": state.pending_update_hash,
|
||||
})
|
||||
}
|
||||
|
||||
fn serve_paths(
|
||||
our: &Address,
|
||||
state: &mut State,
|
||||
updates: &mut Updates,
|
||||
req: &server::IncomingHttpRequest,
|
||||
) -> anyhow::Result<(http::StatusCode, Option<HashMap<String, String>>, Vec<u8>)> {
|
||||
let method = req.method()?;
|
||||
@ -533,7 +538,6 @@ fn serve_paths(
|
||||
.ok_or(anyhow::anyhow!("missing blob"))?
|
||||
.bytes;
|
||||
let body_json: serde_json::Value = serde_json::from_slice(&body).unwrap_or_default();
|
||||
|
||||
let version_hash = body_json
|
||||
.get("version_hash")
|
||||
.and_then(|v| v.as_str())
|
||||
@ -697,6 +701,31 @@ fn serve_paths(
|
||||
)),
|
||||
}
|
||||
}
|
||||
// GET all failed/pending auto_updates
|
||||
"/updates" => {
|
||||
let serialized = serde_json::to_vec(&updates).unwrap_or_default();
|
||||
return Ok((StatusCode::OK, None, serialized));
|
||||
}
|
||||
// POST clear all failed/pending auto_updates for a package_id
|
||||
"/updates/:id/clear" => {
|
||||
let Ok(package_id) = get_package_id(url_params) else {
|
||||
return Ok((
|
||||
StatusCode::BAD_REQUEST,
|
||||
None,
|
||||
format!("Missing package_id").into_bytes(),
|
||||
));
|
||||
};
|
||||
if method != Method::POST {
|
||||
return Ok((
|
||||
StatusCode::METHOD_NOT_ALLOWED,
|
||||
None,
|
||||
format!("Invalid method {method} for {bound_path}").into_bytes(),
|
||||
));
|
||||
}
|
||||
let _ = updates.package_updates.remove(&package_id);
|
||||
updates.save();
|
||||
Ok((StatusCode::OK, None, vec![]))
|
||||
}
|
||||
// GET online/offline mirrors for a listed app
|
||||
"/mirrorcheck/:node" => {
|
||||
if method != Method::GET {
|
||||
|
@ -42,7 +42,7 @@ use kinode_process_lib::{
|
||||
LazyLoadBlob, Message, PackageId, Response,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use state::State;
|
||||
use state::{State, UpdateInfo, Updates};
|
||||
|
||||
wit_bindgen::generate!({
|
||||
path: "target/wit",
|
||||
@ -81,15 +81,19 @@ fn init(our: Address) {
|
||||
let mut http_server = http::server::HttpServer::new(5);
|
||||
http_api::init_frontend(&our, &mut http_server);
|
||||
|
||||
// state = state built from the filesystem, installed packages
|
||||
// updates = state saved with get/set_state(), auto_update metadata.
|
||||
let mut state = State::load().expect("state loading failed");
|
||||
|
||||
let mut updates = Updates::load();
|
||||
loop {
|
||||
match await_message() {
|
||||
Err(send_error) => {
|
||||
print_to_terminal(1, &format!("main: got network error: {send_error}"));
|
||||
}
|
||||
Ok(message) => {
|
||||
if let Err(e) = handle_message(&our, &mut state, &mut http_server, &message) {
|
||||
if let Err(e) =
|
||||
handle_message(&our, &mut state, &mut updates, &mut http_server, &message)
|
||||
{
|
||||
let error_message = format!("error handling message: {e:?}");
|
||||
print_to_terminal(1, &error_message);
|
||||
Response::new()
|
||||
@ -109,6 +113,7 @@ fn init(our: Address) {
|
||||
fn handle_message(
|
||||
our: &Address,
|
||||
state: &mut State,
|
||||
updates: &mut Updates,
|
||||
http_server: &mut http::server::HttpServer,
|
||||
message: &Message,
|
||||
) -> anyhow::Result<()> {
|
||||
@ -132,7 +137,7 @@ fn handle_message(
|
||||
}
|
||||
http_server.handle_request(
|
||||
server_request,
|
||||
|incoming| http_api::handle_http_request(our, state, &incoming),
|
||||
|incoming| http_api::handle_http_request(our, state, updates, &incoming),
|
||||
|_channel_id, _message_type, _blob| {
|
||||
// not expecting any websocket messages from FE currently
|
||||
},
|
||||
@ -166,40 +171,80 @@ fn handle_message(
|
||||
"auto download complete from non-local node"
|
||||
));
|
||||
}
|
||||
// auto_install case:
|
||||
// the downloads process has given us the new package manifest's
|
||||
// capability hashes, and the old package's capability hashes.
|
||||
// we can use these to determine if the new package has the same
|
||||
// capabilities as the old one, and if so, auto-install it.
|
||||
|
||||
let manifest_hash = req.manifest_hash;
|
||||
let package_id = req.download_info.package_id;
|
||||
let version_hash = req.download_info.version_hash;
|
||||
match req {
|
||||
AutoDownloadCompleteRequest::Success(succ) => {
|
||||
// auto_install case:
|
||||
// the downloads process has given us the new package manifest's
|
||||
// capability hashes, and the old package's capability hashes.
|
||||
// we can use these to determine if the new package has the same
|
||||
// capabilities as the old one, and if so, auto-install it.
|
||||
let manifest_hash = succ.manifest_hash;
|
||||
let package_id = succ.package_id;
|
||||
let version_hash = succ.version_hash;
|
||||
|
||||
let process_lib_package_id = package_id.clone().to_process_lib();
|
||||
let process_lib_package_id = package_id.clone().to_process_lib();
|
||||
|
||||
// first, check if we have the package and get its manifest hash
|
||||
let should_auto_install = state
|
||||
.packages
|
||||
.get(&process_lib_package_id)
|
||||
.map(|package| package.manifest_hash == Some(manifest_hash.clone()))
|
||||
.unwrap_or(false);
|
||||
// first, check if we have the package and get its manifest hash
|
||||
let should_auto_install = state
|
||||
.packages
|
||||
.get(&process_lib_package_id)
|
||||
.map(|package| package.manifest_hash == Some(manifest_hash.clone()))
|
||||
.unwrap_or(false);
|
||||
|
||||
if should_auto_install {
|
||||
if let Err(e) =
|
||||
utils::install(&package_id, None, &version_hash, state, &our.node)
|
||||
{
|
||||
if let Some(package) = state.packages.get_mut(&process_lib_package_id) {
|
||||
package.pending_update_hash = Some(version_hash);
|
||||
if should_auto_install {
|
||||
if let Err(e) =
|
||||
utils::install(&package_id, None, &version_hash, state, &our.node)
|
||||
{
|
||||
println!("error auto-installing package: {e}");
|
||||
// Get or create the outer map for this package
|
||||
updates
|
||||
.package_updates
|
||||
.entry(package_id.to_process_lib())
|
||||
.or_default()
|
||||
.insert(
|
||||
version_hash.clone(),
|
||||
UpdateInfo {
|
||||
errors: vec![],
|
||||
pending_manifest_hash: Some(manifest_hash.clone()),
|
||||
},
|
||||
);
|
||||
updates.save();
|
||||
} else {
|
||||
println!(
|
||||
"auto-installed update for package: {process_lib_package_id}"
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// TODO.
|
||||
updates
|
||||
.package_updates
|
||||
.entry(package_id.to_process_lib())
|
||||
.or_default()
|
||||
.insert(
|
||||
version_hash.clone(),
|
||||
UpdateInfo {
|
||||
errors: vec![],
|
||||
pending_manifest_hash: Some(manifest_hash.clone()),
|
||||
},
|
||||
);
|
||||
updates.save();
|
||||
}
|
||||
println!("error auto-installing package: {e}");
|
||||
} else {
|
||||
println!("auto-installed update for package: {process_lib_package_id}");
|
||||
}
|
||||
} else {
|
||||
if let Some(package) = state.packages.get_mut(&process_lib_package_id) {
|
||||
package.pending_update_hash = Some(version_hash);
|
||||
println!("error auto-installing package: manifest hash mismatch");
|
||||
AutoDownloadCompleteRequest::Err(err) => {
|
||||
println!("error auto-downloading package: {err:?}");
|
||||
updates
|
||||
.package_updates
|
||||
.entry(err.package_id.to_process_lib())
|
||||
.or_default()
|
||||
.insert(
|
||||
err.version_hash.clone(),
|
||||
UpdateInfo {
|
||||
errors: err.tries,
|
||||
pending_manifest_hash: None,
|
||||
},
|
||||
);
|
||||
updates.save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
use crate::{utils, VFS_TIMEOUT};
|
||||
use kinode_process_lib::{kimap, vfs, PackageId};
|
||||
use crate::{kinode::process::downloads::DownloadError, utils, VFS_TIMEOUT};
|
||||
use kinode_process_lib::{get_state, kimap, set_state, vfs, PackageId};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
@ -54,9 +54,6 @@ pub struct PackageState {
|
||||
/// capabilities have changed. if they have changed, auto-install must fail
|
||||
/// and the user must approve the new capabilities.
|
||||
pub manifest_hash: Option<String>,
|
||||
/// stores the version hash of a failed auto-install attempt, which can be
|
||||
/// later installed by the user by approving new caps.
|
||||
pub pending_update_hash: Option<String>,
|
||||
}
|
||||
|
||||
// this seems cleaner to me right now with pending_update_hash, but given how we serialize
|
||||
@ -133,7 +130,6 @@ impl State {
|
||||
verified: true, // implicitly verified (TODO re-evaluate)
|
||||
caps_approved: false, // must re-approve if you want to do something ??
|
||||
manifest_hash: Some(manifest_hash),
|
||||
pending_update_hash: None, // ... this could be a separate state saved. don't want to reflect this info on-disk as a file.
|
||||
},
|
||||
);
|
||||
|
||||
@ -147,3 +143,76 @@ impl State {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[serde(transparent)]
|
||||
pub struct Updates {
|
||||
#[serde(with = "package_id_map")]
|
||||
pub package_updates: HashMap<PackageId, HashMap<String, UpdateInfo>>, // package id -> version_hash -> update info
|
||||
}
|
||||
|
||||
impl Default for Updates {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
package_updates: HashMap::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
pub struct UpdateInfo {
|
||||
pub errors: Vec<(String, DownloadError)>, // errors collected by downloads process
|
||||
pub pending_manifest_hash: Option<String>, // pending manifest hash that differed from the installed one
|
||||
}
|
||||
|
||||
impl Updates {
|
||||
pub fn load() -> Self {
|
||||
let bytes = get_state();
|
||||
|
||||
if let Some(bytes) = bytes {
|
||||
serde_json::from_slice(&bytes).unwrap_or_default()
|
||||
} else {
|
||||
Self::default()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn save(&self) {
|
||||
let bytes = serde_json::to_vec(self).unwrap_or_default();
|
||||
set_state(&bytes);
|
||||
}
|
||||
}
|
||||
|
||||
// note: serde_json doesn't support non-string keys when serializing maps, so
|
||||
// we have to use a custom simple serializer.
|
||||
mod package_id_map {
|
||||
use super::*;
|
||||
use std::{collections::HashMap, str::FromStr};
|
||||
|
||||
pub fn serialize<S>(
|
||||
map: &HashMap<PackageId, HashMap<String, UpdateInfo>>,
|
||||
s: S,
|
||||
) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: serde::Serializer,
|
||||
{
|
||||
use serde::ser::SerializeMap;
|
||||
let mut map_ser = s.serialize_map(Some(map.len()))?;
|
||||
for (k, v) in map {
|
||||
map_ser.serialize_entry(&k.to_string(), v)?;
|
||||
}
|
||||
map_ser.end()
|
||||
}
|
||||
|
||||
pub fn deserialize<'de, D>(
|
||||
d: D,
|
||||
) -> Result<HashMap<PackageId, HashMap<String, UpdateInfo>>, D::Error>
|
||||
where
|
||||
D: serde::Deserializer<'de>,
|
||||
{
|
||||
let string_map = HashMap::<String, HashMap<String, UpdateInfo>>::deserialize(d)?;
|
||||
Ok(string_map
|
||||
.into_iter()
|
||||
.filter_map(|(k, v)| PackageId::from_str(&k).ok().map(|pid| (pid, v)))
|
||||
.collect())
|
||||
}
|
||||
}
|
||||
|
@ -225,7 +225,6 @@ pub fn install(
|
||||
verified: true, // sideloaded apps are implicitly verified because there is no "source" to verify against
|
||||
caps_approved: true, // TODO see if we want to auto-approve local installs
|
||||
manifest_hash: Some(manifest_hash),
|
||||
pending_update_hash: None, // TODO: doublecheck if problematically overwrites auto_update state.
|
||||
};
|
||||
|
||||
if let Ok(extracted) = extract_api(&process_package_id) {
|
||||
|
@ -42,13 +42,18 @@
|
||||
//! mechanism is implemented in the FT worker for improved modularity and performance.
|
||||
//!
|
||||
use crate::kinode::process::downloads::{
|
||||
AutoDownloadCompleteRequest, AutoUpdateRequest, DirEntry, DownloadCompleteRequest,
|
||||
DownloadError, DownloadRequests, DownloadResponses, Entry, FileEntry, HashMismatch,
|
||||
LocalDownloadRequest, RemoteDownloadRequest, RemoveFileRequest,
|
||||
AutoDownloadCompleteRequest, AutoDownloadError, AutoUpdateRequest, DirEntry,
|
||||
DownloadCompleteRequest, DownloadError, DownloadRequests, DownloadResponses, Entry, FileEntry,
|
||||
HashMismatch, LocalDownloadRequest, RemoteDownloadRequest, RemoveFileRequest,
|
||||
};
|
||||
use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
io::Read,
|
||||
str::FromStr,
|
||||
};
|
||||
use std::{collections::HashSet, io::Read, str::FromStr};
|
||||
|
||||
use ft_worker_lib::{spawn_receive_transfer, spawn_send_transfer};
|
||||
use kinode::process::downloads::AutoDownloadSuccess;
|
||||
use kinode_process_lib::{
|
||||
await_message, call_init, get_blob, get_state,
|
||||
http::client,
|
||||
@ -69,7 +74,6 @@ wit_bindgen::generate!({
|
||||
mod ft_worker_lib;
|
||||
|
||||
pub const VFS_TIMEOUT: u64 = 5; // 5s
|
||||
pub const APP_SHARE_TIMEOUT: u64 = 120; // 120s
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, process_macros::SerdeJsonInto)]
|
||||
#[serde(untagged)] // untagged as a meta-type for all incoming responses
|
||||
@ -78,6 +82,15 @@ pub enum Resp {
|
||||
HttpClient(Result<client::HttpClientResponse, client::HttpClientError>),
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct AutoUpdateStatus {
|
||||
mirrors_left: HashSet<String>, // set(node/url)
|
||||
mirrors_failed: Vec<(String, DownloadError)>, // vec(node/url, error)
|
||||
active_mirror: String, // (node/url)
|
||||
}
|
||||
|
||||
type AutoUpdates = HashMap<(PackageId, String), AutoUpdateStatus>;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct State {
|
||||
// persisted metadata about which packages we are mirroring
|
||||
@ -117,13 +130,11 @@ fn init(our: Address) {
|
||||
let mut tmp =
|
||||
vfs::open_dir("/app-store:sys/downloads/tmp", true, None).expect("could not open tmp");
|
||||
|
||||
let mut auto_updates: HashSet<(PackageId, String)> = HashSet::new();
|
||||
// metadata for in-flight auto-updates
|
||||
let mut auto_updates: AutoUpdates = HashMap::new();
|
||||
|
||||
loop {
|
||||
match await_message() {
|
||||
Err(send_error) => {
|
||||
print_to_terminal(1, &format!("downloads: got network error: {send_error}"));
|
||||
}
|
||||
Ok(message) => {
|
||||
if let Err(e) = handle_message(
|
||||
&our,
|
||||
@ -143,6 +154,33 @@ fn init(our: Address) {
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
Err(send_error) => {
|
||||
print_to_terminal(1, &format!("downloads: got network error: {send_error}"));
|
||||
if let Some(context) = &send_error.context {
|
||||
if let Ok(download_request) =
|
||||
serde_json::from_slice::<LocalDownloadRequest>(&context)
|
||||
{
|
||||
let key = (
|
||||
download_request.package_id.to_process_lib(),
|
||||
download_request.desired_version_hash.clone(),
|
||||
);
|
||||
|
||||
// Get the error first
|
||||
let error = if send_error.kind.is_timeout() {
|
||||
DownloadError::Timeout
|
||||
} else if send_error.kind.is_offline() {
|
||||
DownloadError::Offline
|
||||
} else {
|
||||
DownloadError::HandlingError(send_error.to_string())
|
||||
};
|
||||
|
||||
// Then remove and get metadata
|
||||
if let Some(metadata) = auto_updates.remove(&key) {
|
||||
try_next_mirror(metadata, key, &mut auto_updates, error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -157,7 +195,7 @@ fn handle_message(
|
||||
message: &Message,
|
||||
downloads: &mut Directory,
|
||||
_tmp: &mut Directory,
|
||||
auto_updates: &mut HashSet<(PackageId, String)>,
|
||||
auto_updates: &mut AutoUpdates,
|
||||
) -> anyhow::Result<()> {
|
||||
if message.is_request() {
|
||||
match message.body().try_into()? {
|
||||
@ -174,8 +212,12 @@ fn handle_message(
|
||||
} = download_request.clone();
|
||||
|
||||
if download_from.starts_with("http") {
|
||||
// use http-client to GET it
|
||||
Request::to(("our", "http-client", "distro", "sys"))
|
||||
// use http_client to GET it
|
||||
print_to_terminal(
|
||||
1,
|
||||
"kicking off http download for {package_id:?} and {version_hash:?}",
|
||||
);
|
||||
Request::to(("our", "http_client", "distro", "sys"))
|
||||
.body(
|
||||
serde_json::to_vec(&client::HttpClientAction::Http(
|
||||
client::OutgoingHttpRequest {
|
||||
@ -200,7 +242,6 @@ fn handle_message(
|
||||
&package_id,
|
||||
&desired_version_hash,
|
||||
&download_from,
|
||||
APP_SHARE_TIMEOUT,
|
||||
)?;
|
||||
|
||||
Request::to((&download_from, "downloads", "app-store", "sys"))
|
||||
@ -236,13 +277,8 @@ fn handle_message(
|
||||
}
|
||||
|
||||
let target_worker = Address::from_str(&worker_address)?;
|
||||
let _ = spawn_send_transfer(
|
||||
our,
|
||||
&package_id,
|
||||
&desired_version_hash,
|
||||
APP_SHARE_TIMEOUT,
|
||||
&target_worker,
|
||||
)?;
|
||||
let _ =
|
||||
spawn_send_transfer(our, &package_id, &desired_version_hash, &target_worker)?;
|
||||
let resp = DownloadResponses::Success;
|
||||
Response::new().body(&resp).send()?;
|
||||
}
|
||||
@ -257,50 +293,30 @@ fn handle_message(
|
||||
if !message.is_local(our) {
|
||||
return Err(anyhow::anyhow!("got non local download complete"));
|
||||
}
|
||||
// if we have a pending auto_install, forward that context to the main process.
|
||||
// it will check if the caps_hashes match (no change in capabilities), and auto_install if it does.
|
||||
|
||||
let manifest_hash = if auto_updates.remove(&(
|
||||
req.package_id.clone().to_process_lib(),
|
||||
req.version_hash.clone(),
|
||||
)) {
|
||||
match get_manifest_hash(
|
||||
req.package_id.clone().to_process_lib(),
|
||||
req.version_hash.clone(),
|
||||
) {
|
||||
Ok(manifest_hash) => Some(manifest_hash),
|
||||
Err(e) => {
|
||||
print_to_terminal(
|
||||
1,
|
||||
&format!("auto_update: error getting manifest hash: {:?}", e),
|
||||
);
|
||||
None
|
||||
}
|
||||
}
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
// pushed to UI via websockets
|
||||
Request::to(("our", "main", "app-store", "sys"))
|
||||
// forward to main:app_store:sys, pushed to UI via websockets
|
||||
Request::to(("our", "main", "app_store", "sys"))
|
||||
.body(serde_json::to_vec(&req)?)
|
||||
.send()?;
|
||||
|
||||
// trigger auto-update install trigger to main:app-store:sys
|
||||
if let Some(manifest_hash) = manifest_hash {
|
||||
let auto_download_complete_req = AutoDownloadCompleteRequest {
|
||||
download_info: req.clone(),
|
||||
manifest_hash,
|
||||
};
|
||||
print_to_terminal(
|
||||
1,
|
||||
&format!(
|
||||
"auto_update download complete: triggering install on main:app-store:sys"
|
||||
),
|
||||
);
|
||||
Request::to(("our", "main", "app-store", "sys"))
|
||||
.body(serde_json::to_vec(&auto_download_complete_req)?)
|
||||
.send()?;
|
||||
// Check if this is an auto-update download
|
||||
let key = (
|
||||
req.package_id.clone().to_process_lib(),
|
||||
req.version_hash.clone(),
|
||||
);
|
||||
|
||||
if let Some(metadata) = auto_updates.remove(&key) {
|
||||
if let Some(err) = req.err {
|
||||
try_next_mirror(metadata, key, auto_updates, err);
|
||||
} else if let Err(_e) = handle_auto_update_success(key.0.clone(), key.1.clone())
|
||||
{
|
||||
try_next_mirror(
|
||||
metadata,
|
||||
key,
|
||||
auto_updates,
|
||||
DownloadError::InvalidManifest,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
DownloadRequests::GetFiles(maybe_id) => {
|
||||
@ -414,29 +430,61 @@ fn handle_message(
|
||||
} = auto_update_request.clone();
|
||||
let process_lib_package_id = package_id.clone().to_process_lib();
|
||||
|
||||
// default auto_update to publisher. TODO: more config here.
|
||||
let download_from = metadata.properties.publisher;
|
||||
// default auto_update to publisher
|
||||
// let download_from = metadata.properties.publisher.clone();
|
||||
let current_version = metadata.properties.current_version;
|
||||
let code_hashes = metadata.properties.code_hashes;
|
||||
|
||||
// Create a HashSet of mirrors including the publisher
|
||||
let mut mirrors = HashSet::new();
|
||||
|
||||
let download_from = if let Some(first_mirror) = metadata.properties.mirrors.first()
|
||||
{
|
||||
first_mirror.clone()
|
||||
} else {
|
||||
"randomnode111.os".to_string()
|
||||
};
|
||||
println!("first_download_from: {download_from}");
|
||||
mirrors.extend(metadata.properties.mirrors.into_iter());
|
||||
mirrors.insert(metadata.properties.publisher.clone());
|
||||
|
||||
let version_hash = code_hashes
|
||||
.iter()
|
||||
.find(|(version, _)| version == ¤t_version)
|
||||
.map(|(_, hash)| hash.clone())
|
||||
.ok_or_else(|| anyhow::anyhow!("auto_update: error for package_id: {}, current_version: {}, no matching hash found", process_lib_package_id.to_string(), current_version))?;
|
||||
.iter()
|
||||
.find(|(version, _)| version == ¤t_version)
|
||||
.map(|(_, hash)| hash.clone())
|
||||
// note, if this errors, full on failure I thnk no?
|
||||
// and bubble this up.
|
||||
.ok_or_else(|| anyhow::anyhow!("auto_update: error for package_id: {}, current_version: {}, no matching hash found", process_lib_package_id.to_string(), current_version))?;
|
||||
|
||||
print_to_terminal(
|
||||
1,
|
||||
&format!(
|
||||
"auto_update: kicking off download for {:?} from {} with version {} from mirror {}",
|
||||
package_id, download_from, version_hash, download_from
|
||||
),
|
||||
);
|
||||
|
||||
let download_request = LocalDownloadRequest {
|
||||
package_id,
|
||||
download_from,
|
||||
download_from: download_from.clone(),
|
||||
desired_version_hash: version_hash.clone(),
|
||||
};
|
||||
|
||||
// kick off local download to ourselves.
|
||||
Request::to(("our", "downloads", "app-store", "sys"))
|
||||
// Initialize auto-update status with mirrors
|
||||
let key = (process_lib_package_id.clone(), version_hash.clone());
|
||||
auto_updates.insert(
|
||||
key,
|
||||
AutoUpdateStatus {
|
||||
mirrors_left: mirrors,
|
||||
mirrors_failed: Vec::new(),
|
||||
active_mirror: download_from.clone(),
|
||||
},
|
||||
);
|
||||
|
||||
// kick off local download to ourselves
|
||||
Request::to(("our", "downloads", "app_store", "sys"))
|
||||
.body(DownloadRequests::LocalDownload(download_request))
|
||||
.send()?;
|
||||
|
||||
auto_updates.insert((process_lib_package_id, version_hash));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
@ -445,18 +493,30 @@ fn handle_message(
|
||||
Resp::Download(download_response) => {
|
||||
// get context of the response.
|
||||
// handled are errors or ok responses from a remote node.
|
||||
// check state, do action based on that!
|
||||
|
||||
if let Some(context) = message.context() {
|
||||
let download_request = serde_json::from_slice::<LocalDownloadRequest>(context)?;
|
||||
match download_response {
|
||||
DownloadResponses::Err(e) => {
|
||||
Request::to(("our", "main", "app_store", "sys"))
|
||||
.body(DownloadCompleteRequest {
|
||||
package_id: download_request.package_id.clone(),
|
||||
version_hash: download_request.desired_version_hash.clone(),
|
||||
err: Some(e),
|
||||
})
|
||||
.send()?;
|
||||
print_to_terminal(1, &format!("downloads: got error response: {e:?}"));
|
||||
let key = (
|
||||
download_request.package_id.clone().to_process_lib(),
|
||||
download_request.desired_version_hash.clone(),
|
||||
);
|
||||
|
||||
if let Some(metadata) = auto_updates.remove(&key) {
|
||||
try_next_mirror(metadata, key, auto_updates, e);
|
||||
} else {
|
||||
// If not an auto-update, forward error normally
|
||||
Request::to(("our", "main", "app_store", "sys"))
|
||||
.body(DownloadCompleteRequest {
|
||||
package_id: download_request.package_id,
|
||||
version_hash: download_request.desired_version_hash,
|
||||
err: Some(e),
|
||||
})
|
||||
.send()?;
|
||||
}
|
||||
}
|
||||
DownloadResponses::Success => {
|
||||
// todo: maybe we do something here.
|
||||
@ -477,29 +537,85 @@ fn handle_message(
|
||||
return Err(anyhow::anyhow!("http-client response without context"));
|
||||
};
|
||||
let download_request = serde_json::from_slice::<LocalDownloadRequest>(context)?;
|
||||
if let Ok(client::HttpClientResponse::Http(client::HttpResponse {
|
||||
status, ..
|
||||
})) = resp
|
||||
{
|
||||
if status == 200 {
|
||||
if let Err(e) = handle_receive_http_download(&download_request) {
|
||||
print_to_terminal(
|
||||
1,
|
||||
&format!("error handling http-client response: {:?}", e),
|
||||
);
|
||||
Request::to(("our", "main", "app-store", "sys"))
|
||||
.body(DownloadRequests::DownloadComplete(
|
||||
DownloadCompleteRequest {
|
||||
package_id: download_request.package_id.clone(),
|
||||
version_hash: download_request.desired_version_hash.clone(),
|
||||
err: Some(e),
|
||||
},
|
||||
))
|
||||
.send()?;
|
||||
let key = (
|
||||
download_request.package_id.clone().to_process_lib(),
|
||||
download_request.desired_version_hash.clone(),
|
||||
);
|
||||
|
||||
// Check if this is an auto-update request
|
||||
let is_auto_update = auto_updates.contains_key(&key);
|
||||
let metadata = if is_auto_update {
|
||||
auto_updates.remove(&key)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
// Handle any non-200 response or client error
|
||||
let Ok(client::HttpClientResponse::Http(resp)) = resp else {
|
||||
if let Some(meta) = metadata {
|
||||
let error = if let Err(e) = resp {
|
||||
format!("HTTP client error: {e:?}")
|
||||
} else {
|
||||
"unexpected response type".to_string()
|
||||
};
|
||||
try_next_mirror(
|
||||
meta,
|
||||
key,
|
||||
auto_updates,
|
||||
DownloadError::HandlingError(error),
|
||||
);
|
||||
}
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
if resp.status != 200 {
|
||||
let error =
|
||||
DownloadError::HandlingError(format!("HTTP status {}", resp.status));
|
||||
handle_download_error(
|
||||
is_auto_update,
|
||||
metadata,
|
||||
key,
|
||||
auto_updates,
|
||||
error,
|
||||
&download_request,
|
||||
)?;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Handle successful download
|
||||
if let Err(e) = handle_receive_http_download(&download_request) {
|
||||
print_to_terminal(1, &format!("error handling http_client response: {:?}", e));
|
||||
handle_download_error(
|
||||
is_auto_update,
|
||||
metadata,
|
||||
key,
|
||||
auto_updates,
|
||||
e,
|
||||
&download_request,
|
||||
)?;
|
||||
} else if is_auto_update {
|
||||
match handle_auto_update_success(key.0.clone(), key.1.clone()) {
|
||||
Ok(_) => print_to_terminal(
|
||||
1,
|
||||
&format!(
|
||||
"auto_update: successfully downloaded package {:?} version {}",
|
||||
&download_request.package_id,
|
||||
&download_request.desired_version_hash
|
||||
),
|
||||
),
|
||||
Err(_) => {
|
||||
if let Some(meta) = metadata {
|
||||
try_next_mirror(
|
||||
meta,
|
||||
key,
|
||||
auto_updates,
|
||||
DownloadError::HandlingError(
|
||||
"could not get manifest hash".to_string(),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
println!("got http-client error: {resp:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -507,6 +623,70 @@ fn handle_message(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Try the next available mirror for a download, recording the current mirror's failure
|
||||
fn try_next_mirror(
|
||||
mut metadata: AutoUpdateStatus,
|
||||
key: (PackageId, String),
|
||||
auto_updates: &mut AutoUpdates,
|
||||
error: DownloadError,
|
||||
) {
|
||||
print_to_terminal(
|
||||
1,
|
||||
&format!(
|
||||
"auto_update: got error from mirror {mirror:?} {error:?}, trying next mirror: {next_mirror:?}",
|
||||
next_mirror = metadata.mirrors_left.iter().next().cloned(),
|
||||
mirror = metadata.active_mirror,
|
||||
error = error
|
||||
),
|
||||
);
|
||||
// Record failure and remove from available mirrors
|
||||
metadata
|
||||
.mirrors_failed
|
||||
.push((metadata.active_mirror.clone(), error));
|
||||
metadata.mirrors_left.remove(&metadata.active_mirror);
|
||||
|
||||
let (package_id, version_hash) = key.clone();
|
||||
|
||||
match metadata.mirrors_left.iter().next().cloned() {
|
||||
Some(next_mirror) => {
|
||||
metadata.active_mirror = next_mirror.clone();
|
||||
auto_updates.insert(key, metadata);
|
||||
Request::to(("our", "downloads", "app_store", "sys"))
|
||||
.body(
|
||||
serde_json::to_vec(&DownloadRequests::LocalDownload(LocalDownloadRequest {
|
||||
package_id: crate::kinode::process::main::PackageId::from_process_lib(
|
||||
package_id,
|
||||
),
|
||||
download_from: next_mirror,
|
||||
desired_version_hash: version_hash.clone(),
|
||||
}))
|
||||
.unwrap(),
|
||||
)
|
||||
.send()
|
||||
.unwrap();
|
||||
}
|
||||
None => {
|
||||
print_to_terminal(
|
||||
1,
|
||||
"auto_update: no more mirrors to try for package_id {package_id:?}",
|
||||
);
|
||||
// gather, and send error to main.
|
||||
let node_tries = metadata.mirrors_failed;
|
||||
let auto_download_error = AutoDownloadCompleteRequest::Err(AutoDownloadError {
|
||||
package_id: crate::kinode::process::main::PackageId::from_process_lib(package_id),
|
||||
version_hash,
|
||||
tries: node_tries,
|
||||
});
|
||||
|
||||
Request::to(("our", "main", "app_store", "sys"))
|
||||
.body(auto_download_error)
|
||||
.send()
|
||||
.unwrap();
|
||||
auto_updates.remove(&key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_receive_http_download(
|
||||
download_request: &LocalDownloadRequest,
|
||||
) -> anyhow::Result<(), DownloadError> {
|
||||
@ -558,6 +738,46 @@ fn handle_receive_http_download(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn handle_download_error(
|
||||
is_auto_update: bool,
|
||||
metadata: Option<AutoUpdateStatus>,
|
||||
key: (PackageId, String),
|
||||
auto_updates: &mut AutoUpdates,
|
||||
error: impl Into<DownloadError>,
|
||||
download_request: &LocalDownloadRequest,
|
||||
) -> anyhow::Result<()> {
|
||||
let error = error.into();
|
||||
if is_auto_update {
|
||||
if let Some(meta) = metadata {
|
||||
try_next_mirror(meta, key, auto_updates, error);
|
||||
}
|
||||
} else {
|
||||
Request::to(("our", "main", "app_store", "sys"))
|
||||
.body(DownloadCompleteRequest {
|
||||
package_id: download_request.package_id.clone(),
|
||||
version_hash: download_request.desired_version_hash.clone(),
|
||||
err: Some(error),
|
||||
})
|
||||
.send()?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Handle auto-update success case by getting manifest hash and sending completion message
|
||||
fn handle_auto_update_success(package_id: PackageId, version_hash: String) -> anyhow::Result<()> {
|
||||
let manifest_hash = get_manifest_hash(package_id.clone(), version_hash.clone())?;
|
||||
|
||||
Request::to(("our", "main", "app_store", "sys"))
|
||||
.body(AutoDownloadCompleteRequest::Success(AutoDownloadSuccess {
|
||||
package_id: crate::kinode::process::main::PackageId::from_process_lib(package_id),
|
||||
version_hash,
|
||||
manifest_hash,
|
||||
}))
|
||||
.send()
|
||||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn format_entries(entries: Vec<vfs::DirEntry>, state: &State) -> Vec<Entry> {
|
||||
entries
|
||||
.into_iter()
|
||||
|
@ -17,7 +17,6 @@ pub fn spawn_send_transfer(
|
||||
our: &Address,
|
||||
package_id: &PackageId,
|
||||
version_hash: &str,
|
||||
timeout: u64,
|
||||
to_addr: &Address,
|
||||
) -> anyhow::Result<()> {
|
||||
let transfer_id: u64 = rand::random();
|
||||
@ -33,17 +32,14 @@ pub fn spawn_send_transfer(
|
||||
return Err(anyhow::anyhow!("failed to spawn ft-worker!"));
|
||||
};
|
||||
|
||||
let req = Request::new()
|
||||
.target((&our.node, worker_process_id))
|
||||
.expects_response(timeout + 1)
|
||||
.body(
|
||||
serde_json::to_vec(&DownloadRequests::RemoteDownload(RemoteDownloadRequest {
|
||||
package_id: package_id.clone(),
|
||||
desired_version_hash: version_hash.to_string(),
|
||||
worker_address: to_addr.to_string(),
|
||||
}))
|
||||
.unwrap(),
|
||||
);
|
||||
let req = Request::new().target((&our.node, worker_process_id)).body(
|
||||
serde_json::to_vec(&DownloadRequests::RemoteDownload(RemoteDownloadRequest {
|
||||
package_id: package_id.clone(),
|
||||
desired_version_hash: version_hash.to_string(),
|
||||
worker_address: to_addr.to_string(),
|
||||
}))
|
||||
.unwrap(),
|
||||
);
|
||||
req.send()?;
|
||||
Ok(())
|
||||
}
|
||||
@ -58,7 +54,6 @@ pub fn spawn_receive_transfer(
|
||||
package_id: &PackageId,
|
||||
version_hash: &str,
|
||||
from_node: &str,
|
||||
timeout: u64,
|
||||
) -> anyhow::Result<Address> {
|
||||
let transfer_id: u64 = rand::random();
|
||||
let timer_id = ProcessId::new(Some("timer"), "distro", "sys");
|
||||
@ -75,7 +70,6 @@ pub fn spawn_receive_transfer(
|
||||
|
||||
let req = Request::new()
|
||||
.target((&our.node, worker_process_id.clone()))
|
||||
.expects_response(timeout + 1)
|
||||
.body(
|
||||
serde_json::to_vec(&DownloadRequests::LocalDownload(LocalDownloadRequest {
|
||||
package_id: package_id.clone(),
|
||||
|
@ -29,6 +29,7 @@
|
||||
//!
|
||||
//! - Hash mismatches between the received file and the expected hash are detected and reported.
|
||||
//! - Various I/O errors are caught and propagated.
|
||||
//! - A 120 second killswitch is implemented to clean up dangling transfers.
|
||||
//!
|
||||
//! ## Integration with App Store:
|
||||
//!
|
||||
@ -61,6 +62,7 @@ wit_bindgen::generate!({
|
||||
});
|
||||
|
||||
const CHUNK_SIZE: u64 = 262144; // 256KB
|
||||
const KILL_SWITCH_MS: u64 = 120000; // 2 minutes
|
||||
|
||||
call_init!(init);
|
||||
fn init(our: Address) {
|
||||
@ -78,8 +80,7 @@ fn init(our: Address) {
|
||||
}
|
||||
|
||||
// killswitch timer, 2 minutes. sender or receiver gets killed/cleaned up.
|
||||
// TODO: killswitch update bubbles up to downloads process?
|
||||
timer::set_timer(120000, None);
|
||||
timer::set_timer(KILL_SWITCH_MS, None);
|
||||
|
||||
let start = std::time::Instant::now();
|
||||
|
||||
@ -105,7 +106,23 @@ fn init(our: Address) {
|
||||
start.elapsed().as_millis()
|
||||
),
|
||||
),
|
||||
Err(e) => print_to_terminal(1, &format!("ft_worker: receive error: {}", e)),
|
||||
Err(e) => {
|
||||
print_to_terminal(1, &format!("ft_worker: receive error: {}", e));
|
||||
// bubble up to parent.
|
||||
// TODO: doublecheck this.
|
||||
// if this fires on a basic timeout, that's bad.
|
||||
Request::new()
|
||||
.body(DownloadRequests::DownloadComplete(
|
||||
DownloadCompleteRequest {
|
||||
package_id: package_id.clone().into(),
|
||||
version_hash: desired_version_hash.to_string(),
|
||||
err: Some(DownloadError::HandlingError(e.to_string())),
|
||||
},
|
||||
))
|
||||
.target(parent_process)
|
||||
.send()
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
DownloadRequests::RemoteDownload(remote_request) => {
|
||||
@ -187,6 +204,17 @@ fn handle_receiver(
|
||||
loop {
|
||||
let message = await_message()?;
|
||||
if *message.source() == timer_address {
|
||||
// send error message to downloads process
|
||||
Request::new()
|
||||
.body(DownloadRequests::DownloadComplete(
|
||||
DownloadCompleteRequest {
|
||||
package_id: package_id.clone().into(),
|
||||
version_hash: version_hash.to_string(),
|
||||
err: Some(DownloadError::Timeout),
|
||||
},
|
||||
))
|
||||
.target(parent_process.clone())
|
||||
.send()?;
|
||||
return Ok(());
|
||||
}
|
||||
if !message.is_request() {
|
||||
|
@ -1,11 +1,16 @@
|
||||
import React from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Link, useLocation } from 'react-router-dom';
|
||||
import { STORE_PATH, PUBLISH_PATH, MY_APPS_PATH } from '../constants/path';
|
||||
import { ConnectButton } from '@rainbow-me/rainbowkit';
|
||||
import { FaHome } from "react-icons/fa";
|
||||
import NotificationBay from './NotificationBay';
|
||||
import useAppsStore from '../store';
|
||||
|
||||
const Header: React.FC = () => {
|
||||
const location = useLocation();
|
||||
const { updates } = useAppsStore();
|
||||
const updateCount = Object.keys(updates || {}).length;
|
||||
|
||||
return (
|
||||
<header className="app-header">
|
||||
<div className="header-left">
|
||||
@ -15,7 +20,10 @@ const Header: React.FC = () => {
|
||||
</button>
|
||||
<Link to={STORE_PATH} className={location.pathname === STORE_PATH ? 'active' : ''}>Apps</Link>
|
||||
<Link to={PUBLISH_PATH} className={location.pathname === PUBLISH_PATH ? 'active' : ''}>Publish</Link>
|
||||
<Link to={MY_APPS_PATH} className={location.pathname === MY_APPS_PATH ? 'active' : ''}>My Apps</Link>
|
||||
<Link to={MY_APPS_PATH} className={location.pathname === MY_APPS_PATH ? 'active' : ''}>
|
||||
My Apps
|
||||
{updateCount > 0 && <span className="update-badge">{updateCount}</span>}
|
||||
</Link>
|
||||
</nav>
|
||||
</div>
|
||||
<div className="header-right">
|
||||
@ -25,4 +33,5 @@ const Header: React.FC = () => {
|
||||
</header>
|
||||
);
|
||||
};
|
||||
|
||||
export default Header;
|
16
kinode/packages/app-store/ui/src/components/Tooltip.tsx
Normal file
16
kinode/packages/app-store/ui/src/components/Tooltip.tsx
Normal file
@ -0,0 +1,16 @@
|
||||
import React from 'react';
|
||||
|
||||
interface TooltipProps {
|
||||
content: React.ReactNode;
|
||||
children?: React.ReactNode;
|
||||
}
|
||||
|
||||
export function Tooltip({ content, children }: TooltipProps) {
|
||||
return (
|
||||
<div className="tooltip-container">
|
||||
{children}
|
||||
<span className="tooltip-icon">ⓘ</span>
|
||||
<div className="tooltip-content">{content}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
@ -1,9 +1,37 @@
|
||||
:root {
|
||||
/* Core colors */
|
||||
--orange: #ff7e33;
|
||||
--dark-orange: #e56a24;
|
||||
--orange-hover: #ff9900;
|
||||
--red: #e53e3e;
|
||||
--blue: #4299e1;
|
||||
--green: #48bb78;
|
||||
--gray: #718096;
|
||||
|
||||
/* Sophisticated neutrals */
|
||||
--bg-light: #fdf6e3;
|
||||
/* Solarized inspired beige */
|
||||
--bg-dark: #1f1d24;
|
||||
/* Deep slate with hint of purple */
|
||||
--surface-light: #f5efd9;
|
||||
/* Slightly deeper complementary beige */
|
||||
--surface-dark: #2a2832;
|
||||
/* Rich eggplant-tinged dark */
|
||||
--text-light: #2d2a2e;
|
||||
/* Warm charcoal */
|
||||
--text-dark: #e8e6f0;
|
||||
/* Cool moonlight white */
|
||||
|
||||
/* Border radius */
|
||||
--border-radius: 8px;
|
||||
}
|
||||
|
||||
/* Base styles */
|
||||
body {
|
||||
font-family: var(--font-family-main);
|
||||
line-height: 1.6;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--tan), var(--tasteful-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
background-color: light-dark(var(--bg-light), var(--bg-dark));
|
||||
}
|
||||
|
||||
/* Layout */
|
||||
@ -35,7 +63,7 @@ a:hover {
|
||||
|
||||
/* Header */
|
||||
.app-header {
|
||||
background-color: light-dark(var(--off-white), var(--off-black));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
padding: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
display: flex;
|
||||
@ -71,12 +99,15 @@ a:hover {
|
||||
text-decoration: none;
|
||||
padding: 0.5rem;
|
||||
border-radius: var(--border-radius);
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.header-left nav a:hover,
|
||||
.header-left nav a.active {
|
||||
background-color: var(--orange);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
}
|
||||
|
||||
/* Forms */
|
||||
@ -91,6 +122,9 @@ form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-bottom: 1rem;
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
padding: 0.75rem;
|
||||
border-radius: var(--border-radius);
|
||||
}
|
||||
|
||||
label {
|
||||
@ -102,15 +136,21 @@ select {
|
||||
padding: 0.5rem;
|
||||
border: 1px solid var(--gray);
|
||||
border-radius: var(--border-radius);
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
}
|
||||
|
||||
/* Buttons */
|
||||
button {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.5rem;
|
||||
height: 40px;
|
||||
font-weight: 500;
|
||||
padding: 0.5rem 1rem;
|
||||
background-color: var(--orange);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
border: none;
|
||||
border-radius: var(--border-radius);
|
||||
cursor: pointer;
|
||||
@ -125,6 +165,36 @@ button:disabled {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
button.danger {
|
||||
background-color: var(--red);
|
||||
}
|
||||
|
||||
button.danger:hover {
|
||||
background-color: color-mix(in srgb, var(--red) 85%, black);
|
||||
}
|
||||
|
||||
/*Download Button */
|
||||
.download-btn {
|
||||
background: var(--orange);
|
||||
color: var(--text-light);
|
||||
border: none;
|
||||
}
|
||||
|
||||
.download-btn:hover {
|
||||
background: var(--dark-orange);
|
||||
}
|
||||
|
||||
/* Notification Button */
|
||||
/* .notification-btn {
|
||||
background: var(--surface-dark);
|
||||
color: var(--text);
|
||||
border: 1px solid var(--gray);
|
||||
}
|
||||
|
||||
.notification-btn:hover {
|
||||
background: var(--surface-hover);
|
||||
} */
|
||||
|
||||
/* Tables */
|
||||
table {
|
||||
width: 100%;
|
||||
@ -151,6 +221,9 @@ td {
|
||||
|
||||
/* Messages */
|
||||
.message {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-weight: 500;
|
||||
padding: 1rem;
|
||||
border-radius: var(--border-radius);
|
||||
margin-bottom: 1rem;
|
||||
@ -158,17 +231,18 @@ td {
|
||||
|
||||
.message.error {
|
||||
background-color: var(--red);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
}
|
||||
|
||||
.message.success {
|
||||
background-color: var(--green);
|
||||
color: var(--white);
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
border: 1px solid var(--green);
|
||||
}
|
||||
|
||||
.message.info {
|
||||
background-color: var(--blue);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
}
|
||||
|
||||
/* Publisher Info */
|
||||
@ -242,17 +316,24 @@ td {
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
color: var(--red);
|
||||
margin-top: 0.5rem;
|
||||
font-size: 0.9rem;
|
||||
margin-top: 0.25rem;
|
||||
}
|
||||
|
||||
/* App Page and Download Page shared styles */
|
||||
/* Shared page styles */
|
||||
.store-page,
|
||||
.app-page,
|
||||
.downloads-page {
|
||||
background-color: light-dark(var(--white), var(--maroon));
|
||||
.my-apps-page,
|
||||
.downloads-page,
|
||||
.publish-page {
|
||||
padding: 1rem;
|
||||
background: light-dark(var(--bg-light), var(--bg-dark));
|
||||
margin: 0 1vw;
|
||||
border-radius: var(--border-radius);
|
||||
padding: 2rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.app-info {
|
||||
max-width: 20rem;
|
||||
}
|
||||
|
||||
.app-header {
|
||||
@ -268,12 +349,26 @@ td {
|
||||
}
|
||||
|
||||
.app-info {
|
||||
background-color: light-dark(var(--tan), var(--tasteful-dark));
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
padding: 1.5rem;
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
/* Components with secondary backgrounds */
|
||||
.app-header,
|
||||
.app-info,
|
||||
.app-description,
|
||||
.form-group,
|
||||
.search-bar input,
|
||||
.version-selector,
|
||||
.mirror-selector select,
|
||||
.secondary,
|
||||
.message.success {
|
||||
background: light-dark(var(--surface-light), var(--surface-dark)) !important;
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
}
|
||||
|
||||
/* Download Page specific styles */
|
||||
.download-section {
|
||||
display: flex;
|
||||
@ -289,8 +384,8 @@ td {
|
||||
padding: 0.5em;
|
||||
border: 1px solid var(--gray);
|
||||
border-radius: var(--border-radius);
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
}
|
||||
|
||||
/* Action Buttons */
|
||||
@ -311,23 +406,23 @@ td {
|
||||
|
||||
.primary {
|
||||
background-color: var(--orange);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
}
|
||||
|
||||
.primary:hover:not(:disabled) {
|
||||
background-color: var(--dark-orange);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
}
|
||||
|
||||
.secondary {
|
||||
background-color: light-dark(var(--off-white), var(--off-black));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: var(--orange);
|
||||
border: 2px solid var(--orange);
|
||||
}
|
||||
|
||||
.secondary:hover:not(:disabled) {
|
||||
background-color: var(--orange);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
}
|
||||
|
||||
.action-button:disabled,
|
||||
@ -337,6 +432,21 @@ td {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.action-button.download-button {
|
||||
background: var(--orange);
|
||||
color: var(--text-light);
|
||||
border: none;
|
||||
}
|
||||
|
||||
.action-button.download-button:hover:not(:disabled) {
|
||||
background: var(--dark-orange);
|
||||
}
|
||||
|
||||
.action-button.download-button:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
/* App actions */
|
||||
.app-actions {
|
||||
display: flex;
|
||||
@ -385,8 +495,8 @@ td {
|
||||
}
|
||||
|
||||
.cap-approval-content {
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
padding: 2rem;
|
||||
border-radius: 8px;
|
||||
max-width: 80%;
|
||||
@ -395,8 +505,8 @@ td {
|
||||
}
|
||||
|
||||
.json-display {
|
||||
background-color: light-dark(var(--tan), var(--off-black));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
padding: 1rem;
|
||||
border-radius: 4px;
|
||||
white-space: pre-wrap;
|
||||
@ -410,6 +520,44 @@ td {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
/* Search bar */
|
||||
.search-bar {
|
||||
width: 100%;
|
||||
margin: 1rem auto 2rem;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.search-bar input {
|
||||
width: 100%;
|
||||
padding: 0.75rem 1rem 0.75rem 2.5rem;
|
||||
border: 2px solid transparent;
|
||||
border-radius: 2rem;
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
font-size: 1rem;
|
||||
transition: all 0.2s ease;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.search-bar input:focus {
|
||||
outline: none;
|
||||
border-color: var(--orange);
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.search-bar svg {
|
||||
position: absolute;
|
||||
left: 0.75rem;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
color: var(--gray);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.search-bar input::placeholder {
|
||||
color: var(--gray);
|
||||
}
|
||||
|
||||
/* Responsive adjustments */
|
||||
@media (max-width: 48em) {
|
||||
|
||||
@ -442,7 +590,7 @@ td {
|
||||
}
|
||||
|
||||
.manifest-display {
|
||||
background: light-dark(var(--white), var(--tasteful-dark));
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
padding: 1rem;
|
||||
max-width: 600px;
|
||||
@ -450,7 +598,7 @@ td {
|
||||
|
||||
.process-manifest {
|
||||
margin-bottom: 0.5rem;
|
||||
border: 1px solid light-dark(var(--gray), var(--off-black));
|
||||
border: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
overflow: hidden;
|
||||
}
|
||||
@ -464,12 +612,12 @@ td {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
|
||||
.process-header:hover {
|
||||
background: light-dark(var(--tan), var(--off-black));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
}
|
||||
|
||||
.process-name {
|
||||
@ -481,7 +629,7 @@ td {
|
||||
.process-indicators {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
color: light-dark(var(--gray), var(--text-dark));
|
||||
}
|
||||
|
||||
.network-icon {
|
||||
@ -498,8 +646,8 @@ td {
|
||||
|
||||
.process-details {
|
||||
padding: 1rem;
|
||||
background: light-dark(var(--tan), var(--off-black));
|
||||
border-top: 1px solid light-dark(var(--gray), var(--off-black));
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-top: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
}
|
||||
|
||||
.capability-section {
|
||||
@ -512,13 +660,13 @@ td {
|
||||
|
||||
.capability-section h4 {
|
||||
margin: 0 0 0.5rem 0;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
}
|
||||
|
||||
.capability-section ul {
|
||||
margin: 0;
|
||||
padding-left: 1.5rem;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
color: light-dark(var(--gray), var(--text-dark));
|
||||
}
|
||||
|
||||
.capability-section li {
|
||||
@ -538,7 +686,7 @@ td {
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
padding: 0.5rem;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
}
|
||||
|
||||
.notification-details {
|
||||
@ -548,7 +696,7 @@ td {
|
||||
width: 320px;
|
||||
max-height: 400px;
|
||||
overflow-y: auto;
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
||||
z-index: 1000;
|
||||
@ -557,7 +705,7 @@ td {
|
||||
|
||||
.badge {
|
||||
background-color: var(--orange);
|
||||
color: var(--white);
|
||||
color: var(--text-light);
|
||||
border-radius: 50%;
|
||||
padding: 0.25rem 0.5rem;
|
||||
font-size: 0.75rem;
|
||||
@ -571,8 +719,8 @@ td {
|
||||
padding: 1rem;
|
||||
margin: 0.5rem 0;
|
||||
border-radius: var(--border-radius);
|
||||
background-color: light-dark(var(--tan), var(--off-black));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
}
|
||||
|
||||
.notification-item.error {
|
||||
@ -606,7 +754,7 @@ td {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
color: light-dark(var(--gray), var(--text-dark));
|
||||
padding: 0.25rem;
|
||||
}
|
||||
|
||||
@ -617,7 +765,7 @@ td {
|
||||
.progress-bar {
|
||||
margin-top: 0.5rem;
|
||||
height: 4px;
|
||||
background-color: light-dark(var(--white), var(--off-black));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: 2px;
|
||||
overflow: hidden;
|
||||
}
|
||||
@ -643,8 +791,8 @@ td {
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: light-dark(var(--text-light), var(--text-dark));
|
||||
padding: 1.5rem;
|
||||
border-radius: var(--border-radius);
|
||||
position: relative;
|
||||
@ -660,7 +808,7 @@ td {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
color: light-dark(var(--gray), var(--text-dark));
|
||||
padding: 0.25rem;
|
||||
}
|
||||
|
||||
@ -713,4 +861,430 @@ td {
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Loading Spinner */
|
||||
.loading-spinner {
|
||||
display: inline-block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 8px;
|
||||
border: 2px solid var(--text-light);
|
||||
border-radius: 50%;
|
||||
border-top-color: transparent;
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
.loading-spinner.small {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
margin-right: 6px;
|
||||
border-width: 1.5px;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
/* Publish Page */
|
||||
.publish-page {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.publish-page h1 {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.connect-wallet {
|
||||
text-align: center;
|
||||
padding: 2rem;
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.publish-form {
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
padding: 2rem;
|
||||
border-radius: var(--border-radius);
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.package-list {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: grid;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.package-list li {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 1rem;
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
}
|
||||
|
||||
.package-list .app-name {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.package-list .app-name:hover {
|
||||
color: var(--orange);
|
||||
}
|
||||
|
||||
.package-icon {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
border-radius: var(--border-radius);
|
||||
}
|
||||
|
||||
.no-packages {
|
||||
text-align: center;
|
||||
padding: 2rem;
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
color: var(--gray);
|
||||
}
|
||||
|
||||
/* Update badge */
|
||||
.update-badge {
|
||||
background: var(--red);
|
||||
color: var(--text-light);
|
||||
border-radius: 50%;
|
||||
padding: 0.15rem 0.4rem;
|
||||
font-size: 0.75rem;
|
||||
position: absolute;
|
||||
top: -5px;
|
||||
right: -5px;
|
||||
min-width: 18px;
|
||||
height: 18px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* Updates section */
|
||||
.updates-section {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.section-title {
|
||||
color: var(--orange);
|
||||
font-size: 1.25rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.updates-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.update-item {
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-radius: var(--border-radius);
|
||||
overflow: hidden;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.update-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0.75rem 1rem;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
|
||||
.update-header:hover {
|
||||
background-color: rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
|
||||
.update-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.update-actions {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.update-actions .action-button {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: var(--gray);
|
||||
transition: color 0.2s;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.update-actions .action-button.retry:hover {
|
||||
color: var(--blue);
|
||||
}
|
||||
|
||||
.update-actions .action-button.clear:hover {
|
||||
color: var(--red);
|
||||
}
|
||||
|
||||
.update-details {
|
||||
padding: 0.75rem 1rem 1rem 2.25rem;
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
.version-info {
|
||||
color: var(--gray);
|
||||
font-size: 0.9rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.manifest-info {
|
||||
color: var(--orange);
|
||||
font-size: 0.9rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.error-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.error-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
color: var(--red);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.error-icon {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
/* App Page Layout */
|
||||
.app-page {
|
||||
max-width: 80rem;
|
||||
margin: 0 auto;
|
||||
padding: 2rem 1rem;
|
||||
}
|
||||
|
||||
/* Updates Section */
|
||||
.updates-section {
|
||||
margin-bottom: 8;
|
||||
}
|
||||
|
||||
.update-item {
|
||||
border: 1px solid transparent;
|
||||
border-radius: 0.5rem;
|
||||
padding: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
}
|
||||
|
||||
.update-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.update-summary {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.update-details {
|
||||
margin-top: 1rem;
|
||||
color: light-dark(var(--text-secondary), var(--text));
|
||||
}
|
||||
|
||||
.retry-button {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
padding: 0.75rem 1rem;
|
||||
border-radius: 0.375rem;
|
||||
font-size: 1rem;
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: var(--orange);
|
||||
border: 1px solid var(--orange);
|
||||
transition: background-color 0.2s, color 0.2s;
|
||||
}
|
||||
|
||||
.error-count {
|
||||
padding: 0.25rem 0.5rem;
|
||||
border-radius: 0.25rem;
|
||||
font-size: 0.75rem;
|
||||
background-color: light-dark(var(--red-100), var(--red-900));
|
||||
color: light-dark(var(--red-700), var(--red-200));
|
||||
}
|
||||
|
||||
/* Navigation */
|
||||
.navigation {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.nav-button {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 2;
|
||||
padding: 0.75rem 1rem;
|
||||
border-radius: 0.375rem;
|
||||
font-size: 1rem;
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
color: var(--orange);
|
||||
border: 1px solid var(--orange);
|
||||
transition: background-color 0.2s, color 0.2s;
|
||||
}
|
||||
|
||||
.current-path {
|
||||
font-size: 1rem;
|
||||
color: light-dark(var(--text-secondary), var(--text));
|
||||
}
|
||||
|
||||
.file-explorer {
|
||||
border: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
padding: 1rem;
|
||||
border-radius: var(--border-radius);
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
}
|
||||
|
||||
.file-explorer h3 {
|
||||
padding: 0.75rem 1rem;
|
||||
font-size: 1.125rem;
|
||||
font-weight: 500;
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-bottom: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
}
|
||||
|
||||
.downloads-table {
|
||||
width: 100%;
|
||||
border-radius: var(--border-radius);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.downloads-table th {
|
||||
padding: 0.75rem 1rem;
|
||||
font-size: 1rem;
|
||||
font-weight: 500;
|
||||
text-align: left;
|
||||
color: light-dark(var(--text-secondary), var(--text));
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
border-bottom: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
}
|
||||
|
||||
.downloads-table td {
|
||||
padding: 0.75rem 1rem;
|
||||
font-size: 1rem;
|
||||
border-bottom: 1px solid light-dark(var(--gray), var(--surface-dark));
|
||||
}
|
||||
|
||||
.downloads-table tr.file:hover,
|
||||
.downloads-table tr.directory:hover {
|
||||
background-color: light-dark(var(--surface-light), var(--surface-dark));
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.updates-section {
|
||||
background: light-dark(var(--surface-light), var(--surface-dark));
|
||||
padding: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border-radius: var(--border-radius);
|
||||
}
|
||||
|
||||
.tooltip-container {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.tooltip-icon {
|
||||
cursor: help;
|
||||
color: #666;
|
||||
font-size: 14px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.tooltip-content {
|
||||
position: absolute;
|
||||
left: 24px;
|
||||
top: -4px;
|
||||
background: #333;
|
||||
color: white;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
white-space: nowrap;
|
||||
z-index: 1000;
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
transition: opacity 0.3s ease, visibility 0.3s ease;
|
||||
min-width: max-content;
|
||||
}
|
||||
|
||||
/* Create an invisible bridge between icon and content */
|
||||
.tooltip-content::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: -20px; /* Cover the gap between icon and content */
|
||||
top: 0;
|
||||
width: 20px;
|
||||
height: 100%;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.tooltip-container:hover .tooltip-content {
|
||||
opacity: 1;
|
||||
visibility: visible;
|
||||
transition-delay: 0.2s;
|
||||
}
|
||||
|
||||
.tooltip-content:hover {
|
||||
opacity: 1 !important;
|
||||
visibility: visible !important;
|
||||
}
|
||||
|
||||
.tooltip-content::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: -4px;
|
||||
top: 8px;
|
||||
border-top: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
border-right: 4px solid #333;
|
||||
}
|
||||
|
||||
.tooltip-content a {
|
||||
color: #fff;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.tooltip-content a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.wallet-status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
}
|
@ -148,6 +148,12 @@ export default function AppPage() {
|
||||
{latestVersion && (
|
||||
<li><span>Latest Version:</span> <span>{latestVersion}</span></li>
|
||||
)}
|
||||
{installedApp?.pending_update_hash && (
|
||||
<li className="warning">
|
||||
<span>Failed Auto-Update:</span>
|
||||
<span>Update to version with hash {installedApp.pending_update_hash.slice(0, 8)}... failed, approve newly requested capabilities and install it here:</span>
|
||||
</li>
|
||||
)}
|
||||
<li><span>Publisher:</span> <span>{app.package_id.publisher_node}</span></li>
|
||||
<li><span>License:</span> <span>{app.metadata?.properties?.license || "Not specified"}</span></li>
|
||||
<li>
|
||||
|
@ -1,7 +1,8 @@
|
||||
import React, { useState, useEffect } from "react";
|
||||
import { FaFolder, FaFile, FaChevronLeft, FaSync, FaRocket, FaSpinner, FaCheck, FaTrash } from "react-icons/fa";
|
||||
import { FaFolder, FaFile, FaChevronLeft, FaSync, FaRocket, FaSpinner, FaCheck, FaTrash, FaExclamationTriangle, FaTimesCircle, FaChevronDown, FaChevronRight } from "react-icons/fa";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import useAppsStore from "../store";
|
||||
import { DownloadItem, PackageManifest, PackageState } from "../types/Apps";
|
||||
import { DownloadItem, PackageManifestEntry, PackageState, Updates, DownloadError, UpdateInfo } from "../types/Apps";
|
||||
|
||||
// Core packages that cannot be uninstalled
|
||||
const CORE_PACKAGES = [
|
||||
@ -16,6 +17,7 @@ const CORE_PACKAGES = [
|
||||
];
|
||||
|
||||
export default function MyAppsPage() {
|
||||
const navigate = useNavigate();
|
||||
const {
|
||||
fetchDownloads,
|
||||
fetchDownloadsForApp,
|
||||
@ -25,16 +27,20 @@ export default function MyAppsPage() {
|
||||
removeDownload,
|
||||
fetchInstalled,
|
||||
installed,
|
||||
uninstallApp
|
||||
uninstallApp,
|
||||
fetchUpdates,
|
||||
clearUpdates,
|
||||
updates
|
||||
} = useAppsStore();
|
||||
|
||||
const [currentPath, setCurrentPath] = useState<string[]>([]);
|
||||
const [items, setItems] = useState<DownloadItem[]>([]);
|
||||
const [expandedUpdates, setExpandedUpdates] = useState<Set<string>>(new Set());
|
||||
const [isInstalling, setIsInstalling] = useState(false);
|
||||
const [isUninstalling, setIsUninstalling] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [showCapApproval, setShowCapApproval] = useState(false);
|
||||
const [manifest, setManifest] = useState<PackageManifest | null>(null);
|
||||
const [manifest, setManifest] = useState<PackageManifestEntry | null>(null);
|
||||
const [selectedItem, setSelectedItem] = useState<DownloadItem | null>(null);
|
||||
const [showUninstallConfirm, setShowUninstallConfirm] = useState(false);
|
||||
const [appToUninstall, setAppToUninstall] = useState<any>(null);
|
||||
@ -42,6 +48,7 @@ export default function MyAppsPage() {
|
||||
useEffect(() => {
|
||||
loadItems();
|
||||
fetchInstalled();
|
||||
fetchUpdates();
|
||||
}, [currentPath]);
|
||||
|
||||
const loadItems = async () => {
|
||||
@ -59,34 +66,132 @@ export default function MyAppsPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const initiateUninstall = (app: any) => {
|
||||
const packageId = `${app.package_id.package_name}:${app.package_id.publisher_node}`;
|
||||
if (CORE_PACKAGES.includes(packageId)) {
|
||||
setError("Cannot uninstall core system packages");
|
||||
return;
|
||||
}
|
||||
setAppToUninstall(app);
|
||||
setShowUninstallConfirm(true);
|
||||
const handleClearUpdates = async (packageId: string) => {
|
||||
await clearUpdates(packageId);
|
||||
fetchUpdates(); // Refresh updates after clearing
|
||||
};
|
||||
|
||||
const handleUninstall = async () => {
|
||||
if (!appToUninstall) return;
|
||||
setIsUninstalling(true);
|
||||
const packageId = `${appToUninstall.package_id.package_name}:${appToUninstall.package_id.publisher_node}`;
|
||||
try {
|
||||
await uninstallApp(packageId);
|
||||
await fetchInstalled();
|
||||
await loadItems();
|
||||
setShowUninstallConfirm(false);
|
||||
setAppToUninstall(null);
|
||||
} catch (error) {
|
||||
console.error('Uninstallation failed:', error);
|
||||
setError(`Uninstallation failed: ${error instanceof Error ? error.message : String(error)}`);
|
||||
} finally {
|
||||
setIsUninstalling(false);
|
||||
}
|
||||
const toggleUpdateExpansion = (packageId: string) => {
|
||||
setExpandedUpdates(prev => {
|
||||
const newSet = new Set(prev);
|
||||
if (newSet.has(packageId)) {
|
||||
newSet.delete(packageId);
|
||||
} else {
|
||||
newSet.add(packageId);
|
||||
}
|
||||
return newSet;
|
||||
});
|
||||
};
|
||||
|
||||
const formatError = (error: DownloadError): string => {
|
||||
if (typeof error === 'string') {
|
||||
return error;
|
||||
} else if ('HashMismatch' in error) {
|
||||
return `Hash mismatch (expected ${error.HashMismatch.desired.slice(0, 8)}, got ${error.HashMismatch.actual.slice(0, 8)})`;
|
||||
} else if ('HandlingError' in error) {
|
||||
return error.HandlingError;
|
||||
} else if ('Timeout' in error) {
|
||||
return 'Connection timed out';
|
||||
}
|
||||
return 'Unknown error';
|
||||
};
|
||||
|
||||
const renderUpdates = () => {
|
||||
if (!updates || Object.keys(updates).length === 0) {
|
||||
return (
|
||||
<div className="updates-section">
|
||||
<h2>Failed Auto Updates (0)</h2>
|
||||
<p>None found, all clear!</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="updates-section">
|
||||
<h2 className="section-title">Failed Auto Updates ({Object.keys(updates).length})</h2>
|
||||
{Object.keys(updates).length > 0 ? (
|
||||
<div className="updates-list">
|
||||
{Object.entries(updates).map(([packageId, versionMap]) => {
|
||||
const totalErrors = Object.values(versionMap).reduce((sum, info) =>
|
||||
sum + (info.errors?.length || 0), 0);
|
||||
const hasManifestChanges = Object.values(versionMap).some(info =>
|
||||
info.pending_manifest_hash);
|
||||
|
||||
return (
|
||||
<div key={packageId} className="update-item error">
|
||||
<div className="update-header" onClick={() => toggleUpdateExpansion(packageId)}>
|
||||
<div className="update-title">
|
||||
{expandedUpdates.has(packageId) ? <FaChevronDown /> : <FaChevronRight />}
|
||||
<FaExclamationTriangle className="error-badge" />
|
||||
<span>{packageId}</span>
|
||||
<div className="update-summary">
|
||||
{totalErrors > 0 && (
|
||||
<span className="error-count">{totalErrors} error{totalErrors !== 1 ? 's' : ''}</span>
|
||||
)}
|
||||
{hasManifestChanges && (
|
||||
<span className="manifest-badge">Manifest changes pending</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="update-actions">
|
||||
<button
|
||||
className="action-button retry"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(`/download/${packageId}`);
|
||||
}}
|
||||
title="Retry download"
|
||||
>
|
||||
<FaSync />
|
||||
<span>Retry</span>
|
||||
</button>
|
||||
<button
|
||||
className="action-button clear"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
handleClearUpdates(packageId);
|
||||
}}
|
||||
title="Clear update info"
|
||||
>
|
||||
<FaTimesCircle />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{expandedUpdates.has(packageId) && Object.entries(versionMap).map(([versionHash, info]) => (
|
||||
<div key={versionHash} className="update-details">
|
||||
<div className="version-info">
|
||||
Version: {versionHash.slice(0, 8)}...
|
||||
</div>
|
||||
{info.pending_manifest_hash && (
|
||||
<div className="manifest-info">
|
||||
<FaExclamationTriangle />
|
||||
Pending manifest: {info.pending_manifest_hash.slice(0, 8)}...
|
||||
</div>
|
||||
)}
|
||||
{info.errors && info.errors.length > 0 && (
|
||||
<div className="error-list">
|
||||
{info.errors.map(([source, error], idx) => (
|
||||
<div key={idx} className="error-item">
|
||||
<FaExclamationTriangle className="error-icon" />
|
||||
<span>{source}: {formatError(error)}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
) : (
|
||||
<div className="empty-state">
|
||||
No failed auto updates found.
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const navigateToItem = (item: DownloadItem) => {
|
||||
if (item.Dir) {
|
||||
@ -173,113 +278,149 @@ export default function MyAppsPage() {
|
||||
return Object.values(installed).some(app => app.package_id.package_name === packageName);
|
||||
};
|
||||
|
||||
const initiateUninstall = (app: any) => {
|
||||
const packageId = `${app.package_id.package_name}:${app.package_id.publisher_node}`;
|
||||
if (CORE_PACKAGES.includes(packageId)) {
|
||||
setError("Cannot uninstall core system packages");
|
||||
return;
|
||||
}
|
||||
setAppToUninstall(app);
|
||||
setShowUninstallConfirm(true);
|
||||
};
|
||||
|
||||
const handleUninstall = async () => {
|
||||
if (!appToUninstall) return;
|
||||
setIsUninstalling(true);
|
||||
const packageId = `${appToUninstall.package_id.package_name}:${appToUninstall.package_id.publisher_node}`;
|
||||
try {
|
||||
await uninstallApp(packageId);
|
||||
await fetchInstalled();
|
||||
await loadItems();
|
||||
setShowUninstallConfirm(false);
|
||||
setAppToUninstall(null);
|
||||
} catch (error) {
|
||||
console.error('Uninstallation failed:', error);
|
||||
setError(`Uninstallation failed: ${error instanceof Error ? error.message : String(error)}`);
|
||||
} finally {
|
||||
setIsUninstalling(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="downloads-page">
|
||||
<h2>My Apps</h2>
|
||||
<div className="my-apps-page">
|
||||
{error && <div className="error-message">{error}</div>}
|
||||
{renderUpdates()}
|
||||
|
||||
{/* Installed Apps Section */}
|
||||
<div className="file-explorer">
|
||||
<h3>Installed Apps</h3>
|
||||
<table className="downloads-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Package ID</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{Object.values(installed).map((app) => {
|
||||
const packageId = `${app.package_id.package_name}:${app.package_id.publisher_node}`;
|
||||
const isCore = CORE_PACKAGES.includes(packageId);
|
||||
return (
|
||||
<tr key={packageId}>
|
||||
<td>{packageId}</td>
|
||||
<td>
|
||||
{isCore ? (
|
||||
<span className="core-package">Core Package</span>
|
||||
) : (
|
||||
<button
|
||||
onClick={() => initiateUninstall(app)}
|
||||
disabled={isUninstalling}
|
||||
>
|
||||
{isUninstalling ? <FaSpinner className="fa-spin" /> : <FaTrash />}
|
||||
Uninstall
|
||||
</button>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
{/* Navigation */}
|
||||
<div className="navigation">
|
||||
{currentPath.length > 0 && (
|
||||
<button onClick={() => setCurrentPath([])} className="nav-button">
|
||||
<FaChevronLeft /> Back
|
||||
</button>
|
||||
)}
|
||||
<div className="current-path">
|
||||
{currentPath.length === 0 ? 'Downloads' : currentPath.join('/')}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Downloads Section */}
|
||||
<div className="file-explorer">
|
||||
<h3>Downloads</h3>
|
||||
<div className="path-navigation">
|
||||
{currentPath.length > 0 && (
|
||||
<button onClick={navigateUp} className="navigate-up">
|
||||
<FaChevronLeft /> Back
|
||||
</button>
|
||||
)}
|
||||
<span className="current-path">/{currentPath.join('/')}</span>
|
||||
{/* Items Table */}
|
||||
<div className="items-table-container">
|
||||
<div className="file-explorer">
|
||||
<h3>Installed Apps</h3>
|
||||
<table className="downloads-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Package ID</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{Object.values(installed).map((app) => {
|
||||
const packageId = `${app.package_id.package_name}:${app.package_id.publisher_node}`;
|
||||
const isCore = CORE_PACKAGES.includes(packageId);
|
||||
return (
|
||||
<tr key={packageId}>
|
||||
<td>{packageId}</td>
|
||||
<td>
|
||||
{isCore ? (
|
||||
<span className="core-package">Core Package</span>
|
||||
) : (
|
||||
<button
|
||||
onClick={() => initiateUninstall(app)}
|
||||
disabled={isUninstalling}
|
||||
>
|
||||
{isUninstalling ? <FaSpinner className="fa-spin" /> : <FaTrash />}
|
||||
Uninstall
|
||||
</button>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<table className="downloads-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Size</th>
|
||||
<th>Mirroring</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{items.map((item, index) => {
|
||||
const isFile = !!item.File;
|
||||
const name = isFile ? item.File!.name : item.Dir!.name;
|
||||
const isInstalled = isFile && isAppInstalled(name);
|
||||
return (
|
||||
<tr key={index} onClick={() => navigateToItem(item)} className={isFile ? 'file' : 'directory'}>
|
||||
<td>
|
||||
{isFile ? <FaFile /> : <FaFolder />} {name}
|
||||
</td>
|
||||
<td>{isFile ? 'File' : 'Directory'}</td>
|
||||
<td>{isFile ? `${(item.File!.size / 1024).toFixed(2)} KB` : '-'}</td>
|
||||
<td>{!isFile && (item.Dir!.mirroring ? 'Yes' : 'No')}</td>
|
||||
<td>
|
||||
{!isFile && (
|
||||
<button onClick={(e) => { e.stopPropagation(); toggleMirroring(item); }}>
|
||||
<FaSync /> {item.Dir!.mirroring ? 'Stop' : 'Start'} Mirroring
|
||||
</button>
|
||||
)}
|
||||
{isFile && !isInstalled && (
|
||||
<>
|
||||
<button onClick={(e) => { e.stopPropagation(); handleInstall(item); }}>
|
||||
<FaRocket /> Install
|
||||
</button>
|
||||
<button onClick={(e) => { e.stopPropagation(); handleRemoveDownload(item); }}>
|
||||
<FaTrash /> Delete
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{isFile && isInstalled && (
|
||||
<FaCheck className="installed" />
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="error-message">
|
||||
{error}
|
||||
<div className="file-explorer">
|
||||
<h3>Downloads</h3>
|
||||
<div className="path-navigation">
|
||||
{currentPath.length > 0 && (
|
||||
<button onClick={navigateUp} className="navigate-up">
|
||||
<FaChevronLeft /> Back
|
||||
</button>
|
||||
)}
|
||||
<span className="current-path">/{currentPath.join('/')}</span>
|
||||
</div>
|
||||
<table className="downloads-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Size</th>
|
||||
<th>Mirroring</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{items.map((item, index) => {
|
||||
const isFile = !!item.File;
|
||||
const name = isFile ? item.File!.name : item.Dir!.name;
|
||||
const isInstalled = isFile && isAppInstalled(name);
|
||||
return (
|
||||
<tr key={index} onClick={() => navigateToItem(item)} className={isFile ? 'file' : 'directory'}>
|
||||
<td>
|
||||
{isFile ? <FaFile /> : <FaFolder />} {name}
|
||||
</td>
|
||||
<td>{isFile ? 'File' : 'Directory'}</td>
|
||||
<td>{isFile ? `${(item.File!.size / 1024).toFixed(2)} KB` : '-'}</td>
|
||||
<td>{!isFile && (item.Dir!.mirroring ? 'Yes' : 'No')}</td>
|
||||
<td>
|
||||
{!isFile && (
|
||||
<button onClick={(e) => { e.stopPropagation(); toggleMirroring(item); }}>
|
||||
<FaSync /> {item.Dir!.mirroring ? 'Stop' : 'Start'} Mirroring
|
||||
</button>
|
||||
)}
|
||||
{isFile && !isInstalled && (
|
||||
<>
|
||||
<button onClick={(e) => { e.stopPropagation(); handleInstall(item); }}>
|
||||
<FaRocket /> Install
|
||||
</button>
|
||||
<button onClick={(e) => { e.stopPropagation(); handleRemoveDownload(item); }}>
|
||||
<FaTrash /> Delete
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{isFile && isInstalled && (
|
||||
<FaCheck className="installed" />
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Uninstall Confirmation Modal */}
|
||||
{showUninstallConfirm && appToUninstall && (
|
||||
@ -318,8 +459,6 @@ export default function MyAppsPage() {
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
|
||||
{showCapApproval && manifest && (
|
||||
<div className="cap-approval-popup">
|
||||
<div className="cap-approval-content">
|
||||
|
@ -7,12 +7,13 @@ import { mechAbi, KIMAP, encodeIntoMintCall, encodeMulticalls, kimapAbi, MULTICA
|
||||
import { kinohash } from '../utils/kinohash';
|
||||
import useAppsStore from "../store";
|
||||
import { PackageSelector } from "../components";
|
||||
import { Tooltip } from '../components/Tooltip';
|
||||
|
||||
const NAME_INVALID = "Package name must contain only valid characters (a-z, 0-9, -, and .)";
|
||||
|
||||
export default function PublishPage() {
|
||||
const { openConnectModal } = useConnectModal();
|
||||
const { ourApps, fetchOurApps, downloads } = useAppsStore();
|
||||
const { ourApps, fetchOurApps, downloads, fetchDownloadsForApp } = useAppsStore();
|
||||
const publicClient = usePublicClient();
|
||||
|
||||
const { address, isConnected, isConnecting } = useAccount();
|
||||
@ -23,6 +24,7 @@ export default function PublishPage() {
|
||||
});
|
||||
|
||||
const [packageName, setPackageName] = useState<string>("");
|
||||
// @ts-ignore
|
||||
const [publisherId, setPublisherId] = useState<string>(window.our?.node || "");
|
||||
const [metadataUrl, setMetadataUrl] = useState<string>("");
|
||||
const [metadataHash, setMetadataHash] = useState<string>("");
|
||||
@ -34,6 +36,26 @@ export default function PublishPage() {
|
||||
fetchOurApps();
|
||||
}, [fetchOurApps]);
|
||||
|
||||
useEffect(() => {
|
||||
if (packageName && publisherId) {
|
||||
const id = `${packageName}:${publisherId}`;
|
||||
fetchDownloadsForApp(id);
|
||||
}
|
||||
}, [packageName, publisherId, fetchDownloadsForApp]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isConfirmed) {
|
||||
// Fetch our apps again after successful publish
|
||||
fetchOurApps();
|
||||
// Reset form fields
|
||||
setPackageName("");
|
||||
// @ts-ignore
|
||||
setPublisherId(window.our?.node || "");
|
||||
setMetadataUrl("");
|
||||
setMetadataHash("");
|
||||
}
|
||||
}, [isConfirmed, fetchOurApps]);
|
||||
|
||||
const validatePackageName = useCallback((name: string) => {
|
||||
// Allow lowercase letters, numbers, hyphens, and dots
|
||||
const validNameRegex = /^[a-z0-9.-]+$/;
|
||||
@ -69,9 +91,12 @@ export default function PublishPage() {
|
||||
// Check if code_hashes exist in metadata and is an object
|
||||
if (metadata.properties && metadata.properties.code_hashes && typeof metadata.properties.code_hashes === 'object') {
|
||||
const codeHashes = metadata.properties.code_hashes;
|
||||
const missingHashes = Object.entries(codeHashes).filter(([version, hash]) =>
|
||||
!downloads[`${packageName}:${publisherId}`]?.some(d => d.File?.name === `${hash}.zip`)
|
||||
);
|
||||
console.log('Available downloads:', downloads[`${packageName}:${publisherId}`]);
|
||||
|
||||
const missingHashes = Object.entries(codeHashes).filter(([version, hash]) => {
|
||||
const hasDownload = downloads[`${packageName}:${publisherId}`]?.some(d => d.File?.name === `${hash}.zip`);
|
||||
return !hasDownload;
|
||||
});
|
||||
|
||||
if (missingHashes.length > 0) {
|
||||
setMetadataError(`Missing local downloads for mirroring versions: ${missingHashes.map(([version]) => version).join(', ')}`);
|
||||
@ -163,12 +188,6 @@ export default function PublishPage() {
|
||||
gas: BigInt(1000000),
|
||||
});
|
||||
|
||||
// Reset form fields
|
||||
setPackageName("");
|
||||
setPublisherId(window.our?.node || "");
|
||||
setMetadataUrl("");
|
||||
setMetadataHash("");
|
||||
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
@ -223,22 +242,31 @@ export default function PublishPage() {
|
||||
return (
|
||||
<div className="publish-page">
|
||||
<h1>Publish Package</h1>
|
||||
{Boolean(address) && (
|
||||
<div className="publisher-info">
|
||||
<span>Publishing as:</span>
|
||||
<span className="address">{address?.slice(0, 4)}...{address?.slice(-4)}</span>
|
||||
{!address ? (
|
||||
<div className="wallet-status">
|
||||
<button onClick={() => openConnectModal?.()}>Connect Wallet</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="wallet-status">
|
||||
Connected: {address.slice(0, 6)}...{address.slice(-4)}
|
||||
<Tooltip content="Make sure the wallet you're connecting to publish is the same as the owner for the publisher!" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isConfirming ? (
|
||||
<div className="message info">Publishing package...</div>
|
||||
<div className="message info">
|
||||
<div className="loading-spinner"></div>
|
||||
<span>Publishing package...</span>
|
||||
</div>
|
||||
) : !address || !isConnected ? (
|
||||
<>
|
||||
<div className="connect-wallet">
|
||||
<h4>Please connect your wallet to publish a package</h4>
|
||||
<ConnectButton />
|
||||
</>
|
||||
</div>
|
||||
) : isConnecting ? (
|
||||
<div className="message info">Approve connection in your wallet</div>
|
||||
<div className="message info">
|
||||
<div className="loading-spinner"></div>
|
||||
<span>Approve connection in your wallet</span>
|
||||
</div>
|
||||
) : (
|
||||
<form className="publish-form" onSubmit={publishPackage}>
|
||||
<div className="form-group">
|
||||
@ -248,33 +276,36 @@ export default function PublishPage() {
|
||||
</div>
|
||||
|
||||
<div className="form-group">
|
||||
<label htmlFor="metadata-url">Metadata URL</label>
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: '4px' }}>
|
||||
<label>Metadata URL</label>
|
||||
<Tooltip content={<>add a link to metadata.json here (<a href="https://raw.githubusercontent.com/kinode-dao/kit/47cdf82f70b36f2a102ddfaaeed5efa10d7ef5b9/src/new/templates/rust/ui/chat/metadata.json" target="_blank" rel="noopener noreferrer">example link</a>)</>} />
|
||||
</div>
|
||||
<input
|
||||
id="metadata-url"
|
||||
type="text"
|
||||
required
|
||||
value={metadataUrl}
|
||||
onChange={(e) => setMetadataUrl(e.target.value)}
|
||||
onBlur={calculateMetadataHash}
|
||||
placeholder="https://github/my-org/my-repo/metadata.json"
|
||||
/>
|
||||
<p className="help-text">
|
||||
Metadata is a JSON file that describes your package.
|
||||
</p>
|
||||
{metadataError && <p className="error-message">{metadataError}</p>}
|
||||
</div>
|
||||
<div className="form-group">
|
||||
<label htmlFor="metadata-hash">Metadata Hash</label>
|
||||
<label>Metadata Hash</label>
|
||||
<input
|
||||
readOnly
|
||||
id="metadata-hash"
|
||||
type="text"
|
||||
value={metadataHash}
|
||||
placeholder="Calculated automatically from metadata URL"
|
||||
/>
|
||||
</div>
|
||||
<button type="submit" disabled={isConfirming || nameValidity !== null}>
|
||||
{isConfirming ? 'Publishing...' : 'Publish'}
|
||||
<button type="submit" disabled={isConfirming || nameValidity !== null || Boolean(metadataError)}>
|
||||
{isConfirming ? (
|
||||
<>
|
||||
<div className="loading-spinner small"></div>
|
||||
<span>Publishing...</span>
|
||||
</>
|
||||
) : (
|
||||
'Publish'
|
||||
)}
|
||||
</button>
|
||||
</form>
|
||||
)}
|
||||
@ -293,21 +324,24 @@ export default function PublishPage() {
|
||||
<div className="my-packages">
|
||||
<h2>Packages You Own</h2>
|
||||
{Object.keys(ourApps).length > 0 ? (
|
||||
<ul>
|
||||
<ul className="package-list">
|
||||
{Object.values(ourApps).map((app) => (
|
||||
<li key={`${app.package_id.package_name}:${app.package_id.publisher_node}`}>
|
||||
<Link to={`/app/${app.package_id.package_name}:${app.package_id.publisher_node}`} className="app-name">
|
||||
{app.metadata?.name || app.package_id.package_name}
|
||||
{app.metadata?.image && (
|
||||
<img src={app.metadata.image} alt="" className="package-icon" />
|
||||
)}
|
||||
<span>{app.metadata?.name || app.package_id.package_name}</span>
|
||||
</Link>
|
||||
|
||||
<button onClick={() => unpublishPackage(app.package_id.package_name, app.package_id.publisher_node)}>
|
||||
<button onClick={() => unpublishPackage(app.package_id.package_name, app.package_id.publisher_node)} className="danger">
|
||||
Unpublish
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
) : (
|
||||
<p>No packages published</p>
|
||||
<p className="no-packages">No packages published</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -2,13 +2,15 @@ import React, { useState, useEffect } from "react";
|
||||
import useAppsStore from "../store";
|
||||
import { AppListing } from "../types/Apps";
|
||||
import { Link } from "react-router-dom";
|
||||
import { FaSearch } from "react-icons/fa";
|
||||
|
||||
export default function StorePage() {
|
||||
const { listings, fetchListings } = useAppsStore();
|
||||
const { listings, fetchListings, fetchUpdates } = useAppsStore();
|
||||
const [searchQuery, setSearchQuery] = useState<string>("");
|
||||
|
||||
useEffect(() => {
|
||||
fetchListings();
|
||||
fetchUpdates();
|
||||
}, [fetchListings]);
|
||||
|
||||
// extensive temp null handling due to weird prod bug
|
||||
@ -25,12 +27,15 @@ export default function StorePage() {
|
||||
return (
|
||||
<div className="store-page">
|
||||
<div className="store-header">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Search apps..."
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
/>
|
||||
<div className="search-bar">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Search apps..."
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
/>
|
||||
<FaSearch />
|
||||
</div>
|
||||
</div>
|
||||
<div className="app-list">
|
||||
{!listings ? (
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { create } from 'zustand'
|
||||
import { persist } from 'zustand/middleware'
|
||||
import { PackageState, AppListing, MirrorCheckFile, DownloadItem, HomepageApp, ManifestResponse, Notification } from '../types/Apps'
|
||||
import { PackageState, AppListing, MirrorCheckFile, DownloadItem, HomepageApp, ManifestResponse, Notification, UpdateInfo } from '../types/Apps'
|
||||
import { HTTP_STATUS } from '../constants/http'
|
||||
import KinodeClientApi from "@kinode/client-api"
|
||||
import { WEBSOCKET_URL } from '../utils/ws'
|
||||
@ -16,6 +16,7 @@ interface AppsStore {
|
||||
notifications: Notification[]
|
||||
homepageApps: HomepageApp[]
|
||||
activeDownloads: Record<string, { downloaded: number, total: number }>
|
||||
updates: Record<string, UpdateInfo>
|
||||
|
||||
fetchData: (id: string) => Promise<void>
|
||||
fetchListings: () => Promise<void>
|
||||
@ -48,6 +49,8 @@ interface AppsStore {
|
||||
clearActiveDownload: (appId: string) => void
|
||||
clearAllActiveDownloads: () => void;
|
||||
|
||||
fetchUpdates: () => Promise<void>
|
||||
clearUpdates: (packageId: string) => Promise<void>
|
||||
}
|
||||
|
||||
const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
@ -58,7 +61,7 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
activeDownloads: {},
|
||||
homepageApps: [],
|
||||
notifications: [],
|
||||
|
||||
updates: {},
|
||||
|
||||
fetchData: async (id: string) => {
|
||||
if (!id) return;
|
||||
@ -380,6 +383,33 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
});
|
||||
},
|
||||
|
||||
fetchUpdates: async () => {
|
||||
try {
|
||||
const res = await fetch(`${BASE_URL}/updates`);
|
||||
if (res.status === HTTP_STATUS.OK) {
|
||||
const updates = await res.json();
|
||||
set({ updates });
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error fetching updates:", error);
|
||||
}
|
||||
},
|
||||
|
||||
clearUpdates: async (packageId: string) => {
|
||||
try {
|
||||
await fetch(`${BASE_URL}/updates/${packageId}/clear`, {
|
||||
method: 'POST',
|
||||
});
|
||||
set((state) => {
|
||||
const newUpdates = { ...state.updates };
|
||||
delete newUpdates[packageId];
|
||||
return { updates: newUpdates };
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error clearing updates:", error);
|
||||
}
|
||||
},
|
||||
|
||||
ws: new KinodeClientApi({
|
||||
uri: WEBSOCKET_URL,
|
||||
nodeId: (window as any).our?.node,
|
||||
@ -419,10 +449,26 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
get().removeNotification(`download-${appId}`);
|
||||
|
||||
if (error) {
|
||||
const formatDownloadError = (error: any): string => {
|
||||
if (typeof error === 'object' && error !== null) {
|
||||
if ('HashMismatch' in error) {
|
||||
const { actual, desired } = error.HashMismatch;
|
||||
return `Hash mismatch: expected ${desired.slice(0, 8)}..., got ${actual.slice(0, 8)}...`;
|
||||
}
|
||||
// Try to serialize the error object if it's not a HashMismatch
|
||||
try {
|
||||
return JSON.stringify(error);
|
||||
} catch {
|
||||
return String(error);
|
||||
}
|
||||
}
|
||||
return String(error);
|
||||
};
|
||||
|
||||
get().addNotification({
|
||||
id: `error-${appId}`,
|
||||
type: 'error',
|
||||
message: `Download failed for ${package_id.package_name}: ${error}`,
|
||||
message: `Download failed for ${package_id.package_name}: ${formatDownloadError(error)}`,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
} else {
|
||||
|
@ -94,6 +94,35 @@ export interface HomepageApp {
|
||||
favorite: boolean;
|
||||
}
|
||||
|
||||
export interface HashMismatch {
|
||||
desired: string;
|
||||
actual: string;
|
||||
}
|
||||
|
||||
export type DownloadError =
|
||||
| "NoPackage"
|
||||
| "NotMirroring"
|
||||
| { HashMismatch: HashMismatch }
|
||||
| "FileNotFound"
|
||||
| "WorkerSpawnFailed"
|
||||
| "HttpClientError"
|
||||
| "BlobNotFound"
|
||||
| "VfsError"
|
||||
| { HandlingError: string }
|
||||
| "Timeout"
|
||||
| "InvalidManifest"
|
||||
| "Offline";
|
||||
|
||||
export interface UpdateInfo {
|
||||
errors: [string, DownloadError][]; // [url/node, error]
|
||||
pending_manifest_hash: string | null;
|
||||
}
|
||||
|
||||
export type Updates = {
|
||||
[key: string]: { // package_id
|
||||
[key: string]: UpdateInfo; // version_hash -> update info
|
||||
};
|
||||
};
|
||||
|
||||
export type NotificationActionType = 'click' | 'modal' | 'popup' | 'redirect';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user