@clonegod/ttd-core 3.1.42 → 3.1.44

package/dist/analyze/index.js

@@ -53,27 +53,47 @@ const index_1 = require("../index");
 const service_ports_1 = require("../constants/service_ports");
 const ws_client_1 = require("./ws_client");
 Object.defineProperty(exports, "AnalyzeWsClient", { enumerable: true, get: function () { return ws_client_1.AnalyzeWsClient; } });
-const _env = (() => {
+const httpHeaders = { 'Content-Type': 'application/json' };
+const httpAgent = new http.Agent({ keepAlive: true, maxSockets: 10 });
+function getAnalyzeHost() {
+    var _a;
     try {
-        return (0, core_env_1.getCoreEnv)();
+        return ((_a = (0, core_env_1.getCoreEnv)()) === null || _a === void 0 ? void 0 : _a.trade_analyze_host) || '';
     }
-    catch (_a) {
-        return null;
+    catch (_b) {
+        return '';
     }
-})();
-const ANALYZE_HOST = (_env === null || _env === void 0 ? void 0 : _env.trade_analyze_host) || '';
-const ANALYZE_HTTP_BASE = ANALYZE_HOST ? `http://${ANALYZE_HOST}:${service_ports_1.SERVICE_PORT.TRADE_ANALYZE_HTTP}/trade/analyze` : '';
-const ANALYZE_WS_URL = ANALYZE_HOST ? `ws://${ANALYZE_HOST}:${service_ports_1.SERVICE_PORT.TRADE_ANALYZE_HTTP}/trade/analyze/ws/ingest` : '';
-const httpHeaders = { 'Content-Type': 'application/json' };
-const httpAgent = new http.Agent({ keepAlive: true, maxSockets: 10 });
+}
 let _wsClient = null;
 function getWsClient() {
-    if (!ANALYZE_WS_URL)
+    const host = getAnalyzeHost();
+    if (!host)
         return null;
-    if (!_wsClient)
-        _wsClient = new ws_client_1.AnalyzeWsClient(ANALYZE_WS_URL);
+    if (!_wsClient) {
+        const url = `ws://${host}:${service_ports_1.SERVICE_PORT.TRADE_ANALYZE_HTTP}/trade/analyze/ws/ingest`;
+        _wsClient = new ws_client_1.AnalyzeWsClient(url, () => buildHello());
+    }
     return _wsClient;
 }
+function buildHello() {
+    let env = {};
+    try {
+        env = (0, core_env_1.getCoreEnv)() || {};
+    }
+    catch (_a) { }
+    const hasQuotePool = !!(env.quote_pool_address || env.quote_pool_name);
+    const hasGroup = !!env.group_id;
+    const kind = hasQuotePool ? 'QUOTE' : hasGroup ? 'TRADE' : 'OTHER';
+    return {
+        kind,
+        app_id: process.env.name || env.app_name || '',
+        pair: env.pair || '',
+        dex_id: env.dex_id || '',
+        group_id: env.group_id || '',
+        pool_name: env.quote_pool_name || '',
+        fee_rate: env.quote_pool_fee_rate ? Number(env.quote_pool_fee_rate) : undefined,
+    };
+}
 const WS_TYPES = new Set([
     'PreTradeEvent',
     'PriceMessageType',
@@ -85,7 +105,8 @@ const HTTP_PATH = {
     TradeResultType: '/ingest/trade-result',
 };
 const report_data_to_analyze = (type, data) => {
-    if (!ANALYZE_HOST)
+    const host = getAnalyzeHost();
+    if (!host)
         return;
     if (WS_TYPES.has(type)) {
         const client = getWsClient();
@@ -99,7 +120,8 @@ const report_data_to_analyze = (type, data) => {
         return;
     }
     try {
-        axios_1.default.post(ANALYZE_HTTP_BASE + path, data, { headers: httpHeaders, timeout: 3000, httpAgent })
+        const url = `http://${host}:${service_ports_1.SERVICE_PORT.TRADE_ANALYZE_HTTP}/trade/analyze${path}`;
+        axios_1.default.post(url, data, { headers: httpHeaders, timeout: 3000, httpAgent })
             .then(() => (0, index_1.log_trace)(`[analyze] report ${type} ok`))
             .catch(err => (0, index_1.log_warn)(`[analyze] report ${type} fail: ${err.message}`));
     }
@@ -109,10 +131,11 @@ const report_data_to_analyze = (type, data) => {
 };
 exports.report_data_to_analyze = report_data_to_analyze;
 const get_pool_latest_quote_price = (unique_orderbook_id) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!ANALYZE_HTTP_BASE || (0, index_1.isEmpty)(unique_orderbook_id))
+    const host = getAnalyzeHost();
+    if (!host || (0, index_1.isEmpty)(unique_orderbook_id))
         return null;
     try {
-        const url = `${ANALYZE_HTTP_BASE}/quote/price-msg?unique_orderbook_id=${unique_orderbook_id}`;
+        const url = `http://${host}:${service_ports_1.SERVICE_PORT.TRADE_ANALYZE_HTTP}/trade/analyze/quote/price-msg?unique_orderbook_id=${unique_orderbook_id}`;
         const res = (yield axios_1.default.get(url, { headers: httpHeaders, timeout: 3000, httpAgent })).data;
         return res.data;
     }

package/dist/analyze/ws_client.d.ts

@@ -1,5 +1,15 @@
+export interface AnalyzeWsHello {
+    kind: 'QUOTE' | 'TRADE' | 'OTHER';
+    app_id?: string;
+    pair?: string;
+    dex_id?: string;
+    group_id?: string;
+    pool_name?: string;
+    fee_rate?: number;
+}
 export declare class AnalyzeWsClient {
     private readonly url;
+    private readonly helloFn?;
     private ws;
     private reconnectTimer;
     private connected;
@@ -7,7 +17,7 @@ export declare class AnalyzeWsClient {
     private readonly MAX_QUEUE;
     private droppedCount;
     private lastDroppedLogAt;
-    constructor(url: string);
+    constructor(url: string, helloFn?: () => AnalyzeWsHello);
     private connect;
     private scheduleReconnect;
     private flushQueue;

package/dist/analyze/ws_client.js

@@ -7,8 +7,9 @@ exports.AnalyzeWsClient = void 0;
 const ws_1 = __importDefault(require("ws"));
 const index_1 = require("../index");
 class AnalyzeWsClient {
-    constructor(url) {
+    constructor(url, helloFn) {
         this.url = url;
+        this.helloFn = helloFn;
         this.ws = null;
         this.reconnectTimer = null;
         this.connected = false;
@@ -24,6 +25,15 @@ class AnalyzeWsClient {
             this.ws.on('open', () => {
                 this.connected = true;
                 (0, index_1.log_info)(`[AnalyzeWs] connected: ${this.url}`);
+                if (this.helloFn) {
+                    try {
+                        const hello = this.helloFn();
+                        this.ws.send(JSON.stringify({ type: 'HELLO', data: hello }));
+                    }
+                    catch (e) {
+                        (0, index_1.log_debug)(`[AnalyzeWs] hello send failed: ${e.message}`);
+                    }
+                }
                 this.flushQueue();
             });
             this.ws.on('close', () => {

package/package.json

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