@ethersphere/bee-js 8.0.1 → 8.1.0

package/dist/cjs/bee.js

@@ -104,8 +104,10 @@ class Bee {
     async uploadData(postageBatchId, data, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
         (0, type_2.assertData)(data);
-        if (options)
+        (0, type_2.assertRequestOptions)(requestOptions);
+        if (options) {
             (0, type_2.assertUploadOptions)(options);
+        }
         return bytes.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
     }
     /**
@@ -151,6 +153,7 @@ class Bee {
      */
     async uploadChunk(postageBatchId, data, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
+        (0, type_2.assertRequestOptions)(requestOptions);
         if (!(data instanceof Uint8Array)) {
             throw new TypeError('Data has to be Uint8Array instance!');
         }
@@ -160,8 +163,9 @@ class Bee {
         if (data.length > types_1.CHUNK_SIZE + types_1.SPAN_SIZE) {
             throw new error_1.BeeArgumentError(`Chunk has to have size of at most ${types_1.CHUNK_SIZE}.`, data);
         }
-        if (options)
+        if (options) {
             (0, type_2.assertUploadOptions)(options);
+        }
         return chunk.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
     }
     /**
@@ -190,6 +194,7 @@ class Bee {
      * @returns A promise that resolves to a `GranteesResult` object.
      */
     async createGrantees(postageBatchId, grantees, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         (0, type_2.assertBatchId)(postageBatchId);
         return grantee.createGrantees(this.getRequestOptionsForCall(requestOptions), postageBatchId, grantees);
     }
@@ -201,6 +206,7 @@ class Bee {
      * @returns A promise that resolves to a `GetGranteesResult` object.
      */
     async getGrantees(reference, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         return grantee.getGrantees(reference, this.getRequestOptionsForCall(requestOptions));
     }
     /**
@@ -214,6 +220,7 @@ class Bee {
      * @returns A Promise that resolves to to a `GranteesResult` object.
      */
     async patchGrantees(postageBatchId, reference, history, grantees, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         (0, type_2.assertBatchId)(postageBatchId);
         return grantee.patchGrantees(postageBatchId, reference, history, { add: grantees.add || [], revoke: grantees.revoke || [] }, this.getRequestOptionsForCall(requestOptions));
     }
@@ -234,10 +241,12 @@ class Bee {
      * @returns reference is a content hash of the file
      */
     async uploadFile(postageBatchId, data, name, options, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         (0, type_2.assertBatchId)(postageBatchId);
         (0, type_2.assertFileData)(data);
-        if (options)
+        if (options) {
             (0, type_2.assertFileUploadOptions)(options);
+        }
         if (name && typeof name !== 'string') {
             throw new TypeError('name has to be string or undefined!');
         }
@@ -309,9 +318,11 @@ class Bee {
      * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz/post)
      */
     async uploadFiles(postageBatchId, fileList, options, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         (0, type_2.assertBatchId)(postageBatchId);
-        if (options)
+        if (options) {
             (0, type_2.assertCollectionUploadOptions)(options);
+        }
         const data = await (0, collection_1.makeCollectionFromFileList)(fileList);
         return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
     }
@@ -325,12 +336,13 @@ class Bee {
      * @param collection
      * @param options Collections and request options
      */
-    async uploadCollection(postageBatchId, collection, options) {
+    async uploadCollection(postageBatchId, collection, options, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         (0, type_2.assertBatchId)(postageBatchId);
         (0, collection_1.assertCollection)(collection);
         if (options)
             (0, type_2.assertCollectionUploadOptions)(options);
-        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.requestOptions, collection, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
+        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getRequestOptionsForCall(this.requestOptions), collection, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
     }
     /**
      * Upload collection of files.
@@ -350,6 +362,7 @@ class Bee {
      */
     async uploadFilesFromDirectory(postageBatchId, dir, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
+        (0, type_2.assertRequestOptions)(requestOptions);
         if (options)
             (0, type_2.assertCollectionUploadOptions)(options);
         const data = await (0, collection_node_1.makeCollectionFromFS)(dir);
@@ -378,10 +391,10 @@ class Bee {
      * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/develop/access-the-swarm/syncing)
      * @see [Bee API reference - `GET /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/get)
      */
-    async getAllTags(options) {
-        (0, type_2.assertRequestOptions)(options);
+    async getAllTags(options, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         (0, type_2.assertAllTagsOptions)(options);
-        return tag.getAllTags(this.getRequestOptionsForCall(options), options?.offset, options?.limit);
+        return tag.getAllTags(this.getRequestOptionsForCall(requestOptions), options?.offset, options?.limit);
     }
     /**
      * Retrieve tag information from Bee node
@@ -544,7 +557,7 @@ class Bee {
                 return true;
             }
             catch (e) {
-                if (e?.response?.status === 404) {
+                if (e?.status === 404 || e?.status === 500) {
                     return false;
                 }
                 throw e;
@@ -776,7 +789,7 @@ class Bee {
      * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
      */
     async setJsonFeed(postageBatchId, topic, data, options, requestOptions) {
-        (0, type_2.assertRequestOptions)(options, 'JsonFeedOptions');
+        (0, type_2.assertRequestOptions)(requestOptions, 'JsonFeedOptions');
         (0, type_2.assertBatchId)(postageBatchId);
         const hashedTopic = this.makeFeedTopic(topic);
         const feedType = options?.type ?? type_1.DEFAULT_FEED_TYPE;
@@ -802,8 +815,8 @@ class Bee {
      *
      * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
      */
-    async getJsonFeed(topic, options) {
-        (0, type_2.assertRequestOptions)(options, 'JsonFeedOptions');
+    async getJsonFeed(topic, options, requestOptions) {
+        (0, type_2.assertRequestOptions)(requestOptions);
         const hashedTopic = this.makeFeedTopic(topic);
         const feedType = options?.type ?? type_1.DEFAULT_FEED_TYPE;
         if (options?.signer && options?.address) {
@@ -826,7 +839,7 @@ class Bee {
                 }
             }
         }
-        const reader = this.makeFeedReader(feedType, hashedTopic, address, options);
+        const reader = this.makeFeedReader(feedType, hashedTopic, address, requestOptions);
         return (0, json_1.getJsonData)(this, reader);
     }
     /**
@@ -1044,6 +1057,7 @@ class Bee {
     async cashoutLastCheque(address, options, requestOptions) {
         (0, type_2.assertCashoutOptions)(options);
         (0, type_2.assertAddress)(address);
+        (0, type_2.assertRequestOptions)(requestOptions);
         return chequebook.cashoutLastCheque(this.getRequestOptionsForCall(requestOptions), address, options);
     }
     /**
@@ -1226,6 +1240,7 @@ class Bee {
         (0, type_2.assertPostageBatchOptions)(options);
         (0, type_2.assertPositiveInteger)(amount);
         (0, type_2.assertNonNegativeInteger)(depth);
+        (0, type_2.assertRequestOptions)(requestOptions);
         if (depth < types_1.STAMPS_DEPTH_MIN) {
             throw new error_1.BeeArgumentError(`Depth has to be at least ${types_1.STAMPS_DEPTH_MIN}`, depth);
         }
@@ -1385,8 +1400,8 @@ class Bee {
      * @param options
      */
     async depositStake(amount, options, requestOptions) {
-        (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertTransactionOptions)(options);
+        (0, type_2.assertRequestOptions)(requestOptions);
         await stake.stake(this.getRequestOptionsForCall(requestOptions), amount, options);
     }
     /**
@@ -1424,7 +1439,7 @@ class Bee {
         if (this.signer) {
             return this.signer;
         }
-        throw new error_1.BeeError('You have to pass Signer as property to either the method call or constructor! Non found.');
+        throw new TypeError('You have to pass Signer as property to either the method call or constructor! Non found.');
     }
     getRequestOptionsForCall(options) {
         return options ? cafe_utility_1.Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;

package/dist/cjs/feed/index.js

@@ -30,6 +30,7 @@ const chunkAPI = __importStar(require("../modules/chunk"));
 const feed_1 = require("../modules/feed");
 const types_1 = require("../types");
 const bytes_1 = require("../utils/bytes");
+const error_1 = require("../utils/error");
 const eth_1 = require("../utils/eth");
 const hash_1 = require("../utils/hash");
 const hex_1 = require("../utils/hex");
@@ -45,7 +46,7 @@ async function findNextIndex(requestOptions, owner, topic, options) {
         return (0, hex_1.makeHexString)(feedUpdate.feedIndexNext, types_1.FEED_INDEX_HEX_LENGTH);
     }
     catch (e) {
-        if (e?.response?.status === 404) {
+        if (e instanceof error_1.BeeResponseError) {
             return (0, hex_1.bytesToHex)((0, bytes_1.makeBytes)(8));
         }
         throw e;

package/dist/cjs/feed/json.js

@@ -23,6 +23,6 @@ exports.getJsonData = getJsonData;
 async function setJsonData(bee, writer, postageBatchId, data, options, requestOptions) {
     const serializedData = serializeJson(data);
     const { reference } = await bee.uploadData(postageBatchId, serializedData, options, requestOptions);
-    return writer.upload(postageBatchId, reference);
+    return writer.upload(postageBatchId, reference, { pin: options?.pin });
 }
 exports.setJsonData = setJsonData;

package/dist/cjs/feed/retrievable.js

@@ -30,7 +30,7 @@ async function isChunkRetrievable(bee, ref, requestOptions) {
         return true;
     }
     catch (e) {
-        if (e?.response?.status === 404) {
+        if (e?.status === 404 || e?.status === 500) {
             return false;
         }
         throw e;

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

@@ -3,14 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersions = exports.isSupportedApiVersion = exports.isSupportedMainApiVersion = exports.isSupportedExactVersion = exports.isSupportedVersion = exports.getNodeInfo = exports.getReadiness = exports.getHealth = exports.getDebugStatus = exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_DEBUG_API_VERSION = exports.SUPPORTED_API_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT = void 0;
+exports.getVersions = exports.isSupportedApiVersion = exports.isSupportedMainApiVersion = exports.isSupportedExactVersion = exports.isSupportedVersion = exports.getNodeInfo = exports.getReadiness = exports.getHealth = exports.getDebugStatus = exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_API_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT = void 0;
 const major_js_1 = __importDefault(require("semver/functions/major.js"));
 const http_1 = require("../../utils/http");
 // Following lines bellow are automatically updated with GitHub Action when Bee version is updated
 // so if you are changing anything about them change the `update_bee` action accordingly!
-exports.SUPPORTED_BEE_VERSION_EXACT = '1.18.2-759f56f';
-exports.SUPPORTED_API_VERSION = '4.0.0';
-exports.SUPPORTED_DEBUG_API_VERSION = '4.0.0';
+exports.SUPPORTED_BEE_VERSION_EXACT = '2.2.0-06a0aca7';
+exports.SUPPORTED_API_VERSION = '7.1.0';
 exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
 const NODE_INFO_URL = 'node';
 const STATUS_URL = 'status';

package/dist/cjs/modules/pinning.js

@@ -58,6 +58,6 @@ async function getAllPins(requestOptions) {
         responseType: 'json',
         url: `${PINNING_ENDPOINT}`,
     });
-    return response.data.references;
+    return response.data.references || [];
 }
 exports.getAllPins = getAllPins;

package/dist/cjs/utils/error.js

@@ -15,8 +15,11 @@ class BeeArgumentError extends BeeError {
 }
 exports.BeeArgumentError = BeeArgumentError;
 class BeeResponseError extends BeeError {
-    constructor(message, status, statusText) {
+    constructor(method, url, message, responseBody, status, statusText) {
         super(message);
+        this.method = method;
+        this.url = url;
+        this.responseBody = responseBody;
         this.status = status;
         this.statusText = statusText;
     }

package/dist/cjs/utils/file.js

@@ -8,8 +8,8 @@ exports.fileArrayBuffer = exports.isFile = void 0;
  */
 function isFile(file) {
     // browser
-    if (typeof File === 'function') {
-        return file instanceof File;
+    if (typeof File === 'function' && file instanceof File) {
+        return true;
     }
     // node.js
     const f = file;

package/dist/cjs/utils/http.js

@@ -35,7 +35,7 @@ async function http(options, config) {
     }
     catch (e) {
         if (e instanceof AxiosError) {
-            throw new index_1.BeeResponseError(e.message, e.status, e.code);
+            throw new index_1.BeeResponseError(config.method || 'get', config.url || '<unknown>', e.message, e.response?.data, e.response?.status, e.code);
         }
         throw e;
     }

package/dist/cjs/utils/type.js

@@ -182,9 +182,6 @@ function assertRequestOptions(value, name = 'RequestOptions') {
         throw new TypeError(`${name} has to be an object!`);
     }
     const options = value;
-    if (options.retry) {
-        assertNonNegativeInteger(options.retry, `${name}.retry`);
-    }
     if (options.timeout) {
         assertNonNegativeInteger(options.timeout, `${name}.timeout`);
     }