@ethersphere/bee-js 8.3.1 → 9.0.2

package/dist/cjs/modules/debug/status.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersions = exports.isSupportedApiVersion = exports.isSupportedMainApiVersion = exports.isSupportedExactVersion = exports.isSupportedVersion = exports.getNodeInfo = exports.getReadiness = exports.getHealth = exports.getDebugStatus = exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_API_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT = void 0;
+exports.getVersions = exports.isSupportedApiVersion = exports.isSupportedExactVersion = exports.getNodeInfo = exports.getReadiness = exports.getHealth = exports.getDebugStatus = exports.SUPPORTED_API_VERSION = exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const major_js_1 = __importDefault(require("semver/functions/major.js"));
+const debug_1 = require("../../types/debug");
 const http_1 = require("../../utils/http");
-// Following lines bellow are automatically updated with GitHub Action when Bee version is updated
-// so if you are changing anything about them change the `update_bee` action accordingly!
-exports.SUPPORTED_BEE_VERSION_EXACT = '2.2.0-06a0aca7';
-exports.SUPPORTED_API_VERSION = '7.1.0';
+exports.SUPPORTED_BEE_VERSION_EXACT = '2.4.0-390a402e';
 exports.SUPPORTED_BEE_VERSION = exports.SUPPORTED_BEE_VERSION_EXACT.split('-')[0];
+exports.SUPPORTED_API_VERSION = '7.2.0';
 const NODE_INFO_URL = 'node';
 const STATUS_URL = 'status';
 const HEALTH_URL = 'health';
@@ -21,7 +21,22 @@ async function getDebugStatus(requestOptions) {
         url: STATUS_URL,
         responseType: 'json',
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        overlay: cafe_utility_1.Types.asString(body.overlay, { name: 'overlay' }),
+        proximity: cafe_utility_1.Types.asNumber(body.proximity, { name: 'proximity' }),
+        beeMode: (0, debug_1.toBeeMode)(cafe_utility_1.Types.asString(body.beeMode, { name: 'beeMode' })),
+        reserveSize: cafe_utility_1.Types.asNumber(body.reserveSize, { name: 'reserveSize' }),
+        reserveSizeWithinRadius: cafe_utility_1.Types.asNumber(body.reserveSizeWithinRadius, { name: 'reserveSizeWithinRadius' }),
+        pullsyncRate: cafe_utility_1.Types.asNumber(body.pullsyncRate, { name: 'pullsyncRate' }),
+        storageRadius: cafe_utility_1.Types.asNumber(body.storageRadius, { name: 'storageRadius' }),
+        connectedPeers: cafe_utility_1.Types.asNumber(body.connectedPeers, { name: 'connectedPeers' }),
+        neighborhoodSize: cafe_utility_1.Types.asNumber(body.neighborhoodSize, { name: 'neighborhoodSize' }),
+        batchCommitment: cafe_utility_1.Types.asNumber(body.batchCommitment, { name: 'batchCommitment' }),
+        isReachable: cafe_utility_1.Types.asBoolean(body.isReachable, { name: 'isReachable' }),
+        lastSyncedBlock: cafe_utility_1.Types.asNumber(body.lastSyncedBlock, { name: 'lastSyncedBlock' }),
+        committedDepth: cafe_utility_1.Types.asNumber(body.committedDepth, { name: 'committedDepth' }),
+    };
 }
 exports.getDebugStatus = getDebugStatus;
 /**
@@ -35,7 +50,12 @@ async function getHealth(requestOptions) {
         url: HEALTH_URL,
         responseType: 'json',
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        apiVersion: cafe_utility_1.Types.asString(body.apiVersion, { name: 'apiVersion' }),
+        version: cafe_utility_1.Types.asString(body.version, { name: 'version' }),
+        status: cafe_utility_1.Types.asString(body.status, { name: 'status' }),
+    };
 }
 exports.getHealth = getHealth;
 /**
@@ -44,16 +64,16 @@ exports.getHealth = getHealth;
  * @param requestOptions Options for making requests
  */
 async function getReadiness(requestOptions) {
-    try {
-        const response = await (0, http_1.http)(requestOptions, {
-            method: 'get',
-            url: READINESS_URL,
-        });
-        return response.status === 200;
-    }
-    catch {
-        return false;
-    }
+    const response = await (0, http_1.http)(requestOptions, {
+        method: 'get',
+        url: READINESS_URL,
+    });
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        apiVersion: cafe_utility_1.Types.asString(body.apiVersion, { name: 'apiVersion' }),
+        version: cafe_utility_1.Types.asString(body.version, { name: 'version' }),
+        status: cafe_utility_1.Types.asString(body.status, { name: 'status' }),
+    };
 }
 exports.getReadiness = getReadiness;
 /**
@@ -67,28 +87,19 @@ async function getNodeInfo(requestOptions) {
         url: NODE_INFO_URL,
         responseType: 'json',
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        beeMode: (0, debug_1.toBeeMode)(cafe_utility_1.Types.asString(body.beeMode, { name: 'beeMode' })),
+        chequebookEnabled: cafe_utility_1.Types.asBoolean(body.chequebookEnabled, { name: 'chequebookEnabled' }),
+        swapEnabled: cafe_utility_1.Types.asBoolean(body.swapEnabled, { name: 'swapEnabled' }),
+    };
 }
 exports.getNodeInfo = getNodeInfo;
-/**
- * Connects to a node and checks if it is a supported Bee version by the bee-js
- *
- * @param requestOptions Options for making requests
- * @returns true if the Bee node version is supported
- * @deprecated Use `isSupportedExactVersion` instead
- */
-// TODO: Remove on break
-async function isSupportedVersion(requestOptions) {
-    return isSupportedExactVersion(requestOptions);
-}
-exports.isSupportedVersion = isSupportedVersion;
 /**
  * Connects to a node and checks if its version matches with the one that bee-js supports.
  *
- * Be aware that this is the most strict version check and most probably
- * you will want to use more relaxed API-versions based checks like
- * `isSupportedApiVersion`, `isSupportedMainApiVersion` or `isSupportedDebugApiVersion`
- * based on your use-case.
+ * This is the most strict version check and most probably you will
+ * want to use the relaxed API-versions check `isSupportedApiVersion`.
  *
  * @param requestOptions Options for making requests
  */
