exposure of two client instances

Author: Shahnawaz-Sk

index.js

@@ -1,4 +1,6 @@
 var lambdaAutomationClient = require("./lib/automation_client");
+var lambdaAutomationClientV2 = require("./lib/automation_client_v2");
 module.exports = {
     AutomationClient: lambdaAutomationClient.AutomationClient,
+    AutomationClientV2: lambdaAutomationClientV2.AutomationClient,
 };

lib/api_client.js

@@ -1,8 +1,13 @@
-const axios = require('axios');
 const { version, appVersion, baseUrl, baseUrlApp } = require("./config");
-const packageVersion = require("../package.json").version;
-let logger;
 
+var request = require("request"),
+    logger,
+    packageVersion = require("../package.json").version;
+
+/**
+ * ApiClient is a function based Class.
+ * @param {!AutomationApiClient} settings An object that for lambda user credentials
+ */
 var ApiClient = function (settings) {
     settings = settings || {};
     /**
@@ -23,40 +28,58 @@ var ApiClient = function (settings) {
         logger = require("./logger")(settings.logFile);
     }
     logger.info("Imported ApiClient and User Credenetials", settings);
-    ApiClient.basicAuth = "Basic " + Buffer.from(settings.username + ":" + settings.accessKey).toString("base64");
+    ApiClient.authHeader =
+        "Basic " + Buffer.from(settings.username + ":" + settings.accessKey).toString("base64");
+    ApiClient.settings = settings;
 
-    ApiClient.apiBaseUrl = settings.isApp ? baseUrlApp + appVersion.latestVersion : baseUrl + version.latestVersion;
+    if (settings.isApp) {
+        ApiClient.baseUrl = baseUrlApp + appVersion.latestVersion;
+    }
+};
 
-    this.makeRequest = async function(method, path, body = null, params = {}) {
-        // Validate path
-        if (!path) {
-            throw new Error('Path is required');
+/**
+ * Extends ApiClient Class with static method for all Api Request.
+ * @param {!ApiClient} options An object that determine the Request payload
+ * @param {Function} fnCallback is callback function.
+ * @return {Function|Error} return response to Callable method or throw Error.
+ */
+ApiClient.request = function (options, fnCallback) {
+    /** Initialize Callback function is not there */
+    fnCallback = fnCallback || function () {};
+    /** Check baseUrl is on ApiClient */
+    if (ApiClient.baseUrl === undefined) {
+        ApiClient.baseUrl = baseUrl + version.latestVersion;
+        ApiClient.request(options, fnCallback);
+    } else {
+        /** Update Options with User Credential If It is object */
+        if (typeof options === "object") {
+            options.headers = {
+                Authorization: ApiClient.authHeader,
+                "Content-Type": "application/json",
+                Accept: "application/json",
+                client: "npm-rest-client",
+                version: packageVersion,
+            };
+            options.url = ApiClient.baseUrl + options.url;
         }
-
-        // Use instance-specific baseUrl
-        const url = `${ApiClient.apiBaseUrl}${path}`;
-        
-        // Prepare request options
-        const options = {
-            method: method,
-            headers: { Authorization: ApiClient.basicAuth },
-            url: url,
-        };
-        
-
-        if (body) options.data = JSON.stringify(body);
-        if (Object.keys(params).length) options.params = params;
-
+        /** For Debbuging purpose log Request Payload */
         logger.info("Api request options ", options);
-        // Axios request
-        try {
-            const response = await axios(options);
-            return response.data;
-        } catch (error) {
-            throw error;
-        }
-    };
-
+        request(options, function (e, response, body) {
+            if (e) {
+                logger.error("Error while Api call of ", e);
+            } else if (response.statusCode === 200) {
+                // use try-catch Error possible due to json parse of non-parseable
+                try {
+                    body = JSON.parse(body);
+                    logger.info("Api response json : ", body);
+                    return fnCallback(e, body);
+                } catch (e) {
+                    logger.error("Error while parse to json of output response ", e);
+                }
+            }
+            return fnCallback(new Error(e || body), null);
+        });
+    }
 };
-module.exports = ApiClient;
 
+module.exports = ApiClient;

lib/api_client_v2.js

@@ -0,0 +1,62 @@
+const axios = require('axios');
+const { version, appVersion, baseUrl, baseUrlApp } = require("./config");
+const packageVersion = require("../package.json").version;
+let logger;
+
+var ApiClient = function (settings) {
+    settings = settings || {};
+    /**
+     * Required check for username.
+     * @return {Error|null}
+     */
+    if (!settings.username) {
+        throw new Error("Username is required.");
+    }
+    /**
+     * Required check for accessKey.
+     * @return {Error|null}
+     */
+    if (!settings.accessKey) {
+        throw new Error("Access Key is required.");
+    }
+    if (!logger) {
+        logger = require("./logger")(settings.logFile);
+    }
+    logger.info("Imported ApiClient and User Credenetials", settings);
+    ApiClient.basicAuth = "Basic " + Buffer.from(settings.username + ":" + settings.accessKey).toString("base64");
+
+    ApiClient.apiBaseUrl = settings.isApp ? baseUrlApp + appVersion.latestVersion : baseUrl + version.latestVersion;
+
+    this.makeRequest = async function(method, path, body = null, params = {}) {
+        // Validate path
+        if (!path) {
+            throw new Error('Path is required');
+        }
+
+        // Use instance-specific baseUrl
+        const url = `${ApiClient.apiBaseUrl}${path}`;
+        
+        // Prepare request options
+        const options = {
+            method: method,
+            headers: { Authorization: ApiClient.basicAuth },
+            url: url,
+        };
+        
+
+        if (body) options.data = JSON.stringify(body);
+        if (Object.keys(params).length) options.params = params;
+
+        logger.info("Api request options ", options);
+        // Axios request
+        try {
+            const response = await axios(options);
+            return response.data;
+        } catch (error) {
+            throw error;
+        }
+    };
+
+};
+module.exports = ApiClient;
+