Merge pull request #73 from hubertshelley/2.0.0

2.0.0

Author: hubertshelley

Cargo.toml

@@ -10,4 +10,4 @@ homepage = "https://github.com/hubertshelley/silent"
 license = "Apache-2.0"
 readme = "./readme.md"
 repository = "https://github.com/hubertshelley/silent"
-version = "1.5.0"
+version = "2.0.0"

examples/exception_handler/src/main.rs

@@ -1,4 +1,6 @@
 use serde::{Deserialize, Serialize};
+
+use silent::middlewares::ExceptionHandler;
 use silent::prelude::*;
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -10,13 +12,8 @@ struct Exception {
 fn main() {
     logger::fmt().with_max_level(Level::INFO).init();
     let route = Route::new("")
+        .root_hook(ExceptionHandler::new(|res, _| async move { res }))
         .get(|mut req| async move { req.params_parse::<Exception>() })
-        .route()
-        .set_exception_handler(|e, _| async move {
-            Exception {
-                code: e.status().as_u16(),
-                msg: e.to_string(),
-            }
-        });
+        .route();
     Server::new().run(route);
 }

examples/form/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 silent = { path = "../../silent" }
-serde = { version = "1.0.213", features = ["derive"] }
+serde = { version = "1.0.210", features = ["derive"] }

examples/grpc/Cargo.toml

@@ -15,7 +15,7 @@ path = "src/client.rs"
 [dependencies]
 tonic = { version = "0.12.3" }
 prost = "0.13"
-tokio = { version = "1.41", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
 silent = { path = "../../silent", features = ["grpc"] }
 async-trait = "0.1.83"
 

examples/grpc/build.rs

@@ -1,5 +1,5 @@
 fn main() {
     tonic_build::configure()
-        .compile(&["proto/helloworld.proto"], &["/proto"])
+        .compile_protos(&["proto/hello_world.proto"], &["/proto"])
         .unwrap();
 }

examples/grpc_h2c/proto/helloworld.proto renamed to examples/grpc/proto/hello_world.proto

@@ -15,10 +15,10 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "io.grpc.examples.helloworld";
+option java_package = "io.grpc.examples.hello_world";
 option java_outer_classname = "HelloWorldProto";
 
-package helloworld;
+package hello_world;
 
 // The greeting service definition.
 service Greeter {

examples/grpc/src/client.rs

@@ -2,7 +2,7 @@ use hello_world::greeter_client::GreeterClient;
 use hello_world::HelloRequest;
 
 pub mod hello_world {
-    tonic::include_proto!("helloworld");
+    tonic::include_proto!("hello_world");
 }
 #[allow(dead_code)]
 #[tokio::main]

examples/grpc/src/main.rs

@@ -3,12 +3,13 @@ use tonic::{Request, Response, Status};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};
-use silent::prelude::{logger, HandlerAppend, Level, Route, RouteService, Server};
+use silent::prelude::{info, logger, HandlerAppend, Level, Route, Server};
+use silent::GrpcRegister;
 
 mod client;
 
 pub mod hello_world {
-    tonic::include_proto!("helloworld"); // The string specified here must match the proto package name
+    tonic::include_proto!("hello_world"); // The string specified here must match the proto package name
 }
 
 #[derive(Debug, Default)]
@@ -21,7 +22,7 @@ impl Greeter for MyGreeter {
         request: Request<HelloRequest>, // Accept request of type HelloRequest
     ) -> Result<Response<HelloReply>, Status> {
         // Return an instance of type HelloReply
-        println!("Got a request: {:?}", request);
+        info!("Got a request: {:?}", request);
 
         let reply = HelloReply {
             message: format!("Hello {}!", request.into_inner().name), // We must use .into_inner() as the fields of gRPC requests and responses are private
@@ -40,12 +41,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     //     // Wrap all services in the middleware stack
     //     .add_service(greeter_server)
     //     .into_router();
-    let route = Route::new("").get(|_req| async { Ok("hello world") });
-    let root = route.route().with_grpc(greeter_server.into());
-    println!("route: \n{:?}", root);
+    let route = Route::new("")
+        .get(|_req| async { Ok("hello world") })
+        .append(greeter_server.service());
+    info!("route: \n{:?}", route);
     Server::new()
         .bind("0.0.0.0:50051".parse().unwrap())
-        .serve(root)
+        .serve(route)
         .await;
     Ok(())
 }

examples/grpc_h2c/build.rs

@@ -4,7 +4,7 @@ fn main() {
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
     tonic_build::configure()
-        .file_descriptor_set_path(out_dir.join("helloworld_descriptor.bin"))
-        .compile(&["proto/helloworld.proto"], &["/proto"])
+        .file_descriptor_set_path(out_dir.join("hello_world_descriptor.bin"))
+        .compile_protos(&["proto/hello_world.proto"], &["/proto"])
         .unwrap();
 }

examples/grpc/proto/helloworld.proto renamed to examples/grpc_h2c/proto/hello_world.proto

@@ -15,10 +15,10 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "io.grpc.examples.helloworld";
+option java_package = "io.grpc.examples.hello_world";
 option java_outer_classname = "HelloWorldProto";
 
-package helloworld;
+package hello_world;
 
 // The greeting service definition.
 service Greeter {
@@ -34,4 +34,4 @@ message HelloRequest {
 // The response message containing the greetings
 message HelloReply {
   string message = 1;
-}
+}

examples/grpc_h2c/src/client.rs

@@ -5,7 +5,7 @@ use hyper_util::client::legacy::Client;
 use hyper_util::rt::TokioExecutor;
 
 pub mod hello_world {
-    tonic::include_proto!("helloworld");
+    tonic::include_proto!("hello_world");
 }
 
 #[tokio::main]

examples/grpc_h2c/src/main.rs

@@ -3,10 +3,11 @@ use tonic::{Request, Response, Status};
 
 use hello_world::greeter_server::{Greeter, GreeterServer};
 use hello_world::{HelloReply, HelloRequest};
-use silent::prelude::{logger, HandlerAppend, Level, Route, RouteService};
+use silent::prelude::{info, logger, HandlerAppend, Level, Route};
+use silent::GrpcRegister;
 
 pub mod hello_world {
-    tonic::include_proto!("helloworld");
+    tonic::include_proto!("hello_world");
 }
 
 #[derive(Default)]
@@ -18,7 +19,7 @@ impl Greeter for MyGreeter {
         &self,
         request: Request<HelloRequest>,
     ) -> Result<Response<HelloReply>, Status> {
-        println!("Got a request from {:?}", request.remote_addr());
+        info!("Got a request from {:?}", request.remote_addr());
 
         let reply = hello_world::HelloReply {
             message: format!("Hello {}!", request.into_inner().name),
@@ -32,11 +33,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let greeter = MyGreeter::default();
     logger::fmt().with_max_level(Level::INFO).init();
 
-    let route = Route::new("").get(|_req| async { Ok("hello world") });
-    let root = route.route().with_grpc(GreeterServer::new(greeter).into());
+    let mut route = Route::new("").get(|_req| async { Ok("hello world") });
+    GreeterServer::new(greeter).register(&mut route);
     silent::prelude::Server::new()
         .bind("0.0.0.0:50051".parse().unwrap())
-        .serve(root)
+        .serve(route)
         .await;
     Ok(())
 }

examples/grpc_streaming/Cargo.toml

@@ -15,7 +15,7 @@ path = "src/client.rs"
 [dependencies]
 tonic = { version = "0.12.3" }
 prost = "0.13"
-tokio = { version = "1.41", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
 silent = { path = "../../silent", features = ["grpc"] }
 async-trait = "0.1.83"
 tokio-stream = "0.1.16"

examples/grpc_streaming/build.rs

@@ -1,5 +1,5 @@
 fn main() {
     tonic_build::configure()
-        .compile(&["proto/echo.proto"], &["/proto"])
+        .compile_protos(&["proto/echo.proto"], &["/proto"])
         .unwrap();
 }

examples/grpc_streaming/src/client.rs

@@ -70,7 +70,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     println!("Streaming echo:");
     streaming_echo(&mut client, 5).await;
-    tokio::time::sleep(Duration::from_secs(1)).await; //do not mess server println functions
+    tokio::time::sleep(Duration::from_secs(1)).await; //do not mess server info functions
 
     // Echo stream that sends 17 requests then graceful end that connection
     println!("\r\nBidirectional stream echo:");

examples/grpc_streaming/src/main.rs

@@ -5,7 +5,8 @@ use tokio_stream::{wrappers::ReceiverStream, Stream, StreamExt};
 use tonic::{Request, Response, Status, Streaming};
 
 use pb::{EchoRequest, EchoResponse};
-use silent::prelude::{logger, HandlerAppend, Level, Route, RouteService, Server};
+use silent::prelude::{info, logger, HandlerAppend, Level, Route, RouteService, Server};
+use silent::GrpcRegister;
 
 mod client;
 
@@ -54,8 +55,8 @@ impl pb::echo_server::Echo for EchoServer {
         &self,
         req: Request<EchoRequest>,
     ) -> EchoResult<Self::ServerStreamingEchoStream> {
-        println!("EchoServer::server_streaming_echo");
-        println!("\tclient connected from: {:?}", req.remote_addr());
+        info!("EchoServer::server_streaming_echo");
+        info!("\tclient connected from: {:?}", req.remote_addr());
 
         // creating infinite stream with requested message
         let repeat = std::iter::repeat(EchoResponse {
@@ -78,7 +79,7 @@ impl pb::echo_server::Echo for EchoServer {
                     }
                 }
             }
-            println!("\tclient disconnected");
+            info!("\tclient disconnected");
         });
 
         let output_stream = ReceiverStream::new(rx);
@@ -100,7 +101,7 @@ impl pb::echo_server::Echo for EchoServer {
         &self,
         req: Request<Streaming<EchoRequest>>,
     ) -> EchoResult<Self::BidirectionalStreamingEchoStream> {
-        println!("EchoServer::bidirectional_streaming_echo");
+        info!("EchoServer::bidirectional_streaming_echo");
 
         let mut in_stream = req.into_inner();
         let (tx, rx) = mpsc::channel(128);
@@ -121,7 +122,7 @@ impl pb::echo_server::Echo for EchoServer {
                             if io_err.kind() == ErrorKind::BrokenPipe {
                                 // here you can handle special case when client
                                 // disconnected in unexpected way
-                                eprintln!("\tclient disconnected: broken pipe");
+                                info!("\tclient disconnected: broken pipe");
                                 break;
                             }
                         }
@@ -133,7 +134,7 @@ impl pb::echo_server::Echo for EchoServer {
                     }
                 }
             }
-            println!("\tstream ended");
+            info!("\tstream ended");
         });
 
         // echo just write the same data that was received
@@ -150,9 +151,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     logger::fmt().with_max_level(Level::INFO).init();
     let server = EchoServer {};
     let route = Route::new("").get(|_req| async { Ok("hello world") });
-    let root = route
-        .route()
-        .with_grpc(pb::echo_server::EchoServer::new(server).into());
+    let mut root = route.route();
+    root.push(pb::echo_server::EchoServer::new(server).service());
     Server::new()
         .bind("0.0.0.0:50051".parse().unwrap())
         .serve(root)

examples/middleware/src/main.rs

@@ -19,11 +19,7 @@ struct MiddleWare {
 
 #[async_trait]
 impl MiddleWareHandler for MiddleWare {
-    async fn pre_request(
-        &self,
-        _req: &mut Request,
-        _res: &mut Response,
-    ) -> Result<MiddlewareResult> {
+    async fn handle(&self, req: Request, next: &Next) -> Result<Response> {
         self.count.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
         let count = self.count.load(std::sync::atomic::Ordering::SeqCst);
         info!("pre_request count: {}", count);
@@ -34,21 +30,6 @@ impl MiddleWareHandler for MiddleWare {
                 msg: "bad request:pre_request".to_string(),
             });
         }
-        Ok(MiddlewareResult::Continue)
-    }
-    async fn after_response(&self, res: &mut Response) -> Result<MiddlewareResult> {
-        let count = self.count.load(std::sync::atomic::Ordering::SeqCst);
-        info!("after_response count: {}", count);
-        if count % 3 == 0 {
-            error!("set after_response error");
-            return Err(SilentError::BusinessError {
-                code: StatusCode::BAD_REQUEST,
-                msg: "bad request:after_response".to_string(),
-            });
-        }
-        if let ResBody::Once(body) = res.body() {
-            println!("body: {:?}", body);
-        }
-        Ok(MiddlewareResult::Continue)
+        next.call(req).await
     }
 }

examples/path_params/src/main.rs

@@ -13,7 +13,7 @@ fn main() {
         .append(Route::new("<key:**>/**").get(hello_world))
         .append(Route::new("<key>").get(hello_world))
         .append(Route::new("<key:other>/other").get(hello_world));
-    println!("{:?}", route);
+    info!("{:?}", route);
     Server::new().run(route);
 }
 

examples/plugin_test/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "examples_plugin_test"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+version.workspace = true
+
+[dependencies]
+silent = { path = "../../silent" }
+crossbeam-epoch = "0.9.18"
+dlopen2 = { version = "0.7.0", features = ["derive"] }

examples/plugin_test/README.MD

@@ -0,0 +1,6 @@
+## where is lib from?
+
+Compiled from example project plugins
+
+this example lib is compiled by MacOS, if your system is different, you need to compile it by yourself and edit
+lib_path.

examples/plugin_test/libexamples_plugins.dylib

@@ -0,0 +1,21 @@
+use crossbeam_epoch::Pointable;
+use dlopen2::wrapper::{Container, WrapperApi};
+use silent::prelude::{logger, Level, Route, Server};
+use std::error::Error;
+
+#[derive(WrapperApi)]
+struct PluginApi {
+    // plugin_metadata: unsafe extern "C" fn() -> PluginMetadata,
+    #[allow(improper_ctypes_definitions)]
+    get_route: unsafe extern "C" fn() -> Route,
+}
+
+fn main() -> Result<(), Box<dyn Error>> {
+    logger::fmt().with_max_level(Level::INFO).init();
+    let lib_path = "./libexamples_plugins.dylib";
+    let container: Container<PluginApi> =
+        unsafe { Container::load(lib_path) }.expect("无法加载插件");
+    let route = unsafe { container.get_route() };
+    Server::new().run(route);
+    Ok(())
+}

examples/plugin_test/src/main.rs

@@ -0,0 +1,2 @@
+[build]
+target-dir = "target"

examples/plugins/.cargo/config.toml

@@ -0,0 +1,15 @@
+[package]
+name = "examples-plugins"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+version.workspace = true
+
+[lib]
+crate-type = ['cdylib']
+
+[dependencies]
+silent = { path = "../../silent" }