@ercworldio/blockchain-shared 1.0.0-dev.5 → 1.0.0-dev.7

package/build/services/Redis.js

@@ -18,260 +18,319 @@ const ElasticSearch_1 = __importDefault(require("./ElasticSearch"));
 const Logger_1 = require("../utils/Logger");
 class Redis {
     constructor(config) {
-        this.initializingPromise = null;
-        this.create_redis_client = () => {
-            if (this.config.serverConfig.environment === 'local') {
-                this.client = (0, redis_1.createClient)();
-            }
-            else {
-                const parsed_string = (0, Parsing_1.parseRedisUrl)(this.config.config.redisConnectionstring);
-                let url = `rediss://${parsed_string.host}:${parsed_string.port}`;
-                this.client = (0, redis_1.createClient)({
-                    pingInterval: 10000,
-                    url,
-                    password: parsed_string.password,
-                    socket: {
-                        host: parsed_string.host,
-                        port: parsed_string.port,
-                        tls: true,
-                        reconnectStrategy: (retries) => {
-                            if (retries > 20)
-                                return new Error('Max retries reached');
-                            return Math.min(retries * 200, 5000);
-                        }
-                        // reconnectStrategy: (retries) => {
-                        //     if (retries < 10) {
-                        //         return 200;
-                        //     }
-                        //     // this.reinitialize();
-                        //     return false;
-                        // }
-                    }
-                });
-            }
-            return this.client;
-        };
+        // Prevent concurrent connect / subscriber-connect attempts
+        this.connectPromise = null;
+        this.subscriberConnectPromise = null;
+        // Stored so the subscription can be restored after subscriber recreation
+        this.expiryPattern = null;
+        this.expiryHandler = null;
         this.config = config;
-        this.initialized = false;
         this.prefix = `${config.serverConfig.projectName}-${config.serverConfig.environment}`;
-        this.client = this.create_redis_client();
-        this.logger = (0, Logger_1.createLogger)(`Redis`, this.config.pipelineConfig.azureAppName);
+        this.logger = (0, Logger_1.createLogger)("Redis", config.pipelineConfig.azureAppName);
+        this.client = this.createClient();
     }
     static getInstance(config) {
         if (!this.instance) {
             this.instance = new Redis(config);
         }
-        if (!this.instance.client.isOpen) {
-            this.instance.initialize().then(() => this.instance.logger.info(`Initialized redis`)).catch((err) => this.instance.logger.info(`Error initializing Redis client: `, err));
-        }
         return this.instance;
     }
-    reinitialize() {
+    // -------------------------------------------------------------------------
+    // Client / subscriber creation
+    // -------------------------------------------------------------------------
+    createClient() {
+        let client;
+        if (this.config.serverConfig.environment === "local") {
+            client = (0, redis_1.createClient)();
+        }
+        else {
+            const p = (0, Parsing_1.parseRedisUrl)(this.config.config.redisConnectionstring);
+            client = (0, redis_1.createClient)({
+                pingInterval: 10000,
+                url: `rediss://${p.host}:${p.port}`,
+                password: p.password,
+                socket: {
+                    host: p.host,
+                    port: p.port,
+                    tls: true,
+                    connectTimeout: 10000,
+                    reconnectStrategy: (retries) => {
+                        if (retries > 20)
+                            return new Error("Redis: max reconnect retries reached");
+                        const delay = Math.min(retries * 200, 5000);
+                        this.logger.warn(`Redis: reconnect attempt ${retries}, retrying in ${delay}ms`);
+                        return delay;
+                    },
+                },
+            });
+        }
+        this.attachMainClientListeners(client);
+        return client;
+    }
+    attachMainClientListeners(client) {
+        client.on("error", (err) => {
+            var _a;
+            this.logger.warn("Redis: client error", { data: { error: err === null || err === void 0 ? void 0 : err.message } });
+            ElasticSearch_1.default.getInstance(this.config).index_log("Redis", "client.error", "Error", "Redis client error", { message: (_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : "Unexpected error" });
+        });
+        client.on("reconnecting", () => this.logger.warn("Redis: client reconnecting"));
+        client.on("connect", () => this.logger.info("Redis: client connected"));
+        client.on("ready", () => {
+            this.logger.info("Redis: client ready");
+            // Enable TCP keep-alive on the underlying socket
+            const stream = client.socket;
+            if (stream === null || stream === void 0 ? void 0 : stream.setKeepAlive)
+                stream.setKeepAlive(true, 10000);
+        });
+        client.on("end", () => {
+            // Fires when reconnectStrategy gave up (or explicit quit — not used here).
+            // Create a completely fresh client; the old one is dead.
+            this.logger.warn("Redis: client ended — reconnect strategy exhausted, creating fresh client");
+            if (this.connectPromise)
+                return; // already recovering
+            this.client = this.createClient();
+            this.connectPromise = this.connectClient(this.client)
+                .catch((err) => this.logger.error("Redis: fresh client connect failed", { data: { error: err } }))
+                .finally(() => { this.connectPromise = null; });
+        });
+    }
+    attachSubscriberListeners(subscriber) {
+        subscriber.on("error", (err) => this.logger.warn("Redis: subscriber error", { data: { error: err === null || err === void 0 ? void 0 : err.message } }));
+        subscriber.on("reconnecting", () => this.logger.warn("Redis: subscriber reconnecting"));
+        subscriber.on("connect", () => this.logger.info("Redis: subscriber connected"));
+        subscriber.on("ready", () => this.logger.info("Redis: subscriber ready"));
+        subscriber.on("end", () => {
+            // Subscriber's reconnect strategy gave up — rebuild from scratch and restore subscription.
+            this.logger.warn("Redis: subscriber ended — recreating");
+            this.recreateSubscriber();
+        });
+    }
+    // -------------------------------------------------------------------------
+    // Connection management
+    // -------------------------------------------------------------------------
+    connectClient(client) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.logger.info("Redis: Reinitializing Redis...");
-                this.client = this.create_redis_client();
-                this.initialized = false;
-                yield this.initialize();
-            }
-            catch (err) {
-                this.logger.warn("Reinit failed:", { data: { error: err } });
+            this.logger.info("Redis: connecting main client");
+            yield client.connect();
+            if (this.config.serverConfig.environment === "local") {
+                yield client.configSet("notify-keyspace-events", "Exg");
             }
+            this.logger.info("Redis: main client ready");
+        });
+    }
+    connectSubscriber() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if ((_a = this.subscriber) === null || _a === void 0 ? void 0 : _a.isOpen)
+                return;
+            if (this.subscriberConnectPromise)
+                return this.subscriberConnectPromise;
+            this.subscriberConnectPromise = this._doConnectSubscriber()
+                .finally(() => { this.subscriberConnectPromise = null; });
+            return this.subscriberConnectPromise;
+        });
+    }
+    _doConnectSubscriber() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.info("Redis: connecting subscriber");
+            // duplicate() copies all connection options, no re-auth needed
+            this.subscriber = this.client.duplicate();
+            this.attachSubscriberListeners(this.subscriber);
+            yield Promise.race([
+                this.subscriber.connect(),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("Subscriber connect timed out after 10s")), 10000)),
+            ]);
+            this.logger.info("Redis: subscriber ready");
         });
     }
