Skip to content

Commit 6c9ef54

Browse files
dependabot[bot]sanityclaude
authored
chore(deps): bump axum from 0.7.9 to 0.8.6 (#1969)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ian Clarke <ian@freenetproject.org> Co-authored-by: Claude <noreply@anthropic.com>
1 parent 92f265c commit 6c9ef54

File tree

6 files changed

+104
-55
lines changed

6 files changed

+104
-55
lines changed

Cargo.lock

Lines changed: 70 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ members = [
1111

1212
[workspace.dependencies]
1313
arrayvec = { version = "0.7", features = ["serde"] }
14-
axum = { version = "0.7", default-features = false }
14+
axum = { version = "0.8", default-features = false }
1515
blake3 = { version = "1", features = ["std", "traits-preview"] }
1616
bs58 = "0.5"
1717
chacha20poly1305 = "0.10"

crates/core/src/client_events/websocket.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ async fn websocket_interface(
434434
},
435435
EncodingProtocol::Native => bincode::serialize(&response)?,
436436
};
437-
server_sink.send(Message::Binary(serialized_res)).await.inspect_err(|err| {
437+
server_sink.send(Message::Binary(serialized_res.into())).await.inspect_err(|err| {
438438
tracing::debug!(err = %err, "error sending message to client");
439439
})?;
440440
}
@@ -476,8 +476,8 @@ async fn process_client_request(
476476
encoding_protoc: EncodingProtocol,
477477
) -> Result<Option<Message>, Option<anyhow::Error>> {
478478
let msg = match msg {
479-
Ok(Message::Binary(data)) => data,
480-
Ok(Message::Text(data)) => data.into_bytes(),
479+
Ok(Message::Binary(data)) => data.to_vec(),
480+
Ok(Message::Text(data)) => data.as_bytes().to_vec(),
481481
Ok(Message::Close(_)) => return Err(None),
482482
Ok(Message::Ping(ping)) => return Ok(Some(Message::Pong(ping))),
483483
Ok(m) => {
@@ -492,7 +492,7 @@ async fn process_client_request(
492492
match encoding_protoc {
493493
EncodingProtocol::Flatbuffers => match ClientRequest::try_decode_fbs(&msg) {
494494
Ok(decoded) => decoded.into_owned(),
495-
Err(err) => return Ok(Some(Message::Binary(err.into_fbs_bytes()))),
495+
Err(err) => return Ok(Some(Message::Binary(err.into_fbs_bytes().into()))),
496496
},
497497
EncodingProtocol::Native => match bincode::deserialize::<ClientRequest>(&msg) {
498498
Ok(decoded) => decoded.into_owned(),
@@ -504,7 +504,7 @@ async fn process_client_request(
504504
.into(),
505505
))
506506
.map_err(|err| Some(err.into()))?;
507-
return Ok(Some(Message::Binary(result_error)));
507+
return Ok(Some(Message::Binary(result_error.into())));
508508
}
509509
},
510510
}
@@ -624,7 +624,7 @@ async fn process_host_response(
624624
);
625625
}
626626

627-
let send_result = tx.send(Message::Binary(serialized_res)).await;
627+
let send_result = tx.send(Message::Binary(serialized_res.into())).await;
628628

629629
// Log WebSocket send result for UPDATE responses
630630
if let Some(key) = is_update_response {
@@ -662,7 +662,7 @@ async fn process_host_response(
662662
let result_error = bincode::serialize(&Err::<HostResponse, ClientError>(
663663
ErrorKind::NodeUnavailable.into(),
664664
))?;
665-
tx.send(Message::Binary(result_error)).await?;
665+
tx.send(Message::Binary(result_error.into())).await?;
666666
tx.send(Message::Close(None)).await?;
667667
tracing::warn!("node shut down while handling responses for {client_id}");
668668
Err(anyhow::anyhow!(

crates/core/src/server/http_gateway/v1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ impl HttpGateway {
2020

2121
let router = Router::new()
2222
.route("/v1", get(home))
23-
.route("/v1/contract/web/:key/", get(web_home))
23+
.route("/v1/contract/web/{key}/", get(web_home))
2424
.with_state(config)
25-
.route("/v1/contract/web/:key/*path", get(web_subpages))
25+
.route("/v1/contract/web/{key}/{*path}", get(web_subpages))
2626
.layer(Extension(attested_contracts.clone()))
2727
.layer(Extension(HttpGatewayRequest(proxy_request_sender)));
2828

0 commit comments

Comments
 (0)