@ethersphere/bee-js 5.1.1 → 5.1.2

package/dist/cjs/utils/eth.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -106,7 +97,6 @@ exports.isHexEthAddress = isHexEthAddress;
  * @return little-endian encoded hexstring
  */
 function toLittleEndian(bigEndian, pad = 2) {
-    var _a;
     if (!(Number.isInteger(pad) && pad >= 2 && pad % 2 === 0)) {
         throw new TypeError('minimal padding for conversion needs to be positive even integer');
     }
@@ -122,7 +112,7 @@ function toLittleEndian(bigEndian, pad = 2) {
     if (hexRep.length % 2 !== 0)
         hexRep = hexRep.padStart(hexRep.length + 1, '0');
     // Match all two pairs in the hexstring, reverse the pairs and join it again
-    const littleEndian = (_a = hexRep.match(/../g)) === null || _a === void 0 ? void 0 : _a.reverse().join('');
+    const littleEndian = hexRep.match(/../g)?.reverse().join('');
     if (littleEndian)
         return littleEndian;
     throw new Error('failed to convert');
@@ -175,37 +165,35 @@ exports.ethToSwarmAddress = ethToSwarmAddress;
  * @param provider Injected web3 provider like window.ethereum or other compatible with EIP-1193
  * @param ethAddress Optional address of the account which the data should be signed with. If not specified `eth_requestAccounts` request is used to get the account address.
  */
-function makeEthereumWalletSigner(provider, ethAddress) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let executorFnc;
-        if (typeof provider !== 'object' || provider === null) {
-            throw new TypeError('We need JsonRPC provider object!');
-        }
-        if (provider.request) {
-            executorFnc = provider.request;
-        }
-        else if (provider.sendAsync) {
-            executorFnc = provider.sendAsync;
-        }
-        else {
-            throw new Error('Incompatible interface of given provider!');
-        }
-        if (!ethAddress) {
-            ethAddress = (yield executorFnc({ method: 'eth_requestAccounts' }))[0];
-        }
-        const bytesEthAddress = makeEthAddress(ethAddress);
-        const hexEthAddress = makeHexEthAddress(ethAddress);
-        return {
-            address: bytesEthAddress,
-            sign: (data) => __awaiter(this, void 0, void 0, function* () {
-                const result = yield executorFnc({
-                    jsonrpc: '2.0',
-                    method: 'personal_sign',
-                    params: ['0x' + data.hex(), '0x' + hexEthAddress],
-                });
-                return result;
-            }),
-        };
-    });
+async function makeEthereumWalletSigner(provider, ethAddress) {
+    let executorFnc;
+    if (typeof provider !== 'object' || provider === null) {
+        throw new TypeError('We need JsonRPC provider object!');
+    }
+    if (provider.request) {
+        executorFnc = provider.request;
+    }
+    else if (provider.sendAsync) {
+        executorFnc = provider.sendAsync;
+    }
+    else {
+        throw new Error('Incompatible interface of given provider!');
+    }
+    if (!ethAddress) {
+        ethAddress = (await executorFnc({ method: 'eth_requestAccounts' }))[0];
+    }
+    const bytesEthAddress = makeEthAddress(ethAddress);
+    const hexEthAddress = makeHexEthAddress(ethAddress);
+    return {
+        address: bytesEthAddress,
+        sign: async (data) => {
+            const result = await executorFnc({
+                jsonrpc: '2.0',
+                method: 'personal_sign',
+                params: ['0x' + data.hex(), '0x' + hexEthAddress],
+            });
+            return result;
+        },
+    };
 }
 exports.makeEthereumWalletSigner = makeEthereumWalletSigner;

package/dist/cjs/utils/file.js

