@ethersphere/bee-js 12.2.2 → 12.3.0

package/dist/cjs/utils/type.js

@@ -35,26 +35,13 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isReadable = isReadable;
 exports.asNumberString = asNumberString;
-exports.prepareBeeRequestOptions = prepareBeeRequestOptions;
-exports.prepareDownloadOptions = prepareDownloadOptions;
-exports.prepareUploadOptions = prepareUploadOptions;
-exports.prepareRedundantUploadOptions = prepareRedundantUploadOptions;
-exports.prepareFileUploadOptions = prepareFileUploadOptions;
-exports.prepareCollectionUploadOptions = prepareCollectionUploadOptions;
 exports.isTag = isTag;
-exports.preparePssMessageHandler = preparePssMessageHandler;
-exports.prepareGsocMessageHandler = prepareGsocMessageHandler;
-exports.preparePostageBatchOptions = preparePostageBatchOptions;
-exports.prepareTransactionOptions = prepareTransactionOptions;
 exports.assertData = assertData;
 exports.assertFileData = assertFileData;
-exports.prepareAllTagsOptions = prepareAllTagsOptions;
 exports.makeTagUid = makeTagUid;
-const cafe_utility_1 = require("cafe-utility");
 const stream = __importStar(require("stream"));
-const types_1 = require("../types");
 const file_1 = require("./file");
-const typed_bytes_1 = require("./typed-bytes");
+const schema_1 = require("./schema");
 function isReadable(value) {
     return typeof stream.Readable !== 'undefined' && value instanceof stream.Readable;
 }
