@clairejs/server 3.23.5 → 3.23.6

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.23.5
+#### 3.23.6
 
+-   fix execCount not being calculated correctly
 -   handle syncJobs being called multiple times
 -   fix abstract job scheduler & job model
 -   remove jobId fallback and update schedule job logic

package/dist/job/AbstractJobScheduler.js

@@ -52,8 +52,11 @@ export class AbstractJobScheduler {
             (updatedScheduledCronJobs.some((j) => j.jobName === job.jobName) ||
                 !scheduledCronJobs.some((j) => j.jobName === job.jobName)));
         this.logger.debug(`Resync ${resyncCronJobs.length} cron jobs`, resyncCronJobs);
+        const allPersistedJobs = await this.jobRepo.getJobs({ _neq: { disabled: true } });
         for (const job of resyncCronJobs) {
+            const matchedPersistedJob = allPersistedJobs.find((persistedJob) => persistedJob.jobName === job.jobName && persistedJob.cron === job.cron);
             await this.scheduleJob({
+                ...matchedPersistedJob,
                 ...job.retryOptions,
                 jobName: job.jobName,
                 cron: job.cron,
@@ -61,8 +64,7 @@ export class AbstractJobScheduler {
             });
         }
         //-- sync "at" jobs
-        const allPersistedAtJobs = await this.jobRepo.getJobs({ _neq: { disabled: true, at: undefined } });
-        const missingScheduledAtJobs = allPersistedAtJobs.filter((job) => !scheduledJobs.find((scheduled) => scheduled.id === job.id));
+        const missingScheduledAtJobs = allPersistedJobs.filter((job) => job.at && !scheduledJobs.find((scheduled) => scheduled.id === job.id));
         for (const job of missingScheduledAtJobs) {
             await this.scheduleJob(job);
         }
@@ -160,6 +162,7 @@ export class AbstractJobScheduler {
                 }
             }
             await this.jobRepo.updateJobById(job.id, update, tx);
+            Object.assign(job, update);
         }
         await tx.commit();
     }

package/package.json

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