Merge branch 'master' of https://github.com/dgraph-io/dgraph-js-http

Author: Paul Korzhyk

lib/client.d.ts

@@ -1,6 +1,6 @@
 import { DgraphClientStub } from "./clientStub";
 import { Txn } from "./txn";
-import { Operation, Payload, UiKeywords, TxnOptions, Response } from "./types";
+import { Operation, Payload, Response, TxnOptions, UiKeywords } from "./types";
 export declare class DgraphClient {
     private readonly clients;
     private debugMode;

lib/client.js

@@ -96,20 +96,14 @@ var DgraphClient = (function () {
         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()];
-                }
+                return [2, this.anyClient().getHealth(all)];
             });
         });
     };
     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()];
-                }
+                return [2, this.anyClient().getState()];
             });
         });
     };

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) {
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -62,14 +51,15 @@ var DgraphClientStub = (function () {
     }
     DgraphClientStub.prototype.detectApiVersion = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var health;
+            var health, version;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.health()];
+                    case 0: return [4, this.getHealth()];
                     case 1:
                         health = _a.sent();
-                        this.legacyApi = health.version.startsWith("1.0.");
-                        return [2, health.version];
+                        version = health["version"] || health[0].version;
+                        this.legacyApi = version.startsWith("1.0.");
+                        return [2, version];
                 }
             });
         });
@@ -248,33 +238,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({}, JSON.parse(text), { health: "OK" })];
-                }
-            });
-        });
-    };
     DgraphClientStub.prototype.login = function (userid, password, refreshToken) {
         return __awaiter(this, void 0, void 0, function () {
             var body, res;
@@ -329,28 +292,15 @@ 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()];
-                }
+                return [2, this.callAPI("health" + (all ? "?all" : ""), {})];
             });
         });
     };
     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()];
-                }
+                return [2, this.callAPI("state", {})];
             });
         });
     };
@@ -375,7 +325,7 @@ var DgraphClientStub = (function () {
         this.cancelRefreshTimer();
         var timeToWait = Math.max(2000, jwt.decode(accessToken).exp * 1000 - Date.now()
             - AUTO_REFRESH_PREFETCH_TIME);
-        this.autoRefreshTimer = setTimeout(function () { return _this.refreshToken && _this.login(); }, timeToWait);
+        this.autoRefreshTimer = setTimeout(function () { return _this.refreshToken !== undefined ? _this.login() : 0; }, timeToWait);
     };
     DgraphClientStub.prototype.callAPI = function (path, config) {
         return __awaiter(this, void 0, void 0, function () {

lib/txn.js

@@ -39,19 +39,20 @@ var errors_1 = require("./errors");
 var util_1 = require("./util");
 var Txn = (function () {
     function Txn(dc, options) {
+        if (options === void 0) { options = {}; }
         this.finished = false;
         this.mutated = false;
         this.dc = dc;
-        if (options && options.bestEffort && !options.readOnly) {
-            this.dc.debug('Client attempted to query using best-effort without setting the transaction to read-only');
+        if (options.bestEffort && !options.readOnly) {
+            this.dc.debug("Client attempted to query using best-effort without setting the transaction to read-only");
             throw errors_1.ERR_BEST_EFFORT_REQUIRED_READ_ONLY;
         }
         this.ctx = {
             start_ts: 0,
             keys: [],
             preds: [],
-            readOnly: options && options.readOnly,
-            bestEffort: options && options.bestEffort,
+            readOnly: options.readOnly,
+            bestEffort: options.bestEffort,
         };
     }
     Txn.prototype.query = function (q, options) {
@@ -74,7 +75,7 @@ var Txn = (function () {
                             timeout: this.dc.getQueryTimeout(),
                             debug: options.debug,
                             readOnly: this.ctx.readOnly,
-                            bestEffort: this.ctx.bestEffort
+                            bestEffort: this.ctx.bestEffort,
                         };
                         if (vars !== undefined) {
                             varsObj_1 = {};