@jayfong/x-server 2.32.0 → 2.35.0

package/lib/_cjs/cli/api_generator.js

@@ -136,7 +136,9 @@ class ApiGenerator {
     this.debug('写入文件...');
     await Promise.all([_fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/api.json'), apiData, {
       spaces: 2
-    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/yapi.json'), this.genYApiData(apiData), {
+    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/yapi.json'), this.apiDataToYApiData(apiData), {
+      spaces: 2
+    }), _fsExtra.default.outputJSON(_path.default.join(this.cwd, 'temp/openapi31.json'), this.apiDataToOpenAPI31Data(apiData), {
       spaces: 2
     })]);
   }
@@ -281,7 +283,7 @@ class ApiGenerator {
     }
     return jsonSchema;
   }
-  genYApiData(handles) {
+  apiDataToYApiData(handles) {
     const data = {};
     for (const handle of handles) {
       for (const path of handle.path) {
@@ -344,5 +346,50 @@ class ApiGenerator {
       list: data[cat]
     }));
   }
+  apiDataToOpenAPI31Data(handles) {
+    const data = {
+      openapi: '3.1.0',
+      info: {
+        title: `${process.env.APP_NAME}`,
+        version: '1.0.0'
+      },
+      paths: {},
+      servers: [{
+        url: `${process.env.APP_URL}`,
+        description: '生产'
+      }, {
+        url: `http://127.0.0.1:${process.env.APP_PORT}/`,
+        description: '本地'
+      }]
+    };
+    for (const handle of handles) {
+      for (const path of handle.path) {
+        data.paths[path] = {
+          [handle.method.toLowerCase()]: {
+            tags: [handle.category],
+            summary: handle.name,
+            requestBody: {
+              content: {
+                'application/json': {
+                  schema: handle.requestDataJsonSchema
+                }
+              }
+            },
+            responses: {
+              '200': {
+                description: 'success',
+                content: {
+                  'application/json': {
+                    schema: handle.responseDataJsonSchema
+                  }
+                }
+              }
+            }
+          }
+        };
+      }
+    }
+    return data;
+  }
 }
 exports.ApiGenerator = ApiGenerator;

package/lib/_cjs/cli/cli.js

@@ -8,7 +8,6 @@ var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone")
 var _vtils = require("vtils");
 var _yargs = _interopRequireDefault(require("yargs"));
 var _api_generator = require("./api_generator");
-var _api_generator2 = require("./api_generator1");
 var _build_util = require("./build_util");
 var _deploy_util = require("./deploy_util");
 var _dev_util = require("./dev_util");
@@ -124,8 +123,6 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   console.log('构建成功');
 }).command('api', '生成 API', async () => {
   await new _api_generator.ApiGenerator().start();
-}).command('api1', '(old) 生成 API', async () => {
-  await new _api_generator2.ApiGenerator1().generate();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

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

@@ -1,31 +1,29 @@
-import { x, HttpError } from '@jayfong/x-server'
-import { PrismaClient, Prisma } from '@prisma/client'
+import { x } from '@jayfong/x-server';
+import { Prisma, PrismaClient } from '@prisma/client';
 
-export const prismaClient = new PrismaClient({
-  rejectOnNotFound: err => new HttpError.NotFound(err.message),
-})
+export const prismaClient = new PrismaClient();
 
-x.dispose.add(() => prismaClient.$disconnect())
+x.dispose.add(() => prismaClient.$disconnect());
 
 type ModelName =
   // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
-  ''
+  '';
 // @endindex
 
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
-    public query = prismaClient[name]
+    public query = prismaClient[name];
 
-    public transactionClient: Prisma.TransactionClient | null = null
+    public transactionClient: Prisma.TransactionClient | null = null;
 
     public transactionify = (tx: Prisma.TransactionClient) => {
       // @ts-ignore
       return new (class extends this.constructor {
-        public query = tx[name]
+        public query = tx[name];
 
-        public transactionClient = tx
-      })() as typeof this
-    }
+        public transactionClient = tx;
+      })() as typeof this;
+    };
 
     public getModel = <T extends ModelName>(
       name: T,
@@ -34,27 +32,29 @@ function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
         ? require('../../src/models')[`${name}Model`].transactionify(
             this.transactionClient,
           )
-        : require('../../src/models')[`${name}Model`]
-    }
-  }
+        : require('../../src/models')[`${name}Model`];
+    };
+  };
 }
 
 // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${m[1]}BaseModel = makeBaseModel('${_.camel(m[1])}')`)
 // @endindex
 
