@upcoming/bee-js 0.12.0 → 0.14.0

package/dist/mjs/bee.js

@@ -1176,6 +1176,15 @@ export class Bee {
     const amount = getAmountForDuration(duration, chainState.currentPrice);
     return this.topUpBatch(batch.batchID, amount, options);
   }
+  async getExtensionCost(postageBatchId, gigabytes, duration, options) {
+    const batch = await this.getPostageBatch(postageBatchId, options);
+    const chainState = await this.getChainState(options);
+    const amount = getAmountForDuration(duration, chainState.currentPrice);
+    const depth = getDepthForSize(gigabytes);
+    const currentValue = getStampCost(batch.depth, batch.amount);
+    const newValue = getStampCost(depth, amount);
+    return newValue.minus(currentValue);
+  }
   async getSizeExtensionCost(postageBatchId, gigabytes, options) {
     const batch = await this.getPostageBatch(postageBatchId, options);
     const depth = getDepthForSize(gigabytes);

package/dist/mjs/chunk/cac.js

@@ -25,4 +25,17 @@ export function makeContentAddressedChunk(payloadBytes) {
     payload: Bytes.fromSlice(data, Span.LENGTH),
     address: calculateChunkAddress(data)
   };
+}
+export function asContentAddressedChunk(chunkBytes) {
+  if (chunkBytes.length < MIN_PAYLOAD_SIZE + Span.LENGTH || chunkBytes.length > MAX_PAYLOAD_SIZE + Span.LENGTH) {
+    throw new RangeError(`chunk size ${chunkBytes.length} exceeds limits [${MIN_PAYLOAD_SIZE + Span.LENGTH}, ${Span.LENGTH}]`);
+  }
+  const span = Span.fromSlice(chunkBytes, 0);
+  const data = Binary.concatBytes(span.toUint8Array(), chunkBytes.slice(Span.LENGTH));
+  return {
+    data,
+    span,
+    payload: Bytes.fromSlice(data, Span.LENGTH),
+    address: calculateChunkAddress(data)
+  };
 }

package/dist/mjs/chunk/soc.js

@@ -5,7 +5,7 @@ import { Bytes } from "../utils/bytes.js";
 import { BeeError } from "../utils/error.js";
 import { EthAddress, Identifier, PrivateKey, Reference, Signature, Span } from "../utils/typed-bytes.js";
 import { calculateChunkAddress } from "./bmt.js";
-import { makeContentAddressedChunk } from "./cac.js";
+import { asContentAddressedChunk, makeContentAddressedChunk } from "./cac.js";
 const SOC_SIGNATURE_OFFSET = Identifier.LENGTH;
 const SOC_SPAN_OFFSET = SOC_SIGNATURE_OFFSET + Signature.LENGTH;
 const SOC_PAYLOAD_OFFSET = SOC_SPAN_OFFSET + Span.LENGTH;
@@ -107,6 +107,12 @@ export async function uploadSingleOwnerChunkData(requestOptions, signer, stamp,
   const soc = makeSingleOwnerChunk(cac, identifier, signer);
   return uploadSingleOwnerChunk(requestOptions, soc, stamp, options);
 }