@@ -4,15 +4,6 @@
  *
  * https://developer.mozilla.org/en-US/docs/Web/API/File
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileArrayBuffer = exports.isFile = void 0;
 function isFile(file) {
@@ -33,17 +24,15 @@ exports.isFile = isFile;
  *
  * @param file A File object
  */
-function fileArrayBuffer(file) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (file.arrayBuffer) {
-            return file.arrayBuffer();
-        }
-        // workaround for Safari where arrayBuffer is not supported on Files
-        return new Promise(resolve => {
-            const fr = new FileReader();
-            fr.onload = () => resolve(fr.result);
-            fr.readAsArrayBuffer(file);
-        });
+async function fileArrayBuffer(file) {
+    if (file.arrayBuffer) {
+        return file.arrayBuffer();
+    }
+    // workaround for Safari where arrayBuffer is not supported on Files
+    return new Promise(resolve => {
+        const fr = new FileReader();
+        fr.onload = () => resolve(fr.result);
+        fr.readAsArrayBuffer(file);
     });
 }
 exports.fileArrayBuffer = fileArrayBuffer;

package/dist/cjs/utils/headers.js

@@ -46,13 +46,13 @@ function extractUploadHeaders(postageBatchId, options) {
     const headers = {
         'swarm-postage-batch-id': postageBatchId,
     };
-    if (options === null || options === void 0 ? void 0 : options.pin)
+    if (options?.pin)
         headers['swarm-pin'] = String(options.pin);
-    if (options === null || options === void 0 ? void 0 : options.encrypt)
+    if (options?.encrypt)
         headers['swarm-encrypt'] = String(options.encrypt);
-    if (options === null || options === void 0 ? void 0 : options.tag)
+    if (options?.tag)
         headers['swarm-tag'] = String(options.tag);
-    if (typeof (options === null || options === void 0 ? void 0 : options.deferred) === 'boolean')
+    if (typeof options?.deferred === 'boolean')
         headers['swarm-deferred-upload'] = options.deferred.toString();
     return headers;
 }

package/dist/cjs/utils/http.js

@@ -1,35 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeDefaultKy = exports.http = exports.filterHeaders = exports.wrapResponseClosure = exports.wrapRequestClosure = void 0;
+exports.http = exports.filterHeaders = exports.wrapResponseClosure = exports.wrapRequestClosure = exports.DEFAULT_KY_CONFIG = void 0;
 const error_1 = require("./error");
-const ky_universal_1 = __importDefault(require("ky-universal"));
 const stream_1 = require("./stream");
-const merge_1 = require("./merge");
 const type_1 = require("./type");
-const DEFAULT_KY_CONFIG = {
+const merge_1 = require("./merge");
+exports.DEFAULT_KY_CONFIG = {
     headers: {
         accept: 'application/json, text/plain, */*',
         'user-agent': `bee-js`,
@@ -55,20 +31,20 @@ function wrapRequest(request) {
     };
 }
 function wrapRequestClosure(cb) {
-    return (request) => __awaiter(this, void 0, void 0, function* () {
-        yield cb(wrapRequest(request));
-    });
+    return async (request) => {
+        await cb(wrapRequest(request));
+    };
 }
 exports.wrapRequestClosure = wrapRequestClosure;
 function wrapResponseClosure(cb) {
-    return (request, options, response) => __awaiter(this, void 0, void 0, function* () {
-        yield cb({
+    return async (request, options, response) => {
+        await cb({
             headers: headersToObject(response.headers),
             status: response.status,
             statusText: response.statusText,
             request: wrapRequest(request),
         });
-    });
+    };
 }
 exports.wrapResponseClosure = wrapResponseClosure;
 /**
@@ -97,76 +73,85 @@ function filterHeaders(obj) {
 exports.filterHeaders = filterHeaders;
 /**
  * Main utility function to make HTTP requests.
- * @param ky
+ * @param kyOptions
  * @param config
  */
-function http(ky, config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const { path, responseType } = config, kyConfig = __rest(config, ["path", "responseType"]);
-            const response = (yield ky(path, Object.assign(Object.assign({}, 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.data = (0, stream_1.normalizeToReadableStream)(response.body);
-                    break;
-                case 'arraybuffer':
-                    response.data = (yield response.arrayBuffer());
-                    break;
-                case 'json':
-                    try {
-                        response.data = (yield response.json());
-                    }
-                    catch (e) {
-                        throw new error_1.BeeNotAJsonError();
-                    }
-                    break;
-                default:
-                    break; // If responseType is not set, then no data are expected
-            }
-            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 = yield 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;
+async function http(kyOptions, 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!');
                 }
-                catch (e) { }
-                if (message) {
-                    throw new error_1.BeeResponseError(e.response.status, e.response, body, config, `${e.response.statusText}: ${message}`);
+                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());
                 }
-                else {
-                    throw new error_1.BeeResponseError(e.response.status, e.response, body, config, e.response.statusText);
+                catch (e) {
+                    throw new error_1.BeeNotAJsonError();
                 }
+                break;
+            default:
+                break; // If responseType is not set, then no data are expected
+        }
+        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;
             }
-            else if (isHttpRequestError(e)) {
-                throw new error_1.BeeRequestError(e.message, config);
+            catch (e) { }
+            if (message) {
+                throw new error_1.BeeResponseError(e.response.status, e.response, body, config, `${e.response.statusText}: ${message}`);
             }
             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 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);
+        }
+    }
 }
 exports.http = http;
-function makeDefaultKy(kyConfig) {
-    return ky_universal_1.default.create((0, merge_1.deepMerge)(DEFAULT_KY_CONFIG, kyConfig));
+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;
 }
-exports.makeDefaultKy = makeDefaultKy;

package/dist/cjs/utils/merge.js

@@ -25,7 +25,7 @@ function deepMerge(...sources) {
                 if ((0, type_1.isObject)(value) && key in returnValue) {
                     value = deepMerge(returnValue[key], value);
                 }
-                returnValue = Object.assign(Object.assign({}, returnValue), { [key]: value });
+                returnValue = { ...returnValue, [key]: value };
             }
         }
     }

package/dist/cjs/utils/sleep.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sleep = void 0;
 /**
@@ -15,9 +6,7 @@ exports.sleep = void 0;
  *
  * @param ms Number of miliseconds to sleep
  */
-function sleep(ms) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => setTimeout(() => resolve(), ms));
-    });
+async function sleep(ms) {
+    return new Promise(resolve => setTimeout(() => resolve(), ms));
 }
 exports.sleep = sleep;

