@jayfong/x-server 2.30.3 → 2.31.0

package/lib/cli/api_generator1.js

@@ -0,0 +1,279 @@
+import path from 'node:path';
+import * as parseComment from 'comment-parser';
+import createDebug from 'debug';
+import fs from 'fs-extra';
+import * as ts from 'ts-morph';
+import { ii, pascalCase, snakeCase } from 'vtils';
+import { HandlerMethodToHttpMethod } from "../core/http_method";
+export class ApiGenerator1 {
+  constructor() {
+    this.debug = createDebug('api1');
+    this.cwd = process.cwd();
+    // cwd = '/Users/admin/Documents/jfWorks/x-server-test'
+    this.project = void 0;
+  }
+  getTypeBySymbol(symbol) {
+    return symbol.getTypeAtLocation(symbol.getDeclarations()[0] || symbol.getValueDeclarationOrThrow());
+  }
+  getComment(declaration) {
+    var _declaration$getLeadi;
+    const text = ((declaration == null || (_declaration$getLeadi = declaration.getLeadingCommentRanges()[0]) == null ? void 0 : _declaration$getLeadi.getText()) || '').trim();
+    const comment = parseComment.parse(text)[0];
+    const description = (comment == null ? void 0 : comment.description) || '';
+    const tags = new Map();
+    comment == null ? void 0 : comment.tags.forEach(tag => {
+      tags.set(tag.tag, tag.description);
+    });
+    return {
+      existing: !!comment,
+      description: description,
+      tags: tags
+    };
+  }
+  getCommentBySymbol(symbol) {
+    var _this$getComment;
+    return ((_this$getComment = this.getComment(symbol.getDeclarations()[0])) == null ? void 0 : _this$getComment.description) || '';
+  }
+  typeToApiData(type, _symbol) {
+    var _type$getSymbol, _type$getSymbol2, _type$getSymbol3;
+    // ws
+    if (((_type$getSymbol = type.getSymbol()) == null ? void 0 : _type$getSymbol.getName()) === 'SocketStream') {
+      return {
+        name: 'ws',
+        desc: 'ws',
+        required: false,
+        type: 'object',
+        children: [],
+        enum: []
+      };
+    }
+
+    // XFile
+    if (((_type$getSymbol2 = type.getSymbol()) == null ? void 0 : _type$getSymbol2.getName()) === 'MultipartFile') {
+      const symbol = _symbol || type.getSymbol();
+      return {
+        name: 'file',
+        desc: symbol && this.getCommentBySymbol(symbol) || '',
+        required: !!symbol && !(symbol.getFlags() & ts.SymbolFlags.Optional),
+        type: 'file',
+        children: [],
+        enum: []
+      };
+    }
+    let isRequired = true;
+    let isUnion = type.isUnion();
+    const unionTypes = isUnion ? type.getUnionTypes().filter(item => !item.isBooleanLiteral() && !item.isNull() && !item.isUndefined()) : [];
+    isUnion = !!unionTypes.length;
+    if (isUnion) {
+      if (unionTypes.length === 1 && !unionTypes[0].isLiteral()) {
+        isUnion = false;
+      }
+      // 兼容 prisma 生成的类型用 null 表示可选
+      isRequired = unionTypes.length === type.getUnionTypes().length;
+      // 必须用 getBaseTypeOfLiteralType 获取枚举字面量的原始类型
+      type = unionTypes[0].getBaseTypeOfLiteralType();
+    }
+    const isEnum = type.isEnum();
+    const enumData = isEnum ?
+    // @ts-ignore
+    type.compilerType.types.reduce((res, item) => {
+      res[item.getSymbol().getName()] = item.value;
+      return res;
+    }, {}) : {};
+    const enumKeys = Object.keys(enumData);
+    const enumValues = Object.values(enumData);
+    const isIntersection = type.isIntersection();
+    const intersectionTypes = isIntersection && type.getIntersectionTypes();
+    const isArray = type.isArray();
+    const isString = isEnum ? typeof enumValues[0] === 'string' : type.isString() || ['Date'].includes(((_type$getSymbol3 = type.getSymbol()) == null ? void 0 : _type$getSymbol3.getName()) || '');
+    const isNumber = isEnum ? typeof enumValues[0] === 'number' : type.isNumber();
+    const isBoolean = type.isBoolean() || type.isUnion() && type.getUnionTypes().some(item => item.isBooleanLiteral()) && type.getUnionTypes().every(item => item.isBooleanLiteral() || item.isNull() || item.isUndefined());
+    const isObject = !isArray && !isString && !isNumber && !isBoolean && type.isObject() ||
+    // 将交集类型视为对象
+    isIntersection;
+    const symbol = _symbol || type.getSymbol();
+    const parentSymbol = symbol;
+    const apiName = (symbol == null ? void 0 : symbol.getName()) || '__type';
+    const apiDesc = [symbol && this.getCommentBySymbol(symbol), isEnum && `枚举：${enumKeys.map((key, index) => `${key}->${enumValues[index]}`).join('; ')}`].filter(Boolean).join('\n');
+    const apiEnum = isUnion ? unionTypes.map(t => t.getLiteralValue()) : isEnum ? enumValues : [];
+    const apiType = isArray ? 'array' : isString ? 'string' : isNumber ? 'number' : isBoolean ? 'boolean' : 'object';
+    const apiRequired = isRequired === false ? false : !!symbol && !(symbol.getFlags() & ts.SymbolFlags.Optional);
+    const apiChildren = isArray ? [this.typeToApiData(type.getArrayElementTypeOrThrow())] : isObject ? ii(() => {
+      const context = type._context;
+      const compilerFactory = context.compilerFactory;
+      const rawChecker = type.compilerType.checker;
+      let symbols = [];
+      if (intersectionTypes) {
+        // https://github.com/microsoft/TypeScript/issues/38184
+        symbols = rawChecker.getAllPossiblePropertiesOfTypes(intersectionTypes.map(item => item.compilerType))
+        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
+        .map(symbol => compilerFactory.getSymbol(symbol));
+      } else {
+        // symbols = type.getApparentProperties()
+        // https://github.com/microsoft/TypeScript/issues/38184
+        symbols = rawChecker.getAllPossiblePropertiesOfTypes([type.compilerType])
+        // https://github.com/dsherret/ts-morph/blob/a7072fcf6f9babb784b40f0326c80dea4563a4aa/packages/ts-morph/src/compiler/types/Type.ts#L296
+        .map(symbol => compilerFactory.getSymbol(symbol));
+      }
+      return symbols.map(symbol => {
+        return this.typeToApiData(!symbol.compilerSymbol.declarations ?
+        // 对于复杂对象，没有定义的，通过 type 直接获取（在前面通过 getText 预处理得到）
+        symbol.compilerSymbol.type ? compilerFactory.getType(symbol.compilerSymbol.type) :
+        // fix: symbol.compilerSymbol.type 为 undefined
+        // https://github.com/styleguidist/react-docgen-typescript/blob/master/src/parser.ts#L696
+        compilerFactory.getType(rawChecker.getTypeOfSymbolAtLocation(
+        // @ts-ignore
+        symbol.compilerSymbol,
+        // @ts-ignore
+        parentSymbol.compilerSymbol.declarations[0])) : this.getTypeBySymbol(symbol), symbol);
+      });
+    }) : [];
+    return {
+      name: apiName,
+      desc: apiDesc,
+      enum: apiEnum,
+      type: apiType,
+      required: apiRequired,
+      children: apiChildren
+    };
+  }
+  apiDataToJsonSchema(apiData, jsonSchema = {}) {
+    jsonSchema.description = apiData.desc;
+    if (apiData.type === 'object') {
+      jsonSchema.type = 'object';
+      jsonSchema.properties = apiData.children.reduce((res, item) => {
+        res[item.name] = this.apiDataToJsonSchema(item);
+        return res;
+      }, {});
+      jsonSchema.required = apiData.children.filter(item => item.required).map(item => item.name);
+    } else if (apiData.type === 'array') {
+      jsonSchema.type = 'array';
+      jsonSchema.items = apiData.children.map(item => this.apiDataToJsonSchema(item))[0];
+    } else {
+      jsonSchema.type = apiData.type;
+      if (apiData.enum.length) {
+        jsonSchema.enum = apiData.enum;
+      }
+    }
+    return jsonSchema;
+  }
+  genYApiData(handles) {
+    const data = {};
+    for (const handle of handles) {
+      data[handle.category] = data[handle.category] || [];
+      data[handle.category].push(handle.handlerMethod === 'GET' ? {
+        method: handle.method.toUpperCase(),
+        title: handle.name,
+        path: handle.path,
+        res_body_type: 'json',
+        req_body_is_json_schema: false,
+        res_body_is_json_schema: true,
+        req_params: [],
+        req_query: handle.requestData.children.map(item => ({
+          required: item.required ? 1 : 0,
+          name: item.name,
+          desc: item.desc,
+          type: 'string'
+        })),
+        req_headers: [],
+        req_body_form: [],
+        res_body: JSON.stringify(handle.responseDataJsonSchema)
+      } : handle.handlerMethod === 'FILE' ? {
+        method: handle.method.toUpperCase(),
+        title: handle.name,
+        path: handle.path,
+        req_body_type: 'form',
+        res_body_type: 'json',
+        req_body_is_json_schema: false,
+        res_body_is_json_schema: true,
+        req_params: [],
+        req_query: [],
+        req_headers: [],
+        req_body_form: handle.requestData.children.map(item => ({
+          required: item.required ? 1 : 0,
+          name: item.name,
+          desc: item.desc,
+          type: item.type === 'file' ? 'file' : 'text'
+        })),
+        res_body: JSON.stringify(handle.responseDataJsonSchema)
+      } : {
+        method: handle.method.toUpperCase(),
+        title: handle.name,
+        path: handle.path,
+        req_body_type: 'json',
+        res_body_type: 'json',
+        req_body_is_json_schema: true,
+        res_body_is_json_schema: true,
+        req_params: [],
+        req_query: [],
+        req_headers: [],
+        req_body_form: [],
+        req_body_other: JSON.stringify(handle.requestDataJsonSchema),
+        res_body: JSON.stringify(handle.responseDataJsonSchema)
+      });
+    }
+    return Object.keys(data).map(cat => ({
+      name: cat,
+      desc: cat,
+      list: data[cat]
+    }));
+  }
+  async generate() {
+    this.debug('启动项目...');
+    this.project = new ts.Project({
+      tsConfigFilePath: path.join(this.cwd, 'tsconfig.json')
+    });
+    this.debug('加载文件...');
+    const sourceFile = this.project.createSourceFile(path.join(this.cwd, 'src/generated/handlers.ts'), await fs.readFile(path.join(this.cwd, 'node_modules/.x/handlers.ts'), 'utf-8'));
+    this.debug('导出处理器...');
+    const handlerGroup = sourceFile.getExportSymbols();
+    const handles = [];
+    this.debug('生成API文档...');
+    for (const handlerList of handlerGroup) {
+      const handlerListSourceFile = this.getTypeBySymbol(handlerList).getProperties()[0].getDeclarations()[0].getSourceFile();
+      const basePath = `/${handlerListSourceFile.getFilePath().replace('.ts', '').split('/src/handlers/')[1].replace(/(^|\/)index$/, '/').split('/').map(v => snakeCase(v)).join('/')}/`.replace(/\/{2,}/g, '/');
+      for (const handler of handlerListSourceFile.getVariableStatements().filter(item => item.isExported())) {
+        // 重要：这一步必须，先调一遍 getText 获取看到的对象，后续对于复杂定义才不会报错
+        handler.getDeclarations().forEach(exp => {
+          exp.getType().getText();
+        });
+        const handlerExp = handler.getDeclarations()[0];
+        const handlerPath = `${basePath}${handlerExp.getName()}`;
+        this.debug('生成接口: %s ...', handlerPath);
+        const [requestType, responseType, methodType] = handlerExp.getType().getTypeArguments();
+        const handlerComment = this.getComment(handlerExp.getParent().getParent());
+        if (handlerComment.tags.has('private')) {
+          this.debug('跳过生成接口: %s', `${handlerPath}`);
+          continue;
+        }
+        const handlerCategory = pascalCase(basePath) || 'Index';
+        const handlerName = handlerComment.description || handlerPath;
+        const handlerMethod = methodType.getLiteralValueOrThrow();
+        const serverMethod = HandlerMethodToHttpMethod[handlerMethod];
+        const requestData = this.typeToApiData(requestType);
+        const responseData = this.typeToApiData(responseType);
+        const requestDataJsonSchema = this.apiDataToJsonSchema(requestData);
+        const responseDataJsonSchema = this.apiDataToJsonSchema(responseData);
+        handles.push({
+          category: handlerCategory,
+          name: handlerName,
+          path: handlerPath,
+          handlerMethod: handlerMethod,
+          method: serverMethod,
+          requestData: requestData,
+          responseData: responseData,
+          requestDataJsonSchema: requestDataJsonSchema,
+          responseDataJsonSchema: responseDataJsonSchema
+        });
+      }
+    }
+    this.debug('写入文件...');
+    await Promise.all([fs.outputJSON(path.join(this.cwd, 'temp/api1.json'), handles, {
+      spaces: 2
+    }), fs.outputJSON(path.join(this.cwd, 'temp/yapi1.json'), this.genYApiData(handles), {
+      spaces: 2
+    })]);
+  }
+}
+
+// new ApiGenerator().generate()

