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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
restore-keys: plugin-rust-${{ runner.os }}-

- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: "3.9"
cache: pip
Expand Down
42 changes: 26 additions & 16 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ path = "src/main.rs"
anyhow = "1.0"
axum = "0.8.9"
axum-server = { version = "0.8.0", features = ["tls-rustls"] }
base64 = "0.22"
base64 = "0.23"
chrono = { version = "0.4", features = ["serde"] }
clap = { version = "4.6.6", features = ["derive", "env", "string"] }
clap = { version = "4.6.7", features = ["derive", "env", "string"] }
clap_complete = "4.6"
crossterm = { version = "0.29", features = ["use-dev-tty"] }
ed25519-dalek = { version = "3.0", features = ["rand_core"] }
flate2 = "1.1.9"
flate2 = "1.1.10"
fs2 = "0.4"
include_dir = "0.7"
libc = "0.2"
notify = "8.2"
rand = "0.9"
rand = "0.10"
ratatui = "0.30.2"
regex = "1.12"
reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] }
rmcp = { version = "3.1.2", features = ["client", "transport-io", "transport-streamable-http-server", "transport-streamable-http-client-reqwest", "reqwest"] }
rmcp = { version = "3.4.0", features = ["client", "transport-io", "transport-streamable-http-server", "transport-streamable-http-client-reqwest", "reqwest"] }
rusqlite = { version = "0.40.2", features = ["backup", "bundled"] }
schemars = "1.0"
serde = { version = "1.0", features = ["derive"] }
Expand Down
20 changes: 10 additions & 10 deletions plugins/obsidian/package-lock.json

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

7 changes: 6 additions & 1 deletion plugins/obsidian/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@
"license": "MIT",
"devDependencies": {
"@types/node": "^26",
"builtin-modules": "^5.3.0",
"builtin-modules": "^5.4.0",
"esbuild": "^0.28.2",
"obsidian": "^1.4.11",
"tslib": "^2.6.0",
"typescript": "^5.4.0"
},
"overrides": {
"obsidian": {
"moment": "^2.31.0"
}
}
}
4 changes: 2 additions & 2 deletions src/consolidation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::{path::PathBuf, time::Duration};

use anyhow::Result;
use chrono::{DateTime, Utc};
use rand::TryRngCore;
use rand::TryRng;
use serde::{Deserialize, Serialize};
use tokio::task::JoinHandle;
use tokio_util::sync::CancellationToken;
Expand Down Expand Up @@ -124,7 +124,7 @@ fn get_rank(cx: &Cortex, key: &str) -> Result<RankEntry> {
}

pub fn generate_rank() -> Result<u8> {
let mut rng = rand::rngs::OsRng;
let mut rng = rand::rngs::SysRng;
loop {
let mut sample = [0_u8; 1];
rng.try_fill_bytes(&mut sample)?;
Expand Down
4 changes: 2 additions & 2 deletions src/eventsig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::io::Write;
use anyhow::{Context, Result, bail};
use base64::{Engine, engine::general_purpose::STANDARD};
use ed25519_dalek::{Signature, Signer, SigningKey, Verifier, VerifyingKey};
use rand::TryRngCore;
use rand::TryRng;
use sha2::{Digest, Sha256};

use crate::event::Event;
Expand Down Expand Up @@ -51,7 +51,7 @@ pub fn verify(public_key: &str, event: &Event, signature: &str) -> Result<()> {

pub fn generate() -> Result<(SigningKey, String, String)> {
let mut seed = [0u8; 32];
rand::rngs::OsRng.try_fill_bytes(&mut seed)?;
rand::rngs::SysRng.try_fill_bytes(&mut seed)?;
let key = SigningKey::from_bytes(&seed);
let public = encode_public(&key.verifying_key());
Ok((key, public, STANDARD.encode(seed)))
Expand Down
6 changes: 3 additions & 3 deletions src/federation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use anyhow::{Context, Result, bail};
use chrono::Utc;
use rmcp::{
ServiceExt,
model::{CallToolRequestParams, ClientInfo},
model::{CallToolRequestParams, ClientConfig},
transport::{
StreamableHttpClientTransport, streamable_http_client::StreamableHttpClientTransportConfig,
},
Expand Down Expand Up @@ -497,7 +497,7 @@ pub async fn sync_peer(cx: &mut Cortex, peer: &PeerEntry) -> Result<SyncReport>
.build()
.context("building federation HTTP client")?;
let transport = StreamableHttpClientTransport::with_client(http_client, transport_config);
let mut client = ClientInfo::default()
let mut client = ClientConfig::default()
.serve(transport)
.await
.with_context(|| format!("connecting to peer {:?} at {endpoint}", peer.name))?;
Expand Down Expand Up @@ -611,7 +611,7 @@ pub async fn sync_peer(cx: &mut Cortex, peer: &PeerEntry) -> Result<SyncReport>

async fn sync_usage(
cx: &mut Cortex,
client: &rmcp::service::RunningService<rmcp::RoleClient, ClientInfo>,
client: &rmcp::service::RunningService<rmcp::RoleClient, ClientConfig>,
peer: &PeerEntry,
peer_id: &str,
report: &mut SyncReport,
Expand Down
4 changes: 2 additions & 2 deletions src/mcp/http_role_tests.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use rmcp::{
model::{CallToolRequestParams, ClientInfo},
model::{CallToolRequestParams, ClientConfig},
transport::{
StreamableHttpClientTransport, streamable_http_client::StreamableHttpClientTransportConfig,
},
Expand Down Expand Up @@ -100,7 +100,7 @@ async fn role_endpoints_enforce_discovery_calls_and_share_usage() {
http.clone(),
StreamableHttpClientTransportConfig::with_uri(endpoint).auth_header("test-secret"),
);
let client = ClientInfo::default().serve(transport).await.unwrap();
let client = ClientConfig::default().serve(transport).await.unwrap();
let listed = client.list_all_tools().await.unwrap();
let mut actual = listed
.iter()
Expand Down
Loading