@ethersphere/bee-js 3.3.3 → 4.0.0

package/dist/cjs/utils/data.browser.js

@@ -8,13 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareWebsocketData = exports.prepareData = void 0;
 const stream_1 = require("./stream");
-const cross_blob_1 = __importDefault(require("cross-blob"));
 /**
  * Validates input and converts to Uint8Array
  *
@@ -23,11 +19,11 @@ const cross_blob_1 = __importDefault(require("cross-blob"));
 function prepareData(data) {
     return __awaiter(this, void 0, void 0, function* () {
         if (typeof data === 'string')
-            return new cross_blob_1.default([data], { type: 'text/plain' });
+            return new Blob([data], { type: 'text/plain' });
         if (data instanceof Uint8Array || data instanceof ArrayBuffer) {
-            return new cross_blob_1.default([data], { type: 'application/octet-stream' });
+            return new Blob([data], { type: 'application/octet-stream' });
         }
-        if (data instanceof cross_blob_1.default) {
+        if (data instanceof Blob) {
             return data;
         }
         // Currently it is not possible to stream requests from browsers
@@ -41,7 +37,7 @@ function prepareData(data) {
                     buffers.push(d);
                 });
                 data.on('end', () => {
-                    resolve(new cross_blob_1.default(buffers, { type: 'application/octet-stream' }));
+                    resolve(new Blob(buffers, { type: 'application/octet-stream' }));
                 });
             });
         }
@@ -57,7 +53,7 @@ function prepareData(data) {
                         buffers.push(value);
                     }
                 } while (!done);
-                resolve(new cross_blob_1.default(buffers, { type: 'application/octet-stream' }));
+                resolve(new Blob(buffers, { type: 'application/octet-stream' }));
             }));
         }
         throw new TypeError('unknown data type');
@@ -70,7 +66,7 @@ function prepareWebsocketData(data) {
             return new TextEncoder().encode(data);
         if (data instanceof ArrayBuffer)
             return new Uint8Array(data);
-        if (data instanceof cross_blob_1.default)
+        if (data instanceof Blob)
             return new Uint8Array(yield new Response(data).arrayBuffer());
         throw new TypeError('unknown websocket data type');
     });

package/dist/cjs/utils/data.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareWebsocketData = exports.prepareData = void 0;
-const cross_blob_1 = __importDefault(require("cross-blob"));
+const fetch_blob_1 = __importDefault(require("fetch-blob"));
 const stream_1 = require("./stream");
 /**
  * Prepare data for valid input for node-fetch.
@@ -26,11 +26,11 @@ const stream_1 = require("./stream");
 function prepareData(data) {
     return __awaiter(this, void 0, void 0, function* () {
         if (typeof data === 'string')
-            return new cross_blob_1.default([data], { type: 'text/plain' });
+            return new fetch_blob_1.default([data], { type: 'text/plain' });
         if (data instanceof Uint8Array || data instanceof ArrayBuffer) {
-            return new cross_blob_1.default([data], { type: 'application/octet-stream' });
+            return new fetch_blob_1.default([data], { type: 'application/octet-stream' });
         }
-        if (data instanceof cross_blob_1.default || (0, stream_1.isNodeReadable)(data))
+        if (data instanceof fetch_blob_1.default || (0, stream_1.isNodeReadable)(data))
             return data;
         if ((0, stream_1.isReadableStream)(data)) {
             return (0, stream_1.readableWebToNode)(data);
@@ -50,8 +50,6 @@ function prepareWebsocketData(data) {
             return new Uint8Array(data);
         if (data instanceof ArrayBuffer)
             return new Uint8Array(data);
-        if (data instanceof cross_blob_1.default)
-            return new Uint8Array(yield new Response(data).arrayBuffer());
         if (isBufferArray(data))
             return new Uint8Array(Buffer.concat(data));
         throw new TypeError('unknown websocket data type');

package/dist/cjs/utils/reference.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeBytesReference = void 0;
+const types_1 = require("../types");
+const bytes_1 = require("./bytes");
+const hex_1 = require("./hex");
+function makeBytesReference(reference, offset = 0) {
+    if (typeof reference === 'string') {
+        if (offset) {
+            throw new Error('Offset property can be set only for UintArray reference!');
+        }
+        try {
+            // Non-encrypted chunk hex string reference
+            const hexReference = (0, hex_1.makeHexString)(reference, types_1.REFERENCE_HEX_LENGTH);
+            return (0, hex_1.hexToBytes)(hexReference);
+        }
+        catch (e) {
+            if (!(e instanceof TypeError)) {
+                throw e;
+            }
+            // Encrypted chunk hex string reference
+            const hexReference = (0, hex_1.makeHexString)(reference, types_1.ENCRYPTED_REFERENCE_HEX_LENGTH);
+            return (0, hex_1.hexToBytes)(hexReference);
+        }
+    }
+    else if (reference instanceof Uint8Array) {
+        if ((0, bytes_1.hasBytesAtOffset)(reference, offset, types_1.ENCRYPTED_REFERENCE_BYTES_LENGTH)) {
+            return (0, bytes_1.bytesAtOffset)(reference, offset, types_1.ENCRYPTED_REFERENCE_BYTES_LENGTH);
+        }
+        else if ((0, bytes_1.hasBytesAtOffset)(reference, offset, types_1.REFERENCE_BYTES_LENGTH)) {
+            return (0, bytes_1.bytesAtOffset)(reference, offset, types_1.REFERENCE_BYTES_LENGTH);
+        }
+    }
+    throw new TypeError('invalid chunk reference');
+}
+exports.makeBytesReference = makeBytesReference;

package/dist/cjs/utils/type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertTransactionHash = exports.makeTagUid = exports.assertAllTagsOptions = exports.assertFileData = exports.assertData = exports.assertCashoutOptions = 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.assertReference = exports.assertNonNegativeInteger = exports.assertInteger = exports.assertBoolean = exports.assertStrictlyObject = exports.isError = exports.isStrictlyObject = exports.isObject = exports.isInteger = exports.isUint8Array = void 0;
+exports.assertTransactionHash = exports.makeTagUid = exports.assertAllTagsOptions = exports.assertFileData = exports.assertData = exports.assertCashoutOptions = 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.assertReferenceOrEns = exports.assertReference = exports.assertNonNegativeInteger = exports.assertInteger = exports.assertBoolean = exports.assertStrictlyObject = exports.isError = exports.isStrictlyObject = exports.isObject = exports.isInteger = exports.isUint8Array = void 0;
 const types_1 = require("../types");
 const error_1 = require("./error");
 const file_1 = require("./file");
@@ -77,6 +77,41 @@ function assertReference(value) {
     }
 }
 exports.assertReference = assertReference;
+function assertReferenceOrEns(value) {
+    if (typeof value !== 'string') {
+        throw new TypeError('ReferenceOrEns has to be a string!');
+    }
+    if ((0, hex_1.isHexString)(value)) {
+        assertReference(value);
+        return;
+    }
+    /**
+     * a.asdf - VALID
+     * test.eth - VALID
+     * ADAM.ETH - VALID
+     * ADAM UHLIR.ETH - INVALID
+     * test.whatever.eth - VALID
+     * -adg.ets - INVALID
+     * adg-.ets - INVALID
+     * as-a.com - VALID
+     * ethswarm.org - VALID
+     * http://asdf.asf - INVALID
+     * řš+ýí.šě+ř.čě - VALID
+     * tsg.asg?asg - INVALID
+     * tsg.asg:1599 - INVALID
+     * ethswarm.something- - INVALID
+     * ethswarm.-something - INVALID
+     * ethswarm.some-thing - VALID
+     */
+    const DOMAIN_REGEX = /^(?:(?!-)[^.\/?:\s]{1,63}(?<!-)\.)+(?!-)[^.\/?:\s]{2,63}(?<!-)$/;
+    // We are doing best-effort validation of domain here. The proper way would be to do validation using IDNA UTS64 standard
+    // but that would give us high penalty to our dependencies as the library (idna-uts46-hx) that does this validation and translation
+    // adds 160kB minified size which is significant. We expects that full validation will be done on Bee side.
+    if (!DOMAIN_REGEX.test(value)) {
+        throw new TypeError('ReferenceOrEns is not valid Reference, but also not valid ENS domain.');
+    }
+}
+exports.assertReferenceOrEns = assertReferenceOrEns;
 function assertAddress(value) {
     (0, hex_1.assertHexString)(value, types_1.ADDRESS_HEX_LENGTH, 'Address');
 }