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

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

@@ -1,35 +1,3 @@
-var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
 import * as bzz from "./modules/bzz.js";
 import * as stewardship from "./modules/stewardship.js";
 import * as tag from "./modules/tag.js";
@@ -53,7 +21,7 @@ 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 { makeCollectionFromFS } from "./utils/collection-node.js";
 import { CHUNK_SIZE, SPAN_SIZE } from "./types/index.js";
 import { makeDefaultKy, wrapRequestClosure, wrapResponseClosure } from "./utils/http.js";
 import { isReadable } from "./utils/stream.js";
@@ -72,38 +40,36 @@ export class Bee {
    * @param options
    */
   constructor(url, options) {
-    var _a;
-
     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 === null || options === void 0 ? void 0 : options.signer) {
+    if (options?.signer) {
       this.signer = makeSigner(options.signer);
     }
 
     const kyOptions = {
       prefixUrl: this.url,
-      timeout: (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : false,
-      retry: options === null || options === void 0 ? void 0 : options.retry,
-      fetch: options === null || options === void 0 ? void 0 : options.fetch,
+      timeout: options?.timeout ?? false,
+      retry: options?.retry,
+      fetch: options?.fetch,
       hooks: {
         beforeRequest: [],
         afterResponse: []
       }
     };
 
-    if (options === null || options === void 0 ? void 0 : options.defaultHeaders) {
+    if (options?.defaultHeaders) {
       kyOptions.headers = options.defaultHeaders;
     }
 
-    if (options === null || options === void 0 ? void 0 : options.onRequest) {
+    if (options?.onRequest) {
       kyOptions.hooks.beforeRequest.push(wrapRequestClosure(options.onRequest));
     }
 
-    if (options === null || options === void 0 ? void 0 : options.onResponse) {
+    if (options?.onResponse) {
       kyOptions.hooks.afterResponse.push(wrapResponseClosure(options.onResponse));
     }
 
@@ -122,13 +88,11 @@ export class Bee {
    */
 
 
-  uploadData(postageBatchId, data, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertBatchId(postageBatchId);
-      assertData(data);
-      if (options) assertUploadOptions(options);
-      return bytes.upload(this.getKy(options), data, postageBatchId, options);
-    });
+  async uploadData(postageBatchId, data, options) {
+    assertBatchId(postageBatchId);
+    assertData(data);
+    if (options) assertUploadOptions(options);
+    return bytes.upload(this.getKy(options), data, postageBatchId, options);
   }
   /**
    * Download data as a byte array
@@ -142,12 +106,10 @@ export class Bee {
    */
 
 
-  downloadData(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReferenceOrEns(reference);
-      return bytes.download(this.getKy(options), reference);
-    });
+  async downloadData(reference, options) {
+    assertRequestOptions(options);
+    assertReferenceOrEns(reference);
+    return bytes.download(this.getKy(options), reference);
   }
   /**
    * Download data as a Readable stream
@@ -161,12 +123,10 @@ export class Bee {
    */
 
 
-  downloadReadableData(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReferenceOrEns(reference);
-      return bytes.downloadReadable(this.getKy(options), reference);
-    });
+  async downloadReadableData(reference, options) {
+    assertRequestOptions(options);
+    assertReferenceOrEns(reference);
+    return bytes.downloadReadable(this.getKy(options), reference);
   }
   /**
    * Upload chunk to a Bee node
@@ -181,25 +141,23 @@ export class Bee {
    */
 
 
-  uploadChunk(postageBatchId, data, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertBatchId(postageBatchId);
+  async uploadChunk(postageBatchId, data, options) {
+    assertBatchId(postageBatchId);
 
-      if (!(data instanceof Uint8Array)) {
-        throw new TypeError('Data has to be Uint8Array instance!');
-      }
+    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 < 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 (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);
-    });
+    if (options) assertUploadOptions(options);
+    return chunk.upload(this.getKy(options), data, postageBatchId, options);
   }
   /**
    * Download chunk as a byte array
@@ -213,12 +171,10 @@ export class Bee {
    */
 
 
-  downloadChunk(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReferenceOrEns(reference);
-      return chunk.download(this.getKy(options), reference);
-    });
+  async downloadChunk(reference, options) {
+    assertRequestOptions(options);
+    assertReferenceOrEns(reference);
+    return chunk.download(this.getKy(options), reference);
   }
   /**
    * Upload single file to a Bee node.
@@ -238,33 +194,32 @@ export class Bee {
    */
 
 
-  uploadFile(postageBatchId, data, name, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertBatchId(postageBatchId);
-      assertFileData(data);
-      if (options) assertFileUploadOptions(options);
+  async uploadFile(postageBatchId, data, name, options) {
+    assertBatchId(postageBatchId);
+    assertFileData(data);
+    if (options) assertFileUploadOptions(options);
 
-      if (name && typeof name !== 'string') {
-        throw new TypeError('name has to be string or undefined!');
-      }
+    if (name && typeof name !== 'string') {
+      throw new TypeError('name has to be string or undefined!');
+    }
 
-      if (isFile(data)) {
-        const fileData = yield fileArrayBuffer(data);
-        const fileName = name !== null && name !== void 0 ? name : data.name;
-        const contentType = data.type;
-        const fileOptions = Object.assign({
-          contentType
-        }, options);
-        return addCidConversionFunction(yield bzz.uploadFile(this.getKy(options), fileData, postageBatchId, fileName, fileOptions), ReferenceType.MANIFEST);
-      } else if (isReadable(data) && (options === null || options === void 0 ? void 0 : options.tag) && !options.size) {
-        // TODO: Needed until https://github.com/ethersphere/bee/issues/2317 is resolved
-        const result = yield bzz.uploadFile(this.getKy(options), data, postageBatchId, name, options);
-        yield this.updateTag(options.tag, result.reference);
-        return addCidConversionFunction(result, ReferenceType.MANIFEST);
-      } else {
-        return addCidConversionFunction(yield bzz.uploadFile(this.getKy(options), data, postageBatchId, name, options), ReferenceType.MANIFEST);
-      }
-    });
+    if (isFile(data)) {
+      const fileData = await fileArrayBuffer(data);
+      const fileName = name ?? data.name;
+      const contentType = data.type;
+      const fileOptions = {
+        contentType,
+        ...options
+      };
+      return addCidConversionFunction(await bzz.uploadFile(this.getKy(options), 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);
+      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);
+    }
   }
   /**
    * Download single file.
@@ -280,12 +235,10 @@ export class Bee {
    */
 
 
-  downloadFile(reference, path = '', options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      reference = makeReferenceOrEns(reference, ReferenceType.MANIFEST);
-      return bzz.downloadFile(this.getKy(options), reference, path);
-    });
+  async downloadFile(reference, path = '', options) {
+    assertRequestOptions(options);
+    reference = makeReferenceOrEns(reference, ReferenceType.MANIFEST);
+    return bzz.downloadFile(this.getKy(options), reference, path);
   }
   /**
    * Download single file as a readable stream
@@ -301,12 +254,10 @@ export class Bee {
    */
 
 
