@orion-js/dogs 3.1.0-alpha.7 → 3.1.0

package/lib/events.test.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const helpers_1 = require("@orion-js/helpers");
 const _1 = require(".");
+const logger_1 = require("@orion-js/logger");
+(0, logger_1.setLogLevel)('error');
 describe('Event tests', () => {
     it('Should run an event job', async () => {
         let count = 0;
@@ -16,8 +18,7 @@ describe('Event tests', () => {
             jobs: { job3 },
             workersCount: 1,
             pollInterval: 10,
-            cooldownPeriod: 10,
-            logLevel: 'info'
+            cooldownPeriod: 10
         });
         expect(count).toBe(0);
         await (0, _1.scheduleJob)({
@@ -55,8 +56,7 @@ describe('Event tests', () => {
             jobs: { job4 },
             workersCount: 1,
             pollInterval: 10,
-            cooldownPeriod: 10,
-            logLevel: 'info'
+            cooldownPeriod: 10
         });
         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,19 @@ 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
         });
         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)();
@@ -116,8 +114,7 @@ describe('Event tests', () => {
             jobs: { [jobId]: job },
             workersCount: 1,
             pollInterval: 10,
-            cooldownPeriod: 10,
-            logLevel: 'warn'
+            cooldownPeriod: 10
         });
         await (0, _1.scheduleJob)({
             name: jobId,

package/lib/history.test.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("@orion-js/helpers");
 const _1 = require(".");
+const logger_1 = require("@orion-js/logger");
+(0, logger_1.setLogLevel)('error');
 describe('Test Jobs History', () => {
     it('Should save success history types', async () => {
         const jobId = (0, helpers_1.generateId)();
@@ -34,7 +36,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),
@@ -58,8 +60,7 @@ describe('Test Jobs History', () => {
         const instance = (0, _1.startWorkers)({
             jobs: { [jobId]: job },
             workersCount: 1,
-            pollInterval: 10,
-            logLevel: 'none'
+            pollInterval: 10
         });
         await (0, _1.scheduleJob)({
             name: jobId,
@@ -75,7 +76,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),
@@ -101,8 +102,7 @@ describe('Test Jobs History', () => {
             jobs: { [jobId]: job },
             workersCount: 1,
             pollInterval: 10,
-            lockTime: 10,
-            logLevel: 'none'
+            lockTime: 10
         });
         await (0, _1.scheduleJob)({
             name: jobId,
@@ -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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const helpers_1 = require("@orion-js/helpers");
 const _1 = require(".");
+const logger_1 = require("@orion-js/logger");
+(0, logger_1.setLogLevel)('error');
 describe('Recurrent tests', () => {
     it('Should run a recurrent job', async () => {
         let ran = false;
@@ -17,8 +19,7 @@ describe('Recurrent tests', () => {
             jobs: { job1 },
             workersCount: 1,
             pollInterval: 100,
-            cooldownPeriod: 100,
-            logLevel: 'info'
+            cooldownPeriod: 100
         });
         await (0, helpers_1.sleep)(500);
         await instance.stop();
@@ -37,8 +38,7 @@ describe('Recurrent tests', () => {
             jobs: { job2 },
             workersCount: 1,
             pollInterval: 10,
-            cooldownPeriod: 10,
-            logLevel: 'info'
+            cooldownPeriod: 10
         });
         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

@@ -7,9 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobsRepo = void 0;
+const logger_1 = require("@orion-js/logger");
 const mongodb_1 = require("@orion-js/mongodb");
 const services_1 = require("@orion-js/services");
-const log_1 = require("../log");
 const JobRecord_1 = require("../types/JobRecord");
 let JobsRepo = class JobsRepo {
     constructor() {
@@ -31,7 +31,7 @@ let JobsRepo = class JobsRepo {
                     },
                     options: {
                         unique: true,
-                        partialFilterExpression: { isRecurrent: true }
+                        partialFilterExpression: { type: 'recurrent' }
                     }
                 },
                 {
@@ -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`);
+            logger_1.logger.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({
@@ -101,11 +104,12 @@ let JobsRepo = class JobsRepo {
         });
     }
     async ensureJobRecord(job) {
+        await this.jobs.connectionPromise;
         const result = await this.jobs.upsert({
             jobName: job.name
         }, {
             $set: {
-                isRecurrent: true,
+                type: job.type,
                 priority: job.priority || 1
             },
             $setOnInsert: {
@@ -113,10 +117,10 @@ let JobsRepo = class JobsRepo {
             }
         });
         if (result.upsertedId) {
-            (0, log_1.log)('debug', `Created job record for "${job.name}"`);
+            logger_1.logger.info(`Created job record for "${job.name}"`);
         }
         else {
-            (0, log_1.log)('debug', `Record for job "${job.name}" already exists`);
+            logger_1.logger.info(`Record for job "${job.name}" already exists`);
         }
     }
     async scheduleJob(options) {
@@ -127,12 +131,12 @@ let JobsRepo = class JobsRepo {
                 params: options.params,
                 nextRunAt: options.nextRunAt,
                 priority: options.priority,
-                isRecurrent: false
+                type: 'event'
             });
         }
         catch (error) {
             if (error.code === 11000 && options.uniqueIdentifier) {
-                (0, log_1.log)('info', `Job "${options.name}" with identifier "${options.uniqueIdentifier}" already exists`);
+                logger_1.logger.info(`Job "${options.name}" with identifier "${options.uniqueIdentifier}" already exists`);
             }
             else {
                 throw error;

package/lib/services/EventsService.js

@@ -10,13 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventsService = void 0;
+const logger_1 = require("@orion-js/logger");
 const services_1 = require("@orion-js/services");
-const log_1 = require("../log");
 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);
+        logger_1.logger.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, context: ExecutionContext): Promise<void>;
     executeJob(jobs: JobsDefinition, jobToRun: JobToRun): Promise<void>;
 }

package/lib/services/Executor.js

@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Executor = void 0;
+const logger_1 = require("@orion-js/logger");
 const services_1 = require("@orion-js/services");
-const log_1 = require("../log");
 const JobsHistoryRepo_1 = require("../repos/JobsHistoryRepo");
 const JobsRepo_1 = require("../repos/JobsRepo");
 const getNextRunDate_1 = require("./getNextRunDate");
@@ -27,17 +27,17 @@ let Executor = class Executor {
                 clearTimeout(staleTimeout);
                 staleTimeout = setTimeout(() => onStale(), extraTime);
                 await this.jobsRepo.extendLockTime(jobToRun.jobId, extraTime);
-            }
+            },
+            logger: logger_1.logger.addMetadata({
+                jobName: jobToRun.name,
+                jobId: jobToRun.jobId
+            })
         };
     }
     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) {
+            logger_1.logger.warn(`Job record "${jobToRun.name}" is "${jobToRun.type}" but definition is "${job.type}"`);
             return;
         }
         return job;
@@ -53,12 +53,12 @@ let Executor = class Executor {
             }
         };
         if (!job.onError) {
-            (0, log_1.log)('error', `Error executing job "${jobToRun.name}"`, error);
+            context.logger.error(`Error executing job "${jobToRun.name}"`, error);
             await scheduleRecurrent();
             return;
         }
         else {
-            (0, log_1.log)('debug', `Error executing job "${jobToRun.name}"`, error);
+            context.logger.info(`Error executing job "${jobToRun.name}"`, error);
         }
         const result = await job.onError(error, jobToRun.params, context);
         if (result.action === 'dismiss') {
@@ -81,7 +81,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 +96,20 @@ let Executor = class Executor {
             });
         }
     }
+    async afterExecutionSuccess(job, jobToRun, context) {
+        if (job.type === 'recurrent') {
+            context.logger.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') {
+            context.logger.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 +117,11 @@ let Executor = class Executor {
         const startedAt = new Date();
         const onStale = () => {
             if (job.onStale) {
-                (0, log_1.log)('debug', `Job "${jobToRun.name}" is stale`);
+                context.logger.info(`Job "${jobToRun.name}" is stale`);
                 job.onStale(jobToRun.params, context);
             }
             else {
-                (0, log_1.log)('warn', `Job "${jobToRun.name}" is stale`);
+                context.logger.error(`Job "${jobToRun.name}" is stale`);
             }
             this.saveExecution({
                 startedAt,
@@ -130,13 +144,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, context);
         }
         catch (error) {
             context.clearStaleTimeout();

package/lib/services/WorkerService.js

@@ -15,7 +15,7 @@ const lodash_1 = require("lodash");
 const JobsRepo_1 = require("../repos/JobsRepo");
 const helpers_1 = require("@orion-js/helpers");
 const Executor_1 = require("./Executor");
-const log_1 = require("../log");
+const logger_1 = require("@orion-js/logger");
 let WorkerService = class WorkerService {
     getJobNames(jobs) {
         return Object.keys(jobs);
@@ -30,20 +30,20 @@ let WorkerService = class WorkerService {
     }
     async runWorkerLoop(config) {
         const names = this.getJobNames(config.jobs);
-        (0, log_1.log)('debug', `Running worker loop for jobs "${names.join(', ')}"...`);
+        logger_1.logger.debug(`Running worker loop for jobs "${names.join(', ')}"...`);
         const jobToRun = await this.jobsRepo.getJobAndLock(names, config.lockTime);
         if (!jobToRun) {
-            (0, log_1.log)('debug', 'No job to run');
+            logger_1.logger.debug('No job to run');
             return false;
         }
-        (0, log_1.log)('debug', `Got job to run: ${JSON.stringify(jobToRun)}`);
+        logger_1.logger.info(`Got job to run:`, 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...');
+                logger_1.logger.info('Got signal to stop. Stopping worker...');
                 return;
             }
             try {
@@ -54,7 +54,7 @@ let WorkerService = class WorkerService {
                     await (0, helpers_1.sleep)(config.cooldownPeriod);
             }
             catch (error) {
-                (0, log_1.log)('error', `Error in job runner. Waiting and running again`, error);
+                logger_1.logger.error(`Error in job runner. Waiting and running again`, error);
                 await (0, helpers_1.sleep)(config.pollInterval);
             }
         }
@@ -65,7 +65,7 @@ let WorkerService = class WorkerService {
             workersCount: config.workersCount,
             workers: [],
             stop: async () => {
-                (0, log_1.log)('debug', 'Stopping workers...', workersInstance.workers);
+                logger_1.logger.debug('Stopping workers...', workersInstance.workers);
                 workersInstance.running = false;
                 await Promise.all(workersInstance.workers);
             }
@@ -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}"...`);
+            logger_1.logger.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');
+        logger_1.logger.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}`);
+            logger_1.logger.info(`Starting worker ${workerIndex}`);
             const workerPromise = this.startWorker(config, workersInstance);
             workersInstance.workers.push(workerPromise);
         }
@@ -96,16 +96,14 @@ let WorkerService = class WorkerService {
             cooldownPeriod: 100,
             pollInterval: 3000,
             workersCount: 4,
-            lockTime: 30 * 1000,
-            logLevel: 'info'
+            lockTime: 30 * 1000
         };
         const config = {
             ...defaultConfig,
             ...userConfig
         };
-        (0, log_1.setLogLevel)(config.logLevel);
         const workersInstance = this.createWorkersInstanceDefinition(config);
-        (0, log_1.log)('debug', 'Starting workers', config);
+        logger_1.logger.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/StartConfig.d.ts

@@ -25,8 +25,4 @@ export interface StartWorkersConfig {
      * You can extend this time inside a job by calling extendLockTime from context.
      */
     lockTime: number;
-    /**
-     * logLevel is the level of logging to use. Default is 'info'.
-     */
-    logLevel: LogLevels;
 }

package/lib/types/Worker.d.ts

@@ -1,9 +1,10 @@
+import { OrionLogger } from '@orion-js/logger';
 import { PlainObject } from './HistoryRecord';
 import { JobDefinition } from './JobsDefinition';
 export interface JobToRun {
     jobId: string;
     name: string;
-    isRecurrent: boolean;
+    type: 'event' | 'recurrent';
     params: PlainObject;
     tries: number;
     lockTime: number;
@@ -14,6 +15,7 @@ export interface ExecutionContext {
     record: JobToRun;
     definition: JobDefinition;
     tries: number;
+    logger: OrionLogger;
     extendLockTime: (extraTime: number) => Promise<void>;
     clearStaleTimeout: () => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/dogs",
-  "version": "3.1.0-alpha.7",
+  "version": "3.1.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -22,7 +22,11 @@
     "@orion-js/services": "^3.1.0-alpha.0",
     "@orion-js/typed-model": "^3.0.38"
   },
+  "peerDependencies": {
+    "@orion-js/logger": "3.1.0-alpha.12"
+  },
   "devDependencies": {
+    "@orion-js/logger": "^3.1.0",
     "@shelf/jest-mongodb": "^2.1.0",
     "@types/jest": "^27.0.2",
     "@types/lodash": "4.14.176",
@@ -35,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "101816e8365b70182b9dbcea22f41a9272f5b9c7"
+  "gitHead": "afeb686374cedd6e4b2827e82d3354bff62a48e0"
 }

package/lib/log/index.d.ts

@@ -1,5 +0,0 @@
-import { LogLevels } from '../types/StartConfig';
-export declare let appLogLevel: LogLevels;
-export declare const levelToInt: (level: LogLevels) => 0 | 1 | 2 | 3;
-export declare const log: (level: LogLevels, ...args: any[]) => void;
-export declare const setLogLevel: (level: LogLevels) => void;

package/lib/log/index.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setLogLevel = exports.log = exports.levelToInt = exports.appLogLevel = void 0;
-exports.appLogLevel = 'info';
-const levelToInt = (level) => {
-    switch (level) {
-        case 'debug':
-            return 0;
-        case 'info':
-            return 1;
-        case 'warn':
-            return 2;
-        case 'error':
-            return 3;
-    }
-};
-exports.levelToInt = levelToInt;
-const log = (level, ...args) => {
-    if (exports.appLogLevel === 'none')
-        return;
-    const levelInt = (0, exports.levelToInt)(level);
-    const appLogLevelInt = (0, exports.levelToInt)(exports.appLogLevel);
-    if (levelInt < appLogLevelInt)
-        return;
-    console[level](...args);
-};
-exports.log = log;
-const setLogLevel = (level) => {
-    exports.appLogLevel = level;
-};
-exports.setLogLevel = setLogLevel;