@samet-it/be-redis-common 1.1.9 → 1.3.1

package/dist/channel/index.types.d.ts

@@ -1,8 +1,8 @@
-import type { RedisConnectionLike, RedisExecOpt } from "../connection";
-import type { CacheChannelProps, CacheChannelLike, CacheChannelOpt } from "@samet-it/be-cache-common";
-import type { Entity } from "@samet-it/be-base-common";
-import type { RedisClientType } from "redis";
-import type { KeyValue } from "@leyyo/common";
+import { RedisConnectionLike } from "../connection";
+import { CacheChannelLike, CacheChannelOpt, CacheChannelProps, CacheExecOpt } from "@samet-it/be-cache-common";
+import { Entity } from "@samet-it/be-base-common";
+import { RedisClientType } from "redis";
+import { KeyValue } from "@leyyo/common";
 /**
  * Redis channel interface
  *
@@ -39,3 +39,7 @@ export interface RedisDirectChannelOpt extends RedisChannelOpt {
      * */
     name?: string;
 }
+/**
+ * Redis query option
+ * */
+export type RedisExecOpt = CacheExecOpt;

package/dist/channel/redis-direct.channel.d.ts

@@ -1,8 +1,8 @@
 import { RedisChannel } from "./redis.channel";
 import { type Entity } from "@samet-it/be-base-common";
-import type { RedisConnectionLike } from "../connection";
-import type { RedisDirectChannelOpt } from "./index.types";
-import type { KeyValue } from "@leyyo/common";
+import { RedisConnectionLike } from "../connection";
+import { RedisDirectChannelOpt } from "./index.types";
+import { KeyValue } from "@leyyo/common";
 /**
  * Redis direct channel class
  *

package/dist/channel/redis-direct.channel.js

@@ -19,7 +19,7 @@ class RedisDirectChannel extends redis_channel_1.RedisChannel {
      * */
     constructor(conn, opt) {
         super(conn, opt);
-        this.logger = be_base_common_1.logger.create(`RedisDirect${opt.name ? '#' + opt.name : ''}`);
+        this.logger = be_base_common_1.logger.of(`RedisDirect${opt.name ? '#' + opt.name : ''}`);
     }
 }
 exports.RedisDirectChannel = RedisDirectChannel;

package/dist/channel/redis.channel.d.ts

@@ -1,9 +1,9 @@
-import type { RedisConnectionLike, RedisExecOpt } from "../connection";
-import type { RedisChannelProps, RedisChannelLike, RedisChannelOpt } from "./index.types";
-import { type Entity } from "@samet-it/be-base-common";
+import { RedisConnectionLike } from "../connection";
+import { RedisChannelLike, RedisChannelOpt, RedisChannelProps, RedisExecOpt } from "./index.types";
+import { Entity } from "@samet-it/be-base-common";
 import { CacheChannel } from "@samet-it/be-cache-common";
-import type { KeyValue } from "@leyyo/common";
-import type { RedisClientType } from "redis";
+import { KeyValue } from "@leyyo/common";
+import { RedisClientType } from "redis";
 /**
  * Redis abstract channel class
  *

package/dist/config/index.types.d.ts

@@ -1,4 +1,4 @@
-import type { EnvBase } from "@leyyo/env";
+import { EnvBase } from "@leyyo/env";
 export interface RedisCommonConf extends EnvBase {
     /**
      * Redis Enabled

package/dist/config/redis-common.config.d.ts

@@ -1,4 +1,4 @@
-import type { RedisCommonConf } from "./index.types";
+import { RedisCommonConf } from "./index.types";
 /**
  * Redis common config
  * */

package/dist/connection/index.types.d.ts

@@ -1,13 +1,12 @@
-import type { CacheConnectionLike, CacheConnOpt, CacheExecOpt } from "@samet-it/be-cache-common";
-import type { RedisClientType } from "redis";
-import type { Entity } from "@samet-it/be-base-common";
-import type { RedisDirectChannelOpt, RedisChannelLike } from "../channel";
-import type { CacheConnProps } from "@samet-it/be-cache-common";
+import { CacheConnectionLike, CacheConnOpt, CacheConnProps } from "@samet-it/be-cache-common";
+import { RedisClientType } from "redis";
+import { Entity } from "@samet-it/be-base-common";
+import { RedisChannelLike, RedisDirectChannelOpt } from "../channel";
 import { KeyValue } from "@leyyo/common";
 /**
  * Redis connection interface
  * */