@@ -97,19 +108,6 @@ async function isSupportedExactVersion(requestOptions) {
     return version === exports.SUPPORTED_BEE_VERSION_EXACT;
 }
 exports.isSupportedExactVersion = isSupportedExactVersion;
-/**
- * Connects to a node and checks if its main's API version matches with the one that bee-js supports.
- *
- * This is useful if you are not using `Bee` class (for anything else then this check)
- * and want to make sure about compatibility.
- *
- * @param requestOptions Options for making requests
- */
-async function isSupportedMainApiVersion(requestOptions) {
-    const { apiVersion } = await getHealth(requestOptions);
-    return (0, major_js_1.default)(apiVersion) === (0, major_js_1.default)(exports.SUPPORTED_API_VERSION);
-}
-exports.isSupportedMainApiVersion = isSupportedMainApiVersion;
 /**
  * Connects to a node and checks if its Main API versions matches with the one that bee-js supports.
  *

package/dist/cjs/modules/debug/transactions.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancelTransaction = exports.rebroadcastTransaction = exports.getTransaction = exports.getAllTransactions = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const http_1 = require("../../utils/http");
+const type_1 = require("../../utils/type");
+const typed_bytes_1 = require("../../utils/typed-bytes");
 const transactionsEndpoint = 'transactions';
 /**
  * Get list of all pending transactions
@@ -13,7 +16,9 @@ async function getAllTransactions(requestOptions) {
         url: transactionsEndpoint,
         responseType: 'json',
     });
-    return response.data.pendingTransactions;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    const pendingTransactions = cafe_utility_1.Types.asArray(body.pendingTransactions, { name: 'pendingTransactions' });
+    return pendingTransactions.map(toTransaction);
 }
 exports.getAllTransactions = getAllTransactions;
 /**
@@ -27,9 +32,24 @@ async function getTransaction(requestOptions, transactionHash) {
         url: `${transactionsEndpoint}/${transactionHash}`,
         responseType: 'json',
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return toTransaction(body);
 }
 exports.getTransaction = getTransaction;
+function toTransaction(value) {
+    const object = cafe_utility_1.Types.asObject(value, { name: 'transaction' });
+    return {
+        transactionHash: new typed_bytes_1.TransactionId(cafe_utility_1.Types.asString(object.transactionHash, { name: 'transactionHash' })),
+        to: cafe_utility_1.Types.asString(object.to, { name: 'to' }),
+        nonce: cafe_utility_1.Types.asNumber(object.nonce, { name: 'nonce' }),
+        gasPrice: (0, type_1.asNumberString)(object.gasPrice, { name: 'gasPrice' }),
+        gasLimit: cafe_utility_1.Types.asNumber(object.gasLimit, { name: 'gasLimit' }),
+        data: cafe_utility_1.Types.asString(object.data, { name: 'data' }),
+        created: cafe_utility_1.Types.asString(object.created, { name: 'created' }),
+        description: cafe_utility_1.Types.asString(object.description, { name: 'description' }),
+        value: (0, type_1.asNumberString)(object.value, { name: 'value' }),
+    };
+}
 /**
  * Rebroadcast existing transaction
  *
@@ -42,7 +62,8 @@ async function rebroadcastTransaction(requestOptions, transactionHash) {
         url: `${transactionsEndpoint}/${transactionHash}`,
         responseType: 'json',
     });
-    return response.data.transactionHash;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return new typed_bytes_1.TransactionId(cafe_utility_1.Types.asString(body.transactionHash, { name: 'transactionHash' }));
 }
 exports.rebroadcastTransaction = rebroadcastTransaction;
 /**
@@ -55,7 +76,7 @@ exports.rebroadcastTransaction = rebroadcastTransaction;
 async function cancelTransaction(requestOptions, transactionHash, gasPrice) {
     const headers = {};
     if (gasPrice) {
-        headers['gas-price'] = gasPrice;
+        headers['gas-price'] = gasPrice.toString();
     }
     const response = await (0, http_1.http)(requestOptions, {
         method: 'delete',
@@ -63,6 +84,7 @@ async function cancelTransaction(requestOptions, transactionHash, gasPrice) {
         url: `${transactionsEndpoint}/${transactionHash}`,
         responseType: 'json',
     });
-    return response.data.transactionHash;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return new typed_bytes_1.TransactionId(cafe_utility_1.Types.asString(body.transactionHash, { name: 'transactionHash' }));
 }
 exports.cancelTransaction = cancelTransaction;

package/dist/cjs/modules/envelope.js

@@ -5,19 +5,21 @@ const cafe_utility_1 = require("cafe-utility");
 const http_1 = require("../utils/http");
 const ENVELOPE_ENDPOINT = 'envelope';
 async function postEnvelope(requestOptions, postageBatchId, reference) {
-    const { data } = await (0, http_1.http)(requestOptions, {
+    const response = await (0, http_1.http)(requestOptions, {
         method: 'post',
         responseType: 'json',
         url: `${ENVELOPE_ENDPOINT}/${reference}`,
         headers: {
-            'swarm-postage-batch-id': postageBatchId,
+            'swarm-postage-batch-id': postageBatchId.toHex(),
         },
     });
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
     return {
-        issuer: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(data.issuer, { name: 'issuer', byteLength: 20 })),
-        index: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(data.index, { name: 'index', byteLength: 8 })),
-        timestamp: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(data.timestamp, { name: 'timestamp', byteLength: 8 })),
-        signature: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(data.signature, { name: 'signature', byteLength: 65 })),
+        issuer: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(body.issuer, { name: 'issuer', byteLength: 20 })),
+        index: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(body.index, { name: 'index', byteLength: 8 })),
+        timestamp: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(body.timestamp, { name: 'timestamp', byteLength: 8 })),
+        signature: cafe_utility_1.Binary.hexToUint8Array(cafe_utility_1.Types.asHexString(body.signature, { name: 'signature', byteLength: 65 })),
+        batchId: postageBatchId,
     };
 }
 exports.postEnvelope = postEnvelope;

package/dist/cjs/modules/feed.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchLatestFeedUpdate = exports.createFeedManifest = void 0;
+exports.probeFeed = exports.fetchLatestFeedUpdate = exports.createFeedManifest = void 0;
+const cafe_utility_1 = require("cafe-utility");
+const bytes_1 = require("../utils/bytes");
 const error_1 = require("../utils/error");
 const headers_1 = require("../utils/headers");
 const http_1 = require("../utils/http");
+const typed_bytes_1 = require("../utils/typed-bytes");
 const feedEndpoint = 'feeds';
 /**
  * Create an initial feed root manifest
@@ -14,14 +17,15 @@ const feedEndpoint = 'feeds';
  * @param postageBatchId  Postage BatchId to be used to create the Feed Manifest
  * @param options         Additional options, like type (default: 'sequence')
  */
