@orion-js/dogs 3.2.1 → 3.2.4

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import { ScheduleJobOptions } from './types/Events';
 import { JobsHistoryRepo } from './repos/JobsHistoryRepo';
 import { JobsRepo } from './repos/JobsRepo';
 export * from './types';
+export * from './service';
 declare const jobsHistoryRepo: JobsHistoryRepo;
 declare const jobsRepo: JobsRepo;
 declare const startWorkers: (config: Partial<StartWorkersConfig>) => import("./types").WorkersInstance;

package/lib/index.js

@@ -19,6 +19,7 @@ const WorkerService_1 = require("./services/WorkerService");
 const JobsHistoryRepo_1 = require("./repos/JobsHistoryRepo");
 const JobsRepo_1 = require("./repos/JobsRepo");
 __exportStar(require("./types"), exports);
+__exportStar(require("./service"), exports);
 const workerService = (0, services_1.getInstance)(WorkerService_1.WorkerService);
 const eventsService = (0, services_1.getInstance)(EventsService_1.EventsService);
 const jobsHistoryRepo = (0, services_1.getInstance)(JobsHistoryRepo_1.JobsHistoryRepo);

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 {
-    history: import("@orion-js/mongodb").Collection<HistoryRecord>;
+    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/JobsHistoryRepo.js

@@ -13,7 +13,7 @@ const lodash_1 = require("lodash");
 const HistoryRecord_1 = require("../types/HistoryRecord");
 let JobsHistoryRepo = class JobsHistoryRepo {
     constructor() {
-        this.history = (0, mongodb_1.createCollection)({
+        this.history = () => (0, mongodb_1.createCollection)({
             name: 'orionjs.jobs_dogs_history',
             model: HistoryRecord_1.HistoryRecord,
             indexes: [
@@ -35,7 +35,7 @@ let JobsHistoryRepo = class JobsHistoryRepo {
         });
     }
     async saveExecution(record) {
-        await this.history.upsert({ executionId: record.executionId }, {
+        await this.history().upsert({ executionId: record.executionId }, {
             $setOnInsert: {
                 status: record.status
             },
@@ -45,7 +45,7 @@ let JobsHistoryRepo = class JobsHistoryRepo {
         });
     }
     async getExecutions(jobName, limit, skip) {
-        const cursor = this.history.find({ jobName }).sort({ startedAt: -1 });
+        const cursor = this.history().find({ jobName }).sort({ startedAt: -1 });
         if (skip) {
             cursor.skip(skip);
         }

package/lib/repos/JobsRepo.d.ts

@@ -3,7 +3,7 @@ import { JobRecord } from '../types/JobRecord';
 import { JobDefinitionWithName } from '../types/JobsDefinition';
 import { JobToRun } from '../types/Worker';
 export declare class JobsRepo {
-    jobs: import("@orion-js/mongodb").Collection<JobRecord>;
+    jobs: () => import("@orion-js/mongodb").Collection<JobRecord>;
     getJobAndLock(jobNames: string[], lockTime: number): Promise<JobToRun>;
     setJobRecordPriority(jobId: string, priority: number): Promise<void>;
     scheduleNextRun(options: {

package/lib/repos/JobsRepo.js

@@ -15,7 +15,7 @@ const lodash_1 = require("lodash");
 const JobRecord_1 = require("../types/JobRecord");
 let JobsRepo = class JobsRepo {
     constructor() {
-        this.jobs = (0, mongodb_1.createCollection)({
+        this.jobs = () => (0, mongodb_1.createCollection)({
             name: 'orionjs.jobs_dogs_records',
             model: JobRecord_1.JobRecord,
             indexes: [
@@ -50,7 +50,7 @@ let JobsRepo = class JobsRepo {
     }
     async getJobAndLock(jobNames, lockTime) {
         const lockedUntil = new Date(Date.now() + lockTime);
-        const job = await this.jobs.findOneAndUpdate({
+        const job = await this.jobs().findOneAndUpdate({
             jobName: { $in: jobNames },
             nextRunAt: { $lte: new Date() },
             $or: [{ lockedUntil: { $exists: false } }, { lockedUntil: { $lte: new Date() } }]
@@ -70,7 +70,7 @@ let JobsRepo = class JobsRepo {
         let tries = job.tries || 1;
         if (job.lockedUntil) {
             logger_1.logger.info(`Running job "${job.jobName}" that was staled`);
-            this.jobs.updateOne(job._id, { $inc: { tries: 1 } });
+            this.jobs().updateOne(job._id, { $inc: { tries: 1 } });
             tries++;
         }
         return {
@@ -86,7 +86,7 @@ let JobsRepo = class JobsRepo {
         };
     }
     async setJobRecordPriority(jobId, priority) {
-        await this.jobs.updateOne(jobId, { $set: { priority } });
+        await this.jobs().updateOne(jobId, { $set: { priority } });
     }
     async scheduleNextRun(options) {
         const updator = {
@@ -96,22 +96,22 @@ let JobsRepo = class JobsRepo {
         if (options.addTries) {
             updator.$inc = { tries: 1 };
         }
-        await this.jobs.updateOne(options.jobId, updator);
+        await this.jobs().updateOne(options.jobId, updator);
     }
     async deleteEventJob(jobId) {
-        await this.jobs.deleteOne({ _id: jobId, type: 'event' });
+        await this.jobs().deleteOne({ _id: jobId, type: 'event' });
     }
     async extendLockTime(jobId, extraTime) {
         const lockedUntil = new Date(Date.now() + extraTime);
-        await this.jobs.updateOne({
+        await this.jobs().updateOne({
             _id: jobId
         }, {
             $set: { lockedUntil }
         });
     }
     async ensureJobRecord(job) {
-        await this.jobs.connectionPromise;
-        const result = await this.jobs.upsert({
+        await this.jobs().connectionPromise;
+        const result = await this.jobs().upsert({
             jobName: job.name
         }, {
             $set: {
@@ -131,7 +131,7 @@ let JobsRepo = class JobsRepo {
     }
     async scheduleJob(options) {
         try {
-            await this.jobs.insertOne({
+            await this.jobs().insertOne({
                 jobName: options.name,
                 uniqueIdentifier: options.uniqueIdentifier,
                 params: options.params,

package/lib/service/index.d.ts

@@ -0,0 +1,9 @@
+import { JobDefinition } from '../types';
+export declare function Jobs(): ClassDecorator;
+export interface JobsPropertyDescriptor extends Omit<PropertyDecorator, 'value'> {
+    value?: JobDefinition['resolve'];
+}
+export declare function Job(options: Omit<JobDefinition, 'resolve'>): (target: any, propertyKey: string, descriptor: JobsPropertyDescriptor) => void;
+export declare function getServiceJobs(target: any): {
+    [key: string]: JobDefinition;
+};

package/lib/service/index.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServiceJobs = exports.Job = exports.Jobs = void 0;
+const services_1 = require("@orion-js/services");
+const defineJob_1 = require("../defineJob");
+function Jobs() {
+    return function (target) {
+        (0, services_1.Service)()(target);
+        target.prototype.service = target;
+    };
+}
+exports.Jobs = Jobs;
+function Job(options) {
+    return function (target, propertyKey, descriptor) {
+        if (!descriptor.value)
+            throw new Error(`You must pass resolver function to ${propertyKey}`);
+        target.echoes = target.echoes || {};
+        target.echoes[propertyKey] = (0, defineJob_1.defineJob)({
+            ...options,
+            resolve: async (params, viewer) => {
+                const instance = (0, services_1.getInstance)(target.service);
+                return await instance[propertyKey](params, viewer);
+            }
+        });
+    };
+}
+exports.Job = Job;
+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/service/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/service/index.test.js

@@ -0,0 +1,37 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
+describe('Jobs (dogs) with service injections', () => {
+    it('Should define a jobs map using services', async () => {
+        let ExampleJobsService = class ExampleJobsService {
+            async job1() {
+                return {};
+            }
+        };
+        __decorate([
+            (0, _1.Job)({ type: 'event' }),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Promise)
+        ], ExampleJobsService.prototype, "job1", null);
+        ExampleJobsService = __decorate([
+            (0, _1.Jobs)()
+        ], ExampleJobsService);
+        const jobs = (0, _1.getServiceJobs)(ExampleJobsService);
+        expect(jobs).toMatchObject({
+            job1: {
+                type: 'event',
+                resolve: expect.any(Function)
+            }
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/dogs",
-  "version": "3.2.1",
+  "version": "3.2.4",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.2.0",
-    "@orion-js/mongodb": "^3.2.1",
+    "@orion-js/mongodb": "^3.2.4",
     "@orion-js/services": "^3.2.0",
-    "@orion-js/typed-model": "^3.2.1"
+    "@orion-js/typed-model": "^3.2.4"
   },
   "peerDependencies": {
     "@orion-js/logger": "3.1.0-alpha.12"
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "582bfdbd33b30a1259cc2c35f46111992aeeff81"
+  "gitHead": "a1c4cff581b31f24896ec96a0a180d043dbf802a"
 }