smol refactor & fixes

Author: dr-frmr

.github/workflows/publish.yml

@@ -44,7 +44,7 @@
 #       #    published.
 #       #
 #       # We *could* pass through `--no-verify` so `cargo` doesn't build the crate before publishing,
-#       # which is reasonable, since this job only runs after the Linux, Windows, and WASM builds
+#       # which is reasonable, since this job only runs after the Linux, Windows, and Wasm builds
 #       # have passed.
 #       - name: "cargo release publish"
 #         run: |-

src/homepage.rs

@@ -0,0 +1,16 @@
+pub fn add_to_homepage(label: &str, icon: Option<&str>, path: Option<&str>, widget: Option<&str>) {
+    crate::Request::to(("our", "homepage", "homepage", "sys"))
+        .body(
+            serde_json::json!({
+                "Add": {
+                    "label": label,
+                    "icon": icon,
+                    "path": path,
+                    "widget": widget
+                }
+            })
+            .to_string(),
+        )
+        .send()
+        .unwrap();
+}

src/http.rs

@@ -15,7 +15,7 @@ use thiserror::Error;
 // these types are a copy of the types used in http module of runtime.
 //
 
-/// HTTP Request type that can be shared over WASM boundary to apps.
+/// HTTP Request type that can be shared over Wasm boundary to apps.
 /// This is the one you receive from the `http_server:distro:sys` service.
 #[derive(Debug, Serialize, Deserialize)]
 pub enum HttpServerRequest {
@@ -51,7 +51,7 @@ pub struct IncomingHttpRequest {
     // BODY is stored in the lazy_load_blob, as bytes
 }
 
-/// HTTP Response type that can be shared over WASM boundary to apps.
+/// HTTP Response type that can be shared over Wasm boundary to apps.
 /// Respond to [`IncomingHttpRequest`] with this type.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct HttpResponse {
@@ -287,7 +287,7 @@ impl IncomingHttpRequest {
     }
 }
 
-/// Request type that can be shared over WASM boundary to apps.
+/// Request type that can be shared over Wasm boundary to apps.
 /// This is the one you send to the `http_client:distro:sys` service.
 #[derive(Debug, Serialize, Deserialize)]
 pub enum HttpClientAction {
@@ -306,7 +306,7 @@ pub enum HttpClientAction {
     },
 }
 
-/// HTTP Request type that can be shared over WASM boundary to apps.
+/// HTTP Request type that can be shared over Wasm boundary to apps.
 /// This is the one you send to the `http_client:distro:sys` service.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct OutgoingHttpRequest {
@@ -318,7 +318,7 @@ pub struct OutgoingHttpRequest {
     // TIMEOUT is stored in the message expect_response
 }
 
-/// WebSocket Client Request type that can be shared over WASM boundary to apps.
+/// WebSocket Client Request type that can be shared over Wasm boundary to apps.
 /// This comes from an open websocket client connection in the `http_client:distro:sys` service.
 #[derive(Debug, Serialize, Deserialize)]
 pub enum HttpClientRequest {
@@ -331,7 +331,7 @@ pub enum HttpClientRequest {
     },
 }
 