+    /**
+     * Called when the subscriber's reconnectStrategy fails
+     * Removes dead subscriber and creates a new one.
+     * Restores expiry subscription using the stored pattern/handler
+     */
+    recreateSubscriber() {
+        this.subscriber = undefined;
+        this.subscriberConnectPromise = null;
+        if (!this.client.isOpen) {
+            // Main client is also down, skip
+            // When the main client recovers, the next initialize() call will
+            // create a fresh subscriber and resubscribe
+            this.logger.warn("Redis: main client not ready, deferring subscriber recreation");
+            return;
+        }
+        this.connectSubscriber()
+            .then(() => __awaiter(this, void 0, void 0, function* () {
+            if (this.expiryPattern && this.expiryHandler && this.subscriber) {
+                yield this.subscriber.pSubscribe(this.expiryPattern, this.expiryHandler);
+                this.logger.info("Redis: subscriber recreated and expiry subscription restored");
+            }
+        }))
+            .catch((err) => this.logger.error("Redis: subscriber recreation failed", { data: { error: err } }));
+    }
+    // -------------------------------------------------------------------------
+    // Public initializer — safe to call multiple times / concurrently
+    // -------------------------------------------------------------------------
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.client.isOpen) {
-                this.initialized = true;
+                // Main client is up — ensure subscriber is also up
+                if (!((_a = this.subscriber) === null || _a === void 0 ? void 0 : _a.isOpen)) {
+                    yield this.connectSubscriber().catch((err) => this.logger.warn("Redis: subscriber connect failed during initialize", { data: { error: err } }));
+                }
                 return;
             }
