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

package/dist/mjs/index.js

@@ -2,7 +2,7 @@ import { Bee } from "./bee.js";
 import { Stamper } from "./stamper/stamper.js";
 export { MerkleTree } from 'cafe-utility';
 export { MantarayNode } from "./manifest/manifest.js";
-export { SUPPORTED_BEE_VERSION, SUPPORTED_BEE_VERSION_EXACT } from "./modules/debug/status.js";
+export { SUPPORTED_BEE_VERSION, SUPPORTED_BEE_VERSION_EXACT } from "./version.js";
 export * from "./types/index.js";
 export { Bytes } from "./utils/bytes.js";
 export * from "./utils/constants.js";

package/dist/mjs/manifest/manifest.js

@@ -55,7 +55,10 @@ export 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(Binary.numberToUint8(this.prefix.length));
     data.push(this.prefix);
     if (this.prefix.length < 30) {
@@ -98,7 +101,8 @@ export class Fork {
     return new Fork(prefix, new MantarayNode({
       selfAddress,
       metadata,
-      path: prefix
+      path: prefix,
+      type
     }));
   }
 }
@@ -111,6 +115,7 @@ export class MantarayNode {
     this.path = new Uint8Array(0);
     this.forks = new Map();
     this.parent = null;
+    this.type = null;
     if (options?.targetAddress) {
       this.targetAddress = options.targetAddress;
     }
@@ -129,6 +134,7 @@ export class MantarayNode {
     if (options?.parent) {
       this.parent = options.parent;
     }
+    this.type = options?.type ?? null;
   }
   get fullPath() {
     return Binary.concatBytes(this.parent?.fullPath ?? new Uint8Array(0), this.path);
@@ -186,9 +192,22 @@ export class MantarayNode {
         fork.node.selfAddress = (await fork.node.calculateSelfAddress()).toUint8Array();
       }
     }
+    const hasEntry = !Binary.equals(this.targetAddress, 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(Binary.equals(this.targetAddress, NULL_ADDRESS) && Binary.equals(this.path, new Uint8Array([47])) ? Binary.numberToUint8(0) : Binary.numberToUint8(this.targetAddress.length), 31);
+    header.set(Binary.numberToUint8(refBytesSize), 31);
+    const entry = hasEntry ? this.targetAddress : new Uint8Array(refBytesSize);
     const forkBitmap = new Uint8Array(32);
     for (const fork of this.forks.keys()) {
       Binary.setBit(forkBitmap, fork, 1, 'LE');
@@ -199,7 +218,7 @@ export class MantarayNode {
         forks.push(this.forks.get(i).marshal());
       }
     }
-    const data = Binary.xorCypher(Binary.concatBytes(header, Binary.equals(this.targetAddress, NULL_ADDRESS) && Binary.equals(this.path, new Uint8Array([47])) ? new Uint8Array(0) : this.targetAddress, forkBitmap, ...forks), this.obfuscationKey);
+    const data = Binary.xorCypher(Binary.concatBytes(header, entry, forkBitmap, ...forks), this.obfuscationKey);
     return Binary.concatBytes(this.obfuscationKey, data);
   }
   /**
@@ -233,11 +252,13 @@ export class MantarayNode {
       obfuscationKey
     });
     const forkBitmap = reader.read(32);
-    for (let i = 0; i < 256; i++) {
-      if (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 (Binary.getBit(forkBitmap, i, 'LE')) {
+          const newFork = Fork.unmarshal(reader, selfAddress.length);
+          node.forks.set(i, newFork);
+          newFork.node.parent = node;
+        }
       }
     }
     return node;
@@ -247,6 +268,7 @@ export 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),
@@ -278,11 +300,13 @@ export 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;
       }
     }
@@ -292,6 +316,7 @@ export 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');
@@ -409,13 +434,20 @@ export class MantarayNode {
   }
   determineType() {
     let type = 0;
-    if (!Binary.equals(this.targetAddress, NULL_ADDRESS) || 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 (!Binary.equals(this.targetAddress, NULL_ADDRESS) || this.forks.size === 0) {
       type |= TYPE_VALUE;
     }
     if (this.forks.size > 0) {
       type |= TYPE_EDGE;
     }
-    if (Binary.indexOf(this.path, PATH_SEPARATOR) !== -1 && !Binary.equals(this.path, PATH_SEPARATOR)) {
+    if (Binary.indexOf(this.path, PATH_SEPARATOR) > 0) {
       type |= TYPE_WITH_PATH_SEPARATOR;
     }
     if (this.metadata) {

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

@@ -1,9 +1,7 @@
 import getMajorSemver from 'semver/functions/major.js';
 import { GetDebugStatusResponse, GetHealthResponse, GetNodeInfoResponse, GetReadinessResponse } from "../../types/schema/status.js";
 import { http } from "../../utils/http.js";
-export const SUPPORTED_BEE_VERSION_EXACT = '2.8.1-7cf53193';
-export const SUPPORTED_BEE_VERSION = SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
-export const SUPPORTED_API_VERSION = '8.1.0';
+import { SUPPORTED_API_VERSION, SUPPORTED_BEE_VERSION_EXACT } from "../../version.js";
 const NODE_INFO_URL = 'node';
 const STATUS_URL = 'status';
 const HEALTH_URL = 'health';

package/dist/mjs/version.js

@@ -0,0 +1,8 @@
+// AUTO-GENERATED from package.json "engines" by scripts/generate-version.cjs — do not edit by hand.
+// Run `npm run generate:version` to regenerate.
+/** Exact supported Bee version, including the commit hash suffix. */
+export const SUPPORTED_BEE_VERSION_EXACT = '2.8.1-7cf53193';
+/** Supported Bee version without the commit hash suffix. */
+export const SUPPORTED_BEE_VERSION = SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
+/** Supported Bee API version. */
+export const SUPPORTED_API_VERSION = '8.1.0';

package/dist/types/index.d.ts

@@ -4,7 +4,7 @@ export { MerkleTree } from 'cafe-utility';
 export type { Chunk } from './chunk/cac';
 export type { SingleOwnerChunk } from './chunk/soc';
 export { MantarayNode } from './manifest/manifest';
-export { SUPPORTED_BEE_VERSION, SUPPORTED_BEE_VERSION_EXACT } from './modules/debug/status';
+export { SUPPORTED_BEE_VERSION, SUPPORTED_BEE_VERSION_EXACT } from './version';
 export * from './types';
 export { Bytes } from './utils/bytes';
 export * from './utils/constants';

package/dist/types/manifest/manifest.d.ts

@@ -18,6 +18,7 @@ interface MantarayNodeOptions {
     metadata?: Record<string, string> | null;
     path?: Uint8Array | null;
     parent?: MantarayNode | null;
+    type?: number | null;
 }
 export declare class MantarayNode {
     obfuscationKey: Uint8Array;
@@ -27,6 +28,7 @@ export declare class MantarayNode {
     path: Uint8Array;
     forks: Map<number, Fork>;
     parent: MantarayNode | null;
+    type: number | null;
     constructor(options?: MantarayNodeOptions);
     get fullPath(): Uint8Array;
     get fullPathString(): string;

package/dist/types/modules/debug/status.d.ts

@@ -1,9 +1,6 @@
 import { BeeRequestOptions } from '../../index';
 import type { DebugStatus, Health, NodeInfo, Readiness } from '../../types/debug';
 import { BeeVersions } from '../../types/debug';
-export declare const SUPPORTED_BEE_VERSION_EXACT = "2.8.1-7cf53193";
-export declare const SUPPORTED_BEE_VERSION: string;
-export declare const SUPPORTED_API_VERSION = "8.1.0";
 export declare function getDebugStatus(requestOptions: BeeRequestOptions): Promise<DebugStatus>;
 /**
  * Get health of node

package/dist/types/version.d.ts

@@ -0,0 +1,6 @@
+/** Exact supported Bee version, including the commit hash suffix. */
+export declare const SUPPORTED_BEE_VERSION_EXACT = "2.8.1-7cf53193";
+/** Supported Bee version without the commit hash suffix. */
+export declare const SUPPORTED_BEE_VERSION: string;
+/** Supported Bee API version. */
+export declare const SUPPORTED_API_VERSION = "8.1.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "12.3.1",
+  "version": "12.3.2-upcoming.116",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -53,7 +53,9 @@
   ],
   "scripts": {
     "prepublishOnly": "NODE_ENV=production npm run build",
-    "build": "rimraf dist && npm run build:node && npm run build:types && npm run build:browser",
+    "prepare": "node scripts/generate-version.cjs",
+    "generate:version": "node scripts/generate-version.cjs",
+    "build": "npm run generate:version && rimraf dist && npm run build:node && npm run build:types && npm run build:browser",
     "build:node": "tsc -p tsconfig.json && tsc -p tsconfig-mjs.json && ./build-fixup && babel --plugins \"babel-plugin-add-import-extension\" --out-dir dist/mjs/ dist/mjs/",
     "build:types": "tsc --emitDeclarationOnly --declaration --outDir dist/types",
     "build:browser": "webpack --progress",
@@ -66,7 +68,7 @@
   "dependencies": {
     "cafe-utility": "^34.0.0",
     "debug": "^4.4.3",
-    "isomorphic-ws": "^4.0.1",
+    "isomorphic-ws": "^5.0.0",
     "semver": "^7.3.5",
     "ws": "^8.21.0",
     "zod": "^4.4.3"
@@ -92,12 +94,12 @@
     "depcheck": "^1.4.7",
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^5.5.6",
     "eslint-plugin-unused-imports": "^4.4.1",
     "husky": "^8.0.1",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.4.1",
-    "prettier": "^2.6.2",
+    "prettier": "^3.9.4",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.1",
     "ts-jest": "^29.4.11",