Re-sign requests if they took too long to be sent.

Fixes the root cause of #221. When maxSockets is set to a value lower than the
amount of parallel requests, some of those requests can be queued for
"a long time". Because signing happens before those requests are queued, their
15 minute signing window can timeout before they ever hit the 'send' event.

This change adds an extra check to the 'send' even to force a re-sign of
the request if more than 10 minutes passed since the sign event was triggered.
This should allow multiple requests to be queued for an indefinite period of
time.

Author: lsegal

lib/event_listeners.js

@@ -125,6 +125,7 @@ AWS.EventListeners = {
 
           // add new authorization
           signer.addAuthorization(credentials, date);
+          req.signedAt = date;
         } catch (e) {
           req.response.error = e;
         }
@@ -145,6 +146,8 @@ AWS.EventListeners = {
 
     addAsync('SEND', 'send', function SEND(resp, done) {
       resp.httpResponse._abortCallback = done;
+      resp.error = null;
+      resp.data = null;
 
       function callback(httpResp) {
         resp.httpResponse.stream = httpResp;
@@ -196,13 +199,23 @@ AWS.EventListeners = {
         });
       }
 
-      resp.error = null;
-      resp.data = null;
+      function executeSend() {
+        var http = AWS.HttpClient.getInstance();
+        var httpOptions = resp.request.service.config.httpOptions || {};
+        var stream = http.handleRequest(resp.request.httpRequest, httpOptions,
+                                        callback, error);
+        progress(stream);
+      }
 
-      var http = AWS.HttpClient.getInstance();
-      var httpOptions = resp.request.service.config.httpOptions || {};
-      var s = http.handleRequest(this.httpRequest, httpOptions, callback, error);
-      progress(s);
+      var timeDiff = (AWS.util.date.getDate() - this.signedAt) / 1000;
+      if (timeDiff >= 60 * 10) { // if we signed 10min ago, re-sign
+        this.emit('sign', [this], function(err) {
+          if (err) done(err);
+          else executeSend();
+        });
+      } else {
+        executeSend();
+      }
     });
 
     add('HTTP_HEADERS', 'httpHeaders',

test/event_listeners.spec.coffee

@@ -166,6 +166,28 @@ describe 'AWS.EventListeners', ->
       makeRequest(->)
       expect(options.timeout).toEqual(15)
 
+    it 'signs only once in normal case', ->
+      signHandler = jasmine.createSpy('sign')
+      helpers.mockHttpResponse 200, {}, ['data']
+
+      request = makeRequest()
+      request.on('sign', signHandler)
+      request.build()
+      request.signedAt = new Date(request.signedAt - 60 * 5 * 1000)
+      request.send()
+      expect(signHandler.callCount).toEqual(1)
+
+    it 'resigns if it took more than 10 min to get to send', ->
+      signHandler = jasmine.createSpy('sign')
+      helpers.mockHttpResponse 200, {}, ['data']
+
+      request = makeRequest()
+      request.on('sign', signHandler)
+      request.build()
+      request.signedAt = new Date(request.signedAt - 60 * 12 * 1000)
+      request.send()
+      expect(signHandler.callCount).toEqual(2)
+
   describe 'httpData', ->
     beforeEach ->
       helpers.mockHttpResponse 200, {}, ['FOO', 'BAR', 'BAZ', 'QUX']