@upcoming/bee-js 12.0.0 → 12.2.2

package/dist/cjs/bee.js

@@ -319,7 +319,7 @@ class Bee {
             const fileData = await (0, file_1.fileArrayBuffer)(data);
             const fileName = name ?? data.name;
             const contentType = data.type;
-            const fileOptions = { contentType, ...options };
+            const fileOptions = { ...options, contentType };
             return bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions);
         }
         else {
@@ -1629,10 +1629,16 @@ class Bee {
             ? currentAmount * multiplier
             : (currentAmount + additionalAmount) * multiplier;
         const amountDelta = targetAmount - currentAmount;
-        const transactionId = await this.topUpBatch(batch.batchID, amountDelta, requestOptions);
+        let transactionId;
+        if (amountDelta > 0n) {
+            transactionId = await this.topUpBatch(batch.batchID, amountDelta, requestOptions);
+        }
         if (depthDelta > 0) {
             return this.diluteBatch(batch.batchID, depth, requestOptions);
         }
+        if (!transactionId) {
+            throw new Error('Nothing to extend, both size and duration are already sufficient');
+        }
         return transactionId;
     }
     /**
@@ -1760,16 +1766,15 @@ class Bee {
     /**
      * Calculates the `amount` and expected duration extension for topping up a postage batch with a given BZZ value.
      *
-     * @param postageBatchId
+     * @param depth Depth of the postage batch to top up.
      * @param bzz The amount of BZZ to spend on the top-up.
      * @param requestOptions Options for making requests, such as timeouts, custom HTTP agents, headers, etc.
      * @returns An object with `amount` (to pass to {@link topUpBatch}) and `duration` (the expected TTL extension).
      */
-    async calculateTopUpForBzz(postageBatchId, bzz, requestOptions) {
-        const batch = await this.getPostageBatch(postageBatchId, requestOptions);
+    async calculateTopUpForBzz(depth, bzz, requestOptions) {
         const chainState = await this.getChainState(requestOptions);
         const blockTime = this.network === 'gnosis' ? 5 : 15;
-        const amount = bzz.toPLURBigInt() / 2n ** BigInt(batch.depth);
+        const amount = bzz.toPLURBigInt() / 2n ** BigInt(depth);
         const duration = (0, stamps_1.getStampDuration)(amount, chainState.currentPrice, blockTime);
         return { amount, duration };
     }

package/dist/cjs/index.js

@@ -36,11 +36,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Stamper = exports.BeeDev = exports.Bee = exports.Size = exports.Utils = exports.Duration = exports.Bytes = exports.SUPPORTED_BEE_VERSION_EXACT = exports.SUPPORTED_BEE_VERSION = exports.MantarayNode = exports.MerkleTree = void 0;
+exports.Stamper = exports.Bee = exports.Size = exports.Utils = exports.Duration = exports.Bytes = exports.SUPPORTED_BEE_VERSION_EXACT = exports.SUPPORTED_BEE_VERSION = exports.MantarayNode = exports.MerkleTree = void 0;
 const bee_1 = require("./bee");
 Object.defineProperty(exports, "Bee", { enumerable: true, get: function () { return bee_1.Bee; } });
-const bee_dev_1 = require("./bee-dev");
-Object.defineProperty(exports, "BeeDev", { enumerable: true, get: function () { return bee_dev_1.BeeDev; } });
 const stamper_1 = require("./stamper/stamper");
 Object.defineProperty(exports, "Stamper", { enumerable: true, get: function () { return stamper_1.Stamper; } });
 var cafe_utility_1 = require("cafe-utility");

package/dist/cjs/modules/feed.js

@@ -60,7 +60,7 @@ async function fetchLatestFeedUpdate(requestOptions, owner, topic, options) {
     const response = await (0, http_1.http)(requestOptions, {
         responseType: 'arraybuffer',
         url: `${feedEndpoint}/${owner}/${topic}`,
-        params: options,
+        params: { ...options },
     });
     return {
         payload: new bytes_1.Bytes(response.data),

package/dist/cjs/modules/status.js

@@ -12,6 +12,7 @@ const http_1 = require("../utils/http");
 async function checkConnection(requestOptions) {
     await (0, http_1.http)(requestOptions, {
         url: '',
+        responseType: 'text',
     });
 }
 async function isGateway(requestOptions) {

package/dist/cjs/utils/http.js

@@ -5,29 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_HTTP_CONFIG = void 0;
 exports.http = http;
-const axios_1 = __importDefault(require("axios"));
+exports.toBeeResponse = toBeeResponse;
 const cafe_utility_1 = require("cafe-utility");
 const debug_1 = __importDefault(require("debug"));
 const index_1 = require("../index");
 const debug = (0, debug_1.default)('bee-js:http');
-const { AxiosError } = axios_1.default;
 const MAX_FAILED_ATTEMPTS = 100000;
 const DELAY_FAST = 200;
 const DELAY_SLOW = 1000;
-const DELAY_THRESHOLD = cafe_utility_1.Dates.minutes(1) / DELAY_FAST;
-const ABORT_ERROR_MESSAGE = 'Request aborted';
+const FAST_RETRY_COUNT = 300;
 exports.DEFAULT_HTTP_CONFIG = {
     headers: {
         accept: 'application/json, text/plain, */*',
     },
-    maxBodyLength: Infinity,
-    maxContentLength: Infinity,
 };
-function throwIfAborted(signal, config, responseData, responseStatus) {
-    if (signal?.aborted) {
-        throw new index_1.BeeResponseError(config.method || 'get', config.url || '<unknown>', ABORT_ERROR_MESSAGE, responseData, responseStatus, 'ERR_CANCELED');
-    }
-}
 /**
  * Main function to make HTTP requests.
  * @param options User defined settings
@@ -37,65 +28,114 @@ async function http(options, config) {
     const requestConfig = cafe_utility_1.Objects.deepMerge3(exports.DEFAULT_HTTP_CONFIG, config, options);
     if (options.signal) {
         requestConfig.signal = options.signal;
-        throwIfAborted(options.signal, config);
     }
-    maybeReplaceBodyBuffers(requestConfig);
+    attachBody(requestConfig);
     if (requestConfig.params) {
-        const keys = Object.keys(requestConfig.params);
-        for (const key of keys) {
-            const value = requestConfig.params[key];
-            if (value === undefined) {
-                delete requestConfig.params[key];
-            }
+        for (const k of Object.keys(requestConfig.params)) {
+            if (requestConfig.params[k] === undefined)
+                delete requestConfig.params[k];
         }
     }
+    const url = buildUrl(requestConfig);
+    const method = (requestConfig.method || 'GET').toUpperCase();
+    requestConfig.method = method;
+    options.onRequest?.({
+        method,
+        url,
+        headers: { ...requestConfig.headers },
+        params: requestConfig.params,
+    });
     let failedAttempts = 0;
     while (failedAttempts < MAX_FAILED_ATTEMPTS) {
-        throwIfAborted(options.signal, config);
         try {
-            debug(`${requestConfig.method || 'get'} ${cafe_utility_1.Strings.joinUrl([
-                requestConfig.baseURL,
-                requestConfig.url,
-            ])}`, { headers: { ...requestConfig.headers }, params: requestConfig.params });
-            maybeRunOnRequestHook(options, requestConfig);
-            const response = await (0, axios_1.default)(requestConfig);
-            return response;
+            debug(`${method} ${url}`, { headers: requestConfig.headers, params: requestConfig.params });
+            const res = await fetch(url, requestConfig);
+            if (!res.ok)
+                await throwHttpError(method, url, res, requestConfig.responseType);
+            return toBeeResponse(res, requestConfig.responseType);
         }
         catch (e) {
-            if (e instanceof AxiosError) {
-                if (e.code === 'ERR_CANCELED') {
-                    throwIfAborted({ aborted: true }, config, e.response?.data, e.response?.status);
-                }
-                if (e.code === 'ECONNABORTED' && options.endlesslyRetry) {
-                    failedAttempts++;
-                    await cafe_utility_1.System.sleepMillis(failedAttempts < DELAY_THRESHOLD ? DELAY_FAST : DELAY_SLOW);
-                }
-                else {
-                    throw new index_1.BeeResponseError(config.method || 'get', config.url || '<unknown>', e.message, e.response?.data, e.response?.status, e.response?.statusText);
-                }
+            if (e instanceof index_1.BeeResponseError)
+                throw e;
+            const err = e;
+            if (err.name === 'TimeoutError' && options.endlesslyRetry) {
+                failedAttempts++;
+                await cafe_utility_1.System.sleepMillis(failedAttempts < FAST_RETRY_COUNT ? DELAY_FAST : DELAY_SLOW);
             }
             else {
-                throw e;
+                throw toBeeError(err, method, url);
             }
         }
     }
     throw Error('Max number of failed attempts reached');
 }
-function maybeRunOnRequestHook(options, requestConfig) {
-    if (options.onRequest) {
-        options.onRequest({
-            method: requestConfig.method || 'GET',
-            url: cafe_utility_1.Strings.joinUrl([requestConfig.baseURL, requestConfig.url]),
-            headers: { ...requestConfig.headers },
-            params: requestConfig.params,
-        });
+function attachBody(config) {
+    if (config.data === undefined)
+        return;
+    const data = config.data;
+    const isJsonShape = (data !== null && typeof data === 'object' && data.constructor === Object) || Array.isArray(data);
+    if (isJsonShape) {
+        config.body = JSON.stringify(data);
+        config.headers = { 'content-type': 'application/json', ...config.headers };
+    }
+    else {
+        config.body = data;
+        config.duplex = 'half';
+        const ct = data instanceof Blob && data.type ? data.type : 'application/octet-stream';
+        config.headers = { 'content-type': ct, ...config.headers };
     }
 }
-function maybeReplaceBodyBuffers(config) {
-    if (config.data && config.data instanceof Uint8Array) {
-        config.data = config.data.buffer.slice(config.data.byteOffset, config.data.byteOffset + config.data.byteLength);
+async function throwHttpError(method, url, res, responseType) {
+    const errBody = await toBeeResponse(res, responseType).catch(() => ({ data: undefined }));
+    const bodyMsg = typeof errBody.data === 'string' ? errBody.data : JSON.stringify(errBody.data);
+    const message = bodyMsg && bodyMsg !== 'undefined' ? `${res.statusText}: ${bodyMsg}` : res.statusText;
+    throw new index_1.BeeResponseError(method, url, message, errBody.data, res.status, res.statusText);
+}
+function toBeeError(err, method, url) {
+    if (err.name === 'AbortError') {
+        return new index_1.BeeResponseError(method, url, 'Request aborted', undefined, undefined, 'ERR_CANCELED');
     }
-    if (config.data && typeof Buffer !== 'undefined' && Buffer.isBuffer(config.data)) {
-        config.data = config.data.buffer.slice(config.data.byteOffset, config.data.byteOffset + config.data.byteLength);
+    const cause = err.cause;
+    const message = cause?.message ? `${err.message}: ${cause.message}` : err.message;
+    return new index_1.BeeResponseError(method, url, message);
+}
+async function toBeeResponse(res, responseType = 'json') {
+    let data;
+    switch (responseType) {
+        case 'arraybuffer':
+            data = await res.arrayBuffer();
+            break;
+        case 'text':
+            data = await res.text();
+            break;
+        case 'blob':
+            data = await res.blob();
+            break;
+        case 'stream':
+            data = res.body;
+            break;
+        case 'json':
+        default: {
+            const text = await res.text();
+            data = text ? JSON.parse(text) : null;
+        }
+    }
+    return {
+        data: data,
+        status: res.status,
+        statusText: res.statusText,
+        headers: Object.fromEntries(res.headers.entries()),
+        raw: res,
+    };
+}
+function buildUrl(config) {
+    let url = cafe_utility_1.Strings.joinUrl([config.baseURL ?? '', config.url ?? '']);
+    if (config.params) {
+        const qs = new URLSearchParams(Object.entries(config.params)
+            .filter(([, v]) => v !== undefined)
+            .map(([k, v]) => [k, String(v)])).toString();
+        if (qs)
+            url += `?${qs}`;
     }
+    return url;
 }

package/dist/cjs/utils/tar.browser.js

@@ -15,10 +15,17 @@ class TarStream {
         });
     }
     beginFile(path, size) {
-        if (path.length > 100) {
-            throw new Error(`File name too long: ${path}`);
+        const { name, prefix, longLink } = splitPath(path);
+        if (longLink) {
+            const encoder = new TextEncoder();
+            const pathData = encoder.encode(path + '\0');
+            this.pieces.push(createLongLinkHeader(pathData.length));
+            this.pieces.push(pathData);
+            const padding = pathData.length % 512 === 0 ? 0 : 512 - (pathData.length % 512);
+            if (padding > 0)
+                this.pieces.push(new Uint8Array(padding));
         }
-        const header = createHeader(path, size);
+        const header = createHeader(name, prefix, size);
         this.pieces.push(header);
         this.currentFileSize = 0;
     }
@@ -37,7 +44,46 @@ class TarStream {
     }
 }
 exports.TarStream = TarStream;
-function createHeader(path, size) {
+function splitPath(path) {
+    if (path.length <= 100)
+        return { name: path, prefix: '', longLink: false };
+    for (let i = path.length - 1; i >= 0; i--) {
+        if (path[i] === '/') {
+            const name = path.substring(i + 1);
+            const prefix = path.substring(0, i);
+            if (name.length <= 100 && prefix.length <= 155)
+                return { name, prefix, longLink: false };
+        }
+    }
+    // Filename itself is > 100 chars or path > 255 chars — use GNU LongLink
+    const lastSlash = path.lastIndexOf('/');
+    const truncatedName = (lastSlash >= 0 ? path.substring(lastSlash + 1) : path).slice(0, 100);
+    return { name: truncatedName, prefix: '', longLink: true };
+}
+function createLongLinkHeader(size) {
+    const encoder = new TextEncoder();
+    function writeToBuffer(str, offset, length) {
+        const bytes = encoder.encode(str);
+        header.set(bytes.slice(0, length), offset);
+    }
+    const header = new Uint8Array(512);
+    header.fill(0);
+    writeToBuffer('././@LongLink', 0, 100);
+    writeToBuffer('0000644\0', 100, 8);
+    writeToBuffer('0000000\0', 108, 8);
+    writeToBuffer('0000000\0', 116, 8);
+    writeToBuffer(size.toString(8).padStart(11, '0') + '\0', 124, 12);
+    writeToBuffer('00000000000\0', 136, 12);
+    writeToBuffer('        ', 148, 8);
+    writeToBuffer('L', 156, 1);
+    writeToBuffer('ustar\0\0', 257, 8);
+    let checksum = 0;
+    for (let i = 0; i < 512; i++)
+        checksum += header[i];
+    writeToBuffer(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
+    return header;
+}
+function createHeader(name, prefix, size) {
     const encoder = new TextEncoder();
     function writeToBuffer(str, offset, length) {
         const bytes = encoder.encode(str);
@@ -47,7 +93,7 @@ function createHeader(path, size) {
     const header = new Uint8Array(512);
     header.fill(0, 0, 512);
     // File name, truncated to 100 characters if necessary
-    writeToBuffer(path.slice(0, 100).padEnd(100, '\0'), 0, 100);
+    writeToBuffer(name.slice(0, 100).padEnd(100, '\0'), 0, 100);
     // File mode (octal) and null-terminated
     writeToBuffer('0000777\0', 100, 8);
     // UID and GID (octal) and null-terminated
@@ -64,11 +110,13 @@ function createHeader(path, size) {
     writeToBuffer('0', 156, 1);
     // USTAR magic and version
     writeToBuffer('ustar\0\0', 257, 8);
+    // UStar prefix field (offset 345, 155 bytes) — used when path > 100 but fits split
+    if (prefix)
+        writeToBuffer(prefix.slice(0, 155).padEnd(155, '\0'), 345, 155);
     // Calculate checksum
     let checksum = 0;
-    for (let i = 0; i < 512; i++) {
+    for (let i = 0; i < 512; i++)
         checksum += header[i];
-    }
     writeToBuffer(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
     return header;
 }

package/dist/cjs/utils/tar.js

@@ -8,10 +8,16 @@ class TarStream {
         this.currentFileSize = 0;
     }
     beginFile(path, size) {
-        if (path.length > 100) {
-            throw new Error(`File name too long: ${path}`);
+        const { name, prefix, longLink } = splitPath(path);
+        if (longLink) {
+            const pathData = Buffer.from(path + '\0');
+            this.output.write(createLongLinkHeader(pathData.length));
+            this.output.write(pathData);
+            const padding = pathData.length % 512 === 0 ? 0 : 512 - (pathData.length % 512);
+            if (padding > 0)
+                this.output.write(Buffer.alloc(padding, 0));
         }
-        const header = createHeader(path, size);
+        const header = createHeader(name, prefix, size);
         this.output.write(header);
         this.currentFileSize = 0;
     }
@@ -44,11 +50,44 @@ class TarStream {
     }
 }
 exports.TarStream = TarStream;
-function createHeader(path, size) {
+function splitPath(path) {
+    if (path.length <= 100)
+        return { name: path, prefix: '', longLink: false };
+    for (let i = path.length - 1; i >= 0; i--) {
+        if (path[i] === '/') {
+            const name = path.substring(i + 1);
+            const prefix = path.substring(0, i);
+            if (name.length <= 100 && prefix.length <= 155)
+                return { name, prefix, longLink: false };
+        }
+    }
+    // Filename itself is > 100 chars or path > 255 chars — use GNU LongLink
+    const lastSlash = path.lastIndexOf('/');
+    const truncatedName = (lastSlash >= 0 ? path.substring(lastSlash + 1) : path).slice(0, 100);
+    return { name: truncatedName, prefix: '', longLink: true };
+}
+function createLongLinkHeader(size) {
+    const header = Buffer.alloc(512, 0);
+    header.write('././@LongLink', 0, 100);
+    header.write('0000644\0', 100, 8);
+    header.write('0000000\0', 108, 8);
+    header.write('0000000\0', 116, 8);
+    header.write(size.toString(8).padStart(11, '0') + '\0', 124, 12);
+    header.write('00000000000\0', 136, 12);
+    header.write('        ', 148, 8);
+    header.write('L', 156, 1);
+    header.write('ustar\0\0', 257, 8);
+    let checksum = 0;
+    for (let i = 0; i < 512; i++)
+        checksum += header[i];
+    header.write(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
+    return header;
+}
+function createHeader(name, prefix, size) {
     // Initialize header with zeros
     const header = Buffer.alloc(512, 0);
     // File name, truncated to 100 characters if necessary
-    header.write(path.slice(0, 100).padEnd(100, '\0'), 0, 100);
+    header.write(name.slice(0, 100).padEnd(100, '\0'), 0, 100);
     // File mode (octal) and null-terminated
     header.write('0000777\0', 100, 8);
     // UID and GID (octal) and null-terminated
@@ -65,11 +104,13 @@ function createHeader(path, size) {
     header.write('0', 156, 1);
     // USTAR magic and version
     header.write('ustar\0\0', 257, 8);
+    // UStar prefix field (offset 345, 155 bytes) — used when path > 100 but fits split
+    if (prefix)
+        header.write(prefix.slice(0, 155).padEnd(155, '\0'), 345, 155);
     // Calculate checksum
     let checksum = 0;
-    for (let i = 0; i < 512; i++) {
+    for (let i = 0; i < 512; i++)
         checksum += header[i];
-    }
     header.write(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
     return header;
 }

package/dist/cjs/utils/tokens.js

@@ -12,6 +12,9 @@ class BZZ {
     static fromPLUR(plur) {
         return new BZZ(new cafe_utility_1.FixedPointNumber(plur, BZZ.DIGITS));
     }
+    static fromFloat(float) {
+        return new BZZ(cafe_utility_1.FixedPointNumber.fromFloat(float, BZZ.DIGITS));
+    }
     toPLURString() {
         return this.state.toString();
     }
@@ -21,6 +24,9 @@ class BZZ {
     toDecimalString() {
         return this.state.toDecimalString();
     }
+    toFloat() {
+        return this.state.toFloat();
+    }
     toSignificantDigits(digits) {
         return this.toDecimalString().slice(0, this.toDecimalString().indexOf('.') + digits + 1);
     }
@@ -82,6 +88,9 @@ class DAI {
     static fromWei(wei) {
         return new DAI(new cafe_utility_1.FixedPointNumber(wei, DAI.DIGITS));
     }
+    static fromFloat(float) {
+        return new DAI(cafe_utility_1.FixedPointNumber.fromFloat(float, DAI.DIGITS));
+    }
     toWeiString() {
         return this.state.toString();
     }
@@ -94,6 +103,9 @@ class DAI {
     toSignificantDigits(digits) {
         return this.toDecimalString().slice(0, this.toDecimalString().indexOf('.') + digits + 1);
     }
+    toFloat() {
+        return this.state.toFloat();
+    }
     /**
      * Does not mutate the current DAI instance.
      *