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

package/dist/channel/index.d.ts

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

package/dist/channel/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./index.types"), exports);
-__exportStar(require("./redis.channel"), exports);
-__exportStar(require("./redis-direct.channel"), exports);
+export * from './index.types.js';
+export * from './redis.channel.js';
+export * from './redis-direct.channel.js';

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

@@ -1,8 +1,7 @@
-import type { RedisConnectionLike } from "../connection";
-import type { CacheChannelProps, CacheChannelLike, CacheChannelOpt, CacheExecOpt } 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/index.js";
+import { CacheChannelLike, CacheChannelOpt, CacheChannelProps, CacheExecOpt } from "@samet-it/be-cache-common";
+import { Entity, KeyValue } from "@samet-it/be-base-common";
+import { RedisClientType } from "redis";
 /**
  * Redis channel interface
  *

package/dist/channel/index.types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

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

@@ -1,8 +1,7 @@
-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 { RedisChannel } from "./redis.channel.js";
+import { type Entity, KeyValue } from "@samet-it/be-base-common";
+import { RedisConnectionLike } from "../connection/index.js";
+import { RedisDirectChannelOpt } from "./index.types.js";
 /**
  * Redis direct channel class
  *

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

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisDirectChannel = void 0;
-const redis_channel_1 = require("./redis.channel");
-const be_base_common_1 = require("@samet-it/be-base-common");
+import { RedisChannel } from "./redis.channel.js";
+import { logCommon, setFqn } from "@samet-it/be-base-common";
+import { FQN } from "../internal.js";
 /**
  * Redis direct channel class
  *
@@ -10,7 +8,7 @@ const be_base_common_1 = require("@samet-it/be-base-common");
  * - 0-`ENT`: entity {@link Entity}
  * - 1-`ID`: id type {@link KeyValue}
  * */
-class RedisDirectChannel extends redis_channel_1.RedisChannel {
+export class RedisDirectChannel extends RedisChannel {
     /**
      * Constructor
      *
@@ -19,7 +17,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 = logCommon.of(`RedisDirect${opt.name ? '#' + opt.name : ''}`);
     }
 }
-exports.RedisDirectChannel = RedisDirectChannel;
+setFqn(RedisDirectChannel, FQN);

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

@@ -1,9 +1,8 @@
-import type { RedisConnectionLike } from "../connection";
-import type { RedisChannelProps, RedisChannelLike, RedisChannelOpt, RedisExecOpt } from "./index.types";
-import { type Entity } from "@samet-it/be-base-common";
+import { RedisConnectionLike } from "../connection/index.js";
+import { RedisChannelLike, RedisChannelOpt, RedisChannelProps, RedisExecOpt } from "./index.types.js";
+import { Entity, KeyValue } 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 { RedisClientType } from "redis";
 /**
  * Redis abstract channel class
  *

package/dist/channel/redis.channel.js

@@ -1,16 +1,6 @@
-"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.RedisChannel = void 0;
-const be_cache_common_1 = require("@samet-it/be-cache-common");
+import { setFqn } from "@samet-it/be-base-common";
+import { CacheChannel } from "@samet-it/be-cache-common";
+import { FQN } from "../internal.js";
 // noinspection JSUnusedGlobalSymbols
 /**
  * Redis abstract channel class
@@ -19,7 +9,7 @@ const be_cache_common_1 = require("@samet-it/be-cache-common");
  * - 0-`ENT`: entity {@link Entity}
  * - 1-`ID`: id type {@link KeyValue}
  * */
-class RedisChannel extends be_cache_common_1.CacheChannel {
+export class RedisChannel extends CacheChannel {
     // endregion protected-property
     /**
      * Constructor
@@ -42,186 +32,167 @@ class RedisChannel extends be_cache_common_1.CacheChannel {
     // endregion getter
     // region native-calls
     /** @inheritDoc */
-    $get(path, opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return undefined;
-            }
-            if (typeof path !== 'string') {
-                return undefined;
-            }
-            try {
-                return yield this.client.get(path);
-            }
-            catch (e) {
-                this.checkError(e, { name: 'GET', method: '$get' });
-            }
+    async $get(path, opt) {
+        if (!this.isConnected) {
+            return undefined;
+        }
+        if (typeof path !== 'string') {
             return undefined;
-        });
+        }
+        try {
+            return await this.client.get(path);
+        }
+        catch (e) {
+            this.checkError(e, { name: 'GET', method: '$get' });
+        }
+        return undefined;
     }
     /** @inheritDoc */
-    $getMore(paths, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return [];
-            }
-            if (paths.length < 1) {
-                return [];
-            }
-            if (paths.length == 1) {
-                try {
-                    const rec = (yield this.client.get(paths[0]));
-                    return rec ? [rec] : [];
-                }
-                catch (e) {
-                    this.checkError(e, { name: 'GET', method: '$getMore' });
-                    return [];
-                }
-            }
+    async $getMore(paths, _opt) {
+        if (!this.isConnected) {
+            return [];
+        }
+        if (paths.length < 1) {
+            return [];
+        }
+        if (paths.length == 1) {
             try {
-                return (yield this.client.mGet(paths));
+                const rec = (await this.client.get(paths[0]));
+                return rec ? [rec] : [];
             }
             catch (e) {
-                this.checkError(e, { name: 'MGET', method: '$getMore' });
+                this.checkError(e, { name: 'GET', method: '$getMore' });
                 return [];
             }
-        });
+        }
+        try {
+            return (await this.client.mGet(paths));
+        }
+        catch (e) {
+            this.checkError(e, { name: 'MGET', method: '$getMore' });
+            return [];
+        }
     }
     /** @inheritDoc */
