@midwayjs/redis 3.0.2 → 3.0.4-beta.1

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@midwayjs/redis",
   "description": "midway redis component",
-  "version": "3.0.2",
+  "version": "3.0.4-beta.1",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
-    "index.d.ts",
-    "dist/**/*.js.map"
+    "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.0.2",
-    "@midwayjs/decorator": "^3.0.2",
-    "@midwayjs/mock": "^3.0.2",
+    "@midwayjs/core": "^3.0.4-beta.1",
+    "@midwayjs/decorator": "^3.0.4-beta.1",
+    "@midwayjs/mock": "^3.0.4-beta.1",
     "@types/ioredis": "4.28.7"
   },
   "dependencies": {
@@ -38,5 +37,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "ca77247d229978a736e79bb208579c014ed226fc"
+  "gitHead": "52bc37e7a570806c121b33a0e8ac1cd084445f5d"
 }

package/dist/configuration.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mDAAoD;AACpD,uCAAgD;AAYhD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC7B,KAAK,CAAC,OAAO,CAAC,SAAS;QACrB,MAAM,SAAS,CAAC,QAAQ,CAAC,6BAAmB,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAS;QACpB,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,6BAAmB,CAAC,CAAC;QAC9D,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;CACF,CAAA;AATY,kBAAkB;IAV9B,IAAA,yBAAa,EAAC;QACb,SAAS,EAAE,OAAO;QAClB,aAAa,EAAE;YACb;gBACE,OAAO,EAAE;oBACP,KAAK,EAAE,EAAE;iBACV;aACF;SACF;KACF,CAAC;GACW,kBAAkB,CAS9B;AATY,gDAAkB","sourcesContent":["import { Configuration } from '@midwayjs/decorator';\nimport { RedisServiceFactory } from './manager';\n\n@Configuration({\n  namespace: 'redis',\n  importConfigs: [\n    {\n      default: {\n        redis: {},\n      },\n    },\n  ],\n})\nexport class RedisConfiguration {\n  async onReady(container) {\n    await container.getAsync(RedisServiceFactory);\n  }\n\n  async onStop(container): Promise<void> {\n    const factory = await container.getAsync(RedisServiceFactory);\n    await factory.stop();\n  }\n}\n"]}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iDAAsE;AAA7D,8GAAA,kBAAkB,OAAiB;AAC5C,4CAA0B","sourcesContent":["export { RedisConfiguration as Configuration } from './configuration';\nexport * from './manager';\n"]}

package/dist/manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Config,\n  Init,\n  Inject,\n  Logger,\n  Provide,\n  Scope,\n  ScopeEnum,\n} from '@midwayjs/decorator';\nimport { ServiceFactory, delegateTargetPrototypeMethod } from '@midwayjs/core';\nimport * as Redis from 'ioredis';\nimport * as assert from 'assert';\n\n@Provide()\n@Scope(ScopeEnum.Singleton)\nexport class RedisServiceFactory extends ServiceFactory<Redis.Redis> {\n  @Config('redis')\n  redisConfig;\n\n  @Init()\n  async init() {\n    await this.initClients(this.redisConfig);\n  }\n\n  @Logger('coreLogger')\n  logger;\n\n  async createClient(config): Promise<Redis.Redis> {\n    let client;\n\n    if (config.cluster === true) {\n      assert(\n        config.nodes && config.nodes.length !== 0,\n        '[@midwayjs/redis] cluster nodes configuration is required when use cluster redis'\n      );\n\n      config.nodes.forEach(client => {\n        assert(\n          client.host &&\n            client.port &&\n            `[@midwayjs/redis] 'host: ${client.host}', 'port: ${client.port}' are required on config`\n        );\n      });\n      this.logger.info('[@midwayjs/redis] cluster connecting');\n      client = new Redis.Cluster(config.nodes, config);\n    } else if (config.sentinels) {\n      assert(\n        config.sentinels && config.sentinels.length !== 0,\n        '[@midwayjs/redis] sentinels configuration is required when use redis sentinel'\n      );\n\n      config.sentinels.forEach(sentinel => {\n        assert(\n          sentinel.host && sentinel.port,\n          `[@midwayjs/redis] 'host: ${sentinel.host}', 'port: ${sentinel.port}' are required on config`\n        );\n      });\n\n      this.logger.info('[@midwayjs/redis] sentinel connecting start');\n      client = new Redis(config);\n    } else {\n      assert(\n        config.host && config.port,\n        `[@midwayjs/redis] 'host: ${config.host}', 'port: ${config.port}' are required on config`\n      );\n      this.logger.info(\n        '[@midwayjs/redis] server connecting redis://:***@%s:%s/%s',\n        config.host,\n        config.port\n      );\n      client = new Redis(config);\n    }\n\n    client.on('connect', () => {\n      this.logger.info('[@midwayjs/redis] client connect success');\n    });\n    client.on('error', err => {\n      this.logger.error('[@midwayjs/redis] client error: %s', err);\n      this.logger.error(err);\n    });\n\n    return client;\n  }\n\n  getName() {\n    return 'redis';\n  }\n\n  async destroyClient(redisInstance) {\n    try {\n      await (redisInstance && redisInstance.quit());\n    } catch (error) {\n      this.logger.error('[@midwayjs/redis] Redis quit failed.', error);\n    }\n  }\n}\n\n@Provide()\n@Scope(ScopeEnum.Singleton)\nexport class RedisService implements Redis.Redis {\n  @Inject()\n  private serviceFactory: RedisServiceFactory;\n\n  // @ts-expect-error used\n  private instance: Redis.Redis;\n\n  @Init()\n  async init() {\n    this.instance = this.serviceFactory.get('default');\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface RedisService extends Redis.Redis {\n  // empty\n}\n\ndelegateTargetPrototypeMethod(RedisService, [Redis]);\n"]}