postchain-client 1.9.0 → 1.11.0

package/README.md

@@ -36,7 +36,7 @@ const blockchainRid =
   "7d565d92fd15bd1cdac2dc276cbcbc5581349d05a9e94ba919e1155ef4daf8f9";
 ```
 
-Next, create a Chromia client instance and configure it with a specific set of base URLs, the `blockchainRID`, and so forth. If you connect to a local node, the `nodeURLPool` property accepts an array or a string of URLs to nodes running the target dapp.
+Next, create a Chromia client instance and configure it with a specific set of base URLs, the `blockchainRID`, and so forth. If you connect to a local node, the `nodeUrlPool` property accepts an array or a string of URLs to nodes running the target dapp.
 
 ```typescript
 const chromiaClient = await createClient({

package/built/cjs/index.js

@@ -2536,10 +2536,10 @@ function createClient(settings) {
                         const transactionObject = {
                             tx: gtxBytes.toString("hex"),
                         };
-                        const { error: error$1, statusCode, rspBody } = yield requestWithRetry(Method.POST, `tx/${this.config.blockchainRid}`, this.config, transactionObject);
+                        const { error, statusCode, rspBody } = yield requestWithRetry(Method.POST, `tx/${this.config.blockchainRid}`, this.config, transactionObject);
                         const transactionRid = getDigestToSign(gtx$1);
                         try {
-                            yield handlePostResponsePromisified(error$1, statusCode, rspBody);
+                            yield handlePostResponsePromisified(error, statusCode, rspBody);
                             if (typeof callback === "function") {
                                 callback(null, {
                                     status: exports.ResponseStatus.Waiting,
@@ -2559,36 +2559,21 @@ function createClient(settings) {
                             statusCode: statusCode,
                             transactionRid: transactionRid,
                         });
-                        const waitConfirmation = (txRID) => {
-                            return new Promise((resolve, reject) => {
-                                this.getTransactionStatus(txRID, (error$1, result) => {
-                                    if (error$1) {
-                                        reject(error$1);
-                                    }
-                                    else {
-                                        const status = result.status;
-                                        switch (status) {
-                                            case exports.ResponseStatus.Confirmed:
-                                                resolve(exports.ResponseStatus.Confirmed);
-                                                break;
-                                            case exports.ResponseStatus.Rejected:
-                                                reject(new TxRejectedError(result.rejectReason));
-                                                break;
-                                            case exports.ResponseStatus.Unknown:
-                                                reject(new LostMessageError());
-                                                break;
-                                            case exports.ResponseStatus.Waiting:
-                                                setTimeout(() => waitConfirmation(txRID).then(resolve, reject), this.config.pollingInterval);
-                                                break;
-                                            default:
-                                                error(status);
-                                                reject(new UnexpectedResponseError());
-                                        }
-                                    }
-                                });
-                            });
-                        };
-                        const confirmationStatus = yield waitConfirmation(getDigestToSign(gtx$1));
+                        const awaitConfirmation = (txRID) => __awaiter$6(this, void 0, void 0, function* () {
+                            let lastKnownResult;
+                            for (let i = 0; i < this.config.statusPollCount; i++) {
+                                lastKnownResult = yield this.getTransactionStatus(txRID);
+                                if (lastKnownResult.status === exports.ResponseStatus.Confirmed) {
+                                    return exports.ResponseStatus.Confirmed;
+                                }
+                                else if (lastKnownResult.status === exports.ResponseStatus.Rejected) {
+                                    throw new TxRejectedError(lastKnownResult.rejectReason);
+                                }
+                                yield sleep(this.config.statusPollInterval);
+                            }
+                            return lastKnownResult.status;
+                        });
+                        const confirmationStatus = yield awaitConfirmation(getDigestToSign(gtx$1));
                         resolve({
                             status: confirmationStatus,
                             statusCode: statusCode,
@@ -2705,6 +2690,27 @@ function createClient(settings) {
                     });
                 });
             },
+            getBlockInfo(blockIdentifier, txs = false, callback) {
+                return __awaiter$6(this, void 0, void 0, function* () {
+                    if (typeof blockIdentifier !== "string" &&
+                        typeof blockIdentifier !== "number") {
+                        throw new TypeError(`Invalid "blockIdentifier" type. Expected string or number, but received ${typeof blockIdentifier}.`);
+                    }
+                    else if (typeof blockIdentifier === "string" &&
+                        !/^[0-9a-fA-F]{64}$/.test(blockIdentifier)) {
+                        throw new TypeError("Parameter 'blockIdentifier' does not have the correct format (64-character hexadecimal string).");
+                    }
+                    const queryString = typeof blockIdentifier === "string"
+                        ? blockIdentifier
+                        : `height/${blockIdentifier}`;
+                    const { error, statusCode, rspBody } = yield requestWithRetry(Method.GET, `blocks/${this.config.blockchainRid}/${queryString}?txs=${txs}`, this.config);
+                    return new Promise((resolve, reject) => {
+                        handleGetResponse(error, statusCode, statusCode === 200 && rspBody !== null
+                            ? formatBlockInfoResponse(rspBody)
+                            : rspBody, callbackPromiseBuilder(reject, resolve, callback));
+                    });
+                });
+            },
             getBlocksInfo(limit = 25, beforeTime, beforeHeight, txs, callback) {
                 return __awaiter$6(this, void 0, void 0, function* () {
                     let filteringQueryParam = "";
@@ -2827,7 +2833,8 @@ function getClientConfigFromSettings(settings) {
         return {
             endpointPool: nodeUrlPoolToUse,
             blockchainRid: blockchainRidToUse,
-            pollingInterval: settings.pollingInterval || 500,
+            statusPollInterval: settings.statusPollInterval || 500,
+            statusPollCount: settings.statusPollCount || 20,
             failoverStrategy: ((_a = settings.failOverConfig) === null || _a === void 0 ? void 0 : _a.strategy) || defaultFailoverConfig.strategy,
             attemptsPerEndpoint: ((_b = settings.failOverConfig) === null || _b === void 0 ? void 0 : _b.attemptsPerEndpoint) ||
                 defaultFailoverConfig.attemptsPerEndpoint,
@@ -3029,7 +3036,8 @@ function getBlockchainRidFromIid(endpointPool, chainId, failOverConfig = default
         const config = {
             endpointPool,
             blockchainRid: undefined,
-            pollingInterval: 500,
+            statusPollInterval: 500,
+            statusPollCount: 20,
             failoverStrategy: failOverConfig.strategy || defaultFailoverConfig.strategy,
             attemptsPerEndpoint: failOverConfig.attemptsPerEndpoint ||
                 defaultFailoverConfig.attemptsPerEndpoint,