@clairejs/server 3.27.3 → 3.27.4

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.27.3
+#### 3.27.4
 
+-   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 abstract 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

@@ -148,7 +148,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,7 +15,10 @@ 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 getJobName;
+    private getOneTimeExpression;
     protected getScheduledJobs(): Promise<AbstractJob[]>;
+    protected retryJob(payload: AbstractJob): Promise<void>;
     protected _scheduleJob(jobInfo: AbstractJob): Promise<void>;
     cancelJob(jobId: string): Promise<void>;
 }

package/dist/job/AwsJobScheduler.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { AbstractLogger, Errors, LogContext } from "@clairejs/core";
 import { AbstractDbAdapter } from "@clairejs/orm";
-import { SchedulerClient, CreateScheduleCommand, DeleteScheduleCommand, GetScheduleCommand, ListSchedulesCommand, ScheduleState, ActionAfterCompletion } from "@aws-sdk/client-scheduler";
+import { SchedulerClient, CreateScheduleCommand, DeleteScheduleCommand, GetScheduleCommand, ListSchedulesCommand, ScheduleState, ActionAfterCompletion, UpdateScheduleCommand } from "@aws-sdk/client-scheduler";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
 import { AbstractJobRepository } from "./AbstractJobRepository";
 /**
@@ -56,6 +56,13 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         }
         return parts.join(" ");
     }
+    getJobName(jobId) {
+        return `${this.jobNamespace}${jobId}`;
+    }
+    getOneTimeExpression(at) {
+        const date = new Date(at);
+        return `at(${date.toISOString().replace(/\.\d{3}Z$/, '')})`;
+    }
     async getScheduledJobs() {
         try {
             const listCommand = new ListSchedulesCommand({
@@ -89,6 +96,28 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
             return [];
         }
     }
+    async retryJob(payload) {
+        this.logger.debug("Retrying job: ", payload);
+        if (payload.at) {
+            if (payload.cron) {
+                //- retry a cron job
+                await this._scheduleJob({ ...payload, id: `${payload.id}-retry-${payload.retryCount}` });
+            }
+            else {
+                //- retry a one-time job, update the schedule
+                const jobName = this.getJobName(payload.id);
+                const schedule = await this.scheduler.send(new GetScheduleCommand({
+                    Name: jobName,
+                    GroupName: schedulerGroupName,
+                }));
+                const updateCommand = new UpdateScheduleCommand({
+                    ...schedule,
+                    ScheduleExpression: this.getOneTimeExpression(payload.at),
+                });
+                await this.scheduler.send(updateCommand);
+            }
+        }
+    }
     async _scheduleJob(jobInfo) {
         this.logger.debug("Scheduling job: ", jobInfo);
         if (jobInfo.cron || jobInfo.at) {
@@ -96,9 +125,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.d.ts

@@ -54,6 +54,7 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     exit(): void;
     protected getScheduledJobs(): Promise<AbstractJob[]>;
     syncJobs(): Promise<void>;
+    protected retryJob(payload: AbstractJob): Promise<void>;
     protected _scheduleJob(jobInfo: AbstractJob): Promise<void>;
     protected cancelJob(jobId: string): Promise<void>;
 }

package/dist/job/LocalJobScheduler.js

@@ -154,6 +154,9 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
         }
         return;
     }
+    async retryJob(payload) {
+        return await this._scheduleJob(payload);
+    }
     async _scheduleJob(jobInfo) {
         if (this.isActive) {
             //-- case each job type

package/package.json

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