@ethersphere/bee-js 12.1.0 → 12.2.1

package/dist/mjs/bee.js

@@ -1602,10 +1602,16 @@ export class Bee {
     const currentAmount = getAmountForDuration(batch.duration, chainState.currentPrice, blockTime);
     const targetAmount = duration.isZero() ? 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/mjs/utils/tar.browser.js

@@ -12,10 +12,20 @@ export 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;
   }
@@ -33,7 +43,55 @@ export class TarStream {
     this.pieces.push(createEndOfArchive());
   }
 }
-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);
@@ -43,7 +101,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
@@ -60,11 +118,11 @@ 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++) {
-    checksum += header[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/mjs/utils/tar.js

@@ -5,10 +5,19 @@ export 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;
   }
@@ -39,11 +48,53 @@ export class 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
@@ -60,11 +111,11 @@ 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++) {
-    checksum += header[i];
-  }
+  for (let i = 0; i < 512; i++) checksum += header[i];
   header.write(checksum.toString(8).padStart(6, '0') + '\0 ', 148, 8);
   return header;
 }

package/dist/types/bee.d.ts

@@ -1074,7 +1074,7 @@ export declare class Bee {
      * @param erasureCodeLevel Assume the future uploaded data is erasure coded, which skews the capacity of the postage batch.
      * @returns
      */
-    extendStorage(postageBatchId: BatchId | Uint8Array | string, size: Size, duration: Duration, requestOptions?: BeeRequestOptions, encryption?: boolean, erasureCodeLevel?: RedundancyLevel): Promise<BatchId>;
+    extendStorage(postageBatchId: BatchId | Uint8Array | string, size: Size, duration: Duration, requestOptions?: BeeRequestOptions, encryption?: boolean, erasureCodeLevel?: RedundancyLevel): Promise<TransactionId | BatchId>;
     /**
      * Extends the storage size of a postage batch by increasing its depth.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethersphere/bee-js",
-  "version": "12.1.0",
+  "version": "12.2.1",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",
@@ -44,7 +44,9 @@
     "./dist/cjs/utils/chunk-stream.js": "./dist/cjs/utils/chunk-stream.browser.js",
     "./dist/mjs/utils/chunk-stream.js": "./dist/mjs/utils/chunk-stream.browser.js",
     "./dist/cjs/utils/collection.node.js": "./dist/cjs/utils/collection.browser.js",
-    "./dist/mjs/utils/collection.node.js": "./dist/mjs/utils/collection.browser.js"
+    "./dist/mjs/utils/collection.node.js": "./dist/mjs/utils/collection.browser.js",
+    "./dist/cjs/utils/tar.js": "./dist/cjs/utils/tar.browser.js",
+    "./dist/mjs/utils/tar.js": "./dist/mjs/utils/tar.browser.js"
   },
   "files": [
     "dist"
@@ -56,12 +58,13 @@
     "build:types": "tsc --emitDeclarationOnly --declaration --outDir dist/types",
     "build:browser": "webpack --progress",
     "test": "TS_NODE_PROJECT=tsconfig.test.json jest --runInBand --verbose --forceExit",
+    "test:browser": "TS_NODE_PROJECT=tsconfig.test.json jest --config jest.browser.config.js --runInBand --verbose --forceExit",
     "check": "tsc --project tsconfig.test.json",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\" && prettier --check \"src/**/*.ts\" \"test/**/*.ts\"",
     "depcheck": "depcheck ."
   },
   "dependencies": {
-    "axios": "^1.15.1",
+    "axios": "^1.15.2",
     "cafe-utility": "^33.9.0",
     "debug": "^4.4.1",
     "isomorphic-ws": "^4.0.1",
@@ -93,6 +96,7 @@
     "eslint-plugin-unused-imports": "^2.0.0",
     "husky": "^8.0.1",
     "jest": "^30.2.0",
+    "jest-environment-jsdom": "^30.4.1",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.1",