Remove the websocket-driver submodule.

Fix for closing a socket in the CONNECTING state

.npmignore

@@ -1,4 +1,6 @@
 .git
 .gitignore
+.npmignore
 .redcar
+.travis.yml
 node_modules

.travis.yml

@@ -0,0 +1,8 @@
+language: node_js
+
+node_js:
+  - "0.6"
+  - "0.8"
+  - "0.10"
+  - "0.11"
+

CHANGELOG.md

@@ -0,0 +1,62 @@
+### 0.4.4 / 2013-02-14
+
+* Emit the `close` event if TCP is closed before CLOSE frame is acked
+
+
+### 0.4.3 / 2012-07-09
+
+* Add `Connection: close` to EventSource response
+* Handle situations where `request.socket` is undefined
+
+
+### 0.4.2 / 2012-04-06
+
+* Add WebSocket error code `1011`.
+* Handle URLs with no path correctly by sending `GET /`
+
+
+### 0.4.1 / 2012-02-26
+
+* Treat anything other than a `Buffer` as a string when calling `send()`
+
+
+### 0.4.0 / 2012-02-13
+
+* Add `ping()` method to server-side `WebSocket` and `EventSource`
+* Buffer `send()` calls until the draft-76 handshake is complete
+* Fix HTTPS problems on Node 0.7
+
+
+### 0.3.1 / 2012-01-16
+
+* Call `setNoDelay(true)` on `net.Socket` objects to reduce latency
+
+
+### 0.3.0 / 2012-01-13
+
+* Add support for `EventSource` connections
+
+
+### 0.2.0 / 2011-12-21
+
+* Add support for `Sec-WebSocket-Protocol` negotiation
+* Support `hixie-76` close frames and 75/76 ignored segments
+* Improve performance of HyBi parsing/framing functions
+* Decouple parsers from TCP and reduce write volume
+
+
+### 0.1.2 / 2011-12-05
+
+* Detect closed sockets on the server side when TCP connection breaks
+* Make `hixie-76` sockets work through HAProxy
+
+
+### 0.1.1 / 2011-11-30
+
+* Fix `addEventListener()` interface methods
+
+
+### 0.1.0 / 2011-11-27
+
+* Initial release, based on WebSocket components from Faye
+

README.markdown

