@openinc/parse-server-opendash 3.14.8 → 3.14.10

package/dist/functions/openinc-auth-login.js

@@ -31,6 +31,7 @@ async function init(name) {
                 };
             }
             catch (error) {
+                console.error(error);
                 throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, "t:AUTH_INVALID");
             }
         }

package/dist/hooks/Maintenance_Schedule_Execution.js

@@ -16,12 +16,12 @@ async function init() {
     });
     (0, __1.afterSaveHook)(types_1.Maintenance_Schedule_Execution, async (request) => {
         const { object, original, user } = request;
-        // save schedule message to source
-        addMachinelogMessage(object, user);
         //If this is an update, do nothing
         if (original !== undefined) {
             return;
         }
+        // save schedule message to source
+        addMachinelogMessage(object, user);
         //If this is a new object, create all steps from the origin
         const tenant = object.get("tenant")
             ? object.get("tenant")

package/dist/hooks/Maintenance_Schedule_Template.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 const bree_1 = __importDefault(require("bree"));
 const __1 = require("..");
-const cron_1 = __importDefault(require("../features/cron"));
-const initScheduling_1 = require("../features/openservice/schedules/initScheduling");
 const types_1 = require("../types");
 bree_1.default.extend(require("@breejs/ts-worker"));
 async function init() {
@@ -18,22 +16,11 @@ async function init() {
     });
     (0, __1.afterSaveHook)(types_1.Maintenance_Schedule_Template, async (request) => {
         const { object, original, user } = request;
-        await (0, initScheduling_1.addJobToBree)([object]);
     });
     (0, __1.beforeDeleteHook)(types_1.Maintenance_Schedule_Template, async (request) => {
         const { object, original, user } = request;
-        try {
-            //Check if a prenotification is scheduled
-            const notifyBeforeDue = object.get("notifyBeforeDue");
-            // If the notifyBeforeDue field is set, we will schedule a job to run before the due date
-            if (notifyBeforeDue && notifyBeforeDue.value > 0) {
-                await cron_1.default.removeJob(cron_1.default.constructJobName(object.id, "Maintenance_Schedule_Notification_Before_Due"));
-            }
-            await cron_1.default.removeJob(cron_1.default.constructJobName(object.id, "Maintenance_Schedule"));
-        }
-        catch (error) {
-            console.error("Error removing jobs:", error);
-        }
     });
-    (0, __1.afterDeleteHook)(types_1.Maintenance_Schedule_Template, async (request) => { });
+    (0, __1.afterDeleteHook)(types_1.Maintenance_Schedule_Template, async (request) => {
+        const { object, original, user } = request;
+    });
 }

package/dist/index.js

@@ -39,7 +39,6 @@ const notifications_1 = require("./features/notifications");
 const permissions_1 = require("./features/permissions");
 const settings_1 = require("./features/user/settings");
 const Core_Email_1 = require("./hooks/Core_Email");
-const cron_1 = require("./features/cron");
 const openservice_1 = require("./features/openservice");
 const _init_1 = require("./functions/_init");
 const _init_2 = require("./hooks/_init");
@@ -83,7 +82,6 @@ async function init() {
     catch (error) { }
     config = config_1.ConfigInstance.getInstance();
     await config.init(true);
-    await (0, cron_1.init)();
     await initTranslations();
     await (0, Core_Email_1.initEmailTransport)();
     await initWebPush();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "3.14.8",
+  "version": "3.14.10",
   "description": "Parse Server Cloud Code for open.INC Stack.",
   "packageManager": "pnpm@10.13.1",
   "keywords": [

package/dist/features/cron/index.d.ts

@@ -1,5 +0,0 @@
-export { ScheduleCronObjectType, ScheduleType } from "./types/CRON_Types";
-export { JobTypes } from "./types/jobTypes";
-export { TimespanFieldType, TimeUnit } from "./types/notifyBeforeDue";
-export { init } from "./services/initBree";
-export { default } from "./states/BreeInstance";

package/dist/features/cron/index.js

@@ -1,12 +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.default = exports.init = exports.TimeUnit = void 0;
-var notifyBeforeDue_1 = require("./types/notifyBeforeDue");
-Object.defineProperty(exports, "TimeUnit", { enumerable: true, get: function () { return notifyBeforeDue_1.TimeUnit; } });
-var initBree_1 = require("./services/initBree");
-Object.defineProperty(exports, "init", { enumerable: true, get: function () { return initBree_1.init; } });
-var BreeInstance_1 = require("./states/BreeInstance");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(BreeInstance_1).default; } });

package/dist/features/cron/services/initBree.d.ts

@@ -1 +0,0 @@
-export declare function init(): Promise<void>;

