README.md

@@ -1,5 +1,5 @@
 <!-- badges/ -->
-[![Build Status](https://secure.travis-ci.org/tim-kos/node-retry.png?branch=master)](http://travis-ci.org/tim-kos/node-retry "Check this project's build status on TravisCI")
+[![Build Status](https://secure.travis-ci.org/tim-kos/node-retry.svg?branch=master)](http://travis-ci.org/tim-kos/node-retry "Check this project's build status on TravisCI")
 [![codecov](https://codecov.io/gh/tim-kos/node-retry/branch/master/graph/badge.svg)](https://codecov.io/gh/tim-kos/node-retry)
 <!-- /badges -->
 
@@ -62,7 +62,7 @@ var operation = retry.operation({
 
 ### retry.operation([options])
 
-Creates a new `RetryOperation` object. `options` is the same as `retry.timeouts()`'s `options`, with two additions:
+Creates a new `RetryOperation` object. `options` is the same as `retry.timeouts()`'s `options`, with three additions:
 
 * `forever`: Whether to retry forever, defaults to `false`.
 * `unref`: Whether to [unref](https://nodejs.org/api/timers.html#timers_unref) the setTimeout's, defaults to `false`.

lib/retry.js

@@ -3,7 +3,7 @@ var RetryOperation = require('./retry_operation');
 exports.operation = function(options) {
   var timeouts = exports.timeouts(options);
   return new RetryOperation(timeouts, {
-      forever: options && options.forever,
+      forever: options && (options.forever || options.retries === Infinity),
       unref: options && options.unref,
       maxRetryTime: options && options.maxRetryTime
   });
@@ -51,7 +51,7 @@ exports.createTimeout = function(attempt, opts) {
     ? (Math.random() + 1)
     : 1;
 
-  var timeout = Math.round(random * opts.minTimeout * Math.pow(opts.factor, attempt));
+  var timeout = Math.round(random * Math.max(opts.minTimeout, 1) * Math.pow(opts.factor, attempt));
   timeout = Math.min(timeout, opts.maxTimeout);
 
   return timeout;

lib/retry_operation.js

@@ -15,6 +15,7 @@ function RetryOperation(timeouts, options) {
   this._operationTimeoutCb = null;
   this._timeout = null;
   this._operationStart = null;
+  this._timer = null;
 
   if (this._options.forever) {
     this._cachedTimeouts = this._timeouts.slice(0);
@@ -24,13 +25,16 @@ module.exports = RetryOperation;
 
 RetryOperation.prototype.reset = function() {
   this._attempts = 1;
-  this._timeouts = this._originalTimeouts;
+  this._timeouts = this._originalTimeouts.slice(0);
 }
 
 RetryOperation.prototype.stop = function() {
   if (this._timeout) {
     clearTimeout(this._timeout);
   }
+  if (this._timer) {
+    clearTimeout(this._timer);
+  }
 
   this._timeouts       = [];
   this._cachedTimeouts = null;
@@ -46,6 +50,7 @@ RetryOperation.prototype.retry = function(err) {
   }
   var currentTime = new Date().getTime();
   if (err && currentTime - this._operationStart >= this._maxRetryTime) {
+    this._errors.push(err);
     this._errors.unshift(new Error('RetryOperation timeout occurred'));
     return false;
   }
@@ -56,16 +61,15 @@ RetryOperation.prototype.retry = function(err) {
   if (timeout === undefined) {
     if (this._cachedTimeouts) {
       // retry forever, only keep last error
-      this._errors.splice(this._errors.length - 1, this._errors.length);
-      this._timeouts = this._cachedTimeouts.slice(0);
-      timeout = this._timeouts.shift();
+      this._errors.splice(0, this._errors.length - 1);
+      timeout = this._cachedTimeouts.slice(-1);
     } else {
       return false;
     }
   }
 
   var self = this;
-  var timer = setTimeout(function() {
+  this._timer = setTimeout(function() {
     self._attempts++;
 
     if (self._operationTimeoutCb) {
@@ -82,7 +86,7 @@ RetryOperation.prototype.retry = function(err) {
   }, timeout);
 
   if (this._options.unref) {
-      timer.unref();
+      this._timer.unref();
   }
 
   return true;

package.json

@@ -3,16 +3,20 @@
   "name": "retry",
   "description": "Abstraction for exponential and custom retry strategies for failed operations.",
   "license": "MIT",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "homepage": "https://github.com/tim-kos/node-retry",
   "repository": {
     "type": "git",
     "url": "git://github.com/tim-kos/node-retry.git"
   },
+  "files": [
+    "lib",
+    "example"
+  ],
   "directories": {
     "lib": "./lib"
   },
-  "main": "index",
+  "main": "index.js",
   "engines": {
     "node": ">= 4"
   },

test/integration/test-retry-operation.js

@@ -256,3 +256,38 @@ var retry = require(common.dir.lib + '/retry');
 
   fn();
 })();
+
+(function testErrorsPreservedWhenMaxRetryTimeExceeded() {
+  var error = new Error('some error');
+  var maxRetryTime = 30;
+  var operation = retry.operation({
+      minTimeout: 1,
+      maxRetryTime: maxRetryTime
+  });
+
+  var finalCallback = fake.callback('finalCallback');
+  fake.expectAnytime(finalCallback);
+
+  var longAsyncFunction = function (wait, callback){
+    setTimeout(callback, wait);
+  };
+
+  var fn = function() {
+    var startTime = new Date().getTime();
+    operation.attempt(function() {
+
+      var curTime = new Date().getTime();
+      longAsyncFunction(maxRetryTime - (curTime - startTime - 1), function(){
+        if (operation.retry(error)) {
+          assert.fail('timeout should be occurred');
+          return;
+        }
+
+        assert.strictEqual(operation.mainError(), error);
+        finalCallback();
+      });
+    });
+  };
+
+  fn();
+})();