@midwayjs/redis 4.0.0-beta.7 → 4.0.0-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extension/serviceDiscovery.js +22 -11
- package/dist/manager.js +4 -0
- package/package.json +4 -4
|
@@ -13,17 +13,22 @@ exports.RedisServiceDiscovery = exports.RedisServiceDiscoverClient = void 0;
|
|
|
13
13
|
const core_1 = require("@midwayjs/core");
|
|
14
14
|
const manager_1 = require("../manager");
|
|
15
15
|
class RedisDataListener extends core_1.DataListener {
|
|
16
|
+
client;
|
|
17
|
+
pubsub;
|
|
18
|
+
options;
|
|
19
|
+
logger;
|
|
20
|
+
unsubscribe = null;
|
|
21
|
+
// 新增:定时刷新 TTL
|
|
22
|
+
ttlTimeout = null;
|
|
23
|
+
instance = null;
|
|
24
|
+
instanceKey = null;
|
|
25
|
+
serviceName;
|
|
16
26
|
constructor(serviceName, client, pubsub, options, logger) {
|
|
17
27
|
super();
|
|
18
28
|
this.client = client;
|
|
19
29
|
this.pubsub = pubsub;
|
|
20
30
|
this.options = options;
|
|
21
31
|
this.logger = logger;
|
|
22
|
-
this.unsubscribe = null;
|
|
23
|
-
// 新增:定时刷新 TTL
|
|
24
|
-
this.ttlTimeout = null;
|
|
25
|
-
this.instance = null;
|
|
26
|
-
this.instanceKey = null;
|
|
27
32
|
this.serviceName = serviceName;
|
|
28
33
|
}
|
|
29
34
|
async init() {
|
|
@@ -153,14 +158,18 @@ class RedisDataListener extends core_1.DataListener {
|
|
|
153
158
|
}
|
|
154
159
|
}
|
|
155
160
|
class RedisServiceDiscoverClient extends core_1.ServiceDiscoveryClient {
|
|
161
|
+
redis;
|
|
162
|
+
serviceDiscoveryOptions;
|
|
163
|
+
logger;
|
|
164
|
+
getListener;
|
|
165
|
+
registeredInstance = null;
|
|
166
|
+
onlineInstanceData = null;
|
|
156
167
|
constructor(redis, serviceDiscoveryOptions, logger, getListener) {
|
|
157
168
|
super(redis, serviceDiscoveryOptions);
|
|
158
169
|
this.redis = redis;
|
|
159
170
|
this.serviceDiscoveryOptions = serviceDiscoveryOptions;
|
|
160
171
|
this.logger = logger;
|
|
161
172
|
this.getListener = getListener;
|
|
162
|
-
this.registeredInstance = null;
|
|
163
|
-
this.onlineInstanceData = null;
|
|
164
173
|
}
|
|
165
174
|
async register(instance) {
|
|
166
175
|
this.registeredInstance = instance;
|
|
@@ -232,10 +241,12 @@ class RedisServiceDiscoverClient extends core_1.ServiceDiscoveryClient {
|
|
|
232
241
|
}
|
|
233
242
|
exports.RedisServiceDiscoverClient = RedisServiceDiscoverClient;
|
|
234
243
|
let RedisServiceDiscovery = class RedisServiceDiscovery extends core_1.ServiceDiscovery {
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
244
|
+
redisServiceFactory;
|
|
245
|
+
configService;
|
|
246
|
+
coreLogger;
|
|
247
|
+
redisServiceDiscoveryOptions;
|
|
248
|
+
listenerStore = new Map();
|
|
249
|
+
pubsub;
|
|
239
250
|
async init() {
|
|
240
251
|
this.redisServiceDiscoveryOptions = this.configService.getConfiguration('redis.serviceDiscovery', {});
|
|
241
252
|
this.redisServiceDiscoveryOptions.prefix =
|
package/dist/manager.js
CHANGED
|
@@ -14,11 +14,13 @@ const core_1 = require("@midwayjs/core");
|
|
|
14
14
|
const ioredis_1 = require("ioredis");
|
|
15
15
|
const assert = require("assert");
|
|
16
16
|
let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactory {
|
|
17
|
+
redisConfig;
|
|
17
18
|
async init() {
|
|
18
19
|
await this.initClients(this.redisConfig, {
|
|
19
20
|
concurrent: true,
|
|
20
21
|
});
|
|
21
22
|
}
|
|
23
|
+
logger;
|
|
22
24
|
async createClient(config, name) {
|
|
23
25
|
let client;
|
|
24
26
|
if (config.cluster === true) {
|
|
@@ -92,6 +94,8 @@ exports.RedisServiceFactory = RedisServiceFactory = __decorate([
|
|
|
92
94
|
(0, core_1.Scope)(core_1.ScopeEnum.Singleton)
|
|
93
95
|
], RedisServiceFactory);
|
|
94
96
|
let RedisService = class RedisService {
|
|
97
|
+
serviceFactory;
|
|
98
|
+
instance;
|
|
95
99
|
async init() {
|
|
96
100
|
this.instance = this.serviceFactory.get(this.serviceFactory.getDefaultClientName?.() || 'default');
|
|
97
101
|
if (!this.instance) {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@midwayjs/redis",
|
|
3
3
|
"description": "midway redis component",
|
|
4
|
-
"version": "4.0.0-beta.
|
|
4
|
+
"version": "4.0.0-beta.8",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
"index.d.ts"
|
|
11
11
|
],
|
|
12
12
|
"devDependencies": {
|
|
13
|
-
"@midwayjs/core": "^4.0.0-beta.
|
|
14
|
-
"@midwayjs/mock": "^4.0.0-beta.
|
|
13
|
+
"@midwayjs/core": "^4.0.0-beta.8",
|
|
14
|
+
"@midwayjs/mock": "^4.0.0-beta.8"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"ioredis": "5.4.2"
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
"type": "git",
|
|
36
36
|
"url": "https://github.com/midwayjs/midway.git"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "355e55949fdd132b0bdcb4830222a0a027e92ded"
|
|
39
39
|
}
|