simple-websocket - npm Package Compare versions

Comparing version 7.0.2 to 7.2.0

index.js

@@ -5,3 +5,2 @@ /* global WebSocket, DOMException */
 
-var Buffer = require('safe-buffer').Buffer
 var debug = require('debug')('simple-websocket')
@@ -8,0 +7,0 @@ var inherits = require('inherits')

package.json

 {
   "name": "simple-websocket",
   "description": "Simple, EventEmitter API for WebSockets (browser)",
-  "version": "7.0.2",
+  "version": "7.2.0",
   "author": {
@@ -21,7 +21,6 @@ "name": "Feross Aboukhadijeh",
     "readable-stream": "^2.0.5",
-    "safe-buffer": "^5.0.1",
-    "ws": "^4.0.0"
+    "ws": "^6.0.0"
   },
   "devDependencies": {
-    "airtap": "0.0.4",
+    "airtap": "0.1.0",
     "browserify": "^16.1.0",
@@ -28,0 +27,0 @@ "prettier-bytes": "^1.0.3",

README.md

@@ -45,3 +45,3 @@ # simple-websocket [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
 
-var socket = new Socket('ws://echo.websocket.org')
+var socket = new Socket('wss://echo.websocket.org')
 socket.on('connect', function () {
@@ -48,0 +48,0 @@ // socket is connected!

server.js

@@ -21,4 +21,11 @@ module.exports = SocketServer
 
+  self.destroyed = false
+
   self._server = new WebSocketServer(opts)
 
+  self._onListeningBound = function () {
+    self._onListening()
+  }
+  self._server.on('listening', self._onListeningBound)
+
   self._onConnectionBound = function (conn) {
@@ -35,9 +42,25 @@ self._onConnection(conn)
 
+SocketServer.prototype.address = function () {
+  return this._server.address()
+}
+
 SocketServer.prototype.close = function (cb) {
-  this._server.removeListener('connection', this._onConnectionBound)
-  this._server.removeListener('error', this._onErrorBound)
-  this._server.close(cb)
-  this.emit('close')
+  var self = this
+
+  if (self.destroyed) return cb(new Error('server is closed'))
+  self.destroyed = true
+  if (cb) self.once('close', cb)
+
+  self._server.removeListener('listening', self._onListeningBound)
+  self._server.removeListener('connection', self._onConnectionBound)
+  self._server.removeListener('error', self._onErrorBound)
+  self._server.close(function () {
+    self.emit('close')
+  })
 }
 
+SocketServer.prototype._onListening = function () {
+  this.emit('listening')
+}
+
 SocketServer.prototype._onConnection = function (conn) {
@@ -44,0 +67,0 @@ var socket = new Socket({ socket: conn })

test/basic.js

@@ -0,6 +1,5 @@
+var common = require('./common')
 var Socket = require('../')
 var test = require('tape')
 
-var SOCKET_SERVER = 'wss://echo.websocket.org'
-
 test('detect WebSocket support', function (t) {
@@ -27,3 +26,3 @@ t.equal(Socket.WEBSOCKET_SUPPORT, true, 'websocket support')
 
-  var socket = new Socket(SOCKET_SERVER)
+  var socket = new Socket(common.SERVER_URL)
   socket.on('connect', function () {
@@ -48,3 +47,3 @@ t.pass('connect emitted')
   var socket = new Socket({
-    url: SOCKET_SERVER
+    url: common.SERVER_URL
   })
@@ -69,3 +68,3 @@ socket.on('connect', function () {
 
-  var socket = new Socket(SOCKET_SERVER)
+  var socket = new Socket(common.SERVER_URL)
   socket.on('connect', function () {
@@ -89,3 +88,3 @@ t.pass('connect emitted')
 
-  var socket = new Socket(SOCKET_SERVER)
+  var socket = new Socket(common.SERVER_URL)
   socket.on('connect', function () {
@@ -111,3 +110,3 @@ t.pass('connect emitted')
 
-  var socket = new Socket(SOCKET_SERVER)
+  var socket = new Socket(common.SERVER_URL)
   socket.on('connect', function () {
@@ -114,0 +113,0 @@ t.pass('connect emitted')

test/custom-socket.js

 /* global WebSocket */
 
+var common = require('./common')
 var Socket = require('../')
@@ -7,4 +8,2 @@ var test = require('tape')
 
-var SOCKET_SERVER = 'wss://echo.websocket.org'
-
 var _WebSocket = typeof ws !== 'function' ? WebSocket : ws
@@ -15,3 +14,3 @@
 
-  var ws = new _WebSocket(SOCKET_SERVER)
+  var ws = new _WebSocket(common.SERVER_URL)
   var socket = new Socket({
@@ -38,3 +37,3 @@ socket: ws
 
-  var ws = new _WebSocket(SOCKET_SERVER)
+  var ws = new _WebSocket(common.SERVER_URL)
   var socket = new Socket({
@@ -61,3 +60,3 @@ socket: ws
 
-  var ws = new _WebSocket(SOCKET_SERVER)
+  var ws = new _WebSocket(common.SERVER_URL)
   var socket = new Socket({
@@ -86,3 +85,3 @@ socket: ws
 
-  var ws = new _WebSocket(SOCKET_SERVER)
+  var ws = new _WebSocket(common.SERVER_URL)
   var socket = new Socket({
@@ -89,0 +88,0 @@ socket: ws

test/node/server.js

@@ -0,1 +1,3 @@
+// Test the Server class
+
 var Socket = require('../../')
@@ -2,0 +4,0 @@ var Server = require('../../server')

test/object-mode.js

@@ -0,6 +1,5 @@
+var common = require('./common')
 var Socket = require('../')
 var test = require('tape')
 
-var SOCKET_SERVER = 'wss://echo.websocket.org'
-
 test('echo string {objectMode: true}', function (t) {
@@ -10,3 +9,3 @@ t.plan(4)
   var socket = new Socket({
-    url: SOCKET_SERVER,
+    url: common.SERVER_URL,
     objectMode: true
@@ -33,3 +32,3 @@ })
   var socket = new Socket({
-    url: SOCKET_SERVER,
+    url: common.SERVER_URL,
     objectMode: true
@@ -56,3 +55,3 @@ })
   var socket = new Socket({
-    url: SOCKET_SERVER,
+    url: common.SERVER_URL,
     objectMode: true
@@ -81,3 +80,3 @@ })
   var socket = new Socket({
-    url: SOCKET_SERVER,
+    url: common.SERVER_URL,
     objectMode: true
@@ -89,2 +88,4 @@ })
     socket.on('data', function (data) {
+      // binary types always get converted to Buffer
+      // See: https://github.com/feross/simple-peer/issues/138#issuecomment-278240571
       t.ok(Buffer.isBuffer(data), 'data is Buffer')
@@ -91,0 +92,0 @@ t.deepEqual(data, Buffer.from([1, 2, 3]), 'got correct data')

test/stream.js

@@ -0,10 +1,9 @@
+var common = require('./common')
 var Socket = require('../')
 var test = require('tape')
 
-var SOCKET_SERVER = 'wss://echo.websocket.org'
-
 test('duplex stream: send data before "connect" event', function (t) {
   t.plan(6)
 
-  var socket = new Socket(SOCKET_SERVER)
+  var socket = new Socket(common.SERVER_URL)
   socket.write('abc')
@@ -30,3 +29,3 @@
 
-  var socket = new Socket(SOCKET_SERVER)
+  var socket = new Socket(common.SERVER_URL)
   socket.on('connect', function () {
@@ -33,0 +32,0 @@ socket.write('abc')

No alert changes

Improved metrics

Total package byte prevSize

99914

increased by2.45%

Dependency count

5

decreased by-16.67%

Number of package files

14

increased by7.69%

Lines of code

904

increased by3.08%

Dependency changes

• + Addedws@6.2.3(transitive)

• - Removedsafe-buffer@^5.0.1

• - Removedws@4.1.0(transitive)

• Updatedws@^6.0.0