@clairejs/server 3.23.0 → 3.23.2

package/README.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-#### 3.23.0
+#### 3.23.2
 
+-   fix fallback jobId by id in AbstractJob
+-   fix retryDelayMs
 -   improve JobScheduler
 
 #### 3.22.15

package/dist/job/AbstractJobRepository.d.ts

@@ -19,5 +19,5 @@ export declare abstract class AbstractJobRepository<T extends AbstractJob = Abst
      * Remove job info by id
      * @param jobId Unique id of job
      */
-    abstract updateJobById(jobId: string, update: Partial<Omit<T, "jobId">>, tx?: ITransaction): Promise<void>;
+    abstract updateJobById(jobId: string, update: Partial<Omit<T, "id" | "jobId">>, tx?: ITransaction): Promise<void>;
 }

package/dist/job/AbstractJobScheduler.js

@@ -66,7 +66,7 @@ export class AbstractJobScheduler {
         const tx = await this.db.createTransaction();
         if (!jobHandler) {
             this.logger.info(`Disable job with id: ${job.jobId} as handler is not found`);
-            await this.disableJob(job.jobId, tx);
+            await this.disableJob(job.jobId || job.id, tx);
         }
         else {
             const update = {
@@ -104,12 +104,12 @@ export class AbstractJobScheduler {
                         }
                         else {
                             update.disabled = true;
-                            await this.cancelJob(job.jobId);
+                            await this.cancelJob(job.jobId || job.id);
                         }
                     }
                 }
             }
-            await this.jobRepo.updateJobById(job.jobId, update, tx);
+            await this.jobRepo.updateJobById(job.jobId || job.id, update, tx);
         }
         await tx.commit();
     }

package/dist/job/AwsJobScheduler.js

