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

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

@@ -24,7 +24,7 @@ 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`,
@@ -197,7 +197,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

@@ -38,7 +38,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;

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

@@ -30,7 +30,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,

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

@@ -31,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 = 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,

package/lib/cjs/common/upload.js

@@ -33,7 +33,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({

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/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;

package/lib/esm/common/logger.js

@@ -1,56 +1,88 @@
+/**
+ * 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.
+ */
+import { createLogger, format, transports, } from 'winston';
 import { version } from '../version.js';
-export class ConsoleTurboLogger {
+export 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,
-            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 = 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.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);
+        }
     }
 }
-ConsoleTurboLogger.default = new ConsoleTurboLogger();
+TurboWinstonLogger.default = new TurboWinstonLogger();
+function getLogFormat(logFormat) {
+    return format.combine(format((info) => {
+        if (info.stack && info.level !== 'error') {
+            delete info.stack;
+        }
+        return info;
+    })(), format.errors({ stack: true }), // Ensure errors show a stack trace
+    format.timestamp(), logFormat === 'json' ? format.json() : format.simple());
+}

package/lib/esm/common/payment.js

@@ -16,12 +16,12 @@
 import { BigNumber } from 'bignumber.js';
 import { Buffer } from 'node:buffer';
 import { TurboHTTPService } from './http.js';
-import { ConsoleTurboLogger } from './logger.js';
+import { TurboWinstonLogger } from './logger.js';
 import { exponentMap, tokenToBaseMap } from './token/index.js';
 export const developmentPaymentServiceURL = 'https://payment.ardrive.dev';
 export const defaultPaymentServiceURL = 'https://payment.ardrive.io';
 export class TurboUnauthenticatedPaymentService {
-    constructor({ url = defaultPaymentServiceURL, retryConfig, logger = ConsoleTurboLogger.default, token = 'arweave', }) {
+    constructor({ url = defaultPaymentServiceURL, retryConfig, logger = TurboWinstonLogger.default, token = 'arweave', }) {
         this.logger = logger;
         this.httpService = new TurboHTTPService({
             url: `${url}/v1`,
@@ -193,7 +193,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 = ConsoleTurboLogger.default, 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

@@ -27,12 +27,12 @@ import { Buffer } from 'node:buffer';
 import nacl from 'tweetnacl';
 import { isEthereumWalletAdapter, } from '../types.js';
 import { fromB64Url, ownerToAddress as ownerToB64Address, toB64Url, } from '../utils/base64.js';
-import { ConsoleTurboLogger } from './logger.js';
+import { TurboWinstonLogger } from './logger.js';
 /**
  * Abstract class for signing TurboDataItems.
  */
 export class TurboDataItemAbstractSigner {
-    constructor({ signer, logger = ConsoleTurboLogger.default, token, walletAdapter, }) {
+    constructor({ signer, logger = TurboWinstonLogger.default, token, walletAdapter, }) {
         this.logger = logger;
         this.signer = signer;
         this.token = token;

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

@@ -18,13 +18,13 @@ import { BigNumber } from 'bignumber.js';
 import { Buffer } from 'node:buffer';
 import { sha256B64Url, toB64Url } from '../../utils/base64.js';
 import { sleep } from '../../utils/common.js';
-import { ConsoleTurboLogger } from '../logger.js';
+import { TurboWinstonLogger } from '../logger.js';
 const ArweaveClass = 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore -- Access the correct class constructor for Arweave
 ArweaveModule.default?.default || ArweaveModule.default || ArweaveModule;
 export class ArweaveToken {
-    constructor({ gatewayUrl = 'https://arweave.net', arweave, logger = ConsoleTurboLogger.default, mintU = true, pollingOptions = {
+    constructor({ gatewayUrl = 'https://arweave.net', arweave, logger = TurboWinstonLogger.default, mintU = true, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 3_000,
         initialBackoffMs: 7_000,

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

@@ -16,11 +16,11 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
 import { defaultProdGatewayUrls } from '../../cli/constants.js';
-import { ConsoleTurboLogger } from '../logger.js';
+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 = ConsoleTurboLogger.default, gatewayUrl = defaultProdGatewayUrls.ethereum, pollingOptions = {
+    constructor({ logger = TurboWinstonLogger.default, gatewayUrl = defaultProdGatewayUrls.ethereum, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
         initialBackoffMs: 10_000,

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

@@ -21,14 +21,14 @@ import { BigNumber } from 'bignumber.js';
 import { defaultProdGatewayUrls } from '../../cli/constants.js';
 import { createAxiosInstance } from '../../utils/axiosClient.js';
 import { sleep } from '../../utils/common.js';
-import { ConsoleTurboLogger } from '../logger.js';
+import { TurboWinstonLogger } from '../logger.js';
 function hasKyveTxResponse(response) {
     return response.tx_response !== undefined;
 }
 export const ukyveToTokenAmount = (winston) => winston;
 export const KYVEToTokenAmount = (sol) => new BigNumber(sol).times(1e6).valueOf();
 export class KyveToken {
-    constructor({ logger = ConsoleTurboLogger.default, gatewayUrl = defaultProdGatewayUrls.kyve, pollingOptions = {
+    constructor({ logger = TurboWinstonLogger.default, gatewayUrl = defaultProdGatewayUrls.kyve, pollingOptions = {
         maxAttempts: 5,
         pollingIntervalMs: 1_000,
         initialBackoffMs: 500,

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

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 import { defaultProdGatewayUrls } from '../../cli/constants.js';
-import { ConsoleTurboLogger } from '../logger.js';
+import { TurboWinstonLogger } from '../logger.js';
 import { ETHToTokenAmount, EthereumToken } from './ethereum.js';
 export const POLToTokenAmount = ETHToTokenAmount;
 export class PolygonToken extends EthereumToken {
-    constructor({ logger = ConsoleTurboLogger.default, gatewayUrl = defaultProdGatewayUrls.pol, pollingOptions = {
+    constructor({ logger = TurboWinstonLogger.default, gatewayUrl = defaultProdGatewayUrls.pol, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
         initialBackoffMs: 5_000,

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

@@ -19,11 +19,11 @@ import bs58 from 'bs58';
 import { Buffer } from 'node:buffer';
 import { defaultProdGatewayUrls } from '../../cli/constants.js';
 import { sleep } from '../../utils/common.js';
-import { ConsoleTurboLogger } from '../logger.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 = ConsoleTurboLogger.default, gatewayUrl = defaultProdGatewayUrls.solana, pollingOptions = {
+    constructor({ logger = TurboWinstonLogger.default, gatewayUrl = defaultProdGatewayUrls.solana, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 2_500,
         initialBackoffMs: 500,

package/lib/esm/common/upload.js

@@ -20,7 +20,7 @@ import { defaultRetryConfig } from '../utils/axiosClient.js';
 import { sleep } from '../utils/common.js';
 import { FailedRequestError } from '../utils/errors.js';
 import { TurboHTTPService } from './http.js';
-import { ConsoleTurboLogger } from './logger.js';
+import { TurboWinstonLogger } from './logger.js';
 export const creditSharingTagNames = {
     shareCredits: 'x-approve-payment',
     sharedWincAmount: 'x-amount',
@@ -30,7 +30,7 @@ export const creditSharingTagNames = {
 export const developmentUploadServiceURL = 'https://upload.ardrive.dev';
 export const defaultUploadServiceURL = 'https://upload.ardrive.io';
 export class TurboUnauthenticatedUploadService {
-    constructor({ url = defaultUploadServiceURL, logger = ConsoleTurboLogger.default, retryConfig = defaultRetryConfig(logger), token = 'arweave', }) {
+    constructor({ url = defaultUploadServiceURL, logger = TurboWinstonLogger.default, retryConfig = defaultRetryConfig(logger), token = 'arweave', }) {
         this.token = token;
         this.logger = logger;
         this.httpService = new TurboHTTPService({

package/lib/esm/utils/axiosClient.js

@@ -15,13 +15,13 @@
  */
 import axios, { CanceledError } from 'axios';
 import axiosRetry from 'axios-retry';
-import { ConsoleTurboLogger } from '../common/logger.js';
+import { TurboWinstonLogger } from '../common/logger.js';
 import { version } from '../version.js';
 export const defaultRequestHeaders = {
     'x-turbo-source-version': version,
     'x-turbo-source-identifier': 'turbo-sdk',
 };
-export const defaultRetryConfig = (logger = ConsoleTurboLogger.default) => ({
+export const defaultRetryConfig = (logger = TurboWinstonLogger.default) => ({
     retryDelay: axiosRetry.exponentialDelay,
     retries: 5,
     retryCondition: (error) => {
@@ -33,7 +33,7 @@ export const defaultRetryConfig = (logger = ConsoleTurboLogger.default) => ({
         logger.debug(`Request failed, ${error}. Retry attempt #${retryCount}...`);
     },
 });
