update juniper and middleware examples

basics/src/main.rs

@@ -77,7 +77,6 @@ fn with_param(req: HttpRequest, path: web::Path<(String,)>) -> HttpResponse {
 
 fn main() -> io::Result<()> {
     env::set_var("RUST_LOG", "actix_web=debug");
-    env::set_var("RUST_BACKTRACE", "1");
     env_logger::init();
     let sys = actix_rt::System::new("basic-example");
 

juniper/Cargo.toml

@@ -2,17 +2,14 @@
 name = "juniper-example"
 version = "0.1.0"
 authors = ["pyros2097 <pyros2097@gmail.com>"]
-workspace = "../"
+workspace = ".."
+edition = "2018"
 
 [dependencies]
-env_logger = "0.5"
-
-actix = "0.7"
-actix-web = "0.7"
-
+actix-web = { git="https://github.com/actix/actix-web.git", branch = "1.0" }
+env_logger = "0.6"
 futures = "0.1"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-
 juniper = "0.9.2"

juniper/src/main.rs

@@ -1,110 +1,59 @@
 //! Actix web juniper example
 //!
 //! A simple example integrating juniper in actix-web
-extern crate serde;
-extern crate serde_json;
-#[macro_use]
-extern crate serde_derive;
+use std::io;
+use std::sync::Arc;
+
 #[macro_use]
 extern crate juniper;
-extern crate actix;
-extern crate actix_web;
-extern crate env_logger;
-extern crate futures;
 
-use actix::prelude::*;
-use actix_web::{
-    http, middleware, server, App, AsyncResponder, Error, FutureResponse, HttpRequest,
-    HttpResponse, Json, State,
-};
+use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer};
 use futures::future::Future;
 use juniper::http::graphiql::graphiql_source;
 use juniper::http::GraphQLRequest;
 
 mod schema;
 
-use schema::create_schema;
-use schema::Schema;
+use crate::schema::{create_schema, Schema};
 
-struct AppState {
-    executor: Addr<GraphQLExecutor>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct GraphQLData(GraphQLRequest);
-
-impl Message for GraphQLData {
-    type Result = Result<String, Error>;
-}
-
-pub struct GraphQLExecutor {
-    schema: std::sync::Arc<Schema>,
-}
-
-impl GraphQLExecutor {
-    fn new(schema: std::sync::Arc<Schema>) -> GraphQLExecutor {
-        GraphQLExecutor { schema: schema }
-    }
-}
-
-impl Actor for GraphQLExecutor {
-    type Context = SyncContext<Self>;
-}
-
-impl Handler<GraphQLData> for GraphQLExecutor {
-    type Result = Result<String, Error>;
-
-    fn handle(&mut self, msg: GraphQLData, _: &mut Self::Context) -> Self::Result {
-        let res = msg.0.execute(&self.schema, &());
-        let res_text = serde_json::to_string(&res)?;
-        Ok(res_text)
-    }
-}
-
-fn graphiql(_req: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
+fn graphiql() -> HttpResponse {
     let html = graphiql_source("http://127.0.0.1:8080/graphql");
-    Ok(HttpResponse::Ok()
+    HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
-        .body(html))
+        .body(html)
 }
 
 fn graphql(
-    (st, data): (State<AppState>, Json<GraphQLData>),
-) -> FutureResponse<HttpResponse> {
-    st.executor
-        .send(data.0)
-        .from_err()
-        .and_then(|res| match res {
-            Ok(user) => Ok(HttpResponse::Ok()
-                .content_type("application/json")
-                .body(user)),
-            Err(_) => Ok(HttpResponse::InternalServerError().into()),
-        })
-        .responder()
+    st: web::State<Arc<Schema>>,
+    data: web::Json<GraphQLRequest>,
+) -> impl Future<Item = HttpResponse, Error = Error> {
+    web::block(move || {
+        let res = data.execute(&st, &());
+        Ok::<_, serde_json::error::Error>(serde_json::to_string(&res)?)
+    })
+    .map_err(Error::from)
+    .and_then(|user| {
+        Ok(HttpResponse::Ok()
+            .content_type("application/json")
+            .body(user))
+    })
 }
 
-fn main() {
-    ::std::env::set_var("RUST_LOG", "actix_web=info");
+fn main() -> io::Result<()> {
+    std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
-    let sys = actix::System::new("juniper-example");
 
+    // Create Juniper schema
     let schema = std::sync::Arc::new(create_schema());
-    let addr = SyncArbiter::start(3, move || GraphQLExecutor::new(schema.clone()));
 
     // Start http server
-    server::new(move || {
-        App::with_state(AppState {
-            executor: addr.clone(),
-        })
-        // enable logger
-        .middleware(middleware::Logger::default())
-        .resource("/graphql", |r| r.method(http::Method::POST).with(graphql))
-        .resource("/graphiql", |r| r.method(http::Method::GET).h(graphiql))
+    HttpServer::new(move || {
+        App::new()
+            .state(schema.clone())
+            .middleware(middleware::Logger::default())
+            .service(web::resource("/graphql").route(web::post().to_async(graphql)))
+            .service(web::resource("/graphiql").route(web::get().to(graphiql)))
     })
-    .bind("127.0.0.1:8080")
-    .unwrap()
-    .start();
-
-    println!("Started http server: 127.0.0.1:8080");
-    let _ = sys.run();
+    .bind("127.0.0.1:8080")?
+    .run()
 }

middleware/Cargo.toml

@@ -2,7 +2,11 @@
 name = "middleware-example"
 version = "0.1.0"
 authors = ["Gorm Casper <gcasper@gmail.com>"]
+edition = "2018"
+workspace = ".."
 
 [dependencies]
-actix = "0.7"
-actix-web = "0.7"
+actix-service = "0.3.3"
+actix-web = { git="https://github.com/actix/actix-web.git", branch = "1.0" }
+futures = "0.1.25"
+env_logger = "0.6"

middleware/src/main.rs

@@ -1,32 +1,27 @@
-extern crate actix;
-extern crate actix_web;
-
-use actix_web::{server, App};
+use actix_web::{web, App, HttpServer};
 
 #[allow(dead_code)]
 mod redirect;
 #[allow(dead_code)]
 mod simple;
 
-fn main() {
-    let sys = actix::System::new("middleware-example");
+fn main() -> std::io::Result<()> {
+    std::env::set_var("RUST_LOG", "actix_web=debug");
+    env_logger::init();
 
-    let _addr = server::new(|| {
+    HttpServer::new(|| {
         App::new()
+            .middleware(redirect::CheckLogin)
             .middleware(simple::SayHi)
-            // .middleware(redirect::CheckLogin)
-            .resource("/login", |r| {
-                r.f(|_| {
-                    "You are on /login. Go to src/redirect.rs to change this behavior."
-                })
-            })
-            .resource("/", |r| {
-                r.f(|_| "Hello, middleware! Check the console where the server is run.")
-            })
+            .service(web::resource("/login").to(|| {
+                "You are on /login. Go to src/redirect.rs to change this behavior."
+            }))
+            .service(
+                web::resource("/").to(|| {
+                    "Hello, middleware! Check the console where the server is run."
+                }),
+            )
     })
-    .bind("127.0.0.1:8080")
-    .unwrap()
-    .start();
-
-    let _ = sys.run();
+    .bind("127.0.0.1:8080")?
+    .run()
 }

middleware/src/redirect.rs

@@ -1,28 +1,64 @@
-extern crate actix_web;
-
-use actix_web::middleware::{Middleware, Started};
-use actix_web::{http, HttpRequest, HttpResponse, Result};
+use actix_service::{Service, Transform};
+use actix_web::dev::{ServiceRequest, ServiceResponse};
+use actix_web::{http, HttpResponse};
+use futures::future::{ok, Either, FutureResult};
+use futures::Poll;
 
 pub struct CheckLogin;
 
-impl<S> Middleware<S> for CheckLogin {
-    // We only need to hook into the `start` for this middleware.
-    fn start(&self, req: &HttpRequest<S>) -> Result<Started> {
+impl<S, P, B> Transform<S> for CheckLogin
+where
+    S: Service<Request = ServiceRequest<P>, Response = ServiceResponse<B>>,
+    S::Future: 'static,
+{
+    type Request = ServiceRequest<P>;
+    type Response = ServiceResponse<B>;
+    type Error = S::Error;
+    type InitError = ();
+    type Transform = CheckLoginMiddleware<S>;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
+
+    fn new_transform(&self, service: S) -> Self::Future {
+        ok(CheckLoginMiddleware { service })
+    }
+}
+pub struct CheckLoginMiddleware<S> {
+    service: S,
+}
+
+impl<S, P, B> Service for CheckLoginMiddleware<S>
+where
+    S: Service<Request = ServiceRequest<P>, Response = ServiceResponse<B>>,
+    S::Future: 'static,
+{
+    type Request = ServiceRequest<P>;
+    type Response = ServiceResponse<B>;
+    type Error = S::Error;
+    type Future = Either<S::Future, FutureResult<Self::Response, Self::Error>>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        self.service.poll_ready()
+    }
+
+    fn call(&mut self, req: ServiceRequest<P>) -> Self::Future {
+        // We only need to hook into the `start` for this middleware.
+
         let is_logged_in = false; // Change this to see the change in outcome in the browser
 
         if is_logged_in {
-            return Ok(Started::Done);
+            Either::A(self.service.call(req))
+        } else {
+            // Don't forward to /login if we are already on /login
+            if req.path() == "/login" {
+                Either::A(self.service.call(req))
+            } else {
+                Either::B(ok(req.into_response(
+                    HttpResponse::Found()
+                        .header(http::header::LOCATION, "/login")
+                        .finish()
+                        .into_body(),
+                )))
+            }
         }
-
-        // Don't forward to /login if we are already on /login
-        if req.path() == "/login" {
-            return Ok(Started::Done);
-        }
-
-        Ok(Started::Response(
-            HttpResponse::Found()
-                .header(http::header::LOCATION, "/login")
-                .finish(),
-        ))
     }
 }

middleware/src/simple.rs

@@ -1,25 +1,63 @@
-extern crate actix_web;
+use actix_service::{Service, Transform};
+use actix_web::dev::{ServiceRequest, ServiceResponse};
+use futures::future::{ok, FutureResult};
+use futures::{Future, Poll};
 
-use actix_web::middleware::{Finished, Middleware, Response, Started};
-use actix_web::{HttpRequest, HttpResponse, Result};
-
-// Middleware can get called at three stages during the request/response handling. Below is a
-// struct that implements all three of them.
+// There are two step in middleware processing.
+// 1. Middleware initialization, middleware factory get called with
+//    next service in chain as parameter.
+// 2. Middleware's call method get called with normal request.
 pub struct SayHi;
 
-impl<S> Middleware<S> for SayHi {
-    fn start(&self, req: &HttpRequest<S>) -> Result<Started> {
-        println!("Hi from start. You requested: {}", req.path());
-        Ok(Started::Done)
-    }
+// Middleware factory is `Transform` trait from actix-service crate
+// `S` - type of the next service
+// `P` - type of request's payload
+// `B` - type of response's body
+impl<S, P, B> Transform<S> for SayHi
+where
+    S: Service<Request = ServiceRequest<P>, Response = ServiceResponse<B>>,
+    S::Future: 'static,
+    S::Error: 'static,
+    B: 'static,
+{
+    type Request = ServiceRequest<P>;
+    type Response = ServiceResponse<B>;
+    type Error = S::Error;
+    type InitError = ();
+    type Transform = SayHiMiddleware<S>;
+    type Future = FutureResult<Self::Transform, Self::InitError>;
 
-    fn response(&self, _req: &HttpRequest<S>, resp: HttpResponse) -> Result<Response> {
-        println!("Hi from response");
-        Ok(Response::Done(resp))
-    }
-
-    fn finish(&self, _req: &HttpRequest<S>, _resp: &HttpResponse) -> Finished {
-        println!("Hi from finish");
-        Finished::Done
+    fn new_transform(&self, service: S) -> Self::Future {
+        ok(SayHiMiddleware { service })
+    }
+}
+
+pub struct SayHiMiddleware<S> {
+    service: S,
+}
+
+impl<S, P, B> Service for SayHiMiddleware<S>
+where
+    S: Service<Request = ServiceRequest<P>, Response = ServiceResponse<B>>,
+    S::Future: 'static,
+    S::Error: 'static,
+    B: 'static,
+{
+    type Request = ServiceRequest<P>;
+    type Response = ServiceResponse<B>;
+    type Error = S::Error;
+    type Future = Box<Future<Item = Self::Response, Error = Self::Error>>;
+
+    fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+        self.service.poll_ready()
+    }
+
+    fn call(&mut self, req: ServiceRequest<P>) -> Self::Future {
+        println!("Hi from start. You requested: {}", req.path());
+
+        Box::new(self.service.call(req).and_then(|res| {
+            println!("Hi from response");
+            Ok(res)
+        }))
     }
 }