@easyrpa/sheduler 1.0.0 → 1.0.2

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import Bree from "bree";
-import { CollectionType } from "@easyrpa/script-creator/dist/types";
-import { ShedulerMessageType, ShedulerLogger, JobOptionsType } from "./types";
+import { type WorkerOptions } from "node:worker_threads";
+import { CollectionType } from "@easyrpa/script-creator";
 export interface ISheduler {
     pathJobs: string;
     collections: CollectionType[];
@@ -46,3 +46,82 @@ export declare class Sheduler implements ISheduler {
     postMessageCancelWorker(jobOptions: JobOptionsType): void;
     private addWorkerListeners;
 }
+export interface IJob {
+    name: string;
+    path: string;
+    interval: number | string;
+    date?: Date;
+    cron?: string;
+    worker?: Partial<WorkerOptions>;
+    externalData: JobType;
+}
+export declare class Job implements IJob {
+    name: string;
+    path: string;
+    interval: number | string;
+    date?: Date;
+    cron?: string;
+    worker?: Partial<WorkerOptions>;
+    _pythonPath: string;
+    _defaultScriptName: string;
+    constructor(jobOption: JobOptionsType, pathJobs: string, pythonPath: string, defaultScriptName?: string);
+    get externalData(): JobType;
+    private init;
+}
+export type JobOptionsType = {
+    _id: string;
+    name: string;
+    status: JobStatus;
+    logs: JobLogType[];
+    flow: JobFlowType;
+    startDateTime: string;
+    interval?: string;
+    intervalMeasur?: IntervalsJob;
+    intervalValue?: number;
+    weekDays?: number[];
+    yearMonths?: number[];
+    endDateTime?: string;
+};
+export type JobType = {
+    name: string;
+    path: string;
+    interval: number | string;
+    date?: Date;
+    cron?: string;
+    worker?: Partial<WorkerOptions>;
+};
+export declare enum JobStatus {
+    STOPPED = "stopped",
+    RUNNING = "running",
+    WORKING = "working",
+    ERROR = "error"
+}
+export type JobLogType = {
+    category: 'run' | 'stop' | 'message' | 'workerCreated' | 'workerDeleted';
+    date: string;
+    message?: string;
+};
+export type JobFlowType = {
+    name: string;
+    content: string;
+};
+export declare enum IntervalsJob {
+    SECONDS = "seconds",
+    MINUTES = "minutes",
+    HOURS = "hours",
+    DAYS = "days",
+    MONTHS = "months"
+}
+export type ShedulerLogger = {
+    info(...args: string[]): void;
+    log(...args: string[]): void;
+    error(...args: string[]): void;
+    warn(...args: string[]): void;
+};
+export type ShedulerMessageType = {
+    name: string;
+    message: unknown;
+};
+export declare const months: string[];
+export declare const weekDays: string[];
+export declare const getInterval: (jobOption: Partial<JobOptionsType>) => string | undefined;

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sheduler = void 0;
+exports.getInterval = exports.weekDays = exports.months = exports.IntervalsJob = exports.JobStatus = exports.Job = exports.Sheduler = void 0;
 const bree_1 = __importDefault(require("bree"));
 const ts_worker_1 = __importDefault(require("@breejs/ts-worker"));
 bree_1.default.extend(ts_worker_1.default);
@@ -11,7 +11,6 @@ const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
 const crypto_ts_1 = require("crypto-ts");
 const script_creator_1 = require("@easyrpa/script-creator");
-const Job_1 = require("./Job");
 class Sheduler {
     constructor(config, collections) {
         this._logger = config.logger;
@@ -108,7 +107,7 @@ class Sheduler {
             if (initialEndDateTime < now)
                 return;
         }
-        const job = new Job_1.Job(jobOptions, this.pathJobs, this._pythonPath);
+        const job = new Job(jobOptions, this.pathJobs, this._pythonPath);
         await this._sheduler.add(job.externalData);
         await this._sheduler.start(jobOptions._id);
         return job.name;
@@ -129,7 +128,7 @@ class Sheduler {
             }
             return true;
         })
-            .map((jobOptions) => new Job_1.Job(jobOptions, this.pathJobs, this._pythonPath));
+            .map((jobOptions) => new Job(jobOptions, this.pathJobs, this._pythonPath));
         if (jobs.length == 0) {
             return;
         }
@@ -166,3 +165,116 @@ class Sheduler {
     }
 }
 exports.Sheduler = Sheduler;