-    $set(path, value, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return false;
-            }
-            if (typeof path !== 'string' || typeof value !== 'string') {
-                return false;
-            }
-            try {
-                yield this.client.set(path, value);
-                return true;
-            }
-            catch (e) {
-                this.checkError(e, { name: 'SET', method: '$set' });
-            }
+    async $set(path, value, _opt) {
+        if (!this.isConnected) {
+            return false;
+        }
+        if (typeof path !== 'string' || typeof value !== 'string') {
             return false;
-        });
+        }
+        try {
+            await this.client.set(path, value);
+            return true;
+        }
+        catch (e) {
+            this.checkError(e, { name: 'SET', method: '$set' });
+        }
+        return false;
     }
     /** @inheritDoc */
-    $setMore(map, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
+    async $setMore(map, _opt) {
+        if (!this.isConnected) {
+            return 0;
+        }
+        if (!map || typeof map !== 'object' || Array.isArray(map)) {
+            return 0;
+        }
+        const keys = Object.keys(map);
+        switch (keys.length) {
+            case 0:
                 return 0;
-            }
-            if (!map || typeof map !== 'object' || Array.isArray(map)) {
-                return 0;
-            }
-            const keys = Object.keys(map);
-            switch (keys.length) {
-                case 0:
-                    return 0;
-                case 1:
-                    const key = keys[0];
-                    try {
-                        yield this.client.set(key, map[key]);
-                    }
-                    catch (e) {
-                        this.checkError(e, { name: 'SET', method: '$setMore' });
-                    }
-                    return 1;
-                default:
-                    try {
-                        yield this.client.mSet(map);
-                    }
-                    catch (e) {
-                        this.checkError(e, { name: 'MSET', method: '$setMore' });
-                    }
-                    return keys.length;
-            }
-        });
+            case 1:
+                const key = keys[0];
+                try {
+                    await this.client.set(key, map[key]);
+                }
+                catch (e) {
+                    this.checkError(e, { name: 'SET', method: '$setMore' });
+                }
+                return 1;
+            default:
+                try {
+                    await this.client.mSet(map);
+                }
+                catch (e) {
+                    this.checkError(e, { name: 'MSET', method: '$setMore' });
+                }
+                return keys.length;
+        }
     }
     /** @inheritDoc */
-    $delete(path, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return false;
-            }
-            if (typeof path !== 'string') {
-                return false;
-            }
-            try {
-                const result = yield this.client.del(path);
-                return result > 0;
-            }
-            catch (e) {
-                this.checkError(e, { name: 'DEL', method: '$delete' });
-            }
+    async $delete(path, _opt) {
+        if (!this.isConnected) {
+            return false;
+        }
+        if (typeof path !== 'string') {
             return false;
-        });
+        }
+        try {
+            const result = await this.client.del(path);
+            return result > 0;
+        }
+        catch (e) {
+            this.checkError(e, { name: 'DEL', method: '$delete' });
+        }
+        return false;
     }
     /** @inheritDoc */
