@webtypen/webframez-core 0.3.52 → 0.3.54

package/dist/Backup/BackupOutputDrivers.d.ts

@@ -5,6 +5,7 @@ declare class BackupOutputDriversFacade {
     };
     constructor();
     register(name: string, driver: any): this;
+    private registerCommands;
     get(name: string): BaseBackupOutputDriver;
     keys(): string[];
 }

package/dist/Backup/BackupOutputDrivers.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackupOutputDrivers = void 0;
 const LocalBackupOutputDriver_1 = require("./OutputDrivers/LocalBackupOutputDriver");
+const SystemCommands_1 = require("../Commands/SystemCommands");
 class BackupOutputDriversFacade {
     constructor() {
         this.drivers = {};
@@ -9,8 +10,16 @@ class BackupOutputDriversFacade {
     }
     register(name, driver) {
         this.drivers[name] = driver;
+        this.registerCommands(driver);
         return this;
     }
+    registerCommands(driver) {
+        const commands = (driver === null || driver === void 0 ? void 0 : driver.commands) || (driver === null || driver === void 0 ? void 0 : driver.consoleCommands);
+        if (!commands) {
+            return;
+        }
+        SystemCommands_1.SystemCommands.register(commands);
+    }
     get(name) {
         const driverClass = this.drivers[name];
         if (!driverClass) {

package/dist/Commands/QueueWorkerCommand.d.ts

@@ -10,6 +10,7 @@ export declare class QueueWorkerCommand extends ConsoleCommand {
     autorestart: boolean;
     workerOperationId: string | null;
     workerHadError: boolean;
+    lastAutomationCheckAt: any;
     jobsExecuted: number;
     jobsSucceeded: number;
     jobsFailed: number;
@@ -30,7 +31,11 @@ export declare class QueueWorkerCommand extends ConsoleCommand {
     }): void;
     getWorkerAutomation(): any[];
     getWorkerJobclasses(): any[] | null;
-    checkWorkerAutomation(): any;
+    private getWorkerTimezone;
+    private getAutomationExecutionPayload;
+    private createAutomationEntry;
+    private pushIfDue;
+    checkWorkerAutomation(since?: any, until?: any): any;
     runAutomation(): Promise<void>;
     getNextJobNumber(connection: any): Promise<number>;
     checkStop(): boolean;

package/dist/Commands/QueueWorkerCommand.js

@@ -38,6 +38,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
         this.autorestart = false;
         this.workerOperationId = null;
         this.workerHadError = false;
+        this.lastAutomationCheckAt = null;
         // Statistics
         this.jobsExecuted = 0;
         this.jobsSucceeded = 0;
@@ -306,14 +307,38 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
         }
         return jobclasses;
     }
-    checkWorkerAutomation() {
+    getWorkerTimezone() {
+        return this.workerConfig.timezone ? this.workerConfig.timezone : "Europe/Berlin";
+    }
+    getAutomationExecutionPayload(automation, options) {
+        return automation.payload || (options && options.payload)
+            ? Object.assign(Object.assign({}, (automation.payload ? automation.payload : {})), (options && options.payload ? options.payload : {})) : null;
+    }
+    createAutomationEntry(automation, type, value, options, executionIdentifier, executionKey, dueAt) {
+        return Object.assign(Object.assign({}, automation), { _execution: {
+                key: `${automation.jobclass}_${executionKey}${executionIdentifier ? "_" + executionIdentifier : ""}_${dueAt.format("YYYY-MM-DD_HH:mm")}`,
+                type: type,
+                value: value,
+                identifier: executionIdentifier,
+                scheduled_at: dueAt.toDate(),
+                payload: this.getAutomationExecutionPayload(automation, options),
+            } });
+    }
+    pushIfDue(out, entryFactory, dueAt, since, until) {
+        if (dueAt.isAfter(since) && !dueAt.isAfter(until)) {
+            out.push(entryFactory(dueAt));
+        }
+    }
+    checkWorkerAutomation(since, until) {
         const workerAutomation = this.getWorkerAutomation();
         if (!workerAutomation || workerAutomation.length < 1) {
             return null;
         }
         const out = [];
         const days = DateFunctions_1.DateFunctions.getDays();
-        const now = (0, moment_timezone_1.default)().tz(this.workerConfig.timezone ? this.workerConfig.timezone : "Europe/Berlin");
+        const timezone = this.getWorkerTimezone();
+        const now = until ? until.clone().tz(timezone) : (0, moment_timezone_1.default)().tz(timezone);
+        const checkedSince = since ? since.clone().tz(timezone) : now.clone().startOf("minute").subtract(1, "millisecond");
         let automationIndex = -1;
         for (let automation of workerAutomation) {
             automationIndex++;
@@ -357,61 +382,58 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                 const useType = days.includes(type) ? "day_in_week" : type;
                 const executionKey = type + "-" + (value !== undefined && value !== null ? value : "0");
                 const executionIdentifier = options && options.identifier ? options.identifier : automation.identifier ? automation.identifier : null;
-                const intervalKey = `${automation.jobclass}_${executionKey}${executionIdentifier ? "_" + executionIdentifier : ""}_${now.format("YYYY-MM-DD_HH:mm")}`;
+                const entryFactory = (dueAt, executionValue = value) => this.createAutomationEntry(automation, type, executionValue, options, executionIdentifier, executionKey, dueAt);
                 switch (useType) {
-                    case "every_hour":
-                        if (parseInt(now.format("mm")) === parseInt(value && !isNaN(parseInt(value)) ? value : "0")) {
-                            out.push(Object.assign(Object.assign({}, automation), { _execution: {
-                                    key: intervalKey,
-                                    type: type,
-                                    value: parseInt(value),
-                                    identifier: executionIdentifier,
-                                    payload: automation.payload || (options && options.payload)
-                                        ? Object.assign(Object.assign({}, (automation.payload ? automation.payload : {})), (options.payload ? options.payload : {})) : null,
-                                } }));
+                    case "every_hour": {
+                        const minute = parseInt(value && !isNaN(parseInt(value)) ? value : "0");
+                        let dueAt = checkedSince.clone().startOf("hour").minute(minute).second(0).millisecond(0);
+                        if (!dueAt.isAfter(checkedSince)) {
+                            dueAt.add(1, "hour");
+                        }
+                        while (!dueAt.isAfter(now)) {
+                            this.pushIfDue(out, (entryDueAt) => entryFactory(entryDueAt, minute), dueAt, checkedSince, now);
+                            dueAt = dueAt.clone().add(1, "hour");
                         }
                         break;
-                    case "every_x_mins":
+                    }
+                    case "every_x_mins": {
                         const intervalMinutes = parseInt(value);
-                        const diffMins = now.diff((0, moment_timezone_1.default)()
-                            .tz(this.workerConfig.timezone ? this.workerConfig.timezone : "Europe/Berlin")
-                            .startOf("day"), "minutes");
-                        if (diffMins % intervalMinutes === 0) {
-                            out.push(Object.assign(Object.assign({}, automation), { _execution: {
-                                    key: intervalKey,
-                                    type: type,
-                                    value: value,
-                                    identifier: executionIdentifier,
-                                    payload: automation.payload || (options && options.payload)
-                                        ? Object.assign(Object.assign({}, (automation.payload ? automation.payload : {})), (options.payload ? options.payload : {})) : null,
-                                } }));
+                        let dueAt = checkedSince.clone().startOf("minute").second(0).millisecond(0);
+                        if (!dueAt.isAfter(checkedSince)) {
+                            dueAt.add(1, "minute");
+                        }
+                        while (!dueAt.isAfter(now)) {
+                            const diffMins = dueAt.diff(dueAt.clone().startOf("day"), "minutes");
+                            if (diffMins % intervalMinutes === 0) {
+                                this.pushIfDue(out, entryFactory, dueAt, checkedSince, now);
+                            }
+                            dueAt = dueAt.clone().add(1, "minute");
                         }
                         break;
-                    case "daily":
-                        if (now.format("HH:mm") === value) {
-                            out.push(Object.assign(Object.assign({}, automation), { _execution: {
-                                    key: intervalKey,
-                                    type: type,
-                                    value: value,
-                                    identifier: executionIdentifier,
-                                    payload: automation.payload || (options && options.payload)
-                                        ? Object.assign(Object.assign({}, (automation.payload ? automation.payload : {})), (options.payload ? options.payload : {})) : null,
-                                } }));
+                    }
+                    case "daily": {
+                        let day = checkedSince.clone().startOf("day");
+                        const endDay = now.clone().startOf("day");
+                        while (!day.isAfter(endDay)) {
+                            const dueAt = moment_timezone_1.default.tz(`${day.format("YYYY-MM-DD")} ${value}`, "YYYY-MM-DD HH:mm", timezone);
+                            this.pushIfDue(out, entryFactory, dueAt, checkedSince, now);
+                            day = day.clone().add(1, "day");
                         }
                         break;
-                    case "day_in_week":
-                        if ((now.format("dddd").toLowerCase() === type || now.format("dddd").toLowerCase() + "s" === type) &&
-                            now.format("HH:mm") === value) {
-                            out.push(Object.assign(Object.assign({}, automation), { _execution: {
-                                    key: intervalKey,
-                                    type: type,
-                                    value: value,
-                                    identifier: executionIdentifier,
-                                    payload: automation.payload || (options && options.payload)
-                                        ? Object.assign(Object.assign({}, (automation.payload ? automation.payload : {})), (options.payload ? options.payload : {})) : null,
-                                } }));
+                    }
+                    case "day_in_week": {
+                        const isoWeekday = days.indexOf(type) + 1;
+                        let day = checkedSince.clone().startOf("day");
+                        const endDay = now.clone().startOf("day");
+                        while (!day.isAfter(endDay)) {
+                            if (day.isoWeekday() === isoWeekday) {
+                                const dueAt = moment_timezone_1.default.tz(`${day.format("YYYY-MM-DD")} ${value}`, "YYYY-MM-DD HH:mm", timezone);
+                                this.pushIfDue(out, entryFactory, dueAt, checkedSince, now);
+                            }
+                            day = day.clone().add(1, "day");
                         }
                         break;
+                    }
                 }
             }
         }
@@ -430,7 +452,12 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                         automationChecking = false;
                         break;
                     }
-                    const checkAutomation = this.checkWorkerAutomation();
+                    const now = (0, moment_timezone_1.default)().tz(this.getWorkerTimezone());
+                    const checkedSince = this.lastAutomationCheckAt
+                        ? this.lastAutomationCheckAt.clone()
+                        : now.clone().startOf("minute").subtract(1, "millisecond");
+                    this.lastAutomationCheckAt = now.clone();
+                    const checkAutomation = this.checkWorkerAutomation(checkedSince, now);
                     if (!checkAutomation || checkAutomation.length < 1) {
                         yield this.wait(5000);
                         continue;

package/dist/Commands/SystemCommands.d.ts

@@ -0,0 +1,8 @@
+declare class SystemCommandsFacade {
+    private commands;
+    private registered;
+    register(data: any): this;
+    getCommands(): any[];
+}
+export declare const SystemCommands: SystemCommandsFacade;
+export {};

package/dist/Commands/SystemCommands.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SystemCommands = void 0;
+class SystemCommandsFacade {
+    constructor() {
+        this.commands = [];
+        this.registered = {};
+    }
+    register(data) {
+        const commands = Array.isArray(data) ? data : [data];
+        for (const command of commands) {
+            if (!command || !command.signature || this.registered[command.signature]) {
+                continue;
+            }
+            this.registered[command.signature] = true;
+            this.commands.push(command);
+        }
+        return this;
+    }
+    getCommands() {
+        return this.commands;
+    }
+}
+exports.SystemCommands = new SystemCommandsFacade();

package/dist/ConsoleApplication.d.ts

@@ -2,6 +2,7 @@ import { ModulesLoader } from "./Modules/ModulesLoader";
 export declare class ConsoleApplication {
     modulesLoader: ModulesLoader | null;
     systemCommands: any;
+    constructor();
     /**
      * Init the routes and start the http-server
      */

package/dist/ConsoleApplication.js

@@ -29,6 +29,7 @@ const BackupRunCommand_1 = require("./Commands/BackupRunCommand");
 const BackupQueueCommand_1 = require("./Commands/BackupQueueCommand");
 const BackupCleanupCommand_1 = require("./Commands/BackupCleanupCommand");
 const BackupRunJob_1 = require("./Backup/Jobs/BackupRunJob");
+const SystemCommands_1 = require("./Commands/SystemCommands");
 const ModulesLoader_1 = require("./Modules/ModulesLoader");
 class ConsoleApplication {
     constructor() {
@@ -46,6 +47,7 @@ class ConsoleApplication {
             QueueWorkerAutorestartCommand_1.QueueWorkerAutorestartCommand,
             BuildFinishCommand_1.BuildFinishCommand,
         ];
+        SystemCommands_1.SystemCommands.register(this.systemCommands);
     }
     /**
      * Init the routes and start the http-server
@@ -120,7 +122,7 @@ class ConsoleApplication {
     getCommand(signature, options) {
         if (!signature || signature.trim() === "")
             return null;
-        for (let command of this.systemCommands) {
+        for (let command of SystemCommands_1.SystemCommands.getCommands()) {
             if (command.signature === signature) {
                 return command;
             }
@@ -174,7 +176,7 @@ class ConsoleApplication {
         let maxSignatureLength = 15;
         const groups = {};
         // Load system commands
-        for (let command of this.systemCommands) {
+        for (let command of SystemCommands_1.SystemCommands.getCommands()) {
             if (!command || !command.signature || command.hidden)
                 continue;
             let groupKey = " ";

package/dist/index.d.ts

@@ -37,6 +37,7 @@ export * from "./Backup/Jobs/BackupRunJob";
 export * from "./Backup/OutputDrivers/BaseBackupOutputDriver";
 export * from "./Backup/OutputDrivers/LocalBackupOutputDriver";
 export * from "./Commands/ConsoleOutputHelper";
+export * from "./Commands/SystemCommands";
 export * from "./Modules/ModuleProvider";
 export * from "./ErrorHandling/ErrorHandler";
 export * from "./Hooks/WebframezHooks";

package/dist/index.js

@@ -53,6 +53,7 @@ __exportStar(require("./Backup/Jobs/BackupRunJob"), exports);
 __exportStar(require("./Backup/OutputDrivers/BaseBackupOutputDriver"), exports);
 __exportStar(require("./Backup/OutputDrivers/LocalBackupOutputDriver"), exports);
 __exportStar(require("./Commands/ConsoleOutputHelper"), exports);
+__exportStar(require("./Commands/SystemCommands"), exports);
 __exportStar(require("./Modules/ModuleProvider"), exports);
 __exportStar(require("./ErrorHandling/ErrorHandler"), exports);
 __exportStar(require("./Hooks/WebframezHooks"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.52",
+    "version": "0.3.54",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",