@samet-it/be-redis-common 1.1.1 → 1.1.3

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

@@ -5,8 +5,12 @@ import type { RedisClientType } from "redis";
 import type { KeyValue } from "@leyyo/common";
 /**
  * Redis channel interface
+ *
+ * Generics:
+ * - 0-`ENT`: entity {@link Entity}
+ * - 1-`ID`: id type {@link KeyValue}
  * */
-export interface RedisChannelLike<ID extends KeyValue, ENTITY extends Entity<ID>> extends CacheChannelLike<RedisConnectionLike, ID, ENTITY> {
+export interface RedisChannelLike<ENT extends Entity<ID>, ID extends KeyValue> extends CacheChannelLike<RedisConnectionLike, ENT, ID> {
     /** @inheritDoc */
     get props(): Readonly<RedisChannelProps>;
 }

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

@@ -5,8 +5,12 @@ import type { RedisDirectChannelOpt } from "./index.types";
 import type { KeyValue } from "@leyyo/common";
 /**
  * Redis direct channel class
+ *
+ * Generics:
+ * - 0-`ENT`: entity {@link Entity}
+ * - 1-`ID`: id type {@link KeyValue}
  * */
-export declare class RedisDirectChannel<ID extends KeyValue, ENTITY extends Entity<ID>> extends RedisChannel<ID, ENTITY> {
+export declare class RedisDirectChannel<ENT extends Entity<ID>, ID extends KeyValue> extends RedisChannel<ENT, ID> {
     /**
      * Constructor
      *

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

@@ -5,6 +5,10 @@ const redis_channel_1 = require("./redis.channel");
 const be_base_common_1 = require("@samet-it/be-base-common");
 /**
  * Redis direct channel class
+ *
+ * Generics:
+ * - 0-`ENT`: entity {@link Entity}
+ * - 1-`ID`: id type {@link KeyValue}
  * */
 class RedisDirectChannel extends redis_channel_1.RedisChannel {
     /**

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

@@ -2,15 +2,24 @@ import type { RedisConnectionLike } from "../connection";
 import type { RedisChannelProps, RedisChannelLike, RedisChannelOpt } from "./index.types";
 import { type Entity } from "@samet-it/be-base-common";
 import { CacheChannel } from "@samet-it/be-cache-common";
-import type { KeyValue, Opt } from "@leyyo/common";
+import type { KeyValue } from "@leyyo/common";
 /**
  * Redis abstract channel class
+ *
+ * Generics:
+ * - 0-`ENT`: entity {@link Entity}
+ * - 1-`ID`: id type {@link KeyValue}
  * */
-export declare abstract class RedisChannel<ID extends KeyValue, ENTITY extends Entity<ID>> extends CacheChannel<RedisConnectionLike, ID, ENTITY> implements RedisChannelLike<ID, ENTITY> {
+export declare abstract class RedisChannel<ENT extends Entity<ID>, ID extends KeyValue> extends CacheChannel<RedisConnectionLike, ENT, ID> implements RedisChannelLike<ENT, ID> {
     /** @inheritDoc */
     protected _props: RedisChannelProps;
+    /**
+     * Constructor
+     *
+     * @param {RedisConnectionLike} conn - redis connection
+     * @param {RedisChannelOpt} opt - options
+     * */
     protected constructor(conn: RedisConnectionLike, opt?: RedisChannelOpt);
-    protected _checkError(e: Error, opt?: Opt): void;
     /** @inheritDoc */
     get props(): Readonly<RedisChannelProps>;
     /** @inheritDoc */

package/dist/channel/redis.channel.js

@@ -10,14 +10,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisChannel = void 0;
-const be_base_common_1 = require("@samet-it/be-base-common");
 const be_cache_common_1 = require("@samet-it/be-cache-common");
 // noinspection JSUnusedGlobalSymbols
 /**
  * Redis abstract channel class
+ *
+ * Generics:
+ * - 0-`ENT`: entity {@link Entity}
+ * - 1-`ID`: id type {@link KeyValue}
  * */
 class RedisChannel extends be_cache_common_1.CacheChannel {
     // endregion protected-property
+    /**
+     * Constructor
+     *
+     * @param {RedisConnectionLike} conn - redis connection
+     * @param {RedisChannelOpt} opt - options
+     * */
     constructor(conn, opt) {
         super(conn, opt);
         conn.onFirstConnected(() => __awaiter(this, void 0, void 0, function* () {
@@ -33,16 +42,6 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
             this._props.isConnected = false;
         }));
     }
-    _checkError(e, opt) {
-        be_base_common_1.errorHandler.addStat(e);
-        if (e instanceof be_cache_common_1.CacheError) {
-            // todo append params
-            throw e;
-        }
-        else {
-            throw be_base_common_1.errorHandler.common.castForClass(be_cache_common_1.CacheError, e, opt);
-        }
-    }
     // region getter
     /** @inheritDoc */
     get props() {
@@ -53,7 +52,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
     /** @inheritDoc */
     $get(...paths) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { client } = this._props;
+            const { client, conn } = this._props;
             if (!client) {
                 return [];
             }
@@ -68,14 +67,14 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                 return (yield client.mGet(paths));
             }
             catch (e) {
-                this._checkError(e, { redis: 'MGET' });
+                conn.checkError(e, { name: 'MGET', method: '$get' });
             }
         });
     }
     /** @inheritDoc */
     $set(map) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { client } = this._props;
+            const { client, conn } = this._props;
             if (!client) {
                 return 0;
             }
@@ -92,7 +91,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                         yield client.set(key, map[key]);
                     }
                     catch (e) {
-                        this._checkError(e, { redis: 'SET' });
+                        conn.checkError(e, { name: 'SET', method: '$set' });
                     }
                     return 1;
                 default:
@@ -100,7 +99,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                         yield client.mSet(map);
                     }
                     catch (e) {
-                        this._checkError(e, { redis: 'MSET' });
+                        conn.checkError(e, { name: 'MSET', method: '$set' });
                     }
                     return keys.length;
             }
@@ -109,7 +108,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
     /** @inheritDoc */
     $delete(...paths) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { client } = this._props;
+            const { client, conn } = this._props;
             if (!client) {
                 return 0;
             }
@@ -120,7 +119,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                 yield client.del(paths);
             }
             catch (e) {
-                this._checkError(e, { redis: 'DEL' });
+                conn.checkError(e, { name: 'DEL', method: '$delete' });
             }
             return paths.length;
         });
