@ethersphere/bee-js 6.0.0-pre.0 → 6.0.0-pre.10

package/dist/{src → mjs}/bee.js

@@ -1,79 +1,63 @@
-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 { makeDefaultKy, wrapRequestClosure, wrapResponseClosure } from "./utils/http.js";
+import { makeCollectionFromFS } from "./utils/collection.node.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 { 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.
  *
  * Not all methods are always available as it depends in what mode is Bee node launched in.
  * For example gateway mode and light node mode has only limited set of endpoints enabled.
  */
-
 export class Bee {
   /**
    * @param url URL on which is the main API of Bee node exposed
    * @param options
    */
   constructor(url, options) {
-    assertBeeUrl(url); // Remove last slash if present, as our endpoint strings starts with `/...`
+    assertBeeUrl(url);
+    // Remove last slash if present, as our endpoint strings starts with `/...`
     // which could lead to double slash in URL to which Bee responds with
     // unnecessary redirects.
-
     this.url = stripLastSlash(url);
-
     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?.headers) {
+      requestOptions.headers = options.headers;
     }
-
     if (options?.onRequest) {
-      kyOptions.hooks.beforeRequest.push(wrapRequestClosure(options.onRequest));
+      requestOptions.onRequest = options.onRequest;
     }
-
-    if (options?.onResponse) {
-      kyOptions.hooks.afterResponse.push(wrapResponseClosure(options.onResponse));
-    }
-
-    this.ky = makeDefaultKy(kyOptions);
+    this.requestOptions = requestOptions;
   }
   /**
    * Upload data to a Bee node
@@ -86,13 +70,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.getKy(options), data, postageBatchId, options);
+    return bytes.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
   }
   /**
    * Download data as a byte array
@@ -104,12 +86,10 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes~1{reference}/get)
    */
