@jayfong/x-server 2.12.7 → 2.12.15

package/lib/cli/template_util.js

@@ -1,4 +1,5 @@
 import fs from 'fs-extra';
+import globby from 'globby';
 import path from 'path';
 import { camelCase, dedent, snakeCase, upperFirst } from 'vtils';
 import { generateManyIndex } from 'vscode-generate-index-standalone';
@@ -9,32 +10,39 @@ export class TemplateUtil {
   static async init(cwd) {
     await Promise.all([this.initHelperPackage(cwd), this.initTasks(cwd)]);
   }
+
   /**
    * 初始化辅助包。
    */
-
-
   static async initHelperPackage(cwd) {
+    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const fromDir = path.join(__dirname, 'templates');
     const toDir = path.join(cwd, 'node_modules/.x');
-    await fs.copy(fromDir, toDir, {
-      overwrite: true
+    const fromFiles = await globby('*', {
+      cwd: fromDir,
+      onlyFiles: true,
+      absolute: true
     });
+    await fs.ensureDir(toDir);
+    await Promise.all(fromFiles.map(async fromFile => {
+      const toFile = fromFile.replace(fromDir, toDir);
+      let fromFileContent = await fs.readFile(fromFile, 'utf-8');
+      fromFileContent = fromFileContent.replaceAll('../.prisma/client/index.d.ts', path.relative(toDir, prismaClientFile)).replaceAll('../../src', path.relative(toDir, `${cwd}/src`));
+      await fs.writeFile(toFile, fromFileContent);
+    }));
     await generateManyIndex({
       cwd: cwd,
       patterns: ['node_modules/.x/*.ts'],
       replaceFile: true
     });
   }
+
   /**
    * 初始化任务。
    */
-
-
   static async initTasks(cwd) {
     const tasksDir = path.join(cwd, 'src/tasks');
     const tasksIndexFile = path.join(tasksDir, 'index.ts');
-
     if (!(await fs.pathExists(tasksIndexFile))) {
       await fs.outputFile(tasksIndexFile, dedent`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
@@ -42,23 +50,21 @@ export class TemplateUtil {
         `);
     }
   }
+
   /**
    * 初始化模型。
    */
-
-
   static async initModels(cwd) {
     const modelsDir = path.join(cwd, 'src/models');
     const indexFile = path.join(modelsDir, 'index.ts');
     const indexFile2 = path.join(cwd, 'node_modules/.x/models.ts');
-    const prismaClientFile = path.join(cwd, 'node_modules/.prisma/client/index.d.ts');
+    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const prismaClientFileContent = await fs.readFile(prismaClientFile, 'utf8');
     const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName:).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => camelCase(match[1]));
     await Promise.all(modelNames.map(async modelName => {
       const model_name = snakeCase(modelName);
       const ModelName = upperFirst(modelName);
       const modelFile = path.join(modelsDir, `${model_name}.ts`);
-
       if (!(await fs.pathExists(modelFile))) {
         await fs.outputFile(modelFile, dedent`
               import { ${ModelName}BaseModel } from '@jayfong/x-server'
@@ -69,19 +75,25 @@ export class TemplateUtil {
             `);
       }
     }));
-
     if (!(await fs.pathExists(indexFile))) {
       await fs.outputFile(indexFile, dedent`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
           // @endindex
         `);
     }
-
     await generateManyIndex({
       cwd: cwd,
       patterns: [indexFile, indexFile2],
       replaceFile: true
     });
   }
-
+  static getPrismaClientTypeFile() {
+    // const prismaClientFile = path.join(
+    //   cwd,
+    //   'node_modules/.prisma/client/index.d.ts',
+    // )
+    // 用 require.resolve 以兼容 pnpm
+    const prismaClientFile = require.resolve('@prisma/client/package.json').replace('@prisma/client/package.json', '.prisma/client/index.d.ts');
+    return prismaClientFile;
+  }
 }

package/lib/core/define_bus.js

@@ -1,18 +1,18 @@
 import { EventEmitter } from 'node:events';
-
 class EventBus extends EventEmitter {
   onReturnOff(event, listener) {
     this.on(event, listener);
     return () => this.off(event, listener);
   }
-
 }