-/// HTTP Client Response type that can be shared over WASM boundary to apps.
+/// HTTP Client Response type that can be shared over Wasm boundary to apps.
 /// This is the one you receive from the `http_client:distro:sys` service.
 #[derive(Debug, Serialize, Deserialize)]
 pub enum HttpClientResponse {

src/lib.rs

@@ -1,4 +1,4 @@
-//! kinode process standard library for Rust compiled to WASM
+//! Kinode process standard library for Rust compiled to Wasm
 //! Must be used in context of bindings generated by `kinode.wit`.
 //!
 //! This library provides a set of functions for interacting with the kinode
@@ -24,6 +24,11 @@ wit_bindgen::generate!({
 
 /// Interact with the eth provider module.
 pub mod eth;
+/// Interact with the system homepage.
+///
+/// Note that your process must have the capability to message
+/// `homepage:homepage:sys` to use this module.
+pub mod homepage;
 /// Interact with the HTTP server and client modules.
 /// Contains types from the `http` crate to use as well.
 pub mod http;
@@ -43,27 +48,19 @@ pub mod timer;
 /// Interact with the virtual filesystem
 pub mod vfs;
 
-// Types
-
-mod package_id;
-pub use package_id::PackageId;
-mod process_id;
-pub use process_id::{ProcessId, ProcessIdParseError};
-mod address;
-pub use address::{Address, AddressParseError};
-mod request;
-pub use request::Request;
-mod response;
-pub use response::Response;
-mod message;
-use message::wit_message_to_message;
-pub use message::{Message, SendError, SendErrorKind};
-mod on_exit;
-pub use on_exit::OnExit;
-mod capability;
-pub use capability::Capability;
-mod lazy_load_blob;
-pub use lazy_load_blob::LazyLoadBlob;
+mod types;
+pub use types::{
+    address::{Address, AddressParseError},
+    capability::Capability,
+    lazy_load_blob::LazyLoadBlob,
+    message::wit_message_to_message,
+    message::{Message, SendError, SendErrorKind},
+    on_exit::OnExit,
+    package_id::PackageId,
+    process_id::{ProcessId, ProcessIdParseError},
+    request::Request,
+    response::Response,
+};
 
 /// Implement the wit-bindgen specific code that the kernel uses to hook into
 /// a process. Write an `init(our: Address)` function and call it with this.
@@ -221,7 +218,7 @@ pub fn get_capability(our: &Address, params: &str) -> Option<Capability> {
         .cloned()
 }
 
-/// get the next message body from the message queue, or propagate the error
+/// Get the next message body from the message queue, or propagate the error
 pub fn await_next_message_body() -> Result<Vec<u8>, SendError> {
     match await_message() {
         Ok(msg) => Ok(msg.body().to_vec()),

src/address.rs src/types/address.rssrc/address.rs renamed to src/types/address.rs

@@ -25,12 +25,6 @@ pub enum Message {
 }
 
 impl Message {
-    pub fn is_request(&self) -> bool {
-        match self {
-            Message::Request { .. } => true,
-            Message::Response { .. } => false,
-        }
-    }
     /// Get the source of a message.
     pub fn source(&self) -> &Address {
         match self {
@@ -63,14 +57,37 @@ impl Message {
     pub fn blob(&self) -> Option<LazyLoadBlob> {
         crate::get_blob()
     }
-
     /// Get the capabilities of a message.
     pub fn capabilities(&self) -> &Vec<Capability> {
         match self {
             Message::Request { capabilities, .. } => capabilities,
             Message::Response { capabilities, .. } => capabilities,
         }
     }
+    /// Check if a message is a request. Returns `false` if it's a response.
+    pub fn is_request(&self) -> bool {
+        match self {
+            Message::Request { .. } => true,
+            Message::Response { .. } => false,
+        }
+    }
+    /// Check if a message was sent by a local process. Returns `false` if the
+    /// source node is not our local node.
+    pub fn is_local(&self, our: &Address) -> bool {
+        match self {
+            Message::Request { source, .. } => source == our,
+            Message::Response { source, .. } => source == our,
+        }
+    }
+    pub fn is_process<T>(&self, process: T) -> bool
+    where
+        ProcessId: PartialEq<T>,
+    {
+        match self {
+            Message::Request { source, .. } => source.process == process,
+            Message::Response { source, .. } => source.process == process,
+        }
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/capability.rs src/types/capability.rssrc/capability.rs renamed to src/types/capability.rs

@@ -0,0 +1,9 @@
+pub mod address;
+pub mod capability;
+pub mod lazy_load_blob;
+pub mod message;
+pub mod on_exit;
+pub mod package_id;
+pub mod process_id;
+pub mod request;
+pub mod response;