-  downloadReadableFile(reference, path = '', options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      reference = makeReferenceOrEns(reference, ReferenceType.MANIFEST);
-      return bzz.downloadFileReadable(this.getKy(options), reference, path);
-    });
+  async downloadReadableFile(reference, path = '', options) {
+    assertRequestOptions(options);
+    reference = makeReferenceOrEns(reference, ReferenceType.MANIFEST);
+    return bzz.downloadFileReadable(this.getKy(options), reference, path);
   }
   /**
    * Upload collection of files to a Bee node
@@ -326,13 +277,11 @@ export class Bee {
    */
 
 
-  uploadFiles(postageBatchId, fileList, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertBatchId(postageBatchId);
-      if (options) assertCollectionUploadOptions(options);
-      const data = yield makeCollectionFromFileList(fileList);
-      return addCidConversionFunction(yield bzz.uploadCollection(this.getKy(options), data, postageBatchId, options), ReferenceType.MANIFEST);
-    });
+  async uploadFiles(postageBatchId, fileList, options) {
+    assertBatchId(postageBatchId);
+    if (options) assertCollectionUploadOptions(options);
+    const data = await makeCollectionFromFileList(fileList);
+    return addCidConversionFunction(await bzz.uploadCollection(this.getKy(options), data, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Upload Collection that you can assembly yourself.
@@ -346,13 +295,11 @@ export class Bee {
    */
 
 
-  uploadCollection(postageBatchId, collection, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertBatchId(postageBatchId);
-      assertCollection(collection);
-      if (options) assertCollectionUploadOptions(options);
-      return addCidConversionFunction(yield bzz.uploadCollection(this.ky, collection, postageBatchId, options), ReferenceType.MANIFEST);
-    });
+  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);
   }
   /**
    * Upload collection of files.
@@ -372,13 +319,11 @@ export class Bee {
    */
 
 
-  uploadFilesFromDirectory(postageBatchId, dir, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertBatchId(postageBatchId);
-      if (options) assertCollectionUploadOptions(options);
-      const data = yield makeCollectionFromFS(dir);
-      return addCidConversionFunction(yield bzz.uploadCollection(this.getKy(options), data, postageBatchId, options), ReferenceType.MANIFEST);
-    });
+  async uploadFilesFromDirectory(postageBatchId, dir, options) {
+    assertBatchId(postageBatchId);
+    if (options) assertCollectionUploadOptions(options);
+    const data = await makeCollectionFromFS(dir);
+    return addCidConversionFunction(await bzz.uploadCollection(this.getKy(options), data, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Create a new Tag which is meant for tracking progres of syncing data across network.
@@ -391,11 +336,9 @@ export class Bee {
    */
 
 
-  createTag(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      return tag.createTag(this.getKy(options));
-    });
+  async createTag(options) {
+    assertRequestOptions(options);
+    return tag.createTag(this.getKy(options));
   }
   /**
    * Fetches all tags.
@@ -413,12 +356,10 @@ export class Bee {
    */
 
 
-  getAllTags(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertAllTagsOptions(options);
-      return tag.getAllTags(this.getKy(options), options === null || options === void 0 ? void 0 : options.offset, options === null || options === void 0 ? void 0 : options.limit);
-    });
+  async getAllTags(options) {
+    assertRequestOptions(options);
+    assertAllTagsOptions(options);
+    return tag.getAllTags(this.getKy(options), options?.offset, options?.limit);
   }
   /**
    * Retrieve tag information from Bee node
@@ -435,12 +376,10 @@ export class Bee {
    */
 
 
-  retrieveTag(tagUid, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      tagUid = makeTagUid(tagUid);
-      return tag.retrieveTag(this.getKy(options), tagUid);
-    });
+  async retrieveTag(tagUid, options) {
+    assertRequestOptions(options);
+    tagUid = makeTagUid(tagUid);
+    return tag.retrieveTag(this.getKy(options), tagUid);
   }
   /**
    * Delete Tag
@@ -457,12 +396,10 @@ export class Bee {
    */
 
 
-  deleteTag(tagUid, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      tagUid = makeTagUid(tagUid);
-      return tag.deleteTag(this.getKy(options), tagUid);
-    });
+  async deleteTag(tagUid, options) {
+    assertRequestOptions(options);
+    tagUid = makeTagUid(tagUid);
+    return tag.deleteTag(this.getKy(options), tagUid);
   }
   /**
    * Update tag's total chunks count.
@@ -483,13 +420,11 @@ export class Bee {
    */
 
 
