Restruct

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() {