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

package/lib/history.test.js

@@ -26,7 +26,7 @@ describe('Test Jobs History', () => {
         });
         await (0, helpers_1.sleep)(100);
         await instance.stop();
-        const executions = await _1.jobsHistory.getExecutions(jobId);
+        const executions = await _1.jobsHistoryRepo.getExecutions(jobId);
         expect(executions.length).toBe(1);
         const execution = executions[0];
         expect(execution.duration).toBeGreaterThan(49);
@@ -68,7 +68,7 @@ describe('Test Jobs History', () => {
         });
         await (0, helpers_1.sleep)(100);
         await instance.stop();
-        const executions = await _1.jobsHistory.getExecutions(jobId);
+        const executions = await _1.jobsHistoryRepo.getExecutions(jobId);
         expect(executions.length).toBe(1);
         const execution = executions[0];
         expect(execution).toEqual({
@@ -110,7 +110,7 @@ describe('Test Jobs History', () => {
         });
         await (0, helpers_1.sleep)(150);
         await instance.stop();
-        const executions = await _1.jobsHistory.getExecutions(jobId);
+        const executions = await _1.jobsHistoryRepo.getExecutions(jobId);
         expect(executions.length).toBe(2);
         const execution1 = executions[1];
         expect(execution1.duration).toBeGreaterThanOrEqual(10);

package/lib/index.d.ts

@@ -2,7 +2,10 @@ import { defineJob } from './defineJob';
 import { StartWorkersConfig } from './types/StartConfig';
 import { ScheduleJobOptions } from './types/Events';
 import { JobsHistoryRepo } from './repos/JobsHistoryRepo';
-declare const jobsHistory: JobsHistoryRepo;
-declare const startWorkers: (config: Partial<StartWorkersConfig>) => import("./types/Worker").WorkersInstance;
+import { JobsRepo } from './repos/JobsRepo';
+export * from './types';
+declare const jobsHistoryRepo: JobsHistoryRepo;
+declare const jobsRepo: JobsRepo;
+declare const startWorkers: (config: Partial<StartWorkersConfig>) => import("./types").WorkersInstance;
 declare const scheduleJob: (options: ScheduleJobOptions) => Promise<void>;
-export { defineJob, startWorkers, scheduleJob, jobsHistory };
+export { defineJob, startWorkers, scheduleJob, jobsHistoryRepo, jobsRepo };

package/lib/index.js

@@ -1,16 +1,30 @@
 "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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jobsHistory = exports.scheduleJob = exports.startWorkers = exports.defineJob = void 0;
+exports.jobsRepo = exports.jobsHistoryRepo = exports.scheduleJob = exports.startWorkers = exports.defineJob = void 0;
 const services_1 = require("@orion-js/services");
 const defineJob_1 = require("./defineJob");
 Object.defineProperty(exports, "defineJob", { enumerable: true, get: function () { return defineJob_1.defineJob; } });
 const EventsService_1 = require("./services/EventsService");
 const WorkerService_1 = require("./services/WorkerService");
 const JobsHistoryRepo_1 = require("./repos/JobsHistoryRepo");
+const JobsRepo_1 = require("./repos/JobsRepo");
+__exportStar(require("./types"), exports);
 const workerService = (0, services_1.getInstance)(WorkerService_1.WorkerService);
 const eventsService = (0, services_1.getInstance)(EventsService_1.EventsService);
-const jobsHistory = (0, services_1.getInstance)(JobsHistoryRepo_1.JobsHistoryRepo);
-exports.jobsHistory = jobsHistory;
+const jobsHistoryRepo = (0, services_1.getInstance)(JobsHistoryRepo_1.JobsHistoryRepo);
+exports.jobsHistoryRepo = jobsHistoryRepo;
+const jobsRepo = (0, services_1.getInstance)(JobsRepo_1.JobsRepo);
+exports.jobsRepo = jobsRepo;
 const startWorkers = (config) => {
     return workerService.startWorkers(config);
 };

package/lib/repos/JobsHistoryRepo.d.ts

@@ -1,7 +1,7 @@
 import { ModelToDocumentTypeWithoutId } from '@orion-js/mongodb';
 import { HistoryRecord } from '../types/HistoryRecord';
 export declare class JobsHistoryRepo {
-    private history;
+    history: import("@orion-js/mongodb").Collection<HistoryRecord>;
     saveExecution(record: ModelToDocumentTypeWithoutId<HistoryRecord>): Promise<void>;
     getExecutions(jobName: string, limit?: number, skip?: number): Promise<HistoryRecord[]>;
 }

package/lib/repos/JobsRepo.d.ts

@@ -1,8 +1,9 @@
 import { ScheduleJobRecordOptions } from '../types/Events';
+import { JobRecord } from '../types/JobRecord';
 import { JobDefinitionWithName } from '../types/JobsDefinition';
 import { JobToRun } from '../types/Worker';
 export declare class JobsRepo {
-    private jobs;
+    jobs: import("@orion-js/mongodb").Collection<JobRecord>;
     getJobAndLock(jobNames: string[], lockTime: number): Promise<JobToRun>;
     scheduleNextRun(options: {
         jobId: string;

package/lib/services/getNextRunDate.d.ts

@@ -1,7 +1,9 @@
-export interface Options {
+export declare type Options = {
     getNextRun?: () => Date;
     runIn?: number;
     runEvery?: number;
     runAt?: Date;
-}
+} & {
+    [key: string]: any;
+};
 export declare const getNextRunDate: (options: Options) => Date;

package/lib/services/getNextRunDate.js

@@ -11,6 +11,9 @@ const getNextRunDate = (options) => {
     if (options.runAt) {
         return options.runAt;
     }
-    return options.getNextRun();
+    if (options.getNextRun) {
+        return options.getNextRun();
+    }
+    return new Date();
 };
 exports.getNextRunDate = getNextRunDate;

package/lib/types/Events.d.ts

@@ -11,7 +11,7 @@ export declare type ScheduleJobOptionsRunIn = ScheduleJobOptionsBase & {
 export declare type ScheduleJobOptionsRunAt = ScheduleJobOptionsBase & {
     runAt: Date;
 };
-export declare type ScheduleJobOptions = ScheduleJobOptionsRunIn | ScheduleJobOptionsRunAt;
+export declare type ScheduleJobOptions = ScheduleJobOptionsRunIn | ScheduleJobOptionsRunAt | ScheduleJobOptionsBase;
 export interface ScheduleJobRecordOptions {
     name: string;
     params: PlainObject;

package/lib/types/JobsDefinition.d.ts

@@ -9,7 +9,7 @@ export declare type JobRetryResultRunIn = JobRetryResultBase & {
 export declare type JobRetryResultRunAt = JobRetryResultBase & {
     runAt: Date;
 };
-export declare type JobRetryResult = JobRetryResultRunIn | JobRetryResultRunAt;
+export declare type JobRetryResult = JobRetryResultRunIn | JobRetryResultRunAt | JobRetryResultBase;
 export interface BaseJobDefinition {
     /**
      * The function to execute when the job is executed.

package/lib/types/index.d.ts

@@ -0,0 +1,6 @@
+export * from './Events';
+export * from './HistoryRecord';
+export * from './JobRecord';
+export * from './JobsDefinition';
+export * from './StartConfig';
+export * from './Worker';

package/lib/types/index.js

@@ -0,0 +1,18 @@
+"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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Events"), exports);
+__exportStar(require("./HistoryRecord"), exports);
+__exportStar(require("./JobRecord"), exports);
+__exportStar(require("./JobsDefinition"), exports);
+__exportStar(require("./StartConfig"), exports);
+__exportStar(require("./Worker"), exports);

package/package.json

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