@ethersphere/bee-js 12.3.1 → 12.3.2-upcoming.116

package/dist/cjs/index.js

@@ -45,9 +45,9 @@ var cafe_utility_1 = require("cafe-utility");
 Object.defineProperty(exports, "MerkleTree", { enumerable: true, get: function () { return cafe_utility_1.MerkleTree; } });
 var manifest_1 = require("./manifest/manifest");
 Object.defineProperty(exports, "MantarayNode", { enumerable: true, get: function () { return manifest_1.MantarayNode; } });
-var status_1 = require("./modules/debug/status");
-Object.defineProperty(exports, "SUPPORTED_BEE_VERSION", { enumerable: true, get: function () { return status_1.SUPPORTED_BEE_VERSION; } });
-Object.defineProperty(exports, "SUPPORTED_BEE_VERSION_EXACT", { enumerable: true, get: function () { return status_1.SUPPORTED_BEE_VERSION_EXACT; } });
+var version_1 = require("./version");
+Object.defineProperty(exports, "SUPPORTED_BEE_VERSION", { enumerable: true, get: function () { return version_1.SUPPORTED_BEE_VERSION; } });
+Object.defineProperty(exports, "SUPPORTED_BEE_VERSION_EXACT", { enumerable: true, get: function () { return version_1.SUPPORTED_BEE_VERSION_EXACT; } });
 __exportStar(require("./types"), exports);
 var bytes_1 = require("./utils/bytes");
 Object.defineProperty(exports, "Bytes", { enumerable: true, get: function () { return bytes_1.Bytes; } });

package/dist/cjs/manifest/manifest.js

@@ -59,7 +59,10 @@ class Fork {
             throw Error('Fork#marshal node.selfAddress is not set');
         }
         const data = [];
-        data.push(new Uint8Array([this.node.determineType()]));
+        // Re-emit the type byte read from the chunk when the node is untouched, so an
+        // unmarshal → marshal round-trip is byte-identical. determineType() can only
+        // recompute it correctly once the node's children are loaded/built in memory.
+        data.push(new Uint8Array([this.node.type ?? this.node.determineType()]));
         data.push(cafe_utility_1.Binary.numberToUint8(this.prefix.length));
         data.push(this.prefix);
         if (this.prefix.length < 30) {
@@ -99,7 +102,7 @@ class Fork {
             const metadataLength = cafe_utility_1.Binary.uint16ToNumber(reader.read(2), 'BE');
             metadata = JSON.parse(DECODER.decode(reader.read(metadataLength)));
         }
-        return new Fork(prefix, new MantarayNode({ selfAddress, metadata, path: prefix }));
+        return new Fork(prefix, new MantarayNode({ selfAddress, metadata, path: prefix, type }));
     }
 }
 exports.Fork = Fork;
@@ -112,6 +115,7 @@ class MantarayNode {
         this.path = new Uint8Array(0);
         this.forks = new Map();
         this.parent = null;
+        this.type = null;
         if (options?.targetAddress) {
             this.targetAddress = options.targetAddress;
         }
@@ -130,6 +134,7 @@ class MantarayNode {
         if (options?.parent) {
             this.parent = options.parent;
         }
+        this.type = options?.type ?? null;
     }
     get fullPath() {
         return cafe_utility_1.Binary.concatBytes(this.parent?.fullPath ?? new Uint8Array(0), this.path);
@@ -184,11 +189,23 @@ class MantarayNode {
                 fork.node.selfAddress = (await fork.node.calculateSelfAddress()).toUint8Array();
             }
         }
+        const hasEntry = !cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS);
+        let refBytesSize = 0;
+        if (hasEntry) {
+            refBytesSize = this.targetAddress.length;
+        }
+        else {
+            for (const fork of this.forks.values()) {
+                if (fork.node.selfAddress) {
+                    refBytesSize = fork.node.selfAddress.length;
+                    break;
+                }
+            }
+        }
         const header = new Uint8Array(32);
         header.set(VERSION_02_HASH, 0);
