@ruiapp/rapid-core 0.8.11 → 0.8.12

package/dist/index.js

@@ -8676,29 +8676,22 @@ var pluginModels$1 = [CronJob];
 
 const code$1 = "runCronJob";
 async function handler$1(plugin, ctx, options) {
-    const { server, routerContext } = ctx;
-    const { response } = routerContext;
+    const { server, routerContext: routeContext } = ctx;
+    const { response } = routeContext;
     const input = ctx.input;
-    if (options.code) {
+    if (options?.code) {
         input.code = options.code;
     }
     if (!input.code) {
         throw new Error(`Cron job code is required.`);
     }
     const cronJobService = server.getService("cronJobService");
-    const job = cronJobService.getJobConfigurationByCode(input.code);
-    if (!job) {
+    const jobConfig = cronJobService.getJobConfigurationByCode(input.code);
+    if (!jobConfig) {
         throw new Error(`Cron job with code '${input.code}' was not found.`);
     }
-    let jobExecutionContext = {
-        logger: server.getLogger(),
-        routerContext,
-        next: null,
-        server,
-        applicationConfig: null,
-        input: input.input,
-    };
-    await cronJobService.executeJob(jobExecutionContext, job);
+    // running job in background.
+    cronJobService.executeJob(jobConfig, input.input);
     response.json({});
 }
 
@@ -8766,7 +8759,7 @@ class CronJobService {
             ...(job.jobOptions || {}),
             cronTime: job.cronTime,
             onTick: async () => {
-                await this.tryExecuteJob(job);
+                await this.executeJob(job);
             },
         });
     }
@@ -8839,7 +8832,12 @@ class CronJobService {
             });
         }
     }
-    async tryExecuteJob(job) {
+    /**
+     * 执行指定任务
+     * @param job
+     * @param input
+     */
+    async executeJob(job, input) {
         const server = this.#server;
         const logger = server.getLogger();
         const jobCode = job.code;
@@ -8850,13 +8848,20 @@ class CronJobService {
             next: null,
             server,
             applicationConfig: null,
-            input: null,
+            input,
         };
         let result;
         let lastErrorMessage;
         let lastErrorStack;
         try {
-            await this.executeJob(handlerContext, job);
+            validateLicense(server);
+            if (job.actionHandlerCode) {
+                const actionHandler = server.getActionHandlerByCode(job.code);
+                await actionHandler(handlerContext, job.handleOptions);
+            }
+            else {
+                await job.handler(handlerContext, job.handleOptions);
+            }
             result = "success";
             logger.info(`Completed cron job '${jobCode}'...`);
         }
@@ -8879,41 +8884,31 @@ class CronJobService {
                 }
             }
         }
