@ethersphere/bee-js 5.2.0 → 6.0.0-pre.1

package/dist/cjs/bee-debug.js

@@ -32,15 +32,13 @@ const stake = __importStar(require("./modules/debug/stake"));
 const states = __importStar(require("./modules/debug/states"));
 const status = __importStar(require("./modules/debug/status"));
 const transactions = __importStar(require("./modules/debug/transactions"));
+const cafe_utility_1 = require("cafe-utility");
 const stamps = __importStar(require("./modules/debug/stamps"));
 const tag = __importStar(require("./modules/debug/tag"));
 const types_1 = require("./types");
 const error_1 = require("./utils/error");
 const type_1 = require("./utils/type");
 const url_1 = require("./utils/url");
-const http_1 = require("./utils/http");
-const merge_1 = require("./utils/merge");
-const sleep_1 = require("./utils/sleep");
 class BeeDebug {
     constructor(url, options) {
         (0, url_1.assertBeeUrl)(url);
@@ -48,34 +46,22 @@ class BeeDebug {
         // which could lead to double slash in URL to which Bee responds with
         // unnecessary redirects.
         this.url = (0, url_1.stripLastSlash)(url);
-        const kyOptions = {
-            prefixUrl: this.url,
+        const requestOptions = {
+            baseURL: this.url,
             timeout: options?.timeout ?? false,
-            retry: options?.retry,
-            fetch: options?.fetch,
-            hooks: {
-                beforeRequest: [],
-                afterResponse: [],
-            },
         };
-        if (options?.defaultHeaders) {
-            kyOptions.headers = options.defaultHeaders;
+        if (options?.headers) {
+            requestOptions.headers = options.headers;
         }
-        if (options?.onRequest) {
-            kyOptions.hooks.beforeRequest.push((0, http_1.wrapRequestClosure)(options.onRequest));
-        }
-        if (options?.onResponse) {
-            kyOptions.hooks.afterResponse.push((0, http_1.wrapResponseClosure)(options.onResponse));
-        }
-        this.kyOptions = (0, merge_1.deepMerge)(http_1.DEFAULT_KY_CONFIG, kyOptions);
+        this.requestOptions = requestOptions;
     }
     async getNodeAddresses(options) {
         (0, type_1.assertRequestOptions)(options);
-        return connectivity.getNodeAddresses(this.getKyOptionsForCall(options));
+        return connectivity.getNodeAddresses(this.getRequestOptionsForCall(options));
     }
     async getBlocklist(options) {
         (0, type_1.assertRequestOptions)(options);
-        return connectivity.getBlocklist(this.getKyOptionsForCall(options));
+        return connectivity.getBlocklist(this.getRequestOptionsForCall(options));
     }
     /**
      * Retrieve tag extended information from Bee node
@@ -98,28 +84,28 @@ class BeeDebug {
         else {
             throw new TypeError('tagUid has to be either Tag or a number (UID)!');
         }
-        return tag.retrieveExtendedTag(this.getKyOptionsForCall(options), tagUid);
+        return tag.retrieveExtendedTag(this.getRequestOptionsForCall(options), tagUid);
     }
     /**
      * Get list of peers for this node
      */
     async getPeers(options) {
         (0, type_1.assertRequestOptions)(options);
-        return connectivity.getPeers(this.getKyOptionsForCall(options));
+        return connectivity.getPeers(this.getRequestOptionsForCall(options));
     }
     async removePeer(peer, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(peer);
-        return connectivity.removePeer(this.getKyOptionsForCall(options), peer);
+        return connectivity.removePeer(this.getRequestOptionsForCall(options), peer);
     }
     async getTopology(options) {
         (0, type_1.assertRequestOptions)(options);
-        return connectivity.getTopology(this.getKyOptionsForCall(options));
+        return connectivity.getTopology(this.getRequestOptionsForCall(options));
     }
     async pingPeer(peer, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(peer);
-        return connectivity.pingPeer(this.getKyOptionsForCall(options), peer);
+        return connectivity.pingPeer(this.getRequestOptionsForCall(options), peer);
     }
     /*
      * Balance endpoints
@@ -129,7 +115,7 @@ class BeeDebug {
      */
     async getAllBalances(options) {
         (0, type_1.assertRequestOptions)(options);
-        return balance.getAllBalances(this.getKyOptionsForCall(options));
+        return balance.getAllBalances(this.getRequestOptionsForCall(options));
     }
     /**
      * Get the balances with a specific peer including prepaid services
@@ -139,14 +125,14 @@ class BeeDebug {
     async getPeerBalance(address, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(address);
-        return balance.getPeerBalance(this.getKyOptionsForCall(options), address);
+        return balance.getPeerBalance(this.getRequestOptionsForCall(options), address);
     }
     /**
      * Get the past due consumption balances with all known peers
      */
     async getPastDueConsumptionBalances(options) {
         (0, type_1.assertRequestOptions)(options);
-        return balance.getPastDueConsumptionBalances(this.getKyOptionsForCall(options));
+        return balance.getPastDueConsumptionBalances(this.getRequestOptionsForCall(options));
     }
     /**
      * Get the past due consumption balance with a specific peer
@@ -156,7 +142,7 @@ class BeeDebug {
     async getPastDueConsumptionPeerBalance(address, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(address);
-        return balance.getPastDueConsumptionPeerBalance(this.getKyOptionsForCall(options), address);
+        return balance.getPastDueConsumptionPeerBalance(this.getRequestOptionsForCall(options), address);
     }
     /*
      * Chequebook endpoints
@@ -169,21 +155,21 @@ class BeeDebug {
      */
     async getChequebookAddress(options) {
         (0, type_1.assertRequestOptions)(options);
-        return chequebook.getChequebookAddress(this.getKyOptionsForCall(options));
+        return chequebook.getChequebookAddress(this.getRequestOptionsForCall(options));
     }
     /**
      * Get the balance of the chequebook
      */
     async getChequebookBalance(options) {
         (0, type_1.assertRequestOptions)(options);
-        return chequebook.getChequebookBalance(this.getKyOptionsForCall(options));
+        return chequebook.getChequebookBalance(this.getRequestOptionsForCall(options));
     }
     /**
      * Get last cheques for all peers
      */
     async getLastCheques(options) {
         (0, type_1.assertRequestOptions)(options);
-        return chequebook.getLastCheques(this.getKyOptionsForCall(options));
+        return chequebook.getLastCheques(this.getRequestOptionsForCall(options));
     }
     /**
      * Get last cheques for the peer
@@ -193,7 +179,7 @@ class BeeDebug {
     async getLastChequesForPeer(address, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(address);
-        return chequebook.getLastChequesForPeer(this.getKyOptionsForCall(options), address);
+        return chequebook.getLastChequesForPeer(this.getRequestOptionsForCall(options), address);
     }
     /**
      * Get last cashout action for the peer
@@ -203,7 +189,7 @@ class BeeDebug {
     async getLastCashoutAction(address, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(address);
-        return chequebook.getLastCashoutAction(this.getKyOptionsForCall(options), address);
+        return chequebook.getLastCashoutAction(this.getRequestOptionsForCall(options), address);
     }
     /**
      * Cashout the last cheque for the peer
@@ -213,10 +199,10 @@ class BeeDebug {
      * @param options.gasPrice Gas price for the cashout transaction in WEI
      * @param options.gasLimit Gas limit for the cashout transaction in WEI
      */
-    async cashoutLastCheque(address, options) {
+    async cashoutLastCheque(address, options, requestOptions) {
         (0, type_1.assertCashoutOptions)(options);
         (0, type_1.assertAddress)(address);
-        return chequebook.cashoutLastCheque(this.getKyOptionsForCall(options), address, options);
+        return chequebook.cashoutLastCheque(this.getRequestOptionsForCall(requestOptions), address, options);
     }
     /**
      * Deposit tokens from overlay address into chequebook
@@ -231,7 +217,7 @@ class BeeDebug {
         if (gasPrice) {
             (0, type_1.assertNonNegativeInteger)(gasPrice);
         }
-        return chequebook.depositTokens(this.getKyOptionsForCall(options), amount, gasPrice);
+        return chequebook.depositTokens(this.getRequestOptionsForCall(options), amount, gasPrice);
     }
     /**
      * Withdraw tokens from the chequebook to the overlay address
@@ -246,7 +232,7 @@ class BeeDebug {
         if (gasPrice) {
             (0, type_1.assertNonNegativeInteger)(gasPrice);
         }
-        return chequebook.withdrawTokens(this.getKyOptionsForCall(options), amount, gasPrice);
+        return chequebook.withdrawTokens(this.getRequestOptionsForCall(options), amount, gasPrice);
     }
     /*
      * Settlements endpoint
@@ -259,35 +245,35 @@ class BeeDebug {
     async getSettlements(address, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertAddress)(address);
-        return settlements.getSettlements(this.getKyOptionsForCall(options), address);
+        return settlements.getSettlements(this.getRequestOptionsForCall(options), address);
     }
     /**
      * Get settlements with all known peers and total amount sent or received
      */
     async getAllSettlements(options) {
         (0, type_1.assertRequestOptions)(options);
-        return settlements.getAllSettlements(this.getKyOptionsForCall(options));
+        return settlements.getAllSettlements(this.getRequestOptionsForCall(options));
     }
     /**
      * Get health of node
      */
     async getHealth(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.getHealth(this.getKyOptionsForCall(options));
+        return status.getHealth(this.getRequestOptionsForCall(options));
     }
     /**
      * Get readiness of node
      */
     async getReadiness(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.getReadiness(this.getKyOptionsForCall(options));
+        return status.getReadiness(this.getRequestOptionsForCall(options));
     }
     /**
      * Get mode information of node
      */
     async getNodeInfo(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.getNodeInfo(this.getKyOptionsForCall(options));
+        return status.getNodeInfo(this.getRequestOptionsForCall(options));
     }
     /**
      * Connnects to a node and checks if it is a supported Bee version by the bee-js
@@ -297,7 +283,7 @@ class BeeDebug {
      */
     async isSupportedVersion(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.isSupportedVersion(this.getKyOptionsForCall(options));
+        return status.isSupportedVersion(this.getRequestOptionsForCall(options));
     }
     /**
      * Connects to a node and checks if its version matches with the one that bee-js supports.
@@ -311,7 +297,7 @@ class BeeDebug {
      */
     async isSupportedExactVersion(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.isSupportedExactVersion(this.getKyOptionsForCall(options));
+        return status.isSupportedExactVersion(this.getRequestOptionsForCall(options));
     }
     /**
      * Connects to a node and checks if its main's API version matches with the one that bee-js supports.
@@ -323,7 +309,7 @@ class BeeDebug {
      */
     async isSupportedMainApiVersion(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.isSupportedMainApiVersion(this.getKyOptionsForCall(options));
+        return status.isSupportedMainApiVersion(this.getRequestOptionsForCall(options));
     }
     /**
      * Connects to a node and checks if its Debug API version matches with the one that bee-js supports.
@@ -335,7 +321,7 @@ class BeeDebug {
      */
     async isSupportedDebugApiVersion(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.isSupportedDebugApiVersion(this.getKyOptionsForCall(options));
+        return status.isSupportedDebugApiVersion(this.getRequestOptionsForCall(options));
     }
     /**
      *
@@ -347,7 +333,7 @@ class BeeDebug {
      */
     async isSupportedApiVersion(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.isSupportedDebugApiVersion(this.getKyOptionsForCall(options));
+        return status.isSupportedDebugApiVersion(this.getRequestOptionsForCall(options));
     }
     /**
      * Returns object with all versions specified by the connected Bee node (properties prefixed with `bee*`)
@@ -357,21 +343,21 @@ class BeeDebug {
      */
     async getVersions(options) {
         (0, type_1.assertRequestOptions)(options);
-        return status.getVersions(this.getKyOptionsForCall(options));
+        return status.getVersions(this.getRequestOptionsForCall(options));
     }
     /**
      * Get reserve state
      */
     async getReserveState(options) {
         (0, type_1.assertRequestOptions)(options);
-        return states.getReserveState(this.getKyOptionsForCall(options));
+        return states.getReserveState(this.getRequestOptionsForCall(options));
     }
     /**
      * Get chain state
      */
     async getChainState(options) {
         (0, type_1.assertRequestOptions)(options);
-        return states.getChainState(this.getKyOptionsForCall(options));
+        return states.getChainState(this.getRequestOptionsForCall(options));
     }
     /**
      * Get wallet balances for xDai and BZZ of the Bee node
@@ -380,7 +366,7 @@ class BeeDebug {
      */
     async getWalletBalance(options) {
         (0, type_1.assertRequestOptions)(options);
-        return states.getWalletBalance(this.getKyOptionsForCall(options));
+        return states.getWalletBalance(this.getRequestOptionsForCall(options));
     }
     /**
      * Creates new postage batch from the funds that the node has available in its Ethereum account.
@@ -399,7 +385,7 @@ class BeeDebug {
      * @see [Bee docs - Keep your data alive / Postage stamps](https://docs.ethswarm.org/docs/access-the-swarm/keep-your-data-alive)
      * @see [Bee Debug API reference - `POST /stamps`](https://docs.ethswarm.org/debug-api/#tag/Postage-Stamps/paths/~1stamps~1{amount}~1{depth}/post)
      */
-    async createPostageBatch(amount, depth, options) {
+    async createPostageBatch(amount, depth, options, requestOptions) {
         (0, type_1.assertPostageBatchOptions)(options);
         (0, type_1.assertPositiveInteger)(amount);
         (0, type_1.assertNonNegativeInteger)(depth);
@@ -409,7 +395,7 @@ class BeeDebug {
         if (depth > types_1.STAMPS_DEPTH_MAX) {
             throw new error_1.BeeArgumentError(`Depth has to be at most ${types_1.STAMPS_DEPTH_MAX}`, depth);
         }
-        const stamp = await stamps.createPostageBatch(this.getKyOptionsForCall(options), amount, depth, options);
+        const stamp = await stamps.createPostageBatch(this.getRequestOptionsForCall(requestOptions), amount, depth, options);
         if (options?.waitForUsable !== false) {
             await this.waitForUsablePostageStamp(stamp, options?.waitForUsableTimeout);
         }
@@ -434,7 +420,7 @@ class BeeDebug {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertNonNegativeInteger)(amount, 'Amount');
         (0, type_1.assertBatchId)(postageBatchId);
-        await stamps.topUpBatch(this.getKyOptionsForCall(options), postageBatchId, amount);
+        await stamps.topUpBatch(this.getRequestOptionsForCall(options), postageBatchId, amount);
     }
     /**
      * Dilute given Postage Batch with new depth (that has to be bigger then the original depth), which allows
@@ -456,7 +442,7 @@ class BeeDebug {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertNonNegativeInteger)(depth, 'Depth');
         (0, type_1.assertBatchId)(postageBatchId);
-        await stamps.diluteBatch(this.getKyOptionsForCall(options), postageBatchId, depth);
+        await stamps.diluteBatch(this.getRequestOptionsForCall(options), postageBatchId, depth);
     }
     /**
      * Return details for specific postage batch.
@@ -469,7 +455,7 @@ class BeeDebug {
     async getPostageBatch(postageBatchId, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertBatchId)(postageBatchId);
-        return stamps.getPostageBatch(this.getKyOptionsForCall(options), postageBatchId);
+        return stamps.getPostageBatch(this.getRequestOptionsForCall(options), postageBatchId);
     }
     /**
      * Return detailed information related to buckets for specific postage batch.
@@ -482,7 +468,7 @@ class BeeDebug {
     async getPostageBatchBuckets(postageBatchId, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertBatchId)(postageBatchId);
-        return stamps.getPostageBatchBuckets(this.getKyOptionsForCall(options), postageBatchId);
+        return stamps.getPostageBatchBuckets(this.getRequestOptionsForCall(options), postageBatchId);
     }
     /**
      * Return all postage batches that has the node available.
@@ -492,14 +478,14 @@ class BeeDebug {
      */
     async getAllPostageBatch(options) {
         (0, type_1.assertRequestOptions)(options);
-        return stamps.getAllPostageBatches(this.getKyOptionsForCall(options));
+        return stamps.getAllPostageBatches(this.getRequestOptionsForCall(options));
     }
     /**
      * Return lists of all current pending transactions that the Bee made
      */
     async getAllPendingTransactions(options) {
         (0, type_1.assertRequestOptions)(options);
-        return transactions.getAllTransactions(this.getKyOptionsForCall(options));
+        return transactions.getAllTransactions(this.getRequestOptionsForCall(options));
     }
     /**
      * Return transaction information for specific transaction
@@ -508,7 +494,7 @@ class BeeDebug {
     async getPendingTransaction(transactionHash, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertTransactionHash)(transactionHash);
-        return transactions.getTransaction(this.getKyOptionsForCall(options), transactionHash);
+        return transactions.getTransaction(this.getRequestOptionsForCall(options), transactionHash);
     }
     /**
      * Rebroadcast already created transaction.
@@ -519,7 +505,7 @@ class BeeDebug {
     async rebroadcastPendingTransaction(transactionHash, options) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertTransactionHash)(transactionHash);
-        return transactions.rebroadcastTransaction(this.getKyOptionsForCall(options), transactionHash);
+        return transactions.rebroadcastTransaction(this.getRequestOptionsForCall(options), transactionHash);
     }
     /**
      * Cancel currently pending transaction
@@ -532,7 +518,7 @@ class BeeDebug {
         if (gasPrice) {
             (0, type_1.assertNonNegativeInteger)(gasPrice);
         }
-        return transactions.cancelTransaction(this.getKyOptionsForCall(options), transactionHash, gasPrice);
+        return transactions.cancelTransaction(this.getRequestOptionsForCall(options), transactionHash, gasPrice);
     }
     /**
      * Gets the staked amount of BZZ (in PLUR unit) as number string.
@@ -541,7 +527,7 @@ class BeeDebug {
      */
     async getStake(options) {
         (0, type_1.assertRequestOptions)(options);
-        return stake.getStake(this.getKyOptionsForCall(options));
+        return stake.getStake(this.getRequestOptionsForCall(options));
     }
     /**
      * Deposits given amount of BZZ token (in PLUR unit).
@@ -551,10 +537,10 @@ class BeeDebug {
      * @param amount Amount of BZZ token (in PLUR unit) to be staked. Minimum is 100_000_000_000_000_000 PLUR (10 BZZ).
      * @param options
      */
-    async depositStake(amount, options) {
+    async depositStake(amount, options, requestOptions) {
         (0, type_1.assertRequestOptions)(options);
         (0, type_1.assertTransactionOptions)(options);
-        await stake.stake(this.getKyOptionsForCall(options), amount, options);
+        await stake.stake(this.getRequestOptionsForCall(requestOptions), amount, options);
     }
     /**
      * Get current status of node in redistribution game
@@ -563,7 +549,7 @@ class BeeDebug {
      */
     async getRedistributionState(options) {
         (0, type_1.assertRequestOptions)(options);
-        return stake.getRedistributionState(this.getKyOptionsForCall(options));
+        return stake.getRedistributionState(this.getRequestOptionsForCall(options));
     }
     async waitForUsablePostageStamp(id, timeout = 120000) {
         const TIME_STEP = 1500;
@@ -572,12 +558,12 @@ class BeeDebug {
             if (stamp.usable) {
                 return;
             }
-            await (0, sleep_1.sleep)(TIME_STEP);
+            await cafe_utility_1.System.sleepMillis(TIME_STEP);
         }
         throw new error_1.BeeError('Timeout on waiting for postage stamp to become usable');
     }
-    getKyOptionsForCall(options) {
-        return (0, merge_1.deepMerge)(this.kyOptions, options);
+    getRequestOptionsForCall(options) {
+        return options ? cafe_utility_1.Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;
     }
 }
 exports.BeeDebug = BeeDebug;