algosdk 1.13.0-beta.1 → 1.13.0-beta.2

package/dist/cjs/src/client/client.js

@@ -18,54 +18,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const request = __importStar(require("superagent"));
-const url_parse_1 = __importDefault(require("url-parse"));
 const utils = __importStar(require("../utils/utils"));
-const intDecoding_1 = __importDefault(require("../types/intDecoding"));
-function createJSONParser(options) {
-    return (res, 
-    // eslint-disable-next-line no-unused-vars
-    fnOrStr
-    // eslint-disable-next-line consistent-return
-    ) => {
-        if (typeof fnOrStr === 'string') {
-            // in browser
-            return fnOrStr && utils.parseJSON(fnOrStr, options);
-        }
-        // in node
-        // based off https://github.com/visionmedia/superagent/blob/1277a880c32191e300b229e352e0633e421046c8/src/node/parsers/json.js
-        res.text = '';
-        res.setEncoding('utf8');
-        res.on('data', (chunk) => {
-            res.text += chunk;
-        });
-        res.on('end', () => {
-            let body;
-            let err;
-            try {
-                body = res.text && utils.parseJSON(res.text, options);
-            }
-            catch (err_) {
-                err = err_;
-                // issue #675: return the raw response if the response parsing fails
-                err.rawResponse = res.text || null;
-                // issue #876: return the http status code if the response parsing fails
-                err.statusCode = res.status;
-            }
-            finally {
-                fnOrStr(err, body);
-            }
-        });
-    };
-}
+const urlTokenBaseHTTPClient_1 = require("./urlTokenBaseHTTPClient");
 /**
  * Remove falsy values or values with a length of 0 from an object.
- * @param obj
  */
 function removeFalsyOrEmpty(obj) {
     for (const key in obj) {
@@ -77,10 +34,19 @@ function removeFalsyOrEmpty(obj) {
     }
     return obj;
 }
+/**
+ * Create a new object with lower-case keys
+ * See https://codereview.stackexchange.com/a/162418
+ * Used to ensure all headers are lower-case and to work more easily with them
+ */
+function tolowerCaseKeys(o) {
+    /* eslint-disable no-param-reassign,no-return-assign,no-sequences */
+    return Object.keys(o).reduce((c, k) => ((c[k.toLowerCase()] = o[k]), c), {});
+    /* eslint-enable no-param-reassign,no-return-assign,no-sequences */
+}
 /**
  * getAcceptFormat returns the correct Accept header depending on the
  * requested format.
- * @param query
  */
 function getAcceptFormat(query) {
     if (query !== undefined &&
@@ -96,29 +62,129 @@ function getAcceptFormat(query) {
     else
         return 'application/json';
 }
+/**
+ * Check is a response is JSON or not
+ * Inspired from superagent code
+ */
+function isResponseJSON(res) {
+    let contentType = tolowerCaseKeys(res.headers)['content-type'];
+    if (contentType) {
+        /* eslint-disable prefer-destructuring */
+        contentType = contentType.split(';')[0];
+        /* eslint-enable prefer-destructuring */
+    }
+    // regex should match /json or +json
+    // but not /json-seq
+    // from https://github.com/visionmedia/superagent/blob/048cf185d954028b1dccde0717d2488b2284c297/src/client.js#L276
+    return /[/+]json($|[^-\w])/i.test(contentType);
+}
+/**
+ * Check is a response is text
+ * Inspired from superagent code
+ */
+function isResponseText(res) {
+    const contentType = tolowerCaseKeys(res.headers)['content-type'] || 'text/plain';
+    return /^\w*text\//i.test(contentType);
+}
+/**
+ * HTTPClient is a wrapper around a BaseHTTPClient
+ * It takes care of setting the proper "Accept" header and of
+ * decoding the JSON outputs.
+ */
 class HTTPClient {
-    constructor(tokenHeader, baseServer, port, defaultHeaders = {}) {
-        this.defaultHeaders = defaultHeaders;
-        this.intDecoding = intDecoding_1.default.DEFAULT;
-        const baseServerURL = new url_parse_1.default(baseServer, {});
-        if (typeof port !== 'undefined') {
-            baseServerURL.set('port', port.toString());
-        }
-        if (baseServerURL.protocol.length === 0) {
-            throw new Error('Invalid base server URL, protocol must be defined.');
-        }
-        this.baseURL = baseServerURL;
-        this.defaultHeaders = defaultHeaders;
-        this.tokenHeader = tokenHeader;
+    constructor(bcOrTokenHeader, baseServer, port, defaultHeaders = {}) {
+        if (baseServer !== undefined) {
+            this.bc = new urlTokenBaseHTTPClient_1.URLTokenBaseHTTPClient(bcOrTokenHeader, baseServer, port, defaultHeaders);
+        }
+        else {
+            this.bc = bcOrTokenHeader;
+        }
+    }
+    /**
+     * Parse JSON using either the built-in JSON.parse or utils.parseJSON
+     * depending on whether jsonOptions are provided or not
+     *
+     * @param text JSON data
+     * @param status Status of the response (used in case parseJSON fails)
+     * @param jsonOptions Options object to use to decode JSON responses. See
+     *   utils.parseJSON for the options available.
+     * @private
+     */
+    static parseJSON(text, status, jsonOptions = {}) {
+        try {
+            if (Object.keys(jsonOptions).length !== 0) {
+                return text && JSON.parse(text);
+            }
+            return text && utils.parseJSON(text, jsonOptions);
+        }
+        catch (err_) {
+            const err = err_;
+            // return the raw response if the response parsing fails
+            err.rawResponse = text || null;
+            // return the http status code if the response parsing fails
+            err.statusCode = status;
+            throw err;
+        }
     }
     /**
-     * Compute the URL for a path relative to the instance's address
-     * @param relativePath - A path string
-     * @returns A URL string
+     * Serialize the data according to the requestHeaders
+     * Assumes that requestHeaders contain a key "content-type"
+     * If the content-type is "application/json", data is JSON serialized
+     * Otherwise, data needs to be either an UTF-8 string that is converted to an Uint8Array
+     * or an Uint8Array
+     * @private
      */
-    addressWithPath(relativePath) {
-        const address = new url_parse_1.default(path_1.default.posix.join(this.baseURL.pathname, relativePath), this.baseURL);
-        return address.toString();
+    static serializeData(data, requestHeaders) {
+        if (!data) {
+            return new Uint8Array(0); // empty Uint8Array
+        }
+        if (requestHeaders['content-type'] === 'application/json') {
+            return new Uint8Array(Buffer.from(JSON.stringify(data)));
+        }
+        if (typeof data === 'string') {
+            return new Uint8Array(Buffer.from(data));
+        }
+        if (data instanceof Uint8Array) {
+            return data;
+        }
+        throw new Error('provided data is neither a string nor a Uint8Array and content-type is not application/json');
+    }
+    /**
+     * Convert a BaseHTTPClientResponse into a full HTTPClientResponse
+     * Parse the body in
+     * Modifies in place res and return the result
+     */
+    static prepareResponse(res, jsonOptions = {}) {
+        let { body } = res;
+        let text;
+        if (isResponseJSON(res)) {
+            text = (body && new TextDecoder().decode(body)) || '';
+            body = HTTPClient.parseJSON(text, res.status, jsonOptions);
+        }
+        else if (isResponseText(res)) {
+            text = (body && new TextDecoder().decode(body)) || '';
+        }
+        return {
+            ...res,
+            body,
+            text,
+            ok: Math.trunc(res.status / 100) === 2,
+        };
+    }
+    /**
+     * Prepare an error with a response
+     * (the type of errors BaseHTTPClient are supposed to throw)
+     * by adding the status and preparing the internal response
+     * @private
+     */
+    static prepareResponseError(err) {
+        if (err.response) {
+            // eslint-disable-next-line no-param-reassign
+            err.response = HTTPClient.prepareResponse(err.response);
+            // eslint-disable-next-line no-param-reassign
+            err.status = err.response.status;
+        }
+        return err;
     }
     /**
      * Send a GET request.
@@ -131,50 +197,45 @@ class HTTPClient {
      */
     async get(relativePath, query, requestHeaders = {}, jsonOptions = {}) {
         const format = getAcceptFormat(query);
-        let r = request
-            .get(this.addressWithPath(relativePath))
-            .set(this.tokenHeader)
-            .set(this.defaultHeaders)
-            .set(requestHeaders)
-            .set('Accept', format)
-            .query(removeFalsyOrEmpty(query));
-        if (format === 'application/msgpack') {
-            r = r.responseType('arraybuffer');
-        }
-        else if (format === 'application/json' &&
-            Object.keys(jsonOptions).length !== 0) {
-            if (utils.isNode()) {
-                // in node, need to set buffer
-                r = r.buffer(true);
-            }
-            r = r.parse(createJSONParser(jsonOptions));
-        }
-        const res = await r;
-        if (Buffer.isBuffer(res.body)) {
-            // In node res.body will be a Buffer, but in the browser it will be an ArrayBuffer
-            // (thanks superagent...), so convert it to an ArrayBuffer for consistency.
-            const underlyingArrayBuffer = res.body.buffer;
-            const start = res.body.byteOffset;
-            const end = start + res.body.byteLength;
-            res.body = underlyingArrayBuffer.slice(start, end);
-        }
-        return res;
+        const fullHeaders = { ...requestHeaders, accept: format };
+        try {
+            const res = await this.bc.get(relativePath, removeFalsyOrEmpty(query), fullHeaders);
+            return HTTPClient.prepareResponse(res, jsonOptions);
+        }
+        catch (err) {
+            throw HTTPClient.prepareResponseError(err);
+        }
     }
+    /**
+     * Send a POST request.
+     * If no content-type present, adds the header "content-type: application/json"
+     * and data is serialized in JSON (if not empty)
+     */
     async post(relativePath, data, requestHeaders = {}) {
-        return request
-            .post(this.addressWithPath(relativePath))
-            .set(this.tokenHeader)
-            .set(this.defaultHeaders)
-            .set(requestHeaders)
-            .send(data);
+        const fullHeaders = {
+            'content-type': 'application/json',
+            ...tolowerCaseKeys(requestHeaders),
+        };
+        try {
+            const res = await this.bc.post(relativePath, HTTPClient.serializeData(data, fullHeaders), undefined, fullHeaders);
+            return HTTPClient.prepareResponse(res);
+        }
+        catch (err) {
+            throw HTTPClient.prepareResponseError(err);
+        }
     }
+    /**
+     * Send a DELETE request.
+     * If no content-type present, adds the header "content-type: application/json"
+     * and data is serialized in JSON (if not empty)
+     */
     async delete(relativePath, data, requestHeaders = {}) {
-        return request
-            .delete(this.addressWithPath(relativePath))
-            .set(this.tokenHeader)
-            .set(this.defaultHeaders)
-            .set(requestHeaders)
-            .send(data);
+        const fullHeaders = {
+            'content-type': 'application/json',
+            ...tolowerCaseKeys(requestHeaders),
+        };
+        const res = await this.bc.delete(relativePath, HTTPClient.serializeData(data, fullHeaders), undefined, fullHeaders);
+        return HTTPClient.prepareResponse(res);
     }
 }
 exports.default = HTTPClient;

package/dist/cjs/src/client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/client/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/client/client.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/client/urlTokenBaseHTTPClient.js

@@ -0,0 +1,138 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.URLTokenBaseHTTPClient = void 0;
+const url_parse_1 = __importDefault(require("url-parse"));
+const path_1 = __importDefault(require("path"));
+const request = __importStar(require("superagent"));
+/**
+ * Implementation of BaseHTTPClient that uses a URL and a token
+ * and make the REST queries using superagent.
+ * This is the default implementation of BaseHTTPClient.
+ */
+class URLTokenBaseHTTPClient {
+    constructor(tokenHeader, baseServer, port, defaultHeaders = {}) {
+        this.defaultHeaders = defaultHeaders;
+        const baseServerURL = new url_parse_1.default(baseServer, {});
+        if (typeof port !== 'undefined') {
+            baseServerURL.set('port', port.toString());
+        }
+        if (baseServerURL.protocol.length === 0) {
+            throw new Error('Invalid base server URL, protocol must be defined.');
+        }
+        this.baseURL = baseServerURL;
+        this.tokenHeader = tokenHeader;
+    }
+    /**
+     * Compute the URL for a path relative to the instance's address
+     * @param relativePath - A path string
+     * @returns A URL string
+     */
+    addressWithPath(relativePath) {
+        const address = new url_parse_1.default(path_1.default.posix.join(this.baseURL.pathname, relativePath), this.baseURL);
+        return address.toString();
+    }
+    /**
+     * Convert a superagent response to a valid BaseHTTPClientResponse
+     * Modify the superagent response
+     * @private
+     */
+    static superagentToHTTPClientResponse(res) {
+        if (res.body instanceof ArrayBuffer) {
+            // Handle the case where the body is an arraybuffer which happens in the browser
+            res.body = new Uint8Array(res.body);
+        }
+        return res;
+    }
+    /**
+     * Make a superagent error more readable. For more info, see https://github.com/visionmedia/superagent/issues/1074
+     */
+    static formatSuperagentError(err) {
+        if (err.response) {
+            try {
+                const decoded = JSON.parse(Buffer.from(err.response.body).toString());
+                // eslint-disable-next-line no-param-reassign
+                err.message = `Network request error. Received status ${err.response.status}: ${decoded.message}`;
+            }
+            catch (err2) {
+                // ignore any error that happened while we are formatting the original error
+            }
+        }
+        return err;
+    }
+    async get(relativePath, query, requestHeaders = {}) {
+        const r = request
+            .get(this.addressWithPath(relativePath))
+            .set(this.tokenHeader)
+            .set(this.defaultHeaders)
+            .set(requestHeaders)
+            .responseType('arraybuffer')
+            .query(query);
+        try {
+            const res = await r;
+            return URLTokenBaseHTTPClient.superagentToHTTPClientResponse(res);
+        }
+        catch (err) {
+            throw URLTokenBaseHTTPClient.formatSuperagentError(err);
+        }
+    }
+    async post(relativePath, data, query, requestHeaders = {}) {
+        const r = request
+            .post(this.addressWithPath(relativePath))
+            .set(this.tokenHeader)
+            .set(this.defaultHeaders)
+            .set(requestHeaders)
+            .query(query)
+            .serialize((o) => o) // disable serialization from superagent
+            .responseType('arraybuffer')
+            .send(Buffer.from(data)); // Buffer.from necessary for superagent
+        try {
+            const res = await r;
+            return URLTokenBaseHTTPClient.superagentToHTTPClientResponse(res);
+        }
+        catch (err) {
+            throw URLTokenBaseHTTPClient.formatSuperagentError(err);
+        }
+    }
+    async delete(relativePath, data, query, requestHeaders = {}) {
+        const r = request
+            .delete(this.addressWithPath(relativePath))
+            .set(this.tokenHeader)
+            .set(this.defaultHeaders)
+            .set(requestHeaders)
+            .query(query)
+            .serialize((o) => o) // disable serialization from superagent
+            .responseType('arraybuffer')
+            .send(Buffer.from(data)); // Buffer.from necessary for superagent
+        try {
+            const res = await r;
+            return URLTokenBaseHTTPClient.superagentToHTTPClientResponse(res);
+        }
+        catch (err) {
+            throw URLTokenBaseHTTPClient.formatSuperagentError(err);
+        }
+    }
+}
+exports.URLTokenBaseHTTPClient = URLTokenBaseHTTPClient;
+//# sourceMappingURL=urlTokenBaseHTTPClient.js.map

package/dist/cjs/src/client/urlTokenBaseHTTPClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"urlTokenBaseHTTPClient.js","sourceRoot":"","sources":["../../../../src/client/urlTokenBaseHTTPClient.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/client/v2/algod/algod.js

@@ -23,8 +23,13 @@ const versions_1 = __importDefault(require("./versions"));
 const genesis_1 = __importDefault(require("./genesis"));
 const proof_1 = __importDefault(require("./proof"));
 class AlgodClient extends serviceClient_1.default {
-    constructor(token, baseServer = 'http://r2.algorand.network', port = 4180, headers = {}) {
-        super('X-Algo-API-Token', token, baseServer, port, headers);
+    /**
+     * Create an AlgodClient from
+     * * either a token, baseServer, port, and optional headers
+     * * or a base client server for interoperability with external dApp wallets
+     */
+    constructor(tokenOrBaseClient, baseServer = 'http://r2.algorand.network', port = 4180, headers = {}) {
+        super('X-Algo-API-Token', tokenOrBaseClient, baseServer, port, headers);
     }
     healthCheck() {
         return new healthCheck_1.default(this.c);

package/dist/cjs/src/client/v2/algod/algod.js.map

@@ -1 +1 @@
-{"version":3,"file":"algod.js","sourceRoot":"","sources":["../../../../../../src/client/v2/algod/algod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"algod.js","sourceRoot":"","sources":["../../../../../../src/client/v2/algod/algod.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/client/v2/indexer/indexer.js

@@ -19,8 +19,13 @@ const searchForTransactions_1 = __importDefault(require("./searchForTransactions
 const searchForAssets_1 = __importDefault(require("./searchForAssets"));
 const searchForApplications_1 = __importDefault(require("./searchForApplications"));
 class IndexerClient extends serviceClient_1.default {
-    constructor(token, baseServer = 'http://127.0.0.1', port = 8080, headers = {}) {
-        super('X-Indexer-API-Token', token, baseServer, port, headers);
+    /**
+     * Create an IndexerClient from
+     * * either a token, baseServer, port, and optional headers
+     * * or a base client server for interoperability with external dApp wallets
+     */
+    constructor(tokenOrBaseClient, baseServer = 'http://127.0.0.1', port = 8080, headers = {}) {
+        super('X-Indexer-API-Token', tokenOrBaseClient, baseServer, port, headers);
     }
     /**
      * Returns the health object for the service.

package/dist/cjs/src/client/v2/indexer/indexer.js.map

@@ -1 +1 @@
-{"version":3,"file":"indexer.js","sourceRoot":"","sources":["../../../../../../src/client/v2/indexer/indexer.ts"],"names":[],"mappings":";;;;;AAAA,qEAA6C;AAE7C,wEAAgD;AAChD,gFAAwD;AACxD,wFAAgE;AAChE,4FAAoE;AACpE,gEAAwC;AACxC,oFAA4D;AAC5D,4EAAoD;AACpD,wEAAgD;AAChD,8EAAsD;AACtD,oFAA4D;AAC5D,sEAA8C;AAC9C,oFAA4D;AAC5D,wEAAgD;AAChD,oFAA4D;AAE5D,MAAqB,aAAc,SAAQ,uBAAa;IACtD,YACE,KAAsD,EACtD,UAAU,GAAG,kBAAkB,EAC/B,OAAwB,IAAI,EAC5B,OAAO,GAAG,EAAE;QAEZ,KAAK,CAAC,qBAAqB,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,IAAI,yBAAe,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,KAAa;QAC/B,OAAO,IAAI,6BAAmB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACH,uBAAuB,CAAC,KAAa;QACnC,OAAO,IAAI,iCAAuB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,yBAAyB,CAAC,OAAe;QACvC,OAAO,IAAI,mCAAyB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACH,WAAW,CAAC,KAAa;QACvB,OAAO,IAAI,qBAAW,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACH,qBAAqB,CAAC,IAAY;QAChC,OAAO,IAAI,+BAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACnE,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,OAAe;QAC/B,OAAO,IAAI,2BAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,KAAa;QAC3B,OAAO,IAAI,yBAAe,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACH,kBAAkB,CAAC,KAAa;QAC9B,OAAO,IAAI,4BAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;IAED;;;OAGG;IACH,qBAAqB,CAAC,KAAa;QACjC,OAAO,IAAI,+BAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,wBAAc,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,OAAO,IAAI,+BAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,IAAI,yBAAe,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,OAAO,IAAI,+BAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;CACF;AApHD,gCAoHC"}
+{"version":3,"file":"indexer.js","sourceRoot":"","sources":["../../../../../../src/client/v2/indexer/indexer.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/client/v2/serviceClient.js

@@ -15,21 +15,30 @@ function convertTokenStringToTokenHeader(token = '', headerIdentifier) {
     tokenHeader[headerIdentifier] = token;
     return tokenHeader;
 }
+function isBaseHTTPClient(tbc) {
+    return typeof tbc.get === 'function';
+}
 /**
  * Abstract service client to encapsulate shared AlgodClient and IndexerClient logic
  */
 class ServiceClient {
-    constructor(tokenHeaderIdentifier, tokenHeaderOrStr, baseServer, port, defaultHeaders = {}) {
-        // Accept token header as string or object
-        // - workaround to allow backwards compatibility for multiple headers
-        let tokenHeader;
-        if (typeof tokenHeaderOrStr === 'string') {
-            tokenHeader = convertTokenStringToTokenHeader(tokenHeaderOrStr, tokenHeaderIdentifier);
+    constructor(tokenHeaderIdentifier, tokenHeaderOrStrOrBaseClient, baseServer, port, defaultHeaders = {}) {
+        if (isBaseHTTPClient(tokenHeaderOrStrOrBaseClient)) {
+            // we are using a base client
+            this.c = new client_1.default(tokenHeaderOrStrOrBaseClient);
         }
         else {
-            tokenHeader = tokenHeaderOrStr;
+            // Accept token header as string or object
+            // - workaround to allow backwards compatibility for multiple headers
+            let tokenHeader;
+            if (typeof tokenHeaderOrStrOrBaseClient === 'string') {
+                tokenHeader = convertTokenStringToTokenHeader(tokenHeaderOrStrOrBaseClient, tokenHeaderIdentifier);
+            }
+            else {
+                tokenHeader = tokenHeaderOrStrOrBaseClient;
+            }
+            this.c = new client_1.default(tokenHeader, baseServer, port, defaultHeaders);
         }
-        this.c = new client_1.default(tokenHeader, baseServer, port, defaultHeaders);
         this.intDecoding = intDecoding_1.default.DEFAULT;
     }
     /**

package/dist/cjs/src/client/v2/serviceClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"serviceClient.js","sourceRoot":"","sources":["../../../../../src/client/v2/serviceClient.ts"],"names":[],"mappings":";;;;;AAAA,uDAAoD;AACpD,0EAAkD;AAQlD;;;;GAIG;AACH,SAAS,+BAA+B,CACtC,QAAgB,EAAE,EAClB,gBAAuC;IAEvC,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,WAAW,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC;IACtC,OAAO,WAA0B,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAA8B,aAAa;IAIzC,YACE,qBAA4C,EAC5C,gBAAsC,EACtC,UAAkB,EAClB,IAAsB,EACtB,iBAAsC,EAAE;QAExC,0CAA0C;QAC1C,qEAAqE;QACrE,IAAI,WAAwB,CAAC;QAC7B,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;YACxC,WAAW,GAAG,+BAA+B,CAC3C,gBAAgB,EAChB,qBAAqB,CACtB,CAAC;SACH;aAAM;YACL,WAAW,GAAG,gBAAgB,CAAC;SAChC;QAED,IAAI,CAAC,CAAC,GAAG,IAAI,gBAAU,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACvE,IAAI,CAAC,WAAW,GAAG,qBAAW,CAAC,OAAO,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,MAAmB;QAChC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF;AA3CD,gCA2CC"}
+{"version":3,"file":"serviceClient.js","sourceRoot":"","sources":["../../../../../src/client/v2/serviceClient.ts"],"names":[],"mappings":";;;;;AAAA,uDAAmC;AACnC,0EAAkD;AAUlD;;;;GAIG;AACH,SAAS,+BAA+B,CACtC,QAAgB,EAAE,EAClB,gBAAuC;IAEvC,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,WAAW,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC;IACtC,OAAO,WAA0B,CAAC;AACpC,CAAC;AAED,SAAS,gBAAgB,CACvB,GAA0C;IAE1C,OAAO,OAAQ,GAAsB,CAAC,GAAG,KAAK,UAAU,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,MAA8B,aAAa;IAIzC,YACE,qBAA4C,EAC5C,4BAAmE,EACnE,UAAkB,EAClB,IAAsB,EACtB,iBAAsC,EAAE;QAExC,IAAI,gBAAgB,CAAC,4BAA4B,CAAC,EAAE;YAClD,6BAA6B;YAC7B,IAAI,CAAC,CAAC,GAAG,IAAI,gBAAU,CAAC,4BAA4B,CAAC,CAAC;SACvD;aAAM;YACL,0CAA0C;YAC1C,qEAAqE;YACrE,IAAI,WAAwB,CAAC;YAC7B,IAAI,OAAO,4BAA4B,KAAK,QAAQ,EAAE;gBACpD,WAAW,GAAG,+BAA+B,CAC3C,4BAA4B,EAC5B,qBAAqB,CACtB,CAAC;aACH;iBAAM;gBACL,WAAW,GAAG,4BAA4B,CAAC;aAC5C;YAED,IAAI,CAAC,CAAC,GAAG,IAAI,gBAAU,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;SACxE;QAED,IAAI,CAAC,WAAW,GAAG,qBAAW,CAAC,OAAO,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,MAAmB;QAChC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF;AAjDD,gCAiDC"}