@clonegod/ttd-bsc-common 1.0.3 → 1.0.5

package/dist/quote/event/pool_event_listener.d.ts

@@ -21,6 +21,7 @@ export declare class PoolEventListener {
     private connectionTimeoutMs;
     private lastProcessedBlockNumber;
     private isBlockListenerActive;
+    private metrics;
     constructor(appConfig: AppConfig, wsProvider: ethers.providers.WebSocketProvider);
     init(poolList: StandardPoolInfoType[]): Promise<void>;
     start(): Promise<void>;

package/dist/quote/event/pool_event_listener.js

@@ -27,6 +27,11 @@ class PoolEventListener {
         this.connectionTimeoutMs = 15000;
         this.lastProcessedBlockNumber = 0;
         this.isBlockListenerActive = false;
+        this.metrics = {
+            lastBlockTime: 0,
+            blockInterval: 0,
+            missedBlocks: 0
+        };
         this.appConfig = appConfig;
         this.wsProvider = wsProvider;
     }
@@ -46,7 +51,7 @@ class PoolEventListener {
                 (0, dist_1.log_warn)('WebSocket 尚未连接，无法启动监听', '');
                 return;
             }
-            this.startBlockListener();
+            yield this.startBlockListener();
             this.isStarted = true;
             (0, dist_1.log_info)('区块监听已成功启动');
         });
@@ -118,11 +123,12 @@ class PoolEventListener {
                 yield this.initProvider();
                 if (this.isStarted) {
                     (0, dist_1.log_info)('重连成功，正在重新启动区块监听...');
-                    yield this.start();
+                    yield this.startBlockListener();
                 }
             }
             catch (err) {
                 (0, dist_1.log_error)('重新连接失败:', err, '');
+                this.handleConnectionIssue();
             }
         });
     }
@@ -168,40 +174,49 @@ class PoolEventListener {
         }
     }
     startBlockListener() {
-        (0, dist_1.log_info)(`开始启动区块监听...`);
-        this.stopBlockListener();
-        if (!this.isConnected || !this.wsProvider) {
-            (0, dist_1.log_warn)(`无法启动区块监听: WebSocket未连接`);
-            return;
-        }
-        this.wsProvider.getBlockNumber()
-            .then(blockNumber => {
-            this.lastProcessedBlockNumber = blockNumber;
-            (0, dist_1.log_info)(`初始化区块监听，当前区块: ${blockNumber}`);
-        })
-            .catch(error => {
-            (0, dist_1.log_error)(`获取当前区块失败:`, error, '');
-        });
-        this.wsProvider.on('block', (blockNumber) => __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, dist_1.log_info)(`开始启动区块监听...`);
+            this.stopBlockListener();
+            if (!this.isConnected || !this.wsProvider) {
+                (0, dist_1.log_warn)(`无法启动区块监听: WebSocket未连接`);
+                return;
+            }
             try {
-                if (!this.isConnected || !this.isBlockListenerActive)
-                    return;
-                (0, dist_1.log_info)(`------- Block: ${blockNumber} -------`);
-                const previousBlockNumber = this.lastProcessedBlockNumber;
+                const blockNumber = yield this.wsProvider.getBlockNumber();
                 this.lastProcessedBlockNumber = blockNumber;
-                const blockUpdateEvent = {
-                    blockNumber: blockNumber,
-                    previousBlockNumber: previousBlockNumber,
-                    timestamp: Date.now()
-                };
-                this.appConfig.emit(constants_1.EVENT_NAMES.BLOCK_UPDATE, blockUpdateEvent);
+                (0, dist_1.log_info)(`初始化区块监听，当前区块: ${blockNumber}`);
+                this.wsProvider.on('block', (blockNumber) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        if (!this.isConnected || !this.isBlockListenerActive)
+                            return;
+                        this.metrics.blockInterval = Date.now() - this.metrics.lastBlockTime;
+                        this.metrics.lastBlockTime = Date.now();
+                        if (this.metrics.blockInterval > 30000) {
+                            (0, dist_1.log_warn)(`区块间隔异常: ${this.metrics.blockInterval}ms`);
+                            this.metrics.missedBlocks++;
+                        }
+                        (0, dist_1.log_info)(`------- Block: ${blockNumber} -------`);
+                        const previousBlockNumber = this.lastProcessedBlockNumber;
+                        this.lastProcessedBlockNumber = blockNumber;
+                        const blockUpdateEvent = {
+                            blockNumber: blockNumber,
+                            previousBlockNumber: previousBlockNumber,
+                            timestamp: Date.now()
+                        };
+                        this.appConfig.emit(constants_1.EVENT_NAMES.BLOCK_UPDATE, blockUpdateEvent);
+                    }
+                    catch (error) {
+                        (0, dist_1.log_error)(`处理区块事件出错:`, error, '');
+                    }
+                }));
+                this.isBlockListenerActive = true;
+                (0, dist_1.log_info)(`区块监听已启动，使用WebSocket事件订阅方式`);
             }
             catch (error) {
-                (0, dist_1.log_error)(`处理区块事件出错:`, error, '');
+                (0, dist_1.log_error)(`启动区块监听失败:`, error, '');
+                this.isBlockListenerActive = false;
             }
-        }));
-        this.isBlockListenerActive = true;
-        (0, dist_1.log_info)(`区块监听已启动，使用WebSocket事件订阅方式`);
+        });
     }
     stopBlockListener() {
         if (this.isBlockListenerActive && this.wsProvider) {
@@ -224,7 +239,8 @@ class PoolEventListener {
                 ? this.wsProvider._websocket.readyState
                 : null,
             trackingPools: this.poolList.length,
-            lastProcessedBlock: this.lastProcessedBlockNumber
+            lastProcessedBlock: this.lastProcessedBlockNumber,
+            metrics: Object.assign(Object.assign({}, this.metrics), { lastBlockTime: new Date(this.metrics.lastBlockTime).toISOString() })
         };
     }
 }

package/dist/utils/redis_lock.js

@@ -90,7 +90,7 @@ class RedisLock {
             }
             finally {
                 if (acquired) {
-                    yield (0, dist_1.sleep)(parseInt(process.env.NONCE_LOCK_RELEASE_DELAY_MS || '1000'));
+                    yield (0, dist_1.sleep)(parseInt(process.env.NONCE_LOCK_RELEASE_DELAY_MS || '1500'));
                     yield this.releaseLock(lock_key, lock_value);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-bsc-common",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "description": "BSC common library",
     "license": "UNLICENSED",
     "main": "dist/index.js",
@@ -14,7 +14,7 @@
         "push": "npm run build && npm publish"
     },
     "dependencies": {
-        "@clonegod/ttd-core": "2.0.19",
+        "@clonegod/ttd-core": "2.0.22",
         "axios": "^1.8.4",
         "dotenv": "^16.4.7",
         "ethers": "^5.8.0"