Refactor: Apply v2.0.0 retry changes to v1.

Author: nspragg

lib/client.js

@@ -339,20 +339,19 @@ function toRetry(err) {
 
 function retry(fn, ctx) {
   ctx.res.retries = [];
-  ctx.res.maxAttempts = ctx.retries;
-  const request = fn.bind(this, ctx);
+  const maxAttempts = ctx.retries;
 
   function attempt(i) {
-    return request()
+    return fn(ctx)
       .catch((err) => {
-        if (ctx.retries > 0) {
+        if (maxAttempts > 0) {
           const delayBy = rejectedPromise(ctx.retryDelay);
           return delayBy(err);
         }
         throw err;
       })
       .catch((err) => {
-        if (i < ctx.retries && isCriticalError(err)) {
+        if (i < maxAttempts && isCriticalError(err)) {
           ctx.res.retries.push(toRetry(err));
           return attempt(++i);
         }

lib/context.js

@@ -12,6 +12,7 @@ const USER_AGENT = `${packageInfo.name}/${packageInfo.version}`;
 
 class Context {
   constructor(defaults) {
+    this.retries = 0;
     this.plugins = [];
     this.req = Request.create();
     this.res = Response.create();

lib/response.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const _ = require('lodash');
+
 const REQUIRED_PROPERTIES = [
   'url',
   'body',
@@ -15,6 +17,7 @@ class Response {
     this.url;
     this.statusCode;
     this.body;
+    this._retries;
   }
 
   getHeader(header) {
@@ -42,6 +45,18 @@ class Response {
     return JSON.stringify(this.body).length;
   }
 
+  get retries() {
+    if (_.isUndefined(this._retries)) return [];
+    return this._retries;
+  }
+
+  set retries(retries) {
+    if (!Array.isArray(retries)) {
+      retries = [];
+    }
+    this._retries = retries;
+  }
+
   toJSON() {
     return {
       body: this.body,

test/response.js

@@ -100,4 +100,23 @@ describe('Response', () => {
     const asJson = JSON.parse(asString);
     assert.deepEqual(asJson, state);
   });
+
+  it('defaults retries to an empty array', () => {
+    const response = Response.create();
+    assert.deepEqual(response.retries, []);
+  });
+
+  it('returns an array of retries', () => {
+    const retries = [{ a: 1 }, { b: 2 }];
+    const response = Response.create();
+    response.retries = retries;
+    assert.deepEqual(response.retries, retries);
+  });
+
+  it('always sets retries to an empty array', () => {
+    const retries = [];
+    const response = Response.create();
+    response.retries = 'crazy input';
+    assert.deepEqual(response.retries, retries);
+  });
 });