[fix] Do not override the fin option of the send method

websockets · Oct 21, 2016 · ea50be7 · ea50be7
1 parent 78425d0
commit ea50be7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/WebSocket.js b/lib/WebSocket.js
@@ -230,7 +230,7 @@ WebSocket.prototype.send = function send (data, options, cb) {
   }
 
   options = options || {};
-  options.fin = true;
+  if (options.fin !== false) options.fin = true;
 
   if (typeof options.binary === 'undefined') {
     options.binary = (data instanceof ArrayBuffer || data instanceof Buffer ||

diff --git a/test/WebSocket.test.js b/test/WebSocket.test.js
@@ -748,6 +748,24 @@ describe('WebSocket', function() {
       });
     });
 
+    it('does not override the `fin` option', function (done) {
+      const wss = new WebSocketServer({ port: ++port }, () => {
+        const ws = new WebSocket(`ws://localhost:${port}`);
+
+        ws.on('open', () => {
+          ws.send('fragment', { fin: false });
+          ws.send('fragment', { fin: true });
+        });
+      });
+
+      wss.on('connection', (ws) => {
+        ws.on('message', (msg) => {
+          assert.strictEqual(msg, 'fragmentfragment');
+          wss.close(done);
+        });
+      });
+    });
+
     it('send and receive binary data as an array', function(done) {
       server.createServer(++port, function(srv) {
         var ws = new WebSocket('ws://localhost:' + port);