@clonegod/ttd-bsc-common 1.0.8 → 1.0.9

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export * from './quote';
 export * from './trade';
 export * from './types';
 export * from './utils';
+export * from './redis';

package/dist/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./quote"), exports);
 __exportStar(require("./trade"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./redis"), exports);

package/dist/redis/index.d.ts

@@ -0,0 +1,16 @@
+import { RedisClientType } from "redis";
+export declare class SimpleRedisClient {
+    private lock_prefix;
+    private redisClient;
+    private lockMaxRetries;
+    private lockRetryDelayMs;
+    private lockExpireSeconds;
+    constructor(lock_prefix: string);
+    getRedisClient(): Promise<RedisClientType>;
+    private getLockKey;
+    private acquireLock;
+    private releaseLock;
+    withLock<T>(lock_identifier: string, callback: () => Promise<T>): Promise<T>;
+    getLockValue(lock_key: string): Promise<string>;
+    setLockValue(lock_key: string, lock_value: string): Promise<void>;
+}

package/dist/redis/index.js

@@ -0,0 +1,114 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleRedisClient = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+class SimpleRedisClient {
+    constructor(lock_prefix) {
+        this.lock_prefix = lock_prefix;
+        this.redisClient = null;
+        this.lockMaxRetries = 10;
+        this.lockRetryDelayMs = 300;
+        this.lockExpireSeconds = 10;
+    }
+    getRedisClient() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.redisClient) {
+                this.redisClient = yield (0, dist_1.getRedisCache)();
+            }
+            return this.redisClient;
+        });
+    }
+    getLockKey(lock_identifier) {
+        return `${this.lock_prefix}:lock:${lock_identifier}`;
+    }
+    acquireLock(lock_key_1, lock_value_1) {
+        return __awaiter(this, arguments, void 0, function* (lock_key, lock_value, expireSeconds = this.lockExpireSeconds) {
+            const redisClient = yield this.getRedisClient();
+            const result = yield redisClient.set(lock_key, lock_value, {
+                NX: true,
+                EX: expireSeconds
+            });
+            (0, dist_1.log_info)(`try acquireLock: lock_key=${lock_key}, lock_value=${lock_value}, expireSeconds=${expireSeconds}, result=${result}`);
+            const success = result === 'OK';
+            if (success) {
+                (0, dist_1.log_info)(`acquire lock success: lock_key=${lock_key}, lock_value=${lock_value}`);
+            }
+            return success;
+        });
+    }
+    releaseLock(lock_key, lock_value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const redisClient = yield this.getRedisClient();
+            const script = `
+            if redis.call('get', KEYS[1]) == ARGV[1] then
+                return redis.call('del', KEYS[1])
+            else
+                return 0
+            end
+        `;
+            const result = yield redisClient.eval(script, {
+                keys: [lock_key],
+                arguments: [lock_value]
+            });
+            const success = Number(result) === 1;
+            if (success) {
+                (0, dist_1.log_info)(`release lock success: lock_key=${lock_key}, lock_value=${lock_value}`);
+            }
+            else {
+                (0, dist_1.log_info)(`release lock failed: lock_key=${lock_key}, lock_value=${lock_value}, maybe expired or locked by other process`);
+            }
+            return success;
+        });
+    }
+    withLock(lock_identifier, callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lock_key = this.getLockKey(lock_identifier);
+            const lock_value = `${Date.now()}-${Math.random().toString(36).substring(2, 15)}`;
+            let retries = 0;
+            let acquired = false;
+            try {
+                while (retries < this.lockMaxRetries) {
+                    acquired = yield this.acquireLock(lock_key, lock_value);
+                    if (acquired)
+                        break;
+                    yield new Promise(resolve => setTimeout(resolve, this.lockRetryDelayMs));
+                    retries++;
+                }
+                if (!acquired) {
+                    throw new Error(`acquire lock failed: lock_key=${lock_key}, lock_value=${lock_value}, after ${this.lockMaxRetries} retries, maybe locked by other process`);
+                }
+                return yield callback();
+            }
+            finally {
+                if (acquired) {
+                    yield (0, dist_1.sleep)(parseInt(process.env.NONCE_LOCK_RELEASE_DELAY_MS || '2000'));
+                    yield this.releaseLock(lock_key, lock_value);
+                }
+            }
+        });
+    }
+    getLockValue(lock_key) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const redisClient = yield this.getRedisClient();
+            return yield redisClient.get(lock_key);
+        });
+    }
+    setLockValue(lock_key, lock_value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const redisClient = yield this.getRedisClient();
+            yield redisClient.set(lock_key, lock_value, {
+                EX: this.lockExpireSeconds
+            });
+        });
+    }
+}
+exports.SimpleRedisClient = SimpleRedisClient;

package/dist/utils/index.d.ts

@@ -1,7 +1,6 @@
 import { ethers } from "ethers";
 import Decimal from "decimal.js";
 export * from './gas_helper';
-export * from './redis_lock';
 export declare const sleep: (ms: number) => Promise<void>;
 export declare const formatPrice: (price: number, precision?: number) => string;
 export declare const formatUnits: (value: ethers.BigNumber, decimals: number) => Decimal;

package/dist/utils/index.js

@@ -21,7 +21,6 @@ exports.formatNumberHighPrecision = exports.formatUnits = exports.formatPrice =
 const ethers_1 = require("ethers");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 __exportStar(require("./gas_helper"), exports);
-__exportStar(require("./redis_lock"), exports);
 const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-bsc-common",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "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.23",
+        "@clonegod/ttd-core": "2.0.27",
         "axios": "^1.8.4",
         "dotenv": "^16.4.7",
         "ethers": "^5.8.0"