-            if (this.initializingPromise)
-                return this.initializingPromise;
-            this.initializingPromise = this._doInitialize().finally(() => {
-                this.initializingPromise = null;
-            });
-            return this.initializingPromise;
+            // Deduplicate concurrent callers
+            if (this.connectPromise)
+                return this.connectPromise;
+            this.connectPromise = this._doInitialize()
+                .finally(() => { this.connectPromise = null; });
+            return this.connectPromise;
         });
     }
     _doInitialize() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.info(`Redis: Initializing redis....`);
-            try {
-                this.client.on('error', (err) => __awaiter(this, void 0, void 0, function* () { return yield this.handle_redis_error(err); }));
-                this.client.on('reconnecting', () => this.handle_redis_action("reconnecting"));
-                this.client.on('connect', () => this.handle_redis_action("connect"));
-                this.client.on('end', () => __awaiter(this, void 0, void 0, function* () { return yield this.handle_redis_action("end"); }));
-                this.client.on('ping', () => {
-                    console.log('Redis PING sent');
-                });
-                // Enable TCP keep-alive on the underlying socket after connecting
-                this.client.on('ready', () => {
-                    var _a, _b;
-                    this.logger;
-                    const socket = (_b = (_a = this.client) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.socket;
-                    // Access the raw net.Socket and enable keep-alive
-                    const stream = this.client.socket;
-                    if (stream === null || stream === void 0 ? void 0 : stream.setKeepAlive) {
-                        stream.setKeepAlive(true, 10000);
-                        this.logger.info(``);
-                    }
-                });
-                // Enable keyspace notifications for expired events
-                try {
-                    yield this.client.connect();
-                    // Subscribe to events on local redis
-                    if (this.config.serverConfig.environment === "local") {
-                        yield this.client.configSet('notify-keyspace-events', 'Exg');
-                    }
-                    this.initialized = true;
-                    // // Create a dedicated subscriber connection for notifications
-                    this.subscriber = this.client.duplicate();
-                    // this.subscriber.on('error', async (err) => await this.handle_redis_error(err));
-                    yield this.subscriber.connect();
-                    this.initialized = true;
-                }
-                catch (e) {
-                    this.logger.warn('Redis: Redis init Error:', { data: { error: e } });
-                }
-                this.logger.info(`Redis: Initialized redis`);
-            }
-            catch (error) {
-                this.logger.error(`Redis: Error initializoing redis client`, { data: error });
-            }
+            this.logger.info("Redis: initializing");
+            yield this.connectClient(this.client);
+            // Subscriber failure is non-fatal for initialization — commands still work.
+            // The subscriber will be retried the first time subscribeToExpiry is called.
+            yield this.connectSubscriber().catch((err) => this.logger.warn("Redis: subscriber connect failed during init — will retry on use", { data: { error: err } }));
+            this.logger.info("Redis: initialization complete");
         });
     }
-    // Subscribe to key expiry notifications
+    // -------------------------------------------------------------------------
+    // Expiry subscription
+    // -------------------------------------------------------------------------
     subscribeToExpiry(onExpire) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
+            if (!((_a = this.subscriber) === null || _a === void 0 ? void 0 : _a.isOpen))
+                yield this.connectSubscriber();
             if (!this.subscriber)
-                throw new Error('Redis subscriber not initialized');
-            const db = (_b = (_a = this.client.options) === null || _a === void 0 ? void 0 : _a.database) !== null && _b !== void 0 ? _b : 0;
+                throw new Error("Redis: subscriber not available");
+            const db = (_c = (_b = this.client.options) === null || _b === void 0 ? void 0 : _b.database) !== null && _c !== void 0 ? _c : 0;
             const pattern = `__keyevent@${db}__:expired`;
