Merge pull request #21 from asambstack/ACE_3374_playwright_terminal_errors

Ace 3374 playwright terminal errors

Author: francisf

lib/core/Context.js

@@ -207,7 +207,7 @@ class Context extends EventEmitter {
     });
 
     this.outgoingSocket.on(kUpstreamClosed, (code, msg) => {
-      this.incomingSocket.close();
+      this.incomingSocket.close(code, msg);
       this.emit(kCleanup, this.connectionId);
       logger.info(
         `${OUTGOING} [${this.connectionId}] [CLOSE] - Socket closed with ${code} and ${msg}`

lib/core/IncomingWebSocket.js

@@ -115,8 +115,10 @@ class IncomingWebSocket extends EventEmitter {
   /**
    * Closes the socket connection.
    */
-  close() {
+  close(code, msg) {
     this.teardown = true;
+    if(code >= 1000 && code < 1004)
+      this.socket.close(code, msg);
     this.socket.terminate();
   }
 

test/core/incomingWebSocket.test.js

@@ -137,17 +137,39 @@ describe('IncomingWebSocket', () => {
 
   describe('#close', () => {
     let terminateSpy;
-    before(() => {
+    let closeSpy;
+    beforeEach(() => {
       terminateSpy = spy();
+      closeSpy = spy();
       incomingWs.socket.terminate = terminateSpy;
-      incomingWs.close();
+      incomingWs.socket.close = closeSpy;
+    });
+
+    it('should close and terminate the websocket when code is >= 1000 and < 1004', () => {
+      incomingWs.close(1001, 'msg');
+      assert(closeSpy.calledWith(1001, 'msg'));
+      assert(terminateSpy.calledOnce);
+    });
+
+    it('should not call close, only terminate the websocket when code is 1005', () => {
+      incomingWs.close(1005, 'msg');
+      assert.isFalse(closeSpy.called);
+      assert(terminateSpy.calledOnce);
+    });
+
+    it('should not call close, only terminate the websocket when code is 1006', () => {
+      incomingWs.close(1006, 'msg');
+      assert.isFalse(closeSpy.called);
+      assert(terminateSpy.calledOnce);
     });
 
     it('should terminate the websocket', () => {
+      incomingWs.close(1001, 'msg');
       assert(terminateSpy.calledOnce);
     });
 
     it('should set teardown to true', () => {
+      incomingWs.close(1001, 'msg');
       expect(incomingWs.teardown).to.equal(true);
     });
   });