-export interface RedisConnectionLike extends CacheConnectionLike<RedisExecOpt> {
+export interface RedisConnectionLike extends CacheConnectionLike {
     /** @inheritDoc */
     get props(): Readonly<RedisConnProps>;
     /**
@@ -63,12 +62,6 @@ export interface RedisConnProps extends CacheConnProps, RedisConnOpt {
      * @type {RedisClientType}
      * */
     client: RedisClientType;
-    /**
-     * Connection try count
-     *
-     * @type {number}
-     * */
-    tryCount: number;
     /**
      * Connection url
      *
@@ -76,7 +69,3 @@ export interface RedisConnProps extends CacheConnProps, RedisConnOpt {
      * */
     producedUrl: string;
 }
-/**
- * Redis query option
- * */
-export type RedisExecOpt = CacheExecOpt;

package/dist/connection/redis-connection.fn.d.ts

@@ -1,4 +1,4 @@
-import type { RedisConnDirectOpt, RedisDirectConnectionLike } from "./index.types";
+import { RedisConnDirectOpt, RedisDirectConnectionLike } from "./index.types";
 /**
  * Crete new redis connection
  *

package/dist/connection/redis-direct.connection.d.ts

@@ -1,8 +1,8 @@
 import { RedisConnection } from "./redis.connection";
-import { type Entity } from "@samet-it/be-base-common";
-import { type RedisDirectChannelOpt, type RedisChannelLike } from "../channel";
-import type { RedisConnDirectOpt, RedisDirectConnectionLike } from "./index.types";
-import type { KeyValue } from "@leyyo/common";
+import { Entity } from "@samet-it/be-base-common";
+import { RedisChannelLike, RedisDirectChannelOpt } from "../channel";
+import { RedisConnDirectOpt, RedisDirectConnectionLike } from "./index.types";
+import { KeyValue } from "@leyyo/common";
 /**
  * Redis connection direct class
  * */

package/dist/connection/redis-direct.connection.js

@@ -15,7 +15,7 @@ class RedisDirectConnection extends redis_connection_1.RedisConnection {
      * */
     constructor(opt) {
         super(opt);
-        this.logger = be_base_common_1.logger.create(`RedisConnection${(opt === null || opt === void 0 ? void 0 : opt.name) ? '#' + (opt === null || opt === void 0 ? void 0 : opt.name) : ''}`);
+        this.logger = be_base_common_1.logger.of(`RedisConnection${(opt === null || opt === void 0 ? void 0 : opt.name) ? '#' + (opt === null || opt === void 0 ? void 0 : opt.name) : ''}`);
     }
     /** @inheritDoc */
     newChannel(opt) {

package/dist/connection/redis.connection.d.ts

@@ -1,28 +1,46 @@
-import type { RedisConnectionLike, RedisExecOpt, RedisConnProps, RedisConnOpt } from "./index.types";
+import { RedisClientType } from 'redis';
+import { RedisConnectionLike, RedisConnOpt, RedisConnProps } from "./index.types";
 import { CacheConnection } from "@samet-it/be-cache-common";
-import type { RedisClientType } from "redis";
 /**
  * Redis connection abstract class
  * */
-export declare abstract class RedisConnection extends CacheConnection<RedisExecOpt> implements RedisConnectionLike {
+export declare abstract class RedisConnection extends CacheConnection implements RedisConnectionLike {
     /**
-     * Base/starting/min delay
+     * Base/starting/min delay for connection
      *
      * @type {number} - as seconds
      * */
-    private static readonly BASE_DELAY;
+    private static readonly CONN_BASE_DELAY;
     /**
-     * Last/max delay
+     * Last/max delay for connection
      *
      * @type {number} - as seconds
      * */
-    private static readonly MAX_DELAY;
+    private static readonly CONN_MAX_DELAY;
     /**
      * Try count
      *
      * @type {number} - times
      * */
-    private static readonly TRY_COUNT;
+    private static readonly CONN_TRY_COUNT;
+    /**
+     * Base/starting/min delay for ping
+     *
+     * @type {number} - as seconds
+     * */
+    private static readonly PING_BASE_DELAY;
+    /**
+     * Last/max delay ping
+     *
+     * @type {number} - as seconds
+     * */
+    private static readonly PING_MAX_DELAY;
+    /**
+     * Try count
+     *
+     * @type {number} - times
+     * */
+    private static readonly PING_TRY_COUNT;
     /** {@inheritDoc} */
     protected _props: RedisConnProps;
     /**
@@ -43,12 +61,8 @@ export declare abstract class RedisConnection extends CacheConnection<RedisExecO
      * Build url from credentials
      * */
     protected _buildUrl(): void;
-    /**
-     * Generate next delay time with exponential & randomized manner
-     *
-     * @return {number}
-     * */
-    protected _delayWithJitter(): number;
+    protected get _connectionDelay(): number;
+    protected get _pingDelay(): number;
     /** {@inheritDoc} */
     connect(): Promise<boolean>;
     /** {@inheritDoc} */

package/dist/connection/redis.connection.js

@@ -47,6 +47,7 @@ const redis = __importStar(require("redis"));
 const config_1 = require("../config");
 const be_cache_common_1 = require("@samet-it/be-cache-common");
 const be_base_common_1 = require("@samet-it/be-base-common");
+const common_1 = require("@leyyo/common");
 /**
  * Redis connection abstract class
  * */
@@ -60,9 +61,8 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
     constructor(opt) {
         super(opt);
         if (!this.logger) {
-            this.logger = be_base_common_1.logger.create(this);
+            this.logger = be_base_common_1.logger.of(this);
         }
-        this._props.tryCount = 0;
         this._readFromEnv();
         this._buildUrl();
     }
@@ -118,14 +118,11 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
         }
         this._props.producedUrl = `${protocol}://${_secure}${host}${_port}${_db}`;
     }
-    /**
-     * Generate next delay time with exponential & randomized manner
-     *
-     * @return {number}
-     * */
-    _delayWithJitter() {
-        const exp = Math.min(RedisConnection.BASE_DELAY * Math.pow(2, this._props.tryCount), RedisConnection.MAX_DELAY);
-        return exp / 2 + Math.random() * (exp / 2);
+    get _connectionDelay() {
+        return this._delayWithJitter(this._props.connectTryCount, RedisConnection.CONN_BASE_DELAY, RedisConnection.CONN_MAX_DELAY);
+    }
+    get _pingDelay() {
+        return this._delayWithJitter(this._props.pingTryCount, RedisConnection.PING_BASE_DELAY, RedisConnection.PING_MAX_DELAY);
     }
     // endregion protected-method
     // region connect
@@ -139,33 +136,38 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
             if (this.isConnected) {
                 return true;
             }
-            if (this._props.tryCount > RedisConnection.TRY_COUNT) {
-                const err = new be_cache_common_1.CacheError('Maximum try county', { tryCount: this._props.tryCount });
-                this.logger.error(be_base_common_1.errorHandler.common.logText(err, 'connect', 'try', this._props.tryCount));
+            if (this._props.connectTryCount > RedisConnection.CONN_TRY_COUNT) {
+                const err = new be_cache_common_1.CacheError('Maximum try county', { tryCount: this._props.connectTryCount });
+                this.logger.error(common_1.errorCommon.text(err, 'connect'));
                 return false;
             }
             try {
                 props.client = redis.createClient({ url: this._props.producedUrl });
                 props.client
                     .on("error", err => {
-                    this.checkError(err, { silent: true, name: 'connection' });
-                    props.tryCount++;
+                    this.logger.warn(common_1.errorCommon.text(err, 'connection', this._props.connectTryCount));
+                    props.connectTryCount++;
                     const old = this.isConnected;
                     props.isConnected = false;
                     if (old) {
                         this._triggerOnCase('disconnected', this._onDisconnected, false);
                     }
-                    setTimeout(() => this.connect().then(), this._delayWithJitter());
+                    setTimeout(() => this.connect().then(), this._connectionDelay);
                 })
                     .on('connect', () => {
                     this.logger.info(`on[connect]`);
                     props.isConnected = true;
-                    props.tryCount = 0;
+                    props.connectTryCount = 0;
                     this._triggerOnCase('connected', this._onConnected, false);
                     if (props.isFirst === undefined) {
                         this._triggerOnCase('first-connected', this._onFirstConnected, true);
                         props.isFirst = false;
                     }
+                    // clear stopped ping
+                    if (this._props.pingTryCount > RedisConnection.PING_TRY_COUNT) {
+                        this._props.pingTryCount = 0;
+                        setTimeout(() => this.ping(true).then(), 30000);
+                    }
                 })
                     .on('ready', () => this.logger.info('on[ready]'))
                     .on('close', () => this.logger.info('on[close]'))
@@ -176,7 +178,7 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
                 setTimeout(() => this.ping(true).then(), 30000);
             }
             catch (e) {
-                this.checkError(e, { name: 'connection' });
+                this.logger.warn(common_1.errorCommon.text(e, 'connection', this._props.connectTryCount));
             }
             return true;
         });
@@ -187,14 +189,23 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
             if (!this.isEnabled) {
                 return false;
             }
+            if (this._props.pingTryCount > RedisConnection.PING_TRY_COUNT) {
+                const err = new be_cache_common_1.CacheError('Maximum try county', { tryCount: this._props.pingTryCount });
+                this.logger.error(common_1.errorCommon.text(err, 'connect'));
+                return false;
+            }
             let result = false;
             if (this.isConnected) {
                 try {
                     yield this.client.ping();
+                    this._props.pingTryCount = 0;
                     result = true;
                 }
                 catch (err) {
-                    this.checkError(err, { silent: true, name: 'ping' });
+                    this._props.pingTryCount++;
+                    this.logger.warn(common_1.errorCommon.text(err, 'ping', this._props.pingTryCount));
+                    setTimeout(() => this.ping(true).then(), this._pingDelay);
+                    next = false;
                 }
             }
             if (next) {
@@ -207,20 +218,38 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
 exports.RedisConnection = RedisConnection;
 // region private-property
 /**
- * Base/starting/min delay
+ * Base/starting/min delay for connection
+ *
+ * @type {number} - as seconds
+ * */
+RedisConnection.CONN_BASE_DELAY = 500; // 0.5 sec
+/**
+ * Last/max delay for connection
+ *
+ * @type {number} - as seconds
+ * */
+RedisConnection.CONN_MAX_DELAY = 1000 * 60 * 60; // 60 minutes
+/**
+ * Try count
+ *
+ * @type {number} - times
+ * */
+RedisConnection.CONN_TRY_COUNT = 100; // 100 times
+/**
+ * Base/starting/min delay for ping
  *
  * @type {number} - as seconds
  * */
-RedisConnection.BASE_DELAY = 500; // 0.5 sec
+RedisConnection.PING_BASE_DELAY = 200; // 0.2 sec
 /**
- * Last/max delay
+ * Last/max delay ping
  *
  * @type {number} - as seconds
  * */
-RedisConnection.MAX_DELAY = 1000 * 60 * 60; // 1 hour
+RedisConnection.PING_MAX_DELAY = 1000 * 60 * 10; // 10 minutes
 /**
  * Try count
  *
  * @type {number} - times
  * */
-RedisConnection.TRY_COUNT = 100; // 100 times
+RedisConnection.PING_TRY_COUNT = 100; // 100 times

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-redis-common",
-  "version": "1.1.9",
+  "version": "1.3.1",
   "description": "Redis common component",
   "keywords": [
     "redis",
@@ -41,6 +41,7 @@
     "@babel/preset-env": "^7.28.0",
     "@babel/preset-typescript": "^7.27.1",
     "@eslint/js": "^9.33.0",
+    "@types/express": "^5.0.6",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.2.1",
     "@typescript-eslint/eslint-plugin": "^8.39.1",
@@ -67,10 +68,10 @@
     }
   },
   "dependencies": {
-    "@leyyo/common": "^1.2.4",
-    "@leyyo/env": "^1.2.5",
-    "@samet-it/be-base-common": "^1.1.5",
-    "@samet-it/be-cache-common": "^1.1.8",
+    "@leyyo/common": "^1.3.7",
+    "@leyyo/env": "^1.3.4",
+    "@samet-it/be-base-common": "^1.3.1",
+    "@samet-it/be-cache-common": "^1.3.1",
     "redis": "^5.10.0"
   }
 }