-async function createFeedManifest(requestOptions, owner, topic, stamp) {
+async function createFeedManifest(requestOptions, owner, topic, stamp, options) {
     const response = await (0, http_1.http)(requestOptions, {
         method: 'post',
         responseType: 'json',
         url: `${feedEndpoint}/${owner}/${topic}`,
-        headers: (0, headers_1.extractUploadHeaders)(stamp),
+        headers: (0, headers_1.prepareRequestHeaders)(stamp, options),
     });
-    return response.data.reference;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return new typed_bytes_1.Reference(cafe_utility_1.Types.asHexString(body.reference));
 }
 exports.createFeedManifest = createFeedManifest;
 function readFeedUpdateHeaders(headers) {
@@ -34,8 +38,8 @@ function readFeedUpdateHeaders(headers) {
         throw new error_1.BeeError('Response did not contain expected swarm-feed-index-next!');
     }
     return {
-        feedIndex,
-        feedIndexNext,
+        feedIndex: new typed_bytes_1.FeedIndex(feedIndex),
+        feedIndexNext: new typed_bytes_1.FeedIndex(feedIndexNext),
     };
 }
 /**
@@ -47,19 +51,30 @@ function readFeedUpdateHeaders(headers) {
  * index of the subsequent update.
  *
  * @param requestOptions Options for making requests
- * @param owner          Owner's ethereum address in hex
- * @param topic          Topic in hex
+ * @param owner          Owner's ethereum address
+ * @param topic          Topic
  * @param options        Additional options, like index, at, type
  */
 async function fetchLatestFeedUpdate(requestOptions, owner, topic, options) {
     const response = await (0, http_1.http)(requestOptions, {
-        responseType: 'json',
+        responseType: 'arraybuffer',
         url: `${feedEndpoint}/${owner}/${topic}`,
         params: options,
     });
     return {
-        ...response.data,
+        payload: new bytes_1.Bytes(response.data),
         ...readFeedUpdateHeaders(response.headers),
     };
 }
 exports.fetchLatestFeedUpdate = fetchLatestFeedUpdate;
+async function probeFeed(requestOptions, owner, topic) {
+    const response = await (0, http_1.http)(requestOptions, {
+        responseType: 'arraybuffer',
+        url: `${feedEndpoint}/${owner}/${topic}`,
+        params: {
+            'Swarm-Only-Root-Chunk': true,
+        },
+    });
+    return readFeedUpdateHeaders(response.headers);
+}
+exports.probeFeed = probeFeed;

package/dist/cjs/modules/grantee.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchGrantees = exports.createGrantees = exports.getGrantees = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const headers_1 = require("../utils/headers");
 const http_1 = require("../utils/http");
+const typed_bytes_1 = require("../utils/typed-bytes");
 const granteeEndpoint = 'grantee';
 async function getGrantees(reference, requestOptions) {
     const response = await (0, http_1.http)(requestOptions, {
@@ -10,10 +12,11 @@ async function getGrantees(reference, requestOptions) {
         url: `${granteeEndpoint}/${reference}`,
         responseType: 'json',
     });
+    const body = cafe_utility_1.Types.asArray(response.data, { name: 'response.data' }).map(x => new typed_bytes_1.PublicKey(cafe_utility_1.Types.asString(x, { name: 'grantee' })));
     return {
         status: response.status,
         statusText: response.statusText,
-        data: response.data,
+        grantees: body,
     };
 }
 exports.getGrantees = getGrantees;
@@ -21,17 +24,16 @@ async function createGrantees(requestOptions, postageBatchId, grantees) {
     const response = await (0, http_1.http)(requestOptions, {
         method: 'post',
         url: granteeEndpoint,
-        data: { grantees },
-        headers: {
-            ...(0, headers_1.extractRedundantUploadHeaders)(postageBatchId),
-        },
+        data: { grantees: grantees.map(x => x.toCompressedHex()) },
+        headers: (0, headers_1.prepareRequestHeaders)(postageBatchId),
         responseType: 'json',
     });
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
     return {
         status: response.status,
         statusText: response.statusText,
-        ref: response.data.ref,
-        historyref: response.data.historyref,
+        ref: new typed_bytes_1.Reference(cafe_utility_1.Types.asString(body.ref, { name: 'ref' })),
+        historyref: new typed_bytes_1.Reference(cafe_utility_1.Types.asString(body.historyref, { name: 'historyref' })),
     };
 }
 exports.createGrantees = createGrantees;
@@ -39,18 +41,22 @@ async function patchGrantees(postageBatchId, reference, historyRef, grantees, re
     const response = await (0, http_1.http)(requestOptions, {
         method: 'patch',
         url: `${granteeEndpoint}/${reference}`,
-        data: grantees,
+        data: {
+            add: grantees.add?.map(x => x.toCompressedHex()),
+            revoke: grantees.revoke?.map(x => x.toCompressedHex()),
+        },
         headers: {
-            ...(0, headers_1.extractRedundantUploadHeaders)(postageBatchId),
-            'swarm-act-history-address': historyRef,
+            ...(0, headers_1.prepareRequestHeaders)(postageBatchId),
+            'swarm-act-history-address': historyRef.toHex(),
         },
         responseType: 'json',
     });
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
     return {
         status: response.status,
         statusText: response.statusText,
-        ref: response.data.ref,
-        historyref: response.data.historyref,
+        ref: new typed_bytes_1.Reference(cafe_utility_1.Types.asString(body.ref, { name: 'ref' })),
+        historyref: new typed_bytes_1.Reference(cafe_utility_1.Types.asString(body.historyref, { name: 'historyref' })),
     };
 }
 exports.patchGrantees = patchGrantees;

package/dist/cjs/modules/gsoc.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.subscribe = exports.send = void 0;
+const cafe_utility_1 = require("cafe-utility");
+const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
+const soc_1 = require("../chunk/soc");
+const endpoint = 'gsoc';
+async function send(requestOptions, soc, stamp, options) {
+    return (0, soc_1.uploadSingleOwnerChunk)(requestOptions, soc, stamp, options);
+}
+exports.send = send;
+function subscribe(url, reference, headers) {
+    const wsUrl = url.replace(/^http/i, 'ws');
+    if (cafe_utility_1.System.whereAmI() === 'browser') {
+        return new isomorphic_ws_1.default(`${wsUrl}/${endpoint}/subscribe/${reference.toHex()}`);
+    }
+    return new isomorphic_ws_1.default(`${wsUrl}/${endpoint}/subscribe/${reference.toHex()}`, {
+        headers,
+    });
+}
+exports.subscribe = subscribe;

package/dist/cjs/modules/pinning.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllPins = exports.getPin = exports.unpin = exports.pin = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const http_1 = require("../utils/http");
+const typed_bytes_1 = require("../utils/typed-bytes");
 const PINNING_ENDPOINT = 'pins';
 /**
  * Pin data with given reference
@@ -44,7 +46,10 @@ async function getPin(requestOptions, reference) {
         responseType: 'json',
         url: `${PINNING_ENDPOINT}/${reference}`,
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        reference: new typed_bytes_1.Reference(cafe_utility_1.Types.asString(body.reference, { name: 'reference' })),
+    };
 }
 exports.getPin = getPin;
 /**
@@ -58,6 +63,12 @@ async function getAllPins(requestOptions) {
         responseType: 'json',
         url: `${PINNING_ENDPOINT}`,
     });
-    return response.data.references || [];
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    // TODO: https://github.com/ethersphere/bee/issues/4964
+    if (body.references === null) {
+        return [];
+    }
+    const references = cafe_utility_1.Types.asArray(body.references, { name: 'references' }).map(x => cafe_utility_1.Types.asString(x, { name: 'reference' }));
+    return references.map(x => new typed_bytes_1.Reference(x));
 }
 exports.getAllPins = getAllPins;

package/dist/cjs/modules/pss.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe = exports.send = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
 const headers_1 = require("../utils/headers");
 const http_1 = require("../utils/http");
@@ -26,7 +27,7 @@ async function send(requestOptions, topic, target, data, postageBatchId, recipie
         data,
         responseType: 'json',
         params: { recipient },
-        headers: (0, headers_1.extractUploadHeaders)(postageBatchId),
+        headers: (0, headers_1.prepareRequestHeaders)(postageBatchId),
     });
 }
 exports.send = send;
@@ -36,8 +37,13 @@ exports.send = send;
  * @param url Bee node URL
  * @param topic Topic name
  */
-function subscribe(url, topic) {
+function subscribe(url, topic, headers) {
     const wsUrl = url.replace(/^http/i, 'ws');
-    return new isomorphic_ws_1.default(`${wsUrl}/${endpoint}/subscribe/${topic}`);
+    if (cafe_utility_1.System.whereAmI() === 'browser') {
+        return new isomorphic_ws_1.default(`${wsUrl}/${endpoint}/subscribe/${topic.toHex()}`);
+    }
+    return new isomorphic_ws_1.default(`${wsUrl}/${endpoint}/subscribe/${topic.toHex()}`, {
+        headers,
+    });
 }
 exports.subscribe = subscribe;

package/dist/cjs/modules/soc.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const headers_1 = require("../utils/headers");
 const http_1 = require("../utils/http");
 const type_1 = require("../utils/type");
+const typed_bytes_1 = require("../utils/typed-bytes");
 const socEndpoint = 'soc';
 /**
  * Upload single owner chunk (SOC) to a Bee node
@@ -23,15 +25,18 @@ async function upload(requestOptions, owner, identifier, signature, data, stamp,
         data,
         headers: {
             'content-type': 'application/octet-stream',
-            ...(0, headers_1.extractUploadHeaders)(stamp, options),
+            ...(0, headers_1.prepareRequestHeaders)(stamp, options),
         },
         responseType: 'json',
-        params: { sig: signature },
+        params: { sig: signature.toHex() },
     });
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
     return {
-        reference: response.data.reference,
+        reference: new typed_bytes_1.Reference(cafe_utility_1.Types.asHexString(body.reference)),
         tagUid: response.headers['swarm-tag'] ? (0, type_1.makeTagUid)(response.headers['swarm-tag']) : undefined,
-        historyAddress: response.headers['swarm-act-history-address'] || '',
+        historyAddress: response.headers['swarm-act-history-address']
+            ? cafe_utility_1.Optional.of(new typed_bytes_1.Reference(response.headers['swarm-act-history-address']))
+            : cafe_utility_1.Optional.empty(),
     };
 }
 exports.upload = upload;

package/dist/cjs/modules/stewardship.js

@@ -1,28 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRetrievable = exports.reupload = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const http_1 = require("../utils/http");
+const typed_bytes_1 = require("../utils/typed-bytes");
 const stewardshipEndpoint = 'stewardship';
 /**
  * Reupload locally pinned data
  * @param requestOptions Options for making requests
  * @param reference
- * @param options
  * @throws BeeResponseError if not locally pinned or invalid data
  */
-async function reupload(requestOptions, reference) {
+async function reupload(requestOptions, stamp, reference) {
     await (0, http_1.http)(requestOptions, {
         method: 'put',
         url: `${stewardshipEndpoint}/${reference}`,
+        headers: { 'swarm-postage-batch-id': stamp.toHex() },
     });
 }
 exports.reupload = reupload;
 async function isRetrievable(requestOptions, reference) {
+    reference = new typed_bytes_1.Reference(reference);
     const response = await (0, http_1.http)(requestOptions, {
         method: 'get',
         responseType: 'json',
         url: `${stewardshipEndpoint}/${reference}`,
     });
-    return response.data.isRetrievable;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return cafe_utility_1.Types.asBoolean(body.isRetrievable, { name: 'isRetrievable' });
 }
 exports.isRetrievable = isRetrievable;

package/dist/cjs/modules/tag.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTag = exports.deleteTag = exports.getAllTags = exports.retrieveTag = exports.createTag = void 0;
+const cafe_utility_1 = require("cafe-utility");
 const http_1 = require("../utils/http");
 const endpoint = 'tags';
 /**
@@ -14,7 +15,17 @@ async function createTag(requestOptions) {
         url: endpoint,
         responseType: 'json',
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        address: cafe_utility_1.Types.asEmptiableString(body.address, { name: 'address' }),
+        seen: cafe_utility_1.Types.asNumber(body.seen, { name: 'seen' }),
+        sent: cafe_utility_1.Types.asNumber(body.sent, { name: 'sent' }),
+        split: cafe_utility_1.Types.asNumber(body.split, { name: 'split' }),
+        startedAt: cafe_utility_1.Types.asString(body.startedAt, { name: 'startedAt' }),
+        stored: cafe_utility_1.Types.asNumber(body.stored, { name: 'stored' }),
+        synced: cafe_utility_1.Types.asNumber(body.synced, { name: 'synced' }),
+        uid: cafe_utility_1.Types.asNumber(body.uid, { name: 'uid' }),
+    };
 }
 exports.createTag = createTag;
 /**
@@ -28,7 +39,17 @@ async function retrieveTag(requestOptions, uid) {
         url: `${endpoint}/${uid}`,
         responseType: 'json',
     });
-    return response.data;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    return {
+        address: cafe_utility_1.Types.asEmptiableString(body.address, { name: 'address' }),
+        seen: cafe_utility_1.Types.asNumber(body.seen, { name: 'seen' }),
+        sent: cafe_utility_1.Types.asNumber(body.sent, { name: 'sent' }),
+        split: cafe_utility_1.Types.asNumber(body.split, { name: 'split' }),
+        startedAt: cafe_utility_1.Types.asString(body.startedAt, { name: 'startedAt' }),
+        stored: cafe_utility_1.Types.asNumber(body.stored, { name: 'stored' }),
+        synced: cafe_utility_1.Types.asNumber(body.synced, { name: 'synced' }),
+        uid: cafe_utility_1.Types.asNumber(body.uid, { name: 'uid' }),
+    };
 }
 exports.retrieveTag = retrieveTag;
 /**
@@ -44,7 +65,18 @@ async function getAllTags(requestOptions, offset, limit) {
         params: { offset, limit },
         responseType: 'json',
     });
-    return response.data.tags;
+    const body = cafe_utility_1.Types.asObject(response.data, { name: 'response.data' });
+    const tags = cafe_utility_1.Types.asArray(body.tags, { name: 'tags' }).map(x => cafe_utility_1.Types.asObject(x, { name: 'tag' }));
+    return tags.map(x => ({
+        address: cafe_utility_1.Types.asEmptiableString(x.address, { name: 'address' }),
+        seen: cafe_utility_1.Types.asNumber(x.seen, { name: 'seen' }),
+        sent: cafe_utility_1.Types.asNumber(x.sent, { name: 'sent' }),
+        split: cafe_utility_1.Types.asNumber(x.split, { name: 'split' }),
+        startedAt: cafe_utility_1.Types.asString(x.startedAt, { name: 'startedAt' }),
+        stored: cafe_utility_1.Types.asNumber(x.stored, { name: 'stored' }),
+        synced: cafe_utility_1.Types.asNumber(x.synced, { name: 'synced' }),
+        uid: cafe_utility_1.Types.asNumber(x.uid, { name: 'uid' }),
+    }));
 }
 exports.getAllTags = getAllTags;
 /**

package/dist/cjs/package.json

@@ -6,6 +6,7 @@
       "./utils/tar.js": "./utils/tar.browser.js",
       "./utils/tar-writer.js": "./utils/tar-writer.browser.js",
       "./utils/tar-uploader.js": "./utils/tar-uploader.browser.js",
+      "./utils/chunk-stream.js": "./utils/chunk-stream.browser.js",
       "./utils/data.js": "./utils/data.browser.js",
       "./utils/collection.node.js": "./utils/collection.browser.js"
     }