@ethersphere/bee-js 10.4.0 → 11.1.0

package/dist/mjs/bee.js

@@ -953,9 +953,6 @@ export class Bee {
    *
    * @param rawPayload Data to be stored in the chunk. If the data is a string, it will be converted to UTF-8 bytes.
    * @param span       Optional span for the chunk. If not provided, it will be set to the length of the payload.
-   *
-   * @example
-   *
    */
   makeContentAddressedChunk(rawPayload, span) {
     return makeContentAddressedChunk(rawPayload, span);

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

@@ -30,6 +30,9 @@ export async function getReserveState(requestOptions) {
     }),
     storageRadius: Types.asNumber(body.storageRadius, {
       name: 'storageRadius'
+    }),
+    reserveCapacityDoubling: Types.asNumber(body.reserveCapacityDoubling, {
+      name: 'reserveCapacityDoubling'
     })
   };
 }

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

@@ -2,7 +2,7 @@ import { Types } from 'cafe-utility';
 import getMajorSemver from 'semver/functions/major.js';
 import { toBeeMode } from "../../types/debug.js";
 import { http } from "../../utils/http.js";
-export const SUPPORTED_BEE_VERSION_EXACT = '2.6.0-d0aa8b93';
+export const SUPPORTED_BEE_VERSION_EXACT = '2.7.0-6ddf9b45';
 export const SUPPORTED_BEE_VERSION = SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
 export const SUPPORTED_API_VERSION = '7.3.0';
 const NODE_INFO_URL = 'node';

package/dist/mjs/utils/chunk-stream.browser.js

