@cleverbrush/scheduler 1.1.4 → 1.1.6

package/dist/index.js

@@ -10,8 +10,7 @@ import { InMemoryJobRepository } from './jobRepository.js';
 export { ScheduleCalculator, Schemas };
 const MAX_BUFFER_SIZE = 10 * 1024 * 1024; // 10MB
 const CHECK_INTERVAL = 1000 * 10; // every 10 seconds
-// const SCHEDULE_JOB_SPAN = 1000 * 60 * 60; // 1 hour
-const SCHEDULE_JOB_SPAN = 1000 * 60; // 1 hour
+const SCHEDULE_JOB_SPAN = 1000 * 60; // 1 minute
 const DEFAULT_JOB_TIMEOUT = 1000 * 20; // 20 seconds
 const DEFAULT_MAX_CONSEQUENT_FAILS = 3;
 const DEFAULT_MAX_RETRIES = 2;
@@ -296,6 +295,12 @@ export class JobScheduler extends EventEmitter {
                     const { date: nextRun, index } = schedule.next();
                     if (nextRun < new Date())
                         continue;
+                    if (jobs[i].noConcurrentRuns) {
+                        const runingInstances = await this._jobsRepository.getInstancesWithStatus(jobs[i].id, 'running');
+                        if (runingInstances.length > 0) {
+                            return;
+                        }
+                    }
                     const alreadyScheduled = scheduledInstances.find((i) => i.index === index);
                     if (alreadyScheduled)
                         continue;
@@ -375,7 +380,8 @@ export class JobScheduler extends EventEmitter {
                 : DEFAULT_MAX_CONSEQUENT_FAILS,
             maxRetries: typeof job.maxRetries === 'number'
                 ? job.maxRetries
-                : DEFAULT_MAX_RETRIES
+                : DEFAULT_MAX_RETRIES,
+            noConcurrentRuns: job.noConcurrentRuns || false
         });
     }
     /**
@@ -394,10 +400,6 @@ export class JobScheduler extends EventEmitter {
             this._jobsRepository = props.persistRepository;
         }
         this._rootFolder = props.rootFolder;
-        setInterval(() => {
-            this._jobsRepository.dumpJobs();
-            this._jobsRepository.dumpInstances();
-        }, 10 * 1000);
     }
     on(name, callback) {
         super.on(name, callback);

package/dist/jobRepository.d.ts

@@ -10,8 +10,6 @@ export interface IJobRepository {
     getInstancesWithStatus(jobId: string, status: JobInstanceStatus): Promise<JobInstance[]>;
     addInstance(jobId: string, instance: AddJobInstanceRequest): Promise<JobInstance>;
     saveInstance(instance: JobInstance): Promise<JobInstance>;
-    dumpJobs(): void;
-    dumpInstances(): void;
 }
 export declare class InMemoryJobRepository implements IJobRepository {
     private _jobs;
@@ -28,7 +26,5 @@ export declare class InMemoryJobRepository implements IJobRepository {
     getInstancesWithStatus(jobId: string, status: JobInstanceStatus): Promise<JobInstance[]>;
     getInstanceById(id: number): Promise<JobInstance>;
     saveInstance(instance: JobInstance): Promise<JobInstance>;
-    dumpJobs(): void;
-    dumpInstances(): void;
 }
 export {};

package/dist/jobRepository.js

@@ -76,10 +76,4 @@ export class InMemoryJobRepository {
         this._jobInstances.push(result);
         return result;
     }
-    dumpJobs() {
-        // console.table(this._jobs);
-    }
-    dumpInstances() {
-        // console.table(this._jobInstances);
-    }
 }

package/dist/types.d.ts

@@ -226,6 +226,10 @@ declare const CreateJobRequestSchema: import("@cleverbrush/schema").ObjectSchema
      * Job will be retried right away this times. Job will be retried on next schedule run if this number is exceeded.
      */
     maxRetries: import("@cleverbrush/schema").NumberSchemaBuilder<number, false>;
+    /**
+     * If true, job will not be runned if previous run is not finished yet.
+     */
+    noConcurrentRuns: import("@cleverbrush/schema").BooleanSchemaBuilder<boolean, false, undefined, boolean>;
 }, true, undefined>;
 /**
  * Schedule for job. Can be one of:
@@ -288,6 +292,10 @@ export type Job = {
      * next schedule run if this number is exceeded.
      */
     maxRetries: number;
+    /**
+     * If true, job will not be runned if previous run is not finished yet.
+     */
+    noConcurrentRuns?: boolean;
 };
 export type JobInstance = {
     /** Id of job instance */
@@ -578,6 +586,10 @@ export declare const Schemas: {
          * Job will be retried right away this times. Job will be retried on next schedule run if this number is exceeded.
          */
         maxRetries: import("@cleverbrush/schema").NumberSchemaBuilder<number, false>;
+        /**
+         * If true, job will not be runned if previous run is not finished yet.
+         */
+        noConcurrentRuns: import("@cleverbrush/schema").BooleanSchemaBuilder<boolean, false, undefined, boolean>;
     }, true, undefined>;
     ScheduleMinuteSchema: import("@cleverbrush/schema").ObjectSchemaBuilder<Omit<Omit<{
         /** Number of intervals (days, months, minutes or weeks)

package/dist/types.js

@@ -1,4 +1,4 @@
-import { date, object, func, number, string, array, union } from '@cleverbrush/schema';
+import { array, boolean, date, func, number, object, string, union } from '@cleverbrush/schema';
 const ScheduleSchemaBase = object({
     /** Number of intervals (days, months, minutes or weeks)
      * between repeats. Interval type depends of `every` value */
@@ -97,7 +97,11 @@ const CreateJobRequestSchema = object({
     /**
      * Job will be retried right away this times. Job will be retried on next schedule run if this number is exceeded.
      */
-    maxRetries: number().optional().min(1)
+    maxRetries: number().optional().min(1),
+    /**
+     * If true, job will not be runned if previous run is not finished yet.
+     */
+    noConcurrentRuns: boolean().optional()
 });
 export const Schemas = {
     ScheduleSchemaBase,

package/package.json

@@ -5,13 +5,13 @@
         "email": "andrew_zol@cleverbrush.com"
     },
     "dependencies": {
-        "@cleverbrush/schema": "1.1.4"
+        "@cleverbrush/schema": "1.1.6"
     },
     "description": "Job Scheduler for NodeJS",
     "files": [
         "dist"
     ],
-    "homepage": "https://docs.cleverbrush.com/v1.1.1/modules/Job_Scheduler.html",
+    "homepage": "https://docs.cleverbrush.com/modules/_cleverbrush_scheduler.html",
     "keywords": [
         "task scheduler",
         "task runner",
@@ -31,12 +31,6 @@
         "build": "tsc"
     },
     "type": "module",
-    "typedoc": {
-        "entryPoint": "./src/index.ts",
-        "readmeFile": "./README.md",
-        "displayName": "Job Scheduler",
-        "tsconfig": "./tsconfig.json"
-    },
     "types": "./dist/index.d.ts",
-    "version": "1.1.4"
+    "version": "1.1.6"
 }