@@ -1,119 +0,0 @@
-# faye-websocket
-
-This is a robust, general-purpose WebSocket implementation extracted from the
-[Faye](http://faye.jcoglan.com) project. It provides classes for easily building
-WebSocket servers and clients in Node. It does not provide a server itself, but
-rather makes it easy to handle WebSocket connections within an existing
-[Node](http://nodejs.org/) application. It does not provide any abstraction
-other than the standard [WebSocket API](http://dev.w3.org/html5/websockets/).
-
-The server-side socket can process [draft-75](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75),
-[draft-76](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76),
-[hybi-07](http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07)
-and later versions of the protocol. It selects protocol versions automatically,
-supports both `text` and `binary` messages, and transparently handles `ping`,
-`pong`, `close` and fragmented messages.
-
-
-## Accepting WebSocket connections in Node
-
-You can handle WebSockets on the server side by listening for HTTP Upgrade
-requests, and creating a new socket for the request. This socket object exposes
-the usual WebSocket methods for receiving and sending messages. For example this
-is how you'd implement an echo server:
-
-```js
-var WebSocket = require('faye-websocket'),
-    http      = require('http');
-
-var server = http.createServer();
-
-server.addListener('upgrade', function(request, socket, head) {
-  var ws = new WebSocket(request, socket, head);
-  
-  ws.onmessage = function(event) {
-    ws.send(event.data);
-  };
-  
-  ws.onclose = function(event) {
-    console.log('close', event.code, event.reason);
-    ws = null;
-  };
-});
-
-server.listen(8000);
-```
-
-
-## Using the WebSocket client
-
-The client supports both the plain-text `ws` protocol and the encrypted `wss`
-protocol, and has exactly the same interface as a socket you would use in a web
-browser. On the wire it identifies itself as hybi-08, though it's compatible
-with servers speaking later versions of the protocol, at least up to version 17.
-
-```js
-var WebSocket = require('faye-websocket'),
-    ws        = new WebSocket.Client('ws://www.example.com/');
-
-ws.onopen = function(event) {
-  console.log('open');
-  ws.send('Hello, world!');
-};
-
-ws.onmessage = function(event) {
-  console.log('message', event.data);
-};
-
-ws.onclose = function(event) {
-  console.log('close', event.code, event.reason);
-  ws = null;
-};
-```
-
-
-## WebSocket API
-
-The WebSocket API consists of several event handlers and a method for sending
-messages.
-
-* <b><tt>onopen</tt></b> fires when the socket connection is established. Event
-  has no attributes.
-* <b><tt>onerror</tt></b> fires when the connection attempt fails. Event has no
-  attributes.
-* <b><tt>onmessage</tt></b> fires when the socket receives a message. Event has
-  one attribute, <b><tt>data</tt></b>, which is either a `String` (for text
-  frames) or a `Buffer` (for binary frames).
-* <b><tt>onclose</tt></b> fires when either the client or the server closes the
-  connection. Event has two optional attributes, <b><tt>code</tt></b> and
-  <b><tt>reason</tt></b>, that expose the status code and message sent by the
-  peer that closed the connection.
-* <b><tt>send(message)</tt></b> accepts either a `String` or a `Buffer` and
-  sends a text or binary message over the connection to the other peer.
-* <b><tt>close(code, reason)</tt></b> closes the connection, sending the given
-  status code and reason text, both of which are optional.
-
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2009-2011 James Coglan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

README.md

@@ -0,0 +1,259 @@
+# faye-websocket
+
+* Travis CI build: [![Build
+  status](https://secure.travis-ci.org/faye/faye-websocket-node.png)](http://travis-ci.org/faye/faye-websocket-node)
+* Autobahn tests: [server](http://faye.jcoglan.com/autobahn/servers/),
+  [client](http://faye.jcoglan.com/autobahn/clients/)
+
+This is a general-purpose WebSocket implementation extracted from the
+[Faye](http://faye.jcoglan.com) project. It provides classes for easily
+building WebSocket servers and clients in Node. It does not provide a server
+itself, but rather makes it easy to handle WebSocket connections within an
+existing [Node](http://nodejs.org/) application. It does not provide any
+abstraction other than the standard [WebSocket
+API](http://dev.w3.org/html5/websockets/).
+
+It also provides an abstraction for handling
+[EventSource](http://dev.w3.org/html5/eventsource/) connections, which are
+one-way connections that allow the server to push data to the client. They are
+based on streaming HTTP responses and can be easier to access via proxies than
+WebSockets.
+
+
+## Installation
+
+```
+$ npm install faye-websocket
+```
+
+
+## Handling WebSocket connections in Node
+
+You can handle WebSockets on the server side by listening for HTTP Upgrade
+requests, and creating a new socket for the request. This socket object exposes
+the usual WebSocket methods for receiving and sending messages. For example this
+is how you'd implement an echo server:
+
+```js
+var WebSocket = require('faye-websocket'),
+    http      = require('http');
+
+var server = http.createServer();
+
+server.on('upgrade', function(request, socket, body) {
+  if (WebSocket.isWebSocket(request)) {
+    var ws = new WebSocket(request, socket, body);
+    
+    ws.on('message', function(event) {
+      ws.send(event.data);
+    });
+    
+    ws.on('close', function(event) {
+      console.log('close', event.code, event.reason);
+      ws = null;
+    });
+
+  }
+});
+
+server.listen(8000);
+```
+
+Note that under certain circumstances (notably a draft-76 client connecting
+through an HTTP proxy), the WebSocket handshake will not be complete after you
+call `new WebSocket()` because the server will not have received the entire
+handshake from the client yet. In this case, calls to `ws.send()` will buffer
+the message in memory until the handshake is complete, at which point any
+buffered messages will be sent to the client.
+
+If you need to detect when the WebSocket handshake is complete, you can use the
+`onopen` event.
+
+If the connection's protocol version supports it, you can call `ws.ping()` to
+send a ping message and wait for the client's response. This method takes a
+message string, and an optional callback that fires when a matching pong
+message is received. It returns `true` iff a ping message was sent. If the
+client does not support ping/pong, this method sends no data and returns
+`false`.
+
+```js
+ws.ping('Mic check, one, two', function() {
+  // fires when pong is received
+});
+```
+
+
+## Using the WebSocket client
+
+The client supports both the plain-text `ws` protocol and the encrypted `wss`
+protocol, and has exactly the same interface as a socket you would use in a web
+browser. On the wire it identifies itself as `hybi-13`.
+
+```js
+var WebSocket = require('faye-websocket'),
+    ws        = new WebSocket.Client('ws://www.example.com/');
+
+ws.on('open', function(event) {
+  console.log('open');
+  ws.send('Hello, world!');
+});
+
+ws.on('message', function(event) {
+  console.log('message', event.data);
+});
+
+ws.on('close', function(event) {
+  console.log('close', event.code, event.reason);
+  ws = null;
+});
+```
+
+
+## Subprotocol negotiation
+
+The WebSocket protocol allows peers to select and identify the application
+protocol to use over the connection. On the client side, you can set which
+protocols the client accepts by passing a list of protocol names when you
+construct the socket:
+
+```js
+var ws = new WebSocket.Client('ws://www.example.com/', ['irc', 'amqp']);
+```
+
+On the server side, you can likewise pass in the list of protocols the server
+supports after the other constructor arguments:
+
+```js
+var ws = new WebSocket(request, socket, body, ['irc', 'amqp']);
+```
+
+If the client and server agree on a protocol, both the client- and server-side
+socket objects expose the selected protocol through the `ws.protocol` property.
+
+
+## WebSocket API
+
+Both server- and client-side `WebSocket` objects support the following API:
+
+* <b>`on('open', function(event) {})`</b> fires when the socket connection is
+  established. Event has no attributes.
+* <b>`on('message', function(event) {})`</b> fires when the socket receives a
+  message. Event has one attribute, <b>`data`</b>, which is either a `String`
+  (for text frames) or a `Buffer` (for binary frames).
+* <b>`on('error', function(event) {})`</b> fires when there is a protocol error
+  due to bad data sent by the other peer. This event is purely informational,
+  you do not need to implement error recover.
+* <b>`on('close', function(event) {})`</b> fires when either the client or the
+  server closes the connection. Event has two optional attributes,
+  <b>`code`</b> and <b>`reason`</b>, that expose the status code and message
+  sent by the peer that closed the connection.
+* <b>`send(message)`</b> accepts either a `String` or a `Buffer` and sends a
+  text or binary message over the connection to the other peer.
+* <b>`ping(message = '', function() {})`</b> sends a ping frame with an
+  optional message and fires the callback when a matching pong is received.
+* <b>`close(code, reason)`</b> closes the connection, sending the given status
+  code and reason text, both of which are optional.
+* <b>`version`</b> is a string containing the version of the `WebSocket`
+  protocol the connection is using.
+* <b>`protocol`</b> is a string (which may be empty) identifying the
+  subprotocol the socket is using.
+
+
+## Handling EventSource connections in Node
+
+EventSource connections provide a very similar interface, although because they
+only allow the server to send data to the client, there is no `onmessage` API.
+EventSource allows the server to push text messages to the client, where each
+message has an optional event-type and ID.
+
+```js
+var WebSocket   = require('faye-websocket'),
+    EventSource = WebSocket.EventSource,
+    http        = require('http');
+
+var server = http.createServer();
+
+server.on('request', function(request, response) {
+  if (EventSource.isEventSource(request)) {
+    var es = new EventSource(request, response);
+    console.log('open', es.url, es.lastEventId);
+    
+    // Periodically send messages
+    var loop = setInterval(function() { es.send('Hello') }, 1000);
+    
+    es.on('close', function() {
+      clearInterval(loop);
+      es = null;
+    });
+  
+  } else {
+    // Normal HTTP request
+    response.writeHead(200, {'Content-Type': 'text/plain'});
+    response.end('Hello');
+  }
+});
+
+server.listen(8000);
+```
+
+The `send` method takes two optional parameters, `event` and `id`. The default
+event-type is `'message'` with no ID. For example, to send a `notification`
+event with ID `99`:
+
+```js
+es.send('Breaking News!', {event: 'notification', id: '99'});
+```
+
+The `EventSource` object exposes the following properties:
+
+* <b>`url`</b> is a string containing the URL the client used to create the
+  EventSource.
+* <b>`lastEventId`</b> is a string containing the last event ID received by the
+  client. You can use this when the client reconnects after a dropped
+  connection to determine which messages need resending.
+
+When you initialize an EventSource with ` new EventSource()`, you can pass
+configuration options after the `response` parameter. Available options are:
+
+* <b>`retry`</b> is a number that tells the client how long (in seconds) it
+  should wait after a dropped connection before attempting to reconnect.
+* <b>`ping`</b> is a number that tells the server how often (in seconds) to
+  send 'ping' packets to the client to keep the connection open, to defeat
+  timeouts set by proxies. The client will ignore these messages.
+
+For example, this creates a connection that pings every 15 seconds and is
+retryable every 10 seconds if the connection is broken:
+
+```js
+var es = new EventSource(request, response, {ping: 15, retry: 10});
+```
+
+You can send a ping message at any time by calling `es.ping()`. Unlike
+WebSocket, the client does not send a response to this; it is merely to send
+some data over the wire to keep the connection alive.
+
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2010-2013 James Coglan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the 'Software'), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

examples/autobahn_client.js

@@ -1,41 +1,44 @@
-var WebSocket = require('../lib/faye/websocket');
+var WebSocket = require('../lib/faye/websocket'),
+    pace      = require('pace');
 
 var host  = 'ws://localhost:9001',
-    agent = 'Faye (Node ' + process.version + ')',
+    agent = 'Node ' + process.version,
     cases = 0,
-    skip  = [247,248,249,250,251,252,253,254,255,
-             256,257,258,259,260,261,262,263,264];
+    skip  = [];
 
-var socket = new WebSocket.Client(host + '/getCaseCount');
+var socket = new WebSocket.Client(host + '/getCaseCount'),
+    progress;
 
 socket.onmessage = function(event) {
   console.log('Total cases to run: ' + event.data);
   cases = parseInt(event.data);
+  progress = pace(cases);
 };
 
 socket.onclose = function() {
   var runCase = function(n) {
+    progress.op();
+
     if (n > cases) {
       socket = new WebSocket.Client(host + '/updateReports?agent=' + encodeURIComponent(agent));
-      socket.onclose = process.exit
-      
+      socket.onclose = process.exit;
+
     } else if (skip.indexOf(n) >= 0) {
       runCase(n + 1);
-      
+
     } else {
-      console.log('Running test case #' + n + ' ...');
       socket = new WebSocket.Client(host + '/runCase?case=' + n + '&agent=' + encodeURIComponent(agent));
-      
+
       socket.onmessage = function(event) {
         socket.send(event.data);
       };
-      
+
       socket.onclose = function() {
         runCase(n + 1);
       };
     }
   };
-  
+
   runCase(1);
 };
 

examples/haproxy.conf

@@ -0,0 +1,21 @@
+defaults
+   mode http
+   timeout client  5s
+   timeout connect 5s
+   timeout server  5s
+
+frontend all 0.0.0.0:3000
+   mode http
+   timeout client 120s
+
+   option forwardfor
+   option http-server-close
+   option http-pretend-keepalive
+
+   default_backend sockets
+
+backend sockets
+   balance uri depth 2
+   timeout server  120s
+   server socket1 127.0.0.1:7000
+

examples/server.js

@@ -6,9 +6,47 @@ var WebSocket = require('../lib/faye/websocket'),
 var port   = process.argv[2] || 7000,
     secure = process.argv[3] === 'ssl';
 
+var upgradeHandler = function(request, socket, head) {
+  var ws = new WebSocket(request, socket, head, ['irc', 'xmpp'], {ping: 5});
+  console.log('open', ws.url, ws.version, ws.protocol);
+
+  ws.pipe(ws);
+
+  ws.onclose = function(event) {
+    console.log('close', event.code, event.reason);
+    ws = null;
+  };
+};
+
+var requestHandler = function(request, response) {
+  if (!WebSocket.EventSource.isEventSource(request))
+    return staticHandler(request, response);
+
+  var es   = new WebSocket.EventSource(request, response),
+      time = parseInt(es.lastEventId, 10) || 0;
+
+  console.log('open', es.url, es.lastEventId);
+
+  var loop = setInterval(function() {
+    time += 1;
+    es.send('Time: ' + time);
+    setTimeout(function() {
+      if (es) es.send('Update!!', {event: 'update', id: time});
+    }, 1000);
+  }, 2000);
+
+  fs.createReadStream(__dirname + '/haproxy.conf').pipe(es);
+
+  es.onclose = function() {
+    clearInterval(loop);
+    console.log('close', es.url);
+    es = null;
+  };
+};
+
 var staticHandler = function(request, response) {
   var path = request.url;
-  
+
   fs.readFile(__dirname + path, function(err, content) {
     var status = err ? 404 : 200;
     response.writeHead(status, {'Content-Type': 'text/html'});
@@ -22,20 +60,9 @@ var server = secure
                key:  fs.readFileSync(__dirname + '/../spec/server.key'),
                cert: fs.readFileSync(__dirname + '/../spec/server.crt')
              })
-           : http.createServer(staticHandler);
-
-server.addListener('upgrade', function(request, socket, head) {
-  var ws = new WebSocket(request, socket, head);
-  console.log('open', ws.url, ws.version);
-  
-  ws.onmessage = function(event) {
-    ws.send(event.data);
-  };
-  
-  ws.onclose = function(event) {
-    console.log('close', event.code, event.reason);
-    ws = null;
-  };
-});
+           : http.createServer();
 
+server.on('request', requestHandler);
+server.on('upgrade', upgradeHandler);
 server.listen(port);
+

examples/sse.html

@@ -0,0 +1,39 @@
+<!doctype html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>EventSource test</title>
+  </head>
+  <body>
+
+    <h1>EventSource test</h1>
+    <ul></ul>
+
+    <script type="text/javascript">
+      var logger = document.getElementsByTagName('ul')[0],
+          socket = new EventSource('/');
+
+      var log = function(text) {
+        logger.innerHTML += '<li>' + text + '</li>';
+      };
+
+      socket.onopen = function() {
+        log('OPEN');
+      };
+
+      socket.onmessage = function(event) {
+        log('MESSAGE: ' + event.data);
+      };
+
+      socket.addEventListener('update', function(event) {
+        log('UPDATE(' + event.lastEventId + '): ' + event.data);
+      });
+
+      socket.onerror = function(event) {
+        log('ERROR: ' + event.message);
+      };
+    </script>
+
+  </body>
+</html>
+

examples/ws.html

@@ -5,31 +5,40 @@
     <title>WebSocket test</title>
   </head>
   <body>
-    
+
     <h1>WebSocket test</h1>
     <ul></ul>
-    
+
     <script type="text/javascript">
       var logger = document.getElementsByTagName('ul')[0],
           Socket = window.MozWebSocket || window.WebSocket,
-          socket = new Socket('ws://' + location.hostname + ':' + location.port + '/'),
+          protos = ['foo', 'bar', 'xmpp'],
+          socket = new Socket('ws://' + location.hostname + ':' + location.port + '/', protos),
           index  = 0;
-      
-      socket.onopen = function() {
-        logger.innerHTML += '<li>OPEN</li>';
-        socket.send('Hello, world');
+
+      var log = function(text) {
+        logger.innerHTML += '<li>' + text + '</li>';
       };
-      
-      socket.addEventListener('message', function(event) {
-        logger.innerHTML += '<li>MESSAGE: ' + event.data + '</li>';
-        setTimeout(function() { socket.send(++index + ' ' + event.data) }, 2000);
+
+      socket.addEventListener('open', function() {
+        log('OPEN: ' + socket.protocol);
+        socket.send('Hello, world');
       });
-      
+
+      socket.onerror = function(event) {
+        log('ERROR: ' + event.message);
+      };
+
+      socket.onmessage = function(event) {
+        log('MESSAGE: ' + event.data);
+        setTimeout(function() { socket.send(++index + ' ' + event.data) }, 2000);
+      };
+
       socket.onclose = function(event) {
-        logger.innerHTML += '<li>CLOSE: ' + event.code + ', ' + event.reason + '</li>';
+        log('CLOSE: ' + event.code + ', ' + event.reason);
       };
     </script>
-    
+
   </body>
 </html>
 

lib/faye/eventsource.js

@@ -0,0 +1,125 @@
+var Stream      = require('stream').Stream,
+    util        = require('util'),
+    driver      = require('websocket-driver'),
+    API         = require('./websocket/api'),
+    EventTarget = require('./websocket/api/event_target'),
+    Event       = require('./websocket/api/event');
+
+var EventSource = function(request, response, options) {
+  this.writable = true;
+  options = options || {};
+
+  this._stream = response.socket;
+  this._ping   = options.ping  || this.DEFAULT_PING;
+  this._retry  = options.retry || this.DEFAULT_RETRY;
+
+  var scheme       = driver.isSecureRequest(request) ? 'https:' : 'http:';
+  this.url         = scheme + '//' + request.headers.host + request.url;
+  this.lastEventId = request.headers['last-event-id'] || '';
+  this.readyState  = API.CONNECTING;
+
+  var self = this;
+
+  if (!this._stream || !this._stream.writable) return;
+  process.nextTick(function() { self._open() });
+
+  this._stream.setTimeout(0);
+  this._stream.setNoDelay(true);
+
+  var handshake = 'HTTP/1.1 200 OK\r\n' +
+                  'Content-Type: text/event-stream\r\n' +
+                  'Cache-Control: no-cache, no-store\r\n' +
+                  'Connection: close\r\n' +
+                  '\r\n\r\n' +
+                  'retry: ' + Math.floor(this._retry * 1000) + '\r\n\r\n';
+
+  this._write(handshake);
+
+  this._stream.on('drain', function() { self.emit('drain') });
+
+  if (this._ping)
+    this._pingTimer = setInterval(function() { self.ping() }, this._ping * 1000);
+
+  ['error', 'end'].forEach(function(event) {
+    self._stream.on(event, function() { self.close() });
+  });
+};
+util.inherits(EventSource, Stream);
+
+EventSource.isEventSource = function(request) {
+  if (request.method !== 'GET') return false;
+  var accept = (request.headers.accept || '').split(/\s*,\s*/);
+  return accept.indexOf('text/event-stream') >= 0;
+};
+
+var instance = {
+  DEFAULT_PING:   10,
+  DEFAULT_RETRY:  5,
+
+  _write: function(chunk) {
+    if (!this.writable) return false;
+    try {
+      return this._stream.write(chunk, 'utf8');
+    } catch (e) {
+      return false;
+    }
+  },
+
+  _open: function() {
+    if (this.readyState !== API.CONNECTING) return;
+
+    this.readyState = API.OPEN;
+
+    var event = new Event('open');
+    event.initEvent('open', false, false);
+    this.dispatchEvent(event);
+  },
+
+  write: function(message) {
+    return this.send(message);
+  },
+
+  end: function(message) {
+    if (message !== undefined) this.write(message);
+    this.close();
+  },
+
+  send: function(message, options) {
+    if (this.readyState > API.OPEN) return false;
+
+    message = String(message).replace(/(\r\n|\r|\n)/g, '$1data: ');
+    options = options || {};
+
+    var frame = '';
+    if (options.event) frame += 'event: ' + options.event + '\r\n';
+    if (options.id)    frame += 'id: '    + options.id    + '\r\n';
+    frame += 'data: ' + message + '\r\n\r\n';
+
+    return this._write(frame);
+  },
+
+  ping: function() {
+    return this._write(':\r\n\r\n');
+  },
+
+  close: function() {
+    if (this.readyState > API.OPEN) return false;
+
+    this.readyState = API.CLOSED;
+    this.writable = false;
+    if (this._pingTimer) clearInterval(this._pingTimer);
+    if (this._stream) this._stream.end();
+
+    var event = new Event('close');
+    event.initEvent('close', false, false);
+    this.dispatchEvent(event);
+
+    return true;
+  }
+};
+
+for (var method in instance) EventSource.prototype[method] = instance[method];
+for (var key in EventTarget) EventSource.prototype[key] = EventTarget[key];
+
+module.exports = EventSource;
+

lib/faye/websocket.js

@@ -1,69 +1,46 @@
-// API and protocol references:
+// API references:
 // 
 // * http://dev.w3.org/html5/websockets/
 // * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-eventtarget
 // * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-event
-// * 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
 
-var Draft75Parser   = require('./websocket/draft75_parser'),
-    Draft76Parser   = require('./websocket/draft76_parser'),
-    Protocol8Parser = require('./websocket/protocol8_parser'),
-    API             = require('./websocket/api');
+var util   = require('util'),
+    driver = require('websocket-driver'),
+    API    = require('./websocket/api');
 
-var getParser = function(request) {
-  var headers = request.headers;
-  return headers['sec-websocket-version']
-       ? Protocol8Parser
-       : (headers['sec-websocket-key1'] && headers['sec-websocket-key2'])
-       ? Draft76Parser
-       : Draft75Parser;
-};
+var WebSocket = function(request, socket, body, protocols, options) {
+  this._stream  = socket;
+  this._ping    = options && options.ping;
+  this._pingId  = 0;
+  this._driver  = driver.http(request, {protocols: protocols});
 
-var isSecureConnection = function(request) {
-  if (request.headers['x-forwarded-proto']) {
-    return request.headers['x-forwarded-proto'] === 'https';
-  } else {
-    return (request.connection && request.connection.authorized !== undefined) ||
-           (request.socket && request.socket.secure);
-  }
-};
-
-var WebSocket = function(request, socket, head) {
-  this.request = request;
-  this._stream = request.socket;
-  
-  var scheme = isSecureConnection(request) ? 'wss:' : 'ws:';
-  this.url = scheme + '//' + request.headers.host + request.url;    
-  this.readyState = API.CONNECTING;
-  this.bufferedAmount = 0;
-  
-  var Parser = getParser(request);
-  this._parser = new Parser(this, this._stream);
-  this._parser.handshakeResponse(head);
-  
-  this.readyState = API.OPEN;
-  this.version = this._parser.getVersion();
-  
-  var event = new API.Event('open');
-  event.initEvent('open', false, false);
-  this.dispatchEvent(event);
-  
   var self = this;
-  
-  this._stream.addListener('data', function(data) {
-    self._parser.parse(data);
-  });
-  this._stream.addListener('close', function() {
-    self.close(1006, '', false);
-  });
-  this._stream.addListener('error', function() {});
+  if (!this._stream || !this._stream.writable) return;
+
+  var catchup = function() { self._stream.removeListener('data', catchup) };
+  this._stream.on('data', catchup);
+
+  this._stream.setTimeout(0);
+  this._stream.setNoDelay(true);
+
+  this._driver.io.write(body);
+  API.call(this);
+
+  ['error', 'end'].forEach(function(event) {
+    this._stream.on(event, function() { self._finalize('', 1006) });
+  }, this);
+
+  this._driver.start();
+};
+util.inherits(WebSocket, API);
+
+WebSocket.isWebSocket = function(request) {
+  return driver.isWebSocket(request);
 };
 
-var API = require('./websocket/api');
-for (var key in API) WebSocket.prototype[key] = API[key];
+WebSocket.WebSocket   = WebSocket;
+WebSocket.Client      = require('./websocket/client');
+WebSocket.EventSource = require('./eventsource');
 
-WebSocket.Client = require('./websocket/client');
-module.exports   = WebSocket;
+module.exports        = WebSocket;
 

lib/faye/websocket/api.js

@@ -1,108 +1,123 @@
-var API = {
-  CONNECTING:   0,
-  OPEN:         1,
-  CLOSING:      2,
-  CLOSED:       3,
-  
-  onopen:     null,
-  onmessage:  null,
-  onerror:    null,
-  onclose:    null,
-  
-  receive: function(data) {
-    if (this.readyState !== API.OPEN) return false;
-    var event = new API.Event('message');
-    event.initEvent('message', false, false);
-    event.data = data;
+var Stream      = require('stream').Stream,
+    util        = require('util'),
+    EventTarget = require('./api/event_target'),
+    Event       = require('./api/event');
+
+var API = function() {
+  this.readable = this.writable = true;
+
+  this.readyState     = API.CONNECTING;
+  this.bufferedAmount = 0;
+  this.protocol       = '';
+  this.url            = this._driver.url;
+  this.version        = this._driver.version;
+
+  var self = this;
+
+  this._driver.on('open',    function(e) { self._open() });
+  this._driver.on('message', function(e) { self._receiveMessage(e.data) });
+  this._driver.on('close',   function(e) { self._finalize(e.reason, e.code) });
+
+  this._driver.on('error', function(error) {
+    var event = new Event('error', {message: error.message});
+    event.initEvent('error', false, false);
+    self.dispatchEvent(event);
+  });
+  this.on('error', function() {});
+
+  this._driver.messages.on('drain', function() {
+    self.emit('drain');
+  });
+
+  if (this._ping)
+    this._pingTimer = setInterval(function() {
+      self._pingId += 1;
+      self.ping(self._pingId.toString());
+    }, this._ping * 1000);
+
+  this._stream.pipe(this._driver.io);
+  this._driver.io.pipe(this._stream);
+};
+util.inherits(API, Stream);
+
+API.CONNECTING = 0;
+API.OPEN       = 1;
+API.CLOSING    = 2;
+API.CLOSED     = 3;
+
+var instance = {
+  write: function(data) {
+    return this.send(data);
+  },
+
+  end: function(data) {
+    if (data !== undefined) this.send(data);
+    this.close();
+  },
+
+  pause: function() {
+    return this._driver.messages.pause();
+  },
+
+  resume: function() {
+    return this._driver.messages.resume();
+  },
+
+  send: function(data) {
+    if (this.readyState > API.OPEN) return false;
+    if (!(data instanceof Buffer)) data = String(data);
+    return this._driver.messages.write(data);
+  },
+
+  ping: function(message, callback) {
+    if (this.readyState > API.OPEN) return false;
+    return this._driver.ping(message, callback);
+  },
+
+  close: function() {
+    if (this.readyState === API.OPEN) this.readyState = API.CLOSING;
+    this._driver.close();
+  },
+
+ _open: function() {
+    if (this.readyState !== API.CONNECTING) return;
+
+    this.readyState = API.OPEN;
+    this.protocol = this._driver.protocol || '';
+
+    var event = new Event('open');
+    event.initEvent('open', false, false);
     this.dispatchEvent(event);
   },
-  
-  send: function(data, type, errorType) {
-    if (this.readyState === API.CLOSED) return false;
-    return this._parser.frame(data, type, errorType);
+
+  _receiveMessage: function(data) {
+    if (this.readyState > API.OPEN) return false;
+
+    if (this.readable) this.emit('data', data);
+
+    var event = new Event('message', {data: data});
+    event.initEvent('message', false, false);
+    this.dispatchEvent(event);
   },
-  
-  close: function(code, reason, ack) {
-    if (this.readyState === API.CLOSING ||
-        this.readyState === API.CLOSED) return;
-    
-    this.readyState = API.CLOSING;
-    
-    var close = function() {
-      this.readyState = API.CLOSED;
-      this._stream.end();
-      var event = new API.Event('close', {code: code || 1000, reason: reason || ''});
-      event.initEvent('close', false, false);
-      this.dispatchEvent(event);
-    };
-    
-    if (ack !== false) {
-      if (this._parser.close) this._parser.close(code, reason, close, this);
-      else close.call(this);
-    } else {
-      if (this._parser.close) this._parser.close(code, reason);
-      close.call(this);
-    }
-  },
-  
-  addEventListener: function(eventType, listener, useCapture) {
-    this._listeners = this._listeners || {};
-    var list = this._listeners[eventType] = this._listeners[eventType] || [];
-    list.push(listener);
-  },
-  
-  removeEventListener: function(eventType, listener, useCapture) {
-    if (!this._listeners || !this._listeners[eventType]) return;
-    
-    if (!listener) {
-      delete this._listeners[eventType];
-      return;
-    }
-    var list = this._listeners[eventType],
-        i    = list.length;
-    
-    while (i--) {
-      if (listener !== list[i]) continue;
-      list.splice(i,1);
-    }
-  },
-  
-  dispatchEvent: function(event) {
-    event.target = event.currentTarget = this;
-    event.eventPhase = API.Event.AT_TARGET;
-    
-    if (this['on' + event.type])
-      this['on' + event.type](event);
-    
-    if (!this._listeners || !this._listeners[event.type]) return;
-    
-    this._listeners[event.type].forEach(function(listener) {
-      listener(event);
-    }, this);
+
+  _finalize: function(reason, code) {
+    if (this.readyState === API.CLOSED) return;
+
+    if (this._pingTimer) clearInterval(this._pingTimer);
+    if (this._stream) this._stream.end();
+
+    if (this.readable) this.emit('end');
+    this.readable = this.writable = false;
+
+    this.readyState = API.CLOSED;
+    var event = new Event('close', {code: code || 1000, reason: reason || ''});
+    event.initEvent('close', false, false);
+    this.dispatchEvent(event);
   }
 };
 
-
-var Event = function(eventType, options) {
-  this.type = eventType;
-  for (var key in options)
-    this[key] = options[key];
-};
-    
-Event.prototype.initEvent = function(eventType, canBubble, cancelable) {
-  this.type       = eventType;
-  this.bubbles    = canBubble;
-  this.cancelable = cancelable;
-};
-
-Event.prototype.stopPropagation = function() {};
-Event.prototype.preventDefault  = function() {};
-    
-Event.CAPTURING_PHASE = 1;
-Event.AT_TARGET       = 2;
-Event.BUBBLING_PHASE  = 3;
-
-API.Event = Event;
+for (var method in instance) API.prototype[method] = instance[method];
+for (var key in EventTarget) API.prototype[key] = EventTarget[key];
 
 module.exports = API;
 

lib/faye/websocket/api/event.js

@@ -0,0 +1,21 @@
+var Event = function(eventType, options) {
+  this.type = eventType;
+  for (var key in options)
+    this[key] = options[key];
+};
+
+Event.prototype.initEvent = function(eventType, canBubble, cancelable) {
+  this.type       = eventType;
+  this.bubbles    = canBubble;
+  this.cancelable = cancelable;
+};
+
+Event.prototype.stopPropagation = function() {};
+Event.prototype.preventDefault  = function() {};
+
+Event.CAPTURING_PHASE = 1;
+Event.AT_TARGET       = 2;
+Event.BUBBLING_PHASE  = 3;
+
+module.exports = Event;
+

lib/faye/websocket/api/event_target.js

@@ -0,0 +1,29 @@
+var Event = require('./event');
+
+var EventTarget = {
+  onopen:     null,
+  onmessage:  null,
+  onerror:    null,
+  onclose:    null,
+
+  addEventListener: function(eventType, listener, useCapture) {
+    this.on(eventType, listener);
+  },
+
+  removeEventListener: function(eventType, listener, useCapture) {
+    this.removeListener(eventType, listener);
+  },
+
+  dispatchEvent: function(event) {
+    event.target = event.currentTarget = this;
+    event.eventPhase = Event.AT_TARGET;
+
+    if (this['on' + event.type])
+      this['on' + event.type](event);
+
+    this.emit(event.type, event);
+  }
+};
+
+module.exports = EventTarget;
+

lib/faye/websocket/client.js

@@ -1,76 +1,40 @@
-var API = require('./api'),
-    net = require('net'),
-    tls = require('tls');
+var util   = require('util'),
+    net    = require('net'),
+    tls    = require('tls'),
+    driver = require('websocket-driver'),
+    API    = require('./api');
 
-var Protocol8Parser = require('./protocol8_parser');
+var Client = function(url, protocols, options) {
+  this.url     = url;
+  this._uri    = require('url').parse(url);
+  this._ping   = options && options.ping;
+  this._pingId = 0;
+  this._driver = driver.client(url, {protocols: protocols});
+
+  var secure     = (this._uri.protocol === 'wss:'),
+      onConnect  = function() { self._driver.start() },
+      tlsOptions = {},
+      self       = this;
+
+  if (options && options.verify === false) tlsOptions.rejectUnauthorized = false;
+
+  var connection = secure
+                 ? tls.connect(this._uri.port || 443, this._uri.hostname, tlsOptions, onConnect)
+                 : net.createConnection(this._uri.port || 80, this._uri.hostname);
 
-var Client = function(url) {
-  this.url = url;
-  this.uri = require('url').parse(url);
-  
-  this.readyState = API.CONNECTING;
-  this.bufferedAmount = 0;
-  
-  var secure     = (this.uri.protocol === 'wss:'),
-      self       = this,
-      onConnect  = function() { self._onConnect() },
-      
-      connection = secure
-                 ? tls.connect(this.uri.port || 443, this.uri.hostname, onConnect)
-                 : net.createConnection(this.uri.port || 80, this.uri.hostname);
-  
-  this._parser = new Protocol8Parser(this, connection, {masking: true});
   this._stream = connection;
-  
-  if (!secure) connection.addListener('connect', onConnect);
-  
-  connection.addListener('data', function(data) {
-    self._onData(data);
-  });
-  connection.addListener('close', function() {
-    self.close(1006, '', false);
-  });
-  connection.addListener('error', function() {});
-};
-  
-Client.prototype._onConnect = function() {
-  this._handshake = this._parser.createHandshake(this.uri);
-  this._message = [];
-  this._handshake.requestData();
-};
+  this._stream.setTimeout(0);
+  this._stream.setNoDelay(true);
 
-Client.prototype._onData = function(data) {
-  switch (this.readyState) {
-    case API.CONNECTING:
-      var bytes = this._handshake.parse(data);
-      for (var i = 0, n = bytes.length; i < n; i++)
-        this._message.push(bytes[i]);
-      
-      if (!this._handshake.isComplete()) return;
-      
-      if (this._handshake.isValid()) {
-        this.readyState = API.OPEN;
-        var event = new API.Event('open');
-        event.initEvent('open', false, false);
-        this.dispatchEvent(event);
-        
-        this._parser.parse(this._message);
-        
-      } else {
-        this.readyState = API.CLOSED;
-        var event = new API.Event('close');
-        event.initEvent('close', false, false);
-        this.dispatchEvent(event);
-      }
-      break;
-      
-    case API.OPEN:
-    case API.CLOSING:
-      this._parser.parse(data);
-  }
-};
+  if (!secure) this._stream.on('connect', onConnect);
 
-for (var key in API) Client.prototype[key] = API[key];
+  API.call(this);
+
+  ['error', 'end'].forEach(function(event) {
+    this._stream.on(event, function() { self._finalize('', 1006) });
+  }, this);
+};
+util.inherits(Client, API);
 
 module.exports = Client;
 

lib/faye/websocket/draft75_parser.js

@@ -1,70 +0,0 @@
-var Draft75Parser = function(webSocket, stream) {
-  this._socket    = webSocket;
-  this._stream    = stream;
-  this._buffer    = [];
-  this._buffering = false;
-};
-
-var instance = {
-  FRAME_START : new Buffer([0x00]),
-  FRAME_END   : new Buffer([0xFF]),
-  
-  getVersion: function() {
-    return 'draft-75';
-  },
-  
-  handshakeResponse: function() {
-    var stream = this._stream;
-    try {
-      stream.write('HTTP/1.1 101 Web Socket Protocol Handshake\r\n');
-      stream.write('Upgrade: WebSocket\r\n');
-      stream.write('Connection: Upgrade\r\n');
-      stream.write('WebSocket-Origin: ' + this._socket.request.headers.origin + '\r\n');
-      stream.write('WebSocket-Location: ' + this._socket.url + '\r\n\r\n');
-    } catch (e) {
-      // socket closed while writing
-      // no handshake sent; client will stop using WebSocket
-    }
-  },
-  
-  parse: function(data) {
-    for (var i = 0, n = data.length; i < n; i++)
-      this._handleChar(data[i]);
-  },
-  
-  frame: function(data) {
-    var stream = this._stream;
-    try {
-      stream.write(this.FRAME_START, 'binary');
-      stream.write(new Buffer(data), 'utf8');
-      stream.write(this.FRAME_END, 'binary');
-      return true;
-    } catch (e) {
-      return false;
-    }
-  },
-  
-  _handleChar: function(data) {
-    switch (data) {
-      case 0x00:
-        this._buffering = true;
-        break;
-      
-      case 0xFF:
-        this._buffer = new Buffer(this._buffer);
-        this._socket.receive(this._buffer.toString('utf8', 0, this._buffer.length));
-        this._buffer = [];
-        this._buffering = false;
-        break;
-      
-      default:
-        if (this._buffering) this._buffer.push(data);
-    }
-  }
-};
-
-for (var key in instance)
-  Draft75Parser.prototype[key] = instance[key];
-
-module.exports = Draft75Parser;
-

lib/faye/websocket/draft76_parser.js

@@ -1,59 +0,0 @@
-var crypto        = require('crypto'),
-    Draft75Parser = require('./draft75_parser'),
-    Draft76Parser = function() { Draft75Parser.apply(this, arguments) };
-
-var bridge = function() {};
-bridge.prototype = Draft75Parser.prototype;
-Draft76Parser.prototype = new bridge();
-
-var numberFromKey = function(key) {
-  return parseInt(key.match(/[0-9]/g).join(''), 10);
-};
-
-var spacesInKey = function(key) {
-  return key.match(/ /g).length;
-};
-
-var bigEndian = function(number) {
-  var string = '';
-  [24,16,8,0].forEach(function(offset) {
-    string += String.fromCharCode(number >> offset & 0xFF);
-  });
-  return string;
-};
-
-Draft76Parser.prototype.getVersion = function() {
-  return 'draft-76';
-};
-  
-Draft76Parser.prototype.handshakeResponse = function(head) {
-  var request = this._socket.request,
-      stream  = this._stream,
-      
-      key1    = request.headers['sec-websocket-key1'],
-      value1  = numberFromKey(key1) / spacesInKey(key1),
-      
-      key2    = request.headers['sec-websocket-key2'],
-      value2  = numberFromKey(key2) / spacesInKey(key2),
-      
-      MD5     = crypto.createHash('md5');
-  
-  MD5.update(bigEndian(value1));
-  MD5.update(bigEndian(value2));
-  MD5.update(head.toString('binary'));
-  
-  try {
-    stream.write('HTTP/1.1 101 Web Socket Protocol Handshake\r\n', 'binary');
-    stream.write('Upgrade: WebSocket\r\n', 'binary');
-    stream.write('Connection: Upgrade\r\n', 'binary');
-    stream.write('Sec-WebSocket-Origin: ' + request.headers.origin + '\r\n', 'binary');
-    stream.write('Sec-WebSocket-Location: ' + this._socket.url + '\r\n\r\n', 'binary');
-    stream.write(MD5.digest('binary'), 'binary');
-  } catch (e) {
-    // socket closed while writing
-    // no handshake sent; client will stop using WebSocket
-  }
-};
-
-module.exports = Draft76Parser;
-

lib/faye/websocket/protocol8_parser.js

@@ -1,384 +0,0 @@
-var crypto = require('crypto');
-
-var Handshake = function(uri, stream) {
-  this._uri    = uri;
-  this._stream = stream;
-  
-  var buffer = new Buffer(16), i = 16;
-  while (i--) buffer[i] = Math.floor(Math.random() * 254);
-  this._key = buffer.toString('base64');
-  
-  var SHA1 = crypto.createHash('sha1');
-  SHA1.update(this._key + Protocol8Parser.prototype.GUID);
-  this._accept = SHA1.digest('base64');
-  
-  var HTTPParser = process.binding('http_parser').HTTPParser,
-      parser     = new HTTPParser(HTTPParser.RESPONSE || 'response'),
-      current    = null,
-      self       = this;
-  
-  this._nodeVersion = HTTPParser.RESPONSE ? 6 : 4;
-  this._complete    = false;
-  this._headers     = {};
-  this._parser      = parser;
-  
-  parser.onHeaderField = function(b, start, length) {
-    current = b.toString('utf8', start, start + length);
-  };
-  parser.onHeaderValue = function(b, start, length) {
-    self._headers[current] = b.toString('utf8', start, start + length);
-  };
-  parser.onHeadersComplete = function(info) {
-    self._status = info.statusCode;
-    var headers = info.headers;
-    if (!headers) return;
-    for (var i = 0, n = headers.length; i < n; i += 2)
-      self._headers[headers[i]] = headers[i+1];
-  };
-  parser.onMessageComplete = function() {
-    self._complete = true;
-  };
-};
-    
-Handshake.prototype.requestData = function() {
-  var stream = this._stream, u = this._uri;
-  try {
-    stream.write('GET ' + u.pathname + (u.search || '') + ' HTTP/1.1\r\n');
-    stream.write('Host: ' + u.hostname + (u.port ? ':' + u.port : '') + '\r\n');
-    stream.write('Upgrade: websocket\r\n');
-    stream.write('Connection: Upgrade\r\n');
-    stream.write('Sec-WebSocket-Key: ' + this._key + '\r\n');
-    stream.write('Sec-WebSocket-Version: 8\r\n');
-    stream.write('\r\n');
-  } catch (e) {}
-};
-
-Handshake.prototype.parse = function(data) {
-  var consumed = this._parser.execute(data, 0, data.length),
-      offset   = (this._nodeVersion < 6) ? 1 : 0;
-  
-  return (consumed === data.length) ? [] : data.slice(consumed + offset);
-};
-
-Handshake.prototype.isComplete = function() {
-  return this._complete;
-};
-
-Handshake.prototype.isValid = function() {
-  if (this._status !== 101) return false;
-  
-  var upgrade    = this._headers.Upgrade,
-      connection = this._headers.Connection;
-  
-  return upgrade && /^websocket$/i.test(upgrade) &&
-         connection && connection.split(/\s*,\s*/).indexOf('Upgrade') >= 0 &&
-         this._headers['Sec-WebSocket-Accept'] === this._accept;
-};
-
-var Protocol8Parser = function(webSocket, stream, options) {
-  this._reset();
-  this._socket  = webSocket;
-  this._stream  = stream;
-  this._stage   = 0;
-  this._masking = options && options.masking;
-};
-
-var instance = {
-  FIN:    128,
-  MASK:   128,
-  RSV1:   64,
-  RSV2:   32,
-  RSV3:   16,
-  OPCODE: 15,
-  LENGTH: 127,
-  
-  GUID: '258EAFA5-E914-47DA-95CA-C5AB0DC85B11',
-  
-  OPCODES: {
-    continuation: 0,
-    text:         1,
-    binary:       2,
-    close:        8,
-    ping:         9,
-    pong:         10
-  },
-  
-  ERRORS: {
-    normal_closure:   1000,
-    going_away:       1001,
-    protocol_error:   1002,
-    unacceptable:     1003,
-    encoding_error:   1007,
-    policy_violation: 1008,
-    too_large:        1009,
-    extension_error:  1010
-  },
-  
-  FRAGMENTED_OPCODES: [0,1,2],
-  OPENING_OPCODES:    [1,2],
-  
-  ERROR_CODES: [1000,1001,1002,1003,1007,1008,1009,1010],
-  
-  UTF8_MATCH: /^([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})*$/,
-  
-  getVersion: function() {
-    var version = this._socket.request.headers['sec-websocket-version'];
-    return 'protocol-' + version;
-  },
-  
-  handshakeResponse: function() {
-    var secKey = this._socket.request.headers['sec-websocket-key'];
-    if (!secKey) return;
-    
-    var SHA1 = crypto.createHash('sha1');
-    SHA1.update(secKey + this.GUID);
-    var accept = SHA1.digest('base64');
-    
-    var stream = this._stream;
-    try {
-      stream.write('HTTP/1.1 101 Switching Protocols\r\n');
-      stream.write('Upgrade: websocket\r\n');
-      stream.write('Connection: Upgrade\r\n');
-      stream.write('Sec-WebSocket-Accept: ' + accept + '\r\n\r\n');
-    } catch (e) {
-      // socket closed while writing
-      // no handshake sent; client will stop using WebSocket
-    }
-  },
-  
-  createHandshake: function() {
-    return new Handshake(this._socket.uri, this._stream);
-  },
-  
-  parse: function(data) {
-    for (var i = 0, n = data.length; i < n; i++) {
-      switch (this._stage) {
-        case 0: this._parseOpcode(data[i]);         break;
-        case 1: this._parseLength(data[i]);         break;
-        case 2: this._parseExtendedLength(data[i]); break;
-        case 3: this._parseMask(data[i]);           break;
-        case 4: this._parsePayload(data[i]);        break;
-      }
-      if (this._stage === 4 && this._length === 0)
-        this._emitFrame();
-    }
-  },
-  
-  frame: function(data, type, code) {
-    if (this._closed) return;
-    
-    var opcode = this.OPCODES[type || (typeof data === 'string' ? 'text' : 'binary')],
-        buffer = new Buffer(data),
-        insert = code ? 2 : 0,
-        length = buffer.length + insert,
-        masked = this._masking ? this.MASK : 0,
-        stream = this._stream,
-        frame, factor, mask, i, n;
-    
-    data = new Buffer(length);
-    if (code) {
-      data[0] = Math.floor(code / 256);
-      data[1] = code & 255;
-    }
-    for (i = 0, n = buffer.length; i < n; i++)
-      data[insert + i] = buffer[i];
-    
-    if (length <= 125) {
-      frame = new Buffer(2);
-      frame[1] = masked | length;
-    } else if (length >= 126 && length <= 65535) {
-      frame = new Buffer(4);
-      frame[1] = masked | 126;
-      frame[2] = Math.floor(length / 256);
-      frame[3] = length & 255;
-    } else {
-      frame = new Buffer(10);
-      frame[1] = masked | 127;
-      for (var i = 0; i < 8; i++) {
-        factor = Math.pow(2, 8 * (8 - 1 - i));
-        frame[2+i] = Math.floor(length / factor) & 255;
-      }
-    }
-    frame[0] = this.FIN | opcode;
-    
-    if (this._masking) {
-      mask = [1,2,3,4].map(function() { return Math.floor(Math.random() * 255) });
-      for (i = 0, n = data.length; i < n; i++)
-        data[i] = data[i] ^ mask[i % 4];
-    }
-    
-    try {
-      stream.write(frame, 'binary');
-      if (mask) stream.write(new Buffer(mask), 'binary');
-      if (data.length > 0) stream.write(data, 'utf8');
-      return true;
-    } catch (e) {
-      return false;
-    }
-  },
-  
-  close: function(code, reason, callback, context) {
-    if (this._closed) return;
-    if (callback) this._closingCallback = [callback, context];
-    this.frame(reason || '', 'close', code || this.ERRORS.normal_closure);
-    this._closed = true;
-  },
-  
-  buffer: function(fragment) {
-    for (var i = 0, n = fragment.length; i < n; i++)
-      this._buffer.push(fragment[i]);
-  },
-  
-  _parseOpcode: function(data) {
-    var rsvs = [this.RSV1, this.RSV2, this.RSV3].filter(function(rsv) {
-      return (data & rsv) === rsv;
-    }, this);
-    
-    if (rsvs.length > 0) return this._socket.close(this.ERRORS.protocol_error, null, false);
-    
-    this._final   = (data & this.FIN) === this.FIN;
-    this._opcode  = (data & this.OPCODE);
-    this._mask    = [];
-    this._payload = [];
-    
-    var valid = false;
-    
-    for (var key in this.OPCODES) {
-      if (this.OPCODES[key] === this._opcode)
-        valid = true;
-    }
-    if (!valid) return this._socket.close(this.ERRORS.protocol_error, null, false);
-    
-    if (this.FRAGMENTED_OPCODES.indexOf(this._opcode) < 0 && !this._final)
-      return this._socket.close(this.ERRORS.protocol_error, null, false);
-    
-    if (this._mode && this.OPENING_OPCODES.indexOf(this._opcode) >= 0)
-      return this._socket.close(this.ERRORS.protocol_error, null, false);
-    
-    this._stage = 1;
-  },
-  
-  _parseLength: function(data) {
-    this._masked = (data & this.MASK) === this.MASK;
-    this._length = (data & this.LENGTH);
-    
-    if (this._length >= 0 && this._length <= 125) {
-      this._stage = this._masked ? 3 : 4;
-    } else {
-      this._lengthBuffer = [];
-      this._lengthSize   = (this._length === 126 ? 2 : 8);
-      this._stage        = 2;
-    }
-  },
-  
-  _parseExtendedLength: function(data) {
-    this._lengthBuffer.push(data);
-    if (this._lengthBuffer.length < this._lengthSize) return;
-    this._length = this._getInteger(this._lengthBuffer);
-    this._stage  = this._masked ? 3 : 4;
-  },
-  
-  _parseMask: function(data) {
-    this._mask.push(data);
-    if (this._mask.length < 4) return;
-    this._stage = 4;
-  },
-  
-  _parsePayload: function(data) {
-    this._payload.push(data);
-    if (this._payload.length < this._length) return;
-    this._emitFrame();
-  },
-  
-  _emitFrame: function() {
-    var payload = this._unmask(this._payload, this._mask),
-        opcode  = this._opcode;
-    
-    if (opcode === this.OPCODES.continuation) {
-      if (!this._mode) return this._socket.close(this.ERRORS.protocol_error, null, false);
-      this.buffer(payload);
-      if (this._final) {
-        var message = new Buffer(this._buffer);
-        if (this._mode === 'text') message = this._encode(message);
-        this._reset();
-        if (message !== null) this._socket.receive(message);
-        else this._socket.close(this.ERRORS.encoding_error, null, false);
-      }
-    }
-    else if (opcode === this.OPCODES.text) {
-      if (this._final) {
-        var message = this._encode(payload);
-        if (message !== null) this._socket.receive(message);
-        else this._socket.close(this.ERRORS.encoding_error, null, false);
-      } else {
-        this._mode = 'text';
-        this.buffer(payload);
-      }
-    }
-    else if (opcode === this.OPCODES.binary) {
-      if (this._final) {
-        this._socket.receive(payload);
-      } else {
-        this._mode = 'binary';
-        this.buffer(payload);
-      }
-    }
-    else if (opcode === this.OPCODES.close) {
-      var code   = (payload.length >= 2) ? 256 * payload[0] + payload[1] : null,
-          reason = (payload.length > 2) ? this._encode(payload.slice(2)) : null;
-      
-      if (!(payload.length === 0) &&
-          !(code !== null && code >= 3000 && code < 5000) &&
-          this.ERROR_CODES.indexOf(code) < 0)
-        code = this.ERRORS.protocol_error;
-      
-      if (payload.length > 125 || (payload.length > 2 && !reason))
-        code = this.ERRORS.protocol_error;
-      
-      this._socket.close(code, (payload.length > 2) ? reason : null, false);
-      if (this._closingCallback)
-        this._closingCallback[0].call(this._closingCallback[1]);
-    }
-    else if (opcode === this.OPCODES.ping) {
-      if (payload.length > 125) return this._socket.close(this.ERRORS.protocol_error, null, false);
-      this._socket.send(payload, 'pong');
-    }
-    this._stage = 0;
-  },
-  
-  _reset: function() {
-    this._mode   = null;
-    this._buffer = [];
-  },
-  
-  _encode: function(buffer) {
-    try {
-      var string = buffer.toString('binary', 0, buffer.length);
-      if (!this.UTF8_MATCH.test(string)) return null;
-    } catch (e) {}
-    return buffer.toString('utf8', 0, buffer.length);
-  },
-  
-  _getInteger: function(bytes) {
-    var number = 0;
-    for (var i = 0, n = bytes.length; i < n; i++)
-      number += bytes[i] << (8 * (n - 1 - i));
-    return number;
-  },
-  
-  _unmask: function(payload, mask) {
-    var unmasked = new Buffer(payload.length), b;
-    for (var i = 0, n = payload.length; i < n; i++) {
-      b = payload[i];
-      if (mask.length > 0) b = b ^ mask[i % 4];
-      unmasked[i] = b;
-    }
-    return unmasked;
-  }
-};
-
-for (var key in instance)
-  Protocol8Parser.prototype[key] = instance[key];
-
-module.exports = Protocol8Parser;
-

package.json

@@ -1,23 +1,26 @@
 { "name"            : "faye-websocket"
-, "description"     : "Robust general-purpose WebSocket server and client"
-, "homepage"        : "http://github.com/jcoglan/faye-websocket-node"
+, "description"     : "Standards-compliant WebSocket server and client"
+, "homepage"        : "http://github.com/faye/faye-websocket-node"
 , "author"          : "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)"
-, "keywords"        : ["websocket"]
+, "keywords"        : ["websocket", "eventsource"]
 
-, "version"         : "0.1.1"
+, "version"         : "0.4.4"
 , "engines"         : {"node": ">=0.4.0"}
 , "main"            : "./lib/faye/websocket"
-, "devDependencies" : {"jsclass": ">=3.0.4"}
+, "dependencies"    : {"websocket-driver": ""}
+, "devDependencies" : {"jsclass": "", "pace": ""}
 
-, "bugs"            : "http://github.com/jcoglan/faye-websocket-node/issues"
+, "scripts"         : {"test": "node spec/runner.js"}
 
-, "licenses"        : [ { "type"    : "MIT"
-                        , "url"     : "http://www.opensource.org/licenses/mit-license.php"
+, "bugs"            : "http://github.com/faye/faye-websocket-node/issues"
+
+, "licenses"        : [ { "type"  : "MIT"
+                        , "url"   : "http://www.opensource.org/licenses/mit-license.php"
                         }
                       ]
 
-, "repositories"    : [ { "type"    : "git"
-                        , "url"     : "git://github.com/jcoglan/faye-websocket-node.git"
+, "repositories"    : [ { "type"  : "git"
+                        , "url"   : "git://github.com/faye/faye-websocket-node.git"
                         }
                       ]
 }

spec/faye/websocket/client_spec.js

@@ -7,29 +7,29 @@ JS.ENV.WebSocketSteps = JS.Test.asyncSteps({
     this._port = port
     setTimeout(callback, 100)
   },
-  
+
   stop: function(callback) {
     this._adapter.stop()
     setTimeout(callback, 100)
   },
-  
-  open_socket: function(url, callback) {
+
+  open_socket: function(url, protocols, callback) {
     var done = false,
         self = this,
-        
+
         resume = function(open) {
                    if (done) return
                    done = true
                    self._open = open
                    callback()
                  }
-    
-    this._ws = new Client(url)
-    
+
+    this._ws = new Client(url, protocols, {verify: false})
+
     this._ws.onopen  = function() { resume(true)  }
     this._ws.onclose = function() { resume(false) }
   },
-  
+
   close_socket: function(callback) {
     var self = this
     this._ws.onclose = function() {
@@ -38,33 +38,38 @@ JS.ENV.WebSocketSteps = JS.Test.asyncSteps({
     }
     this._ws.close()
   },
-  
+
   check_open: function(callback) {
     this.assert( this._open )
     callback()
   },
-  
+
   check_closed: function(callback) {
     this.assert( !this._open )
     callback()
   },
-  
+
+  check_protocol: function(protocol, callback) {
+    this.assertEqual( protocol, this._ws.protocol )
+    callback()
+  },
+
   listen_for_message: function(callback) {
     var self = this
     this._ws.addEventListener('message', function(message) { self._message = message.data })
     callback()
   },
-  
-  send_message: function(callback) {
-    this._ws.send("I expect this to be echoed")
+
+  send_message: function(message, callback) {
+    this._ws.send(message)
     setTimeout(callback, 100)
   },
-  
-  check_response: function(callback) {
-    this.assertEqual( "I expect this to be echoed", this._message )
+
+  check_response: function(message, callback) {
+    this.assertEqual( message, this._message )
     callback()
   },
-  
+
   check_no_response: function(callback) {
     this.assert( !this._message )
     callback()
@@ -74,76 +79,92 @@ JS.ENV.WebSocketSteps = JS.Test.asyncSteps({
 
 JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
   include(WebSocketSteps)
-  
+
   before(function() {
-    this.plain_text_url  = "ws://localhost:8000/bayeux"
-    this.secure_url      = "wss://localhost:8000/bayeux"
+    this.protocols       = ["foo", "echo"]
+    this.plain_text_url  = "ws://localhost:4180/bayeux"
+    this.secure_url      = "wss://localhost:4180/bayeux"
+    this.port            = 4180
   })
-  
+
   sharedBehavior("socket client", function() { with(this) {
     it("can open a connection", function() { with(this) {
-      open_socket(socket_url)
+      open_socket(socket_url, protocols)
       check_open()
+      check_protocol("echo")
     }})
-    
-    it("cannot open a connection to the wrong host", function() { with(this) {
-      open_socket(blocked_url)
-      check_closed()
-    }})
-    
+
     it("can close the connection", function() { with(this) {
-      open_socket(socket_url)
+      open_socket(socket_url, protocols)
       close_socket()
       check_closed()
     }})
-    
+
     describe("in the OPEN state", function() { with(this) {
       before(function() { with(this) {
-        open_socket(socket_url)
+        open_socket(socket_url, protocols)
       }})
-      
+
       it("can send and receive messages", function() { with(this) {
         listen_for_message()
-        send_message()
-        check_response()
+        send_message("I expect this to be echoed")
+        check_response("I expect this to be echoed")
+      }})
+
+      it("sends numbers as strings", function() { with(this) {
+        listen_for_message()
+        send_message(13)
+        check_response("13")
+      }})
+
+      it("sends booleans as strings", function() { with(this) {
+        listen_for_message()
+        send_message(false)
+        check_response("false")
+      }})
+
+      it("sends arrays as strings", function() { with(this) {
+        listen_for_message()
+        send_message([13,14,15])
+        check_response("13,14,15")
       }})
     }})
-    
+
     describe("in the CLOSED state", function() { with(this) {
       before(function() { with(this) {
-        open_socket(socket_url)
+        open_socket(socket_url, protocols)
         close_socket()
       }})
-      
+
       it("cannot send and receive messages", function() { with(this) {
         listen_for_message()
-        send_message()
+        send_message("I expect this to be echoed")
         check_no_response()
       }})
     }})
   }})
-  
+
   describe("with a plain-text server", function() { with(this) {
     before(function() {
       this.socket_url  = this.plain_text_url
       this.blocked_url = this.secure_url
     })
-    
-    before(function() { this.server(8000, false) })
+
+    before(function() { this.server(4180, false) })
     after (function() { this.stop() })
-    
+
     behavesLike("socket client")
   }})
-  
+
   describe("with a secure server", function() { with(this) {
     before(function() {
       this.socket_url  = this.secure_url
       this.blocked_url = this.plain_text_url
     })
-    
-    before(function() { this.server(8000, true) })
+
+    before(function() { this.server(4180, true) })
     after (function() { this.stop() })
-    
+
     behavesLike("socket client")
   }})
 }})

spec/faye/websocket/draft75parser_spec.js

@@ -1,39 +0,0 @@
-var Draft75Parser = require('../../../lib/faye/websocket/draft75_parser')
-
-JS.ENV.Draft75ParserSpec = JS.Test.describe("Draft75Parser", function() { with(this) {
-  before(function() { with(this) {
-    this.webSocket = {dispatchEvent: function() {}}
-    this.socket = new FakeSocket
-    this.parser = new Draft75Parser(webSocket, socket)
-  }})
-  
-  describe("parse", function() { with(this) {
-    it("parses text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Hello")
-      parser.parse([0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff])
-    }})
-    
-    it("parses multibyte text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Apple = ")
-      parser.parse([0x00, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf, 0xff])
-    }})
-    
-    it("parses fragmented frames", function() { with(this) {
-      expect(webSocket, "receive").given("Hello")
-      parser.parse([0x00, 0x48, 0x65, 0x6c])
-      parser.parse([0x6c, 0x6f, 0xff])
-    }})
-  }})
-  
-  describe("frame", function() { with(this) {
-    it("returns the given string formatted as a WebSocket frame", function() { with(this) {
-      parser.frame("Hello")
-      assertEqual( [0x00, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0xff], socket.read() )
-    }})
-    
-    it("encodes multibyte characters correctly", function() { with(this) {
-      parser.frame("Apple = ")
-      assertEqual( [0x00, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf, 0xff], socket.read() )
-    }})
-  }})
-}})

spec/faye/websocket/protocol8parser_spec.js

@@ -1,153 +0,0 @@
-var Protocol8Parser = require('../../../lib/faye/websocket/protocol8_parser')
-
-JS.ENV.Protocol8ParserSpec = JS.Test.describe("Protocol8Parser", function() { with(this) {
-  before(function() { with(this) {
-    this.webSocket = {dispatchEvent: function() {}}
-    this.socket = new FakeSocket
-    this.parser = new Protocol8Parser(webSocket, socket)
-  }})
-  
-  define("parse", function() {
-    var bytes = [];
-    for (var i = 0, n = arguments.length; i < n; i++) bytes = bytes.concat(arguments[i])
-    this.parser.parse(new Buffer(bytes))
-  })
-  
-  define("buffer", function(string) {
-    return {
-      equals: function(buffer) {
-        return buffer.toString('utf8', 0, buffer.length) === string
-      }
-    }
-  })
-  
-  describe("parse", function() { with(this) {
-    define("mask", function() {
-      return this._mask = this._mask || [1,2,3,4].map(function() { return Math.floor(Math.random() * 255) })
-    })
-    
-    define("maskMessage", function(bytes) {
-      var output = []
-      Array.prototype.forEach.call(bytes, function(b, i) {
-        output[i] = bytes[i] ^ this.mask()[i % 4]
-      }, this)
-      return output
-    })
-    
-    it("parses unmasked text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Hello")
-      parse([0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f])
-    }})
-    
-    it("parses empty text frames", function() { with(this) {
-      expect(webSocket, "receive").given("")
-      parse([0x81, 0x00])
-    }})
-    
-    it("parses fragmented text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Hello")
-      parse([0x01, 0x03, 0x48, 0x65, 0x6c])
-      parse([0x80, 0x02, 0x6c, 0x6f])
-    }})
-    
-    it("parses masked text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Hello")
-      parse([0x81, 0x85], mask(), maskMessage([0x48, 0x65, 0x6c, 0x6c, 0x6f]))
-    }})
-    
-    it("parses masked empty text frames", function() { with(this) {
-      expect(webSocket, "receive").given("")
-      parse([0x81, 0x80], mask(), maskMessage([]))
-    }})
-    
-    it("parses masked fragmented text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Hello")
-      parse([0x01, 0x81], mask(), maskMessage([0x48]))
-      parse([0x80, 0x84], mask(), maskMessage([0x65, 0x6c, 0x6c, 0x6f]))
-    }})
-    
-    it("closes the socket if the frame has an unrecognized opcode", function() { with(this) {
-      expect(webSocket, "close").given(1002, null, false)
-      parse([0x83, 0x00])
-    }})
-    
-    it("closes the socket if a close frame is received", function() { with(this) {
-      expect(webSocket, "close").given(1000, "Hello", false)
-      parse([0x88, 0x07, 0x03, 0xe8, 0x48, 0x65, 0x6c, 0x6c, 0x6f])
-    }})
-    
-    it("parses unmasked multibyte text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Apple = ")
-      parse([0x81, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf])
-    }})
-    
-    it("parses fragmented multibyte text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Apple = ")
-      parse([0x01, 0x0a, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3])
-      parse([0x80, 0x01, 0xbf])
-    }})
-    
-    it("parses masked multibyte text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Apple = ")
-      parse([0x81, 0x8b], mask(), maskMessage([0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf]))
-    }})
-    
-    it("parses masked fragmented multibyte text frames", function() { with(this) {
-      expect(webSocket, "receive").given("Apple = ")
-      parse([0x01, 0x8a], mask(), maskMessage([0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3]))
-      parse([0x80, 0x81], mask(), maskMessage([0xbf]))
-    }})
-    
-    it("parses unmasked medium-length text frames", function() { with(this) {
-      expect(webSocket, "receive").given("HelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHello")
-      parse([129, 126, 0, 200, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111])
-    }})
-    
-    it("parses masked medium-length text frames", function() { with(this) {
-      expect(webSocket, "receive").given("HelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHello")
-      parse([129, 254, 0, 200], mask(), maskMessage([72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111]))
-    }})
-    
-    it("replies to pings with a pong", function() { with(this) {
-      expect(webSocket, "send").given(buffer("OHAI"), "pong")
-      parse([0x89, 0x04, 0x4f, 0x48, 0x41, 0x49])
-    }})
-  }})
-  
-  describe("frame", function() { with(this) {
-    it("returns the given string formatted as a WebSocket frame", function() { with(this) {
-      parser.frame("Hello")
-      assertEqual( [0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f], socket.read() )
-    }})
-    
-    it("encodes multibyte characters correctly", function() { with(this) {
-      parser.frame("Apple = ")
-      assertEqual( [0x81, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0xef, 0xa3, 0xbf], socket.read() )
-    }})
-    
-    it("encodes medium-length strings using extra length bytes", function() { with(this) {
-      parser.frame("HelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHello")
-      assertEqual( [129, 126, 0, 200, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111, 72, 101, 108, 108, 111], socket.read() )
-    }})
-    
-    it("encodes long strings using extra length bytes", function() { with(this) {
-      var reps = 13108, message = '', output = [0x81, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04]
-      while (reps--) {
-        message += "Hello"
-        output = output.concat([0x48, 0x65, 0x6c, 0x6c, 0x6f])
-      }
-      parser.frame(message)
-      assertEqual( output, socket.read() )
-    }})
-    
-    it("encodes close frames with an error code", function() { with(this) {
-      parser.frame("Hello", "close", 1002)
-      assertEqual( [0x88, 0x07, 0x03, 0xea, 0x48, 0x65, 0x6c, 0x6c, 0x6f], socket.read() )
-    }})
-    
-    it("encodes pong frames", function() { with(this) {
-      parser.frame("", "pong")
-      assertEqual( [0x8a, 0x00], socket.read() )
-    }})
-  }})
-}})

spec/runner.js

@@ -6,23 +6,6 @@ var WebSocket = require('../lib/faye/websocket'),
     https     = require('https')
 
 
-JS.ENV.FakeSocket = function() {
-  this._fragments = []
-}
-FakeSocket.prototype.write = function(buffer, encoding) {
-  this._fragments.push([buffer, encoding])
-}
-FakeSocket.prototype.read = function() {
-  var output = []
-  this._fragments.forEach(function(buffer, i) {
-    for (var j = 0, n = buffer[0].length; j < n; j++)
-    output.push(buffer[0][j])
-  })
-  return output
-}
-FakeSocket.prototype.addListener = function() {}
-
-
 JS.ENV.EchoServer = function() {}
 EchoServer.prototype.listen = function(port, ssl) {
   var server = ssl
@@ -31,33 +14,24 @@ EchoServer.prototype.listen = function(port, ssl) {
                  cert: fs.readFileSync(__dirname + '/server.crt')
                })
              : http.createServer()
-  
-  server.addListener('upgrade', function(request, socket, head) {
-    var ws = new WebSocket(request, socket, head)
-    ws.onmessage = function(event) {
-      ws.send(event.data)
-    }
+
+  server.on('upgrade', function(request, socket, head) {
+    var ws = new WebSocket(request, socket, head, ["echo"])
+    ws.pipe(ws)
   })
   this._httpServer = server
   server.listen(port)
 }
 EchoServer.prototype.stop = function(callback, scope) {
-  this._httpServer.addListener('close', function() {
+  this._httpServer.on('close', function() {
     if (callback) callback.call(scope);
   });
   this._httpServer.close();
 }
 
 
-JS.Packages(function() { with(this) {
-  autoload(/.*Spec/, {from: 'spec/faye/websocket'})
-}})
-
-
 JS.require('JS.Test', function() {
-  JS.require( 'ClientSpec',
-              'Draft75ParserSpec',
-              'Protocol8ParserSpec',
-              JS.Test.method('autorun'))
+  require('./faye/websocket/client_spec')
+  JS.Test.autorun()
 })