-            yield this.subscriber.pSubscribe(pattern, (expiredKey) => __awaiter(this, void 0, void 0, function* () {
+            const handler = (expiredKey) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    // Get the value before it expires (if possible) or use the key
                     const pref = `${this.prefix}-`;
                     const normalizedKey = expiredKey.startsWith(pref) ? expiredKey.slice(pref.length) : expiredKey;
-                    this.logger.info(`Redis: Expired key: ${normalizedKey} `);
-                    // Try to get the value from the expired key (might not work for expired keys)
+                    this.logger.info(`Redis: key expired: ${normalizedKey}`);
                     let value = null;
                     try {
                         value = yield this.get_object(expiredKey);
                     }
-                    catch (e) {
-                        // Key already expired, use the key itself
-                    }
+                    catch ( /* already gone */_a) { /* already gone */ }
                     onExpire(normalizedKey, value);
                 }
-                catch (e) {
-                    yield this.handle_redis_error(e);
+                catch (err) {
+                    this.logger.error("Redis: expiry handler error", { data: { error: err } });
                 }
-            }));
+            });
+            // Persist so recreateSubscriber can restore the subscription automatically.
+            this.expiryPattern = pattern;
+            this.expiryHandler = handler;
+            try {
+                yield Promise.race([
+                    this.subscriber.pSubscribe(pattern, handler),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error("pSubscribe timed out after 10s")), 10000)),
+                ]);
+                this.logger.info(`Redis: subscribed to expiry pattern ${pattern}`);
+            }
+            catch (err) {
+                // Non-fatal: handler is stored — subscription is restored automatically
+                // when the subscriber reconnects (see recreateSubscriber / 'end' event).
+                this.logger.warn("Redis: pSubscribe timed out — will retry when subscriber reconnects", { data: { error: err } });
+            }
         });
     }
+    // -------------------------------------------------------------------------
+    // Key helpers
+    // -------------------------------------------------------------------------
     get_key(key, use_prefix = true) {
-        if (!use_prefix) {
-            return key;
-        }
-        else {
-            return `${this.prefix}-${key}`;
-        }
+        return use_prefix ? `${this.prefix}-${key}` : key;
     }
-    _get(final_key) {
+    // -------------------------------------------------------------------------
+    // Core read / write / delete — all guarded by ensureConnected + withTimeout
+    // -------------------------------------------------------------------------
+    ensureConnected() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.initialized)
+            if (!this.client.isOpen)
                 yield this.initialize();
-            const value = yield this.withTimeout(() => this.client.get(final_key));
-            if (!value)
-                return null;
-            return value;
         });
     }
-    _set(final_key, _value, options) {
+    _get(final_key) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.initialized)
-                yield this.initialize();
-            if (options) {
-                const expiry_timestamp = options.expires_at;
-                const ttl = options.ttl;
-                if (!expiry_timestamp)
-                    throw new Error("Expiry timestamp is required");
-                if (!ttl)
-                    throw new Error("TTL for key required");
-                let opt = {
-                    expiration: {
-                        type: "EXAT",
-                        value: expiry_timestamp
-                    },
-                };
-                let now_s = Math.floor(new Date().getTime() / 1000);
-                if (options.publish) {
-                    const publishName = options.publish.name;
-                    return yield this.withTimeout(() => {
-                        const multi = this.client.multi();
-                        multi.set(final_key, _value, ttl ? { EX: ttl } : undefined);
-                        multi.publish(publishName, _value);
-                        return multi.exec();
-                    });
-                }
-                else {
-                    return yield this.withTimeout(() => this.client.set(final_key, _value, { EX: ttl }));
-                }
+            yield this.ensureConnected();
+            return this.withTimeout(() => this.client.get(final_key));
+        });
+    }
+    _set(final_key, value, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureConnected();
+            if (!options) {
+                return this.withTimeout(() => this.client.set(final_key, value));
             }
-            else {
-                return yield this.withTimeout(() => this.client.set(final_key, _value));
+            const { expires_at, ttl, publish } = options;
+            if (!expires_at)
+                throw new Error("expires_at is required");
+            if (!ttl)
+                throw new Error("ttl is required");
+            if (publish) {
+                return this.withTimeout(() => {
+                    const multi = this.client.multi();
+                    multi.set(final_key, value, { EX: ttl });
+                    multi.publish(publish.name, value);
+                    return multi.exec();
+                });
             }
+            return this.withTimeout(() => this.client.set(final_key, value, { EX: ttl }));
         });
     }
     _delete(final_key) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.initialized)
