vona-module-a-redis 5.1.5 → 5.1.9
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/LICENSE +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/redis.d.ts.map +1 -1
- package/dist/service/redis.d.ts.map +1 -1
- package/dist/service/redisClient_.d.ts.map +1 -1
- package/package.json +10 -7
- package/src/lib/redis.ts +5 -1
- package/src/service/redis.ts +8 -2
- package/src/service/redisClient_.ts +4 -1
package/LICENSE
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../src/lib/redis.ts","../src/service/redisClient_.ts","../src/bean/bean.redis.ts","../src/service/redis.ts","../src/main.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["getRedisClientKeyPrefix","clientName","app","mode","includes","config","meta","name","prepareRedisClientKeyPrefix","keyPrefix","ServiceRedisClient","BeanBase","constructor","args","_redisInstance","instance","__init__","_createClient","__dispose__","disconnect","configRedis","redis","configClient","clients","Error","cast","sentinels","Redis","nodes","Cluster","configNode","deepExtend","base","__decorate","Service","__z_BeanInfo","module","BeanRedis","getClient","bean","_getBeanSelector","get","client","Bean","ServiceRedis","clearAllData","_clearRedisKeys","_clientName","startsWith","pattern","options","keys","keysDel","fullKey","key","substring","length","push","del","Main","BeanSimple","moduleLoading","_configDefault","combineConfigDefault","configDefault","moduleLoaded","configLoaded","_config","_app","ScopeModuleARedis","BeanScopeBase","Scope"],"mappings":";;;;;AAEM,SAAUA,uBAAuBA,CAACC,UAAkB,EAAEC,GAAoB,EAAA;EAC9E,MAAMC,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAACC,QAAQ,CAACF,GAAG,CAACG,MAAM,CAACC,IAAI,CAACH,IAAI,CAAC,GAAG,QAAQ,GAAG,EAAE;EAC3E,OAAO,CAAA,EAAGF,UAAU,CAAA,CAAA,EAAIC,GAAG,CAACK,IAAI,CAAA,EAAGJ,IAAI,CAAA,CAAA,CAAG;AAC5C;SAEgBK,2BAA2BA,
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../src/lib/redis.ts","../src/service/redisClient_.ts","../src/bean/bean.redis.ts","../src/service/redis.ts","../src/main.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["getRedisClientKeyPrefix","clientName","app","mode","includes","config","meta","name","prepareRedisClientKeyPrefix","keyPrefix","ServiceRedisClient","BeanBase","constructor","args","_redisInstance","instance","__init__","_createClient","__dispose__","disconnect","configRedis","redis","configClient","clients","Error","cast","sentinels","Redis","nodes","Cluster","configNode","deepExtend","base","__decorate","Service","__z_BeanInfo","module","BeanRedis","getClient","bean","_getBeanSelector","get","client","Bean","ServiceRedis","clearAllData","_clearRedisKeys","_clientName","startsWith","pattern","options","keys","keysDel","fullKey","key","substring","length","push","del","Main","BeanSimple","moduleLoading","_configDefault","combineConfigDefault","configDefault","moduleLoaded","configLoaded","_config","_app","ScopeModuleARedis","BeanScopeBase","Scope"],"mappings":";;;;;AAEM,SAAUA,uBAAuBA,CAACC,UAAkB,EAAEC,GAAoB,EAAA;EAC9E,MAAMC,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAACC,QAAQ,CAACF,GAAG,CAACG,MAAM,CAACC,IAAI,CAACH,IAAI,CAAC,GAAG,QAAQ,GAAG,EAAE;EAC3E,OAAO,CAAA,EAAGF,UAAU,CAAA,CAAA,EAAIC,GAAG,CAACK,IAAI,CAAA,EAAGJ,IAAI,CAAA,CAAA,CAAG;AAC5C;SAEgBK,2BAA2BA,CACzCC,SAAoC,EACpCR,UAAkB,EAClBC,GAAoB,EAAA;EAEpB,OAAOO,SAAS,KAAK,IAAI,GAAGT,uBAAuB,CAACC,UAAU,EAAEC,GAAG,CAAC,GAAGO,SAAS;AAClF;;ACFO,IAAMC,kBAAkB,GAAxB,MAAMA,kBAAmB,SAAQC,QAAQ,CAAA;AAAAC,EAAAA,WAAAA,CAAA,GAAAC,IAAA,EAAA;AAAA,IAAA,KAAA,CAAA,GAAAA,IAAA,CAAA;AAAA,IAAA,IAAA,CACtCC,cAAc,GAAA,MAAA;AAAA,EAAA;EAEtB,IAAIC,QAAQA,GAAA;IACV,OAAO,IAAI,CAACD,cAAc;AAC5B,EAAA;EAEUE,QAAQA,CAACf,UAAoC,EAAA;AACrD;IACA,IAAI,CAACa,cAAc,GAAG,IAAI,CAACG,aAAa,CAAChB,UAAU,CAAC;AACtD,EAAA;EAEU,MAAMiB,WAAWA,GAAA;AACzB,IAAA,MAAM,IAAI,CAACJ,cAAc,EAAEK,UAAU,EAAE;AACzC,EAAA;EAEQF,aAAaA,CAAChB,UAAoC,EAAA;IACxD,MAAMmB,WAAW,GAAG,IAAI,CAAClB,GAAG,CAACG,MAAM,CAACgB,KAAK;AACzC,IAAA,MAAMC,YAAY,GAAGF,WAAW,CAACG,OAAO,CAACtB,UAAU,CAAC;IACpD,IAAI,CAACqB,YAAY,EAAE,MAAM,IAAIE,KAAK,CAAC,CAAA,wBAAA,EAA2BvB,UAAU,CAAA,CAAE,CAAC;AAC3E,IAAA,IAAIwB,IAAI,CAAeH,YAAY,CAAC,CAACI,SAAS,EAAE;AAC9C;AACA,MAAA,OAAO,IAAIC,KAAK,CAACL,YAA4B,CAAC;IAChD,CAAC,MAAM,IAAIG,IAAI,CAAqBH,YAAY,CAAC,CAACM,KAAK,EAAE;AACvD,MAAA,OAAO,IAAID,KAAK,CAACE,OAAO,CACtBJ,IAAI,CAAqBH,YAAY,CAAC,CAACM,KAAK,EAC5CH,IAAI,CAAqBH,YAAY,CAAC,CACnB;AACvB,IAAA,CAAC,MAAM;AACL,MAAA,MAAMb,SAAS,GAAGD,2BAA2B,CAACc,YAAY,CAACb,SAAS,EAAER,UAAU,EAAE,IAAI,CAACC,GAAG,CAAC;AAC3F,MAAA,MAAM4B,UAAU,GAAGC,UAAU,CAAC,EAAE,EAAEX,WAAW,CAACY,IAAI,EAAEV,YAAY,EAAE;AAAEb,QAAAA;AAAS,OAAE,CAAC;AAChF,MAAA,OAAO,IAAIkB,KAAK,CAACG,UAAU,CAAC;AAC9B,IAAA;AACF,EAAA;;AAjCWpB,kBAAkB,GAAAuB,UAAA,CAAA,CAD9BC,OAAO,EAAE,EAAAC,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACG,EAAA1B,kBAAkB,CAkC9B;;ACrCM,IAAM2B,SAAS,GAAf,MAAMA,SAAU,SAAQ1B,QAAQ,CAAA;EACrC2B,SAASA,CAACrC,UAAqC,EAAA;AAC7C,IAAA,OAAO,IAAI,CAACC,GAAG,CAACqC,IAAI,CAACC,gBAAgB,CAAC9B,kBAAkB,EAAET,UAAU,IAAI,SAAS,CAAC;AACpF,EAAA;EAEAwC,GAAGA,CAACxC,UAAqC,EAAA;AACvC,IAAA,MAAMyC,MAAM,GAAG,IAAI,CAACJ,SAAS,CAACrC,UAAU,CAAC;IACzC,OAAOyC,MAAM,CAAC3B,QAAQ;AACxB,EAAA;;AARWsB,SAAS,GAAAJ,UAAA,CAAA,CADrBU,IAAI,EAAE,EAAAR,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACM,EAAAC,SAAS,CASrB;;ACPM,IAAMO,YAAY,GAAlB,MAAMA,YAAa,SAAQjC,QAAQ,CAAA;EACxC,MAAMkC,YAAYA,GAAA;AAChB,IAAA,MAAM3C,GAAG,GAAG,IAAI,CAACA,GAAG;AACpB;AACA;IACA,MAAM,IAAI,CAAC4C,eAAe,CACxB5C,GAAG,CAACqC,IAAI,CAAClB,KAAK,CAACoB,GAAG,CAAC,OAAO,CAAC,EAC3B,CAAA,EAAGzC,uBAAuB,CAAC,MAAM,EAAEE,GAAG,CAAC,CAAA,CAAA,CAAG,CAC3C;AACD;AACA;IACA,KAAK,MAAM6C,WAAW,IAAI7C,GAAG,CAACG,MAAM,CAACgB,KAAK,CAACE,OAAO,EAAE;MAClD,MAAMtB,UAAU,GAAG8C,WAAuC;AAC1D,MAAA,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC3C,QAAQ,CAACH,UAAU,CAAC,EAAE;AAC5D,MAAA,IAAIA,UAAU,CAAC+C,UAAU,CAAC,SAAS,CAAC,EAAE;QACpC,MAAM,IAAI,CAACF,eAAe,CACxB5C,GAAG,CAACqC,IAAI,CAAClB,KAAK,CAACoB,GAAG,CAACxC,UAAU,CAAC,EAC9B,CAAA,EAAGD,uBAAuB,CAAC,SAAS,EAAEE,GAAG,CAAC,CAAA,CAAA,CAAG,CAC9C;AACH,MAAA,CAAC,MAAM;QACL,MAAMwC,MAAM,GAAGxC,GAAG,CAACG,MAAM,CAACgB,KAAK,CAACE,OAAO,CAACtB,UAAU,CAAC;AACnD,QAAA,MAAMQ,SAAS,GAAGD,2BAA2B,CAACkC,MAAM,CAACjC,SAAS,EAAER,UAAU,EAAE,IAAI,CAACC,GAAG,CAAC;AACrF,QAAA,MAAM,IAAI,CAAC4C,eAAe,CAAC5C,GAAG,CAACqC,IAAI,CAAClB,KAAK,CAACoB,GAAG,CAACxC,UAAU,CAAC,EAAE,CAAA,EAAGQ,SAAS,GAAG,CAAC;AAC7E,MAAA;AACF,IAAA;AACF,EAAA;AAEQ,EAAA,MAAMqC,eAAeA,CAACzB,KAAY,EAAE4B,OAAe,EAAA;IACzD,IAAI,CAAC5B,KAAK,EAAE;AACZ,IAAA,MAAMZ,SAAS,GAAGY,KAAK,CAAC6B,OAAO,CAACzC,SAAS;IACzC,MAAM0C,IAAI,GAAG,MAAM9B,KAAK,CAAC8B,IAAI,CAACF,OAAO,CAAC;IACtC,MAAMG,OAAO,GAAa,EAAE;AAC5B,IAAA,KAAK,MAAMC,OAAO,IAAIF,IAAI,EAAE;AAC1B,MAAA,MAAMG,GAAG,GAAG7C,SAAS,GAAG4C,OAAO,CAACE,SAAS,CAAC9C,SAAS,CAAC+C,MAAM,CAAC,GAAGH,OAAO;AACrED,MAAAA,OAAO,CAACK,IAAI,CAACH,GAAG,CAAC;AACnB,IAAA;AACA,IAAA,IAAIF,OAAO,CAACI,MAAM,GAAG,CAAC,EAAE;AACtB,MAAA,MAAMnC,KAAK,CAACqC,GAAG,CAACN,OAAO,CAAC;AAC1B,IAAA;AACF,EAAA;;AAvCWR,YAAY,GAAAX,UAAA,CAAA,CADxBC,OAAO,EAAE,EAAAC,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACG,EAAAQ,YAAY,CAwCxB;;AC5CK,MAAOe,IAAK,SAAQC,UAAU,CAAA;EAClC,MAAMC,aAAaA,GAAA;IACjB,MAAMC,cAAc,GAAG,MAAMC,oBAAoB,CAAc,IAAI,CAAC7D,GAAG,EAAE8D,aAAa,CAAC;IACvF,IAAI,CAAC9D,GAAG,CAACG,MAAM,CAACgB,KAAK,GAAGU,UAAU,CAAC,EAAE,EAAE+B,cAAc,EAAE,IAAI,CAAC5D,GAAG,CAACG,MAAM,CAACgB,KAAK,CAAC;AAC/E,EAAA;EAEA,MAAM4C,YAAYA,GAAA,CAAI;AAEtB,EAAA,MAAMC,YAAYA,CAACC,OAAY,GAAG;AACnC;AAEM,eAAeH,aAAaA,CAACI,IAAqB,EAAA;AACvD,EAAA,OAAO,EAAE;AACX;;ACyDO,IAAMC,iBAAiB,GAAvB,MAAMA,iBAAkB,SAAQC,aAAa,CAAA;AAAvCD,iBAAiB,GAAApC,UAAA,CAAA,CAD7BsC,KAAK,EAAE,EAAApC,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACK,EAAAiC,iBAAiB,CAAyB;AAuBvD;;;;"}
|
package/dist/lib/redis.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/lib/redis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5C,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,MAAM,CAGxF;AAED,wBAAgB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/lib/redis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5C,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,MAAM,CAGxF;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACpC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,eAAe,GACnB,MAAM,GAAG,SAAS,CAEpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/service/redis.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAOhC,qBACa,YAAa,SAAQ,QAAQ;IAClC,YAAY;
|
|
1
|
+
{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/service/redis.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAOhC,qBACa,YAAa,SAAQ,QAAQ;IAClC,YAAY;YA0BJ,eAAe;CAa9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisClient_.d.ts","sourceRoot":"","sources":["../../src/service/redisClient_.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAoB,MAAM,MAAM,CAAC;AAGlD,OAAO,KAAK,EAAsB,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAIhF,qBACa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,cAAc,CAAQ;IAE9B,IAAI,QAAQ,IAAI,KAAK,CAEpB;IAED,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,kBAAkB;cAKvC,WAAW;IAI3B,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"redisClient_.d.ts","sourceRoot":"","sources":["../../src/service/redisClient_.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAoB,MAAM,MAAM,CAAC;AAGlD,OAAO,KAAK,EAAsB,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAIhF,qBACa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,cAAc,CAAQ;IAE9B,IAAI,QAAQ,IAAI,KAAK,CAEpB;IAED,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,kBAAkB;cAKvC,WAAW;IAI3B,OAAO,CAAC,aAAa;CAkBtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona-module-a-redis",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.9",
|
|
4
|
+
"gitHead": "3380f8c5d3989242b60dc2a34cbb330f74335cbe",
|
|
4
5
|
"description": "",
|
|
5
6
|
"keywords": [
|
|
6
7
|
"Vona Module"
|
|
@@ -22,6 +23,13 @@
|
|
|
22
23
|
},
|
|
23
24
|
"./package.json": "./package.json"
|
|
24
25
|
},
|
|
26
|
+
"scripts": {
|
|
27
|
+
"clean": "rimraf dist tsconfig.build.tsbuildinfo",
|
|
28
|
+
"tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
|
|
29
|
+
"prepublishOnly": "npm run tsc:publish",
|
|
30
|
+
"prepack": "clean-package",
|
|
31
|
+
"postpack": "clean-package restore && npm run clean"
|
|
32
|
+
},
|
|
25
33
|
"dependencies": {
|
|
26
34
|
"ioredis": "^5.10.1"
|
|
27
35
|
},
|
|
@@ -35,10 +43,5 @@
|
|
|
35
43
|
"globalDependencies": {
|
|
36
44
|
"ioredis": true
|
|
37
45
|
}
|
|
38
|
-
},
|
|
39
|
-
"gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
|
|
40
|
-
"scripts": {
|
|
41
|
-
"clean": "rimraf dist tsconfig.build.tsbuildinfo",
|
|
42
|
-
"tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json"
|
|
43
46
|
}
|
|
44
|
-
}
|
|
47
|
+
}
|
package/src/lib/redis.ts
CHANGED
|
@@ -5,6 +5,10 @@ export function getRedisClientKeyPrefix(clientName: string, app: VonaApplication
|
|
|
5
5
|
return `${clientName}_${app.name}${mode}:`;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
-
export function prepareRedisClientKeyPrefix(
|
|
8
|
+
export function prepareRedisClientKeyPrefix(
|
|
9
|
+
keyPrefix: string | true | undefined,
|
|
10
|
+
clientName: string,
|
|
11
|
+
app: VonaApplication,
|
|
12
|
+
): string | undefined {
|
|
9
13
|
return keyPrefix === true ? getRedisClientKeyPrefix(clientName, app) : keyPrefix;
|
|
10
14
|
}
|
package/src/service/redis.ts
CHANGED
|
@@ -13,14 +13,20 @@ export class ServiceRedis extends BeanBase {
|
|
|
13
13
|
const app = this.app;
|
|
14
14
|
// clear keys
|
|
15
15
|
// await this._clearRedisKeys(app.bean.redis.get('limiter'), `b_${app.name}:*`);
|
|
16
|
-
await this._clearRedisKeys(
|
|
16
|
+
await this._clearRedisKeys(
|
|
17
|
+
app.bean.redis.get('queue'),
|
|
18
|
+
`${getRedisClientKeyPrefix('bull', app)}*`,
|
|
19
|
+
);
|
|
17
20
|
// broadcast channel has subscribed
|
|
18
21
|
// await _clearRedisKeys(app.redis.get('broadcast'), `${getRedisClientKeyPrefix('broadcast', app)}*`);
|
|
19
22
|
for (const _clientName in app.config.redis.clients) {
|
|
20
23
|
const clientName = _clientName as keyof IRedisClientRecord;
|
|
21
24
|
if (['limiter', 'queue', 'broadcast'].includes(clientName)) continue;
|
|
22
25
|
if (clientName.startsWith('redlock')) {
|
|
23
|
-
await this._clearRedisKeys(
|
|
26
|
+
await this._clearRedisKeys(
|
|
27
|
+
app.bean.redis.get(clientName),
|
|
28
|
+
`${getRedisClientKeyPrefix('redlock', app)}*`,
|
|
29
|
+
);
|
|
24
30
|
} else {
|
|
25
31
|
const client = app.config.redis.clients[clientName];
|
|
26
32
|
const keyPrefix = prepareRedisClientKeyPrefix(client.keyPrefix, clientName, this.app);
|
|
@@ -33,7 +33,10 @@ export class ServiceRedisClient extends BeanBase {
|
|
|
33
33
|
// sentinels
|
|
34
34
|
return new Redis(configClient as RedisOptions);
|
|
35
35
|
} else if (cast<ConfigRedisCluster>(configClient).nodes) {
|
|
36
|
-
return new Redis.Cluster(
|
|
36
|
+
return new Redis.Cluster(
|
|
37
|
+
cast<ConfigRedisCluster>(configClient).nodes,
|
|
38
|
+
cast<ConfigRedisCluster>(configClient),
|
|
39
|
+
) as unknown as Redis;
|
|
37
40
|
} else {
|
|
38
41
|
const keyPrefix = prepareRedisClientKeyPrefix(configClient.keyPrefix, clientName, this.app);
|
|
39
42
|
const configNode = deepExtend({}, configRedis.base, configClient, { keyPrefix });
|