[minor] Use consistent error messages

Make some server error messages consistent with the respective client error messages.
websockets · May 21, 2022 · fb658bd · fb658bd
1 parent 0fdcc0a
commit fb658bd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/lib/websocket-server.js b/lib/websocket-server.js
@@ -234,23 +234,23 @@ class WebSocketServer extends EventEmitter {
     const version = +req.headers['sec-websocket-version'];
 
     if (req.method !== 'GET') {
-      abortHandshake(socket, 405, 'The HTTP method is invalid');
+      abortHandshake(socket, 405, 'Invalid HTTP method');
       return;
     }
 
     if (req.headers.upgrade.toLowerCase() !== 'websocket') {
-      abortHandshake(socket, 400, 'The Upgrade header is invalid');
+      abortHandshake(socket, 400, 'Invalid Upgrade header');
       return;
     }
 
     if (!key || !keyRegex.test(key)) {
-      const message = 'The Sec-WebSocket-Key header is missing or invalid';
+      const message = 'Missing or invalid Sec-WebSocket-Key header';
       abortHandshake(socket, 400, message);
       return;
     }
 
     if (version !== 8 && version !== 13) {
-      const message = 'The Sec-WebSocket-Version header is missing or invalid';
+      const message = 'Missing or invalid Sec-WebSocket-Version header';
       abortHandshake(socket, 400, message);
       return;
     }
@@ -267,7 +267,7 @@ class WebSocketServer extends EventEmitter {
       try {
         protocols = subprotocol.parse(secWebSocketProtocol);
       } catch (err) {
-        const message = 'The Sec-WebSocket-Protocol header is invalid';
+        const message = 'Invalid Sec-WebSocket-Protocol header';
         abortHandshake(socket, 400, message);
         return;
       }
@@ -295,7 +295,7 @@ class WebSocketServer extends EventEmitter {
         }
       } catch (err) {
         const message =
-          'The Sec-WebSocket-Extensions header is invalid or not acceptable';
+          'Invalid or unacceptable Sec-WebSocket-Extensions header';
         abortHandshake(socket, 400, message);
         return;
       }

diff --git a/test/websocket-server.test.js b/test/websocket-server.test.js
@@ -508,7 +508,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Sec-WebSocket-Key header is missing or invalid'
+              'Missing or invalid Sec-WebSocket-Key header'
             );
             wss.close(done);
           });
@@ -577,7 +577,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The HTTP method is invalid'
+              'Invalid HTTP method'
             );
             wss.close(done);
           });
@@ -613,7 +613,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Upgrade header is invalid'
+              'Invalid Upgrade header'
             );
             wss.close(done);
           });
@@ -647,7 +647,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Sec-WebSocket-Key header is missing or invalid'
+              'Missing or invalid Sec-WebSocket-Key header'
             );
             wss.close(done);
           });
@@ -682,7 +682,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Sec-WebSocket-Key header is missing or invalid'
+              'Missing or invalid Sec-WebSocket-Key header'
             );
             wss.close(done);
           });
@@ -717,7 +717,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Sec-WebSocket-Version header is missing or invalid'
+              'Missing or invalid Sec-WebSocket-Version header'
             );
             wss.close(done);
           });
@@ -753,7 +753,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Sec-WebSocket-Version header is missing or invalid'
+              'Missing or invalid Sec-WebSocket-Version header'
             );
             wss.close(done);
           });
@@ -790,7 +790,7 @@ describe('WebSocketServer', () => {
           res.on('end', () => {
             assert.strictEqual(
               Buffer.concat(chunks).toString(),
-              'The Sec-WebSocket-Protocol header is invalid'
+              'Invalid Sec-WebSocket-Protocol header'
             );
             wss.close(done);
           });
@@ -833,8 +833,7 @@ describe('WebSocketServer', () => {
             res.on('end', () => {
               assert.strictEqual(
                 Buffer.concat(chunks).toString(),
-                'The Sec-WebSocket-Extensions header is invalid or not ' +
-                  'acceptable'
+                'Invalid or unacceptable Sec-WebSocket-Extensions header'
               );
               wss.close(done);
             });