-
 export function defineBus() {
   const eventEmitter = new EventBus();
   return eventEmitter;
-} // strict-event-emitter-types
+}
+
+// strict-event-emitter-types
 // https://github.com/bterlson/strict-event-emitter-types/blob/9ed45fc68a69f0b7f85ce4e5fe11ff53cc6a009e/src/index.ts
+
 // the overridden signatures need to be assignment compatible, but
 // due to how tuple types work[0] it's not possible to be assignment
 // compatible anymore. This hack fixes it with a unique symbol that
@@ -20,4 +20,6 @@ export function defineBus() {
 //
 // Unfortunately, this has the result of giving a poor error message when
 // you mix up types.
-// 0: https://github.com/Microsoft/TypeScript/issues/26013)
+// 0: https://github.com/Microsoft/TypeScript/issues/26013)
+// TODO: Stash under a symbol key once TS compiler bug is fixed
+// EventEmitter method overrides

package/lib/core/define_handler.js

@@ -1,35 +1,36 @@
 import { Handler } from "./handler";
 export function defineHandler(options) {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'POST'
   });
   return handler;
 }
 defineHandler.POST = defineHandler;
-
 defineHandler.GET = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'GET'
   });
   return handler;
 };
-
 defineHandler.FILE = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'FILE'
   });
   return handler;
 };
-
 defineHandler.WS = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'WS'
   });
   return handler;
 };
-
 defineHandler.XML = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'XML'
   });
   return handler;

package/lib/core/define_task.js