-    $deleteMore(paths, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return 0;
-            }
-            if (paths.length < 1) {
-                return 0;
-            }
-            try {
-                yield this.client.del(paths);
-            }
-            catch (e) {
-                this.checkError(e, { name: 'DEL', method: '$deleteMore' });
-            }
-            return paths.length;
-        });
+    async $deleteMore(paths, _opt) {
+        if (!this.isConnected) {
+            return 0;
+        }
+        if (paths.length < 1) {
+            return 0;
+        }
+        try {
+            await this.client.del(paths);
+        }
+        catch (e) {
+            this.checkError(e, { name: 'DEL', method: '$deleteMore' });
+        }
+        return paths.length;
     }
     /** @inheritDoc */
-    $addLinks(idPath, paths, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return 0;
-            }
-            if (paths.length < 1) {
-                return 0;
-            }
-            try {
-                yield this.client.sAdd(idPath, paths);
-            }
-            catch (e) {
-                this.checkError(e, { name: 'SADD', method: '$addLinks' });
-            }
-            return paths.length;
-        });
+    async $addLinks(idPath, paths, _opt) {
+        if (!this.isConnected) {
+            return 0;
+        }
+        if (paths.length < 1) {
+            return 0;
+        }
+        try {
+            await this.client.sAdd(idPath, paths);
+        }
+        catch (e) {
+            this.checkError(e, { name: 'SADD', method: '$addLinks' });
+        }
+        return paths.length;
     }
     /** @inheritDoc */
-    $expire(path, seconds, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isConnected) {
-                return false;
-            }
-            try {
-                return (yield this.client.expire(path, seconds)) > 0;
-            }
-            catch (e) {
-                this.checkError(e, { name: 'EXPIRE', method: '$expire' });
-            }
-        });
+    async $expire(path, seconds, _opt) {
+        if (!this.isConnected) {
+            return false;
+        }
+        try {
+            return (await this.client.expire(path, seconds)) > 0;
+        }
+        catch (e) {
+            this.checkError(e, { name: 'EXPIRE', method: '$expire' });
+        }
     }
     /** @inheritDoc */
-    $getLinks(idPath, _opt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.isConnected) {
-                return [];
-            }
-            try {
-                return (_a = (yield this.client.sMembers(idPath))) !== null && _a !== void 0 ? _a : [];
-            }
-            catch (e) {
-                this.checkError(e, { name: 'SMEMBERS', method: '$getLinks' });
-            }
-        });
+    async $getLinks(idPath, _opt) {
+        if (!this.isConnected) {
+            return [];
+        }
+        try {
+            return (await this.client.sMembers(idPath)) ?? [];
+        }
+        catch (e) {
+            this.checkError(e, { name: 'SMEMBERS', method: '$getLinks' });
+        }
     }
 }
-exports.RedisChannel = RedisChannel;
+setFqn(RedisChannel, FQN);

package/dist/config/index.d.ts

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

package/dist/config/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./redis-common.config"), exports);
-__exportStar(require("./index.types"), exports);
+export * from './redis-common.config.js';
+export * from './index.types.js';

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/index.types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

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

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

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

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redisCommonConfig = void 0;
-const env_1 = require("@leyyo/env");
+import { envCore } from "@samet-it/be-base-common";
 /**
  * Redis common config
  * */
-exports.redisCommonConfig = env_1.envCore.configure
+export const redisCommonConfig = envCore.configure
     .scope('RedisCommon', 'REDIS')
     .start()
     // @formatter:off

package/dist/connection/index.d.ts

@@ -1,4 +1,4 @@
-export * from './index.types';
-export * from './redis.connection';
-export * from './redis-direct.connection';
-export * from './redis-connection.fn';
+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,20 +1,4 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./index.types"), exports);
-__exportStar(require("./redis.connection"), exports);
-__exportStar(require("./redis-direct.connection"), exports);
-__exportStar(require("./redis-connection.fn"), exports);
+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.types.d.ts

