README.md

@@ -1,7 +1,7 @@
 # ws: a Node.js WebSocket library
 
 [![Version npm](https://img.shields.io/npm/v/ws.svg?logo=npm)](https://www.npmjs.com/package/ws)
-[![Linux Build](https://img.shields.io/travis/websockets/ws/master.svg?logo=travis)](https://travis-ci.org/websockets/ws)
+[![Linux Build](https://img.shields.io/travis/websockets/ws/master.svg?logo=travis)](https://travis-ci.com/websockets/ws)
 [![Windows Build](https://img.shields.io/appveyor/ci/lpinca/ws/master.svg?logo=appveyor)](https://ci.appveyor.com/project/lpinca/ws)
 [![Coverage Status](https://img.shields.io/coveralls/websockets/ws/master.svg)](https://coveralls.io/github/websockets/ws)
 

examples/express-session-parse/index.js

@@ -8,6 +8,7 @@ const uuid = require('uuid');
 const WebSocket = require('../..');
 
 const app = express();
+const map = new Map();
 
 //
 // We need the same instance of the session parser in express and
@@ -37,8 +38,12 @@ app.post('/login', function(req, res) {
 });
 
 app.delete('/logout', function(request, response) {
+  const ws = map.get(request.session.userId);
+
   console.log('Destroying session');
   request.session.destroy(function() {
+    if (ws) ws.close();
+
     response.send({ result: 'OK', message: 'Session destroyed' });
   });
 });
@@ -47,7 +52,7 @@ app.delete('/logout', function(request, response) {
 // Create HTTP server by ourselves.
 //
 const server = http.createServer(app);
-const wss = new WebSocket.Server({ noServer: true });
+const wss = new WebSocket.Server({ clientTracking: false, noServer: true });
 
 server.on('upgrade', function(request, socket, head) {
   console.log('Parsing session from request...');
@@ -67,13 +72,19 @@ server.on('upgrade', function(request, socket, head) {
 });
 
 wss.on('connection', function(ws, request) {
+  const userId = request.session.userId;
+
+  map.set(userId, ws);
+
   ws.on('message', function(message) {
     //
     // Here we can now use session parameters.
     //
-    console.log(
-      `Received message ${message} from user ${request.session.userId}`
-    );
+    console.log(`Received message ${message} from user ${userId}`);
+  });
+
+  ws.on('close', function() {
+    map.delete(userId);
   });
 });
 

lib/buffer-util.js

@@ -19,10 +19,12 @@ function concat(list, totalLength) {
 
   for (let i = 0; i < list.length; i++) {
     const buf = list[i];
-    buf.copy(target, offset);
+    target.set(buf, offset);
     offset += buf.length;
   }
 
+  if (offset < totalLength) return target.slice(0, offset);
+
   return target;
 }
 

lib/receiver.js

@@ -96,11 +96,12 @@ class Receiver extends Writable {
 
     do {
       const buf = this._buffers[0];
+      const offset = dst.length - n;
 
       if (n >= buf.length) {
-        this._buffers.shift().copy(dst, dst.length - n);
+        dst.set(this._buffers.shift(), offset);
       } else {
-        buf.copy(dst, dst.length - n, 0, n);
+        dst.set(new Uint8Array(buf.buffer, buf.byteOffset, n), offset);
         this._buffers[0] = buf.slice(n);
       }
 

lib/stream.js

@@ -67,7 +67,6 @@ function createWebSocketStream(ws, options) {
     autoDestroy: false,
     emitClose: false,
     objectMode: false,
-    readableObjectMode: false,
     writableObjectMode: false
   });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws",
-  "version": "7.1.2",
+  "version": "7.2.0",
   "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
   "keywords": [
     "HyBi",

test/buffer-util.test.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const assert = require('assert');
+
+const { concat } = require('../lib/buffer-util');
+
+describe('bufferUtil', () => {
+  describe('concat', () => {
+    it('never returns uninitialized data', () => {
+      const buf = concat([Buffer.from([1, 2]), Buffer.from([3, 4])], 6);
+
+      assert.ok(buf.equals(Buffer.from([1, 2, 3, 4])));
+    });
+  });
+});

test/websocket.test.js

@@ -1381,7 +1381,7 @@ describe('WebSocket', () => {
         ws.close();
         ws.on('close', () => done());
       });
-    });
+    }).timeout(4000);
 
     it("can be called from a listener of the 'upgrade' event", (done) => {
       const wss = new WebSocket.Server({ port: 0 }, () => {
@@ -1630,7 +1630,7 @@ describe('WebSocket', () => {
         ws.terminate();
         ws.on('close', () => done());
       });
-    });
+    }).timeout(4000);
 
     it("can be called from a listener of the 'upgrade' event", (done) => {
       const wss = new WebSocket.Server({ port: 0 }, () => {