vona-module-a-redis 5.0.26 → 5.0.28

package/dist/index.js

@@ -2,12 +2,12 @@ import { BeanInfo, BeanBase, cast, deepExtend, BeanSimple, combineConfigDefault,
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { Redis } from 'ioredis';
 
-function getRedisClientKeyPrefix(clientName, appInfo) {
-  const mode = ['test', 'dev'].includes(appInfo.configMeta.mode) ? '_local' : '';
-  return `${clientName}_${appInfo.name}${mode}:`;
+function getRedisClientKeyPrefix(clientName, app) {
+  const mode = ['test', 'dev'].includes(app.configMeta.mode) ? '_local' : '';
+  return `${clientName}_${app.name}${mode}:`;
 }
-function prepareRedisClientKeyPrefix(keyPrefix, clientName, appInfo) {
-  return keyPrefix === true ? getRedisClientKeyPrefix(clientName, appInfo) : keyPrefix;
+function prepareRedisClientKeyPrefix(keyPrefix, clientName, app) {
+  return keyPrefix === true ? getRedisClientKeyPrefix(clientName, app) : keyPrefix;
 }
 
 var _dec$3, _dec2$3, _class$3;
@@ -71,16 +71,16 @@ let ServiceRedis = (_dec$1 = Service(), _dec2$1 = BeanInfo({
     await this._clearRedisKeys(app.bean.redis.get('queue'), `${getRedisClientKeyPrefix('bull', app)}*`);
     // broadcast channel has subscribed
     // await _clearRedisKeys(app.redis.get('broadcast'), `${getRedisClientKeyPrefix('broadcast', app)}*`);
-    // redlock
-    for (const clientName of this.$scope.redlock.config.redlock.clients) {
-      await this._clearRedisKeys(app.bean.redis.get(clientName), `${getRedisClientKeyPrefix('redlock', app)}*`);
-    }
-    for (const clientName in app.config.redis.clients) {
-      if (['redlock', 'limiter', 'queue', 'broadcast'].includes(clientName)) continue;
-      if (clientName.includes('redlock')) continue;
-      const client = app.config.redis.clients[clientName];
-      const keyPrefix = prepareRedisClientKeyPrefix(client.keyPrefix, clientName, this.app);
-      await this._clearRedisKeys(app.bean.redis.get(clientName), `${keyPrefix}*`);
+    for (const _clientName in app.config.redis.clients) {
+      const clientName = _clientName;
+      if (['limiter', 'queue', 'broadcast'].includes(clientName)) continue;
+      if (clientName.startsWith('redlock')) {
+        await this._clearRedisKeys(app.bean.redis.get(clientName), `${getRedisClientKeyPrefix('redlock', app)}*`);
+      } else {
+        const client = app.config.redis.clients[clientName];
+        const keyPrefix = prepareRedisClientKeyPrefix(client.keyPrefix, clientName, this.app);
+        await this._clearRedisKeys(app.bean.redis.get(clientName), `${keyPrefix}*`);
+      }
     }
   }
   async _clearRedisKeys(redis, pattern) {

package/dist/lib/redis.d.ts

@@ -1,3 +1,3 @@
-import type { VonaAppInfo, VonaApplication } from 'vona';
-export declare function getRedisClientKeyPrefix(clientName: string, appInfo: VonaAppInfo | VonaApplication): string;
-export declare function prepareRedisClientKeyPrefix(keyPrefix: string | true | undefined, clientName: string, appInfo: VonaAppInfo | VonaApplication): string | undefined;
+import type { VonaApplication } from 'vona';
+export declare function getRedisClientKeyPrefix(clientName: string, app: VonaApplication): string;
+export declare function prepareRedisClientKeyPrefix(keyPrefix: string | true | undefined, clientName: string, app: VonaApplication): string | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-redis",
   "type": "module",
-  "version": "5.0.26",
+  "version": "5.0.28",
   "title": "a-redis",
   "vonaModule": {
     "dependencies": {},