@lenne.tech/nest-server 8.6.18 → 8.6.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.18",
+  "version": "8.6.19",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/config.env.ts

@@ -12,9 +12,11 @@ const config: { [env: string]: IServerOptions } = {
   local: {
     cronJobs: {
       sayHello: {
-        cronTime: CronExpression.EVERY_5_MINUTES,
-        timeZone: 'Europe/Berlin',
+        cronTime: CronExpression.EVERY_10_SECONDS,
         runOnInit: false,
+        runParallel: 1,
+        timeZone: 'Europe/Berlin',
+        throwException: false,
       },
     },
     email: {

package/src/core/common/interfaces/cron-job-config.interface.ts

@@ -24,11 +24,24 @@ export interface CronJobConfig {
   onComplete?: CronCommand | null;
 
   /**
-   * This will immediately fire your `onTickfunction as soon as the requisit initialization has happened.
-   * This option is set to ``true``` by default.
+   * This will immediately fire your `onTickfunction` as soon as the requisit initialization has happened.
+   * This option is set to `true` by default.
    */
   runOnInit?: boolean;
 
+  /**
+   * Depending on how long the execution of a job takes, it may happen that several executions take place at the
+   * same time. This can be prevented with `runParallel = false`.This option is set to `true` by default.
+   * If a number is specified, it is used as the number of maximum parallel executions.
+   */
+  runParallel?: boolean | number;
+
+  /**
+   * Whether an exception is thrown or only acknowledged with a console.error.
+   * This option is set to `true` by default.
+   */
+  throwException?: boolean;
+
   /**
    * Specify the timezone for the execution. This will modify the actual time relative to your timezone.
    * If the timezone is invalid, an error is thrown. Can be any string accepted by luxon's `DateTime.setZone()`

package/src/core/common/services/core-cron-jobs.service.ts

@@ -15,6 +15,11 @@ export abstract class CoreCronJobs {
     log: boolean;
   };
 
+  /**
+   * Cron jobs that are currently running
+   */
+  runningJobs: Record<string, Date[]> = {};
+
   // ===================================================================================================================
   // Initializations
   // ===================================================================================================================
@@ -51,18 +56,20 @@ export abstract class CoreCronJobs {
       }
 
       // Prepare config
-      let config: CronExpression | string | Date | Falsy | CronJobConfig = CronExpressionOrConfig;
-      if (typeof config === 'string' || config instanceof Date) {
-        config = {
-          cronTime: config,
+      let conf: CronExpression | string | Date | Falsy | CronJobConfig = CronExpressionOrConfig;
+      if (typeof conf === 'string' || conf instanceof Date) {
+        conf = {
+          cronTime: conf,
         };
       }
 
       // Set defaults
-      config = {
-        timeZone: 'Europe/Berlin',
+      const config: CronJobConfig = {
         runOnInit: true,
-        ...config,
+        runParallel: true,
+        throwException: true,
+        timeZone: 'Europe/Berlin',
+        ...conf,
       };
 
       // Check if cron job should be activated
@@ -81,8 +88,40 @@ export abstract class CoreCronJobs {
       // Init cron job
       const job = new CronJob(
         config.cronTime,
-        () => {
-          this[name]();
+        async () => {
+          // Get current processes of cron job
+          const dates = this.runningJobs[name];
+
+          // Check if parallel execution is allowed and if so how many can run in parallel
+          if (
+            dates?.length &&
+            (!config.runParallel || (typeof config.runParallel === 'number' && dates.length >= config.runParallel))
+          ) {
+            return;
+          }
+
+          // Prepare the acquisition of parallel job executions
+          if (!this.runningJobs[name]) {
+            this.runningJobs[name] = [];
+          }
+          const date = new Date();
+          this.runningJobs[name].push(date);
+
+          // Execute the job and wait until job process is done
+          try {
+            await this[name]();
+          } catch (e) {
+            // Remove job from running list
+            this.runningJobs[name] = this.runningJobs[name].filter((item) => item !== date);
+            if (config.throwException) {
+              throw e;
+            } else {
+              console.error(e);
+            }
+          }
+
+          // Remove job from running list
+          this.runningJobs[name] = this.runningJobs[name].filter((item) => item !== date);
         },
         null,
         true,

package/src/server/common/services/cron-jobs.service.ts

@@ -20,7 +20,10 @@ export class CronJobs extends CoreCronJobs {
   // Cron jobs
   // ===================================================================================================================
 
-  protected sayHello() {
+  protected async sayHello() {
     console.log('Hello :)');
+    await new Promise<void>((resolve) => {
+      setTimeout(() => resolve(), 30000);
+    });
   }
 }