Upgrate to latest rust-http2

Author: stepancheg

.github/workflows/ci.yml

@@ -135,7 +135,7 @@ jobs:
         run: "./ci/install-protobuf.sh"
         shell: bash
       - name: install protobuf-codegen
-        run: cargo install protobuf-codegen --version=2.18.2
+        run: cargo install protobuf-codegen --version=2.23
         shell: bash
       - name: gen
         run: grpc-compiler/test-protoc-plugin/gen.sh

README.md

@@ -63,7 +63,7 @@ In Cargo.toml:
 ```ini
 [dependencies]
 grpc            = "~0.8"
-protobuf        = "~2"
+protobuf        = "2.23"
 futures         = "~0.3"
 
 [build-dependencies]

ci-gen/src/main.rs

@@ -73,7 +73,7 @@ fn test_protoc_plugin_job() -> Job {
     steps.push(install_protobuf_step());
     steps.push(Step::run(
         "install protobuf-codegen",
-        "cargo install protobuf-codegen --version=2.18.2",
+        "cargo install protobuf-codegen --version=2.23",
     ));
     steps.push(Step::run("gen", "grpc-compiler/test-protoc-plugin/gen.sh"));
     steps.push(Step::run(

grpc-compiler/Cargo.toml

@@ -7,8 +7,8 @@ authors = ["Stepan Koltsov <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-protobuf = "~2.18.2"
-protobuf-codegen = "~2.18.2"
+protobuf = "2.23"
+protobuf-codegen = "2.23"
 
 [[bin]]
 

grpc-compiler/src/codegen.rs

@@ -295,7 +295,7 @@ impl<'a> MethodGen<'a> {
 
     fn server_sig(&self) -> String {
         format!(
-            "{}(&self, o: ::grpc::ServerHandlerContext, req: {}, resp: {}) -> ::grpc::Result<()>",
+            "{}(&self, req: {}, resp: {}) -> ::grpc::Result<()>",
             self.snake_name(),
             self.server_req_type(),
             self.server_resp_type(),
@@ -492,7 +492,7 @@ impl<'a> ServiceGen<'a> {
                             method.write_descriptor(w, "::grpc::rt::ArcOrStatic::Static(&", "),");
                             w.block("{", "},", |w| {
                                 w.write_line(&format!("let handler_copy = {}.clone();", handler));
-                                w.write_line(&format!("::grpc::rt::MethodHandler{}::new(move |ctx, req, resp| (*handler_copy).{}(ctx, req, resp))",
+                                w.write_line(&format!("::grpc::rt::MethodHandler{}::new(move |req, resp| (*handler_copy).{}(req, resp))",
                                     method.streaming_upper(),
                                     method.snake_name()));
                             });

grpc-compiler/test-protoc-plugin/Cargo.toml

@@ -6,8 +6,8 @@ publish = false
 edition = "2018"
 
 [dependencies]
-tls-api         = "0.4.*"
-protobuf        = "~2.18.2"
+tls-api         = "0.5.0"
+protobuf        = "2.23"
 grpc            = { path = "../../grpc" }
 grpc-protobuf   = { path = "../../grpc-protobuf" }
 

grpc-examples/greeter/Cargo.toml

@@ -15,12 +15,14 @@ path = "../../grpc"
 path = "../../grpc-protobuf"
 
 [dependencies]
-protobuf        = "~2.18.2"
+protobuf        = "2.23"
 futures         = "0.3.*"
-tls-api            = "0.4.*"
-tls-api-native-tls = "0.4.*"
-httpbis         = "~0.9"
-#httpbis         = { git = "https://github.com/stepancheg/rust-http2" }
+tls-api         = "0.5.0"
+tls-api-stub    = "0.5.0"
+tls-api-native-tls = "0.5.0"
+#httpbis         = "~0.9"
+httpbis         = { git = "https://github.com/stepancheg/rust-http2" }
+#httpbis         = { path = "../../../rust-http2/httpbis" }
 env_logger      = "~0.5"
 
 [build-dependencies]

grpc-examples/greeter/src/bin/greeter_client.rs

@@ -13,7 +13,6 @@ use tls_api::TlsConnectorBuilder;
 
 fn test_tls_connector() -> tls_api_native_tls::TlsConnector {
     let root_ca = include_bytes!("../root-ca.der");
-    let root_ca = tls_api::Certificate::from_der(root_ca.to_vec());
 
     let mut builder = tls_api_native_tls::TlsConnector::builder().unwrap();
     builder
@@ -45,8 +44,10 @@ fn main() {
         // This is a bit complicated, because we need to explicitly pass root CA here
         // because server uses self-signed certificate.
         // TODO: simplify it
-        let tls_option =
-            httpbis::ClientTlsOption::Tls("foobar.com".to_owned(), Arc::new(test_tls_connector()));
+        let tls_option = httpbis::ClientTlsOption::Tls(
+            "foobar.com".to_owned(),
+            Arc::new(test_tls_connector().into_dyn()),
+        );
         let grpc_client = Arc::new(
             grpc::ClientBuilder::new("::1", port)
                 .explicit_tls(tls_option)

grpc-examples/greeter/src/bin/greeter_server.rs

@@ -4,17 +4,16 @@ use std::thread;
 use grpc_examples_greeter::helloworld::*;
 use grpc_examples_greeter::helloworld_grpc::*;
 
-use grpc::ServerHandlerContext;
 use grpc::ServerRequestSingle;
 use grpc::ServerResponseUnarySink;
+use tls_api::TlsAcceptor;
 use tls_api::TlsAcceptorBuilder;
 
 struct GreeterImpl;
 
 impl Greeter for GreeterImpl {
     fn say_hello(
         &self,
-        _: ServerHandlerContext,
         req: ServerRequestSingle<HelloRequest>,
         resp: ServerResponseUnarySink<HelloReply>,
     ) -> grpc::Result<()> {
@@ -32,7 +31,7 @@ impl Greeter for GreeterImpl {
 
 fn test_tls_acceptor() -> tls_api_native_tls::TlsAcceptor {
     let pkcs12 = include_bytes!("../foobar.com.p12");
-    let builder = tls_api_native_tls::TlsAcceptorBuilder::from_pkcs12(pkcs12, "mypass").unwrap();
+    let builder = tls_api_native_tls::TlsAcceptor::builder_from_pkcs12(pkcs12, "mypass").unwrap();
     builder.build().unwrap()
 }
 

grpc-examples/route_guide/Cargo.toml

@@ -15,10 +15,10 @@ path = "../../grpc"
 path = "../../grpc-protobuf"
 
 [dependencies]
-protobuf        = "~2.18.2"
+protobuf        = "2.23"
 futures         = "0.3.*"
-tls-api            = "0.4.*"
-tls-api-native-tls = "0.4.*"
+tls-api         = "0.5.0"
+tls-api-stub    = "0.5.0"
 env_logger      = "0.4.*"
 rand            = "0.5.5"
 json            = "0.11.*"

grpc-examples/route_guide/src/server.rs

@@ -42,7 +42,6 @@ impl RouteGuideImpl {
 impl RouteGuide for RouteGuideImpl {
     fn get_feature(
         &self,
-        _o: ServerHandlerContext,
         req: ServerRequestSingle<Point>,
         resp: ServerResponseUnarySink<Feature>,
     ) -> grpc::Result<()> {
@@ -60,13 +59,13 @@ impl RouteGuide for RouteGuideImpl {
 
     fn list_features(
         &self,
-        o: ServerHandlerContext,
         mut req: ServerRequestSingle<Rectangle>,
         mut resp: ServerResponseSink<Feature>,
     ) -> grpc::Result<()> {
+        let loop_handle = req.loop_handle();
         let req = req.take_message();
         let saved_features = self.saved_features.clone();
-        o.spawn(async move {
+        loop_handle.spawn(async move {
             for feature in &saved_features[..] {
                 if in_range(feature.get_location(), &req) {
                     resp.ready().await?;
@@ -80,17 +79,18 @@ impl RouteGuide for RouteGuideImpl {
 
     fn record_route(
         &self,
-        o: ServerHandlerContext,
         req: ServerRequest<Point>,
         resp: ServerResponseUnarySink<RouteSummary>,
     ) -> grpc::Result<()> {
         let start_time = Instant::now();
 
         let saved_features = self.saved_features.clone();
 
+        let loop_handle = req.loop_handle();
+
         let mut stream = req.into_stream();
 
-        o.spawn(async move {
+        loop_handle.spawn(async move {
             struct State {
                 point_count: u32,
                 feature_count: u32,
@@ -133,15 +133,16 @@ impl RouteGuide for RouteGuideImpl {
 
     fn route_chat(
         &self,
-        o: ServerHandlerContext,
         req: ServerRequest<RouteNote>,
         mut resp: ServerResponseSink<RouteNote>,
     ) -> grpc::Result<()> {
         let route_notes_map = self.route_notes.clone();
 
+        let loop_handle = req.loop_handle();
+
         let mut req = req.into_stream();
 
-        o.spawn(async move {
+        loop_handle.spawn(async move {
             loop {
                 // Wait until resp is writable
                 resp.ready().await?;

grpc-protobuf/Cargo.toml

@@ -11,9 +11,9 @@ keywords = ["grpc"]
 edition = "2018"
 
 [dependencies]
-protobuf        = { version = "~2.18.2", features = ["with-bytes"] }
+protobuf        = { version = "2.23", features = ["with-bytes"] }
 grpc = { path = "../grpc", version = "=0.9.0-pre" }
-bytes           = "0.5.*"
+bytes = "1.0.1"
 
 [lib]
 doctest = false

grpc/Cargo.toml

@@ -14,16 +14,19 @@ edition = "2018"
 log             = "0.4"
 log-ndc         = "0.2.*"
 futures         = "0.3.1"
-tokio           = { version = "~0.2.6", features = ["net", "uds", "io-util", "time"] }
-httpbis         = "~0.9"
-#httpbis         = { git = "https://github.com/stepancheg/rust-http2" }
-tls-api         = "0.4.*"
-tls-api-stub    = "0.4.*"
-bytes           = "0.5.*"
+tokio = { version = "1.2.0", features = ["io-util", "net", "time", "rt"] }
+tokio-util = { version = "0.6.3", features = ["io"] }
+#httpbis         = "~0.9"
+httpbis         = { git = "https://github.com/stepancheg/rust-http2" }
+#httpbis         = { path = "../../rust-http2/httpbis" }
+tls-api         = "0.5.0"
+tls-api-stub    = "0.5.0"
+bytes           = "1.0.1"
 base64          = "0.9"
 
 [dev-dependencies]
 log-ndc-env-logger = "~0.2"
+rand = "0.8.3"
 
 [lib]
 doctest = false

grpc/src/bytesx/buf_eq.rs

@@ -0,0 +1,37 @@
+use bytes::Buf;
+use std::cmp;
+
+/// Test if two buffers content is the same.
+pub fn buf_eq<B1: Buf, B2: Buf>(mut b1: B1, mut b2: B2) -> bool {
+    loop {
+        if !b1.has_remaining() || !b2.has_remaining() {
+            return b1.has_remaining() == b2.has_remaining();
+        }
+        let s1 = b1.chunk();
+        let s2 = b2.chunk();
+        let min = cmp::min(s1.len(), s2.len());
+        if &s1[..min] != &s2[..min] {
+            return false;
+        }
+        b1.advance(min);
+        b2.advance(min);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use bytes::buf::Chain;
+
+    #[test]
+    fn test() {
+        assert!(buf_eq(b"".as_ref(), b"".as_ref()));
+        assert!(buf_eq(b"ab".as_ref(), b"ab".as_ref()));
+        assert!(!buf_eq(b"a".as_ref(), b"ab".as_ref()));
+        assert!(!buf_eq(b"abc".as_ref(), b"ab".as_ref()));
+
+        assert!(buf_eq(b"".as_ref().chain(b"ab".as_ref()), b"ab".as_ref()));
+        assert!(buf_eq(b"a".as_ref().chain(b"b".as_ref()), b"ab".as_ref()));
+        assert!(!buf_eq(b"a".as_ref().chain(b"bc".as_ref()), b"ab".as_ref()));
+    }
+}