@clonegod/ttd-core 3.1.105 → 3.1.107

package/dist/index.js

@@ -249,11 +249,21 @@ const format_pair_symbol = (symbol) => {
 };
 exports.format_pair_symbol = format_pair_symbol;
 const format_unique_orderbook_id = (chain_id, dex_id, pool_id, fee_rate) => {
+    if (String(chain_id).includes('_') || String(dex_id).includes('_') || String(fee_rate).includes('_')) {
+        throw new Error(`format_unique_orderbook_id: chain_id/dex_id/fee_rate can't contain '_'! ${chain_id}, ${dex_id}, ${fee_rate}`);
+    }
+    if (!Number.isFinite(fee_rate)) {
+        log_warn(`format_unique_orderbook_id: fee_rate is not a finite number! ${chain_id}, ${dex_id}, ${pool_id}, ${fee_rate}`);
+    }
     return `${chain_id}_${dex_id}_${pool_id}_${fee_rate}`;
 };
 exports.format_unique_orderbook_id = format_unique_orderbook_id;
 const parse_unique_orderbook_id = (unique_orderbook_id) => {
-    let [chain_id, dex_id, pool_id, fee_rate] = unique_orderbook_id.split('_');
+    let parts = unique_orderbook_id.split('_');
+    let chain_id = parts[0];
+    let dex_id = parts[1];
+    let fee_rate = parts[parts.length - 1];
+    let pool_id = parts.slice(2, parts.length - 1).join('_');
     return {
         chain_id,
         dex_id,

package/dist/redis/redis_client.d.ts

@@ -13,6 +13,7 @@ export declare class RedisClient {
     expire(key: string, ttl: number): Promise<boolean>;
     del(key: string, field?: string): Promise<number>;
     set_nx(key: string, value: string): Promise<boolean>;
+    incr_by(key: string, increment?: number): Promise<number>;
     get(key: string): Promise<string | null>;
     set(key: string, value: string, expireSeconds?: number): Promise<string | null>;
     hset(key: string, field: string, value: string, expireSeconds?: number): Promise<number>;

package/dist/redis/redis_client.js

@@ -62,6 +62,12 @@ class RedisClient {
             return yield this.redis_client.setNX(key, value);
         });
     }
+    incr_by(key_1) {
+        return __awaiter(this, arguments, void 0, function* (key, increment = 1) {
+            const client = yield this.ensureClient();
+            return Number(yield client.incrBy(key, increment));
+        });
+    }
     get(key) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield this.ensureClient();

package/dist/test/test_parse_unique_orderbook_id.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/test_parse_unique_orderbook_id.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("../index");
+const main = () => {
+    const cases = [
+        [index_1.CHAIN_ID.TON, index_1.DEX_ID.DEDUST, 'EQA-X_yo3fzzbDbJ_0bzFWKqtRuZFIRa1sJsveZJ1YpViO3r', 25],
+        [index_1.CHAIN_ID.TON, index_1.DEX_ID.STONFI, 'EQCqFPpSLtcstURtrXLRCv9wyjfrw7_44_nwvD8JiSmSjbUI', 30],
+        [index_1.CHAIN_ID.TON, index_1.DEX_ID.STONFI_V2, 'EQD9BmgQQ2_nzk-9LfxthcoLYC3yBHWK5WqEv_FyMU2riRvE', 20],
+        [index_1.CHAIN_ID.TON, index_1.DEX_ID.DEDUST, 'EQCO9NDT4Il25_4ZpHIOgMAUbRJvpsI9pLzqhD8X7eTVB7X_', 30],
+        [index_1.CHAIN_ID.TON, index_1.DEX_ID.STONFI, 'EQD8TJ8xEWB1SpnRE4d89YO3jl0W0EiBnNS4IBaHaUmdfizE', 20],
+        [index_1.CHAIN_ID.BSC, index_1.DEX_ID.PANCAKE_CLMM, '0x36696169C63e42cd08ce11f5deeBbCeBae652050', 500],
+        [index_1.CHAIN_ID.SOLANA, index_1.DEX_ID.RAYDIUM_CLMM, '8sLbNZoA1cfnvMJLPfp98ZLAnFSYCFApfJKMbiXNLwxj', 25],
+    ];
+    const parse_positional = (id) => {
+        let [chain_id, dex_id, pool_id, fee_rate] = id.split('_');
+        return { chain_id, dex_id, pool_id, fee_rate };
+    };
+    let failed = 0;
+    for (const [chain_id, dex_id, pool_id, fee_rate] of cases) {
+        const id = (0, index_1.format_unique_orderbook_id)(chain_id, dex_id, pool_id, fee_rate);
+        const parsed = (0, index_1.parse_unique_orderbook_id)(id);
+        let ok = parsed.chain_id === chain_id
+            && parsed.dex_id === dex_id
+            && parsed.pool_id === pool_id
+            && String(parsed.fee_rate) === String(fee_rate);
+        if (ok && id.split('_').length === 4) {
+            const old = parse_positional(id);
+            ok = old.chain_id === parsed.chain_id && old.dex_id === parsed.dex_id
+                && old.pool_id === parsed.pool_id && old.fee_rate === parsed.fee_rate;
+        }
+        console.log(ok ? 'OK  ' : 'FAIL', id, ok ? '' : JSON.stringify(parsed));
+        if (!ok)
+            failed++;
+    }
+    try {
+        (0, index_1.format_unique_orderbook_id)(index_1.CHAIN_ID.TON, 'FOO_BAR', 'EQxx', 30);
+        console.log('FAIL guard: dex_id 含 _ 未被拦截');
+        failed++;
+    }
+    catch (err) {
+        console.log('OK   guard: dex_id 含 _ 生成时即 throw');
+    }
+    if (failed > 0) {
+        console.error(`parse_unique_orderbook_id: ${failed} case(s) FAILED`);
+        process.exit(1);
+    }
+    console.log(`parse_unique_orderbook_id: all passed`);
+};
+main();

package/package.json

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