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

package/dist/models/RedisKeys.d.ts

@@ -7,5 +7,6 @@ declare const RedisKeys: {
     VISIT_STAT_DATE_PREFIX: string;
     LINK_TO_CUSTOM_PREFIX: string;
     CURD_MIX_BY_DICT_PREFIX: string;
+    QUERY_ENUM_INFO_PREFIX: string;
 };
 export { RedisKeys };

package/dist/models/RedisKeys.js

@@ -9,6 +9,7 @@ const RedisKeys = {
     VISIT_STAT_LOCK_PREFIX: 'FatVsLock_',
     VISIT_STAT_DATE_PREFIX: 'FatVsDate_',
     LINK_TO_CUSTOM_PREFIX: 'FatLinkToCustom@@',
-    CURD_MIX_BY_DICT_PREFIX: 'FatCurdMixByDictService@@',
+    CURD_MIX_BY_DICT_PREFIX: 'FatCurdMixByDict@@',
+    QUERY_ENUM_INFO_PREFIX: 'FatQueryEnum@@',
 };
 exports.RedisKeys = RedisKeys;

package/dist/service/EnumInfoService.js

@@ -19,6 +19,7 @@ const parseConfig_1 = require("../libs/utils/parseConfig");
 const RedisCacheService_1 = require("./base/RedisCacheService");
 const CurdMixByLinkToCustomService_1 = require("./curd/CurdMixByLinkToCustomService");
 const global_config_1 = require("../libs/global-config/global-config");
+const RedisKeys_1 = require("../models/RedisKeys");
 function filterEmpty(e) {
     return e.label && typeof e.value !== 'undefined';
 }
@@ -28,7 +29,7 @@ let EnumInfoService = class EnumInfoService {
         const result = [];
         for (let i = 0; i < codeList.length; i++) {
             const { code, type } = codeList[i];
-            const cacheKey = `enums@@${type}@@${code}`;
+            const cacheKey = `${RedisKeys_1.RedisKeys.QUERY_ENUM_INFO_PREFIX}${type}@@${code}`;
             const emums = refreshCache ? null : await this.redisCacheService.getJsonObject(cacheKey);
             if (!Array.isArray(emums) || emums.length === 0) {
                 let values;

package/dist/service/anyapi/AnyApiSandboxService.js

@@ -74,18 +74,18 @@ let AnyApiSandboxService = class AnyApiSandboxService extends BaseService_1.Base
             };
             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)
-        }
+            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);

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -64,7 +64,7 @@ class AsyncTaskRunner {
                 });
             }
             catch (error) {
-                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('executeTaskList error', error);
+                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('[AsyncTaskRunner] executeTaskList error', error);
             }
         }
         this.isBusy = false;
@@ -178,7 +178,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
         });
         // 开始执行。
         exports.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));
         });
     }
     async runBySchedule() {
@@ -201,7 +201,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             await this.fetchPendingTasks();
         }
         catch (e) {
-            console.error('fetchPendingTasks error', (0, errorToString_1.errorToString)(e));
+            console.error('[AsyncTaskRunnerService] fetchPendingTasks error', (0, errorToString_1.errorToString)(e));
         }
         await this.redisService.del(ASYNC_TASK_LOCK);
         return Promise.resolve();

package/dist/service/asyncTask/handler/ExportExcelAsyncTaskHandler.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportExcelAsyncTaskHandler = void 0;
-const schedule_1 = require("../../../schedule");
 const AsyncTaskModel_1 = require("../../../models/AsyncTaskModel");
+const schedule_1 = require("../../../schedule");
+const AsyncTaskModel_2 = require("../../../models/AsyncTaskModel");
 const ExportExcelByStdCrudHandler_1 = require("./ExportExcelByStdCrudHandler");
 const ExportExcelByInnerHttpHandler_1 = require("./ExportExcelByInnerHttpHandler");
 const bizmodels_1 = require("../../../models/bizmodels");
@@ -13,6 +14,7 @@ const fs2 = require("node:fs/promises");
 const path = require("node:path");
 const functions_1 = require("../../../libs/utils/functions");
 const userSession_1 = require("../../../models/userSession");
