lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-04 10:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Spruce up error handling

Browse source
This commit is contained in:
Marin Minnerly 2024-01-15 12:23:26 -08:00
parent 0fc228042b
commit 6080f86723
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,8 @@ use client::{NetClient, NetClientBuilder};
use config::{RequestConfig, ServeConfig};
use websocket::NetWebSocket;
const DEFAULT_IP_ADDRESS: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1);
pub fn create(lua: &'static Lua) -> LuaResult<LuaTable> {
NetClientBuilder::new()
.headers(&[("User-Agent", create_user_agent_header())])?
@ -142,14 +144,21 @@ where
.app_data_ref::<&Scheduler>()
.expect("Lua struct is missing scheduler");
let address_pattern = Regex::new(r"(?:.*:\/\/)?([\d\.]+)(?::\d+)?").unwrap();
let address_pattern = Regex::new(r"(?:.*:\/\/)?(\d+\.\d+\.\d+\.\d+)(?::\d+)?").unwrap();
let address = match &config.address {
let address: Ipv4Addr = match &config.address {
Some(addr) => {
let caps = address_pattern.captures(addr.to_str()?).unwrap();
caps[1].parse::<Ipv4Addr>()?
let addr_str = addr.to_str()?;
if let Some(caps) = address_pattern.captures(addr_str) {
caps[1].parse::<Ipv4Addr>()?
} else {
return Err(LuaError::runtime(format!(
"IP address format is incorrect (expected an IP in the form 'http://0.0.0.0' or '0.0.0.0', got '{addr_str}')"
)));
}
}
None => Ipv4Addr::new(127, 0, 0, 1),
None => DEFAULT_IP_ADDRESS,
};
let builder = bind_to_addr(address, port)?;