michael/mlua
michael
/
mlua
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use unstable features in examples

This commit is contained in:
Alex Orlenko 2022-12-30 13:39:27 +00:00
parent d67332a3ac
commit 2cb4b49d0d
No known key found for this signature in database
GPG Key ID: 4C150C250863B96D
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -91,7 +91,7 @@ required-features = ["async", "serialize", "macros"]
[[example]] [[example]]
name = "async_http_server" name = "async_http_server"
required-features = ["async", "macros", "unstable"] required-features = ["async", "macros"]
[[example]] [[example]]
name = "async_tcp_server" name = "async_tcp_server"

32
examples/async_http_server.rs
View File

@ -1,6 +1,7 @@
use std::future::Future; use std::future::Future;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::pin::Pin; use std::pin::Pin;
use std::rc::Rc;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use hyper::server::conn::AddrStream; use hyper::server::conn::AddrStream;
@ -8,8 +9,7 @@ use hyper::service::Service;
use hyper::{Body, Request, Response, Server}; use hyper::{Body, Request, Response, Server};
use mlua::{ use mlua::{
chunk, Error as LuaError, Function, Lua, OwnedFunction, String as LuaString, Table, UserData, chunk, Error as LuaError, Function, Lua, String as LuaString, Table, UserData, UserDataMethods,
UserDataMethods,
}; };
struct LuaRequest(SocketAddr, Request<Body>); struct LuaRequest(SocketAddr, Request<Body>);
@ -21,10 +21,7 @@ impl UserData for LuaRequest {
} }
} }
#[derive(Clone)] pub struct Svc(Rc<Lua>, SocketAddr);
struct Handler(OwnedFunction);
pub struct Svc(Handler, SocketAddr);
impl Service<Request<Body>> for Svc { impl Service<Request<Body>> for Svc {
type Response = Response<Body>; type Response = Response<Body>;
@ -37,10 +34,11 @@ impl Service<Request<Body>> for Svc {
fn call(&mut self, req: Request<Body>) -> Self::Future { fn call(&mut self, req: Request<Body>) -> Self::Future {
// If handler returns an error then generate 5xx response // If handler returns an error then generate 5xx response
let handler = self.0.clone(); let lua = self.0.clone();
let lua_req = LuaRequest(self.1, req); let lua_req = LuaRequest(self.1, req);
Box::pin(async move { Box::pin(async move {
match handler.0.to_ref().call_async::<_, Table>(lua_req).await { let handler: Function = lua.named_registry_value("http_handler")?;
match handler.call_async::<_, Table>(lua_req).await {
Ok(lua_resp) => { Ok(lua_resp) => {
let status = lua_resp.get::<_, Option<u16>>("status")?.unwrap_or(200); let status = lua_resp.get::<_, Option<u16>>("status")?.unwrap_or(200);
let mut resp = Response::builder().status(status); let mut resp = Response::builder().status(status);
@ -74,10 +72,10 @@ impl Service<Request<Body>> for Svc {
#[tokio::main(flavor = "current_thread")] #[tokio::main(flavor = "current_thread")]
async fn main() { async fn main() {
let lua = Lua::new(); let lua = Rc::new(Lua::new());
// Create Lua handler function // Create Lua handler function
let handler_fn: Function = lua let handler: Function = lua
.load(chunk! { .load(chunk! {
function(req) function(req)
return { return {
@ -93,10 +91,12 @@ async fn main() {
.eval() .eval()
.expect("cannot create Lua handler"); .expect("cannot create Lua handler");
// Store it in the Registry
lua.set_named_registry_value("http_handler", handler)
.expect("cannot store Lua handler");
let addr = ([127, 0, 0, 1], 3000).into(); let addr = ([127, 0, 0, 1], 3000).into();
let server = Server::bind(&addr) let server = Server::bind(&addr).executor(LocalExec).serve(MakeSvc(lua));
.executor(LocalExec)
.serve(MakeSvc(Handler(handler_fn.into_owned())));
println!("Listening on http://{}", addr); println!("Listening on http://{}", addr);
@ -105,7 +105,7 @@ async fn main() {
local.run_until(server).await.expect("cannot run server") local.run_until(server).await.expect("cannot run server")
} }
struct MakeSvc(Handler); struct MakeSvc(Rc<Lua>);
impl Service<&AddrStream> for MakeSvc { impl Service<&AddrStream> for MakeSvc {
type Response = Svc; type Response = Svc;
@ -117,9 +117,9 @@ impl Service<&AddrStream> for MakeSvc {
} }
fn call(&mut self, stream: &AddrStream) -> Self::Future { fn call(&mut self, stream: &AddrStream) -> Self::Future {
let handler = self.0.clone(); let lua = self.0.clone();
let remote_addr = stream.remote_addr(); let remote_addr = stream.remote_addr();
Box::pin(async move { Ok(Svc(handler, remote_addr)) }) Box::pin(async move { Ok(Svc(lua, remote_addr)) })
} }
} }