Cargo.lock

@@ -2995,7 +2995,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.15.5"
+version = "0.15.4"
 dependencies = [
  "itertools",
  "log",
@@ -3010,14 +3010,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.15.5"
+version = "0.15.4"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.15.5"
+version = "0.15.4"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3061,7 +3061,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.15.5"
+version = "0.15.4"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -3071,7 +3071,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.15.5"
+version = "0.15.4"
 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.5"
+version = "0.15.4"
 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.5", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.15.4", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.15.5", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.15.4", path = "../shared", registry = "xinu" }
 linkify = "0.10.0"
 log = "0.4.17"
 lol_html = "2.0.0"

shared/Cargo.toml

@@ -12,6 +12,6 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { version = "0.15.5", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.15.4", 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.5", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.15.4", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.15.5", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.15.4", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"

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("/api/ws", &mut orders.proxy(Msg::WebSocket)),
+        websocket: websocket::init(&mut orders.proxy(Msg::WebSocket)),
     }
 }
 

web/src/websocket.rs

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