@orion-js/dogs 3.1.0-alpha.6 → 3.1.0-alpha.9

package/lib/events.test.js

@@ -17,7 +17,7 @@ describe('Event tests', () => {
             workersCount: 1,
             pollInterval: 10,
             cooldownPeriod: 10,
-            logLevel: 'info'
+            logLevel: 'none'
         });
         expect(count).toBe(0);
         await (0, _1.scheduleJob)({
@@ -56,7 +56,7 @@ describe('Event tests', () => {
             workersCount: 1,
             pollInterval: 10,
             cooldownPeriod: 10,
-            logLevel: 'info'
+            logLevel: 'none'
         });
         expect(passes).toBe(false);
         await (0, _1.scheduleJob)({
@@ -74,8 +74,7 @@ describe('Event tests', () => {
         const job = (0, _1.defineJob)({
             type: 'event',
             async resolve(params, context) {
-                if (ranCount === 1) {
-                    expect(context.tries).toBe(2);
+                if (context.tries === 2) {
                     context.extendLockTime(10000);
                 }
                 await (0, helpers_1.sleep)(100);
@@ -88,20 +87,20 @@ describe('Event tests', () => {
         });
         const instance = (0, _1.startWorkers)({
             jobs: { [jobId]: job },
-            workersCount: 1,
+            workersCount: 2,
             pollInterval: 10,
             cooldownPeriod: 10,
-            lockTime: 40,
-            logLevel: 'info'
+            lockTime: 10,
+            logLevel: 'none'
         });
         await (0, _1.scheduleJob)({
             name: jobId,
             runIn: 1
         });
-        await (0, helpers_1.sleep)(200);
+        await (0, helpers_1.sleep)(300);
         await instance.stop();
-        expect(ranCount).toBe(2);
         expect(staleCount).toBe(1);
+        expect(ranCount).toBe(2);
     });
     it('Should only schedule one job with uniqueIdentifier', async () => {
         const jobId = (0, helpers_1.generateId)();
@@ -117,7 +116,7 @@ describe('Event tests', () => {
             workersCount: 1,
             pollInterval: 10,
             cooldownPeriod: 10,
-            logLevel: 'warn'
+            logLevel: 'none'
         });
         await (0, _1.scheduleJob)({
             name: jobId,

package/lib/history.test.js

@@ -34,7 +34,7 @@ describe('Test Jobs History', () => {
             _id: expect.any(String),
             executionId: expect.any(String),
             jobName: jobId,
-            isRecurrent: false,
+            type: 'event',
             priority: 1,
             tries: 1,
             startedAt: expect.any(Date),
@@ -75,7 +75,7 @@ describe('Test Jobs History', () => {
             _id: expect.any(String),
             executionId: expect.any(String),
             jobName: jobId,
-            isRecurrent: false,
+            type: 'event',
             priority: 1,
             tries: 1,
             startedAt: expect.any(Date),
@@ -119,7 +119,7 @@ describe('Test Jobs History', () => {
             _id: expect.any(String),
             executionId: expect.any(String),
             jobName: jobId,
-            isRecurrent: false,
+            type: 'event',
             priority: 1,
             tries: 1,
             startedAt: expect.any(Date),
@@ -137,7 +137,7 @@ describe('Test Jobs History', () => {
             _id: expect.any(String),
             executionId: expect.any(String),
             jobName: jobId,
-            isRecurrent: false,
+            type: 'event',
             priority: 1,
             tries: 1,
             startedAt: expect.any(Date),

package/lib/recurrent.test.js

@@ -18,7 +18,7 @@ describe('Recurrent tests', () => {
             workersCount: 1,
             pollInterval: 100,
             cooldownPeriod: 100,
-            logLevel: 'info'
+            logLevel: 'none'
         });
         await (0, helpers_1.sleep)(500);
         await instance.stop();
@@ -38,7 +38,7 @@ describe('Recurrent tests', () => {
             workersCount: 1,
             pollInterval: 10,
             cooldownPeriod: 10,
-            logLevel: 'info'
+            logLevel: 'none'
         });
         await (0, helpers_1.sleep)(200);
         await instance.stop();

package/lib/repos/JobsRepo.d.ts

@@ -10,6 +10,7 @@ export declare class JobsRepo {
         nextRunAt: Date;
         addTries: boolean;
     }): Promise<void>;
+    deleteEventJob(jobId: string): Promise<void>;
     extendLockTime(jobId: string, extraTime: number): Promise<void>;
     ensureJobRecord(job: JobDefinitionWithName): Promise<void>;
     scheduleJob(options: ScheduleJobRecordOptions): Promise<void>;

package/lib/repos/JobsRepo.js

@@ -31,7 +31,7 @@ let JobsRepo = class JobsRepo {
                     },
                     options: {
                         unique: true,
-                        partialFilterExpression: { isRecurrent: true }
+                        partialFilterExpression: { type: 'recurrent' }
                     }
                 },
                 {
@@ -53,7 +53,7 @@ let JobsRepo = class JobsRepo {
             nextRunAt: { $lte: new Date() },
             $or: [{ lockedUntil: { $exists: false } }, { lockedUntil: { $lte: new Date() } }]
         }, {
-            $set: { lockedUntil }
+            $set: { lockedUntil, lastRunAt: new Date() }
         }, {
             mongoOptions: {
                 sort: {
@@ -67,7 +67,7 @@ let JobsRepo = class JobsRepo {
             return;
         let tries = job.tries || 1;
         if (job.lockedUntil) {
-            (0, log_1.log)('debug', `Running job "${job.jobName}" that was staled`);
+            (0, log_1.log)('info', `Running job "${job.jobName}" that was staled`);
             this.jobs.updateOne(job._id, { $inc: { tries: 1 } });
             tries++;
         }
@@ -75,7 +75,7 @@ let JobsRepo = class JobsRepo {
             jobId: job._id,
             name: job.jobName,
             params: job.params,
-            isRecurrent: job.isRecurrent,
+            type: job.type,
             tries,
             lockTime,
             priority: job.priority,
@@ -92,6 +92,9 @@ let JobsRepo = class JobsRepo {
         }
         await this.jobs.updateOne(options.jobId, updator);
     }
+    async deleteEventJob(jobId) {
+        await this.jobs.deleteOne({ _id: jobId, type: 'event' });
+    }
     async extendLockTime(jobId, extraTime) {
         const lockedUntil = new Date(Date.now() + extraTime);
         await this.jobs.updateOne({
@@ -105,7 +108,7 @@ let JobsRepo = class JobsRepo {
             jobName: job.name
         }, {
             $set: {
-                isRecurrent: true,
+                type: job.type,
                 priority: job.priority || 1
             },
             $setOnInsert: {
@@ -113,10 +116,10 @@ let JobsRepo = class JobsRepo {
             }
         });
         if (result.upsertedId) {
-            (0, log_1.log)('debug', `Created job record for "${job.name}"`);
+            (0, log_1.log)('info', `Created job record for "${job.name}"`);
         }
         else {
-            (0, log_1.log)('debug', `Record for job "${job.name}" already exists`);
+            (0, log_1.log)('info', `Record for job "${job.name}" already exists`);
         }
     }
     async scheduleJob(options) {
@@ -127,7 +130,7 @@ let JobsRepo = class JobsRepo {
                 params: options.params,
                 nextRunAt: options.nextRunAt,
                 priority: options.priority,
-                isRecurrent: false
+                type: 'event'
             });
         }
         catch (error) {

package/lib/services/EventsService.js

@@ -16,7 +16,7 @@ const JobsRepo_1 = require("../repos/JobsRepo");
 const getNextRunDate_1 = require("./getNextRunDate");
 let EventsService = class EventsService {
     async scheduleJob(options) {
-        (0, log_1.log)('debug', 'Scheduling job...', options);
+        (0, log_1.log)('info', 'Scheduling job...', options);
         await this.jobsRepo.scheduleJob({
             name: options.name,
             priority: options.priority || 1,

package/lib/services/Executor.d.ts

@@ -15,5 +15,6 @@ export declare class Executor {
         job: JobDefinition;
         jobToRun: JobToRun;
     }): Promise<void>;
+    afterExecutionSuccess(job: JobDefinition, jobToRun: JobToRun): Promise<void>;
     executeJob(jobs: JobsDefinition, jobToRun: JobToRun): Promise<void>;
 }

package/lib/services/Executor.js

@@ -32,12 +32,8 @@ let Executor = class Executor {
     }
     getJobDefinition(jobToRun, jobs) {
         const job = jobs[jobToRun.name];
-        if (!jobToRun.isRecurrent && job.type === 'recurrent') {
-            (0, log_1.log)('warn', `Job record ${jobToRun.name} is event but definition is recurrent`);
-            return;
-        }
-        if (jobToRun.isRecurrent && job.type === 'event') {
-            (0, log_1.log)('warn', `Job record ${jobToRun.name} is recurrent but definition is event`);
+        if (jobToRun.type !== job.type) {
+            (0, log_1.log)('warn', `Job record "${jobToRun.name}" is "${jobToRun.type}" but definition is "${job.type}"`);
             return;
         }
         return job;
@@ -58,7 +54,7 @@ let Executor = class Executor {
             return;
         }
         else {
-            (0, log_1.log)('debug', `Error executing job "${jobToRun.name}"`, error);
+            (0, log_1.log)('info', `Error executing job "${jobToRun.name}"`, error);
         }
         const result = await job.onError(error, jobToRun.params, context);
         if (result.action === 'dismiss') {
@@ -81,7 +77,7 @@ let Executor = class Executor {
             await this.jobsHistoryRepo.saveExecution({
                 executionId: jobToRun.jobId,
                 jobName: jobToRun.name,
-                isRecurrent: jobToRun.isRecurrent,
+                type: jobToRun.type,
                 priority: jobToRun.priority,
                 tries: jobToRun.tries,
                 uniqueIdentifier: jobToRun.uniqueIdentifier,
@@ -96,6 +92,20 @@ let Executor = class Executor {
             });
         }
     }
+    async afterExecutionSuccess(job, jobToRun) {
+        if (job.type === 'recurrent') {
+            (0, log_1.log)('info', `Scheduling next run for recurrent job "${jobToRun.name}"`);
+            await this.jobsRepo.scheduleNextRun({
+                jobId: jobToRun.jobId,
+                nextRunAt: (0, getNextRunDate_1.getNextRunDate)(job),
+                addTries: false
+            });
+        }
+        if (job.type === 'event') {
+            (0, log_1.log)('info', `Removing event job after success "${jobToRun.name}"`);
+            await this.jobsRepo.deleteEventJob(jobToRun.jobId);
+        }
+    }
     async executeJob(jobs, jobToRun) {
         const job = this.getJobDefinition(jobToRun, jobs);
         if (!job)
@@ -103,11 +113,11 @@ let Executor = class Executor {
         const startedAt = new Date();
         const onStale = () => {
             if (job.onStale) {
-                (0, log_1.log)('debug', `Job "${jobToRun.name}" is stale`);
+                (0, log_1.log)('info', `Job "${jobToRun.name}" is stale`);
                 job.onStale(jobToRun.params, context);
             }
             else {
-                (0, log_1.log)('warn', `Job "${jobToRun.name}" is stale`);
+                (0, log_1.log)('error', `Job "${jobToRun.name}" is stale`);
             }
             this.saveExecution({
                 startedAt,
@@ -130,13 +140,7 @@ let Executor = class Executor {
                 job,
                 jobToRun
             });
-            if (job.type === 'recurrent') {
-                await this.jobsRepo.scheduleNextRun({
-                    jobId: jobToRun.jobId,
-                    nextRunAt: (0, getNextRunDate_1.getNextRunDate)(job),
-                    addTries: false
-                });
-            }
+            await this.afterExecutionSuccess(job, jobToRun);
         }
         catch (error) {
             context.clearStaleTimeout();

package/lib/services/WorkerService.js

@@ -36,14 +36,14 @@ let WorkerService = class WorkerService {
             (0, log_1.log)('debug', 'No job to run');
             return false;
         }
-        (0, log_1.log)('debug', `Got job to run: ${JSON.stringify(jobToRun)}`);
+        (0, log_1.log)('info', `Got job to run: ${JSON.stringify(jobToRun)}`);
         await this.executor.executeJob(config.jobs, jobToRun);
         return true;
     }
     async startWorker(config, workersInstance) {
         while (true) {
             if (!workersInstance.running) {
-                (0, log_1.log)('debug', 'Got signal to stop. Stopping worker...');
+                (0, log_1.log)('info', 'Got signal to stop. Stopping worker...');
                 return;
             }
             try {
@@ -77,15 +77,15 @@ let WorkerService = class WorkerService {
         await Promise.all(jobs
             .filter(job => job.type === 'recurrent')
             .map(async (job) => {
-            (0, log_1.log)('debug', `Ensuring records for job "${job.name}"...`);
+            (0, log_1.log)('info', `Ensuring records for job "${job.name}"...`);
             await this.jobsRepo.ensureJobRecord(job);
         }));
     }
     async runWorkers(config, workersInstance) {
-        (0, log_1.log)('debug', 'Will ensure records for recurrent jobs');
+        (0, log_1.log)('info', 'Will ensure records for recurrent jobs');
         await this.ensureRecords(config);
         for (const workerIndex of (0, lodash_1.range)(config.workersCount)) {
-            (0, log_1.log)('debug', `Starting worker ${workerIndex}`);
+            (0, log_1.log)('info', `Starting worker ${workerIndex}`);
             const workerPromise = this.startWorker(config, workersInstance);
             workersInstance.workers.push(workerPromise);
         }
@@ -105,7 +105,7 @@ let WorkerService = class WorkerService {
         };
         (0, log_1.setLogLevel)(config.logLevel);
         const workersInstance = this.createWorkersInstanceDefinition(config);
-        (0, log_1.log)('debug', 'Starting workers', config);
+        (0, log_1.log)('info', 'Starting workers', config);
         this.runWorkers(config, workersInstance);
         return workersInstance;
     }

package/lib/types/HistoryRecord.d.ts

@@ -5,7 +5,7 @@ export declare class HistoryRecord {
     _id: string;
     executionId: string;
     jobName: string;
-    isRecurrent: boolean;
+    type: 'recurrent' | 'event';
     priority: number;
     tries: number;
     uniqueIdentifier?: string;

package/lib/types/HistoryRecord.js

@@ -27,8 +27,8 @@ __decorate([
 ], HistoryRecord.prototype, "jobName", void 0);
 __decorate([
     (0, typed_model_1.Prop)(),
-    __metadata("design:type", Boolean)
-], HistoryRecord.prototype, "isRecurrent", void 0);
+    __metadata("design:type", String)
+], HistoryRecord.prototype, "type", void 0);
 __decorate([
     (0, typed_model_1.Prop)(),
     __metadata("design:type", Number)

package/lib/types/JobRecord.d.ts

@@ -2,7 +2,7 @@ import { PlainObject } from './HistoryRecord';
 export declare class JobRecord {
     _id: string;
     jobName: string;
-    isRecurrent: boolean;
+    type: 'recurrent' | 'event';
     priority: number;
     uniqueIdentifier?: string;
     nextRunAt: Date;

package/lib/types/JobRecord.js

@@ -23,8 +23,8 @@ __decorate([
 ], JobRecord.prototype, "jobName", void 0);
 __decorate([
     (0, typed_model_1.Prop)(),
-    __metadata("design:type", Boolean)
-], JobRecord.prototype, "isRecurrent", void 0);
+    __metadata("design:type", String)
+], JobRecord.prototype, "type", void 0);
 __decorate([
     (0, typed_model_1.Prop)(),
     __metadata("design:type", Number)

package/lib/types/Worker.d.ts

@@ -3,7 +3,7 @@ import { JobDefinition } from './JobsDefinition';
 export interface JobToRun {
     jobId: string;
     name: string;
-    isRecurrent: boolean;
+    type: 'event' | 'recurrent';
     params: PlainObject;
     tries: number;
     lockTime: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/dogs",
-  "version": "3.1.0-alpha.6",
+  "version": "3.1.0-alpha.9",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f76a7b8b9e317baf4e9204f75bb22d0562a29024"
+  "gitHead": "65ebf7047a46aa5e93e9066d82ca70f81d69f10c"
 }