@jayfong/x-server 1.32.1 → 1.33.2

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.33.2](https://github.com/jfWorks/x-server/compare/v1.33.1...v1.33.2) (2022-06-28)
+
+### [1.33.1](https://github.com/jfWorks/x-server/compare/v1.33.0...v1.33.1) (2022-06-12)
+
+## [1.33.0](https://github.com/jfWorks/x-server/compare/v1.32.1...v1.33.0) (2022-06-11)
+
+
+### Features
+
+* defineTask concurrency ([d8174aa](https://github.com/jfWorks/x-server/commit/d8174aa302e9013610d41265d937512a02412359))
+
 ### [1.32.1](https://github.com/jfWorks/x-server/compare/v1.32.0...v1.32.1) (2022-06-02)
 
 

package/lib/_cjs/cli/templates/models.ts

@@ -1,11 +1,11 @@
 import { x, HttpError } from '@jayfong/x-server'
 import { PrismaClient } from '@prisma/client'
 
-const prisma = new PrismaClient({
+export const prismaClient = new PrismaClient({
   rejectOnNotFound: err => new HttpError.NotFound(err.message),
 })
 
-x.dispose.add(() => prisma.$disconnect())
+x.dispose.add(() => prismaClient.$disconnect())
 
 type ModelName =
   // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
@@ -14,7 +14,7 @@ type ModelName =
 
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
-    public query = prisma[name]
+    public query = prismaClient[name]
   }
 }
 

package/lib/_cjs/core/define_task.js

@@ -18,7 +18,7 @@ function defineTask(options) {
     },
     prefix: `${_x.x.appId}_task`
   });
-  queue.process(async job => {
+  queue.process(options.concurrency || 1, async job => {
     return options.handle(job.data);
   });
   return queue;

package/lib/_cjs/services/captcha.js

@@ -17,16 +17,19 @@ class CaptchaService {
     this.serviceName = 'captcha';
   }
 
-  async generate() {
+  async generate(scene) {
     const code = Math.random().toString().slice(0 - this.options.size);
-    const token = await _x.x.cache.save(code, this.options.ttl);
+    const token = await _x.x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code
     };
   }
 
-  async generateImage() {
+  async generateImage(scene) {
     const {
       text: code,
       data: svg
@@ -34,7 +37,10 @@ class CaptchaService {
       size: this.options.size
     });
 
-    const token = await _x.x.cache.save(code, this.options.ttl);
+    const token = await _x.x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code,
@@ -42,12 +48,12 @@ class CaptchaService {
     };
   }
 
-  async generateDataUrl() {
+  async generateDataUrl(scene) {
     const {
       token,
       code,
       svg
-    } = await this.generateImage();
+    } = await this.generateImage(scene);
     const dataUrl = (0, _miniSvgDataUri.default)(svg);
     return {
       token: token,
@@ -61,14 +67,14 @@ class CaptchaService {
       return false;
     }
 
-    const expectedCode = await _x.x.cache.get(options.token);
+    const expected = await _x.x.cache.get(options.token);
 
-    if (expectedCode == null) {
+    if (expected == null) {
       return false;
     }
 
     await _x.x.cache.remove(options.token);
-    return options.code.toLowerCase() === expectedCode.toLowerCase();
+    return expected.scene === options.scene && options.code.toLowerCase() === expected.code.toLowerCase();
   }
 
 }

package/lib/cli/templates/models.ts

@@ -1,11 +1,11 @@
 import { x, HttpError } from '@jayfong/x-server'
 import { PrismaClient } from '@prisma/client'
 
-const prisma = new PrismaClient({
+export const prismaClient = new PrismaClient({
   rejectOnNotFound: err => new HttpError.NotFound(err.message),
 })
 
-x.dispose.add(() => prisma.$disconnect())
+x.dispose.add(() => prismaClient.$disconnect())
 
 type ModelName =
   // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
@@ -14,7 +14,7 @@ type ModelName =
 
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
-    public query = prisma[name]
+    public query = prismaClient[name]
   }
 }
 

package/lib/core/define_task.js

@@ -9,7 +9,7 @@ export function defineTask(options) {
     },
     prefix: `${x.appId}_task`
   });
-  queue.process(async job => {
+  queue.process(options.concurrency || 1, async job => {
     return options.handle(job.data);
   });
   return queue;

package/lib/core/types.d.ts

@@ -139,6 +139,12 @@ export declare namespace XTask {
          * 任务名称
          */
         name: string;
+        /**
+         * 并发数量
+         *
+         * @default 1
+         */
+        concurrency?: number;
         /**
          * 处理器
          */

package/lib/services/captcha.d.ts

@@ -27,14 +27,15 @@ export interface CaptchaServiceGenerateDataUrlResult {
 export interface CaptchaServiceVerifyOptions {
     token: string;
     code: string;
+    scene: string;
 }
 export declare class CaptchaService implements BaseService {
     private options;
     serviceName: string;
     constructor(options: CaptchaServiceOptions);
-    generate(): Promise<CaptchaServiceGenerateResult>;
-    generateImage(): Promise<CaptchaServiceGenerateImageResult>;
-    generateDataUrl(): Promise<CaptchaServiceGenerateDataUrlResult>;
+    generate(scene: string): Promise<CaptchaServiceGenerateResult>;
+    generateImage(scene: string): Promise<CaptchaServiceGenerateImageResult>;
+    generateDataUrl(scene: string): Promise<CaptchaServiceGenerateDataUrlResult>;
     verify(options: CaptchaServiceVerifyOptions): Promise<boolean>;
 }
 declare module '../x' {

package/lib/services/captcha.js

@@ -7,23 +7,29 @@ export class CaptchaService {
     this.serviceName = 'captcha';
   }
 
-  async generate() {
+  async generate(scene) {
     const code = Math.random().toString().slice(0 - this.options.size);
-    const token = await x.cache.save(code, this.options.ttl);
+    const token = await x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code
     };
   }
 
-  async generateImage() {
+  async generateImage(scene) {
     const {
       text: code,
       data: svg
     } = svgCaptcha.create({
       size: this.options.size
     });
-    const token = await x.cache.save(code, this.options.ttl);
+    const token = await x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code,
@@ -31,12 +37,12 @@ export class CaptchaService {
     };
   }
 
-  async generateDataUrl() {
+  async generateDataUrl(scene) {
     const {
       token,
       code,
       svg
-    } = await this.generateImage();
+    } = await this.generateImage(scene);
     const dataUrl = svgToDataUrl(svg);
     return {
       token: token,
@@ -50,14 +56,14 @@ export class CaptchaService {
       return false;
     }
 
-    const expectedCode = await x.cache.get(options.token);
+    const expected = await x.cache.get(options.token);
 
-    if (expectedCode == null) {
+    if (expected == null) {
       return false;
     }
 
     await x.cache.remove(options.token);
-    return options.code.toLowerCase() === expectedCode.toLowerCase();
+    return expected.scene === options.scene && options.code.toLowerCase() === expected.code.toLowerCase();
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.32.1",
+  "version": "1.33.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",