@ethersphere/bee-js 9.7.1 → 9.8.1

package/dist/mjs/manifest/manifest.js

@@ -1,6 +1,8 @@
 import { Binary, MerkleTree, Optional, Uint8ArrayReader } from 'cafe-utility';
+import _debug from 'debug';
 import { NULL_ADDRESS } from "../index.js";
 import { Reference } from "../utils/typed-bytes.js";
+const debug = _debug('bee-js:manifest');
 const ENCODER = new TextEncoder();
 const DECODER = new TextDecoder();
 const TYPE_VALUE = 2;
@@ -60,6 +62,11 @@ export 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: Binary.uint8ArrayToHex(this.node.selfAddress)
+    });
     if (this.node.metadata) {
       const metadataBytes = Binary.padEndToMultiple(new Uint8Array([0x00, 0x00, ...ENCODER.encode(JSON.stringify(this.node.metadata))]), 32, 0x0a);
       const metadataLengthBytes = Binary.numberToUint16(metadataBytes.length - 2, 'BE');
@@ -72,8 +79,17 @@ export class Fork {
     const type = Binary.uint8ToNumber(reader.read(1));
     const prefixLength = Binary.uint8ToNumber(reader.read(1));
     const prefix = reader.read(prefixLength);
-    reader.read(30 - prefixLength);
+    if (prefixLength < 30) {
+      reader.read(30 - prefixLength);
+    }
     const selfAddress = reader.read(addressLength);
+    debug('unmarshalling fork', {
+      type,
+      prefixLength,
+      prefix: DECODER.decode(prefix),
+      addressLength,
+      address: Binary.uint8ArrayToHex(selfAddress)
+    });
     let metadata = undefined;
     if (isType(type, TYPE_WITH_METADATA)) {
       const metadataLength = Binary.uint16ToNumber(reader.read(2), 'BE');
@@ -210,7 +226,7 @@ export class MantarayNode {
       throw new Error('MantarayNode#unmarshal invalid version hash');
     }
     const targetAddressLength = Binary.uint8ToNumber(reader.read(1));
-    const targetAddress = targetAddressLength === 0 ? NULL_ADDRESS : reader.read(targetAddressLength);
+    const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : NULL_ADDRESS;
     const node = new MantarayNode({
       selfAddress,
       targetAddress,
@@ -219,7 +235,7 @@ export class MantarayNode {
     const forkBitmap = reader.read(32);
     for (let i = 0; i < 256; i++) {
       if (Binary.getBit(forkBitmap, i, 'LE')) {
-        const newFork = Fork.unmarshal(reader, targetAddressLength);
+        const newFork = Fork.unmarshal(reader, selfAddress.length);
         node.forks.set(i, newFork);
         newFork.node.parent = node;
       }
@@ -232,6 +248,10 @@ export 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 Reference(reference).represent()
+    });
     // TODO: this should not be ignored
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let tip = this;

package/dist/mjs/utils/http.js

@@ -1,6 +1,8 @@
 import axios from 'axios';
 import { Dates, Objects, Strings, System } from 'cafe-utility';
+import _debug from 'debug';
 import { BeeResponseError } from "../index.js";
+const debug = _debug('bee-js:http');
 const {
   AxiosError
 } = axios;
@@ -37,6 +39,12 @@ export async function http(options, config) {
   let failedAttempts = 0;
   while (failedAttempts < MAX_FAILED_ATTEMPTS) {
     try {
+      debug(`${requestConfig.method || 'get'} ${Strings.joinUrl([requestConfig.baseURL, requestConfig.url])}`, {
+        headers: {
+          ...requestConfig.headers
+        },
+        params: requestConfig.params
+      });
       maybeRunOnRequestHook(options, requestConfig);
       const response = await axios(requestConfig);
       return response;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "9.7.1",
+  "version": "9.8.1",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -63,6 +63,7 @@
   "dependencies": {
     "axios": "^0.30.0",
     "cafe-utility": "^31.0.0",
+    "debug": "^4.4.1",
     "isomorphic-ws": "^4.0.1",
     "semver": "^7.3.5",
     "ws": "^8.7.0"
@@ -78,6 +79,7 @@
     "@commitlint/config-conventional": "^17.4.2",
     "@jest/types": "^29.6.3",
     "@naholyr/cross-env": "^1.0.0",
+    "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.13",
     "@types/node": "^18.11.11",
     "@types/semver": "^7.3.9",