@orion-js/dogs 3.11.6 → 3.11.8

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/repos/JobsHistoryRepo.js

@@ -61,7 +61,7 @@ let JobsHistoryRepo = class JobsHistoryRepo {
         return await cursor.toArray();
     }
 };
-JobsHistoryRepo = __decorate([
+exports.JobsHistoryRepo = JobsHistoryRepo;
+exports.JobsHistoryRepo = JobsHistoryRepo = __decorate([
     (0, services_1.Service)()
 ], JobsHistoryRepo);
-exports.JobsHistoryRepo = JobsHistoryRepo;

package/lib/repos/JobsRepo.js

@@ -152,7 +152,7 @@ let JobsRepo = class JobsRepo {
         }
     }
 };
-JobsRepo = __decorate([
+exports.JobsRepo = JobsRepo;
+exports.JobsRepo = JobsRepo = __decorate([
     (0, services_1.Service)()
 ], JobsRepo);
-exports.JobsRepo = JobsRepo;

package/lib/service/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceJobs = exports.EventJob = exports.RecurrentJob = exports.Jobs = void 0;
+exports.Jobs = Jobs;
+exports.RecurrentJob = RecurrentJob;
+exports.EventJob = EventJob;
+exports.getServiceJobs = getServiceJobs;
 const services_1 = require("@orion-js/services");
 const defineJob_1 = require("../defineJob");
 function Jobs() {
@@ -9,7 +12,6 @@ function Jobs() {
         target.prototype.service = target;
     };
 }
-exports.Jobs = Jobs;
 function RecurrentJob(options) {
     return function (target, propertyKey, descriptor) {
         if (!descriptor.value)
@@ -25,7 +27,6 @@ function RecurrentJob(options) {
         });
     };
 }
-exports.RecurrentJob = RecurrentJob;
 function EventJob(options = {}) {
     return function (target, propertyKey, descriptor) {
         if (!descriptor.value)
@@ -41,11 +42,9 @@ function EventJob(options = {}) {
         });
     };
 }
-exports.EventJob = EventJob;
 function getServiceJobs(target) {
     if (!target.prototype) {
         throw new Error('You must pass a class to getServiceRoutes');
     }
     return target.prototype.echoes || {};
 }
-exports.getServiceJobs = getServiceJobs;

package/lib/services/EventsService.js

@@ -26,11 +26,11 @@ let EventsService = class EventsService {
         });
     }
 };
+exports.EventsService = EventsService;
 __decorate([
     (0, services_1.Inject)(),
     __metadata("design:type", JobsRepo_1.JobsRepo)
 ], EventsService.prototype, "jobsRepo", void 0);
-EventsService = __decorate([
+exports.EventsService = EventsService = __decorate([
     (0, services_1.Service)()
 ], EventsService);
-exports.EventsService = EventsService;

package/lib/services/Executor.d.ts

@@ -2,8 +2,8 @@ import { PlainObject } from '../types/HistoryRecord';
 import { JobDefinition, JobsDefinition } from '../types/JobsDefinition';
 import { ExecutionContext, JobToRun } from '../types/Worker';
 export declare class Executor {
-    private jobsRepo;
-    private jobsHistoryRepo;
+    private readonly jobsRepo;
+    private readonly jobsHistoryRepo;
     getContext(job: JobDefinition, jobToRun: JobToRun, onStale: Function): ExecutionContext;
     getJobDefinition(jobToRun: JobToRun, jobs: JobsDefinition): JobDefinition;
     onError(error: any, job: JobDefinition, jobToRun: JobToRun, context: ExecutionContext): Promise<void>;

package/lib/services/Executor.js

@@ -15,6 +15,7 @@ const services_1 = require("@orion-js/services");
 const JobsHistoryRepo_1 = require("../repos/JobsHistoryRepo");
 const JobsRepo_1 = require("../repos/JobsRepo");
 const getNextRunDate_1 = require("./getNextRunDate");
+const api_1 = require("@opentelemetry/api");
 let Executor = class Executor {
     getContext(job, jobToRun, onStale) {
         let staleTimeout = setTimeout(() => onStale(), jobToRun.lockTime);
@@ -30,8 +31,8 @@ let Executor = class Executor {
             },
             logger: logger_1.logger.addMetadata({
                 jobName: jobToRun.name,
-                jobId: jobToRun.jobId
-            })
+                jobId: jobToRun.jobId,
+            }),
         };
     }
     getJobDefinition(jobToRun, jobs) {
@@ -49,7 +50,7 @@ let Executor = class Executor {
                     jobId: jobToRun.jobId,
                     nextRunAt: (0, getNextRunDate_1.getNextRunDate)(job),
                     addTries: false,
-                    priority: job.priority
+                    priority: job.priority,
                 });
             }
         };
