Bumped ws to v2.0.0.

echo-server.js

@@ -1,3 +1,5 @@
+'use strict'
+
 var http = require('http')
 var websocket = require('./')
 var server = null

index.js

@@ -1,6 +1,6 @@
 
-var Server = require('./server.js')
+var server = require('./server.js')
 
 module.exports = require('./stream.js')
-module.exports.Server = Server
-module.exports.createServer = Server
+module.exports.Server = server.Server
+module.exports.createServer = server.createServer

package.json

@@ -26,7 +26,7 @@
     "duplexify": "^3.2.0",
     "inherits": "^2.0.1",
     "through2": "^2.0.0",
-    "ws": "^1.0.1",
+    "ws": "^2.0.0",
     "xtend": "^4.0.0"
   },
   "devDependencies": {

server.js

@@ -1,31 +1,29 @@
+'use strict'
 
-var inherits = require('inherits')
 var WebSocketServer = require('ws').Server
 var stream = require('./stream')
 
-module.exports = Server
-
-function Server(opts, cb) {
-  if (!(this instanceof Server)) {
-    return new Server(opts, cb)
-  }
-
-  WebSocketServer.call(this, opts)
-
-  var proxied = false
-  this.on('newListener', function(event) {
-    if (!proxied && event === 'stream') {
-      proxied = true
-      this.on('connection', function(conn) {
-        this.emit('stream', stream(conn, opts))
-      })
+class Server extends WebSocketServer{
+  constructor(opts, cb) {
+    super(opts)
+
+    var proxied = false
+    this.on('newListener', function(event) {
+      if (!proxied && event === 'stream') {
+        proxied = true
+        this.on('connection', function(conn) {
+          this.emit('stream', stream(conn, opts))
+        })
+      }
+    })
+
+    if (cb) {
+      this.on('stream', cb)
     }
-  })
-
-  if (cb) {
-    this.on('stream', cb)
   }
 }
 
-inherits(Server, WebSocketServer)
-
+module.exports.Server = Server
+module.exports.createServer = function(opts, cb) {
+  return new Server(opts, cb)
+}

stream.js

@@ -17,7 +17,7 @@ function WebSocketStream(target, protocols, options) {
   if (protocols && !Array.isArray(protocols) && 'object' === typeof protocols) {
     // accept the "options" Object as the 2nd argument
     options = protocols
-    protocols = null
+    protocols = []
 
     if (typeof options.protocol === 'string' || Array.isArray(options.protocol)) {
       protocols = options.protocol;
@@ -67,6 +67,13 @@ function WebSocketStream(target, protocols, options) {
   var coerceToBuffer = options.binary || options.binary === undefined
 
   function socketWriteNode(chunk, enc, next) {
+    // avoid errors, this never happens unless
+    // destroy() is called
+    if (socket.readyState !== WS.OPEN) {
+      next()
+      return
+    }
+
     if (coerceToBuffer && typeof chunk === 'string') {
       chunk = new Buffer(chunk, 'utf8')
     }