@easyrpa/sheduler 1.0.4 → 1.0.6

package/dist/index.d.ts

@@ -3,7 +3,6 @@ import { type WorkerOptions } from "node:worker_threads";
 import { CollectionType } from "@easyrpa/script-creator";
 export interface ISheduler {
     pathJobs: string;
-    collections: CollectionType[];
     runJobs(jobsOptions: JobOptionsType[]): Promise<string[] | undefined>;
     runJob(jobOptions: JobOptionsType): Promise<string | undefined>;
     stopJob(jobOptions: JobOptionsType): Promise<string | undefined>;
@@ -28,12 +27,10 @@ export declare class Sheduler implements ISheduler {
     _sheduler: Bree;
     _encriptKey: string;
     _pythonPath: string;
-    _collections: CollectionType[];
     _onWorkerCreated?: (id: string) => void | Promise<void>;
     _onWorkerDeleted?: (id: string) => void | Promise<void>;
-    constructor(config: ShedulerConfig, collections?: CollectionType[]);
-    get collections(): CollectionType[];
-    set collections(cols: CollectionType[]);
+    handleGetCollections: () => Promise<CollectionType[]>;
+    constructor(config: ShedulerConfig, handleGetCollections: () => Promise<CollectionType[]>);
     prepareJobsDirectory(): Promise<void>;
     createJobsDirectory(): Promise<void>;
     clearJobsDirectory(): Promise<void>;

package/dist/index.js

@@ -1,16 +1,22 @@
-import Bree from "bree";
-import tsWorker from "@breejs/ts-worker";
-Bree.extend(tsWorker);
-import path from "path";
-import fsPromises from "fs/promises";
-import { AES, enc } from "crypto-ts";
-import { ScriptCreator } from "@easyrpa/script-creator";
-export class Sheduler {
-    constructor(config, collections) {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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);
+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");
+class Sheduler {
+    constructor(config, handleGetCollections) {
         this._logger = config.logger;
         this._encriptKey = config.encriptKey;
         this._pythonPath = config.pythonPath;
-        this._sheduler = new Bree({
+        this._sheduler = new bree_1.default({
             root: false,
             jobs: [],
             logger: this._logger,
@@ -28,21 +34,15 @@ export class Sheduler {
         this.pathJobs = config.pathJobs;
         this._onWorkerCreated = config.onWorkerCreated;
         this._onWorkerDeleted = config.onWorkerDeleted;
-        this._collections = collections || [];
+        this.handleGetCollections = handleGetCollections;
         this.prepareJobsDirectory();
         this.addWorkerListeners();
     }
-    get collections() {
-        return this._collections;
-    }
-    set collections(cols) {
-        this._collections = cols;
-    }
     //Подготовка директории со скриптами задач
     async prepareJobsDirectory() {
         //Проверка наличия директории с задачами
         try {
-            await fsPromises.access(this.pathJobs);
+            await promises_1.default.access(this.pathJobs);
             this.clearJobsDirectory();
         }
         catch (err) {
@@ -51,25 +51,25 @@ export class Sheduler {
     }
     //Создание директории со скриптами задач
     async createJobsDirectory() {
-        await fsPromises.mkdir(this.pathJobs, { recursive: true });
+        await promises_1.default.mkdir(this.pathJobs, { recursive: true });
     }
     //Очистка директории со скриптами задач
     async clearJobsDirectory() {
-        await fsPromises.rm(this.pathJobs, { recursive: true });
-        await fsPromises.mkdir(this.pathJobs, { recursive: true });
+        await promises_1.default.rm(this.pathJobs, { recursive: true });
+        await promises_1.default.mkdir(this.pathJobs, { recursive: true });
     }
     //Создание директории одного скрипта
     async createPhytonScript(jobOptions) {
         // создаем директорию phyton скрипта
-        await fsPromises.mkdir(path.join(this.pathJobs, jobOptions._id), {
+        await promises_1.default.mkdir(path_1.default.join(this.pathJobs, jobOptions._id), {
             recursive: true,
         });
         // чтение данных схемы
-        const decryptedData = AES.decrypt(jobOptions.flow.content, this._encriptKey);
-        const dataFlow = JSON.parse(decryptedData.toString(enc.Utf8));
+        const decryptedData = crypto_ts_1.AES.decrypt(jobOptions.flow.content, this._encriptKey);
+        const dataFlow = JSON.parse(decryptedData.toString(crypto_ts_1.enc.Utf8));
         // создаем python скрипт для схемы
-        const scriptCreator = new ScriptCreator(this._collections);
-        const scriptPath = await scriptCreator.createScript(path.join(this.pathJobs, jobOptions._id), dataFlow.nodes, dataFlow.edges);
+        const scriptCreator = new script_creator_1.ScriptCreator(this.handleGetCollections);
+        const scriptPath = await scriptCreator.createScript(path_1.default.join(this.pathJobs, jobOptions._id), dataFlow.nodes, dataFlow.edges);
         return scriptPath;
     }
     //Создание директорий скриптов
@@ -88,8 +88,8 @@ export class Sheduler {
     }
     //Удаление директории одного скрипта
     async deletePhytonScript(jobOptions) {
-        const pathScript = path.join(this.pathJobs, jobOptions._id);
-        await fsPromises.rm(pathScript, { recursive: true });
+        const pathScript = path_1.default.join(this.pathJobs, jobOptions._id);
+        await promises_1.default.rm(pathScript, { recursive: true });
         return pathScript;
     }
     //Запуск задачи
@@ -158,10 +158,11 @@ export class Sheduler {
         });
     }
 }
-export class Job {
+exports.Sheduler = Sheduler;
+class Job {
     constructor(jobOption, pathJobs, pythonPath, defaultScriptName) {
         this.name = jobOption._id;
-        this.path = path.join(process.cwd(), "assets", "scriptFlow.js");
+        this.path = path_1.default.join(process.cwd(), "assets", "scriptFlow.js");
         this.interval = jobOption.interval || 0;
         this._pythonPath = pythonPath;
         this._defaultScriptName = defaultScriptName || 'script.py';
@@ -191,29 +192,30 @@ export class Job {
         }
         this.worker = {
             workerData: {
-                scriptPythonPath: path.join(pathJobs, jobOption._id, this._defaultScriptName),
+                scriptPythonPath: path_1.default.join(pathJobs, jobOption._id, this._defaultScriptName),
                 pythonPath: this._pythonPath,
             },
         };
     }
 }
-export var JobStatus;
+exports.Job = Job;
+var JobStatus;
 (function (JobStatus) {
     JobStatus["STOPPED"] = "stopped";
     JobStatus["RUNNING"] = "running";
     JobStatus["WORKING"] = "working";
     JobStatus["ERROR"] = "error";
-})(JobStatus || (JobStatus = {}));
-export var IntervalsJob;
+})(JobStatus || (exports.JobStatus = JobStatus = {}));
+var IntervalsJob;
 (function (IntervalsJob) {
     IntervalsJob["SECONDS"] = "seconds";
     IntervalsJob["MINUTES"] = "minutes";
     IntervalsJob["HOURS"] = "hours";
     IntervalsJob["DAYS"] = "days";
     IntervalsJob["MONTHS"] = "months";
-})(IntervalsJob || (IntervalsJob = {}));
+})(IntervalsJob || (exports.IntervalsJob = IntervalsJob = {}));
 //utils
-export const months = [
+exports.months = [
     'January',
     'February',
     'March',
@@ -227,7 +229,7 @@ export const months = [
     'November',
     'December',
 ];
-export const weekDays = [
+exports.weekDays = [
     'Monday',
     'Tuesday',
     'Wednesday',
@@ -236,7 +238,7 @@ export const weekDays = [
     'Saturday',
     'Sunday',
 ];
-export const getInterval = (jobOption) => {
+const getInterval = (jobOption) => {
     if ((jobOption.intervalMeasur && jobOption.intervalValue) || jobOption.weekDays || jobOption.yearMonths) {
         let builder = '';
         if (jobOption.intervalMeasur && jobOption.intervalValue) {
@@ -260,12 +262,13 @@ export const getInterval = (jobOption) => {
             }
         }
         if (jobOption.weekDays && jobOption.weekDays.length > 0) {
-            builder = `${builder} on ${jobOption.weekDays.map(wd => weekDays[wd - 1]).join(',')}`;
+            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 => months[ym - 1]).join(',')} month`;
+            builder = `${builder} of ${jobOption.yearMonths.map(ym => exports.months[ym - 1]).join(',')} month`;
         }
         return builder;
     }
     return;
 };
+exports.getInterval = getInterval;

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@easyrpa/sheduler",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "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": "rimraf dist && tsc"
@@ -26,7 +25,7 @@
   ],
   "dependencies": {
     "@breejs/ts-worker": "^2.0.0",
-    "@easyrpa/script-creator": "^1.0.2",
+    "@easyrpa/script-creator": "^1.0.10",
     "bree": "^9.2.9",
     "crypto-ts": "^1.0.2"
   },