@@ -58,9 +59,7 @@ let Executor = class Executor {
             await scheduleRecurrent();
             return;
         }
-        else {
-            context.logger.info(`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') {
             await scheduleRecurrent();
@@ -71,7 +70,7 @@ let Executor = class Executor {
                 jobId: jobToRun.jobId,
                 nextRunAt: (0, getNextRunDate_1.getNextRunDate)(result),
                 addTries: true,
-                priority: job.type === 'recurrent' ? job.priority : jobToRun.priority
+                priority: job.type === 'recurrent' ? job.priority : jobToRun.priority,
             });
         }
     }
@@ -96,7 +95,7 @@ let Executor = class Executor {
                 status,
                 errorMessage,
                 params: jobToRun.params,
-                result
+                result,
             });
         }
     }
@@ -107,7 +106,7 @@ let Executor = class Executor {
                 jobId: jobToRun.jobId,
                 nextRunAt: (0, getNextRunDate_1.getNextRunDate)(job),
                 addTries: false,
-                priority: job.priority
+                priority: job.priority,
             });
         }
         if (job.type === 'event') {
@@ -119,54 +118,70 @@ let Executor = class Executor {
         const job = this.getJobDefinition(jobToRun, jobs);
         if (!job)
             return;
-        const startedAt = new Date();
-        const onStale = async () => {
-            if (job.onStale) {
-                context.logger.info(`Job "${jobToRun.name}" is stale`);
-                job.onStale(jobToRun.params, context);
+        const tracer = api_1.trace.getTracer('orionjs.dogs', '1.0');
+        await tracer.startActiveSpan(`job.${jobToRun.name}.${jobToRun.executionId}`, async (span) => {
+            try {
+                const startedAt = new Date();
+                const onStale = async () => {
+                    if (job.onStale) {
+                        context.logger.info(`Job "${jobToRun.name}" is stale`);
+                        job.onStale(jobToRun.params, context);
+                    }
+                    else {
+                        context.logger.error(`Job "${jobToRun.name}" is stale`);
+                    }
+                    await this.jobsRepo.setJobRecordPriority(jobToRun.jobId, 0);
+                    respawnWorker();
+                    this.saveExecution({
+                        startedAt,
+                        status: 'stale',
+                        result: null,
+                        errorMessage: null,
+                        job,
+                        jobToRun,
+                    });
+                };
+                const context = this.getContext(job, jobToRun, onStale);
+                try {
+                    const result = await job.resolve(jobToRun.params, context);
+                    context.clearStaleTimeout();
+                    this.saveExecution({
+                        startedAt,
+                        status: 'success',
+                        result: result || null,
+                        errorMessage: null,
+                        job,
+                        jobToRun,
+                    });
+                    await this.afterExecutionSuccess(job, jobToRun, context);
+                }
+                catch (error) {
+                    context.clearStaleTimeout();
+                    this.saveExecution({
+                        startedAt,
+                        status: 'error',
+                        result: null,
+                        errorMessage: error.message,
+                        job,
+                        jobToRun,
+                    });
+                    await this.onError(error, job, jobToRun, context);
+                }
             }
-            else {
-                context.logger.error(`Job "${jobToRun.name}" is stale`);
+            catch (error) {
+                span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: error.message,
+                });
+                throw error;
             }
-            await this.jobsRepo.setJobRecordPriority(jobToRun.jobId, 0);
-            respawnWorker();
-            this.saveExecution({
-                startedAt,
-                status: 'stale',
-                result: null,
-                errorMessage: null,
-                job,
-                jobToRun
-            });
-        };
-        const context = this.getContext(job, jobToRun, onStale);
-        try {
-            const result = await job.resolve(jobToRun.params, context);
-            context.clearStaleTimeout();
-            this.saveExecution({
-                startedAt,
-                status: 'success',
-                result: result || null,
-                errorMessage: null,
-                job,
-                jobToRun
-            });
-            await this.afterExecutionSuccess(job, jobToRun, context);
-        }
-        catch (error) {
-            context.clearStaleTimeout();
-            this.saveExecution({
-                startedAt,
-                status: 'error',
-                result: null,
-                errorMessage: error.message,
-                job,
-                jobToRun
-            });
-            await this.onError(error, job, jobToRun, context);
-        }
+            finally {
+                span.end();
+            }
+        });
     }
 };
+exports.Executor = Executor;
 __decorate([
     (0, services_1.Inject)(),
     __metadata("design:type", JobsRepo_1.JobsRepo)
@@ -175,7 +190,6 @@ __decorate([
     (0, services_1.Inject)(),
     __metadata("design:type", JobsHistoryRepo_1.JobsHistoryRepo)
 ], Executor.prototype, "jobsHistoryRepo", void 0);
-Executor = __decorate([
+exports.Executor = Executor = __decorate([
     (0, services_1.Service)()
 ], Executor);
-exports.Executor = Executor;

package/lib/services/WorkerService.js

@@ -128,6 +128,7 @@ let WorkerService = class WorkerService {
         return workersInstance;
     }
 };
+exports.WorkerService = WorkerService;
 __decorate([
     (0, services_1.Inject)(),
     __metadata("design:type", JobsRepo_1.JobsRepo)
@@ -136,7 +137,6 @@ __decorate([
     (0, services_1.Inject)(),
     __metadata("design:type", Executor_1.Executor)
 ], WorkerService.prototype, "executor", void 0);
-WorkerService = __decorate([
+exports.WorkerService = WorkerService = __decorate([
     (0, services_1.Service)()
 ], WorkerService);
-exports.WorkerService = WorkerService;

package/lib/services/getNextRunDate.d.ts

@@ -1,4 +1,4 @@
-export declare type Options = {
+export type Options = {
     getNextRun?: () => Date;
     runIn?: number;
     runEvery?: number;

package/lib/types/Events.d.ts

@@ -5,13 +5,13 @@ export interface ScheduleJobOptionsBase {
     priority?: number;
     uniqueIdentifier?: string;
 }
-export declare type ScheduleJobOptionsRunIn = ScheduleJobOptionsBase & {
+export type ScheduleJobOptionsRunIn = ScheduleJobOptionsBase & {
     runIn: number;
 };
-export declare type ScheduleJobOptionsRunAt = ScheduleJobOptionsBase & {
+export type ScheduleJobOptionsRunAt = ScheduleJobOptionsBase & {
     runAt: Date;
 };
-export declare type ScheduleJobOptions = ScheduleJobOptionsRunIn | ScheduleJobOptionsRunAt | ScheduleJobOptionsBase;
+export type ScheduleJobOptions = ScheduleJobOptionsRunIn | ScheduleJobOptionsRunAt | ScheduleJobOptionsBase;
 export interface ScheduleJobRecordOptions {
     name: string;
     params: PlainObject;

package/lib/types/HistoryRecord.d.ts

@@ -1,4 +1,4 @@
-export declare type PlainObject = {
+export type PlainObject = {
     [name: string]: any;
 };
 export declare class HistoryRecord {

package/lib/types/HistoryRecord.js

@@ -13,6 +13,7 @@ exports.HistoryRecord = void 0;
 const typed_model_1 = require("@orion-js/typed-model");
 let HistoryRecord = class HistoryRecord {
 };
+exports.HistoryRecord = HistoryRecord;
 __decorate([
     (0, typed_model_1.Prop)(),
     __metadata("design:type", String)
@@ -77,7 +78,6 @@ __decorate([
     (0, typed_model_1.Prop)({ type: 'blackbox', optional: true }),
     __metadata("design:type", Object)
 ], HistoryRecord.prototype, "result", void 0);
-HistoryRecord = __decorate([
+exports.HistoryRecord = HistoryRecord = __decorate([
     (0, typed_model_1.TypedModel)()
 ], HistoryRecord);
-exports.HistoryRecord = HistoryRecord;

package/lib/types/JobRecord.js

@@ -13,6 +13,7 @@ exports.JobRecord = void 0;
 const typed_model_1 = require("@orion-js/typed-model");
 let JobRecord = class JobRecord {
 };
+exports.JobRecord = JobRecord;
 __decorate([
     (0, typed_model_1.Prop)(),
     __metadata("design:type", String)
@@ -53,7 +54,6 @@ __decorate([
     (0, typed_model_1.Prop)({ type: 'blackbox', optional: true }),
     __metadata("design:type", Object)
 ], JobRecord.prototype, "params", void 0);
-JobRecord = __decorate([
+exports.JobRecord = JobRecord = __decorate([
     (0, typed_model_1.TypedModel)()
 ], JobRecord);
-exports.JobRecord = JobRecord;

package/lib/types/JobsDefinition.d.ts

@@ -3,13 +3,13 @@ import { ExecutionContext } from './Worker';
 export interface JobRetryResultBase {
     action: 'retry' | 'dismiss';
 }
-export declare type JobRetryResultRunIn = JobRetryResultBase & {
+export type JobRetryResultRunIn = JobRetryResultBase & {
     runIn: number;
 };
-export declare type JobRetryResultRunAt = JobRetryResultBase & {
+export type JobRetryResultRunAt = JobRetryResultBase & {
     runAt: Date;
 };
-export declare type JobRetryResult = JobRetryResultRunIn | JobRetryResultRunAt | JobRetryResultBase;
+export type JobRetryResult = JobRetryResultRunIn | JobRetryResultRunAt | JobRetryResultBase;
 export interface BaseJobDefinition {
     /**
      * The function to execute when the job is executed.
@@ -52,8 +52,8 @@ export interface EventJobDefinition extends BaseJobDefinition {
      */
     type: 'event';
 }
-export declare type JobDefinition = RecurrentJobDefinition | EventJobDefinition;
-export declare type JobDefinitionWithName = JobDefinition & {
+export type JobDefinition = RecurrentJobDefinition | EventJobDefinition;
+export type JobDefinitionWithName = JobDefinition & {
     name: string;
 };
 export interface JobsDefinition {

package/lib/types/StartConfig.d.ts

@@ -1,5 +1,5 @@
 import { JobsDefinition } from './JobsDefinition';
-export declare type LogLevels = 'debug' | 'info' | 'warn' | 'error' | 'none';
+export type LogLevels = 'debug' | 'info' | 'warn' | 'error' | 'none';
 export interface StartWorkersConfig {
     /**
      * Object map of the jobs that this workers will execute

package/lib/types/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/dogs",
-  "version": "3.11.6",
+  "version": "3.11.8",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -17,16 +17,17 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
-    "@orion-js/helpers": "^3.11.6",
-    "@orion-js/mongodb": "^3.11.6",
-    "@orion-js/services": "^3.11.6",
-    "@orion-js/typed-model": "^3.11.6"
+    "@opentelemetry/api": "^1.9.0",
+    "@orion-js/helpers": "^3.11.8",
+    "@orion-js/mongodb": "^3.11.8",
+    "@orion-js/services": "^3.11.8",
+    "@orion-js/typed-model": "^3.11.8"
   },
   "peerDependencies": {
     "@orion-js/logger": "*"
   },
   "devDependencies": {
-    "@orion-js/logger": "^3.11.6",
+    "@orion-js/logger": "^3.11.8",
     "@shelf/jest-mongodb": "^4.3.2",
     "@types/jest": "^29.5.12",
     "@types/lodash": "4.14.176",
@@ -34,10 +35,10 @@
     "jest": "29.7.0",
     "reflect-metadata": "^0.1.13",
     "ts-jest": "29.1.2",
-    "typescript": "^4.4.4"
+    "typescript": "^5.4.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "04323e40315251064616cece5fba54bf378917aa"
+  "gitHead": "78d70ac414964ec657cc000cedfad8a5efff5cc3"
 }