@ardrive/turbo-sdk 1.10.0-alpha.1 → 1.10.0-alpha.3

package/lib/cjs/common/factory.js

@@ -1,38 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurboBaseFactory = void 0;
-/**
- * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-const arbundles_1 = require("arbundles");
-const signer_js_1 = require("../node/signer.js");
-const upload_js_1 = require("../node/upload.js");
-const types_js_1 = require("../types.js");
-const common_js_1 = require("../utils/common.js");
-const signer_js_2 = require("../web/signer.js");
-const upload_js_2 = require("../web/upload.js");
 const logger_js_1 = require("./logger.js");
 const payment_js_1 = require("./payment.js");
-const index_js_1 = require("./token/index.js");
 const turbo_js_1 = require("./turbo.js");
-const upload_js_3 = require("./upload.js");
+const upload_js_1 = require("./upload.js");
 class TurboBaseFactory {
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogLevel(level) {
         this.logger.setLogLevel(level);
     }
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogFormat(format) {
         this.logger.setLogFormat(format);
     }
@@ -41,7 +19,7 @@ class TurboBaseFactory {
             ...paymentServiceConfig,
             logger: this.logger,
         });
-        const uploadService = new upload_js_3.TurboUnauthenticatedUploadService({
+        const uploadService = new upload_js_1.TurboUnauthenticatedUploadService({
             ...uploadServiceConfig,
             logger: this.logger,
         });
@@ -50,95 +28,6 @@ class TurboBaseFactory {
             paymentService,
         });
     }
-    static getSigner(providedSigner, providedPrivateKey, token) {
-        let signer;
-        if (providedSigner !== undefined) {
-            signer = providedSigner;
-        }
-        else if (providedPrivateKey !== undefined) {
-            if (token === 'solana') {
-                signer = new arbundles_1.HexSolanaSigner(providedPrivateKey);
-            }
-            else if (token === 'ethereum') {
-                if (!(0, types_js_1.isEthPrivateKey)(providedPrivateKey)) {
-                    throw new Error('An Ethereum private key must be provided for EthereumSigner.');
-                }
-                signer = new arbundles_1.EthereumSigner(providedPrivateKey);
-            }
-            else {
-                if (!(0, types_js_1.isJWK)(providedPrivateKey)) {
-                    throw new Error('A JWK must be provided for ArweaveSigner.');
-                }
-                signer = new arbundles_1.ArweaveSigner(providedPrivateKey);
-            }
-        }
-        else {
-            throw new Error('A privateKey or signer must be provided.');
-        }
-        if ((0, common_js_1.isWeb)()) {
-            return new signer_js_2.TurboWebArweaveSigner({
-                signer,
-                logger: this.logger,
-            });
-        }
-        return new signer_js_1.TurboNodeSigner({
-            signer,
-            logger: this.logger,
-        });
-    }
-    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, tokenMap, gatewayUrl, tokenTools, }) {
-        if (!token) {
-            if (providedSigner) {
-                // Derive token from signer if not provided
-                if (providedSigner instanceof arbundles_1.EthereumSigner) {
-                    token = 'ethereum';
-                }
-                else if (providedSigner instanceof arbundles_1.HexSolanaSigner) {
-                    token = 'solana';
-                }
-                else {
-                    token = 'arweave';
-                }
-            }
-            else {
-                token = 'arweave';
-            }
-        }
-        const turboSigner = this.getSigner(providedSigner, privateKey, token);
-        if (!tokenTools) {
-            if (tokenMap && token === 'arweave') {
-                tokenTools = tokenMap.arweave;
-            }
-            tokenTools = index_js_1.defaultTokenMap[token]?.({
-                gatewayUrl,
-                logger: this.logger,
-            });
-        }
-        const paymentService = new payment_js_1.TurboAuthenticatedPaymentService({
-            ...paymentServiceConfig,
-            signer: turboSigner,
-            logger: this.logger,
-            token,
-            tokenTools,
-        });
-        const uploadService = (0, common_js_1.isWeb)()
-            ? new upload_js_2.TurboAuthenticatedWebUploadService({
-                ...uploadServiceConfig,
-                signer: turboSigner,
-                logger: this.logger,
-                token,
-            })
-            : new upload_js_1.TurboAuthenticatedNodeUploadService({
-                ...uploadServiceConfig,
-                signer: turboSigner,
-                logger: this.logger,
-                token,
-            });
-        return new turbo_js_1.TurboAuthenticatedClient({
-            uploadService,
-            paymentService,
-        });
-    }
 }
 exports.TurboBaseFactory = TurboBaseFactory;
-TurboBaseFactory.logger = new logger_js_1.TurboWinstonLogger();
+TurboBaseFactory.logger = logger_js_1.TurboWinstonLogger.default;

package/lib/cjs/common/logger.js

@@ -21,34 +21,67 @@ const winston_1 = require("winston");
 const version_js_1 = require("../version.js");
 class TurboWinstonLogger {
     constructor({ level = 'info', logFormat = 'simple', } = {}) {
-        this.logger = (0, winston_1.createLogger)({
-            level,
-            defaultMeta: { client: 'turbo-sdk', version: version_js_1.version },
-            silent: level === 'none',
-            format: getLogFormat(logFormat),
-            transports: [new winston_1.transports.Console()],
-        });
+        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.silent)
+            return;
         this.logger.info(message, ...args);
     }
     warn(message, ...args) {
+        if (this.silent)
+            return;
         this.logger.warn(message, ...args);
     }
     error(message, ...args) {
+        if (this.silent)
+            return;
         this.logger.error(message, ...args);
     }
     debug(message, ...args) {
+        if (this.silent)
+            return;
         this.logger.debug(message, ...args);
     }
     setLogLevel(level) {
-        this.logger.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.logger.format = getLogFormat(logFormat);
+        if ('format' in this.logger) {
+            this.logger.format = getLogFormat(logFormat);
+        }
     }
 }
 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') {

package/lib/cjs/common/payment.js

@@ -18,12 +18,13 @@ exports.TurboAuthenticatedPaymentService = exports.TurboUnauthenticatedPaymentSe
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 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");
 exports.developmentPaymentServiceURL = 'https://payment.ardrive.dev';
 exports.defaultPaymentServiceURL = 'https://payment.ardrive.io';
 class TurboUnauthenticatedPaymentService {
-    constructor({ url = exports.defaultPaymentServiceURL, retryConfig, logger = new logger_js_1.TurboWinstonLogger(), 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`,
@@ -94,7 +95,7 @@ class TurboUnauthenticatedPaymentService {
     async submitFundTransaction({ txId, }) {
         const response = await this.httpService.post({
             endpoint: `/account/balance/${this.token}`,
-            data: Buffer.from(JSON.stringify({ tx_id: txId })),
+            data: node_buffer_1.Buffer.from(JSON.stringify({ tx_id: txId })),
         });
         if ('creditedTransaction' in response) {
             return {
@@ -133,7 +134,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 = new logger_js_1.TurboWinstonLogger(), 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

@@ -23,6 +23,7 @@ exports.TurboDataItemAbstractSigner = void 0;
 const arbundles_1 = require("arbundles");
 const crypto_1 = require("crypto");
 const ethers_1 = require("ethers");
+const node_buffer_1 = require("node:buffer");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const base64_js_1 = require("../utils/base64.js");
 /**
@@ -54,13 +55,13 @@ class TurboDataItemAbstractSigner {
     }
     async generateSignedRequestHeaders() {
         const nonce = (0, crypto_1.randomBytes)(16).toString('hex');
-        const buffer = Buffer.from(nonce);
+        const buffer = node_buffer_1.Buffer.from(nonce);
         const signature = await this.signer.sign(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)(Buffer.from(signature)),
+            'x-signature': (0, base64_js_1.toB64Url)(node_buffer_1.Buffer.from(signature)),
         };
     }
     async getPublicKey() {
@@ -71,7 +72,7 @@ class TurboDataItemAbstractSigner {
         if (!(this.signer instanceof arbundles_1.EthereumSigner)) {
             throw new Error('Only EthereumSigner is supported for sendTransaction API currently!');
         }
-        const keyAsStringFromUint8Array = Buffer.from(this.signer.key).toString('hex');
+        const keyAsStringFromUint8Array = node_buffer_1.Buffer.from(this.signer.key).toString('hex');
         const ethWalletAndProvider = new ethers_1.Wallet(keyAsStringFromUint8Array, provider);
         const tx = await ethWalletAndProvider.sendTransaction({
             to: target,

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

@@ -22,13 +22,14 @@ exports.ARToTokenAmount = exports.WinstonToTokenAmount = exports.ArweaveToken =
  */
 const arweave_1 = __importDefault(require("@irys/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");
 class ArweaveToken {
     constructor({ gatewayUrl = 'https://arweave.net', arweave = arweave_1.default.init({
         url: gatewayUrl,
-    }), logger = new logger_js_1.TurboWinstonLogger(), mintU = true, pollingOptions = {
+    }), logger = logger_js_1.TurboWinstonLogger.default, mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3_000,
         initialBackoffMs: 7_000,
@@ -59,7 +60,7 @@ class ArweaveToken {
         tx.setOwner(publicKeyB64Url);
         const dataToSign = await tx.getSignatureData();
         const signatureUint8Array = await signer.signData(dataToSign);
-        const signatureBuffer = Buffer.from(signatureUint8Array);
+        const signatureBuffer = node_buffer_1.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 = new logger_js_1.TurboWinstonLogger(), gatewayUrl = 'https://cloudflare-eth.com/', pollingOptions = {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = 'https://cloudflare-eth.com/', pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
         initialBackoffMs: 10_000,

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

@@ -23,6 +23,7 @@ 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 common_js_1 = require("../../utils/common.js");
 const logger_js_1 = require("../logger.js");
 const lamportToTokenAmount = (winston) => winston;
@@ -30,7 +31,7 @@ exports.lamportToTokenAmount = lamportToTokenAmount;
 const SOLToTokenAmount = (sol) => new bignumber_js_1.BigNumber(sol).times(1e9).valueOf();
 exports.SOLToTokenAmount = SOLToTokenAmount;
 class SolanaToken {
-    constructor({ logger = new logger_js_1.TurboWinstonLogger(), gatewayUrl = 'https://api.mainnet-beta.solana.com', pollingOptions = {
+    constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = 'https://api.mainnet-beta.solana.com', pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 5_000,
         initialBackoffMs: 7_000,
@@ -53,7 +54,7 @@ class SolanaToken {
         }));
         const serializedTx = tx.serializeMessage();
         const signature = await signer.signData(serializedTx);
-        tx.addSignature(publicKey, Buffer.from(signature));
+        tx.addSignature(publicKey, node_buffer_1.Buffer.from(signature));
         const id = bs58_1.default.encode(signature);
         await this.submitTx(tx, id);
         return { id, target };

package/lib/cjs/common/upload.js

@@ -1,13 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurboAuthenticatedBaseUploadService = exports.TurboUnauthenticatedUploadService = exports.defaultUploadServiceURL = exports.developmentUploadServiceURL = void 0;
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+const node_buffer_1 = require("node:buffer");
 const plimit_lit_1 = require("plimit-lit");
 const http_js_1 = require("./http.js");
 const logger_js_1 = require("./logger.js");
 exports.developmentUploadServiceURL = 'https://upload.ardrive.dev';
 exports.defaultUploadServiceURL = 'https://upload.ardrive.io';
 class TurboUnauthenticatedUploadService {
-    constructor({ url = exports.defaultUploadServiceURL, retryConfig, logger = new logger_js_1.TurboWinstonLogger(), token = 'arweave', }) {
+    constructor({ url = exports.defaultUploadServiceURL, retryConfig, logger = logger_js_1.TurboWinstonLogger.default, token = 'arweave', }) {
         this.token = token;
         this.logger = logger;
         this.httpService = new http_js_1.TurboHTTPService({
@@ -91,7 +108,8 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
         return this.contentTypeFromFile(file);
     }
     async uploadFolder(params) {
-        const { dataItemOpts, signal, manifestOptions = {}, maxConcurrentUploads = 5, throwOnFailure = true, } = params;
+        this.logger.debug('Uploading folder...', { params });
+        const { dataItemOpts, signal, manifestOptions = {}, maxConcurrentUploads = 1, throwOnFailure = true, } = params;
         const { disableManifest, indexFile, fallbackFile } = manifestOptions;
         const paths = {};
         const response = {
@@ -130,6 +148,11 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
         const files = await this.getFiles(params);
         const limit = (0, plimit_lit_1.pLimit)(maxConcurrentUploads);
         await Promise.all(files.map((file) => limit(() => uploadFile(file))));
+        this.logger.debug('Finished uploading files', {
+            numFiles: files.length,
+            numErrors: errors.length,
+            results: response.fileResponses,
+        });
         if (errors.length > 0) {
             response.errors = errors;
         }
@@ -146,7 +169,7 @@ class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUploadServ
                 []),
             { name: 'Content-Type', value: 'application/x.arweave-manifest+json' },
         ];
-        const manifestBuffer = Buffer.from(JSON.stringify(manifest));
+        const manifestBuffer = node_buffer_1.Buffer.from(JSON.stringify(manifest));
         const manifestResponse = await this.uploadFile({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             fileStreamFactory: () => this.createManifestStream(manifestBuffer),

package/lib/cjs/node/factory.js

@@ -17,7 +17,70 @@ exports.TurboFactory = void 0;
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+const arbundles_1 = require("arbundles");
 const factory_js_1 = require("../common/factory.js");
+const index_js_1 = require("../common/index.js");
+const payment_js_1 = require("../common/payment.js");
+const turbo_js_1 = require("../common/turbo.js");
+const common_js_1 = require("../utils/common.js");
+const signer_js_1 = require("./signer.js");
+const upload_js_1 = require("./upload.js");
 class TurboFactory extends factory_js_1.TurboBaseFactory {
+    static getSigner(providedSigner, providedPrivateKey, token) {
+        return new signer_js_1.TurboNodeSigner({
+            signer: (0, common_js_1.createTurboSigner)({
+                signer: providedSigner,
+                privateKey: providedPrivateKey,
+                token,
+            }),
+            logger: this.logger,
+        });
+    }
+    static authenticated({ privateKey, signer: providedSigner, paymentServiceConfig = {}, uploadServiceConfig = {}, token, tokenMap, gatewayUrl, tokenTools, }) {
+        if (!token) {
+            if (providedSigner) {
+                // Derive token from signer if not provided
+                if (providedSigner instanceof arbundles_1.EthereumSigner) {
+                    token = 'ethereum';
+                }
+                else if (providedSigner instanceof arbundles_1.HexSolanaSigner) {
+                    token = 'solana';
+                }
+                else {
+                    token = 'arweave';
+                }
+            }
+            else {
+                token = 'arweave';
+            }
+        }
+        const turboSigner = this.getSigner(providedSigner, privateKey, token);
+        if (!tokenTools) {
+            if (tokenMap && token === 'arweave') {
+                tokenTools = tokenMap.arweave;
+            }
+            tokenTools = index_js_1.defaultTokenMap[token]?.({
+                gatewayUrl,
+                logger: this.logger,
+            });
+        }
+        const paymentService = new payment_js_1.TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer: turboSigner,
+            logger: this.logger,
+            token,
+            tokenTools,
+        });
+        const uploadService = new upload_js_1.TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer: turboSigner,
+            logger: this.logger,
+            token,
+        });
+        return new turbo_js_1.TurboAuthenticatedClient({
+            uploadService,
+            paymentService,
+        });
+    }
 }
 exports.TurboFactory = TurboFactory;

package/lib/cjs/node/signer.js

@@ -22,6 +22,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 signer_js_1 = require("../common/signer.js");
 const base64_js_1 = require("../utils/base64.js");
 /**
@@ -54,7 +55,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' ? Buffer.from(anchor) : null;
+        const _anchor = typeof anchor === 'string' ? node_buffer_1.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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TurboAuthenticatedNodeUploadService = void 0;
+exports.TurboAuthenticatedUploadService = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -23,7 +23,7 @@ const node_stream_1 = require("node:stream");
 const path_1 = require("path");
 const upload_js_1 = require("../common/upload.js");
 const types_js_1 = require("../types.js");
-class TurboAuthenticatedNodeUploadService extends upload_js_1.TurboAuthenticatedBaseUploadService {
+class TurboAuthenticatedUploadService extends upload_js_1.TurboAuthenticatedBaseUploadService {
     constructor({ url = upload_js_1.defaultUploadServiceURL, retryConfig, signer, logger, token, }) {
         super({ url, retryConfig, logger, token, signer });
     }
@@ -69,4 +69,4 @@ class TurboAuthenticatedNodeUploadService extends upload_js_1.TurboAuthenticated
         return node_stream_1.Readable.from(manifestBuffer);
     }
 }
-exports.TurboAuthenticatedNodeUploadService = TurboAuthenticatedNodeUploadService;
+exports.TurboAuthenticatedUploadService = TurboAuthenticatedUploadService;

package/lib/cjs/utils/axiosClient.js

@@ -51,7 +51,7 @@ exports.defaultRequestHeaders = {
     'x-turbo-source-version': version_js_1.version,
     'x-turbo-source-identifier': 'turbo-sdk',
 };
-const createAxiosInstance = ({ logger = new logger_js_1.TurboWinstonLogger(), axiosConfig = {}, retryConfig = {
+const createAxiosInstance = ({ logger = logger_js_1.TurboWinstonLogger.default, axiosConfig = {}, retryConfig = {
     retryDelay: axios_retry_1.default.exponentialDelay,
     retries: 3,
     retryCondition: (error) => {

package/lib/cjs/utils/base64.js

@@ -24,6 +24,7 @@ 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 +38,7 @@ function fromB64Url(input) {
         .replace(/-/g, '+')
         .replace(/_/g, '/')
         .concat('='.repeat(paddingLength));
-    return Buffer.from(base64, 'base64');
+    return node_buffer_1.Buffer.from(base64, 'base64');
 }
 function toB64Url(buffer) {
     return (0, utils_js_1.bufferTob64Url)(buffer);

package/lib/cjs/utils/common.js

@@ -1,4 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = sleep;
+exports.isWeb = isWeb;
+exports.createTurboSigner = createTurboSigner;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -15,12 +19,35 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = sleep;
-exports.isWeb = isWeb;
+const arbundles_1 = require("arbundles");
+const types_js_1 = require("../types.js");
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function isWeb() {
     return typeof window !== 'undefined';
 }
+function createTurboSigner({ signer: clientProvidedSigner, privateKey: clientProvidedPrivateKey, token = 'arweave', }) {
+    if (clientProvidedSigner !== undefined) {
+        return clientProvidedSigner;
+    }
+    if (clientProvidedPrivateKey === undefined) {
+        throw new Error('A privateKey or signer must be provided.');
+    }
+    if (token === 'solana') {
+        // TODO: Add a type check for SOL private keys shape for detailed error message
+        return new arbundles_1.HexSolanaSigner(clientProvidedPrivateKey);
+    }
+    else if (token === 'ethereum') {
+        if (!(0, types_js_1.isEthPrivateKey)(clientProvidedPrivateKey)) {
+            throw new Error('An Ethereum private key must be provided for EthereumSigner.');
+        }
+        return new arbundles_1.EthereumSigner(clientProvidedPrivateKey);
+    }
+    else {
+        if (!(0, types_js_1.isJWK)(clientProvidedPrivateKey)) {
+            throw new Error('A JWK must be provided for ArweaveSigner.');
+        }
+        return new arbundles_1.ArweaveSigner(clientProvidedPrivateKey);
+    }
+}

package/lib/cjs/utils/readableStream.js

@@ -1,9 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readableStreamToBuffer = readableStreamToBuffer;
+/**
+ * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+const node_buffer_1 = require("node:buffer");
 async function readableStreamToBuffer({ stream, size, }) {
     const reader = stream.getReader();
-    const buffer = Buffer.alloc(size);
+    const buffer = node_buffer_1.Buffer.alloc(size);
     let offset = 0;
     let done = false;
     while (!done) {

package/lib/cjs/version.js

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