@clonegod/ttd-core 3.0.10 → 3.0.12

package/dist/cache/arb_event_pub.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArbEventPublisher = void 0;
 const index_1 = require("../index");
+const logger = (0, index_1.createLogger)(__filename);
 class ArbEventPublisher {
     constructor(arb_cache) {
         this.arb_cache = arb_cache;
@@ -35,11 +36,10 @@ class ArbEventPublisher {
     }
     publish_order_event(group_id, pair, dex_id, message) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const channel = (0, index_1.get_order_channel_name)(group_id, pair, dex_id);
             yield this.redis_cmd.publish(channel, JSON.stringify(message));
-            (0, index_1.log_info)(`publish_order_event, success`, {
-                channel, message
-            });
+            logger.info(`publish_order_event`, { channel, trace_id: (_a = message.data) === null || _a === void 0 ? void 0 : _a.order_trace_id });
         });
     }
     publish_wallet_raw_tx_event(group_id, wallet, message) {

package/dist/index.d.ts

@@ -202,6 +202,13 @@ export declare function log_info(msg: string, data?: {}, traceId?: string, calle
 export declare function log_error(msg: string, err: Error, traceId?: string, caller?: {
     module: string;
 }): void;
+export declare function createLogger(filename: string): {
+    trace(msg: string, data?: any, traceId?: string): void;
+    debug(msg: string, data?: any, traceId?: string): void;
+    info(msg: string, data?: any, traceId?: string): void;
+    warn(msg: string, data?: any, traceId?: string): void;
+    error(msg: string, err: any, traceId?: string): void;
+};
 export declare function new_line(lines?: number): void;
 export declare const generateRandomNumber: (min: number, max: number) => number;
 export declare class DecimalUtil {

package/dist/index.js

@@ -56,6 +56,7 @@ exports.log_debug = log_debug;
 exports.log_warn = log_warn;
 exports.log_info = log_info;
 exports.log_error = log_error;
+exports.createLogger = createLogger;
 exports.new_line = new_line;
 exports.getCurDateTime = getCurDateTime;
 exports.getCurTimeShort = getCurTimeShort;
@@ -349,17 +350,16 @@ var REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE;
     REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE["TRADE_INSTANCE_EXIT"] = "TRADE_INSTANCE_EXIT";
 })(REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE || (exports.REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE = REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE = {}));
 function _caller() {
-    try {
-        throw new Error('');
-    }
-    catch (err) {
-        let line = err.stack.split('\n')[3];
-        let module = (line.substring(line.lastIndexOf(path_1.default.sep) + 1, line.indexOf(':')).replace('.js', ''));
-        return {
-            method: '',
-            module
-        };
-    }
+    const obj = {};
+    Error.captureStackTrace(obj, _caller);
+    const stack = obj.stack;
+    const lines = stack.split('\n');
+    const line = lines[2] || lines[1] || '';
+    const module = (line.substring(line.lastIndexOf(path_1.default.sep) + 1, line.indexOf(':')).replace('.js', ''));
+    return {
+        method: '',
+        module
+    };
 }
 var LOG_LEVEL;
 (function (LOG_LEVEL) {
@@ -428,6 +428,27 @@ function log_error(msg, err, traceId = '', caller = undefined) {
         console.error(`${getCurDateTime()} - [5] - [${caller.module}] - ${traceId} - ${msg}`, err);
     }
 }
+function createLogger(filename) {
+    const module = path_1.default.basename(filename).replace(/\.(js|ts)$/, '');
+    const caller = { method: '', module };
+    return {
+        trace(msg, data = {}, traceId = '') {
+            log_info(msg, data, traceId, caller, LOG_LEVEL.TRACE);
+        },
+        debug(msg, data = {}, traceId = '') {
+            log_info(msg, data, traceId, caller, LOG_LEVEL.DEBUG);
+        },
+        info(msg, data = {}, traceId = '') {
+            log_info(msg, data, traceId, caller, LOG_LEVEL.INFO);
+        },
+        warn(msg, data = {}, traceId = '') {
+            log_info(`!!! ${msg}`, data, traceId, caller, LOG_LEVEL.WARN);
+        },
+        error(msg, err, traceId = '') {
+            log_error(msg, err, traceId, caller);
+        },
+    };
+}
 function new_line(lines = 2) {
     for (let i = 0; i < lines; i++) {
         console.log('>');

package/dist/trade/handle_order_message.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handle_order_message = exports.try_lock_order_msg = void 0;
 const __1 = require("..");
+const logger = (0, __1.createLogger)(__filename);
 const trade_context_1 = require("./trade_context");
 const check_parse_order_msg = (appConfig, order_msg) => __awaiter(void 0, void 0, void 0, function* () {
     let { unique_orderbook_id, price_id, group_id, unique_order_msg_id } = order_msg;
@@ -58,21 +59,25 @@ const try_lock_order_msg = (appConfig, order_msg) => __awaiter(void 0, void 0, v
 exports.try_lock_order_msg = try_lock_order_msg;
 const order_trace_id_set = new Set();
 const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker_factory, recv_order_msg) => __awaiter(void 0, void 0, void 0, function* () {
-    (0, __1.new_line)(3);
-    console.log(`=================================================================================`);
-    console.log(`|                              NEW ORDER MESSAGE                                |`);
-    console.log(`=================================================================================`);
-    (0, __1.log_info)(`handle_order_message, on message: `, recv_order_msg);
-    let order_event_message = JSON.parse(recv_order_msg);
-    if (__1.LOG.debug) {
-        (0, __1.log_debug)(`order_event_msg`, order_event_message);
+    console.log(`\n\n\n================================== NEW ORDER ==================================`);
+    let order_event_message;
+    try {
+        order_event_message = JSON.parse(recv_order_msg);
+    }
+    catch (err) {
+        logger.error(`handle_order_message, JSON parse failed!`, err);
+        logger.info(`handle_order_message, raw message: `, recv_order_msg);
+        return;
     }
     let { event_time, event_type, group_id, data: order_msg } = order_event_message;
+    logger.info(`[NEW ORDER] ${order_msg === null || order_msg === void 0 ? void 0 : order_msg.order_trace_id} | ${order_msg === null || order_msg === void 0 ? void 0 : order_msg.pair} ${(order_msg === null || order_msg === void 0 ? void 0 : order_msg.aToB) ? 'SELL' : 'BUY'} ${order_msg === null || order_msg === void 0 ? void 0 : order_msg.amount}`, {
+        group_id, price_id: order_msg === null || order_msg === void 0 ? void 0 : order_msg.price_id, dex: order_msg === null || order_msg === void 0 ? void 0 : order_msg.unique_orderbook_id
+    });
     let { price_msg, id_parts } = yield check_parse_order_msg(trade_appconfig, order_msg);
     let { order_trace_id } = order_msg;
     let { chain_id, dex_id, pool_id, fee_rate } = id_parts;
     if (order_trace_id_set.has(order_trace_id)) {
-        (0, __1.log_warn)(`order_trace_id already processed, skip`, { order_trace_id });
+        logger.warn(`order_trace_id already processed, skip`, { order_trace_id });
         return;
     }
     order_trace_id_set.add(order_trace_id);
@@ -81,7 +86,6 @@ const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker
     let order_submit_result;
     try {
         context = new trade_context_1.TradeContext(price_msg, order_msg);
-        let { env_args } = trade_appconfig;
         yield context.init(trade_appconfig);
         txid = yield trade_instance.execute(context);
         order_msg.order_submit_time = Date.now();
@@ -95,7 +99,7 @@ const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker
         trade_appconfig.subscribe_wallet_raw_txn_event();
     }
     catch (err) {
-        (0, __1.log_error)(`handle_order_message error!`, err);
+        logger.error(`handle_order_message error!`, err);
         order_submit_result = {
             success: false,
             msg: (err === null || err === void 0 ? void 0 : err.message) || 'FAILED',
@@ -105,8 +109,7 @@ const handle_order_message = (trade_appconfig, trade_instance, tx_result_checker
     finally {
         trade_appconfig.arb_cache.cache_order_message(Object.assign(Object.assign({}, order_msg), { order_submit_result })).then(res => {
         }).catch(err => {
-            (0, __1.log_warn)('cache order submit result, error!', { order_msg, order_submit_result, err });
-            console.log(err);
+            logger.warn('cache order submit result, error!', { order_msg, order_submit_result, err });
         });
     }
 });

package/dist/trade/trade_context.js

@@ -32,14 +32,14 @@ class TradeContext {
             if (!this.pool_info) {
                 throw new Error(`Not found pool_info! pool_id=${this.pool_id}, pool_info_list=${JSON.stringify(this.trade_runtime.pair_dex.pool_info_list)}`);
             }
-            let { inputToken, outputToken } = (0, __1.get_input_out_token)(this.pool_info, this.order_msg.aToB);
-            let { amount } = this.order_msg;
-            let amount_dot_index = amount.indexOf('.');
-            if (amount_dot_index != -1) {
-                let amount_with_exact_decimals = amount.substring(0, amount_dot_index + inputToken.decimals + 1);
-                let uiAmount = parseFloat(amount_with_exact_decimals).toString();
-                this.order_msg.amount = uiAmount;
-                (0, __1.log_warn)(`Fix input token's amount decimal: from ${amount} to ${uiAmount}`);
+            const { inputToken, outputToken } = (0, __1.get_input_out_token)(this.pool_info, this.order_msg.aToB);
+            const amount = this.order_msg.amount;
+            const dotIdx = amount.indexOf('.');
+            if (dotIdx !== -1 && amount.length - dotIdx - 1 > inputToken.decimals) {
+                let truncated = amount.substring(0, dotIdx + inputToken.decimals + 1);
+                truncated = truncated.replace(/0+$/, '').replace(/\.$/, '');
+                this.order_msg.amount = truncated;
+                (0, __1.log_warn)(`Fix input token's amount decimal: from ${amount} to ${truncated}`);
             }
             this.slippage_bps = Math.min(300, Math.max(0, this.trade_runtime.settings.slippage_bps));
             this.aToB = this.pool_info.is_reverse_token ? !this.order_msg.aToB : this.order_msg.aToB;

package/package.json

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