aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2024-01-24 17:29:33 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2024-01-24 17:29:33 +0100
commit67441f813917d0a9c6624ec04ddc08d89ec2b3bc (patch)
tree8071903dc1c6982daa2fd84e2cc867e276c1160e /src
parent82f6ce1b1f003903c0e8ffceafe17682ecd7fb88 (diff)
downloadcats-radio-node-67441f813917d0a9c6624ec04ddc08d89ec2b3bc.tar.gz
cats-radio-node-67441f813917d0a9c6624ec04ddc08d89ec2b3bc.tar.bz2
cats-radio-node-67441f813917d0a9c6624ec04ddc08d89ec2b3bc.zip
Work on chat page
Diffstat (limited to 'src')
-rw-r--r--src/db.rs33
-rw-r--r--src/main.rs16
-rw-r--r--src/ui.rs90
3 files changed, 106 insertions, 33 deletions
diff --git a/src/db.rs b/src/db.rs
index d5285ba..2e07792 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -2,7 +2,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
use std::io;
use log::debug;
-use sqlx::SqlitePool;
+use sqlx::{SqlitePool, sqlite::SqliteRow, Row};
#[derive(Clone)]
pub struct Database {
@@ -10,13 +10,27 @@ pub struct Database {
num_frames_received : u64,
}
-#[derive(sqlx::FromRow, Debug)]
+#[derive(Debug)]
pub struct Packet {
pub id : i64,
- pub received_at : i64,
+ pub received_at: chrono::DateTime<chrono::Utc>,
pub content : Vec<u8>,
}
+impl sqlx::FromRow<'_, SqliteRow> for Packet {
+ fn from_row(row: &SqliteRow) -> Result<Self, sqlx::Error> {
+ Ok(Self {
+ id: row.try_get("id")?,
+ received_at: {
+ let row : i64 = row.try_get("received_at")?;
+ chrono::DateTime::from_timestamp(row, 0).expect("Convert timestamp to chrono")
+ },
+ content: row.try_get("content")?,
+
+ })
+ }
+}
+
impl Database {
pub async fn new() -> Self {
{
@@ -83,4 +97,17 @@ impl Database {
Ok(results)
}
+
+ pub async fn get_packets_since(&mut self, unix_timestamp: i64) -> anyhow::Result<Vec<Packet>> {
+ let results = sqlx::query_as(r#"
+ SELECT id, received_at, content
+ FROM frames_received
+ WHERE received_at > ?1
+ ORDER BY received_at DESC"#)
+ .bind(unix_timestamp)
+ .fetch_all(&self.pool)
+ .await?;
+
+ Ok(results)
+ }
}
diff --git a/src/main.rs b/src/main.rs
index 49ef58e..5eb47e8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,17 +10,11 @@ mod radio;
mod config;
mod ui;
-#[derive(Clone, serde::Serialize)]
-struct WSChatMessage {
- from: String,
- message: String,
-}
-
struct AppState {
conf : config::Config,
db : db::Database,
transmit_queue : mpsc::Sender<Vec<u8>>,
- ws_broadcast : broadcast::Sender<WSChatMessage>,
+ ws_broadcast : broadcast::Sender<ui::UIPacket>,
start_time : chrono::DateTime<chrono::Utc>,
}
@@ -133,9 +127,11 @@ async fn main() -> std::io::Result<()> {
let mut commentbuf = [0u8, 255];
if let Ok(comment) = packet.comment(&mut commentbuf) {
- let m = WSChatMessage {
- from: format!("{}-{}", ident.callsign, ident.ssid),
- message: comment.to_owned()
+ let m = ui::UIPacket {
+ received_at: chrono::Utc::now(),
+ from_callsign: ident.callsign.to_string(),
+ from_ssid: ident.ssid,
+ comment: Some(comment.to_owned())
};
match ws_broadcast.send(m) {
Ok(num) => debug!("Send WS message to {num}"),
diff --git a/src/ui.rs b/src/ui.rs
index cbf493e..5a5e322 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,3 +1,4 @@
+use std::time::{UNIX_EPOCH, SystemTime, Duration};
use std::ops::ControlFlow;
use std::net::SocketAddr;
use std::str::FromStr;
@@ -10,12 +11,12 @@ use axum::{
extract::State,
extract::{ws::{Message, WebSocket, WebSocketUpgrade}, ConnectInfo},
http::StatusCode,
- response::Html,
response::IntoResponse,
routing::{get, post},
};
+use chrono::serde::ts_seconds;
use futures::{StreamExt, SinkExt};
-use log::{debug, info, warn};
+use log::{debug, info, warn, error};
use serde::Deserialize;
use tower_http::services::ServeDir;
@@ -52,6 +53,19 @@ enum ActivePage {
None,
}
+impl ActivePage {
+ // Used by templates/head.html to include the correct js files in <head>
+ fn styles(&self) -> Vec<&'static str> {
+ match self {
+ ActivePage::Dashboard => vec![],
+ ActivePage::Chat => vec!["chat.js"],
+ ActivePage::Send => vec!["send.js"],
+ ActivePage::Settings => vec![],
+ ActivePage::None => vec![],
+ }
+ }
+}
+
#[derive(Template)]
#[template(path = "dashboard.html")]
struct DashboardTemplate<'a> {
@@ -63,8 +77,10 @@ struct DashboardTemplate<'a> {
packets: Vec<UIPacket>,
}
-struct UIPacket {
- pub received_at : i64,
+#[derive(Clone, serde::Serialize)]
+pub struct UIPacket {
+ #[serde(with = "ts_seconds")]
+ pub received_at: chrono::DateTime<chrono::Utc>,
pub from_callsign : String,
pub from_ssid : u8,
@@ -72,20 +88,12 @@ struct UIPacket {
pub comment : Option<String>,
}
-async fn dashboard(State(state): State<SharedState>) -> DashboardTemplate<'static> {
- let (conf, mut db, node_startup_time) = {
- let st = state.lock().unwrap();
- (st.conf.clone(), st.db.clone(), st.start_time.clone())
- };
+impl UIPacket {
+ fn received_at_iso(&self) -> String {
+ self.received_at.to_string()
+ }
- let packets = match db.get_most_recent_packets(10).await {
- Ok(v) => v,
- Err(e) => {
- warn!("Dashboard will have empty packet list: {}", e);
- Vec::new()
- },
- }.iter()
- .filter_map(|db_packet| {
+ fn from_db_packet(db_packet: &crate::db::Packet) -> Option<Self> {
let mut buf = [0; MAX_PACKET_LEN];
match ham_cats::packet::Packet::fully_decode(&db_packet.content, &mut buf) {
Ok(p) => {
@@ -113,7 +121,23 @@ async fn dashboard(State(state): State<SharedState>) -> DashboardTemplate<'stati
None
},
}
- })
+ }
+}
+
+async fn dashboard(State(state): State<SharedState>) -> DashboardTemplate<'static> {
+ let (conf, mut db, node_startup_time) = {
+ let st = state.lock().unwrap();
+ (st.conf.clone(), st.db.clone(), st.start_time.clone())
+ };
+
+ let packets = match db.get_most_recent_packets(10).await {
+ Ok(v) => v,
+ Err(e) => {
+ warn!("Dashboard will have empty packet list: {}", e);
+ Vec::new()
+ },
+ }.iter()
+ .filter_map(|p| UIPacket::from_db_packet(p))
.collect();
let node_startup_time = format!("{} UTC",
@@ -135,13 +159,39 @@ struct ChatTemplate<'a> {
title: &'a str,
page: ActivePage,
conf: config::Config,
+ packets: Vec<UIPacket>,
}
async fn chat(State(state): State<SharedState>) -> ChatTemplate<'static> {
+
+ let (conf, mut db) = {
+ let st = state.lock().unwrap();
+ (st.conf.clone(), st.db.clone())
+ };
+
+ let time_start = SystemTime::now() - Duration::from_secs(6*3600);
+ let timestamp = time_start
+ .duration_since(UNIX_EPOCH)
+ .expect("Time went backwards");
+
+ let timestamp_i64 : i64 = timestamp.as_secs().try_into().unwrap();
+ let packets = match db.get_packets_since(timestamp_i64).await {
+ Ok(packets) => {
+ packets.iter()
+ .filter_map(|p| UIPacket::from_db_packet(p))
+ .collect()
+ },
+ Err(e) => {
+ error!("Failed to get packets since TS: {e}");
+ vec![]
+ }
+ };
+
ChatTemplate {
title: "Chat",
- conf: state.lock().unwrap().conf.clone(),
+ conf,
page: ActivePage::Chat,
+ packets
}
}
@@ -156,7 +206,7 @@ async fn ws_handler(
async fn handle_socket(
mut socket: WebSocket,
- mut rx: tokio::sync::broadcast::Receiver<crate::WSChatMessage>,
+ mut rx: tokio::sync::broadcast::Receiver<UIPacket>,
who: SocketAddr) {
if socket.send(Message::Ping(vec![1, 2, 3])).await.is_ok() {
info!("Pinged {who}...");
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 11:01:27 +0000