@@ -128,7 +127,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
     /** @inheritDoc */
     $addLinks(idPath, paths) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { client } = this._props;
+            const { client, conn } = this._props;
             if (!client) {
                 return 0;
             }
@@ -139,7 +138,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                 yield client.sAdd(idPath, paths);
             }
             catch (e) {
-                this._checkError(e, { redis: 'SADD' });
+                conn.checkError(e, { name: 'SADD', method: '$addLinks' });
             }
             return paths.length;
         });
@@ -147,7 +146,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
     /** @inheritDoc */
     $expire(path, seconds) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { client } = this._props;
+            const { client, conn } = this._props;
             if (!client) {
                 return false;
             }
@@ -155,7 +154,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                 return (yield client.expire(path, seconds)) > 0;
             }
             catch (e) {
-                this._checkError(e, { redis: 'EXPIRE' });
+                conn.checkError(e, { name: 'EXPIRE', method: '$expire' });
             }
         });
     }
@@ -163,7 +162,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
     $getLinks(idPath) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const { client } = this._props;
+            const { client, conn } = this._props;
             if (!client) {
                 return [];
             }
@@ -171,7 +170,7 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
                 return (_a = (yield client.sMembers(idPath))) !== null && _a !== void 0 ? _a : [];
             }
             catch (e) {
-                this._checkError(e, { redis: 'SMEMBERS' });
+                conn.checkError(e, { name: 'SMEMBERS', method: '$getLinks' });
             }
         });
     }

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

@@ -18,10 +18,14 @@ export interface RedisDirectConnectionLike extends RedisConnectionLike {
     /**
      * Create new channel
      *
+     * Generics:
+     * - 0-`ENT`: entity {@link Entity}
+     * - 1-`ID`: id type {@link KeyValue}
+     *
      * @param {RedisDirectChannelOpt?} opt - direct channel options
      * @return {RedisChannelLike<Entity>} - new channel
      * */
-    newChannel<ID extends KeyValue, ENTITY extends Entity<ID>>(opt?: RedisDirectChannelOpt): RedisChannelLike<ID, ENTITY>;
+    newChannel<ENT extends Entity<ID>, ID extends KeyValue>(opt?: RedisDirectChannelOpt): RedisChannelLike<ENT, ID>;
 }
 /**
  * Redis connection option

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

@@ -14,5 +14,5 @@ export declare class RedisDirectConnection extends RedisConnection implements Re
      * */
     constructor(opt?: RedisConnDirectOpt);
     /** @inheritDoc */
-    newChannel<ID extends KeyValue, ENTITY extends Entity<ID>>(opt?: RedisDirectChannelOpt): RedisChannelLike<ID, ENTITY>;
+    newChannel<ENT extends Entity<ID>, ID extends KeyValue>(opt?: RedisDirectChannelOpt): RedisChannelLike<ENT, ID>;
 }

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

@@ -24,6 +24,11 @@ export declare abstract class RedisConnection extends CacheConnection<RedisExecO
     private static readonly TRY_COUNT;
     /** {@inheritDoc} */
     protected _props: RedisConnProps;
+    /**
+     * Constructor
+     *
+     * @param {RedisConnOpt} opt - options
+     * */
     protected constructor(opt?: RedisConnOpt);
     /** @inheritDoc */
     get props(): Readonly<RedisConnProps>;

package/dist/connection/redis.connection.js

@@ -46,11 +46,17 @@ exports.RedisConnection = void 0;
 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");
 /**
  * Redis connection abstract class
  * */
 class RedisConnection extends be_cache_common_1.CacheConnection {
     // endregion protected-property
+    /**
+     * Constructor
+     *
+     * @param {RedisConnOpt} opt - options
+     * */
     constructor(opt) {
         super(opt);
         this._props.tryCount = 0;
@@ -122,7 +128,8 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
                 return true;
             }
             if (this._props.tryCount > RedisConnection.TRY_COUNT) {
-                this.logger.error(`on[error/*], maximum try`);
+                const err = new be_cache_common_1.CacheError('Maximum try county', { count: this._props.tryCount });
+                this.logger.error(be_base_common_1.errorHandler.common.logText(err, 'connect', 'try', this._props.tryCount));
                 return false;
             }
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-redis-common",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Redis common component",
   "keywords": [
     "redis",
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@leyyo/common": "^1.2.1",
+    "@leyyo/common": "^1.2.3",
     "@leyyo/env": "^1.2.1",
-    "@samet-it/be-base-common": "^1.1.1",
-    "@samet-it/be-cache-common": "^1.1.1",
+    "@samet-it/be-base-common": "^1.1.3",
+    "@samet-it/be-cache-common": "^1.1.3",
     "redis": "^5.10.0"
   }
 }