@ruiapp/rapid-core 0.6.2 → 0.6.4

package/dist/index.js

@@ -4586,6 +4586,9 @@ class RapidServer {
     }
     async #handleEntityEvent(eventName, sender, payload, routerContext) {
         const { modelSingularCode, baseModelSingularCode } = payload;
+        if (!routerContext) {
+            routerContext = new RouteContext(this);
+        }
         const entityWatchHandlerContext = {
             server: this,
             payload,
@@ -8457,6 +8460,7 @@ class CronJobPlugin {
     async onApplicationReady(server, applicationConfig) {
         for (const job of this.#jobs) {
             const jobInstance = cron__namespace.CronJob.from({
+                ...(job.jobOptions || {}),
                 cronTime: job.cronTime,
                 onTick: async () => {
                     server.getLogger().info(`Executing cron job '${job.code}'...`);

package/dist/plugins/cronJob/CronJobPluginTypes.d.ts

@@ -12,6 +12,10 @@ export interface CronJobConfiguration {
      * crontab 表达式
      */
     cronTime: string;
+    /**
+     * 任务设置
+     */
+    jobOptions?: CronJobOptions;
     /**
      * 任务处理程序编号。当指定处理程序编号时，忽略 handler 配置。
      */
@@ -28,6 +32,16 @@ export interface CronJobConfiguration {
      */
     handleOptions?: any;
 }
+export interface CronJobOptions {
+    /**
+     * Instantly triggers the onTick function post initialization. Default is false.
+     */
+    runOnInit?: boolean;
+    /**
+     * If true, no additional instances of the onTick callback function will run until the current onTick callback has completed. Any new scheduled executions that occur while the current callback is running will be skipped entirely. Default is false.
+     */
+    waitForCompletion?: boolean;
+}
 export interface CronJobPluginInitOptions {
     jobs: CronJobConfiguration[];
 }

package/dist/types.d.ts

@@ -618,7 +618,7 @@ export type EntityWatchHandler<TEventName extends keyof RpdServerEventTypes> = (
 export type EntityWatchHandlerContext<TEventName extends keyof RpdServerEventTypes> = {
     server: IRpdServer;
     payload: RpdServerEventTypes[TEventName][1];
-    routerContext?: RouteContext;
+    routerContext: RouteContext;
 };
 export interface EntityWatchPluginInitOptions {
     watchers: EntityWatcherType[];

package/package.json

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

package/src/plugins/cronJob/CronJobPlugin.ts

@@ -71,6 +71,7 @@ class CronJobPlugin implements RapidPlugin {
   async onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
     for (const job of this.#jobs) {
       const jobInstance = cron.CronJob.from({
+        ...(job.jobOptions || {}),
         cronTime: job.cronTime,
         onTick: async () => {
           server.getLogger().info(`Executing cron job '${job.code}'...`);

package/src/plugins/cronJob/CronJobPluginTypes.ts

@@ -1,5 +1,4 @@
 import { ActionHandlerContext } from "~/core/actionHandler";
-import { RpdHttpMethod } from "~/types";
 
 export interface CronJobConfiguration {
   /**
@@ -17,6 +16,11 @@ export interface CronJobConfiguration {
    */
   cronTime: string;
 
+  /**
+   * 任务设置
+   */
+  jobOptions?: CronJobOptions;
+
   /**
    * 任务处理程序编号。当指定处理程序编号时，忽略 handler 配置。
    */
@@ -36,6 +40,18 @@ export interface CronJobConfiguration {
   handleOptions?: any;
 }
 
+export interface CronJobOptions {
+  /**
+   * Instantly triggers the onTick function post initialization. Default is false.
+   */
+  runOnInit?: boolean;
+
+  /**
+   * If true, no additional instances of the onTick callback function will run until the current onTick callback has completed. Any new scheduled executions that occur while the current callback is running will be skipped entirely. Default is false.
+   */
+  waitForCompletion?: boolean;
+}
+
 export interface CronJobPluginInitOptions {
   jobs: CronJobConfiguration[];
 }

package/src/server.ts

@@ -445,6 +445,9 @@ export class RapidServer implements IRpdServer {
 
   async #handleEntityEvent(eventName: keyof RpdServerEventTypes, sender: RapidPlugin, payload: RpdEntityCreateEventPayload, routerContext?: RouteContext) {
     const { modelSingularCode, baseModelSingularCode } = payload;
+    if (!routerContext) {
+      routerContext = new RouteContext(this);
+    }
     const entityWatchHandlerContext: EntityWatchHandlerContext<typeof eventName> = {
       server: this,
       payload,

package/src/types.ts

@@ -788,7 +788,7 @@ export type EntityWatchHandler<TEventName extends keyof RpdServerEventTypes> = (
 export type EntityWatchHandlerContext<TEventName extends keyof RpdServerEventTypes> = {
   server: IRpdServer;
   payload: RpdServerEventTypes[TEventName][1];
-  routerContext?: RouteContext;
+  routerContext: RouteContext;
 };
 
 export interface EntityWatchPluginInitOptions {