vona-module-a-redis 5.0.25 → 5.0.27

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './.metadata/index.ts';
+export * from './lib/index.ts';
 export * from './types/index.ts';

package/dist/index.js

@@ -1,7 +1,15 @@
-import { BeanInfo, BeanBase, cast, deepExtend, getRedisClientKeyPrefix, BeanSimple, combineConfigDefault, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanBase, cast, deepExtend, BeanSimple, combineConfigDefault, BeanScopeBase } from 'vona';
 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 prepareRedisClientKeyPrefix(keyPrefix, clientName, appInfo) {
+  return keyPrefix === true ? getRedisClientKeyPrefix(clientName, appInfo) : keyPrefix;
+}
+
 var _dec$3, _dec2$3, _class$3;
 let ServiceRedisClient = (_dec$3 = Service(), _dec2$3 = BeanInfo({
   module: "a-redis"
@@ -30,7 +38,10 @@ let ServiceRedisClient = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     } else if (cast(configClient).nodes) {
       return new Redis.Cluster(cast(configClient).nodes, cast(configClient));
     } else {
-      const configNode = deepExtend({}, configRedis.base, configClient);
+      const keyPrefix = prepareRedisClientKeyPrefix(configClient.keyPrefix, clientName, this.app);
+      const configNode = deepExtend({}, configRedis.base, configClient, {
+        keyPrefix
+      });
       return new Redis(configNode);
     }
   }
@@ -60,15 +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];
-      await this._clearRedisKeys(app.bean.redis.get(clientName), `${client.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) {
@@ -105,4 +117,4 @@ let ScopeModuleARedis = (_dec = Scope(), _dec2 = BeanInfo({
 
 /** scope: end */
 
-export { BeanRedis, Main, ScopeModuleARedis, ServiceRedis, ServiceRedisClient, configDefault };
+export { BeanRedis, Main, ScopeModuleARedis, ServiceRedis, ServiceRedisClient, configDefault, getRedisClientKeyPrefix, prepareRedisClientKeyPrefix };

package/dist/lib/index.d.ts

@@ -0,0 +1 @@
+export * from './redis.ts';

package/dist/lib/redis.d.ts

@@ -0,0 +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;

package/dist/types/redis.d.ts

@@ -9,12 +9,15 @@ export interface IRedisClientRecord {
     summer: never;
     model: never;
 }
+export interface IRedisClientOptions extends Omit<RedisOptions, 'keyPrefix'> {
+    keyPrefix?: string | true;
+}
 export interface ConfigRedisCluster extends ClusterOptions {
     nodes: RedisOptions[];
 }
 export interface ConfigRedis {
     base: RedisOptions;
-    clients: Record<keyof IRedisClientRecord, RedisOptions | ConfigRedisCluster>;
+    clients: Record<keyof IRedisClientRecord, IRedisClientOptions | ConfigRedisCluster>;
 }
 declare module 'vona' {
     interface VonaConfig {

package/package.json

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