@clonegod/ttd-core 3.0.8 → 3.0.10

package/dist/app_config/EnvArgs.js

@@ -31,7 +31,7 @@ class EnvArgs {
         this.quote_pool_fee_rate = parseInt(process.env.QUOTE_POOL_FEE_RATE || '0');
         this.trade_group_id = process.env.TRADE_GROUP_ID || '';
         this.trade_pair = process.env.TRADE_PAIR || '';
-        this.token_price_cache_seconds = parseInt(process.env.TOKEN_PRICE_CACHE_SECONDS || '600');
+        this.token_price_cache_seconds = parseInt(process.env.TOKEN_PRICE_CACHE_SECONDS || '1200');
     }
     print() {
         console.log('>>> EnvArgs', this);

package/dist/token/price/defi_llama.js

@@ -17,18 +17,20 @@ const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
 function fetchPriceFromDefiLlama(network, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const result = new Map();
         const currentTime = (0, index_1.getCurDateTime)();
         const timeout = 10000;
-        const maxRetries = 3;
+        const maxRetries = 1;
         const retrysleepMs = 1000;
         const addressString = addresses.map(address => `${network.toLowerCase()}:${address}`).join(',');
         const url = `https://coins.llama.fi/prices/current/${addressString}`;
         console.log(url);
         (0, index_1.log_debug)(`[fetchPriceFromDefiLlama] Requesting prices for ${addresses.length} tokens`);
-        let retryCount = 0;
-        while (retryCount <= maxRetries) {
+        let attempt = 0;
+        while (attempt <= maxRetries) {
             try {
+                attempt++;
                 const response = yield axios_1.default.get(url, { timeout });
                 let tokenPrices = response.data['coins'];
                 if (tokenPrices) {
@@ -51,10 +53,14 @@ function fetchPriceFromDefiLlama(network, addresses) {
                 break;
             }
             catch (error) {
-                retryCount++;
-                (0, index_1.log_warn)(`[fetchPriceFromDefiLlama] Request failed (attempt ${retryCount}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}`);
-                if (retryCount <= maxRetries) {
-                    const currentRetrysleep = retrysleepMs * retryCount;
+                const status = axios_1.default.isAxiosError(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined;
+                (0, index_1.log_warn)(`[fetchPriceFromDefiLlama] Request failed (attempt ${attempt}/${maxRetries + 1}): ${error instanceof Error ? error.message : String(error)}`);
+                if (status === 429) {
+                    (0, index_1.log_warn)(`[fetchPriceFromDefiLlama] Rate limited (429). Skip retries and fallback to next channel immediately.`);
+                    break;
+                }
+                if (attempt <= maxRetries) {
+                    const currentRetrysleep = retrysleepMs * attempt;
                     (0, index_1.log_debug)(`[fetchPriceFromDefiLlama] Retrying in ${currentRetrysleep}ms...`);
                     yield (0, index_1.sleep)(currentRetrysleep);
                 }

package/dist/token/price/gecko_terminal.js

@@ -17,18 +17,20 @@ const axios_1 = __importDefault(require("axios"));
 const index_1 = require("../../index");
 function fetchPriceFromGeckoTerminal(network, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const result = new Map();
         const currentTime = (0, index_1.getCurDateTime)();
         const timeout = 10000;
-        const maxRetries = 3;
+        const maxRetries = 1;
         const retrysleepMs = 1000;
         const addressString = addresses.join(',');
         const url = `https://api.geckoterminal.com/api/v2/simple/networks/${network.toLowerCase()}/token_price/${addressString}`;
         console.log(url);
         (0, index_1.log_debug)(`[fetchPriceFromGeckoTerminal] Requesting prices for ${addresses.length} tokens`);
-        let retryCount = 0;
-        while (retryCount <= maxRetries) {
+        let attempt = 0;
+        while (attempt <= maxRetries) {
             try {
+                attempt++;
                 const response = yield axios_1.default.get(url, { timeout });
                 if (response.data && response.data.data && response.data.data.attributes && response.data.data.attributes.token_prices) {
                     const tokenPrices = response.data.data.attributes.token_prices;
@@ -57,10 +59,14 @@ function fetchPriceFromGeckoTerminal(network, addresses) {
                 break;
             }
             catch (error) {
-                retryCount++;
-                (0, index_1.log_warn)(`[fetchPriceFromGeckoTerminal] Request failed (attempt ${retryCount}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}`);
-                if (retryCount <= maxRetries) {
-                    const currentRetrysleep = retrysleepMs * retryCount;
+                const status = axios_1.default.isAxiosError(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined;
+                (0, index_1.log_warn)(`[fetchPriceFromGeckoTerminal] Request failed (attempt ${attempt}/${maxRetries + 1}): ${error instanceof Error ? error.message : String(error)}`);
+                if (status === 429) {
+                    (0, index_1.log_warn)(`[fetchPriceFromGeckoTerminal] Rate limited (429). Skip retries and fallback to next channel immediately.`);
+                    break;
+                }
+                if (attempt <= maxRetries) {
+                    const currentRetrysleep = retrysleepMs * attempt;
                     (0, index_1.log_debug)(`[fetchPriceFromGeckoTerminal] Retrying in ${currentRetrysleep}ms...`);
                     yield (0, index_1.sleep)(currentRetrysleep);
                 }

package/dist/token/price/get_solana_token_price.js

@@ -101,16 +101,18 @@ function get_solana_token_price_info(addresses) {
 }
 function fetchPriceFromJupiter(addresses) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const result = new Map();
         const currentTime = (0, index_1.getCurDateTime)();
         const timeout = 6000;
-        const maxRetries = 2;
-        const retrysleepMs = 500;
+        const maxRetries = 1;
+        const retrysleepMs = 1000;
         const url = (process.env.JUPITER_PRICE_API || 'https://api.jup.ag/price/v3') + `?ids=${addresses.join(',')}`;
         (0, index_1.log_debug)(`[fetchPriceFromJupiter] Requesting Jupiter API for ${addresses.length} tokens`);
-        let retryCount = 0;
-        while (retryCount <= maxRetries) {
+        let attempt = 0;
+        while (attempt <= maxRetries) {
             try {
+                attempt++;
                 const response = yield axios_1.default.get(url, {
                     headers: {
                         'x-api-key': process.env.JUPITER_API_KEY
@@ -138,10 +140,14 @@ function fetchPriceFromJupiter(addresses) {
                 break;
             }
             catch (error) {
-                retryCount++;
-                (0, index_1.log_warn)(`[fetchPriceFromJupiter] Request failed (attempt ${retryCount}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}, url: ${url}`);
-                if (retryCount <= maxRetries) {
-                    const currentRetrysleep = retrysleepMs * retryCount;
+                const status = axios_1.default.isAxiosError(error) ? (_a = error.response) === null || _a === void 0 ? void 0 : _a.status : undefined;
+                (0, index_1.log_warn)(`[fetchPriceFromJupiter] Request failed (attempt ${attempt}/${maxRetries + 1}): ${error instanceof Error ? error.message : String(error)}, url: ${url}`);
+                if (status === 429) {
+                    (0, index_1.log_warn)(`[fetchPriceFromJupiter] Rate limited (429). Skip retries and fallback to next channel immediately.`);
+                    break;
+                }
+                if (attempt <= maxRetries) {
+                    const currentRetrysleep = retrysleepMs * attempt;
                     (0, index_1.log_debug)(`[fetchPriceFromJupiter] Retrying in ${currentRetrysleep}ms...`);
                     yield (0, index_1.sleep)(currentRetrysleep);
                 }

package/dist/token/price/price_cache.js

@@ -33,7 +33,7 @@ const fetchPriceFromCache = (token_address_list) => __awaiter(void 0, void 0, vo
         (0, __1.log_warn)('global_app_config is not set, skip get token price from cache');
         return result;
     }
-    let token_price_timeout_seconds = 600;
+    let token_price_timeout_seconds = global_app_config.env_args.token_price_cache_seconds;
     let all_token_list = yield global_app_config.arb_cache.get_token_list();
     let token_list = all_token_list.filter(e => token_address_list.includes(e.address) && !(0, __1.isEmpty)(e.market_price) && !(0, __1.isEmpty)(e.update_time));
     let not_found_token_list = [];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "3.0.8",
+    "version": "3.0.10",
     "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

@@ -346,6 +346,12 @@ export interface Ladder {
     // 询价生成的价格，所对应的slot (account, vaultA, vaultB)
     slot: string
 
+    // 区块号
+    blockNumber?: string
+
+    // ��格来源: "rpc:v1" | "{provider_id}:v2" | "{provider_id}:v3"
+    source?: string
+
     // unique_orderbook_id 价格更新时间
     price_id: string
     price_time: string