@clonegod/ttd-core 2.1.17 → 2.1.19

package/dist/token/cache_token_config.js

@@ -35,7 +35,7 @@ const cache_token_config = (chain_id, valid_tokens_map) => __awaiter(void 0, voi
                 address_hex: '',
                 decimals: token.decimals,
                 name: token.name,
-                is_token2022: false,
+                is_token2022: token.is_token_2022,
                 market_price: token.price,
                 update_time: (0, index_1.getCurDateTime)(),
                 alias: (0, index_1.get_token_symbol_alias)(token.address),

package/dist/util/httputil.d.ts

@@ -0,0 +1,6 @@
+import { AxiosRequestConfig } from 'axios';
+export declare function simplifyAxiosError(error: any): string;
+export declare class HttpUtil {
+    static get(url: string, config?: AxiosRequestConfig): Promise<any>;
+    static post(url: string, data?: any, config?: AxiosRequestConfig): Promise<any>;
+}

package/dist/util/httputil.js

@@ -0,0 +1,134 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpUtil = void 0;
+exports.simplifyAxiosError = simplifyAxiosError;
+const axios_1 = __importDefault(require("axios"));
+const http = __importStar(require("http"));
+const https = __importStar(require("https"));
+const ip_util_1 = require("./ip_util");
+function simplifyAxiosError(error) {
+    if (axios_1.default.isAxiosError(error)) {
+        if (error.response) {
+            return `HTTP ${error.response.status}: ${error.response.statusText || 'Unknown'}`;
+        }
+        else if (error.request) {
+            return `No response from server (timeout or network error)`;
+        }
+        else {
+            return error.message || 'Request setup error';
+        }
+    }
+    else if (error instanceof Error) {
+        return error.message;
+    }
+    return 'Unknown error';
+}
+function createHttpAgent(ip) {
+    return new http.Agent({
+        family: 4,
+        localAddress: ip
+    });
+}
+function createHttpsAgent(ip) {
+    return new https.Agent({
+        family: 4,
+        localAddress: ip
+    });
+}
+function createAxiosInstance() {
+    const instance = axios_1.default.create();
+    instance.interceptors.request.use((config) => {
+        if (config.httpAgent || config.httpsAgent) {
+            return config;
+        }
+        const ip = (0, ip_util_1.getNextIP)();
+        if (ip) {
+            const url = config.url || '';
+            const baseURL = config.baseURL || '';
+            const fullUrl = url.startsWith('http') ? url : (baseURL + url);
+            const isHttps = fullUrl.startsWith('https:');
+            if (isHttps) {
+                config.httpsAgent = createHttpsAgent(ip);
+            }
+            else {
+                config.httpAgent = createHttpAgent(ip);
+            }
+            console.log(`[HttpUtil] Using IP: ${ip} for ${fullUrl}`);
+        }
+        return config;
+    });
+    instance.interceptors.response.use((response) => response, (error) => {
+        var _a;
+        const simplifiedError = simplifyAxiosError(error);
+        const url = ((_a = error.config) === null || _a === void 0 ? void 0 : _a.url) || 'unknown url';
+        console.error(`[HttpUtil] Request failed for ${url}:`, simplifiedError);
+        const simplifiedAxiosError = new Error(simplifiedError);
+        simplifiedAxiosError.isAxiosError = true;
+        simplifiedAxiosError.config = error.config;
+        simplifiedAxiosError.response = error.response;
+        simplifiedAxiosError.request = error.request;
+        return Promise.reject(simplifiedAxiosError);
+    });
+    return instance;
+}
+const axiosInstance = createAxiosInstance();
+class HttpUtil {
+    static get(url, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield axiosInstance.get(url, config);
+            return response.data;
+        });
+    }
+    static post(url, data, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield axiosInstance.post(url, data, config);
+            return response.data;
+        });
+    }
+}
+exports.HttpUtil = HttpUtil;

package/dist/util/index.d.ts

@@ -1 +1,3 @@
 export * from './fileutil';
+export * from './httputil';
+export * from './ip_util';

package/dist/util/index.js

@@ -15,3 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./fileutil"), exports);
+__exportStar(require("./httputil"), exports);
+__exportStar(require("./ip_util"), exports);

package/dist/util/ip_util.d.ts

@@ -0,0 +1,3 @@
+export declare function getServerIpList(): string[];
+export declare function getNextIP(): string;
+export declare function getCurrentIpList(): string[];

package/dist/util/ip_util.js

@@ -0,0 +1,92 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServerIpList = getServerIpList;
+exports.getNextIP = getNextIP;
+exports.getCurrentIpList = getCurrentIpList;
+require('dotenv').config();
+const os = __importStar(require("os"));
+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(',')
+            .map(ip => ip.trim())
+            .filter(ip => ip.length > 0);
+        if (ipList.length > 0) {
+            return ipList;
+        }
+    }
+    return [];
+}
+function getProxyIpFromLocal() {
+    const exclude_ip_prefix_arr = (process.env.IP_PREFIX_EXCLUDE || '192.168').split(',').map(p => p.trim());
+    const ips = [];
+    const interfaces = os.networkInterfaces();
+    for (const devName in interfaces) {
+        const iface = interfaces[devName] || [];
+        for (const alias of iface) {
+            if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) {
+                const is_invalid = exclude_ip_prefix_arr.some(prefix => alias.address.startsWith(prefix));
+                if (!is_invalid) {
+                    ips.push(alias.address);
+                }
+            }
+        }
+    }
+    return ips;
+}
+function getServerIpList() {
+    const envIps = getProxyIpFromEnv();
+    if (envIps.length > 0) {
+        return envIps;
+    }
+    return getProxyIpFromLocal();
+}
+function getNextIP() {
+    try {
+        if (IP_LIST.length === 0) {
+            IP_LIST = getServerIpList();
+        }
+        return IP_LIST[ip_counter++ % IP_LIST.length];
+    }
+    catch (err) {
+        console.error('[IpUtil] getNextIP error!!!', err);
+        throw err;
+    }
+}
+function getCurrentIpList() {
+    return [...IP_LIST];
+}

package/package.json

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