websocket: improve .close()

lib/web/websocket/util.js

@@ -8,6 +8,17 @@ const { MessageEvent, ErrorEvent } = require('./events')
 
 /**
  * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
+ */
+function isConnecting (ws) {
+  // If the WebSocket connection is not yet established, and the connection
+  // is not yet closed, then the WebSocket connection is in the CONNECTING state.
+  return ws[kReadyState] === states.CONNECTING
+}
+
+/**
+ * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
  */
 function isEstablished (ws) {
   // If the server's response is validated as provided for above, it is
@@ -18,6 +29,7 @@ function isEstablished (ws) {
 
 /**
  * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
  */
 function isClosing (ws) {
   // Upon either sending or receiving a Close control frame, it is said
@@ -28,6 +40,7 @@ function isClosing (ws) {
 
 /**
  * @param {import('./websocket').WebSocket} ws
+ * @returns {boolean}
  */
 function isClosed (ws) {
   return ws[kReadyState] === states.CLOSED
@@ -190,6 +203,7 @@ function failWebsocketConnection (ws, reason) {
 }
 
 module.exports = {
+  isConnecting,
   isEstablished,
   isClosing,
   isClosed,

lib/web/websocket/websocket.js

@@ -13,7 +13,15 @@ const {
   kSentClose,
   kByteParser
 } = require('./symbols')
-const { isEstablished, isClosing, isValidSubprotocol, failWebsocketConnection, fireEvent } = require('./util')
+const {
+  isConnecting,
+  isEstablished,
+  isClosed,
+  isClosing,
+  isValidSubprotocol,
+  failWebsocketConnection,
+  fireEvent
+} = require('./util')
 const { establishWebSocketConnection } = require('./connection')
 const { WebsocketFrameSend } = require('./frame')
 const { ByteParser } = require('./receiver')
@@ -184,10 +192,10 @@ class WebSocket extends EventTarget {
     }
 
     // 3. Run the first matching steps from the following list:
-    if (this[kReadyState] === WebSocket.CLOSING || this[kReadyState] === WebSocket.CLOSED) {
+    if (isClosing(this) || isClosed(this)) {
       // If this's ready state is CLOSING (2) or CLOSED (3)
       // Do nothing.
-    } else if (!isEstablished(this)) {
+    } else if (isConnecting(this)) {
       // If the WebSocket connection is not yet established
       // Fail the WebSocket connection and set this's ready state
       // to CLOSING (2).