package/lib/cli/cli.js

@@ -5,6 +5,7 @@ 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";
@@ -95,7 +96,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   default: 'production'
 }), async argv => {
   process.env.NODE_ENV = 'production';
-  const externals = castArray(argv.external || []).map(item => item.split(',')).flat().filter(Boolean);
+  const externals = castArray(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
   const envMap = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
     file: ['.env', `.env.${argv.env}`]
@@ -119,7 +120,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   });
   console.log('构建成功');
 }).command('api', '生成 API', async () => {
-  await new ApiGenerator().generate();
+  await new ApiGenerator().start();
+}).command('api1', '(old) 生成 API', async () => {
+  await new ApiGenerator1().generate();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

package/lib/core/types.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="got/dist/source/core/utils/timed-out" />
 import type { MultipartFile } from '@fastify/multipart';
 import type { SocketStream } from '@fastify/websocket';
 import type { Queue } from 'bull';

package/lib/services/jwt.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="got/dist/source/core/utils/timed-out" />
 import jwt from 'jsonwebtoken';
 import { BaseService } from './base';
 import { LRUCache } from 'lru-cache';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.30.3",
+  "version": "2.31.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -19,7 +19,9 @@
     "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
     "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
     "test_api_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
-    "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api"
+    "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api",
+    "test_api1_bot": "cd /Users/admin/Documents/jfWorks/qiqi-bot && DEBUG=api1 tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api1",
+    "test_api1_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api1 tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api1"
   },
   "dependencies": {
     "@fastify/cors": "^8.3.0",
@@ -41,8 +43,8 @@
     "cron": "^3.1.6",
     "cuid": "^2.1.8",
     "debug": "^4.3.4",
-    "esbuild": "^0.18.11",
-    "esbuild-register": "^3.4.2",
+    "esbuild": "^0.19.10",
+    "esbuild-register": "^3.5.0",
     "execa": "^5.1.1",
     "exit-hook": "^2.2.1",
     "fast-xml-parser": "^4.2.5",
@@ -65,7 +67,7 @@
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",
     "tencentcloud-sdk-nodejs-sms": "^4.0.681",
-    "ts-morph": "^12.2.0",
+    "ts-morph": "^21.0.1",
     "tsx": "^4.6.2",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",