@clairejs/server 3.27.3 → 3.27.6

package/README.md

@@ -1,7 +1,12 @@
 ## Change Log
 
-#### 3.27.3
+#### 3.27.6
 
+-   fix npm security issues
+
+#### 3.27.5
+
+-   implement job retry logic
 -   use aws scheduler for jobs
 
 #### 3.26.2

package/dist/job/AbstractJobScheduler.d.ts

@@ -29,6 +29,7 @@ export declare abstract class AbstractJobScheduler {
      * @param id The job id returned from scheduleJobAt function
      */
     protected abstract cancelJob(id: string): Promise<void>;
+    protected retryJob(payload: AbstractJob): Promise<void>;
     /**
      * Remove the scheduled job and prevent if from running in the future
      * @param id The job id returned from scheduleJobAt function

package/dist/job/AbstractJobScheduler.js

@@ -96,6 +96,10 @@ export class AbstractJobScheduler {
         await tx.commit();
         return jobId;
     }
+    async retryJob(payload) {
+        this.logger.debug("Retrying job: ", payload);
+        await this._scheduleJob({ ...payload, id: `${payload.id}-retry-${payload.retryCount}` });
+    }
     /**
      * Remove the scheduled job and prevent if from running in the future
      * @param id The job id returned from scheduleJobAt function
@@ -148,7 +152,7 @@ export class AbstractJobScheduler {
                         //-- retry by reschedule the job
                         update.retryCount = (job.retryCount || 0) + 1;
                         const retryDelay = job.retryDelayMs || 0;
-                        await this.scheduleJob({ ...job, at: Date.now() + (retryDelay < 60000 ? 60000 : retryDelay) });
+                        await this.retryJob({ ...job, ...update, at: Date.now() + (retryDelay < 60000 ? 60000 : retryDelay) });
                     }
                     else {
                         if (job.cron) {

package/dist/job/AwsJobScheduler.d.ts

@@ -15,6 +15,7 @@ export declare class AwsJobScheduler extends AbstractJobScheduler {
     constructor(logger: AbstractLogger, db: AbstractDbAdapter, jobRepo: AbstractJobRepository, apiLambdaFunctionArn: string, apiLambdaFunctionRoleArn: string, jobNamespace: string);
     handleCron(jobInfo: AbstractJob): Promise<void>;
     private convertCronToSchedulerExpression;
+    private getOneTimeExpression;
     protected getScheduledJobs(): Promise<AbstractJob[]>;
     protected _scheduleJob(jobInfo: AbstractJob): Promise<void>;
     cancelJob(jobId: string): Promise<void>;

package/dist/job/AwsJobScheduler.js

@@ -56,6 +56,10 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         }
         return parts.join(" ");
     }
+    getOneTimeExpression(at) {
+        const date = new Date(at);
+        return `at(${date.toISOString().replace(/\.\d{3}Z$/, '')})`;
+    }
     async getScheduledJobs() {
         try {
             const listCommand = new ListSchedulesCommand({
@@ -96,9 +100,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
             let scheduleExpression;
             let flexibleTimeWindow;
             if (jobInfo.at) {
-                // For one-time jobs, use at() expression
-                const date = new Date(jobInfo.at);
-                scheduleExpression = `at(${date.toISOString().replace(/\.\d{3}Z$/, '')})`;
+                scheduleExpression = this.getOneTimeExpression(jobInfo.at);
                 // Add flexible time window for one-time jobs to handle slight delays
                 flexibleTimeWindow = {
                     Mode: "OFF",

package/dist/job/LocalJobScheduler.js

@@ -80,7 +80,7 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
                     return;
                 }
                 const jobInfo = data;
-                await this.scheduleJob(jobInfo);
+                await this._scheduleJob(jobInfo);
                 break;
             case CommunicationMessage.REMOVE_JOB:
                 if (!this.isActive) {

package/package.json

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