+class Job {
+    constructor(jobOption, pathJobs, pythonPath, defaultScriptName) {
+        this.name = jobOption._id;
+        this.path = path_1.default.join(process.cwd(), "assets", "scriptFlow.js");
+        this.interval = jobOption.interval || 0;
+        this._pythonPath = pythonPath;
+        this._defaultScriptName = defaultScriptName || 'script.py';
+        this.init(jobOption, pathJobs);
+    }
+    get externalData() {
+        return {
+            name: this.name,
+            path: this.path,
+            interval: this.interval,
+            date: this.date,
+            cron: this.cron,
+            worker: this.worker,
+        };
+    }
+    init(jobOption, pathJobs) {
+        //определение даты начала
+        const initialStartDateTime = new Date(jobOption.startDateTime);
+        const now = new Date();
+        const reserveSeconds = 10;
+        let dateStart = initialStartDateTime >
+            new Date(now.setSeconds(now.getSeconds() + reserveSeconds))
+            ? initialStartDateTime
+            : undefined;
+        if (dateStart) {
+            this.date = dateStart;
+        }
+        this.worker = {
+            workerData: {
+                scriptPythonPath: path_1.default.join(pathJobs, jobOption._id, this._defaultScriptName),
+                pythonPath: this._pythonPath,
+            },
+        };
+    }
+}
+exports.Job = Job;
+var JobStatus;
+(function (JobStatus) {
+    JobStatus["STOPPED"] = "stopped";
+    JobStatus["RUNNING"] = "running";
+    JobStatus["WORKING"] = "working";
+    JobStatus["ERROR"] = "error";
+})(JobStatus || (exports.JobStatus = JobStatus = {}));
+var IntervalsJob;
+(function (IntervalsJob) {
+    IntervalsJob["SECONDS"] = "seconds";
+    IntervalsJob["MINUTES"] = "minutes";
+    IntervalsJob["HOURS"] = "hours";
+    IntervalsJob["DAYS"] = "days";
+    IntervalsJob["MONTHS"] = "months";
+})(IntervalsJob || (exports.IntervalsJob = IntervalsJob = {}));
+//utils
+exports.months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+];
+exports.weekDays = [
+    'Monday',
+    'Tuesday',
+    'Wednesday',
+    'Thursday',
+    'Friday',
+    'Saturday',
+    'Sunday',
+];
+const getInterval = (jobOption) => {
+    if ((jobOption.intervalMeasur && jobOption.intervalValue) || jobOption.weekDays || jobOption.yearMonths) {
+        let builder = '';
+        if (jobOption.intervalMeasur && jobOption.intervalValue) {
+            builder = 'every';
+            switch (jobOption.intervalMeasur) {
+                case IntervalsJob.SECONDS:
+                    builder = `${builder} ${jobOption.intervalValue} seconds`;
+                    break;
+                case IntervalsJob.MINUTES:
+                    builder = `${builder} ${jobOption.intervalValue} minutes`;
+                    break;
+                case IntervalsJob.HOURS:
+                    builder = `${builder} ${jobOption.intervalValue} hours`;
+                    break;
+                case IntervalsJob.DAYS:
+                    builder = `${builder} ${jobOption.intervalValue} day`;
+                    break;
+                case IntervalsJob.MONTHS:
+                    builder = `${builder} ${jobOption.intervalValue} month`;
+                    break;
+            }
+        }
+        if (jobOption.weekDays && jobOption.weekDays.length > 0) {
+            builder = `${builder} on ${jobOption.weekDays.map(wd => exports.weekDays[wd - 1]).join(',')}`;
+        }
+        if (jobOption.yearMonths && jobOption.yearMonths.length > 0) {
+            builder = `${builder} of ${jobOption.yearMonths.map(ym => exports.months[ym - 1]).join(',')} month`;
+        }
+        return builder;
+    }
+    return;
+};
+exports.getInterval = getInterval;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@easyrpa/sheduler",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Sheduler for easy rpa",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc"
+    "build": "rimraf dist && tsc"
   },
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "bree": "^9.2.9",
     "crypto-ts": "^1.0.2"
   },
-    "keywords": [
+  "keywords": [
     "easyrpa",
     "sheduler"
   ],
@@ -38,5 +38,8 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "rimraf": "^6.1.3"
   }
 }

package/dist/Job.d.ts

