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 a735ab214a..d89580dc81 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 @@ -20,25 +20,25 @@ pub async fn obs_gateway_websocket_handler( server_state: web::Data>, stream: web::Payload, ) -> Result { - error!(">>>>>> obs_ws_index"); + info!(">>>>>> obs_ws_index"); let mut client = PollingTwitchWebsocketClient::new().unwrap(); - error!("Connecting to Twitch PubSub..."); + info!("Connecting to Twitch PubSub..."); client.connect().await.unwrap(); - error!("Connected to Twitch PubSub"); + info!("Connected to Twitch PubSub"); //println!("Starting polling thread..."); //client.start_ping_thread().await; - error!("Sending Twitch PubSub PING..."); + info!("Sending Twitch PubSub PING..."); client.send_ping().await.unwrap(); - error!("Try read next from Twitch PubSub..."); + info!("Try read next from Twitch PubSub..."); let r = client.try_next().await.unwrap(); - error!("Twitch PubSub Result: {:?}", r); + info!("Twitch PubSub Result: {:?}", r); // User: vocodes //let user_id = 652567283; @@ -65,7 +65,7 @@ pub async fn obs_gateway_websocket_handler( let auth_token = server_state.twitch_oauth_temp.temp_oauth_access_token.clone(); - error!("Begin TwitchPubSub LISTEN on authenticated OAuth topics..."); + info!("Begin TwitchPubSub LISTEN on authenticated OAuth topics..."); client.listen(&auth_token, &topics).await.unwrap(); @@ -76,7 +76,7 @@ pub async fn obs_gateway_websocket_handler( //let res = rx.recv().unwrap(); - error!("Begin Javascript WebSocket..."); + info!("Begin Javascript WebSocket..."); let websocket = ObsGatewayWebSocket::new(client); ws::start(websocket, &request, stream) @@ -102,7 +102,7 @@ impl Actor for ObsGatewayWebSocket { type Context = ws::WebsocketContext; fn started(&mut self, _ctx: &mut Self::Context) { - error!(">>>>>> obs actor started"); + info!(">>>>>> obs actor started"); } } @@ -113,7 +113,7 @@ impl StreamHandler> for ObsGatewayWebSock ctx: &mut Self::Context, ) { if let Ok(msg) = msg { - error!(">>>>>> obs streamhandler::handle (msg = {:?})", msg); + info!(">>>>>> obs streamhandler::handle (msg = {:?})", msg); //let (tx, rx) = crossbeam::channel::bounded(1); //let handle = Handle::current(); @@ -148,11 +148,13 @@ impl StreamHandler> for ObsGatewayWebSock // } //} loop { - info!("Thread loop"); + info!("thread loop"); sleep(Duration::from_millis(1000)); } }); + info!("after thread spawn"); + match msg { ws::Message::Text(text) => ctx.text(text), diff --git a/static/websocket_test.js b/static/websocket_test.js index 98bb5940fd..c646feb927 100644 --- a/static/websocket_test.js +++ b/static/websocket_test.js @@ -8,16 +8,27 @@ sock.onopen = function (event) { console.log('on open event', event); - sock.send('on open message from client'); + sock.send('on open message from browser'); }; sock.onmessage = function (event) { console.log('on message event', event.data); } + sock.onerror = function(event) { + console.log('on error event', event.data); + } + setInterval(() => { - console.log('sending message to server on interval'); + console.log('sending browser message to server on interval'); sock.send('interval trigger'); }, 2000); + //setTimeout(() => { + // console.log('disconnect') + // const normal_close = 1000; + // sock.close(normal_close, 'close'); + // + //}, 10000) + })(); \ No newline at end of file