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

package/lib/cjs/web/factory.js

@@ -20,37 +20,17 @@ exports.TurboFactory = void 0;
 const arbundles_1 = require("arbundles");
 const factory_js_1 = require("../common/factory.js");
 const index_js_1 = require("../common/index.js");
-const types_js_1 = require("../types.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) {
-        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.');
-        }
         return new signer_js_1.TurboWebArweaveSigner({
-            signer,
+            signer: (0, common_js_1.createTurboSigner)({
+                signer: providedSigner,
+                privateKey: providedPrivateKey,
+                token,
+            }),
             logger: this.logger,
         });
     }
@@ -90,7 +70,7 @@ class TurboFactory extends factory_js_1.TurboBaseFactory {
             token,
             tokenTools,
         });
-        const uploadService = new upload_js_1.TurboAuthenticatedWebUploadService({
+        const uploadService = new upload_js_1.TurboAuthenticatedUploadService({
             ...uploadServiceConfig,
             signer: turboSigner,
             logger: this.logger,

package/lib/cjs/web/upload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TurboAuthenticatedWebUploadService = void 0;
+exports.TurboAuthenticatedUploadService = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc. All Rights Reserved.
  *
@@ -19,7 +19,7 @@ exports.TurboAuthenticatedWebUploadService = void 0;
  */
 const upload_js_1 = require("../common/upload.js");
 const types_js_1 = require("../types.js");
-class TurboAuthenticatedWebUploadService 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 });
     }
@@ -54,4 +54,4 @@ class TurboAuthenticatedWebUploadService extends upload_js_1.TurboAuthenticatedB
         return stream;
     }
 }
-exports.TurboAuthenticatedWebUploadService = TurboAuthenticatedWebUploadService;
+exports.TurboAuthenticatedUploadService = TurboAuthenticatedUploadService;

package/lib/esm/common/factory.js

@@ -1,35 +1,13 @@
-/**
- * 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/>.
- */
-import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
-import { TurboNodeSigner } from '../node/signer.js';
-import { TurboAuthenticatedNodeUploadService } from '../node/upload.js';
-import { isEthPrivateKey, isJWK, } from '../types.js';
-import { isWeb } from '../utils/common.js';
-import { TurboWebArweaveSigner } from '../web/signer.js';
-import { TurboAuthenticatedWebUploadService } from '../web/upload.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 { TurboUnauthenticatedPaymentService } from './payment.js';
+import { TurboUnauthenticatedClient } from './turbo.js';
 import { TurboUnauthenticatedUploadService } from './upload.js';
 export class TurboBaseFactory {
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogLevel(level) {
         this.logger.setLogLevel(level);
     }
+    /* @deprecated - use TurboWinstonLogger directly */
     static setLogFormat(format) {
         this.logger.setLogFormat(format);
     }
@@ -47,94 +25,5 @@ export class TurboBaseFactory {
             paymentService,
         });
     }
-    static getSigner(providedSigner, providedPrivateKey, token) {
-        let signer;
-        if (providedSigner !== undefined) {
-            signer = providedSigner;
-        }
-        else if (providedPrivateKey !== undefined) {
-            if (token === 'solana') {
-                signer = new HexSolanaSigner(providedPrivateKey);
-            }
-            else if (token === 'ethereum') {
-                if (!isEthPrivateKey(providedPrivateKey)) {
-                    throw new Error('An Ethereum private key must be provided for EthereumSigner.');
-                }
-                signer = new EthereumSigner(providedPrivateKey);
-            }
-            else {
-                if (!isJWK(providedPrivateKey)) {
-                    throw new Error('A JWK must be provided for ArweaveSigner.');
-                }
-                signer = new ArweaveSigner(providedPrivateKey);
-            }
-        }
-        else {
-            throw new Error('A privateKey or signer must be provided.');
-        }
-        if (isWeb()) {
-            return new TurboWebArweaveSigner({
-                signer,
-                logger: this.logger,
-            });
-        }
-        return new 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 EthereumSigner) {
-                    token = 'ethereum';
-                }
-                else if (providedSigner instanceof 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 = defaultTokenMap[token]?.({
-                gatewayUrl,
-                logger: this.logger,
-            });
-        }
-        const paymentService = new TurboAuthenticatedPaymentService({
-            ...paymentServiceConfig,
-            signer: turboSigner,
-            logger: this.logger,
-            token,
-            tokenTools,
-        });
-        const uploadService = isWeb()
-            ? new TurboAuthenticatedWebUploadService({
-                ...uploadServiceConfig,
-                signer: turboSigner,
-                logger: this.logger,
-                token,
-            })
-            : new TurboAuthenticatedNodeUploadService({
-                ...uploadServiceConfig,
-                signer: turboSigner,
-                logger: this.logger,
-                token,
-            });
-        return new TurboAuthenticatedClient({
-            uploadService,
-            paymentService,
-        });
-    }
 }
