@ethersphere/bee-js 11.0.0 → 11.1.0

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "axios": "^0.30.2",
-    "cafe-utility": "^33.3.4",
+    "cafe-utility": "^33.6.1",
     "debug": "^4.4.1",
     "isomorphic-ws": "^4.0.1",
     "semver": "^7.3.5",