vona-module-captcha-simple 5.1.13 → 5.1.15

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"AACA,6BAA6B;AAC7B,cAAc,sCAAsC,CAAC;AACrD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AAC7F,OAAO,uBAAuB,CAAC;AAC/B,OAAO,QAAQ,uBAAuB,CAAC;IAEnC,UAAiB,sBAAsB;QACrC,0BAA0B,EAAE,gCAAgC,CAAC;KAC9D;CAGJ;AACD,OAAO,QAAQ,4BAA4B,CAAC;IAEpC,UAAiB,wBAAwB;KAGxC;IAEC,UAAiB,wBAAwB;QACvC,IAAI,aAAa,IAAI,0CAA0C,CAAC;QAChE,IAAI,UAAU,IAAI,0BAA0B,CAAC;QAC7C,IAAI,aAAa,IAAI,gCAAgC,CAAC;KACvD;CACV;AACD,2BAA2B;AAC3B,0BAA0B;AAC1B,cAAc,gCAAgC,CAAC;AAE/C,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,QAAQ,uBAAuB,CAAC;IAEnC,UAAiB,mBAAmB;QAClC,uBAAuB,EAAE,6BAA6B,CAAC;KACxD;CAGJ;AACD,OAAO,QAAQ,4BAA4B,CAAC;IAEpC,UAAiB,kBAAkB;KAGlC;IAEC,UAAiB,kBAAkB;QACjC,IAAI,aAAa,IAAI,oCAAoC,CAAC;QAC1D,IAAI,UAAU,IAAI,uBAAuB,CAAC;QAC1C,IAAI,aAAa,IAAI,6BAA6B,CAAC;KACpD;CACV;AACD,wBAAwB;AACxB,kBAAkB;AAClB,cAAc,uBAAuB,CAAC;AAEtC,OAAO,oBAAoB,CAAC;AAC5B,OAAO,QAAQ,oBAAoB,CAAC;IAEhC,UAAiB,WAAW;QAC1B,sBAAsB,EAAE,KAAK,CAAC;KAC/B;CAGJ;AACD,OAAO,QAAQ,4BAA4B,CAAC;IAEpC,UAAiB,SAAS;KAGzB;IAEC,UAAiB,SAAS;QACxB,IAAI,aAAa,IAAI,2BAA2B,CAAC;QACjD,IAAI,UAAU,IAAI,sBAAsB,CAAC;KAE1C;CACV;AACD,gBAAgB;AAChB,wBAAwB;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,sBAAsB;AACtB,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAC;AAGzD,qBACa,wBAAyB,SAAQ,aAAa;CAAG;AAE9D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;CAChB;AAED,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,gBAAgB;QAC/B,gBAAgB,EAAE,wBAAwB,CAAC;KAC5C;IAED,UAAiB,mBAAmB;QAClC,aAAa,EAAE,wBAAwB,CAAC;KACzC;CAOF;AACD,iBAAiB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"AACA,6BAA6B;AAC7B,cAAc,sCAAsC,CAAC;AACrD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AAC7F,OAAO,uBAAuB,CAAC;AAC/B,OAAO,QAAQ,uBAAuB,CAAC;IAEnC,UAAiB,sBAAsB;QACrC,0BAA0B,EAAE,gCAAgC,CAAC;KAC9D;CAGJ;AACD,OAAO,QAAQ,4BAA4B,CAAC;IAEpC,UAAiB,wBAAwB;KAGxC;IAEC,UAAiB,wBAAwB;QACvC,IAAI,aAAa,IAAI,0CAA0C,CAAC;QAChE,IAAI,UAAU,IAAI,0BAA0B,CAAC;QAC7C,IAAI,aAAa,IAAI,gCAAgC,CAAC;KACvD;CACV;AACD,2BAA2B;AAC3B,0BAA0B;AAC1B,cAAc,gCAAgC,CAAC;AAE/C,OAAO,EAAE,KAAK,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,QAAQ,uBAAuB,CAAC;IAEnC,UAAiB,mBAAmB;QAClC,uBAAuB,EAAE,6BAA6B,CAAC;KACxD;CAGJ;AACD,OAAO,QAAQ,4BAA4B,CAAC;IAEpC,UAAiB,kBAAkB;KAGlC;IAEC,UAAiB,kBAAkB;QACjC,IAAI,aAAa,IAAI,oCAAoC,CAAC;QAC1D,IAAI,UAAU,IAAI,uBAAuB,CAAC;QAC1C,IAAI,aAAa,IAAI,6BAA6B,CAAC;KACpD;CACV;AACD,wBAAwB;AACxB,kBAAkB;AAClB,cAAc,uBAAuB,CAAC;AAEtC,OAAO,oBAAoB,CAAC;AAC5B,OAAO,QAAQ,oBAAoB,CAAC;IAEhC,UAAiB,WAAW;QAC1B,sBAAsB,EAAE,KAAK,CAAC;KAC/B;CAGJ;AACD,OAAO,QAAQ,4BAA4B,CAAC;IAEpC,UAAiB,SAAS;KAGzB;IAEC,UAAiB,SAAS;QACxB,IAAI,aAAa,IAAI,2BAA2B,CAAC;QACjD,IAAI,UAAU,IAAI,sBAAsB,CAAC;KAC1C;CACV;AACD,gBAAgB;AAChB,wBAAwB;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,sBAAsB;AACtB,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAC;AAGzD,qBACa,wBAAyB,SAAQ,aAAa;CAAG;AAE9D,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,SAAS,CAAC;CAChB;AAED,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,gBAAgB;QAC/B,gBAAgB,EAAE,wBAAwB,CAAC;KAC5C;IAED,UAAiB,mBAAmB;QAClC,aAAa,EAAE,wBAAwB,CAAC;KACzC;CAOF;AACD,iBAAiB"}

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