package/dist/cjs/utils/type.js

@@ -140,14 +140,13 @@ exports.assertReferenceOrEns = assertReferenceOrEns;
  * @param expectedCidType
  */
 function makeReferenceOrEns(value, expectedCidType) {
-    var _a;
     if (typeof value !== 'string') {
         throw new TypeError('ReferenceCidOrEns has to be a string!');
     }
     try {
         const result = (0, swarm_cid_1.decodeCid)(value);
         if (result.type !== expectedCidType) {
-            throw new error_1.BeeError(`CID was expected to be of type ${expectedCidType}, but got instead ${(_a = result.type) !== null && _a !== void 0 ? _a : 'non-Swarm CID'}`);
+            throw new error_1.BeeError(`CID was expected to be of type ${expectedCidType}, but got instead ${result.type ?? 'non-Swarm CID'}`);
         }
         return result.reference;
     }
@@ -165,9 +164,12 @@ exports.makeReferenceOrEns = makeReferenceOrEns;
  * @param cidType Type as described in the @ethersphere/swarm-cids-js -> ReferenceType
  */
 function addCidConversionFunction(result, cidType) {
-    return Object.assign(Object.assign({}, result), { cid() {
+    return {
+        ...result,
+        cid() {
             return (0, swarm_cid_1.encodeReference)(result.reference, cidType).toString();
-        } });
+        },
+    };
 }
 exports.addCidConversionFunction = addCidConversionFunction;
 function assertAddress(value) {
@@ -308,16 +310,16 @@ function assertPostageBatchOptions(value) {
     assertStrictlyObject(value);
     const options = value;
     assertRequestOptions(options, 'PostageBatchOptions');
-    if (options === null || options === void 0 ? void 0 : options.gasPrice) {
+    if (options?.gasPrice) {
         assertNonNegativeInteger(options.gasPrice);
     }
-    if ((options === null || options === void 0 ? void 0 : options.immutableFlag) !== undefined) {
+    if (options?.immutableFlag !== undefined) {
         assertBoolean(options.immutableFlag);
     }
-    if ((options === null || options === void 0 ? void 0 : options.waitForUsable) !== undefined) {
+    if (options?.waitForUsable !== undefined) {
         assertBoolean(options.waitForUsable);
     }
-    if ((options === null || options === void 0 ? void 0 : options.waitForUsableTimeout) !== undefined) {
+    if (options?.waitForUsableTimeout !== undefined) {
         assertNonNegativeInteger(options.waitForUsableTimeout, 'options.waitForUsableTimeout');
     }
 }
@@ -328,10 +330,10 @@ function assertTransactionOptions(value, name = 'TransactionOptions') {
     }
     assertStrictlyObject(value, name);
     const options = value;
-    if (options === null || options === void 0 ? void 0 : options.gasLimit) {
+    if (options?.gasLimit) {
         assertNonNegativeInteger(options.gasLimit, name);
     }
-    if (options === null || options === void 0 ? void 0 : options.gasPrice) {
+    if (options?.gasPrice) {
         assertNonNegativeInteger(options.gasPrice, name);
     }
 }
@@ -378,7 +380,7 @@ function assertAllTagsOptions(entry) {
     }
     assertRequestOptions(entry, 'AllTagsOptions');
     const options = entry;
-    if ((options === null || options === void 0 ? void 0 : options.limit) !== undefined) {
+    if (options?.limit !== undefined) {
         if (typeof options.limit !== 'number') {
             throw new TypeError('AllTagsOptions.limit has to be a number or undefined!');
         }
@@ -389,7 +391,7 @@ function assertAllTagsOptions(entry) {
             throw new error_1.BeeArgumentError(`AllTagsOptions.limit has to be at most ${types_1.TAGS_LIMIT_MAX}`, options.limit);
         }
     }
-    if ((options === null || options === void 0 ? void 0 : options.offset) !== undefined) {
+    if (options?.offset !== undefined) {
         assertNonNegativeInteger(options.offset, 'AllTagsOptions.offset');
     }
 }