refactor: code

Author: alexander-akait

client-src/utils/createSocketURL.js

@@ -32,6 +32,10 @@ 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:') {

client-src/utils/parseURL.js

@@ -29,7 +29,7 @@ function parseURL(resourceQuery) {
         // is to allow parsing of path-relative or protocol-relative URLs,
         // and will have no effect if `scriptSource` is a fully valid URL.
         scriptSourceURL = new URL(scriptSource, self.location.href);
-      } catch (e) {
+      } catch (error) {
         // URL parsing failed, do nothing.
         // We will still proceed to see if we can recover using `resourceQuery`
       }

test/client/clients/SockJSClient.test.js

@@ -74,21 +74,6 @@ describe('SockJSClient', () => {
         done();
       }, 3000);
     });
-
-    it('should change the protocol from chrome-extension to http', (done) => {
-      const client = new SockJSClient('chrome-extension://localhost');
-
-      expect(client.sock.url).toEqual('http://localhost');
-
-      done();
-    });
-
-    it('should change the protocol from file to http', (done) => {
-      const client = new SockJSClient('file://localhost');
-      expect(client.sock.url).toEqual('http://localhost');
-
-      done();
-    });
   });
 
   afterAll((done) => {

test/client/clients/WebsocketClient.test.js

@@ -42,7 +42,7 @@ describe('WebsocketClient', () => {
         }, 1000);
       });
 
-      const client = new WebsocketClient(`http://localhost:${port}/ws-server`);
+      const client = new WebsocketClient(`ws://localhost:${port}/ws-server`);
       const data = [];
 
       client.onOpen(() => {
@@ -68,22 +68,6 @@ describe('WebsocketClient', () => {
         done();
       }, 3000);
     });
-
-    it('should change the protocol from chrome-extension to http', (done) => {
-      const client = new WebsocketClient('chrome-extension://localhost/');
-
-      expect(client.client.url).toEqual('ws://localhost/');
-
-      done();
-    });
-
-    it('should change the protocol from file to http', (done) => {
-      const client = new WebsocketClient('file://localhost/');
-
-      expect(client.client.url).toEqual('ws://localhost/');
-
-      done();
-    });
   });
 
   afterAll((done) => {

test/client/utils/createSocketURL.test.js

@@ -111,18 +111,20 @@ describe("'createSocketURL' function ", () => {
     ['?https://[::1]:8080/', 'http://[::1]:8080/', 'wss://[::1]:8080/ws'],
     [null, 'http://[::1]:8080/', 'ws://[::1]:8080/ws'],
     [null, 'https://[::1]:8080/', 'wss://[::1]:8080/ws'],
-    [null, 'file:///home/user/project/index.html', 'ws:/ws'],
+    [null, 'file:///home/user/project/index.html', 'ws://localhost/ws'],
+    [null, 'chrome-extension://localhost/', 'ws://localhost/ws'],
+    [null, 'file://localhost/', 'ws://localhost/ws'],
   ];
 
   samples.forEach(([__resourceQuery, location, expected]) => {
     jest.doMock('../../../client-src/utils/getCurrentScriptSource', () => () =>
-      location
+      new URL('./entry.js', location).toString()
     );
 
     const createSocketURL = require('../../../client-src/utils/createSocketURL');
     const parseURL = require('../../../client-src/utils/parseURL');
 
-    test.only(`should return '${expected}' socket URL when '__resourceQuery' is '${__resourceQuery}' and 'self.location' is '${location}'`, () => {
+    test(`should return '${expected}' socket URL when '__resourceQuery' is '${__resourceQuery}' and 'self.location' is '${location}'`, () => {
       const selfLocation = new URL(location);
 
       delete window.location;