@clonegod/ttd-bsc-common 1.0.11 → 1.0.13

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

@@ -9,7 +9,7 @@ export declare class PoolEventListener {
     private appConfig;
     private wsProvider;
     private poolList;
-    private endpoint;
+    private ws_endpoint;
     private isConnected;
     private isReconnecting;
     private isStarted;
@@ -19,7 +19,7 @@ export declare class PoolEventListener {
     private maxReconnectDelay;
     private lastProcessedBlockNumber;
     private isBlockListenerActive;
-    constructor(appConfig: AppConfig);
+    constructor(appConfig: AppConfig, ws_endpoint: string);
     init(poolList: StandardPoolInfoType[]): Promise<void>;
     start(): Promise<void>;
     stop(): Promise<void>;

package/dist/quote/event/pool_event_listener.js

@@ -14,7 +14,7 @@ const ethers_1 = require("ethers");
 const dist_1 = require("@clonegod/ttd-core/dist");
 const common_1 = require("../../common");
 class PoolEventListener {
-    constructor(appConfig) {
+    constructor(appConfig, ws_endpoint) {
         this.wsProvider = null;
         this.poolList = [];
         this.isConnected = false;
@@ -27,7 +27,7 @@ class PoolEventListener {
         this.lastProcessedBlockNumber = 0;
         this.isBlockListenerActive = false;
         this.appConfig = appConfig;
-        this.endpoint = this.appConfig.env_args.ws_endpoint;
+        this.ws_endpoint = ws_endpoint;
     }
     init(poolList) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -62,12 +62,12 @@ class PoolEventListener {
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                (0, dist_1.log_info)(`正在连接 WebSocket: ${this.endpoint}`);
-                this.wsProvider = new ethers_1.ethers.providers.WebSocketProvider(this.endpoint);
+                (0, dist_1.log_info)(`正在连接 WebSocket: ${this.ws_endpoint}`);
+                this.wsProvider = new ethers_1.ethers.providers.WebSocketProvider(this.ws_endpoint);
                 yield this.wsProvider.ready;
                 this.isConnected = true;
                 this.reconnectAttempts = 0;
-                (0, dist_1.log_info)(`WebSocket 已连接: ${this.endpoint}`);
+                (0, dist_1.log_info)(`WebSocket 已连接: ${this.ws_endpoint}`);
                 this.wsProvider.on('error', (err) => {
                     (0, dist_1.log_error)(`WebSocket 错误:`, err, '');
                     this.handleConnectionIssue();
@@ -81,8 +81,18 @@ class PoolEventListener {
                 }
             }
             catch (error) {
-                (0, dist_1.log_error)(`连接 WebSocket 失败: ${this.endpoint}`, error, '');
-                this.handleConnectionIssue();
+                (0, dist_1.log_error)(`首次连接 WebSocket 失败: ${this.ws_endpoint}`, error, '');
+                if (this.reconnectAttempts > 0) {
+                    this.handleConnectionIssue();
+                }
+                else {
+                    this.isReconnecting = true;
+                    this.isConnected = false;
+                    this.cleanup();
+                    yield (0, dist_1.sleep)(this.baseReconnectDelay);
+                    yield this.connect();
+                    this.isReconnecting = false;
+                }
             }
         });
     }
@@ -96,11 +106,11 @@ class PoolEventListener {
             this.cleanup();
             this.reconnectAttempts++;
             const delay = Math.min(this.baseReconnectDelay * Math.pow(2, this.reconnectAttempts), this.maxReconnectDelay);
-            (0, dist_1.log_info)(`尝试重连 ${this.reconnectAttempts}/${this.maxReconnectAttempts}, 延迟 ${delay}ms, 节点: ${this.endpoint}`);
+            (0, dist_1.log_info)(`尝试重连 ${this.reconnectAttempts}/${this.maxReconnectAttempts}, 延迟 ${delay}ms, 节点: ${this.ws_endpoint}`);
             if (this.reconnectAttempts > this.maxReconnectAttempts) {
                 (0, dist_1.log_error)(`重连失败，尝试次数达到 ${this.maxReconnectAttempts} 次，程序退出`, new Error('Max reconnect attempts failed'), '');
                 this.appConfig.emit(common_1.EVENT_NAMES.WS_CONNECTION_FAILED, {
-                    endpoint: this.endpoint,
+                    endpoint: this.ws_endpoint,
                     attempts: this.maxReconnectAttempts,
                 });
                 process.exit(1);
@@ -151,7 +161,7 @@ class PoolEventListener {
         if (this.isBlockListenerActive && this.wsProvider) {
             this.wsProvider.removeListener('block', () => { });
             this.isBlockListenerActive = false;
-            (0, dist_1.log_info)(`区块监听器已停止`);
+            (0, dist_1.log_info)(`区块监听已停止`);
         }
     }
     cleanup() {
@@ -167,9 +177,12 @@ class PoolEventListener {
             }
             this.wsProvider = null;
         }
+        this.isConnected = false;
+        this.isReconnecting = false;
     }
     isWSConnected() {
-        return this.isConnected;
+        var _a, _b;
+        return this.isConnected && ((_b = (_a = this.wsProvider) === null || _a === void 0 ? void 0 : _a._websocket) === null || _b === void 0 ? void 0 : _b.readyState) === 1;
     }
     getConnectionDiagnostics() {
         return {
@@ -177,7 +190,7 @@ class PoolEventListener {
             isReconnecting: this.isReconnecting,
             isStarted: this.isStarted,
             reconnectAttempts: this.reconnectAttempts,
-            endpoint: this.endpoint,
+            ws_endpoint: this.ws_endpoint,
             wsReadyState: this.wsProvider && this.wsProvider._websocket
                 ? this.wsProvider._websocket.readyState
                 : null,

package/dist/redis/redis_client.d.ts

@@ -10,7 +10,7 @@ export declare class SimpleRedisClient {
     private getLockKey;
     private acquireLock;
     private releaseLock;
-    withLock<T>(lock_identifier: string, callback: () => Promise<T>): Promise<T>;
+    withLock<T>(lock_identifier: string, callback: () => Promise<T>, release_lock_delay_ms?: number): Promise<T>;
     getValue(key: string): Promise<string>;
     setValue(key: string, value: string, expireSeconds: number): Promise<any>;
     hsetValue(key: string, field: string, value: string, expireSeconds: number): Promise<any>;

package/dist/redis/redis_client.js

@@ -69,8 +69,8 @@ class SimpleRedisClient {
             return success;
         });
     }
-    withLock(lock_identifier, callback) {
-        return __awaiter(this, void 0, void 0, function* () {
+    withLock(lock_identifier_1, callback_1) {
+        return __awaiter(this, arguments, void 0, function* (lock_identifier, callback, release_lock_delay_ms = 2000) {
             const lock_key = this.getLockKey(lock_identifier);
             const lock_value = `${Date.now()}-${Math.random().toString(36).substring(2, 15)}`;
             let retries = 0;
@@ -90,7 +90,7 @@ class SimpleRedisClient {
             }
             finally {
                 if (acquired) {
-                    yield (0, dist_1.sleep)(parseInt(process.env.NONCE_LOCK_RELEASE_DELAY_MS || '2000'));
+                    yield (0, dist_1.sleep)(parseInt(process.env.NONCE_LOCK_RELEASE_DELAY_MS || String(release_lock_delay_ms)));
                     yield this.releaseLock(lock_key, lock_value);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-bsc-common",
-    "version": "1.0.11",
+    "version": "1.0.13",
     "description": "BSC common library",
     "license": "UNLICENSED",
     "main": "dist/index.js",