chore: Release

Cargo.lock

@@ -2995,7 +2995,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.15.1"
+version = "0.15.7"
 dependencies = [
  "itertools",
  "log",
@@ -3010,14 +3010,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.15.1"
+version = "0.15.7"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.15.1"
+version = "0.15.7"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3061,7 +3061,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.15.1"
+version = "0.15.7"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -3071,7 +3071,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.15.1"
+version = "0.15.7"
 dependencies = [
  "build-info",
  "build-info-build",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.15.1"
+version = "0.15.7"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

server/Cargo.toml

@@ -27,8 +27,8 @@ css-inline = "0.14.0"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
-letterbox-notmuch = { version = "0.15.1", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.15.7", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.15.1", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.15.7", path = "../shared", registry = "xinu" }
 linkify = "0.10.0"
 log = "0.4.17"
 lol_html = "2.0.0"

server/src/bin/letterbox-server.rs

@@ -8,10 +8,10 @@ use async_graphql_axum::{GraphQL, GraphQLSubscription};
 //allows to extract the IP of connecting user
 use axum::extract::connect_info::ConnectInfo;
 use axum::{
-    extract::{self, ws::WebSocketUpgrade, State},
+    extract::{self, ws::WebSocketUpgrade, Query, State},
     http::{header, StatusCode},
     response::{self, IntoResponse, Response},
-    routing::{any, get},
+    routing::{any, get, post},
     Router,
 };
 use cacher::FilesystemCacher;
@@ -25,6 +25,7 @@ use letterbox_server::{
     ws::ConnectionTracker,
 };
 use letterbox_shared::WebsocketMessage;
+use serde::Deserialize;
 use sqlx::postgres::PgPool;
 use tokio::{net::TcpListener, sync::Mutex};
 use tower_http::trace::{DefaultMakeSpan, TraceLayer};
@@ -157,20 +158,33 @@ async fn start_ws(
         connection_tracker, ..
     }): State<AppState>,
 ) -> impl IntoResponse {
+    info!("intiating websocket connection for {addr}");
     ws.on_upgrade(async move |socket| connection_tracker.lock().await.add_peer(socket, addr).await)
 }
-#[axum_macros::debug_handler]
+
-async fn test_handler(
+#[derive(Debug, Deserialize)]
+struct NotificationParams {
+    delay_ms: Option<u64>,
+}
+
+async fn send_refresh_websocket_handler(
     State(AppState {
         connection_tracker, ..
     }): State<AppState>,
+    params: Query<NotificationParams>,
 ) -> impl IntoResponse {
+    info!("send_refresh_websocket_handler params {params:?}");
+    if let Some(delay_ms) = params.delay_ms {
+        let delay = Duration::from_millis(delay_ms);
+        info!("sleeping {delay:?}");
+        tokio::time::sleep(delay).await;
+    }
     connection_tracker
         .lock()
         .await
         .send_message_all(WebsocketMessage::RefreshMessages)
         .await;
-    "test triggered"
+    "refresh triggered"
 }
 
 async fn watch_new(
@@ -237,26 +251,29 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let connection_tracker = Arc::new(Mutex::new(ConnectionTracker::default()));
     let ct = Arc::clone(&connection_tracker);
-    let poll_time = Duration::from_secs(10);
+    let poll_time = Duration::from_secs(60);
     let _h = tokio::spawn(watch_new(nm.clone(), pool, ct, poll_time));
 
-    let app = Router::new()
+    let api_routes = Router::new()
-        .route("/test", get(test_handler))
         .route(
-            "/api/download/attachment/{id}/{idx}/{*rest}",
+            "/download/attachment/{id}/{idx}/{*rest}",
             get(download_attachment),
         )
+        .route("/view/attachment/{id}/{idx}/{*rest}", get(view_attachment))
+        .route("/cid/{id}/{cid}", get(view_cid))
+        .route("/ws", any(start_ws))
+        .route_service("/graphql/ws", GraphQLSubscription::new(schema.clone()))
         .route(
-            "/api/view/attachment/{id}/{idx}/{*rest}",
+            "/graphql/",
-            get(view_attachment),
-        )
-        .route("/api/cid/{id}/{cid}", get(view_cid))
-        .route("/api/ws", any(start_ws))
-        .route_service("/api/graphql/ws", GraphQLSubscription::new(schema.clone()))
-        .route(
-            "/api/graphql/",
             get(graphiql).post_service(GraphQL::new(schema.clone())),
-        )
+        );
+
+    let notification_routes = Router::new()
+        .route("/mail", post(send_refresh_websocket_handler))
+        .route("/news", post(send_refresh_websocket_handler));
+    let app = Router::new()
+        .nest("/api", api_routes)
+        .nest("/notification", notification_routes)
         .with_state(AppState {
             nm,
             connection_tracker,

shared/Cargo.toml

@@ -12,6 +12,6 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { version = "0.15.1", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.15.7", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }
 strum_macros = "0.27.1"

web/Cargo.toml

@@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.13.1", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.15.1", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.15.7", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.15.1", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.15.7", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"

web/Trunk.toml

@@ -13,6 +13,9 @@ backend = "ws://localhost:9345/api/ws"
 [[proxy]]
 backend = "http://localhost:9345/api/"
 
+[[proxy]]
+backend = "http://localhost:9345/notification/"
+
 [[hooks]]
 stage = "pre_build"
 command = "printf"

web/src/state.rs

@@ -62,7 +62,7 @@ pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
         },
         catchup: None,
         last_url: Url::current(),
-        websocket: websocket::init(&mut orders.proxy(Msg::WebSocket)),
+        websocket: websocket::init("/api/ws", &mut orders.proxy(Msg::WebSocket)),
     }
 }
 

web/src/view/mod.rs

@@ -541,13 +541,19 @@ fn search_toolbar(
                 tw_classes::button(),
                 IF!(!pager.has_previous_page => attrs!{ At::Disabled=>true }),
                 "<",
-                IF!(pager.has_previous_page => ev(Ev::Click, |_| Msg::PreviousPage)),
+                IF!(pager.has_previous_page => ev(
+                    Ev::Click, |_| Msg::MultiMsg(vec![
+                        Msg::ScrollToTop,
+                        Msg::PreviousPage]))),
             ],
             button![
                 tw_classes::button(),
                 IF!(!pager.has_next_page => attrs!{ At::Disabled=>true }),
                 ">",
-                IF!(pager.has_next_page => ev(Ev::Click, |_| Msg::NextPage))
+                IF!(pager.has_next_page => ev(
+                    Ev::Click, |_| Msg::MultiMsg(vec![
+                        Msg::ScrollToTop,
+                        Msg::NextPage])))
             ]
         ]
     ]

