Merge branch 'master' into refactor/cli-flags

Author: snitin315

client-src/clients/SockJSClient.js

@@ -7,7 +7,8 @@ const BaseClient = require('./BaseClient');
 module.exports = class SockJSClient extends BaseClient {
   constructor(url) {
     super();
-    this.sock = new SockJS(url);
+    const sockUrl = url.replace(/^(?:chrome-extension|file)/i, 'http');
+    this.sock = new SockJS(sockUrl);
 
     this.sock.onerror = (err) => {
       log.error(err);

client-src/clients/WebsocketClient.js

@@ -8,7 +8,8 @@ const BaseClient = require('./BaseClient');
 module.exports = class WebsocketClient extends BaseClient {
   constructor(url) {
     super();
-    this.client = new WebSocket(url.replace(/^http/, 'ws'));
+    const wsUrl = url.replace(/^(?:http|chrome-extension|file)/i, 'ws');
+    this.client = new WebSocket(wsUrl);
 
     this.client.onerror = (err) => {
       log.error(err);

package-lock.json

@@ -63,7 +63,7 @@
     "url": "^0.11.0",
     "util": "^0.12.3",
     "webpack-dev-middleware": "^4.0.2",
-    "ws": "^7.4.1"
+    "ws": "^7.4.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.10",
@@ -85,7 +85,7 @@
     "eslint-plugin-import": "^2.22.1",
     "execa": "^5.0.0",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^4.5.0",
+    "html-webpack-plugin": "^4.5.1",
     "husky": "^4.3.6",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",

package.json

@@ -72,6 +72,16 @@ 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/SockJSClient.test.js

@@ -65,6 +65,16 @@ 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) => {