Skip to content

Fix: local message incoming from rpc #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 8, 2025
Merged

Fix: local message incoming from rpc #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b6cd15
wip
jurij-jukic Oct 2, 2025
9285a7a
wip
jurij-jukic Oct 2, 2025
8c3d647
works
jurij-jukic Oct 2, 2025
998b79f
cleanup
jurij-jukic Oct 2, 2025
858b9d8
handlers finally correct
jurij-jukic Oct 2, 2025
e2ce565
reset logging level to info
jurij-jukic Oct 2, 2025
c18867a
pass http server req and blob
jurij-jukic Oct 6, 2025
7d75e54
add to error message
jurij-jukic Oct 6, 2025
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 18 additions & 27 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,7 +1881,8 @@ fn generate_local_message_handler(
Source: {:?}\n\
Body: {}\n\
\n\
💡 This usually means the message format doesn't match any of your #[local] or #[remote] handlers.",
💡 This usually means the message format doesn't match any of your #[local] or #[remote] handlers.\n\
💡 If you are sending an HTTP message, if it is malformed, it might have ended up in the local message handler.",
e, message.source(), raw_body
);
}
Expand Down Expand Up @@ -1955,35 +1956,21 @@ fn generate_message_handlers(
#websocket_client_handler
}
/// Handle messages from the HTTP server
fn handle_http_server_message(state: *mut #self_ty, message: hyperware_process_lib::Message) {
let blob_opt = message.blob();

match serde_json::from_slice::<hyperware_process_lib::http::server::HttpServerRequest>(message.body()) {
Ok(http_server_request) => {
match http_server_request {
hyperware_process_lib::http::server::HttpServerRequest::Http(http_request) => {
hyperware_process_lib::logging::debug!("Processing HTTP request, message has blob: {}", blob_opt.is_some());
if let Some(ref blob) = blob_opt {
hyperware_process_lib::logging::debug!("Blob size: {} bytes, content: {}", blob.bytes.len(), String::from_utf8_lossy(&blob.bytes[..std::cmp::min(200, blob.bytes.len())]));
}

#http_context_setup
#http_request_parsing
#http_dispatcher
},
#websocket_handlers
fn handle_http_server_message(state: *mut #self_ty, http_server_request: hyperware_process_lib::http::server::HttpServerRequest, blob_opt: Option<hyperware_process_lib::LazyLoadBlob>) {
match http_server_request {
hyperware_process_lib::http::server::HttpServerRequest::Http(http_request) => {
hyperware_process_lib::logging::debug!("Processing HTTP request, message has blob: {}", blob_opt.is_some());
if let Some(ref blob) = blob_opt {
hyperware_process_lib::logging::debug!("Blob size: {} bytes, content: {}", blob.bytes.len(), String::from_utf8_lossy(&blob.bytes[..std::cmp::min(200, blob.bytes.len())]));
}
#http_context_setup
#http_request_parsing
#http_dispatcher
},
Err(e) => {
hyperware_process_lib::logging::error!(
"Failed to parse HTTP server request: {}\n\
This usually indicates a malformed message to the HTTP server.",
e
);
}
#websocket_handlers
}
}

#local_message_handler
#remote_message_handler
#eth_message_handler
Expand Down Expand Up @@ -2197,7 +2184,11 @@ fn generate_component_impl(
}
hyperware_process_lib::Message::Request { .. } => {
if message.is_local() && message.source().process == "http-server:distro:sys" {
handle_http_server_message(&mut state, message);
if let Ok(http_server_request) = serde_json::from_slice::<hyperware_process_lib::http::server::HttpServerRequest>(message.body()) {
handle_http_server_message(&mut state, http_server_request, message.blob());
} else {
handle_local_message(&mut state, message);
}
} else if message.is_local() && message.source().process == "http-client:distro:sys" {
handle_websocket_client_message(&mut state, message);
} else if message.is_local() && message.source().process == "eth:distro:sys" {
Expand Down