test: fix

Author: alexander-akait

client-src/index.js

@@ -25,13 +25,12 @@ const defaultOptions = {
   useErrorOverlay: false,
   useProgress: false,
 };
-const parsedResourceQuery = parseURL();
-
-let options = defaultOptions;
+const parsedResourceQuery = parseURL(__resourceQuery);
+const options = defaultOptions;
 
 // Handle Node.js legacy format and `new URL()`
 if (parsedResourceQuery.query) {
-  options = Object.assign(options, parsedResourceQuery.query);
+  Object.assign(options, parsedResourceQuery.query);
 } else if (parsedResourceQuery.searchParams) {
   const paramsToObject = (entries) => {
     const result = {};
@@ -43,7 +42,7 @@ if (parsedResourceQuery.query) {
     return result;
   };
 
-  options = Object.assign(
+  Object.assign(
     options,
     paramsToObject(parsedResourceQuery.searchParams.entries())
   );

client-src/utils/createSocketURL.js

@@ -32,10 +32,6 @@ function createSocketURL(parsedURL) {
     hostname = self.location.hostname;
   }
 
-  if (!hostname && protocol === 'file:') {
-    hostname = 'localhost';
-  }
-
   // `hostname` can be empty when the script path is relative. In that case, specifying a protocol would result in an invalid URL.
   // When https is used in the app, secure websockets are always necessary because the browser doesn't accept non-secure websockets.
   if (hostname && isInAddrAny && self.location.protocol === 'https:') {
@@ -70,10 +66,11 @@ function createSocketURL(parsedURL) {
   //
   // All of these sock url params are optionally passed in through resourceQuery,
   // so we need to fall back to the default if they are not provided
-  const socketURLHostname = (getURLSearchParam('host') || hostname).replace(
-    /^\[(.*)\]$/,
-    '$1'
-  );
+  const socketURLHostname = (
+    getURLSearchParam('host') ||
+    hostname ||
+    'localhost'
+  ).replace(/^\[(.*)\]$/, '$1');
 
   if (!port || port === '0') {
     port = self.location.port;

test/client/index.test.js

@@ -53,7 +53,7 @@ describe('index', () => {
     });
 
     // createSocketUrl
-    jest.setMock('../../client-src/utils/createSocketUrl.js', () => 'mock-url');
+    jest.setMock('../../client-src/utils/createSocketURL.js', () => 'mock-url');
 
     // issue: https://github.com/jsdom/jsdom/issues/2112
     delete window.location;

test/fixtures/custom-client/CustomSockJSClient.js

@@ -9,7 +9,10 @@ const BaseClient = require('../../../client/clients/BaseClient');
 module.exports = class SockJSClient extends BaseClient {
   constructor(url) {
     super();
-    this.sock = new SockJS(url);
+
+    this.sock = new SockJS(
+      url.replace(/^ws:/i, 'http://').replace(/^wss:/i, 'https://')
+    );
   }
 
   static getClientPath(options) {