@@ -12,6 +12,10 @@ export async function streamDirectory(_bee, _dir, _postageBatchId, _onUploadProg
   throw new Error('Streaming directories is not supported in browsers!');
 }
 export async function streamFiles(bee, files, postageBatchId, onUploadProgress, options, requestOptions) {
+  const signal = requestOptions?.signal;
+  if (signal?.aborted) {
+    throw new Error('Request aborted');
+  }
   const queue = new AsyncQueue(64, 64);
   let total = 0;
   let processed = 0;
@@ -21,15 +25,28 @@ export async function streamFiles(bee, files, postageBatchId, onUploadProgress,
   postageBatchId = new BatchId(postageBatchId);
   async function onChunk(chunk) {
     await queue.enqueue(async () => {
-      await bee.uploadChunk(postageBatchId, chunk.build(), options, requestOptions);
-      onUploadProgress?.({
-        total,
-        processed: ++processed
-      });
+      if (signal?.aborted) {
+        return;
+      }
+      try {
+        await bee.uploadChunk(postageBatchId, chunk.build(), options, requestOptions);
+        onUploadProgress?.({
+          total,
+          processed: ++processed
+        });
+      } catch (err) {
+        if (signal?.aborted) {
+          return;
+        }
+        throw err;
+      }
     });
   }
   const mantaray = new MantarayNode();
   for (const file of files) {
+    if (signal?.aborted) {
+      throw new Error('Request aborted');
+    }
     const rootChunk = await new Promise((resolve, reject) => {
       const tree = new MerkleTree(onChunk);
       let offset = 0;
@@ -38,6 +55,10 @@ export async function streamFiles(bee, files, postageBatchId, onUploadProgress,
         reject(reader.error);
       };
       const readNextChunk = async () => {
+        if (signal?.aborted) {
+          reject(new Error('Request aborted'));
+          return;
+        }
         if (offset >= file.size) {
           const rootChunk = await tree.finalize();
           resolve(rootChunk);
@@ -75,6 +96,9 @@ export async function streamFiles(bee, files, postageBatchId, onUploadProgress,
       });
     }
   }
+  if (signal?.aborted) {
+    throw new Error('Request aborted');
+  }
   return mantaray.saveRecursively(bee, postageBatchId, options, requestOptions);
 }
 function maybeEnrichMime(mime) {

package/dist/mjs/utils/expose.js

@@ -2,4 +2,4 @@ export { getCollectionSize, makeCollectionFromFileList } from "./collection.js";
 export { getFolderSize } from "./collection.node.js";
 export { makeMaxTarget } from "./pss.js";
 export { approximateOverheadForRedundancyLevel, getRedundancyStat, getRedundancyStats } from "./redundancy.js";
-export { getAmountForDuration, getDepthForSize, getStampCost, getStampDuration, getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage, mapPostageBatch, unmapPostageBatch } from "./stamps.js";
+export { convertEnvelopeToMarshaledStamp, getAmountForDuration, getDepthForSize, getStampCost, getStampDuration, getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage, mapPostageBatch, unmapPostageBatch } from "./stamps.js";

package/dist/mjs/utils/http.js

@@ -10,6 +10,7 @@ const MAX_FAILED_ATTEMPTS = 100000;
 const DELAY_FAST = 200;
 const DELAY_SLOW = 1000;
 const DELAY_THRESHOLD = Dates.minutes(1) / DELAY_FAST;
+const ABORT_ERROR_MESSAGE = 'Request aborted';
 export const DEFAULT_HTTP_CONFIG = {
   headers: {
     accept: 'application/json, text/plain, */*'
@@ -17,6 +18,11 @@ export const DEFAULT_HTTP_CONFIG = {
   maxBodyLength: Infinity,
   maxContentLength: Infinity
 };
+function throwIfAborted(signal, config, responseData, responseStatus) {
+  if (signal?.aborted) {
+    throw new BeeResponseError(config.method || 'get', config.url || '<unknown>', ABORT_ERROR_MESSAGE, responseData, responseStatus, 'ERR_CANCELED');
+  }
+}
 /**
  * Main function to make HTTP requests.
  * @param options User defined settings
@@ -24,6 +30,10 @@ export const DEFAULT_HTTP_CONFIG = {
  */
 export async function http(options, config) {
   const requestConfig = Objects.deepMerge3(DEFAULT_HTTP_CONFIG, config, options);
+  if (options.signal) {
+    requestConfig.signal = options.signal;
+    throwIfAborted(options.signal, config);
+  }
   if (requestConfig.data && typeof Buffer !== 'undefined' && Buffer.isBuffer(requestConfig.data)) {
     requestConfig.data = requestConfig.data.buffer.slice(requestConfig.data.byteOffset, requestConfig.data.byteOffset + requestConfig.data.byteLength);
   }
@@ -38,6 +48,7 @@ export async function http(options, config) {
   }
   let failedAttempts = 0;
   while (failedAttempts < MAX_FAILED_ATTEMPTS) {
+    throwIfAborted(options.signal, config);
     try {
       debug(`${requestConfig.method || 'get'} ${Strings.joinUrl([requestConfig.baseURL, requestConfig.url])}`, {
         headers: {
@@ -50,11 +61,16 @@ export async function http(options, config) {
       return response;
     } catch (e) {
       if (e instanceof AxiosError) {
+        if (e.code === 'ERR_CANCELED') {
+          throwIfAborted({
+            aborted: true
+          }, config, e.response?.data, e.response?.status);
+        }
         if (e.code === 'ECONNABORTED' && options.endlesslyRetry) {
           failedAttempts++;
           await System.sleepMillis(failedAttempts < DELAY_THRESHOLD ? DELAY_FAST : DELAY_SLOW);
         } else {
-          throw new BeeResponseError(config.method || 'get', config.url || '<unknown>', e.message, e.response?.data, e.response?.status, e.code);
+          throw new BeeResponseError(config.method || 'get', config.url || '<unknown>', e.message, e.response?.data, e.response?.status, e.response?.statusText);
         }
       } else {
         throw e;

package/dist/mjs/utils/type.js

@@ -34,7 +34,8 @@ export function prepareBeeRequestOptions(value) {
     httpsAgent: object.httpsAgent,
     endlesslyRetry: Types.asOptional(x => Types.asBoolean(x, {
       name: 'endlesslyRetry'
-    }), object.endlesslyRetry)
+    }), object.endlesslyRetry),
+    signal: object.signal
   };
 }
 export function prepareDownloadOptions(value) {

package/dist/types/bee.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
 import { Chunk } from './chunk/cac';
 import { SingleOwnerChunk } from './chunk/soc';
@@ -618,9 +617,6 @@ export declare class Bee {
      *
      * @param rawPayload Data to be stored in the chunk. If the data is a string, it will be converted to UTF-8 bytes.
      * @param span       Optional span for the chunk. If not provided, it will be set to the length of the payload.
-     *
-     * @example
-     *
      */
     makeContentAddressedChunk(rawPayload: Bytes | Uint8Array | string, span?: Span | bigint): Chunk;
     /**

package/dist/types/index.d.ts

@@ -15,6 +15,7 @@ export * as Utils from './utils/expose';
 export { Size } from './utils/size';
 export * from './utils/tokens';
 export * from './utils/typed-bytes';
+export type { UploadProgress } from './utils/upload-progress';
 export { Bee, BeeDev, Stamper };
 declare global {
     interface Window {

package/dist/types/modules/bzz.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
 import { BeeRequestOptions, Collection, CollectionUploadOptions, DownloadOptions, FileData, FileUploadOptions, UploadResult } from '../types';
 import { Bytes } from '../utils/bytes';

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

@@ -1,7 +1,7 @@
 import { BeeRequestOptions } from '../../index';
 import type { DebugStatus, Health, NodeInfo, Readiness } from '../../types/debug';
 import { BeeVersions } from '../../types/debug';
-export declare const SUPPORTED_BEE_VERSION_EXACT = "2.6.0-d0aa8b93";
+export declare const SUPPORTED_BEE_VERSION_EXACT = "2.7.0-6ddf9b45";
 export declare const SUPPORTED_BEE_VERSION: string;
 export declare const SUPPORTED_API_VERSION = "7.3.0";
 export declare function getDebugStatus(requestOptions: BeeRequestOptions): Promise<DebugStatus>;

package/dist/types/modules/gsoc.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="ws" />
 import WebSocket from 'isomorphic-ws';
 import { BeeRequestOptions, UploadOptions } from '..';
 import { SingleOwnerChunk } from '../chunk/soc';

package/dist/types/modules/pss.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="ws" />
 import WebSocket from 'isomorphic-ws';
 import type { BeeRequestOptions } from '../types';
 import { BatchId, PublicKey, Topic } from '../utils/typed-bytes';

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

@@ -212,6 +212,7 @@ export interface ReserveState {
     radius: number;
     storageRadius: number;
     commitment: number;
+    reserveCapacityDoubling: number;
 }
 export interface ChainState {
     chainTip: number;

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

@@ -39,6 +39,7 @@ export type BeeRequestOptions = {
     httpAgent?: unknown;
     httpsAgent?: unknown;
     endlesslyRetry?: boolean;
+    signal?: AbortSignal;
 };
 /**
  * Options for the Bee client which affect all method calls *(unless overridden in the method call itself)*.

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

@@ -2,6 +2,6 @@ import { BatchId, Topic } from './typed-bytes';
 export declare const SWARM_GATEWAY_URL = "https://api.gateway.ethswarm.org";
 export declare const NULL_STAMP: BatchId;
 export declare const NULL_TOPIC: Topic;
-export declare const NULL_ADDRESS: Uint8Array;
-export declare const NULL_IDENTIFIER: Uint8Array;
-export declare const NULL_OWNER: Uint8Array;
+export declare const NULL_ADDRESS: Uint8Array<ArrayBuffer>;
+export declare const NULL_IDENTIFIER: Uint8Array<ArrayBuffer>;
+export declare const NULL_OWNER: Uint8Array<ArrayBuffer>;

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

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

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

@@ -2,4 +2,4 @@ export { getCollectionSize, makeCollectionFromFileList } from './collection';
 export { getFolderSize } from './collection.node';
 export { makeMaxTarget } from './pss';
 export { approximateOverheadForRedundancyLevel, getRedundancyStat, getRedundancyStats } from './redundancy';
-export { getAmountForDuration, getDepthForSize, getStampCost, getStampDuration, getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage, mapPostageBatch, unmapPostageBatch, } from './stamps';
+export { convertEnvelopeToMarshaledStamp, getAmountForDuration, getDepthForSize, getStampCost, getStampDuration, getStampEffectiveBytes, getStampEffectiveBytesBreakpoints, getStampTheoreticalBytes, getStampUsage, mapPostageBatch, unmapPostageBatch, } from './stamps';

package/dist/types/utils/tar.browser.d.ts

@@ -1,7 +1,7 @@
 export declare class TarStream {
     pieces: Uint8Array[];
     currentFileSize: number;
-    get output(): Uint8Array;
+    get output(): Uint8Array<ArrayBufferLike>;
     beginFile(path: string, size: number): void;
     appendFile(data: Uint8Array): Promise<void>;
     endFile(): Promise<void>;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { PassThrough } from 'stream';
 export declare class TarStream {
     output: PassThrough;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as stream from 'stream';
 import { AllTagsOptions, BeeRequestOptions, CollectionUploadOptions, DownloadOptions, FileUploadOptions, GsocMessageHandler, NumberString, PostageBatchOptions, PssMessageHandler, RedundantUploadOptions, Tag, TransactionOptions, UploadOptions } from '../types';
 export declare function isReadable(value: unknown): value is stream.Readable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "10.4.0",
+  "version": "11.1.0",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -50,19 +50,19 @@
     "dist"
   ],
   "scripts": {
-    "prepublishOnly": "cross-env NODE_ENV=production npm run build",
+    "prepublishOnly": "NODE_ENV=production npm run build",
     "build": "rimraf dist && npm run build:node && npm run build:types && npm run build:browser",
     "build:node": "tsc -p tsconfig.json && tsc -p tsconfig-mjs.json && ./build-fixup && babel --plugins \"babel-plugin-add-import-extension\" --out-dir dist/mjs/ dist/mjs/",
     "build:types": "tsc --emitDeclarationOnly --declaration --outDir dist/types",
     "build:browser": "webpack --progress",
-    "test": "jest --config=jest.config.ts --runInBand --verbose --forceExit",
+    "test": "TS_NODE_PROJECT=tsconfig.test.json jest --runInBand --verbose --forceExit",
     "check": "tsc --project tsconfig.test.json",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\" && prettier --check \"src/**/*.ts\" \"test/**/*.ts\"",
     "depcheck": "depcheck ."
   },
   "dependencies": {
-    "axios": "^0.30.0",
-    "cafe-utility": "^33.3.4",
+    "axios": "^0.30.2",
+    "cafe-utility": "^33.6.1",
     "debug": "^4.4.1",
     "isomorphic-ws": "^4.0.1",
     "semver": "^7.3.5",
@@ -77,10 +77,8 @@
     "@babel/preset-typescript": "^7.18.6",
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.4.2",
-    "@jest/types": "^29.6.3",
-    "@naholyr/cross-env": "^1.0.0",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.13",
+    "@types/jest": "^30.0.0",
     "@types/node": "^18.11.11",
     "@types/semver": "^7.3.9",
     "@types/ws": "^8.5.3",
@@ -88,20 +86,19 @@
     "@typescript-eslint/parser": "^5.46.0",
     "babel-loader": "^9.1.0",
     "babel-plugin-add-import-extension": "^1.6.0",
-    "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",
     "husky": "^8.0.1",
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.1",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
+    "ts-jest": "^29.4.6",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   }