vona-module-a-captcha 5.0.26 → 5.0.27

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

@@ -5,6 +5,7 @@ export declare class BeanCaptcha extends BeanBase {
     create(sceneName: keyof ICaptchaSceneRecord): Promise<ICaptchaData>;
     refresh(id: string, sceneName: keyof ICaptchaSceneRecord): Promise<ICaptchaData>;
     verify(id: string, token: unknown, sceneName: keyof ICaptchaSceneRecord): Promise<boolean>;
+    private _verifyInner;
     verifyImmediate(id: string, token: unknown): Promise<false | string>;
     getCaptchaData(id: string): Promise<ICaptchaDataCache | undefined>;
     updateCaptchaToken(id: string, token: unknown): Promise<undefined>;

package/dist/index.js

@@ -57,6 +57,7 @@ let BeanCaptcha = class BeanCaptcha extends BeanBase {
     await this.scope.cacheRedis.captcha.set(captchaData, id, {
       ttl: provider.options.ttl ?? this.scope.config.captchaProvider.ttl
     });
+    this.$loggerChild('captcha').debug(() => `captcha.create: id:${id}, sceneName:${sceneName}, provider:${provider.name}, token:${captcha.token}`);
     // result
     const result = {
       id,
@@ -90,6 +91,7 @@ let BeanCaptcha = class BeanCaptcha extends BeanBase {
     await this.scope.cacheRedis.captcha.set(captchaData, id, {
       ttl: providerOptions.ttl ?? this.scope.config.captchaProvider.ttl
     });
+    this.$loggerChild('captcha').debug(() => `captcha.refresh: id:${id}, sceneName:${sceneName}, provider:${captchaData.provider}, token:${captcha.token}`);
     // result
     const result = {
       id,
@@ -102,7 +104,12 @@ let BeanCaptcha = class BeanCaptcha extends BeanBase {
     return result;
   }
   async verify(id, token, sceneName) {
-    let captchaData = await this.getCaptchaData(id);
+    const captchaData = await this.getCaptchaData(id);
+    const verified = await this._verifyInner(captchaData, id, token, sceneName);
+    this.$loggerChild('captcha').debug(() => `captcha.verify: id:${id}, sceneName:${sceneName}, provider:${captchaData?.provider}, token:${token}, tokenWanted:${captchaData?.token}`);
+    return verified;
+  }
+  async _verifyInner(captchaData, id, token, sceneName) {
     if (!captchaData) return false;
     // scene
     if (captchaData.scene !== sceneName) return false;

package/dist/types/captcha.d.ts

@@ -1,5 +1,6 @@
 import type { ICaptchaProviderRecord } from './captchaProvider.ts';
 import type { ICaptchaSceneRecord } from './captchaScene.ts';
+import 'vona';
 export interface ICaptchaDataCache {
     scene: keyof ICaptchaSceneRecord;
     provider: keyof ICaptchaProviderRecord;
@@ -12,3 +13,8 @@ export interface ICaptchaData {
     token?: unknown;
     payload: unknown;
 }
+declare module 'vona' {
+    interface ILoggerChildRecord {
+        captcha: never;
+    }
+}

package/package.json

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