Combined health into detectApiVersion

Author: Aelbannan

lib/clientStub.d.ts

@@ -14,12 +14,6 @@ export declare class DgraphClientStub {
     mutate(mu: Mutation): Promise<Assigned>;
     commit(ctx: TxnContext): Promise<TxnContext>;
     abort(ctx: TxnContext): Promise<TxnContext>;
-    health(): Promise<{
-        health: string;
-        version: string;
-        instance?: string;
-        uptime?: number;
-    }>;
     login(userid?: string, password?: string, refreshToken?: string): Promise<boolean>;
     logout(): void;
     getAuthTokens(): {

lib/clientStub.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -63,14 +52,26 @@ var DgraphClientStub = (function () {
     }
     DgraphClientStub.prototype.detectApiVersion = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var health;
+            var response, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.health()];
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4, this.getHealth()];
                     case 1:
-                        health = _a.sent();
-                        this.legacyApi = health.version.startsWith("1.0.");
-                        return [2, health.version];
+                        response = _a.sent();
+                        if (response.data === "OK") {
+                            this.legacyApi = true;
+                            return [2, "1.0.x"];
+                        }
+                        else {
+                            return [2, response.data["version"]];
+                        }
+                        return [3, 3];
+                    case 2:
+                        err_1 = _a.sent();
+                        throw new Error("Invalid status code");
+                    case 3: return [2];
                 }
             });
         });
@@ -249,33 +250,6 @@ var DgraphClientStub = (function () {
             : "/abort/" + ctx.start_ts;
         return this.callAPI(url, { method: "POST" });
     };
-    DgraphClientStub.prototype.health = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var response, text;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, fetch(this.getURL("health"), {
-                            method: "GET",
-                        })];
-                    case 1:
-                        response = _a.sent();
-                        if (response.status >= 300 || response.status < 200) {
-                            throw new Error("Invalid status code = " + response.status);
-                        }
-                        return [4, response.text()];
-                    case 2:
-                        text = _a.sent();
-                        if (text === "OK") {
-                            return [2, {
-                                    health: text,
-                                    version: "1.0.x",
-                                }];
-                        }
-                        return [2, __assign(__assign({}, JSON.parse(text)), { health: "OK" })];
-                }
-            });
-        });
-    };
     DgraphClientStub.prototype.login = function (userid, password, refreshToken) {
         return __awaiter(this, void 0, void 0, function () {
             var body, res;

lib/zero.js

@@ -61,8 +61,12 @@ var DgraphZero = (function () {
         return __awaiter(this, void 0, void 0, function () {
             var url;
             return __generator(this, function (_a) {
-                url = "health" + (all ? "?all" : "");
-                return [2, this.callAPI(url, {})];
+                switch (_a.label) {
+                    case 0:
+                        url = "health" + (all ? "?all" : "");
+                        return [4, this.callAPI(url, {})];
+                    case 1: return [2, _a.sent()];
+                }
             });
         });
     };

src/clientStub.ts

@@ -40,9 +40,19 @@ export class DgraphClientStub {
     }
 
     public async detectApiVersion(): Promise<string> {
-        const health = await this.health();
-        this.legacyApi = health.version.startsWith("1.0.");
-        return health.version;
+      try {
+        const response = await this.getHealth();
+        
+        if (response.data === "OK") {
+          this.legacyApi = true;
+          return "1.0.x"
+        } else {
+          return response.data["version"];
+        }
+      } 
+      catch (err) {
+        throw new Error("Failed to obtain alpha health.");
+      }
     }
 
     public alter(op: Operation): Promise<Payload> {
@@ -232,27 +242,6 @@ export class DgraphClientStub {
         return this.callAPI(url, { method: "POST" });
     }
 
-    public async health(): Promise<{ health: string; version: string; instance?: string; uptime?: number }> {
-        const response: { status: number; text(): Promise<string> } =
-            await fetch(this.getURL("health"), { // tslint:disable-line no-unsafe-any
-                method: "GET",
-            });
-        if (response.status >= 300 || response.status < 200) {
-            throw new Error(`Invalid status code = ${response.status}`);
-        }
-        const text = await response.text();
-        if (text === "OK") {
-          return {
-            health: text,
-            version: "1.0.x",
-          };
-        }
-        return {
-          ...JSON.parse(text),
-          health: "OK",
-        };
-    }
-
     public async login(userid?: string, password?: string, refreshToken?: string): Promise<boolean> {
       if (this.legacyApi) {
         throw new Error("Pre v1.1 clients do not support Login methods");