@ethersphere/bee-js 9.1.0 → 9.1.1

package/dist/cjs/manifest/manifest.js

@@ -20,6 +20,22 @@ class Fork {
     }
     static split(a, b) {
         const commonPart = cafe_utility_1.Binary.commonPrefix(a.prefix, b.prefix);
+        if (commonPart.length === a.prefix.length) {
+            const remainingB = b.prefix.slice(commonPart.length);
+            b.node.path = b.prefix.slice(commonPart.length);
+            b.prefix = b.prefix.slice(commonPart.length);
+            b.node.parent = a.node;
+            a.node.forks.set(remainingB[0], b);
+            return a;
+        }
+        if (commonPart.length === b.prefix.length) {
+            const remainingA = a.prefix.slice(commonPart.length);
+            a.node.path = a.prefix.slice(commonPart.length);
+            a.prefix = a.prefix.slice(commonPart.length);
+            a.node.parent = b.node;
+            b.node.forks.set(remainingA[0], a);
+            return b;
+        }
         const node = new MantarayNode({ path: commonPart });
         const newAFork = new Fork(a.prefix.slice(commonPart.length), a.node);
         const newBFork = new Fork(b.prefix.slice(commonPart.length), b.node);
@@ -58,13 +74,13 @@ class Fork {
         const prefixLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
         const prefix = reader.read(prefixLength);
         reader.read(30 - prefixLength);
-        const targetAddress = reader.read(32);
+        const selfAddress = reader.read(32);
         let metadata = undefined;
         if (isType(type, TYPE_WITH_METADATA)) {
             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({ targetAddress, metadata, path: prefix }));
+        return new Fork(prefix, new MantarayNode({ selfAddress, metadata, path: prefix }));
     }
 }
 exports.Fork = Fork;
@@ -175,15 +191,16 @@ class MantarayNode {
      * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
      */
     static async unmarshal(bee, reference, options, requestOptions) {
+        reference = new typed_bytes_1.Reference(reference);
         const data = (await bee.downloadData(reference, options, requestOptions)).toUint8Array();
-        return this.unmarshalFromData(data);
+        return this.unmarshalFromData(data, reference.toUint8Array());
     }
     /**
      * Unmarshals a MantarayNode from the given data.
      *
      * Do not forget calling `loadRecursively` on the returned node to load the entire tree.
      */
-    static unmarshalFromData(data) {
+    static unmarshalFromData(data, selfAddress) {
         const obfuscationKey = data.subarray(0, 32);
         const decrypted = cafe_utility_1.Binary.xorCypher(data.subarray(32), obfuscationKey);
         const reader = new cafe_utility_1.Uint8ArrayReader(decrypted);
@@ -193,7 +210,7 @@ class MantarayNode {
         }
         const targetAddressLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
         const targetAddress = targetAddressLength === 0 ? __1.NULL_ADDRESS : reader.read(targetAddressLength);
-        const node = new MantarayNode({ targetAddress, obfuscationKey });
+        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')) {
@@ -290,7 +307,10 @@ class MantarayNode {
      */
     async loadRecursively(bee, options, requestOptions) {
         for (const fork of this.forks.values()) {
-            const node = await MantarayNode.unmarshal(bee, fork.node.targetAddress, options, requestOptions);
+            if (!fork.node.selfAddress) {
+                throw Error('MantarayNode#loadRecursively fork.node.selfAddress is not set');
+            }
+            const node = await MantarayNode.unmarshal(bee, fork.node.selfAddress, options, requestOptions);
             fork.node.targetAddress = node.targetAddress;
             fork.node.forks = node.forks;
             fork.node.path = fork.prefix;