-export const createAxiosInstance = ({ logger = ConsoleTurboLogger.default, axiosConfig = {}, retryConfig = defaultRetryConfig(logger), } = {}) => {
+export const createAxiosInstance = ({ logger = TurboWinstonLogger.default, axiosConfig = {}, retryConfig = defaultRetryConfig(logger), } = {}) => {
     const axiosInstance = axios.create({
         ...axiosConfig,
         headers: {

package/lib/types/common/factory.d.ts

@@ -1,16 +1,16 @@
 import { GetTurboSignerParams, TurboAuthenticatedConfiguration, TurboAuthenticatedUploadServiceConfiguration, TurboAuthenticatedUploadServiceInterface, TurboUnauthenticatedConfiguration } from '../types.js';
-import { ConsoleTurboLogger, LogFormat, LogLevel } from './logger.js';
+import { TurboWinstonLogger } from './logger.js';
 import { TurboDataItemAbstractSigner } from './signer.js';
 import { TurboAuthenticatedClient, TurboUnauthenticatedClient } from './turbo.js';
 export declare abstract class TurboBaseFactory {
-    protected static logger: ConsoleTurboLogger;
-    static setLogLevel(level: LogLevel): void;
-    static setLogFormat(format: LogFormat): void;
+    protected static logger: TurboWinstonLogger;
+    static setLogLevel(level: string): void;
+    static setLogFormat(format: string): void;
     static unauthenticated({ paymentServiceConfig, uploadServiceConfig, token, }?: TurboUnauthenticatedConfiguration): TurboUnauthenticatedClient;
     protected abstract getSigner({ providedPrivateKey, providedSigner, providedWalletAdapter, logger, token, }: GetTurboSignerParams): TurboDataItemAbstractSigner;
     protected abstract getAuthenticatedUploadService(config: TurboAuthenticatedUploadServiceConfiguration): TurboAuthenticatedUploadServiceInterface;
     protected getAuthenticatedTurbo({ privateKey, signer: providedSigner, paymentServiceConfig, uploadServiceConfig, token, gatewayUrl, tokenMap, tokenTools, logger, walletAdapter, }: TurboAuthenticatedConfiguration & {
-        logger: ConsoleTurboLogger;
+        logger: TurboWinstonLogger;
     }): TurboAuthenticatedClient;
     private signerFromAdapter;
 }

package/lib/types/common/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,oBAAoB,EAEpB,+BAA+B,EAC/B,4CAA4C,EAC5C,wCAAwC,EACxC,iCAAiC,EAIlC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAGpB,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,MAAM,CAAC,MAAM,qBAA8B;IAGrD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ;IAKlC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS;IAIrC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,GACN,GAAE,iCAAsC;IAqBzC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC3B,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,KAAK,GACN,EAAE,oBAAoB,GAAG,2BAA2B;IAErD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAC9C,MAAM,EAAE,4CAA4C,GACnD,wCAAwC;IAE3C,SAAS,CAAC,qBAAqB,CAAC,EAC9B,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,GACd,EAAE,+BAA+B,GAAG;QAAE,MAAM,EAAE,kBAAkB,CAAA;KAAE;IA6DnE,OAAO,CAAC,iBAAiB;CAuB1B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/common/factory.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,oBAAoB,EAEpB,+BAA+B,EAC/B,4CAA4C,EAC5C,wCAAwC,EACxC,iCAAiC,EAIlC,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAGpB,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,MAAM,CAAC,MAAM,qBAA8B;IAGrD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAKhC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAIlC,MAAM,CAAC,eAAe,CAAC,EACrB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,GACN,GAAE,iCAAsC;IAqBzC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAC3B,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,KAAK,GACN,EAAE,oBAAoB,GAAG,2BAA2B;IAErD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAC9C,MAAM,EAAE,4CAA4C,GACnD,wCAAwC;IAE3C,SAAS,CAAC,qBAAqB,CAAC,EAC9B,UAAU,EACV,MAAM,EAAE,cAAc,EACtB,oBAAyB,EACzB,mBAAwB,EACxB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,UAAU,EACV,MAAM,EACN,aAAa,GACd,EAAE,+BAA+B,GAAG;QAAE,MAAM,EAAE,kBAAkB,CAAA;KAAE;IA6DnE,OAAO,CAAC,iBAAiB;CAuB1B"}