review changes

Aelbannan · Aelbannan · commit 1af2bd4d9161 · 2019-12-29T20:36:48.000-08:00
diff --git a/lib/client.d.ts b/lib/client.d.ts
@@ -1,6 +1,6 @@
 import { DgraphClientStub } from "./clientStub";
 import { Txn } from "./txn";
-import { Operation, Payload, UiKeywords, TxnOptions } from "./types";
+import { Operation, Payload, UiKeywords, TxnOptions, Response } from "./types";
 export declare class DgraphClient {
     private readonly clients;
     private debugMode;
@@ -14,6 +14,8 @@ export declare class DgraphClient {
     newTxn(options?: TxnOptions): Txn;
     setDebugMode(mode?: boolean): void;
     fetchUiKeywords(): Promise<UiKeywords>;
+    getHealth(all?: boolean): Promise<Response>;
+    getState(): Promise<Response>;
     debug(msg: string): void;
     anyClient(): DgraphClientStub;
 }
diff --git a/lib/client.js b/lib/client.js
@@ -93,6 +93,27 @@ var DgraphClient = (function () {
     DgraphClient.prototype.fetchUiKeywords = function () {
         return this.anyClient().fetchUiKeywords();
     };
+    DgraphClient.prototype.getHealth = function (all) {
+        if (all === void 0) { all = true; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.anyClient().getHealth(all)];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        });
+    };
+    DgraphClient.prototype.getState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.anyClient().getState()];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        });
+    };
     DgraphClient.prototype.debug = function (msg) {
         if (this.debugMode) {
             console.log(msg);
diff --git a/lib/clientStub.d.ts b/lib/clientStub.d.ts
@@ -27,15 +27,11 @@ export declare class DgraphClientStub {
         refreshToken?: string;
     };
     fetchUiKeywords(): Promise<UiKeywords>;
+    getHealth(all?: boolean): Promise<Response>;
+    getState(): Promise<Response>;
     setAutoRefresh(val: boolean): void;
     private cancelRefreshTimer;
     private maybeStartRefreshTimer;
-    callAPI<T>(path: string, config: {
-        method?: string;
-        body?: string;
-        headers?: {
-            [k: string]: string;
-        };
-    }): Promise<T>;
+    private callAPI;
     private getURL;
 }
diff --git a/lib/clientStub.js b/lib/clientStub.js
@@ -327,6 +327,34 @@ var DgraphClientStub = (function () {
             });
         });
     };
+    DgraphClientStub.prototype.getHealth = function (all) {
+        if (all === void 0) { all = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var url;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        url = "health" + (all ? "?all" : "");
+                        return [4, this.callAPI(url, {
+                                method: "GET",
+                            })];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        });
+    };
+    DgraphClientStub.prototype.getState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.callAPI("state", {
+                            method: "GET",
+                        })];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        });
+    };
     DgraphClientStub.prototype.setAutoRefresh = function (val) {
         if (!val) {
             this.cancelRefreshTimer();
diff --git a/lib/cluster.d.ts b/lib/cluster.d.ts
diff --git a/lib/cluster.js b/lib/cluster.js
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -3,5 +3,4 @@ export * from "./clientStub";
 export * from "./client";
 export * from "./txn";
 export * from "./errors";
-export * from './cluster';
-export * from './zero';
+export * from "./zero";
diff --git a/lib/index.js b/lib/index.js
@@ -7,5 +7,4 @@ __export(require("./clientStub"));
 __export(require("./client"));
 __export(require("./txn"));
 __export(require("./errors"));
-__export(require("./cluster"));
 __export(require("./zero"));
diff --git a/lib/zero.d.ts b/lib/zero.d.ts
@@ -3,7 +3,7 @@ export declare class DgraphZero {
     private readonly addr;
     constructor(addr?: string);
     getState(): Promise<Response>;
-    getClusterHealth(): Promise<Response>;
+    getHealth(all?: boolean): Promise<Response>;
     private callAPI;
     private getURL;
 }
diff --git a/lib/zero.js b/lib/zero.js
@@ -47,10 +47,24 @@ var DgraphZero = (function () {
         }
     }
     DgraphZero.prototype.getState = function () {
-        return this.callAPI("state", {});
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.callAPI("state", {})];
+                    case 1: return [2, _a.sent()];
+                }
+            });
+        });
     };
