Restruct

node_modules/websocket-driver/lib/websocket/driver.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // Protocol references:
-//
+// 
 // * http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75
 // * http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
 // * http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
@@ -32,7 +32,14 @@ var Driver = {
   },
 
   isWebSocket: function(request) {
-    return Base.isWebSocket(request);
+    if (request.method !== 'GET') return false;
+
+    var connection = request.headers.connection || '',
+        upgrade    = request.headers.upgrade || '';
+
+    return request.method === 'GET' &&
+           connection.toLowerCase().split(/ *, */).indexOf('upgrade') >= 0 &&
+           upgrade.toLowerCase() === 'websocket';
   },
 
   validateOptions: function(options, validKeys) {

node_modules/websocket-driver/lib/websocket/driver/base.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var Buffer  = require('safe-buffer').Buffer,
-    Emitter = require('events').EventEmitter,
+var Emitter = require('events').EventEmitter,
     util    = require('util'),
     streams = require('../streams'),
     Headers = require('./headers'),
@@ -26,15 +25,6 @@ var Base = function(request, url, options) {
 };
 util.inherits(Base, Emitter);
 
-Base.isWebSocket = function(request) {
-  var connection = request.headers.connection || '',
-      upgrade    = request.headers.upgrade || '';
-
-  return request.method === 'GET' &&
-         connection.toLowerCase().split(/ *, */).indexOf('upgrade') >= 0 &&
-         upgrade.toLowerCase() === 'websocket';
-};
-
 Base.validateOptions = function(options, validKeys) {
   for (var key in options) {
     if (validKeys.indexOf(key) < 0)
@@ -89,35 +79,13 @@ var instance = {
 
   start: function() {
     if (this.readyState !== 0) return false;
-
-    if (!Base.isWebSocket(this._request))
-      return this._failHandshake(new Error('Not a WebSocket request'));
-
-    var response;
-
-    try {
-      response = this._handshakeResponse();
-    } catch (error) {
-      return this._failHandshake(error);
-    }
-
+    var response = this._handshakeResponse();
+    if (!response) return false;
     this._write(response);
     if (this._stage !== -1) this._open();
     return true;
   },
 
-  _failHandshake: function(error) {
-    var headers = new Headers();
-    headers.set('Content-Type', 'text/plain');
-    headers.set('Content-Length', Buffer.byteLength(error.message, 'utf8'));
-
-    headers = ['HTTP/1.1 400 Bad Request', headers.toString(), error.message];
-    this._write(Buffer.from(headers.join('\r\n'), 'utf8'));
-    this._fail('protocol_error', error.message);
-
-    return false;
-  },
-
   text: function(message) {
     return this.frame(message);
   },
@@ -156,12 +124,6 @@ var instance = {
   _write: function(chunk) {
     var io = this.io;
     if (io.readable) io.emit('data', chunk);
-  },
-
-  _fail: function(type, message) {
-    this.readyState = 2;
-    this.emit('error', new Error(message));
-    this.close();
   }
 };
 
@@ -182,12 +144,4 @@ Base.MessageEvent = function(data) {
   this.data = data;
 };
 
-Base.PingEvent = function(data) {
-  this.data = data;
-};
-
-Base.PongEvent = function(data) {
-  this.data = data;
-};
-
 module.exports = Base;

node_modules/websocket-driver/lib/websocket/driver/client.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var Buffer     = require('safe-buffer').Buffer,
-    crypto     = require('crypto'),
+var crypto     = require('crypto'),
     url        = require('url'),
     util       = require('util'),
     HttpParser = require('../http_parser'),
@@ -10,7 +9,7 @@ var Buffer     = require('safe-buffer').Buffer,
     Proxy      = require('./proxy');
 
 var Client = function(_url, options) {
-  this.version = 'hybi-' + Hybi.VERSION;
+  this.version = 'hybi-13';
   Hybi.call(this, null, _url, options);
 
   this.readyState = -1;
@@ -19,7 +18,7 @@ var Client = function(_url, options) {
   this._http      = new HttpParser('response');
 
   var uri  = url.parse(this.url),
-      auth = uri.auth && Buffer.from(uri.auth, 'utf8').toString('base64');
+      auth = uri.auth && new Buffer(uri.auth, 'utf8').toString('base64');
 
   if (this.VALID_PROTOCOLS.indexOf(uri.protocol) < 0)
     throw new Error(this.url + ' is not a valid WebSocket URL');
@@ -30,7 +29,7 @@ var Client = function(_url, options) {
   this._headers.set('Upgrade', 'websocket');
   this._headers.set('Connection', 'Upgrade');
   this._headers.set('Sec-WebSocket-Key', this._key);
-  this._headers.set('Sec-WebSocket-Version', Hybi.VERSION);
+  this._headers.set('Sec-WebSocket-Version', '13');
 
   if (this._protocols.length > 0)
     this._headers.set('Sec-WebSocket-Protocol', this._protocols.join(', '));
@@ -80,7 +79,7 @@ var instance = {
     var start   = 'GET ' + this._pathname + ' HTTP/1.1',
         headers = [start, this._headers.toString(), ''];
 
-    return Buffer.from(headers.join('\r\n'), 'utf8');
+    return new Buffer(headers.join('\r\n'), 'utf8');
   },
 
   _failHandshake: function(message) {
@@ -94,9 +93,6 @@ var instance = {
     this.statusCode = this._http.statusCode;
     this.headers    = this._http.headers;
 
-    if (this._http.error)
-      return this._failHandshake(this._http.error.message);
-
     if (this._http.statusCode !== 101)
       return this._failHandshake('Unexpected response code: ' + this._http.statusCode);
 

node_modules/websocket-driver/lib/websocket/driver/draft75.js

@@ -1,8 +1,7 @@
 'use strict';
 
-var Buffer = require('safe-buffer').Buffer,
-    Base   = require('./base'),
-    util   = require('util');
+var Base = require('./base'),
+    util = require('util');
 
 var Draft75 = function(request, url, options) {
   Base.apply(this, arguments);
@@ -62,7 +61,7 @@ var instance = {
         case 2:
           if (octet === 0xFF) {
             this._stage = 0;
-            message = Buffer.from(this._buffer).toString('utf8', 0, this._buffer.length);
+            message = new Buffer(this._buffer).toString('utf8', 0, this._buffer.length);
             this.emit('message', new Base.MessageEvent(message));
           }
           else {
@@ -86,12 +85,12 @@ var instance = {
 
     if (typeof buffer !== 'string') buffer = buffer.toString();
 
-    var length = Buffer.byteLength(buffer),
-        frame  = Buffer.allocUnsafe(length + 2);
+    var payload = new Buffer(buffer, 'utf8'),
+        frame   = new Buffer(payload.length + 2);
 
     frame[0] = 0x00;
-    frame.write(buffer, 1);
-    frame[frame.length - 1] = 0xFF;
+    frame[payload.length + 1] = 0xFF;
+    payload.copy(frame, 1);
 
     this._write(frame);
     return true;
@@ -101,7 +100,7 @@ var instance = {
     var start   = 'HTTP/1.1 101 Web Socket Protocol Handshake',
         headers = [start, this._headers.toString(), ''];
 
-    return Buffer.from(headers.join('\r\n'), 'utf8');
+    return new Buffer(headers.join('\r\n'), 'utf8');
   },
 
   _parseLeadingByte: function(octet) {

node_modules/websocket-driver/lib/websocket/driver/draft76.js

@@ -1,18 +1,17 @@
 'use strict';
 
-var Buffer  = require('safe-buffer').Buffer,
-    Base    = require('./base'),
+var Base    = require('./base'),
     Draft75 = require('./draft75'),
     crypto  = require('crypto'),
     util    = require('util');
 
 
 var numberFromKey = function(key) {
-  return parseInt((key.match(/[0-9]/g) || []).join(''), 10);
+  return parseInt(key.match(/[0-9]/g).join(''), 10);
 };
 
 var spacesInKey = function(key) {
-  return (key.match(/ /g) || []).length;
+  return key.match(/ /g).length;
 };
 
 
@@ -43,7 +42,7 @@ var instance = {
 
   close: function() {
     if (this.readyState === 3) return false;
-    if (this.readyState === 1) this._write(Buffer.from([0xFF, 0x00]));
+    this._write(new Buffer([0xFF, 0x00]));
     this.readyState = 3;
     this.emit('close', new Base.CloseEvent(null, null));
     return true;
@@ -51,41 +50,41 @@ var instance = {
 
   _handshakeResponse: function() {
     var headers = this._request.headers,
+
         key1    = headers['sec-websocket-key1'],
-        key2    = headers['sec-websocket-key2'];
-
-    if (!key1) throw new Error('Missing required header: Sec-WebSocket-Key1');
-    if (!key2) throw new Error('Missing required header: Sec-WebSocket-Key2');
-
-    var number1 = numberFromKey(key1),
+        number1 = numberFromKey(key1),
         spaces1 = spacesInKey(key1),
 
+        key2    = headers['sec-websocket-key2'],
         number2 = numberFromKey(key2),
         spaces2 = spacesInKey(key2);
 
-    if (number1 % spaces1 !== 0 || number2 % spaces2 !== 0)
-      throw new Error('Client sent invalid Sec-WebSocket-Key headers');
+    if (number1 % spaces1 !== 0 || number2 % spaces2 !== 0) {
+      this.emit('error', new Error('Client sent invalid Sec-WebSocket-Key headers'));
+      this.close();
+      return null;
+    }
 
     this._keyValues = [number1 / spaces1, number2 / spaces2];
 
     var start   = 'HTTP/1.1 101 WebSocket Protocol Handshake',
         headers = [start, this._headers.toString(), ''];
 
-    return Buffer.from(headers.join('\r\n'), 'binary');
+    return new Buffer(headers.join('\r\n'), 'binary');
   },
 
   _handshakeSignature: function() {
     if (this._body.length < this.BODY_SIZE) return null;
 
     var md5    = crypto.createHash('md5'),
-        buffer = Buffer.allocUnsafe(8 + this.BODY_SIZE);
+        buffer = new Buffer(8 + this.BODY_SIZE);
 
     buffer.writeUInt32BE(this._keyValues[0], 0);
     buffer.writeUInt32BE(this._keyValues[1], 4);
-    Buffer.from(this._body).copy(buffer, 8, 0, this.BODY_SIZE);
+    new Buffer(this._body).copy(buffer, 8, 0, this.BODY_SIZE);
 
     md5.update(buffer);
-    return Buffer.from(md5.digest('binary'), 'binary');
+    return new Buffer(md5.digest('binary'), 'binary');
   },
 
   _sendHandshakeBody: function() {

node_modules/websocket-driver/lib/websocket/driver/hybi.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var Buffer     = require('safe-buffer').Buffer,
-    crypto     = require('crypto'),
+var crypto     = require('crypto'),
     util       = require('util'),
     Extensions = require('websocket-extensions'),
     Base       = require('./base'),
@@ -23,20 +22,25 @@ var Hybi = function(request, url, options) {
 
   if (!this._request) return;
 
-  var protos    = this._request.headers['sec-websocket-protocol'],
+  var secKey    = this._request.headers['sec-websocket-key'],
+      protos    = this._request.headers['sec-websocket-protocol'],
+      version   = this._request.headers['sec-websocket-version'],
       supported = this._protocols;
 
+  this._headers.set('Upgrade', 'websocket');
+  this._headers.set('Connection', 'Upgrade');
+  this._headers.set('Sec-WebSocket-Accept', Hybi.generateAccept(secKey));
+
   if (protos !== undefined) {
     if (typeof protos === 'string') protos = protos.split(/ *, */);
     this.protocol = protos.filter(function(p) { return supported.indexOf(p) >= 0 })[0];
+    if (this.protocol) this._headers.set('Sec-WebSocket-Protocol', this.protocol);
   }
 
-  this.version = 'hybi-' + Hybi.VERSION;
+  this.version = 'hybi-' + version;
 };
 util.inherits(Hybi, Base);
 
-Hybi.VERSION = '13';
-
 Hybi.mask = function(payload, mask, offset) {
   if (!mask || mask.length === 0) return payload;
   offset = offset || 0;
@@ -188,7 +192,7 @@ var instance = {
     if (this.readyState <= 0) return this._queue([buffer, type, code]);
     if (this.readyState > 2) return false;
 
-    if (buffer instanceof Array)    buffer = Buffer.from(buffer);
+    if (buffer instanceof Array)    buffer = new Buffer(buffer);
     if (typeof buffer === 'number') buffer = buffer.toString();
 
     var message = new Message(),
@@ -198,11 +202,11 @@ var instance = {
     message.rsv1   = message.rsv2 = message.rsv3 = false;
     message.opcode = this.OPCODES[type || (isText ? 'text' : 'binary')];
 
-    payload = isText ? Buffer.from(buffer, 'utf8') : buffer;
+    payload = isText ? new Buffer(buffer, 'utf8') : buffer;
 
     if (code) {
       copy = payload;
-      payload = Buffer.allocUnsafe(2 + copy.length);
+      payload = new Buffer(2 + copy.length);
       payload.writeUInt16BE(code, 0);
       copy.copy(payload, 2);
     }
@@ -240,7 +244,7 @@ var instance = {
     var length = frame.length,
         header = (length <= 125) ? 2 : (length <= 65535 ? 4 : 10),
         offset = header + (frame.masked ? 4 : 0),
-        buffer = Buffer.allocUnsafe(offset + length),
+        buffer = new Buffer(offset + length),
         masked = frame.masked ? this.MASK : 0;
 
     buffer[0] = (frame.final ? this.FIN : 0) |
@@ -271,28 +275,18 @@ var instance = {
   },
 
   _handshakeResponse: function() {
-    var secKey  = this._request.headers['sec-websocket-key'],
-        version = this._request.headers['sec-websocket-version'];
+    try {
+      var extensions = this._extensions.generateResponse(this._request.headers['sec-websocket-extensions']);
+    } catch (e) {
+      return this._fail('protocol_error', e.message);
+    }
 
-    if (version !== Hybi.VERSION)
-      throw new Error('Unsupported WebSocket version: ' + version);
-
-    if (typeof secKey !== 'string')
-      throw new Error('Missing handshake request header: Sec-WebSocket-Key');
-
-    this._headers.set('Upgrade', 'websocket');
-    this._headers.set('Connection', 'Upgrade');
-    this._headers.set('Sec-WebSocket-Accept', Hybi.generateAccept(secKey));
-
-    if (this.protocol) this._headers.set('Sec-WebSocket-Protocol', this.protocol);
-
-    var extensions = this._extensions.generateResponse(this._request.headers['sec-websocket-extensions']);
     if (extensions) this._headers.set('Sec-WebSocket-Extensions', extensions);
 
     var start   = 'HTTP/1.1 101 Switching Protocols',
         headers = [start, this._headers.toString(), ''];
 
-    return Buffer.from(headers.join('\r\n'), 'utf8');
+    return new Buffer(headers.join('\r\n'), 'utf8');
   },
 
   _shutdown: function(code, reason, error) {
@@ -427,7 +421,6 @@ var instance = {
 
     if (opcode === this.OPCODES.ping) {
       this.frame(payload, 'pong');
-      this.emit('ping', new Base.PingEvent(payload.toString()))
     }
 
     if (opcode === this.OPCODES.pong) {
@@ -437,8 +430,6 @@ var instance = {
 
       delete callbacks[message];
       if (callback) callback()
-
-      this.emit('pong', new Base.PongEvent(payload.toString()))
     }
   },
 

node_modules/websocket-driver/lib/websocket/driver/hybi/message.js

@@ -1,19 +1,26 @@
 'use strict';
 
-var Buffer = require('safe-buffer').Buffer;
-
 var Message = function() {
   this.rsv1    = false;
   this.rsv2    = false;
   this.rsv3    = false;
-  this.opcode  = null;
+  this.opcode  = null
   this.length  = 0;
   this._chunks = [];
 };
 
 var instance = {
   read: function() {
-    return this.data = this.data || Buffer.concat(this._chunks, this.length);
+    if (this.data) return this.data;
+
+    this.data  = new Buffer(this.length);
+    var offset = 0;
+
+    for (var i = 0, n = this._chunks.length; i < n; i++) {
+      this._chunks[i].copy(this.data, offset);
+      offset += this._chunks[i].length;
+    }
+    return this.data;
   },
 
   pushFrame: function(frame) {

node_modules/websocket-driver/lib/websocket/driver/proxy.js

@@ -1,14 +1,13 @@
 'use strict';
 
-var Buffer     = require('safe-buffer').Buffer,
-    Stream     = require('stream').Stream,
+var Stream     = require('stream').Stream,
     url        = require('url'),
     util       = require('util'),
     Base       = require('./base'),
     Headers    = require('./headers'),
     HttpParser = require('../http_parser');
 
-var PORTS = { 'ws:': 80, 'wss:': 443 };
+var PORTS = {'ws:': 80, 'wss:': 443};
 
 var Proxy = function(client, origin, options) {
   this._client  = client;
@@ -26,7 +25,7 @@ var Proxy = function(client, origin, options) {
   this._headers.set('Connection', 'keep-alive');
   this._headers.set('Proxy-Connection', 'keep-alive');
 
-  var auth = this._url.auth && Buffer.from(this._url.auth, 'utf8').toString('base64');
+  var auth = this._url.auth && new Buffer(this._url.auth, 'utf8').toString('base64');
   if (auth) this._headers.set('Proxy-Authorization', 'Basic ' + auth);
 };
 util.inherits(Proxy, Stream);
@@ -48,7 +47,7 @@ var instance = {
 
     var headers = [start, this._headers.toString(), ''];
 
-    this.emit('data', Buffer.from(headers.join('\r\n'), 'utf8'));
+    this.emit('data', new Buffer(headers.join('\r\n'), 'utf8'));
     return true;
   },
 

node_modules/websocket-driver/lib/websocket/driver/server.js

@@ -14,7 +14,7 @@ var Server = function(options) {
 util.inherits(Server, Base);
 
 var instance = {
-  EVENTS: ['open', 'message', 'error', 'close', 'ping', 'pong'],
+  EVENTS: ['open', 'message', 'error', 'close'],
 
   _bindEventListeners: function() {
     this.messages.on('error', function() {});
@@ -95,15 +95,11 @@ Server.http = function(request, options) {
   if (options.requireMasking === undefined) options.requireMasking = true;
 
   var headers = request.headers,
-      version = headers['sec-websocket-version'],
-      key     = headers['sec-websocket-key'],
-      key1    = headers['sec-websocket-key1'],
-      key2    = headers['sec-websocket-key2'],
       url     = this.determineUrl(request);
 
-  if (version || key)
+  if (headers['sec-websocket-version'])
     return new Hybi(request, url, options);
-  else if (key1 || key2)
+  else if (headers['sec-websocket-key1'])
     return new Draft76(request, url, options);
   else
     return new Draft75(request, url, options);

node_modules/websocket-driver/lib/websocket/driver/stream_reader.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var Buffer = require('safe-buffer').Buffer;
-
 var StreamReader = function() {
   this._queue     = [];
   this._queueSize = 0;
@@ -10,14 +8,14 @@ var StreamReader = function() {
 
 StreamReader.prototype.put = function(buffer) {
   if (!buffer || buffer.length === 0) return;
-  if (!Buffer.isBuffer(buffer)) buffer = Buffer.from(buffer);
+  if (!buffer.copy) buffer = new Buffer(buffer);
   this._queue.push(buffer);
   this._queueSize += buffer.length;
 };
 
 StreamReader.prototype.read = function(length) {
   if (length > this._queueSize) return null;
-  if (length === 0) return Buffer.alloc(0);
+  if (length === 0) return new Buffer(0);
 
   this._queueSize -= length;
 
@@ -46,7 +44,7 @@ StreamReader.prototype.read = function(length) {
     buffers.push(queue[0].slice(0, remain));
     queue[0] = queue[0].slice(remain);
   }
-  return Buffer.concat(buffers, length);
+  return this._concat(buffers, length);
 };
 
 StreamReader.prototype.eachByte = function(callback, context) {
@@ -66,4 +64,17 @@ StreamReader.prototype.eachByte = function(callback, context) {
   }
 };
 
+StreamReader.prototype._concat = function(buffers, length) {
+  if (Buffer.concat) return Buffer.concat(buffers, length);
+
+  var buffer = new Buffer(length),
+      offset = 0;
+
+  for (var i = 0, n = buffers.length; i < n; i++) {
+    buffers[i].copy(buffer, offset);
+    offset += buffers[i].length;
+  }
+  return buffer;
+};
+
 module.exports = StreamReader;

node_modules/websocket-driver/lib/websocket/http_parser.js

@@ -1,16 +1,15 @@
 'use strict';
 
-var NodeHTTPParser = require('http-parser-js').HTTPParser,
-    Buffer         = require('safe-buffer').Buffer;
-
-var TYPES = {
-  request:  NodeHTTPParser.REQUEST  || 'request',
-  response: NodeHTTPParser.RESPONSE || 'response'
-};
+var NodeHTTPParser = process.binding('http_parser').HTTPParser,
+    version        = NodeHTTPParser.RESPONSE ? 6 : 4;
 
 var HttpParser = function(type) {
+  if (type === 'request')
+    this._parser = new NodeHTTPParser(NodeHTTPParser.REQUEST || 'request');
+  else
+    this._parser = new NodeHTTPParser(NodeHTTPParser.RESPONSE || 'response');
+
   this._type     = type;
-  this._parser   = new NodeHTTPParser(TYPES[type]);
   this._complete = false;
   this.headers   = {};
 
@@ -77,59 +76,25 @@ HttpParser.METHODS = {
   13: 'PROPPATCH',
   14: 'SEARCH',
   15: 'UNLOCK',
-  16: 'BIND',
-  17: 'REBIND',
-  18: 'UNBIND',
-  19: 'ACL',
-  20: 'REPORT',
-  21: 'MKACTIVITY',
-  22: 'CHECKOUT',
-  23: 'MERGE',
-  24: 'M-SEARCH',
-  25: 'NOTIFY',
-  26: 'SUBSCRIBE',
-  27: 'UNSUBSCRIBE',
-  28: 'PATCH',
-  29: 'PURGE',
-  30: 'MKCALENDAR',
-  31: 'LINK',
-  32: 'UNLINK'
+  16: 'REPORT',
+  17: 'MKACTIVITY',
+  18: 'CHECKOUT',
+  19: 'MERGE',
+  24: 'PATCH'
 };
 
-var VERSION = process.version
-  ? process.version.match(/[0-9]+/g).map(function(n) { return parseInt(n, 10) })
-  : [];
-
-if (VERSION[0] === 0 && VERSION[1] === 12) {
-  HttpParser.METHODS[16] = 'REPORT';
-  HttpParser.METHODS[17] = 'MKACTIVITY';
-  HttpParser.METHODS[18] = 'CHECKOUT';
-  HttpParser.METHODS[19] = 'MERGE';
-  HttpParser.METHODS[20] = 'M-SEARCH';
-  HttpParser.METHODS[21] = 'NOTIFY';
-  HttpParser.METHODS[22] = 'SUBSCRIBE';
-  HttpParser.METHODS[23] = 'UNSUBSCRIBE';
-  HttpParser.METHODS[24] = 'PATCH';
-  HttpParser.METHODS[25] = 'PURGE';
-}
-
 HttpParser.prototype.isComplete = function() {
   return this._complete;
 };
 
 HttpParser.prototype.parse = function(chunk) {
-  var consumed = this._parser.execute(chunk, 0, chunk.length);
-
-  if (typeof consumed !== 'number') {
-    this.error     = consumed;
-    this._complete = true;
-    return;
-  }
+  var offset   = (version < 6) ? 1 : 0,
+      consumed = this._parser.execute(chunk, 0, chunk.length) + offset;
 
   if (this._complete)
     this.body = (consumed < chunk.length)
               ? chunk.slice(consumed)
-              : Buffer.alloc(0);
+              : new Buffer(0);
 };
 
 module.exports = HttpParser;