-  updateTag(tagUid, reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertReference(reference);
-      assertRequestOptions(options);
-      tagUid = makeTagUid(tagUid);
-      return tag.updateTag(this.getKy(options), tagUid, reference);
-    });
+  async updateTag(tagUid, reference, options) {
+    assertReference(reference);
+    assertRequestOptions(options);
+    tagUid = makeTagUid(tagUid);
+    return tag.updateTag(this.getKy(options), tagUid, reference);
   }
   /**
    * Pin local data with given reference
@@ -504,12 +439,10 @@ export class Bee {
    */
 
 
-  pin(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReference(reference);
-      return pinning.pin(this.getKy(options), reference);
-    });
+  async pin(reference, options) {
+    assertRequestOptions(options);
+    assertReference(reference);
+    return pinning.pin(this.getKy(options), reference);
   }
   /**
    * Unpin local data with given reference
@@ -524,12 +457,10 @@ export class Bee {
    */
 
 
-  unpin(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReference(reference);
-      return pinning.unpin(this.getKy(options), reference);
-    });
+  async unpin(reference, options) {
+    assertRequestOptions(options);
+    assertReference(reference);
+    return pinning.unpin(this.getKy(options), reference);
   }
   /**
    * Get list of all locally pinned references
@@ -541,11 +472,9 @@ export class Bee {
    */
 
 