-                yield this.initialize();
-            return yield this.withTimeout(() => this.client.del(final_key));
+            yield this.ensureConnected();
+            return this.withTimeout(() => this.client.del(final_key));
         });
     }
+    // -------------------------------------------------------------------------
+    // Public API (interface preserved)
+    // -------------------------------------------------------------------------
     get(_key) {
         return __awaiter(this, void 0, void 0, function* () {
-            let key = this.get_key(_key);
-            const value = yield this._get(key);
-            if (!value)
-                return null;
-            return value;
+            return this._get(this.get_key(_key));
         });
     }
-    set(_key, _value, options) {
+    set(_key, value, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let key = this.get_key(_key);
-            return yield this._set(key, _value, options);
+            return this._set(this.get_key(_key), value, options);
         });
     }
     delete(_key) {
         return __awaiter(this, void 0, void 0, function* () {
-            let key = this.get_key(_key);
-            return yield this._delete(key);
+            return this._delete(this.get_key(_key));
         });
     }
-    set_object(_key, _value, options) {
+    set_object(_key, value, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let key = this.get_key(_key);
-            return this._set(key, JSON.stringify(_value), options);
+            return this._set(this.get_key(_key), JSON.stringify(value), options);
         });
     }
     get_object(_key_1) {
         return __awaiter(this, arguments, void 0, function* (_key, use_prefix = true) {
-            let key = this.get_key(_key, use_prefix);
-            this.logger.info(`Redis: Getting object with key: ${key} `);
-            const value = yield this._get(key);
-            return value ? JSON.parse(value) : null;
+            const key = this.get_key(_key, use_prefix);
+            this.logger.info(`Redis: Getting object with key: ${key}`);
+            const raw = yield this._get(key);
+            return raw ? JSON.parse(raw) : null;
         });
     }
     delete_object(_key) {
         return __awaiter(this, void 0, void 0, function* () {
-            let key = this.get_key(_key);
-            return yield this._delete(key);
+            return this._delete(this.get_key(_key));
         });
     }
+    // -------------------------------------------------------------------------
+    // Command execution with timeout + single retry on dead connection
+    // -------------------------------------------------------------------------
     withTimeout(fn_1) {
         return __awaiter(this, arguments, void 0, function* (fn, ms = 5000, retry = true) {
             let timedOut = false;
@@ -286,32 +345,20 @@ class Redis {
             }
             catch (err) {
                 if (timedOut && retry) {
-                    this.logger.warn(`Redis: command timed out, reinitializing and retrying once`);
-                    yield this.reinitialize();
-                    return this.withTimeout(fn, ms, false); // retry once on fresh connection, no further retry
+                    this.logger.warn("Redis: command timed out — attempting recovery");
+                    if (!this.client.isOpen) {
+                        // Connection is dead — create a fresh client before retrying.
+                        // This also covers the case where the 'end' event hasn't fired yet.
+                        this.logger.warn("Redis: client closed, creating fresh client before retry");
+                        this.client = this.createClient();
+                        yield this.connectClient(this.client);
+                    }
+                    // fn() references this.client via arrow closure — picks up the new client.
+                    return this.withTimeout(fn, ms, false);
                 }
                 throw err;
             }
         });
     }
-    handle_redis_error(error) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger.info(`Redis: Redis Client Error: `, { data: { error } });
-            const error_data = { message: (error === null || error === void 0 ? void 0 : error.message) ? error.message : "Unexpected error occured" };
-            ElasticSearch_1.default.getInstance(this.config).index_log("Redis", this.handle_redis_error.name, "Error", "Redis Client Error", error_data);
-        });
-    }
-    handle_redis_action(type) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let message = "Redis Client Connected";
-            if (type === "reconnecting")
-                message = "Redis Client Reconnecting";
-            else if (type === "end") {
-                message = "Redis Client Connection Ended";
-                yield this.reinitialize();
-            }
-            this.logger.info(`Redis: Redis client action: ${message} type: ${type}`);
-        });
-    }
 }
 exports.default = Redis;

