@clairejs/server 3.27.1 → 3.27.3

package/README.md

@@ -1,6 +1,6 @@
 ## Change Log
 
-#### 3.27.1
+#### 3.27.3
 
 -   use aws scheduler for jobs
 

package/dist/job/AbstractJobScheduler.d.ts

@@ -29,11 +29,6 @@ export declare abstract class AbstractJobScheduler {
      * @param id The job id returned from scheduleJobAt function
      */
     protected abstract cancelJob(id: string): Promise<void>;
-    /**
-     * Clean up the job after it has been executed
-     * @param job The job to clean up
-     */
-    protected abstract cleanupJob(job: 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

@@ -129,8 +129,6 @@ export class AbstractJobScheduler {
                 await jobHandler.handlerFn(job);
                 //-- job run success, update
                 update.lastSuccessAt = Date.now();
-                //-- clean up
-                await this.cleanupJob(job);
                 //-- reset retry count if this is cron job
                 if (job.cron) {
                     if (job.retryCount) {

package/dist/job/AwsJobScheduler.d.ts

@@ -15,7 +15,6 @@ 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;
-    protected cleanupJob(job: AbstractJob): Promise<void>;
     protected getScheduledJobs(): Promise<AbstractJob[]>;
     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 } from "@aws-sdk/client-scheduler";
+import { SchedulerClient, CreateScheduleCommand, DeleteScheduleCommand, GetScheduleCommand, ListSchedulesCommand, ScheduleState, ActionAfterCompletion } from "@aws-sdk/client-scheduler";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
 import { AbstractJobRepository } from "./AbstractJobRepository";
 /**
@@ -56,11 +56,6 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         }
         return parts.join(" ");
     }
-    async cleanupJob(job) {
-        if (job.at) {
-            await this.cancelJob(job.id);
-        }
-    }
     async getScheduledJobs() {
         try {
             const listCommand = new ListSchedulesCommand({
@@ -103,7 +98,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
             if (jobInfo.at) {
                 // For one-time jobs, use at() expression
                 const date = new Date(jobInfo.at);
-                scheduleExpression = `at(${date.toISOString()})`;
+                scheduleExpression = `at(${date.toISOString().replace(/\.\d{3}Z$/, '')})`;
                 // Add flexible time window for one-time jobs to handle slight delays
                 flexibleTimeWindow = {
                     Mode: "OFF",
@@ -141,6 +136,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
                     }),
                 },
                 State: ScheduleState.ENABLED,
+                ActionAfterCompletion: ActionAfterCompletion.DELETE,
             };
             try {
                 const createCommand = new CreateScheduleCommand(scheduleParams);

package/dist/job/LocalJobScheduler.d.ts

@@ -50,7 +50,6 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     private sendJob;
     private processMessage;
     private extendMutexKey;
-    protected cleanupJob(): Promise<void>;
     init(): Promise<void>;
     exit(): void;
     protected getScheduledJobs(): Promise<AbstractJob[]>;

package/dist/job/LocalJobScheduler.js

@@ -103,9 +103,6 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
         await this.redisClient.setex(this.holdMutexKey, this.keyRetentionDurationSeconds, 1);
         this.logger.debug("Scheduler extends mutex key");
     }
-    async cleanupJob() {
-        //-- do nothing
-    }
     async init() {
         this.logger.debug("LocalJobScheduler init");
         //-- subscribe to multi client channel

package/dist/system/lamba-request-mapper.js

@@ -11,7 +11,6 @@ const parseCookie = (cookieArray) => {
     return result;
 };
 export const lambdaRequestMapper = (event) => {
-    console.log("lambda event", event);
     if (event.requestContext.eventType) {
         //-- socket
         const method = event.requestContext.eventType.toLowerCase();

package/package.json

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