postchain-client 2.1.3 → 2.1.4

package/built/umd/index.js

@@ -39186,7 +39186,7 @@
 	var errors = {};
 
 	Object.defineProperty(errors, "__esModule", { value: true });
-	errors.GetBridFromChainException = errors.SerializedTransactionFormatException = errors.InvalidTxRidException = errors.UnexpectedStatusError = errors.TxRejectedError = errors.GetTransactionRidException = errors.InvalidTransactionFormatException = errors.DirectoryNodeUrlPoolException = errors.BlockchainUrlUndefinedException = errors.MissingNodeUrlError = errors.MissingBlockchainIdentifierError = errors.MissingPubKeyError = void 0;
+	errors.GetBridFromChainException = errors.SerializedTransactionFormatException = errors.InvalidTxRidException = errors.UnexpectedStatusError = errors.TxRejectedError = errors.GetTransactionRidException = errors.InvalidTransactionFormatException = errors.FilteredNodeUrlPoolEmptyError = errors.DirectoryNodeUrlPoolException = errors.BlockchainUrlUndefinedException = errors.MissingNodeUrlError = errors.MissingBlockchainIdentifierError = errors.MissingPubKeyError = void 0;
 	const customError_1 = customError;
 	const formatter_1$1 = formatter;
 	class MissingPubKeyError extends customError_1.CustomError {
@@ -39220,6 +39220,12 @@
 	    }
 	}
 	errors.DirectoryNodeUrlPoolException = DirectoryNodeUrlPoolException;
+	class FilteredNodeUrlPoolEmptyError extends customError_1.CustomError {
+	    constructor(poolName) {
+	        super(`All node URLs were filtered out for pool "${poolName}". Update node URL filters or pool configuration.`, 400);
+	    }
+	}
+	errors.FilteredNodeUrlPoolEmptyError = FilteredNodeUrlPoolEmptyError;
 	class InvalidTransactionFormatException extends customError_1.CustomError {
 	    constructor() {
 	        super(`The transaction is not in the right format`, 400);
@@ -40547,23 +40553,9 @@
 			                responseTimeout: settings.responseTimeout,
 			            });
 			        }))();
