vona-module-a-captcha 5.0.20 → 5.0.22

package/cli/captchaProvider/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -18,7 +18,8 @@ export class CaptchaProvider<%=argv.beanNameCapitalize%>
   async verify(
     _token: TypeCaptchaProvider<%=argv.beanNameCapitalize%>Token,
     _tokenInput: TypeCaptchaProvider<%=argv.beanNameCapitalize%>Token,
-    _options: ICaptchaProviderOptions<%=argv.beanNameCapitalize%>): Promise<boolean> {
+    _options: ICaptchaProviderOptions<%=argv.beanNameCapitalize%>,
+  ): Promise<boolean> {
     return false;
   }
 }

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

@@ -123,17 +123,37 @@ declare module 'vona-module-a-web' {
     }
 }
 /** controller: end */
+/** hmr: begin */
+export * from '../bean/hmr.captchaProvider.ts';
+export * from '../bean/hmr.captchaScene.ts';
+import 'vona';
+declare module 'vona' {
+    interface IHmrRecord {
+        'a-captcha:captchaProvider': never;
+        'a-captcha:captchaScene': never;
+    }
+}
+declare module 'vona-module-a-captcha' {
+    interface HmrCaptchaProvider {
+    }
+    interface HmrCaptchaProvider {
+        get $beanFullName(): 'a-captcha.hmr.captchaProvider';
+        get $onionName(): 'a-captcha:captchaProvider';
+    }
+    interface HmrCaptchaScene {
+    }
+    interface HmrCaptchaScene {
+        get $beanFullName(): 'a-captcha.hmr.captchaScene';
+        get $onionName(): 'a-captcha:captchaScene';
+    }
+}
+/** hmr: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
-export declare const locales: {
-    'en-us': {
-        CaptchaInvalid: string;
-    };
-    'zh-cn': {
-        CaptchaInvalid: string;
-    };
-};
+/** config: end */
+/** locale: begin */
+import { locales } from './locales.ts';
 /** locale: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
@@ -160,5 +180,4 @@ declare module 'vona' {
         'a-captcha': (typeof locales)[TypeLocaleBase];
     }
 }
-export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `a-captcha::${K}`;
 /** scope: end */

package/dist/.metadata/locales.d.ts

@@ -0,0 +1,10 @@
+import type { TypeLocaleBase } from 'vona';
+export declare const locales: {
+    'en-us': {
+        CaptchaInvalid: string;
+    };
+    'zh-cn': {
+        CaptchaInvalid: string;
+    };
+};
+export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `a-captcha::${K}`;

package/dist/bean/bean.captcha.d.ts

@@ -1,15 +1,12 @@
 import type { ICaptchaData, ICaptchaDataCache } from '../types/captcha.ts';
-import type { ICaptchaProviderRecord } from '../types/captchaProvider.ts';
 import type { ICaptchaSceneRecord } from '../types/captchaScene.ts';
 import { BeanBase } from 'vona';
-declare const SymbolProviders: unique symbol;
 export declare class BeanCaptcha extends BeanBase {
-    protected [SymbolProviders]: Record<keyof ICaptchaSceneRecord, ICaptchaProviderRecord>;
     create(sceneName: keyof ICaptchaSceneRecord): Promise<ICaptchaData>;
     refresh(id: string, sceneName: keyof ICaptchaSceneRecord): Promise<ICaptchaData>;
     verify(id: string, token: unknown, sceneName: keyof ICaptchaSceneRecord): Promise<boolean>;
     verifyImmediate(id: string, token: unknown): Promise<false | string>;
-    getCaptchaData(id: string): Promise<ICaptchaDataCache | null | undefined>;
+    getCaptchaData(id: string): Promise<ICaptchaDataCache | undefined>;
     updateCaptchaToken(id: string, token: unknown): Promise<undefined>;
     private _getProviderInstance;
     private _getProviderOptions;
@@ -17,4 +14,3 @@ export declare class BeanCaptcha extends BeanBase {
     private _getProviders;
     private _prepareProviders;
 }
-export {};

package/dist/bean/hmr.captchaProvider.d.ts

@@ -0,0 +1,6 @@
+import type { IDecoratorBeanOptionsBase } from 'vona';
+import type { IHmrReload } from 'vona-module-a-hmr';
+import { BeanBase } from 'vona';
+export declare class HmrCaptchaProvider extends BeanBase implements IHmrReload {
+    reload(_beanOptions: IDecoratorBeanOptionsBase): Promise<void>;
+}

package/dist/bean/hmr.captchaScene.d.ts

@@ -0,0 +1,6 @@
+import type { IDecoratorBeanOptionsBase } from 'vona';
+import type { IHmrReload } from 'vona-module-a-hmr';
+import { BeanBase } from 'vona';
+export declare class HmrCaptchaScene extends BeanBase implements IHmrReload {
+    reload(_beanOptions: IDecoratorBeanOptionsBase): Promise<void>;
+}

package/dist/index.d.ts

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

package/dist/index.js

@@ -7,13 +7,14 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto, Controller, Web, Arg } from 'vona-module-a-web';
 import z from 'zod';
 import { Passport } from 'vona-module-a-user';
