@ethersphere/bee-js 9.8.0 → 10.0.0

package/dist/mjs/utils/bytes.js

@@ -67,4 +67,21 @@ export class Bytes {
   represent() {
     return this.toHex();
   }
+}
+export function parseSizeToBytes(sizeStr) {
+  const units = {
+    B: 1,
+    kB: 1000,
+    MB: 1000 ** 2,
+    GB: 1000 ** 3,
+    TB: 1000 ** 4,
+    PB: 1000 ** 5
+  };
+  const match = sizeStr.match(/^([\d.]+)\s*(B|kB|MB|GB|TB|PB)$/);
+  if (!match) {
+    throw new Error(`Invalid size format: ${sizeStr}`);
+  }
+  const value = parseFloat(match[1]);
+  const unit = match[2];
+  return Math.ceil(value * units[unit]);
 }

package/dist/mjs/utils/duration.js

@@ -2,8 +2,8 @@ import { Dates } from 'cafe-utility';
 export class Duration {
   constructor(seconds) {
     this.seconds = Math.ceil(seconds);
-    if (seconds <= 0) {
-      throw Error('Duration must be greater than 0');
+    if (seconds < 0) {
+      this.seconds = 0;
     }
   }
   static fromMilliseconds(milliseconds) {
@@ -48,4 +48,8 @@ export class Duration {
   represent() {
     return Dates.secondsToHumanTime(this.seconds);
   }
-}
+  isZero() {
+    return this.seconds === 0;
+  }
+}
+Duration.ZERO = new Duration(0);

package/dist/mjs/utils/stamps.js

@@ -1,5 +1,6 @@
 import { Binary } from 'cafe-utility';
-import { Bytes } from "./bytes.js";
+import { capacityBreakpoints } from "../types/index.js";
+import { Bytes, parseSizeToBytes } from "./bytes.js";
 import { Duration } from "./duration.js";
 import { BZZ } from "./tokens.js";
 import { asNumberString } from "./type.js";
@@ -37,24 +38,33 @@ const effectiveSizeBreakpoints = [[17, 0.00004089], [18, 0.00609], [19, 0.10249]
  *
  * @returns {number} The effective size of the postage batch in bytes.
  */
-export function getStampEffectiveBytes(depth) {
+export function getStampEffectiveBytes(depth, encryption, erasureCodeLevel) {
   if (depth < 17) {
     return 0;
   }
-  const breakpoint = effectiveSizeBreakpoints.find(([d, size]) => {
-    if (depth === d) {
-      return size;
+  if (encryption !== undefined && erasureCodeLevel !== undefined) {
+    const encryptionKey = encryption ? 'ENCRYPTION_ON' : 'ENCRYPTION_OFF';
+    const breakpoints = capacityBreakpoints[encryptionKey][erasureCodeLevel];
+    const entry = breakpoints.find(item => item.batchDepth === depth);
+    if (entry?.effectiveVolume) {
+      return parseSizeToBytes(entry.effectiveVolume);
+    }
+  } else {
+    const breakpoint = effectiveSizeBreakpoints.find(([d, size]) => {
+      if (depth === d) {
+        return size;
+      }
+    });
+    if (breakpoint) {
+      return breakpoint[1] * 1000 * 1000 * 1000;
     }
-  });
-  if (breakpoint) {
-    return breakpoint[1] * 1000 * 1000 * 1000;
   }
   return Math.ceil(getStampTheoreticalBytes(depth) * MAX_UTILIZATION);
 }
-export function getStampEffectiveBytesBreakpoints() {
+export function getStampEffectiveBytesBreakpoints(encryption, erasureCodeLevel) {
   const map = new Map();
   for (let i = 17; i < 35; i++) {
-    map.set(i, getStampEffectiveBytes(i));
+    map.set(i, getStampEffectiveBytes(i, encryption, erasureCodeLevel));
   }
   return map;
 }
@@ -91,10 +101,21 @@ export function getAmountForDuration(duration, pricePerBlock, blockTime) {
  * @param size The effective size of the postage batch
  * @returns
  */
-export function getDepthForSize(size) {
-  for (const [depth, sizeBreakpoint] of effectiveSizeBreakpoints) {
-    if (size.toBytes() <= sizeBreakpoint * 1000 * 1000 * 1000) {
-      return depth;
+export function getDepthForSize(size, encryption, erasureCodeLevel) {
+  if (encryption !== undefined && erasureCodeLevel !== undefined) {
+    const encryptionKey = encryption ? 'ENCRYPTION_ON' : 'ENCRYPTION_OFF';
+    const breakpoints = capacityBreakpoints[encryptionKey][erasureCodeLevel];
+    const entry = breakpoints.find(item => {
+      return size.toBytes() <= parseSizeToBytes(item.effectiveVolume);
+    });
+    if (entry?.effectiveVolume) {
+      return entry.batchDepth;
+    }
+  } else {
+    for (const [depth, sizeBreakpoint] of effectiveSizeBreakpoints) {
+      if (size.toBytes() <= sizeBreakpoint * 1000 * 1000 * 1000) {
+        return depth;
+      }
     }
   }
   return 35;

package/dist/mjs/utils/type.js

@@ -158,6 +158,9 @@ export function preparePssMessageHandler(value) {
     }),
     onError: Types.asFunction(object.onError, {
       name: 'onError'
+    }),
+    onClose: Types.asFunction(object.onClose, {
+      name: 'onClose'
     })
   };
 }
@@ -171,6 +174,9 @@ export function prepareGsocMessageHandler(value) {
     }),
     onError: Types.asFunction(object.onError, {
       name: 'onError'
+    }),
+    onClose: Types.asFunction(object.onClose, {
+      name: 'onClose'
     })
   };
 }