[minor] Do not use the legacy URL API

websockets · Oct 29, 2018 · 0da3fdb · 0da3fdb
1 parent d2317b1
commit 0da3fdb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/websocket-server.js b/lib/websocket-server.js
@@ -3,7 +3,6 @@
 const EventEmitter = require('events');
 const crypto = require('crypto');
 const http = require('http');
-const url = require('url');
 
 const PerMessageDeflate = require('./permessage-deflate');
 const extension = require('./extension');
@@ -147,8 +146,11 @@ class WebSocketServer extends EventEmitter {
    * @public
    */
   shouldHandle (req) {
-    if (this.options.path && url.parse(req.url).pathname !== this.options.path) {
-      return false;
+    if (this.options.path) {
+      const index = req.url.indexOf('?');
+      const pathname = index !== -1 ? req.url.slice(0, index) : req.url;
+
+      if (pathname !== this.options.path) return false;
     }
 
     return true;

diff --git a/lib/websocket.js b/lib/websocket.js
@@ -6,7 +6,7 @@ const https = require('https');
 const http = require('http');
 const net = require('net');
 const tls = require('tls');
-const url = require('url');
+const { URL } = require('url');
 
 const PerMessageDeflate = require('./permessage-deflate');
 const EventTarget = require('./event-target');
@@ -447,7 +447,7 @@ function initAsClient (address, protocols, options) {
     parsedUrl = address;
     this.url = address.href;
   } else {
-    parsedUrl = url.parse(address);
+    parsedUrl = new URL(address);
     this.url = address;
   }
 

diff --git a/test/websocket.test.js b/test/websocket.test.js
@@ -20,8 +20,8 @@ describe('WebSocket', function () {
   describe('#ctor', function () {
     it('throws an error when using an invalid url', function () {
       assert.throws(
-        () => new WebSocket('echo.websocket.org'),
-        /^Error: Invalid URL: echo\.websocket\.org$/
+        () => new WebSocket('ws+unix:'),
+        /^Error: Invalid URL: ws\+unix:$/
       );
     });
 
@@ -33,6 +33,7 @@ describe('WebSocket', function () {
         done();
       };
 
+      // eslint-disable-next-line node/no-deprecated-api
       const ws = new WebSocket(url.parse('ws://localhost'), { agent });
     });