From 69773f325ec34cab7fa6ddfa0534481d8b03b971 Mon Sep 17 00:00:00 2001
From: Christian Bundy <christianbundy@fraction.io>
Date: Tue, 17 Sep 2019 09:10:43 -0700
Subject: [PATCH 1/2] Upgrade module dependencies

---
 .gitignore     | 1 +
 .npmrc         | 1 +
 package.json   | 8 +++-----
 server.js      | 4 ++--
 test/error.js  | 2 +-
 test/server.js | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 .npmrc

diff --git a/.gitignore b/.gitignore
index 3c3629e..c9106a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 node_modules
+.nyc_output
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000..43c97e7
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/package.json b/package.json
index b999244..3ad93ff 100644
--- a/package.json
+++ b/package.json
@@ -26,16 +26,14 @@
   "dependencies": {
     "relative-url": "^1.0.2",
     "safe-buffer": "^5.1.1",
-    "ws": "^1.1.0"
+    "ws": "^7.1.2"
   },
   "devDependencies": {
     "mapleTree": "^0.5.1",
     "pull-goodbye": "~0.0.1",
-    "pull-json-doubleline": "^1.0.0",
-    "pull-split": "^0.2.0",
+    "pull-json-doubleline": "^2.0.0",
     "pull-stream": "^3.3.2",
-    "pull-through": "^1.0.18",
-    "tap": "^5.7.2",
+    "tap": "^14.6.4",
     "tape": "^4.4.0",
     "testling": "^1.7.1",
     "wsurl": "^1.0.0"
diff --git a/server.js b/server.js
index 123b10b..9f8a9bb 100644
--- a/server.js
+++ b/server.js
@@ -38,9 +38,9 @@ module.exports = !WebSocket.Server ? null : function (opts, onConnection) {
     proxy(server, 'request')
     proxy(server, 'close')
 
-    wsServer.on('connection', function (socket) {
+    wsServer.on('connection', function (socket, req) {
       var stream = ws(socket)
-      stream.remoteAddress = socket.upgradeReq.socket.remoteAddress
+      stream.remoteAddress = req.socket.remoteAddress
       emitter.emit('connection', stream)
     })
 
diff --git a/test/error.js b/test/error.js
index d402165..ebc7d63 100644
--- a/test/error.js
+++ b/test/error.js
@@ -14,7 +14,7 @@ test('test error', function (t) {
     pull.values(['x', 'y', 'z']),
     pull.through(null, function (err) {
       if(_err) {
-        t.strictEqual(err, _err);
+        t.strictEqual(err.error, _err.error);
         t.end();
       }
       _err = err
diff --git a/test/server.js b/test/server.js
index b6361a5..fe37e1c 100644
--- a/test/server.js
+++ b/test/server.js
@@ -27,8 +27,8 @@ var wss = new WebSocketServer({ port: port });
     });
   });
 
-  wss.on('connection', function(ws) {
-    var match = router.match(ws.upgradeReq.url);
+  wss.on('connection', function(ws, req) {
+    var match = router.match(req.url);
     if (match && typeof match.fn == 'function') {
       match.fn(ws);
     }

From 3faf920a78f8851c87a64855acc9cb0dc206e93e Mon Sep 17 00:00:00 2001
From: Christian Bundy <christianbundy@fraction.io>
Date: Tue, 17 Sep 2019 09:13:17 -0700
Subject: [PATCH 2/2] Remove unused variables

---
 duplex.js      | 2 +-
 server.js      | 2 --
 source.js      | 2 +-
 test/error.js  | 4 ----
 test/ws-url.js | 5 -----
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/duplex.js b/duplex.js
index 8ae6fa7..610c3d5 100644
--- a/duplex.js
+++ b/duplex.js
@@ -19,5 +19,5 @@ function duplex (ws, opts) {
     upgrade: req.upgrade,
     method: req.method
   };
-};
+}
 
diff --git a/server.js b/server.js
index 9f8a9bb..19015d1 100644
--- a/server.js
+++ b/server.js
@@ -1,13 +1,11 @@
 var ws = require('./')
 var WebSocket = require('ws')
-var url = require('url')
 var http = require('http')
 var https = require('https')
 
 var EventEmitter = require('events').EventEmitter
 module.exports = !WebSocket.Server ? null : function (opts, onConnection) {
     var emitter = new EventEmitter()
-    var server
     if (typeof opts === 'function'){
       onConnection = opts
       opts = null
diff --git a/source.js b/source.js
index 887bd6e..4c7e272 100644
--- a/source.js
+++ b/source.js
@@ -80,7 +80,7 @@ module.exports = function(socket, cb) {
     else
       receiver = cb;
 
-  };
+  }
 
   return read;
 };
diff --git a/test/error.js b/test/error.js
index ebc7d63..93a917f 100644
--- a/test/error.js
+++ b/test/error.js
@@ -1,6 +1,5 @@
 var test = require('tape');
 var WebSocket = require('ws');
-var endpoint = require('./helpers/wsurl') + '/read';
 var pull = require('pull-stream');
 var ws = require('../');
 
@@ -34,14 +33,11 @@ test('test error', function (t) {
 //connect to a server that does not exist, and check that it errors.
 //should pass the error to both sides of the stream.
 test('test error', function (t) {
-  var _err
-
   ws(new WebSocket('ws://localhost:34897/' + Math.random()),
     {onConnect: function (err) {
       t.ok(err)
       t.end()
     }})
-
 })
 
 
diff --git a/test/ws-url.js b/test/ws-url.js
index 4205c65..ab52eff 100644
--- a/test/ws-url.js
+++ b/test/ws-url.js
@@ -24,11 +24,6 @@ tape('map from a relative url to one for this domain', function (t) {
 })
 
 tape('same path works on dev and deployed', function (t) {
-  var location = {
-    protocol: 'http',
-    host: 'localhost:8000',
-  }
-
   t.equal(
     wsurl('/', {
       protocol: 'http',