+import { Hmr } from 'vona-module-a-hmr';
 
-var _dec$6, _dec2$6, _class$6;
-let InterceptorCaptchaVerify = (_dec$6 = Interceptor({
+var _dec$8, _dec2$8, _class$8;
+let InterceptorCaptchaVerify = (_dec$8 = Interceptor({
   bodyField: 'captcha'
-}), _dec2$6 = BeanInfo({
+}), _dec2$8 = BeanInfo({
   module: "a-captcha"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class InterceptorCaptchaVerify extends BeanBase {
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class InterceptorCaptchaVerify extends BeanBase {
   async execute(options, next) {
     // scene
     const sceneName = options.scene;
@@ -29,17 +30,17 @@ let InterceptorCaptchaVerify = (_dec$6 = Interceptor({
     // next
     return next();
   }
-}) || _class$6) || _class$6);
+}) || _class$8) || _class$8);
+
+const SymbolCacheSceneProviders = Symbol('SymbolCacheSceneProviders');
+function clearAllCacheSceneProviders(app) {
+  delete app.meta[SymbolCacheSceneProviders];
+}
 
-var _dec$5, _dec2$5, _class$5;
-const SymbolProviders = Symbol('SymbolProviders');
-let BeanCaptcha = (_dec$5 = Bean(), _dec2$5 = BeanInfo({
+var _dec$7, _dec2$7, _class$7;
+let BeanCaptcha = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
   module: "a-captcha"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class BeanCaptcha extends BeanBase {
-  constructor(...args) {
-    super(...args);
-    this[SymbolProviders] = {};
-  }
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanCaptcha extends BeanBase {
   async create(sceneName) {
     // resolve provider
     const provider = await this._resolveProvider(sceneName);
@@ -212,13 +213,14 @@ let BeanCaptcha = (_dec$5 = Bean(), _dec2$5 = BeanInfo({
     };
   }
   _getProviders(sceneName) {
-    if (!this[SymbolProviders][sceneName]) {
+    if (!this.app.meta[SymbolCacheSceneProviders]) this.app.meta[SymbolCacheSceneProviders] = {};
+    if (!this.app.meta[SymbolCacheSceneProviders][sceneName]) {
       const onionSlice = this.bean.onion.captchaScene.getOnionSlice(sceneName);
       if (!onionSlice) throw new Error(`not found captcha scene: ${sceneName}`);
       const onionOptions = onionSlice.beanOptions.options;
-      this[SymbolProviders][sceneName] = this._prepareProviders(onionOptions?.providers);
+      this.app.meta[SymbolCacheSceneProviders][sceneName] = this._prepareProviders(onionOptions?.providers);
     }
-    return this[SymbolProviders][sceneName];
+    return this.app.meta[SymbolCacheSceneProviders][sceneName];
   }
   _prepareProviders(providers) {
     if (!providers) return {};
@@ -233,19 +235,19 @@ let BeanCaptcha = (_dec$5 = Bean(), _dec2$5 = BeanInfo({
     }
     return providersNew;
   }
-}) || _class$5) || _class$5);
+}) || _class$7) || _class$7);
 async function resolverDefault(_ctx, providers) {
   const keys = Object.keys(providers);
   const index = getRandomInt(keys.length, 0);
   return keys[index];
 }
 
-var _dec$4, _dec2$4, _class$4;
-let CacheRedisCaptcha = (_dec$4 = CacheRedis({
+var _dec$6, _dec2$6, _class$6;
+let CacheRedisCaptcha = (_dec$6 = CacheRedis({
   disableTransactionCompensate: true
-}), _dec2$4 = BeanInfo({
+}), _dec2$6 = BeanInfo({
   module: "a-captcha"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class CacheRedisCaptcha extends BeanCacheRedisBase {}) || _class$4) || _class$4);
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class CacheRedisCaptcha extends BeanCacheRedisBase {}) || _class$6) || _class$6);
 
 function _applyDecoratedDescriptor(i, e, r, n, l) {
   var a = {};
@@ -264,10 +266,10 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$3, _dec2$3, _dec3$2, _dec4$2, _dec5$2, _dec6$2, _dec7$1, _dec8$1, _dec9$1, _dec0$1, _class$3, _class2$2, _descriptor$1, _descriptor2$1, _descriptor3, _descriptor4;
-let DtoCaptchaData = (_dec$3 = Dto(), _dec2$3 = BeanInfo({
+var _dec$5, _dec2$5, _dec3$2, _dec4$2, _dec5$2, _dec6$2, _dec7$1, _dec8$1, _dec9$1, _dec0$1, _class$5, _class2$2, _descriptor$1, _descriptor2$1, _descriptor3, _descriptor4;
+let DtoCaptchaData = (_dec$5 = Dto(), _dec2$5 = BeanInfo({
   module: "a-captcha"
-}), _dec3$2 = Api.field(), _dec4$2 = Reflect.metadata("design:type", String), _dec5$2 = Api.field(z.string()), _dec6$2 = Reflect.metadata("design:type", Object), _dec7$1 = Api.field(v.optional()), _dec8$1 = Reflect.metadata("design:type", Object), _dec9$1 = Api.field(), _dec0$1 = Reflect.metadata("design:type", Object), _dec$3(_class$3 = _dec2$3(_class$3 = (_class2$2 = class DtoCaptchaData {
+}), _dec3$2 = Api.field(), _dec4$2 = Reflect.metadata("design:type", String), _dec5$2 = Api.field(z.string()), _dec6$2 = Reflect.metadata("design:type", Object), _dec7$1 = Api.field(v.optional()), _dec8$1 = Reflect.metadata("design:type", Object), _dec9$1 = Api.field(), _dec0$1 = Reflect.metadata("design:type", Object), _dec$5(_class$5 = _dec2$5(_class$5 = (_class2$2 = class DtoCaptchaData {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor$1, this);
     _initializerDefineProperty(this, "provider", _descriptor2$1, this);
@@ -294,12 +296,12 @@ let DtoCaptchaData = (_dec$3 = Dto(), _dec2$3 = BeanInfo({
   enumerable: true,
   writable: true,
   initializer: null
-}), _class2$2)) || _class$3) || _class$3);
+}), _class2$2)) || _class$5) || _class$5);
 
-var _dec$2, _dec2$2, _dec3$1, _dec4$1, _dec5$1, _dec6$1, _class$2, _class2$1, _descriptor, _descriptor2;
-let DtoCaptchaVerify = (_dec$2 = Dto(), _dec2$2 = BeanInfo({
+var _dec$4, _dec2$4, _dec3$1, _dec4$1, _dec5$1, _dec6$1, _class$4, _class2$1, _descriptor, _descriptor2;
+let DtoCaptchaVerify = (_dec$4 = Dto(), _dec2$4 = BeanInfo({
   module: "a-captcha"
-}), _dec3$1 = Api.field(), _dec4$1 = Reflect.metadata("design:type", String), _dec5$1 = Api.field(), _dec6$1 = Reflect.metadata("design:type", Object), _dec$2(_class$2 = _dec2$2(_class$2 = (_class2$1 = class DtoCaptchaVerify {
+}), _dec3$1 = Api.field(), _dec4$1 = Reflect.metadata("design:type", String), _dec5$1 = Api.field(), _dec6$1 = Reflect.metadata("design:type", Object), _dec$4(_class$4 = _dec2$4(_class$4 = (_class2$1 = class DtoCaptchaVerify {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
     _initializerDefineProperty(this, "token", _descriptor2, this);
@@ -314,10 +316,10 @@ let DtoCaptchaVerify = (_dec$2 = Dto(), _dec2$2 = BeanInfo({
   enumerable: true,
   writable: true,
   initializer: null
-}), _class2$1)) || _class$2) || _class$2);
+}), _class2$1)) || _class$4) || _class$4);
 
-var _dec$1, _dec2$1, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _class$1, _class2;
-let ControllerCaptcha = (_dec$1 = Controller('captcha'), _dec2$1 = BeanInfo({
+var _dec$3, _dec2$3, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _class$3, _class2;
+let ControllerCaptcha = (_dec$3 = Controller('captcha'), _dec2$3 = BeanInfo({
   module: "a-captcha"
 }), _dec3 = Web.post('create'), _dec4 = Api.body(DtoCaptchaData), _dec5 = Passport.public(), _dec6 = function (target, key) {
   return Arg.body('scene')(target, key, 0);
@@ -329,7 +331,7 @@ let ControllerCaptcha = (_dec$1 = Controller('captcha'), _dec2$1 = BeanInfo({
   return Arg.body('id')(target, key, 0);
 }, _dec18 = function (target, key) {
   return Arg.body('token')(target, key, 1);
-}, _dec19 = Reflect.metadata("design:type", Function), _dec20 = Reflect.metadata("design:paramtypes", [String, Object]), _dec$1(_class$1 = _dec2$1(_class$1 = (_class2 = class ControllerCaptcha extends BeanBase {
+}, _dec19 = Reflect.metadata("design:type", Function), _dec20 = Reflect.metadata("design:paramtypes", [String, Object]), _dec$3(_class$3 = _dec2$3(_class$3 = (_class2 = class ControllerCaptcha extends BeanBase {
   async create(scene) {
     return await this.bean.captcha.create(scene);
   }
@@ -341,7 +343,25 @@ let ControllerCaptcha = (_dec$1 = Controller('captcha'), _dec2$1 = BeanInfo({
     if (!verified) this.app.throw(403);
     return verified;
   }
-}, _applyDecoratedDescriptor(_class2.prototype, "create", [_dec3, _dec4, _dec5, _dec6, _dec7, _dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "create"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "refresh", [_dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13], Object.getOwnPropertyDescriptor(_class2.prototype, "refresh"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "verifyImmediate", [_dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20], Object.getOwnPropertyDescriptor(_class2.prototype, "verifyImmediate"), _class2.prototype), _class2)) || _class$1) || _class$1);
+}, _applyDecoratedDescriptor(_class2.prototype, "create", [_dec3, _dec4, _dec5, _dec6, _dec7, _dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "create"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "refresh", [_dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13], Object.getOwnPropertyDescriptor(_class2.prototype, "refresh"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "verifyImmediate", [_dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20], Object.getOwnPropertyDescriptor(_class2.prototype, "verifyImmediate"), _class2.prototype), _class2)) || _class$3) || _class$3);
+
+var _dec$2, _dec2$2, _class$2;
+let HmrCaptchaProvider = (_dec$2 = Hmr(), _dec2$2 = BeanInfo({
+  module: "a-captcha"
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class HmrCaptchaProvider extends BeanBase {
+  async reload(_beanOptions) {
+    clearAllCacheSceneProviders(this.app);
+  }
+}) || _class$2) || _class$2);
+
+var _dec$1, _dec2$1, _class$1;
+let HmrCaptchaScene = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
+  module: "a-captcha"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrCaptchaScene extends BeanBase {
+  async reload(_beanOptions) {
+    clearAllCacheSceneProviders(this.app);
+  }
+}) || _class$1) || _class$1);
 
 function config(app) {
   const showToken = !app.meta.isProd;
@@ -356,6 +376,13 @@ function config(app) {
   };
 }
 
+var _dec, _dec2, _class;
+let ScopeModuleACaptcha = (_dec = Scope(), _dec2 = BeanInfo({
+  module: "a-captcha"
+}), _dec(_class = _dec2(_class = class ScopeModuleACaptcha extends BeanScopeBase {}) || _class) || _class);
+
+/** scope: end */
+
 var locale_en_us = {
   CaptchaInvalid: 'Captcha Invalid'
 };
@@ -364,18 +391,13 @@ var locale_zh_cn = {
   CaptchaInvalid: '验证码不正确'
 };
 
-var _dec, _dec2, _class;
 const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn
 };
-let ScopeModuleACaptcha = (_dec = Scope(), _dec2 = BeanInfo({
-  module: "a-captcha"
-}), _dec(_class = _dec2(_class = class ScopeModuleACaptcha extends BeanScopeBase {}) || _class) || _class);
 function $locale(key) {
   return `a-captcha::${key}`;
 }
-/** scope: end */
 
 function CaptchaProvider(options) {
   return createBeanDecorator('captchaProvider', options);
@@ -385,4 +407,4 @@ function CaptchaScene(options) {
   return createBeanDecorator('captchaScene', options);
 }
 
-export { $locale, BeanCaptcha, CacheRedisCaptcha, CaptchaProvider, CaptchaScene, ControllerCaptcha, DtoCaptchaData, DtoCaptchaVerify, InterceptorCaptchaVerify, ScopeModuleACaptcha, config, locales };
+export { $locale, BeanCaptcha, CacheRedisCaptcha, CaptchaProvider, CaptchaScene, ControllerCaptcha, DtoCaptchaData, DtoCaptchaVerify, HmrCaptchaProvider, HmrCaptchaScene, InterceptorCaptchaVerify, ScopeModuleACaptcha, SymbolCacheSceneProviders, clearAllCacheSceneProviders, config, locales };

package/dist/lib/const.d.ts

@@ -0,0 +1,3 @@
+import type { VonaApplication } from 'vona';
+export declare const SymbolCacheSceneProviders: unique symbol;
+export declare function clearAllCacheSceneProviders(app: VonaApplication): void;

package/dist/lib/index.d.ts

@@ -1,2 +1,3 @@
 export * from './captchaProvider.ts';
 export * from './captchaScene.ts';
+export * from './const.ts';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-captcha",
   "type": "module",
-  "version": "5.0.20",
+  "version": "5.0.22",
   "title": "a-captcha",
   "vonaModule": {
     "dependencies": {},