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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "flow-engine"
version = "0.1.0"
edition = "2024"
rust-version = "1.85"
rust-version = "1.95"
description = "Node-RED-style visual flow editor + runtime in Rust (axum + SQLite + Svelte/xyflow). Single binary."

[dependencies]
Expand Down
8 changes: 4 additions & 4 deletions src/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ pub async fn logout(State(st): State<AppState>, req: Request) -> Response {

/// Extract the token from the Authorization header or the `?token=` query.
fn extract_token(req: &Request) -> Option<String> {
if let Some(value) = req.headers().get(header::AUTHORIZATION) {
if let Some(token) = value.to_str().ok().and_then(|s| s.strip_prefix("Bearer ")) {
return Some(token.to_string());
}
if let Some(value) = req.headers().get(header::AUTHORIZATION)
&& let Some(token) = value.to_str().ok().and_then(|s| s.strip_prefix("Bearer "))
{
return Some(token.to_string());
}
req.uri().query().and_then(|q| {
q.split('&')
Expand Down
10 changes: 5 additions & 5 deletions src/runtime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ fn merge_broker(
.filter(|id| !id.is_empty())
.and_then(|id| configs.get(id));
let mut merged = node_cfg.clone();
if let (Some(broker), Some(obj)) = (broker, merged.as_object_mut()) {
if let Some(fields) = broker.as_object() {
for (k, v) in fields {
obj.insert(k.clone(), v.clone());
}
if let (Some(broker), Some(obj)) = (broker, merged.as_object_mut())
&& let Some(fields) = broker.as_object()
{
for (k, v) in fields {
obj.insert(k.clone(), v.clone());
}
}
merged
Expand Down
8 changes: 4 additions & 4 deletions src/runtime/nodes/range.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ impl RangeNode {
let Some(v) = msgprop::get(msg, &self.property).and_then(|v| v.as_f64()) else {
return;
};
if let Some(mapped) = self.map(v) {
if let Some(n) = serde_json::Number::from_f64(mapped) {
msgprop::set(msg, &self.property, json!(n));
}
if let Some(mapped) = self.map(v)
&& let Some(n) = serde_json::Number::from_f64(mapped)
{
msgprop::set(msg, &self.property, json!(n));
}
}
}
Expand Down