@@ -4,6 +4,12 @@ import { BeanBase } from 'vona';
 export type TypeCaptchaProviderImageTextToken = string;
 export type TypeCaptchaProviderImageTextPayload = string;
 export type TypeCaptchaProviderImageTextData = ICaptchaProviderData<TypeCaptchaProviderImageTextToken, TypeCaptchaProviderImageTextPayload>;
+export interface ICaptchaImageTextState {
+    token?: string;
+    token2?: string;
+    revision: string;
+    ttlSecondary: number;
+}
 export type TypeCaptchaProviderImageTextType = 'char' | 'math';
 export interface ICaptchaProviderOptionsImageText extends IDecoratorCaptchaProviderOptions {
     type?: TypeCaptchaProviderImageTextType;
@@ -11,8 +17,12 @@ export interface ICaptchaProviderOptionsImageText extends IDecoratorCaptchaProvi
     opts: ConfigObject;
 }
 export declare class CaptchaProviderImageText extends BeanBase implements ICaptchaProviderExecute<TypeCaptchaProviderImageTextToken, TypeCaptchaProviderImageTextPayload> {
-    create(options: ICaptchaProviderOptionsImageText): Promise<TypeCaptchaProviderImageTextData>;
-    verify(token: TypeCaptchaProviderImageTextToken, tokenInput: TypeCaptchaProviderImageTextToken, _options: ICaptchaProviderOptionsImageText): Promise<boolean>;
+    create(options: ICaptchaProviderOptionsImageText, _payload?: unknown, previousToken?: string): Promise<TypeCaptchaProviderImageTextData>;
+    verify(token: string, tokenInput: unknown, _options: ICaptchaProviderOptionsImageText): Promise<boolean>;
+    verifyImmediate(token: string, tokenInput: unknown, _options: ICaptchaProviderOptionsImageText): Promise<false | string>;
+    updateToken(token: string, tokenInput: unknown, options: ICaptchaProviderOptionsImageText): Promise<TypeCaptchaProviderImageTextData>;
+    private _matches;
+    private _policy;
     private _confirmFont;
 }
 //# sourceMappingURL=captchaProvider.imageText.d.ts.map