-  getAllPins(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      return pinning.getAllPins(this.getKy(options));
-    });
+  async getAllPins(options) {
+    assertRequestOptions(options);
+    return pinning.getAllPins(this.getKy(options));
   }
   /**
    * Get pinning status of chunk with given reference
@@ -561,12 +490,10 @@ export class Bee {
    */
 
 
-  getPin(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReference(reference);
-      return pinning.getPin(this.getKy(options), reference);
-    });
+  async getPin(reference, options) {
+    assertRequestOptions(options);
+    assertReference(reference);
+    return pinning.getPin(this.getKy(options), reference);
   }
   /**
    * Instructs the Bee node to reupload a locally pinned data into the network.
@@ -581,12 +508,10 @@ export class Bee {
    */
 
 
-  reuploadPinnedData(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReferenceOrEns(reference);
-      yield stewardship.reupload(this.getKy(options), reference);
-    });
+  async reuploadPinnedData(reference, options) {
+    assertRequestOptions(options);
+    assertReferenceOrEns(reference);
+    await stewardship.reupload(this.getKy(options), reference);
   }
   /**
    * Checks if content specified by reference is retrievable from the network.
@@ -600,12 +525,10 @@ export class Bee {
    */
 
 
-  isReferenceRetrievable(reference, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertReferenceOrEns(reference);
-      return stewardship.isRetrievable(this.getKy(options), reference);
-    });
+  async isReferenceRetrievable(reference, options) {
+    assertRequestOptions(options);
+    assertReferenceOrEns(reference);
+    return stewardship.isRetrievable(this.getKy(options), reference);
   }
   /**
    * Functions that validates if feed is retrievable in the network.
@@ -624,32 +547,30 @@ export class Bee {
    */
 
 
-  isFeedRetrievable(type, owner, topic, index, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      const canonicalOwner = makeEthAddress(owner);
-      const canonicalTopic = makeTopic(topic);
-
-      if (!index) {
-        try {
-          yield 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
+  async isFeedRetrievable(type, owner, topic, index, options) {
+    const canonicalOwner = makeEthAddress(owner);
+    const canonicalTopic = makeTopic(topic);
 
-          if ((err === null || err === void 0 ? void 0 : err.status) === 404) {
-            return false;
-          }
+    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
 
-          throw e;
+        if (err?.status === 404) {
+          return false;
         }
-      }
 
-      if (type !== 'sequence') {
-        throw new BeeError('Only Sequence type of Feeds is supported at the moment');
+        throw e;
       }
+    }
 
-      return areAllSequentialFeedsUpdateRetrievable(this, canonicalOwner, canonicalTopic, index, options);
-    });
+    if (type !== 'sequence') {
+      throw new BeeError('Only Sequence type of Feeds is supported at the moment');
+    }
+
+    return areAllSequentialFeedsUpdateRetrievable(this, canonicalOwner, canonicalTopic, index, options);
   }
   /**
    * Send data to recipient or target with Postal Service for Swarm.
@@ -677,24 +598,22 @@ export class Bee {
    */
 
 
