@midwayjs/redis 3.13.9 → 3.14.0

package/dist/configuration.d.ts

@@ -1,5 +1,7 @@
-export declare class RedisConfiguration {
-    onReady(container: any): Promise<void>;
-    onStop(container: any): Promise<void>;
+import { HealthResult, ILifeCycle, IMidwayContainer } from '@midwayjs/core';
+export declare class RedisConfiguration implements ILifeCycle {
+    onReady(container: IMidwayContainer): Promise<void>;
+    onStop(container: IMidwayContainer): Promise<void>;
+    onHealthCheck(container: IMidwayContainer): Promise<HealthResult>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -17,6 +17,22 @@ let RedisConfiguration = class RedisConfiguration {
         const factory = await container.getAsync(manager_1.RedisServiceFactory);
         await factory.stop();
     }
+    async onHealthCheck(container) {
+        const factory = await container.getAsync(manager_1.RedisServiceFactory);
+        const clients = factory.getClients();
+        // find status not ready
+        let clientName;
+        for (const [name, instance] of clients) {
+            if (instance.status !== 'ready' && !factory.isLowPriority(name)) {
+                clientName = name;
+                break;
+            }
+        }
+        return {
+            status: !clientName,
+            reason: clientName ? `redis client "${clientName}" is not ready` : '',
+        };
+    }
 };
 RedisConfiguration = __decorate([
     (0, core_1.Configuration)({

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+import Redis from 'ioredis';
 export { RedisConfiguration as Configuration } from './configuration';
 export * from './manager';
 export * from './interface';
+export { Redis };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,7 +14,9 @@ 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 });
-exports.Configuration = void 0;
+exports.Redis = exports.Configuration = void 0;
+const ioredis_1 = require("ioredis");
+exports.Redis = ioredis_1.default;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.RedisConfiguration; } });
 __exportStar(require("./manager"), exports);

package/dist/manager.d.ts

@@ -1,13 +1,13 @@
-import { ServiceFactory, ServiceFactoryConfigOption } from '@midwayjs/core';
+import { ServiceFactory, ServiceFactoryConfigOption, ILogger } from '@midwayjs/core';
 import Redis from 'ioredis';
 import { RedisConfigOptions } from './interface';
 export declare class RedisServiceFactory extends ServiceFactory<Redis> {
-    redisConfig: ServiceFactoryConfigOption<RedisConfigOptions>;
-    init(): Promise<void>;
-    logger: any;
-    createClient(config: any): Promise<Redis>;
+    protected redisConfig: ServiceFactoryConfigOption<RedisConfigOptions>;
+    protected init(): Promise<void>;
+    protected logger: ILogger;
+    protected createClient(config: any): Promise<Redis>;
     getName(): string;
-    destroyClient(redisInstance: any): Promise<void>;
+    protected destroyClient(redisInstance: any): Promise<void>;
 }
 export declare class RedisService implements Redis {
     private serviceFactory;

package/dist/manager.js

@@ -57,7 +57,12 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
     }
     async destroyClient(redisInstance) {
         try {
-            await (redisInstance && redisInstance.quit());
+            if (redisInstance) {
+                const canQuit = !['end', 'close'].includes(redisInstance.status);
+                if (canQuit) {
+                    await redisInstance.quit();
+                }
+            }
         }
         catch (error) {
             this.logger.error('[midway:redis] Redis quit failed.', error);

package/index.d.ts

@@ -1,7 +1,4 @@
-import { ClusterNode, ClusterOptions } from 'ioredis';
-import * as Redis from 'ioredis';
 import { RedisConfigOptions } from './dist';
-
 export * from './dist/index';
 
 // Single Redis

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/redis",
   "description": "midway redis component",
-  "version": "3.13.9",
+  "version": "3.14.0",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.13.7",
-    "@midwayjs/mock": "^3.13.9"
+    "@midwayjs/core": "^3.14.0",
+    "@midwayjs/mock": "^3.14.0"
   },
   "dependencies": {
     "ioredis": "5.3.2"
@@ -35,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "00750219506f4e3ad0e1dbb167d295610005b328"
+  "gitHead": "67e3a3596ffdb65a413064d30c68f1f7965af282"
 }