-        const cronJobManager = server.getEntityManager("sys_cron_job");
-        const cronJobInDb = await cronJobManager.findEntity({
-            filters: [{ operator: "eq", field: "code", value: jobCode }],
-        });
-        if (cronJobInDb) {
-            let nextRunningTime;
-            const namedJobInstance = lodash.find(this.#namedJobInstances, { code: jobCode });
-            if (namedJobInstance && namedJobInstance.instance) {
-                nextRunningTime = formatDateTimeWithTimezone(namedJobInstance.instance.nextDate().toISO());
-            }
-            await cronJobManager.updateEntityById({
-                id: cronJobInDb.id,
-                entityToSave: {
-                    nextRunningTime,
-                    lastRunningResult: result,
-                    lastRunningTime: getNowStringWithTimezone(),
-                    lastErrorMessage,
-                    lastErrorStack,
-                },
+        try {
+            const cronJobManager = server.getEntityManager("sys_cron_job");
+            const cronJobInDb = await cronJobManager.findEntity({
+                filters: [{ operator: "eq", field: "code", value: jobCode }],
             });
+            if (cronJobInDb) {
+                let nextRunningTime;
+                const namedJobInstance = lodash.find(this.#namedJobInstances, { code: jobCode });
+                if (namedJobInstance && namedJobInstance.instance) {
+                    nextRunningTime = formatDateTimeWithTimezone(namedJobInstance.instance.nextDate().toISO());
+                }
+                await cronJobManager.updateEntityById({
+                    id: cronJobInDb.id,
+                    entityToSave: {
+                        nextRunningTime,
+                        lastRunningResult: result,
+                        lastRunningTime: getNowStringWithTimezone(),
+                        lastErrorMessage,
+                        lastErrorStack,
+                    },
+                });
+            }
         }
-    }
-    /**
-     * 执行指定任务
-     * @param job
-     */
-    async executeJob(handlerContext, job) {
-        const server = this.#server;
-        validateLicense(server);
-        if (job.actionHandlerCode) {
-            const actionHandler = server.getActionHandlerByCode(job.code);
-            await actionHandler(handlerContext, job.handleOptions);
-        }
-        else {
-            await job.handler(handlerContext, job.handleOptions);
+        catch (ex) {
+            logger.error("Failed to saving cron job running result. job code: %s, error: %s", jobCode, ex.message);
         }
     }
     async updateJobConfig(routeContext, options) {

package/dist/plugins/cronJob/services/CronJobService.d.ts

@@ -2,7 +2,6 @@ import { IRpdServer } from "../../../core/server";
 import { RouteContext } from "../../../core/routeContext";
 import { UpdateJobConfigOptions } from "../CronJobPluginTypes";
 import { CronJobConfiguration } from "../../../types/cron-job-types";
-import { ActionHandlerContext } from "../../../core/actionHandler";
 export default class CronJobService {
     #private;
     constructor(server: IRpdServer);
@@ -16,11 +15,11 @@ export default class CronJobService {
      * 重新加载定时任务
      */
     reloadJobs(): Promise<void>;
-    tryExecuteJob(job: CronJobConfiguration): Promise<void>;
     /**
      * 执行指定任务
      * @param job
+     * @param input
      */
-    executeJob(handlerContext: ActionHandlerContext, job: CronJobConfiguration): Promise<void>;
+    executeJob(job: CronJobConfiguration, input?: any): Promise<void>;
     updateJobConfig(routeContext: RouteContext, options: UpdateJobConfigOptions): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/plugins/cronJob/actionHandlers/runCronJob.ts

@@ -6,12 +6,12 @@ import CronJobService from "../services/CronJobService";
 export const code = "runCronJob";
 
 export async function handler(plugin: CronJobPlugin, ctx: ActionHandlerContext, options: RunCronJobActionHandlerOptions) {
-  const { server, routerContext } = ctx;
-  const { response } = routerContext;
+  const { server, routerContext: routeContext } = ctx;
+  const { response } = routeContext;
 
   const input: RunCronJobInput = ctx.input;
 
-  if (options.code) {
+  if (options?.code) {
     input.code = options.code;
   }
 
@@ -20,20 +20,13 @@ export async function handler(plugin: CronJobPlugin, ctx: ActionHandlerContext,
   }
 
   const cronJobService = server.getService<CronJobService>("cronJobService");
-  const job = cronJobService.getJobConfigurationByCode(input.code);
-  if (!job) {
+  const jobConfig = cronJobService.getJobConfigurationByCode(input.code);
+  if (!jobConfig) {
     throw new Error(`Cron job with code '${input.code}' was not found.`);
   }
 
-  let jobExecutionContext: ActionHandlerContext = {
-    logger: server.getLogger(),
-    routerContext,
-    next: null,
-    server,
-    applicationConfig: null,
-    input: input.input,
-  };
-  await cronJobService.executeJob(jobExecutionContext, job);
+  // running job in background.
+  cronJobService.executeJob(jobConfig, input.input);
 
   response.json({});
 }

package/src/plugins/cronJob/services/CronJobService.ts

@@ -30,7 +30,7 @@ export default class CronJobService {
       ...(job.jobOptions || {}),
       cronTime: job.cronTime,
       onTick: async () => {
-        await this.tryExecuteJob(job);
+        await this.executeJob(job);
       },
     });
   }
@@ -117,7 +117,12 @@ export default class CronJobService {
     }
   }
 
-  async tryExecuteJob(job: CronJobConfiguration) {
+  /**
+   * 执行指定任务
+   * @param job
+   * @param input
+   */
+  async executeJob(job: CronJobConfiguration, input?: any) {
     const server = this.#server;
     const logger = server.getLogger();
 
@@ -130,14 +135,21 @@ export default class CronJobService {
       next: null,
       server,
       applicationConfig: null,
-      input: null,
+      input,
     };
 
     let result: JobRunningResult;
     let lastErrorMessage: string | null;
     let lastErrorStack: string | null;
     try {
-      await this.executeJob(handlerContext, job);
+      validateLicense(server);
+
+      if (job.actionHandlerCode) {
+        const actionHandler = server.getActionHandlerByCode(job.code);
+        await actionHandler(handlerContext, job.handleOptions);
+      } else {
+        await job.handler(handlerContext, job.handleOptions);
+      }
       result = "success";
       logger.info(`Completed cron job '${jobCode}'...`);
     } catch (ex: any) {
@@ -159,44 +171,32 @@ export default class CronJobService {
       }
     }
 
-    const cronJobManager = server.getEntityManager<SysCronJob>("sys_cron_job");
-    const cronJobInDb = await cronJobManager.findEntity({
-      filters: [{ operator: "eq", field: "code", value: jobCode }],
-    });
-
-    if (cronJobInDb) {
-      let nextRunningTime: string | null;
-      const namedJobInstance = find(this.#namedJobInstances, { code: jobCode });
-      if (namedJobInstance && namedJobInstance.instance) {
-        nextRunningTime = formatDateTimeWithTimezone(namedJobInstance.instance.nextDate().toISO());
-      }
-
-      await cronJobManager.updateEntityById({
-        id: cronJobInDb.id,
-        entityToSave: {
-          nextRunningTime,
-          lastRunningResult: result,
-          lastRunningTime: getNowStringWithTimezone(),
-          lastErrorMessage,
-          lastErrorStack,
-        } as Partial<SysCronJob>,
+    try {
+      const cronJobManager = server.getEntityManager<SysCronJob>("sys_cron_job");
+      const cronJobInDb = await cronJobManager.findEntity({
+        filters: [{ operator: "eq", field: "code", value: jobCode }],
       });
-    }
-  }
 
-  /**
-   * 执行指定任务
-   * @param job
-   */
-  async executeJob(handlerContext: ActionHandlerContext, job: CronJobConfiguration) {
-    const server = this.#server;
-    validateLicense(server);
+      if (cronJobInDb) {
+        let nextRunningTime: string | null;
+        const namedJobInstance = find(this.#namedJobInstances, { code: jobCode });
+        if (namedJobInstance && namedJobInstance.instance) {
+          nextRunningTime = formatDateTimeWithTimezone(namedJobInstance.instance.nextDate().toISO());
+        }
 
-    if (job.actionHandlerCode) {
-      const actionHandler = server.getActionHandlerByCode(job.code);
-      await actionHandler(handlerContext, job.handleOptions);
-    } else {
-      await job.handler(handlerContext, job.handleOptions);
+        await cronJobManager.updateEntityById({
+          id: cronJobInDb.id,
+          entityToSave: {
+            nextRunningTime,
+            lastRunningResult: result,
+            lastRunningTime: getNowStringWithTimezone(),
+            lastErrorMessage,
+            lastErrorStack,
+          } as Partial<SysCronJob>,
+        });
+      }
+    } catch (ex: any) {
+      logger.error("Failed to saving cron job running result. job code: %s, error: %s", jobCode, ex.message);
     }
   }