@ethersphere/bee-js 5.2.0 → 6.0.0-pre.1

package/dist/cjs/modules/stewardship.js

@@ -10,19 +10,19 @@ const stewardshipEndpoint = 'stewardship';
  * @param options
  * @throws BeeResponseError if not locally pinned or invalid data
  */
-async function reupload(kyOptions, reference) {
-    await (0, http_1.http)(kyOptions, {
+async function reupload(requestOptions, reference) {
+    await (0, http_1.http)(requestOptions, {
         method: 'put',
-        path: `${stewardshipEndpoint}/${reference}`,
+        url: `${stewardshipEndpoint}/${reference}`,
     });
 }
 exports.reupload = reupload;
-async function isRetrievable(kyOptions, reference) {
-    const response = await (0, http_1.http)(kyOptions, {
+async function isRetrievable(requestOptions, reference) {
+    const response = await (0, http_1.http)(requestOptions, {
         method: 'get',
         responseType: 'json',
-        path: `${stewardshipEndpoint}/${reference}`,
+        url: `${stewardshipEndpoint}/${reference}`,
     });
-    return response.parsedData.isRetrievable;
+    return response.data.isRetrievable;
 }
 exports.isRetrievable = isRetrievable;

package/dist/cjs/modules/tag.js

@@ -8,13 +8,13 @@ const endpoint = 'tags';
  *
  * @param url Bee tag URL
  */
-async function createTag(kyOptions) {
-    const response = await (0, http_1.http)(kyOptions, {
+async function createTag(requestOptions) {
+    const response = await (0, http_1.http)(requestOptions, {
         method: 'post',
-        path: endpoint,
+        url: endpoint,
         responseType: 'json',
     });
-    return response.parsedData;
+    return response.data;
 }
 exports.createTag = createTag;
 /**
@@ -23,12 +23,12 @@ exports.createTag = createTag;
  * @param url Bee tag URL
  * @param uid UID of tag to be retrieved
  */
-async function retrieveTag(kyOptions, uid) {
-    const response = await (0, http_1.http)(kyOptions, {
-        path: `${endpoint}/${uid}`,
+async function retrieveTag(requestOptions, uid) {
+    const response = await (0, http_1.http)(requestOptions, {
+        url: `${endpoint}/${uid}`,
         responseType: 'json',
     });
-    return response.parsedData;
+    return response.data;
 }
 exports.retrieveTag = retrieveTag;
 /**
@@ -38,13 +38,13 @@ exports.retrieveTag = retrieveTag;
  * @param offset
  * @param limit
  */
-async function getAllTags(kyOptions, offset, limit) {
-    const response = await (0, http_1.http)(kyOptions, {
-        path: `${endpoint}`,
-        searchParams: { offset, limit },
+async function getAllTags(requestOptions, offset, limit) {
+    const response = await (0, http_1.http)(requestOptions, {
+        url: endpoint,
+        params: { offset, limit },
         responseType: 'json',
     });
-    return response.parsedData.tags;
+    return response.data.tags;
 }
 exports.getAllTags = getAllTags;
 /**
@@ -52,10 +52,10 @@ exports.getAllTags = getAllTags;
  * @param url
  * @param uid
  */
-async function deleteTag(kyOptions, uid) {
-    await (0, http_1.http)(kyOptions, {
+async function deleteTag(requestOptions, uid) {
+    await (0, http_1.http)(requestOptions, {
         method: 'delete',
-        path: `${endpoint}/${uid}`,
+        url: `${endpoint}/${uid}`,
     });
 }
 exports.deleteTag = deleteTag;
@@ -65,11 +65,11 @@ exports.deleteTag = deleteTag;
  * @param uid
  * @param reference
  */
-async function updateTag(kyOptions, uid, reference) {
-    await (0, http_1.http)(kyOptions, {
+async function updateTag(requestOptions, uid, reference) {
+    await (0, http_1.http)(requestOptions, {
         method: 'patch',
-        path: `${endpoint}/${uid}`,
-        json: {
+        url: `${endpoint}/${uid}`,
+        data: {
             reference,
         },
     });

package/dist/cjs/utils/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BeeNotAJsonError = exports.BeeResponseError = exports.BeeRequestError = exports.BeeArgumentError = exports.BeeError = void 0;
+exports.BeeArgumentError = exports.BeeError = void 0;
 class BeeError extends Error {
     constructor(message) {
         super(message);
@@ -14,37 +14,3 @@ class BeeArgumentError extends BeeError {
     }
 }
 exports.BeeArgumentError = BeeArgumentError;
-class BeeRequestError extends BeeError {
-    /**
-     * @param message
-     * @param requestOptions KyOptions that were used to assemble the request. THIS MIGHT NOT BE COMPLETE! If custom Ky instance was used that has set defaults then these defaults are not visible in this object!
-     */
-    constructor(message, requestOptions) {
-        super(message);
-        this.requestOptions = requestOptions;
-    }
-}
-exports.BeeRequestError = BeeRequestError;
-class BeeResponseError extends BeeError {
-    /**
-     * @param status HTTP status code number
-     * @param response Response returned from the server
-     * @param responseBody Response body as string which is returned from response.text() call
-     * @param requestOptions KyOptions that were used to assemble the request. THIS MIGHT NOT BE COMPLETE! If custom Ky instance was used that has set defaults then these defaults are not visible in this object!
-     * @param message
-     */
-    constructor(status, response, responseBody, requestOptions, message) {
-        super(message);
-        this.status = status;
-        this.response = response;
-        this.responseBody = responseBody;
-        this.requestOptions = requestOptions;
-    }
-}
-exports.BeeResponseError = BeeResponseError;
-class BeeNotAJsonError extends BeeError {
-    constructor() {
-        super(`Received response is not valid JSON.`);
-    }
-}
-exports.BeeNotAJsonError = BeeNotAJsonError;

package/dist/cjs/utils/headers.js

@@ -29,9 +29,9 @@ function readTagUid(header) {
     return parseInt(header, 10);
 }
 function readFileHeaders(headers) {
-    const name = readContentDispositionFilename(headers.get('content-disposition'));
-    const tagUid = readTagUid(headers.get('swarm-tag-uid'));
-    const contentType = headers.get('content-type') || undefined;
+    const name = readContentDispositionFilename(headers['content-disposition']);
+    const tagUid = readTagUid(headers['swarm-tag-uid']);
+    const contentType = headers['content-type'] || undefined;
     return {
         name,
         tagUid,

package/dist/cjs/utils/http.js

@@ -1,157 +1,30 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.http = exports.filterHeaders = exports.wrapResponseClosure = exports.wrapRequestClosure = exports.DEFAULT_KY_CONFIG = void 0;
-const error_1 = require("./error");
-const stream_1 = require("./stream");
-const type_1 = require("./type");
-const merge_1 = require("./merge");
-exports.DEFAULT_KY_CONFIG = {
+exports.http = exports.DEFAULT_HTTP_CONFIG = void 0;
+const axios_1 = __importDefault(require("axios"));
+const cafe_utility_1 = require("cafe-utility");
+exports.DEFAULT_HTTP_CONFIG = {
     headers: {
         accept: 'application/json, text/plain, */*',
         'user-agent': `bee-js`,
     },
 };
-function isHttpError(e) {
-    return (0, type_1.isObject)(e) && typeof e.response !== 'undefined';
-}
-function isHttpRequestError(e) {
-    return (0, type_1.isObject)(e) && typeof e.request !== 'undefined';
-}
-function headersToObject(header) {
-    return [...header.entries()].reduce((obj, [key, val]) => {
-        obj[key] = val;
-        return obj;
-    }, {});
-}
-function wrapRequest(request) {
-    return {
-        url: request.url,
-        method: request.method.toUpperCase(),
-        headers: headersToObject(request.headers),
-    };
-}
-function wrapRequestClosure(cb) {
-    return async (request) => {
-        await cb(wrapRequest(request));
-    };
-}
-exports.wrapRequestClosure = wrapRequestClosure;
-function wrapResponseClosure(cb) {
-    return async (request, options, response) => {
-        await cb({
-            headers: headersToObject(response.headers),
-            status: response.status,
-            statusText: response.statusText,
-            request: wrapRequest(request),
-        });
-    };
-}
-exports.wrapResponseClosure = wrapResponseClosure;
-/**
- * Filters out entries that has undefined value from headers object.
- * Modifies the original object!
- *
- * @param obj
- */
-// eslint-disable-next-line @typescript-eslint/ban-types
-function filterHeaders(obj) {
-    if (obj === undefined) {
-        return undefined;
-    }
-    (0, type_1.isStrictlyObject)(obj);
-    const typedObj = obj;
-    for (const key in typedObj) {
-        if (typedObj[key] === undefined) {
-            delete typedObj[key];
-        }
-    }
-    if (Object.keys(typedObj).length === 0) {
-        return undefined;
-    }
-    return typedObj;
-}
-exports.filterHeaders = filterHeaders;
 /**
- * Main utility function to make HTTP requests.
- * @param kyOptions
- * @param config
+ * Main function to make HTTP requests.
+ * @param options User defined settings
+ * @param config Internal settings and/or Bee settings
  */
-async function http(kyOptions, config) {
+async function http(options, config) {
     try {
-        const ky = await getKy();
-        const { path, responseType, ...kyConfig } = (0, merge_1.deepMerge)(kyOptions, config);
-        const response = (await ky(path, {
-            ...kyConfig,
-            searchParams: filterHeaders(kyConfig.searchParams),
-        }));
-        switch (responseType) {
-            case 'stream':
-                if (!response.body) {
-                    throw new error_1.BeeError('Response was expected to get data but did not get any!');
-                }
-                response.parsedData = (0, stream_1.normalizeToReadableStream)(response.body);
-                break;
-            case 'arraybuffer':
-                response.parsedData = (await response.arrayBuffer());
-                break;
-            case 'json':
-                try {
-                    response.parsedData = (await response.json());
-                }
-                catch (e) {
-                    throw new error_1.BeeNotAJsonError();
-                }
-                break;
-            default:
-                break; // If responseType is not set, then no data are expected
-        }
+        const requestConfig = cafe_utility_1.Objects.deepMerge3(exports.DEFAULT_HTTP_CONFIG, config, options);
+        const response = await (0, axios_1.default)(requestConfig);
         return response;
     }
     catch (e) {
-        // Passthrough thrown errors
-        if (e instanceof error_1.BeeNotAJsonError) {
-            throw e;
-        }
-        if (isHttpError(e)) {
-            let message;
-            // We store the response body here as it can be read only once in Response's lifecycle so to make it exposed
-            // to the user in the BeeResponseError, for further analysis.
-            const body = await e.response.text();
-            try {
-                // The response can be Bee's JSON with structure `{code, message}` lets try to parse it
-                message = JSON.parse(body).message;
-            }
-            catch (e) { }
-            if (message) {
-                throw new error_1.BeeResponseError(e.response.status, e.response, body, config, `${e.response.statusText}: ${message}`);
-            }
-            else {
-                throw new error_1.BeeResponseError(e.response.status, e.response, body, config, e.response.statusText);
-            }
-        }
-        else if (isHttpRequestError(e)) {
-            throw new error_1.BeeRequestError(e.message, config);
-        }
-        else {
-            // Node 18 has native `fetch` implementation called Undici. Errors from this implementation have top level generic
-            // message "fetch failed" with the more specific error placed into `cause` property. Instead of "fetch failed" we
-            // expose the underlying problem.
-            if (e.cause) {
-                throw new error_1.BeeError(e.cause.message);
-            }
-            throw new error_1.BeeError(e.message);
-        }
+        throw e;
     }
 }
 exports.http = http;
-let ky;
-async function getKy() {
-    if (ky) {
-        return ky;
-    }
-    ky = (await import('ky-universal')).default;
-    if (!ky) {
-        throw new Error('Ky was not found while it should have been!');
-    }
-    return ky;
-}

package/dist/cjs/utils/type.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertTransactionHash = exports.makeTagUid = exports.assertAllTagsOptions = exports.assertFileData = exports.assertData = exports.assertCashoutOptions = exports.assertTransactionOptions = exports.assertPostageBatchOptions = exports.assertPublicKey = exports.assertPssMessageHandler = exports.assertAddressPrefix = exports.assertTag = exports.isTag = exports.assertCollectionUploadOptions = exports.assertFileUploadOptions = exports.assertUploadOptions = exports.assertRequestOptions = exports.assertBatchId = exports.assertAddress = exports.addCidConversionFunction = exports.makeReferenceOrEns = exports.assertReferenceOrEns = exports.assertReference = exports.assertPositiveInteger = exports.assertNonNegativeInteger = exports.assertInteger = exports.assertBoolean = exports.assertStrictlyObject = exports.isError = exports.isStrictlyObject = exports.isObject = exports.isInteger = exports.isUint8Array = void 0;
+const swarm_cid_1 = require("@ethersphere/swarm-cid");
 const types_1 = require("../types");
 const error_1 = require("./error");
 const file_1 = require("./file");
 const hex_1 = require("./hex");
 const stream_1 = require("./stream");
-const swarm_cid_1 = require("@ethersphere/swarm-cid");
 function isUint8Array(obj) {
     return obj instanceof Uint8Array;
 }
@@ -194,9 +194,6 @@ function assertRequestOptions(value, name = 'RequestOptions') {
     if (options.timeout) {
         assertNonNegativeInteger(options.timeout, `${name}.timeout`);
     }
-    if (options.fetch && typeof options.fetch !== 'function') {
-        throw new TypeError(`${name}.fetch has to be a function or undefined!`);
-    }
 }
 exports.assertRequestOptions = assertRequestOptions;
 function assertUploadOptions(value, name = 'UploadOptions') {