vona-module-a-redis 5.0.13 → 5.0.16

package/dist/.metadata/index.d.ts

@@ -18,29 +18,34 @@ declare module 'vona' {
 }
 /** bean: end */
 /** service: begin */
-export * from '../service/redisClient.ts';
+export * from '../service/redis.ts';
+export * from '../service/redisClient_.ts';
 import 'vona';
 declare module 'vona-module-a-bean' {
     interface IServiceRecord {
-        'a-redis:redisClient': never;
+        'a-redis:redis': never;
     }
 }
 declare module 'vona-module-a-redis' {
-    interface ServiceRedisClient {
+    interface ServiceRedis {
+    }
+    interface ServiceRedis {
+        get $beanFullName(): 'a-redis.service.redis';
+        get $onionName(): 'a-redis:redis';
     }
 }
 /** service: end */
 /** service: begin */
-import type { ServiceRedisClient } from '../service/redisClient.ts';
+import type { ServiceRedis } from '../service/redis.ts';
 export interface IModuleService {
-    'redisClient': ServiceRedisClient;
+    'redis': ServiceRedis;
 }
 /** service: end */
 /** service: begin */
 import 'vona';
 declare module 'vona' {
     interface IBeanRecordGeneral {
-        'a-redis.service.redisClient': ServiceRedisClient;
+        'a-redis.service.redis': ServiceRedis;
     }
 }
 /** service: end */

package/dist/bean/bean.redis.d.ts

@@ -1,6 +1,6 @@
 import type { IRedisClientRecord } from '../types/redis.ts';
 import { BeanBase } from 'vona';
-import { ServiceRedisClient } from '../service/redisClient.ts';
+import { ServiceRedisClient } from '../service/redisClient_.ts';
 export declare class BeanRedis extends BeanBase {
     getClient(clientName?: keyof IRedisClientRecord): ServiceRedisClient;
     get(clientName?: keyof IRedisClientRecord): import("ioredis").default;

package/dist/index.js

@@ -2,10 +2,10 @@ import { BeanInfo, BeanBase, cast, deepExtend, BeanSimple, combineConfigDefault,
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { Redis } from 'ioredis';
 
-var _dec$2, _dec2$2, _class$2;
-let ServiceRedisClient = (_dec$2 = Service(), _dec2$2 = BeanInfo({
+var _dec$3, _dec2$3, _class$3;
+let ServiceRedisClient = (_dec$3 = Service(), _dec2$3 = BeanInfo({
   module: "a-redis"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class ServiceRedisClient extends BeanBase {
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class ServiceRedisClient extends BeanBase {
   constructor(...args) {
     super(...args);
     this._redisInstance = void 0;
@@ -18,10 +18,9 @@ let ServiceRedisClient = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     this._redisInstance = this._createClient(clientName);
   }
   async __dispose__() {
-    await this._redisInstance?.quit();
+    await this._redisInstance?.disconnect();
   }
   _createClient(clientName) {
-    clientName = clientName || 'default';
     const configRedis = this.app.config.redis;
     const configClient = configRedis.clients[clientName];
     if (!configClient) throw new Error(`redis client not found: ${clientName}`);
@@ -35,6 +34,25 @@ let ServiceRedisClient = (_dec$2 = Service(), _dec2$2 = BeanInfo({
       return new Redis(configNode);
     }
   }
+}) || _class$3) || _class$3);
+
+var _dec$2, _dec2$2, _class$2;
+let BeanRedis = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
+  module: "a-redis"
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class BeanRedis extends BeanBase {
+  getClient(clientName) {
+    return this.app.bean._getBeanSelector(ServiceRedisClient, clientName ?? 'default');
+  }
+  get(clientName) {
+    const client = this.getClient(clientName);
+    return client.instance;
+  }
+}) || _class$2) || _class$2);
+
+var _dec$1, _dec2$1, _class$1;
+let ServiceRedis = (_dec$1 = Service(), _dec2$1 = BeanInfo({
+  module: "a-redis"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceRedis extends BeanBase {
   async clearAllData() {
     const app = this.app;
     // clear keys
@@ -66,19 +84,6 @@ let ServiceRedisClient = (_dec$2 = Service(), _dec2$2 = BeanInfo({
       await redis.del(keysDel);
     }
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-let BeanRedis = (_dec$1 = Bean(), _dec2$1 = BeanInfo({
-  module: "a-redis"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class BeanRedis extends BeanBase {
-  getClient(clientName) {
-    return this.app.bean._getBeanSelector(ServiceRedisClient, clientName);
-  }
-  get(clientName) {
-    const client = this.getClient(clientName);
-    return client.instance;
-  }
 }) || _class$1) || _class$1);
 
 class Main extends BeanSimple {
@@ -132,4 +137,4 @@ let ScopeModuleARedis = (_dec = Scope(), _dec2 = BeanInfo({
 
 /** scope: end */
 
-export { BeanRedis, Main, ScopeModuleARedis, ServiceRedisClient, configDefault };
+export { BeanRedis, Main, ScopeModuleARedis, ServiceRedis, ServiceRedisClient, configDefault };

package/dist/service/redis.d.ts

@@ -0,0 +1,5 @@
+import { BeanBase } from 'vona';
+export declare class ServiceRedis extends BeanBase {
+    clearAllData(): Promise<void>;
+    private _clearRedisKeys;
+}

package/dist/service/{redisClient.d.ts → redisClient_.d.ts}

@@ -1,11 +1,10 @@
+import type { IRedisClientRecord } from '../types/redis.ts';
 import { Redis } from 'ioredis';
 import { BeanBase } from 'vona';
 export declare class ServiceRedisClient extends BeanBase {
     private _redisInstance;
     get instance(): Redis;
-    protected __init__(clientName?: string): void;
+    protected __init__(clientName: keyof IRedisClientRecord): void;
     protected __dispose__(): Promise<void>;
     private _createClient;
-    clearAllData(): Promise<void>;
-    private _clearRedisKeys;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-redis",
   "type": "module",
-  "version": "5.0.13",
+  "version": "5.0.16",
   "title": "a-redis",
   "vonaModule": {
     "dependencies": {},
@@ -29,7 +29,7 @@
     "static"
   ],
   "dependencies": {
-    "ioredis": "^5.4.1"
+    "ioredis": "^5.7.0"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",