package/dist/features/cron/services/initBree.js

@@ -1,19 +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.init = init;
-const __1 = __importDefault(require(".."));
-async function init() {
-    const bree = __1.default.getBree();
-    //Start bree object
-    // const graceful = new Graceful({ brees: [bree] });
-    // graceful.listen();
-    (async () => {
-        console.log("[@openinc/parse-server-opendash] Starting bree");
-        await bree.start();
-        const jobs = __1.default.getAllJobs();
-        console.log("[@openinc/parse-server-opendash] Number of Bree jobs in initialization:", jobs.length);
-    })();
-}

package/dist/features/cron/states/BreeInstance.d.ts

@@ -1,32 +0,0 @@
-import Bree from "bree";
-import { JobTypes, TimespanFieldType } from "..";
-export default class BreeInstance {
-    private static instance;
-    private static jobs;
-    private constructor();
-    static getBree(): Bree;
-    static getAllJobs(): Bree.Job[];
-    /**
-     * Converts a cron-like string into a human-readable format.
-     *
-     * @param value - The cron-like string to convert.
-     * @returns A human-readable string representing the cron-like schedule.
-     */
-    static createHumanReadableFormat(value: string): string;
-    /**
-     * Calculates how much earlier a job should be scheduled based on the user input.
-     * Users can set an offset like "2 weeks" or "3 days" to schedule the job earlier.
-     * This function will substract the offset from startdate and return a new date.
-     */
-    static calculateOffsetToExecution(startdate: Date, notifyBeforeDue: TimespanFieldType): Date;
-    static addJob(newjob: Bree.Job | Omit<Bree.Job, "timeout"> | undefined): Promise<void>;
-    static removeJob(jobName: string): Promise<void>;
-    static getJobByName(jobName: string): Bree.Job | undefined;
-    /**
-     * Constructs a job name based on the schedule ID and job type.
-     * @param id - The ID of the schedule.
-     * @param jobType - The type of the job (e.g., "notification before due").
-     * @returns A string representing the constructed job name.
-     */
-    static constructJobName(id: string, jobType: JobTypes): string;
-}

package/dist/features/cron/states/BreeInstance.js

@@ -1,133 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const bree_1 = __importDefault(require("bree"));
-const dayjs_1 = __importDefault(require("dayjs"));
-const duration_1 = __importDefault(require("dayjs/plugin/duration"));
-dayjs_1.default.extend(duration_1.default);
-class BreeInstance {
-    constructor() { }
-    static getBree() {
-        if (this.instance === null) {
-            // Create a new instance of Bree
-            this.instance = new bree_1.default({
-                // Bree configuration options
-                errorHandler: (error, workerMetadata) => {
-                    console.error(`An error occurred in worker ${workerMetadata.name} with the following error: ${error}`);
-                },
-                workerMessageHandler: (message) => {
-                    console.log(`Worker ${message.name} sent the following message: ${message.message}`);
-                },
-                root: false, //path.join(__dirname, "..", "jobs")
-                jobs: this.jobs,
-                acceptedExtensions: ["js"],
-                defaultExtension: "js",
-                outputWorkerMetadata: false,
-            });
-        }
-        return this.instance;
-    }
-    static getAllJobs() {
-        return this.jobs;
-    }
-    /**
-     * Converts a cron-like string into a human-readable format.
-     *
-     * @param value - The cron-like string to convert.
-     * @returns A human-readable string representing the cron-like schedule.
-     */
-    static createHumanReadableFormat(value) {
-        //value looks like this: "1 1 1 1 1 1 1"
-        //1. seconds
-        //2. minutes
-        //3. hours
-        //4. days
-        //5. weeks
-        //6. months
-        //7. years
-        const valueArray = value.split(" ");
-        //Should be in the format: "every 1 second" when second is 1
-        //If any value is 0, it should be ignored
-        //Values should be separated by a comma
-        const returnArray = [];
-        if (valueArray[0] !== "0") {
-            returnArray.push(`every ${valueArray[0]} seconds`);
-        }
-        if (valueArray[1] !== "0") {
-            returnArray.push(`every ${valueArray[1]} minutes`);
-        }
-        if (valueArray[2] !== "0") {
-            returnArray.push(`every ${valueArray[2]} hours`);
-        }
-        if (valueArray[3] !== "0") {
-            returnArray.push(`every ${valueArray[3]} days`);
-        }
-        if (valueArray[4] !== "0") {
-            returnArray.push(`every ${valueArray[4]} weeks`);
-        }
-        if (valueArray[5] !== "0") {
-            returnArray.push(`every ${valueArray[5]} months`);
-        }
-        if (valueArray[6] !== "0") {
-            returnArray.push(`every ${valueArray[6]} years`);
-        }
-        return returnArray.join(", ");
-    }
-    /**
-     * Calculates how much earlier a job should be scheduled based on the user input.
-     * Users can set an offset like "2 weeks" or "3 days" to schedule the job earlier.
-     * This function will substract the offset from startdate and return a new date.
-     */
-    static calculateOffsetToExecution(startdate, notifyBeforeDue) {
-        const result = (0, dayjs_1.default)(startdate).subtract(dayjs_1.default.duration({ days: notifyBeforeDue.value }));
-        return result.toDate();
-    }
-    static async addJob(newjob) {
-        if (newjob === undefined) {
-            console.error("newjob is undefined");
-            return;
-        }
-        //Get all jobs from bree and check whether the job already exists
-        const jobs = BreeInstance.getAllJobs();
-        let jobExists = false;
-        for (const job of jobs) {
-            if (job.name === newjob.name) {
-                jobExists = true;
-                break;
-            }
-        }
-        if (jobExists) {
-            console.log(`Job with name ${newjob.name} already exists`);
-            return;
-        }
-        console.log(`Adding job with jobname ${newjob.name}`);
-        return await BreeInstance.getBree().add(newjob);
-    }
-    static async removeJob(jobName) {
-        console.log(`Removing job with jobname ${jobName}`);
-        return BreeInstance.getBree().remove(jobName);
-    }
-    static getJobByName(jobName) {
-        const jobs = BreeInstance.getAllJobs();
-        for (const job of jobs) {
-            if (job.name === jobName) {
-                return job;
-            }
-        }
-        return undefined;
-    }
-    /**
-     * Constructs a job name based on the schedule ID and job type.
-     * @param id - The ID of the schedule.
-     * @param jobType - The type of the job (e.g., "notification before due").
-     * @returns A string representing the constructed job name.
-     */
-    static constructJobName(id, jobType) {
-        return `${id}_${jobType}`;
-    }
-}
-BreeInstance.instance = null;
-BreeInstance.jobs = [];
-exports.default = BreeInstance;