-export * from '@prisma/client'
+export * from '@prisma/client';
 
 export const startTransaction = <T>(
-  cb: (models: {
-    [K in ModelName]: typeof import('../../src/models')[`${K}Model`]
-  }) => Promise<T>,
+  cb: (
+    models: {
+      [K in ModelName]: typeof import('../../src/models')[`${K}Model`];
+    },
+  ) => Promise<T>,
 ): Promise<T> => {
   return prismaClient.$transaction(async tx => {
-    const _models = require('../../src/models')
-    const cache = Object.create(null)
+    const _models = require('../../src/models');
+    const cache = Object.create(null);
     return cb({
       // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `get ${_.camel(m[1])}() { return cache.${_.camel(m[1])} || (cache.${_.camel(m[1])} = _models.${_.camel(m[1])}Model.transactionify(tx)) }, `)
       // @endindex
-    })
-  })
-}
+    });
+  });
+};

package/lib/_cjs/core/define_task.js

@@ -40,58 +40,74 @@ function defineSliceTask(options) {
       }
     }
   });
-  const redisKeyPrefix = `${_x.x.appId}_batch_task_${options.name}`;
-  const res = {
-    add: async (data, addOptions) => {
-      const key = (addOptions == null ? void 0 : addOptions.key) || '';
-      const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? (0, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.ms)(options.duration);
-      const threshold = (addOptions == null ? void 0 : addOptions.threshold) || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
-      const thresholdTimeout = (addOptions == null ? void 0 : addOptions.thresholdTimeout) != null ? (0, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.ms)(options.thresholdTimeout);
-      (0, _assert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
-      const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
-      const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1;
+  const addAction = async (data, addOptions) => {
+    const redisKeyPrefix = `${_x.x.appId}_batch_task_${options.name}`;
+    const key = (addOptions == null ? void 0 : addOptions.key) || '';
+    const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? (0, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.ms)(options.duration);
+    const threshold = (addOptions == null ? void 0 : addOptions.threshold) || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
+    const thresholdTimeout = (addOptions == null ? void 0 : addOptions.thresholdTimeout) != null ? (0, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.ms)(options.thresholdTimeout);
+    (0, _assert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
+    const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
+    const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
+    const count = parseInt(res[0][1], 10) + 1;
 
-      // 仅时段
-      // 1分钟内的合并推送
-      if (duration != null) {
-        if (count === 1) {
-          await task.add({
-            key: key,
-            redisKey: redisKey
-          }, {
-            delay: duration
-          });
-        }
+    // 仅时段
+    // 1分钟内的合并推送
+    if (duration != null) {
+      if (count === 1) {
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        }, {
+          delay: duration
+        });
       }
-      // 仅阈值
-      // 满10条推送
-      else if (threshold != null) {
-        const delayTaskId = redisKey;
-        const prevJob = await task.getJob(delayTaskId);
+    }
+    // 仅阈值
+    // 满10条推送
+    else if (threshold != null) {
+      const delayTaskId = redisKey;
+      const prevJob = await task.getJob(delayTaskId);
 
-        // 到达阈值，立即发送
-        if (count === threshold) {
-          await (prevJob == null ? void 0 : prevJob.remove());
+      // 到达阈值，立即发送
+      if (count === threshold) {
+        await (prevJob == null ? void 0 : prevJob.remove());
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        });
+      }
+      // 存在超时设置
+      else if (thresholdTimeout) {
+        if (!prevJob) {
           await task.add({
             key: key,
             redisKey: redisKey
+          }, {
+            jobId: delayTaskId,
+            delay: thresholdTimeout
           });
         }
-        // 存在超时设置
-        else if (thresholdTimeout) {
-          if (!prevJob) {
-            await task.add({
-              key: key,
-              redisKey: redisKey
-            }, {
-              jobId: delayTaskId,
-              delay: thresholdTimeout
-            });
-          }
-        }
       }
     }
   };
+  const addTask = defineTask({
+    name: `${options.name}_add`,
+    concurrency: 1,
+    handle: async payload => {
+      await addAction(payload.data, payload.options);
+    }
+  });
+  const res = {
+    add: async (data, addOptions) => {
+      const delay = addOptions.delay && (0, _vtils.ms)(addOptions.delay) || 0;
+      await addTask.add({
+        data: data,
+        options: addOptions
+      }, {
+        delay: delay
+      });
+    }
+  };
   return res;
 }

package/lib/_cjs/core/handler.js

@@ -10,8 +10,7 @@ var vae = _interopRequireWildcard(require("vtils/vae"));
 var _validator = require("vtils/validator");
 var _http_error = require("../core/http_error");
 var _dispose = require("../services/dispose");
-// @ts-ignore
-// prettier-ignore
+var _server = require("./server");
 _validator.yup.setLocale((0, _validator.getZhCN)({
   getLabel: params => params.label || params.path
 }));
@@ -79,9 +78,18 @@ class Handler {
           '_#': _lzString.default.compress(JSON.stringify(res))
         };
       }
+
+      // 加密返回数据
+      if (this.options.responseDataEncrypt && _server.Server.options.responseEncryptAlgorithm) {
+        if (_server.Server.options.responseEncryptAlgorithm === 'simple') {
+          res = {
+            _$: (0, _vtils.rot13)((0, _vtils.base64UrlEncode)(`${Date.now()}${JSON.stringify(res)}`))
+          };
+        }
+      }
       return res == null ? {} : res;
     };
