@clairejs/server 3.21.2 → 3.21.4

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.21.2:
+#### 3.21.4:
 
+-   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 {
@@ -81,13 +82,25 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         this.logger.debug("Scheduling job: ", jobInfo);
         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) {
+                this.logger.debug("At job", jobInfo.at);
+                cronExpression = this.generateCronFromTimestamp(jobInfo.at);
+            }
+            else if (jobInfo.cron) {
+                let cron = jobInfo.cron;
+                this.logger.debug("Cron job", cron, cron.endsWith(" *"));
+                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,
-                Description: `${jobInfo.jobName} - ${jobInfo.cron || jobInfo.at}`,
+                Description: `${jobInfo.jobName} - ${cronExpression || jobInfo.at}`,
                 EventBusName: this.eventBusName,
                 ScheduleExpression: `cron(${cronExpression})`,
                 State: "ENABLED",
@@ -121,14 +134,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);
@@ -155,7 +164,6 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
             });
         }
         //-- 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.2",
+    "version": "3.21.4",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",