package/dist/features/cron/types/CRON_Types.d.ts

@@ -1,10 +0,0 @@
-export type ScheduleType = "quartz" | "human";
-export type ScheduleCronObjectType = {
-    scheduletype: ScheduleType;
-    run_cron: string;
-    run_startdate: Date;
-    run_enddate: Date;
-    is_week: boolean;
-    week_interval: number;
-    is_one_time: boolean;
-};

package/dist/features/cron/types/CRON_Types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/features/cron/types/jobTypes.d.ts

@@ -1,5 +0,0 @@
-/**
- * @description
- * This file contains the types for the job types used in the cron jobs.
- */
-export type JobTypes = "Maintenance_Schedule" | "Maintenance_Schedule_Notification_Before_Due";

package/dist/features/cron/types/jobTypes.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/features/cron/types/notifyBeforeDue.d.ts

@@ -1,14 +0,0 @@
-export declare enum TimeUnit {
-    milliseconds = "milliseconds",
-    seconds = "seconds",
-    minutes = "minutes",
-    hours = "hours",
-    days = "days",
-    weeks = "weeks",
-    months = "months",
-    years = "years"
-}
-export type TimespanFieldType = {
-    value: number;
-    unit: TimeUnit;
-};

package/dist/features/cron/types/notifyBeforeDue.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeUnit = void 0;
-var TimeUnit;
-(function (TimeUnit) {
-    TimeUnit["milliseconds"] = "milliseconds";
-    TimeUnit["seconds"] = "seconds";
-    TimeUnit["minutes"] = "minutes";
-    TimeUnit["hours"] = "hours";
-    TimeUnit["days"] = "days";
-    TimeUnit["weeks"] = "weeks";
-    TimeUnit["months"] = "months";
-    TimeUnit["years"] = "years";
-})(TimeUnit || (exports.TimeUnit = TimeUnit = {}));

package/dist/features/openservice/schedules/initScheduling.d.ts

@@ -1,6 +0,0 @@
-import { Maintenance_Schedule_Template } from "../../../types";
-/**
- * This function is called upon initialization and uses bree to schedule all jobs.
- */
-export declare function initScheduling(): Promise<void>;
-export declare function addJobToBree(query: Maintenance_Schedule_Template[]): Promise<void>;

package/dist/features/openservice/schedules/initScheduling.js