@@ -1,9 +1,7 @@
-import type { CacheConnectionLike, CacheConnOpt } 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 type { KeyValue } from "@leyyo/common";
+import { CacheConnectionLike, CacheConnOpt, CacheConnProps } from "@samet-it/be-cache-common";
+import { RedisClientType } from "redis";
+import { Entity, KeyValue } from "@samet-it/be-base-common";
+import { RedisChannelLike, RedisDirectChannelOpt } from "../channel/index.js";
 /**
  * Redis connection interface
  * */

package/dist/connection/index.types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

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.js";
 /**
  * Crete new redis connection
  *

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

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redisConnection = redisConnection;
-const redis_direct_connection_1 = require("./redis-direct.connection");
+import { RedisDirectConnection } from "./redis-direct.connection.js";
 // noinspection JSUnusedGlobalSymbols
 /**
  * Crete new redis connection
@@ -9,6 +6,6 @@ const redis_direct_connection_1 = require("./redis-direct.connection");
  * @param {RedisConnDirectOpt} opt - option
  * @return {RedisDirectConnectionLike} - new redis connection
  * */
-function redisConnection(opt) {
-    return new redis_direct_connection_1.RedisDirectConnection(opt);
+export function redisConnection(opt) {
+    return new RedisDirectConnection(opt);
 }

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

@@ -1,8 +1,7 @@
-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 { RedisConnection } from "./redis.connection.js";
+import { Entity, KeyValue } from "@samet-it/be-base-common";
+import { RedisChannelLike, RedisDirectChannelOpt } from "../channel/index.js";
+import { RedisConnDirectOpt, RedisDirectConnectionLike } from "./index.types.js";
 /**
  * Redis connection direct class
  * */

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

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisDirectConnection = void 0;
-const redis_connection_1 = require("./redis.connection");
-const be_base_common_1 = require("@samet-it/be-base-common");
-const channel_1 = require("../channel");
+import { RedisConnection } from "./redis.connection.js";
+import { logCommon, setFqn } from "@samet-it/be-base-common";
+import { RedisDirectChannel } from "../channel/index.js";
+import { FQN } from "../internal.js";
 /**
  * Redis connection direct class
  * */
-class RedisDirectConnection extends redis_connection_1.RedisConnection {
+export class RedisDirectConnection extends RedisConnection {
     /**
      * Constructor
      *
@@ -15,11 +13,11 @@ 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 = logCommon.of(`RedisConnection${opt?.name ? '#' + opt?.name : ''}`);
     }
     /** @inheritDoc */
     newChannel(opt) {
-        return new channel_1.RedisDirectChannel(this, opt);
+        return new RedisDirectChannel(this, opt);
     }
 }
-exports.RedisDirectConnection = RedisDirectConnection;
+setFqn(RedisDirectConnection, FQN);

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

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

package/dist/connection/redis.connection.js

@@ -1,56 +1,49 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-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.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");
+import * as redis from 'redis';
+import { redisCommonConfig } 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";
 /**
  * Redis connection abstract class
  * */
-class RedisConnection extends be_cache_common_1.CacheConnection {
+export class RedisConnection extends CacheConnection {
+    // region private-property
+    /**
+     * Base/starting/min delay for connection
+     *
+     * @type {number} - as seconds
+     * */
+    static CONN_BASE_DELAY = 500; // 0.5 sec
+    /**
+     * Last/max delay for connection
+     *
+     * @type {number} - as seconds
+     * */
+    static CONN_MAX_DELAY = 1_000 * 60 * 60; // 60 minutes
+    /**
+     * Try count
+     *
+     * @type {number} - times
+     * */
+    static CONN_TRY_COUNT = 100; // 100 times
+    /**
+     * Base/starting/min delay for ping
+     *
+     * @type {number} - as seconds
+     * */
+    static PING_BASE_DELAY = 200; // 0.2 sec
+    /**
+     * Last/max delay ping
+     *
+     * @type {number} - as seconds
+     * */
+    static PING_MAX_DELAY = 1_000 * 60 * 10; // 10 minutes
+    /**
+     * Try count
+     *
+     * @type {number} - times
+     * */
+    static PING_TRY_COUNT = 100; // 100 times
     // endregion protected-property
     /**
      * Constructor
@@ -60,7 +53,7 @@ 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 = logCommon.of(this);
         }
         this._readFromEnv();
         this._buildUrl();
@@ -80,19 +73,18 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
      * Read credentials from environment
      * */
     _readFromEnv() {
-        var _a, _b, _c, _d, _e, _f, _g;
         const { _props: props } = this;
-        let env = config_1.redisCommonConfig.valueShort;
+        let env = redisCommonConfig.valueShort;
         if (props.envVariant) {
-            env = config_1.redisCommonConfig.configure.getVariation(props.envVariant).valueShort;
+            env = redisCommonConfig.configure.getVariation(props.envVariant).valueShort;
         }
-        props.isEnabled = (_a = props.isEnabled) !== null && _a !== void 0 ? _a : env.ENABLED;
-        props.protocol = (_b = props.protocol) !== null && _b !== void 0 ? _b : env.PROTOCOL;
-        props.host = (_c = props.host) !== null && _c !== void 0 ? _c : env.HOST;
-        props.port = (_d = props.port) !== null && _d !== void 0 ? _d : env.PORT;
-        props.username = (_e = props.username) !== null && _e !== void 0 ? _e : env.USER;
-        props.password = (_f = props.password) !== null && _f !== void 0 ? _f : env.PASS;
-        props.dbNumber = (_g = props.dbNumber) !== null && _g !== void 0 ? _g : env.DB_NUMBER;
+        props.isEnabled = props.isEnabled ?? env.ENABLED;
+        props.protocol = props.protocol ?? env.PROTOCOL;
+        props.host = props.host ?? env.HOST;
+        props.port = props.port ?? env.PORT;
+        props.username = props.username ?? env.USER;
+        props.password = props.password ?? env.PASS;
+        props.dbNumber = props.dbNumber ?? env.DB_NUMBER;
     }
     /**
      * Build url from credentials
@@ -126,129 +118,88 @@ class RedisConnection extends be_cache_common_1.CacheConnection {
     // endregion protected-method
     // region connect
     /** {@inheritDoc} */
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { _props: props } = this;
-            if (!this.isEnabled) {
-                return false;
-            }
-            if (this.isConnected) {
-                return true;
-            }
-            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(be_base_common_1.errorHandler.common.logText(err, 'connect'));
-                return false;
-            }
-            try {
-                props.client = redis.createClient({ url: this._props.producedUrl });
-                props.client
-                    .on("error", err => {
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(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._connectionDelay);
-                })
-                    .on('connect', () => {
-                    this.logger.info(`on[connect]`);
-                    props.isConnected = true;
-                    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]'))
-                    .on('reconnecting', () => this.logger.info('on[reconnecting]'))
-                    .on('end', () => this.logger.info('on[end]'));
-                yield props.client.connect();
-                this.logger.info('Connected');
-                setTimeout(() => this.ping(true).then(), 30000);
-            }
-            catch (e) {
-                this.logger.warn(be_base_common_1.errorHandler.common.logText(e, 'connection', this._props.connectTryCount));
-            }
+    async connect() {
+        const { _props: props } = this;
+        if (!this.isEnabled) {
+            return false;
+        }
+        if (this.isConnected) {
             return true;
-        });
-    }
-    /** {@inheritDoc} */
-    ping(next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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(be_base_common_1.errorHandler.common.logText(err, 'connect'));
-                return false;
-            }
-            let result = false;
-            if (this.isConnected) {
-                try {
-                    yield this.client.ping();
-                    this._props.pingTryCount = 0;
-                    result = 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'));
+            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));
+                props.connectTryCount++;
+                const old = this.isConnected;
+                props.isConnected = false;
+                if (old) {
+                    this._triggerOnCase('disconnected', this._onDisconnected, false);
+                }
+                setTimeout(() => this.connect().then(), this._connectionDelay);
+            })
+                .on('connect', () => {
+                this.logger.info(`on[connect]`);
+                props.isConnected = true;
+                props.connectTryCount = 0;
+                this._triggerOnCase('connected', this._onConnected, false);
+                if (props.isFirst === undefined) {
+                    this._triggerOnCase('first-connected', this._onFirstConnected, true);
+                    props.isFirst = false;
                 }
-                catch (err) {
-                    this._props.pingTryCount++;
-                    this.logger.warn(be_base_common_1.errorHandler.common.logText(err, 'ping', this._props.pingTryCount));
-                    setTimeout(() => this.ping(true).then(), this._pingDelay);
-                    next = false;
+                // clear stopped ping
+                if (this._props.pingTryCount > RedisConnection.PING_TRY_COUNT) {
+                    this._props.pingTryCount = 0;
+                    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]'));
+            await props.client.connect();
+            this.logger.info('Connected');
+            setTimeout(() => this.ping(true).then(), 30_000);
+        }
+        catch (e) {
+            this.logger.warn(errorCommon.text(e, 'connection', this._props.connectTryCount));
+        }
+        return true;
+    }
+    /** {@inheritDoc} */
+    async ping(next) {
+        if (!this.isEnabled) {
+            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'));
+            return false;
+        }
+        let result = false;
+        if (this.isConnected) {
+            try {
+                await this.client.ping();
+                this._props.pingTryCount = 0;
+                result = true;
             }
-            if (next) {
-                setTimeout(() => this.ping(true).then(), 30000);
+            catch (err) {
+                this._props.pingTryCount++;
+                this.logger.warn(errorCommon.text(err, 'ping', this._props.pingTryCount));
+                setTimeout(() => this.ping(true).then(), this._pingDelay);
+                next = false;
             }
-            return result;
-        });
+        }
+        if (next) {
+            setTimeout(() => this.ping(true).then(), 30_000);
+        }
+        return result;
     }
 }
