fix onclose event when client closes the connection (#360)

* fix onclose event when client closes the connection * fix onclose event when client fails the connection
thoov · May 24, 2022 · caba3e0 · caba3e0
1 parent 336eba2
commit caba3e0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/algorithms/close.js b/src/algorithms/close.js
@@ -13,12 +13,19 @@ export function closeWebSocketConnection(context, code, reason) {
     code,
     reason
   });
+  const serverCloseEvent = createCloseEvent({
+    type: 'server::close',
+    target: context,
+    code,
+    reason
+  });
 
   delay(() => {
     networkBridge.removeWebSocket(context, context.url);
 
     context.readyState = WebSocket.CLOSED;
     context.dispatchEvent(closeEvent);
+    context.dispatchEvent(serverCloseEvent);
 
     if (server) {
       server.dispatchEvent(closeEvent, server);
@@ -37,6 +44,13 @@ export function failWebSocketConnection(context, code, reason) {
     reason,
     wasClean: false
   });
+  const serverCloseEvent = createCloseEvent({
+    type: 'server::close',
+    target: context,
+    code,
+    reason,
+    wasClean: false
+  });
 
   const errorEvent = createEvent({
     type: 'error',
@@ -49,6 +63,7 @@ export function failWebSocketConnection(context, code, reason) {
     context.readyState = WebSocket.CLOSED;
     context.dispatchEvent(errorEvent);
     context.dispatchEvent(closeEvent);
+    context.dispatchEvent(serverCloseEvent);
 
     if (server) {
       server.dispatchEvent(closeEvent, server);

diff --git a/tests/functional/websockets.test.js b/tests/functional/websockets.test.js
@@ -97,6 +97,23 @@ test.cb('that onclose is called after the client closes the connection', t => {
   };
 });
 
+test.cb('that the server gets called when the client closes the connection', t => {
+  const testServer = new Server('ws://localhost:8080');
+
+  testServer.on('connection', socket => {
+    socket.onclose = function close(event) {
+      t.is(event.target.readyState, WebSocket.CLOSED, 'onclose fires as expected');
+      t.end();
+    };
+  });
+
+  const mockSocket = new WebSocket('ws://localhost:8080');
+
+  mockSocket.onopen = function open() {
+    mockSocket.close();
+  };
+});
+
 test.cb('that the server gets called when the client sends a message', t => {
   const testServer = new Server('ws://localhost:8080');