fix(js): Allow JS to use custom WebSocket implementation

Kitware · Jun 29, 2023 · f7fad26 · f7fad26
1 parent b82483b
commit f7fad26
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/js/src/SmartConnect/index.js b/js/src/SmartConnect/index.js
@@ -48,6 +48,7 @@ function wsConnect(publicAPI, model) {
     urls: model.config.sessionURL,
     secret: model.config.secret,
     retry: model.config.retry,
+    wsProxy: model.config.iframe || model.config.wsProxy,
   });
   model.subscriptions.push(
     wsConnection.onConnectionReady(publicAPI.readyForwarder)
@@ -137,7 +138,7 @@ function smartConnect(publicAPI, model) {
   function cleanUp(timeout) {
     if (session) {
       if (timeout > 0) {
-        session.call("application.exit.later", [timeout]);
+        session.call('application.exit.later', [timeout]);
       }
       session.close();
     }

diff --git a/js/src/WebsocketConnection/index.js b/js/src/WebsocketConnection/index.js
@@ -53,7 +53,11 @@ function WebsocketConnection(publicAPI, model) {
       }
     }
     try {
-      model.connection = new WebSocket(transports[0].url);
+      if (model.wsProxy) {
+        model.connection = new WSLINK.WebSocket(transports[0].url);
+      } else {
+        model.connection = new WebSocket(transports[0].url);
+      }
     } catch (err) {
       // If the server isn't running, we still don't enter here on Chrome -
       // console shows a net::ERR_CONNECTION_REFUSED error inside WebSocket
@@ -111,7 +115,7 @@ function WebsocketConnection(publicAPI, model) {
       model.session &&
       timeout > 0
     ) {
-      model.session.call("application.exit.later", [timeout]);
+      model.session.call('application.exit.later', [timeout]);
     }
     if (model.connection) {
       model.connection.close();
@@ -127,6 +131,7 @@ const DEFAULT_VALUES = {
   connection: null,
   session: null,
   retry: false,
+  wsProxy: false, // Use WSLINK.WebSocket if true else native WebSocket
 };
 
 export function extend(publicAPI, model, initialValues = {}) {