@ethersphere/bee-js 12.1.0 → 12.2.1

package/dist/cjs/bee.js

@@ -1629,10 +1629,16 @@ class Bee {
             ? currentAmount * multiplier
             : (currentAmount + additionalAmount) * multiplier;
         const amountDelta = targetAmount - currentAmount;
-        const transactionId = await this.topUpBatch(batch.batchID, amountDelta, requestOptions);
+        let transactionId;
+        if (amountDelta > 0n) {
+            transactionId = await this.topUpBatch(batch.batchID, amountDelta, requestOptions);
+        }
         if (depthDelta > 0) {
             return this.diluteBatch(batch.batchID, depth, requestOptions);
         }
+        if (!transactionId) {
+            throw new Error('Nothing to extend, both size and duration are already sufficient');
+        }
         return transactionId;
     }
     /**

package/dist/cjs/utils/tar.browser.js

@@ -15,10 +15,17 @@ class TarStream {
         });
     }
     beginFile(path, size) {
-        if (path.length > 100) {
-            throw new Error(`File name too long: ${path}`);
+        const { name, prefix, longLink } = splitPath(path);
+        if (longLink) {
+            const encoder = new TextEncoder();
+            const pathData = encoder.encode(path + '\0');
+            this.pieces.push(createLongLinkHeader(pathData.length));
+            this.pieces.push(pathData);
+            const padding = pathData.length % 512 === 0 ? 0 : 512 - (pathData.length % 512);
+            if (padding > 0)
+                this.pieces.push(new Uint8Array(padding));
         }
-        const header = createHeader(path, size);
+        const header = createHeader(name, prefix, size);
         this.pieces.push(header);
         this.currentFileSize = 0;
     }
@@ -37,7 +44,46 @@ class TarStream {
     }
 }
 exports.TarStream = TarStream;
-function createHeader(path, size) {
+function splitPath(path) {
+    if (path.length <= 100)
+        return { name: path, prefix: '', longLink: false };
+    for (let i = path.length - 1; i >= 0; i--) {
+        if (path[i] === '/') {
+            const name = path.substring(i + 1);
+            const prefix = path.substring(0, i);
+            if (name.length <= 100 && prefix.length <= 155)
+                return { name, prefix, longLink: false };
+        }
+    }
+    // Filename itself is > 100 chars or path > 255 chars — use GNU LongLink
+    const lastSlash = path.lastIndexOf('/');
+    const truncatedName = (lastSlash >= 0 ? path.substring(lastSlash + 1) : path).slice(0, 100);
+    return { name: truncatedName, prefix: '', longLink: true };
+}
+function createLongLinkHeader(size) {
+    const encoder = new TextEncoder();
+    function writeToBuffer(str, offset, length) {
+        const bytes = encoder.encode(str);
+        header.set(bytes.slice(0, length), offset);
+    }
+    const header = new Uint8Array(512);
+    header.fill(0);
+    writeToBuffer('././@LongLink', 0, 100);
+    writeToBuffer('0000644\0', 100, 8);
+    writeToBuffer('0000000\0', 108, 8);
+    writeToBuffer('0000000\0', 116, 8);
+    writeToBuffer(size.toString(8).padStart(11, '0') + '\0', 124, 12);
+    writeToBuffer('00000000000\0', 136, 12);
+    writeToBuffer('        ', 148, 8);
+    writeToBuffer('L', 156, 1);
+    writeToBuffer('ustar\0\0', 257, 8);
+    let checksum = 0;
+    for (let i = 0; i < 512; i++)
+        checksum += header[i];
+    writeToBuffer(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
+    return header;
+}
+function createHeader(name, prefix, size) {
     const encoder = new TextEncoder();
     function writeToBuffer(str, offset, length) {
         const bytes = encoder.encode(str);
@@ -47,7 +93,7 @@ function createHeader(path, size) {
     const header = new Uint8Array(512);
     header.fill(0, 0, 512);
     // File name, truncated to 100 characters if necessary
-    writeToBuffer(path.slice(0, 100).padEnd(100, '\0'), 0, 100);
+    writeToBuffer(name.slice(0, 100).padEnd(100, '\0'), 0, 100);
     // File mode (octal) and null-terminated
     writeToBuffer('0000777\0', 100, 8);
     // UID and GID (octal) and null-terminated
@@ -64,11 +110,13 @@ function createHeader(path, size) {
     writeToBuffer('0', 156, 1);
     // USTAR magic and version
     writeToBuffer('ustar\0\0', 257, 8);
+    // UStar prefix field (offset 345, 155 bytes) — used when path > 100 but fits split
+    if (prefix)
+        writeToBuffer(prefix.slice(0, 155).padEnd(155, '\0'), 345, 155);
     // Calculate checksum
     let checksum = 0;
-    for (let i = 0; i < 512; i++) {
+    for (let i = 0; i < 512; i++)
         checksum += header[i];
-    }
     writeToBuffer(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
     return header;
 }

package/dist/cjs/utils/tar.js

@@ -8,10 +8,16 @@ class TarStream {
         this.currentFileSize = 0;
     }
     beginFile(path, size) {
-        if (path.length > 100) {
-            throw new Error(`File name too long: ${path}`);
+        const { name, prefix, longLink } = splitPath(path);
+        if (longLink) {
+            const pathData = Buffer.from(path + '\0');
+            this.output.write(createLongLinkHeader(pathData.length));
+            this.output.write(pathData);
+            const padding = pathData.length % 512 === 0 ? 0 : 512 - (pathData.length % 512);
+            if (padding > 0)
+                this.output.write(Buffer.alloc(padding, 0));
         }
-        const header = createHeader(path, size);
+        const header = createHeader(name, prefix, size);
         this.output.write(header);
         this.currentFileSize = 0;
     }
@@ -44,11 +50,44 @@ class TarStream {
     }
 }
 exports.TarStream = TarStream;
-function createHeader(path, size) {
+function splitPath(path) {
+    if (path.length <= 100)
+        return { name: path, prefix: '', longLink: false };
+    for (let i = path.length - 1; i >= 0; i--) {
+        if (path[i] === '/') {
+            const name = path.substring(i + 1);
+            const prefix = path.substring(0, i);
+            if (name.length <= 100 && prefix.length <= 155)
+                return { name, prefix, longLink: false };
+        }
+    }
+    // Filename itself is > 100 chars or path > 255 chars — use GNU LongLink
+    const lastSlash = path.lastIndexOf('/');
+    const truncatedName = (lastSlash >= 0 ? path.substring(lastSlash + 1) : path).slice(0, 100);
+    return { name: truncatedName, prefix: '', longLink: true };
+}
+function createLongLinkHeader(size) {
+    const header = Buffer.alloc(512, 0);
+    header.write('././@LongLink', 0, 100);
+    header.write('0000644\0', 100, 8);
+    header.write('0000000\0', 108, 8);
+    header.write('0000000\0', 116, 8);
+    header.write(size.toString(8).padStart(11, '0') + '\0', 124, 12);
+    header.write('00000000000\0', 136, 12);
+    header.write('        ', 148, 8);
+    header.write('L', 156, 1);
+    header.write('ustar\0\0', 257, 8);
+    let checksum = 0;
+    for (let i = 0; i < 512; i++)
+        checksum += header[i];
+    header.write(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
+    return header;
+}
+function createHeader(name, prefix, size) {
     // Initialize header with zeros
     const header = Buffer.alloc(512, 0);
     // File name, truncated to 100 characters if necessary
-    header.write(path.slice(0, 100).padEnd(100, '\0'), 0, 100);
+    header.write(name.slice(0, 100).padEnd(100, '\0'), 0, 100);
     // File mode (octal) and null-terminated
     header.write('0000777\0', 100, 8);
     // UID and GID (octal) and null-terminated
@@ -65,11 +104,13 @@ function createHeader(path, size) {
     header.write('0', 156, 1);
     // USTAR magic and version
     header.write('ustar\0\0', 257, 8);
+    // UStar prefix field (offset 345, 155 bytes) — used when path > 100 but fits split
+    if (prefix)
+        header.write(prefix.slice(0, 155).padEnd(155, '\0'), 345, 155);
     // Calculate checksum
     let checksum = 0;
-    for (let i = 0; i < 512; i++) {
+    for (let i = 0; i < 512; i++)
         checksum += header[i];
-    }
     header.write(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
     return header;
 }