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

package/dist/cjs/bee.js

@@ -24,36 +24,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bee = void 0;
-const bzz = __importStar(require("./modules/bzz"));
-const stewardship = __importStar(require("./modules/stewardship"));
-const tag = __importStar(require("./modules/tag"));
-const pinning = __importStar(require("./modules/pinning"));
-const bytes = __importStar(require("./modules/bytes"));
-const chunk = __importStar(require("./modules/chunk"));
-const pss = __importStar(require("./modules/pss"));
-const status = __importStar(require("./modules/status"));
-const error_1 = require("./utils/error");
-const data_1 = require("./utils/data");
-const file_1 = require("./utils/file");
-const feed_1 = require("./feed");
+const swarm_cid_1 = require("@ethersphere/swarm-cid");
+const cafe_utility_1 = require("cafe-utility");
 const signer_1 = require("./chunk/signer");
-const type_1 = require("./feed/type");
 const soc_1 = require("./chunk/soc");
+const feed_1 = require("./feed");
+const json_1 = require("./feed/json");
+const retrievable_1 = require("./feed/retrievable");
 const topic_1 = require("./feed/topic");
+const type_1 = require("./feed/type");
+const bytes = __importStar(require("./modules/bytes"));
+const bzz = __importStar(require("./modules/bzz"));
+const chunk = __importStar(require("./modules/chunk"));
 const feed_2 = require("./modules/feed");
-const url_1 = require("./utils/url");
-const eth_1 = require("./utils/eth");
+const pinning = __importStar(require("./modules/pinning"));
+const pss = __importStar(require("./modules/pss"));
+const status = __importStar(require("./modules/status"));
+const stewardship = __importStar(require("./modules/stewardship"));
+const tag = __importStar(require("./modules/tag"));
+const types_1 = require("./types");
 const bytes_1 = require("./utils/bytes");
-const type_2 = require("./utils/type");
-const json_1 = require("./feed/json");
 const collection_1 = require("./utils/collection");
 const collection_node_1 = require("./utils/collection.node");
-const types_1 = require("./types");
-const http_1 = require("./utils/http");
+const data_1 = require("./utils/data");
+const error_1 = require("./utils/error");
+const eth_1 = require("./utils/eth");
+const file_1 = require("./utils/file");
 const stream_1 = require("./utils/stream");
-const retrievable_1 = require("./feed/retrievable");
-const swarm_cid_1 = require("@ethersphere/swarm-cid");
-const merge_1 = require("./utils/merge");
+const type_2 = require("./utils/type");
+const url_1 = require("./utils/url");
 /**
  * The main component that abstracts operations available on the main Bee API.
  *
@@ -74,26 +73,14 @@ class Bee {
         if (options?.signer) {
             this.signer = (0, signer_1.makeSigner)(options.signer);
         }
-        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?.onRequest) {
-            kyOptions.hooks.beforeRequest.push((0, http_1.wrapRequestClosure)(options.onRequest));
-        }
-        if (options?.onResponse) {
-            kyOptions.hooks.afterResponse.push((0, http_1.wrapResponseClosure)(options.onResponse));
+        if (options?.headers) {
+            requestOptions.headers = options.headers;
         }
-        this.kyOptions = (0, merge_1.deepMerge)(http_1.DEFAULT_KY_CONFIG, kyOptions);
+        this.requestOptions = requestOptions;
     }
     /**
      * Upload data to a Bee node
@@ -106,12 +93,12 @@ class Bee {
      * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
      * @see [Bee API reference - `POST /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes/post)
      */