-TurboBaseFactory.logger = new TurboWinstonLogger();
+TurboBaseFactory.logger = TurboWinstonLogger.default;

package/lib/esm/common/logger.js

@@ -18,33 +18,66 @@ import { createLogger, format, transports } from 'winston';
 import { version } from '../version.js';
 export class TurboWinstonLogger {
     constructor({ level = 'info', logFormat = 'simple', } = {}) {
-        this.logger = createLogger({
-            level,
-            defaultMeta: { client: 'turbo-sdk', version },
-            silent: level === 'none',
-            format: getLogFormat(logFormat),
-            transports: [new transports.Console()],
-        });
+        this.silent = false;
+        if (level === 'none') {
+            this.silent = true;
+        }
+        if (typeof window !== 'undefined') {
+            this.logger = console;
+        }
+        else {
+            this.logger = createLogger({
+                level,
+                silent: this.silent,
+                defaultMeta: {
+                    name: 'turbo-sdk',
+                    version,
+                },
+                format: format.combine(format.timestamp(), format.json()),
+                transports: [
+                    new 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);
+        }
     }
 }
+TurboWinstonLogger.default = new TurboWinstonLogger();
 function getLogFormat(logFormat) {
     return format.combine(format((info) => {
         if (info.stack && info.level !== 'error') {

package/lib/esm/common/payment.js

@@ -15,12 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { BigNumber } from 'bignumber.js';
+import { Buffer } from 'node:buffer';
 import { TurboHTTPService } from './http.js';
 import { TurboWinstonLogger } from './logger.js';
 export const developmentPaymentServiceURL = 'https://payment.ardrive.dev';
 export const defaultPaymentServiceURL = 'https://payment.ardrive.io';
 export class TurboUnauthenticatedPaymentService {
-    constructor({ url = defaultPaymentServiceURL, retryConfig, logger = new TurboWinstonLogger(), token = 'arweave', }) {
+    constructor({ url = defaultPaymentServiceURL, retryConfig, logger = TurboWinstonLogger.default, token = 'arweave', }) {
         this.logger = logger;
         this.httpService = new TurboHTTPService({
             url: `${url}/v1`,
@@ -129,7 +130,7 @@ export class TurboUnauthenticatedPaymentService {
 }
 // NOTE: to avoid redundancy, we use inheritance here - but generally prefer composition over inheritance
 export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentService {
-    constructor({ url = defaultPaymentServiceURL, retryConfig, signer, logger = new TurboWinstonLogger(), token = 'arweave', tokenTools, }) {
+    constructor({ url = defaultPaymentServiceURL, retryConfig, signer, logger = TurboWinstonLogger.default, token = 'arweave', tokenTools, }) {
         super({ url, retryConfig, logger, token });
         this.signer = signer;
         this.tokenTools = tokenTools;

package/lib/esm/common/signer.js

@@ -17,6 +17,7 @@
 import { EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { randomBytes } from 'crypto';
 import { Wallet as EthereumWallet, parseEther } from 'ethers';
+import { Buffer } from 'node:buffer';
 import nacl from 'tweetnacl';
 import { toB64Url } from '../utils/base64.js';
 /**

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

@@ -16,13 +16,14 @@
  */
 import Arweave from '@irys/arweave';
 import { BigNumber } from 'bignumber.js';
+import { Buffer } from 'node:buffer';
 import { sha256B64Url, toB64Url } from '../../utils/base64.js';
 import { sleep } from '../../utils/common.js';
 import { TurboWinstonLogger } from '../logger.js';
 export class ArweaveToken {
     constructor({ gatewayUrl = 'https://arweave.net', arweave = Arweave.init({
         url: gatewayUrl,
-    }), logger = new TurboWinstonLogger(), mintU = true, pollingOptions = {
+    }), logger = TurboWinstonLogger.default, mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3_000,
         initialBackoffMs: 7_000,

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

@@ -20,7 +20,7 @@ import { TurboWinstonLogger } from '../logger.js';
 export const weiToTokenAmount = (wei) => wei;
 export const ETHToTokenAmount = (eth) => new BigNumber(eth).times(1e18).valueOf();
 export class EthereumToken {
-    constructor({ logger = new TurboWinstonLogger(), gatewayUrl = 'https://cloudflare-eth.com/', pollingOptions = {
+    constructor({ logger = TurboWinstonLogger.default, gatewayUrl = 'https://cloudflare-eth.com/', pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
         initialBackoffMs: 10_000,

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

@@ -17,12 +17,13 @@
 import { Connection, PublicKey, SystemProgram, Transaction, } from '@solana/web3.js';
 import { BigNumber } from 'bignumber.js';
 import bs58 from 'bs58';
+import { Buffer } from 'node:buffer';
 import { sleep } from '../../utils/common.js';
 import { TurboWinstonLogger } from '../logger.js';
 export const lamportToTokenAmount = (winston) => winston;
 export const SOLToTokenAmount = (sol) => new BigNumber(sol).times(1e9).valueOf();
 export class SolanaToken {
-    constructor({ logger = new TurboWinstonLogger(), gatewayUrl = 'https://api.mainnet-beta.solana.com', pollingOptions = {
+    constructor({ logger = TurboWinstonLogger.default, gatewayUrl = 'https://api.mainnet-beta.solana.com', pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 5_000,
         initialBackoffMs: 7_000,

package/lib/esm/common/upload.js

@@ -1,10 +1,27 @@
+/**
+ * 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/>.
+ */
+import { Buffer } from 'node:buffer';
 import { pLimit } from 'plimit-lit';
 import { TurboHTTPService } from './http.js';
 import { TurboWinstonLogger } from './logger.js';
 export const developmentUploadServiceURL = 'https://upload.ardrive.dev';
 export const defaultUploadServiceURL = 'https://upload.ardrive.io';
 export class TurboUnauthenticatedUploadService {
-    constructor({ url = defaultUploadServiceURL, retryConfig, logger = new TurboWinstonLogger(), token = 'arweave', }) {
+    constructor({ url = defaultUploadServiceURL, retryConfig, logger = TurboWinstonLogger.default, token = 'arweave', }) {
         this.token = token;
         this.logger = logger;
         this.httpService = new TurboHTTPService({
@@ -87,7 +104,8 @@ export class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUpl
         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 = {
@@ -126,6 +144,11 @@ export class TurboAuthenticatedBaseUploadService extends TurboUnauthenticatedUpl
         const files = await this.getFiles(params);
         const limit = 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;
         }

package/lib/esm/node/factory.js

@@ -14,6 +14,69 @@
  * 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/>.
  */
+import { EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { TurboBaseFactory } from '../common/factory.js';
+import { defaultTokenMap } from '../common/index.js';
+import { TurboAuthenticatedPaymentService } from '../common/payment.js';
+import { TurboAuthenticatedClient } from '../common/turbo.js';
+import { createTurboSigner } from '../utils/common.js';
+import { TurboNodeSigner } from './signer.js';
+import { TurboAuthenticatedUploadService } from './upload.js';
 export class TurboFactory extends TurboBaseFactory {
+    static getSigner(providedSigner, providedPrivateKey, token) {
+        return new TurboNodeSigner({
+            signer: 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 EthereumSigner) {
+                    token = 'ethereum';
+                }
+                else if (providedSigner instanceof 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 = defaultTokenMap[token]?.({
+                gatewayUrl,
+                logger: this.logger,
+            });
+        }
+        const paymentService = new TurboAuthenticatedPaymentService({
+            ...paymentServiceConfig,
+            signer: turboSigner,
+            logger: this.logger,
+            token,
+            tokenTools,
+        });
+        const uploadService = new TurboAuthenticatedUploadService({
+            ...uploadServiceConfig,
+            signer: turboSigner,
+            logger: this.logger,
+            token,
+        });
+        return new TurboAuthenticatedClient({
+            uploadService,
+            paymentService,
+        });
+    }
 }

package/lib/esm/node/signer.js

@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import { ArconnectSigner, ArweaveSigner, EthereumSigner, HexSolanaSigner, serializeTags, streamSigner, } from 'arbundles';
+import { Buffer } from 'node:buffer';
 import { TurboDataItemAbstractSigner } from '../common/signer.js';
 import { fromB64Url } from '../utils/base64.js';
 /**

package/lib/esm/node/upload.js

@@ -20,7 +20,7 @@ import { Readable } from 'node:stream';
 import { join } from 'path';
 import { TurboAuthenticatedBaseUploadService, defaultUploadServiceURL, } from '../common/upload.js';
 import { isNodeUploadFolderParams, } from '../types.js';
-export class TurboAuthenticatedNodeUploadService extends TurboAuthenticatedBaseUploadService {
+export class TurboAuthenticatedUploadService extends TurboAuthenticatedBaseUploadService {
     constructor({ url = defaultUploadServiceURL, retryConfig, signer, logger, token, }) {
         super({ url, retryConfig, logger, token, signer });
     }

package/lib/esm/utils/axiosClient.js

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

package/lib/esm/utils/base64.js

@@ -16,6 +16,7 @@
  */
 import { bufferTob64Url } from 'arweave/node/lib/utils.js';
 import { createHash } from 'crypto';
+import { Buffer } from 'node:buffer';
 export const base64URLRegex = /^[a-zA-Z0-9_-]{43}$/;
 export function jwkToPublicArweaveAddress(jwk) {
     return ownerToAddress(jwk.n);

package/lib/esm/utils/common.js

@@ -14,9 +14,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/>.
  */
+import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
+import { isEthPrivateKey, isJWK, } from '../types.js';
 export function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 export function isWeb() {
     return typeof window !== 'undefined';
 }
+export 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 HexSolanaSigner(clientProvidedPrivateKey);
+    }
+    else if (token === 'ethereum') {
+        if (!isEthPrivateKey(clientProvidedPrivateKey)) {
+            throw new Error('An Ethereum private key must be provided for EthereumSigner.');
+        }
+        return new EthereumSigner(clientProvidedPrivateKey);
+    }
+    else {
+        if (!isJWK(clientProvidedPrivateKey)) {
+            throw new Error('A JWK must be provided for ArweaveSigner.');
+        }
+        return new ArweaveSigner(clientProvidedPrivateKey);
+    }
+}

package/lib/esm/utils/readableStream.js

@@ -1,3 +1,20 @@
+/**
+ * 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/>.
+ */
+import { Buffer } from 'node:buffer';
 export async function readableStreamToBuffer({ stream, size, }) {
     const reader = stream.getReader();
     const buffer = Buffer.alloc(size);

package/lib/esm/version.js

@@ -15,4 +15,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '1.10.0-alpha.1';
+export const version = '1.10.0-alpha.3';

package/lib/esm/web/factory.js

@@ -14,40 +14,20 @@
  * 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/>.
  */
-import { ArweaveSigner, EthereumSigner, HexSolanaSigner } from 'arbundles';
+import { EthereumSigner, HexSolanaSigner } from 'arbundles';
 import { TurboBaseFactory } from '../common/factory.js';
 import { TurboAuthenticatedClient, TurboAuthenticatedPaymentService, defaultTokenMap, } from '../common/index.js';
-import { isEthPrivateKey, isJWK, } from '../types.js';
+import { createTurboSigner } from '../utils/common.js';
 import { TurboWebArweaveSigner } from './signer.js';
-import { TurboAuthenticatedWebUploadService } from './upload.js';
+import { TurboAuthenticatedUploadService } from './upload.js';
 export class TurboFactory extends TurboBaseFactory {
     static getSigner(providedSigner, providedPrivateKey, token) {
-        let signer;
-        if (providedSigner !== undefined) {
-            signer = providedSigner;
-        }
-        else if (providedPrivateKey !== undefined) {
-            if (token === 'solana') {
-                signer = new HexSolanaSigner(providedPrivateKey);
-            }
-            else if (token === 'ethereum') {
-                if (!isEthPrivateKey(providedPrivateKey)) {
-                    throw new Error('An Ethereum private key must be provided for EthereumSigner.');
-                }
-                signer = new EthereumSigner(providedPrivateKey);
-            }
-            else {
-                if (!isJWK(providedPrivateKey)) {
-                    throw new Error('A JWK must be provided for ArweaveSigner.');
-                }
-                signer = new ArweaveSigner(providedPrivateKey);
-            }
-        }
-        else {
-            throw new Error('A privateKey or signer must be provided.');
-        }
         return new TurboWebArweaveSigner({
-            signer,
+            signer: createTurboSigner({
+                signer: providedSigner,
+                privateKey: providedPrivateKey,
+                token,
+            }),
             logger: this.logger,
         });
     }
@@ -87,7 +67,7 @@ export class TurboFactory extends TurboBaseFactory {
             token,
             tokenTools,
         });
-        const uploadService = new TurboAuthenticatedWebUploadService({
+        const uploadService = new TurboAuthenticatedUploadService({
             ...uploadServiceConfig,
             signer: turboSigner,
             logger: this.logger,

package/lib/esm/web/upload.js

@@ -16,7 +16,7 @@
  */
 import { TurboAuthenticatedBaseUploadService, defaultUploadServiceURL, } from '../common/upload.js';
 import { isWebUploadFolderParams, } from '../types.js';
-export class TurboAuthenticatedWebUploadService extends TurboAuthenticatedBaseUploadService {
+export class TurboAuthenticatedUploadService extends TurboAuthenticatedBaseUploadService {
     constructor({ url = defaultUploadServiceURL, retryConfig, signer, logger, token, }) {
         super({ url, retryConfig, logger, token, signer });
     }