@samet-it/be-redis-common 1.3.2 → 1.3.4

package/README.md

@@ -28,7 +28,7 @@ npm i @samet-it/be-redis-common
 ```
 
 ## Environments
-- [RedisCommonConf](./src/config/redis-common.config.ts)
+- [RedisCommonConf](./src/config/redis-common.env.ts)
 
 | Name              | Type    | Default | Required | Secret | Description              |
 |-------------------|---------|---------|----------|--------|--------------------------|

package/dist/channel/index.d.ts

@@ -1,3 +1,3 @@
-export * from './index.types.js';
-export * from './redis.channel.js';
-export * from './redis-direct.channel.js';
+export * from "./index.types.js";
+export * from "./redis.channel.js";
+export * from "./redis-direct.channel.js";

package/dist/channel/index.js

@@ -1,3 +1,3 @@
-export * from './index.types.js';
-export * from './redis.channel.js';
-export * from './redis-direct.channel.js';
+export * from "./index.types.js";
+export * from "./redis.channel.js";
+export * from "./redis-direct.channel.js";

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

@@ -17,7 +17,7 @@ export class RedisDirectChannel extends RedisChannel {
      * */
     constructor(conn, opt) {
         super(conn, opt);
-        this.logger = logCommon.of(`RedisDirect${opt.name ? '#' + opt.name : ''}`);
+        this.logger = logCommon.of(`RedisDirect${opt.name ? "#" + opt.name : ""}`);
     }
 }
 setFqn(RedisDirectChannel, FQN);

package/dist/channel/redis.channel.js

@@ -36,14 +36,14 @@ export class RedisChannel extends CacheChannel {
         if (!this.isConnected) {
             return undefined;
         }
-        if (typeof path !== 'string') {
+        if (typeof path !== "string") {
             return undefined;
         }
         try {
-            return await this.client.get(path);
+            return (await this.client.get(path));
         }
         catch (e) {
-            this.checkError(e, { name: 'GET', method: '$get' });
+            this.checkError(e, { name: "GET", method: "$get" });
         }
         return undefined;
     }
@@ -61,7 +61,7 @@ export class RedisChannel extends CacheChannel {
                 return rec ? [rec] : [];
             }
             catch (e) {
-                this.checkError(e, { name: 'GET', method: '$getMore' });
+                this.checkError(e, { name: "GET", method: "$getMore" });
                 return [];
             }
         }
@@ -69,7 +69,7 @@ export class RedisChannel extends CacheChannel {
             return (await this.client.mGet(paths));
         }
         catch (e) {
-            this.checkError(e, { name: 'MGET', method: '$getMore' });
+            this.checkError(e, { name: "MGET", method: "$getMore" });
             return [];
         }
     }
@@ -78,7 +78,7 @@ export class RedisChannel extends CacheChannel {
         if (!this.isConnected) {
             return false;
         }
-        if (typeof path !== 'string' || typeof value !== 'string') {
+        if (typeof path !== "string" || typeof value !== "string") {
             return false;
         }
         try {
@@ -86,7 +86,7 @@ export class RedisChannel extends CacheChannel {
             return true;
         }
         catch (e) {
-            this.checkError(e, { name: 'SET', method: '$set' });
+            this.checkError(e, { name: "SET", method: "$set" });
         }
         return false;
     }
@@ -95,20 +95,21 @@ export class RedisChannel extends CacheChannel {
         if (!this.isConnected) {
             return 0;
         }
-        if (!map || typeof map !== 'object' || Array.isArray(map)) {
+        if (!map || typeof map !== "object" || Array.isArray(map)) {
             return 0;
         }
         const keys = Object.keys(map);
+        let key;
         switch (keys.length) {
             case 0:
                 return 0;
             case 1:
-                const key = keys[0];
+                key = keys[0];
                 try {
                     await this.client.set(key, map[key]);
                 }
                 catch (e) {
-                    this.checkError(e, { name: 'SET', method: '$setMore' });
+                    this.checkError(e, { name: "SET", method: "$setMore" });
                 }
                 return 1;
             default:
@@ -116,7 +117,7 @@ export class RedisChannel extends CacheChannel {
                     await this.client.mSet(map);
                 }
                 catch (e) {
-                    this.checkError(e, { name: 'MSET', method: '$setMore' });
+                    this.checkError(e, { name: "MSET", method: "$setMore" });
                 }
                 return keys.length;
         }
@@ -126,7 +127,7 @@ export class RedisChannel extends CacheChannel {
         if (!this.isConnected) {
             return false;
         }
-        if (typeof path !== 'string') {
+        if (typeof path !== "string") {
             return false;
         }
         try {
@@ -134,7 +135,7 @@ export class RedisChannel extends CacheChannel {
             return result > 0;
         }
         catch (e) {
-            this.checkError(e, { name: 'DEL', method: '$delete' });
+            this.checkError(e, { name: "DEL", method: "$delete" });
         }
         return false;
     }
@@ -150,7 +151,7 @@ export class RedisChannel extends CacheChannel {
             await this.client.del(paths);
         }
         catch (e) {
-            this.checkError(e, { name: 'DEL', method: '$deleteMore' });
+            this.checkError(e, { name: "DEL", method: "$deleteMore" });
         }
         return paths.length;
     }
@@ -166,7 +167,7 @@ export class RedisChannel extends CacheChannel {
             await this.client.sAdd(idPath, paths);
         }
         catch (e) {
-            this.checkError(e, { name: 'SADD', method: '$addLinks' });
+            this.checkError(e, { name: "SADD", method: "$addLinks" });
         }
         return paths.length;
     }
@@ -179,7 +180,7 @@ export class RedisChannel extends CacheChannel {
             return (await this.client.expire(path, seconds)) > 0;
         }
         catch (e) {
-            this.checkError(e, { name: 'EXPIRE', method: '$expire' });
+            this.checkError(e, { name: "EXPIRE", method: "$expire" });
         }
     }
     /** @inheritDoc */
@@ -191,7 +192,7 @@ export class RedisChannel extends CacheChannel {
             return (await this.client.sMembers(idPath)) ?? [];
         }
         catch (e) {
-            this.checkError(e, { name: 'SMEMBERS', method: '$getLinks' });
+            this.checkError(e, { name: "SMEMBERS", method: "$getLinks" });
         }
     }
 }

package/dist/config/index.d.ts

@@ -1,2 +1,2 @@
-export * from './redis-common.config.js';
-export * from './index.types.js';
+export * from "./redis-common.env.js";
+export * from "./index.types.js";

package/dist/config/index.js

@@ -1,2 +1,2 @@
-export * from './redis-common.config.js';
-export * from './index.types.js';
+export * from "./redis-common.env.js";
+export * from "./index.types.js";

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

@@ -1,5 +1,5 @@
-import { EnvBase } from "@leyyo/env";
-export interface RedisCommonConf extends EnvBase {
+import { EnvBase } from "@samet-it/be-base-common";
+export interface RedisCommonEnv extends EnvBase {
     /**
      * Redis Enabled
      * */

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

@@ -0,0 +1,5 @@
+import { RedisCommonEnv } from "./index.types.js";
+/**
+ * Redis common config
+ * */
+export declare const redisCommonEnv: import("@samet-it/be-base-common").EnvScopeRuntime<RedisCommonEnv, "REDIS", undefined>;

package/dist/config/redis-common.env.js

@@ -0,0 +1,45 @@
+import { envCore } from "@samet-it/be-base-common";
+/**
+ * Redis common config
+ * */
+export const redisCommonEnv = envCore.configure
+    .scope("RedisCommonEnv", "REDIS")
+    .start()
+    // @formatter:off
+    .field("ENABLED")
+    .boolean()
+    .def(true)
+    .end()
+    .field("PROTOCOL")
+    .off((v) => !v.ENABLED)
+    .text()
+    .def("redis")
+    .end()
+    .field("HOST")
+    .off((v) => !v.ENABLED)
+    .text()
+    .required()
+    .end()
+    .field("PORT")
+    .off((v) => !v.ENABLED)
+    .integer()
+    .def(6379)
+    .end()
+    .field("USER")
+    .off((v) => !v.ENABLED)
+    .text()
+    .end()
+    .field("PASS")
+    .off((v) => !v.ENABLED)
+    .text()
+    .end()
+    .field("PREFIX")
+    .off((v) => !v.ENABLED)
+    .text()
+    .end()
+    .field("DB_NUMBER")
+    .off((v) => !v.ENABLED)
+    .integer()
+    .end()
+    // @formatter:on
+    .finish();

package/dist/connection/index.d.ts

@@ -1,4 +1,4 @@
-export * from './index.types.js';
-export * from './redis.connection.js';
-export * from './redis-direct.connection.js';
-export * from './redis-connection.fn.js';
+export * from "./index.types.js";
+export * from "./redis.connection.js";
+export * from "./redis-direct.connection.js";
+export * from "./redis-connection.fn.js";

package/dist/connection/index.js

@@ -1,4 +1,4 @@
-export * from './index.types.js';
-export * from './redis.connection.js';
-export * from './redis-direct.connection.js';
-export * from './redis-connection.fn.js';
+export * from "./index.types.js";
+export * from "./redis.connection.js";
+export * from "./redis-direct.connection.js";
+export * from "./redis-connection.fn.js";

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

@@ -13,7 +13,7 @@ export class RedisDirectConnection extends RedisConnection {
      * */
     constructor(opt) {
         super(opt);
-        this.logger = logCommon.of(`RedisConnection${opt?.name ? '#' + opt?.name : ''}`);
+        this.logger = logCommon.of(`RedisConnection${opt?.name ? "#" + opt?.name : ""}`);
     }
     /** @inheritDoc */
     newChannel(opt) {

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

@@ -1,4 +1,4 @@
-import { RedisClientType } from 'redis';
+import { RedisClientType } from "redis";
 import { RedisConnectionLike, RedisConnOpt, RedisConnProps } from "./index.types.js";
 import { CacheConnection } from "@samet-it/be-cache-common";
 /**

package/dist/connection/redis.connection.js

@@ -1,5 +1,5 @@
-import * as redis from 'redis';
-import { redisCommonConfig } from "../config/index.js";
+import * as redis from "redis";
+import { redisCommonEnv } from "../config/index.js";
 import { CacheConnection, CacheError } from "@samet-it/be-cache-common";
 import { errorCommon, logCommon, setFqn } from "@samet-it/be-base-common";
 import { FQN } from "../internal.js";
@@ -74,9 +74,9 @@ export class RedisConnection extends CacheConnection {
      * */
     _readFromEnv() {
         const { _props: props } = this;
-        let env = redisCommonConfig.valueShort;
+        let env = redisCommonEnv.valueShort;
         if (props.envVariant) {
-            env = redisCommonConfig.configure.getVariation(props.envVariant).valueShort;
+            env = redisCommonEnv.configure.getVariation(props.envVariant).valueShort;
         }
         props.isEnabled = props.isEnabled ?? env.ENABLED;
         props.protocol = props.protocol ?? env.PROTOCOL;
@@ -91,21 +91,21 @@ export class RedisConnection extends CacheConnection {
      * */
     _buildUrl() {
         const { username, password, dbNumber, port, host, protocol } = this._props;
-        let _secure = '';
+        let _secure = "";
         if (username) {
             _secure = username;
             if (password) {
-                _secure += ':' + password;
+                _secure += ":" + password;
             }
-            _secure += '@';
+            _secure += "@";
         }
-        let _db = '';
+        let _db = "";
         if (dbNumber !== undefined) {
-            _db = '/' + dbNumber;
+            _db = "/" + dbNumber;
         }
-        let _port = '';
+        let _port = "";
         if (port !== undefined) {
-            _port = ':' + port;
+            _port = ":" + port;
         }
         this._props.producedUrl = `${protocol}://${_secure}${host}${_port}${_db}`;
     }
