ecluding timeout from streaming client

Author: Tim Whitlock

lib/twitter.js

@@ -159,7 +159,7 @@ TwitterClient.prototype._rest = function( requestMethod, requestPath, requestArg
             console.error('No callback for '+requestMethod+' '+requestUri);
         }
     }
-    return this.call( requestMethod, requestUri, requestArgs, function( res, err ) {
+    return this.call( requestMethod, requestUri, requestArgs, TWITTER_API_TIMEOUT, function( res, err ) {
         if( ! res ){
             callback( null, err, 0 );
             return;
@@ -215,9 +215,10 @@ TwitterClient.prototype.stream = function( requestPath, requestArgs, callback ){
         };
     }
     var client = this;
-    return this.call( requestMethod, requestUri, requestArgs, function(res){
+    return this.call( requestMethod, requestUri, requestArgs, 0, function( res, err ){
         if( ! res ){
-            callback();
+            callback( null, err );
+            return;
         }
         client.response = res;
         res.setEncoding('utf8');
@@ -237,7 +238,7 @@ TwitterClient.prototype.stream = function( requestPath, requestArgs, callback ){
     } );
 }
 
-TwitterClient.prototype.call = function( requestMethod, requestUri, requestArgs, callback ){
+TwitterClient.prototype.call = function( requestMethod, requestUri, requestArgs, timeout, callback ){
     requestMethod = String( requestMethod||'GET' ).toUpperCase();
     // build and sign request parameters
     var params = new OAuthParams( requestArgs );
@@ -262,17 +263,17 @@ TwitterClient.prototype.call = function( requestMethod, requestUri, requestArgs,
         http.path += '?' + query;
     }
     var req = require('https').get( http, callback );
-    req.on('socket', function (socket) {
-        socket.setTimeout( TWITTER_API_TIMEOUT );  
-        socket.on('timeout', function() {
-            req.abort();
+    if( timeout ){
+        req.on('socket', function (socket) {
+            socket.setTimeout( timeout );  
+            socket.on('timeout', function() {
+                console.error('Request timeout in '+requestUri);
+                req.abort();
+            } );
         } );
-    } );
+    }
     req.on('error', function( e ) {
         console.error( String(e) );
-        if( 'ECONNRESET' === e.code ){
-            e = { message: 'Request timeout', code: 408 };
-        }
         callback( null, e );
     } );
     if( 'POST' === requestMethod && query ){
@@ -313,7 +314,7 @@ TwitterClient.prototype._oauthExchange = function( requestUri, requestArgs, call
             console.error('No callback for POST '+requestUri);
         }
     }
-    this.call( 'POST', requestUri, requestArgs, function( res, err ){
+    this.call( 'POST', requestUri, requestArgs, TWITTER_API_TIMEOUT, function( res, err ){
         if( ! res ){
             callback( null, err||{}, 0 );
             return;