Make axium extensions available to request context#143

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

Closed
centdix wants to merge 1 commit into from
Closed

Make axium extensions available to request context #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down
1 change: 1 addition & 0 deletions crates/rmcp/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store
View file
Open in desktop
Binary file not shown.
40 changes: 35 additions & 5 deletions crates/rmcp/src/service.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
},
transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
fn get_extensions(&self) -> &AxumExtensions;
fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
transport: T,
) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
where
T: IntoTransport<R, E, A>,
T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
Self: Sized,
{
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
ct: CancellationToken,
) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
where
T: IntoTransport<R, E, A>,
T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
pub extensions: Extensions,
/// An interface to fetch the remote client or server
pub peer: Peer<R>,
pub req_extensions: AxumExtensions,
pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
R: ServiceRole,
S: Service<R>,
T: IntoTransport<R, E, A>,
T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + Send + Sync + 'static,
{
serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
R: ServiceRole,
S: Service<R>,
T: IntoTransport<R, E, A>,
T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + Send + Sync + 'static,
{
let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
serve_inner(service, transport, peer, peer_rx, ct).await
let req_extensions = transport.get_extensions().clone();
let workspace_id = transport.get_workspace_id();
serve_inner(
service,
transport,
peer,
peer_rx,
ct,
req_extensions,
workspace_id,
)
.await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
peer: Peer<R>,
mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
ct: CancellationToken,
req_extensions: AxumExtensions,
workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
peer: peer.clone(),
meta: request.get_meta().clone(),
extensions: request.extensions().clone(),
req_extensions: req_extensions.clone(),
workspace_id: workspace_id.clone(),
};
tokio::spawn(async move {
let result = service.handle_request(request, context).await;
Expand Down
20 changes: 16 additions & 4 deletions crates/rmcp/src/service/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
ct: CancellationToken,
) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
where
T: IntoTransport<RoleClient, E, A>,
T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
Self: Sized,
{
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
S: Service<RoleClient>,
T: IntoTransport<RoleClient, E, A>,
T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
S: Service<RoleClient>,
T: IntoTransport<RoleClient, E, A>,
T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
let req_extensions = transport.get_extensions().clone();
let workspace_id = transport.get_workspace_id();
let (sink, stream) = transport.into_transport();
let mut sink = Box::pin(sink);
let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
);
sink.send(notification).await?;
let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
serve_inner(service, (sink, stream), peer, peer_rx, ct).await

serve_inner(
service,
(sink, stream),
peer,
peer_rx,
ct,
req_extensions,
workspace_id,
)
.await
}

macro_rules! method {
Expand Down
21 changes: 17 additions & 4 deletions crates/rmcp/src/service/server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
ct: CancellationToken,
) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
where
T: IntoTransport<RoleServer, E, A>,
T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
Self: Sized,
{
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
S: Service<RoleServer>,
T: IntoTransport<RoleServer, E, A>,
T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
S: Service<RoleServer>,
T: IntoTransport<RoleServer, E, A>,
T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
let req_extensions = transport.get_extensions().clone();
let workspace_id = transport.get_workspace_id();
let (sink, stream) = transport.into_transport();
let mut sink = Box::pin(sink);
let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
meta: request.get_meta().clone(),
extensions: request.extensions().clone(),
peer: peer.clone(),
req_extensions: req_extensions.clone(),
workspace_id: workspace_id.clone(),
};
// Send initialize response
let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
};
let _ = service.handle_notification(notification).await;
// Continue processing service
serve_inner(service, (sink, stream), peer, peer_rx, ct).await
serve_inner(
service,
(sink, stream),
peer,
peer_rx,
ct,
req_extensions,
workspace_id,
)
.await
}

macro_rules! method {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Make axium extensions available to request context#143

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

 Closed

centdix
wants to merge
1
commit into

from

 Closed


Make axium extensions available to request context
#143
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@


[workspace]
members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
members = ["crates/rmcp", "crates/rmcp-macros"]
resolver = "2"

[workspace.dependencies]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ documentation = "https://docs.rs/rmcp"
all-features = true

[dependencies]
async-stream = "0.3"
serde = { version = "1.0", features = ["derive", "rc"] }
serde_json = "1.0"
thiserror = "2"
Expand Down
Binary file addedcrates/rmcp/src/.DS_Store

View file


Open in desktop


Binary file not shown.


40 changes: 35 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,19 @@ use crate::{
 },
 transport::IntoTransport,
};

