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: 2 additions & 0 deletions service-sdk-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ proc-macro = true
quote = "*"

proc-macro2 = "*"

syn = { version = "*", features = ["full"] }
55 changes: 55 additions & 0 deletions service-sdk-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,33 @@ pub fn use_signal_r_subscriber(_input: TokenStream) -> TokenStream {
.into()
}

use quote::quote;
use syn::{
parse::{Parse, ParseStream},
parse_macro_input,
Ident, Path, Result, Token, Type,
};

struct GenerateGrpcServiceArgs {
service_ident: Ident,
app_ty: Type,
server_path: Path,
}

impl Parse for GenerateGrpcServiceArgs {
fn parse(input: ParseStream) -> Result<Self> {
let service_ident: Ident = input.parse()?;
input.parse::<Token![,]>()?;

let app_ty: Type = input.parse()?;
input.parse::<Token![,]>()?;

let server_path: Path = input.parse()?;

Ok(Self { service_ident, app_ty, server_path })
}
}

#[proc_macro]
pub fn generate_grpc_service(input: TokenStream) -> TokenStream {
let input: proc_macro2::TokenStream = input.into();
Expand All @@ -316,3 +343,31 @@ pub fn generate_grpc_service(input: TokenStream) -> TokenStream {
}
.into()
}

#[proc_macro]
pub fn generate_named_grpc_service(input: TokenStream) -> TokenStream {
let GenerateGrpcServiceArgs { service_ident, app_ty, server_path } = parse_macro_input!(input as GenerateGrpcServiceArgs);

let expanded = quote! {
#[derive(Clone)]
pub struct #service_ident {
pub app_context: ::std::sync::Arc<#app_ty>,
}

impl #service_ident {
pub fn new(app_context: ::std::sync::Arc<#app_ty>) -> Self {
Self { app_context }
}
}

impl service_sdk::IntoGrpcServer for #service_ident {
type GrpcServer = #server_path<Self>;

fn into_grpc_server(self) -> Self::GrpcServer {
#server_path::new(self)
}
}
};

expanded.into()
}
10 changes: 10 additions & 0 deletions service-sdk/src/builders/grpc_server_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ use my_logger::LogEventCtx;

use crate::GrpcMetricsMiddlewareLayer;

use crate::IntoGrpcServer;

const DEFAULT_GRPC_PORT: u16 = 8888;
pub struct GrpcServerBuilder {
server: Option<
Expand Down Expand Up @@ -56,6 +58,14 @@ impl GrpcServerBuilder {
self.listen_address = Some(SocketAddr::new(ip, port));
}

pub fn add_service<S>(&mut self, svc: S)
where
S: IntoGrpcServer,
<S::GrpcServer as my_grpc_extensions::tonic::codegen::Service<Request<Body>>>::Future: Send + 'static,
{
self.add_grpc_service(svc.into_grpc_server());
}

pub fn add_grpc_service<S>(&mut self, svc: S)
where
S: Service<
Expand Down
21 changes: 21 additions & 0 deletions service-sdk/src/common/into_grpc_server.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
use std::convert::Infallible;

use my_grpc_extensions::tonic::{
body::Body,
codegen::{http::Request, Service},
server::NamedService,
};

pub trait IntoGrpcServer {
type GrpcServer: Service<
Request<Body>,
Response = my_grpc_extensions::hyper::Response<Body>,
Error = Infallible,
> + NamedService
+ Clone
+ Send
+ Sync
+ 'static;

fn into_grpc_server(self) -> Self::GrpcServer;
}
5 changes: 5 additions & 0 deletions service-sdk/src/common/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
mod service_info;
pub use service_info::*;

#[cfg(feature = "grpc")]
mod into_grpc_server;
#[cfg(feature = "grpc")]
pub use into_grpc_server::*;
Loading