@ardrive/turbo-sdk 1.23.3-alpha.test.0 → 1.23.4-alpha.1

package/lib/cjs/common/factory.js

@@ -24,11 +24,11 @@ const index_js_1 = require("./token/index.js");
 const turbo_js_1 = require("./turbo.js");
 const upload_js_1 = require("./upload.js");
 class TurboBaseFactory {
-    /* @deprecated - use ConsoleTurboLogger directly */
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogLevel(level) {
         this.logger.setLogLevel(level);
     }
-    /* @deprecated - use ConsoleTurboLogger directly */
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogFormat(format) {
         this.logger.setLogFormat(format);
     }
@@ -125,4 +125,4 @@ class TurboBaseFactory {
     }
 }
 exports.TurboBaseFactory = TurboBaseFactory;
-TurboBaseFactory.logger = logger_js_1.ConsoleTurboLogger.default;
+TurboBaseFactory.logger = logger_js_1.TurboWinstonLogger.default;

package/lib/cjs/common/logger.js

@@ -1,60 +1,92 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleTurboLogger = void 0;
+exports.TurboWinstonLogger = void 0;
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const winston_1 = require("winston");
 const version_js_1 = require("../version.js");
-class ConsoleTurboLogger {
+class TurboWinstonLogger {
     constructor({ level = 'info', logFormat = 'simple', } = {}) {
-        this.level = level;
-        this.format = logFormat;
-        this.silent = level === 'none';
-    }
-    shouldLog(level) {
-        if (this.silent)
-            return false;
-        const order = ['none', 'error', 'info', 'debug'];
-        return order.indexOf(level) <= order.indexOf(this.level);
-    }
-    formatMessage(level, message, args) {
-        const base = {
-            level,
-            message,
-            args,
-            version: version_js_1.version,
-            timestamp: new Date().toISOString(),
-        };
-        return this.format === 'json'
-            ? JSON.stringify(base)
-            : `[${base.timestamp}] [${level.toUpperCase()}] ${message} ${args
-                .map((a) => JSON.stringify(a))
-                .join(' ')}`;
+        this.silent = false;
+        if (level === 'none') {
+            this.silent = true;
+        }
+        if (typeof window !== 'undefined') {
+            this.logger = console;
+        }
+        else {
+            this.logger = (0, winston_1.createLogger)({
+                level,
+                silent: this.silent,
+                defaultMeta: {
+                    name: 'turbo-sdk',
+                    version: version_js_1.version,
+                },
+                format: winston_1.format.combine(winston_1.format.timestamp(), winston_1.format.json()),
+                transports: [
+                    new winston_1.transports.Console({
+                        format: getLogFormat(logFormat),
+                    }),
+                ],
+            });
+        }
     }
     info(message, ...args) {
-        if (this.shouldLog('info')) {
-            console.info(this.formatMessage('info', message, args));
-        }
+        if (this.silent)
+            return;
+        this.logger.info(message, ...args);
     }
     warn(message, ...args) {
-        if (this.shouldLog('info')) {
-            console.warn(this.formatMessage('warn', message, args));
-        }
+        if (this.silent)
+            return;
+        this.logger.warn(message, ...args);
     }
     error(message, ...args) {
-        if (this.shouldLog('error')) {
-            console.error(this.formatMessage('error', message, args));
-        }
+        if (this.silent)
+            return;
+        this.logger.error(message, ...args);
     }
     debug(message, ...args) {
-        if (this.shouldLog('debug')) {
-            console.debug(this.formatMessage('debug', message, args));
-        }
+        if (this.silent)
+            return;
+        this.logger.debug(message, ...args);
     }
     setLogLevel(level) {
-        this.level = level;
         this.silent = level === 'none';
+        if ('silent' in this.logger) {
+            this.logger.silent = level === 'none';
+        }
+        if ('level' in this.logger) {
+            this.logger.level = level;
+        }
     }
     setLogFormat(logFormat) {
-        this.format = logFormat;
+        if ('format' in this.logger) {
+            this.logger.format = getLogFormat(logFormat);
+        }
     }
 }
-exports.ConsoleTurboLogger = ConsoleTurboLogger;
-ConsoleTurboLogger.default = new ConsoleTurboLogger();
+exports.TurboWinstonLogger = TurboWinstonLogger;
+TurboWinstonLogger.default = new TurboWinstonLogger();
+function getLogFormat(logFormat) {
+    return winston_1.format.combine((0, winston_1.format)((info) => {
+        if (info.stack && info.level !== 'error') {
+            delete info.stack;
+        }
+        return info;
+    })(), winston_1.format.errors({ stack: true }), // Ensure errors show a stack trace
+    winston_1.format.timestamp(), logFormat === 'json' ? winston_1.format.json() : winston_1.format.simple());
+}

package/lib/cjs/common/payment.js

@@ -17,14 +17,13 @@ exports.TurboAuthenticatedPaymentService = exports.TurboUnauthenticatedPaymentSe
  * limitations under the License.
  */
 const bignumber_js_1 = require("bignumber.js");
-const node_buffer_1 = require("node:buffer");
 const http_js_1 = require("./http.js");
 const logger_js_1 = require("./logger.js");
 const index_js_1 = require("./token/index.js");
 exports.developmentPaymentServiceURL = 'https://payment.ardrive.dev';
 exports.defaultPaymentServiceURL = 'https://payment.ardrive.io';
 class TurboUnauthenticatedPaymentService {
-    constructor({ url = exports.defaultPaymentServiceURL, retryConfig, logger = logger_js_1.ConsoleTurboLogger.default, token = 'arweave', }) {
+    constructor({ url = exports.defaultPaymentServiceURL, retryConfig, logger = logger_js_1.TurboWinstonLogger.default, token = 'arweave', }) {
         this.logger = logger;
         this.httpService = new http_js_1.TurboHTTPService({
             url: `${url}/v1`,
@@ -130,7 +129,7 @@ class TurboUnauthenticatedPaymentService {
     async submitFundTransaction({ txId, }) {
         const response = await this.httpService.post({
             endpoint: `/account/balance/${this.token}`,
-            data: node_buffer_1.Buffer.from(JSON.stringify({ tx_id: txId })),
+            data: Buffer.from(JSON.stringify({ tx_id: txId })),
         });
         if ('creditedTransaction' in response) {
             return {
@@ -197,7 +196,7 @@ class TurboUnauthenticatedPaymentService {
 exports.TurboUnauthenticatedPaymentService = TurboUnauthenticatedPaymentService;
 // NOTE: to avoid redundancy, we use inheritance here - but generally prefer composition over inheritance
 class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentService {
-    constructor({ url = exports.defaultPaymentServiceURL, retryConfig, signer, logger = logger_js_1.ConsoleTurboLogger.default, token = 'arweave', tokenTools, }) {
+    constructor({ url = exports.defaultPaymentServiceURL, retryConfig, signer, logger = logger_js_1.TurboWinstonLogger.default, token = 'arweave', tokenTools, }) {
         super({ url, retryConfig, logger, token });
         this.signer = signer;
         this.tokenTools = tokenTools;

package/lib/cjs/common/signer.js

@@ -29,7 +29,6 @@ const bs58_1 = __importDefault(require("bs58"));
 const crypto_2 = require("crypto");
 const ethers_1 = require("ethers");
 const ethers_2 = require("ethers");
-const node_buffer_1 = require("node:buffer");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const types_js_1 = require("../types.js");
 const base64_js_1 = require("../utils/base64.js");
@@ -38,7 +37,7 @@ const logger_js_1 = require("./logger.js");
  * Abstract class for signing TurboDataItems.
  */
 class TurboDataItemAbstractSigner {
-    constructor({ signer, logger = logger_js_1.ConsoleTurboLogger.default, token, walletAdapter, }) {
+    constructor({ signer, logger = logger_js_1.TurboWinstonLogger.default, token, walletAdapter, }) {
         this.logger = logger;
         this.signer = signer;
         this.token = token;
@@ -64,13 +63,13 @@ class TurboDataItemAbstractSigner {
     }
     async generateSignedRequestHeaders() {
         const nonce = (0, crypto_2.randomBytes)(16).toString('hex');
-        const buffer = node_buffer_1.Buffer.from(nonce);
+        const buffer = Buffer.from(nonce);
         const signature = await this.signer.sign(Uint8Array.from(buffer));
         const publicKey = (0, base64_js_1.toB64Url)(this.signer.publicKey);
         return {
             'x-public-key': publicKey,
             'x-nonce': nonce,
-            'x-signature': (0, base64_js_1.toB64Url)(node_buffer_1.Buffer.from(signature)),
+            'x-signature': (0, base64_js_1.toB64Url)(Buffer.from(signature)),
         };
     }
     async getPublicKey() {
@@ -98,7 +97,7 @@ class TurboDataItemAbstractSigner {
         if (!(this.signer instanceof arbundles_1.EthereumSigner)) {
             throw new Error('Only EthereumSigner is supported for sendTransaction API currently!');
         }
-        const keyAsStringFromUint8Array = node_buffer_1.Buffer.from(this.signer.key).toString('hex');
+        const keyAsStringFromUint8Array = Buffer.from(this.signer.key).toString('hex');
         if (this.token === 'kyve') {
             const chainId = gatewayUrl.includes('kaon')
                 ? 'kaon-1'

package/lib/cjs/common/token/arweave.js

@@ -21,7 +21,6 @@ exports.ARToTokenAmount = exports.WinstonToTokenAmount = exports.ArweaveToken =
  */
 const arweave_1 = __importDefault(require("arweave"));
 const bignumber_js_1 = require("bignumber.js");
-const node_buffer_1 = require("node:buffer");
 const base64_js_1 = require("../../utils/base64.js");
 const common_js_1 = require("../../utils/common.js");
 const logger_js_1 = require("../logger.js");
@@ -30,7 +29,7 @@ const ArweaveClass =
 // @ts-ignore -- Access the correct class constructor for Arweave
 arweave_1.default.default?.default || arweave_1.default.default || arweave_1.default;
 class ArweaveToken {
-    constructor({ gatewayUrl = 'https://arweave.net', arweave, logger = logger_js_1.ConsoleTurboLogger.default, mintU = true, pollingOptions = {
+    constructor({ gatewayUrl = 'https://arweave.net', arweave, logger = logger_js_1.TurboWinstonLogger.default, mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3_000,
         initialBackoffMs: 7_000,
@@ -68,7 +67,7 @@ class ArweaveToken {
         tx.setOwner(publicKeyB64Url);
         const dataToSign = await tx.getSignatureData();
         const signatureUint8Array = await signer.signData(dataToSign);
-        const signatureBuffer = node_buffer_1.Buffer.from(signatureUint8Array);
+        const signatureBuffer = Buffer.from(signatureUint8Array);
         const id = (0, base64_js_1.sha256B64Url)(signatureBuffer);
         tx.setSignature({
             id: id,

package/lib/cjs/common/token/ethereum.js

@@ -25,7 +25,7 @@ exports.weiToTokenAmount = weiToTokenAmount;
 const ETHToTokenAmount = (eth) => new bignumber_js_1.BigNumber(eth).times(1e18).valueOf();
 exports.ETHToTokenAmount = ETHToTokenAmount;
 class EthereumToken {
-    constructor({ logger = logger_js_1.ConsoleTurboLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.ethereum, pollingOptions = {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.ethereum, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
         initialBackoffMs: 10_000,

package/lib/cjs/common/token/kyve.js

@@ -36,7 +36,7 @@ exports.ukyveToTokenAmount = ukyveToTokenAmount;
 const KYVEToTokenAmount = (sol) => new bignumber_js_1.BigNumber(sol).times(1e6).valueOf();
 exports.KYVEToTokenAmount = KYVEToTokenAmount;
 class KyveToken {
-    constructor({ logger = logger_js_1.ConsoleTurboLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.kyve, pollingOptions = {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.kyve, pollingOptions = {
         maxAttempts: 5,
         pollingIntervalMs: 1_000,
         initialBackoffMs: 500,

package/lib/cjs/common/token/polygon.js

@@ -21,7 +21,7 @@ const logger_js_1 = require("../logger.js");
 const ethereum_js_1 = require("./ethereum.js");
 exports.POLToTokenAmount = ethereum_js_1.ETHToTokenAmount;
 class PolygonToken extends ethereum_js_1.EthereumToken {
-    constructor({ logger = logger_js_1.ConsoleTurboLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.pol, pollingOptions = {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.pol, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
         initialBackoffMs: 5_000,

package/lib/cjs/common/token/solana.js

@@ -22,7 +22,6 @@ exports.SolanaToken = exports.SOLToTokenAmount = exports.lamportToTokenAmount =
 const web3_js_1 = require("@solana/web3.js");
 const bignumber_js_1 = require("bignumber.js");
 const bs58_1 = __importDefault(require("bs58"));
-const node_buffer_1 = require("node:buffer");
 const constants_js_1 = require("../../cli/constants.js");
 const common_js_1 = require("../../utils/common.js");
 const logger_js_1 = require("../logger.js");
@@ -31,7 +30,7 @@ exports.lamportToTokenAmount = lamportToTokenAmount;
 const SOLToTokenAmount = (sol) => new bignumber_js_1.BigNumber(sol).times(1e9).valueOf();
 exports.SOLToTokenAmount = SOLToTokenAmount;
 class SolanaToken {
-    constructor({ logger = logger_js_1.ConsoleTurboLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.solana, pollingOptions = {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = constants_js_1.defaultProdGatewayUrls.solana, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 2_500,
         initialBackoffMs: 500,
@@ -54,7 +53,7 @@ class SolanaToken {
         }));
         const serializedTx = tx.serializeMessage();
         const signature = await signer.signData(Uint8Array.from(serializedTx));
-        tx.addSignature(publicKey, node_buffer_1.Buffer.from(signature));
+        tx.addSignature(publicKey, Buffer.from(signature));
         const id = bs58_1.default.encode(signature);
         await this.submitTx(tx, id);
         return { id, target };

package/lib/cjs/common/upload.js

@@ -17,7 +17,6 @@ exports.TurboAuthenticatedBaseUploadService = exports.TurboUnauthenticatedUpload
  * limitations under the License.
  */
 const axios_1 = require("axios");
-const node_buffer_1 = require("node:buffer");
 const plimit_lit_1 = require("plimit-lit");
 const axiosClient_js_1 = require("../utils/axiosClient.js");
 const common_js_1 = require("../utils/common.js");
@@ -33,7 +32,7 @@ exports.creditSharingTagNames = {
 exports.developmentUploadServiceURL = 'https://upload.ardrive.dev';
 exports.defaultUploadServiceURL = 'https://upload.ardrive.io';
 class TurboUnauthenticatedUploadService {
-    constructor({ url = exports.defaultUploadServiceURL, logger = logger_js_1.ConsoleTurboLogger.default, retryConfig = (0, axiosClient_js_1.defaultRetryConfig)(logger), token = 'arweave', }) {
+    constructor({ url = exports.defaultUploadServiceURL, logger = logger_js_1.TurboWinstonLogger.default, retryConfig = (0, axiosClient_js_1.defaultRetryConfig)(logger), token = 'arweave', }) {
         this.token = token;
         this.logger = logger;
         this.httpService = new http_js_1.TurboHTTPService({
@@ -234,7 +233,7 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
                 []),
             { name: 'Content-Type', value: 'application/x.arweave-manifest+json' },
         ];
-        const manifestBuffer = node_buffer_1.Buffer.from(JSON.stringify(manifest));
+        const manifestBuffer = Buffer.from(JSON.stringify(manifest));
         const manifestResponse = await this.uploadFile({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             fileStreamFactory: () => this.createManifestStream(manifestBuffer),
@@ -267,7 +266,7 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
                 value: expiresBySeconds.toString(),
             });
         }
-        const nonceData = node_buffer_1.Buffer.from(approvedAddress + approvedWincAmount + Date.now());
+        const nonceData = Buffer.from(approvedAddress + approvedWincAmount + Date.now());
         const { createdApproval, ...uploadResponse } = await this.uploadFile({
             fileStreamFactory: () => nonceData,
             fileSizeFactory: () => nonceData.byteLength,
@@ -288,7 +287,7 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
                 },
             ],
         };
-        const nonceData = node_buffer_1.Buffer.from(revokedAddress + Date.now());
+        const nonceData = Buffer.from(revokedAddress + Date.now());
         const { revokedApprovals, ...uploadResponse } = await this.uploadFile({
             fileStreamFactory: () => nonceData,
             fileSizeFactory: () => nonceData.byteLength,

package/lib/cjs/node/signer.js

@@ -21,8 +21,7 @@ Object.defineProperty(exports, "ArconnectSigner", { enumerable: true, get: funct
 Object.defineProperty(exports, "ArweaveSigner", { enumerable: true, get: function () { return arbundles_1.ArweaveSigner; } });
 Object.defineProperty(exports, "EthereumSigner", { enumerable: true, get: function () { return arbundles_1.EthereumSigner; } });
 Object.defineProperty(exports, "HexSolanaSigner", { enumerable: true, get: function () { return arbundles_1.HexSolanaSigner; } });
-const node_buffer_1 = require("node:buffer");
-const node_stream_1 = require("node:stream");
+const stream_1 = require("stream");
 const signer_js_1 = require("../common/signer.js");
 const base64_js_1 = require("../utils/base64.js");
 /**
@@ -36,8 +35,8 @@ class TurboNodeSigner extends signer_js_1.TurboDataItemAbstractSigner {
         // TODO: replace with our own signer implementation
         this.logger.debug('Signing data item...');
         let [stream1, stream2] = [fileStreamFactory(), fileStreamFactory()];
-        stream1 = stream1 instanceof node_buffer_1.Buffer ? node_stream_1.Readable.from(stream1) : stream1;
-        stream2 = stream2 instanceof node_buffer_1.Buffer ? node_stream_1.Readable.from(stream2) : stream2;
+        stream1 = stream1 instanceof Buffer ? stream_1.Readable.from(stream1) : stream1;
+        stream2 = stream2 instanceof Buffer ? stream_1.Readable.from(stream2) : stream2;
         const signedDataItem = await (0, arbundles_1.streamSigner)(stream1, stream2, this.signer, dataItemOpts);
         this.logger.debug('Successfully signed data item...');
         // TODO: support target, anchor, and tags
@@ -57,7 +56,7 @@ class TurboNodeSigner extends signer_js_1.TurboDataItemAbstractSigner {
         // ref: https://github.com/Irys-xyz/arbundles/blob/master/src/ar-data-create.ts#L18
         const _target = typeof target === 'string' ? (0, base64_js_1.fromB64Url)(target) : null;
         const targetLength = 1 + (_target ? _target.byteLength : 0);
-        const _anchor = typeof anchor === 'string' ? node_buffer_1.Buffer.from(anchor) : null;
+        const _anchor = typeof anchor === 'string' ? Buffer.from(anchor) : null;
         const anchorLength = 1 + (_anchor ? _anchor.byteLength : 0);
         const serializedTags = tags && tags.length > 0 ? (0, arbundles_1.serializeTags)(tags) : null;
         const tagsLength = 16 + (serializedTags ? serializedTags.byteLength : 0);

package/lib/cjs/node/upload.js

@@ -18,8 +18,8 @@ exports.TurboAuthenticatedUploadService = void 0;
  */
 const fs_1 = require("fs");
 const mime_types_1 = require("mime-types");
-const node_stream_1 = require("node:stream");
 const path_1 = require("path");
+const stream_1 = require("stream");
 const upload_js_1 = require("../common/upload.js");
 const types_js_1 = require("../types.js");
 class TurboAuthenticatedUploadService extends upload_js_1.TurboAuthenticatedBaseUploadService {
@@ -74,7 +74,7 @@ class TurboAuthenticatedUploadService extends upload_js_1.TurboAuthenticatedBase
         return mimeType !== false ? mimeType : 'application/octet-stream';
     }
     createManifestStream(manifestBuffer) {
-        return node_stream_1.Readable.from(manifestBuffer);
+        return stream_1.Readable.from(manifestBuffer);
     }
 }
 exports.TurboAuthenticatedUploadService = TurboAuthenticatedUploadService;

package/lib/cjs/utils/axiosClient.js

@@ -50,7 +50,7 @@ exports.defaultRequestHeaders = {
     'x-turbo-source-version': version_js_1.version,
     'x-turbo-source-identifier': 'turbo-sdk',
 };
-const defaultRetryConfig = (logger = logger_js_1.ConsoleTurboLogger.default) => ({
+const defaultRetryConfig = (logger = logger_js_1.TurboWinstonLogger.default) => ({
     retryDelay: axios_retry_1.default.exponentialDelay,
     retries: 5,
     retryCondition: (error) => {
@@ -63,7 +63,7 @@ const defaultRetryConfig = (logger = logger_js_1.ConsoleTurboLogger.default) =>
     },
 });
 exports.defaultRetryConfig = defaultRetryConfig;
-const createAxiosInstance = ({ logger = logger_js_1.ConsoleTurboLogger.default, axiosConfig = {}, retryConfig = (0, exports.defaultRetryConfig)(logger), } = {}) => {
+const createAxiosInstance = ({ logger = logger_js_1.TurboWinstonLogger.default, axiosConfig = {}, retryConfig = (0, exports.defaultRetryConfig)(logger), } = {}) => {
     const axiosInstance = axios_1.default.create({
         ...axiosConfig,
         headers: {

package/lib/cjs/utils/base64.js

@@ -23,7 +23,6 @@ exports.sha256B64Url = sha256B64Url;
  */
 const utils_js_1 = require("arweave/node/lib/utils.js");
 const crypto_1 = require("crypto");
-const node_buffer_1 = require("node:buffer");
 exports.base64URLRegex = /^[a-zA-Z0-9_-]{43}$/;
 function jwkToPublicArweaveAddress(jwk) {
     return ownerToAddress(jwk.n);
@@ -37,7 +36,7 @@ function fromB64Url(input) {
         .replace(/-/g, '+')
         .replace(/_/g, '/')
         .concat('='.repeat(paddingLength));
-    return node_buffer_1.Buffer.from(base64, 'base64');
+    return Buffer.from(base64, 'base64');
 }
 function toB64Url(buffer) {
     return (0, utils_js_1.bufferTob64Url)(Uint8Array.from(buffer));

package/lib/cjs/utils/readableStream.js

@@ -1,25 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readableStreamToBuffer = readableStreamToBuffer;
-/**
- * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-const node_buffer_1 = require("node:buffer");
 async function readableStreamToBuffer({ stream, size, }) {
     const reader = stream.getReader();
-    const buffer = node_buffer_1.Buffer.alloc(size);
+    const buffer = Buffer.alloc(size);
     let offset = 0;
     let done = false;
     while (!done) {

package/lib/cjs/version.js

@@ -17,4 +17,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-exports.version = '1.23.3';
+exports.version = '1.23.4-alpha.1';

package/lib/cjs/web/signer.js

@@ -21,7 +21,6 @@ Object.defineProperty(exports, "ArconnectSigner", { enumerable: true, get: funct
 Object.defineProperty(exports, "ArweaveSigner", { enumerable: true, get: function () { return arbundles_1.ArweaveSigner; } });
 Object.defineProperty(exports, "EthereumSigner", { enumerable: true, get: function () { return arbundles_1.EthereumSigner; } });
 Object.defineProperty(exports, "HexSolanaSigner", { enumerable: true, get: function () { return arbundles_1.HexSolanaSigner; } });
-const node_buffer_1 = require("node:buffer");
 const signer_js_1 = require("../common/signer.js");
 const readableStream_js_1 = require("../utils/readableStream.js");
 /**
@@ -47,7 +46,7 @@ class TurboWebArweaveSigner extends signer_js_1.TurboDataItemAbstractSigner {
         await this.setPublicKey();
         const fileStream = fileStreamFactory();
         // TODO: converts the readable stream to a buffer bc incrementally signing ReadableStreams is not trivial
-        const buffer = fileStream instanceof node_buffer_1.Buffer
+        const buffer = fileStream instanceof Buffer
             ? fileStream
             : await (0, readableStream_js_1.readableStreamToBuffer)({
                 stream: fileStream,
@@ -57,7 +56,7 @@ class TurboWebArweaveSigner extends signer_js_1.TurboDataItemAbstractSigner {
         this.logger.debug('Signing data item...');
         if (this.signer instanceof arbundles_1.ArconnectSigner) {
             this.logger.debug('Arconnect signer detected, signing with Arconnect signData Item API...');
-            const sign = node_buffer_1.Buffer.from(await this.signer['signer'].signDataItem({
+            const sign = Buffer.from(await this.signer['signer'].signDataItem({
                 data: Uint8Array.from(buffer),
                 tags: dataItemOpts?.tags,
                 target: dataItemOpts?.target,

package/lib/esm/common/factory.js

@@ -15,17 +15,17 @@
  */
 import { EthereumSigner, HexInjectedSolanaSigner, HexSolanaSigner, InjectedEthereumSigner, } from '@dha-team/arbundles';
 import { isEthereumWalletAdapter, isSolanaWalletAdapter, } from '../types.js';
-import { ConsoleTurboLogger } from './logger.js';
+import { TurboWinstonLogger } from './logger.js';
 import { TurboAuthenticatedPaymentService, TurboUnauthenticatedPaymentService, } from './payment.js';
 import { defaultTokenMap } from './token/index.js';
 import { TurboAuthenticatedClient, TurboUnauthenticatedClient, } from './turbo.js';
 import { TurboUnauthenticatedUploadService } from './upload.js';
 export class TurboBaseFactory {
-    /* @deprecated - use ConsoleTurboLogger directly */
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogLevel(level) {
         this.logger.setLogLevel(level);
     }
-    /* @deprecated - use ConsoleTurboLogger directly */
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogFormat(format) {
         this.logger.setLogFormat(format);
     }
@@ -121,4 +121,4 @@ export class TurboBaseFactory {
         throw new Error('Unsupported wallet adapter -- wallet adapter is currently only supported for Solana and Ethereum');
     }
 }
-TurboBaseFactory.logger = ConsoleTurboLogger.default;
+TurboBaseFactory.logger = TurboWinstonLogger.default;