@midwayjs/redis 3.19.0 → 4.0.0-alpha.1

package/dist/configuration.js

@@ -34,7 +34,8 @@ let RedisConfiguration = class RedisConfiguration {
         };
     }
 };
-RedisConfiguration = __decorate([
+exports.RedisConfiguration = RedisConfiguration;
+exports.RedisConfiguration = RedisConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'redis',
         importConfigs: [
@@ -46,5 +47,4 @@ RedisConfiguration = __decorate([
         ],
     })
 ], RedisConfiguration);
-exports.RedisConfiguration = RedisConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/manager.js

@@ -20,28 +20,28 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
     async createClient(config) {
         let client;
         if (config.cluster === true) {
-            assert(config.nodes && config.nodes.length !== 0, '[midway:redis] cluster nodes configuration is required when use cluster redis');
+            assert.ok(config.nodes && config.nodes.length !== 0, '[midway:redis] cluster nodes configuration is required when use cluster redis');
             config.nodes.forEach(client => {
-                assert(client.host && client.port, `[midway:redis] 'host: ${client.host}', 'port: ${client.port}' are required on config`);
+                assert.ok(client.host && client.port, `[midway:redis] 'host: ${client.host}', 'port: ${client.port}' are required on config`);
             });
-            this.logger.info('[midway:redis] cluster connecting');
             client = new ioredis_1.default.Cluster(config.nodes, config);
+            this.logger.info('[midway:redis] cluster is connecting');
         }
         else if (config.sentinels) {
-            assert(config.sentinels && config.sentinels.length !== 0, '[midway:redis] sentinels configuration is required when use redis sentinel');
+            assert.ok(config.sentinels && config.sentinels.length !== 0, '[midway:redis] sentinels configuration is required when use redis sentinel');
             config.sentinels.forEach(sentinel => {
-                assert(sentinel.host && sentinel.port, `[midway:redis] 'host: ${sentinel.host}', 'port: ${sentinel.port}' are required on config`);
+                assert.ok(sentinel.host && sentinel.port, `[midway:redis] 'host: ${sentinel.host}', 'port: ${sentinel.port}' are required on config`);
             });
-            this.logger.info('[midway:redis] sentinel connecting start');
             client = new ioredis_1.default(config);
+            this.logger.info('[midway:redis] sentinel is connecting');
         }
         else {
-            assert(config.host && config.port, `[midway:redis] 'host: ${config.host}', 'port: ${config.port}' are required on config`);
-            this.logger.info('[midway:redis] server connecting redis://:***@%s:%s', config.host, config.port);
+            assert.ok(config.host && config.port, `[midway:redis] 'host: ${config.host}', 'port: ${config.port}' are required on config`);
             client = new ioredis_1.default(config);
+            this.logger.info('[midway:redis] server is connecting redis://:***@%s:%s', config.host, config.port);
         }
         await new Promise((resolve, reject) => {
-            client.on('connect', () => {
+            client.on('ready', () => {
                 this.logger.info('[midway:redis] client connect success');
                 resolve();
             });
@@ -69,6 +69,7 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
         }
     }
 };
+exports.RedisServiceFactory = RedisServiceFactory;
 __decorate([
     (0, core_1.Config)('redis'),
     __metadata("design:type", Object)
@@ -83,20 +84,19 @@ __decorate([
     (0, core_1.Logger)('coreLogger'),
     __metadata("design:type", Object)
 ], RedisServiceFactory.prototype, "logger", void 0);
-RedisServiceFactory = __decorate([
+exports.RedisServiceFactory = RedisServiceFactory = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], RedisServiceFactory);
-exports.RedisServiceFactory = RedisServiceFactory;
 let RedisService = class RedisService {
     async init() {
-        var _a, _b;
-        this.instance = this.serviceFactory.get(((_b = (_a = this.serviceFactory).getDefaultClientName) === null || _b === void 0 ? void 0 : _b.call(_a)) || 'default');
+        this.instance = this.serviceFactory.get(this.serviceFactory.getDefaultClientName?.() || 'default');
         if (!this.instance) {
             throw new core_1.MidwayCommonError('redis default instance not found.');
         }
     }
 };
+exports.RedisService = RedisService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", RedisServiceFactory)
@@ -107,11 +107,10 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], RedisService.prototype, "init", null);
-RedisService = __decorate([
+exports.RedisService = RedisService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], RedisService);
-exports.RedisService = RedisService;
 (0, core_1.delegateTargetAllPrototypeMethod)(RedisService, ioredis_1.default);
 RedisService.prototype.defineCommand = function (name, definition) {
     this.instance.defineCommand(name, definition);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/redis",
   "description": "midway redis component",
-  "version": "3.19.0",
+  "version": "4.0.0-alpha.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/mock": "^3.19.0"
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-alpha.1"
   },
   "dependencies": {
     "ioredis": "5.4.1"
@@ -23,8 +23,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "lint": "mwts check"
   },
@@ -35,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "437e92d9375b0e375f83aa363f3e6a60187c7109"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }