@orion-js/dogs 3.11.15 → 4.0.0-alpha.3

package/package.json

@@ -1,44 +1,45 @@
 {
   "name": "@orion-js/dogs",
-  "version": "3.11.15",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "version": "4.0.0-alpha.3",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "import": "./dist/index.js",
+    "require": "./dist/index.cjs"
+  },
   "files": [
-    "/lib"
+    "dist"
   ],
   "author": "nicolaslopezj",
   "license": "MIT",
   "scripts": {
-    "test": "jest",
-    "prepare": "yarn run build",
-    "clean": "rm -rf ./lib",
-    "build": "yarn run clean && tsc",
-    "watch": "tsc -w",
-    "upgrade-interactive": "yarn upgrade-interactive"
+    "test": "bun test",
+    "build": "bun run build.ts",
+    "dev": "bun --watch src/index.ts",
+    "clean": "rm -rf ./dist"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@orion-js/helpers": "^3.11.15",
-    "@orion-js/mongodb": "^3.11.15",
-    "@orion-js/services": "^3.11.15",
-    "@orion-js/typed-model": "^3.11.15"
+    "@orion-js/helpers": "^4.0.0-alpha.2",
+    "@orion-js/mongodb": "^4.0.0-alpha.2",
+    "@orion-js/services": "^4.0.0-alpha.2",
+    "@orion-js/typed-model": "^4.0.0-alpha.2"
   },
   "peerDependencies": {
     "@orion-js/logger": "*"
   },
   "devDependencies": {
-    "@orion-js/logger": "^3.11.8",
-    "@shelf/jest-mongodb": "^4.3.2",
-    "@types/jest": "^29.5.12",
+    "@types/bun": "^1.2.4",
+    "@orion-js/logger": "^4.0.0-alpha.2",
     "@types/lodash": "4.14.176",
-    "@types/node": "16.11.7",
-    "jest": "29.7.0",
     "reflect-metadata": "^0.1.13",
-    "ts-jest": "29.1.2",
     "typescript": "^5.4.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a5c95d9fd18f779c834644eb757928cdb840643c"
-}
+  "gitHead": "2d14bc085d49a33b2a5566bec1caf60c7d0f897e"
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Orionjs Team
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/lib/defineJob/index.d.ts

@@ -1,2 +0,0 @@
-import { JobDefinition } from '../types/JobsDefinition';
-export declare const defineJob: (options: JobDefinition) => JobDefinition;

package/lib/defineJob/index.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineJob = void 0;
-const defineJob = (options) => {
-    if (options.type === 'recurrent') {
-        if (!options.hasOwnProperty('priority')) {
-            options.priority = 100;
-        }
-    }
-    return options;
-};
-exports.defineJob = defineJob;

package/lib/events.test.d.ts

@@ -1 +0,0 @@
-import 'reflect-metadata';

package/lib/events.test.js

@@ -1,133 +0,0 @@
-"use strict";
-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;
-        const job3 = (0, _1.defineJob)({
-            type: 'event',
-            async resolve(params) {
-                count += params.add;
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { job3 },
-            workersCount: 1,
-            pollInterval: 10,
-            cooldownPeriod: 10
-        });
-        expect(count).toBe(0);
-        await (0, _1.scheduleJob)({
-            name: 'job3',
-            params: { add: 5 },
-            runIn: 1
-        });
-        await (0, _1.scheduleJob)({
-            name: 'job3',
-            params: { add: 25 },
-            runIn: 1
-        });
-        await (0, helpers_1.sleep)(100);
-        await instance.stop();
-        expect(count).toBe(30);
-    });
-    it('Should run retry the job 3 times', async () => {
-        let passes = false;
-        const job4 = (0, _1.defineJob)({
-            type: 'event',
-            async resolve(params, context) {
-                if (context.tries < 3) {
-                    throw new Error('Failed');
-                }
-                passes = true;
-            },
-            async onError() {
-                return {
-                    action: 'retry',
-                    runIn: 1
-                };
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { job4 },
-            workersCount: 1,
-            pollInterval: 10,
-            cooldownPeriod: 10
-        });
-        expect(passes).toBe(false);
-        await (0, _1.scheduleJob)({
-            name: 'job4',
-            runIn: 1
-        });
-        await (0, helpers_1.sleep)(100);
-        await instance.stop();
-        expect(passes).toBe(true);
-    });
-    it('Should throw locktime error and test extendLockTime', async () => {
-        const jobId = (0, helpers_1.generateId)();
-        let ranCount = 0;
-        let staleCount = 0;
-        const job = (0, _1.defineJob)({
-            type: 'event',
-            async resolve(params, context) {
-                if (context.tries === 2) {
-                    context.extendLockTime(10000);
-                }
-                await (0, helpers_1.sleep)(100);
-                ranCount++;
-            },
-            async onStale(params, context) {
-                expect(context.tries).toBe(1);
-                staleCount++;
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { [jobId]: job },
-            workersCount: 2,
-            pollInterval: 10,
-            cooldownPeriod: 10,
-            lockTime: 10
-        });
-        await (0, _1.scheduleJob)({
-            name: jobId,
-            runIn: 1
-        });
-        await (0, helpers_1.sleep)(300);
-        await instance.stop();
-        expect(staleCount).toBe(1);
-        expect(ranCount).toBe(2);
-    });
-    it('Should only schedule one job with uniqueIdentifier', async () => {
-        const jobId = (0, helpers_1.generateId)();
-        let ranCount = 0;
-        const job = (0, _1.defineJob)({
-            type: 'event',
-            async resolve() {
-                ranCount++;
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { [jobId]: job },
-            workersCount: 1,
-            pollInterval: 10,
-            cooldownPeriod: 10
-        });
-        await (0, _1.scheduleJob)({
-            name: jobId,
-            runIn: 1,
-            uniqueIdentifier: 'unique'
-        });
-        await (0, _1.scheduleJob)({
-            name: jobId,
-            runIn: 1,
-            uniqueIdentifier: 'unique'
-        });
-        await (0, helpers_1.sleep)(50);
-        await instance.stop();
-        expect(ranCount).toBe(1);
-    });
-});

package/lib/history.test.d.ts

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

package/lib/history.test.js

@@ -1,140 +0,0 @@
-"use strict";
-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)('none');
-describe('Test Jobs History', () => {
-    it('Should save success history types', async () => {
-        const jobId = (0, helpers_1.generateId)();
-        const job = (0, _1.defineJob)({
-            type: 'event',
-            async resolve() {
-                await (0, helpers_1.sleep)(50);
-                return {
-                    number: 1
-                };
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { [jobId]: job },
-            workersCount: 1,
-            pollInterval: 10
-        });
-        await (0, _1.scheduleJob)({
-            name: jobId,
-            runIn: 1,
-            params: { id: 2 }
-        });
-        await (0, helpers_1.sleep)(100);
-        await instance.stop();
-        const executions = await _1.jobsHistoryRepo.getExecutions(jobId);
-        expect(executions.length).toBe(1);
-        const execution = executions[0];
-        expect(execution.duration).toBeGreaterThan(49);
-        expect(execution).toEqual({
-            _id: expect.any(String),
-            jobId: expect.any(String),
-            executionId: expect.any(String),
-            jobName: jobId,
-            type: 'event',
-            priority: 100,
-            tries: 1,
-            startedAt: expect.any(Date),
-            endedAt: expect.any(Date),
-            duration: expect.any(Number),
-            expiresAt: expect.any(Date),
-            status: 'success',
-            errorMessage: null,
-            params: { id: 2 },
-            result: { number: 1 }
-        });
-    });
-    it('Should save error history types', async () => {
-        const jobId = (0, helpers_1.generateId)();
-        const job = (0, _1.defineJob)({
-            type: 'event',
-            async resolve() {
-                throw new Error('Hello');
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { [jobId]: job },
-            workersCount: 1,
-            pollInterval: 10
-        });
-        await (0, _1.scheduleJob)({
-            name: jobId,
-            runIn: 1,
-            params: { id: 4 }
-        });
-        await (0, helpers_1.sleep)(100);
-        await instance.stop();
-        const executions = await _1.jobsHistoryRepo.getExecutions(jobId);
-        expect(executions.length).toBe(1);
-        const execution = executions[0];
-        expect(execution).toEqual({
-            _id: expect.any(String),
-            jobId: expect.any(String),
-            executionId: expect.any(String),
-            jobName: jobId,
-            type: 'event',
-            priority: 100,
-            tries: 1,
-            startedAt: expect.any(Date),
-            endedAt: expect.any(Date),
-            duration: expect.any(Number),
-            expiresAt: expect.any(Date),
-            status: 'error',
-            errorMessage: 'Hello',
-            params: { id: 4 },
-            result: null
-        });
-    });
-    it('Should save stale history types', async () => {
-        const jobId = (0, helpers_1.generateId)();
-        const job = (0, _1.defineJob)({
-            type: 'event',
-            async resolve(_, context) {
-                if (context.tries === 1) {
-                    await (0, helpers_1.sleep)(100);
-                }
-                return { status: 'ok' };
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { [jobId]: job },
-            workersCount: 1,
-            pollInterval: 10,
-            lockTime: 10
-        });
-        await (0, _1.scheduleJob)({
-            name: jobId,
-            runIn: 1
-        });
-        await (0, helpers_1.sleep)(150);
-        await instance.stop();
-        const executions = await _1.jobsHistoryRepo.getExecutions(jobId);
-        expect(executions.length).toBe(2);
-        const execution = executions.find(e => e.status === 'stale');
-        expect(execution.duration).toBeGreaterThanOrEqual(100);
-        expect(execution.duration).toBeLessThan(200);
-        expect(execution).toEqual({
-            _id: expect.any(String),
-            jobId: expect.any(String),
-            executionId: expect.any(String),
-            jobName: jobId,
-            type: 'event',
-            priority: 100,
-            tries: 1,
-            startedAt: expect.any(Date),
-            endedAt: expect.any(Date),
-            duration: expect.any(Number),
-            expiresAt: expect.any(Date),
-            status: 'stale',
-            errorMessage: null,
-            params: null,
-            result: { status: 'ok' }
-        });
-    });
-});

package/lib/index.d.ts

@@ -1,12 +0,0 @@
-import { defineJob } from './defineJob';
-import { StartWorkersConfig } from './types/StartConfig';
-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;
-declare const scheduleJob: (options: ScheduleJobOptions) => Promise<void>;
-export { defineJob, startWorkers, scheduleJob, jobsHistoryRepo, jobsRepo };

package/lib/index.js

@@ -1,40 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-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.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);
-__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);
-exports.jobsHistoryRepo = jobsHistoryRepo;
-const jobsRepo = (0, services_1.getInstance)(JobsRepo_1.JobsRepo);
-exports.jobsRepo = jobsRepo;
-const startWorkers = (config) => {
-    return workerService.startWorkers(config);
-};
-exports.startWorkers = startWorkers;
-const scheduleJob = (options) => {
-    return eventsService.scheduleJob(options);
-};
-exports.scheduleJob = scheduleJob;

package/lib/recurrent.test.d.ts

@@ -1 +0,0 @@
-import 'reflect-metadata';

package/lib/recurrent.test.js

@@ -1,47 +0,0 @@
-"use strict";
-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;
-        const job1 = (0, _1.defineJob)({
-            type: 'recurrent',
-            runEvery: 1000,
-            async resolve() {
-                ran = true;
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { job1 },
-            workersCount: 1,
-            pollInterval: 100,
-            cooldownPeriod: 100
-        });
-        await (0, helpers_1.sleep)(500);
-        await instance.stop();
-        expect(ran).toBe(true);
-    });
-    it('Should run a recurrent job 3 times', async () => {
-        let count = 0;
-        const job2 = (0, _1.defineJob)({
-            type: 'recurrent',
-            runEvery: 20,
-            async resolve() {
-                count++;
-            }
-        });
-        const instance = (0, _1.startWorkers)({
-            jobs: { job2 },
-            workersCount: 1,
-            pollInterval: 10,
-            cooldownPeriod: 10
-        });
-        await (0, helpers_1.sleep)(200);
-        await instance.stop();
-        expect(count).toBeGreaterThanOrEqual(3);
-    });
-});