+export async function uploadSingleOwnerChunkWithWrappedChunk(requestOptions, signer, stamp, identifier, rootChunk, options) {
+  signer = new PrivateKey(signer);
+  identifier = new Identifier(identifier);
+  const soc = makeSingleOwnerChunk(asContentAddressedChunk(rootChunk), identifier, signer);
+  return uploadSingleOwnerChunk(requestOptions, soc, stamp, options);
+}
 /**
  * Helper function to download SOC.
  *

package/dist/mjs/feed/index.js

@@ -1,10 +1,13 @@
 import { Binary, Optional, Types } from 'cafe-utility';
-import { makeSingleOwnerChunkFromData, uploadSingleOwnerChunkData } from "../chunk/soc.js";
+import { asContentAddressedChunk } from "../chunk/cac.js";
+import { makeSingleOwnerChunkFromData, uploadSingleOwnerChunkData, uploadSingleOwnerChunkWithWrappedChunk } from "../chunk/soc.js";
+import * as bytes from "../modules/bytes.js";
 import * as chunkAPI from "../modules/chunk.js";
 import { fetchLatestFeedUpdate, probeFeed } from "../modules/feed.js";
 import { Bytes } from "../utils/bytes.js";
 import { BeeResponseError } from "../utils/error.js";
-import { FeedIndex, Reference } from "../utils/typed-bytes.js";
+import { ResourceLocator } from "../utils/resource-locator.js";
+import { FeedIndex, Identifier, Reference, Signature } from "../utils/typed-bytes.js";
 import { makeFeedIdentifier } from "./identifier.js";
 const TIMESTAMP_PAYLOAD_OFFSET = 0;
 const TIMESTAMP_PAYLOAD_SIZE = 8;
@@ -35,6 +38,11 @@ export async function updateFeedWithReference(requestOptions, signer, topic, ref
 export async function updateFeedWithPayload(requestOptions, signer, topic, data, postageBatchId, options) {
   const nextIndex = options?.index ?? (await findNextIndex(requestOptions, signer.publicKey().address(), topic));
   const identifier = makeFeedIdentifier(topic, nextIndex);
+  if (data.length > 4096) {
+    const uploadResult = await bytes.upload(requestOptions, data, postageBatchId, options);
+    const rootChunk = await chunkAPI.download(requestOptions, uploadResult.reference);
+    return uploadSingleOwnerChunkWithWrappedChunk(requestOptions, signer, postageBatchId, identifier, rootChunk, options);
+  }
   return uploadSingleOwnerChunkData(requestOptions, signer, postageBatchId, identifier, Types.isString(data) ? Bytes.fromUtf8(data).toUint8Array() : data, options);
 }
 export function getFeedUpdateChunkReference(owner, topic, index) {
@@ -56,6 +64,12 @@ export async function downloadFeedUpdate(requestOptions, owner, topic, index, ha
     payload: new Bytes(soc.payload.offset(hasTimestamp ? REFERENCE_PAYLOAD_OFFSET : 0))
   };
 }
+export async function downloadFeedUpdateAsCAC(requestOptions, owner, topic, index) {
+  index = typeof index === 'number' ? FeedIndex.fromBigInt(BigInt(index)) : index;
+  const address = getFeedUpdateChunkReference(owner, topic, index);
+  const data = await chunkAPI.download(requestOptions, address);
+  return asContentAddressedChunk(data.slice(Identifier.LENGTH + Signature.LENGTH));
+}
 export function makeFeedReader(requestOptions, topic, owner) {
   // TODO: remove after enough time has passed in deprecated version
   const download = async options => {
@@ -73,10 +87,11 @@ export function makeFeedReader(requestOptions, topic, owner) {
     if (options?.index === undefined) {
       return fetchLatestFeedUpdate(requestOptions, owner, topic);
     }
-    const update = await downloadFeedUpdate(requestOptions, owner, topic, options.index, options.hasTimestamp);
+    const cac = await downloadFeedUpdateAsCAC(requestOptions, owner, topic, options.index);
+    const payload = cac.span.toBigInt() <= 4096n ? cac.payload : await bytes.download(requestOptions, new ResourceLocator(cac.address));
     const feedIndex = typeof options.index === 'number' ? FeedIndex.fromBigInt(BigInt(options.index)) : options.index;
     return {
-      payload: update.payload,
+      payload,
       feedIndex
     };
   };

package/dist/types/bee.d.ts

@@ -653,6 +653,7 @@ export declare class Bee {
     getStorageCost(gigabytes: number, duration: Duration, options?: BeeRequestOptions): Promise<BZZ>;
     extendStorageSize(postageBatchId: BatchId | Uint8Array | string, gigabytes: number, options?: BeeRequestOptions): Promise<BatchId>;
     extendStorageDuration(postageBatchId: BatchId | Uint8Array | string, duration: Duration, options?: BeeRequestOptions): Promise<BatchId>;
+    getExtensionCost(postageBatchId: BatchId | Uint8Array | string, gigabytes: number, duration: Duration, options?: BeeRequestOptions): Promise<BZZ>;
     getSizeExtensionCost(postageBatchId: BatchId | Uint8Array | string, gigabytes: number, options?: BeeRequestOptions): Promise<BZZ>;
     getDurationExtensionCost(postageBatchId: BatchId | Uint8Array | string, duration: Duration, options?: BeeRequestOptions): Promise<BZZ>;
     /**

package/dist/types/chunk/cac.d.ts

@@ -23,3 +23,4 @@ export interface Chunk {
  * @param payloadBytes the data to be stored in the chunk
  */
 export declare function makeContentAddressedChunk(payloadBytes: Uint8Array | string): Chunk;
+export declare function asContentAddressedChunk(chunkBytes: Uint8Array): Chunk;

package/dist/types/chunk/soc.d.ts

@@ -55,6 +55,7 @@ export declare function uploadSingleOwnerChunk(requestOptions: BeeRequestOptions
  * @param options
  */
 export declare function uploadSingleOwnerChunkData(requestOptions: BeeRequestOptions, signer: PrivateKey | Uint8Array | string, stamp: BatchId | Uint8Array | string, identifier: Identifier | Uint8Array | string, data: Uint8Array, options?: UploadOptions): Promise<UploadResult>;
+export declare function uploadSingleOwnerChunkWithWrappedChunk(requestOptions: BeeRequestOptions, signer: PrivateKey | Uint8Array | string, stamp: BatchId | Uint8Array | string, identifier: Identifier | Uint8Array | string, rootChunk: Uint8Array, options?: UploadOptions): Promise<UploadResult>;
 /**
  * Helper function to download SOC.
  *

package/dist/types/feed/index.d.ts

@@ -1,4 +1,5 @@
 import { Optional } from 'cafe-utility';
+import { Chunk } from '../chunk/cac';
 import { FeedUpdateOptions } from '../modules/feed';
 import { BeeRequestOptions, FeedReader, FeedWriter, UploadOptions, UploadResult } from '../types';
 import { Bytes } from '../utils/bytes';
@@ -18,5 +19,6 @@ export declare function updateFeedWithReference(requestOptions: BeeRequestOption
 export declare function updateFeedWithPayload(requestOptions: BeeRequestOptions, signer: PrivateKey, topic: Topic, data: Uint8Array | string, postageBatchId: BatchId, options?: FeedUploadOptions): Promise<UploadResult>;
 export declare function getFeedUpdateChunkReference(owner: EthAddress, topic: Topic, index: FeedIndex): Reference;
 export declare function downloadFeedUpdate(requestOptions: BeeRequestOptions, owner: EthAddress, topic: Topic, index: FeedIndex | number, hasTimestamp?: boolean): Promise<FeedUpdate>;
+export declare function downloadFeedUpdateAsCAC(requestOptions: BeeRequestOptions, owner: EthAddress, topic: Topic, index: FeedIndex | number): Promise<Chunk>;
 export declare function makeFeedReader(requestOptions: BeeRequestOptions, topic: Topic, owner: EthAddress): FeedReader;
 export declare function makeFeedWriter(requestOptions: BeeRequestOptions, topic: Topic, signer: PrivateKey): FeedWriter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upcoming/bee-js",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "Javascript client for Bee",
   "keywords": [
     "bee",