@ethersphere/bee-js 9.7.0 → 9.8.0

package/dist/cjs/bee.js

@@ -722,7 +722,8 @@ class Bee {
         for (let i = 0n; i < 0xffffn; i++) {
             const signer = new typed_bytes_1.PrivateKey(cafe_utility_1.Binary.numberToUint256(start + i, 'BE'));
             const socAddress = (0, soc_1.makeSOCAddress)(identifier, signer.publicKey().address());
-            const actualProximity = 256 - cafe_utility_1.Binary.proximity(socAddress.toUint8Array(), targetOverlay.toUint8Array(), 256);
+            // TODO: test the significance of the hardcoded 256
+            const actualProximity = 256 - cafe_utility_1.Binary.proximity(socAddress.toUint8Array(), targetOverlay.toUint8Array());
             if (actualProximity <= 256 - proximity) {
                 return signer;
             }

package/dist/cjs/manifest/manifest.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MantarayNode = exports.Fork = void 0;
 const cafe_utility_1 = require("cafe-utility");
+const debug_1 = __importDefault(require("debug"));
 const __1 = require("..");
 const typed_bytes_1 = require("../utils/typed-bytes");
+const debug = (0, debug_1.default)('bee-js:manifest');
 const ENCODER = new TextEncoder();
 const DECODER = new TextDecoder();
 const TYPE_VALUE = 2;
@@ -61,6 +66,11 @@ class Fork {
             data.push(new Uint8Array(30 - this.prefix.length));
         }
         data.push(this.node.selfAddress);
+        debug('marshalling fork', {
+            prefixLength: this.prefix.length,
+            prefix: DECODER.decode(this.prefix),
+            address: cafe_utility_1.Binary.uint8ArrayToHex(this.node.selfAddress),
+        });
         if (this.node.metadata) {
             const metadataBytes = cafe_utility_1.Binary.padEndToMultiple(new Uint8Array([0x00, 0x00, ...ENCODER.encode(JSON.stringify(this.node.metadata))]), 32, 0x0a);
             const metadataLengthBytes = cafe_utility_1.Binary.numberToUint16(metadataBytes.length - 2, 'BE');
@@ -75,6 +85,12 @@ class Fork {
         const prefix = reader.read(prefixLength);
         reader.read(30 - prefixLength);
         const selfAddress = reader.read(addressLength);
+        debug('unmarshalling fork', {
+            prefixLength,
+            prefix: DECODER.decode(prefix),
+            addressLength,
+            address: cafe_utility_1.Binary.uint8ArrayToHex(selfAddress),
+        });
         let metadata = undefined;
         if (isType(type, TYPE_WITH_METADATA)) {
             const metadataLength = cafe_utility_1.Binary.uint16ToNumber(reader.read(2), 'BE');
@@ -227,6 +243,7 @@ class MantarayNode {
     addFork(path, reference, metadata) {
         this.selfAddress = null;
         path = path instanceof Uint8Array ? path : ENCODER.encode(path);
+        debug('adding fork', { path: DECODER.decode(path), reference: new typed_bytes_1.Reference(reference).represent() });
         // TODO: this should not be ignored
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         let tip = this;

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

@@ -40,6 +40,7 @@ async function streamDirectory(bee, dir, postageBatchId, onUploadProgress, optio
     for (const file of files) {
         total += (0, chunk_size_1.totalChunks)(file.size);
     }
+    let hasIndexHtml = false;
     async function onChunk(chunk) {
         await queue.enqueue(async () => {
             await bee.uploadChunk(postageBatchId, chunk.build(), options, requestOptions);
@@ -64,11 +65,22 @@ async function streamDirectory(bee, dir, postageBatchId, onUploadProgress, optio
             Filename: filename,
         });
         if (file.path === 'index.html') {
-            mantaray.addFork('/', __1.NULL_ADDRESS, {
-                'website-index-document': 'index.html',
-            });
+            hasIndexHtml = true;
         }
     }
+    if (hasIndexHtml || options?.indexDocument || options?.errorDocument) {
+        const metadata = {};
+        if (options?.indexDocument) {
+            metadata['website-index-document'] = options.indexDocument;
+        }
+        else if (hasIndexHtml) {
+            metadata['website-index-document'] = 'index.html';
+        }
+        if (options?.errorDocument) {
+            metadata['website-error-document'] = options.errorDocument;
+        }
+        mantaray.addFork('/', __1.NULL_ADDRESS, metadata);
+    }
     return mantaray.saveRecursively(bee, postageBatchId, options, requestOptions);
 }
 exports.streamDirectory = streamDirectory;

package/dist/cjs/utils/http.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.http = exports.DEFAULT_HTTP_CONFIG = void 0;
 const axios_1 = __importDefault(require("axios"));
 const cafe_utility_1 = require("cafe-utility");
+const debug_1 = __importDefault(require("debug"));
 const index_1 = require("../index");
+const debug = (0, debug_1.default)('bee-js:http');
 const { AxiosError } = axios_1.default;
 const MAX_FAILED_ATTEMPTS = 100000;
 const DELAY_FAST = 200;
@@ -41,6 +43,10 @@ async function http(options, config) {
     let failedAttempts = 0;
     while (failedAttempts < MAX_FAILED_ATTEMPTS) {
         try {
+            debug(`${requestConfig.method || 'get'} ${cafe_utility_1.Strings.joinUrl([
+                requestConfig.baseURL,
+                requestConfig.url,
+            ])}`, { headers: { ...requestConfig.headers }, params: requestConfig.params });
             maybeRunOnRequestHook(options, requestConfig);
             const response = await (0, axios_1.default)(requestConfig);
             return response;
@@ -67,7 +73,7 @@ function maybeRunOnRequestHook(options, requestConfig) {
     if (options.onRequest) {
         options.onRequest({
             method: requestConfig.method || 'GET',
-            url: cafe_utility_1.Strings.joinUrl(requestConfig.baseURL, requestConfig.url),
+            url: cafe_utility_1.Strings.joinUrl([requestConfig.baseURL, requestConfig.url]),
             headers: { ...requestConfig.headers },
             params: requestConfig.params,
         });