-  pssSend(postageBatchId, topic, target, data, recipient, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertData(data);
-      assertBatchId(postageBatchId);
-      assertAddressPrefix(target);
+  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 (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);
-      } else {
-        return pss.send(this.getKy(options), topic, target, data, postageBatchId);
-      }
-    });
+    if (recipient) {
+      assertPublicKey(recipient);
+      return pss.send(this.getKy(options), topic, target, data, postageBatchId, recipient);
+    } else {
+      return pss.send(this.getKy(options), topic, target, data, postageBatchId);
+    }
   }
   /**
    * Subscribe to messages for given topic with Postal Service for Swarm
@@ -739,13 +658,13 @@ export class Bee {
       cancel
     };
 
-    ws.onmessage = ev => __awaiter(this, void 0, void 0, function* () {
-      const data = yield prepareWebsocketData(ev.data); // ignore empty messages
+    ws.onmessage = async ev => {
+      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
@@ -784,40 +703,38 @@ export class Bee {
    */
 
 
-  pssReceive(topic, timeoutMsec = 0) {
-    return __awaiter(this, void 0, void 0, function* () {
-      if (typeof topic !== 'string') {
-        throw new TypeError('topic has to be an string!');
-      }
+  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!');
-      }
+    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, {
-          onError: error => {
-            clearTimeout(timeout);
-            subscription.cancel();
-            reject(error.message);
-          },
-          onMessage: message => {
-            clearTimeout(timeout);
-            subscription.cancel();
-            resolve(message);
-          }
-        });
-
-        if (timeoutMsec > 0) {
-          // we need to cast the type because Typescript is getting confused with Node.js'
-          // alternative type definitions
-          timeout = setTimeout(() => {
-            subscription.cancel();
-            reject(new BeeError('pssReceive timeout'));
-          }, timeoutMsec);
+    return new Promise((resolve, reject) => {
+      let timeout;
+      const subscription = this.pssSubscribe(topic, {
+        onError: error => {
+          clearTimeout(timeout);
+          subscription.cancel();
+          reject(error.message);
+        },
+        onMessage: message => {
+          clearTimeout(timeout);
+          subscription.cancel();
+          resolve(message);
         }
       });
+
+      if (timeoutMsec > 0) {
+        // we need to cast the type because Typescript is getting confused with Node.js'
+        // alternative type definitions
+        timeout = setTimeout(() => {
+          subscription.cancel();
+          reject(new BeeError('pssReceive timeout'));
+        }, timeoutMsec);
+      }
     });
   }
   /**
@@ -833,21 +750,21 @@ 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)
-   * TODO: Once breaking add support for Feed CID
    */
 
 
-  createFeedManifest(postageBatchId, type, topic, owner, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options);
-      assertFeedType(type);
-      assertBatchId(postageBatchId);
-      const canonicalTopic = makeTopic(topic);
-      const canonicalOwner = makeHexEthAddress(owner);
-      return createFeedManifest(this.getKy(options), canonicalOwner, canonicalTopic, postageBatchId, {
-        type
-      });
+  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, {
+      type
     });
+    return addCidConversionFunction({
+      reference
+    }, ReferenceType.FEED);
   }
   /**
    * Make a new feed reader for downloading feed updates.
@@ -907,17 +824,13 @@ export class Bee {
    */
 
 
-  setJsonFeed(postageBatchId, topic, data, options) {
-    var _a;
-
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options, 'JsonFeedOptions');
-      assertBatchId(postageBatchId);
-      const hashedTopic = this.makeFeedTopic(topic);
-      const feedType = (_a = options === null || options === void 0 ? void 0 : options.type) !== null && _a !== void 0 ? _a : DEFAULT_FEED_TYPE;
-      const writer = this.makeFeedWriter(feedType, hashedTopic, options === null || options === void 0 ? void 0 : options.signer, options);
-      return setJsonData(this, writer, postageBatchId, data, options);
-    });
+  async setJsonFeed(postageBatchId, topic, data, options) {
+    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);
   }
   /**
    * High-level function that allows you to easily get data from feed.
@@ -940,37 +853,33 @@ export class Bee {
    */
 
 