#[cfg(feature = "transport-sse-server")]
use axum::http::Extensions as AxumExtensions;

#[cfg(not(feature = "transport-sse-server"))]
#[derive(Debug, Clone, Default)]
pub struct AxumExtensions;

pub trait ProvidesAxiumExtensions {
 fn get_extensions(&self) -> &AxumExtensions;
 fn get_workspace_id(&self) -> String;
}

#[cfg(feature = "client")]
mod client;
#[cfg(feature = "client")]
Expand DownExpand Up@@ -109,7 +122,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 transport: T,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -121,7 +134,7 @@ pub trait ServiceExt<R: ServiceRole>: Service<R> + Sized {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<R, Self>, E>> + Send
 where
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized;
}
Expand DownExpand Up@@ -474,6 +487,8 @@ pub struct RequestContext<R: ServiceRole> {
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
 pub req_extensions: AxumExtensions,
 pub workspace_id: String,
}

/// Use this function to skip initialization process
Expand All@@ -485,7 +500,7 @@ pub async fn serve_directly<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
Expand All@@ -501,11 +516,22 @@ pub async fn serve_directly_with_ct<R, S, T, E, A>(
where
 R: ServiceRole,
 S: Service<R>,
 T: IntoTransport<R, E, A>,
 T: IntoTransport<R, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 serve_inner(
 service,
 transport,
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

#[instrument(skip_all)]
Expand All@@ -515,6 +541,8 @@ async fn serve_inner<R, S, T, E, A>(
 peer: Peer<R>,
 mut peer_rx: tokio::sync::mpsc::Receiver<PeerSinkMessage<R>>,
 ct: CancellationToken,
 req_extensions: AxumExtensions,
 workspace_id: String,
) -> Result<RunningService<R, S>, E>
where
 R: ServiceRole,
Expand DownExpand Up@@ -669,6 +697,8 @@ where
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand Down

20 changes: 16 additions & 4 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,7 +93,7 @@ impl<S: Service<RoleClient>> ServiceExt<RoleClient> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleClient, Self>, E>> + Send
 where
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -107,7 +107,7 @@ pub async fn serve_client<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
Expand All@@ -120,9 +120,11 @@ pub async fn serve_client_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleClient, S>, E>
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 T: IntoTransport<RoleClient, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -175,7 +177,17 @@ where
 );
 sink.send(notification).await?;
 let (peer, peer_rx) = Peer::new(id_provider, initialize_result);
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await

 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down

21 changes: 17 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ct: CancellationToken,
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, E>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 Self: Sized,
 {
Expand All@@ -74,7 +74,7 @@ pub async fn serve_server<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
Expand DownExpand Up@@ -129,9 +129,11 @@ pub async fn serve_server_with_ct<S, T, E, A>(
) -> Result<RunningService<RoleServer, S>, E>
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 T: IntoTransport<RoleServer, E, A> + ProvidesAxiumExtensions,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
{
 let req_extensions = transport.get_extensions().clone();
 let workspace_id = transport.get_workspace_id();
 let (sink, stream) = transport.into_transport();
 let mut sink = Box::pin(sink);
 let mut stream = Box::pin(stream);
Expand DownExpand Up@@ -162,6 +164,8 @@ where
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 peer: peer.clone(),
 req_extensions: req_extensions.clone(),
 workspace_id: workspace_id.clone(),
 };
 // Send initialize response
 let init_response = service.handle_request(request.clone(), context).await;
Expand DownExpand Up@@ -207,7 +211,16 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 serve_inner(service, (sink, stream), peer, peer_rx, ct).await
 serve_inner(
 service,
 (sink, stream),
 peer,
 peer_rx,
 ct,
 req_extensions,
 workspace_id,
 )
 .await
}

macro_rules! method {
Expand Down
Loading