From 714d6c96b4484a362c25482873f8006b32858525 Mon Sep 17 00:00:00 2001 From: Matthew Tancik Date: Fri, 11 Nov 2022 15:11:36 -0800 Subject: [PATCH] Dont crash on invalid websocket (#949) --- .../viewer/app/src/modules/WebSocket/WebSocket.jsx | 10 ++++++++-- .../viewer/app/src/modules/WebSocketUrlField.jsx | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/nerfstudio/viewer/app/src/modules/WebSocket/WebSocket.jsx b/nerfstudio/viewer/app/src/modules/WebSocket/WebSocket.jsx index 0ac088ea9..0e265ef60 100644 --- a/nerfstudio/viewer/app/src/modules/WebSocket/WebSocket.jsx +++ b/nerfstudio/viewer/app/src/modules/WebSocket/WebSocket.jsx @@ -23,7 +23,11 @@ export default function WebSocketContextFunction({ children }) { const connect = () => { // of the form wss://ip_address:port console.log(websocket_url); - socket = new WebSocket(websocket_url); + try { + socket = new WebSocket(websocket_url); + } catch (error) { + socket = new WebSocket('ws://localhost:7007'); + } socket.binaryType = 'arraybuffer'; socket.onopen = () => { dispatch({ @@ -56,7 +60,9 @@ export default function WebSocketContextFunction({ children }) { useEffect(() => { // cleanup function to close the websocket on rerender return () => { - socket.close(); + if (socket !== null) { + socket.close(); + } }; }, [websocket_url]); diff --git a/nerfstudio/viewer/app/src/modules/WebSocketUrlField.jsx b/nerfstudio/viewer/app/src/modules/WebSocketUrlField.jsx index 4dcec3376..f93b528fc 100644 --- a/nerfstudio/viewer/app/src/modules/WebSocketUrlField.jsx +++ b/nerfstudio/viewer/app/src/modules/WebSocketUrlField.jsx @@ -19,6 +19,16 @@ export default function WebSocketUrlField() { }); }; + const testWebSocket = (url) => { + try { + // eslint-disable-next-line no-new + new WebSocket(url); + return false; + } catch (error) { + return true; + } + }; + return (
viewer.nerf.studio?websocket_url={websocket_url}