@@ -1,123 +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.initScheduling = initScheduling;
-exports.addJobToBree = addJobToBree;
-const path_1 = __importDefault(require("path"));
-const catchError_1 = require("../../../helper/catchError");
-const types_1 = require("../../../types");
-const cron_1 = __importDefault(require("../../cron"));
-/**
- * This function is called upon initialization and uses bree to schedule all jobs.
- */
-async function initScheduling() {
-    console.log("Init scheduling Maintenance_Schedule_Template jobs");
-    //Get all Maintenance_Schedule_Template objects
-    const [queryError, query] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Schedule_Template).find({
-        useMasterKey: true,
-    }));
-    //Create an new bree object for all Maintenance_Schedule_Template objects that have cron.is_one_time = false
-    if (queryError) {
-        console.error("Error while querying Maintenance_Schedule_Template objects", queryError);
-        return;
-    }
-    await addJobToBree(query);
-}
-async function addJobToBree(query) {
-    for (const schedule of query) {
-        const cron = schedule.get("cron");
-        const notifyBeforeDue = schedule.get("notifyBeforeDue");
-        // If the notifyBeforeDue field is set, we will schedule a job to run before the due date
-        if (notifyBeforeDue && notifyBeforeDue.value > 0) {
-            // Calculate the offset from the start date
-            const startdate = cron_1.default.calculateOffsetToExecution(schedule.get("cron").run_startdate, notifyBeforeDue);
-            //Add a job to bree to run at the calculated date
-            const newjob = {
-                name: cron_1.default.constructJobName(schedule.id, "Maintenance_Schedule_Notification_Before_Due"),
-                path: path_1.default.join(__dirname, "..", "jobs", "open_service_notifyBeforeSchedule.js"),
-                date: startdate,
-                interval: cron.is_one_time
-                    ? 0
-                    : cron_1.default.createHumanReadableFormat(cron.run_cron),
-                hasSeconds: true,
-                worker: {
-                    workerData: {
-                        scheduleId: schedule.id,
-                        ParseAppId: Parse.applicationId,
-                        ParseJSKey: Parse.javaScriptKey,
-                        ParseMasterKey: Parse.masterKey,
-                        ParseServerURL: Parse.serverURL,
-                    },
-                },
-            };
-            await cron_1.default.addJob(newjob);
-        }
-        try {
-            let newjob = undefined;
-            if (cron.is_one_time === false) {
-                if (cron.scheduletype === "human") {
-                    newjob = {
-                        name: cron_1.default.constructJobName(schedule.id, "Maintenance_Schedule"),
-                        date: cron.run_startdate,
-                        path: path_1.default.join(__dirname, "..", "jobs", "open_service_notifyOnSchedule.js"),
-                        interval: cron_1.default.createHumanReadableFormat(cron.run_cron),
-                        hasSeconds: true,
-                        worker: {
-                            workerData: {
-                                scheduleId: schedule.id,
-                                ParseAppId: Parse.applicationId,
-                                ParseJSKey: Parse.javaScriptKey,
-                                ParseMasterKey: Parse.masterKey,
-                                ParseServerURL: Parse.serverURL,
-                            },
-                        },
-                    };
-                }
-                else if (cron.scheduletype === "quartz") {
-                    newjob = {
-                        name: cron_1.default.constructJobName(schedule.id, "Maintenance_Schedule"),
-                        cron: cron.run_cron,
-                        path: path_1.default.join(__dirname, "..", "jobs", "open_service_notifyOnSchedule.js"),
-                        timeout: 0,
-                        interval: 0,
-                        hasSeconds: true,
-                        worker: {
-                            workerData: {
-                                scheduleId: schedule.id,
-                                ParseAppId: Parse.applicationId,
-                                ParseJSKey: Parse.javaScriptKey,
-                                ParseMasterKey: Parse.masterKey,
-                                ParseServerURL: Parse.serverURL,
-                            },
-                        },
-                    };
-                }
-            }
-            else {
-                // If the job is a one time job, we will schedule it to run once
-                newjob = {
-                    name: cron_1.default.constructJobName(schedule.id, "Maintenance_Schedule"),
-                    date: cron.run_startdate,
-                    path: path_1.default.join(__dirname, "..", "jobs", "open_service_notifyOnSchedule.js"),
-                    interval: 0,
-                    hasSeconds: true,
-                    worker: {
-                        workerData: {
-                            scheduleId: schedule.id,
-                            ParseAppId: Parse.applicationId,
-                            ParseJSKey: Parse.javaScriptKey,
-                            ParseMasterKey: Parse.masterKey,
-                            ParseServerURL: Parse.serverURL,
-                        },
-                    },
-                };
-            }
-            await cron_1.default.addJob(newjob);
-        }
-        catch (error) {
-            console.warn(`Error while adding job for schedule ${schedule.id}`, error);
-        }
-    }
-}