Skip to content

feat: add cancellation_token method to RunningService #218

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

Merged
merged 2 commits into from
May 26, 2025
Merged

feat: add cancellation_token method to RunningService #218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9de1bbd
feat: add split method to RunningService
lucasfernog-crabnebula May 25, 2025
76e7e38
simplify impl
lucasfernog-crabnebula May 26, 2025
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
19 changes: 17 additions & 2 deletions crates/rmcp/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,14 +424,14 @@ pub struct RunningService<R: ServiceRole, S: Service<R>> {
service: Arc<S>,
peer: Peer<R>,
handle: tokio::task::JoinHandle<QuitReason>,
/// cancellation token with drop guard
cancellation_token: CancellationToken,
dg: DropGuard,
}
impl<R: ServiceRole, S: Service<R>> Deref for RunningService<R, S> {
type Target = Peer<R>;

fn deref(&self) -> &Self::Target {
self.peer()
&self.peer
}
}

Expand All @@ -444,6 +444,11 @@ impl<R: ServiceRole, S: Service<R>> RunningService<R, S> {
pub fn service(&self) -> &S {
self.service.as_ref()
}
#[inline]
pub fn cancellation_token(&self) -> RunningServiceCancellationToken {
RunningServiceCancellationToken(self.cancellation_token.clone())
}
#[inline]
pub async fn waiting(self) -> Result<QuitReason, tokio::task::JoinError> {
self.handle.await
}
Expand All @@ -454,6 +459,15 @@ impl<R: ServiceRole, S: Service<R>> RunningService<R, S> {
}
}

// use a wrapper type so we can tweak the implementation if needed
pub struct RunningServiceCancellationToken(CancellationToken);

impl RunningServiceCancellationToken {
pub fn cancel(self) {
self.0.cancel();
}
}

#[derive(Debug)]
pub enum QuitReason {
Cancelled,
Expand Down Expand Up @@ -801,6 +815,7 @@ where
service,
peer: peer_return,
handle,
cancellation_token: ct.clone(),
dg: ct.drop_guard(),
}
}
Loading