socket: flush the write buffer before closing the socket (fixes socke…

…tio#293)

lib/socket.js

@@ -370,11 +370,24 @@ Socket.prototype.getAvailableUpgrades = function () {
  */
 
 Socket.prototype.close = function () {
-  if ('open' == this.readyState) {
-    this.readyState = 'closing';
-    var self = this;
-    this.transport.close(function () {
-      self.onClose('forced close');
-    });
+  if ('open' != this.readyState) return;
+
+  this.readyState = 'closing';
+
+  if (this.writeBuffer.length) {
+    this.once('drain', this.closeTransport.bind(this));
+    return;
   }
+
+  this.closeTransport();
+};
+
+/**
+ * Closes the underlying transport.
+ *
+ * @api private
+ */
+
+Socket.prototype.closeTransport = function () {
+  this.transport.close(this.onClose.bind(this, 'forced close'));
 };

test/server.js

@@ -903,7 +903,7 @@ describe('server', function () {
       });
     });
 
-    it('should arrive from server to client (ws)', function (done) {
+    it('should arrive from server to client (multiple, ws)', function (done) {
       var opts = { allowUpgrades: false, transports: ['websocket'] };
       var engine = listen(opts, function (port) {
         var socket = new eioc.Socket('ws://localhost:%d'.s(port), { transports: ['websocket'] })
@@ -935,6 +935,34 @@ describe('server', function () {
       });
     });
 
+    it('should arrive from server to client (multiple, no delay, ws)', function (done) {
+      var opts = { allowUpgrades: false, transports: ['websocket'] };
+      var engine = listen(opts, function (port) {
+        var socket = new eioc.Socket('ws://localhost:%d'.s(port), { transports: ['websocket'] })
+          , expected = ['a', 'b', 'c']
+          , i = 0;
+
+        engine.on('connection', function (conn) {
+          conn.on('close', function () {
+            setTimeout(function () {
+              expect(i).to.be(3);
+              done();
+            }, 50);
+          });
+          conn.send('a');
+          conn.send('b');
+          conn.send('c');
+          conn.close();
+        });
+
+        socket.on('open', function () {
+          socket.on('message', function (msg) {
+            expect(msg).to.be(expected[i++]);
+          });
+        });
+      });
+    });
+
     it('should arrive when binary data is sent as Int8Array (ws)', function (done) {
       var binaryData = new Int8Array(5);
       for (var i = 0; i < binaryData.length; i++) {