debugging retry handler with promise retry. adding retry example.

Author: david-schrenker

examples/basic/basicSendWithRetry.js

@@ -17,15 +17,12 @@ message.to.push("[email protected]");
 /**
  * Create the client
  */
-var client = new SocketLabsClient(exampleConfig.ServerId, exampleConfig.ApiKey, {
+var client = new SocketLabsClient(exampleConfig.ServerId, exampleConfig.ApiKey,
+    {
+        optionalProxy: "http://localhost:4433"
+    });
 
-    //optionalProxy: "http://localhost:4433",
-    //requestTimeout: 120,
-    numberOfRetries = 3
-});
-
-console.log(exampleConfig.ServerId);
-console.log(exampleConfig.ApiKey);
+client.numberOfRetries = 3;
 
 /**
  * Send the message

src/core/retryHandler.js

@@ -1,163 +1,74 @@
 'use strict';
 
-//const sendResultEnum = require('./sendResultEnum');
-
-const sendResultEnum = require('../sendResultEnum');
-const request = require('request');
-
+const axios = require('axios');
+const promiseRetry = require('promise-retry');
 
 class RetryHandler {
     /**
    * Creates a new instance of the SocketLabsClient
-   * @param {number} serverId - Your SocketLabs ServerId number.
-   * @param {string} apiKey - Your SocketLabs Injection API key
-   * @param {string} endpointUrl - The SocketLabs Injection API endpoint Url
-   * @param {string} optionalProxy - The http proxy you would like to use.
-   * @param {number} requestTimeout  - The timeout occured sending the message.
-   * @param {number} retrySettings  - The retry value sent .
+   * @param {object} request - Request options
+   * @param {object} retrySettings  - The retry value sent .
    *
    */
 
-    constructor(serverId, apiKey, {
-
-        endpointUrl = null,
-        optionalProxy = null,
-        requestTimeout = 120,
-        retryHandler = null,
-    } = {}) {
-
-        /**
-         * Your SocketLabs ServerId number.
-         */
-        this.serverId = serverId;
-
-        /**
-         * Your SocketLabs Injection API key
-         */
-        this.apiKey = apiKey;
+    constructor(
+        maximumNumberOfRetries) {
 
+        this._defaultNumberOfRetries = 0;
+        this._maximumAllowedNumberOfRetries = 5;
 
-        /**
-         * The SocketLabs Injection API endpoint Url
-         */
-        this.userAgent = `SocketLabs-node/${version} (nodejs ${process.version})`;
+        if (maximumNumberOfRetries != null) {
+            if (maximumNumberOfRetries < 0) throw new Error(`Argument maximumNumberOfRetries is invalid. maximumNumberOfRetries must be greater than 0`);
+            if (maximumNumberOfRetries > this._maximumAllowedNumberOfRetries) throw new Error(`Argument maximumNumberOfRetries is invalid. The maximum number of allowed retries is ${this._maximumAllowedNumberOfRetries}`);
 
-        /**
-         * The SocketLabs Injection API endpoint Url
-         */
-        //this.endpointUrl = "http://localhost:4433";
-
-        this.endpointUrl = "https://inject.socketlabs.com/api/v1/email";
-        if (endpointUrl && endpointUrl !== '') {
-            this.endpointUrl = endpointUrl;
-        }
-
-        if (optionalProxy && typeof optionalProxy === 'string') {
-            request.defaults({
-                'proxy': optionalProxy
-            });
+            this.MaximumNumberOfRetries = maximumNumberOfRetries;
         }
+        else
+            this.MaximumNumberOfRetries = this._defaultNumberOfRetries;
 
-        requestTimeout = {
-
-            get requestTimeout() {
-                return this.requestTimeout;
-            },
-            set requestTimeout(value) {
-                this.requestTimeout = value;
-            }
-        };
+        this.errorStatusCodes = [500, 502, 503, 504, "ECONNABORTED"];
 
-        retryHandler = {
-            get retryHandler() {
-                return this.retryHandler;
-            },
-            set retryHandler(value) {
-                this.retryHandler = value;
-            }
-
-        };
     }
 
     /**
-    * Set the unique key generated by the Injection API if an unexpected error occurs during the SocketLabsClient send request.
-    * @param  {string} value
-    */
-
-
-    /**
-     * Set the result of the SocketLabsClient send request.
-     * @param  {sendResultEnum} value
+     *
+     * @param {*} request
+     * @returns
      */
-
-    setResult(value) {
-        var sr;
-        if (typeof value === 'undefined' || !value) {
-            return;
-        }
-        else if ((typeof value === 'object') &&
-            ('name' in value) &&
-            ('value' in value) &&
-            ('message' in value)) {
-
-
-            /**
-             * The result of the SocketLabsClient send request.
-             */
-            this.result = value;
-            this.responseMessage = value.message;
-        }
-        else {
-            throw new Error("Invalid sendResult, type of 'sendResultEnum' was expected.");
-        }
+    send(request) {
+        return new Promise((resolve, reject) => {
+
+            promiseRetry(
+                {
+                    retries: this.MaximumNumberOfRetries,
+                    factor: 2,
+                    randomize: true,
+                    minTimeout: 1000,
+                    maxTimeout: 10000
+                },
+                (retry, number) => {
+                    console.log(`attempt: ${number}`);
+                    return axios(request)
+                        .then(
+                            (response) => { resolve(response); },
+                            (error) => {
+                                let statusCode = (error.code) ? error.code : (error.status) ? error.status : error.response.status;
+                                console.log(`statusCode: ${statusCode}`);
+                                if ((this.errorStatusCodes.includes(statusCode) &&
+                                    number <= this.MaximumNumberOfRetries))
+                                    retry(error);
+                                reject(error);
+                            }
+                        )
+                        .catch(retry);
+                })
+                .then(
+                    (result) => { resolve(result); },
+                    (error) => { reject(error) })
+                .catch(error => { reject(error); });
+
+        });
     }
+}
 
-    static parse(value) {
-        console.log(value);
-        console.log(value.statusCode);
-
-        switch (value.statusCode) {
-            case 200: //HttpStatusCode.OK
-
-                var r = sendResultEnum[body.ErrorCode];
-                if (r === undefined) {
-                    response.setResult(sendResultEnum.UnknownError);
-                }
-                else {
-                    response.setResult(r);
-                }
-                break;
-
-            case 500: //HttpStatusCode.InternalServerError
-                response.setResult(sendResultEnum.InternalError);
-                break;
-
-            case 502: //HttpStatusCode.Bad Gateway
-                response.setResult(sendResultEnum.BadGateway);
-                return response;
-            //break;
-
-            case 503: //HttpStatusCode.Service Unavailable
-                response.setResult(sendResultEnum.ServiceUnavailable);
-                break;
-            case 504: //HttpStatusCode.GatewayTimeout
-                response.setResult(sendResultEnum.GatewayTimeout);
-                break;
-
-            default:
-                response.transactionReceipt = body.transactionReceipt;
-                response.setResult(sendResultEnum.UnknownError);
-
-                break;
-        }
-
-    }
-
-    SendAsync(content, cancellationToken) {
-
-        if (retrySettings.MaximumNumberOfRetries == 0)
-            return await HttpClient
-
-
-    }
-}
+module.exports = RetryHandler;