Improved error handling in stream and HTTP client.

pgriess · Aug 9, 2010 · d45951d · d45951d
1 parent 0f57020
commit d45951d
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/lib/websocket.js b/lib/websocket.js
@@ -314,6 +314,17 @@ var WebSocket = function(url, proto) {
         self.emit('fd', fd);
     };
 
+    // Handle errors from any source (HTTP client, stream, etc)
+    var errorListener = function(e) {
+        process.nextTick(function() {
+            self.emit('wserror', e);
+
+            if (self.onerror) {
+                self.onerror(e);
+            }
+        });
+    };
+
     // External API
     self.close = function() {
         switch (readyState) {
@@ -513,10 +524,12 @@ var WebSocket = function(url, proto) {
                     }
                 });
                 stream.addListener('fd', fdListener);
+                stream.addListener('error', errorListener);
 
                 stream.emit('data', head);
             };
         })());
+        httpClient.addListener('error', errorListener);
 
         var httpReq = httpClient.request(httpPath, httpHeaders);