@zorionapp/gg-core 5.0.13 → 5.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zorionapp/gg-core",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "type": "commonjs",
   "dependencies": {
     "cache-manager": "5.2.4",
@@ -9,10 +9,9 @@
     "@google-cloud/trace-agent": "7.1.2"
   },
   "peerDependencies": {
-    "cache-manager-redis-yet": "^4.1.2",
+    "cache-manager-ioredis-yet": "^2.0.0",
     "amqp-connection-manager": "^4.1.14",
     "amqplib": "^0.10.3",
-    "redis": "^4.6.10",
     "helmet": "^7.1.0",
     "pino-http": "^8.5.0",
     "@google-cloud/error-reporting": "^3.0.5",

package/src/gg-cache/gg-cache.module.js

@@ -5,13 +5,10 @@ exports.GgCacheModule = void 0;
 const tslib_1 = require("tslib");
 const cache_manager_1 = require("@nestjs/cache-manager");
 const common_1 = require("@nestjs/common");
-const exceptions_1 = require("@nestjs/core/errors/exceptions");
-const cache_manager_redis_yet_1 = require("cache-manager-redis-yet");
+const cache_manager_ioredis_yet_1 = require("cache-manager-ioredis-yet");
 const luxon_1 = require("luxon");
-const redis_1 = require("redis");
+const gg_redis_1 = require("../gg-redis");
 const gg_cache_service_1 = require("./gg-cache.service");
-const redis_config_1 = require("./redis.config");
-const PING_INTERVAL_SECONDS = 60;
 let GgCacheModule = GgCacheModule_1 = class GgCacheModule {
     static forRoot() {
         return {
@@ -21,29 +18,15 @@ let GgCacheModule = GgCacheModule_1 = class GgCacheModule {
             exports: [gg_cache_service_1.GgCacheService],
             imports: [
                 cache_manager_1.CacheModule.registerAsync({
-                    inject: [redis_config_1.redisConfig.KEY],
+                    inject: [gg_redis_1.redisConfig.KEY],
                     isGlobal: true,
-                    useFactory: async (redisConf) => {
-                        const client = (0, redis_1.createClient)({
-                            socket: { host: redisConf.host, port: redisConf.port },
-                            pingInterval: luxon_1.Duration.fromObject({ second: PING_INTERVAL_SECONDS }).as('milliseconds'),
-                        });
-                        client.on('error', (err) => {
-                            console.error('Redis Client Error', err);
-                        });
-                        try {
-                            await client.connect();
-                        }
-                        catch (error) {
-                            console.error('Redis connecting Error', error);
-                            throw new exceptions_1.RuntimeException('Error connecting to Redis');
-                        }
+                    useFactory: (redisConf) => {
+                        const client = (0, gg_redis_1.createRedisClient)(redisConf, { keepAlive: 1 });
+                        client.on('error', (err) => console.error('Redis cache client error', err));
                         return {
-                            socket: { host: redisConf.host, port: redisConf.port },
-                            client,
-                            store: cache_manager_redis_yet_1.redisStore,
-                            ttl: luxon_1.Duration.fromObject({ minute: 1 }).as('milliseconds'),
-                            pingInterval: luxon_1.Duration.fromObject({ second: PING_INTERVAL_SECONDS }).as('milliseconds'),
+                            store: (0, cache_manager_ioredis_yet_1.redisInsStore)(client, {
+                                ttl: luxon_1.Duration.fromObject({ minute: 1 }).as('milliseconds'),
+                            }),
                         };
                     },
                 }),

package/src/gg-cache/gg-cache.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"gg-cache.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/gg-cache.module.ts"],"names":[],"mappings":";;;;;AAAA,yDAAoD;AACpD,2CAAuD;AAEvD,+DAAkE;AAClE,qEAAqD;AACrD,iCAAiC;AACjC,iCAAyD;AACzD,yDAAoD;AACpD,iDAA6C;AAE7C,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAG1B,IAAM,aAAa,qBAAnB,MAAM,aAAa;IACjB,MAAM,CAAC,OAAO;QACnB,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,CAAC,iCAAc,CAAC;YAC3B,OAAO,EAAE,CAAC,iCAAc,CAAC;YACzB,OAAO,EAAE;gBACP,2BAAW,CAAC,aAAa,CAAqB;oBAC5C,MAAM,EAAE,CAAC,0BAAW,CAAC,GAAG,CAAC;oBACzB,QAAQ,EAAE,IAAI;oBACd,UAAU,EAAE,KAAK,EAAE,SAAyC,EAAE,EAAE;wBAC9D,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC;4BAC1B,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE;4BACtD,YAAY,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;yBACxF,CAAC,CAAC;wBAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;4BACzB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;wBAC3C,CAAC,CAAC,CAAC;wBAEH,IAAI,CAAC;4BACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;wBACzB,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;4BAC/C,MAAM,IAAI,6BAAgB,CAAC,2BAA2B,CAAC,CAAC;wBAC1D,CAAC;wBAED,OAAO;4BACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE;4BACtD,MAAM;4BACN,KAAK,EAAE,oCAAU;4BACjB,GAAG,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;4BAC1D,YAAY,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;yBACxF,CAAC;oBACJ,CAAC;iBACF,CAAC;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,aAAa,CAwCzB"}
+{"version":3,"file":"gg-cache.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/gg-cache.module.ts"],"names":[],"mappings":";;;;;AAAA,yDAAoD;AACpD,2CAAuD;AAEvD,yEAA0D;AAC1D,iCAAiC;AACjC,0CAA6D;AAC7D,yDAAoD;AAG7C,IAAM,aAAa,qBAAnB,MAAM,aAAa;IACjB,MAAM,CAAC,OAAO;QACnB,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,CAAC,iCAAc,CAAC;YAC3B,OAAO,EAAE,CAAC,iCAAc,CAAC;YACzB,OAAO,EAAE;gBACP,2BAAW,CAAC,aAAa,CAAC;oBACxB,MAAM,EAAE,CAAC,sBAAW,CAAC,GAAG,CAAC;oBACzB,QAAQ,EAAE,IAAI;oBACd,UAAU,EAAE,CAAC,SAAyC,EAAE,EAAE;wBACxD,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;wBAC9D,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC,CAAC;wBAC5E,OAAO;4BACL,KAAK,EAAE,IAAA,yCAAa,EAAC,MAAM,EAAE;gCAC3B,GAAG,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;6BAC3D,CAAC;yBACH,CAAC;oBACJ,CAAC;iBACF,CAAC;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAxBY,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,aAAa,CAwBzB"}

package/src/gg-cache/index.d.ts

@@ -1,2 +1,2 @@
 export * from './gg-cache.service';
-export * from './redis.config';
+export { redisConfig } from '../gg-redis';

package/src/gg-cache/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.redisConfig = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./gg-cache.service"), exports);
-tslib_1.__exportStar(require("./redis.config"), exports);
+var gg_redis_1 = require("../gg-redis");
+Object.defineProperty(exports, "redisConfig", { enumerable: true, get: function () { return gg_redis_1.redisConfig; } });
 //# sourceMappingURL=index.js.map

package/src/gg-cache/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,yDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/index.ts"],"names":[],"mappings":";;;;AAAA,6DAAmC;AACnC,wCAA0C;AAAjC,uGAAA,WAAW,OAAA"}

package/src/gg-core/gg-core.module.js

@@ -5,7 +5,7 @@ exports.GgCoreModule = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const gg_auth_module_1 = require("../gg-auth/gg-auth.module");
-const gg_cache_1 = require("../gg-cache");
+const gg_redis_1 = require("../gg-redis");
 const gg_cache_module_1 = require("../gg-cache/gg-cache.module");
 const gg_cls_1 = require("../gg-cls");
 const gg_config_1 = require("../gg-config");
@@ -23,7 +23,7 @@ let GgCoreModule = GgCoreModule_1 = class GgCoreModule {
     static forRootAsync(options) {
         const imports = [
             /** Config module with basic app configurations */
-            gg_config_1.GgConfigModule.forRoot({ configs: [gg_config_1.appConfig, gg_cache_1.redisConfig, gg_micro_1.rmqConfig, ...(options.loadConfigs ?? [])] }),
+            gg_config_1.GgConfigModule.forRoot({ configs: [gg_config_1.appConfig, gg_redis_1.redisConfig, gg_micro_1.rmqConfig, ...(options.loadConfigs ?? [])] }),
             /** AsyncContext module to avoid DI three rebuilding */
             gg_cls_1.GgClsModule.forRoot(),
             /** Pino logger module */

package/src/gg-database/modules/mikroorm.module.js

@@ -57,7 +57,6 @@ let MikroormModule = MikroormModule_1 = class MikroormModule {
         const isValidationRequired = true;
         return (0, postgresql_1.defineConfig)({
             ...ormConfig,
-            debug: true,
             entities: entitiesConfig.entities,
             tsNode: isTsNode,
             logger: logger.debug.bind(logger),

package/src/gg-database/modules/mikroorm.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"mikroorm.module.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-database/modules/mikroorm.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mikroorm.module.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-database/modules/mikroorm.module.ts"],"names":[],"mappings":"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"}

package/src/gg-redis/index.d.ts

@@ -0,0 +1,2 @@
+export { redisConfig, type RedisMode } from './redis.config';
+export { createRedisClient } from './redis-client.factory';

package/src/gg-redis/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRedisClient = exports.redisConfig = void 0;
+var redis_config_1 = require("./redis.config");
+Object.defineProperty(exports, "redisConfig", { enumerable: true, get: function () { return redis_config_1.redisConfig; } });
+var redis_client_factory_1 = require("./redis-client.factory");
+Object.defineProperty(exports, "createRedisClient", { enumerable: true, get: function () { return redis_client_factory_1.createRedisClient; } });
+//# sourceMappingURL=index.js.map

package/src/gg-redis/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redis/index.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAApD,2GAAA,WAAW,OAAA;AACpB,+DAA2D;AAAlD,yHAAA,iBAAiB,OAAA"}

package/src/gg-redis/redis-client.factory.d.ts

@@ -0,0 +1,6 @@
+import { ConfigType } from '@nestjs/config';
+import { default as Redis, RedisOptions } from 'ioredis';
+import { redisConfig } from './redis.config';
+type RedisConfigType = ConfigType<typeof redisConfig>;
+export declare function createRedisClient(config: RedisConfigType, options?: Partial<RedisOptions>): Redis;
+export {};

package/src/gg-redis/redis-client.factory.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRedisClient = void 0;
+const ioredis_1 = require("ioredis");
+function createRedisClient(config, options) {
+    if (config.mode === 'sentinel') {
+        const sentinels = config.sentinelHosts
+            .split(';')
+            .map((entry) => entry.trim())
+            .filter(Boolean)
+            .map((entry) => {
+            const [host, port] = entry.split(':');
+            return { host, port: Number(port) || 26379 };
+        });
+        if (sentinels.length === 0) {
+            throw new Error('REDIS_SENTINEL_HOSTS is empty or invalid after parsing');
+        }
+        return new ioredis_1.default({
+            sentinels,
+            name: config.sentinelMaster,
+            ...options,
+        });
+    }
+    return new ioredis_1.default({
+        host: config.host,
+        port: config.port,
+        ...options,
+    });
+}
+exports.createRedisClient = createRedisClient;
+//# sourceMappingURL=redis-client.factory.js.map

package/src/gg-redis/redis-client.factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-client.factory.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redis/redis-client.factory.ts"],"names":[],"mappings":";;;AACA,qCAAyD;AAKzD,SAAgB,iBAAiB,CAAC,MAAuB,EAAE,OAA+B;IACxF,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa;aACnC,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEL,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,IAAI,iBAAK,CAAC;YACf,SAAS;YACT,IAAI,EAAE,MAAM,CAAC,cAAc;YAC3B,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,iBAAK,CAAC;QACf,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC;AA3BD,8CA2BC"}

package/src/{gg-cache → gg-redis}/redis.config.d.ts

@@ -1,6 +1,10 @@
+export type RedisMode = 'standalone' | 'sentinel';
 declare class RedisConfig {
+    readonly mode: RedisMode;
     readonly host: string;
     readonly port: number;
+    readonly sentinelHosts: string;
+    readonly sentinelMaster: string;
 }
 export declare const redisConfig: (() => Promise<RedisConfig>) & import("@nestjs/config").ConfigFactoryKeyHost<Promise<RedisConfig>>;
 export {};

package/src/gg-redis/redis.config.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redisConfig = void 0;
+const tslib_1 = require("tslib");
+const class_validator_1 = require("class-validator");
+const lodash_1 = require("lodash");
+const gg_config_1 = require("../gg-config");
+class RedisConfig {
+    constructor() {
+        this.mode = (0, lodash_1.get)(process.env, 'REDIS_MODE', 'standalone');
+        this.host = (0, lodash_1.get)(process.env, 'REDIS_HOST');
+        this.port = Number((0, lodash_1.get)(process.env, 'REDIS_PORT', 6379));
+        this.sentinelHosts = (0, lodash_1.get)(process.env, 'REDIS_SENTINEL_HOSTS');
+        this.sentinelMaster = (0, lodash_1.get)(process.env, 'REDIS_SENTINEL_MASTER');
+    }
+}
+tslib_1.__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsIn)(['standalone', 'sentinel']),
+    tslib_1.__metadata("design:type", String)
+], RedisConfig.prototype, "mode", void 0);
+tslib_1.__decorate([
+    (0, class_validator_1.ValidateIf)((o) => o.mode === 'standalone'),
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsString)(),
+    tslib_1.__metadata("design:type", String)
+], RedisConfig.prototype, "host", void 0);
+tslib_1.__decorate([
+    (0, class_validator_1.ValidateIf)((o) => o.mode === 'standalone'),
+    (0, class_validator_1.IsNotEmpty)(),
+    tslib_1.__metadata("design:type", Number)
+], RedisConfig.prototype, "port", void 0);
+tslib_1.__decorate([
+    (0, class_validator_1.ValidateIf)((o) => o.mode === 'sentinel'),
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsString)(),
+    tslib_1.__metadata("design:type", String)
+], RedisConfig.prototype, "sentinelHosts", void 0);
+tslib_1.__decorate([
+    (0, class_validator_1.ValidateIf)((o) => o.mode === 'sentinel'),
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsString)(),
+    tslib_1.__metadata("design:type", String)
+], RedisConfig.prototype, "sentinelMaster", void 0);
+exports.redisConfig = (0, gg_config_1.registerConfig)(RedisConfig);
+//# sourceMappingURL=redis.config.js.map

package/src/gg-redis/redis.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.config.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redis/redis.config.ts"],"names":[],"mappings":";;;;AAAA,qDAAqF;AACrF,mCAA6B;AAC7B,4CAA8C;AAI9C,MAAM,WAAW;IAAjB;QAGkB,SAAI,GAAc,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,YAAY,CAAc,CAAC;QAK5E,SAAI,GAAW,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAI9C,SAAI,GAAW,MAAM,CAAC,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QAK5D,kBAAa,GAAW,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;QAKjE,mBAAc,GAAW,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC;IACrF,CAAC;CAAA;AApBiB;IAFf,IAAA,4BAAU,GAAE;IACZ,IAAA,sBAAI,EAAC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;;yCAC2D;AAK5E;IAHf,IAAA,4BAAU,EAAC,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC;IACvD,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;yCACmD;AAI9C;IAFf,IAAA,4BAAU,EAAC,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC;IACvD,IAAA,4BAAU,GAAE;;yCAC+D;AAK5D;IAHf,IAAA,4BAAU,EAAC,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;IACrD,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;kDACsE;AAKjE;IAHf,IAAA,4BAAU,EAAC,CAAC,CAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;IACrD,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;mDACwE;AAGxE,QAAA,WAAW,GAAG,IAAA,0BAAc,EAAC,WAAW,CAAC,CAAC"}

package/src/gg-redlock/index.d.ts

@@ -1,2 +1,3 @@
 export * from './redlock.module';
 export * from './redlock.service';
+export type { Mutex as DistributedMutex } from 'redis-semaphore';

package/src/gg-redlock/redlock.module.d.ts

@@ -1,3 +1,4 @@
-import { RedlockOpts } from './redlock.options';
-export declare class RedlockModule extends RedlockOpts.ConfigurableModuleClass {
+import { DynamicModule } from '@nestjs/common';
+export declare class RedlockModule {
+    static register(): DynamicModule;
 }

package/src/gg-redlock/redlock.module.js

@@ -1,17 +1,45 @@
 "use strict";
+var RedlockModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedlockModule = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
+const gg_redis_1 = require("../gg-redis");
 const redlock_options_1 = require("./redlock.options");
 const redlock_service_1 = require("./redlock.service");
-let RedlockModule = class RedlockModule extends redlock_options_1.RedlockOpts.ConfigurableModuleClass {
+let RedlockModule = RedlockModule_1 = class RedlockModule {
+    static register() {
+        return {
+            module: RedlockModule_1,
+            providers: [
+                {
+                    provide: redlock_options_1.REDIS_LOCK_CLIENT,
+                    inject: [gg_redis_1.redisConfig.KEY],
+                    useFactory: (conf) => {
+                        const client = (0, gg_redis_1.createRedisClient)(conf, {
+                            enableOfflineQueue: false,
+                            enableReadyCheck: false,
+                            enableAutoPipelining: false,
+                            autoResendUnfulfilledCommands: true,
+                            commandTimeout: 6000,
+                            socketTimeout: 10000,
+                            connectTimeout: 5000,
+                            keepAlive: 1,
+                            retryStrategy: (times) => Math.min(times * 50, 1000),
+                            reconnectOnError: (err) => err.message.includes('READONLY') || err.message.includes('ECONNRESET'),
+                        });
+                        client.on('error', (err) => console.error('Redis lock client error', err));
+                        return client;
+                    },
+                },
+                redlock_service_1.RedlockService,
+            ],
+            exports: [redlock_service_1.RedlockService],
+        };
+    }
 };
 exports.RedlockModule = RedlockModule;
-exports.RedlockModule = RedlockModule = tslib_1.__decorate([
-    (0, common_1.Module)({
-        providers: [redlock_service_1.RedlockService],
-        exports: [redlock_service_1.RedlockService],
-    })
+exports.RedlockModule = RedlockModule = RedlockModule_1 = tslib_1.__decorate([
+    (0, common_1.Module)({})
 ], RedlockModule);
 //# sourceMappingURL=redlock.module.js.map

package/src/gg-redlock/redlock.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redlock.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.module.ts"],"names":[],"mappings":";;;;AAAA,2CAAwC;AACxC,uDAAgD;AAChD,uDAAmD;AAM5C,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,6BAAW,CAAC,uBAAuB;CAAG,CAAA;AAA5D,sCAAa;wBAAb,aAAa;IAJzB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,gCAAc,CAAC;QAC3B,OAAO,EAAE,CAAC,gCAAc,CAAC;KAC1B,CAAC;GACW,aAAa,CAA+C"}
+{"version":3,"file":"redlock.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AAEvD,0CAA6D;AAC7D,uDAAsD;AACtD,uDAAmD;AAG5C,IAAM,aAAa,qBAAnB,MAAM,aAAa;IACjB,MAAM,CAAC,QAAQ;QACpB,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,mCAAiB;oBAC1B,MAAM,EAAE,CAAC,sBAAW,CAAC,GAAG,CAAC;oBACzB,UAAU,EAAE,CAAC,IAAoC,EAAE,EAAE;wBACnD,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,IAAI,EAAE;4BACrC,kBAAkB,EAAE,KAAK;4BACzB,gBAAgB,EAAE,KAAK;4BACvB,oBAAoB,EAAE,KAAK;4BAC3B,6BAA6B,EAAE,IAAI;4BACnC,cAAc,EAAE,IAAI;4BACpB,aAAa,EAAE,KAAK;4BACpB,cAAc,EAAE,IAAI;4BACpB,SAAS,EAAE,CAAC;4BACZ,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC;4BACpD,gBAAgB,EAAE,CAAC,GAAG,EAAE,EAAE,CACxB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;yBACzE,CAAC,CAAC;wBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC,CAAC;wBAC3E,OAAO,MAAM,CAAC;oBAChB,CAAC;iBACF;gBACD,gCAAc;aACf;YACD,OAAO,EAAE,CAAC,gCAAc,CAAC;SAC1B,CAAC;IACJ,CAAC;CACF,CAAA;AA/BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,aAAa,CA+BzB"}

package/src/gg-redlock/redlock.options.d.ts

@@ -1,8 +1 @@
-export type RedlockOptions = string[];
-export declare const ConfigurableModuleClass: import("@nestjs/common").ConfigurableModuleCls<RedlockOptions, "register", "create", {}>, MODULE_OPTIONS_TOKEN: string | symbol, OPTIONS_TYPE: RedlockOptions & Partial<{}>, ASYNC_OPTIONS_TYPE: import("@nestjs/common").ConfigurableModuleAsyncOptions<RedlockOptions, "create"> & Partial<{}>;
-export declare const RedlockOpts: {
-    MODULE_OPTIONS_TOKEN: string | symbol;
-    OPTIONS_TYPE: RedlockOptions & Partial<{}>;
-    ASYNC_OPTIONS_TYPE: import("@nestjs/common").ConfigurableModuleAsyncOptions<RedlockOptions, "create"> & Partial<{}>;
-    ConfigurableModuleClass: import("@nestjs/common").ConfigurableModuleCls<RedlockOptions, "register", "create", {}>;
-};
+export declare const REDIS_LOCK_CLIENT: unique symbol;

package/src/gg-redlock/redlock.options.js

@@ -1,13 +1,5 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedlockOpts = exports.ASYNC_OPTIONS_TYPE = exports.OPTIONS_TYPE = exports.MODULE_OPTIONS_TOKEN = exports.ConfigurableModuleClass = void 0;
-const common_1 = require("@nestjs/common");
-_a = new common_1.ConfigurableModuleBuilder({ moduleName: 'RedlockModule' }).setClassMethodName('register').build(), exports.ConfigurableModuleClass = _a.ConfigurableModuleClass, exports.MODULE_OPTIONS_TOKEN = _a.MODULE_OPTIONS_TOKEN, exports.OPTIONS_TYPE = _a.OPTIONS_TYPE, exports.ASYNC_OPTIONS_TYPE = _a.ASYNC_OPTIONS_TYPE;
-exports.RedlockOpts = {
-    MODULE_OPTIONS_TOKEN: exports.MODULE_OPTIONS_TOKEN,
-    OPTIONS_TYPE: exports.OPTIONS_TYPE,
-    ASYNC_OPTIONS_TYPE: exports.ASYNC_OPTIONS_TYPE,
-    ConfigurableModuleClass: exports.ConfigurableModuleClass,
-};
+exports.REDIS_LOCK_CLIENT = void 0;
+exports.REDIS_LOCK_CLIENT = Symbol('REDIS_LOCK_CLIENT');
 //# sourceMappingURL=redlock.options.js.map

package/src/gg-redlock/redlock.options.js.map

@@ -1 +1 @@
-{"version":3,"file":"redlock.options.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.options.ts"],"names":[],"mappings":";;;;AAAA,2CAA2D;AAI9C,KACX,IAAI,kCAAyB,CAAiB,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EADxG,+BAAuB,+BAAE,4BAAoB,4BAAE,oBAAY,oBAAE,0BAAkB,yBAC0B;AAE3G,QAAA,WAAW,GAAG;IACzB,oBAAoB,EAApB,4BAAoB;IACpB,YAAY,EAAZ,oBAAY;IACZ,kBAAkB,EAAlB,0BAAkB;IAClB,uBAAuB,EAAvB,+BAAuB;CACxB,CAAC"}
+{"version":3,"file":"redlock.options.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.options.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}

package/src/gg-redlock/redlock.service.d.ts

@@ -1,20 +1,14 @@
-import { RedlockMutex } from 'redis-semaphore';
-import { RedlockOptions } from './redlock.options';
-export interface LockOptions {
-    ttl?: number;
-    retryInterval?: number;
-    maxAttempts?: number;
-}
+import { default as Redis } from 'ioredis';
+import { Mutex } from 'redis-semaphore';
 export declare class RedlockService {
-    private readonly options;
+    private readonly client;
     private readonly logger;
-    private readonly clients;
-    constructor(options: RedlockOptions);
-    getLock(resource: string, identifier?: string): RedlockMutex;
-    acquire(resources: RedlockMutex[]): Promise<RedlockMutex[]>;
-    tryAcquire(resources: RedlockMutex[]): Promise<boolean[]>;
-    release(resources: RedlockMutex[]): Promise<void[]>;
-    protected tryAcquireOne(mutex: RedlockMutex): Promise<boolean>;
-    protected acquireOne(mutex: RedlockMutex): Promise<RedlockMutex>;
-    protected releaseOne(mutex: RedlockMutex): Promise<void>;
+    constructor(client: Redis);
+    getLock(resource: string, identifier?: string): Mutex;
+    acquire(resources: Mutex[]): Promise<Mutex[]>;
+    tryAcquire(resources: Mutex[]): Promise<boolean[]>;
+    release(resources: Mutex[]): Promise<void[]>;
+    protected tryAcquireOne(mutex: Mutex): Promise<boolean>;
+    protected acquireOne(mutex: Mutex): Promise<Mutex>;
+    protected releaseOne(mutex: Mutex): Promise<void>;
 }

package/src/gg-redlock/redlock.service.js

@@ -6,38 +6,20 @@ const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const ioredis_1 = require("ioredis");
 const lodash_1 = require("lodash");
-const luxon_1 = require("luxon");
 const redis_semaphore_1 = require("redis-semaphore");
 const redlock_options_1 = require("./redlock.options");
 let RedlockService = RedlockService_1 = class RedlockService {
-    constructor(options) {
-        this.options = options;
+    constructor(client) {
+        this.client = client;
         this.logger = new common_1.Logger(RedlockService_1.name);
-        this.clients = this.options.map((host) => new ioredis_1.default(`redis://${host}`, {
-            autoResubscribe: true,
-            // increase retry to 1 sec
-            retryStrategy: (times) => Math.min(times * 50, 1000),
-            // reconnect on temp troubles
-            reconnectOnError: (err) => err.message.includes('READONLY') || err.message.includes('ECONNRESET'),
-            commandTimeout: 6000,
-            socketTimeout: 10000,
-            connectTimeout: 5000,
-            keepAlive: 1,
-            autoResendUnfulfilledCommands: true,
-            enableOfflineQueue: false,
-            enableReadyCheck: false,
-            enableAutoPipelining: false,
-        }));
     }
     getLock(resource, identifier) {
-        return new redis_semaphore_1.RedlockMutex(this.clients, resource, {
+        return new redis_semaphore_1.Mutex(this.client, resource, {
             acquireAttemptsLimit: 2000,
-            retryInterval: luxon_1.Duration.fromObject({ milliseconds: 200 }).as('milliseconds'),
-            acquireTimeout: luxon_1.Duration.fromObject({ seconds: 100 }).as('milliseconds'),
-            // main parameters which indicates maximum timeout for single lock
-            lockTimeout: luxon_1.Duration.fromObject({ seconds: 101 }).as('milliseconds'),
-            ...(identifier && { identifier }),
-            ...(identifier && { acquiredExternally: true }),
+            retryInterval: 200,
+            acquireTimeout: 100_000,
+            lockTimeout: 101_000,
+            ...(identifier && { identifier, acquiredExternally: true }),
             refreshInterval: 0,
         });
     }
@@ -63,7 +45,7 @@ let RedlockService = RedlockService_1 = class RedlockService {
             await mutex.acquire();
         }
         catch (e) {
-            if (!(e instanceof redis_semaphore_1.TimeoutError) || !(e instanceof redis_semaphore_1.LostLockError))
+            if (!(e instanceof redis_semaphore_1.TimeoutError) && !(e instanceof redis_semaphore_1.LostLockError))
                 throw e;
             if (e instanceof redis_semaphore_1.TimeoutError) {
                 this.logger.warn({
@@ -74,13 +56,12 @@ let RedlockService = RedlockService_1 = class RedlockService {
                 throw new common_1.HttpException({ message: 'Resource locked' }, 423);
             }
             if (e instanceof redis_semaphore_1.LostLockError) {
-                try {
-                    await mutex.acquire();
-                }
-                catch (retryError) {
-                    this.logger.error(`Failed to reacquire lock: ${mutex.identifier}`, retryError);
-                    throw new common_1.HttpException({ message: 'Failed to reacquire lock' }, 423);
-                }
+                this.logger.error({
+                    msg: `Lock lost`,
+                    resource: (0, lodash_1.get)(mutex, '_key', mutex.identifier),
+                    identifier: mutex.identifier,
+                });
+                throw new common_1.HttpException({ message: 'Resource lock lost' }, 423);
             }
         }
         return mutex;
@@ -97,7 +78,7 @@ let RedlockService = RedlockService_1 = class RedlockService {
 exports.RedlockService = RedlockService;
 exports.RedlockService = RedlockService = RedlockService_1 = tslib_1.__decorate([
     (0, common_1.Injectable)(),
-    tslib_1.__param(0, (0, common_1.Inject)(redlock_options_1.RedlockOpts.MODULE_OPTIONS_TOKEN)),
-    tslib_1.__metadata("design:paramtypes", [Array])
+    tslib_1.__param(0, (0, common_1.Inject)(redlock_options_1.REDIS_LOCK_CLIENT)),
+    tslib_1.__metadata("design:paramtypes", [ioredis_1.default])
 ], RedlockService);
 //# sourceMappingURL=redlock.service.js.map

package/src/gg-redlock/redlock.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"redlock.service.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.service.ts"],"names":[],"mappings":";;;;;AAAA,2CAA2E;AAC3E,qCAA2C;AAC3C,mCAA6B;AAC7B,iCAAiC;AACjC,qDAA4E;AAC5E,uDAAgE;AASzD,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,YAA6D,OAAwC;QAAvB,YAAO,GAAP,OAAO,CAAgB;QAJpF,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;QAKxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAC7B,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,iBAAK,CAAC,WAAW,IAAI,EAAE,EAAE;YAC3B,eAAe,EAAE,IAAI;YACrB,0BAA0B;YAC1B,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC;YACpD,6BAA6B;YAC7B,gBAAgB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;YACjG,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,CAAC;YACZ,6BAA6B,EAAE,IAAI;YACnC,kBAAkB,EAAE,KAAK;YACzB,gBAAgB,EAAE,KAAK;YACvB,oBAAoB,EAAE,KAAK;SAC5B,CAAC,CACL,CAAC;IACJ,CAAC;IAEM,OAAO,CAAC,QAAgB,EAAE,UAAmB;QAClD,OAAO,IAAI,8BAAY,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE;YAC9C,oBAAoB,EAAE,IAAI;YAC1B,aAAa,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;YAC5E,cAAc,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;YACxE,kEAAkE;YAClE,WAAW,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;YACrE,GAAG,CAAC,UAAU,IAAI,EAAE,UAAU,EAAE,CAAC;YACjC,GAAG,CAAC,UAAU,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;YAC/C,eAAe,EAAE,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IAEM,OAAO,CAAC,SAAyB;QACtC,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAEM,UAAU,CAAC,SAAyB;QACzC,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAEM,OAAO,CAAC,SAAyB;QACtC,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAES,aAAa,CAAC,KAAmB;QACzC,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC;IAC5B,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,KAAmB;QAC5C,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;gBACd,GAAG,EAAE,cAAc;gBACnB,QAAQ,EAAE,IAAA,YAAG,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC;gBAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,CAAC,YAAY,8BAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,+BAAa,CAAC;gBAAE,MAAM,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,8BAAY,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;oBACf,GAAG,EAAE,eAAe;oBACpB,QAAQ,EAAE,IAAA,YAAG,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC;oBAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;iBAC7B,CAAC,CAAC;gBAEH,MAAM,IAAI,sBAAa,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,CAAC,YAAY,+BAAa,EAAE,CAAC;gBAC/B,IAAI,CAAC;oBACH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;gBACxB,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,UAAU,EAAE,EAAE,UAAU,CAAC,CAAC;oBAE/E,MAAM,IAAI,sBAAa,CAAC,EAAE,OAAO,EAAE,0BAA0B,EAAE,EAAE,GAAG,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAES,UAAU,CAAC,KAAmB;QACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YACd,GAAG,EAAE,cAAc;YACnB,QAAQ,EAAE,IAAA,YAAG,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC;YAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF,CAAA;AApGY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAMS,mBAAA,IAAA,eAAM,EAAC,6BAAW,CAAC,oBAAoB,CAAC,CAAA;;GALjD,cAAc,CAoG1B"}
+{"version":3,"file":"redlock.service.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.service.ts"],"names":[],"mappings":"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"}

package/src/index.d.ts

@@ -8,4 +8,5 @@ export * from './gg-gcp';
 export * from './gg-kernel';
 export * from './gg-metrics';
 export * from './gg-micro';
+export * from './gg-redis';
 export * from './gg-redlock';

package/src/index.js

@@ -11,5 +11,6 @@ tslib_1.__exportStar(require("./gg-gcp"), exports);
 tslib_1.__exportStar(require("./gg-kernel"), exports);
 tslib_1.__exportStar(require("./gg-metrics"), exports);
 tslib_1.__exportStar(require("./gg-micro"), exports);
+tslib_1.__exportStar(require("./gg-redis"), exports);
 tslib_1.__exportStar(require("./gg-redlock"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/gg-core/src/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,qDAA2B;AAC3B,sDAA4B;AAC5B,oDAA0B;AAC1B,wDAA8B;AAC9B,sDAA4B;AAC5B,mDAAyB;AACzB,sDAA4B;AAC5B,uDAA6B;AAC7B,qDAA2B;AAC3B,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/gg-core/src/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,qDAA2B;AAC3B,sDAA4B;AAC5B,oDAA0B;AAC1B,wDAA8B;AAC9B,sDAA4B;AAC5B,mDAAyB;AACzB,sDAA4B;AAC5B,uDAA6B;AAC7B,qDAA2B;AAC3B,qDAA2B;AAC3B,uDAA6B"}

package/src/gg-cache/redis.config.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redisConfig = void 0;
-const tslib_1 = require("tslib");
-const class_validator_1 = require("class-validator");
-const lodash_1 = require("lodash");
-const gg_config_1 = require("../gg-config");
-class RedisConfig {
-    constructor() {
-        this.host = (0, lodash_1.get)(process.env, 'REDIS_HOST');
-        this.port = (0, lodash_1.get)(process.env, 'REDIS_PORT', 6349);
-    }
-}
-tslib_1.__decorate([
-    (0, class_validator_1.IsNotEmpty)(),
-    tslib_1.__metadata("design:type", String)
-], RedisConfig.prototype, "host", void 0);
-tslib_1.__decorate([
-    (0, class_validator_1.IsNotEmpty)(),
-    tslib_1.__metadata("design:type", Object)
-], RedisConfig.prototype, "port", void 0);
-exports.redisConfig = (0, gg_config_1.registerConfig)(RedisConfig);
-//# sourceMappingURL=redis.config.js.map

package/src/gg-cache/redis.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redis.config.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/redis.config.ts"],"names":[],"mappings":";;;;AAAA,qDAA6C;AAC7C,mCAA6B;AAC7B,4CAA8C;AAE9C,MAAM,WAAW;IAAjB;QAEkB,SAAI,GAAW,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAG9C,SAAI,GAAG,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAW,CAAC;IACxE,CAAC;CAAA;AAJiB;IADf,IAAA,4BAAU,GAAE;;yCACiD;AAG9C;IADf,IAAA,4BAAU,GAAE;;yCACyD;AAG3D,QAAA,WAAW,GAAG,IAAA,0BAAc,EAAC,WAAW,CAAC,CAAC"}

package/src/gg-redlock/redlock.config.d.ts

@@ -1,5 +0,0 @@
-declare class RedlockConfig {
-    readonly hosts: string[];
-}
-export declare const redlockConfig: (() => Promise<RedlockConfig>) & import("@nestjs/config").ConfigFactoryKeyHost<Promise<RedlockConfig>>;
-export {};

package/src/gg-redlock/redlock.config.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redlockConfig = void 0;
-const tslib_1 = require("tslib");
-const class_validator_1 = require("class-validator");
-const lodash_1 = require("lodash");
-const process = require("node:process");
-const gg_config_1 = require("../gg-config");
-class RedlockConfig {
-    constructor() {
-        this.hosts = (0, lodash_1.get)(process.env, 'REDLOCK_HOSTS', '').split(';');
-    }
-}
-tslib_1.__decorate([
-    (0, class_validator_1.IsArray)(),
-    (0, class_validator_1.ArrayMinSize)(3),
-    (0, class_validator_1.IsString)({ each: true }),
-    (0, class_validator_1.IsOptional)(),
-    tslib_1.__metadata("design:type", Array)
-], RedlockConfig.prototype, "hosts", void 0);
-exports.redlockConfig = (0, gg_config_1.registerConfig)(RedlockConfig);
-//# sourceMappingURL=redlock.config.js.map

package/src/gg-redlock/redlock.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redlock.config.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.config.ts"],"names":[],"mappings":";;;;AAAA,qDAA8E;AAC9E,mCAA6B;AAC7B,wCAAwC;AACxC,4CAA8C;AAE9C,MAAM,aAAa;IAAnB;QAKkB,UAAK,GAAa,IAAA,YAAG,EAAC,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrF,CAAC;CAAA;AADiB;IAJf,IAAA,yBAAO,GAAE;IACT,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,IAAA,4BAAU,GAAE;;4CACsE;AAGxE,QAAA,aAAa,GAAG,IAAA,0BAAc,EAAC,aAAa,CAAC,CAAC"}