lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2024-12-12 13:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement handler calling for serve again, now with extra multithreading

Browse source
This commit is contained in:
Filip Tibell 2023-08-21 20:59:43 -05:00
parent 851589c695
commit 609eba08a8
5 changed files with 192 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lune/builtins/net/mod.rs
View file

@ -15,13 +15,13 @@ use super::serde::{
mod client; mod client;
mod config; mod config;
mod processing;
mod response; mod response;
mod server; mod server;
mod websocket; mod websocket;
use client::{NetClient, NetClientBuilder}; use client::{NetClient, NetClientBuilder};
use config::{RequestConfig, ServeConfig}; use config::{RequestConfig, ServeConfig};
use response::NetServeResponse;
use server::bind_to_localhost; use server::bind_to_localhost;
use websocket::NetWebSocket; use websocket::NetWebSocket;

101
src/lune/builtins/net/processing.rs Normal file
View file

@ -0,0 +1,101 @@
use std::sync::atomic::{AtomicUsize, Ordering};
use hyper::{body::to_bytes, Body, Request};
use mlua::prelude::*;
use crate::lune::util::TableBuilder;
static ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
#[derive(Debug, Clone, Copy)]
pub(super) struct ProcessedRequestId(usize);
impl ProcessedRequestId {
pub fn new() -> Self {
// NOTE: This may overflow after a couple billion requests,
// but that's completely fine... unless a request is still
// alive after billions more arrive and need to be handled
Self(ID_COUNTER.fetch_add(1, Ordering::Relaxed))
}
}
pub(super) struct ProcessedRequest {
id: ProcessedRequestId,
method: String,
path: String,
query: Vec<(String, String)>,
headers: Vec<(String, Vec<u8>)>,
body: Vec<u8>,
}
impl ProcessedRequest {
pub async fn from_request(req: Request<Body>) -> LuaResult<Self> {
let (head, body) = req.into_parts();
// FUTURE: We can do extra processing like async decompression here
let body = match to_bytes(body).await {
Err(_) => return Err(LuaError::runtime("Failed to read request body bytes")),
Ok(b) => b.to_vec(),
};
let method = head.method.to_string().to_ascii_uppercase();
let mut path = head.uri.path().to_string();
if path.is_empty() {
path = "/".to_string();
}
let query = head
.uri
.query()
.unwrap_or_default()
.split('&')
.filter_map(|q| q.split_once('='))
.map(|(k, v)| (k.to_string(), v.to_string()))
.collect();
let mut headers = Vec::new();
let mut header_name = String::new();
for (name_opt, value) in head.headers.into_iter() {
if let Some(name) = name_opt {
header_name = name.to_string();
}
headers.push((header_name.clone(), value.as_bytes().to_vec()))
}
let id = ProcessedRequestId::new();
Ok(Self {
id,
method,
path,
query,
headers,
body,
})
}
pub fn into_lua_table(self, lua: &Lua) -> LuaResult<LuaTable> {
// FUTURE: Make inner tables for query keys that have multiple values?
let query = lua.create_table_with_capacity(0, self.query.len())?;
for (key, value) in self.query.into_iter() {
query.set(key, value)?;
}
let headers = lua.create_table_with_capacity(0, self.headers.len())?;
for (key, value) in self.headers.into_iter() {
headers.set(key, lua.create_string(value)?)?;
}
let body = lua.create_string(self.body)?;
TableBuilder::new(lua)?
.with_value("method", self.method)?
.with_value("path", self.path)?
.with_value("query", query)?
.with_value("headers", headers)?
.with_value("body", body)?
.build_readonly()
}
}

25
src/lune/builtins/net/response.rs
View file

@ -9,7 +9,7 @@ pub enum NetServeResponseKind {
Table, Table,
} }
#[derive(Debug, Clone)] #[derive(Debug)]
pub struct NetServeResponse { pub struct NetServeResponse {
kind: NetServeResponseKind, kind: NetServeResponseKind,
status: u16, status: u16,
@ -81,26 +81,3 @@ impl<'lua> FromLua<'lua> for NetServeResponse {
} }
} }
} }
impl<'lua> IntoLua<'lua> for NetServeResponse {
fn into_lua(self, lua: &'lua Lua) -> LuaResult<LuaValue<'lua>> {
if self.headers.len() > i32::MAX as usize {
return Err(LuaError::ToLuaConversionError {
from: "NetServeResponse",
to: "table",
message: Some("Too many header values".to_string()),
});
}
let body = self.body.map(|b| lua.create_string(b)).transpose()?;
let headers = lua.create_table_with_capacity(0, self.headers.len())?;
for (key, value) in self.headers {
headers.set(key, lua.create_string(&value)?)?;
}
let table = lua.create_table_with_capacity(0, 3)?;
table.set("status", self.status)?;
table.set("headers", headers)?;
table.set("body", body)?;
table.set_readonly(true);
Ok(LuaValue::Table(table))
}
}

130
src/lune/builtins/net/server.rs
View file

@ -1,16 +1,20 @@
use std::{convert::Infallible, net::SocketAddr}; use std::{convert::Infallible, net::SocketAddr, sync::Arc};
use hyper::{ use hyper::{
server::{conn::AddrIncoming, Builder}, server::{conn::AddrIncoming, Builder},
service::{make_service_fn, service_fn}, service::{make_service_fn, service_fn},
Response, Server, Response, Server,
}; };
use mlua::prelude::*; use mlua::prelude::*;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use crate::lune::{scheduler::Scheduler, util::TableBuilder}; use crate::{
lune::{scheduler::Scheduler, util::TableBuilder},
LuneError,
};
use super::config::ServeConfig; use super::{config::ServeConfig, processing::ProcessedRequest, response::NetServeResponse};
pub(super) fn bind_to_localhost(port: u16) -> LuaResult<Builder<AddrIncoming>> { pub(super) fn bind_to_localhost(port: u16) -> LuaResult<Builder<AddrIncoming>> {
let addr = match SocketAddr::try_from(([127, 0, 0, 1], port)) { let addr = match SocketAddr::try_from(([127, 0, 0, 1], port)) {
@ -45,19 +49,43 @@ where
// into our table with the stop function // into our table with the stop function
let (shutdown_tx, mut shutdown_rx) = mpsc::channel::<()>(1); let (shutdown_tx, mut shutdown_rx) = mpsc::channel::<()>(1);
// Spawn a scheduler background task, communicate using mpsc // Communicate between background thread(s) and main lua thread using mpsc
// channels, do any heavy lifting possible in background thread let (tx_request, mut rx_request) = mpsc::channel::<ProcessedRequest>(64);
let (tx_request, mut rx_request) = mpsc::channel::<()>(64);
let (tx_websocket, mut rx_websocket) = mpsc::channel::<()>(64); let (tx_websocket, mut rx_websocket) = mpsc::channel::<()>(64);
let tx_request_arc = Arc::new(tx_request);
let tx_websocket_arc = Arc::new(tx_websocket);
// Create our background service which will accept
// requests, do some processing, then forward to lua
let hyper_make_service = make_service_fn(move |_| {
let tx_request = Arc::clone(&tx_request_arc);
let tx_websocket = Arc::clone(&tx_websocket_arc);
let handler = service_fn(move |req| {
// TODO: Check if we should upgrade to a
// websocket, handle the request differently
let tx_request = Arc::clone(&tx_request);
let tx_websocket = Arc::clone(&tx_websocket);
async move {
let processed = ProcessedRequest::from_request(req).await?;
if (tx_request.send(processed).await).is_err() {
return Err(LuaError::runtime("Lua handler is busy"));
}
// TODO: Wait for response from lua
let res = Response::new("TODO".to_string());
Ok::<_, LuaError>(res)
}
});
async move { Ok::<_, Infallible>(handler) }
});
// Start up our service
sched.spawn(async move { sched.spawn(async move {
let result = builder let result = builder
.serve(make_service_fn(|_| async move { .http1_only(true) // Web sockets can only use http1
Ok::<_, Infallible>(service_fn(|_req| async move { .http1_keepalive(true) // Web sockets must be kept alive
// TODO: Send this request back to lua .serve(hyper_make_service)
let res = Response::new("TODO".to_string());
Ok::<_, Infallible>(res)
}))
}))
.with_graceful_shutdown(async move { .with_graceful_shutdown(async move {
shutdown_rx.recv().await; shutdown_rx.recv().await;
}); });
@ -66,42 +94,58 @@ where
} }
}); });
// Spawn a local thread with access to lua, this will get // Spawn a local thread with access to lua and the same lifetime
// requests and sockets to handle using our lua handlers
sched.spawn_local(async move { sched.spawn_local(async move {
loop { loop {
// Wait for either a request or a websocket to handle,
// if we got neither it means both channels were dropped
// and our server has stopped, either gracefully or panic
let (req, sock) = tokio::select! { let (req, sock) = tokio::select! {
req = rx_request.recv() => (req, None), req = rx_request.recv() => (req, None),
sock = rx_websocket.recv() => (None, sock), sock = rx_websocket.recv() => (None, sock),
}; };
if req.is_none() && sock.is_none() {
break; // NOTE: The closure here is not really necessary, we
} // make the closure so that we can use the `?` operator
if let Some(_req) = req { let handle_req_or_sock = || async {
// TODO: Convert request into lua request struct match (req, sock) {
let thread_id = sched (None, None) => Ok::<_, LuaError>(true),
.push_back(lua, config.handle_request.clone(), ()) (Some(req), _) => {
.expect("Failed to spawn net serve handler"); let req_table = req.into_lua_table(lua)?;
// TODO: Send response back to other thread somehow let req_handler = config.handle_request.clone();
match sched.wait_for_thread(lua, thread_id).await {
Err(e) => eprintln!("Net serve handler error: {e}"), let thread_id = sched.push_back(lua, req_handler, req_table)?;
Ok(v) => println!("Net serve handler result: {v:?}"), let thread_res = sched.wait_for_thread(lua, thread_id).await?;
};
} // TODO: Send response back to other thread somehow
if let Some(_sock) = sock { let handler_res = NetServeResponse::from_lua_multi(thread_res, lua)?;
let handle_web_socket = config
.handle_web_socket Ok(false)
.as_ref() }
.expect("Got web socket but web socket handler is missing"); (_, Some(_sock)) => {
// TODO: Convert request into lua request struct let sock_handler = config
let thread_id = sched .handle_web_socket
.push_back(lua, handle_web_socket.clone(), ()) .as_ref()
.expect("Failed to spawn net websocket handler"); .cloned()
// TODO: Send response back to other thread somehow .expect("Got web socket but web socket handler is missing");
match sched.wait_for_thread(lua, thread_id).await {
Err(e) => eprintln!("Net websocket handler error: {e}"), // TODO: Convert websocket into lua websocket struct, give as args
Ok(v) => println!("Net websocket handler result: {v:?}"), let thread_id = sched.push_back(lua, sock_handler, ())?;
};
// NOTE: Web socket handler does not need to send any
// response back, the websocket upgrade response is
// automatically sent above in the background thread(s)
sched.wait_for_thread(lua, thread_id).await?;
Ok(false)
}
}
};
match handle_req_or_sock().await {
Ok(true) => break,
Ok(false) => continue,
Err(e) => eprintln!("{}", LuneError::from(e)),
} }
} }
}); });

4
tests/net/serve/requests.luau
View file

@ -16,8 +16,8 @@ local thread = task.delay(1, function()
end) end)
local handle = net.serve(PORT, function(request) local handle = net.serve(PORT, function(request)
print("Request:", request) -- print("Request:", request)
print("Responding with", RESPONSE) -- print("Responding with", RESPONSE)
assert(request.path == "/some/path") assert(request.path == "/some/path")
assert(request.query.key == "param2") assert(request.query.key == "param2")
assert(request.query.key2 == "param3") assert(request.query.key2 == "param3")