@ethersphere/bee-js 11.0.0 → 11.1.1

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

@@ -17,6 +17,10 @@ async function streamDirectory(_bee, _dir, _postageBatchId, _onUploadProgress, _
     throw new Error('Streaming directories is not supported in browsers!');
 }
 async function streamFiles(bee, files, postageBatchId, onUploadProgress, options, requestOptions) {
+    const signal = requestOptions?.signal;
+    if (signal?.aborted) {
+        throw new Error('Request aborted');
+    }
     const queue = new cafe_utility_1.AsyncQueue(64, 64);
     let total = 0;
     let processed = 0;
@@ -26,12 +30,26 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
     postageBatchId = new typed_bytes_1.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 manifest_1.MantarayNode();
     for (const file of files) {
+        if (signal?.aborted) {
+            throw new Error('Request aborted');
+        }
         const rootChunk = await new Promise((resolve, reject) => {
             const tree = new cafe_utility_1.MerkleTree(onChunk);
             let offset = 0;
@@ -40,6 +58,10 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
                 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);
@@ -74,6 +96,9 @@ async function streamFiles(bee, files, postageBatchId, onUploadProgress, options
             });
         }
     }
+    if (signal?.aborted) {
+        throw new Error('Request aborted');
+    }
     return mantaray.saveRecursively(bee, postageBatchId, options, requestOptions);
 }
 function maybeEnrichMime(mime) {

package/dist/cjs/utils/http.js

@@ -15,6 +15,7 @@ const MAX_FAILED_ATTEMPTS = 100000;
 const DELAY_FAST = 200;
 const DELAY_SLOW = 1000;
 const DELAY_THRESHOLD = cafe_utility_1.Dates.minutes(1) / DELAY_FAST;
+const ABORT_ERROR_MESSAGE = 'Request aborted';
 exports.DEFAULT_HTTP_CONFIG = {
     headers: {
         accept: 'application/json, text/plain, */*',
@@ -22,6 +23,11 @@ exports.DEFAULT_HTTP_CONFIG = {
     maxBodyLength: Infinity,
     maxContentLength: Infinity,
 };
+function throwIfAborted(signal, config, responseData, responseStatus) {
+    if (signal?.aborted) {
+        throw new index_1.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
@@ -29,9 +35,11 @@ exports.DEFAULT_HTTP_CONFIG = {
  */
 async function http(options, config) {
     const requestConfig = cafe_utility_1.Objects.deepMerge3(exports.DEFAULT_HTTP_CONFIG, config, options);
-    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);
+    if (options.signal) {
+        requestConfig.signal = options.signal;
+        throwIfAborted(options.signal, config);
     }
+    maybeReplaceBodyBuffers(requestConfig);
     if (requestConfig.params) {
         const keys = Object.keys(requestConfig.params);
         for (const key of keys) {
@@ -43,6 +51,7 @@ async function http(options, config) {
     }
     let failedAttempts = 0;
     while (failedAttempts < MAX_FAILED_ATTEMPTS) {
+        throwIfAborted(options.signal, config);
         try {
             debug(`${requestConfig.method || 'get'} ${cafe_utility_1.Strings.joinUrl([
                 requestConfig.baseURL,
@@ -54,12 +63,15 @@ async function http(options, config) {
         }
         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 cafe_utility_1.System.sleepMillis(failedAttempts < DELAY_THRESHOLD ? DELAY_FAST : DELAY_SLOW);
                 }
                 else {
-                    throw new index_1.BeeResponseError(config.method || 'get', config.url || '<unknown>', e.message, e.response?.data, e.response?.status, e.code);
+                    throw new index_1.BeeResponseError(config.method || 'get', config.url || '<unknown>', e.message, e.response?.data, e.response?.status, e.response?.statusText);
                 }
             }
             else {
@@ -79,3 +91,11 @@ function maybeRunOnRequestHook(options, requestConfig) {
         });
     }
 }
+function maybeReplaceBodyBuffers(config) {
+    if (config.data && config.data instanceof Uint8Array) {
+        config.data = config.data.buffer.slice(config.data.byteOffset, config.data.byteOffset + config.data.byteLength);
+    }
+    if (config.data && typeof Buffer !== 'undefined' && Buffer.isBuffer(config.data)) {
+        config.data = config.data.buffer.slice(config.data.byteOffset, config.data.byteOffset + config.data.byteLength);
+    }
+}

package/dist/cjs/utils/type.js

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