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
702 changes: 547 additions & 155 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_yaml = "0.9"
evalexpr = "11"
cron = "0.12"
cron = "0.16"
# Observability
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
Expand All @@ -71,15 +71,15 @@ uuid = { version = "1", features = ["v4", "serde"] }
chrono = { version = "0.4", features = ["serde"] }

# HTTP client (webhook delivery, Typesense indexing)
reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false }
reqwest = { version = "0.13", features = ["json", "rustls"], default-features = false }

# Cryptography
sha2 = "0.10"
sha2 = "0.11"
hex = "0.4"
hmac = "0.12"
hmac = "0.13"

# Randomness
rand = "0.8"
rand = "0.10"

# Concurrent data structures
dashmap = "6"
Expand All @@ -93,7 +93,7 @@ jsonwebtoken = "9"
futures-util = "0.3"

# WebSocket client (test client)
tokio-tungstenite = { version = "0.26", features = ["rustls-tls-webpki-roots"] }
tokio-tungstenite = { version = "0.29", features = ["rustls-tls-webpki-roots"] }
url = "2"

# MCP SDK
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ── Build stage ──────────────────────────────────────────────
# Hard-code --platform to prevent exec format error on ARM Macs.
FROM --platform=linux/amd64 rust:1.88-bookworm AS builder
FROM --platform=linux/amd64 rust:1.93-bookworm AS builder
WORKDIR /build
COPY . .
RUN cargo build --release -p sprout-relay \
Expand Down
2 changes: 1 addition & 1 deletion crates/sprout-acp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ anyhow = { workspace = true }
clap = { version = "4", features = ["derive", "env"] }

# Config file
toml = "0.8"
toml = "0.9"

# Filter expressions
evalexpr = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions crates/sprout-auth/src/nip42.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ const TIMESTAMP_TOLERANCE_SECS: u64 = 60;

/// Generate a random NIP-42 challenge (32 CSPRNG bytes, hex-encoded).
pub fn generate_challenge() -> String {
use rand::Rng;
let bytes: [u8; 32] = rand::thread_rng().gen();
let bytes: [u8; 32] = rand::random();
hex::encode(bytes)
}

Expand Down
3 changes: 1 addition & 2 deletions crates/sprout-auth/src/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ const TOKEN_PREFIX: &str = "sprout_";

/// Generate a new random API token (CSPRNG, 32 bytes, hex-encoded with prefix).
pub fn generate_token() -> String {
use rand::Rng;
let bytes: [u8; 32] = rand::thread_rng().gen();
let bytes: [u8; 32] = rand::random();
format!("{}{}", TOKEN_PREFIX, hex::encode(bytes))
}

Expand Down
2 changes: 1 addition & 1 deletion crates/sprout-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ sprout-sdk = { workspace = true }
base64 = "0.22"

# SHA-256 — NIP-98 payload hash tag
sha2 = "0.10"
sha2 = "0.11"
4 changes: 2 additions & 2 deletions crates/sprout-huddle/src/webhook.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use hmac::{Hmac, Mac};
use hmac::{Hmac, KeyInit, Mac};
use serde::{Deserialize, Serialize};
use sha2::Sha256;

Expand Down Expand Up @@ -155,7 +155,7 @@ pub fn parse_webhook(
#[cfg(test)]
mod tests {
use super::*;
use hmac::{Hmac, Mac};
use hmac::{Hmac, KeyInit, Mac};
use sha2::Sha256;

fn make_sig(body: &[u8], secret: &str) -> String {
Expand Down
4 changes: 2 additions & 2 deletions crates/sprout-media/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ hex = { workspace = true }
chrono = { workspace = true }
axum = { workspace = true }
s3 = { version = "0.37", package = "rust-s3", default-features = false, features = ["tokio-rustls-tls", "fail-on-err", "tags"] }
infer = "0.16"
infer = "0.19"
image = { version = "0.25", default-features = false, features = ["jpeg", "png", "gif", "webp"] }
blurhash = "0.2"
imagesize = "0.13"
imagesize = "0.14"
bytes = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/sprout-proxy/src/shadow_keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
use std::sync::atomic::{AtomicUsize, Ordering};

use dashmap::DashMap;
use hmac::{Hmac, Mac};
use hmac::{Hmac, KeyInit, Mac};
use nostr::util::hex;
use nostr::{Keys, SecretKey};
use sha2::Sha256;
Expand Down
2 changes: 1 addition & 1 deletion crates/sprout-relay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ base64 = "0.22"
sprout-workflow = { workspace = true, features = ["reqwest"] }
sprout-media = { workspace = true }
bytes = "1"
infer = "0.16"
infer = "0.19"
serde_yaml = { workspace = true }
sha2 = { workspace = true }
hex = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/sprout-workflow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ serde_json = { workspace = true }
serde_yaml = { workspace = true }
dashmap = { workspace = true }
evalexpr = "11"
cron = "0.12"
cron = "0.16"
uuid = { workspace = true }
chrono = { workspace = true }
tokio = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"version": "0.1.0",
"type": "module",
"packageManager": "pnpm@10.12.1",
"packageManager": "pnpm@10.33.0",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
Expand Down Expand Up @@ -72,7 +72,7 @@
"postcss": "^8.5.8",
"tailwindcss": "^3.4.17",
"tailwindcss-animate": "^1.0.7",
"typescript": "~5.8.3",
"typescript": "~5.9.0",
"vite": "^7.0.4"
}
}
Loading
Loading