package/build/services/RedisListQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisListQueue.d.ts","sourceRoot":"","sources":["../../src/services/RedisListQueue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAG/C,cAAM,cAAc;IAChB,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM;IAOnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;IAQlB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;IAiBzB,WAAW,CAAC,CAAC,EAAE,cAAc,SAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAWrD,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,SAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAgB3D,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;CAGlC;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"RedisListQueue.d.ts","sourceRoot":"","sources":["../../src/services/RedisListQueue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAG/C,cAAM,cAAc;IAChB,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM;IAOnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;IASlB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;IAkBzB,WAAW,CAAC,CAAC,EAAE,cAAc,SAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAYrD,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,SAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAiB3D,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;CAIlC;AAED,eAAe,cAAc,CAAC"}

package/build/services/RedisListQueue.js

@@ -23,12 +23,14 @@ class RedisListQueue {
     // Clear the queue completely
     clear() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.redis.initialize();
             yield this.redis.client.del(this.key);
         });
     }
-    // Push single message 
+    // Push single message
     push(message) {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.redis.initialize();
             yield this.redis.client.rPush(this.key, JSON.stringify(message));
         });
     }
@@ -37,6 +39,7 @@ class RedisListQueue {
         return __awaiter(this, void 0, void 0, function* () {
             if (!messages.length)
                 return;
+            yield this.redis.initialize();
             const multi = this.redis.client.multi();
             for (const m of messages) {
                 multi.rPush(this.key, JSON.stringify(m));
@@ -49,6 +52,7 @@ class RedisListQueue {
     // Blocking pop (consumer side)
     popBlocking() {
         return __awaiter(this, arguments, void 0, function* (timeoutSeconds = 0) {
+            yield this.redis.initialize();
             const result = yield this.redis.client.blPop(this.key, timeoutSeconds);
             if (!result)
                 return null;
@@ -58,6 +62,7 @@ class RedisListQueue {
     // Blocking pop many
     popMany(count_1) {
         return __awaiter(this, arguments, void 0, function* (count, timeoutSeconds = 0) {
+            yield this.redis.initialize();
             const results = [];
             const first = yield this.redis.client.blPop(this.key, timeoutSeconds);
             if (!first)
@@ -74,6 +79,7 @@ class RedisListQueue {
     }
     length() {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.redis.initialize();
             return yield this.redis.client.lLen(this.key);
         });
     }

package/build/services/StorageService.js

@@ -18,7 +18,7 @@ class StorageService {
     constructor(config) {
         this.fetchContainerContent = (containerClientName, fileName) => __awaiter(this, void 0, void 0, function* () {
             try {
-                const vaultHandler = new KeyVaultService_1.default(this.config.config.projectName, this.config.config.environment);
+                const vaultHandler = new KeyVaultService_1.default(this.config.config.keyVaultName);
                 if (!vaultHandler.client) {
                     vaultHandler.initializeKeyVaultService();
                 }
@@ -43,7 +43,7 @@ class StorageService {
         // Function to update or create the content of a file in a given container
         this.updateContainerContent = (containerName, fileName, content) => __awaiter(this, void 0, void 0, function* () {
             try {
-                const vaultHandler = new KeyVaultService_1.default(this.config.config.projectName, this.config.config.environment);
+                const vaultHandler = new KeyVaultService_1.default(this.config.config.keyVaultName);
                 if (!vaultHandler.client) {
                     vaultHandler.initializeKeyVaultService();
                 }

package/build/services/SweepJobService.d.ts

@@ -46,6 +46,7 @@ WHERE job_status IN ('pending', 'queued');
     batch_update_failed_jobs: (request_ids: number[], new_status: SweepJobStatus, error_message?: string, retryable?: boolean) => Promise<void>;
     batch_update_failed_jobs_with_error: (jobs: SweepJob[], retryable: boolean) => Promise<void>;
     batch_update_confirming: (jobs: SweepResult[], expected_status: SweepJobStatus) => Promise<void>;
+    reset_retry_count: (job_ids: number[]) => Promise<void>;
     find_confirming_jobs_with_tx_hash(blockchain: BlockchainType, limit: number, lock_owner: string, lock_minutes?: number): Promise<SweepJob[]>;
 }
 export default SweepJobService;

package/build/services/SweepJobService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SweepJobService.d.ts","sourceRoot":"","sources":["../../src/services/SweepJobService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SweepJobService.d.ts","sourceRoot":"","sources":["../../src/services/SweepJobService.ts"],"names":[],"mappings":"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"}