-    this.handleWs = async (data, ctx) => {
+    this.handleWs = async (_data, ctx) => {
       const dispose = new _dispose.DisposeService();
       ctx.ws.socket.on('message', async payload => {
         try {

package/lib/_cjs/core/server.js

@@ -6,9 +6,9 @@ exports.Server = void 0;
 var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
 var _fastify = _interopRequireDefault(require("fastify"));
 var _vtils = require("vtils");
-var _http_method = require("./http_method");
-var _http_error = require("./http_error");
 var _x = require("../x");
+var _http_error = require("./http_error");
+var _http_method = require("./http_method");
 class Server {
   constructor(options) {
     this.options = options;
@@ -97,7 +97,6 @@ class Server {
         if (handlerMethod === 'FILE') {
           const part = await req.file();
           files = Object.keys(part.fields).reduce((res, name) => {
-            ;
             res[name] = (0, _vtils.castArray)(part.fields[name]).map(item => item.file ? item : item.value)[0];
             return res;
           }, {});

package/lib/cli/api_generator.d.ts

@@ -1,5 +1,6 @@
 import createDebug from 'debug';
 import { type JSONSchema4 } from 'json-schema';
+import { type OpenAPIV3_1 } from 'openapi-types';
 import { ts } from 'ts-morph';
 import { LiteralUnion } from 'vtils/types';
 import { type XHandler } from '../core/types';
@@ -43,10 +44,23 @@ export declare class ApiGenerator {
         keySymbol?: ts.Symbol;
     }): ApiDto;
     apiDataToJsonSchema(apiData: ApiDto, jsonSchema?: JSONSchema4): JSONSchema4;
-    genYApiData(handles: ApiData[]): {
+    apiDataToYApiData(handles: ApiData[]): {
         name: string;
         desc: string;
         list: any;
     }[];
+    apiDataToOpenAPI31Data(handles: ApiData[]): Omit<Omit<import("openapi-types").OpenAPIV3.Document<{}>, "paths" | "components">, "info" | "paths" | "components" | "servers" | "webhooks" | "jsonSchemaDialect"> & {
+        info: OpenAPIV3_1.InfoObject;
+        jsonSchemaDialect?: string;
+        servers?: OpenAPIV3_1.ServerObject[];
+    } & Pick<{
+        paths: OpenAPIV3_1.PathsObject<{}, {}>;
+        webhooks: Record<string, OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.PathItemObject<{}>>;
+        components: OpenAPIV3_1.ComponentsObject;
+    }, "paths"> & Omit<Partial<{
+        paths: OpenAPIV3_1.PathsObject<{}, {}>;
+        webhooks: Record<string, OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.PathItemObject<{}>>;
+        components: OpenAPIV3_1.ComponentsObject;
+    }>, "paths">;
 }
 export {};

package/lib/cli/api_generator.js

@@ -131,7 +131,9 @@ export class ApiGenerator {
     this.debug('写入文件...');
     await Promise.all([fs.outputJSON(path.join(this.cwd, 'temp/api.json'), apiData, {
       spaces: 2
-    }), fs.outputJSON(path.join(this.cwd, 'temp/yapi.json'), this.genYApiData(apiData), {
+    }), fs.outputJSON(path.join(this.cwd, 'temp/yapi.json'), this.apiDataToYApiData(apiData), {
+      spaces: 2
+    }), fs.outputJSON(path.join(this.cwd, 'temp/openapi31.json'), this.apiDataToOpenAPI31Data(apiData), {
       spaces: 2
     })]);
   }
@@ -276,7 +278,7 @@ export class ApiGenerator {
     }
     return jsonSchema;
   }
-  genYApiData(handles) {
+  apiDataToYApiData(handles) {
     const data = {};
     for (const handle of handles) {
       for (const path of handle.path) {
@@ -339,4 +341,49 @@ export class ApiGenerator {
       list: data[cat]
     }));
   }
+  apiDataToOpenAPI31Data(handles) {
+    const data = {
+      openapi: '3.1.0',
+      info: {
+        title: `${process.env.APP_NAME}`,
+        version: '1.0.0'
+      },
+      paths: {},
+      servers: [{
+        url: `${process.env.APP_URL}`,
+        description: '生产'
+      }, {
+        url: `http://127.0.0.1:${process.env.APP_PORT}/`,
+        description: '本地'
+      }]
+    };
+    for (const handle of handles) {
+      for (const path of handle.path) {
+        data.paths[path] = {
+          [handle.method.toLowerCase()]: {
+            tags: [handle.category],
+            summary: handle.name,
+            requestBody: {
+              content: {
+                'application/json': {
+                  schema: handle.requestDataJsonSchema
+                }
+              }
+            },
+            responses: {
+              '200': {
+                description: 'success',
+                content: {
+                  'application/json': {
+                    schema: handle.responseDataJsonSchema
+                  }
+                }
+              }
+            }
+          }
+        };
+      }
+    }
+    return data;
+  }
 }

package/lib/cli/cli.js

@@ -5,7 +5,6 @@ import { generateManyIndex } from 'vscode-generate-index-standalone';
 import { castArray, debounce } from 'vtils';
 import yargs from 'yargs';
 import { ApiGenerator } from "./api_generator";
-import { ApiGenerator1 } from "./api_generator1";
 import { BuildUtil } from "./build_util";
 import { DeployUtil } from "./deploy_util";
 import { DevUtil } from "./dev_util";
@@ -121,8 +120,6 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   console.log('构建成功');
 }).command('api', '生成 API', async () => {
   await new ApiGenerator().start();
-}).command('api1', '(old) 生成 API', async () => {
-  await new ApiGenerator1().generate();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

package/lib/cli/templates/models.ts

@@ -1,31 +1,29 @@
-import { x, HttpError } from '@jayfong/x-server'
-import { PrismaClient, Prisma } from '@prisma/client'
+import { x } from '@jayfong/x-server';
+import { Prisma, PrismaClient } from '@prisma/client';
 
-export const prismaClient = new PrismaClient({
-  rejectOnNotFound: err => new HttpError.NotFound(err.message),
-})
+export const prismaClient = new PrismaClient();
 
-x.dispose.add(() => prismaClient.$disconnect())
+x.dispose.add(() => prismaClient.$disconnect());
 
 type ModelName =
   // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `| '${_.camel(m[1])}'`)
-  ''
+  '';
 // @endindex
 
 function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
   return class BaseModel {
-    public query = prismaClient[name]
+    public query = prismaClient[name];
 
-    public transactionClient: Prisma.TransactionClient | null = null
+    public transactionClient: Prisma.TransactionClient | null = null;
 
     public transactionify = (tx: Prisma.TransactionClient) => {
       // @ts-ignore
       return new (class extends this.constructor {
-        public query = tx[name]
+        public query = tx[name];
 
-        public transactionClient = tx
-      })() as typeof this
-    }
+        public transactionClient = tx;
+      })() as typeof this;
+    };
 
     public getModel = <T extends ModelName>(
       name: T,
@@ -34,27 +32,29 @@ function makeBaseModel<TModelName extends ModelName>(name: TModelName) {
         ? require('../../src/models')[`${name}Model`].transactionify(
             this.transactionClient,
           )
-        : require('../../src/models')[`${name}Model`]
-    }
-  }
+        : require('../../src/models')[`${name}Model`];
+    };
+  };
 }
 
 // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `export const ${m[1]}BaseModel = makeBaseModel('${_.camel(m[1])}')`)
 // @endindex
 
-export * from '@prisma/client'
+export * from '@prisma/client';
 
 export const startTransaction = <T>(
-  cb: (models: {
-    [K in ModelName]: typeof import('../../src/models')[`${K}Model`]
-  }) => Promise<T>,
+  cb: (
+    models: {
+      [K in ModelName]: typeof import('../../src/models')[`${K}Model`];
+    },
+  ) => Promise<T>,
 ): Promise<T> => {
   return prismaClient.$transaction(async tx => {
-    const _models = require('../../src/models')
-    const cache = Object.create(null)
+    const _models = require('../../src/models');
+    const cache = Object.create(null);
     return cb({
       // @index('../.prisma/client/index.d.ts', /(?<=const ModelName:).+?(?=\})/s, /(\S+?):/g, (m, _) => `get ${_.camel(m[1])}() { return cache.${_.camel(m[1])} || (cache.${_.camel(m[1])} = _models.${_.camel(m[1])}Model.transactionify(tx)) }, `)
       // @endindex
-    })
-  })
-}
+    });
+  });
+};