midway-fatcms 0.0.1-beta.24 → 0.0.1-beta.25

package/src/service/anyapi/AnyApiSandboxService.ts

@@ -1,121 +1,121 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import * as vm from 'node:vm';
-import { LRUCache } from 'lru-cache';
-import { BaseService } from '../base/BaseService';
-import { CurdMixService } from '../curd/CurdMixService';
-import { ISysAnyApiEntity } from '../../models/SystemEntities';
-import axios from 'axios';
-import * as _ from 'lodash';
-import * as moment from 'moment';
-import * as nodemailer from 'nodemailer';
-
-const scriptCacheOptions = {
-  max: 500,
-  ttl: 1000 * 60 * 5,
-  allowStale: false,
-  updateAgeOnGet: true,
-  updateAgeOnHas: true,
-};
-
-const scriptCache = new LRUCache<string, vm.Script>(scriptCacheOptions);
-
-function getCompiledScript(anyApi: ISysAnyApiEntity, code: string): vm.Script {
-  const { id, func_code_md5 } = anyApi;
-  const cacheKey = id + '_' + func_code_md5;
-  const oldScript = scriptCache.get(cacheKey);
-  if (oldScript) {
-    return oldScript;
-  }
-  const script = new vm.Script(code);
-  scriptCache.set(cacheKey, script);
-  return script;
-}
-
-export interface IRunInSandboxParams {
-  body: any;
-  query: any;
-  headers: any;
-  params?: any;
-}
-
-@Provide()
-export class AnyApiSandboxService extends BaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  private curdMixService: CurdMixService;
-
-  public async runInSandbox(anyApi: ISysAnyApiEntity, allParams: IRunInSandboxParams) {
-    const { func_code, method } = anyApi;
-
-    return new Promise((resolve, reject) => {
-      const logger = this.getPrefixContextLogger(`[AnyApiSandboxService][method=${method}]`);
-      // 创建一个沙盒上下文
-      const proc = process;
-      const newContext = {
-        sandbox: {
-          allParams,
-          logger,
-          moment,
-          axios,
-          nodemailer,
-          _,
-          userSession: this.ctx.userSession,
-          ctx: this.ctx,
-          curdMixService: this.curdMixService,
-          redisService: this.redisService,
-          publicOSSService: this.getPublicOSSService(),
-          privateOSSService: this.getPrivateOSSService(),
-          returnSuccess: resolve,
-          returnError: reject,
-          processInfo: {
-            version: proc.version,
-            versions: proc.versions,
-            env: process.env,
-            argv: process.argv,
-            cwd: process.cwd(),
-          },
-        },
-        console: logger,
-        JSON: JSON,
-      };
-
-      const nextLine100 = new Array(10).fill('\n').join('');
-      const bindCode = this.toBindCodeString('httpController', newContext, 'sandbox');
-      const code = `
-      (async () => {
-        ${nextLine100}${func_code}; // 必须有一个 class HttpController { async handleRequest(params){} }
-        ${nextLine100}
-        try {
-          const httpController = new HttpController();
-          ${bindCode}
-          const res = await httpController.handleRequest(sandbox.allParams.params);
-          sandbox.returnSuccess(res);
-        } catch (e) {
-          sandbox.returnError(e)
-        }
-      })(); `;
-
-      try {
-        const script = getCompiledScript(anyApi, code);
-        script.runInNewContext(newContext, {
-          filename: 'method',
-          timeout: anyApi.timeout_ms || 1000 * 60 * 5,
-        });
-      } catch (e) {
-        reject(e);
-      }
-    });
-  }
-
-  private toBindCodeString(toName: string, newContext: any, fromName: any): string {
-    const keys = Object.keys(newContext[fromName]);
-    return keys
-      .map(key => {
-        return `${toName}.${key} = ${fromName}.${key};\n`;
-      })
-      .join('');
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import * as vm from 'node:vm';
+import { LRUCache } from 'lru-cache';
+import { BaseService } from '../base/BaseService';
+import { CurdMixService } from '../curd/CurdMixService';
+import { ISysAnyApiEntity } from '../../models/SystemEntities';
+import axios from 'axios';
+import * as _ from 'lodash';
+import * as moment from 'moment';
+import * as nodemailer from 'nodemailer';
+
+const scriptCacheOptions = {
+  max: 500,
+  ttl: 1000 * 60 * 5,
+  allowStale: false,
+  updateAgeOnGet: true,
+  updateAgeOnHas: true,
+};
+
+const scriptCache = new LRUCache<string, vm.Script>(scriptCacheOptions);
+
+function getCompiledScript(anyApi: ISysAnyApiEntity, code: string): vm.Script {
+  const { id, func_code_md5 } = anyApi;
+  const cacheKey = id + '_' + func_code_md5;
+  const oldScript = scriptCache.get(cacheKey);
+  if (oldScript) {
+    return oldScript;
+  }
+  const script = new vm.Script(code);
+  scriptCache.set(cacheKey, script);
+  return script;
+}
+
+export interface IRunInSandboxParams {
+  body: any;
+  query: any;
+  headers: any;
+  params?: any;
+}
+
+@Provide()
+export class AnyApiSandboxService extends BaseService {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  public async runInSandbox(anyApi: ISysAnyApiEntity, allParams: IRunInSandboxParams) {
+    const { func_code, method } = anyApi;
+
+    return new Promise((resolve, reject) => {
+      const logger = this.getPrefixContextLogger(`[AnyApiSandboxService][method=${method}]`);
+      // 创建一个沙盒上下文
+      const proc = process;
+      const newContext = {
+        sandbox: {
+          allParams,
+          logger,
+          moment,
+          axios,
+          nodemailer,
+          _,
+          userSession: this.ctx.userSession,
+          ctx: this.ctx,
+          curdMixService: this.curdMixService,
+          redisService: this.redisService,
+          publicOSSService: this.getPublicOSSService(),
+          privateOSSService: this.getPrivateOSSService(),
+          returnSuccess: resolve,
+          returnError: reject,
+          processInfo: {
+            version: proc.version,
+            versions: proc.versions,
+            env: process.env,
+            argv: process.argv,
+            cwd: process.cwd(),
+          },
+        },
+        console: logger,
+        JSON: JSON,
+      };
+
+      const nextLine100 = new Array(10).fill('\n').join('');
+      const bindCode = this.toBindCodeString('httpController', newContext, 'sandbox');
+      const code = `
+      (async () => {
+        ${nextLine100}${func_code}; // 必须有一个 class HttpController { async handleRequest(params){} }
+        ${nextLine100}
+        try {
+          const httpController = new HttpController();
+          ${bindCode}
+          const res = await httpController.handleRequest(sandbox.allParams.params);
+          sandbox.returnSuccess(res);
+        } catch (e) {
+          sandbox.returnError(e)
+        }
+      })(); `;
+
+      try {
+        const script = getCompiledScript(anyApi, code);
+        script.runInNewContext(newContext, {
+          filename: 'method',
+          timeout: anyApi.timeout_ms || 1000 * 60 * 5,
+        });
+      } catch (e) {
+        reject(e);
+      }
+    });
+  }
+
+  private toBindCodeString(toName: string, newContext: any, fromName: any): string {
+    const keys = Object.keys(newContext[fromName]);
+    return keys
+      .map(key => {
+        return `${toName}.${key} = ${fromName}.${key};\n`;
+      })
+      .join('');
+  }
+}

package/src/service/anyapi/AnyApiService.ts

@@ -1,187 +1,186 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
-import { SystemTables} from '@/models/SystemTables';
-import { LRUCache } from 'lru-cache';
-import { BizException } from '@/models/devops';
-import { CurdMixService } from '../curd/CurdMixService';
-import { ISysAnyApiEntity } from '@/models/SystemEntities';
-import { AnyApiSandboxService, IRunInSandboxParams } from './AnyApiSandboxService';
-import { parseJsonObject } from '@/libs/utils/functions';
-import * as _ from 'lodash';
-import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
-import { WorkbenchService } from '../WorkbenchService';
-import { validateByCfgString } from '@/libs/crud-pro/utils/ValidateUtils';
-import { API_BASE_TYPE, ApiBaseService } from '../base/ApiBaseService';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-
-const lruCache = new LRUCache<string, any>({
-  max: 500,
-  ttl: 1000 * 60,
-  ttlAutopurge: true,
-});
-
-@Provide()
-export class AnyApiService extends ApiBaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  private curdMixService: CurdMixService;
-
-  @Inject()
-  private anyApiSandboxService: AnyApiSandboxService;
-
-  @Inject()
-  protected workbenchService: WorkbenchService;
-
-  async executeAnyApiMethod(methodCode: string, headers: any, body: any, query: any) {
-    const anyApi = await this.getAnyApiMethod(methodCode);
-    if (!anyApi || anyApi.status !== 1) {
-      throw new BizException('接口不存在或已下线：' + methodCode);
-    }
-
-    const isSupport = await this.workbenchService.isSupportCurrentWorkbench(anyApi.workbench_code_array);
-    if (!isSupport) {
-      throw new BizException('此接口不支持在当前站点打开：' + methodCode);
-    }
-
-    await super.beforeCheckApiAccessibility(API_BASE_TYPE.PROXY_API, anyApi);
-
-    if (!anyApi.func_code) {
-      throw new BizException('没有配置代码：' + methodCode);
-    }
-
-    if (!this.checkFuncCode(anyApi.func_code)) {
-      throw new BizException('接口代码校验失败：不满足形式： class HttpController { async handleRequest(params){} }; ');
-    }
-
-    const allParams: IRunInSandboxParams = { headers, body, query };
-    allParams.params = this.toAnyApiParams(anyApi, allParams); // 组合参数
-
-    // 执行代码
-    const funcRes = await this.executeFunctionCode(anyApi, allParams);
-    return funcRes;
-  }
-
-  private async getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
-
-    // 开发环境，不使用缓存
-    if (this.isEnableDebug()) {
-      return this._getAnyApiMethod(methodCode);
-    }
-
-    // 线上环境可以使用缓存
-    let anyApi = lruCache.get(methodCode);
-    if (!anyApi) {
-      anyApi = await this._getAnyApiMethod(methodCode);
-      lruCache.set(methodCode, anyApi);
-    }
-    return anyApi;
-  }
-
-  private async _getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const res = await this.curdMixService.executeCrudByCfg(
-      { condition: { method: methodCode } },
-      {
-        sqlTable: SystemTables.sys_anyapi,
-        method: `get_sys_anyapi_${methodCode}`,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-        updateCfg: {},
-      }
-    );
-    const obj: ISysAnyApiEntity = res.getOneObj();
-    if (!obj) {
-      return null;
-    }
-    obj.parsedOthers = parseJsonObject(obj.others);
-    return obj;
-  }
-
-  /**
-   * 构造参数
-   * @param anyApi
-   * @param allParams
-   * @private
-   */
-  private toAnyApiParams(anyApi: ISysAnyApiEntity, allParams: IRunInSandboxParams): any {
-    if (!anyApi.req_params) {
-      return {};
-    }
-
-    const configs = anyApi.parsedOthers?.req_params || [];
-    const params = {};
-    for (let i = 0; i < configs.length; i++) {
-      const { name, fromType, fromKey, validate_required, validate_cfg_list, valueType, defaultValue } = configs[i];
-      const value = _.get(allParams, [fromType, fromKey], defaultValue);
-      if (validate_required && MixinUtils.isEmpty(value)) {
-        throw new BizException(`参数校验失败：${name} 不能为空`);
-      }
-
-      // 参数校验
-      if (Array.isArray(validate_cfg_list)) {
-        for (let j = 0; j < validate_cfg_list.length; j++) {
-          const validateCfg = validate_cfg_list[j];
-          validateByCfgString(validateCfg, value, name);
-        }
-      }
-
-      // 格式转换
-      params[name] = MixinUtils.parseValueByType(value, valueType);
-    }
-    return params;
-  }
-
-  /**
-   * 运行代码
-   * @param anyApiEntity
-   * @param allParams
-   * @private
-   */
-  private async executeFunctionCode(anyApiEntity: ISysAnyApiEntity, allParams: IRunInSandboxParams): Promise<any> {
-    return this.anyApiSandboxService.runInSandbox(anyApiEntity, allParams);
-  }
-
-  private checkFuncCode(func_code: string): boolean {
-    if (!func_code) {
-      return false;
-    }
-
-    const lineHasKey = (lineTrim: string, target: string): boolean => {
-      const words = lineTrim.split(/[\s{}();]/);
-      for (let i = 0; i < words.length; i++) {
-        const word = words[i];
-        if (word && word === target) {
-          return true;
-        }
-      }
-      return false;
-    };
-
-    let hasClass = false;
-    let hasMethod = false;
-    const lines = func_code.split('\n');
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (line) {
-        const lineTrim = line.trim();
-        if (lineTrim) {
-          if (lineHasKey(lineTrim, 'class') && lineHasKey(lineTrim, 'HttpController')) {
-            hasClass = true;
-          }
-          if (lineHasKey(lineTrim, 'async') && lineHasKey(lineTrim, 'handleRequest')) {
-            hasMethod = true;
-          }
-          if (lineTrim.startsWith('handleRequest')) {
-            hasMethod = true;
-          }
-        }
-      }
-    }
-    return hasMethod && hasClass;
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { SystemTables } from '@/models/SystemTables';
+import { LRUCache } from 'lru-cache';
+import { BizException } from '@/models/devops';
+import { CurdMixService } from '../curd/CurdMixService';
+import { ISysAnyApiEntity } from '@/models/SystemEntities';
+import { AnyApiSandboxService, IRunInSandboxParams } from './AnyApiSandboxService';
+import { parseJsonObject } from '@/libs/utils/functions';
+import * as _ from 'lodash';
+import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
+import { WorkbenchService } from '../WorkbenchService';
+import { validateByCfgString } from '@/libs/crud-pro/utils/ValidateUtils';
+import { API_BASE_TYPE, ApiBaseService } from '../base/ApiBaseService';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+
+const lruCache = new LRUCache<string, any>({
+  max: 500,
+  ttl: 1000 * 60,
+  ttlAutopurge: true,
+});
+
+@Provide()
+export class AnyApiService extends ApiBaseService {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  @Inject()
+  private anyApiSandboxService: AnyApiSandboxService;
+
+  @Inject()
+  protected workbenchService: WorkbenchService;
+
+  async executeAnyApiMethod(methodCode: string, headers: any, body: any, query: any) {
+    const anyApi = await this.getAnyApiMethod(methodCode);
+    if (!anyApi || anyApi.status !== 1) {
+      throw new BizException('接口不存在或已下线：' + methodCode);
+    }
+
+    const isSupport = await this.workbenchService.isSupportCurrentWorkbench(anyApi.workbench_code_array);
+    if (!isSupport) {
+      throw new BizException('此接口不支持在当前站点打开：' + methodCode);
+    }
+
+    await super.beforeCheckApiAccessibility(API_BASE_TYPE.PROXY_API, anyApi);
+
+    if (!anyApi.func_code) {
+      throw new BizException('没有配置代码：' + methodCode);
+    }
+
+    if (!this.checkFuncCode(anyApi.func_code)) {
+      throw new BizException('接口代码校验失败：不满足形式： class HttpController { async handleRequest(params){} }; ');
+    }
+
+    const allParams: IRunInSandboxParams = { headers, body, query };
+    allParams.params = this.toAnyApiParams(anyApi, allParams); // 组合参数
+
+    // 执行代码
+    const funcRes = await this.executeFunctionCode(anyApi, allParams);
+    return funcRes;
+  }
+
+  private async getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
+    // 开发环境，不使用缓存
+    if (this.isEnableDebug()) {
+      return this._getAnyApiMethod(methodCode);
+    }
+
+    // 线上环境可以使用缓存
+    let anyApi = lruCache.get(methodCode);
+    if (!anyApi) {
+      anyApi = await this._getAnyApiMethod(methodCode);
+      lruCache.set(methodCode, anyApi);
+    }
+    return anyApi;
+  }
+
+  private async _getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const res = await this.curdMixService.executeCrudByCfg(
+      { condition: { method: methodCode } },
+      {
+        sqlTable: SystemTables.sys_anyapi,
+        method: `get_sys_anyapi_${methodCode}`,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+        updateCfg: {},
+      }
+    );
+    const obj: ISysAnyApiEntity = res.getOneObj();
+    if (!obj) {
+      return null;
+    }
+    obj.parsedOthers = parseJsonObject(obj.others);
+    return obj;
+  }
+
+  /**
+   * 构造参数
+   * @param anyApi
+   * @param allParams
+   * @private
+   */
+  private toAnyApiParams(anyApi: ISysAnyApiEntity, allParams: IRunInSandboxParams): any {
+    if (!anyApi.req_params) {
+      return {};
+    }
+
+    const configs = anyApi.parsedOthers?.req_params || [];
+    const params = {};
+    for (let i = 0; i < configs.length; i++) {
+      const { name, fromType, fromKey, validate_required, validate_cfg_list, valueType, defaultValue } = configs[i];
+      const value = _.get(allParams, [fromType, fromKey], defaultValue);
+      if (validate_required && MixinUtils.isEmpty(value)) {
+        throw new BizException(`参数校验失败：${name} 不能为空`);
+      }
+
+      // 参数校验
+      if (Array.isArray(validate_cfg_list)) {
+        for (let j = 0; j < validate_cfg_list.length; j++) {
+          const validateCfg = validate_cfg_list[j];
+          validateByCfgString(validateCfg, value, name);
+        }
+      }
+
+      // 格式转换
+      params[name] = MixinUtils.parseValueByType(value, valueType);
+    }
+    return params;
+  }
+
+  /**
+   * 运行代码
+   * @param anyApiEntity
+   * @param allParams
+   * @private
+   */
+  private async executeFunctionCode(anyApiEntity: ISysAnyApiEntity, allParams: IRunInSandboxParams): Promise<any> {
+    return this.anyApiSandboxService.runInSandbox(anyApiEntity, allParams);
+  }
+
+  private checkFuncCode(func_code: string): boolean {
+    if (!func_code) {
+      return false;
+    }
+
+    const lineHasKey = (lineTrim: string, target: string): boolean => {
+      const words = lineTrim.split(/[\s{}();]/);
+      for (let i = 0; i < words.length; i++) {
+        const word = words[i];
+        if (word && word === target) {
+          return true;
+        }
+      }
+      return false;
+    };
+
+    let hasClass = false;
+    let hasMethod = false;
+    const lines = func_code.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (line) {
+        const lineTrim = line.trim();
+        if (lineTrim) {
+          if (lineHasKey(lineTrim, 'class') && lineHasKey(lineTrim, 'HttpController')) {
+            hasClass = true;
+          }
+          if (lineHasKey(lineTrim, 'async') && lineHasKey(lineTrim, 'handleRequest')) {
+            hasMethod = true;
+          }
+          if (lineTrim.startsWith('handleRequest')) {
+            hasMethod = true;
+          }
+        }
+      }
+    }
+    return hasMethod && hasClass;
+  }
+}

package/src/service/asyncTask/AsyncTaskRunnerService.ts

@@ -59,7 +59,7 @@ class AsyncTaskRunner {
           completed_at: getCurrentFullMoment(),
         });
       } catch (error) {
-        ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('executeTaskList error', error);
+        ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('[AsyncTaskRunner] executeTaskList error', error);
       }
     }
 
@@ -205,7 +205,7 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
 
     // 开始执行。
     ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
-      console.log('ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
+      console.log('[AsyncTaskRunnerService] ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
     });
   }
 
@@ -231,7 +231,7 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
     try {
       await this.fetchPendingTasks();
     } catch (e) {
-      console.error('fetchPendingTasks error', errorToString(e));
+      console.error('[AsyncTaskRunnerService] fetchPendingTasks error', errorToString(e));
     }
 
     await this.redisService.del(ASYNC_TASK_LOCK);