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

package/dist/mjs/bee-debug.js

@@ -6,15 +6,13 @@ import * as stake from "./modules/debug/stake.js";
 import * as states from "./modules/debug/states.js";
 import * as status from "./modules/debug/status.js";
 import * as transactions from "./modules/debug/transactions.js";
+import { Objects, System } from 'cafe-utility';
 import * as stamps from "./modules/debug/stamps.js";
 import * as tag from "./modules/debug/tag.js";
 import { STAMPS_DEPTH_MAX, STAMPS_DEPTH_MIN } from "./types/index.js";
 import { BeeArgumentError, BeeError } from "./utils/error.js";
 import { assertAddress, assertBatchId, assertCashoutOptions, assertNonNegativeInteger, assertPositiveInteger, assertPostageBatchOptions, assertRequestOptions, assertTransactionHash, assertTransactionOptions, isTag } from "./utils/type.js";
 import { assertBeeUrl, stripLastSlash } from "./utils/url.js";
-import { DEFAULT_KY_CONFIG, wrapRequestClosure, wrapResponseClosure } from "./utils/http.js";
-import { deepMerge } from "./utils/merge.js";
-import { sleep } from "./utils/sleep.js";
 export class BeeDebug {
   constructor(url, options) {
     assertBeeUrl(url);
@@ -22,34 +20,22 @@ export class BeeDebug {
     // which could lead to double slash in URL to which Bee responds with
     // unnecessary redirects.
     this.url = stripLastSlash(url);
-    const kyOptions = {
-      prefixUrl: this.url,
-      timeout: options?.timeout ?? false,
-      retry: options?.retry,
-      fetch: options?.fetch,
-      hooks: {
-        beforeRequest: [],
-        afterResponse: []
-      }
+    const requestOptions = {
+      baseURL: this.url,
+      timeout: options?.timeout ?? false
     };
-    if (options?.defaultHeaders) {
-      kyOptions.headers = options.defaultHeaders;
-    }
-    if (options?.onRequest) {
-      kyOptions.hooks.beforeRequest.push(wrapRequestClosure(options.onRequest));
-    }
-    if (options?.onResponse) {
-      kyOptions.hooks.afterResponse.push(wrapResponseClosure(options.onResponse));
+    if (options?.headers) {
+      requestOptions.headers = options.headers;
     }
-    this.kyOptions = deepMerge(DEFAULT_KY_CONFIG, kyOptions);
+    this.requestOptions = requestOptions;
   }
   async getNodeAddresses(options) {
     assertRequestOptions(options);
-    return connectivity.getNodeAddresses(this.getKyOptionsForCall(options));
+    return connectivity.getNodeAddresses(this.getRequestOptionsForCall(options));
   }
   async getBlocklist(options) {
     assertRequestOptions(options);
-    return connectivity.getBlocklist(this.getKyOptionsForCall(options));
+    return connectivity.getBlocklist(this.getRequestOptionsForCall(options));
   }
   /**
    * Retrieve tag extended information from Bee node
@@ -70,28 +56,28 @@ export 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) {
     assertRequestOptions(options);
-    return connectivity.getPeers(this.getKyOptionsForCall(options));
+    return connectivity.getPeers(this.getRequestOptionsForCall(options));
   }
   async removePeer(peer, options) {
     assertRequestOptions(options);
     assertAddress(peer);
-    return connectivity.removePeer(this.getKyOptionsForCall(options), peer);
+    return connectivity.removePeer(this.getRequestOptionsForCall(options), peer);
   }
   async getTopology(options) {
     assertRequestOptions(options);
-    return connectivity.getTopology(this.getKyOptionsForCall(options));
+    return connectivity.getTopology(this.getRequestOptionsForCall(options));
   }
   async pingPeer(peer, options) {
     assertRequestOptions(options);
     assertAddress(peer);
-    return connectivity.pingPeer(this.getKyOptionsForCall(options), peer);
+    return connectivity.pingPeer(this.getRequestOptionsForCall(options), peer);
   }
   /*
    * Balance endpoints
@@ -101,7 +87,7 @@ export class BeeDebug {
    */
   async getAllBalances(options) {
     assertRequestOptions(options);
-    return balance.getAllBalances(this.getKyOptionsForCall(options));
+    return balance.getAllBalances(this.getRequestOptionsForCall(options));
   }
   /**
    * Get the balances with a specific peer including prepaid services
@@ -111,14 +97,14 @@ export class BeeDebug {
   async getPeerBalance(address, options) {
     assertRequestOptions(options);
     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) {
     assertRequestOptions(options);
-    return balance.getPastDueConsumptionBalances(this.getKyOptionsForCall(options));
+    return balance.getPastDueConsumptionBalances(this.getRequestOptionsForCall(options));
   }
   /**
    * Get the past due consumption balance with a specific peer
@@ -128,7 +114,7 @@ export class BeeDebug {
   async getPastDueConsumptionPeerBalance(address, options) {
     assertRequestOptions(options);
     assertAddress(address);
-    return balance.getPastDueConsumptionPeerBalance(this.getKyOptionsForCall(options), address);
+    return balance.getPastDueConsumptionPeerBalance(this.getRequestOptionsForCall(options), address);
   }
   /*
    * Chequebook endpoints
@@ -141,21 +127,21 @@ export class BeeDebug {
    */
   async getChequebookAddress(options) {
     assertRequestOptions(options);
-    return chequebook.getChequebookAddress(this.getKyOptionsForCall(options));
+    return chequebook.getChequebookAddress(this.getRequestOptionsForCall(options));
   }
   /**
    * Get the balance of the chequebook
    */
   async getChequebookBalance(options) {
     assertRequestOptions(options);
-    return chequebook.getChequebookBalance(this.getKyOptionsForCall(options));
+    return chequebook.getChequebookBalance(this.getRequestOptionsForCall(options));
   }
   /**
    * Get last cheques for all peers
    */
   async getLastCheques(options) {
     assertRequestOptions(options);
-    return chequebook.getLastCheques(this.getKyOptionsForCall(options));
+    return chequebook.getLastCheques(this.getRequestOptionsForCall(options));
   }
   /**
    * Get last cheques for the peer
@@ -165,7 +151,7 @@ export class BeeDebug {
   async getLastChequesForPeer(address, options) {
     assertRequestOptions(options);
     assertAddress(address);
-    return chequebook.getLastChequesForPeer(this.getKyOptionsForCall(options), address);
+    return chequebook.getLastChequesForPeer(this.getRequestOptionsForCall(options), address);
   }
   /**
    * Get last cashout action for the peer
@@ -175,7 +161,7 @@ export class BeeDebug {
   async getLastCashoutAction(address, options) {
     assertRequestOptions(options);
     assertAddress(address);
-    return chequebook.getLastCashoutAction(this.getKyOptionsForCall(options), address);
+    return chequebook.getLastCashoutAction(this.getRequestOptionsForCall(options), address);
   }
   /**
    * Cashout the last cheque for the peer
@@ -185,10 +171,10 @@ export 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) {
     assertCashoutOptions(options);
     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
@@ -203,7 +189,7 @@ export class BeeDebug {
     if (gasPrice) {
       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
@@ -218,7 +204,7 @@ export class BeeDebug {
     if (gasPrice) {
       assertNonNegativeInteger(gasPrice);
     }
-    return chequebook.withdrawTokens(this.getKyOptionsForCall(options), amount, gasPrice);
+    return chequebook.withdrawTokens(this.getRequestOptionsForCall(options), amount, gasPrice);
   }
   /*
    * Settlements endpoint
@@ -231,35 +217,35 @@ export class BeeDebug {
   async getSettlements(address, options) {
     assertRequestOptions(options);
     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) {
     assertRequestOptions(options);
-    return settlements.getAllSettlements(this.getKyOptionsForCall(options));
+    return settlements.getAllSettlements(this.getRequestOptionsForCall(options));
   }
   /**
    * Get health of node
    */
   async getHealth(options) {
     assertRequestOptions(options);
-    return status.getHealth(this.getKyOptionsForCall(options));
+    return status.getHealth(this.getRequestOptionsForCall(options));
   }
   /**
    * Get readiness of node
    */
   async getReadiness(options) {
     assertRequestOptions(options);
-    return status.getReadiness(this.getKyOptionsForCall(options));
+    return status.getReadiness(this.getRequestOptionsForCall(options));
   }
   /**
    * Get mode information of node
    */
   async getNodeInfo(options) {
     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
@@ -269,7 +255,7 @@ export class BeeDebug {
    */
   async isSupportedVersion(options) {
     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.
@@ -283,7 +269,7 @@ export class BeeDebug {
    */
   async isSupportedExactVersion(options) {
     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.
@@ -295,7 +281,7 @@ export class BeeDebug {
    */
   async isSupportedMainApiVersion(options) {
     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.
@@ -307,7 +293,7 @@ export class BeeDebug {
    */
   async isSupportedDebugApiVersion(options) {
     assertRequestOptions(options);
-    return status.isSupportedDebugApiVersion(this.getKyOptionsForCall(options));
+    return status.isSupportedDebugApiVersion(this.getRequestOptionsForCall(options));
   }
   /**
    *
@@ -319,7 +305,7 @@ export class BeeDebug {
    */
   async isSupportedApiVersion(options) {
     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*`)
@@ -329,21 +315,21 @@ export class BeeDebug {
    */
   async getVersions(options) {
     assertRequestOptions(options);
-    return status.getVersions(this.getKyOptionsForCall(options));
+    return status.getVersions(this.getRequestOptionsForCall(options));
   }
   /**
    * Get reserve state
    */
   async getReserveState(options) {
     assertRequestOptions(options);
-    return states.getReserveState(this.getKyOptionsForCall(options));
+    return states.getReserveState(this.getRequestOptionsForCall(options));
   }
   /**
    * Get chain state
    */
   async getChainState(options) {
     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
@@ -352,7 +338,7 @@ export class BeeDebug {
    */
   async getWalletBalance(options) {
     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.
@@ -371,7 +357,7 @@ export 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) {
     assertPostageBatchOptions(options);
     assertPositiveInteger(amount);
     assertNonNegativeInteger(depth);
@@ -381,7 +367,7 @@ export class BeeDebug {
     if (depth > STAMPS_DEPTH_MAX) {
       throw new BeeArgumentError(`Depth has to be at most ${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);
     }
@@ -406,7 +392,7 @@ export class BeeDebug {
     assertRequestOptions(options);
     assertNonNegativeInteger(amount, 'Amount');
     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
@@ -428,7 +414,7 @@ export class BeeDebug {
     assertRequestOptions(options);
     assertNonNegativeInteger(depth, 'Depth');
     assertBatchId(postageBatchId);
-    await stamps.diluteBatch(this.getKyOptionsForCall(options), postageBatchId, depth);
+    await stamps.diluteBatch(this.getRequestOptionsForCall(options), postageBatchId, depth);
   }
   /**
    * Return details for specific postage batch.
@@ -441,7 +427,7 @@ export class BeeDebug {
   async getPostageBatch(postageBatchId, options) {
     assertRequestOptions(options);
     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.
@@ -454,7 +440,7 @@ export class BeeDebug {
   async getPostageBatchBuckets(postageBatchId, options) {
     assertRequestOptions(options);
     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.
@@ -464,14 +450,14 @@ export class BeeDebug {
    */
   async getAllPostageBatch(options) {
     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) {
     assertRequestOptions(options);
-    return transactions.getAllTransactions(this.getKyOptionsForCall(options));
+    return transactions.getAllTransactions(this.getRequestOptionsForCall(options));
   }
   /**
    * Return transaction information for specific transaction
@@ -480,7 +466,7 @@ export class BeeDebug {
   async getPendingTransaction(transactionHash, options) {
     assertRequestOptions(options);
     assertTransactionHash(transactionHash);
-    return transactions.getTransaction(this.getKyOptionsForCall(options), transactionHash);
+    return transactions.getTransaction(this.getRequestOptionsForCall(options), transactionHash);
   }
   /**
    * Rebroadcast already created transaction.
@@ -491,7 +477,7 @@ export class BeeDebug {
   async rebroadcastPendingTransaction(transactionHash, options) {
     assertRequestOptions(options);
     assertTransactionHash(transactionHash);
-    return transactions.rebroadcastTransaction(this.getKyOptionsForCall(options), transactionHash);
+    return transactions.rebroadcastTransaction(this.getRequestOptionsForCall(options), transactionHash);
   }
   /**
    * Cancel currently pending transaction
@@ -504,7 +490,7 @@ export class BeeDebug {
     if (gasPrice) {
       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.
@@ -513,7 +499,7 @@ export class BeeDebug {
    */
   async getStake(options) {
     assertRequestOptions(options);
-    return stake.getStake(this.getKyOptionsForCall(options));
+    return stake.getStake(this.getRequestOptionsForCall(options));
   }
   /**
    * Deposits given amount of BZZ token (in PLUR unit).
@@ -523,10 +509,10 @@ export 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) {
     assertRequestOptions(options);
     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
@@ -535,7 +521,7 @@ export class BeeDebug {
    */
   async getRedistributionState(options) {
     assertRequestOptions(options);
-    return stake.getRedistributionState(this.getKyOptionsForCall(options));
+    return stake.getRedistributionState(this.getRequestOptionsForCall(options));
   }
   async waitForUsablePostageStamp(id, timeout = 120000) {
     const TIME_STEP = 1500;
@@ -544,11 +530,11 @@ export class BeeDebug {
       if (stamp.usable) {
         return;
       }
-      await sleep(TIME_STEP);
+      await System.sleepMillis(TIME_STEP);
     }
     throw new BeeError('Timeout on waiting for postage stamp to become usable');
   }
-  getKyOptionsForCall(options) {
-    return deepMerge(this.kyOptions, options);
+  getRequestOptionsForCall(options) {
+    return options ? Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;
   }
 }