mirror of
https://github.com/uqbar-dao/nectar.git
synced 2024-12-21 07:31:34 +03:00
nick.kino
GitHub
commit
efabf3ce47
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -3652,7 +3652,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "kinode"
|
||||
version = "0.9.8"
|
||||
version = "0.9.9"
|
||||
dependencies = [
|
||||
"aes-gcm",
|
||||
"alloy 0.2.1",
|
||||
@ -3710,7 +3710,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "kinode_lib"
|
||||
version = "0.9.8"
|
||||
version = "0.9.9"
|
||||
dependencies = [
|
||||
"lib",
|
||||
]
|
||||
@ -3855,7 +3855,7 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
|
||||
|
||||
[[package]]
|
||||
name = "lib"
|
||||
version = "0.9.8"
|
||||
version = "0.9.9"
|
||||
dependencies = [
|
||||
"alloy 0.2.1",
|
||||
"anyhow",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "kinode_lib"
|
||||
authors = ["KinodeDAO"]
|
||||
version = "0.9.8"
|
||||
version = "0.9.9"
|
||||
edition = "2021"
|
||||
description = "A general-purpose sovereign cloud computing platform"
|
||||
homepage = "https://kinode.org"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "kinode"
|
||||
authors = ["KinodeDAO"]
|
||||
version = "0.9.8"
|
||||
version = "0.9.9"
|
||||
edition = "2021"
|
||||
description = "A general-purpose sovereign cloud computing platform"
|
||||
homepage = "https://kinode.org"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
use crate::{
|
||||
kinode::process::chain::{ChainRequests, ChainResponses},
|
||||
kinode::process::downloads::{
|
||||
DownloadRequests, DownloadResponses, LocalDownloadRequest, RemoveFileRequest,
|
||||
DownloadRequests, DownloadResponses, Entry, LocalDownloadRequest, RemoveFileRequest,
|
||||
},
|
||||
state::{MirrorCheck, PackageState, State},
|
||||
};
|
||||
@ -31,6 +31,7 @@ pub fn init_frontend(our: &Address, http_server: &mut server::HttpServer) {
|
||||
"/apps/:id", // detail about an on-chain app
|
||||
"/downloads/:id", // local downloads for an app
|
||||
"/installed/:id", // detail about an installed app
|
||||
"/manifest", // manifest of a downloaded app, id & version hash in query params
|
||||
// actions
|
||||
"/apps/:id/download", // download a listed app
|
||||
"/apps/:id/install", // install a downloaded app
|
||||
@ -190,6 +191,7 @@ fn make_widget() -> String {
|
||||
/// - get all apps we've published: GET /ourapps
|
||||
/// - get detail about a specific app: GET /apps/:id
|
||||
/// - get detail about a specific apps downloads: GET /downloads/:id
|
||||
/// - get manifest of a specific downloaded app: GET /manifest?id={id}&version_hash={version_hash}
|
||||
/// - remove a downloaded app: POST /downloads/:id/remove
|
||||
|
||||
/// - get online/offline mirrors for a listed app: GET /mirrorcheck/:node
|
||||
@ -225,8 +227,8 @@ pub fn handle_http_request(
|
||||
}
|
||||
}
|
||||
|
||||
fn get_package_id(url_params: &HashMap<String, String>) -> anyhow::Result<PackageId> {
|
||||
let Some(package_id) = url_params.get("id") else {
|
||||
fn get_package_id(params: &HashMap<String, String>) -> anyhow::Result<PackageId> {
|
||||
let Some(package_id) = params.get("id") else {
|
||||
return Err(anyhow::anyhow!("Missing id"));
|
||||
};
|
||||
|
||||
@ -246,6 +248,7 @@ 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,
|
||||
})
|
||||
}
|
||||
|
||||
@ -258,6 +261,7 @@ fn serve_paths(
|
||||
|
||||
let bound_path: &str = req.bound_path(Some(&our.process.to_string()));
|
||||
let url_params = req.url_params();
|
||||
let query_params = req.query_params();
|
||||
|
||||
match bound_path {
|
||||
// GET all apps
|
||||
@ -362,6 +366,73 @@ fn serve_paths(
|
||||
)),
|
||||
}
|
||||
}
|
||||
"/manifest" => {
|
||||
// get manifest of a downloaded app, version hash and id in query params
|
||||
let Ok(package_id) = get_package_id(query_params) else {
|
||||
return Ok((
|
||||
StatusCode::BAD_REQUEST,
|
||||
None,
|
||||
format!("Missing id in query params.").into_bytes(),
|
||||
));
|
||||
};
|
||||
|
||||
let Some(version_hash) = query_params.get("version_hash") else {
|
||||
return Ok((
|
||||
StatusCode::BAD_REQUEST,
|
||||
None,
|
||||
format!("Missing version_hash in query params.").into_bytes(),
|
||||
));
|
||||
};
|
||||
|
||||
let package_id = crate::kinode::process::main::PackageId::from_process_lib(package_id);
|
||||
|
||||
// get the file corresponding to the version hash, extract manifest and return.
|
||||
let resp = Request::to(("our", "downloads", "app_store", "sys"))
|
||||
.body(serde_json::to_vec(&DownloadRequests::GetFiles(Some(
|
||||
package_id.clone(),
|
||||
)))?)
|
||||
.send_and_await_response(5)??;
|
||||
|
||||
let msg = serde_json::from_slice::<DownloadResponses>(resp.body())?;
|
||||
match msg {
|
||||
DownloadResponses::GetFiles(files) => {
|
||||
let file_name = format!("{version_hash}.zip");
|
||||
let file_entry = files.into_iter().find(|entry| match entry {
|
||||
Entry::File(file) => file.name == file_name,
|
||||
_ => false,
|
||||
});
|
||||
|
||||
match file_entry {
|
||||
Some(Entry::File(file)) => {
|
||||
let response = serde_json::json!({
|
||||
"package_id": package_id,
|
||||
"version_hash": version_hash,
|
||||
"manifest": file.manifest,
|
||||
});
|
||||
return Ok((StatusCode::OK, None, serde_json::to_vec(&response)?));
|
||||
}
|
||||
_ => {
|
||||
return Ok((
|
||||
StatusCode::NOT_FOUND,
|
||||
None,
|
||||
format!("File with version hash {} not found", version_hash)
|
||||
.into_bytes(),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
DownloadResponses::Err(e) => Ok((
|
||||
StatusCode::NOT_FOUND,
|
||||
None,
|
||||
format!("Error from downloads: {:?}", e).into_bytes(),
|
||||
)),
|
||||
_ => Ok((
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
None,
|
||||
format!("Invalid response from downloads: {:?}", msg).into_bytes(),
|
||||
)),
|
||||
}
|
||||
}
|
||||
"/installed" => {
|
||||
let all: Vec<serde_json::Value> = state
|
||||
.packages
|
||||
|
||||
@ -178,21 +178,30 @@ fn handle_message(
|
||||
let package_id = req.download_info.package_id;
|
||||
let version_hash = req.download_info.version_hash;
|
||||
|
||||
if let Some(package) = state.packages.get(&package_id.clone().to_process_lib()) {
|
||||
if package.manifest_hash == Some(manifest_hash) {
|
||||
print_to_terminal(1, "auto_install:main, manifest_hash match");
|
||||
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);
|
||||
|
||||
if should_auto_install {
|
||||
if let Err(e) =
|
||||
utils::install(&package_id, None, &version_hash, state, &our.node)
|
||||
{
|
||||
print_to_terminal(1, &format!("error auto_installing package: {e}"));
|
||||
if let Some(package) = state.packages.get_mut(&process_lib_package_id) {
|
||||
package.pending_update_hash = Some(version_hash);
|
||||
}
|
||||
println!("error auto-installing package: {e}");
|
||||
} else {
|
||||
println!(
|
||||
"auto_installed update for package: {:?}",
|
||||
&package_id.to_process_lib()
|
||||
);
|
||||
println!("auto-installed update for package: {process_lib_package_id}");
|
||||
}
|
||||
} else {
|
||||
print_to_terminal(1, "auto_install:main, manifest_hash do not match");
|
||||
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");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -54,8 +54,19 @@ 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
|
||||
// the state to disk right now, with installed_apis and packages being populated directly
|
||||
// from the filesystem, not sure I'd like to serialize the whole of this state (maybe separate out the pending one?)
|
||||
// another option would be to have the download_api recheck the manifest hash? but not sure...
|
||||
// arbitrary complexity here.
|
||||
|
||||
// alternative is main loop doing this, storing it.
|
||||
|
||||
/// this process's saved state
|
||||
pub struct State {
|
||||
/// packages we have installed
|
||||
@ -122,6 +133,7 @@ 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.
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@ -225,6 +225,7 @@ 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) {
|
||||
|
||||
@ -209,19 +209,32 @@ fn handle_message(
|
||||
desired_version_hash,
|
||||
worker_address: our_worker.to_string(),
|
||||
}))
|
||||
.expects_response(60)
|
||||
.context(&download_request)
|
||||
.send()?;
|
||||
}
|
||||
DownloadRequests::RemoteDownload(download_request) => {
|
||||
// this is a node requesting a download from us.
|
||||
// check if we are mirroring. we should maybe implement some back and forth here.
|
||||
// small handshake for started? but we do not really want to wait for that in this loop..
|
||||
// might be okay. implement.
|
||||
let RemoteDownloadRequest {
|
||||
package_id,
|
||||
desired_version_hash,
|
||||
worker_address,
|
||||
} = download_request;
|
||||
|
||||
let process_lib_package_id = package_id.clone().to_process_lib();
|
||||
|
||||
// check if we are mirroring, if not send back an error.
|
||||
if !state.mirroring.contains(&process_lib_package_id) {
|
||||
let resp = DownloadResponses::Err(DownloadError::NotMirroring);
|
||||
Response::new().body(&resp).send()?;
|
||||
return Ok(()); // return here, todo unify remote and local responses?
|
||||
}
|
||||
|
||||
if !download_zip_exists(&process_lib_package_id, &desired_version_hash) {
|
||||
let resp = DownloadResponses::Err(DownloadError::FileNotFound);
|
||||
Response::new().body(&resp).send()?;
|
||||
return Ok(()); // return here, todo unify remote and local responses?
|
||||
}
|
||||
|
||||
let target_worker = Address::from_str(&worker_address)?;
|
||||
let _ = spawn_send_transfer(
|
||||
our,
|
||||
@ -230,6 +243,8 @@ fn handle_message(
|
||||
APP_SHARE_TIMEOUT,
|
||||
&target_worker,
|
||||
)?;
|
||||
let resp = DownloadResponses::Success;
|
||||
Response::new().body(&resp).send()?;
|
||||
}
|
||||
DownloadRequests::Progress(ref progress) => {
|
||||
// forward progress to main:app_store:sys,
|
||||
@ -428,12 +443,35 @@ fn handle_message(
|
||||
} else {
|
||||
match message.body().try_into()? {
|
||||
Resp::Download(download_response) => {
|
||||
// these are handled in line.
|
||||
// get context of the response.
|
||||
// handled are errors or ok responses from a remote node.
|
||||
|
||||
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()?;
|
||||
}
|
||||
DownloadResponses::Success => {
|
||||
// todo: maybe we do something here.
|
||||
print_to_terminal(
|
||||
1,
|
||||
&format!("got a weird download response: {:?}", download_response),
|
||||
&format!(
|
||||
"downloads: got success response from remote node: {:?}",
|
||||
download_request
|
||||
),
|
||||
);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
Resp::HttpClient(resp) => {
|
||||
let Some(context) = message.context() else {
|
||||
return Err(anyhow::anyhow!("http_client response without context"));
|
||||
@ -575,6 +613,22 @@ fn extract_and_write_manifest(file_contents: &[u8], manifest_path: &str) -> anyh
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Check if a download zip exists for a given package and version hash.
|
||||
/// Used to check if we can share a package or not!
|
||||
fn download_zip_exists(package_id: &PackageId, version_hash: &str) -> bool {
|
||||
let filename = format!(
|
||||
"/app_store:sys/downloads/{}:{}/{}.zip",
|
||||
package_id.package_name,
|
||||
package_id.publisher(),
|
||||
version_hash
|
||||
);
|
||||
let res = vfs::metadata(&filename, None);
|
||||
match res {
|
||||
Ok(meta) => meta.file_type == vfs::FileType::File,
|
||||
Err(_e) => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn get_manifest_hash(package_id: PackageId, version_hash: String) -> anyhow::Result<String> {
|
||||
let package_dir = format!("{}/{}", "/app_store:sys/downloads", package_id.to_string());
|
||||
let manifest_path = format!("{}/{}.json", package_dir, version_hash);
|
||||
|
||||
@ -78,6 +78,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);
|
||||
|
||||
let start = std::time::Instant::now();
|
||||
@ -167,7 +168,11 @@ fn handle_receiver(
|
||||
package_id: &PackageId,
|
||||
version_hash: &str,
|
||||
) -> anyhow::Result<()> {
|
||||
// TODO: write to a temporary location first, then check hash as we go, then rename to final location.
|
||||
let timer_address = Address::from_str("our@timer:distro:sys")?;
|
||||
|
||||
let mut file: Option<File> = None;
|
||||
let mut size: Option<u64> = None;
|
||||
let mut hasher = Sha256::new();
|
||||
|
||||
let package_dir = vfs::open_dir(
|
||||
&format!(
|
||||
@ -179,16 +184,6 @@ fn handle_receiver(
|
||||
None,
|
||||
)?;
|
||||
|
||||
let timer_address = Address::from_str("our@timer:distro:sys")?;
|
||||
|
||||
let mut file = vfs::open_file(
|
||||
&format!("{}{}.zip", &package_dir.path, version_hash),
|
||||
true,
|
||||
None,
|
||||
)?;
|
||||
let mut size: Option<u64> = None;
|
||||
let mut hasher = Sha256::new();
|
||||
|
||||
loop {
|
||||
let message = await_message()?;
|
||||
if *message.source() == timer_address {
|
||||
@ -200,7 +195,28 @@ fn handle_receiver(
|
||||
|
||||
match message.body().try_into()? {
|
||||
DownloadRequests::Chunk(chunk) => {
|
||||
handle_chunk(&mut file, &chunk, parent_process, &mut size, &mut hasher)?;
|
||||
let bytes = if let Some(blob) = get_blob() {
|
||||
blob.bytes
|
||||
} else {
|
||||
return Err(anyhow::anyhow!("ft_worker: got no blob in chunk request"));
|
||||
};
|
||||
|
||||
if file.is_none() {
|
||||
file = Some(vfs::open_file(
|
||||
&format!("{}{}.zip", &package_dir.path, version_hash),
|
||||
true,
|
||||
None,
|
||||
)?);
|
||||
}
|
||||
|
||||
handle_chunk(
|
||||
file.as_mut().unwrap(),
|
||||
&chunk,
|
||||
parent_process,
|
||||
&mut size,
|
||||
&mut hasher,
|
||||
&bytes,
|
||||
)?;
|
||||
if let Some(s) = size {
|
||||
if chunk.offset + chunk.length >= s {
|
||||
let recieved_hash = format!("{:x}", hasher.finalize());
|
||||
@ -232,7 +248,7 @@ fn handle_receiver(
|
||||
let manifest_filename =
|
||||
format!("{}{}.json", package_dir.path, version_hash);
|
||||
|
||||
let contents = file.read()?;
|
||||
let contents = file.as_mut().unwrap().read()?;
|
||||
extract_and_write_manifest(&contents, &manifest_filename)?;
|
||||
|
||||
Request::new()
|
||||
@ -292,15 +308,10 @@ fn handle_chunk(
|
||||
parent: &Address,
|
||||
size: &mut Option<u64>,
|
||||
hasher: &mut Sha256,
|
||||
bytes: &[u8],
|
||||
) -> anyhow::Result<()> {
|
||||
let bytes = if let Some(blob) = get_blob() {
|
||||
blob.bytes
|
||||
} else {
|
||||
return Err(anyhow::anyhow!("ft_worker: got no blob"));
|
||||
};
|
||||
|
||||
file.write_all(&bytes)?;
|
||||
hasher.update(&bytes);
|
||||
file.write_all(bytes)?;
|
||||
hasher.update(bytes);
|
||||
|
||||
if let Some(total_size) = size {
|
||||
// let progress = ((chunk.offset + chunk.length) as f64 / *total_size as f64 * 100.0) as u64;
|
||||
|
||||
@ -3,6 +3,7 @@ import { Link } 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';
|
||||
|
||||
const Header: React.FC = () => {
|
||||
return (
|
||||
@ -18,10 +19,10 @@ const Header: React.FC = () => {
|
||||
</nav>
|
||||
</div>
|
||||
<div className="header-right">
|
||||
<NotificationBay />
|
||||
<ConnectButton />
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
};
|
||||
|
||||
export default Header;
|
||||
@ -0,0 +1,97 @@
|
||||
import React, { useState } from 'react';
|
||||
import { ManifestResponse, PackageManifestEntry } from '../types/Apps';
|
||||
import { FaChevronDown, FaChevronRight, FaGlobe, FaLock, FaShieldAlt } from 'react-icons/fa';
|
||||
|
||||
interface ManifestDisplayProps {
|
||||
manifestResponse: ManifestResponse;
|
||||
}
|
||||
|
||||
const capabilityMap: Record<string, string> = {
|
||||
'vfs:distro:sys': 'Virtual Filesystem',
|
||||
'http_client:distro:sys': 'HTTP Client',
|
||||
'http_server:distro:sys': 'HTTP Server',
|
||||
'eth:distro:sys': 'Ethereum RPC access',
|
||||
'homepage:homepage:sys': 'Ability to add itself to homepage',
|
||||
'main:app_store:sys': 'App Store',
|
||||
'chain:app_store:sys': 'Chain',
|
||||
'terminal:terminal:sys': 'Terminal',
|
||||
};
|
||||
|
||||
// note: we can do some future regex magic mapping here too!
|
||||
// if includes("root") return WARNING
|
||||
const transformCapabilities = (capabilities: any[]) => {
|
||||
return capabilities.map(cap => capabilityMap[cap] || cap);
|
||||
};
|
||||
|
||||
|
||||
const ProcessManifest: React.FC<{ manifest: PackageManifestEntry }> = ({ manifest }) => {
|
||||
const [isExpanded, setIsExpanded] = useState(false);
|
||||
const hasCapabilities = manifest.request_capabilities.length > 0 || manifest.grant_capabilities.length > 0;
|
||||
|
||||
return (
|
||||
<div className="process-manifest">
|
||||
<button
|
||||
className="process-header"
|
||||
onClick={() => setIsExpanded(!isExpanded)}
|
||||
>
|
||||
{isExpanded ? <FaChevronDown /> : <FaChevronRight />}
|
||||
<span className="process-name">{manifest.process_name}</span>
|
||||
<div className="process-indicators">
|
||||
{manifest.request_networking && (
|
||||
<FaGlobe title="Requests Network Access" className="network-icon" />
|
||||
)}
|
||||
{hasCapabilities && (
|
||||
<FaShieldAlt title="Has Capability Requirements" className="capability-icon" />
|
||||
)}
|
||||
{!manifest.public && (
|
||||
<FaLock title="Private Process" className="private-icon" />
|
||||
)}
|
||||
</div>
|
||||
</button>
|
||||
|
||||
{isExpanded && (
|
||||
<div className="process-details">
|
||||
{manifest.request_capabilities.length > 0 && (
|
||||
<div className="capability-section">
|
||||
<h4>Requested Capabilities:</h4>
|
||||
<ul>
|
||||
{transformCapabilities(manifest.request_capabilities).map((cap, i) => (
|
||||
<li key={i}>{cap}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{manifest.grant_capabilities.length > 0 && (
|
||||
<div className="capability-section">
|
||||
<h4>Granted Capabilities:</h4>
|
||||
<ul>
|
||||
{transformCapabilities(manifest.grant_capabilities).map((cap, i) => (
|
||||
<li key={i}>{cap}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const ManifestDisplay: React.FC<ManifestDisplayProps> = ({ manifestResponse }) => {
|
||||
if (!manifestResponse) {
|
||||
return <p>No manifest data available.</p>;
|
||||
}
|
||||
|
||||
const parsedManifests: PackageManifestEntry[] = JSON.parse(manifestResponse.manifest);
|
||||
|
||||
return (
|
||||
<div className="manifest-display">
|
||||
{parsedManifests.map((manifest, index) => (
|
||||
<ProcessManifest key={index} manifest={manifest} />
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default ManifestDisplay;
|
||||
140
kinode/packages/app_store/ui/src/components/NotificationBay.tsx
Normal file
140
kinode/packages/app_store/ui/src/components/NotificationBay.tsx
Normal file
@ -0,0 +1,140 @@
|
||||
import React, { ReactNode, useState } from 'react';
|
||||
import { FaBell, FaChevronDown, FaChevronUp, FaTrash, FaTimes } from 'react-icons/fa';
|
||||
import useAppsStore from '../store';
|
||||
import { Notification, NotificationAction } from '../types/Apps';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
|
||||
interface ModalProps {
|
||||
children: ReactNode;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
const Modal: React.FC<ModalProps> = ({ children, onClose }) => {
|
||||
return (
|
||||
<div className="modal-overlay">
|
||||
<div className="modal-content">
|
||||
<button className="modal-close" onClick={onClose}>
|
||||
<FaTimes />
|
||||
</button>
|
||||
{children}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const NotificationBay: React.FC = () => {
|
||||
const { notifications, removeNotification } = useAppsStore();
|
||||
const hasErrors = notifications.some(n => n.type === 'error');
|
||||
const [isExpanded, setIsExpanded] = useState(false);
|
||||
const [modalContent, setModalContent] = useState<React.ReactNode | null>(null);
|
||||
const navigate = useNavigate();
|
||||
|
||||
const handleActionClick = (action: NotificationAction) => {
|
||||
switch (action.action.type) {
|
||||
case 'modal':
|
||||
const content = typeof action.action.modalContent === 'function'
|
||||
? action.action.modalContent()
|
||||
: action.action.modalContent;
|
||||
setModalContent(content);
|
||||
break;
|
||||
case 'click':
|
||||
action.action.onClick?.();
|
||||
break;
|
||||
case 'redirect':
|
||||
if (action.action.path) {
|
||||
navigate(action.action.path);
|
||||
}
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
const handleDismiss = (notificationId: string, event: React.MouseEvent) => {
|
||||
event.stopPropagation(); // Prevent event bubbling
|
||||
removeNotification(notificationId);
|
||||
};
|
||||
|
||||
const renderNotification = (notification: Notification) => {
|
||||
return (
|
||||
<div key={notification.id} className={`notification-item ${notification.type}`}>
|
||||
{notification.renderContent ? (
|
||||
notification.renderContent(notification)
|
||||
) : (
|
||||
<>
|
||||
<div className="notification-content">
|
||||
<p>{notification.message}</p>
|
||||
{notification.type === 'download' && notification.metadata?.progress && (
|
||||
<div className="progress-bar">
|
||||
<div
|
||||
className="progress"
|
||||
style={{ width: `${notification.metadata.progress}%` }}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{notification.actions && (
|
||||
<div className="notification-actions">
|
||||
{notification.actions.map((action, index) => (
|
||||
<button
|
||||
key={index}
|
||||
onClick={() => handleActionClick(action)}
|
||||
className={`action-button ${action.variant || 'secondary'}`}
|
||||
>
|
||||
{action.icon && <action.icon />}
|
||||
{action.label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!notification.persistent && (
|
||||
<button
|
||||
className="dismiss-button"
|
||||
onClick={(e) => handleDismiss(notification.id, e)}
|
||||
>
|
||||
<FaTrash />
|
||||
</button>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="notification-bay">
|
||||
<button
|
||||
onClick={() => setIsExpanded(!isExpanded)}
|
||||
className={`notification-button ${hasErrors ? 'has-errors' : ''}`}
|
||||
>
|
||||
<FaBell />
|
||||
{notifications.length > 0 && (
|
||||
<span className={`badge ${hasErrors ? 'error-badge' : ''}`}>
|
||||
{notifications.length}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
|
||||
{isExpanded && (
|
||||
<div className="notification-details">
|
||||
{notifications.length === 0 ? (
|
||||
<p>All clear, no notifications!</p>
|
||||
) : (
|
||||
notifications.map(renderNotification)
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{modalContent && (
|
||||
<Modal onClose={() => setModalContent(null)}>
|
||||
{modalContent}
|
||||
</Modal>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default NotificationBay;
|
||||
@ -1,3 +1,5 @@
|
||||
export { default as Header } from './Header';
|
||||
export { default as MirrorSelector } from './MirrorSelector';
|
||||
export { default as PackageSelector } from './PackageSelector';
|
||||
export { default as ManifestDisplay } from './ManifestDisplay';
|
||||
export { default as NotificationBay } from './NotificationBay';
|
||||
@ -49,6 +49,13 @@ a:hover {
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.header-right {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
/* Provides consistent spacing between NotificationBay and ConnectButton */
|
||||
}
|
||||
|
||||
.header-left h1 {
|
||||
margin: 0;
|
||||
font-size: 1.5rem;
|
||||
@ -433,3 +440,277 @@ td {
|
||||
.fa-spin {
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
.manifest-display {
|
||||
background: light-dark(var(--white), var(--tasteful-dark));
|
||||
border-radius: var(--border-radius);
|
||||
padding: 1rem;
|
||||
max-width: 600px;
|
||||
}
|
||||
|
||||
.process-manifest {
|
||||
margin-bottom: 0.5rem;
|
||||
border: 1px solid light-dark(var(--gray), var(--off-black));
|
||||
border-radius: var(--border-radius);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.process-header {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
padding: 0.75rem 1rem;
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
|
||||
.process-header:hover {
|
||||
background: light-dark(var(--tan), var(--off-black));
|
||||
}
|
||||
|
||||
.process-name {
|
||||
flex: 1;
|
||||
text-align: left;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.process-indicators {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
}
|
||||
|
||||
.network-icon {
|
||||
color: var(--orange);
|
||||
}
|
||||
|
||||
.capability-icon {
|
||||
color: var(--blue);
|
||||
}
|
||||
|
||||
.private-icon {
|
||||
color: var(--gray);
|
||||
}
|
||||
|
||||
.process-details {
|
||||
padding: 1rem;
|
||||
background: light-dark(var(--tan), var(--off-black));
|
||||
border-top: 1px solid light-dark(var(--gray), var(--off-black));
|
||||
}
|
||||
|
||||
.capability-section {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.capability-section:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.capability-section h4 {
|
||||
margin: 0 0 0.5rem 0;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
}
|
||||
|
||||
.capability-section ul {
|
||||
margin: 0;
|
||||
padding-left: 1.5rem;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
}
|
||||
|
||||
.capability-section li {
|
||||
margin-bottom: 0.25rem;
|
||||
}
|
||||
|
||||
.notification-bay {
|
||||
position: relative;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
.notification-button {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
padding: 0.5rem;
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
}
|
||||
|
||||
.notification-details {
|
||||
position: absolute;
|
||||
top: 100%;
|
||||
right: 0;
|
||||
width: 320px;
|
||||
max-height: 400px;
|
||||
overflow-y: auto;
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
border-radius: var(--border-radius);
|
||||
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
||||
z-index: 1000;
|
||||
padding: 0.5rem;
|
||||
}
|
||||
|
||||
.badge {
|
||||
background-color: var(--orange);
|
||||
color: var(--white);
|
||||
border-radius: 50%;
|
||||
padding: 0.25rem 0.5rem;
|
||||
font-size: 0.75rem;
|
||||
min-width: 1.5rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.notification-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
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));
|
||||
}
|
||||
|
||||
.notification-item.error {
|
||||
background-color: light-dark(#ffe6e6, #4a2020);
|
||||
}
|
||||
|
||||
.notification-item.success {
|
||||
background-color: light-dark(#e6ffe6, #204a20);
|
||||
}
|
||||
|
||||
.notification-item.warning {
|
||||
background-color: light-dark(#fff3e6, #4a3820);
|
||||
}
|
||||
|
||||
.notification-item.download {
|
||||
background-color: light-dark(#e6f3ff, #20304a);
|
||||
}
|
||||
|
||||
.notification-content {
|
||||
flex: 1;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
.notification-actions {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.dismiss-button {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
padding: 0.25rem;
|
||||
}
|
||||
|
||||
.dismiss-button:hover {
|
||||
color: var(--orange);
|
||||
}
|
||||
|
||||
.progress-bar {
|
||||
margin-top: 0.5rem;
|
||||
height: 4px;
|
||||
background-color: light-dark(var(--white), var(--off-black));
|
||||
border-radius: 2px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.progress {
|
||||
height: 100%;
|
||||
background-color: var(--orange);
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
|
||||
/* Modal styles */
|
||||
.modal-overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 1100;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background-color: light-dark(var(--white), var(--tasteful-dark));
|
||||
color: light-dark(var(--off-black), var(--off-white));
|
||||
padding: 1.5rem;
|
||||
border-radius: var(--border-radius);
|
||||
position: relative;
|
||||
max-width: 80%;
|
||||
max-height: 80vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.modal-close {
|
||||
position: absolute;
|
||||
top: 0.75rem;
|
||||
right: 0.75rem;
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: light-dark(var(--gray), var(--off-white));
|
||||
padding: 0.25rem;
|
||||
}
|
||||
|
||||
.modal-close:hover {
|
||||
color: var(--orange);
|
||||
}
|
||||
|
||||
.notification-button.has-errors {
|
||||
animation: shake 0.82s cubic-bezier(.36, .07, .19, .97) both;
|
||||
}
|
||||
|
||||
.badge.error-badge {
|
||||
background-color: var(--error-red);
|
||||
animation: pulse 2s infinite;
|
||||
}
|
||||
|
||||
@keyframes shake {
|
||||
|
||||
10%,
|
||||
90% {
|
||||
transform: translate3d(-1px, 0, 0);
|
||||
}
|
||||
|
||||
20%,
|
||||
80% {
|
||||
transform: translate3d(2px, 0, 0);
|
||||
}
|
||||
|
||||
30%,
|
||||
50%,
|
||||
70% {
|
||||
transform: translate3d(-4px, 0, 0);
|
||||
}
|
||||
|
||||
40%,
|
||||
60% {
|
||||
transform: translate3d(4px, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
50% {
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
100% {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,8 @@ import React, { useState, useEffect, useCallback, useMemo } from "react";
|
||||
import { useParams } from "react-router-dom";
|
||||
import { FaDownload, FaSpinner, FaChevronDown, FaChevronUp, FaRocket, FaTrash, FaPlay } from "react-icons/fa";
|
||||
import useAppsStore from "../store";
|
||||
import { MirrorSelector } from '../components';
|
||||
import { MirrorSelector, ManifestDisplay } from '../components';
|
||||
import { ManifestResponse } from "../types/Apps";
|
||||
|
||||
export default function DownloadPage() {
|
||||
const { id } = useParams<{ id: string }>();
|
||||
@ -17,7 +18,7 @@ export default function DownloadPage() {
|
||||
removeDownload,
|
||||
clearAllActiveDownloads,
|
||||
fetchHomepageApps,
|
||||
getLaunchUrl
|
||||
getLaunchUrl,
|
||||
} = useAppsStore();
|
||||
|
||||
const [showMetadata, setShowMetadata] = useState(false);
|
||||
@ -26,7 +27,7 @@ export default function DownloadPage() {
|
||||
const [showMyDownloads, setShowMyDownloads] = useState(false);
|
||||
const [isMirrorOnline, setIsMirrorOnline] = useState<boolean | null>(null);
|
||||
const [showCapApproval, setShowCapApproval] = useState(false);
|
||||
const [manifest, setManifest] = useState<any>(null);
|
||||
const [manifestResponse, setManifestResponse] = useState<ManifestResponse | null>(null);
|
||||
const [isInstalling, setIsInstalling] = useState(false);
|
||||
const [isCheckingLaunch, setIsCheckingLaunch] = useState(false);
|
||||
const [launchPath, setLaunchPath] = useState<string | null>(null);
|
||||
@ -151,8 +152,12 @@ export default function DownloadPage() {
|
||||
const download = appDownloads.find(d => d.File && d.File.name === `${hash}.zip`);
|
||||
if (download?.File?.manifest) {
|
||||
try {
|
||||
const manifestData = JSON.parse(download.File.manifest);
|
||||
setManifest(manifestData);
|
||||
const manifest_response: ManifestResponse = {
|
||||
package_id: app.package_id,
|
||||
version_hash: hash,
|
||||
manifest: download.File.manifest
|
||||
};
|
||||
setManifestResponse(manifest_response);
|
||||
setShowCapApproval(true);
|
||||
} catch (error) {
|
||||
console.error('Failed to parse manifest:', error);
|
||||
@ -170,7 +175,7 @@ export default function DownloadPage() {
|
||||
setLaunchPath(null);
|
||||
installApp(id, versionData.hash).then(() => {
|
||||
setShowCapApproval(false);
|
||||
setManifest(null);
|
||||
setManifestResponse(null);
|
||||
fetchData(id);
|
||||
});
|
||||
}
|
||||
@ -337,13 +342,11 @@ export default function DownloadPage() {
|
||||
)}
|
||||
</div>
|
||||
|
||||
{showCapApproval && manifest && (
|
||||
{showCapApproval && manifestResponse && (
|
||||
<div className="cap-approval-popup">
|
||||
<div className="cap-approval-content">
|
||||
<h3>Approve Capabilities</h3>
|
||||
<pre className="json-display">
|
||||
{JSON.stringify(manifest[0]?.request_capabilities || [], null, 2)}
|
||||
</pre>
|
||||
<ManifestDisplay manifestResponse={manifestResponse} />
|
||||
<div className="approval-buttons">
|
||||
<button onClick={() => setShowCapApproval(false)}>Cancel</button>
|
||||
<button onClick={confirmInstall}>
|
||||
@ -354,7 +357,6 @@ export default function DownloadPage() {
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
<div className="app-details">
|
||||
<h3>App Details</h3>
|
||||
<button onClick={() => setShowMetadata(!showMetadata)}>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { create } from 'zustand'
|
||||
import { persist } from 'zustand/middleware'
|
||||
import { PackageState, AppListing, MirrorCheckFile, PackageManifest, DownloadItem, HomepageApp } from '../types/Apps'
|
||||
import { PackageState, AppListing, MirrorCheckFile, DownloadItem, HomepageApp, ManifestResponse, Notification } from '../types/Apps'
|
||||
import { HTTP_STATUS } from '../constants/http'
|
||||
import KinodeClientApi from "@kinode/client-api"
|
||||
import { WEBSOCKET_URL } from '../utils/ws'
|
||||
@ -13,6 +13,7 @@ interface AppsStore {
|
||||
downloads: Record<string, DownloadItem[]>
|
||||
ourApps: AppListing[]
|
||||
ws: KinodeClientApi
|
||||
notifications: Notification[]
|
||||
homepageApps: HomepageApp[]
|
||||
activeDownloads: Record<string, { downloaded: number, total: number }>
|
||||
|
||||
@ -29,11 +30,15 @@ interface AppsStore {
|
||||
fetchHomepageApps: () => Promise<void>
|
||||
getLaunchUrl: (id: string) => string | null
|
||||
|
||||
addNotification: (notification: Notification) => void;
|
||||
removeNotification: (id: string) => void;
|
||||
clearNotifications: () => void;
|
||||
|
||||
installApp: (id: string, version_hash: string) => Promise<void>
|
||||
uninstallApp: (id: string) => Promise<void>
|
||||
downloadApp: (id: string, version_hash: string, downloadFrom: string) => Promise<void>
|
||||
removeDownload: (packageId: string, versionHash: string) => Promise<void>
|
||||
getCaps: (id: string) => Promise<PackageManifest | null>
|
||||
getManifest: (id: string, version_hash: string) => Promise<ManifestResponse | null>
|
||||
approveCaps: (id: string) => Promise<void>
|
||||
startMirroring: (id: string) => Promise<void>
|
||||
stopMirroring: (id: string) => Promise<void>
|
||||
@ -52,6 +57,7 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
ourApps: [],
|
||||
activeDownloads: {},
|
||||
homepageApps: [],
|
||||
notifications: [],
|
||||
|
||||
|
||||
fetchData: async (id: string) => {
|
||||
@ -282,14 +288,14 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
}
|
||||
},
|
||||
|
||||
getCaps: async (id: string) => {
|
||||
getManifest: async (id: string, version_hash: string) => {
|
||||
try {
|
||||
const res = await fetch(`${BASE_URL}/apps/${id}/caps`);
|
||||
const res = await fetch(`${BASE_URL}/manifest?id=${id}&version_hash=${version_hash}`);
|
||||
if (res.status === HTTP_STATUS.OK) {
|
||||
return await res.json() as PackageManifest;
|
||||
return await res.json() as ManifestResponse;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error getting caps:", error);
|
||||
console.error("Error getting manifest:", error);
|
||||
}
|
||||
return null;
|
||||
},
|
||||
@ -355,6 +361,18 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
}));
|
||||
},
|
||||
|
||||
|
||||
addNotification: (notification) => set(state => ({
|
||||
notifications: [...state.notifications, notification]
|
||||
})),
|
||||
|
||||
removeNotification: (id) => set(state => ({
|
||||
notifications: state.notifications.filter(n => n.id !== id)
|
||||
})),
|
||||
|
||||
clearNotifications: () => set({ notifications: [] }),
|
||||
|
||||
|
||||
clearActiveDownload: (appId) => {
|
||||
set((state) => {
|
||||
const { [appId]: _, ...rest } = state.activeDownloads;
|
||||
@ -374,10 +392,48 @@ const useAppsStore = create<AppsStore>()((set, get) => ({
|
||||
const { package_id, version_hash, downloaded, total } = data.data;
|
||||
const appId = `${package_id.package_name}:${package_id.publisher_node}:${version_hash}`;
|
||||
get().setActiveDownload(appId, downloaded, total);
|
||||
|
||||
const existingNotification = get().notifications.find(
|
||||
n => n.id === `download-${appId}`
|
||||
);
|
||||
|
||||
if (existingNotification) {
|
||||
get().removeNotification(`download-${appId}`);
|
||||
}
|
||||
|
||||
get().addNotification({
|
||||
id: `download-${appId}`,
|
||||
type: 'download',
|
||||
message: `Downloading ${package_id.package_name}`,
|
||||
timestamp: Date.now(),
|
||||
metadata: {
|
||||
packageId: `${package_id.package_name}:${package_id.publisher_node}`,
|
||||
versionHash: version_hash,
|
||||
progress: Math.round((downloaded / total) * 100)
|
||||
}
|
||||
});
|
||||
} else if (data.kind === 'complete') {
|
||||
const { package_id, version_hash } = data.data;
|
||||
const { package_id, version_hash, error } = data.data;
|
||||
const appId = `${package_id.package_name}:${package_id.publisher_node}:${version_hash}`;
|
||||
get().clearActiveDownload(appId);
|
||||
get().removeNotification(`download-${appId}`);
|
||||
|
||||
if (error) {
|
||||
get().addNotification({
|
||||
id: `error-${appId}`,
|
||||
type: 'error',
|
||||
message: `Download failed for ${package_id.package_name}: ${error}`,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
} else {
|
||||
get().addNotification({
|
||||
id: `complete-${appId}`,
|
||||
type: 'success',
|
||||
message: `Download complete: ${package_id.package_name}`,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
}
|
||||
|
||||
get().fetchData(`${package_id.package_name}:${package_id.publisher_node}`);
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
import { ReactNode } from "react";
|
||||
import { IconType } from "react-icons/lib";
|
||||
|
||||
export interface PackageId {
|
||||
package_name: string;
|
||||
publisher_node: string;
|
||||
@ -59,9 +62,10 @@ export interface PackageState {
|
||||
our_version_hash: string;
|
||||
verified: boolean;
|
||||
caps_approved: boolean;
|
||||
pending_update_hash?: string;
|
||||
}
|
||||
|
||||
export interface PackageManifest {
|
||||
export interface PackageManifestEntry {
|
||||
process_name: string
|
||||
process_wasm_path: string
|
||||
on_exit: string
|
||||
@ -71,6 +75,12 @@ export interface PackageManifest {
|
||||
public: boolean
|
||||
}
|
||||
|
||||
export interface ManifestResponse {
|
||||
package_id: PackageId;
|
||||
version_hash: string;
|
||||
manifest: string;
|
||||
}
|
||||
|
||||
export interface HomepageApp {
|
||||
id: string;
|
||||
process: string;
|
||||
@ -83,3 +93,35 @@ export interface HomepageApp {
|
||||
order: number;
|
||||
favorite: boolean;
|
||||
}
|
||||
|
||||
|
||||
export type NotificationActionType = 'click' | 'modal' | 'popup' | 'redirect';
|
||||
|
||||
export type NotificationAction = {
|
||||
label: string;
|
||||
icon?: IconType;
|
||||
variant?: 'primary' | 'secondary' | 'danger';
|
||||
action: {
|
||||
type: NotificationActionType;
|
||||
onClick?: () => void;
|
||||
modalContent?: ReactNode | (() => ReactNode);
|
||||
popupContent?: ReactNode | (() => ReactNode);
|
||||
path?: string;
|
||||
};
|
||||
};
|
||||
|
||||
export type Notification = {
|
||||
id: string;
|
||||
type: 'error' | 'success' | 'warning' | 'info' | 'download' | 'install' | 'update';
|
||||
message: string;
|
||||
timestamp: number;
|
||||
metadata?: {
|
||||
packageId?: string;
|
||||
versionHash?: string;
|
||||
progress?: number;
|
||||
error?: string;
|
||||
};
|
||||
actions?: NotificationAction[];
|
||||
renderContent?: (notification: Notification) => ReactNode;
|
||||
persistent?: boolean;
|
||||
};
|
||||
@ -3,7 +3,7 @@ const BASE_URL = "/main:app_store:sys/";
|
||||
|
||||
if (window.our) window.our.process = BASE_URL?.replace("/", "");
|
||||
|
||||
export const PROXY_TARGET = `${(import.meta.env.VITE_NODE_URL || `http://localhost:8080`)}${BASE_URL}`;
|
||||
export const PROXY_TARGET = `${(import.meta.env.VITE_NODE_URL || `http://localhost:8080`).replace(/\/+$/, '')}${BASE_URL}`;
|
||||
|
||||
// This env also has BASE_URL which should match the process + package name
|
||||
export const WEBSOCKET_URL = import.meta.env.DEV
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import { defineConfig, ViteDevServer } from 'vite'
|
||||
import { nodePolyfills } from 'vite-plugin-node-polyfills'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
@ -17,10 +17,15 @@ The format is "/" + "process_name:package_name:publisher_node"
|
||||
const BASE_URL = `/main:app_store:sys`;
|
||||
|
||||
// This is the proxy URL, it must match the node you are developing against
|
||||
const PROXY_URL = (process.env.VITE_NODE_URL || 'http://127.0.0.1:8080');
|
||||
const PROXY_URL = (process.env.VITE_NODE_URL || 'http://localhost:8080').replace(/\/$/, '');
|
||||
|
||||
const DEV_SERVER_PORT = 3000; // Hardcoded port for the dev server...
|
||||
|
||||
console.log('process.env.VITE_NODE_URL', process.env.VITE_NODE_URL, PROXY_URL);
|
||||
|
||||
const openUrl = `${PROXY_URL.replace(/:\d+$/, '')}:${DEV_SERVER_PORT}${BASE_URL}`;
|
||||
console.log('Server will run at:', openUrl);
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
nodePolyfills({
|
||||
@ -37,7 +42,8 @@ export default defineConfig({
|
||||
}
|
||||
},
|
||||
server: {
|
||||
open: true,
|
||||
open: openUrl,
|
||||
port: DEV_SERVER_PORT,
|
||||
proxy: {
|
||||
[`^${BASE_URL}/our.js`]: {
|
||||
target: PROXY_URL,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
use kinode_process_lib::{call_init, http, timer, Address, Request};
|
||||
use kinode_process_lib::{call_init, http, println, timer, Address, Request};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
wit_bindgen::generate!({
|
||||
|
||||
@ -343,7 +343,8 @@ async fn handle_request(
|
||||
|
||||
// current prepend to filepaths needs to be: /package_id/drive/path
|
||||
let (package_id, drive, rest) = parse_package_and_drive(&request.path, &vfs_path)?;
|
||||
let drive = format!("{package_id}/{drive}");
|
||||
// must have prepended `/` here or else it messes up caps downstream, e.g. in run-tests
|
||||
let drive = format!("/{package_id}/{drive}");
|
||||
let action = request.action;
|
||||
let path = PathBuf::from(&request.path);
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "lib"
|
||||
authors = ["KinodeDAO"]
|
||||
version = "0.9.8"
|
||||
version = "0.9.9"
|
||||
edition = "2021"
|
||||
description = "A general-purpose sovereign cloud computing platform"
|
||||
homepage = "https://kinode.org"
|
||||
|
||||
@ -60,7 +60,7 @@ def build_and_move(feature, tmp_dir, architecture, os_name):
|
||||
source_path = f"target/release/{binary_name}"
|
||||
dest_path = os.path.join(tmp_dir, binary_name)
|
||||
shutil.move(source_path, dest_path)
|
||||
os.chmod(dest_path, 0o775)
|
||||
os.chmod(dest_path, 0o744)
|
||||
|
||||
# Create a zip archive of the binary
|
||||
zip_path = os.path.join(tmp_dir, zip_name)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user