-        header.set(cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS) && cafe_utility_1.Binary.equals(this.path, new Uint8Array([47]))
-            ? cafe_utility_1.Binary.numberToUint8(0)
-            : cafe_utility_1.Binary.numberToUint8(this.targetAddress.length), 31);
+        header.set(cafe_utility_1.Binary.numberToUint8(refBytesSize), 31);
+        const entry = hasEntry ? this.targetAddress : new Uint8Array(refBytesSize);
         const forkBitmap = new Uint8Array(32);
         for (const fork of this.forks.keys()) {
             cafe_utility_1.Binary.setBit(forkBitmap, fork, 1, 'LE');
@@ -199,9 +216,7 @@ class MantarayNode {
                 forks.push(this.forks.get(i).marshal());
             }
         }
-        const data = cafe_utility_1.Binary.xorCypher(cafe_utility_1.Binary.concatBytes(header, cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS) && cafe_utility_1.Binary.equals(this.path, new Uint8Array([47]))
-            ? new Uint8Array(0)
-            : this.targetAddress, forkBitmap, ...forks), this.obfuscationKey);
+        const data = cafe_utility_1.Binary.xorCypher(cafe_utility_1.Binary.concatBytes(header, entry, forkBitmap, ...forks), this.obfuscationKey);
         return cafe_utility_1.Binary.concatBytes(this.obfuscationKey, data);
     }
     /**
@@ -231,11 +246,13 @@ class MantarayNode {
         const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : __1.NULL_ADDRESS;
         const node = new MantarayNode({ selfAddress, targetAddress, obfuscationKey });
         const forkBitmap = reader.read(32);
-        for (let i = 0; i < 256; i++) {
-            if (cafe_utility_1.Binary.getBit(forkBitmap, i, 'LE')) {
-                const newFork = Fork.unmarshal(reader, selfAddress.length);
-                node.forks.set(i, newFork);
-                newFork.node.parent = node;
+        if (targetAddressLength > 0) {
+            for (let i = 0; i < 256; i++) {
+                if (cafe_utility_1.Binary.getBit(forkBitmap, i, 'LE')) {
+                    const newFork = Fork.unmarshal(reader, selfAddress.length);
+                    node.forks.set(i, newFork);
+                    newFork.node.parent = node;
+                }
             }
         }
         return node;
@@ -245,6 +262,7 @@ class MantarayNode {
      */
     addFork(path, reference, metadata) {
         this.selfAddress = null;
+        this.type = 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
@@ -273,12 +291,14 @@ class MantarayNode {
                 tip.forks.set(remainingPath[0], fork);
                 fork.node.parent = tip;
                 tip.selfAddress = null;
+                tip.type = null;
                 tip = newFork.node;
             }
             else {
                 tip.forks.set(remainingPath[0], newFork);
                 newFork.node.parent = tip;
                 tip.selfAddress = null;
+                tip.type = null;
                 tip = newFork.node;
             }
         }
