arkitu/pico-website
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Arkitu 2025-05-02 00:37:11 +02:00
parent b90c978a38
commit e6bc8561d4
6 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/apps/chat.html
View File

@ -33,19 +33,14 @@
<form id="login-page">
Enter your name :
<input
id="username"
name="username"
type="text"
autocomplete="username"
minlength="3"
maxlength="16"
required
/>
<button
hx-get="/chat/connect"
hx-include="#username"
hx-target="#login-page"
hx-swap="outerHTML"
>
<button hx-post="/chat" hx-target="#login-page" hx-swap="outerHTML">
Connect
</button>
</form>

33
src/apps/chat.rs
View File

@ -1,10 +1,10 @@
use core::fmt::Write;
use core::{fmt::Write, str::from_utf8};
use heapless::{String, Vec};
use log::info;
use pico_website::unwrap;
use ringbuffer::{ConstGenericRingBuffer, RingBuffer};
use crate::socket::HttpResCode;
use crate::socket::{HttpRequestType, HttpResCode};
use super::App;
@ -47,16 +47,21 @@ impl App for ChatApp {
fn socket_name(&self) -> &'static str {
"chat"
}
async fn handle_request<'a>(&'a mut self, path: &str) -> (HttpResCode, &'static str, &'a [u8]) {
match path {
"/" | "/index" | "/index.html" | "/chat" | "/chat.html" => {
async fn handle_request<'a>(
&'a mut self,
path: &str,
req_type: HttpRequestType,
content: &str,
) -> (HttpResCode, &'static str, &'a [u8]) {
match (req_type, path) {
(HttpRequestType::Get, "/" | "/index" | "/index.html" | "/chat" | "/chat.html") => {
(HttpResCode::Ok, "html", include_bytes!("./chat.html"))
}
path => {
(req_type, path) => {
let (path, args) = path.split_once('?').unwrap_or((path, ""));
let mut load = None;
let mut username = None;
for arg in args.split('&') {
for arg in args.split('&').chain(content.split('&')) {
match arg.split_once('=') {
Some(("load", n)) => {
let n: u16 = match n.parse() {
@ -76,18 +81,22 @@ impl App for ChatApp {
_ => {}
}
}
if path == "/chat" && username.is_some() {
return (
HttpResCode::Ok,
"html",
self.res_buf.clear();
unwrap(write!(
&mut self.res_buf,
"<div \
class=\"message\" \
hx-get=\"/chat/message/abs/0?load=\" \
hx-get=\"/chat/message/abs/0?load={}\" \
hx-target=\"this\" \
hx-swap=\"outerHTML\" \
hx-trigger=\"load\" \
></div>",
);
MEMORY_SIZE
))
.await;
return (HttpResCode::Ok, "html", &self.res_buf);
} else if path.starts_with("/chat/message/abs/") && path.len() > 18 {
let msg_id: u16 = match path[18..].parse() {
Ok(n) => n,

9
src/apps/index.rs
View File

@ -1,4 +1,4 @@
use crate::socket::HttpResCode;
use crate::socket::{HttpRequestType, HttpResCode};
use super::App;
@ -7,7 +7,12 @@ impl App for IndexApp {
fn socket_name(&self) -> &'static str {
"index"
}
async fn handle_request<'a>(&'a mut self, path: &str) -> (HttpResCode, &'static str, &'a [u8]) {
async fn handle_request<'a>(
&'a mut self,
path: &str,
_req_type: HttpRequestType,
_content: &str,
) -> (HttpResCode, &'static str, &'a [u8]) {
match path {
"/" | "/index" | "/index.html" => {
(HttpResCode::Ok, "html", include_bytes!("./index.html"))

9
src/apps/mod.rs
View File

@ -1,4 +1,4 @@
use crate::socket::HttpResCode;
use crate::socket::{HttpRequestType, HttpResCode};
pub mod chat;
pub mod index;
@ -6,5 +6,10 @@ pub mod ttt;
pub trait App {
fn socket_name(&self) -> &'static str;
async fn handle_request<'a>(&'a mut self, path: &str) -> (HttpResCode, &'static str, &'a [u8]);
async fn handle_request<'a>(
&'a mut self,
path: &str,
req_type: HttpRequestType,
content: &str,
) -> (HttpResCode, &'static str, &'a [u8]);
}

9
src/apps/ttt.rs
View File

@ -5,7 +5,7 @@ use heapless::Vec;
use pico_website::unwrap;
use portable_atomic::{AtomicBool, AtomicU32};
use crate::socket::HttpResCode;
use crate::socket::{HttpRequestType, HttpResCode};
use super::App;
@ -154,7 +154,12 @@ impl App for TttApp {
fn socket_name(&self) -> &'static str {
self.team.name()
}
async fn handle_request<'a>(&'a mut self, path: &str) -> (HttpResCode, &'static str, &'a [u8]) {
async fn handle_request<'a>(
&'a mut self,
path: &str,
_req_type: HttpRequestType,
_content: &str,
) -> (HttpResCode, &'static str, &'a [u8]) {
match path {
"/" | "/index" | "/index.html" | "/ttt" | "/ttt.html" => {
(HttpResCode::Ok, "html", include_bytes!("./ttt.html"))

53
src/socket.rs
View File

@ -64,41 +64,31 @@ pub async fn listen_task(stack: embassy_net::Stack<'static>, mut app: impl App,
}
};
let mut headers: &[u8] = &buf[..n];
let mut _content: &[u8] = &[];
for i in 0..(n - 1) {
if &buf[i..i + 1] == b"\r\n" {
headers = &buf[0..i];
if i + 2 < n {
_content = &buf[i + 2..n];
}
}
let (headers, content) = match from_utf8(&buf[..n]) {
Ok(b) => match b.split_once("\r\n\r\n") {
Some(t) => t,
None => (b, ""),
},
Err(_) => {
warn!("Non utf8 http request");
break;
}
};
let mut headers = headers.split(|x| *x == b'\n');
let (request_type, path) = match headers.next() {
// let mut headers = headers.split(|x| *x == b'\n');
let (request_type, path) = match headers.lines().next() {
None => {
warn!("Empty request");
break;
}
Some(l1) => {
let mut l1 = l1.split(|x| *x == b' ');
let mut l1 = l1.split(' ');
(
match l1.next() {
Some(b"GET") => HttpRequestType::Get,
Some(b"POST") => HttpRequestType::Post,
Some("GET") => HttpRequestType::Get,
Some("POST") => HttpRequestType::Post,
Some(t) => {
match from_utf8(t) {
Ok(t) => {
warn!("Unknown request type : {}", t);
}
Err(e) => {
warn!(
"Error while parsing request type : {}\nRaw type : {:?}",
e, t
);
}
}
break;
}
None => {
@ -107,16 +97,7 @@ pub async fn listen_task(stack: embassy_net::Stack<'static>, mut app: impl App,
}
},
match l1.next() {
Some(path) => match from_utf8(path) {
Ok(p) => p,
Err(e) => {
warn!(
"Error while parsing requested path : {}\nRaw path : {:?}",
e, path
);
break;
}
},
Some(path) => path,
None => {
warn!("No path");
break;
@ -143,7 +124,7 @@ pub async fn listen_task(stack: embassy_net::Stack<'static>, mut app: impl App,
#[cfg(not(debug_assertions))]
include_bytes!("../static/htmx.min.js"),
),
p => app.handle_request(p).await,
p => app.handle_request(p, request_type, content).await,
};
res_head_buf.clear();
@ -179,7 +160,7 @@ pub async fn listen_task(stack: embassy_net::Stack<'static>, mut app: impl App,
}
#[derive(Clone, Copy, Debug)]
enum HttpRequestType {
pub enum HttpRequestType {
Get,
Post,
}