-exports.RedisConnection = RedisConnection;
-// region private-property
-/**
- * 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.PING_BASE_DELAY = 200; // 0.2 sec
-/**
- * Last/max delay ping
- *
- * @type {number} - as seconds
- * */
-RedisConnection.PING_MAX_DELAY = 1000 * 60 * 10; // 10 minutes
-/**
- * Try count
- *
- * @type {number} - times
- * */
-RedisConnection.PING_TRY_COUNT = 100; // 100 times
+setFqn(RedisConnection, FQN);

package/dist/index.d.ts

@@ -1,3 +1,5 @@
-export * from './connection';
-export * from './config';
-export * from './channel';
+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

@@ -0,0 +1 @@
+export declare const foretell_sametRedisCommon: any[];

package/dist/index.foretell.js

@@ -0,0 +1,8 @@
+import { foretell_sametBaseCommon } from "@samet-it/be-base-common";
+import { foretell_sametCacheCommon } from "@samet-it/be-cache-common/dist/index.foretell.js";
+// noinspection JSUnusedGlobalSymbols
+export const foretell_sametRedisCommon = [
+    // dependencies
+    ...foretell_sametBaseCommon,
+    ...foretell_sametCacheCommon,
+];

package/dist/index.js

@@ -1,19 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./connection"), exports);
-__exportStar(require("./config"), exports);
-__exportStar(require("./channel"), exports);
+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

@@ -0,0 +1 @@
+export declare const loader_sametRedisCommon: import("@leyyo/common").LoaderLike;

package/dist/index.loader.js

@@ -0,0 +1,10 @@
+import { defineLoader } from "@leyyo/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";
+// noinspection JSUnusedGlobalSymbols
+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));

package/dist/internal.d.ts

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

package/dist/internal.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-redis-common",
-  "version": "1.1.10",
+  "version": "1.3.2",
   "description": "Redis common component",
   "keywords": [
     "redis",
@@ -20,13 +20,13 @@
     "email": "mustafay@samet.com.tr"
   },
   "main": "dist/index.js",
-  "type": "commonjs",
+  "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",
-    "asset": "node -r ts-node/register commands/assets.ts",
+    "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",
@@ -68,10 +68,8 @@
     }
   },
   "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.10",
+    "@samet-it/be-base-common": "^1.3.4",
+    "@samet-it/be-cache-common": "^1.3.5",
     "redis": "^5.10.0"
   }
 }