web/src/websocket.rs

@@ -78,13 +78,14 @@ pub struct ClientMessage {
 
 //const WS_URL: &str = "wss://9000.z.xinu.tv/api/ws";
 //const WS_URL: &str = "wss://9345.z.xinu.tv/api/graphql/ws";
-const WS_URL: &str = "wss://6758.z.xinu.tv/api/ws";
+//const WS_URL: &str = "wss://6758.z.xinu.tv/api/ws";
 
 // ------ ------
 //     Model
 // ------ ------
 
 pub struct Model {
+    ws_url: String,
     web_socket: EventClient,
     web_socket_reconnector: Option<StreamHandle>,
     pub updates: VecDeque<WebsocketMessage>,
@@ -94,9 +95,10 @@ pub struct Model {
 //     Init
 // ------ ------
 
-pub fn init(orders: &mut impl Orders<Msg>) -> Model {
+pub fn init(ws_url: &str, orders: &mut impl Orders<Msg>) -> Model {
     Model {
-        web_socket: create_websocket(orders).unwrap(),
+        ws_url: ws_url.to_string(),
+        web_socket: create_websocket(ws_url, orders).unwrap(),
         web_socket_reconnector: None,
         updates: VecDeque::new(),
     }
@@ -155,7 +157,7 @@ Reason: {2}
         }
         Msg::ReconnectWebSocket(retries) => {
             info!("Reconnect attempt: {}", retries);
-            model.web_socket = create_websocket(orders).unwrap();
+            model.web_socket = create_websocket(&model.ws_url, orders).unwrap();
         }
         Msg::SendMessage(msg) => {
             let txt = serde_json::to_string(&msg).unwrap();
@@ -164,10 +166,10 @@ Reason: {2}
     }
 }
 
-fn create_websocket(orders: &impl Orders<Msg>) -> Result<EventClient, WebSocketError> {
+fn create_websocket(url: &str, orders: &impl Orders<Msg>) -> Result<EventClient, WebSocketError> {
     let msg_sender = orders.msg_sender();
 
-    let mut client = EventClient::new(WS_URL)?;
+    let mut client = EventClient::new(url)?;
 
     client.set_on_error(Some(Box::new(|error| {
         gloo_console::error!("WS: ", error);