@clonegod/ttd-core 3.1.17 → 3.1.19

package/dist/token/price/get_eth_token_price.js

@@ -16,9 +16,9 @@ exports.get_eth_token_price_info = get_eth_token_price_info;
 require('dotenv').config();
 const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
+const defi_llama_1 = require("./defi_llama");
 const gecko_terminal_1 = require("./gecko_terminal");
 const price_cache_1 = require("./price_cache");
-const defi_llama_1 = require("./defi_llama");
 function get_eth_token_price_info(evm_chain_info, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
         addresses = addresses.map(addr => addr.toLowerCase());

package/dist/token/price/get_solana_token_price.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_solana_token_price_info = get_solana_token_price_info;
-require('dotenv').config();
 const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
 const gecko_terminal_1 = require("./gecko_terminal");
@@ -107,7 +106,8 @@ function fetchPriceFromJupiter(addresses) {
         const timeout = 6000;
         const maxRetries = 1;
         const retrysleepMs = 1000;
-        const url = (process.env.JUPITER_PRICE_API || 'https://api.jup.ag/price/v3') + `?ids=${addresses.join(',')}`;
+        const jupBase = process.env.JUPITER_PRICE_API || 'https://api.jup.ag/price/v3';
+        const url = jupBase + `?ids=${addresses.join(',')}`;
         (0, index_1.log_debug)(`[fetchPriceFromJupiter] Requesting Jupiter API for ${addresses.length} tokens`);
         let attempt = 0;
         while (attempt <= maxRetries) {
@@ -115,7 +115,7 @@ function fetchPriceFromJupiter(addresses) {
                 attempt++;
                 const response = yield axios_1.default.get(url, {
                     headers: {
-                        'x-api-key': process.env.JUPITER_API_KEY
+                        'x-api-key': process.env.JUPITER_API_KEY || ''
                     },
                     timeout,
                 });

package/dist/token/zh_pinyin_map.js

@@ -5,17 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_zh_pinyin_map = void 0;
 exports.replace_zh_symbols = replace_zh_symbols;
-require('dotenv').config();
 const os_1 = __importDefault(require("os"));
+const core_env_1 = require("../app_config/core_env");
 const path_1 = __importDefault(require("path"));
 const index_1 = require("../index");
 let _first_load_logged = false;
 const get_zh_pinyin_map = () => {
-    const chain_id = process.env.CHAIN_ID;
+    const coreEnv = (0, core_env_1.getCoreEnv)();
+    const chain_id = coreEnv.chain_id;
     if (!chain_id) {
         return [];
     }
-    const filepath = process.env.ZH_PINYIN_MAP_FILE ||
+    const filepath = coreEnv.zh_pinyin_map_file ||
         path_1.default.join(os_1.default.homedir(), 'data', 'onchain_data', chain_id.toLowerCase(), 'zh_pinyin_map.json');
     let list = [];
     try {

package/dist/trade/abstract_tx_check.js

@@ -148,7 +148,7 @@ class AbstractTransactionResultCheck {
             execution: trade_extra_info,
             c_id
         };
-        (0, analyze_1.report_trade_analyze_data)('TradeResultType', trade_result);
+        (0, analyze_1.report_data_to_analyze)('TradeResultType', trade_result);
         return trade_result;
     }
 }

package/dist/trade/handle_order_message.js

@@ -115,7 +115,7 @@ const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker
             .catch(err => {
             logger.warn('cache order submit result, error!', { order_msg, order_submit_result, err });
         });
-        (0, analyze_1.report_trade_analyze_data)('OrderMessageType', order_msg_with_result);
+        (0, analyze_1.report_data_to_analyze)('OrderMessageType', order_msg_with_result);
     }
 });
 exports.handle_order_message = handle_order_message;

package/dist/util/crypto.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encrypt = encrypt;
 exports.decrypt = decrypt;
-require('dotenv').config();
 const crypto_1 = __importDefault(require("crypto"));
+const core_env_1 = require("../app_config/core_env");
 function getEncryptionKey() {
-    const envKey = process.env.ENCRYPTION_KEY;
+    const envKey = (0, core_env_1.getCoreEnv)().encryption_key;
     if (envKey && envKey.length >= 32) {
         return envKey.substring(0, 32);
     }

package/dist/util/ip_util.js

@@ -38,11 +38,14 @@ exports.getNextIP = getNextIP;
 exports.getCurrentIpList = getCurrentIpList;
 require('dotenv').config();
 const os = __importStar(require("os"));
+const core_env_1 = require("../app_config/core_env");
 let IP_LIST = getServerIpList();
 let ip_counter = 0;
 function getProxyIpFromEnv() {
-    if (process.env.PROXY_IP_LIST || process.env.BIND_IP_LIST) {
-        const ipList = (process.env.PROXY_IP_LIST || process.env.BIND_IP_LIST || '').split(',')
+    const coreEnv = (0, core_env_1.getCoreEnv)();
+    const raw = coreEnv.server_ip_list || '';
+    if (raw) {
+        const ipList = String(raw).split(',')
             .map(ip => ip.trim())
             .filter(ip => ip.length > 0);
         if (ipList.length > 0) {
@@ -52,7 +55,10 @@ function getProxyIpFromEnv() {
     return [];
 }
 function getProxyIpFromLocal() {
-    const exclude_ip_prefix_arr = (process.env.IP_PREFIX_EXCLUDE || '192.168').split(',').map(p => p.trim());
+    var _a;
+    const coreEnv = (0, core_env_1.getCoreEnv)();
+    const prefixRaw = (_a = coreEnv.ip_exclude_prefix) !== null && _a !== void 0 ? _a : '192.168';
+    const exclude_ip_prefix_arr = String(prefixRaw || '192.168').split(',').map(p => p.trim());
     const ips = [];
     const interfaces = os.networkInterfaces();
     for (const devName in interfaces) {

package/dist/ws/ws_client.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketClient = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
+const __1 = require("..");
 const ws_1 = __importDefault(require("ws"));
 class WebSocketClient {
     constructor(url, options = {}) {
@@ -26,11 +26,11 @@ class WebSocketClient {
         this.options = Object.assign({ reconnectInterval: 3000, rejectUnauthorized: false, keepAlive: false, keepAliveInterval: 30000 }, options);
     }
     connect() {
-        (0, dist_1.log_info)(`Connecting to ${this.url}`);
+        (0, __1.log_info)(`Connecting to ${this.url}`);
         try {
             this.ws = new ws_1.default(this.url, { headers: this.options.headers });
             this.ws.on('open', () => {
-                (0, dist_1.log_info)('ws connected');
+                (0, __1.log_info)('ws connected');
                 this.isReconnecting = false;
                 this.startKeepAlive();
                 if (this.onOpenCallback)
@@ -43,20 +43,20 @@ class WebSocketClient {
                         this.onMessageCallback(data);
                 }
                 catch (err) {
-                    (0, dist_1.log_error)('Invalid message format:', err);
+                    (0, __1.log_error)('Invalid message format:', err);
                 }
             });
             this.ws.on('close', (code, reason) => {
-                (0, dist_1.log_warn)(`ws disconnected: ${code} - ${reason.toString()}`);
+                (0, __1.log_warn)(`ws disconnected: ${code} - ${reason.toString()}`);
                 this.reconnect();
             });
             this.ws.on('error', (err) => {
-                (0, dist_1.log_error)('ws error:', err);
+                (0, __1.log_error)('ws error:', err);
                 this.reconnect();
             });
         }
         catch (error) {
-            (0, dist_1.log_error)('Failed to create WebSocket:', error);
+            (0, __1.log_error)('Failed to create WebSocket:', error);
             this.reconnect();
         }
     }
@@ -66,8 +66,8 @@ class WebSocketClient {
                 return;
             }
             this.isReconnecting = true;
-            (0, dist_1.log_info)(`Reconnecting in ${this.options.reconnectInterval}ms`);
-            yield (0, dist_1.sleep)(this.options.reconnectInterval);
+            (0, __1.log_info)(`Reconnecting in ${this.options.reconnectInterval}ms`);
+            yield (0, __1.sleep)(this.options.reconnectInterval);
             this.forceCleanup();
             this.connect();
         });
@@ -84,7 +84,7 @@ class WebSocketClient {
             return true;
         }
         else {
-            (0, dist_1.log_warn)('ws is not connected, you need connect first, then send message');
+            (0, __1.log_warn)('ws is not connected, you need connect first, then send message');
             return false;
         }
     }
@@ -99,7 +99,7 @@ class WebSocketClient {
                 }
             }
             catch (error) {
-                (0, dist_1.log_warn)(`Error closing WebSocket: ${error.message}`);
+                (0, __1.log_warn)(`Error closing WebSocket: ${error.message}`);
             }
             this.ws = null;
         }
@@ -113,11 +113,11 @@ class WebSocketClient {
         }
         this.stopKeepAlive();
         const interval = this.options.keepAliveInterval || 30000;
-        (0, dist_1.log_info)(`Starting keepAlive with interval: ${interval}ms`);
+        (0, __1.log_info)(`Starting keepAlive with interval: ${interval}ms`);
         this.keepAliveTimer = setInterval(() => {
             if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
                 this.ws.ping();
-                (0, dist_1.log_info)('KeepAlive ping sent');
+                (0, __1.log_info)('KeepAlive ping sent');
             }
         }, interval);
     }
@@ -125,7 +125,7 @@ class WebSocketClient {
         if (this.keepAliveTimer) {
             clearInterval(this.keepAliveTimer);
             this.keepAliveTimer = null;
-            (0, dist_1.log_info)('KeepAlive stopped');
+            (0, __1.log_info)('KeepAlive stopped');
         }
     }
     forceCleanup() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "3.1.17",
+    "version": "3.1.19",
     "description": "Common types and utilities for trading systems - use `npm run push` to publish",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/types/index.d.ts

@@ -1,40 +1,3 @@
-/*********************************************************************
- *           CONFIG - COMMON SERVICE CONFIG TYPE                     *
- * *******************************************************************/
-export interface CommonServiceType {
-    config_center: ConfigCenterServiceType
-    quote: QuoteServiceType[]
-    orderbook: OrderbookServiceType
-    trade_proxy: TradeProxyServiceType
-}
-
-// Service
-export interface ConfigCenterServiceType {
-    http_port: number
-}
-
-// Service
-export interface QuoteServiceType {
-    dex_id: string
-    http_port: number
-    ws_port: number
-    enable: boolean
-}
-
-// Service
-export interface OrderbookServiceType {
-    http_port: number
-    ws_port: number
-}
-
-// Service
-export interface TradeProxyServiceType {
-    http_port: number
-    ws_port: number
-}
-
-
-
 /*********************************************************************
  *                  CONFIG - TOKEN CONFIG TYPE                       *
  * *******************************************************************/
@@ -624,7 +587,6 @@ export declare class ArbCache {
     init(): Promise<void>;
     init_configs(): Promise<void>;
     get_config_filepath(suffix: string): string;
-    get_bak_config_filepath(suffix: string): string;
     refresh_local_cache_token_list(token_list: StandardTokenInfoType[]): void;
     refresh_local_cache_pool_list(pool_list: StandardPoolInfoType[]): void;
     refresh_local_cache_group_map(trade_config: TradeServiceConfigType): void;
@@ -645,8 +607,6 @@ export declare class ArbCache {
     publish_pool_change_event(): Promise<void>;
     get_one_pair(input_pair: string): Promise<StandardPairType>;
     get_pair_list(input_pair?: string): Promise<StandardPairType[]>;
-    cache_common_service(): Promise<void>;
-    get_common_service(): Promise<CommonServiceType>;
     cache_trade_group(update_group_id?: string): Promise<void>;
     update_trade_group(input_trade_config: TradeServiceConfigType): Promise<void>;
     get_trade_group_id_list(): Promise<string[]>;

package/dist/cache/redis_client.d.ts

@@ -1,3 +0,0 @@
-import type { RedisClientType } from 'redis';
-declare function getRedisClient(module_name?: string): Promise<RedisClientType>;
-export { getRedisClient, };

package/dist/cache/redis_client.js

@@ -1,45 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRedisClient = getRedisClient;
-const redis_1 = require("redis");
-let redisClient = null;
-let connectPromise = null;
-function createConnection() {
-    const host = process.env.REDIS_HOST || '127.0.0.1';
-    const port = process.env.REDIS_PORT || '6379';
-    const url = `redis://${host}:${port}`;
-    console.log(`[Redis] connecting to ${url}`);
-    const client = (0, redis_1.createClient)({ url });
-    client.on('error', (err) => console.error(`[Redis] error: ${err.message}`));
-    client.on('reconnecting', () => console.info('[Redis] reconnecting...'));
-    client.on('ready', () => console.info('[Redis] ready'));
-    return client.connect().then(() => {
-        redisClient = client;
-        console.info(`[Redis] connected to ${url}`);
-        return client;
-    }).catch((err) => {
-        redisClient = null;
-        connectPromise = null;
-        console.error(`[Redis] connect failed: ${err.message}`);
-        throw err;
-    });
-}
-function getRedisClient() {
-    return __awaiter(this, arguments, void 0, function* (module_name = '') {
-        if (redisClient)
-            return redisClient;
-        if (connectPromise)
-            return connectPromise;
-        connectPromise = createConnection();
-        return connectPromise;
-    });
-}