@clairejs/server 3.21.1 → 3.21.3

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.21.1:
+#### 3.21.3:
 
+-   fix cron expression
 -   add log to aws job scheduler & fix cronjob sync
 -   simplify lambda job scheduler, remove job interval that is less than 60s
 

package/dist/job/AwsJobScheduler.js

@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { AbstractLogger, Errors, LogContext } from "@clairejs/core";
 import { AbstractDbAdapter } from "@clairejs/orm";
+import assert from "assert";
 import aws from "aws-sdk";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
 let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
@@ -82,8 +83,19 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         if (jobInfo.cron || jobInfo.at) {
             const jobId = `${this.jobNamePrefix}${this.uniqueJobIdFactory()}`;
             //-- generate pattern from cron (add * at the end for year) / at timestamp
-            const cronExpression = jobInfo.cron ? `${jobInfo.cron} *` : this.generateCronFromTimestamp(jobInfo.at);
+            let cronExpression;
+            if (jobInfo.at) {
+                cronExpression = this.generateCronFromTimestamp(jobInfo.at);
+            }
+            else if (jobInfo.cron) {
+                let cron = jobInfo.cron;
+                if (cron.endsWith(" *")) {
+                    cronExpression = `${cron.slice(0, -2)} ?`;
+                }
+                cronExpression = `${cron} *`;
+            }
             this.logger.debug("Cron expression", cronExpression);
+            assert.ok(cronExpression);
             await this.eventbridge
                 .putRule({
                 Name: jobId,
@@ -121,14 +133,10 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
     }
     async syncJobs() {
         //-- check jobs
-        console.log("syncJobs started");
         const scheduledJobs = await this.getAllScheduledJobs();
-        console.log("scheduledJobs", scheduledJobs);
         const allJobs = await this.getAvailableJobInfo();
-        console.log("allJobs", allJobs);
         //-- remove job that no more exist
         const nomoreExistJobs = scheduledJobs.filter((job) => !allJobs.find((j) => j.jobName === job.jobName));
-        console.log("nomoreExistJobs", nomoreExistJobs);
         for (const job of nomoreExistJobs) {
             this.logger.info(`Removing stale job: ${job.jobName} of id: ${job.id}`);
             await this.removeJob(job.id);
@@ -142,20 +150,19 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         const unmatchedCronJobs = scheduledCronJobs.filter((j) => j.cron && !allJobs.find((job) => job.jobName === j.jobName && job.cron === j.cron));
         if (unmatchedCronJobs.length) {
             await Promise.all(unmatchedCronJobs.map((j) => this.removeJob(j.id)));
-            //-- reschedule new cron jobs and those which are not synced
-            const resyncCronJobs = allJobs.filter((job) => job.cron &&
-                (unmatchedCronJobs.some((j) => j.jobName === job.jobName) ||
-                    !scheduledCronJobs.some((j) => j.jobName === job.jobName)));
-            this.logger.debug("Reschedule cron jobs", resyncCronJobs);
-            for (const job of resyncCronJobs) {
-                await this.scheduleJob({
-                    jobName: job.jobName,
-                    cron: job.cron,
-                });
-            }
+        }
+        //-- reschedule new cron jobs and those which are not synced
+        const resyncCronJobs = allJobs.filter((job) => job.cron &&
+            (unmatchedCronJobs.some((j) => j.jobName === job.jobName) ||
+                !scheduledCronJobs.some((j) => j.jobName === job.jobName)));
+        this.logger.debug("Reschedule cron jobs", resyncCronJobs);
+        for (const job of resyncCronJobs) {
+            await this.scheduleJob({
+                jobName: job.jobName,
+                cron: job.cron,
+            });
         }
         //-- keep "at" jobs as is
-        console.log("syncJobs finished");
     }
     async removeJob(jobId) {
         await this.eventbridge

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.21.1",
+    "version": "3.21.3",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",