-
-
   async downloadData(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return bytes.download(this.getKy(options), reference);
+    return bytes.download(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Download data as a Readable stream
@@ -121,12 +101,10 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bytes`](https://docs.ethswarm.org/api/#tag/Bytes/paths/~1bytes~1{reference}/get)
    */
-
-
   async downloadReadableData(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return bytes.downloadReadable(this.getKy(options), reference);
+    return bytes.downloadReadable(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Upload chunk to a Bee node
@@ -139,25 +117,19 @@ 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!');
     }
-
     if (data.length < SPAN_SIZE) {
       throw new BeeArgumentError(`Chunk has to have size of at least ${SPAN_SIZE}.`, data);
     }
-
     if (data.length > CHUNK_SIZE + SPAN_SIZE) {
       throw new BeeArgumentError(`Chunk has to have size of at most ${CHUNK_SIZE}.`, data);
     }
-
     if (options) assertUploadOptions(options);
-    return chunk.upload(this.getKy(options), data, postageBatchId, options);
+    return chunk.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
   }
   /**
    * Download chunk as a byte array
@@ -169,12 +141,10 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /chunks`](https://docs.ethswarm.org/api/#tag/Chunk/paths/~1chunks~1{reference}/get)
    */
-
-
   async downloadChunk(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return chunk.download(this.getKy(options), reference);
+    return chunk.download(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Upload single file to a Bee node.
@@ -192,17 +162,13 @@ 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);
-
     if (name && typeof name !== 'string') {
       throw new TypeError('name has to be string or undefined!');
     }
-
     if (isFile(data)) {
       const fileData = await fileArrayBuffer(data);
       const fileName = name ?? data.name;
@@ -211,14 +177,14 @@ export class Bee {
         contentType,
         ...options
       };
-      return addCidConversionFunction(await bzz.uploadFile(this.getKy(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.getKy(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.getKy(options), data, postageBatchId, name, options), ReferenceType.MANIFEST);
+      return addCidConversionFunction(await bzz.uploadFile(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, name, options), ReferenceType.MANIFEST);
     }
   }
   /**
@@ -233,12 +199,10 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bzz`](https://docs.ethswarm.org/api/#tag/Collection/paths/~1bzz~1{reference}~1{path}/get)
    */
-
-
   async downloadFile(reference, path = '', options) {
     assertRequestOptions(options);
     reference = makeReferenceOrEns(reference, ReferenceType.MANIFEST);
-    return bzz.downloadFile(this.getKy(options), reference, path);
+    return bzz.downloadFile(this.getRequestOptionsForCall(options), reference, path);
   }
   /**
    * Download single file as a readable stream
@@ -252,12 +216,10 @@ export class Bee {
    * @see [Bee docs - Upload and download](https://docs.ethswarm.org/docs/access-the-swarm/upload-and-download)
    * @see [Bee API reference - `GET /bzz`](https://docs.ethswarm.org/api/#tag/Collection/paths/~1bzz~1{reference}~1{path}/get)
    */
-
-
   async downloadReadableFile(reference, path = '', options) {
     assertRequestOptions(options);
     reference = makeReferenceOrEns(reference, ReferenceType.MANIFEST);
-    return bzz.downloadFileReadable(this.getKy(options), reference, path);
+    return bzz.downloadFileReadable(this.getRequestOptionsForCall(options), reference, path);
   }
   /**
    * Upload collection of files to a Bee node
@@ -275,13 +237,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.getKy(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.
@@ -293,13 +253,11 @@ export class Bee {
    * @param collection
    * @param options Collections and request options
    */
-
-
   async uploadCollection(postageBatchId, collection, options) {
     assertBatchId(postageBatchId);
     assertCollection(collection);
     if (options) assertCollectionUploadOptions(options);
-    return addCidConversionFunction(await bzz.uploadCollection(this.ky, collection, postageBatchId, options), ReferenceType.MANIFEST);
+    return addCidConversionFunction(await bzz.uploadCollection(this.requestOptions, collection, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Upload collection of files.
@@ -317,36 +275,28 @@ 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.getKy(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.
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param options Options that affects the request behavior
    * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/access-the-swarm/syncing)
    * @see [Bee API reference - `POST /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/post)
    */
-
-
   async createTag(options) {
     assertRequestOptions(options);
-    return tag.createTag(this.getKy(options));
+    return tag.createTag(this.getRequestOptionsForCall(options));
   }
   /**
    * Fetches all tags.
    *
    * The listing is limited by options.limit. So you have to iterate using options.offset to get all tags.
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param options Options that affects the request behavior
    * @throws TypeError if limit or offset are not numbers or undefined
    * @throws BeeArgumentError if limit or offset have invalid options
@@ -354,18 +304,14 @@ export class Bee {
    * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/access-the-swarm/syncing)
    * @see [Bee API reference - `GET /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/get)
    */
-
-
   async getAllTags(options) {
     assertRequestOptions(options);
     assertAllTagsOptions(options);
-    return tag.getAllTags(this.getKy(options), options?.offset, options?.limit);
+    return tag.getAllTags(this.getRequestOptionsForCall(options), options?.offset, options?.limit);
   }
   /**
    * Retrieve tag information from Bee node
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param tagUid UID or tag object to be retrieved
    * @param options Options that affects the request behavior
    * @throws TypeError if tagUid is in not correct format
@@ -374,18 +320,14 @@ export class Bee {
    * @see [Bee API reference - `GET /tags/{uid}`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags~1{uid}/get)
    *
    */
-
-
   async retrieveTag(tagUid, options) {
     assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
-    return tag.retrieveTag(this.getKy(options), tagUid);
+    return tag.retrieveTag(this.getRequestOptionsForCall(options), tagUid);
   }
   /**
    * Delete Tag
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param tagUid UID or tag object to be retrieved
    * @param options Options that affects the request behavior
    * @throws TypeError if tagUid is in not correct format
@@ -394,12 +336,10 @@ export class Bee {
    * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/access-the-swarm/syncing)
    * @see [Bee API reference - `DELETE /tags/{uid}`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags~1{uid}/delete)
    */
-
-
   async deleteTag(tagUid, options) {
     assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
-    return tag.deleteTag(this.getKy(options), tagUid);
+    return tag.deleteTag(this.getRequestOptionsForCall(options), tagUid);
   }
   /**
    * Update tag's total chunks count.
@@ -407,8 +347,6 @@ export class Bee {
    * This is important if you are uploading individual chunks with a tag. Then upon finishing the final root chunk,
    * you can use this method to update the total chunks count for the tag.
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param tagUid UID or tag object to be retrieved
    * @param reference The root reference that contains all the chunks to be counted
    * @param options Options that affects the request behavior
@@ -418,69 +356,53 @@ export class Bee {
    * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/access-the-swarm/syncing)
    * @see [Bee API reference - `PATCH /tags/{uid}`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags~1{uid}/patch)
    */
-
-
   async updateTag(tagUid, reference, options) {
     assertReference(reference);
     assertRequestOptions(options);
     tagUid = makeTagUid(tagUid);
-    return tag.updateTag(this.getKy(options), tagUid, reference);
+    return tag.updateTag(this.getRequestOptionsForCall(options), tagUid, reference);
   }
   /**
    * Pin local data with given reference
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param reference Data reference
    * @param options Options that affects the request behavior
    * @throws TypeError if reference is in not correct format
    *
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/access-the-swarm/pinning)
    */
-
-
   async pin(reference, options) {
     assertRequestOptions(options);
     assertReference(reference);
-    return pinning.pin(this.getKy(options), reference);
+    return pinning.pin(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Unpin local data with given reference
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param reference Data reference
    * @param options Options that affects the request behavior
    * @throws TypeError if reference is in not correct format
    *
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/access-the-swarm/pinning)
    */
-
-
   async unpin(reference, options) {
     assertRequestOptions(options);
     assertReference(reference);
-    return pinning.unpin(this.getKy(options), reference);
+    return pinning.unpin(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Get list of all locally pinned references
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param options Options that affects the request behavior
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/access-the-swarm/pinning)
    */
-
-
   async getAllPins(options) {
     assertRequestOptions(options);
-    return pinning.getAllPins(this.getKy(options));
+    return pinning.getAllPins(this.getRequestOptionsForCall(options));
   }
   /**
    * Get pinning status of chunk with given reference
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * @param reference Bee data reference in hex string (either 64 or 128 chars long) or ENS domain.
    * @param options Options that affects the request behavior
    * @throws TypeError if some of the input parameters is not expected type
@@ -488,12 +410,10 @@ export class Bee {
    *
    * @see [Bee docs - Pinning](https://docs.ethswarm.org/docs/access-the-swarm/pinning)
    */
-
-
   async getPin(reference, options) {
     assertRequestOptions(options);
     assertReference(reference);
-    return pinning.getPin(this.getKy(options), reference);
+    return pinning.getPin(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Instructs the Bee node to reupload a locally pinned data into the network.
@@ -506,12 +426,10 @@ export class Bee {
    *
    * @see [Bee API reference - `PUT /stewardship`](https://docs.ethswarm.org/api/#tag/Stewardship/paths/~1stewardship~1{reference}/put)
    */
-
-
   async reuploadPinnedData(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    await stewardship.reupload(this.getKy(options), reference);
+    await stewardship.reupload(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Checks if content specified by reference is retrievable from the network.
@@ -523,12 +441,10 @@ export class Bee {
    *
    * @see [Bee API reference - `GET /stewardship`](https://docs.ethswarm.org/api/#tag/Stewardship/paths/~1stewardship~1{reference}/get)
    */
-
-
   async isReferenceRetrievable(reference, options) {
     assertRequestOptions(options);
     assertReferenceOrEns(reference);
-    return stewardship.isRetrievable(this.getKy(options), reference);
+    return stewardship.isRetrievable(this.getRequestOptionsForCall(options), reference);
   }
   /**
    * Functions that validates if feed is retrievable in the network.
@@ -545,32 +461,24 @@ export class Bee {
    * @param index
    * @param options
    */
-
-
   async isFeedRetrievable(type, owner, topic, index, options) {
     const canonicalOwner = makeEthAddress(owner);
     const canonicalTopic = makeTopic(topic);
-
     if (!index) {
       try {
         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;
       }
     }
-
     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.
@@ -580,8 +488,6 @@ export class Bee {
    * most likely for setting up an encrypted communication
    * channel by sending an one-off message.
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * **Warning! If the recipient Bee node is a light node, then he will never receive the message!**
    * This is because light nodes does not fully participate in the data exchange in Swarm network and hence the message won't arrive to them.
    *
@@ -596,30 +502,24 @@ export class Bee {
    * @see [Bee docs - PSS](https://docs.ethswarm.org/docs/dapps-on-swarm/pss)
    * @see [Bee API reference - `POST /pss`](https://docs.ethswarm.org/api/#tag/Postal-Service-for-Swarm/paths/~1pss~1send~1{topic}~1{targets}/post)
    */
-
-
   async pssSend(postageBatchId, topic, target, data, recipient, options) {
     assertRequestOptions(options);
     assertData(data);
     assertBatchId(postageBatchId);
     assertAddressPrefix(target);
-
     if (typeof topic !== 'string') {
       throw new TypeError('topic has to be an string!');
     }
-
     if (recipient) {
       assertPublicKey(recipient);
-      return pss.send(this.getKy(options), topic, target, data, postageBatchId, recipient);
+      return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId, recipient);
     } else {
-      return pss.send(this.getKy(options), topic, target, data, postageBatchId);
+      return pss.send(this.getRequestOptionsForCall(options), topic, target, data, postageBatchId);
     }
   }
   /**
    * Subscribe to messages for given topic with Postal Service for Swarm
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * **Warning! If connected Bee node is a light node, then he will never receive any message!**
    * This is because light nodes does not fully participate in the data exchange in Swarm network and hence the message won't arrive to them.
    *
@@ -631,24 +531,19 @@ export class Bee {
    * @see [Bee docs - PSS](https://docs.ethswarm.org/docs/dapps-on-swarm/pss)
    * @see [Bee API reference - `GET /pss`](https://docs.ethswarm.org/api/#tag/Postal-Service-for-Swarm/paths/~1pss~1subscribe~1{topic}/get)
    */
-
-
   pssSubscribe(topic, handler) {
     assertPssMessageHandler(handler);
-
     if (typeof topic !== 'string') {
       throw new TypeError('topic has to be an string!');
     }
-
     const ws = pss.subscribe(this.url, topic);
     let cancelled = false;
-
     const cancel = () => {
       if (cancelled === false) {
-        cancelled = true; // although the WebSocket API offers a `close` function, it seems that
+        cancelled = true;
+        // although the WebSocket API offers a `close` function, it seems that
         // with the library that we are using (isomorphic-ws) it doesn't close
         // the websocket properly, whereas `terminate` does
-
         if (ws.terminate) ws.terminate();else ws.close(); // standard Websocket in browser does not have terminate function
       }
     };
@@ -657,22 +552,19 @@ export class Bee {
       topic,
       cancel
     };
-
     ws.onmessage = async ev => {
-      const data = await prepareWebsocketData(ev.data); // ignore empty messages
-
+      const data = await prepareWebsocketData(ev.data);
+      // ignore empty messages
       if (data.length > 0) {
         handler.onMessage(wrapBytesWithHelpers(data), subscription);
       }
     };
-
     ws.onerror = ev => {
       // ignore errors after subscription was cancelled
       if (!cancelled) {
         handler.onError(new BeeError(ev.message), subscription);
       }
     };
-
     return subscription;
   }
   /**
@@ -688,8 +580,6 @@ export class Bee {
    * timeout can be provided for the message to arrive or else
    * an error will be thrown.
    *
-   * **Warning! Not allowed when node is in Gateway mode!**
-   *
    * **Warning! If connected Bee node is a light node, then he will never receive any message!**
    * This is because light nodes does not fully participate in the data exchange in Swarm network and hence the message won't arrive to them.
    *
@@ -701,17 +591,13 @@ export class Bee {
    * @see [Bee docs - PSS](https://docs.ethswarm.org/docs/dapps-on-swarm/pss)
    * @see [Bee API reference - `GET /pss`](https://docs.ethswarm.org/api/#tag/Postal-Service-for-Swarm/paths/~1pss~1subscribe~1{topic}/get)
    */
-
-
   async pssReceive(topic, timeoutMsec = 0) {
     if (typeof topic !== 'string') {
       throw new TypeError('topic has to be an string!');
     }
-
     if (typeof timeoutMsec !== 'number') {
       throw new TypeError('timeoutMsc parameter has to be a number!');
     }
-
     return new Promise((resolve, reject) => {
       let timeout;
       const subscription = this.pssSubscribe(topic, {
@@ -726,7 +612,6 @@ export class Bee {
           resolve(message);
         }
       });
-
       if (timeoutMsec > 0) {
         // we need to cast the type because Typescript is getting confused with Node.js'
         // alternative type definitions
@@ -751,15 +636,13 @@ export class Bee {
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/dapps-on-swarm/feeds)
    * @see [Bee API reference - `POST /feeds`](https://docs.ethswarm.org/api/#tag/Feed/paths/~1feeds~1{owner}~1{topic}/post)
    */
-
-
   async createFeedManifest(postageBatchId, type, topic, owner, options) {
     assertRequestOptions(options);
     assertFeedType(type);
     assertBatchId(postageBatchId);
     const canonicalTopic = makeTopic(topic);
     const canonicalOwner = makeHexEthAddress(owner);
-    const reference = await createFeedManifest(this.getKy(options), canonicalOwner, canonicalTopic, postageBatchId, {
+    const reference = await createFeedManifest(this.getRequestOptionsForCall(options), canonicalOwner, canonicalTopic, postageBatchId, {
       type
     });
     return addCidConversionFunction({
@@ -776,14 +659,12 @@ export class Bee {
    *
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/dapps-on-swarm/feeds)
    */
-
-
   makeFeedReader(type, topic, owner, options) {
     assertRequestOptions(options);
     assertFeedType(type);
     const canonicalTopic = makeTopic(topic);
     const canonicalOwner = makeHexEthAddress(owner);
-    return makeFeedReader(this.getKy(options), type, canonicalTopic, canonicalOwner);
+    return makeFeedReader(this.getRequestOptionsForCall(options), type, canonicalTopic, canonicalOwner);
   }
   /**
    * Make a new feed writer for updating feeds
@@ -795,14 +676,12 @@ export class Bee {
    *
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/dapps-on-swarm/feeds)
    */
-
-
   makeFeedWriter(type, topic, signer, options) {
     assertRequestOptions(options);
     assertFeedType(type);
     const canonicalTopic = makeTopic(topic);
     const canonicalSigner = this.resolveSigner(signer);
-    return makeFeedWriter(this.getKy(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.
@@ -822,15 +701,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.
@@ -851,19 +728,14 @@ export class Bee {
    *
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/dapps-on-swarm/feeds)
    */
-
-
   async getJsonFeed(topic, options) {
     assertRequestOptions(options, 'JsonFeedOptions');
     const hashedTopic = this.makeFeedTopic(topic);
     const feedType = options?.type ?? DEFAULT_FEED_TYPE;
-
     if (options?.signer && options?.address) {
       throw new BeeError('Both options "signer" and "address" can not be specified at one time!');
     }
-
     let address;
-
     if (options?.address) {
       address = makeEthAddress(options?.address);
     } else {
@@ -877,7 +749,6 @@ export class Bee {
         }
       }
     }
-
     const reader = this.makeFeedReader(feedType, hashedTopic, address, options);
     return getJsonData(this, reader);
   }
@@ -889,8 +760,6 @@ export class Bee {
    *
    * @param topic The input string
    */
-
-
   makeFeedTopic(topic) {
     return makeTopicFromString(topic);
   }
@@ -901,14 +770,12 @@ export class Bee {
    * @param options Options that affects the request behavior
    * @see [Bee docs - Chunk Types](https://docs.ethswarm.org/docs/dapps-on-swarm/chunk-types#single-owner-chunks)
    */
-
-
   makeSOCReader(ownerAddress, options) {
     assertRequestOptions(options);
     const canonicalOwner = makeEthAddress(ownerAddress);
     return {
       owner: makeHexEthAddress(canonicalOwner),
-      download: downloadSingleOwnerChunk.bind(null, this.getKy(options), canonicalOwner)
+      download: downloadSingleOwnerChunk.bind(null, this.getRequestOptionsForCall(options), canonicalOwner)
     };
   }
   /**
@@ -918,13 +785,12 @@ export class Bee {
    * @param options Options that affects the request behavior
    * @see [Bee docs - Chunk Types](https://docs.ethswarm.org/docs/dapps-on-swarm/chunk-types#single-owner-chunks)
    */
-
-
   makeSOCWriter(signer, options) {
     assertRequestOptions(options);
     const canonicalSigner = this.resolveSigner(signer);
-    return { ...this.makeSOCReader(canonicalSigner.address, options),
-      upload: uploadSingleOwnerChunkData.bind(null, this.getKy(options), canonicalSigner)
+    return {
+      ...this.makeSOCReader(canonicalSigner.address, options),
+      upload: uploadSingleOwnerChunkData.bind(null, this.getRequestOptionsForCall(options), canonicalSigner)
     };
   }
   /**
@@ -933,11 +799,9 @@ export class Bee {
    * @param options Options that affects the request behavior
    * @throws If connection was not successful throw error
    */
-
-
   async checkConnection(options) {
     assertRequestOptions(options, 'PostageBatchOptions');
-    return status.checkConnection(this.getKy(options));
+    return status.checkConnection(this.getRequestOptionsForCall(options));
   }
   /**
    * Ping the Bee node to see if there is a live Bee node on the given URL.
@@ -945,17 +809,13 @@ export class Bee {
    * @param options Options that affects the request behavior
    * @returns true if successful, false on error
    */
-
-
   async isConnected(options) {
     assertRequestOptions(options, 'PostageBatchOptions');
-
     try {
-      await status.checkConnection(this.getKy(options));
+      await status.checkConnection(this.getRequestOptionsForCall(options));
     } catch (e) {
       return false;
     }
-
     return true;
   }
   /**
@@ -963,26 +823,16 @@ export class Bee {
    * @private
    * @throws BeeError if either no Signer was passed or no default Signer was specified for the instance
    */
-
-
   resolveSigner(signer) {
     if (signer) {
       return makeSigner(signer);
     }
-
     if (this.signer) {
       return this.signer;
     }
-
     throw new BeeError('You have to pass Signer as property to either the method call or constructor! Non found.');
   }
-
-  getKy(options) {
-    if (!options) {
-      return this.ky;
-    }
-
-    return this.ky.extend(options);
+  getRequestOptionsForCall(options) {
+    return options ? Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;
   }
-
 }