-    DgraphZero.prototype.getClusterHealth = function () {
-        return this.callAPI("health?all", {});
+    DgraphZero.prototype.getHealth = function (all) {
+        if (all === void 0) { all = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var url;
+            return __generator(this, function (_a) {
+                url = "health" + (all ? "?all" : "");
+                return [2, this.callAPI(url, {})];
+            });
+        });
     };
     DgraphZero.prototype.callAPI = function (path, config) {
         return __awaiter(this, void 0, void 0, function () {
diff --git a/src/client.ts b/src/client.ts
@@ -1,7 +1,7 @@
 import { DgraphClientStub } from "./clientStub";
 import { ERR_NO_CLIENTS } from "./errors";
 import { Txn } from "./txn";
-import { Operation, Payload, UiKeywords, TxnOptions } from "./types";
+import { Operation, Payload, UiKeywords, TxnOptions, Response } from "./types";
 import { stringifyMessage } from "./util";
 
 /**
@@ -92,6 +92,14 @@ export class DgraphClient {
       return this.anyClient().fetchUiKeywords();
     }
 
+    public async getHealth(all: boolean = true): Promise<Response> {
+      return await this.anyClient().getHealth(all);
+    }
+
+    public async getState(): Promise<Response> {
+      return await this.anyClient().getState();
+    }
+
     /**
      * debug prints a message on the console if debug mode is switched on.
      */
diff --git a/src/clientStub.ts b/src/clientStub.ts
@@ -296,6 +296,35 @@ export class DgraphClientStub {
       return this.callAPI("ui/keywords", {});
     }
 
+
+    /**
+     * Gets instance or cluster health, based on the all param
+     *
+     * @param {boolean} [all=false] Whether to get the health of the full cluster 
+     * @returns {Promise<Response>} Health in JSON
+     * @memberof DgraphClientStub
+     */
+    public async getHealth(all: boolean = false): Promise<Response> {
+      const url = "health" + (all? "?all" : "");
+
+      return await this.callAPI(url, {
+        method: "GET",
+      });
+    }
+
+    /**
+     * Gets the state of the cluster
+     *
+     * @returns {Promise<Response>} State in JSON
+     * @memberof DgraphClientStub
+     */
+    public async getState(): Promise<Response> {
+      return await this.callAPI("state", {
+        method: "GET",
+      });
+    }
+
+
     public setAutoRefresh(val: boolean) {
         if (!val) {
           this.cancelRefreshTimer();
@@ -328,7 +357,7 @@ export class DgraphClientStub {
       );
     }
 
-    public async callAPI<T>(path: string, config: { method?: string; body?: string; headers?: { [k: string]: string } }): Promise<T> {
+    private async callAPI<T>(path: string, config: { method?: string; body?: string; headers?: { [k: string]: string } }): Promise<T> {
         const url = this.getURL(path);
         if (this.accessToken !== undefined && path !== "login") {
           config.headers = config.headers !== undefined ? config.headers : {};
diff --git a/src/cluster.ts b/src/cluster.ts
diff --git a/src/index.ts b/src/index.ts
@@ -11,10 +11,7 @@ export * from "./client";
 export * from "./txn";
 
 // Export error constants.
-export * from "./errors";
-
-// Export DgraphCluster class
-export * from './cluster'
+export * from "./errors"
 
 // Export DgraphZero class
-export * from './zero'
+export * from "./zero"
diff --git a/src/zero.ts b/src/zero.ts
@@ -21,13 +21,14 @@ export class DgraphZero {
             this.addr = addr;
         }
     }
-
-    public getState(): Promise<Response> {
-        return this.callAPI("state", {});
+    
+    public async getState(): Promise<Response> {
+        return await this.callAPI("state", {});
     }
 
-    getClusterHealth() : Promise<Response> {
-        return this.callAPI("health?all", {});
+    public async getHealth(all: boolean = false) : Promise<Response> {
+        const url = "health" + (all? "?all" : "");
+        return this.callAPI(url, {});
     }
 
     private async callAPI<T>(path: string, config: { method?: string; body?: string; headers?: { [k: string]: string } }): Promise<T> {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ export declare class DgraphZero {`
`3`	`3`	`private readonly addr;`
`4`	`4`	`constructor(addr?: string);`
`5`	`5`	`getState(): Promise<Response>;`
`6`		`- getClusterHealth(): Promise<Response>;`
	`6`	`+ getHealth(all?: boolean): Promise<Response>;`
`7`	`7`	`private callAPI;`
`8`	`8`	`private getURL;`
`9`	`9`	`}`