@ethersphere/bee-js 8.0.2 → 8.1.0

package/dist/mjs/bee.js

@@ -78,7 +78,10 @@ export class Bee {
   async uploadData(postageBatchId, data, options, requestOptions) {
     assertBatchId(postageBatchId);
     assertData(data);
-    if (options) assertUploadOptions(options);
+    assertRequestOptions(requestOptions);
+    if (options) {
+      assertUploadOptions(options);
+    }
     return bytes.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
   }
   /**
@@ -124,6 +127,7 @@ export class Bee {
    */
   async uploadChunk(postageBatchId, data, options, requestOptions) {
     assertBatchId(postageBatchId);
+    assertRequestOptions(requestOptions);
     if (!(data instanceof Uint8Array)) {
       throw new TypeError('Data has to be Uint8Array instance!');
     }
@@ -133,7 +137,9 @@ export class Bee {
     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);
+    if (options) {
+      assertUploadOptions(options);
+    }
     return chunk.upload(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options);
   }
   /**
@@ -162,6 +168,7 @@ export class Bee {
    * @returns A promise that resolves to a `GranteesResult` object.
    */
   async createGrantees(postageBatchId, grantees, requestOptions) {
+    assertRequestOptions(requestOptions);
     assertBatchId(postageBatchId);
     return grantee.createGrantees(this.getRequestOptionsForCall(requestOptions), postageBatchId, grantees);
   }
@@ -173,6 +180,7 @@ export class Bee {
    * @returns A promise that resolves to a `GetGranteesResult` object.
    */
   async getGrantees(reference, requestOptions) {
+    assertRequestOptions(requestOptions);
     return grantee.getGrantees(reference, this.getRequestOptionsForCall(requestOptions));
   }
   /**
@@ -186,6 +194,7 @@ export class Bee {
    * @returns A Promise that resolves to to a `GranteesResult` object.
    */
   async patchGrantees(postageBatchId, reference, history, grantees, requestOptions) {
+    assertRequestOptions(requestOptions);
     assertBatchId(postageBatchId);
     return grantee.patchGrantees(postageBatchId, reference, history, {
       add: grantees.add || [],
@@ -209,9 +218,12 @@ export class Bee {
    * @returns reference is a content hash of the file
    */
   async uploadFile(postageBatchId, data, name, options, requestOptions) {
+    assertRequestOptions(requestOptions);
     assertBatchId(postageBatchId);
     assertFileData(data);
-    if (options) assertFileUploadOptions(options);
+    if (options) {
+      assertFileUploadOptions(options);
+    }
     if (name && typeof name !== 'string') {
       throw new TypeError('name has to be string or undefined!');
     }
@@ -284,8 +296,11 @@ export class Bee {
    * @see [Bee API reference - `POST /bzz`](https://docs.ethswarm.org/api/#tag/BZZ/paths/~1bzz/post)
    */
   async uploadFiles(postageBatchId, fileList, options, requestOptions) {
+    assertRequestOptions(requestOptions);
     assertBatchId(postageBatchId);
-    if (options) assertCollectionUploadOptions(options);
+    if (options) {
+      assertCollectionUploadOptions(options);
+    }
     const data = await makeCollectionFromFileList(fileList);
     return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), ReferenceType.MANIFEST);
   }
@@ -299,11 +314,12 @@ export class Bee {
    * @param collection
    * @param options Collections and request options
    */
-  async uploadCollection(postageBatchId, collection, options) {
+  async uploadCollection(postageBatchId, collection, options, requestOptions) {
+    assertRequestOptions(requestOptions);
     assertBatchId(postageBatchId);
     assertCollection(collection);
     if (options) assertCollectionUploadOptions(options);
-    return addCidConversionFunction(await bzz.uploadCollection(this.requestOptions, collection, postageBatchId, options), ReferenceType.MANIFEST);
+    return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(this.requestOptions), collection, postageBatchId, options), ReferenceType.MANIFEST);
   }
   /**
    * Upload collection of files.
@@ -323,6 +339,7 @@ export class Bee {
    */
   async uploadFilesFromDirectory(postageBatchId, dir, options, requestOptions) {
     assertBatchId(postageBatchId);
+    assertRequestOptions(requestOptions);
     if (options) assertCollectionUploadOptions(options);
     const data = await makeCollectionFromFS(dir);
     return addCidConversionFunction(await bzz.uploadCollection(this.getRequestOptionsForCall(requestOptions), data, postageBatchId, options), ReferenceType.MANIFEST);
@@ -350,10 +367,10 @@ export class Bee {
    * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/develop/access-the-swarm/syncing)
    * @see [Bee API reference - `GET /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/get)
    */
-  async getAllTags(options) {
-    assertRequestOptions(options);
+  async getAllTags(options, requestOptions) {
+    assertRequestOptions(requestOptions);
     assertAllTagsOptions(options);
-    return tag.getAllTags(this.getRequestOptionsForCall(options), options?.offset, options?.limit);
+    return tag.getAllTags(this.getRequestOptionsForCall(requestOptions), options?.offset, options?.limit);
   }
   /**
    * Retrieve tag information from Bee node
@@ -515,7 +532,7 @@ export class Bee {
         await this.makeFeedReader(type, canonicalTopic, canonicalOwner).download();
         return true;
       } catch (e) {
-        if (e?.response?.status === 404) {
+        if (e?.status === 404 || e?.status === 500) {
           return false;
         }
         throw e;
@@ -745,7 +762,7 @@ export class Bee {
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
    */
   async setJsonFeed(postageBatchId, topic, data, options, requestOptions) {
-    assertRequestOptions(options, 'JsonFeedOptions');
+    assertRequestOptions(requestOptions, 'JsonFeedOptions');
     assertBatchId(postageBatchId);
     const hashedTopic = this.makeFeedTopic(topic);
     const feedType = options?.type ?? DEFAULT_FEED_TYPE;
@@ -771,8 +788,8 @@ export class Bee {
    *
    * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
    */
-  async getJsonFeed(topic, options) {
-    assertRequestOptions(options, 'JsonFeedOptions');
+  async getJsonFeed(topic, options, requestOptions) {
+    assertRequestOptions(requestOptions);
     const hashedTopic = this.makeFeedTopic(topic);
     const feedType = options?.type ?? DEFAULT_FEED_TYPE;
     if (options?.signer && options?.address) {
@@ -792,7 +809,7 @@ export class Bee {
         }
       }
     }
-    const reader = this.makeFeedReader(feedType, hashedTopic, address, options);
+    const reader = this.makeFeedReader(feedType, hashedTopic, address, requestOptions);
     return getJsonData(this, reader);
   }
   /**
@@ -1007,6 +1024,7 @@ export class Bee {
   async cashoutLastCheque(address, options, requestOptions) {
     assertCashoutOptions(options);
     assertAddress(address);
+    assertRequestOptions(requestOptions);
     return chequebook.cashoutLastCheque(this.getRequestOptionsForCall(requestOptions), address, options);
   }
   /**
@@ -1189,6 +1207,7 @@ export class Bee {
     assertPostageBatchOptions(options);
     assertPositiveInteger(amount);
     assertNonNegativeInteger(depth);
+    assertRequestOptions(requestOptions);
     if (depth < STAMPS_DEPTH_MIN) {
       throw new BeeArgumentError(`Depth has to be at least ${STAMPS_DEPTH_MIN}`, depth);
     }
@@ -1348,8 +1367,8 @@ export class Bee {
    * @param options
    */
   async depositStake(amount, options, requestOptions) {
-    assertRequestOptions(options);
     assertTransactionOptions(options);
+    assertRequestOptions(requestOptions);
     await stake.stake(this.getRequestOptionsForCall(requestOptions), amount, options);
   }
   /**
@@ -1386,7 +1405,7 @@ export class Bee {
     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.');
+    throw new TypeError('You have to pass Signer as property to either the method call or constructor! Non found.');
   }
   getRequestOptionsForCall(options) {
     return options ? Objects.deepMerge2(this.requestOptions, options) : this.requestOptions;

package/dist/mjs/feed/json.js

@@ -20,5 +20,7 @@ export async function setJsonData(bee, writer, postageBatchId, data, options, re
   const {
     reference
   } = await bee.uploadData(postageBatchId, serializedData, options, requestOptions);
-  return writer.upload(postageBatchId, reference);
+  return writer.upload(postageBatchId, reference, {
+    pin: options?.pin
+  });
 }

package/dist/mjs/feed/retrievable.js

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

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

@@ -1,9 +1,8 @@
 import getMajorSemver from 'semver/functions/major.js';
 import { http } from "../../utils/http.js"; // Following lines bellow are automatically updated with GitHub Action when Bee version is updated
 // so if you are changing anything about them change the `update_bee` action accordingly!
-export const SUPPORTED_BEE_VERSION_EXACT = '1.18.2-759f56f';
-export const SUPPORTED_API_VERSION = '4.0.0';
-export const SUPPORTED_DEBUG_API_VERSION = '4.0.0';
+export const SUPPORTED_BEE_VERSION_EXACT = '2.2.0-06a0aca7';
+export const SUPPORTED_API_VERSION = '7.1.0';
 export const SUPPORTED_BEE_VERSION = SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
 const NODE_INFO_URL = 'node';
 const STATUS_URL = 'status';

package/dist/mjs/modules/pinning.js

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

package/dist/mjs/utils/error.js

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

package/dist/mjs/utils/file.js

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

package/dist/mjs/utils/http.js

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

package/dist/mjs/utils/type.js

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

package/dist/types/bee.d.ts

@@ -190,7 +190,7 @@ export declare class Bee {
      * @param collection
      * @param options Collections and request options
      */
-    uploadCollection(postageBatchId: string | BatchId, collection: Collection, options?: CollectionUploadOptions & UploadRedundancyOptions): Promise<UploadResultWithCid>;
+    uploadCollection(postageBatchId: string | BatchId, collection: Collection, options?: CollectionUploadOptions & UploadRedundancyOptions, requestOptions?: BeeRequestOptions): Promise<UploadResultWithCid>;
     /**
      * Upload collection of files.
      *
@@ -228,7 +228,7 @@ export declare class Bee {
      * @see [Bee docs - Syncing / Tags](https://docs.ethswarm.org/docs/develop/access-the-swarm/syncing)
      * @see [Bee API reference - `GET /tags`](https://docs.ethswarm.org/api/#tag/Tag/paths/~1tags/get)
      */
-    getAllTags(options?: AllTagsOptions): Promise<Tag[]>;
+    getAllTags(options?: AllTagsOptions, requestOptions?: BeeRequestOptions): Promise<Tag[]>;
     /**
      * Retrieve tag information from Bee node
      *
@@ -464,7 +464,7 @@ export declare class Bee {
      *
      * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
      */
-    setJsonFeed<T extends AnyJson>(postageBatchId: string | BatchId, topic: string, data: T, options?: JsonFeedOptions, requestOptions?: BeeRequestOptions): Promise<UploadResult>;
+    setJsonFeed<T extends AnyJson>(postageBatchId: string | BatchId, topic: string, data: T, options?: JsonFeedOptions & UploadOptions, requestOptions?: BeeRequestOptions): Promise<UploadResult>;
     /**
      * High-level function that allows you to easily get data from feed.
      * Returned data are parsed using JSON.parse().
@@ -484,7 +484,7 @@ export declare class Bee {
      *
      * @see [Bee docs - Feeds](https://docs.ethswarm.org/docs/develop/tools-and-features/feeds)
      */
-    getJsonFeed<T extends AnyJson>(topic: string, options?: JsonFeedOptions): Promise<T>;
+    getJsonFeed<T extends AnyJson>(topic: string, options?: JsonFeedOptions, requestOptions?: BeeRequestOptions): Promise<T>;
     /**
      * Make a new feed topic from a string
      *

package/dist/types/modules/debug/status.d.ts

@@ -1,9 +1,8 @@
 import { BeeRequestOptions } from '../../index';
 import type { DebugStatus, Health, NodeInfo } from '../../types/debug';
 import { BeeVersions } from '../../types/debug';
-export declare const SUPPORTED_BEE_VERSION_EXACT = "1.18.2-759f56f";
-export declare const SUPPORTED_API_VERSION = "4.0.0";
-export declare const SUPPORTED_DEBUG_API_VERSION = "4.0.0";
+export declare const SUPPORTED_BEE_VERSION_EXACT = "2.2.0-06a0aca7";
+export declare const SUPPORTED_API_VERSION = "7.1.0";
 export declare const SUPPORTED_BEE_VERSION: string;
 export declare function getDebugStatus(requestOptions: BeeRequestOptions): Promise<DebugStatus>;
 /**

package/dist/types/types/index.d.ts

@@ -71,7 +71,6 @@ export type AddressPrefix = HexString;
 export type BeeRequestOptions = {
     baseURL?: string;
     timeout?: number | false;
-    retry?: number | false;
     headers?: Record<string, string>;
     onRequest?: (request: BeeRequest) => void;
 };

package/dist/types/utils/error.d.ts

@@ -6,7 +6,10 @@ export declare class BeeArgumentError extends BeeError {
     constructor(message: string, value: unknown);
 }
 export declare class BeeResponseError extends BeeError {
+    method: string;
+    url: string;
+    responseBody?: any;
     status?: number | undefined;
     statusText?: string | undefined;
-    constructor(message: string, status?: number | undefined, statusText?: string | undefined);
+    constructor(method: string, url: string, message: string, responseBody?: any, status?: number | undefined, statusText?: string | undefined);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "8.0.2",
+  "version": "8.1.0",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -52,12 +52,13 @@
     "build:types": "tsc --emitDeclarationOnly --declaration --outDir dist/types",
     "build:browser": "webpack --progress",
     "mock-ci": "npm run lint:check && npm run check:types && npm run test",
-    "test": "mocha",
+    "test": "jest --config=jest.config.ts --runInBand --verbose",
+    "test:coverage": "jest --config=jest.config.ts --coverage",
     "check:types": "tsc --project tsconfig.test.json",
     "lint": "eslint --fix \"src/**/*.ts\" \"test/**/*.ts\" && prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "lint:check": "eslint \"src/**/*.ts\" \"test/**/*.ts\" && prettier --check \"src/**/*.ts\" \"test/**/*.ts\"",
     "depcheck": "depcheck .",
-    "bee": "npx fdp-play start --detach --fresh"
+    "bee": "npx @fairdatasociety/fdp-play@3.2.0 start --detach --fresh"
   },
   "dependencies": {
     "@ethersphere/swarm-cid": "^0.1.0",
@@ -79,42 +80,38 @@
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.4.2",
     "@fluffy-spoon/substitute": "^1.208.0",
+    "@jest/types": "^29.6.3",
     "@naholyr/cross-env": "^1.0.0",
-    "@types/chai": "^4.3.4",
-    "@types/chai-as-promised": "^7.1.5",
     "@types/elliptic": "^6.4.14",
-    "@types/mocha": "^10.0.1",
+    "@types/jest": "^29.5.13",
     "@types/node": "^18.11.11",
     "@types/semver": "^7.3.9",
-    "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.9",
     "@types/ws": "^8.5.3",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
     "@typescript-eslint/parser": "^5.46.0",
     "babel-loader": "^9.1.0",
     "babel-plugin-add-import-extension": "^1.6.0",
-    "chai": "^4.3.7",
-    "chai-as-promised": "^7.1.1",
-    "chai-parentheses": "^0.0.2",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.7",
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "expect": "^29.4.0",
     "husky": "^8.0.1",
-    "mocha": "^10.2.0",
+    "jest": "^29.7.0",
     "nock": "^13.3.0",
     "playwright-test": "^8.1.2",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
-    "sinon": "^15.0.1",
-    "sinon-chai": "^3.7.0",
     "terser-webpack-plugin": "^5.3.1",
+    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
+  },
+  "engines": {
+    "bee": "2.2.0-06a0aca7",
+    "beeApiVersion": "7.1.0"
   }
 }