@@ -62,113 +49,19 @@ function asNumberString(value, options) {
     if (typeof value === 'bigint') {
         value = value.toString();
     }
-    return cafe_utility_1.Types.asIntegerString(value, options);
-}
-function prepareBeeRequestOptions(value) {
-    const object = cafe_utility_1.Types.asObject(value, { name: 'BeeRequestOptions' });
-    return {
-        baseURL: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asString(x, { name: 'baseURL' }), object.baseURL),
-        timeout: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'timeout', min: 0 }), object.timeout),
-        headers: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asStringMap(x, { name: 'headers' }), object.headers),
-        onRequest: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asFunction(x, { name: 'onRequest' }), object.onRequest),
-        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) {
-    const object = cafe_utility_1.Types.asObject(value, { name: 'DownloadOptions' });
-    return {
-        redundancyStrategy: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'redundancyStrategy' }), object.redundancyStrategy),
-        fallback: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'fallback' }), object.fallback),
-        timeoutMs: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'timeoutMs', min: 0 }), object.timeoutMs),
-        actPublisher: cafe_utility_1.Types.asOptional(x => new typed_bytes_1.PublicKey(x), object.actPublisher),
-        actHistoryAddress: cafe_utility_1.Types.asOptional(x => new typed_bytes_1.Reference(x), object.actHistoryAddress),
-        actTimestamp: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asNumber(x, { name: 'actTimestamp' }), object.actTimestamp),
-    };
-}
-function prepareUploadOptions(value, name = 'UploadOptions') {
-    const object = cafe_utility_1.Types.asObject(value, { name });
-    return {
-        act: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'act' }), object.act),
-        actHistoryAddress: cafe_utility_1.Types.asOptional(x => new typed_bytes_1.Reference(x), object.actHistoryAddress),
-        deferred: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'deferred' }), object.deferred),
-        encrypt: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'encrypt' }), object.encrypt),
-        pin: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'pin' }), object.pin),
-        tag: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'tag', min: 0 }), object.tag),
-    };
-}
-function prepareRedundantUploadOptions(value, name = 'UploadOptions') {
-    const uploadOptions = prepareUploadOptions(value, name);
-    const object = cafe_utility_1.Types.asObject(value, { name });
-    return {
-        ...uploadOptions,
-        redundancyLevel: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'redundancyLevel', min: 0 }), object.redundancyLevel),
-    };
-}
-function prepareFileUploadOptions(value) {
-    const uploadOptions = prepareUploadOptions(value, 'FileUploadOptions');
-    const object = cafe_utility_1.Types.asObject(value, { name: 'FileUploadOptions' });
-    return {
-        ...uploadOptions,
-        size: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'size', min: 0 }), object.size),
-        contentType: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asString(x, { name: 'contentType' }), object.contentType),
-        redundancyLevel: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'redundancyLevel', min: 0 }), object.redundancyLevel),
-    };
-}
-function prepareCollectionUploadOptions(value) {
-    const uploadOptions = prepareUploadOptions(value, 'CollectionUploadOptions');
-    const object = cafe_utility_1.Types.asObject(value, { name: 'CollectionUploadOptions' });
-    return {
-        ...uploadOptions,
-        errorDocument: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asString(x, { name: 'errorDocument' }), object.errorDocument),
-        indexDocument: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asString(x, { name: 'indexDocument' }), object.indexDocument),
-        redundancyLevel: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'redundancyLevel', min: 0 }), object.redundancyLevel),
-    };
-}
-function isTag(value) {
-    try {
-        const object = cafe_utility_1.Types.asObject(value, { name: 'Tag' });
-        cafe_utility_1.Types.asInteger(object.uid, { name: 'Tag.uid' });
-        return true;
+    if (typeof value !== 'string' || !/^-?\d+$/.test(value)) {
+        throw new TypeError(`${options?.name ?? 'value'} is not a valid integer string, got: ${value}`);
     }
-    catch {
-        return false;
+    if (options?.min !== undefined && BigInt(value) < options.min) {
+        throw new RangeError(`${options?.name ?? 'value'} must be >= ${options.min}, got: ${value}`);
     }
+    if (options?.max !== undefined && BigInt(value) > options.max) {
+        throw new RangeError(`${options?.name ?? 'value'} must be <= ${options.max}, got: ${value}`);
+    }
+    return value;
 }
-function preparePssMessageHandler(value) {
-    const object = cafe_utility_1.Types.asObject(value, { name: 'PssMessageHandler' });
-    return {
-        onMessage: cafe_utility_1.Types.asFunction(object.onMessage, { name: 'onMessage' }),
-        onError: cafe_utility_1.Types.asFunction(object.onError, { name: 'onError' }),
-        onClose: cafe_utility_1.Types.asFunction(object.onClose, { name: 'onClose' }),
-    };
-}
-function prepareGsocMessageHandler(value) {
-    const object = cafe_utility_1.Types.asObject(value, { name: 'GsocMessageHandler' });
-    return {
-        onMessage: cafe_utility_1.Types.asFunction(object.onMessage, { name: 'onMessage' }),
-        onError: cafe_utility_1.Types.asFunction(object.onError, { name: 'onError' }),
-        onClose: cafe_utility_1.Types.asFunction(object.onClose, { name: 'onClose' }),
-    };
-}
-function preparePostageBatchOptions(value) {
-    const object = cafe_utility_1.Types.asObject(value, { name: 'PostageBatchOptions' });
-    return {
-        gasPrice: cafe_utility_1.Types.asOptional(x => asNumberString(x, { name: 'gasPrice' }), object.gasPrice),
-        immutableFlag: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'immutableFlag' }), object.immutableFlag),
-        label: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asString(x, { name: 'label' }), object.label),
-        waitForUsable: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asBoolean(x, { name: 'waitForUsable' }), object.waitForUsable),
-        waitForUsableTimeout: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'waitForUsableTimeout', min: 0 }), object.waitForUsableTimeout),
-    };
-}
-function prepareTransactionOptions(value, name = 'TransactionOptions') {
-    const object = cafe_utility_1.Types.asObject(value, { name });
-    return {
-        gasLimit: cafe_utility_1.Types.asOptional(x => asNumberString(x, { name: 'gasLimit', min: 0n }), object.gasLimit),
-        gasPrice: cafe_utility_1.Types.asOptional(x => asNumberString(x, { name: 'gasPrice', min: 0n }), object.gasPrice),
-    };
+function isTag(value) {
+    return schema_1.TagInputSchema.safeParse(value).success;
 }
 /**
  * Check whether the given parameter is valid data to upload
@@ -190,17 +83,6 @@ function assertFileData(value) {
         throw new TypeError('Data must be either string, Readable, Uint8Array or File!');
     }
 }
-/**
- * Checks whether optional options for AllTags query are valid
- * @param options
- */
-function prepareAllTagsOptions(value) {
-    const object = cafe_utility_1.Types.asObject(value, { name: 'AllTagsOptions' });
-    return {
-        limit: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'limit', min: types_1.TAGS_LIMIT_MIN, max: types_1.TAGS_LIMIT_MAX }), object.limit),
-        offset: cafe_utility_1.Types.asOptional(x => cafe_utility_1.Types.asInteger(x, { name: 'offset', min: 0 }), object.offset),
-    };
-}
 /**
  * Utility functions that return Tag UID
  * @param tagUid
@@ -213,7 +95,7 @@ function makeTagUid(tagUid) {
         return tagUid.uid;
     }
     else if (typeof tagUid === 'number' || typeof tagUid === 'string') {
-        return cafe_utility_1.Types.asNumber(tagUid, { name: 'tagUid', min: 0 });
+        return schema_1.TagUidSchema.parse(tagUid);
     }
     throw new TypeError(`Expected number | Tag | string from tagUid, got: ${tagUid}`);
 }

package/dist/cjs/utils/url.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidBeeUrl = isValidBeeUrl;
+exports.isValidBeePort = isValidBeePort;
 exports.assertBeeUrl = assertBeeUrl;
 exports.stripLastSlash = stripLastSlash;
+const bad_ports_1 = require("./bad-ports");
 const error_1 = require("./error");
 /**
  * Validates that passed string is valid URL of Bee.
@@ -23,6 +25,24 @@ function isValidBeeUrl(url) {
         return false;
     }
 }
+/**
+ * Validates that passed string is valid port to use Bee and is not a bad port.
+ * We support only HTTP and HTTPS protocols. Bad ports are defined in
+ * the WHATWG Fetch spec (https://fetch.spec.whatwg.org/#port-blocking)
+ * and are blocked for HTTP/HTTPS requests.
+ *
+ * @param port
+ */
+function isValidBeePort(port) {
+    if (typeof port !== 'string') {
+        return false;
+    }
+    if (bad_ports_1.BAD_PORTS.includes(port)) {
+        return false;
+    }
+    const portNumber = parseInt(port, 10);
+    return portNumber > 0 && portNumber < 65536 && !isNaN(portNumber);
+}
 /**
  * Validates that passed string is valid URL of Bee, if not it throws BeeArgumentError.
  * We support only HTTP and HTTPS protocols.
@@ -33,6 +53,10 @@ function assertBeeUrl(url) {
     if (!isValidBeeUrl(url)) {
         throw new error_1.BeeArgumentError('URL is not valid!', url);
     }
+    const port = new URL(url).port;
+    if (port && !isValidBeePort(port)) {
+        throw new error_1.BeeArgumentError('Port in URL is considered bad port and cannot be used!', port);
+    }
 }
 /**
  * Removes trailing slash out of the given string.