@@ -288,6 +308,7 @@ class MantarayNode {
      */
     removeFork(path) {
         this.selfAddress = null;
+        this.type = null;
         path = path instanceof Uint8Array ? path : ENCODER.encode(path);
         if (path.length === 0) {
             throw Error('MantarayNode#removeFork [path] parameter cannot be empty');
@@ -405,13 +426,20 @@ class MantarayNode {
     }
     determineType() {
         let type = 0;
-        if (!cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS) || cafe_utility_1.Binary.equals(this.path, PATH_SEPARATOR)) {
+        // Mirror Bee (pkg/manifest/mantaray/node.go): Add() marks every explicitly
+        // added leaf as a value (makeValue), even one with a null entry such as a
+        // metadata-only "/" node. In final-state terms a leaf (no forks) is always an
+        // added entry, so it is a value; a node with forks is a value only when it also
+        // carries an entry. The path-separator flag is set only when a separator occurs
+        // past the first byte (IndexRune > 0), so a prefix that merely starts with '/'
+        // does not qualify.
+        if (!cafe_utility_1.Binary.equals(this.targetAddress, __1.NULL_ADDRESS) || this.forks.size === 0) {
             type |= TYPE_VALUE;
         }
         if (this.forks.size > 0) {
             type |= TYPE_EDGE;
         }
-        if (cafe_utility_1.Binary.indexOf(this.path, PATH_SEPARATOR) !== -1 && !cafe_utility_1.Binary.equals(this.path, PATH_SEPARATOR)) {
+        if (cafe_utility_1.Binary.indexOf(this.path, PATH_SEPARATOR) > 0) {
             type |= TYPE_WITH_PATH_SEPARATOR;
         }
         if (this.metadata) {

package/dist/cjs/modules/debug/status.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUPPORTED_API_VERSION = exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT = void 0;
 exports.getDebugStatus = getDebugStatus;
 exports.getHealth = getHealth;
 exports.getReadiness = getReadiness;
@@ -14,9 +13,7 @@ exports.getVersions = getVersions;
 const major_js_1 = __importDefault(require("semver/functions/major.js"));
 const status_1 = require("../../types/schema/status");
 const http_1 = require("../../utils/http");
-exports.SUPPORTED_BEE_VERSION_EXACT = '2.8.1-7cf53193';
-exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
-exports.SUPPORTED_API_VERSION = '8.1.0';
+const version_1 = require("../../version");
 const NODE_INFO_URL = 'node';
 const STATUS_URL = 'status';
 const HEALTH_URL = 'health';
@@ -77,7 +74,7 @@ async function getNodeInfo(requestOptions) {
  */
 async function isSupportedExactVersion(requestOptions) {
     const { version } = await getHealth(requestOptions);
-    return version === exports.SUPPORTED_BEE_VERSION_EXACT;
+    return version === version_1.SUPPORTED_BEE_VERSION_EXACT;
 }
 /**
  * Connects to a node and checks if its Main API versions matches with the one that bee-js supports.
@@ -88,7 +85,7 @@ async function isSupportedExactVersion(requestOptions) {
  */
 async function isSupportedApiVersion(requestOptions) {
     const { apiVersion } = await getHealth(requestOptions);
-    return (0, major_js_1.default)(apiVersion) === (0, major_js_1.default)(exports.SUPPORTED_API_VERSION);
+    return (0, major_js_1.default)(apiVersion) === (0, major_js_1.default)(version_1.SUPPORTED_API_VERSION);
 }
 /**
  * Returns object with all versions specified by the connected Bee node (properties prefixed with `bee*`)
@@ -99,8 +96,8 @@ async function isSupportedApiVersion(requestOptions) {
 async function getVersions(requestOptions) {
     const { version, apiVersion } = await getHealth(requestOptions);
     return {
-        supportedBeeVersion: exports.SUPPORTED_BEE_VERSION_EXACT,
-        supportedBeeApiVersion: exports.SUPPORTED_API_VERSION,
+        supportedBeeVersion: version_1.SUPPORTED_BEE_VERSION_EXACT,
+        supportedBeeApiVersion: version_1.SUPPORTED_API_VERSION,
         beeVersion: version,
         beeApiVersion: apiVersion,
     };

package/dist/cjs/version.js

@@ -0,0 +1,11 @@
+"use strict";
+// AUTO-GENERATED from package.json "engines" by scripts/generate-version.cjs — do not edit by hand.
+// Run `npm run generate:version` to regenerate.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SUPPORTED_API_VERSION = exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT = void 0;
+/** Exact supported Bee version, including the commit hash suffix. */
+exports.SUPPORTED_BEE_VERSION_EXACT = '2.8.1-7cf53193';
+/** Supported Bee version without the commit hash suffix. */
+exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
+/** Supported Bee API version. */
+exports.SUPPORTED_API_VERSION = '8.1.0';