@midwayjs/redis 3.0.0-beta.1 → 3.0.0-beta.13

package/CHANGELOG.md

@@ -3,6 +3,108 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/redis
+
+
+
+
+
 # [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
 
 

package/README.md

@@ -5,7 +5,7 @@
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/configuration.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const path_1 = require("path");
 const manager_1 = require("./manager");
 let RedisConfiguration = class RedisConfiguration {
     async onReady(container) {
@@ -22,7 +21,13 @@ let RedisConfiguration = class RedisConfiguration {
 RedisConfiguration = __decorate([
     (0, decorator_1.Configuration)({
         namespace: 'redis',
-        importConfigs: [(0, path_1.join)(__dirname, './config.default')],
+        importConfigs: [
+            {
+                default: {
+                    redis: {},
+                },
+            },
+        ],
     })
 ], RedisConfiguration);
 exports.RedisConfiguration = RedisConfiguration;

package/dist/manager.js

@@ -25,8 +25,7 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
             config.nodes.forEach(client => {
                 assert(client.host &&
                     client.port &&
-                    client.password !== undefined &&
-                    client.db !== undefined, `[@midwayjs/redis] 'host: ${client.host}', 'port: ${client.port}', 'password: ${client.password}', 'db: ${client.db}' are required on config`);
+                    `[@midwayjs/redis] 'host: ${client.host}', 'port: ${client.port}' are required on config`);
             });
             this.logger.info('[@midwayjs/redis] cluster connecting');
             client = new Redis.Cluster(config.nodes, config);
@@ -36,16 +35,12 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
             config.sentinels.forEach(sentinel => {
                 assert(sentinel.host && sentinel.port, `[@midwayjs/redis] 'host: ${sentinel.host}', 'port: ${sentinel.port}' are required on config`);
             });
-            assert(config.name && config.password !== undefined && config.db !== undefined, `[@midwayjs/redis] 'name of master: ${config.name}', 'password: ${config.password}', 'db: ${config.db}' are required on config`);
             this.logger.info('[@midwayjs/redis] sentinel connecting start');
             client = new Redis(config);
         }
         else {
-            assert(config.host &&
-                config.port &&
-                config.password !== undefined &&
-                config.db !== undefined, `[@midwayjs/redis] 'host: ${config.host}', 'port: ${config.port}', 'password: ${config.password}', 'db: ${config.db}' are required on config`);
-            this.logger.info('[@midwayjs/redis] server connecting redis://:***@%s:%s/%s', config.host, config.port, config.db);
+            assert(config.host && config.port, `[@midwayjs/redis] 'host: ${config.host}', 'port: ${config.port}' are required on config`);
+            this.logger.info('[@midwayjs/redis] server connecting redis://:***@%s:%s/%s', config.host, config.port);
             client = new Redis(config);
         }
         client.on('connect', () => {

package/index.d.ts

@@ -0,0 +1,62 @@
+import { ClusterNode, ClusterOptions } from 'ioredis';
+
+export * from './dist/index';
+
+import * as Redis from 'ioredis';
+
+// Single Redis
+// client: {
+//   host: 'host',
+//   port: 'port',
+//   family: 'user',
+//   password: 'password',
+//   db: 'db',
+// },
+
+// Cluster Redis
+// client: {
+//   cluster: true,
+//   nodes: [{
+//     host: 'host',
+//     port: 'port',
+//     family: 'user',
+//     password: 'password',
+//     db: 'db',
+//   },{
+//     host: 'host',
+//     port: 'port',
+//     family: 'user',
+//     password: 'password',
+//     db: 'db',
+//   },
+// ]},
+
+// Multi Redis
+// clients: {
+//   instance1: {
+//     host: 'host',
+//     port: 'port',
+//     family: 'user',
+//     password: 'password',
+//     db: 'db',
+//   },
+//   instance2: {
+//     host: 'host',
+//     port: 'port',
+//     family: 'user',
+//     password: 'password',
+//     db: 'db',
+//   },
+// },
+
+declare module '@midwayjs/core/dist/interface' {
+  interface MidwayConfig {
+    redis?: ServiceFactoryConfigOption<
+      | Redis.RedisOptions
+      | ({
+          cluster?: boolean;
+          nodes?: ClusterNode[];
+        } & ClusterOptions)
+    >;
+  }
+}

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@midwayjs/redis",
   "description": "midway redis component",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.13",
   "main": "dist/index",
-  "typings": "dist/index.d.ts",
+  "typings": "index.d.ts",
   "files": [
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.1",
-    "@midwayjs/decorator": "^3.0.0-beta.1",
-    "@midwayjs/mock": "^3.0.0-beta.1",
+    "@midwayjs/core": "^3.0.0-beta.13",
+    "@midwayjs/decorator": "^3.0.0-beta.13",
+    "@midwayjs/mock": "^3.0.0-beta.13",
     "@types/ioredis": "^4.27.1"
   },
   "dependencies": {
@@ -36,5 +37,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "72e4d20c678e65a5440c4e9a6d3b70046daa497c"
+  "gitHead": "d3c47770fee9dce33a8d148882173fd7782864ad"
 }

package/dist/config.default.d.ts

@@ -1,5 +0,0 @@
-export declare const redis: {
-    default: {};
-    supportTimeCommand: boolean;
-};
-//# sourceMappingURL=config.default.d.ts.map

package/dist/config.default.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redis = void 0;
-exports.redis = {
-    default: {},
-    // redis client will try to use TIME command to detect client is ready or not
-    // if your redis server not support TIME command, please set this config to false
-    // see https://redis.io/commands/time
-    supportTimeCommand: true,
-    //  Redis: require('ioredis'), // customize ioredis version, only set when you needed
-    // Single Redis
-    // client: {
-    //   host: 'host',
-    //   port: 'port',
-    //   family: 'user',
-    //   password: 'password',
-    //   db: 'db',
-    // },
-    // Cluster Redis
-    // client: {
-    //   cluster: true,
-    //   nodes: [{
-    //     host: 'host',
-    //     port: 'port',
-    //     family: 'user',
-    //     password: 'password',
-    //     db: 'db',
-    //   },{
-    //     host: 'host',
-    //     port: 'port',
-    //     family: 'user',
-    //     password: 'password',
-    //     db: 'db',
-    //   },
-    // ]},
-    // Multi Redis
-    // clients: {
-    //   instance1: {
-    //     host: 'host',
-    //     port: 'port',
-    //     family: 'user',
-    //     password: 'password',
-    //     db: 'db',
-    //   },
-    //   instance2: {
-    //     host: 'host',
-    //     port: 'port',
-    //     family: 'user',
-    //     password: 'password',
-    //     db: 'db',
-    //   },
-    // },
-};
-//# sourceMappingURL=config.default.js.map