Replace the built-in Node HTTP parser with the http-parser-js package.

lib/websocket/driver/client.js

@@ -93,6 +93,9 @@ 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);
 

lib/websocket/http_parser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var NodeHTTPParser = process.binding('http_parser').HTTPParser;
+var NodeHTTPParser = require('http-parser-js').HTTPParser;
 
 var VERSION = process.version.match(/[0-9]+/g).map(function(n) { return parseInt(n, 10) });
 
@@ -115,8 +115,15 @@ HttpParser.prototype.isComplete = function() {
 };
 
 HttpParser.prototype.parse = function(chunk) {
-  var offset   = (VERSION[0] === 0 && VERSION[1] < 6) ? 1 : 0,
-      consumed = this._parser.execute(chunk, 0, chunk.length) + offset;
+  var consumed = this._parser.execute(chunk, 0, chunk.length);
+
+  if (typeof consumed !== 'number') {
+    this.error     = consumed;
+    this._complete = true;
+    return;
+  }
+
+  if (VERSION[0] === 0 && VERSION[1] < 6) consumed += 1;
 
   if (this._complete)
     this.body = (consumed < chunk.length)

package.json

@@ -8,8 +8,13 @@
 , "version"         : "0.6.5"
 , "engines"         : {"node": ">=0.6.0"}
 , "main"            : "./lib/websocket/driver"
-, "dependencies"    : {"websocket-extensions": ">=0.1.1"}
-, "devDependencies" : {"jstest": "", "permessage-deflate": ""}
+
+, "dependencies"    : { "http-parser-js": ">=0.4.0"
+                      , "websocket-extensions": ">=0.1.1"
+                      }
+, "devDependencies" : { "jstest": ""
+                      , "permessage-deflate": ""
+                      }
 
 , "scripts"         : {"test": "jstest spec/runner.js"}
 

spec/websocket/driver/client_spec.js

@@ -257,8 +257,8 @@ test.describe("Client", function() { with(this) {
 
       it("changes the state to closed", function() { with(this) {
         assertEqual( false, open )
-        assertEqual( "Error during WebSocket handshake: Unexpected response code: 4", error.message )
-        assertEqual( [1002, "Error during WebSocket handshake: Unexpected response code: 4"], close )
+        assertEqual( "Error during WebSocket handshake: Parse Error", error.message )
+        assertEqual( [1002, "Error during WebSocket handshake: Parse Error"], close )
         assertEqual( "closed", driver().getState() )
       }})
     }})