Merge pull request #1 from dubesar/master

Author: psych0der

lib/api_client.js

@@ -1,57 +1,9 @@
+const { version, baseUrl } = require("./config");
+
 var request = require("request"),
   logger,
-  Config = require("./config"),
   packageVersion = require("../../package.json").version;
 
-/**
- * Operates on an instance of ApiClient and returns latest version and list of supported versions.
- * @param {!AutomationApiClient} settings An object that for lambda user credentials
- *     explanation that spans multiple lines.
- * @param {number} retries for max attemt to fetch
- * @param {Function} fnCallback is callback function.
- * @return {Function|Error} return version that is supported by lambdaTest Rest Client e.g. v1, v2 etc.
- */
-var fetchApiVersions_ = function(settings, retries, fnCallback) {
-  /** Check left retries */
-  if (retries >= 0) {
-    request(Config.httpApiVersionPath, function(e, response, body) {
-      if (e) {
-        logger.error("Error while fetching version from server path ", e);
-        fetchApiVersions_(settings, retries - 1, fnCallback);
-      } else {
-        /** use try-catch Possibly Error due to json parse of non-parseable */
-        try {
-          body = JSON.parse(body);
-          /** Check for supportedVersions list is there */
-          if (body.supportedVersions && body.supportedVersions.length) {
-            /** Check Requester request for version and exist in supportedVersions list  */
-            if (settings.version) {
-              if (body.supportedVersions.indexOf(settings.version) === -1) {
-                return fnCallback(true, null);
-              } else {
-                return fnCallback(false, settings.version);
-              }
-            } else {
-              return fnCallback(false, body.latestVersion);
-            }
-          } else {
-            fetchApiVersions_(settings, retries - 1, fnCallback);
-          }
-        } catch (e) {
-          logger.error(
-            "Error while parse to json of output response of versions json path ",
-            e
-          );
-          /** Re-Attemp to fetch If getting Error */
-          fetchApiVersions_(settings, retries - 1, fnCallback);
-        }
-      }
-    });
-  } else {
-    return fnCallback(true, null);
-  }
-};
-
 /**
  * ApiClient is a function based Class.
  * @param {!AutomationApiClient} settings An object that for lambda user credentials
@@ -95,18 +47,8 @@ ApiClient.request = function(options, fnCallback) {
   fnCallback = fnCallback || function() {};
   /** Check baseUrl is on ApiClient */
   if (ApiClient.baseUrl === undefined) {
-    /** Calling method for Update baseUrl and Request pass to Server for Getting Response
-     * @return {Function|Error} return response to Callable method or throw Error.
-     */
-    fetchApiVersions_(ApiClient.settings, 5, function(e, response) {
-      if (e) {
-        logger.error("Error while fetching Versions", e);
-        throw new Error("Invalid Api version");
-      } else {
-        ApiClient.baseUrl = Config.baseUrl + response;
-        ApiClient.request(options, fnCallback);
-      }
-    });
+    ApiClient.baseUrl = baseUrl + version.latestVersion;
+    ApiClient.request(options, fnCallback);
   } else {
     /** Update Options with User Credential If It is object */
     if (typeof options === "object") {

lib/config.js

@@ -1,5 +1,4 @@
 module.exports = {
-  httpApiVersionPath:
-    "https://downloads.lambdatest.com/npm/api/supported_versions.json",
+  version: {"latestVersion": "v1", "supportedVersions": ["v1"]},
   baseUrl: "https://api.lambdatest.com/automation/api/"
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/node-rest-client",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "LambdaTest Rest Client for Node.js",
   "main": "index.js",
   "repository": {