@@ -4,7 +4,8 @@ import { ms } from 'vtils';
 import { x } from "../x";
 export function defineTask(options) {
   const queue = new Queue(options.name, {
-    redis: { ...x.redis.options,
+    redis: {
+      ...x.redis.options,
       // https://github.com/OptimalBits/bull/issues/2186
       maxRetriesPerRequest: null,
       enableReadyCheck: false
@@ -28,7 +29,6 @@ export function defineSliceTask(options) {
     handle: async data => {
       const res = data.count ? await x.redis.multi([['lrange', data.redisKey, `-${data.count}`, '-1'], ['ltrim', data.redisKey, '0', `-${data.count + 1}`]]).exec() : await x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
       const list = res[0][1].reverse().map(item => JSON.parse(item));
-
       if (list.length) {
         return options.handle(list, data.key);
       }
@@ -44,9 +44,10 @@ export function defineSliceTask(options) {
       assert(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
       const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
       const res = await x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1; // 仅时段
-      // 1分钟内的合并推送
+      const count = parseInt(res[0][1], 10) + 1;
 
+      // 仅时段
+      // 1分钟内的合并推送
       if (duration != null) {
         if (count === 1) {
           await task.add({
@@ -56,7 +57,8 @@ export function defineSliceTask(options) {
             delay: duration
           });
         }
-      } // 仅阈值
+      }
+      // 仅阈值
       // 满10条推送
       else if (threshold != null) {
         if (thresholdTimeout) {
@@ -70,7 +72,6 @@ export function defineSliceTask(options) {
             delay: thresholdTimeout
           });
         }
-
         if (count === threshold) {
           await task.add({
             key: key,

package/lib/core/get_handler_url.js

@@ -1,5 +1,6 @@
 import { createUrlQueryString } from 'vtils';
-import { x } from "../x"; // @ts-ignore
+import { x } from "../x";
+// @ts-ignore
 
 export function getHandlerUrl(path, query) {
   return `${x.env.APP_URL.replace(/\/+$/, '')}${path}${query ? `?${createUrlQueryString(query)}` : ''}`;

package/lib/core/handler.js

@@ -3,24 +3,23 @@ import { DataPacker } from 'vtils';
 import { DisposeService } from "../services/dispose";
 import { HttpError } from "../core/http_error";
 import { yup } from 'vtils/validator';
+
+// @ts-ignore
+// prettier-ignore
 export class Handler {
   constructor(options) {
     this.options = options;
     this.requestDataSchema = void 0;
-
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
         await Promise.all(Handler.hooks.map(hook => hook(this.options, data, ctx)));
       }
-
       if (this.options.requestMethod === 'WS') {
         return this.handleWs(data, ctx);
       }
-
       return this.handleHttp(data, ctx);
     };
-
     this.handleHttp = async (data, ctx) => {
       // 请求数据验证
       if (this.requestDataSchema) {
@@ -33,45 +32,40 @@ export class Handler {
           throw new HttpError.BadRequest(err.message);
         }
       }
+      let res = await this.options.handle(data, ctx);
 
-      let res = await this.options.handle(data, ctx); // 设置响应的 Content-Type 头
-
+      // 设置响应的 Content-Type 头
       if (this.options.responseContentType) {
         ctx.setHeader('Content-Type', this.options.responseContentType);
-      } // 打包返回数据
-
+      }
 
+      // 打包返回数据
       if (this.options.responseDataPack) {
         res = DataPacker.packAsRawType(res);
-      } // 混淆返回数据
-
+      }
 
+      // 混淆返回数据
       if (this.options.responseDataObfuscate) {
         res = {
           '_#': LZString.compress(JSON.stringify(res))
         };
       }
-
       return res == null ? {} : res;
     };
-
     this.handleWs = async (data, ctx) => {
       const dispose = new DisposeService();
       ctx.ws.socket.on('message', async payload => {
         try {
           const _ = JSON.parse(payload.toString('utf8'));
-
           const send = data => {
             ctx.ws.socket.send(JSON.stringify({
               id: _.id,
               data: data
             }));
           };
-
           const process = async (type, fn) => {
             if (_.type === type) {
               let sent = false;
-
               try {
                 await fn({
                   data: _.data,
@@ -81,13 +75,11 @@ export class Handler {
                   },
                   dispose: dispose
                 });
-
                 if (!sent) {
                   send();
                 }
               } catch (err) {
                 const _err = HttpError.isHttpError(err) ? err : new HttpError.InternalServerError();
-
                 send({
                   statusCode: _err.statusCode,
                   error: _err.name,
@@ -96,7 +88,6 @@ export class Handler {
               }
             }
           };
-
           if (_.type === 'ping') {
             send();
           } else {
@@ -104,7 +95,6 @@ export class Handler {
           }
         } catch (err) {
           const _err = HttpError.isHttpError(err) ? err : new HttpError.InternalServerError();
-
           ctx.ws.socket.send(JSON.stringify({
             statusCode: _err.statusCode,
             error: _err.name,
@@ -116,15 +106,12 @@ export class Handler {
         dispose.dispose();
       });
     };
-
     if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(yup);
     }
   }
-
   static addHook(hook) {
     this.hooks.push(hook);
   }
-
 }
 Handler.hooks = [];

package/lib/core/http_header.js

@@ -1,5 +1,4 @@
 // https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-
 /**
 [...$0.querySelectorAll('tr')].map(v => v.querySelector('td:nth-child(1)').innerText.trim().split(',').map(name => name.replace(/\[.*?\]/g, '').trim()).map((name) => ({
   name: name,
@@ -16,9 +15,8 @@ ${'/'}**
 ${item.pascalName} = '${item.name}',
 `).join('\n\n')
 */
-export let HttpRequestHeader;
 
-(function (HttpRequestHeader) {
+export let HttpRequestHeader = /*#__PURE__*/function (HttpRequestHeader) {
   HttpRequestHeader["A_IM"] = "A-IM";
   HttpRequestHeader["ACCEPT"] = "Accept";
   HttpRequestHeader["ACCEPT_CHARSET"] = "Accept-Charset";
@@ -75,11 +73,9 @@ export let HttpRequestHeader;
   HttpRequestHeader["X_REQUEST_ID"] = "X-Request-ID";
   HttpRequestHeader["X_CORRELATION_ID"] = "X-Correlation-ID";
   HttpRequestHeader["SAVE_DATA"] = "Save-Data";
-})(HttpRequestHeader || (HttpRequestHeader = {}));
-
-export let HttpResponseHeader;
-
-(function (HttpResponseHeader) {
+  return HttpRequestHeader;
+}({});
+export let HttpResponseHeader = /*#__PURE__*/function (HttpResponseHeader) {
   HttpResponseHeader["ACCESS_CONTROL_ALLOW_ORIGIN"] = "Access-Control-Allow-Origin";
   HttpResponseHeader["ACCESS_CONTROL_ALLOW_CREDENTIALS"] = "Access-Control-Allow-Credentials";
   HttpResponseHeader["ACCESS_CONTROL_EXPOSE_HEADERS"] = "Access-Control-Expose-Headers";
@@ -139,4 +135,5 @@ export let HttpResponseHeader;
   HttpResponseHeader["X_CORRELATION_ID"] = "X-Correlation-ID";
   HttpResponseHeader["X_UA_COMPATIBLE"] = "X-UA-Compatible";
   HttpResponseHeader["X_XSS_PROTECTION"] = "X-XSS-Protection";
-})(HttpResponseHeader || (HttpResponseHeader = {}));
+  return HttpResponseHeader;
+}({});

package/lib/core/server.js

@@ -10,7 +10,6 @@ export class Server {
     this.routes = [];
     Server.options = options;
   }
-
   async start() {
     this.applyServices();
     await this.prepareFastify();
@@ -22,13 +21,10 @@ export class Server {
     await this.startCrons();
     await this.applyAutoClose();
   }
-
   async close() {
     var _this$fastify;
-
     await ((_this$fastify = this.fastify) == null ? void 0 : _this$fastify.close());
   }
-
   async prepareFastify() {
     this.fastify = await Fastify({
       logger: process.env.NODE_ENV === 'development' ? {
@@ -42,14 +38,12 @@ export class Server {
       ...this.options.fastifyOptions
     });
   }
-
   async startFastify() {
     await this.fastify.listen({
       host: this.options.host || '0.0.0.0',
       port: this.options.port
     });
   }
-
   async prepareRoutes() {
     // @ts-ignore
     const {
@@ -57,36 +51,30 @@ export class Server {
     } = await import('.x/routes');
     this.routes = routes;
   }
-
   async applyHooks() {
     // @ts-ignore
     await import('.x/hooks');
   }
-
   applyServices() {
     x.register(...(this.options.services || []));
   }
-
   applyPlugins() {
     const plugins = this.options.plugins || [];
-
     for (const plugin of plugins) {
       plugin.register(this.fastify);
     }
   }
-
   async applyRoutes() {
     await this.fastify.register(async fastify => {
       const appUrl = x.env.APP_URL.replace(/\/+$/, '');
       const routeMap = keyBy(this.routes, item => item.path);
-
       const handleRoute = async (item, req, res, path) => {
         const handlerOptions = item.handler.options;
         const handlerMethod = handlerOptions.requestMethod || 'POST';
         const isWS = handlerMethod === 'WS';
-        const url = `${appUrl}${// 结构：/test/sss?x=2
+        const url = `${appUrl}${
+        // 结构：/test/sss?x=2
         path != null ? path : isWS ? res.url : req.url}`;
-
         if (isWS) {
           await item.handler.handle(undefined, {
             url: url,
@@ -99,9 +87,7 @@ export class Server {
           });
           return;
         }
-
         let files = {};
-
         if (handlerMethod === 'FILE') {
           const part = await req.file();
           files = Object.keys(part.fields).reduce((res, name) => {
@@ -110,8 +96,8 @@ export class Server {
             return res;
           }, {});
         }
-
-        const data = await item.handler.handle({ // @ts-ignore
+        const data = await item.handler.handle({
+          // @ts-ignore
           ...req.params,
           // @ts-ignore
           ...req.query,
@@ -129,7 +115,6 @@ export class Server {
         });
         return data;
       };
-
       for (const item of this.routes) {
         const handlerOptions = item.handler.options;
         const handlerMethod = handlerOptions.requestMethod || 'POST';
@@ -144,39 +129,34 @@ export class Server {
           websocket: isWS,
           handler: (req, res) => handleRoute(item, req, res)
         });
-      } // 接口统一入口
-
+      }
 
+      // 接口统一入口
       fastify.route({
         method: 'POST',
         url: '/@',
         handler: async (req, res) => {
           let requestPath = req.headers['x-path'] || '';
-
           if (!requestPath.startsWith('/')) {
             const [_requestPath, _time] = base64UrlDecode(rot13(requestPath)).split('#');
-
             if (!_time || Date.now() / 1000 - Number(_time) > 5 * 60) {
               throw new HttpError.Forbidden();
             }
-
             requestPath = _requestPath;
           }
-
           if (!requestPath || !routeMap[requestPath]) {
             throw new HttpError.NotFound();
           }
-
           return handleRoute(routeMap[requestPath], req, res, requestPath);
         }
-      }); // 开发管理入口
+      });
 
+      // 开发管理入口
       fastify.route({
         method: 'POST',
         url: '/$',
         handler: async req => {
           const payload = req.body;
-
           if (payload && typeof payload === 'object' && x.env.APP_TOKEN && payload.token === x.env.APP_TOKEN) {
             if (payload.type === 'ping') {
               return 'ping:success';
@@ -188,15 +168,12 @@ export class Server {
       });
     });
   }
-
   async startCrons() {
     // @ts-ignore
     await import('.x/crons');
   }
-
   async applyAutoClose() {
     x.dispose.add(() => this.close());
   }
-
 }
 Server.options = {};

package/lib/core/types.js

@@ -1,15 +1,8 @@
 export let XServer;
-
 (function (_XServer) {})(XServer || (XServer = {}));
-
 export let XHandler;
-
 (function (_XHandler) {})(XHandler || (XHandler = {}));
-
 export let XTask;
-
 (function (_XTask) {})(XTask || (XTask = {}));
-
 export let XCron;
-
 (function (_XCron) {})(XCron || (XCron = {}));

package/lib/index.js

@@ -1,4 +1,4 @@
-// @index(['./**/*.ts', '!**/*.test.ts', '!./cli/**', '!./client_helper.ts', '!**/_*'], f => `export * from '${f.path}'`)
+// @index(['./**/*.ts', '!**/*.test.ts', '!./cli/**', '!**/_*'], f => `export * from '${f.path}'`)
 export * from "./core/define_bus";
 export * from "./core/define_cron";
 export * from "./core/define_handler";
@@ -33,7 +33,8 @@ export * from "./services/redis";
 export * from "./services/request";
 export * from "./services/sensitive_words";
 export * from "./types/index";
-export * from "./x"; // @endindex
-// @ts-ignore
+export * from "./x";
+// @endindex
 
+// @ts-ignore
 export * from '.x/models';

package/lib/plugins/cors.js

@@ -1,7 +1,6 @@
 import FastifyCors from '@fastify/cors';
 import { memoize } from 'vtils';
 import { ms } from 'vtils';
-
 /**
  * CORS 支持插件
  */
@@ -9,7 +8,6 @@ export class CorsPlugin {
   constructor(options) {
     this.options = options;
   }
-
   register(fastify) {
     const allows = this.options.allow.map(item => ({
       type: item === '*' ? 'all' : item.startsWith('*.') ? 'endsWith' : 'equal',
@@ -30,5 +28,4 @@ export class CorsPlugin {
       maxAge: ms(this.options.ttl, true)
     });
   }
-
 }

package/lib/plugins/file_parser.js

@@ -1,6 +1,5 @@
 import FastifyMultipart from '@fastify/multipart';
 import { bytes } from 'vtils';
-
 /**
  * file 解析器插件
  *
@@ -10,16 +9,14 @@ export class FileParserPlugin {
   constructor(options) {
     this.options = options;
   }
-
   register(fastify) {
     var _this$options;
-
-    fastify.register(FastifyMultipart, { ...this.options,
+    fastify.register(FastifyMultipart, {
+      ...this.options,
       limits: {
         fileSize: bytes(1, 'MB'),
         ...((_this$options = this.options) == null ? void 0 : _this$options.limits)
       }
     });
   }
-
 }

package/lib/plugins/form_body_parser.js

@@ -1,5 +1,4 @@
 import FastifyFormBody from '@fastify/formbody';
-
 /**
  * POST application/x-www-form-urlencoded 解析器插件
  */
@@ -7,9 +6,7 @@ export class FormBodyParserPlugin {
   constructor(options) {
     this.options = options;
   }
-
   register(fastify) {
     fastify.register(FastifyFormBody, this.options);
   }
-
 }

package/lib/plugins/ws_parser.js

@@ -1,5 +1,4 @@
 import FastifyWebsocket from '@fastify/websocket';
-
 /**
  * websocket 解析器插件
  */
@@ -7,9 +6,7 @@ export class WsParserPlugin {
   constructor(options) {
     this.options = options;
   }
-
   register(fastify) {
     fastify.register(FastifyWebsocket, this.options);
   }
-
 }