@upcoming/bee-js 0.5.2 → 0.5.4

package/dist/cjs/bee.js

@@ -58,6 +58,7 @@ const collection_node_1 = require("./utils/collection.node");
 const data_1 = require("./utils/data");
 const error_1 = require("./utils/error");
 const file_1 = require("./utils/file");
+const tokens_1 = require("./utils/tokens");
 const type_1 = require("./utils/type");
 const typed_bytes_1 = require("./utils/typed-bytes");
 const url_1 = require("./utils/url");
@@ -341,9 +342,9 @@ class Bee {
         postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
         return (0, chunk_stream_1.streamDirectory)(this, dir, postageBatchId, onUploadProgress, options, this.getRequestOptionsForCall(requestOptions));
     }
-    async streamFiles(postageBatchId, files, onUploadProgress, options) {
+    async streamFiles(postageBatchId, files, onUploadProgress, options, requestOptions) {
         postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
-        return (0, chunk_stream_1.streamFiles)(this, files, postageBatchId, onUploadProgress, options);
+        return (0, chunk_stream_1.streamFiles)(this, files, postageBatchId, onUploadProgress, options, this.getRequestOptionsForCall(requestOptions));
     }
     /**
      * Upload Collection that you can assembly yourself.
@@ -1005,7 +1006,7 @@ class Bee {
      * @return string  Hash of the transaction
      */
     async depositTokens(amount, gasPrice, options) {
-        const amountString = (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
+        const amountString = amount instanceof tokens_1.BZZ ? amount.toPLURString() : (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
         let gasPriceString;
         if (gasPrice) {
             gasPriceString = (0, type_1.asNumberString)(amount, { min: 0n, name: 'gasPrice' });
@@ -1020,7 +1021,8 @@ class Bee {
      * @return string  Hash of the transaction
      */
     async withdrawTokens(amount, gasPrice, options) {
-        const amountString = (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
+        // TODO: check BZZ in tests
+        const amountString = amount instanceof tokens_1.BZZ ? amount.toPLURString() : (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
         let gasPriceString;
         if (gasPrice) {
             gasPriceString = (0, type_1.asNumberString)(amount, { min: 0n, name: 'gasPrice' });
@@ -1287,11 +1289,12 @@ class Bee {
      * @param options
      */
     async depositStake(amount, options, requestOptions) {
-        const amountString = (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
+        const amountString = amount instanceof tokens_1.BZZ ? amount.toPLURString() : (0, type_1.asNumberString)(amount, { min: 1n, name: 'amount' });
         if (options) {
             options = (0, type_1.prepareTransactionOptions)(options);
         }
-        await stake.stake(this.getRequestOptionsForCall(requestOptions), amountString, options);
+        // TODO: Add test for response
+        return stake.stake(this.getRequestOptionsForCall(requestOptions), amountString, options);
     }
     /**
      * Get current status of node in redistribution game

package/dist/cjs/manifest/manifest.js

@@ -102,6 +102,13 @@ class MantarayNode {
     get fullPathString() {
         return DECODER.decode(this.fullPath);
     }
+    getRootMetadata() {
+        const node = this.find('/');
+        if (node && node.metadata) {
+            return cafe_utility_1.Optional.of(node.metadata);
+        }
+        return cafe_utility_1.Optional.empty();
+    }
     async marshal() {
         for (const fork of this.forks.values()) {
             if (!fork.node.selfAddress) {
@@ -128,8 +135,8 @@ class MantarayNode {
             : this.targetAddress, forkBitmap, ...forks), this.obfuscationKey);
         return cafe_utility_1.Binary.concatBytes(this.obfuscationKey, data);
     }
-    static async unmarshal(bee, reference) {
-        const data = (await bee.downloadData(reference)).toUint8Array();
+    static async unmarshal(bee, reference, options, requestOptions) {
+        const data = (await bee.downloadData(reference, options, requestOptions)).toUint8Array();
         const obfuscationKey = data.subarray(0, 32);
         const decrypted = cafe_utility_1.Binary.xorCypher(data.subarray(32), obfuscationKey);
         const reader = new cafe_utility_1.Uint8ArrayReader(decrypted);
@@ -217,15 +224,16 @@ class MantarayNode {
         }
         const result = await bee.uploadData(postageBatchId, await this.marshal(), options, requestOptions);
         this.selfAddress = result.reference.toUint8Array();
-        return new typed_bytes_1.Reference(this.selfAddress);
+        return result;
     }
-    async loadRecursively(bee) {
+    async loadRecursively(bee, options, requestOptions) {
         for (const fork of this.forks.values()) {
-            const node = await MantarayNode.unmarshal(bee, fork.node.targetAddress);
+            const node = await MantarayNode.unmarshal(bee, fork.node.targetAddress, options, requestOptions);
             fork.node.targetAddress = node.targetAddress;
             fork.node.forks = node.forks;
             fork.node.path = fork.prefix;
-            await fork.node.loadRecursively(bee);
+            fork.node.parent = this;
+            await fork.node.loadRecursively(bee, options, requestOptions);
         }
     }
     find(path) {

package/dist/cjs/modules/debug/balance.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPastDueConsumptionPeerBalance = exports.getPastDueConsumptionBalances = exports.getPeerBalance = exports.getAllBalances = void 0;
 const cafe_utility_1 = require("cafe-utility");
 const http_1 = require("../../utils/http");
+const tokens_1 = require("../../utils/tokens");
 const type_1 = require("../../utils/type");
 const balancesEndpoint = 'balances';
 const consumedEndpoint = 'consumed';
@@ -21,7 +22,7 @@ async function getAllBalances(requestOptions) {
     return {
         balances: balances.map(x => ({
             peer: cafe_utility_1.Types.asString(x.peer, { name: 'peer' }),
-            balance: (0, type_1.asNumberString)(x.balance, { name: 'balance' }),
+            balance: tokens_1.BZZ.fromPLUR((0, type_1.asNumberString)(x.balance, { name: 'balance' })),
         })),
     };
 }
@@ -40,7 +41,7 @@ async function getPeerBalance(requestOptions, address) {
     const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
     return {
         peer: cafe_utility_1.Types.asString(body.peer, { name: 'peer' }),
-        balance: (0, type_1.asNumberString)(body.balance, { name: 'balance' }),
+        balance: tokens_1.BZZ.fromPLUR((0, type_1.asNumberString)(body.balance, { name: 'balance' })),
     };
 }
 exports.getPeerBalance = getPeerBalance;
@@ -59,7 +60,7 @@ async function getPastDueConsumptionBalances(requestOptions) {
     return {
         balances: balances.map(x => ({
             peer: cafe_utility_1.Types.asString(x.peer, { name: 'peer' }),
-            balance: (0, type_1.asNumberString)(x.balance, { name: 'balance' }),
+            balance: tokens_1.BZZ.fromPLUR((0, type_1.asNumberString)(x.balance, { name: 'balance' })),
         })),
     };
 }
@@ -78,7 +79,7 @@ async function getPastDueConsumptionPeerBalance(requestOptions, address) {
     const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
     return {
         peer: cafe_utility_1.Types.asString(body.peer, { name: 'peer' }),
-        balance: (0, type_1.asNumberString)(body.balance, { name: 'balance' }),
+        balance: tokens_1.BZZ.fromPLUR((0, type_1.asNumberString)(body.balance, { name: 'balance' })),
     };
 }
 exports.getPastDueConsumptionPeerBalance = getPastDueConsumptionPeerBalance;

package/dist/cjs/modules/debug/stake.js

@@ -6,6 +6,7 @@ const headers_1 = require("../../utils/headers");
 const http_1 = require("../../utils/http");
 const tokens_1 = require("../../utils/tokens");
 const type_1 = require("../../utils/type");
+const typed_bytes_1 = require("../../utils/typed-bytes");
 const STAKE_ENDPOINT = 'stake';
 const REDISTRIBUTION_ENDPOINT = 'redistributionstate';
 /**
@@ -31,12 +32,14 @@ exports.getStake = getStake;
  * @param options
  */
 async function stake(requestOptions, amount, options) {
-    await (0, http_1.http)(requestOptions, {
+    const repsonse = await (0, http_1.http)(requestOptions, {
         method: 'post',
         responseType: 'json',
         url: `${STAKE_ENDPOINT}/${amount}`,
         headers: (0, headers_1.prepareRequestHeaders)(null, options),
     });
+    const body = cafe_utility_1.Types.asObject(repsonse.data, { name: 'response.data' });
+    return new typed_bytes_1.TransactionId(cafe_utility_1.Types.asHexString(body.txHash, { name: 'txHash' }));
 }
 exports.stake = stake;
 /**

package/dist/cjs/utils/chunk-stream.browser.js

@@ -16,7 +16,7 @@ async function streamDirectory(_bee, _dir, _postageBatchId, _onUploadProgress, _
     throw new Error('Streaming directories is not supported in browsers!');
 }
 exports.streamDirectory = streamDirectory;
-async function streamFiles(bee, files, postageBatchId, onUploadProgress, options) {
+async function streamFiles(bee, files, postageBatchId, onUploadProgress, options, requestOptions) {
     const queue = new cafe_utility_1.AsyncQueue(64, 64);
     let total = 0;
     let processed = 0;
@@ -26,7 +26,7 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
     postageBatchId = new typed_bytes_1.BatchId(postageBatchId);
     async function onChunk(chunk) {
         await queue.enqueue(async () => {
-            await bee.uploadChunk(postageBatchId, chunk.build(), options);
+            await bee.uploadChunk(postageBatchId, chunk.build(), options, requestOptions);
             onUploadProgress?.({ total, processed: ++processed });
         });
     }
@@ -74,7 +74,7 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
             });
         }
     }
-    return mantaray.saveRecursively(bee, postageBatchId);
+    return mantaray.saveRecursively(bee, postageBatchId, options, requestOptions);
 }
 exports.streamFiles = streamFiles;
 function maybeEnrichMime(mime) {

package/dist/cjs/utils/chunk-stream.js

@@ -78,7 +78,7 @@ function maybeEnrichMime(mime) {
     }
     return mime;
 }
-async function streamFiles(_bee, _files, _postageBatchId, _onUploadProgress, _options) {
+async function streamFiles(_bee, _files, _postageBatchId, _onUploadProgress, _options, _requestOptions) {
     throw new Error('Streaming files is not supported in Node.js');
 }
 exports.streamFiles = streamFiles;

package/dist/cjs/utils/tokens.js

@@ -21,6 +21,51 @@ class BZZ {
     toDecimalString() {
         return this.state.toDecimalString();
     }
+    toSignificantDigits(digits) {
+        return this.toDecimalString().slice(0, this.toDecimalString().indexOf('.') + digits + 1);
+    }
+    /**
+     * Does not mutate the current BZZ instance.
+     *
+     * @param other BZZ instance, or amount in PLUR
+     * @returns New BZZ instance
+     */
+    plus(other) {
+        return new BZZ(this.state.add(other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)));
+    }
+    /**
+     * Does not mutate the current BZZ instance.
+     *
+     * @param other BZZ instance, or amount in PLUR
+     * @returns New BZZ instance
+     */
+    minus(other) {
+        return new BZZ(this.state.subtract(other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)));
+    }
+    /**
+     * Does not mutate the current BZZ instance.
+     *
+     * @param other Divisor
+     * @returns New BZZ instance
+     */
+    divide(other) {
+        return new BZZ(this.state.divide(other)[0]);
+    }
+    gt(other) {
+        return this.state.value > (other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)).value;
+    }
+    gte(other) {
+        return this.state.value >= (other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)).value;
+    }
+    lt(other) {
+        return this.state.value < (other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)).value;
+    }
+    lte(other) {
+        return this.state.value <= (other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)).value;
+    }
+    eq(other) {
+        return this.state.value === (other instanceof BZZ ? other.state : new cafe_utility_1.FixedPointNumber(other, BZZ.DIGITS)).value;
+    }
 }
 exports.BZZ = BZZ;
 BZZ.DIGITS = 16;
@@ -43,6 +88,51 @@ class DAI {
     toDecimalString() {
         return this.state.toDecimalString();
     }
+    toSignificantDigits(digits) {
+        return this.toDecimalString().slice(0, this.toDecimalString().indexOf('.') + digits + 1);
+    }
+    /**
+     * Does not mutate the current DAI instance.
+     *
+     * @param other DAI instance, or amount in PLUR
+     * @returns New DAI instance
+     */
+    plus(other) {
+        return new DAI(this.state.add(other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)));
+    }
+    /**
+     * Does not mutate the current DAI instance.
+     *
+     * @param other DAI instance, or amount in PLUR
+     * @returns New DAI instance
+     */
+    minus(other) {
+        return new DAI(this.state.subtract(other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)));
+    }
+    /**
+     * Does not mutate the current DAI instance.
+     *
+     * @param other Divisor
+     * @returns New DAI instance
+     */
+    divide(other) {
+        return new DAI(this.state.divide(other)[0]);
+    }
+    gt(other) {
+        return this.state.value > (other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)).value;
+    }
+    gte(other) {
+        return this.state.value >= (other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)).value;
+    }
+    lt(other) {
+        return this.state.value < (other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)).value;
+    }
+    lte(other) {
+        return this.state.value <= (other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)).value;
+    }
+    eq(other) {
+        return this.state.value === (other instanceof DAI ? other.state : new cafe_utility_1.FixedPointNumber(other, DAI.DIGITS)).value;
+    }
 }
 exports.DAI = DAI;
 DAI.DIGITS = 18;

package/dist/cjs/utils/typed-bytes.js

@@ -4,6 +4,7 @@ exports.FeedIndex = exports.Topic = exports.Signature = exports.BatchId = export
 const cafe_utility_1 = require("cafe-utility");
 const bytes_1 = require("./bytes");
 const cid_1 = require("./cid");
+// TODO: add JSdocs for each class
 const ENCODER = new TextEncoder();
 class PrivateKey extends bytes_1.Bytes {
     constructor(bytes) {
@@ -78,6 +79,15 @@ class Reference extends bytes_1.Bytes {
     toCid(type) {
         return (0, cid_1.convertReferenceToCid)(this.bytes, type);
     }
+    static isValid(value) {
+        try {
+            new Reference(value);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
 }
 exports.Reference = Reference;
 Reference.LENGTH = 32;