@@ -127,30 +127,30 @@ export class RedisConnection extends CacheConnection {
             return true;
         }
         if (this._props.connectTryCount > RedisConnection.CONN_TRY_COUNT) {
-            const err = new CacheError('Maximum try county', { tryCount: this._props.connectTryCount });
-            this.logger.error(errorCommon.text(err, 'connect'));
+            const err = new CacheError("Maximum try county", { tryCount: this._props.connectTryCount });
+            this.logger.error(errorCommon.text(err, "connect"));
             return false;
         }
         try {
             props.client = redis.createClient({ url: this._props.producedUrl });
             props.client
-                .on("error", err => {
-                this.logger.warn(errorCommon.text(err, 'connection', this._props.connectTryCount));
+                .on("error", (err) => {
+                this.logger.warn(errorCommon.text(err, "connection", this._props.connectTryCount));
                 props.connectTryCount++;
                 const old = this.isConnected;
                 props.isConnected = false;
                 if (old) {
-                    this._triggerOnCase('disconnected', this._onDisconnected, false);
+                    this._triggerOnCase("disconnected", this._onDisconnected, false);
                 }
                 setTimeout(() => this.connect().then(), this._connectionDelay);
             })
-                .on('connect', () => {
+                .on("connect", () => {
                 this.logger.info(`on[connect]`);
                 props.isConnected = true;
                 props.connectTryCount = 0;
-                this._triggerOnCase('connected', this._onConnected, false);
+                this._triggerOnCase("connected", this._onConnected, false);
                 if (props.isFirst === undefined) {
-                    this._triggerOnCase('first-connected', this._onFirstConnected, true);
+                    this._triggerOnCase("first-connected", this._onFirstConnected, true);
                     props.isFirst = false;
                 }
                 // clear stopped ping
@@ -159,16 +159,16 @@ export class RedisConnection extends CacheConnection {
                     setTimeout(() => this.ping(true).then(), 30_000);
                 }
             })
-                .on('ready', () => this.logger.info('on[ready]'))
-                .on('close', () => this.logger.info('on[close]'))
-                .on('reconnecting', () => this.logger.info('on[reconnecting]'))
-                .on('end', () => this.logger.info('on[end]'));
+                .on("ready", () => this.logger.info("on[ready]"))
+                .on("close", () => this.logger.info("on[close]"))
+                .on("reconnecting", () => this.logger.info("on[reconnecting]"))
+                .on("end", () => this.logger.info("on[end]"));
             await props.client.connect();
-            this.logger.info('Connected');
+            this.logger.info("Connected");
             setTimeout(() => this.ping(true).then(), 30_000);
         }
         catch (e) {
-            this.logger.warn(errorCommon.text(e, 'connection', this._props.connectTryCount));
+            this.logger.warn(errorCommon.text(e, "connection", this._props.connectTryCount));
         }
         return true;
     }
@@ -178,8 +178,8 @@ export class RedisConnection extends CacheConnection {
             return false;
         }
         if (this._props.pingTryCount > RedisConnection.PING_TRY_COUNT) {
-            const err = new CacheError('Maximum try county', { tryCount: this._props.pingTryCount });
-            this.logger.error(errorCommon.text(err, 'connect'));
+            const err = new CacheError("Maximum try county", { tryCount: this._props.pingTryCount });
+            this.logger.error(errorCommon.text(err, "connect"));
             return false;
         }
         let result = false;
@@ -191,7 +191,7 @@ export class RedisConnection extends CacheConnection {
             }
             catch (err) {
                 this._props.pingTryCount++;
-                this.logger.warn(errorCommon.text(err, 'ping', this._props.pingTryCount));
+                this.logger.warn(errorCommon.text(err, "ping", this._props.pingTryCount));
                 setTimeout(() => this.ping(true).then(), this._pingDelay);
                 next = false;
             }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export * from './connection/index.js';
-export * from './config/index.js';
-export * from './channel/index.js';
-export * from './index.foretell.js';
-export * from './index.loader.js';
+export * from "./connection/index.js";
+export * from "./config/index.js";
+export * from "./channel/index.js";
+export * from "./index.foretell.js";
+export * from "./index.loader.js";

package/dist/index.foretell.d.ts

@@ -1 +1 @@
-export declare const foretell_sametRedisCommon: any[];
+export declare const foretell_sametRedisCommon: (() => void)[];

package/dist/index.js

@@ -1,5 +1,5 @@
-export * from './connection/index.js';
-export * from './config/index.js';
-export * from './channel/index.js';
-export * from './index.foretell.js';
-export * from './index.loader.js';
+export * from "./connection/index.js";
+export * from "./config/index.js";
+export * from "./channel/index.js";
+export * from "./index.foretell.js";
+export * from "./index.loader.js";

package/dist/index.loader.d.ts

@@ -1 +1 @@
-export declare const loader_sametRedisCommon: import("@leyyo/common").LoaderLike;
+export declare const loader_sametRedisCommon: import("@samet-it/be-base-common").LoaderLike;

package/dist/index.loader.js

@@ -1,4 +1,4 @@
-import { defineLoader } from "@leyyo/common";
+import { defineLoader } from "@samet-it/be-base-common";
 import { FQN } from "./internal.js";
 import { loader_sametBaseCommon } from "@samet-it/be-base-common";
 import { loader_sametCacheCommon } from "@samet-it/be-cache-common/dist/index.loader.js";
@@ -7,4 +7,4 @@ export const loader_sametRedisCommon = defineLoader(FQN,
 // dependencies
 ...loader_sametBaseCommon, ...loader_sametCacheCommon, 
 // classes
-() => import('./channel/redis.channel.js').then(m => m.RedisChannel), () => import('./channel/redis-direct.channel.js').then(m => m.RedisDirectChannel), () => import('./connection/redis.connection.js').then(m => m.RedisConnection), () => import('./connection/redis-direct.connection.js').then(m => m.RedisDirectConnection), () => import('./config/redis-common.config.js').then(m => m.redisCommonConfig));
+() => import("./channel/redis.channel.js").then((m) => m.RedisChannel), () => import("./channel/redis-direct.channel.js").then((m) => m.RedisDirectChannel), () => import("./connection/redis.connection.js").then((m) => m.RedisConnection), () => import("./connection/redis-direct.connection.js").then((m) => m.RedisDirectConnection), () => import("./config/redis-common.env.js").then((m) => m.redisCommonEnv));

package/dist/internal.d.ts

@@ -1 +1 @@
-export declare const NME: string, FQN: string, VER: string, CNF: import("@samet-it/be-base-common").LeyyoConfig;
+export declare const NME: string, FQN: string, VER: string;

package/dist/internal.js

@@ -1,2 +1,3 @@
-import { sysAll } from "@samet-it/be-base-common";
-export const { pck: { name: NME, fqn: FQN, version: VER }, config: CNF } = sysAll(import.meta.url);
+import { packageJson } from "@leyyo/common";
+// noinspection JSUnusedGlobalSymbols
+export const { name: NME, fqn: FQN, version: VER } = packageJson(import.meta.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-redis-common",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Redis common component",
   "keywords": [
     "redis",
@@ -22,54 +22,40 @@
   "main": "dist/index.js",
   "type": "module",
   "scripts": {
-    "clear": "rimraf dist && rimraf coverage",
-    "clear:nm": "rimraf node_modules && npm run clear",
-    "lint": "eslint src/**/*.ts --quiet",
-    "lint:verbose": "eslint src/**/*.ts",
+    "clear": "rimraf dist",
+    "lint": "eslint src/**/*.ts",
+    "lint:fix": "eslint src/**/*.ts --fix",
+    "format": "prettier --check \"{src,test}/**/*.{ts,tsx,js}\"",
+    "format:force": "prettier --write \"{src,test}/**/*.{ts,tsx,js}\"",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
     "asset": "node -r ts-node/register commands/assets.js",
     "build": "npm run clear && tsc && npm run asset",
-    "test": "jest --config=jest.json --detectOpenHandles",
-    "coverage": "rimraf coverage && jest --config=jest.json --coverage --coverageDirectory=coverage",
-    "sample": "node -r ts-node/register src/sample.ts",
-    "publish:public": "npm run build && npm publish -access=public"
+    "publish:public": "npm run lint && npm run format:force && npm run test && npm run build && npm publish --access=public"
   },
   "files": [
     "dist/*"
   ],
   "license": "ISC",
   "devDependencies": {
-    "@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",
+    "@eslint/js": "^9.0.0",
     "@types/node": "^24.2.1",
-    "@typescript-eslint/eslint-plugin": "^8.39.1",
-    "@typescript-eslint/parser": "^8.39.1",
-    "eslint": "^9.33.0",
+    "@vitest/coverage-istanbul": "^4.0.18",
+    "eslint": "^9.0.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^54.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "husky": "^9.1.7",
-    "jest": "^29.7.0",
-    "prettier": "^3.6.2",
+    "eslint-plugin-n": "^17.24.0",
+    "prettier": "^3.8.1",
     "rimraf": "^6.0.1",
-    "test": "^3.3.0",
-    "ts-jest": "^29.4.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.39.1"
-  },
-  "overrides": {
-    "eslint-config-standard": {
-      "eslint": "^9.33.0"
-    }
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.0.0",
+    "vitest": "^4.0.18",
+    "@types/express": "^5.0.6"
   },
   "dependencies": {
-    "@samet-it/be-base-common": "^1.3.4",
-    "@samet-it/be-cache-common": "^1.3.5",
+    "@samet-it/be-base-common": "^1.3.8",
+    "@samet-it/be-cache-common": "^1.3.8",
     "redis": "^5.10.0"
   }
 }

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

@@ -1,5 +0,0 @@
-import { RedisCommonConf } from "./index.types.js";
-/**
- * Redis common config
- * */
-export declare const redisCommonConfig: import("@samet-it/be-base-common").EnvScopeRuntime<RedisCommonConf, "REDIS", undefined>;

package/dist/config/redis-common.config.js

@@ -1,32 +0,0 @@
-import { envCore } from "@samet-it/be-base-common";
-/**
- * Redis common config
- * */
-export const redisCommonConfig = envCore.configure
-    .scope('RedisCommon', 'REDIS')
-    .start()
-    // @formatter:off
-    .field('ENABLED').boolean().def(true).end()
-    .field('PROTOCOL')
-    .off(v => !v.ENABLED)
-    .text().def('redis').end()
-    .field('HOST')
-    .off(v => !v.ENABLED)
-    .text().required().end()
-    .field('PORT')
-    .off(v => !v.ENABLED)
-    .integer().def(6379).end()
-    .field('USER')
-    .off(v => !v.ENABLED)
-    .text().end()
-    .field('PASS')
-    .off(v => !v.ENABLED)
-    .text().end()
-    .field('PREFIX')
-    .off(v => !v.ENABLED)
-    .text().end()
-    .field('DB_NUMBER')
-    .off(v => !v.ENABLED)
-    .integer().end()
-    // @formatter:on
-    .finish();