@@ -1,24 +0,0 @@
-import { JobOptionsType, JobType } from "./types";
-import { type WorkerOptions } from "node:worker_threads";
-export interface IJob {
-    name: string;
-    path: string;
-    interval: number | string;
-    date?: Date;
-    cron?: string;
-    worker?: Partial<WorkerOptions>;
-    externalData: JobType;
-}
-export declare class Job implements IJob {
-    name: string;
-    path: string;
-    interval: number | string;
-    date?: Date;
-    cron?: string;
-    worker?: Partial<WorkerOptions>;
-    _pythonPath: string;
-    _defaultScriptName: string;
-    constructor(jobOption: JobOptionsType, pathJobs: string, pythonPath: string, defaultScriptName?: string);
-    get externalData(): JobType;
-    private init;
-}

package/dist/Job.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Job = void 0;
-const path_1 = __importDefault(require("path"));
-class Job {
-    constructor(jobOption, pathJobs, pythonPath, defaultScriptName) {
-        this.name = jobOption._id;
-        this.path = path_1.default.join(process.cwd(), "assets", "scriptFlow.js");
-        this.interval = jobOption.interval || 0;
-        this._pythonPath = pythonPath;
-        this._defaultScriptName = defaultScriptName || 'script.py';
-        this.init(jobOption, pathJobs);
-    }
-    get externalData() {
-        return {
-            name: this.name,
-            path: this.path,
-            interval: this.interval,
-            date: this.date,
-            cron: this.cron,
-            worker: this.worker,
-        };
-    }
-    init(jobOption, pathJobs) {
-        //определение даты начала
-        const initialStartDateTime = new Date(jobOption.startDateTime);
-        const now = new Date();
-        const reserveSeconds = 10;
-        let dateStart = initialStartDateTime >
-            new Date(now.setSeconds(now.getSeconds() + reserveSeconds))
-            ? initialStartDateTime
-            : undefined;
-        if (dateStart) {
-            this.date = dateStart;
-        }
-        this.worker = {
-            workerData: {
-                scriptPythonPath: path_1.default.join(pathJobs, jobOption._id, this._defaultScriptName),
-                pythonPath: this._pythonPath,
-            },
-        };
-    }
-}
-exports.Job = Job;

package/dist/types.d.ts

@@ -1,54 +0,0 @@
-export type JobOptionsType = {
-    _id: string;
-    name: string;
-    status: JobStatus;
-    logs: JobLogType[];
-    flow: JobFlowType;
-    startDateTime: string;
-    interval?: string;
-    intervalMeasur?: IntervalsJob;
-    intervalValue?: number;
-    weekDays?: number[];
-    yearMonths?: number[];
-    endDateTime?: string;
-};
-export type JobType = {
-    name: string;
-    path: string;
-    interval: number | string;
-    date?: Date;
-    cron?: string;
-    worker?: Partial<WorkerOptions>;
-};
-export declare enum JobStatus {
-    STOPPED = "stopped",
-    RUNNING = "running",
-    WORKING = "working",
-    ERROR = "error"
-}
-export type JobLogType = {
-    category: 'run' | 'stop' | 'message' | 'workerCreated' | 'workerDeleted';
-    date: string;
-    message?: string;
-};
-export type JobFlowType = {
-    name: string;
-    content: string;
-};
-export declare enum IntervalsJob {
-    SECONDS = "seconds",
-    MINUTES = "minutes",
-    HOURS = "hours",
-    DAYS = "days",
-    MONTHS = "months"
-}
-export type ShedulerLogger = {
-    info(...args: string[]): void;
-    log(...args: string[]): void;
-    error(...args: string[]): void;
-    warn(...args: string[]): void;
-};
-export type ShedulerMessageType = {
-    name: string;
-    message: unknown;
-};

package/dist/types.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IntervalsJob = exports.JobStatus = void 0;
-var JobStatus;
-(function (JobStatus) {
-    JobStatus["STOPPED"] = "stopped";
-    JobStatus["RUNNING"] = "running";
-    JobStatus["WORKING"] = "working";
-    JobStatus["ERROR"] = "error";
-})(JobStatus || (exports.JobStatus = JobStatus = {}));
-var IntervalsJob;
-(function (IntervalsJob) {
-    IntervalsJob["SECONDS"] = "seconds";
-    IntervalsJob["MINUTES"] = "minutes";
-    IntervalsJob["HOURS"] = "hours";
-    IntervalsJob["DAYS"] = "days";
-    IntervalsJob["MONTHS"] = "months";
-})(IntervalsJob || (exports.IntervalsJob = IntervalsJob = {}));