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

package/dist/mjs/bee.js

@@ -1,33 +1,32 @@
-import * as bzz from "./modules/bzz.js";
-import * as stewardship from "./modules/stewardship.js";
-import * as tag from "./modules/tag.js";
-import * as pinning from "./modules/pinning.js";
-import * as bytes from "./modules/bytes.js";
-import * as chunk from "./modules/chunk.js";
-import * as pss from "./modules/pss.js";
-import * as status from "./modules/status.js";
-import { BeeArgumentError, BeeError } from "./utils/error.js";
-import { prepareWebsocketData } from "./utils/data.js";
-import { fileArrayBuffer, isFile } from "./utils/file.js";
-import { makeFeedReader, makeFeedWriter } from "./feed/index.js";
+import { ReferenceType } from '@ethersphere/swarm-cid';
+import { Objects } from 'cafe-utility';
 import { makeSigner } from "./chunk/signer.js";
-import { assertFeedType, DEFAULT_FEED_TYPE } from "./feed/type.js";
 import { downloadSingleOwnerChunk, uploadSingleOwnerChunkData } from "./chunk/soc.js";
+import { makeFeedReader, makeFeedWriter } from "./feed/index.js";
+import { getJsonData, setJsonData } from "./feed/json.js";
+import { areAllSequentialFeedsUpdateRetrievable } from "./feed/retrievable.js";
 import { makeTopic, makeTopicFromString } from "./feed/topic.js";
+import { assertFeedType, DEFAULT_FEED_TYPE } from "./feed/type.js";
+import * as bytes from "./modules/bytes.js";
+import * as bzz from "./modules/bzz.js";
+import * as chunk from "./modules/chunk.js";
 import { createFeedManifest } from "./modules/feed.js";
-import { assertBeeUrl, stripLastSlash } from "./utils/url.js";
-import { makeEthAddress, makeHexEthAddress } from "./utils/eth.js";
+import * as pinning from "./modules/pinning.js";
+import * as pss from "./modules/pss.js";
+import * as status from "./modules/status.js";
+import * as stewardship from "./modules/stewardship.js";
+import * as tag from "./modules/tag.js";
+import { CHUNK_SIZE, SPAN_SIZE } from "./types/index.js";
 import { wrapBytesWithHelpers } from "./utils/bytes.js";
-import { addCidConversionFunction, assertAddressPrefix, assertAllTagsOptions, assertBatchId, assertCollectionUploadOptions, assertData, assertFileData, assertFileUploadOptions, assertPssMessageHandler, assertPublicKey, assertReference, assertReferenceOrEns, assertRequestOptions, assertUploadOptions, makeReferenceOrEns, makeTagUid } from "./utils/type.js";
-import { getJsonData, setJsonData } from "./feed/json.js";
 import { assertCollection, makeCollectionFromFileList } from "./utils/collection.js";
 import { makeCollectionFromFS } from "./utils/collection.node.js";
-import { CHUNK_SIZE, SPAN_SIZE } from "./types/index.js";
-import { DEFAULT_KY_CONFIG, wrapRequestClosure, wrapResponseClosure } from "./utils/http.js";
+import { prepareWebsocketData } from "./utils/data.js";
+import { BeeArgumentError, BeeError } from "./utils/error.js";
+import { makeEthAddress, makeHexEthAddress } from "./utils/eth.js";
+import { fileArrayBuffer, isFile } from "./utils/file.js";
 import { isReadable } from "./utils/stream.js";
