@hg-ts/redis 0.1.117 → 0.2.0

package/dist/redis.client.d.ts

@@ -1,9 +1,9 @@
-import { DESTROY_HOOK, INIT_HOOK } from '@hg-ts/ioc';
-import { RedisConfig } from '@hg-ts/redis-config';
+import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import Redis from 'ioredis';
-export declare class RedisClient extends Redis {
+import { RedisConfig } from './redis.config';
+export declare class RedisClient extends Redis implements OnModuleInit, OnModuleDestroy {
     constructor(config: RedisConfig);
-    [INIT_HOOK](): Promise<void>;
-    [DESTROY_HOOK](): Promise<void>;
+    onModuleInit(): Promise<void>;
+    onModuleDestroy(): Promise<void>;
 }
 //# sourceMappingURL=redis.client.d.ts.map

package/dist/redis.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.client.d.ts","sourceRoot":"","sources":["../src/redis.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,YAAY,EACZ,SAAS,EACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAEN,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,qBACa,WAAY,SAAQ,KAAK;gBAClB,MAAM,EAAE,WAAW;IAUzB,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5C"}
+{"version":3,"file":"redis.client.d.ts","sourceRoot":"","sources":["../src/redis.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,eAAe,EACf,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBACa,WAAY,SAAQ,KAAM,YAAW,YAAY,EAAE,eAAe;gBAC3D,MAAM,EAAE,WAAW;IAUzB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7C"}

package/dist/redis.client.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisClient = void 0;
 const tslib_1 = require("tslib");
-const ioc_1 = require("@hg-ts/ioc");
-const redis_config_1 = require("@hg-ts/redis-config");
+const common_1 = require("@nestjs/common");
 const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
+const redis_config_1 = require("./redis.config");
 let RedisClient = class RedisClient extends ioredis_1.default {
     constructor(config) {
         super({
@@ -15,17 +15,16 @@ let RedisClient = class RedisClient extends ioredis_1.default {
             lazyConnect: true,
         });
     }
-    async [ioc_1.INIT_HOOK]() {
+    async onModuleInit() {
         await this.connect();
     }
-    async [ioc_1.DESTROY_HOOK]() {
+    async onModuleDestroy() {
         await this.quit();
     }
 };
 exports.RedisClient = RedisClient;
 exports.RedisClient = RedisClient = tslib_1.__decorate([
-    (0, ioc_1.Dependant)(),
+    (0, common_1.Injectable)(),
     tslib_1.__metadata("design:paramtypes", [redis_config_1.RedisConfig])
 ], RedisClient);
-redis_config_1.REDIS_CLIENTS.add(RedisClient);
 //# sourceMappingURL=redis.client.js.map

package/dist/redis.client.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.client.js","sourceRoot":"","sources":["../src/redis.client.ts"],"names":[],"mappings":";;;;AAAA,oCAIoB;AACpB,sDAG6B;AAC7B,8DAA4B;AAGrB,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,iBAAK;IACrC,YAAmB,MAAmB;QACrC,KAAK,CAAC;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,EAAE,EAAE,MAAM,CAAC,QAAQ;YACnB,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,IAAI;SACjB,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,CAAC,eAAS,CAAC;QACvB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,CAAC,kBAAY,CAAC;QAC1B,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;CACD,CAAA;AAlBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,eAAS,GAAE;6CAEgB,0BAAW;GAD1B,WAAW,CAkBvB;AAED,4BAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"redis.client.js","sourceRoot":"","sources":["../src/redis.client.ts"],"names":[],"mappings":";;;;AAAA,2CAIwB;AAExB,8DAA4B;AAE5B,iDAA6C;AAGtC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,iBAAK;IACrC,YAAmB,MAAmB;QACrC,KAAK,CAAC;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,EAAE,EAAE,MAAM,CAAC,QAAQ;YACnB,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,IAAI;SACjB,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY;QACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,eAAe;QAC3B,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;CACD,CAAA;AAlBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;6CAEe,0BAAW;GAD1B,WAAW,CAkBvB"}

package/dist/redis.config.d.ts

@@ -0,0 +1,23 @@
+import zod from '@hg-ts/validation';
+export declare const REDIS_CONFIG_SCHEMA: zod.ZodObject<{
+    host: zod.ZodEffects<zod.ZodString, string, string>;
+    database: zod.ZodNumber;
+    port: zod.ZodNumber;
+}, "strip", zod.ZodTypeAny, {
+    host: string;
+    database: number;
+    port: number;
+}, {
+    host: string;
+    database: number;
+    port: number;
+}>;
+declare const RedisConfig_base: import("@hg-ts/validation").ZodDto<{
+    host: string;
+    database: number;
+    port: number;
+}>;
+export declare class RedisConfig extends RedisConfig_base {
+}
+export {};
+//# sourceMappingURL=redis.config.d.ts.map

package/dist/redis.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.config.d.ts","sourceRoot":"","sources":["../src/redis.config.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AAEpC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;EAI9B,CAAC;;;;;;AAEH,qBAAa,WAAY,SAAQ,gBAA6B;CAAG"}

package/dist/redis.config.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisConfig = exports.REDIS_CONFIG_SCHEMA = void 0;
+const tslib_1 = require("tslib");
+const validation_1 = tslib_1.__importDefault(require("@hg-ts/validation"));
+exports.REDIS_CONFIG_SCHEMA = validation_1.default.object({
+    host: validation_1.default.string().enforceEnv('REDIS_HOST'),
+    database: validation_1.default.number().int().min(0),
+    port: validation_1.default.number().positive().int(),
+});
+class RedisConfig extends exports.REDIS_CONFIG_SCHEMA.toClass() {
+}
+exports.RedisConfig = RedisConfig;
+//# sourceMappingURL=redis.config.js.map

package/dist/redis.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.config.js","sourceRoot":"","sources":["../src/redis.config.ts"],"names":[],"mappings":";;;;AAAA,2EAAoC;AAEvB,QAAA,mBAAmB,GAAG,oBAAG,CAAC,MAAM,CAAC;IAC7C,IAAI,EAAE,oBAAG,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;IAC3C,QAAQ,EAAE,oBAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,IAAI,EAAE,oBAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE;CACnC,CAAC,CAAC;AAEH,MAAa,WAAY,SAAQ,2BAAmB,CAAC,OAAO,EAAE;CAAG;AAAjE,kCAAiE"}

package/dist/redis.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.module.d.ts","sourceRoot":"","sources":["../src/redis.module.ts"],"names":[],"mappings":"AAQA,qBAMa,WAAW;CAAG"}
+{"version":3,"file":"redis.module.d.ts","sourceRoot":"","sources":["../src/redis.module.ts"],"names":[],"mappings":"AAUA,qBAca,WAAW;CAAG"}

package/dist/redis.module.js

@@ -2,18 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisModule = void 0;
 const tslib_1 = require("tslib");
-const ioc_1 = require("@hg-ts/ioc");
-const redis_config_1 = require("@hg-ts/redis-config");
+const config_loader_1 = require("@hg-ts/config-loader");
+const common_1 = require("@nestjs/common");
 const redis_client_1 = require("./redis.client");
+const redis_config_1 = require("./redis.config");
 let RedisModule = class RedisModule {
 };
 exports.RedisModule = RedisModule;
 exports.RedisModule = RedisModule = tslib_1.__decorate([
-    (0, ioc_1.Global)(),
-    (0, ioc_1.Module)({
-        imports: [redis_config_1.RedisConfigModule],
-        providers: [redis_client_1.RedisClient],
-        exports: [redis_client_1.RedisClient],
+    (0, common_1.Global)(),
+    (0, common_1.Module)({
+        providers: [
+            {
+                provide: redis_config_1.RedisConfig,
+                async useFactory(configLoader) {
+                    return configLoader.load(redis_config_1.RedisConfig, 'redis');
+                },
+                inject: [config_loader_1.ConfigLoader],
+            },
+            redis_client_1.RedisClient,
+        ],
+        exports: [redis_client_1.RedisClient, redis_config_1.RedisConfig],
     })
 ], RedisModule);
 //# sourceMappingURL=redis.module.js.map

package/dist/redis.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.module.js","sourceRoot":"","sources":["../src/redis.module.ts"],"names":[],"mappings":";;;;AAAA,oCAGoB;AACpB,sDAAwD;AAExD,iDAA6C;AAQtC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IANvB,IAAA,YAAM,GAAE;IACR,IAAA,YAAM,EAAC;QACP,OAAO,EAAE,CAAC,gCAAiB,CAAC;QAC5B,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,CAAC;KACtB,CAAC;GACW,WAAW,CAAG"}
+{"version":3,"file":"redis.module.js","sourceRoot":"","sources":["../src/redis.module.ts"],"names":[],"mappings":";;;;AAAA,wDAAoD;AAEpD,2CAGwB;AAExB,iDAA6C;AAC7C,iDAA6C;AAgBtC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IAdvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACP,SAAS,EAAE;YACV;gBACC,OAAO,EAAE,0BAAW;gBACpB,KAAK,CAAC,UAAU,CAAC,YAA0B;oBAC1C,OAAO,YAAY,CAAC,IAAI,CAAC,0BAAW,EAAE,OAAO,CAAC,CAAC;gBAChD,CAAC;gBACD,MAAM,EAAE,CAAC,4BAAY,CAAC;aACtB;YACD,0BAAW;SACX;QACD,OAAO,EAAE,CAAC,0BAAW,EAAE,0BAAW,CAAC;KACnC,CAAC;GACW,WAAW,CAAG"}

package/dist/test-container/index.d.ts

@@ -0,0 +1,2 @@
+export * from './redis-testcontainer.module';
+//# sourceMappingURL=index.d.ts.map

package/dist/test-container/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-container/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC"}

package/dist/test-container/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./redis-testcontainer.module"), exports);
+//# sourceMappingURL=index.js.map

package/dist/test-container/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test-container/index.ts"],"names":[],"mappings":";;;AAAA,uEAA6C"}

package/dist/test-container/redis-testcontainer.module.d.ts

@@ -0,0 +1,3 @@
+export declare class RedisTestContainerModule {
+}
+//# sourceMappingURL=redis-testcontainer.module.d.ts.map

package/dist/test-container/redis-testcontainer.module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-testcontainer.module.d.ts","sourceRoot":"","sources":["../../src/test-container/redis-testcontainer.module.ts"],"names":[],"mappings":"AASA,qBAEa,wBAAwB;CAAG"}

package/dist/test-container/redis-testcontainer.module.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisTestContainerModule = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const redis_module_1 = require("../redis.module");
+const redis_testcontainer_service_1 = require("./redis-testcontainer.service");
+let RedisTestContainerModule = class RedisTestContainerModule {
+};
+exports.RedisTestContainerModule = RedisTestContainerModule;
+exports.RedisTestContainerModule = RedisTestContainerModule = tslib_1.__decorate([
+    (0, common_1.Global)(),
+    (0, common_1.Module)({ imports: [redis_module_1.RedisModule], providers: [redis_testcontainer_service_1.RedisTestContainerService] })
+], RedisTestContainerModule);
+//# sourceMappingURL=redis-testcontainer.module.js.map

package/dist/test-container/redis-testcontainer.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-testcontainer.module.js","sourceRoot":"","sources":["../../src/test-container/redis-testcontainer.module.ts"],"names":[],"mappings":";;;;AAAA,2CAGwB;AAExB,kDAA8C;AAE9C,+EAA0E;AAInE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;CAAG,CAAA;AAA3B,4DAAwB;mCAAxB,wBAAwB;IAFpC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,OAAO,EAAE,CAAC,0BAAW,CAAC,EAAE,SAAS,EAAE,CAAC,uDAAyB,CAAC,EAAE,CAAC;GAC9D,wBAAwB,CAAG"}

package/dist/test-container/redis-testcontainer.service.d.ts

@@ -0,0 +1,13 @@
+import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+export declare class RedisTestContainerService implements OnModuleInit, OnModuleDestroy {
+    private readonly config;
+    private container;
+    private initPromise;
+    constructor();
+    onModuleInit(): Promise<void>;
+    onModuleDestroy(): Promise<void>;
+    private startContainer;
+    private stopContainer;
+    private enrichClient;
+}
+//# sourceMappingURL=redis-testcontainer.service.d.ts.map

package/dist/test-container/redis-testcontainer.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-testcontainer.service.d.ts","sourceRoot":"","sources":["../../src/test-container/redis-testcontainer.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,eAAe,EACf,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAUxB,qBAAa,yBAA0B,YAAW,YAAY,EAAE,eAAe;IAE9E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAErC,OAAO,CAAC,SAAS,CAAwB;IAEzC,OAAO,CAAC,WAAW,CAAiC;;IAMvC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;YAI/B,cAAc;YAOd,aAAa;IAI3B,OAAO,CAAC,YAAY;CAWpB"}

package/dist/test-container/redis-testcontainer.service.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisTestContainerService = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const redis_1 = require("@testcontainers/redis");
+const redis_client_1 = require("../redis.client");
+const redis_config_1 = require("../redis.config");
+class RedisTestContainerService {
+    config;
+    container;
+    initPromise = null;
+    constructor() {
+        this.enrichClient();
+    }
+    async onModuleInit() {
+        if (!this.initPromise) {
+            this.initPromise = this.startContainer();
+        }
+        return this.initPromise;
+    }
+    async onModuleDestroy() {
+        await this.stopContainer();
+    }
+    async startContainer() {
+        const container = new redis_1.RedisContainer('redis')
+            .withExposedPorts({ container: 6379, host: this.config.port });
+        this.container = await container.start();
+    }
+    async stopContainer() {
+        await this.container.stop();
+    }
+    enrichClient() {
+        const originalInitHook = redis_client_1.RedisClient.prototype.onModuleInit;
+        const self = this;
+        redis_client_1.RedisClient.prototype.onModuleInit = async function () {
+            await self.onModuleInit();
+            return originalInitHook.call(this);
+        };
+    }
+}
+exports.RedisTestContainerService = RedisTestContainerService;
+tslib_1.__decorate([
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", redis_config_1.RedisConfig)
+], RedisTestContainerService.prototype, "config", void 0);
+//# sourceMappingURL=redis-testcontainer.service.js.map

package/dist/test-container/redis-testcontainer.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-testcontainer.service.js","sourceRoot":"","sources":["../../src/test-container/redis-testcontainer.service.ts"],"names":[],"mappings":";;;;AAAA,2CAIwB;AAExB,iDAG+B;AAE/B,kDAA8C;AAC9C,kDAA8C;AAE9C,MAAa,yBAAyB;IAEpB,MAAM,CAAc;IAE7B,SAAS,CAAwB;IAEjC,WAAW,GAA4B,IAAI,CAAC;IAEpD;QACC,IAAI,CAAC,YAAY,EAAE,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,eAAe;QAC3B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC3B,MAAM,SAAS,GAAG,IAAI,sBAAc,CAAC,OAAO,CAAC;aAC3C,gBAAgB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC,SAAS,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,aAAa;QAC1B,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAEO,YAAY;QAEnB,MAAM,gBAAgB,GAAG,0BAAW,CAAC,SAAS,CAAC,YAAY,CAAC;QAE5D,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,0BAAW,CAAC,SAAS,CAAC,YAAY,GAAG,KAAK;YACzC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;IACH,CAAC;CACD;AA9CD,8DA8CC;AA5CiB;IADhB,IAAA,eAAM,GAAE;sCACgB,0BAAW;yDAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hg-ts/redis",
-  "version": "0.1.117",
+  "version": "0.2.0",
   "main": "dist/index.js",
   "exports": {
     ".": "./dist/index.js"
@@ -15,11 +15,12 @@
     "lint:ts:fix": "lint-ts --fix"
   },
   "devDependencies": {
-    "@hg-ts-config/typescript": "0.1.117",
-    "@hg-ts/ioc": "0.1.117",
-    "@hg-ts/linter": "0.1.117",
-    "@hg-ts/redis-config": "0.1.117",
-    "@hg-ts/types": "0.1.117",
+    "@hg-ts-config/typescript": "0.2.0",
+    "@hg-ts/config-loader": "0.2.0",
+    "@hg-ts/linter": "0.2.0",
+    "@hg-ts/types": "0.2.0",
+    "@hg-ts/validation": "0.2.0",
+    "@nestjs/common": "11.1.0",
     "@types/node": "22.10.6",
     "eslint": "9.18.0",
     "reflect-metadata": "0.2.2",
@@ -29,13 +30,16 @@
     "typescript": "5.7.3"
   },
   "peerDependencies": {
-    "@hg-ts/ioc": "0.1.117",
-    "@hg-ts/redis-config": "0.1.117",
+    "@hg-ts/config-loader": "0.2.0",
+    "@hg-ts/validation": "0.2.0",
+    "@nestjs/common": "*",
     "reflect-metadata": "*",
     "rxjs": "*",
     "tslib": "*"
   },
   "dependencies": {
-    "ioredis": "5.5.0"
+    "@testcontainers/redis": "11.5.1",
+    "ioredis": "5.5.0",
+    "testcontainers": "11.2.1"
   }
 }