From 0837f6be19d5cfd24f5aef07e16d169d8d1bfe7a Mon Sep 17 00:00:00 2001 From: Drew Tada Date: Sat, 3 Feb 2024 21:43:35 -0500 Subject: [PATCH 1/2] scripts.json uses snake_case --- Cargo.lock | 18 ++++++++++- kinode/packages/app_store/install/src/lib.rs | 2 +- kinode/packages/app_store/pkg/scripts.json | 18 +++++------ .../packages/app_store/uninstall/src/lib.rs | 2 +- kinode/packages/terminal/pkg/scripts.json | 32 +++++++++---------- 5 files changed, 44 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c3e0eec..0d3c6b18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3309,6 +3309,22 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "kinode_process_lib" +version = "0.5.8" +dependencies = [ + "anyhow", + "bincode", + "http 1.0.0", + "mime_guess", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror", + "url", + "wit-bindgen", +] + [[package]] name = "kit" version = "0.1.0" @@ -5630,7 +5646,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.5.7", + "kinode_process_lib 0.5.8", "rand 0.8.5", "regex", "serde", diff --git a/kinode/packages/app_store/install/src/lib.rs b/kinode/packages/app_store/install/src/lib.rs index af4732f9..bc0c478e 100644 --- a/kinode/packages/app_store/install/src/lib.rs +++ b/kinode/packages/app_store/install/src/lib.rs @@ -1,5 +1,5 @@ use kinode_process_lib::{ - await_next_request_body, call_init, println, Address, Message, NodeId, PackageId, Request, + await_next_request_body, call_init, println, Address, Message, PackageId, Request, }; use serde::{Deserialize, Serialize}; diff --git a/kinode/packages/app_store/pkg/scripts.json b/kinode/packages/app_store/pkg/scripts.json index 6ec7b9a9..cafe060f 100644 --- a/kinode/packages/app_store/pkg/scripts.json +++ b/kinode/packages/app_store/pkg/scripts.json @@ -2,33 +2,33 @@ "download.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [ + "request_networking": false, + "request_capabilities": [ "main:app_store:sys" ], - "grantCapabilities": [ + "grant_capabilities": [ "main:app_store:sys" ] }, "install.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [ + "request_networking": false, + "request_capabilities": [ "main:app_store:sys" ], - "grantCapabilities": [ + "grant_capabilities": [ "main:app_store:sys" ] }, "uninstall.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [ + "request_networking": false, + "request_capabilities": [ "main:app_store:sys" ], - "grantCapabilities": [ + "grant_capabilities": [ "main:app_store:sys" ] } diff --git a/kinode/packages/app_store/uninstall/src/lib.rs b/kinode/packages/app_store/uninstall/src/lib.rs index 97a348c5..7ff233bc 100644 --- a/kinode/packages/app_store/uninstall/src/lib.rs +++ b/kinode/packages/app_store/uninstall/src/lib.rs @@ -1,5 +1,5 @@ use kinode_process_lib::{ - await_next_request_body, call_init, println, Address, Message, NodeId, PackageId, Request, + await_next_request_body, call_init, println, Address, Message, PackageId, Request, }; use serde::{Deserialize, Serialize}; diff --git a/kinode/packages/terminal/pkg/scripts.json b/kinode/packages/terminal/pkg/scripts.json index 7d6f9291..77f18429 100644 --- a/kinode/packages/terminal/pkg/scripts.json +++ b/kinode/packages/terminal/pkg/scripts.json @@ -2,24 +2,24 @@ "alias.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [ + "request_networking": false, + "request_capabilities": [ "terminal:terminal:sys" ], - "grantCapabilities": [] + "grant_capabilities": [] }, "echo.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [], - "grantCapabilities": [] + "request_networking": false, + "request_capabilities": [], + "grant_capabilities": [] }, "cat.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [ + "request_networking": false, + "request_capabilities": [ "vfs:distro:sys", { "process": "vfs:distro:sys", @@ -28,31 +28,31 @@ } } ], - "grantCapabilities": [] + "grant_capabilities": [] }, "hi.wasm": { "root": false, "public": false, - "requestNetworking": true, - "requestCapabilities": [ + "request_networking": true, + "request_capabilities": [ "net:distro:sys" ], - "grantCapabilities": [ + "grant_capabilities": [ "net:distro:sys" ] }, "top.wasm": { "root": false, "public": false, - "requestNetworking": false, - "requestCapabilities": [ + "request_networking": false, + "request_capabilities": [ "kernel:distro:sys" ], - "grantCapabilities": [] + "grant_capabilities": [] }, "m.wasm": { "root": true, "public": false, - "requestNetworking": true + "request_networking": true } } \ No newline at end of file From 140f6f5b271eeace804fae869cec0d1ccdf65eeb Mon Sep 17 00:00:00 2001 From: Drew Tada Date: Mon, 5 Feb 2024 10:01:38 -0500 Subject: [PATCH 2/2] 0.5.9 --- Cargo.lock | 1 + kinode/packages/terminal/terminal/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0d3c6b18..462b94c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3312,6 +3312,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.5.8" +source = "git+https://github.com/uqbar-dao/process_lib.git?tag=v0.5.9-alpha#09d411dfab23f9049fbbcbef1c56157191269ab2" dependencies = [ "anyhow", "bincode", diff --git a/kinode/packages/terminal/terminal/Cargo.toml b/kinode/packages/terminal/terminal/Cargo.toml index 102fb604..c036ab50 100644 --- a/kinode/packages/terminal/terminal/Cargo.toml +++ b/kinode/packages/terminal/terminal/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/uqbar-dao/process_lib.git", tag = "v0.5.8-alpha" } +kinode_process_lib = { git = "https://github.com/uqbar-dao/process_lib.git", tag = "v0.5.9-alpha" } rand = "0.8" regex = "1.10.3" serde = { version = "1.0", features = ["derive"] }