-import { areAllSequentialFeedsUpdateRetrievable } from "./feed/retrievable.js";
-import { ReferenceType } from '@ethersphere/swarm-cid';
-import { deepMerge } from "./utils/merge.js";
+import { addCidConversionFunction, assertAddressPrefix, assertAllTagsOptions, assertBatchId, assertCollectionUploadOptions, assertData, assertFileData, assertFileUploadOptions, assertPssMessageHandler, assertPublicKey, assertReference, assertReferenceOrEns, assertRequestOptions, assertUploadOptions, makeReferenceOrEns, makeTagUid } from "./utils/type.js";
+import { assertBeeUrl, stripLastSlash } from "./utils/url.js";
 /**
  * The main component that abstracts operations available on the main Bee API.
  *
@@ -48,26 +47,14 @@ export class Bee {
     if (options?.signer) {
       this.signer = makeSigner(options.signer);
     }
-    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;
   }
   /**
    * Upload data to a Bee node
@@ -80,11 +67,11 @@ export 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) {
     assertBatchId(postageBatchId);
     assertData(data);
     if (options) 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
@@ -99,7 +86,7 @@ export class Bee {
   async downloadData(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return bytes.download(this.getKyOptionsForCall(options), reference);
+    return bytes.download(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Download data as a Readable stream
@@ -114,7 +101,7 @@ export class Bee {
   async downloadReadableData(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return bytes.downloadReadable(this.getKyOptionsForCall(options), reference);
+    return bytes.downloadReadable(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Upload chunk to a Bee node
@@ -127,7 +114,7 @@ export 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) {
     assertBatchId(postageBatchId);
     if (!(data instanceof Uint8Array)) {
       throw new TypeError('Data has to be Uint8Array instance!');
@@ -139,7 +126,7 @@ export class Bee {
       throw new BeeArgumentError(`Chunk has to have size of at most ${CHUNK_SIZE}.`, data);
     }
     if (options) 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
@@ -154,7 +141,7 @@ export class Bee {
   async downloadChunk(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return chunk.download(this.getKyOptionsForCall(options), reference);
+    return chunk.download(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Upload single file to a Bee node.
@@ -172,7 +159,7 @@ export 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) {
     assertBatchId(postageBatchId);
     assertFileData(data);
     if (options) assertFileUploadOptions(options);
@@ -187,14 +174,14 @@ export class Bee {
         contentType,
         ...options
       };
-      return addCidConversionFunction(await bzz.uploadFile(this.getKyOptionsForCall(options), fileData, postageBatchId, fileName, fileOptions), ReferenceType.MANIFEST);
+      return addCidConversionFunction(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), fileData, postageBatchId, fileName, fileOptions), ReferenceType.MANIFEST);
     } else if (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 addCidConversionFunction(result, ReferenceType.MANIFEST);
     } else {
-      return addCidConversionFunction(await bzz.uploadFile(this.getKyOptionsForCall(options), data, postageBatchId, name, options), ReferenceType.MANIFEST);
+      return addCidConversionFunction(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options), ReferenceType.MANIFEST);
     }
   }
   /**
@@ -212,7 +199,7 @@ export class Bee {
   async downloadFile(reference, path = '', options) {
     assertRequestOptions(options);
     reference = makeReferenceOrEns(reference, 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
@@ -229,7 +216,7 @@ export class Bee {
   async downloadReadableFile(reference, path = '', options) {
     assertRequestOptions(options);
     reference = makeReferenceOrEns(reference, 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
@@ -247,11 +234,11 @@ export 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) {
     assertBatchId(postageBatchId);
     if (options) assertCollectionUploadOptions(options);
     const data = await makeCollectionFromFileList(fileList);
-    return addCidConversionFunction(await bzz.uploadCollection(this.getKyOptionsForCall(options), data, postageBatchId, options), ReferenceType.MANIFEST);
+    return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Upload Collection that you can assembly yourself.
@@ -267,7 +254,7 @@ export class Bee {
     assertBatchId(postageBatchId);
     assertCollection(collection);
     if (options) assertCollectionUploadOptions(options);
-    return addCidConversionFunction(await bzz.uploadCollection(this.kyOptions, collection, postageBatchId, options), ReferenceType.MANIFEST);
+    return addCidConversionFunction(await bzz.uploadCollection(this.requestOptions, collection, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Upload collection of files.
@@ -285,11 +272,11 @@ export 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) {
     assertBatchId(postageBatchId);
     if (options) assertCollectionUploadOptions(options);
     const data = await makeCollectionFromFS(dir);
-    return addCidConversionFunction(await bzz.uploadCollection(this.getKyOptionsForCall(options), data, postageBatchId, options), ReferenceType.MANIFEST);
+    return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Create a new Tag which is meant for tracking progres of syncing data across network.
@@ -300,7 +287,7 @@ export class Bee {
    */
   async createTag(options) {
     assertRequestOptions(options);
-    return tag.createTag(this.getKyOptionsForCall(options));
+    return tag.createTag(this.getRequestOptionsForCall(options));
   }
   /**
    * Fetches all tags.
@@ -317,7 +304,7 @@ export class Bee {
   async getAllTags(options) {
     assertRequestOptions(options);
     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
@@ -333,7 +320,7 @@ export class Bee {
   async retrieveTag(tagUid, options) {
     assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
-    return tag.retrieveTag(this.getKyOptionsForCall(options), tagUid);
+    return tag.retrieveTag(this.getRequestOptionsForCall(options), tagUid);
   }
   /**
    * Delete Tag
@@ -349,7 +336,7 @@ export class Bee {
   async deleteTag(tagUid, options) {
     assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
-    return tag.deleteTag(this.getKyOptionsForCall(options), tagUid);
+    return tag.deleteTag(this.getRequestOptionsForCall(options), tagUid);
   }
   /**
    * Update tag's total chunks count.
@@ -370,7 +357,7 @@ export class Bee {
     assertReference(reference);
     assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
-    return tag.updateTag(this.getKyOptionsForCall(options), tagUid, reference);
+    return tag.updateTag(this.getRequestOptionsForCall(options), tagUid, reference);
   }
   /**
    * Pin local data with given reference
@@ -384,7 +371,7 @@ export class Bee {
   async pin(reference, options) {
     assertRequestOptions(options);
     assertReference(reference);
-    return pinning.pin(this.getKyOptionsForCall(options), reference);
+    return pinning.pin(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Unpin local data with given reference
@@ -398,7 +385,7 @@ export class Bee {
   async unpin(reference, options) {
     assertRequestOptions(options);
     assertReference(reference);
-    return pinning.unpin(this.getKyOptionsForCall(options), reference);
+    return pinning.unpin(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Get list of all locally pinned references
@@ -408,7 +395,7 @@ export class Bee {
    */
   async getAllPins(options) {
     assertRequestOptions(options);
-    return pinning.getAllPins(this.getKyOptionsForCall(options));
+    return pinning.getAllPins(this.getRequestOptionsForCall(options));
   }
   /**
    * Get pinning status of chunk with given reference
@@ -423,7 +410,7 @@ export class Bee {
   async getPin(reference, options) {
     assertRequestOptions(options);
     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.
@@ -439,7 +426,7 @@ export class Bee {
   async reuploadPinnedData(reference, options) {
     assertRequestOptions(options);
     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.
@@ -454,7 +441,7 @@ export class Bee {
   async isReferenceRetrievable(reference, options) {
     assertRequestOptions(options);
     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.
@@ -479,9 +466,7 @@ export class Bee {
         await this.makeFeedReader(type, canonicalTopic, canonicalOwner).download();
         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;
@@ -490,7 +475,7 @@ export class Bee {
     if (type !== 'sequence') {
       throw new BeeError('Only Sequence type of Feeds is supported at the moment');
     }
-    return areAllSequentialFeedsUpdateRetrievable(this, canonicalOwner, canonicalTopic, index, options);
+    return areAllSequentialFeedsUpdateRetrievable(this, canonicalOwner, canonicalTopic, index, this.getRequestOptionsForCall(options));
   }
   /**
    * Send data to recipient or target with Postal Service for Swarm.
@@ -524,9 +509,9 @@ export class Bee {
     }
     if (recipient) {
       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);
     }
   }
   /**
@@ -654,7 +639,7 @@ export class Bee {
     assertBatchId(postageBatchId);
     const canonicalTopic = makeTopic(topic);
     const canonicalOwner = makeHexEthAddress(owner);
-    const reference = await createFeedManifest(this.getKyOptionsForCall(options), canonicalOwner, canonicalTopic, postageBatchId, {
+    const reference = await createFeedManifest(this.getRequestOptionsForCall(options), canonicalOwner, canonicalTopic, postageBatchId, {
       type
     });
     return addCidConversionFunction({
@@ -676,7 +661,7 @@ export class Bee {
     assertFeedType(type);
     const canonicalTopic = makeTopic(topic);
     const canonicalOwner = makeHexEthAddress(owner);
-    return makeFeedReader(this.getKyOptionsForCall(options), type, canonicalTopic, canonicalOwner);
+    return makeFeedReader(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalOwner);
   }
   /**
    * Make a new feed writer for updating feeds
@@ -693,7 +678,7 @@ export class Bee {
     assertFeedType(type);
     const canonicalTopic = makeTopic(topic);
     const canonicalSigner = this.resolveSigner(signer);
-    return makeFeedWriter(this.getKyOptionsForCall(options), type, canonicalTopic, canonicalSigner);
+    return makeFeedWriter(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalSigner);
   }
   /**
    * High-level function that allows you to easily set JSON data to feed.
@@ -713,13 +698,13 @@ export 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) {
     assertRequestOptions(options, 'JsonFeedOptions');
     assertBatchId(postageBatchId);
     const hashedTopic = this.makeFeedTopic(topic);
     const feedType = options?.type ?? DEFAULT_FEED_TYPE;
-    const writer = this.makeFeedWriter(feedType, hashedTopic, options?.signer, options);
-    return setJsonData(this, writer, postageBatchId, data, options);
+    const writer = this.makeFeedWriter(feedType, hashedTopic, options?.signer, requestOptions);
+    return setJsonData(this, writer, postageBatchId, data, options, requestOptions);
   }
   /**
    * High-level function that allows you to easily get data from feed.
@@ -787,7 +772,7 @@ export class Bee {
     const canonicalOwner = makeEthAddress(ownerAddress);
     return {
       owner: makeHexEthAddress(canonicalOwner),
-      download: downloadSingleOwnerChunk.bind(null, this.getKyOptionsForCall(options), canonicalOwner)
+      download: downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), canonicalOwner)
     };
   }
   /**
@@ -802,7 +787,7 @@ export class Bee {
     const canonicalSigner = this.resolveSigner(signer);
     return {
       ...this.makeSOCReader(canonicalSigner.address, options),
-      upload: uploadSingleOwnerChunkData.bind(null, this.getKyOptionsForCall(options), canonicalSigner)
+      upload: uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), canonicalSigner)
     };
   }
   /**
@@ -813,7 +798,7 @@ export class Bee {
    */
   async checkConnection(options) {
     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.
@@ -824,7 +809,7 @@ export class Bee {
   async isConnected(options) {
     assertRequestOptions(options, 'PostageBatchOptions');
     try {
-      await status.checkConnection(this.getKyOptionsForCall(options));
+      await status.checkConnection(this.getRequestOptionsForCall(options));
     } catch (e) {
       return false;
     }
@@ -844,7 +829,7 @@ export class Bee {
     }
     throw new BeeError('You have to pass Signer as property to either the method call or constructor! Non found.');
   }
-  getKyOptionsForCall(options) {
-    return deepMerge(this.kyOptions, options);
+  getRequestOptionsForCall(options) {
+    return options ? Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;
   }
 }

package/dist/mjs/chunk/soc.js

@@ -1,15 +1,15 @@
+import * as chunkAPI from "../modules/chunk.js";
+import * as socAPI from "../modules/soc.js";
 import { bytesAtOffset, bytesEqual, flexBytesAtOffset } from "../utils/bytes.js";
-import { bmtHash } from "./bmt.js";
-import { recoverAddress, sign } from "./signer.js";
-import { keccak256Hash } from "../utils/hash.js";
-import { SPAN_SIZE } from "./span.js";
-import { serializeBytes } from "./serialize.js";
 import { BeeError } from "../utils/error.js";
-import { makeContentAddressedChunk, MAX_PAYLOAD_SIZE, MIN_PAYLOAD_SIZE, assertValidChunkData } from "./cac.js";
+import { keccak256Hash } from "../utils/hash.js";
 import { bytesToHex } from "../utils/hex.js";
-import * as socAPI from "../modules/soc.js";
-import * as chunkAPI from "../modules/chunk.js";
 import { assertAddress } from "../utils/type.js";
+import { bmtHash } from "./bmt.js";
+import { assertValidChunkData, makeContentAddressedChunk, MAX_PAYLOAD_SIZE, MIN_PAYLOAD_SIZE } from "./cac.js";
+import { serializeBytes } from "./serialize.js";
+import { recoverAddress, sign } from "./signer.js";
+import { SPAN_SIZE } from "./span.js";
 const IDENTIFIER_SIZE = 32;
 const SIGNATURE_SIZE = 65;
 const SOC_IDENTIFIER_OFFSET = 0;
@@ -90,12 +90,12 @@ export async function makeSingleOwnerChunk(chunk, identifier, signer) {
  * @param postageBatchId  Postage BatchId that will be assigned to uploaded data
  * @param options         Upload options
  */
-export async function uploadSingleOwnerChunk(kyOptions, chunk, postageBatchId, options) {
+export async function uploadSingleOwnerChunk(requestOptions, chunk, postageBatchId, options) {
   const owner = bytesToHex(chunk.owner());
   const identifier = bytesToHex(chunk.identifier());
   const signature = bytesToHex(chunk.signature());
   const data = 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);
 }
 /**
  * Helper function to create and upload SOC.
@@ -107,11 +107,11 @@ export async function uploadSingleOwnerChunk(kyOptions, chunk, postageBatchId, o
  * @param data            The chunk data
  * @param options
  */
-export async function uploadSingleOwnerChunkData(kyOptions, signer, postageBatchId, identifier, data, options) {
+export async function uploadSingleOwnerChunkData(requestOptions, signer, postageBatchId, identifier, data, options) {
   assertAddress(postageBatchId);
   const cac = makeContentAddressedChunk(data);
   const soc = await makeSingleOwnerChunk(cac, identifier, signer);
-  return uploadSingleOwnerChunk(kyOptions, soc, postageBatchId, options);
+  return uploadSingleOwnerChunk(requestOptions, soc, postageBatchId, options);
 }
 /**
  * Helper function to download SOC.
@@ -120,8 +120,8 @@ export async function uploadSingleOwnerChunkData(kyOptions, signer, postageBatch
  * @param ownerAddress  The singer interface for signing the chunk
  * @param identifier    The identifier of the chunk
  */
-export async function downloadSingleOwnerChunk(kyOptions, ownerAddress, identifier) {
+export async function downloadSingleOwnerChunk(requestOptions, ownerAddress, identifier) {
   const address = makeSOCAddress(identifier, ownerAddress);
-  const data = await chunkAPI.download(kyOptions, bytesToHex(address));
+  const data = await chunkAPI.download(requestOptions, bytesToHex(address));
   return makeSingleOwnerChunkFromData(data, address);
 }

package/dist/mjs/feed/index.js

@@ -1,48 +1,47 @@
-import { keccak256Hash } from "../utils/hash.js";
 import { serializeBytes } from "../chunk/serialize.js";
-import { fetchLatestFeedUpdate } from "../modules/feed.js";
 import { makeSingleOwnerChunkFromData, uploadSingleOwnerChunkData } from "../chunk/soc.js";
+import * as chunkAPI from "../modules/chunk.js";
+import { fetchLatestFeedUpdate } from "../modules/feed.js";
 import { FEED_INDEX_HEX_LENGTH } from "../types/index.js";
 import { bytesAtOffset, makeBytes } from "../utils/bytes.js";
-import { BeeResponseError } from "../utils/error.js";
-import { bytesToHex, hexToBytes, makeHexString } from "../utils/hex.js";
-import { readUint64BigEndian, writeUint64BigEndian } from "../utils/uint64.js";
-import * as chunkAPI from "../modules/chunk.js";
 import { makeHexEthAddress } from "../utils/eth.js";
+import { keccak256Hash } from "../utils/hash.js";
+import { bytesToHex, hexToBytes, makeHexString } from "../utils/hex.js";
+import { makeBytesReference } from "../utils/reference.js";
 import { assertAddress } from "../utils/type.js";
+import { readUint64BigEndian, writeUint64BigEndian } from "../utils/uint64.js";
 import { makeFeedIdentifier } from "./identifier.js";
-import { makeBytesReference } from "../utils/reference.js";
 const TIMESTAMP_PAYLOAD_OFFSET = 0;
 const TIMESTAMP_PAYLOAD_SIZE = 8;
 const REFERENCE_PAYLOAD_OFFSET = TIMESTAMP_PAYLOAD_SIZE;
-export async function findNextIndex(kyOptions, owner, topic, options) {
+export async function findNextIndex(requestOptions, owner, topic, options) {
   try {
-    const feedUpdate = await fetchLatestFeedUpdate(kyOptions, owner, topic, options);
+    const feedUpdate = await fetchLatestFeedUpdate(requestOptions, owner, topic, options);
     return makeHexString(feedUpdate.feedIndexNext, FEED_INDEX_HEX_LENGTH);
   } catch (e) {
-    if (e instanceof BeeResponseError && e.status === 404) {
+    if (e?.response?.status === 404) {
       return bytesToHex(makeBytes(8));
     }
     throw e;
   }
 }
-export async function updateFeed(kyOptions, signer, topic, reference, postageBatchId, options, index = 'latest') {
+export async function updateFeed(requestOptions, signer, topic, reference, postageBatchId, options, index = 'latest') {
   const ownerHex = 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 = makeFeedIdentifier(topic, nextIndex);
   const at = options?.at ?? Date.now() / 1000.0;
   const timestamp = writeUint64BigEndian(at);
   const payloadBytes = serializeBytes(timestamp, reference);
-  return uploadSingleOwnerChunkData(kyOptions, signer, postageBatchId, identifier, payloadBytes, options);
+  return uploadSingleOwnerChunkData(requestOptions, signer, postageBatchId, identifier, payloadBytes, options);
 }
 export function getFeedUpdateChunkReference(owner, topic, index) {
   const identifier = makeFeedIdentifier(topic, index);
   return keccak256Hash(identifier, owner);
 }
-export async function downloadFeedUpdate(kyOptions, owner, topic, index) {
+export async function downloadFeedUpdate(requestOptions, owner, topic, index) {
   const address = getFeedUpdateChunkReference(owner, topic, index);
   const addressHex = bytesToHex(address);
-  const data = await chunkAPI.download(kyOptions, addressHex);
+  const data = await chunkAPI.download(requestOptions, addressHex);
   const soc = makeSingleOwnerChunkFromData(data, address);
   const payload = soc.payload();
   const timestampBytes = bytesAtOffset(payload, TIMESTAMP_PAYLOAD_OFFSET, TIMESTAMP_PAYLOAD_SIZE);
@@ -53,19 +52,19 @@ export async function downloadFeedUpdate(kyOptions, owner, topic, index) {
     reference
   };
 }
-export function makeFeedReader(kyOptions, type, topic, owner) {
+export function makeFeedReader(requestOptions, type, topic, owner) {
   return {
     type,
     owner,
     topic,
     async download(options) {
       if (!options?.index) {
-        return fetchLatestFeedUpdate(kyOptions, owner, topic, {
+        return fetchLatestFeedUpdate(requestOptions, owner, topic, {
           ...options,
           type
         });
       }
-      const update = await downloadFeedUpdate(kyOptions, hexToBytes(owner), topic, options.index);
+      const update = await downloadFeedUpdate(requestOptions, hexToBytes(owner), topic, options.index);
       return {
         reference: bytesToHex(update.reference),
         feedIndex: options.index,
@@ -74,17 +73,17 @@ export function makeFeedReader(kyOptions, type, topic, owner) {
     }
   };
 }
-export function makeFeedWriter(kyOptions, type, topic, signer) {
+export function makeFeedWriter(requestOptions, type, topic, signer) {
   const upload = async (postageBatchId, reference, options) => {
     assertAddress(postageBatchId);
     const canonicalReference = makeBytesReference(reference);
-    return updateFeed(kyOptions, signer, topic, canonicalReference, postageBatchId, {
+    return updateFeed(requestOptions, signer, topic, canonicalReference, postageBatchId, {
       ...options,
       type
     });
   };
   return {
-    ...makeFeedReader(kyOptions, type, topic, makeHexEthAddress(signer.address)),
+    ...makeFeedReader(requestOptions, type, topic, makeHexEthAddress(signer.address)),
     upload
   };
 }

package/dist/mjs/feed/json.js

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

package/dist/mjs/feed/retrievable.js

@@ -1,6 +1,6 @@
-import { getFeedUpdateChunkReference } from "./index.js";
-import { readUint64BigEndian } from "../utils/uint64.js";
 import { bytesToHex } from "../utils/hex.js";
+import { readUint64BigEndian } from "../utils/uint64.js";
+import { getFeedUpdateChunkReference } from "./index.js";
 function makeNumericIndex(index) {
   if (index instanceof Uint8Array) {
     return readUint64BigEndian(index);
@@ -21,13 +21,12 @@ function makeNumericIndex(index) {
  * @param ref
  * @param options
  */
-async function isChunkRetrievable(bee, ref, options) {
+async function isChunkRetrievable(bee, ref, requestOptions) {
   try {
-    await bee.downloadChunk(ref, options);
+    await bee.downloadChunk(ref, requestOptions);
     return true;
   } catch (e) {
-    const err = e;
-    if (err.status === 404) {
+    if (e?.response?.status === 404) {
       return false;
     }
     throw e;
@@ -48,7 +47,7 @@ function getAllSequenceUpdateReferences(owner, topic, index) {
   }
   return updateReferences;
 }
-export async function areAllSequentialFeedsUpdateRetrievable(bee, owner, topic, index, options) {
-  const chunkRetrievablePromises = getAllSequenceUpdateReferences(owner, topic, index).map(async ref => isChunkRetrievable(bee, ref, options));
+export async function areAllSequentialFeedsUpdateRetrievable(bee, owner, topic, index, requestOptions) {
+  const chunkRetrievablePromises = getAllSequenceUpdateReferences(owner, topic, index).map(async ref => isChunkRetrievable(bee, ref, requestOptions));
   return (await Promise.all(chunkRetrievablePromises)).every(result => result);
 }