Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kinode/packages/app_store/app_store/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ fn init(our: Address) {
loop {
match await_message() {
Err(send_error) => {
// TODO handle these based on what they are triggered by
println!("got network error: {send_error}");
// for now, these are timer callbacks to already finished ft_workers.
print_to_terminal(1, &format!("got network error: {send_error}"));
}
Ok(message) => {
if let Err(e) = handle_message(&our, &mut state, &mut http_server, &message) {
Expand Down
51 changes: 17 additions & 34 deletions kinode/packages/app_store/download/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::kinode::process::downloads::{DownloadRequests, DownloadResponses};
use crate::kinode::process::downloads::DownloadRequests;
use kinode::process::downloads::LocalDownloadRequest;
use kinode_process_lib::{
await_next_message_body, call_init, println, Address, Message, PackageId, Request,
await_next_message_body, call_init, println, Address, PackageId, Request,
};

wit_bindgen::generate!({
Expand Down Expand Up @@ -37,40 +37,23 @@ fn init(our: Address) {

let version_hash: String = arg3.to_string();

let Ok(Ok(Message::Response { body, .. })) =
Request::to((our.node(), ("downloads", "app_store", "sys")))
.body(
serde_json::to_vec(&DownloadRequests::LocalDownload(LocalDownloadRequest {
package_id: crate::kinode::process::main::PackageId {
package_name: package_id.package_name.clone(),
publisher_node: package_id.publisher_node.clone(),
},
download_from: download_from.clone(),
desired_version_hash: version_hash.clone(),
}))
.expect("Failed to serialize LocalDownloadRequest"),
)
.send_and_await_response(10)
let Ok(_) = Request::to((our.node(), ("downloads", "app_store", "sys")))
.body(
serde_json::to_vec(&DownloadRequests::LocalDownload(LocalDownloadRequest {
package_id: crate::kinode::process::main::PackageId {
package_name: package_id.package_name.clone(),
publisher_node: package_id.publisher_node.clone(),
},
download_from: download_from.clone(),
desired_version_hash: version_hash.clone(),
}))
.expect("Failed to serialize LocalDownloadRequest"),
)
.send()
else {
println!("download: failed to get a response from app_store..!");
println!("download: failed to send request to downloads:app_store!");
return;
};

let Ok(response) = serde_json::from_slice::<DownloadResponses>(&body) else {
println!("download: failed to parse response from app_store..!");
return;
};

match response {
DownloadResponses::Error(_e) => {
println!("download: error");
}
DownloadResponses::Success => {
println!("download: success");
}
_ => {
println!("download: unexpected response from app_store..!");
return;
}
}
println!("download: request sent, started download from {download_from}");
}
6 changes: 4 additions & 2 deletions kinode/packages/app_store/ft_worker/src/ft_worker_lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ pub fn spawn_send_transfer(
to_addr: &Address,
) -> anyhow::Result<()> {
let transfer_id: u64 = rand::random();
let timer_id = ProcessId::new(Some("timer"), "distro", "sys");
let Ok(worker_process_id) = spawn(
Some(&transfer_id.to_string()),
&format!("{}/pkg/ft_worker.wasm", our.package_id()),
OnExit::None,
our_capabilities(),
vec![],
vec![timer_id],
false,
) else {
return Err(anyhow::anyhow!("failed to spawn ft_worker!"));
Expand Down Expand Up @@ -48,12 +49,13 @@ pub fn spawn_receive_transfer(
timeout: u64,
) -> anyhow::Result<Address> {
let transfer_id: u64 = rand::random();
let timer_id = ProcessId::new(Some("timer"), "distro", "sys");
let Ok(worker_process_id) = spawn(
Some(&transfer_id.to_string()),
&format!("{}/pkg/ft_worker.wasm", our.package_id()),
OnExit::None,
our_capabilities(),
vec![],
vec![timer_id],
false,
) else {
return Err(anyhow::anyhow!("failed to spawn ft_worker!"));
Expand Down
4 changes: 3 additions & 1 deletion kinode/packages/app_store/pkg/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"http_server:distro:sys",
"main:app_store:sys",
"chain:app_store:sys",
"terminal:terminal:sys",
"vfs:distro:sys",
{
"process": "vfs:distro:sys",
Expand All @@ -20,6 +21,7 @@
"grant_capabilities": [
"http_server:distro:sys",
"vfs:distro:sys",
"terminal:terminal:sys",
"http_client:distro:sys"
],
"public": false
Expand Down Expand Up @@ -99,4 +101,4 @@
],
"public": false
}
]
]
6 changes: 4 additions & 2 deletions kinode/packages/app_store/pkg/scripts.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
"public": false,
"request_networking": false,
"request_capabilities": [
"main:app_store:sys"
"main:app_store:sys",
"downloads:app_store:sys"
],
"grant_capabilities": [
"main:app_store:sys"
"main:app_store:sys",
"downloads:app_store:sys"
],
"wit_version": 0
},
Expand Down
Loading