package/dist/bean/captchaProvider.imageText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captchaProvider.imageText.d.ts","sourceRoot":"","sources":["../../src/bean/captchaProvider.imageText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EACjC,MAAM,uBAAuB,CAAC;AAG/B,OAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIjE,OAAO,EAAE,QAAQ,EAAQ,MAAM,MAAM,CAAC;AAGtC,MAAM,MAAM,iCAAiC,GAAG,MAAM,CAAC;AACvD,MAAM,MAAM,mCAAmC,GAAG,MAAM,CAAC;AACzD,MAAM,MAAM,gCAAgC,GAAG,oBAAoB,CACjE,iCAAiC,EACjC,mCAAmC,CACpC,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/D,MAAM,WAAW,gCAAiC,SAAQ,gCAAgC;IACxF,IAAI,CAAC,EAAE,gCAAgC,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;CACpB;AAED,qBAMa,wBACX,SAAQ,QACR,YACE,uBAAuB,CAAC,iCAAiC,EAAE,mCAAmC,CAAC;IAE3F,MAAM,CACV,OAAO,EAAE,gCAAgC,GACxC,OAAO,CAAC,gCAAgC,CAAC;IAWtC,MAAM,CACV,KAAK,EAAE,iCAAiC,EACxC,UAAU,EAAE,iCAAiC,EAC7C,QAAQ,EAAE,gCAAgC,GACzC,OAAO,CAAC,OAAO,CAAC;YAIL,YAAY;CAQ3B"}
+{"version":3,"file":"captchaProvider.imageText.d.ts","sourceRoot":"","sources":["../../src/bean/captchaProvider.imageText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EACjC,MAAM,uBAAuB,CAAC;AAG/B,OAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIjE,OAAO,EAAE,QAAQ,EAAgB,MAAM,MAAM,CAAC;AAG9C,MAAM,MAAM,iCAAiC,GAAG,MAAM,CAAC;AACvD,MAAM,MAAM,mCAAmC,GAAG,MAAM,CAAC;AACzD,MAAM,MAAM,gCAAgC,GAAG,oBAAoB,CACjE,iCAAiC,EACjC,mCAAmC,CACpC,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,gCAAgC,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/D,MAAM,WAAW,gCAAiC,SAAQ,gCAAgC;IACxF,IAAI,CAAC,EAAE,gCAAgC,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;CACpB;AAED,qBAMa,wBACX,SAAQ,QACR,YACE,uBAAuB,CAAC,iCAAiC,EAAE,mCAAmC,CAAC;IAE3F,MAAM,CACV,OAAO,EAAE,gCAAgC,EACzC,QAAQ,CAAC,EAAE,OAAO,EAClB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,gCAAgC,CAAC;IAkCtC,MAAM,CACV,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,gCAAgC,GACzC,OAAO,CAAC,OAAO,CAAC;IAmBb,eAAe,CACnB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,gCAAgC,GACzC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;IAmBpB,WAAW,CACf,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,gCAAgC,GACxC,OAAO,CAAC,gCAAgC,CAAC;IAwB5C,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,OAAO;YAgBD,YAAY;CAQ3B"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BeanInfo, BeanBase, cast, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanBase, uuidv4, cast, BeanScopeBase } from 'vona';
 import { __decorate } from 'tslib';
 import { getRandomInt } from '@cabloy/utils';
 import svgCaptcha from '@zhennann/svg-captcha';
@@ -12,20 +12,117 @@ import { Scope } from 'vona-module-a-bean';
 
 const CaptchaProviderImageTextTypes = ['char', 'math'];
 let CaptchaProviderImageText = class CaptchaProviderImageText extends BeanBase {
-  async create(options) {
+  async create(options, _payload, previousToken) {
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = previousToken ? await cache.snapshot(previousToken) : undefined;
+    if (previousToken !== undefined && !previousToken.startsWith('imageText:')) {
+      return this.app.throw(403);
+    }
+    const {
+      ttl,
+      ttlSecondary
+    } = this._policy(options);
     await this._confirmFont(options);
     let type = options.type;
     if (!type) {
       type = CaptchaProviderImageTextTypes[getRandomInt(2, 0)];
     }
     const captcha = type === 'char' ? svgCaptcha.create(options.opts) : svgCaptcha.createMathExpr(options.opts);
-    return {
+    const token = snapshot ? previousToken : `imageText:${uuidv4()}`;
+    const written = await cache.writeProof(token, {
       token: captcha.text,
-      payload: svg64(captcha.data)
+      revision: uuidv4(),
+      ttlSecondary
+    }, ttl, snapshot);
+    if (!written.changed) return this.app.throw(403);
+    return {
+      token,
+      tokenPublic: captcha.text,
+      payload: svg64(captcha.data),
+      serverNow: written.serverNow,
+      expiresAt: written.expiresAt,
+      routingExpiresAt: written.expiresAt + ttlSecondary
     };
   }
   async verify(token, tokenInput, _options) {
-    return !!tokenInput && !!token && tokenInput.toLowerCase() === token.toLowerCase();
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = await cache.snapshot(token);
+    if (!snapshot || !token.startsWith('imageText:')) return false;
+    const data = snapshot.data;
+    if (data.token2) {
+      const consumed = await cache.compareAndSet(token, snapshot);
+      return consumed && data.token2 === tokenInput;
+    }
+    if (!data.token) return false;
+    const verified = this._matches(data.token, tokenInput);
+    const changed = await cache.compareAndSet(token, snapshot, verified ? undefined : {
+      ...data,
+      token: undefined,
+      revision: uuidv4()
+    });
+    return verified && changed;
+  }
+  async verifyImmediate(token, tokenInput, _options) {
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = await cache.snapshot(token);
+    if (!snapshot || !token.startsWith('imageText:') || !snapshot.data.token) return false;
+    const data = snapshot.data;
+    if (!this._matches(data.token, tokenInput)) {
+      await cache.compareAndSet(token, snapshot, {
+        ...data,
+        token: undefined,
+        revision: uuidv4()
+      });
+      return false;
+    }
+    const tokenSecondary = uuidv4();
+    const changed = await cache.compareAndSet(token, snapshot, {
+      ...data,
+      token: undefined,
+      token2: tokenSecondary,
+      revision: uuidv4()
+    }, data.ttlSecondary);
+    return changed ? tokenSecondary : false;
+  }
+  async updateToken(token, tokenInput, options) {
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = await cache.snapshot(token);
+    if (!snapshot || !token.startsWith('imageText:') || typeof tokenInput !== 'string') {
+      return this.app.throw(403);
+    }
+    const {
+      ttl,
+      ttlSecondary
+    } = this._policy(options);
+    const written = await cache.writeProof(token, {
+      token: tokenInput,
+      revision: uuidv4(),
+      ttlSecondary
+    }, ttl, snapshot);
+    if (!written.changed) return this.app.throw(403);
+    return {
+      token,
+      tokenPublic: tokenInput,
+      payload: '',
+      serverNow: written.serverNow,
+      expiresAt: written.expiresAt,
+      routingExpiresAt: written.expiresAt + ttlSecondary
+    };
+  }
+  _matches(token, input) {
+    return typeof input === 'string' && !!input && input.toLowerCase() === token.toLowerCase();
+  }
+  _policy(options) {
+    const defaults = this.$scope.captcha.config.captchaProvider;
+    const ttl = options.ttl ?? defaults.ttl;
+    const ttlSecondary = options.ttlSecondary ?? defaults.ttlSecondary;
+    if (!Number.isSafeInteger(ttl) || ttl <= 0 || !Number.isSafeInteger(ttlSecondary) || ttlSecondary <= 0 || !Number.isSafeInteger(Date.now() + ttl + ttlSecondary)) {
+      throw new Error('invalid captcha ttl');
+    }
+    return {
+      ttl,
+      ttlSecondary
+    };
   }
   async _confirmFont(options) {
     if (cast(svgCaptcha.options).font) return;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/bean/captchaProvider.imageText.ts","../src/bean/captchaScene.simple.ts","../src/bean/meta.asset.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null],"names":["CaptchaProviderImageTextTypes","CaptchaProviderImageText","BeanBase","create","options","_confirmFont","type","getRandomInt","captcha","svgCaptcha","opts","createMathExpr","token","text","payload","svg64","data","verify","tokenInput","_options","toLowerCase","cast","font","fontFile","fontPath","scope","asset","get","_loadFont","ascender","descender","__decorate","CaptchaProvider","size","color","__z_BeanInfo","module","buffer","fse","readFile","opentypeParse","_nodeBufferToArrayBuffer","ab","ArrayBuffer","length","view","Uint8Array","i","CaptchaSceneSimple","CaptchaScene","resolver","_ctx","_providers","providers","MetaAsset","BeanAssetBase","Meta","ScopeModuleCaptchaSimple","BeanScopeBase","Scope"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/bean/captchaProvider.imageText.ts","../src/bean/captchaScene.simple.ts","../src/bean/meta.asset.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null],"names":["CaptchaProviderImageTextTypes","CaptchaProviderImageText","BeanBase","create","options","_payload","previousToken","cache","$scope","captcha","cacheRedis","snapshot","undefined","startsWith","app","throw","ttl","ttlSecondary","_policy","_confirmFont","type","getRandomInt","svgCaptcha","opts","createMathExpr","token","uuidv4","written","writeProof","text","revision","changed","tokenPublic","payload","svg64","data","serverNow","expiresAt","routingExpiresAt","verify","tokenInput","_options","token2","consumed","compareAndSet","verified","_matches","verifyImmediate","tokenSecondary","updateToken","input","toLowerCase","defaults","config","captchaProvider","Number","isSafeInteger","Date","now","Error","cast","font","fontFile","fontPath","scope","asset","get","_loadFont","ascender","descender","__decorate","CaptchaProvider","size","color","__z_BeanInfo","module","buffer","fse","readFile","opentypeParse","_nodeBufferToArrayBuffer","ab","ArrayBuffer","length","view","Uint8Array","i","CaptchaSceneSimple","CaptchaScene","resolver","_ctx","_providers","providers","MetaAsset","BeanAssetBase","Meta","ScopeModuleCaptchaSimple","BeanScopeBase","Scope"],"mappings":";;;;;;;;;;;;AA6BA,MAAMA,6BAA6B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAU;AAaxD,IAAMC,wBAAwB,GAA9B,MAAMA,wBACX,SAAQC,QAAQ,CAAA;AAIhB,EAAA,MAAMC,MAAMA,CACVC,OAAyC,EACzCC,QAAkB,EAClBC,aAAsB,EAAA;IAEtB,MAAMC,KAAK,GAAG,IAAI,CAACC,MAAM,CAACC,OAAO,CAACC,UAAU,CAACD,OAAO;AACpD,IAAA,MAAME,QAAQ,GAAGL,aAAa,GAC1B,MAAMC,KAAK,CAACI,QAAQ,CAAyBL,aAAa,CAAC,GAC3DM,SAAS;IACb,IAAIN,aAAa,KAAKM,SAAS,IAAI,CAACN,aAAa,CAACO,UAAU,CAAC,YAAY,CAAC,EAAE;AAC1E,MAAA,OAAO,IAAI,CAACC,GAAG,CAACC,KAAK,CAAC,GAAG,CAAC;AAC5B,IAAA;IACA,MAAM;MAAEC,GAAG;AAAEC,MAAAA;AAAY,KAAE,GAAG,IAAI,CAACC,OAAO,CAACd,OAAO,CAAC;AACnD,IAAA,MAAM,IAAI,CAACe,YAAY,CAACf,OAAO,CAAC;AAChC,IAAA,IAAIgB,IAAI,GAAGhB,OAAO,CAACgB,IAAI;IACvB,IAAI,CAACA,IAAI,EAAE;MACTA,IAAI,GAAGpB,6BAA6B,CAACqB,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1D,IAAA;IACA,MAAMZ,OAAO,GACXW,IAAI,KAAK,MAAM,GAAGE,UAAU,CAACnB,MAAM,CAACC,OAAO,CAACmB,IAAI,CAAC,GAAGD,UAAU,CAACE,cAAc,CAACpB,OAAO,CAACmB,IAAI,CAAC;IAC7F,MAAME,KAAK,GAAGd,QAAQ,GAAGL,aAAc,GAAG,CAAA,UAAA,EAAaoB,MAAM,EAAE,CAAA,CAAE;IACjE,MAAMC,OAAO,GAAG,MAAMpB,KAAK,CAACqB,UAAU,CACpCH,KAAK,EACL;MAAEA,KAAK,EAAEhB,OAAO,CAACoB,IAAI;MAAEC,QAAQ,EAAEJ,MAAM,EAAE;AAAET,MAAAA;AAAY,KAAE,EACzDD,GAAG,EACHL,QAAQ,CACT;AACD,IAAA,IAAI,CAACgB,OAAO,CAACI,OAAO,EAAE,OAAO,IAAI,CAACjB,GAAG,CAACC,KAAK,CAAC,GAAG,CAAC;IAChD,OAAO;MACLU,KAAK;MACLO,WAAW,EAAEvB,OAAO,CAACoB,IAAI;AACzBI,MAAAA,OAAO,EAAEC,KAAK,CAACzB,OAAO,CAAC0B,IAAI,CAAC;MAC5BC,SAAS,EAAET,OAAO,CAACS,SAAS;MAC5BC,SAAS,EAAEV,OAAO,CAACU,SAAS;AAC5BC,MAAAA,gBAAgB,EAAEX,OAAO,CAACU,SAAS,GAAGpB;KACvC;AACH,EAAA;AAEA,EAAA,MAAMsB,MAAMA,CACVd,KAAa,EACbe,UAAmB,EACnBC,QAA0C,EAAA;IAE1C,MAAMlC,KAAK,GAAG,IAAI,CAACC,MAAM,CAACC,OAAO,CAACC,UAAU,CAACD,OAAO;IACpD,MAAME,QAAQ,GAAG,MAAMJ,KAAK,CAACI,QAAQ,CAAyBc,KAAK,CAAC;AACpE,IAAA,IAAI,CAACd,QAAQ,IAAI,CAACc,KAAK,CAACZ,UAAU,CAAC,YAAY,CAAC,EAAE,OAAO,KAAK;AAC9D,IAAA,MAAMsB,IAAI,GAAGxB,QAAQ,CAACwB,IAAI;IAC1B,IAAIA,IAAI,CAACO,MAAM,EAAE;MACf,MAAMC,QAAQ,GAAG,MAAMpC,KAAK,CAACqC,aAAa,CAACnB,KAAK,EAAEd,QAAQ,CAAC;AAC3D,MAAA,OAAOgC,QAAQ,IAAIR,IAAI,CAACO,MAAM,KAAKF,UAAU;AAC/C,IAAA;AACA,IAAA,IAAI,CAACL,IAAI,CAACV,KAAK,EAAE,OAAO,KAAK;IAC7B,MAAMoB,QAAQ,GAAG,IAAI,CAACC,QAAQ,CAACX,IAAI,CAACV,KAAK,EAAEe,UAAU,CAAC;AACtD,IAAA,MAAMT,OAAO,GAAG,MAAMxB,KAAK,CAACqC,aAAa,CACvCnB,KAAK,EACLd,QAAQ,EACRkC,QAAQ,GAAGjC,SAAS,GAAG;AAAE,MAAA,GAAGuB,IAAI;AAAEV,MAAAA,KAAK,EAAEb,SAAS;MAAEkB,QAAQ,EAAEJ,MAAM;AAAE,KAAE,CACzE;IACD,OAAOmB,QAAQ,IAAId,OAAO;AAC5B,EAAA;AAEA,EAAA,MAAMgB,eAAeA,CACnBtB,KAAa,EACbe,UAAmB,EACnBC,QAA0C,EAAA;IAE1C,MAAMlC,KAAK,GAAG,IAAI,CAACC,MAAM,CAACC,OAAO,CAACC,UAAU,CAACD,OAAO;IACpD,MAAME,QAAQ,GAAG,MAAMJ,KAAK,CAACI,QAAQ,CAAyBc,KAAK,CAAC;AACpE,IAAA,IAAI,CAACd,QAAQ,IAAI,CAACc,KAAK,CAACZ,UAAU,CAAC,YAAY,CAAC,IAAI,CAACF,QAAQ,CAACwB,IAAI,CAACV,KAAK,EAAE,OAAO,KAAK;AACtF,IAAA,MAAMU,IAAI,GAAGxB,QAAQ,CAACwB,IAAI;IAC1B,IAAI,CAAC,IAAI,CAACW,QAAQ,CAACX,IAAI,CAACV,KAAM,EAAEe,UAAU,CAAC,EAAE;AAC3C,MAAA,MAAMjC,KAAK,CAACqC,aAAa,CAACnB,KAAK,EAAEd,QAAQ,EAAE;AAAE,QAAA,GAAGwB,IAAI;AAAEV,QAAAA,KAAK,EAAEb,SAAS;QAAEkB,QAAQ,EAAEJ,MAAM;AAAE,OAAE,CAAC;AAC7F,MAAA,OAAO,KAAK;AACd,IAAA;AACA,IAAA,MAAMsB,cAAc,GAAGtB,MAAM,EAAE;IAC/B,MAAMK,OAAO,GAAG,MAAMxB,KAAK,CAACqC,aAAa,CACvCnB,KAAK,EACLd,QAAQ,EACR;AAAE,MAAA,GAAGwB,IAAI;AAAEV,MAAAA,KAAK,EAAEb,SAAS;AAAE8B,MAAAA,MAAM,EAAEM,cAAc;MAAElB,QAAQ,EAAEJ,MAAM;KAAI,EACzES,IAAI,CAAClB,YAAY,CAClB;AACD,IAAA,OAAOc,OAAO,GAAGiB,cAAc,GAAG,KAAK;AACzC,EAAA;AAEA,EAAA,MAAMC,WAAWA,CACfxB,KAAa,EACbe,UAAmB,EACnBpC,OAAyC,EAAA;IAEzC,MAAMG,KAAK,GAAG,IAAI,CAACC,MAAM,CAACC,OAAO,CAACC,UAAU,CAACD,OAAO;IACpD,MAAME,QAAQ,GAAG,MAAMJ,KAAK,CAACI,QAAQ,CAAyBc,KAAK,CAAC;AACpE,IAAA,IAAI,CAACd,QAAQ,IAAI,CAACc,KAAK,CAACZ,UAAU,CAAC,YAAY,CAAC,IAAI,OAAO2B,UAAU,KAAK,QAAQ,EAAE;AAClF,MAAA,OAAO,IAAI,CAAC1B,GAAG,CAACC,KAAK,CAAC,GAAG,CAAC;AAC5B,IAAA;IACA,MAAM;MAAEC,GAAG;AAAEC,MAAAA;AAAY,KAAE,GAAG,IAAI,CAACC,OAAO,CAACd,OAAO,CAAC;IACnD,MAAMuB,OAAO,GAAG,MAAMpB,KAAK,CAACqB,UAAU,CACpCH,KAAK,EACL;AAAEA,MAAAA,KAAK,EAAEe,UAAU;MAAEV,QAAQ,EAAEJ,MAAM,EAAE;AAAET,MAAAA;AAAY,KAAE,EACvDD,GAAG,EACHL,QAAQ,CACT;AACD,IAAA,IAAI,CAACgB,OAAO,CAACI,OAAO,EAAE,OAAO,IAAI,CAACjB,GAAG,CAACC,KAAK,CAAC,GAAG,CAAC;IAChD,OAAO;MACLU,KAAK;AACLO,MAAAA,WAAW,EAAEQ,UAAU;AACvBP,MAAAA,OAAO,EAAE,EAAE;MACXG,SAAS,EAAET,OAAO,CAACS,SAAS;MAC5BC,SAAS,EAAEV,OAAO,CAACU,SAAS;AAC5BC,MAAAA,gBAAgB,EAAEX,OAAO,CAACU,SAAS,GAAGpB;KACvC;AACH,EAAA;AAEQ6B,EAAAA,QAAQA,CAACrB,KAAa,EAAEyB,KAAc,EAAA;AAC5C,IAAA,OAAO,OAAOA,KAAK,KAAK,QAAQ,IAAI,CAAC,CAACA,KAAK,IAAIA,KAAK,CAACC,WAAW,EAAE,KAAK1B,KAAK,CAAC0B,WAAW,EAAE;AAC5F,EAAA;EAEQjC,OAAOA,CAACd,OAAyC,EAAA;IACvD,MAAMgD,QAAQ,GAAG,IAAI,CAAC5C,MAAM,CAACC,OAAO,CAAC4C,MAAM,CAACC,eAAe;IAC3D,MAAMtC,GAAG,GAAGZ,OAAO,CAACY,GAAG,IAAIoC,QAAQ,CAACpC,GAAG;IACvC,MAAMC,YAAY,GAAGb,OAAO,CAACa,YAAY,IAAImC,QAAQ,CAACnC,YAAY;AAClE,IAAA,IACE,CAACsC,MAAM,CAACC,aAAa,CAACxC,GAAG,CAAC,IAC1BA,GAAG,IAAI,CAAC,IACR,CAACuC,MAAM,CAACC,aAAa,CAACvC,YAAY,CAAC,IACnCA,YAAY,IAAI,CAAC,IACjB,CAACsC,MAAM,CAACC,aAAa,CAACC,IAAI,CAACC,GAAG,EAAE,GAAG1C,GAAG,GAAGC,YAAY,CAAC,EACtD;AACA,MAAA,MAAM,IAAI0C,KAAK,CAAC,qBAAqB,CAAC;AACxC,IAAA;IACA,OAAO;MAAE3C,GAAG;AAAEC,MAAAA;KAAc;AAC9B,EAAA;EAEQ,MAAME,YAAYA,CAACf,OAAyC,EAAA;IAClE,IAAIwD,IAAI,CAACtC,UAAU,CAAClB,OAAO,CAAC,CAACyD,IAAI,EAAE;AACnC,IAAA,MAAMC,QAAQ,GAAG1D,OAAO,CAAC2D,QAAQ,IAAI,IAAI,CAACC,KAAK,CAACC,KAAK,CAACC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC;AAClF,IAAA,MAAML,IAAI,GAAG,MAAMM,SAAS,CAACL,QAAQ,CAAC;IACtCF,IAAI,CAACtC,UAAU,CAAClB,OAAO,CAAC,CAACyD,IAAI,GAAGA,IAAI;IACpCD,IAAI,CAACtC,UAAU,CAAClB,OAAO,CAAC,CAACgE,QAAQ,GAAGP,IAAI,CAACO,QAAQ;IACjDR,IAAI,CAACtC,UAAU,CAAClB,OAAO,CAAC,CAACiE,SAAS,GAAGR,IAAI,CAACQ,SAAS;AACrD,EAAA;;AAhJWpE,wBAAwB,GAAAqE,UAAA,CAAA,CANpCC,eAAe,CAAmC;AACjDhD,EAAAA,IAAI,EAAE;AACJiD,IAAAA,IAAI,EAAE,CAAC;AACPC,IAAAA,KAAK,EAAE;AACR;CACF,CAAC,EAAAC,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACW,EAAA1E,wBAAwB,CAiJpC;AAED,eAAekE,SAASA,CAACL,QAAgB,EAAA;EACvC,MAAMc,MAAM,GAAG,MAAMC,GAAG,CAACC,QAAQ,CAAChB,QAAQ,CAAC;AAC3C,EAAA,OAAOiB,KAAa,CAACC,wBAAwB,CAACJ,MAAM,CAAC,CAAC;AACxD;AAEA,SAASI,wBAAwBA,CAACJ,MAAM,EAAA;EACtC,MAAMK,EAAE,GAAG,IAAIC,WAAW,CAACN,MAAM,CAACO,MAAM,CAAC;AACzC,EAAA,MAAMC,IAAI,GAAG,IAAIC,UAAU,CAACJ,EAAE,CAAC;AAC/B,EAAA,KAAK,IAAIK,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGV,MAAM,CAACO,MAAM,EAAE,EAAEG,CAAC,EAAE;AACtCF,IAAAA,IAAI,CAACE,CAAC,CAAC,GAAGV,MAAM,CAACU,CAAC,CAAC;AACrB,EAAA;AAEA,EAAA,OAAOL,EAAE;AACX;;AC/LO,IAAMM,kBAAkB,GAAxB,MAAMA,kBAAmB,SAAQrF,QAAQ,CAAA;AAAnCqF,kBAAkB,GAAAjB,UAAA,CAAA,CAR9BkB,YAAY,CAAC;AACZC,EAAAA,QAAQ,EAAE,OAAOC,IAAI,EAAEC,UAAU,KAAI;AACnC,IAAA,OAAO,0BAA0B;EACnC,CAAC;AACDC,EAAAA,SAAS,EAAE;AACT,IAAA,0BAA0B,EAAE;AAC7B;CACF,CAAC,EAAAlB,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACW,EAAAY,kBAAkB,CAAoB;;ACH5C,IAAMM,SAAS,GAAf,MAAMA,SAAU,SAAQC,aAA4B,CAAA;AAA9CD,SAAS,GAAAvB,UAAA,CAAA,CADrByB,IAAI,EAAE,EAAArB,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACM,EAAAkB,SAAS,CAAwC;;AC8EvD,IAAMG,wBAAwB,GAA9B,MAAMA,wBAAyB,SAAQC,aAAa,CAAA;AAA9CD,wBAAwB,GAAA1B,UAAA,CAAA,CADpC4B,KAAK,EAAE,EAAAxB,QAAA,CAAA;EAAAC,MAAA,EAAA;AAAA,CAAA,CAAA,CACK,EAAAqB,wBAAwB,CAAyB;AAuB9D;;"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-captcha-simple",
-  "version": "5.1.13",
-  "gitHead": "1a39e8008e1b48001cfeff475ddd53a2a0d867c4",
+  "version": "5.1.15",
+  "gitHead": "30aa129a2ca0c4ef6dde9cc910d42f7b3982ef79",
   "description": "",
   "keywords": [
     "Vona Module"

package/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../bean/captchaProvider.imageText.ts';
 import type { ICaptchaProviderOptionsImageText } from '../bean/captchaProvider.imageText.ts';
 import 'vona-module-a-captcha';
 declare module 'vona-module-a-captcha' {
-  
+
     export interface ICaptchaProviderRecord {
       'captcha-simple:imageText': ICaptchaProviderOptionsImageText;
     }
 
-  
+
 }
 declare module 'vona-module-captcha-simple' {
-  
+
         export interface CaptchaProviderImageText {
           /** @internal */
           get scope(): ScopeModuleCaptchaSimple;
@@ -22,7 +22,7 @@ declare module 'vona-module-captcha-simple' {
             get $beanFullName(): 'captcha-simple.captchaProvider.imageText';
             get $onionName(): 'captcha-simple:imageText';
             get $onionOptions(): ICaptchaProviderOptionsImageText;
-          } 
+          }
 }
 /** captchaProvider: end */
 /** captchaScene: begin */
@@ -30,15 +30,15 @@ export * from '../bean/captchaScene.simple.ts';
 
 import { type IDecoratorCaptchaSceneOptions } from 'vona-module-a-captcha';
 declare module 'vona-module-a-captcha' {
-  
+
     export interface ICaptchaSceneRecord {
       'captcha-simple:simple': IDecoratorCaptchaSceneOptions;
     }
 
-  
+
 }
 declare module 'vona-module-captcha-simple' {
-  
+
         export interface CaptchaSceneSimple {
           /** @internal */
           get scope(): ScopeModuleCaptchaSimple;
@@ -48,7 +48,7 @@ declare module 'vona-module-captcha-simple' {
             get $beanFullName(): 'captcha-simple.captchaScene.simple';
             get $onionName(): 'captcha-simple:simple';
             get $onionOptions(): IDecoratorCaptchaSceneOptions;
-          } 
+          }
 }
 /** captchaScene: end */
 /** meta: begin */
@@ -56,15 +56,15 @@ export * from '../bean/meta.asset.ts';
 
 import 'vona-module-a-meta';
 declare module 'vona-module-a-meta' {
-  
+
     export interface IMetaRecord {
       'captcha-simple:asset': never;
     }
 
-  
+
 }
 declare module 'vona-module-captcha-simple' {
-  
+
         export interface MetaAsset {
           /** @internal */
           get scope(): ScopeModuleCaptchaSimple;
@@ -73,8 +73,7 @@ declare module 'vona-module-captcha-simple' {
           export interface MetaAsset {
             get $beanFullName(): 'captcha-simple.meta.asset';
             get $onionName(): 'captcha-simple:asset';
-            
-          } 
+          }
 }
 /** meta: end */
 /** meta asset: begin */
@@ -101,11 +100,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     captchaSimple: ScopeModuleCaptchaSimple;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

package/src/bean/captchaProvider.imageText.ts

@@ -9,7 +9,7 @@ import svgCaptcha, { ConfigObject } from '@zhennann/svg-captcha';
 import fse from 'fs-extra';
 import { parse as opentypeParse } from 'opentype.js/dist/opentype.mjs';
 import svg64 from 'svg64';
-import { BeanBase, cast } from 'vona';
+import { BeanBase, cast, uuidv4 } from 'vona';
 import { CaptchaProvider } from 'vona-module-a-captcha';
 
 export type TypeCaptchaProviderImageTextToken = string;
@@ -19,6 +19,13 @@ export type TypeCaptchaProviderImageTextData = ICaptchaProviderData<
   TypeCaptchaProviderImageTextPayload
 >;
 
+export interface ICaptchaImageTextState {
+  token?: string;
+  token2?: string;
+  revision: string;
+  ttlSecondary: number;
+}
+
 export type TypeCaptchaProviderImageTextType = 'char' | 'math';
 const CaptchaProviderImageTextTypes = ['char', 'math'] as const;
 export interface ICaptchaProviderOptionsImageText extends IDecoratorCaptchaProviderOptions {
@@ -40,7 +47,17 @@ export class CaptchaProviderImageText
 {
   async create(
     options: ICaptchaProviderOptionsImageText,
+    _payload?: unknown,
+    previousToken?: string,
   ): Promise<TypeCaptchaProviderImageTextData> {
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = previousToken
+      ? await cache.snapshot<ICaptchaImageTextState>(previousToken)
+      : undefined;
+    if (previousToken !== undefined && !previousToken.startsWith('imageText:')) {
+      return this.app.throw(403);
+    }
+    const { ttl, ttlSecondary } = this._policy(options);
     await this._confirmFont(options);
     let type = options.type;
     if (!type) {
@@ -48,15 +65,116 @@ export class CaptchaProviderImageText
     }
     const captcha =
       type === 'char' ? svgCaptcha.create(options.opts) : svgCaptcha.createMathExpr(options.opts);
-    return { token: captcha.text, payload: svg64(captcha.data) };
+    const token = snapshot ? previousToken! : `imageText:${uuidv4()}`;
+    const written = await cache.writeProof(
+      token,
+      { token: captcha.text, revision: uuidv4(), ttlSecondary },
+      ttl,
+      snapshot,
+    );
+    if (!written.changed) return this.app.throw(403);
+    return {
+      token,
+      tokenPublic: captcha.text,
+      payload: svg64(captcha.data),
+      serverNow: written.serverNow,
+      expiresAt: written.expiresAt,
+      routingExpiresAt: written.expiresAt + ttlSecondary,
+    };
   }
 
   async verify(
-    token: TypeCaptchaProviderImageTextToken,
-    tokenInput: TypeCaptchaProviderImageTextToken,
+    token: string,
+    tokenInput: unknown,
     _options: ICaptchaProviderOptionsImageText,
   ): Promise<boolean> {
-    return !!tokenInput && !!token && tokenInput.toLowerCase() === token.toLowerCase();
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = await cache.snapshot<ICaptchaImageTextState>(token);
+    if (!snapshot || !token.startsWith('imageText:')) return false;
+    const data = snapshot.data;
+    if (data.token2) {
+      const consumed = await cache.compareAndSet(token, snapshot);
+      return consumed && data.token2 === tokenInput;
+    }
+    if (!data.token) return false;
+    const verified = this._matches(data.token, tokenInput);
+    const changed = await cache.compareAndSet(
+      token,
+      snapshot,
+      verified ? undefined : { ...data, token: undefined, revision: uuidv4() },
+    );
+    return verified && changed;
+  }
+
+  async verifyImmediate(
+    token: string,
+    tokenInput: unknown,
+    _options: ICaptchaProviderOptionsImageText,
+  ): Promise<false | string> {
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = await cache.snapshot<ICaptchaImageTextState>(token);
+    if (!snapshot || !token.startsWith('imageText:') || !snapshot.data.token) return false;
+    const data = snapshot.data;
+    if (!this._matches(data.token!, tokenInput)) {
+      await cache.compareAndSet(token, snapshot, { ...data, token: undefined, revision: uuidv4() });
+      return false;
+    }
+    const tokenSecondary = uuidv4();
+    const changed = await cache.compareAndSet(
+      token,
+      snapshot,
+      { ...data, token: undefined, token2: tokenSecondary, revision: uuidv4() },
+      data.ttlSecondary,
+    );
+    return changed ? tokenSecondary : false;
+  }
+
+  async updateToken(
+    token: string,
+    tokenInput: unknown,
+    options: ICaptchaProviderOptionsImageText,
+  ): Promise<TypeCaptchaProviderImageTextData> {
+    const cache = this.$scope.captcha.cacheRedis.captcha;
+    const snapshot = await cache.snapshot<ICaptchaImageTextState>(token);
+    if (!snapshot || !token.startsWith('imageText:') || typeof tokenInput !== 'string') {
+      return this.app.throw(403);
+    }
+    const { ttl, ttlSecondary } = this._policy(options);
+    const written = await cache.writeProof(
+      token,
+      { token: tokenInput, revision: uuidv4(), ttlSecondary },
+      ttl,
+      snapshot,
+    );
+    if (!written.changed) return this.app.throw(403);
+    return {
+      token,
+      tokenPublic: tokenInput,
+      payload: '',
+      serverNow: written.serverNow,
+      expiresAt: written.expiresAt,
+      routingExpiresAt: written.expiresAt + ttlSecondary,
+    };
+  }
+
+  private _matches(token: string, input: unknown) {
+    return typeof input === 'string' && !!input && input.toLowerCase() === token.toLowerCase();
+  }
+
+  private _policy(options: ICaptchaProviderOptionsImageText) {
+    const defaults = this.$scope.captcha.config.captchaProvider;
+    const ttl = options.ttl ?? defaults.ttl;
+    const ttlSecondary = options.ttlSecondary ?? defaults.ttlSecondary;
+    if (
+      !Number.isSafeInteger(ttl) ||
+      ttl <= 0 ||
+      !Number.isSafeInteger(ttlSecondary) ||
+      ttlSecondary <= 0 ||
+      !Number.isSafeInteger(Date.now() + ttl + ttlSecondary)
+    ) {
+      throw new Error('invalid captcha ttl');
+    }
+    return { ttl, ttlSecondary };
   }
 
   private async _confirmFont(options: ICaptchaProviderOptionsImageText) {