-    async uploadData(postageBatchId, data, options) {
+    async uploadData(postageBatchId, data, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
         (0, type_2.assertData)(data);
         if (options)
             (0, type_2.assertUploadOptions)(options);
-        return bytes.upload(this.getKyOptionsForCall(options), data, postageBatchId, options);
+        return bytes.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
     }
     /**
      * Download data as a byte array
@@ -126,7 +113,7 @@ class Bee {
     async downloadData(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReferenceOrEns)(reference);
-        return bytes.download(this.getKyOptionsForCall(options), reference);
+        return bytes.download(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Download data as a Readable stream
@@ -141,7 +128,7 @@ class Bee {
     async downloadReadableData(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReferenceOrEns)(reference);
-        return bytes.downloadReadable(this.getKyOptionsForCall(options), reference);
+        return bytes.downloadReadable(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Upload chunk to a Bee node
@@ -154,7 +141,7 @@ class Bee {
      * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
      * @see [Bee API reference - `POST /chunks`](https://docs.ethswarm.org/api/#tag/Chunk/paths/~1chunks/post)
      */
-    async uploadChunk(postageBatchId, data, options) {
+    async uploadChunk(postageBatchId, data, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
         if (!(data instanceof Uint8Array)) {
             throw new TypeError('Data has to be Uint8Array instance!');
@@ -167,7 +154,7 @@ class Bee {
         }
         if (options)
             (0, type_2.assertUploadOptions)(options);
-        return chunk.upload(this.getKyOptionsForCall(options), data, postageBatchId, options);
+        return chunk.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
     }
     /**
      * Download chunk as a byte array
@@ -182,7 +169,7 @@ class Bee {
     async downloadChunk(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReferenceOrEns)(reference);
-        return chunk.download(this.getKyOptionsForCall(options), reference);
+        return chunk.download(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Upload single file to a Bee node.
@@ -200,7 +187,7 @@ class Bee {
      * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/File/paths/~1bzz/post)
      * @returns reference is a content hash of the file
      */
-    async uploadFile(postageBatchId, data, name, options) {
+    async uploadFile(postageBatchId, data, name, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
         (0, type_2.assertFileData)(data);
         if (options)
@@ -213,16 +200,16 @@ class Bee {
             const fileName = name ?? data.name;
             const contentType = data.type;
             const fileOptions = { contentType, ...options };
-            return (0, type_2.addCidConversionFunction)(await bzz.uploadFile(this.getKyOptionsForCall(options), fileData, postageBatchId, fileName, fileOptions), swarm_cid_1.ReferenceType.MANIFEST);
+            return (0, type_2.addCidConversionFunction)(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions), swarm_cid_1.ReferenceType.MANIFEST);
         }
         else if ((0, stream_1.isReadable)(data) && options?.tag && !options.size) {
             // TODO: Needed until https://github.com/ethersphere/bee/issues/2317 is resolved
-            const result = await bzz.uploadFile(this.getKyOptionsForCall(options), data, postageBatchId, name, options);
+            const result = await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options);
             await this.updateTag(options.tag, result.reference);
             return (0, type_2.addCidConversionFunction)(result, swarm_cid_1.ReferenceType.MANIFEST);
         }
         else {
-            return (0, type_2.addCidConversionFunction)(await bzz.uploadFile(this.getKyOptionsForCall(options), data, postageBatchId, name, options), swarm_cid_1.ReferenceType.MANIFEST);
+            return (0, type_2.addCidConversionFunction)(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options), swarm_cid_1.ReferenceType.MANIFEST);
         }
     }
     /**
@@ -240,7 +227,7 @@ class Bee {
     async downloadFile(reference, path = '', options) {
         (0, type_2.assertRequestOptions)(options);
         reference = (0, type_2.makeReferenceOrEns)(reference, swarm_cid_1.ReferenceType.MANIFEST);
-        return bzz.downloadFile(this.getKyOptionsForCall(options), reference, path);
+        return bzz.downloadFile(this.getRequestOptionsForCall(options), reference, path);
     }
     /**
      * Download single file as a readable stream
@@ -257,7 +244,7 @@ class Bee {
     async downloadReadableFile(reference, path = '', options) {
         (0, type_2.assertRequestOptions)(options);
         reference = (0, type_2.makeReferenceOrEns)(reference, swarm_cid_1.ReferenceType.MANIFEST);
-        return bzz.downloadFileReadable(this.getKyOptionsForCall(options), reference, path);
+        return bzz.downloadFileReadable(this.getRequestOptionsForCall(options), reference, path);
     }
     /**
      * Upload collection of files to a Bee node
@@ -275,12 +262,12 @@ class Bee {
      * @see [Bee docs - Upload directory](https://docs.ethswarm.org/docs/access-the-swarm/upload-a-directory/)
      * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/Collection/paths/~1bzz/post)
      */
-    async uploadFiles(postageBatchId, fileList, options) {
+    async uploadFiles(postageBatchId, fileList, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
         if (options)
             (0, type_2.assertCollectionUploadOptions)(options);
         const data = await (0, collection_1.makeCollectionFromFileList)(fileList);
-        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getKyOptionsForCall(options), data, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
+        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
     }
     /**
      * Upload Collection that you can assembly yourself.
@@ -297,7 +284,7 @@ class Bee {
         (0, collection_1.assertCollection)(collection);
         if (options)
             (0, type_2.assertCollectionUploadOptions)(options);
-        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.kyOptions, collection, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
+        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.requestOptions, collection, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
     }
     /**
      * Upload collection of files.
@@ -315,12 +302,12 @@ class Bee {
      * @see [Bee docs - Upload directory](https://docs.ethswarm.org/docs/access-the-swarm/upload-a-directory/)
      * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/Collection/paths/~1bzz/post)
      */
-    async uploadFilesFromDirectory(postageBatchId, dir, options) {
+    async uploadFilesFromDirectory(postageBatchId, dir, options, requestOptions) {
         (0, type_2.assertBatchId)(postageBatchId);
         if (options)
             (0, type_2.assertCollectionUploadOptions)(options);
         const data = await (0, collection_node_1.makeCollectionFromFS)(dir);
-        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getKyOptionsForCall(options), data, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
+        return (0, type_2.addCidConversionFunction)(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), swarm_cid_1.ReferenceType.MANIFEST);
     }
     /**
      * Create a new Tag which is meant for tracking progres of syncing data across network.
@@ -331,7 +318,7 @@ class Bee {
      */
     async createTag(options) {
         (0, type_2.assertRequestOptions)(options);
-        return tag.createTag(this.getKyOptionsForCall(options));
+        return tag.createTag(this.getRequestOptionsForCall(options));
     }
     /**
      * Fetches all tags.
@@ -348,7 +335,7 @@ class Bee {
     async getAllTags(options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertAllTagsOptions)(options);
-        return tag.getAllTags(this.getKyOptionsForCall(options), options?.offset, options?.limit);
+        return tag.getAllTags(this.getRequestOptionsForCall(options), options?.offset, options?.limit);
     }
     /**
      * Retrieve tag information from Bee node
@@ -364,7 +351,7 @@ class Bee {
     async retrieveTag(tagUid, options) {
         (0, type_2.assertRequestOptions)(options);
         tagUid = (0, type_2.makeTagUid)(tagUid);
-        return tag.retrieveTag(this.getKyOptionsForCall(options), tagUid);
+        return tag.retrieveTag(this.getRequestOptionsForCall(options), tagUid);
     }
     /**
      * Delete Tag
@@ -380,7 +367,7 @@ class Bee {
     async deleteTag(tagUid, options) {
         (0, type_2.assertRequestOptions)(options);
         tagUid = (0, type_2.makeTagUid)(tagUid);
-        return tag.deleteTag(this.getKyOptionsForCall(options), tagUid);
+        return tag.deleteTag(this.getRequestOptionsForCall(options), tagUid);
     }
     /**
      * Update tag's total chunks count.
@@ -401,7 +388,7 @@ class Bee {
         (0, type_2.assertReference)(reference);
         (0, type_2.assertRequestOptions)(options);
         tagUid = (0, type_2.makeTagUid)(tagUid);
-        return tag.updateTag(this.getKyOptionsForCall(options), tagUid, reference);
+        return tag.updateTag(this.getRequestOptionsForCall(options), tagUid, reference);
     }
     /**
      * Pin local data with given reference
@@ -415,7 +402,7 @@ class Bee {
     async pin(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReference)(reference);
-        return pinning.pin(this.getKyOptionsForCall(options), reference);
+        return pinning.pin(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Unpin local data with given reference
@@ -429,7 +416,7 @@ class Bee {
     async unpin(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReference)(reference);
-        return pinning.unpin(this.getKyOptionsForCall(options), reference);
+        return pinning.unpin(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Get list of all locally pinned references
@@ -439,7 +426,7 @@ class Bee {
      */
     async getAllPins(options) {
         (0, type_2.assertRequestOptions)(options);
-        return pinning.getAllPins(this.getKyOptionsForCall(options));
+        return pinning.getAllPins(this.getRequestOptionsForCall(options));
     }
     /**
      * Get pinning status of chunk with given reference
@@ -454,7 +441,7 @@ class Bee {
     async getPin(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReference)(reference);
-        return pinning.getPin(this.getKyOptionsForCall(options), reference);
+        return pinning.getPin(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Instructs the Bee node to reupload a locally pinned data into the network.
@@ -470,7 +457,7 @@ class Bee {
     async reuploadPinnedData(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReferenceOrEns)(reference);
-        await stewardship.reupload(this.getKyOptionsForCall(options), reference);
+        await stewardship.reupload(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Checks if content specified by reference is retrievable from the network.
@@ -485,7 +472,7 @@ class Bee {
     async isReferenceRetrievable(reference, options) {
         (0, type_2.assertRequestOptions)(options);
         (0, type_2.assertReferenceOrEns)(reference);
-        return stewardship.isRetrievable(this.getKyOptionsForCall(options), reference);
+        return stewardship.isRetrievable(this.getRequestOptionsForCall(options), reference);
     }
     /**
      * Functions that validates if feed is retrievable in the network.
@@ -511,9 +498,7 @@ class Bee {
                 return true;
             }
             catch (e) {
-                const err = e;
-                // Only if the error is "not-found" then we return false otherwise we re-throw the error
-                if (err?.status === 404) {
+                if (e?.response?.status === 404) {
                     return false;
                 }
                 throw e;
@@ -522,7 +507,7 @@ class Bee {
         if (type !== 'sequence') {
             throw new error_1.BeeError('Only Sequence type of Feeds is supported at the moment');
         }
-        return (0, retrievable_1.areAllSequentialFeedsUpdateRetrievable)(this, canonicalOwner, canonicalTopic, index, options);
+        return (0, retrievable_1.areAllSequentialFeedsUpdateRetrievable)(this, canonicalOwner, canonicalTopic, index, this.getRequestOptionsForCall(options));
     }
     /**
      * Send data to recipient or target with Postal Service for Swarm.
@@ -556,10 +541,10 @@ class Bee {
         }
         if (recipient) {
             (0, type_2.assertPublicKey)(recipient);
-            return pss.send(this.getKyOptionsForCall(options), topic, target, data, postageBatchId, recipient);
+            return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId, recipient);
         }
         else {
-            return pss.send(this.getKyOptionsForCall(options), topic, target, data, postageBatchId);
+            return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId);
         }
     }
     /**
@@ -689,7 +674,7 @@ class Bee {
         (0, type_2.assertBatchId)(postageBatchId);
         const canonicalTopic = (0, topic_1.makeTopic)(topic);
         const canonicalOwner = (0, eth_1.makeHexEthAddress)(owner);
-        const reference = await (0, feed_2.createFeedManifest)(this.getKyOptionsForCall(options), canonicalOwner, canonicalTopic, postageBatchId, {
+        const reference = await (0, feed_2.createFeedManifest)(this.getRequestOptionsForCall(options), canonicalOwner, canonicalTopic, postageBatchId, {
             type,
         });
         return (0, type_2.addCidConversionFunction)({ reference }, swarm_cid_1.ReferenceType.FEED);
@@ -709,7 +694,7 @@ class Bee {
         (0, type_1.assertFeedType)(type);
         const canonicalTopic = (0, topic_1.makeTopic)(topic);
         const canonicalOwner = (0, eth_1.makeHexEthAddress)(owner);
-        return (0, feed_1.makeFeedReader)(this.getKyOptionsForCall(options), type, canonicalTopic, canonicalOwner);
+        return (0, feed_1.makeFeedReader)(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalOwner);
     }
     /**
      * Make a new feed writer for updating feeds
@@ -726,7 +711,7 @@ class Bee {
         (0, type_1.assertFeedType)(type);
         const canonicalTopic = (0, topic_1.makeTopic)(topic);
         const canonicalSigner = this.resolveSigner(signer);
-        return (0, feed_1.makeFeedWriter)(this.getKyOptionsForCall(options), type, canonicalTopic, canonicalSigner);
+        return (0, feed_1.makeFeedWriter)(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalSigner);
     }
     /**
      * High-level function that allows you to easily set JSON data to feed.
@@ -746,13 +731,13 @@ class Bee {
      *
      * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/dapps-on-swarm/feeds)
      */
-    async setJsonFeed(postageBatchId, topic, data, options) {
+    async setJsonFeed(postageBatchId, topic, data, options, requestOptions) {
         (0, type_2.assertRequestOptions)(options, 'JsonFeedOptions');
         (0, type_2.assertBatchId)(postageBatchId);
         const hashedTopic = this.makeFeedTopic(topic);
         const feedType = options?.type ?? type_1.DEFAULT_FEED_TYPE;
-        const writer = this.makeFeedWriter(feedType, hashedTopic, options?.signer, options);
-        return (0, json_1.setJsonData)(this, writer, postageBatchId, data, options);
+        const writer = this.makeFeedWriter(feedType, hashedTopic, options?.signer, requestOptions);
+        return (0, json_1.setJsonData)(this, writer, postageBatchId, data, options, requestOptions);
     }
     /**
      * High-level function that allows you to easily get data from feed.
@@ -823,7 +808,7 @@ class Bee {
         const canonicalOwner = (0, eth_1.makeEthAddress)(ownerAddress);
         return {
             owner: (0, eth_1.makeHexEthAddress)(canonicalOwner),
-            download: soc_1.downloadSingleOwnerChunk.bind(null, this.getKyOptionsForCall(options), canonicalOwner),
+            download: soc_1.downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), canonicalOwner),
         };
     }
     /**
@@ -838,7 +823,7 @@ class Bee {
         const canonicalSigner = this.resolveSigner(signer);
         return {
             ...this.makeSOCReader(canonicalSigner.address, options),
-            upload: soc_1.uploadSingleOwnerChunkData.bind(null, this.getKyOptionsForCall(options), canonicalSigner),
+            upload: soc_1.uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), canonicalSigner),
         };
     }
     /**
@@ -849,7 +834,7 @@ class Bee {
      */
     async checkConnection(options) {
         (0, type_2.assertRequestOptions)(options, 'PostageBatchOptions');
-        return status.checkConnection(this.getKyOptionsForCall(options));
+        return status.checkConnection(this.getRequestOptionsForCall(options));
     }
     /**
      * Ping the Bee node to see if there is a live Bee node on the given URL.
@@ -860,7 +845,7 @@ class Bee {
     async isConnected(options) {
         (0, type_2.assertRequestOptions)(options, 'PostageBatchOptions');
         try {
-            await status.checkConnection(this.getKyOptionsForCall(options));
+            await status.checkConnection(this.getRequestOptionsForCall(options));
         }
         catch (e) {
             return false;
@@ -881,8 +866,8 @@ class Bee {
         }
         throw new error_1.BeeError('You have to pass Signer as property to either the method call or constructor! Non found.');
     }
-    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.Bee = Bee;

package/dist/cjs/chunk/soc.js

@@ -24,18 +24,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadSingleOwnerChunk = exports.uploadSingleOwnerChunkData = exports.uploadSingleOwnerChunk = exports.makeSingleOwnerChunk = exports.makeSOCAddress = exports.makeSingleOwnerChunkFromData = void 0;
+const chunkAPI = __importStar(require("../modules/chunk"));
+const socAPI = __importStar(require("../modules/soc"));
 const bytes_1 = require("../utils/bytes");
-const bmt_1 = require("./bmt");
-const signer_1 = require("./signer");
-const hash_1 = require("../utils/hash");
-const span_1 = require("./span");
-const serialize_1 = require("./serialize");
 const error_1 = require("../utils/error");
-const cac_1 = require("./cac");
+const hash_1 = require("../utils/hash");
 const hex_1 = require("../utils/hex");
-const socAPI = __importStar(require("../modules/soc"));
-const chunkAPI = __importStar(require("../modules/chunk"));
 const type_1 = require("../utils/type");
+const bmt_1 = require("./bmt");
+const cac_1 = require("./cac");
+const serialize_1 = require("./serialize");
+const signer_1 = require("./signer");
+const span_1 = require("./span");
 const IDENTIFIER_SIZE = 32;
 const SIGNATURE_SIZE = 65;
 const SOC_IDENTIFIER_OFFSET = 0;
@@ -119,12 +119,12 @@ exports.makeSingleOwnerChunk = makeSingleOwnerChunk;
  * @param postageBatchId  Postage BatchId that will be assigned to uploaded data
  * @param options         Upload options
  */
-async function uploadSingleOwnerChunk(kyOptions, chunk, postageBatchId, options) {
+async function uploadSingleOwnerChunk(requestOptions, chunk, postageBatchId, options) {
     const owner = (0, hex_1.bytesToHex)(chunk.owner());
     const identifier = (0, hex_1.bytesToHex)(chunk.identifier());
     const signature = (0, hex_1.bytesToHex)(chunk.signature());
     const data = (0, serialize_1.serializeBytes)(chunk.span(), chunk.payload());
-    return socAPI.upload(kyOptions, owner, identifier, signature, data, postageBatchId, options);
+    return socAPI.upload(requestOptions, owner, identifier, signature, data, postageBatchId, options);
 }
 exports.uploadSingleOwnerChunk = uploadSingleOwnerChunk;
 /**
@@ -137,11 +137,11 @@ exports.uploadSingleOwnerChunk = uploadSingleOwnerChunk;
  * @param data            The chunk data
  * @param options
  */
-async function uploadSingleOwnerChunkData(kyOptions, signer, postageBatchId, identifier, data, options) {
+async function uploadSingleOwnerChunkData(requestOptions, signer, postageBatchId, identifier, data, options) {
     (0, type_1.assertAddress)(postageBatchId);
     const cac = (0, cac_1.makeContentAddressedChunk)(data);
     const soc = await makeSingleOwnerChunk(cac, identifier, signer);
-    return uploadSingleOwnerChunk(kyOptions, soc, postageBatchId, options);
+    return uploadSingleOwnerChunk(requestOptions, soc, postageBatchId, options);
 }
 exports.uploadSingleOwnerChunkData = uploadSingleOwnerChunkData;
 /**
@@ -151,9 +151,9 @@ exports.uploadSingleOwnerChunkData = uploadSingleOwnerChunkData;
  * @param ownerAddress  The singer interface for signing the chunk
  * @param identifier    The identifier of the chunk
  */
-async function downloadSingleOwnerChunk(kyOptions, ownerAddress, identifier) {
+async function downloadSingleOwnerChunk(requestOptions, ownerAddress, identifier) {
     const address = makeSOCAddress(identifier, ownerAddress);
-    const data = await chunkAPI.download(kyOptions, (0, hex_1.bytesToHex)(address));
+    const data = await chunkAPI.download(requestOptions, (0, hex_1.bytesToHex)(address));
     return makeSingleOwnerChunkFromData(data, address);
 }
 exports.downloadSingleOwnerChunk = downloadSingleOwnerChunk;

package/dist/cjs/feed/index.js

@@ -24,44 +24,43 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFeedWriter = exports.makeFeedReader = exports.downloadFeedUpdate = exports.getFeedUpdateChunkReference = exports.updateFeed = exports.findNextIndex = void 0;
-const hash_1 = require("../utils/hash");
 const serialize_1 = require("../chunk/serialize");
-const feed_1 = require("../modules/feed");
 const soc_1 = require("../chunk/soc");
+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 hex_1 = require("../utils/hex");
-const uint64_1 = require("../utils/uint64");
-const chunkAPI = __importStar(require("../modules/chunk"));
 const eth_1 = require("../utils/eth");
+const hash_1 = require("../utils/hash");
+const hex_1 = require("../utils/hex");
+const reference_1 = require("../utils/reference");
 const type_1 = require("../utils/type");
+const uint64_1 = require("../utils/uint64");
 const identifier_1 = require("./identifier");
-const reference_1 = require("../utils/reference");
 const TIMESTAMP_PAYLOAD_OFFSET = 0;
 const TIMESTAMP_PAYLOAD_SIZE = 8;
 const REFERENCE_PAYLOAD_OFFSET = TIMESTAMP_PAYLOAD_SIZE;
-async function findNextIndex(kyOptions, owner, topic, options) {
+async function findNextIndex(requestOptions, owner, topic, options) {
     try {
-        const feedUpdate = await (0, feed_1.fetchLatestFeedUpdate)(kyOptions, owner, topic, options);
+        const feedUpdate = await (0, feed_1.fetchLatestFeedUpdate)(requestOptions, owner, topic, options);
         return (0, hex_1.makeHexString)(feedUpdate.feedIndexNext, types_1.FEED_INDEX_HEX_LENGTH);
     }
     catch (e) {
-        if (e instanceof error_1.BeeResponseError && e.status === 404) {
+        if (e?.response?.status === 404) {
             return (0, hex_1.bytesToHex)((0, bytes_1.makeBytes)(8));
         }
         throw e;
     }
 }
 exports.findNextIndex = findNextIndex;
-async function updateFeed(kyOptions, signer, topic, reference, postageBatchId, options, index = 'latest') {
+async function updateFeed(requestOptions, signer, topic, reference, postageBatchId, options, index = 'latest') {
     const ownerHex = (0, eth_1.makeHexEthAddress)(signer.address);
-    const nextIndex = index === 'latest' ? await findNextIndex(kyOptions, ownerHex, topic, options) : index;
+    const nextIndex = index === 'latest' ? await findNextIndex(requestOptions, ownerHex, topic, options) : index;
     const identifier = (0, identifier_1.makeFeedIdentifier)(topic, nextIndex);
     const at = options?.at ?? Date.now() / 1000.0;
     const timestamp = (0, uint64_1.writeUint64BigEndian)(at);
     const payloadBytes = (0, serialize_1.serializeBytes)(timestamp, reference);
-    return (0, soc_1.uploadSingleOwnerChunkData)(kyOptions, signer, postageBatchId, identifier, payloadBytes, options);
+    return (0, soc_1.uploadSingleOwnerChunkData)(requestOptions, signer, postageBatchId, identifier, payloadBytes, options);
 }
 exports.updateFeed = updateFeed;
 function getFeedUpdateChunkReference(owner, topic, index) {
@@ -69,10 +68,10 @@ function getFeedUpdateChunkReference(owner, topic, index) {
     return (0, hash_1.keccak256Hash)(identifier, owner);
 }
 exports.getFeedUpdateChunkReference = getFeedUpdateChunkReference;
-async function downloadFeedUpdate(kyOptions, owner, topic, index) {
+async function downloadFeedUpdate(requestOptions, owner, topic, index) {
     const address = getFeedUpdateChunkReference(owner, topic, index);
     const addressHex = (0, hex_1.bytesToHex)(address);
-    const data = await chunkAPI.download(kyOptions, addressHex);
+    const data = await chunkAPI.download(requestOptions, addressHex);
     const soc = (0, soc_1.makeSingleOwnerChunkFromData)(data, address);
     const payload = soc.payload();
     const timestampBytes = (0, bytes_1.bytesAtOffset)(payload, TIMESTAMP_PAYLOAD_OFFSET, TIMESTAMP_PAYLOAD_SIZE);
@@ -84,16 +83,16 @@ async function downloadFeedUpdate(kyOptions, owner, topic, index) {
     };
 }
 exports.downloadFeedUpdate = downloadFeedUpdate;
-function makeFeedReader(kyOptions, type, topic, owner) {
+function makeFeedReader(requestOptions, type, topic, owner) {
     return {
         type,
         owner,
         topic,
         async download(options) {
             if (!options?.index) {
-                return (0, feed_1.fetchLatestFeedUpdate)(kyOptions, owner, topic, { ...options, type });
+                return (0, feed_1.fetchLatestFeedUpdate)(requestOptions, owner, topic, { ...options, type });
             }
-            const update = await downloadFeedUpdate(kyOptions, (0, hex_1.hexToBytes)(owner), topic, options.index);
+            const update = await downloadFeedUpdate(requestOptions, (0, hex_1.hexToBytes)(owner), topic, options.index);
             return {
                 reference: (0, hex_1.bytesToHex)(update.reference),
                 feedIndex: options.index,
@@ -103,14 +102,14 @@ function makeFeedReader(kyOptions, type, topic, owner) {
     };
 }
 exports.makeFeedReader = makeFeedReader;
-function makeFeedWriter(kyOptions, type, topic, signer) {
+function makeFeedWriter(requestOptions, type, topic, signer) {
     const upload = async (postageBatchId, reference, options) => {
         (0, type_1.assertAddress)(postageBatchId);
         const canonicalReference = (0, reference_1.makeBytesReference)(reference);
-        return updateFeed(kyOptions, signer, topic, canonicalReference, postageBatchId, { ...options, type });
+        return updateFeed(requestOptions, signer, topic, canonicalReference, postageBatchId, { ...options, type });
     };
     return {
-        ...makeFeedReader(kyOptions, type, topic, (0, eth_1.makeHexEthAddress)(signer.address)),
+        ...makeFeedReader(requestOptions, type, topic, (0, eth_1.makeHexEthAddress)(signer.address)),
         upload,
     };
 }

package/dist/cjs/feed/json.js

@@ -20,9 +20,9 @@ async function getJsonData(bee, reader) {
     return retrievedData.json();
 }
 exports.getJsonData = getJsonData;
-async function setJsonData(bee, writer, postageBatchId, data, options) {
+async function setJsonData(bee, writer, postageBatchId, data, options, requestOptions) {
     const serializedData = serializeJson(data);
-    const { reference } = await bee.uploadData(postageBatchId, serializedData, options);
+    const { reference } = await bee.uploadData(postageBatchId, serializedData, options, requestOptions);
     return writer.upload(postageBatchId, reference);
 }
 exports.setJsonData = setJsonData;