-			        return {
-			            endpointPool,
-			            nodeManager: nodeManager,
-			            blockchainRid: blockchainRidToUse,
-			            merkleHashVersion: (_e = settings.merkleHashVersion) !== null && _e !== void 0 ? _e : constants_1.MERKLE_HASH_VERSIONS.UNSET,
-			            dappStatusPolling: setStatusPolling(settings.dappStatusPolling),
-			            clusterAnchoringStatusPolling: setStatusPolling(settings.clusterAnchoringStatusPolling),
-			            systemAnchoringStatusPolling: setStatusPolling(settings.systemAnchoringStatusPolling),
-			            retryTransactionPolling: setRetryTransactionPolling(settings.retryTransactionPolling),
-			            failoverStrategy: ((_f = settings.failOverConfig) === null || _f === void 0 ? void 0 : _f.strategy) || exports.defaultFailoverConfig.strategy,
-			            attemptsPerEndpoint: ((_g = settings.failOverConfig) === null || _g === void 0 ? void 0 : _g.attemptsPerEndpoint) || exports.defaultFailoverConfig.attemptsPerEndpoint,
-			            attemptInterval: ((_h = settings.failOverConfig) === null || _h === void 0 ? void 0 : _h.attemptInterval) || exports.defaultFailoverConfig.attemptInterval,
-			            unreachableDuration: ((_j = settings.failOverConfig) === null || _j === void 0 ? void 0 : _j.unreachableDuration) || exports.defaultFailoverConfig.unreachableDuration,
-			            directoryChainRid: settings.directoryChainRid || directoryChainRid,
-			            connectTimeout: settings.connectTimeout,
-			            responseTimeout: settings.responseTimeout,
-			        };
+			        return Object.assign(Object.assign(Object.assign({ endpointPool, nodeManager: nodeManager }, (settings.blockedNodeUrlSubstrings !== undefined
+			            ? { blockedNodeUrlSubstrings: settings.blockedNodeUrlSubstrings }
+			            : {})), (settings.nodeUrlFilter !== undefined ? { nodeUrlFilter: settings.nodeUrlFilter } : {})), { blockchainRid: blockchainRidToUse, merkleHashVersion: (_e = settings.merkleHashVersion) !== null && _e !== void 0 ? _e : constants_1.MERKLE_HASH_VERSIONS.UNSET, dappStatusPolling: setStatusPolling(settings.dappStatusPolling), clusterAnchoringStatusPolling: setStatusPolling(settings.clusterAnchoringStatusPolling), systemAnchoringStatusPolling: setStatusPolling(settings.systemAnchoringStatusPolling), retryTransactionPolling: setRetryTransactionPolling(settings.retryTransactionPolling), failoverStrategy: ((_f = settings.failOverConfig) === null || _f === void 0 ? void 0 : _f.strategy) || exports.defaultFailoverConfig.strategy, attemptsPerEndpoint: ((_g = settings.failOverConfig) === null || _g === void 0 ? void 0 : _g.attemptsPerEndpoint) || exports.defaultFailoverConfig.attemptsPerEndpoint, attemptInterval: ((_h = settings.failOverConfig) === null || _h === void 0 ? void 0 : _h.attemptInterval) || exports.defaultFailoverConfig.attemptInterval, unreachableDuration: ((_j = settings.failOverConfig) === null || _j === void 0 ? void 0 : _j.unreachableDuration) || exports.defaultFailoverConfig.unreachableDuration, directoryChainRid: settings.directoryChainRid || directoryChainRid, connectTimeout: settings.connectTimeout, responseTimeout: settings.responseTimeout });
 			    });
 			}
 			function getMerkleHashVersionFromDapp(config) {
@@ -40589,7 +40581,7 @@
 			    return true;
 			}
 			function nodeDiscovery(_a) {
-			    return __awaiter(this, arguments, void 0, function* ({ nodeManager, directoryEndpointPool, failOverConfig, blockchainRid, blockchainIid, connectTimeout, responseTimeout, }) {
+			    return __awaiter(this, arguments, void 0, function* ({ nodeManager, directoryEndpointPool, blockedNodeUrlSubstrings, nodeUrlFilter, failOverConfig, blockchainRid, blockchainIid, connectTimeout, responseTimeout, }) {
 			        if (directoryEndpointPool.length === 0) {
 			            throw new errors_2.DirectoryNodeUrlPoolException();
 			        }
@@ -40625,7 +40617,11 @@
 			            nodeUrlPool: (0, exports.getUrlsFromEndpoints)(directoryEndpointPool),
 			            blockchainRid: directoryBRID,
 			        });
-			        return yield getBlockchainApiUrls(D1Client, (0, formatter_1.ensureBuffer)(blockchainRidToUse));
+			        const discoveredNodes = yield getBlockchainApiUrls(D1Client, (0, formatter_1.ensureBuffer)(blockchainRidToUse));
+			        return applyNodeUrlFilters(discoveredNodes, {
+			            blockedNodeUrlSubstrings,
+			            nodeUrlFilter,
+			        }, "discoveredNodeUrlPool");
 			    });
 			}
 			function getBlockchainApiUrls(directoryClient, blockchainRid) {
@@ -40768,14 +40764,21 @@
 			    return __awaiter(this, void 0, void 0, function* () {
 			        var _a;
 			        if (settings.directoryNodeUrlPool) {
+			            const directoryNodeUrlsOrNull = applyNodeUrlFilters(ensureArray(settings.directoryNodeUrlPool), settings, "directoryNodeUrlPool");
+			            if (directoryNodeUrlsOrNull === null) {
+			                throw new errors_2.DirectoryNodeUrlPoolException();
+			            }
+			            const directoryNodeUrls = directoryNodeUrlsOrNull;
 			            // If directoryNodeUrlPool is provided, use nodeDiscovery
 			            const nodeManager = (0, nodeManager_1.createNodeManager)({
-			                nodeUrls: ensureArray(settings.directoryNodeUrlPool),
+			                nodeUrls: directoryNodeUrls,
 			                unavailableDuration: (_a = settings.failOverConfig) === null || _a === void 0 ? void 0 : _a.unreachableDuration,
 			            });
 			            const discoveredNodes = yield nodeDiscovery({
 			                nodeManager,
-			                directoryEndpointPool: (0, exports.createEndpointObjects)(ensureArray(settings.directoryNodeUrlPool)),
+			                directoryEndpointPool: (0, exports.createEndpointObjects)(directoryNodeUrls),
+			                blockedNodeUrlSubstrings: settings.blockedNodeUrlSubstrings,
+			                nodeUrlFilter: settings.nodeUrlFilter,
 			                failOverConfig: settings.failOverConfig,
 			                blockchainRid: settings.blockchainRid,
 			                blockchainIid: settings.blockchainIid,
@@ -40786,11 +40789,11 @@
 			        }
 			        else if (typeof settings.nodeUrlPool === "string") {
 			            // If nodeUrlPool is a string, convert it to an array
-			            return [settings.nodeUrlPool];
+			            return applyNodeUrlFilters([settings.nodeUrlPool], settings, "nodeUrlPool");
 			        }
 			        else if (Array.isArray(settings.nodeUrlPool)) {
 			            // If nodeUrlPool is already an array, use it as-is
-			            return settings.nodeUrlPool;
+			            return applyNodeUrlFilters(settings.nodeUrlPool, settings, "nodeUrlPool");
 			        }
 			        else {
 			            // Default to an empty array if no valid configuration is provided
@@ -40798,6 +40801,30 @@
 			        }
 			    });
 			}
+			function applyNodeUrlFilters(nodeUrls, settings, poolName) {
+			    var _a;
+			    if (nodeUrls === null) {
+			        return null;
+			    }
+			    const hasBlockedSubstringsFilter = Array.isArray(settings.blockedNodeUrlSubstrings) &&
+			        settings.blockedNodeUrlSubstrings.length > 0;
+			    const hasNodeUrlFilter = typeof settings.nodeUrlFilter === "function";
+			    if (!hasBlockedSubstringsFilter && !hasNodeUrlFilter) {
+			        return nodeUrls;
+			    }
+			    const blockedSubstrings = ((_a = settings.blockedNodeUrlSubstrings) !== null && _a !== void 0 ? _a : [])
+			        .map(substring => substring.toLowerCase())
+			        .filter(substring => substring.length > 0);
+			    const filteredNodeUrls = nodeUrls.filter(url => {
+			        const isBlockedBySubstring = blockedSubstrings.some(substring => url.toLowerCase().includes(substring));
+			        const passesCustomFilter = settings.nodeUrlFilter ? settings.nodeUrlFilter(url) : true;
+			        return !isBlockedBySubstring && passesCustomFilter;
+			    });
+			    if (filteredNodeUrls.length === 0) {
+			        throw new errors_2.FilteredNodeUrlPoolEmptyError(poolName);
+			    }
+			    return filteredNodeUrls;
+			}
 			function getSystemClient(directoryNodeUrlPool, directoryChainRid) {
 			    return __awaiter(this, void 0, void 0, function* () {
 			        return yield (0, blockchainClient_1.createClient)({
@@ -41316,6 +41343,8 @@
 		                blockchainRid: (0, formatter_1.ensureString)(sourceBlockchainRid),
 		                merkleHashVersion: merkleHashVersion,
 		                useStickyNode: true,
+		                blockedNodeUrlSubstrings: directoryClient.config.blockedNodeUrlSubstrings,
+		                nodeUrlFilter: directoryClient.config.nodeUrlFilter,
 		            });
 		        }
 		        else {
@@ -41324,6 +41353,8 @@
 		                blockchainRid: (0, formatter_1.ensureString)(sourceBlockchainRid),
 		                merkleHashVersion: merkleHashVersion,
 		                useStickyNode: true,
+		                blockedNodeUrlSubstrings: directoryClient.config.blockedNodeUrlSubstrings,
+		                nodeUrlFilter: directoryClient.config.nodeUrlFilter,
 		            });
 		        }
 		        const txProof = yield clientConfiguredToSource.getConfirmationProof(txToProveRid);