@midwayjs/captcha 3.14.0 → 3.14.4

package/dist/config/config.default.d.ts

@@ -1,3 +1,13 @@
 import { CaptchaOptions } from '../interface';
-export declare const captcha: CaptchaOptions;
+declare const _default: {
+    captcha: CaptchaOptions;
+    cacheManager: {
+        clients: {
+            captcha: {
+                store: string;
+            };
+        };
+    };
+};
+export default _default;
 //# sourceMappingURL=config.default.d.ts.map

package/dist/config/config.default.js

@@ -1,19 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.captcha = void 0;
-exports.captcha = {
-    default: {
-        size: 4,
-        noise: 1,
-        width: 120,
-        height: 40,
+exports.default = {
+    captcha: {
+        default: {
+            size: 4,
+            noise: 1,
+            width: 120,
+            height: 40,
+        },
+        image: {
+            type: 'mixed',
+        },
+        formula: {},
+        text: {},
+        expirationTime: 3600,
+        idPrefix: 'midway:vc',
     },
-    image: {
-        type: 'mixed',
+    cacheManager: {
+        clients: {
+            captcha: {
+                store: 'memory',
+            },
+        },
     },
-    formula: {},
-    text: {},
-    expirationTime: 3600,
-    idPrefix: 'midway:vc',
 };
 //# sourceMappingURL=config.default.js.map

package/dist/configuration.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CaptchaConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
-const cacheComponent = require("@midwayjs/cache");
+const cacheComponent = require("@midwayjs/cache-manager");
 const DefaultConfig = require("./config/config.default");
 let CaptchaConfiguration = class CaptchaConfiguration {
 };

package/dist/service.d.ts

@@ -1,8 +1,8 @@
-import { CacheManager } from '@midwayjs/cache';
+import { MidwayCache } from '@midwayjs/cache-manager';
 import { FormulaCaptchaOptions, ImageCaptchaOptions, TextCaptchaOptions, CaptchaOptions } from './interface';
 export declare class CaptchaService {
-    cacheManager: CacheManager;
-    captcha: CaptchaOptions;
+    protected captchaCaching: MidwayCache;
+    protected captcha: CaptchaOptions;
     image(options?: ImageCaptchaOptions): Promise<{
         id: string;
         imageBase64: string;

package/dist/service.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CaptchaService = void 0;
 const core_1 = require("@midwayjs/core");
-const cache_1 = require("@midwayjs/cache");
+const cache_manager_1 = require("@midwayjs/cache-manager");
 const svgCaptcha = require("svg-captcha");
 const svgBase64 = require("mini-svg-data-uri");
 const nanoid_1 = require("nanoid");
@@ -73,7 +73,7 @@ let CaptchaService = class CaptchaService {
     }
     async set(text) {
         const id = (0, nanoid_1.nanoid)();
-        await this.cacheManager.set(this.getStoreId(id), (text || '').toLowerCase(), { ttl: this.captcha.expirationTime });
+        await this.captchaCaching.set(this.getStoreId(id), (text || '').toLowerCase(), this.captcha.expirationTime * 1000);
         return id;
     }
     async check(id, value) {
@@ -81,11 +81,11 @@ let CaptchaService = class CaptchaService {
             return false;
         }
         const storeId = this.getStoreId(id);
-        const storedValue = await this.cacheManager.get(storeId);
+        const storedValue = await this.captchaCaching.get(storeId);
         if (value.toLowerCase() !== storedValue) {
             return false;
         }
-        this.cacheManager.del(storeId);
+        await this.captchaCaching.del(storeId);
         return true;
     }
     getStoreId(id) {
@@ -96,9 +96,9 @@ let CaptchaService = class CaptchaService {
     }
 };
 __decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", cache_1.CacheManager)
-], CaptchaService.prototype, "cacheManager", void 0);
+    (0, core_1.InjectClient)(cache_manager_1.CachingFactory, 'captcha'),
+    __metadata("design:type", Object)
+], CaptchaService.prototype, "captchaCaching", void 0);
 __decorate([
     (0, core_1.Config)('captcha'),
     __metadata("design:type", Object)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/captcha",
-  "version": "3.14.0",
+  "version": "3.14.4",
   "description": "Midway Component for Captcha(Verification Code)",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -22,15 +22,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/cache": "^3.14.0",
+    "@midwayjs/cache-manager": "^3.14.4",
     "mini-svg-data-uri": "1.4.4",
     "nanoid": "3.3.7",
     "svg-captcha": "1.4.0"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.14.0",
-    "@midwayjs/koa": "^3.14.0",
-    "@midwayjs/mock": "^3.14.0"
+    "@midwayjs/core": "^3.14.4",
+    "@midwayjs/koa": "^3.14.4",
+    "@midwayjs/mock": "^3.14.4"
   },
-  "gitHead": "67e3a3596ffdb65a413064d30c68f1f7965af282"
+  "gitHead": "72aacdfd87ef730f100690557de48dcbd4d806a7"
 }