+const errorToString_1 = require("../../../libs/utils/errorToString");
 const indexRef = { current: 0 };
 async function createFileFolder(distFileFolder) {
     try {
@@ -31,7 +33,7 @@ function getExcelAsyncTaskHandler(asyncTaskContext, ctx) {
     if (inputParams && inputParams.appType === bizmodels_1.StdCrudExportInputParamsAppType.INNER_HTTP) {
         return new ExportExcelByInnerHttpHandler_1.ExportExcelByInnerHttpHandler(asyncTaskContext, inputParams, ctx);
     }
-    throw new Error('[getExcelAsyncTaskHandler]appType不支持');
+    throw new Error('[getExcelAsyncTaskHandler]appType不支持；appType = ' + inputParams.appType);
 }
 /**
  * 多实例，每个任务一个实例。
@@ -53,7 +55,9 @@ class ExportExcelAsyncTask {
         return fatcmsExportExcelTmpFilePath;
     }
     async executeWithContext() {
-        this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext start');
+        const taskElement = this.asyncTaskContext.task;
+        const taskId = _.get(this.asyncTaskContext, 'task.id');
+        this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext start, taskId=' + taskId);
         const pageSize = await this.excelAsyncTaskHandler.getPageSize();
         const fileName = await this.getExcelFileName(); // 文件名
         const distFileFolder = this.getDistFileFolder();
@@ -62,7 +66,7 @@ class ExportExcelAsyncTask {
         const totalCount = await this.getTotalCount();
         await this.asyncTaskContext.updateTaskStatus({
             output_total_records: totalCount,
-            output_file_format: AsyncTaskModel_1.SysAsyncFileFormat.CSV,
+            output_file_format: AsyncTaskModel_2.SysAsyncFileFormat.CSV,
             output_file_path: diskFilePath,
         });
         this.headerColumns = await this.getExcelHeader();
@@ -74,28 +78,42 @@ class ExportExcelAsyncTask {
         csvStream.write('\ufeff'); // 写入BOM头，解决中文乱码问题
         csvStream.write(this.formatToCsvHeader(this.headerColumns));
         let processed_records = 0;
-        if (typeof totalCount === 'number' && totalCount > 0) {
-            const batchCount = Math.ceil(totalCount / pageSize);
-            for (let i = 0; i < batchCount; i++) {
-                const num = await this.writeExcelBatchData(csvStream, i + 1, pageSize);
-                processed_records = processed_records + num;
-                const progress = Math.round((processed_records / totalCount) * 100);
-                await this.asyncTaskContext.updateTaskStatus({
-                    processed_records,
-                    progress,
-                });
+        try {
+            if (typeof totalCount === 'number' && totalCount > 0) {
+                const batchCount = Math.ceil(totalCount / pageSize);
+                for (let i = 0; i < batchCount; i++) {
+                    const num = await this.writeExcelBatchData(csvStream, i + 1, pageSize);
+                    processed_records = processed_records + num;
+                    const progress = Math.round((processed_records / totalCount) * 100);
+                    await this.asyncTaskContext.updateTaskStatus({
+                        processed_records,
+                        progress,
+                    });
+                }
             }
+            taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED;
+        }
+        catch (error) {
+            taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.FAILED;
+            taskElement.error_message = (0, errorToString_1.errorToString)(error);
+            const progress = Math.round((processed_records / totalCount) * 100);
+            await this.asyncTaskContext.updateTaskStatus({
+                processed_records,
+                progress,
+                task_status: taskElement.task_status,
+                error_message: taskElement.error_message,
+            });
         }
         csvStream.end();
         ws.on('finish', async () => {
-            this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext finish');
+            this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext finish, taskId=' + taskId);
             const fsStat = await fs2.stat(diskFilePath);
             const output_file_size = fsStat.size;
             this.asyncTaskContext.updateTaskStatus({
                 output_file_size,
             });
         });
-        this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext end');
+        this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext end, taskId=' + taskId);
     }
     formatToCsvHeader(headerColumns) {
         return headerColumns.map(item => {
@@ -180,7 +198,8 @@ class ExportExcelAsyncTask {
  */
 class ExportExcelAsyncTaskHandler {
     async execute(asyncTaskContext) {
-        console.log('[ExportExcelAsyncTaskHandler] execute');
+        const taskId = _.get(asyncTaskContext, 'task.id');
+        console.log('[ExportExcelAsyncTaskHandler] execute, taskId=>' + taskId);
         const res = await schedule_1.ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx) => {
             var _a;
             const createdUserSession = (0, functions_1.parseJsonObject)((_a = asyncTaskContext === null || asyncTaskContext === void 0 ? void 0 : asyncTaskContext.task) === null || _a === void 0 ? void 0 : _a.created_user_session);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.24",
+  "version": "0.0.1-beta.26",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/models/AsyncTaskModel.ts

@@ -1,82 +1,82 @@
-export interface SysAsyncTaskEntity {
-  id: number;
-  task_uuid: string;
-  task_name: string;
-  task_description: string | null;
-  task_type: string;
-  task_status: SysAsyncTaskStatus;
-  input_params: any;
-  output_result: any | null;
-
-  input_file_path: string | null;
-  input_file_format: SysAsyncFileFormat | null;
-  input_file_size: number | null;
-
-  output_file_path: string | null;
-  output_file_format: SysAsyncFileFormat | null;
-  output_file_size: number | null;
-
-  input_total_records: number | null;
-  output_total_records: number | null;
-  processed_records: number;
-  progress: number;
-  error_message: string | null;
-  error_records: any | null;
-  created_by: string | null;
-  priority: number;
-  retry_count: number;
-  max_retries: number;
-
-  parent_task_id: number | null;
-  created_at: Date | string | null;
-  started_at: Date | string | null;
-  updated_at: Date | string | null;
-  expired_at: Date | string | null;
-  completed_at: Date | string | null;
-  created_user_session: string;
-}
-
-export type SysAsyncTaskPartial = Partial<SysAsyncTaskEntity>;
-
-export enum SysAsyncTaskStatus {
-  PENDING = 'PENDING', // 等待中，还未进入排队
-  RUNNING = 'RUNNING', // 运行中
-  SUCCEEDED = 'SUCCEEDED', // 终止状态：全部成功
-  PART_SUCCEEDED = 'PART_SUCCEEDED',// 终止状态：部分成功
-  FAILED = 'FAILED', // 终止状态：失败
-  CANCELLED = 'CANCELLED', // 取消
-  PAUSED = 'PAUSED', // 暂停
-}
-
-/**
- * 导出的文件名后缀
- */
-export enum SysAsyncFileFormat {
-  XLSX = 'xlsx',
-  CSV = 'csv',
-  JSON = 'json',
-  PDF = 'pdf',
-  TXT = 'txt',
-  XML = 'xml',
-  ZIP = 'zip',
-  HTML = 'html',
-  PNG = 'png',
-  JPG = 'jpg',
-}
-
-export interface ISysAsyncTaskHandler {
-  execute(asyncTaskContext: SysAsyncTaskContext): Promise<void>;
-}
-
-export interface SysAsyncTaskContext {
-  task: SysAsyncTaskEntity;
-  updateTaskStatus: (sysAsyncTaskPartial: SysAsyncTaskPartial) => any;
-}
-
-export interface SysAsyncTaskHandlerConfig {
-  taskType: string;
-  handler: ISysAsyncTaskHandler;
-  maxRetries?: number;
-  priority?: number;
-  expireSeconds?: number;
-}
+export interface SysAsyncTaskEntity {
+  id: number;
+  task_uuid: string;
+  task_name: string;
+  task_description: string | null;
+  task_type: string;
+  task_status: SysAsyncTaskStatus;
+  input_params: any;
+  output_result: any | null;
+
+  input_file_path: string | null;
+  input_file_format: SysAsyncFileFormat | null;
+  input_file_size: number | null;
+
+  output_file_path: string | null;
+  output_file_format: SysAsyncFileFormat | null;
+  output_file_size: number | null;
+
+  input_total_records: number | null;
+  output_total_records: number | null;
+  processed_records: number;
+  progress: number;
+  error_message: string | null;
+  error_records: any | null;
+  created_by: string | null;
+  priority: number;
+  retry_count: number;
+  max_retries: number;
+
+  parent_task_id: number | null;
+  created_at: Date | string | null;
+  started_at: Date | string | null;
+  updated_at: Date | string | null;
+  expired_at: Date | string | null;
+  completed_at: Date | string | null;
+  created_user_session: string;
+}
+
+export type SysAsyncTaskPartial = Partial<SysAsyncTaskEntity>;
+
+export enum SysAsyncTaskStatus {
+  PENDING = 'PENDING', // 等待中，还未进入排队
+  RUNNING = 'RUNNING', // 运行中
+  SUCCEEDED = 'SUCCEEDED', // 终止状态：全部成功
+  PART_SUCCEEDED = 'PART_SUCCEEDED', // 终止状态：部分成功
+  FAILED = 'FAILED', // 终止状态：失败
+  CANCELLED = 'CANCELLED', // 取消
+  PAUSED = 'PAUSED', // 暂停
+}
+
+/**
+ * 导出的文件名后缀
+ */
+export enum SysAsyncFileFormat {
+  XLSX = 'xlsx',
+  CSV = 'csv',
+  JSON = 'json',
+  PDF = 'pdf',
+  TXT = 'txt',
+  XML = 'xml',
+  ZIP = 'zip',
+  HTML = 'html',
+  PNG = 'png',
+  JPG = 'jpg',
+}
+
+export interface ISysAsyncTaskHandler {
+  execute(asyncTaskContext: SysAsyncTaskContext): Promise<void>;
+}
+
+export interface SysAsyncTaskContext {
+  task: SysAsyncTaskEntity;
+  updateTaskStatus: (sysAsyncTaskPartial: SysAsyncTaskPartial) => any;
+}
+
+export interface SysAsyncTaskHandlerConfig {
+  taskType: string;
+  handler: ISysAsyncTaskHandler;
+  maxRetries?: number;
+  priority?: number;
+  expireSeconds?: number;
+}

package/src/models/RedisKeys.ts

@@ -6,7 +6,8 @@ const RedisKeys = {
   VISIT_STAT_LOCK_PREFIX: 'FatVsLock_',
   VISIT_STAT_DATE_PREFIX: 'FatVsDate_',
   LINK_TO_CUSTOM_PREFIX: 'FatLinkToCustom@@',
-  CURD_MIX_BY_DICT_PREFIX: 'FatCurdMixByDictService@@',
+  CURD_MIX_BY_DICT_PREFIX: 'FatCurdMixByDict@@',
+  QUERY_ENUM_INFO_PREFIX: 'FatQueryEnum@@',
 };
 
 export { RedisKeys };