-  getJsonFeed(topic, options) {
-    var _a;
+  async getJsonFeed(topic, options) {
+    assertRequestOptions(options, 'JsonFeedOptions');
+    const hashedTopic = this.makeFeedTopic(topic);
+    const feedType = options?.type ?? DEFAULT_FEED_TYPE;
 
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options, 'JsonFeedOptions');
-      const hashedTopic = this.makeFeedTopic(topic);
-      const feedType = (_a = options === null || options === void 0 ? void 0 : options.type) !== null && _a !== void 0 ? _a : DEFAULT_FEED_TYPE;
+    if (options?.signer && options?.address) {
+      throw new BeeError('Both options "signer" and "address" can not be specified at one time!');
+    }
 
-      if ((options === null || options === void 0 ? void 0 : options.signer) && (options === null || options === void 0 ? void 0 : options.address)) {
-        throw new BeeError('Both options "signer" and "address" can not be specified at one time!');
-      }
+    let address;
 
-      let address;
-
-      if (options === null || options === void 0 ? void 0 : options.address) {
-        address = makeEthAddress(options === null || options === void 0 ? void 0 : options.address);
-      } else {
-        try {
-          address = this.resolveSigner(options === null || options === void 0 ? void 0 : options.signer).address;
-        } catch (e) {
-          if (e instanceof BeeError) {
-            throw new BeeError('Either address, signer or default signer has to be specified!');
-          } else {
-            throw e;
-          }
+    if (options?.address) {
+      address = makeEthAddress(options?.address);
+    } else {
+      try {
+        address = this.resolveSigner(options?.signer).address;
+      } catch (e) {
+        if (e instanceof BeeError) {
+          throw new BeeError('Either address, signer or default signer has to be specified!');
+        } else {
+          throw e;
         }
       }
+    }
 
-      const reader = this.makeFeedReader(feedType, hashedTopic, address, options);
-      return getJsonData(this, reader);
-    });
+    const reader = this.makeFeedReader(feedType, hashedTopic, address, options);
+    return getJsonData(this, reader);
   }
   /**
    * Make a new feed topic from a string
@@ -1014,9 +923,9 @@ export class Bee {
   makeSOCWriter(signer, options) {
     assertRequestOptions(options);
     const canonicalSigner = this.resolveSigner(signer);
-    return Object.assign(Object.assign({}, this.makeSOCReader(canonicalSigner.address, options)), {
+    return { ...this.makeSOCReader(canonicalSigner.address, options),
       upload: uploadSingleOwnerChunkData.bind(null, this.getKy(options), canonicalSigner)
-    });
+    };
   }
   /**
    * Ping the Bee node to see if there is a live Bee node on the given URL.
@@ -1026,11 +935,9 @@ export class Bee {
    */
 
 
-  checkConnection(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options, 'PostageBatchOptions');
-      return status.checkConnection(this.getKy(options));
-    });
+  async checkConnection(options) {
+    assertRequestOptions(options, 'PostageBatchOptions');
+    return status.checkConnection(this.getKy(options));
   }
   /**
    * Ping the Bee node to see if there is a live Bee node on the given URL.
@@ -1040,18 +947,16 @@ export class Bee {
    */
 
 
-  isConnected(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-      assertRequestOptions(options, 'PostageBatchOptions');
+  async isConnected(options) {
+    assertRequestOptions(options, 'PostageBatchOptions');
 
-      try {
-        yield status.checkConnection(this.getKy(options));
-      } catch (e) {
-        return false;
-      }
+    try {
+      await status.checkConnection(this.getKy(options));
+    } catch (e) {
+      return false;
+    }
 
-      return true;
-    });
+    return true;
   }
   /**
    * @param signer