@@ -133,7 +133,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         const nomoreExistJobs = scheduledJobs.filter((job) => !allHandlers.find((handler) => handler.jobName === job.jobName));
         for (const job of nomoreExistJobs) {
             this.logger.info(`Removing stale job: ${job.jobName} of id: ${job.jobId}`);
-            await this.disableJob(job.jobId);
+            await this.disableJob(job.jobId || job.id);
         }
         if (nomoreExistJobs.length) {
             this.logger.info(`Cleaned up: ${nomoreExistJobs.length} stale jobs`);
@@ -143,7 +143,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         const scheduledCronJobs = scheduledJobs.filter((j) => j.cron);
         const unmatchedCronJobs = scheduledCronJobs.filter((j) => j.cron && !allHandlers.find((job) => job.jobName === j.jobName && job.cron === j.cron));
         if (unmatchedCronJobs.length) {
-            await Promise.all(unmatchedCronJobs.map((j) => this.disableJob(j.jobId)));
+            await Promise.all(unmatchedCronJobs.map((j) => this.disableJob(j.jobId || j.id)));
         }
         //-- reschedule new cron jobs and those which are not synced
         const resyncCronJobs = allHandlers.filter((job) => job.cron &&

package/dist/job/LocalJobScheduler.js

@@ -148,7 +148,12 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
             const allJobs = await this.getCurrentJobHandlers();
             for (const job of allJobs) {
                 if (job.cron) {
-                    await this.scheduleJob(job);
+                    await this.scheduleJob({
+                        ...job.retryOptions,
+                        jobName: job.jobName,
+                        cron: job.cron,
+                        jobId: job.jobName,
+                    });
                 }
             }
             //-- re-schedule "at" jobs that are stored in repo
@@ -171,13 +176,13 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
                 const timeout = setTimeout(() => {
                     this.executeJob(jobInfo).catch((err) => this.logger.error(`Error execute job ${jobInfo.jobName} with id: ${jobInfo.jobId}`, err));
                 }, new Date(jobInfo.at).getTime() - Date.now());
-                this.jobHolder[jobInfo.jobId] = { jobCanceler: () => clearTimeout(timeout), jobInfo };
+                this.jobHolder[jobInfo.jobId || jobInfo.id] = { jobCanceler: () => clearTimeout(timeout), jobInfo };
             }
             else if (jobInfo.cron) {
                 const job = scheduler.scheduleJob(jobInfo.cron, () => {
                     this.executeJob(jobInfo).catch((err) => this.logger.error(`Error execute job ${jobInfo.jobName} with id: ${jobInfo.jobId}`, err));
                 });
-                this.jobHolder[jobInfo.jobId] = { jobCanceler: () => job.cancel(), jobInfo };
+                this.jobHolder[jobInfo.jobId || jobInfo.id] = { jobCanceler: () => job.cancel(), jobInfo };
             }
             else {
                 throw Errors.SYSTEM_ERROR(`Job does not have time config: ${jobInfo.jobName}`);

package/dist/job/default-job-repo.d.ts

@@ -7,7 +7,7 @@ export declare class DefaultJobRepository<T extends AbstractJob & AbstractModel>
     protected db: AbstractDbAdapter;
     constructor(model: Constructor<T>, db: AbstractDbAdapter);
     getJobs(query?: QueryCondition<T>, options?: GetManyOptions<T, keyof T>): Promise<T[]>;
-    insertJob({ jobId, ...jobInfo }: Partial<T>, tx?: ITransaction): Promise<string>;
+    insertJob(jobInfo: Partial<T>, tx?: ITransaction): Promise<string>;
     removeJobById(jobId: string, tx?: ITransaction): Promise<void>;
-    updateJobById(jobId: string, update: Partial<Omit<T, "jobId">>, tx?: ITransaction): Promise<void>;
+    updateJobById(jobId: string, update: Partial<Omit<T, "id" | "jobId">>, tx?: ITransaction): Promise<void>;
 }

package/dist/job/default-job-repo.js

@@ -10,22 +10,18 @@ export class DefaultJobRepository extends AbstractJobRepository {
     async getJobs(query, options) {
         return await this.db.use(this.model).getRecords(query, options);
     }
-    async insertJob({ jobId, ...jobInfo }, tx) {
-        if (jobId) {
-            //-- update
-            await this.db.use(this.model, tx).updateOne({ _eq: { jobId } }, jobInfo);
-            return jobId;
-        }
-        else {
-            //-- create new
-            const job = await this.db.use(this.model, tx).createOne(jobInfo);
-            return job.jobId;
-        }
+    async insertJob(jobInfo, tx) {
+        const model = new this.model();
+        Object.assign(model, jobInfo);
+        const job = await this.db.use(this.model, tx).createOne(model);
+        return job.jobId || job.id;
     }
     async removeJobById(jobId, tx) {
-        await this.db.use(this.model, tx).deleteMany({ _eq: { jobId } });
+        await this.db.use(this.model, tx).deleteMany({ _or: [{ _eq: { jobId } }, { _eq: { id: jobId } }] });
     }
     async updateJobById(jobId, update, tx) {
-        await this.db.use(this.model, tx).updateOne({ _eq: { jobId } }, update);
+        await this.db
+            .use(this.model, tx)
+            .updateOne({ _or: [{ _eq: { jobId } }, { _eq: { id: jobId } }] }, update);
     }
 }

package/dist/job/interfaces.d.ts

@@ -38,7 +38,7 @@ export interface JobSchedulePayload extends JobRetryOptions {
     cron?: string;
 }
 export interface AbstractJob extends JobSchedulePayload {
-    jobId: string;
+    id: string;
     disabled?: boolean;
     execCount?: number;
     failCount?: number;

package/dist/job/job.d.ts

@@ -1,7 +1,7 @@
 import { AbstractModel } from "@clairejs/core";
 import { AbstractJob } from "./interfaces";
 export declare abstract class AbstractJobModel extends AbstractModel implements AbstractJob {
-    jobId: string;
+    jobId?: string;
     jobName: string;
     at?: number;
     cron?: string;
@@ -9,7 +9,7 @@ export declare abstract class AbstractJobModel extends AbstractModel implements
     retryOnFail?: boolean;
     maxRetry?: number;
     retryCount?: number;
-    retryDelay?: number;
+    retryDelayMs?: number;
     disabled?: boolean;
     execCount?: number;
     failCount?: number;

package/dist/job/job.js

@@ -17,7 +17,7 @@ export class AbstractJobModel extends AbstractModel {
     retryOnFail;
     maxRetry;
     retryCount;
-    retryDelay;
+    retryDelayMs;
     disabled;
     execCount;
     failCount;
@@ -28,7 +28,6 @@ export class AbstractJobModel extends AbstractModel {
 __decorate([
     Column({
         description: "Unique id of the job",
-        isRequired: true,
     }),
     __metadata("design:type", String)
 ], AbstractJobModel.prototype, "jobId", void 0);
@@ -73,7 +72,7 @@ __decorate([
 __decorate([
     Column({}),
     __metadata("design:type", Number)
-], AbstractJobModel.prototype, "retryDelay", void 0);
+], AbstractJobModel.prototype, "retryDelayMs", void 0);
 __decorate([
     Column({}),
     __metadata("design:type", Boolean)

package/package.json

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