@jayfong/x-server 1.20.1 → 1.23.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.23.0](https://github.com/jfWorks/x-server/compare/v1.22.0...v1.23.0) (2022-05-01)
+
+
+### Features
+
+* **captcha:** add generateDataUrl ([54205df](https://github.com/jfWorks/x-server/commit/54205df24d0cc397029d8c66ea17020d7cb5c5fd))
+
+## [1.22.0](https://github.com/jfWorks/x-server/compare/v1.21.0...v1.22.0) (2022-05-01)
+
+
+### Features
+
+* **cors:** allowAll ([5ce4b5d](https://github.com/jfWorks/x-server/commit/5ce4b5d9183f68a32173d77de569f00c5409ccdc))
+
+## [1.21.0](https://github.com/jfWorks/x-server/compare/v1.20.1...v1.21.0) (2022-04-29)
+
+
+### Features
+
+* export * from '@prisma/client' ([3e6c707](https://github.com/jfWorks/x-server/commit/3e6c707d55bad0cbb719f1b76bdd306ef0527ba1))
+
 ### [1.20.1](https://github.com/jfWorks/x-server/compare/v1.20.0...v1.20.1) (2022-04-27)
 
 

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

@@ -20,3 +20,5 @@ function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
 
 // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${_.pascal(m[1])}BaseModel = makeBaseModel('${_.camel(m[1])}')`)
 // @endindex
+
+export * from '@prisma/client'

package/lib/_cjs/plugins/cors.js

@@ -21,9 +21,10 @@ class CorsPlugin {
 
   register(fastify) {
     const allows = this.options.allow.map(item => ({
-      type: item.startsWith('*.') ? 'endsWith' : 'equal',
+      type: item === '*' ? 'all' : item.startsWith('*.') ? 'endsWith' : 'equal',
       domain: item.startsWith('*.') ? item.replace('*.', '.') : item
     }));
+    const allowAll = allows.length === 1 && allows[0].type === 'all';
     const check = (0, _vtils.memoize)(origin => {
       let i = origin.indexOf(':');
       let j = origin.indexOf(':', i + 1);
@@ -34,7 +35,7 @@ class CorsPlugin {
       return pass;
     });
     fastify.register(_fastifyCors.default, {
-      origin: (origin, cb) => cb(null, origin ? check(origin) : true),
+      origin: (origin, cb) => allowAll ? cb(null, true) : cb(null, origin ? check(origin) : true),
       maxAge: (0, _date.ms)(this.options.ttl, true)
     });
   }

package/lib/_cjs/services/captcha.js

@@ -7,6 +7,8 @@ exports.CaptchaService = void 0;
 
 var _svgCaptcha = _interopRequireDefault(require("svg-captcha"));
 
+var _miniSvgDataUri = _interopRequireDefault(require("mini-svg-data-uri"));
+
 var _x = require("../x");
 
 class CaptchaService {
@@ -40,6 +42,20 @@ class CaptchaService {
     };
   }
 
+  async generateDataUrl() {
+    const {
+      token,
+      code,
+      svg
+    } = await this.generateImage();
+    const dataUrl = (0, _miniSvgDataUri.default)(svg);
+    return {
+      token: token,
+      code: code,
+      dataUrl: dataUrl
+    };
+  }
+
   async verify(options) {
     if (options.code.length !== this.options.size) {
       return false;

package/lib/cli/templates/models.ts

@@ -20,3 +20,5 @@ function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
 
 // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${_.pascal(m[1])}BaseModel = makeBaseModel('${_.camel(m[1])}')`)
 // @endindex
+
+export * from '@prisma/client'

package/lib/plugins/cors.js

@@ -12,9 +12,10 @@ export class CorsPlugin {
 
   register(fastify) {
     const allows = this.options.allow.map(item => ({
-      type: item.startsWith('*.') ? 'endsWith' : 'equal',
+      type: item === '*' ? 'all' : item.startsWith('*.') ? 'endsWith' : 'equal',
       domain: item.startsWith('*.') ? item.replace('*.', '.') : item
     }));
+    const allowAll = allows.length === 1 && allows[0].type === 'all';
     const check = memoize(origin => {
       let i = origin.indexOf(':');
       let j = origin.indexOf(':', i + 1);
@@ -25,7 +26,7 @@ export class CorsPlugin {
       return pass;
     });
     fastify.register(FastifyCors, {
-      origin: (origin, cb) => cb(null, origin ? check(origin) : true),
+      origin: (origin, cb) => allowAll ? cb(null, true) : cb(null, origin ? check(origin) : true),
       maxAge: ms(this.options.ttl, true)
     });
   }

package/lib/services/captcha.d.ts

@@ -19,6 +19,11 @@ export interface CaptchaGenerateImageResult {
     code: string;
     svg: string;
 }
+export interface CaptchaGenerateDataUrlResult {
+    token: string;
+    code: string;
+    dataUrl: string;
+}
 export interface CaptchaVerifyOptions {
     token: string;
     code: string;
@@ -29,6 +34,7 @@ export declare class CaptchaService implements BaseService {
     constructor(options: CaptchaOptions);
     generate(): Promise<CaptchaGenerateResult>;
     generateImage(): Promise<CaptchaGenerateImageResult>;
+    generateDataUrl(): Promise<CaptchaGenerateDataUrlResult>;
     verify(options: CaptchaVerifyOptions): Promise<boolean>;
 }
 declare module '../x' {

package/lib/services/captcha.js

@@ -1,4 +1,5 @@
 import svgCaptcha from 'svg-captcha';
+import svgToDataUrl from 'mini-svg-data-uri';
 import { x } from "../x";
 export class CaptchaService {
   constructor(options) {
@@ -30,6 +31,20 @@ export class CaptchaService {
     };
   }
 
+  async generateDataUrl() {
+    const {
+      token,
+      code,
+      svg
+    } = await this.generateImage();
+    const dataUrl = svgToDataUrl(svg);
+    return {
+      token: token,
+      code: code,
+      dataUrl: dataUrl
+    };
+  }
+
   async verify(options) {
     if (options.code.length !== this.options.size) {
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.20.1",
+  "version": "1.23.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -53,6 +53,7 @@
     "http-errors": "^1.8.1",
     "ioredis": "^4.28.5",
     "jsonwebtoken": "^8.5.1",
+    "mini-svg-data-uri": "^1.4.4",
     "node-ssh": "^12.0.4",
     "nodemailer": "^6.7.3",
     "pino-pretty": "^7.6.1",