package/lib/repos/JobsHistoryRepo.d.ts

@@ -1,7 +0,0 @@
-import { ModelToDocumentTypeWithoutId } from '@orion-js/mongodb';
-import { HistoryRecord } from '../types/HistoryRecord';
-export declare class JobsHistoryRepo {
-    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

@@ -1,67 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobsHistoryRepo = void 0;
-const mongodb_1 = require("@orion-js/mongodb");
-const services_1 = require("@orion-js/services");
-const lodash_1 = require("lodash");
-const HistoryRecord_1 = require("../types/HistoryRecord");
-let JobsHistoryRepo = class JobsHistoryRepo {
-    constructor() {
-        this.history = () => (0, mongodb_1.createCollection)({
-            name: 'orionjs.jobs_dogs_history',
-            idGeneration: 'uuid',
-            model: HistoryRecord_1.HistoryRecord,
-            indexes: [
-                {
-                    keys: {
-                        jobName: 1,
-                        startedAt: 1
-                    }
-                },
-                {
-                    keys: {
-                        executionId: 1
-                    }
-                },
-                {
-                    keys: {
-                        expiresAt: 1
-                    },
-                    options: {
-                        expireAfterSeconds: 0
-                    }
-                }
-            ]
-        });
-    }
-    async saveExecution(record) {
-        await this.history().upsert({ executionId: record.executionId }, {
-            $setOnInsert: {
-                status: record.status
-            },
-            $set: {
-                ...(0, lodash_1.omit)(record, 'status')
-            }
-        });
-    }
-    async getExecutions(jobName, limit, skip) {
-        const cursor = this.history().find({ jobName }).sort({ startedAt: -1 });
-        if (skip) {
-            cursor.skip(skip);
-        }
-        if (limit) {
-            cursor.limit(limit);
-        }
-        return await cursor.toArray();
-    }
-};
-exports.JobsHistoryRepo = JobsHistoryRepo;
-exports.JobsHistoryRepo = JobsHistoryRepo = __decorate([
-    (0, services_1.Service)()
-], JobsHistoryRepo);

package/lib/repos/JobsRepo.d.ts

@@ -1,19 +0,0 @@
-import { ScheduleJobRecordOptions } from '../types/Events';
-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>;
-    getJobAndLock(jobNames: string[], lockTime: number): Promise<JobToRun>;
-    setJobRecordPriority(jobId: string, priority: number): Promise<void>;
-    scheduleNextRun(options: {
-        jobId: string;
-        nextRunAt: Date;
-        addTries: boolean;
-        priority: number;
-    }): Promise<void>;
-    deleteEventJob(jobId: string): Promise<void>;
-    extendLockTime(jobId: string, extraTime: number): Promise<void>;
-    ensureJobRecord(job: JobDefinitionWithName): Promise<void>;
-    scheduleJob(options: ScheduleJobRecordOptions): Promise<void>;
-}