From 6b03fb84c5ee8f1062450778d3370f4fae170cf0 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 9 Jan 2022 21:14:15 -0500 Subject: [PATCH] OBS WIP --- .../obs_gateway_websocket_handler.rs | 38 ++++++++++--------- static/websocket_test.js | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs b/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs index d89580dc81..4839f1bb38 100644 --- a/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs +++ b/crates/app/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs @@ -135,29 +135,33 @@ impl StreamHandler> for ObsGatewayWebSock //let res = rx.recv().unwrap(); - let handle = Handle::current(); + //let handle = Handle::current(); - handle.spawn(async move { - //error!("Twitch PubSub Try read next..."); - //match client2.try_next().await { - // Ok(r) => { - // error!("Twitch PubSub Result: {:?}", r); - // }, - // Err(e) => { - // warn!("pubsub error: {:?}", e); - // } - //} - loop { - info!("thread loop"); - sleep(Duration::from_millis(1000)); - } - }); + //handle.spawn(async move { + // //error!("Twitch PubSub Try read next..."); + // //match client2.try_next().await { + // // Ok(r) => { + // // error!("Twitch PubSub Result: {:?}", r); + // // }, + // // Err(e) => { + // // warn!("pubsub error: {:?}", e); + // // } + // //} + // loop { + // info!("thread loop"); + // sleep(Duration::from_millis(1000)); + // } + //}); info!("after thread spawn"); + info!("process message: {:?}", &msg); match msg { - ws::Message::Text(text) => ctx.text(text), + ws::Message::Text(text) => { + info!("sending text response"); + ctx.text("hello from Rust") + }, ws::Message::Binary(bin) => ctx.binary(bin), ws::Message::Ping(bytes) => ctx.pong(&bytes), ws::Message::Close(reason) => { diff --git a/static/websocket_test.js b/static/websocket_test.js index c646feb927..fac4d5a6e3 100644 --- a/static/websocket_test.js +++ b/static/websocket_test.js @@ -21,7 +21,7 @@ setInterval(() => { console.log('sending browser message to server on interval'); - sock.send('interval trigger'); + sock.send('interval trigger from browser'); }, 2000); //setTimeout(() => {