@strkfarm/sdk 2.0.0-dev.27 → 2.0.0-dev.28

package/dist/cli.js

@@ -28,7 +28,7 @@ var import_commander = require("commander");
 var import_inquirer = __toESM(require("inquirer"));
 
 // src/utils/store.ts
-var import_fs = __toESM(require("fs"));
+var import_fs2 = __toESM(require("fs"));
 var import_starknet = require("starknet");
 var crypto2 = __toESM(require("crypto"));
 
@@ -82,41 +82,195 @@ var PasswordJsonCryptoUtil = class {
 };
 
 // src/utils/logger.node.ts
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
 var import_winston = __toESM(require("winston"));
 var colors = {
   error: "red",
   warn: "yellow",
   info: "blue",
-  verbose: "white",
-  debug: "white"
+  verbose: "cyan",
+  debug: "gray"
 };
 import_winston.default.addColors(colors);
-var logger = import_winston.default.createLogger({
-  level: "debug",
-  // Set the minimum logging level
-  format: import_winston.format.combine(
-    import_winston.format.colorize({ all: true }),
-    // Apply custom colors
-    import_winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
-    // Add timestamp to log messages
-    import_winston.format.printf(({ timestamp, level, message, ...meta }) => {
-      let msg = `${timestamp} ${level}: ${message}`;
-      if (meta && meta[Symbol.for("splat")]) {
-        for (const arg of meta[Symbol.for("splat")]) {
-          if (arg instanceof Error) {
-            msg += `
-${arg.stack}`;
-          }
-        }
+var stringifyUnknown = (value) => {
+  if (typeof value === "string") return value;
+  if (typeof value === "undefined") return "undefined";
+  if (value === null) return "null";
+  if (value instanceof Error) return value.message || value.name || "Error";
+  try {
+    const encoded = JSON.stringify(
+      value,
+      (_, v) => typeof v === "bigint" ? v.toString() : v
+    );
+    return encoded ?? String(value);
+  } catch {
+    return String(value);
+  }
+};
+var stripAnsi = (text) => stringifyUnknown(text).replace(/\u001b\[[0-9;]*m/g, "");
+var escapeValue = (value) => value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
+var escapeMessageValue = (value) => value.replace(/\\/g, "\\\\").replace(/"/g, "'").replace(/\n/g, "\\n");
+var ANSI = {
+  reset: "\x1B[0m",
+  red: "\x1B[31m",
+  yellow: "\x1B[33m",
+  green: "\x1B[32m"
+};
+var paint = (text, color) => `${color}${text}${ANSI.reset}`;
+var highlightRoutes = (text) => text.replace(/\b[A-Z][A-Z0-9_]{2,}\b/g, (token) => paint(token, ANSI.yellow));
+var highlightCases = (text) => text.replace(/\[[A-Z][A-Z0-9_]+\]/g, (token) => paint(token, ANSI.green));
+var colorizeMessageForConsole = (message) => {
+  const hasExtendedTradeContext = /\bEXTENDED_(LIMIT|MARKET)_(BUY|SELL)\b/.test(message) || /\bEXTENDED_(INCREASE|DECREASE)_LEVER\b/.test(message);
+  if (hasExtendedTradeContext && /\b(SUCCESS|SUCCEEDED|FILLED)\b/i.test(message)) {
+    return paint(highlightRoutes(message), ANSI.green);
+  }
+  if (hasExtendedTradeContext && /\b(INITIATED|PENDING|SUBMITTED|RETRY|PARTIAL)\b/i.test(message)) {
+    return paint(highlightRoutes(message), ANSI.yellow);
+  }
+  if (/\b(fail|failed|failure|error)\b/i.test(message)) {
+    return paint(highlightRoutes(highlightCases(message)), ANSI.red);
+  }
+  if (/Transaction sent/i.test(message)) {
+    return paint(message, ANSI.yellow);
+  }
+  if (/Transaction succeeded/i.test(message)) {
+    return paint(message, ANSI.green);
+  }
+  if (/Detected \d+ case\(s\)/i.test(message)) {
+    return paint(highlightRoutes(highlightCases(message)), ANSI.green);
+  }
+  if (/_executeStandardCase route/i.test(message)) {
+    return paint(highlightRoutes(message), ANSI.green);
+  }
+  if (/\broute\b/i.test(message)) {
+    return highlightRoutes(message);
+  }
+  return message;
+};
+var FIXED_TAG_WIDTH = 10;
+var toFixedTag = (rawTag) => {
+  const compact = rawTag.replace(/[^A-Za-z0-9_-]/g, "");
+  if (!compact) return "general".slice(0, FIXED_TAG_WIDTH).padEnd(FIXED_TAG_WIDTH, " ");
+  return compact.slice(0, FIXED_TAG_WIDTH).padEnd(FIXED_TAG_WIDTH, " ");
+};
+var extractTagAndMessage = (rawMessage) => {
+  const normalized = stripAnsi(rawMessage).trim();
+  const bracketTagMatch = normalized.match(/^\[([^\]]+)\]\s*(.*)$/);
+  if (bracketTagMatch) {
+    return {
+      tag: toFixedTag(bracketTagMatch[1]),
+      body: bracketTagMatch[2] || normalized
+    };
+  }
+  const scopeTagMatch = normalized.match(/^([A-Za-z0-9_-]+)::\s*(.*)$/);
+  if (scopeTagMatch) {
+    return {
+      tag: toFixedTag(scopeTagMatch[1]),
+      body: scopeTagMatch[2] || normalized
+    };
+  }
+  return {
+    tag: toFixedTag("general"),
+    body: normalized
+  };
+};
+var getStackFromMeta = (stack, meta) => {
+  if (typeof stack === "string" && stack.length > 0) {
+    return stack;
+  }
+  const splat = meta[Symbol.for("splat")];
+  if (Array.isArray(splat)) {
+    for (const item of splat) {
+      if (item instanceof Error && item.stack) {
+        return item.stack;
       }
-      return msg;
-    })
-  ),
-  transports: [
-    new import_winston.default.transports.Console()
-    // Output logs to the console
-  ]
+    }
+  }
+  return void 0;
+};
+var DEFAULT_LEVEL = (process.env.LOG_LEVEL || process.env.SDK_LOG_LEVEL || "debug").toLowerCase();
+var DEFAULT_CONSOLE_LEVEL = (process.env.LOG_CONSOLE_LEVEL || "info").toLowerCase();
+var DEFAULT_FILE_LEVEL = (process.env.LOG_FILE_LEVEL || DEFAULT_LEVEL).toLowerCase();
+var DEFAULT_FILE_PATH = process.env.LOG_FILE_PATH;
+var logger = import_winston.default.createLogger({
+  level: DEFAULT_LEVEL,
+  transports: []
 });
+function configureLogger(config = {}) {
+  const level = config.level ?? DEFAULT_LEVEL;
+  const consoleLevel = config.consoleLevel ?? DEFAULT_CONSOLE_LEVEL;
+  const fileLevel = config.fileLevel ?? DEFAULT_FILE_LEVEL;
+  const filePath = config.filePath ?? DEFAULT_FILE_PATH;
+  const enableConsole = config.enableConsole ?? true;
+  const enableFile = config.enableFile ?? Boolean(filePath);
+  const colorizeConsole = config.colorizeConsole ?? true;
+  const shortErrorsInConsole = config.shortErrorsInConsole ?? true;
+  const emitConfigLog = config.emitConfigLog ?? false;
+  logger.clear();
+  logger.level = level;
+  if (enableConsole) {
+    logger.add(
+      new import_winston.default.transports.Console({
+        level: consoleLevel,
+        format: import_winston.format.combine(
+          colorizeConsole ? import_winston.format.colorize({ level: true }) : import_winston.format.uncolorize(),
+          import_winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+          import_winston.format.errors({ stack: true }),
+          import_winston.format.printf(({ timestamp, level: level2, message, stack, ...meta }) => {
+            const baseMessage = stringifyUnknown(message);
+            const { tag, body } = extractTagAndMessage(baseMessage);
+            const consoleBody = colorizeConsole ? colorizeMessageForConsole(body) : body;
+            let out = `ts="${timestamp}" level=${stringifyUnknown(level2)} [${tag}] msg="${escapeMessageValue(consoleBody)}"`;
+            if (!shortErrorsInConsole) {
+              const derivedStack = getStackFromMeta(stack, meta);
+              if (derivedStack) {
+                out += ` stack="${escapeValue(derivedStack)}"`;
+              }
+            }
+            return out;
+          })
+        )
+      })
+    );
+  }
+  if (enableFile && filePath) {
+    import_fs.default.mkdirSync(import_path.default.dirname(filePath), { recursive: true });
+    logger.add(
+      new import_winston.default.transports.File({
+        filename: filePath,
+        level: fileLevel,
+        format: import_winston.format.combine(
+          import_winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+          import_winston.format.errors({ stack: true }),
+          import_winston.format.printf(({ timestamp, level: level2, message, stack, ...meta }) => {
+            const parsedMessage = stringifyUnknown(message);
+            const normalizedMessage = stripAnsi(parsedMessage);
+            const { tag, body } = extractTagAndMessage(normalizedMessage);
+            let out = `ts="${timestamp}" level=${stripAnsi(level2)} [${tag}] msg="${escapeMessageValue(body)}"`;
+            const derivedStack = getStackFromMeta(stack, meta);
+            if (derivedStack) {
+              out += ` stack="${escapeValue(stripAnsi(derivedStack))}"`;
+            }
+            const metaCopy = { ...meta };
+            delete metaCopy[Symbol.for("splat")];
+            if (Object.keys(metaCopy).length > 0) {
+              out += ` meta=${escapeValue(stringifyUnknown(metaCopy))}`;
+            }
+            return out;
+          })
+        )
+      })
+    );
+  }
+  if (emitConfigLog) {
+    logger.info(
+      `[Logger] configured level=${level} console=${enableConsole ? consoleLevel : "off"} file=${enableFile ? fileLevel : "off"}${filePath ? ` path=${filePath}` : ""}`
+    );
+  }
+  return logger;
+}
+configureLogger();
 
 // src/utils/store.ts
 function getDefaultStoreConfig(network) {
@@ -179,21 +333,21 @@ var Store = class _Store {
       pk
     };
     const encryptedData = this.encryptor.encrypt(allAccounts, this.storeConfig.PASSWORD);
-    (0, import_fs.writeFileSync)(this.getAccountFilePath(), encryptedData);
+    (0, import_fs2.writeFileSync)(this.getAccountFilePath(), encryptedData);
     logger.verbose(`Account added: ${accountKey} to network: ${this.config.network}`);
   }
   getAccountFilePath() {
-    const path = `${this.storeConfig.SECRET_FILE_FOLDER}/${this.storeConfig.ACCOUNTS_FILE_NAME}`;
-    logger.verbose(`Path: ${path}`);
-    return path;
+    const path2 = `${this.storeConfig.SECRET_FILE_FOLDER}/${this.storeConfig.ACCOUNTS_FILE_NAME}`;
+    logger.verbose(`Path: ${path2}`);
+    return path2;
   }
   getAllAccounts() {
     const PATH = this.getAccountFilePath();
-    if (!import_fs.default.existsSync(PATH)) {
+    if (!import_fs2.default.existsSync(PATH)) {
       logger.verbose(`Accounts: files doesnt exist`);
       return {};
     }
-    let encryptedData = (0, import_fs.readFileSync)(PATH, {
+    let encryptedData = (0, import_fs2.readFileSync)(PATH, {
       encoding: "utf-8"
     });
     let data = this.encryptor.decrypt(encryptedData, this.storeConfig.PASSWORD);
@@ -219,10 +373,10 @@ var Store = class _Store {
     return Object.keys(this.loadAccounts());
   }
   static ensureFolder(folder) {
-    if (!import_fs.default.existsSync(folder)) {
-      import_fs.default.mkdirSync(folder, { recursive: true });
+    if (!import_fs2.default.existsSync(folder)) {
+      import_fs2.default.mkdirSync(folder, { recursive: true });
     }
-    if (!import_fs.default.existsSync(`${folder}`)) {
+    if (!import_fs2.default.existsSync(`${folder}`)) {
       throw new Error(`Store folder not found: ${folder}`);
     }
   }

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import { Command } from "commander";
 import inquirer from "inquirer";
 
 // src/utils/store.ts
-import fs, { readFileSync, writeFileSync } from "fs";
+import fs2, { readFileSync, writeFileSync } from "fs";
 import { Account } from "starknet";
 import * as crypto2 from "crypto";
 
@@ -59,41 +59,195 @@ var PasswordJsonCryptoUtil = class {
 };
 
 // src/utils/logger.node.ts
+import fs from "fs";
+import path from "path";
 import winston, { format } from "winston";
 var colors = {
   error: "red",
   warn: "yellow",
   info: "blue",
-  verbose: "white",
-  debug: "white"
+  verbose: "cyan",
+  debug: "gray"
 };
 winston.addColors(colors);
-var logger = winston.createLogger({
-  level: "debug",
-  // Set the minimum logging level
-  format: format.combine(
-    format.colorize({ all: true }),
-    // Apply custom colors
-    format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
-    // Add timestamp to log messages
-    format.printf(({ timestamp, level, message, ...meta }) => {
-      let msg = `${timestamp} ${level}: ${message}`;
-      if (meta && meta[Symbol.for("splat")]) {
-        for (const arg of meta[Symbol.for("splat")]) {
-          if (arg instanceof Error) {
-            msg += `
-${arg.stack}`;
-          }
-        }
+var stringifyUnknown = (value) => {
+  if (typeof value === "string") return value;
+  if (typeof value === "undefined") return "undefined";
+  if (value === null) return "null";
+  if (value instanceof Error) return value.message || value.name || "Error";
+  try {
+    const encoded = JSON.stringify(
+      value,
+      (_, v) => typeof v === "bigint" ? v.toString() : v
+    );
+    return encoded ?? String(value);
+  } catch {
+    return String(value);
+  }
+};
+var stripAnsi = (text) => stringifyUnknown(text).replace(/\u001b\[[0-9;]*m/g, "");
+var escapeValue = (value) => value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
+var escapeMessageValue = (value) => value.replace(/\\/g, "\\\\").replace(/"/g, "'").replace(/\n/g, "\\n");
+var ANSI = {
+  reset: "\x1B[0m",
+  red: "\x1B[31m",
+  yellow: "\x1B[33m",
+  green: "\x1B[32m"
+};
+var paint = (text, color) => `${color}${text}${ANSI.reset}`;
+var highlightRoutes = (text) => text.replace(/\b[A-Z][A-Z0-9_]{2,}\b/g, (token) => paint(token, ANSI.yellow));
+var highlightCases = (text) => text.replace(/\[[A-Z][A-Z0-9_]+\]/g, (token) => paint(token, ANSI.green));
+var colorizeMessageForConsole = (message) => {
+  const hasExtendedTradeContext = /\bEXTENDED_(LIMIT|MARKET)_(BUY|SELL)\b/.test(message) || /\bEXTENDED_(INCREASE|DECREASE)_LEVER\b/.test(message);
+  if (hasExtendedTradeContext && /\b(SUCCESS|SUCCEEDED|FILLED)\b/i.test(message)) {
+    return paint(highlightRoutes(message), ANSI.green);
+  }
+  if (hasExtendedTradeContext && /\b(INITIATED|PENDING|SUBMITTED|RETRY|PARTIAL)\b/i.test(message)) {
+    return paint(highlightRoutes(message), ANSI.yellow);
+  }
+  if (/\b(fail|failed|failure|error)\b/i.test(message)) {
+    return paint(highlightRoutes(highlightCases(message)), ANSI.red);
+  }
+  if (/Transaction sent/i.test(message)) {
+    return paint(message, ANSI.yellow);
+  }
+  if (/Transaction succeeded/i.test(message)) {
+    return paint(message, ANSI.green);
+  }
+  if (/Detected \d+ case\(s\)/i.test(message)) {
+    return paint(highlightRoutes(highlightCases(message)), ANSI.green);
+  }
+  if (/_executeStandardCase route/i.test(message)) {
+    return paint(highlightRoutes(message), ANSI.green);
+  }
+  if (/\broute\b/i.test(message)) {
+    return highlightRoutes(message);
+  }
+  return message;
+};
+var FIXED_TAG_WIDTH = 10;
+var toFixedTag = (rawTag) => {
+  const compact = rawTag.replace(/[^A-Za-z0-9_-]/g, "");
+  if (!compact) return "general".slice(0, FIXED_TAG_WIDTH).padEnd(FIXED_TAG_WIDTH, " ");
+  return compact.slice(0, FIXED_TAG_WIDTH).padEnd(FIXED_TAG_WIDTH, " ");
+};
+var extractTagAndMessage = (rawMessage) => {
+  const normalized = stripAnsi(rawMessage).trim();
+  const bracketTagMatch = normalized.match(/^\[([^\]]+)\]\s*(.*)$/);
+  if (bracketTagMatch) {
+    return {
+      tag: toFixedTag(bracketTagMatch[1]),
+      body: bracketTagMatch[2] || normalized
+    };
+  }
+  const scopeTagMatch = normalized.match(/^([A-Za-z0-9_-]+)::\s*(.*)$/);
+  if (scopeTagMatch) {
+    return {
+      tag: toFixedTag(scopeTagMatch[1]),
+      body: scopeTagMatch[2] || normalized
+    };
+  }
+  return {
+    tag: toFixedTag("general"),
+    body: normalized
+  };
+};
+var getStackFromMeta = (stack, meta) => {
+  if (typeof stack === "string" && stack.length > 0) {
+    return stack;
+  }
+  const splat = meta[Symbol.for("splat")];
+  if (Array.isArray(splat)) {
+    for (const item of splat) {
+      if (item instanceof Error && item.stack) {
+        return item.stack;
       }
-      return msg;
-    })
-  ),
-  transports: [
-    new winston.transports.Console()
-    // Output logs to the console
-  ]
+    }
+  }
+  return void 0;
+};
+var DEFAULT_LEVEL = (process.env.LOG_LEVEL || process.env.SDK_LOG_LEVEL || "debug").toLowerCase();
+var DEFAULT_CONSOLE_LEVEL = (process.env.LOG_CONSOLE_LEVEL || "info").toLowerCase();
+var DEFAULT_FILE_LEVEL = (process.env.LOG_FILE_LEVEL || DEFAULT_LEVEL).toLowerCase();
+var DEFAULT_FILE_PATH = process.env.LOG_FILE_PATH;
+var logger = winston.createLogger({
+  level: DEFAULT_LEVEL,
+  transports: []
 });
+function configureLogger(config = {}) {
+  const level = config.level ?? DEFAULT_LEVEL;
+  const consoleLevel = config.consoleLevel ?? DEFAULT_CONSOLE_LEVEL;
+  const fileLevel = config.fileLevel ?? DEFAULT_FILE_LEVEL;
+  const filePath = config.filePath ?? DEFAULT_FILE_PATH;
+  const enableConsole = config.enableConsole ?? true;
+  const enableFile = config.enableFile ?? Boolean(filePath);
+  const colorizeConsole = config.colorizeConsole ?? true;
+  const shortErrorsInConsole = config.shortErrorsInConsole ?? true;
+  const emitConfigLog = config.emitConfigLog ?? false;
+  logger.clear();
+  logger.level = level;
+  if (enableConsole) {
+    logger.add(
+      new winston.transports.Console({
+        level: consoleLevel,
+        format: format.combine(
+          colorizeConsole ? format.colorize({ level: true }) : format.uncolorize(),
+          format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+          format.errors({ stack: true }),
+          format.printf(({ timestamp, level: level2, message, stack, ...meta }) => {
+            const baseMessage = stringifyUnknown(message);
+            const { tag, body } = extractTagAndMessage(baseMessage);
+            const consoleBody = colorizeConsole ? colorizeMessageForConsole(body) : body;
+            let out = `ts="${timestamp}" level=${stringifyUnknown(level2)} [${tag}] msg="${escapeMessageValue(consoleBody)}"`;
+            if (!shortErrorsInConsole) {
+              const derivedStack = getStackFromMeta(stack, meta);
+              if (derivedStack) {
+                out += ` stack="${escapeValue(derivedStack)}"`;
+              }
+            }
+            return out;
+          })
+        )
+      })
+    );
+  }
+  if (enableFile && filePath) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    logger.add(
+      new winston.transports.File({
+        filename: filePath,
+        level: fileLevel,
+        format: format.combine(
+          format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+          format.errors({ stack: true }),
+          format.printf(({ timestamp, level: level2, message, stack, ...meta }) => {
+            const parsedMessage = stringifyUnknown(message);
+            const normalizedMessage = stripAnsi(parsedMessage);
+            const { tag, body } = extractTagAndMessage(normalizedMessage);
+            let out = `ts="${timestamp}" level=${stripAnsi(level2)} [${tag}] msg="${escapeMessageValue(body)}"`;
+            const derivedStack = getStackFromMeta(stack, meta);
+            if (derivedStack) {
+              out += ` stack="${escapeValue(stripAnsi(derivedStack))}"`;
+            }
+            const metaCopy = { ...meta };
+            delete metaCopy[Symbol.for("splat")];
+            if (Object.keys(metaCopy).length > 0) {
+              out += ` meta=${escapeValue(stringifyUnknown(metaCopy))}`;
+            }
+            return out;
+          })
+        )
+      })
+    );
+  }
+  if (emitConfigLog) {
+    logger.info(
+      `[Logger] configured level=${level} console=${enableConsole ? consoleLevel : "off"} file=${enableFile ? fileLevel : "off"}${filePath ? ` path=${filePath}` : ""}`
+    );
+  }
+  return logger;
+}
+configureLogger();
 
 // src/utils/store.ts
 function getDefaultStoreConfig(network) {
@@ -160,13 +314,13 @@ var Store = class _Store {
     logger.verbose(`Account added: ${accountKey} to network: ${this.config.network}`);
   }
   getAccountFilePath() {
-    const path = `${this.storeConfig.SECRET_FILE_FOLDER}/${this.storeConfig.ACCOUNTS_FILE_NAME}`;
-    logger.verbose(`Path: ${path}`);
-    return path;
+    const path2 = `${this.storeConfig.SECRET_FILE_FOLDER}/${this.storeConfig.ACCOUNTS_FILE_NAME}`;
+    logger.verbose(`Path: ${path2}`);
+    return path2;
   }
   getAllAccounts() {
     const PATH = this.getAccountFilePath();
-    if (!fs.existsSync(PATH)) {
+    if (!fs2.existsSync(PATH)) {
       logger.verbose(`Accounts: files doesnt exist`);
       return {};
     }
@@ -196,10 +350,10 @@ var Store = class _Store {
     return Object.keys(this.loadAccounts());
   }
   static ensureFolder(folder) {
-    if (!fs.existsSync(folder)) {
-      fs.mkdirSync(folder, { recursive: true });
+    if (!fs2.existsSync(folder)) {
+      fs2.mkdirSync(folder, { recursive: true });
     }
-    if (!fs.existsSync(`${folder}`)) {
+    if (!fs2.existsSync(`${folder}`)) {
       throw new Error(`Store folder not found: ${folder}`);
     }
   }