@clonegod/ttd-sol-common 2.0.79 → 2.0.80

package/dist/quote/index.d.ts

@@ -1,5 +1,4 @@
 export * from './pricing';
-export * from './pool_subscription_registry';
 export * from './pool_event';
 export * from './chain_ops';
 export * from './abstract_dex_quote';

package/dist/quote/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./pricing"), exports);
-__exportStar(require("./pool_subscription_registry"), exports);
 __exportStar(require("./pool_event"), exports);
 __exportStar(require("./chain_ops"), exports);
 __exportStar(require("./abstract_dex_quote"), exports);

package/dist/quote/pool_subscription_registry.js

@@ -52,11 +52,18 @@ async function attachPoolSubscriptionLifecycle(appConfig, pools) {
             + '询价进程必须由 PM2/trade-mgt 以确定进程名启动，否则订阅会被 reconcile 当孤儿清除。');
     }
     await registerPoolSubscriptions(appConfig, pools, quote_app_id);
+    const heartbeatMs = Math.max(5000, parseInt(process.env.SUBSCRIPTION_HEARTBEAT_MS || '30000', 10) || 30000);
+    const heartbeat = setInterval(() => {
+        registerPoolSubscriptions(appConfig, pools, quote_app_id)
+            .catch(e => (0, dist_1.log_warn)(`[pool/subscriptions] heartbeat re-register failed: ${e.message}`));
+    }, heartbeatMs);
+    heartbeat.unref?.();
     let cleaned = false;
     const cleanup = async (sig) => {
         if (cleaned)
             return;
         cleaned = true;
+        clearInterval(heartbeat);
         (0, dist_1.log_info)(`[pool/subscriptions] ${sig} → unregister ${quote_app_id}`);
         await unregisterPoolSubscriptions(appConfig, quote_app_id);
         process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.79",
+  "version": "2.0.80",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/quote/index.ts

@@ -1,5 +1,4 @@
 export * from './pricing'
-export * from './pool_subscription_registry'
 export * from './pool_event'
 export * from './chain_ops'
 export * from './abstract_dex_quote'

package/src/quote/pool_subscription_registry.ts

@@ -1,87 +0,0 @@
-import { AppConfig, HttpUtil, log_info, log_warn, SERVICE_PORT, StandardPoolInfoType } from '@clonegod/ttd-core/dist'
-import { resolveGrpcProvider } from '../grpc/grpc_provider_registry'
-
-/**
- * 按需订阅 —— 生产端（询价进程调用）。对齐 BSC/BASE/SUI：询价进程通过 config-center 声明所需池子，
- * config-center 写 `${chain}:pool:subscriptions` Hash + 广播 `:change`，stream-quote 消费后订阅 Helius。
- *
- * Solana 适配（与 BSC 的差异）：
- *  - **单 Helius provider，且对齐 SUI 由运维在 analyze Config/RPC 页配（type=grpc, endpoint=laserstream URL, auth_token=API key）**。
- *    本 helper **不自动种 provider**；register 用 `resolveGrpcProvider` 解析出 analyze 配的 provider id（无配 fail-loud）。
- *  - **base58 地址大小写敏感**：依赖 config-center `lower()` 已改为 0x 感知（非 0x 原样保留），不破坏地址。
- */
-
-function configCenterBase(appConfig: AppConfig): string {
-    const chain = appConfig.env_args.chain_id // SOLANA
-    let host = String(appConfig.env_args.config_center_host || '127.0.0.1').trim()
-    // host 可能含端口(127.0.0.1:4000)或不含(127.0.0.1)；不含则补 CONFIG_CENTER_HTTP
-    if (!host.includes(':')) host = `${host}:${SERVICE_PORT.CONFIG_CENTER_HTTP}`
-    return `http://${host}/${chain}/config`
-}
-
-/** 注册一批池子订阅（每池 POST config-center /quote/register），provider_ids 用 analyze 配的 grpc provider。 */
-export async function registerPoolSubscriptions(
-    appConfig: AppConfig,
-    pools: StandardPoolInfoType[],
-    quote_app_id: string,
-): Promise<void> {
-    // provider 由运维在 analyze Config/RPC 配（type=grpc）；解析其 id 供 register 引用，无配 fail-loud
-    const provider = await resolveGrpcProvider(appConfig.arb_cache.redis_cmd, appConfig.env_args.chain_id)
-    const provider_ids = [provider.id]
-
-    const base = configCenterBase(appConfig)
-    let ok = 0
-    for (const p of pools) {
-        try {
-            await HttpUtil.post(`${base}/quote/register`, {
-                pool_address: p.pool_address,
-                provider_ids,
-                quote_app_id,
-                pair: p.pair,
-                dex_id: p.dex_id,
-                pool_name: p.pool_name,
-                fee_rate: p.fee_rate,
-            })
-            ok++
-        } catch (e: any) {
-            log_warn(`[pool/subscriptions] register ${p.pool_address} failed: ${e.message}`)
-        }
-    }
-    log_info(`[pool/subscriptions] registered ${ok}/${pools.length} pools by ${quote_app_id} → provider=${provider.id}`)
-}
-
-/** 注销本进程注册的所有池子订阅（按 quote_app_id）。 */
-export async function unregisterPoolSubscriptions(appConfig: AppConfig, quote_app_id: string): Promise<void> {
-    try {
-        await HttpUtil.post(`${configCenterBase(appConfig)}/quote/unregister`, { quote_app_id })
-        log_info(`[pool/subscriptions] unregistered all pools by ${quote_app_id}`)
-    } catch (e: any) {
-        log_warn(`[pool/subscriptions] unregister failed: ${e.message}`)
-    }
-}
-
-/**
- * 询价进程启动后调用一次：确保 helius provider + 注册全部池子 + 装退出时自动 unregister。
- * quote_app_id **必须 = PM2 进程名**（pm2 注入 process.env.name），与 trade-mgt register/reconcile 用的 app_id 一致。
- * 否则 trade-mgt 的 60s reconcile 按 PM2 进程名核对，会把本进程自注册的订阅当"孤儿"注销 → 订阅消失、收不到事件。
- * **取不到则 fail-loud（绝不兜底）**：塌成 'sol-quote' 这类 PM2 里不存在的名字 = 必被 reconcile 清掉，等于没注册还掩盖问题。
- */
-export async function attachPoolSubscriptionLifecycle(appConfig: AppConfig, pools: StandardPoolInfoType[]): Promise<void> {
-    const quote_app_id = process.env.name || String(appConfig.env_args.app_name || '')
-    if (!quote_app_id) {
-        throw new Error('[pool/subscriptions] 无法确定 quote_app_id：process.env.name(PM2 进程名) 与 APP_NAME 均为空。'
-            + '询价进程必须由 PM2/trade-mgt 以确定进程名启动，否则订阅会被 reconcile 当孤儿清除。')
-    }
-    await registerPoolSubscriptions(appConfig, pools, quote_app_id)
-
-    let cleaned = false
-    const cleanup = async (sig: string) => {
-        if (cleaned) return
-        cleaned = true
-        log_info(`[pool/subscriptions] ${sig} → unregister ${quote_app_id}`)
-        await unregisterPoolSubscriptions(appConfig, quote_app_id)
-        process.exit(0)
-    }
-    process.on('SIGINT', () => void cleanup('SIGINT'))
-    process.on('SIGTERM', () => void cleanup('SIGTERM'))
-}