@fdm-monster/server 1.8.3 → 1.9.0

package/dist/services/{core/task-manager.service.js → task-manager.service.js}

@@ -10,65 +10,28 @@ Object.defineProperty(exports, "TaskManagerService", {
 });
 const _toadscheduler = require("toad-scheduler");
 const _awilix = require("awilix");
-const _jobexceptions = require("../../exceptions/job.exceptions");
-const _containertokens = require("../../container.tokens");
+const _jobexceptions = require("../exceptions/job.exceptions");
+const _errorutils = require("../utils/error.utils");
 class TaskManagerService {
-    jobScheduler;
-    taskStates = {};
-    cradle;
+    cradleService;
+    toadScheduler;
+    taskStates;
     logger;
-    constructor(container){
-        this.cradle = container;
-        this.logger = container[_containertokens.DITokens.loggerFactory](TaskManagerService.name);
-        this.jobScheduler = container[_containertokens.DITokens.toadScheduler];
+    constructor(loggerFactory, cradleService, toadScheduler){
+        this.cradleService = cradleService;
+        this.toadScheduler = toadScheduler;
+        this.taskStates = {};
+        this.logger = loggerFactory(TaskManagerService.name);
     }
-    validateInput(taskId, workload, schedulerOptions) {
-        if (!taskId) {
-            throw new _jobexceptions.JobValidationException("Task ID was not provided. Cant register task or schedule job.", taskId);
-        }
-        const prefix = `Job '${workload?.name || "anonymous"}' with ID '${taskId}'`;
-        if (!!this.taskStates[taskId]) {
-            throw new _jobexceptions.JobValidationException(`${prefix} was already registered. Cant register a key twice.`, taskId);
-        }
-        if (typeof workload !== "function") {
-            if (typeof workload !== "string") {
-                throw new _jobexceptions.JobValidationException(`${prefix} is not a callable nor a string dependency to lookup. It can't be scheduled.`, taskId);
-            }
-            let resolvedService;
-            try {
-                resolvedService = this.cradle[workload];
-            } catch (e) {
-                if (e instanceof _awilix.AwilixResolutionError) {
-                    throw new _jobexceptions.JobValidationException(`${prefix} had an awilix dependency resolution error. It can't be scheduled without fixing this problem. Inner error:\n` + e.stack, taskId);
-                } else {
-                    throw new _jobexceptions.JobValidationException(`${prefix} is not a registered awilix dependency. It can't be scheduled. Error:\n` + e.stack, taskId);
-                }
-            }
-            if (typeof resolvedService?.run !== "function") {
-                throw new _jobexceptions.JobValidationException(`${prefix} was resolved but it doesn't have a 'run(..)' method to call.`, taskId);
-            }
-        }
-        if (!schedulerOptions?.periodic && !schedulerOptions?.runOnce && !schedulerOptions?.runDelayed) {
-            throw new _jobexceptions.JobValidationException(`Provide 'periodic' or 'runOnce' or 'runDelayed' option'.`, taskId);
-        }
-        if (!schedulerOptions?.periodic && !!schedulerOptions.disabled) {
-            throw new _jobexceptions.JobValidationException(`Only tasks of type 'periodic' can be disabled at boot.`, taskId);
-        }
-        if (schedulerOptions?.runDelayed && !schedulerOptions.milliseconds && !schedulerOptions.seconds) {
-            throw new _jobexceptions.JobValidationException(`Provide a delayed timing parameter (milliseconds|seconds)'`, taskId);
-        }
-        if (schedulerOptions?.periodic && !schedulerOptions.milliseconds && !schedulerOptions.seconds && !schedulerOptions.minutes && !schedulerOptions.hours && !schedulerOptions.days) {
-            throw new _jobexceptions.JobValidationException(`Provide a periodic timing parameter (milliseconds|seconds|minutes|hours|days)'`, taskId);
-        }
-    }
-    registerJobOrTask({ id: taskId, task: asyncTaskCallbackOrToken, preset: schedulerOptions }) {
+    registerJobOrTask(registration) {
+        const { id: taskId, task: serviceIdentifier, preset: schedulerOptions } = registration;
         try {
-            this.validateInput(taskId, asyncTaskCallbackOrToken, schedulerOptions);
+            this.validateInput(taskId, serviceIdentifier, schedulerOptions);
         } catch (e) {
-            this.logger.error(e.stack, schedulerOptions);
+            this.logger.error((0, _errorutils.errorSummary)(e), schedulerOptions);
             return;
         }
-        const timedTask = this.getSafeTimedTask(taskId, asyncTaskCallbackOrToken);
+        const timedTask = this.getSafeTimedTask(taskId, serviceIdentifier);
         this.taskStates[taskId] = {
             options: schedulerOptions,
             timedTask
@@ -76,10 +39,10 @@ class TaskManagerService {
         if (schedulerOptions.runOnce) {
             timedTask.execute();
         } else if (schedulerOptions.runDelayed) {
-            const delay = (schedulerOptions.milliseconds || 0) + (schedulerOptions.seconds || 0) * 1000;
+            const delay = (schedulerOptions.milliseconds ?? 0) + (schedulerOptions.seconds ?? 0) * 1000;
             this.runTimeoutTaskInstance(taskId, delay);
         } else {
-            this.#scheduleEnabledPeriodicJob(taskId);
+            this.scheduleEnabledPeriodicJob(taskId);
         }
     }
     scheduleDisabledJob(taskId, failIfEnabled = true) {
@@ -92,18 +55,18 @@ class TaskManagerService {
             return;
         }
         taskState.options.disabled = false;
-        this.#scheduleEnabledPeriodicJob(taskId);
+        this.scheduleEnabledPeriodicJob(taskId);
     }
     disableJob(taskId, failIfDisabled = true) {
         if (this.isTaskDisabled(taskId)) {
             if (failIfDisabled) {
-                throw new _jobexceptions.JobValidationException("Cant disable a job which is already disabled", taskId);
+                throw new _jobexceptions.JobValidationException("Can't disable a job which is already disabled", taskId);
             }
             return;
         }
         const taskState = this.getTaskState(taskId);
         taskState.options.disabled = true;
-        taskState.job.stop();
+        taskState.job?.stop();
     }
     isTaskDisabled(taskId) {
         return !!this.getTaskState(taskId).options.disabled;
@@ -111,7 +74,7 @@ class TaskManagerService {
     deregisterTask(taskId) {
         this.getTaskState(taskId);
         delete this.taskStates[taskId];
-        this.jobScheduler.removeById(taskId);
+        this.toadScheduler.removeById(taskId);
     }
     getTaskState(taskId) {
         const taskState = this.taskStates[taskId];
@@ -123,23 +86,57 @@ class TaskManagerService {
     runTimeoutTaskInstance(taskId, timeoutMs) {
         const taskState = this.getTaskState(taskId);
         this.logger.log(`Running delayed task '${taskId}' in ${timeoutMs}ms`);
-        setTimeout(()=>taskState.timedTask.execute(), timeoutMs, taskId);
+        setTimeout(()=>taskState.timedTask.execute(), timeoutMs);
     }
-    getSafeTimedTask(taskId, handler) {
+    stopSchedulerTasks() {
+        this.toadScheduler.stop();
+    }
+    validateInput(taskId, serviceIdentifier, schedulerOptions) {
+        if (!taskId) {
+            throw new _jobexceptions.JobValidationException("Task ID was not provided. Can't register task or schedule job.", taskId);
+        }
+        const serviceName = serviceIdentifier || "unknown";
+        const prefix = `Job '${schedulerOptions?.name ?? serviceName}' with ID '${taskId}'`;
+        if (this.taskStates[taskId]) {
+            throw new _jobexceptions.JobValidationException(`${prefix} was already registered. Can't register a key twice.`, taskId);
+        }
+        let resolvedService;
+        try {
+            resolvedService = this.cradleService.resolve(serviceIdentifier);
+        } catch (e) {
+            if (e instanceof _awilix.AwilixResolutionError) {
+                throw new _jobexceptions.JobValidationException(`${prefix} had an awilix dependency resolution error. It can't be scheduled without fixing this problem. Inner error:\n` + e.stack, taskId);
+            } else {
+                throw new _jobexceptions.JobValidationException(`${prefix} is not a registered awilix dependency. It can't be scheduled. Error:\n` + e.stack, taskId);
+            }
+        }
+        if (typeof resolvedService?.run !== "function") {
+            throw new _jobexceptions.JobValidationException(`${prefix} was resolved but it doesn't have a 'run()' method to call.`, taskId);
+        }
+        if (!schedulerOptions?.periodic && !schedulerOptions?.runOnce && !schedulerOptions?.runDelayed) {
+            throw new _jobexceptions.JobValidationException(`${prefix} Provide 'periodic', 'runOnce', or 'runDelayed' option.`, taskId);
+        }
+        if (!schedulerOptions?.periodic && !!schedulerOptions.disabled) {
+            throw new _jobexceptions.JobValidationException(`${prefix} Only tasks of type 'periodic' can be disabled at boot.`, taskId);
+        }
+        if (schedulerOptions?.runDelayed && !schedulerOptions.milliseconds && !schedulerOptions.seconds) {
+            throw new _jobexceptions.JobValidationException(`${prefix} Provide a delayed timing parameter (milliseconds|seconds)`, taskId);
+        }
+        if (schedulerOptions?.periodic && !schedulerOptions.milliseconds && !schedulerOptions.seconds && !schedulerOptions.minutes && !schedulerOptions.hours && !schedulerOptions.days) {
+            throw new _jobexceptions.JobValidationException(`${prefix} Provide a periodic timing parameter (milliseconds|seconds|minutes|hours|days)`, taskId);
+        }
+    }
+    getSafeTimedTask(taskId, serviceIdentifier) {
         const asyncHandler = async ()=>{
-            await this.timeTask(taskId, handler);
+            await this.timeTask(taskId, serviceIdentifier);
         };
         return new _toadscheduler.AsyncTask(taskId, asyncHandler, this.getErrorHandler(taskId));
     }
-    async timeTask(taskId, handler) {
-        let taskState = this.taskStates[taskId];
+    async timeTask(taskId, serviceIdentifier) {
+        const taskState = this.taskStates[taskId];
         taskState.started = Date.now();
-        if (typeof handler === "string") {
-            const taskService = this.cradle[handler];
-            await taskService.run();
-        } else {
-            await handler();
-        }
+        const taskService = this.cradleService.resolve(serviceIdentifier);
+        await taskService.run();
         taskState.duration = Date.now() - taskState.started;
         if (taskState.options?.logFirstCompletion !== false && !taskState?.firstCompletion) {
             this.logger.log(`Task '${taskId}' first completion. Duration ${taskState.duration}ms`);
@@ -148,23 +145,20 @@ class TaskManagerService {
     }
     getErrorHandler(taskId) {
         return (error)=>{
-            const registration = this.taskStates[taskId];
-            if (!registration.lastError) registration.erroredlastError = {
+            const taskState = this.taskStates[taskId];
+            taskState.lastError ??= {
                 time: Date.now(),
                 error
             };
-            this.logger.error(`Task '${taskId}' threw an exception:` + error.stack);
+            this.logger.error(`Task '${taskId}' threw an exception: ${error.stack}`);
         };
     }
-    stopSchedulerTasks() {
-        this.jobScheduler.stop();
-    }
-    #scheduleEnabledPeriodicJob(taskId) {
+    scheduleEnabledPeriodicJob(taskId) {
         const taskState = this.getTaskState(taskId);
         if (!taskState?.timedTask || !taskState?.options) {
             throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not registered properly ('timedTask' or 'options' missing).`, taskId);
         }
-        const schedulerOptions = taskState?.options;
+        const schedulerOptions = taskState.options;
         const timedTask = taskState.timedTask;
         if (!schedulerOptions?.periodic) {
             throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} is not periodic and cannot be enabled.`, taskId);
@@ -173,7 +167,7 @@ class TaskManagerService {
             this.logger.log(`Task '${taskId}' was scheduled (runImmediately: ${!!schedulerOptions.runImmediately}).`);
             const job = new _toadscheduler.SimpleIntervalJob(schedulerOptions, timedTask);
             taskState.job = job;
-            this.jobScheduler.addSimpleIntervalJob(job);
+            this.toadScheduler.addSimpleIntervalJob(job);
         } else {
             this.logger.log(`Task '${taskId}' was marked as disabled (deferred execution).`);
         }

package/dist/services/task-manager.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/task-manager.service.ts"],"names":["TaskManagerService","taskStates","logger","constructor","loggerFactory","cradleService","toadScheduler","name","registerJobOrTask","registration","id","taskId","task","serviceIdentifier","preset","schedulerOptions","validateInput","e","error","errorSummary","timedTask","getSafeTimedTask","options","runOnce","execute","runDelayed","delay","milliseconds","seconds","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disabled","JobValidationException","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","stopSchedulerTasks","serviceName","prefix","resolvedService","resolve","AwilixResolutionError","stack","run","periodic","minutes","hours","days","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","lastError","time","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}

package/dist/services/validators/camera-service.validation.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createCameraStreamSchema", {
+    enumerable: true,
+    get: function() {
+        return createCameraStreamSchema;
+    }
+});
+const _zod = require("zod");
+const _genericvalidation = require("../../controllers/validation/generic.validation");
+const createCameraStreamSchema = (isSqlite)=>_zod.z.object({
+        printerId: (0, _genericvalidation.idRuleV2)(isSqlite).nullish(),
+        streamURL: _zod.z.string().url(),
+        name: _zod.z.string().min(1).optional()
+    });
+
+//# sourceMappingURL=camera-service.validation.js.map

package/dist/services/validators/camera-service.validation.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/validators/camera-service.validation.ts"],"names":["createCameraStreamSchema","isSqlite","z","object","printerId","idRuleV2","nullish","streamURL","string","url","name","min","optional"],"mappings":";;;;+BAGaA;;;eAAAA;;;qBAHK;mCACO;AAElB,MAAMA,2BAA2B,CAACC,WACvCC,MAAC,CAACC,MAAM,CAAC;QACPC,WAAWC,IAAAA,2BAAQ,EAACJ,UAAUK,OAAO;QACrCC,WAAWL,MAAC,CAACM,MAAM,GAAGC,GAAG;QACzBC,MAAMR,MAAC,CAACM,MAAM,GAAGG,GAAG,CAAC,GAAGC,QAAQ;IAClC"}

package/dist/services/validators/floor-service.validation.js

@@ -9,54 +9,65 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    createFloorRules: function() {
-        return createFloorRules;
+    createOrUpdateFloorSchema: function() {
+        return createOrUpdateFloorSchema;
     },
-    printerInFloorRules: function() {
-        return printerInFloorRules;
+    floorLevelValidator: function() {
+        return floorLevelValidator;
     },
-    removePrinterInFloorRules: function() {
-        return removePrinterInFloorRules;
+    floorNameValidator: function() {
+        return floorNameValidator;
     },
-    updateFloorNameRules: function() {
-        return updateFloorNameRules;
+    printerInFloorSchema: function() {
+        return printerInFloorSchema;
     },
-    updateFloorNumberRules: function() {
-        return updateFloorNumberRules;
+    removePrinterInFloorSchema: function() {
+        return removePrinterInFloorSchema;
     },
-    updateFloorRules: function() {
-        return updateFloorRules;
+    updateFloorLevelSchema: function() {
+        return updateFloorLevelSchema;
+    },
+    updateFloorNameSchema: function() {
+        return updateFloorNameSchema;
+    },
+    xValidator: function() {
+        return xValidator;
+    },
+    yValidator: function() {
+        return yValidator;
     }
 });
+const _zod = require("zod");
 const _serviceconstants = require("../../constants/service.constants");
 const _genericvalidation = require("../../controllers/validation/generic.validation");
-const removePrinterInFloorRules = (isSqlite)=>({
+const removePrinterInFloorSchema = (isSqlite)=>_zod.z.object({
         printerId: (0, _genericvalidation.idRuleV2)(isSqlite)
     });
-const printerInFloorRules = (isSqlite)=>({
+const xValidator = _zod.z.number().int().min(0).max(12);
+const yValidator = _zod.z.number().int().min(0).max(12);
+const floorLevelValidator = _zod.z.number().int();
+const floorNameValidator = _zod.z.string().min(_serviceconstants.minFloorNameLength);
+const printerInFloorSchema = (isSqlite)=>_zod.z.object({
         printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
-        floorId: isSqlite ? (0, _genericvalidation.idRuleV2)(true) : "not",
-        x: "required|integer|between:0,12",
-        y: "required|integer|between:0,12"
+        floorId: (0, _genericvalidation.idRuleV2)(isSqlite),
+        x: xValidator,
+        y: yValidator
+    });
+const updateFloorNameSchema = _zod.z.object({
+    name: floorNameValidator
+});
+const updateFloorLevelSchema = _zod.z.object({
+    floor: floorLevelValidator
+});
+const createOrUpdateFloorSchema = (isSqlite)=>_zod.z.object({
+        name: floorNameValidator,
+        floor: floorLevelValidator,
+        printers: _zod.z.array(_zod.z.object({
+            printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
+            floorId: (0, _genericvalidation.idRuleV2)(isSqlite).optional(),
+            x: xValidator,
+            y: yValidator
+        })).optional()
     });
-const updateFloorNameRules = {
-    name: `required|minLength:${_serviceconstants.minFloorNameLength}`
-};
-const updateFloorNumberRules = {
-    floor: "required|integer"
-};
-const updateFloorRules = {
-    name: `required|minLength:${_serviceconstants.minFloorNameLength}`,
-    floor: "required|integer",
-    printers: "array",
-    "printer.*.printerId": "required|mongoId",
-    "printer.*.x": "required|integer|between:0,12",
-    "printer.*.y": "required|integer|between:0,12"
-};
-const createFloorRules = {
-    name: `required|minLength:${_serviceconstants.minFloorNameLength}`,
-    floor: "required|integer",
-    printers: "array"
-};
 
 //# sourceMappingURL=floor-service.validation.js.map

package/dist/services/validators/floor-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createFloorRules","printerInFloorRules","removePrinterInFloorRules","updateFloorNameRules","updateFloorNumberRules","updateFloorRules","isSqlite","printerId","idRuleV2","floorId","x","y","name","minFloorNameLength","floor","printers"],"mappings":";;;;;;;;;;;IA+BaA,gBAAgB;eAAhBA;;IAxBAC,mBAAmB;eAAnBA;;IAJAC,yBAAyB;eAAzBA;;IAWAC,oBAAoB;eAApBA;;IAIAC,sBAAsB;eAAtBA;;IAIAC,gBAAgB;eAAhBA;;;kCAtBsB;mCACV;AAElB,MAAMH,4BAA4B,CAACI,WAAuB,CAAA;QAC/DC,WAAWC,IAAAA,2BAAQ,EAACF;IACtB,CAAA;AAEO,MAAML,sBAAsB,CAACK,WAAuB,CAAA;QACzDC,WAAWC,IAAAA,2BAAQ,EAACF;QACpBG,SAASH,WAAWE,IAAAA,2BAAQ,EAAC,QAAQ;QACrCE,GAAG;QACHC,GAAG;IACL,CAAA;AAEO,MAAMR,uBAAuB;IAClCS,MAAM,CAAC,mBAAmB,EAAEC,oCAAkB,EAAE;AAClD;AAEO,MAAMT,yBAAyB;IACpCU,OAAO;AACT;AAEO,MAAMT,mBAAmB;IAC9BO,MAAM,CAAC,mBAAmB,EAAEC,oCAAkB,EAAE;IAChDC,OAAO;IACPC,UAAU;IACV,uBAAuB;IACvB,eAAe;IACf,eAAe;AACjB;AAEO,MAAMf,mBAAmB;IAC9BY,MAAM,CAAC,mBAAmB,EAAEC,oCAAkB,EAAE;IAChDC,OAAO;IACPC,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","floorLevelValidator","floorNameValidator","printerInFloorSchema","removePrinterInFloorSchema","updateFloorLevelSchema","updateFloorNameSchema","xValidator","yValidator","isSqlite","z","object","printerId","idRuleV2","number","int","min","max","string","minFloorNameLength","floorId","x","y","name","floor","printers","array","optional"],"mappings":";;;;;;;;;;;IA8BaA,yBAAyB;eAAzBA;;IAnBAC,mBAAmB;eAAnBA;;IACAC,kBAAkB;eAAlBA;;IAEAC,oBAAoB;eAApBA;;IAVAC,0BAA0B;eAA1BA;;IAsBAC,sBAAsB;eAAtBA;;IAJAC,qBAAqB;eAArBA;;IAbAC,UAAU;eAAVA;;IACAC,UAAU;eAAVA;;;qBAVK;kCACiB;mCACV;AAElB,MAAMJ,6BAA6B,CAACK,WACzCC,MAAC,CAACC,MAAM,CAAC;QACPC,WAAWC,IAAAA,2BAAQ,EAACJ;IACtB;AAEK,MAAMF,aAAaG,MAAC,CAACI,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAMT,aAAaE,MAAC,CAACI,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAMhB,sBAAsBS,MAAC,CAACI,MAAM,GAAGC,GAAG;AAC1C,MAAMb,qBAAqBQ,MAAC,CAACQ,MAAM,GAAGF,GAAG,CAACG,oCAAkB;AAE5D,MAAMhB,uBAAuB,CAACM,WACnCC,MAAC,CAACC,MAAM,CAAC;QACPC,WAAWC,IAAAA,2BAAQ,EAACJ;QACpBW,SAASP,IAAAA,2BAAQ,EAACJ;QAClBY,GAAGd;QACHe,GAAGd;IACL;AAEK,MAAMF,wBAAwBI,MAAC,CAACC,MAAM,CAAC;IAC5CY,MAAMrB;AACR;AAEO,MAAMG,yBAAyBK,MAAC,CAACC,MAAM,CAAC;IAC7Ca,OAAOvB;AACT;AAEO,MAAMD,4BAA4B,CAACS,WACxCC,MAAC,CAACC,MAAM,CAAC;QACPY,MAAMrB;QACNsB,OAAOvB;QACPwB,UAAUf,MAAC,CACRgB,KAAK,CACJhB,MAAC,CAACC,MAAM,CAAC;YACPC,WAAWC,IAAAA,2BAAQ,EAACJ;YACpBW,SAASP,IAAAA,2BAAQ,EAACJ,UAAUkB,QAAQ;YACpCN,GAAGd;YACHe,GAAGd;QACL,IAEDmB,QAAQ;IACb"}

package/dist/services/validators/print-completion-service.validation.js

@@ -2,19 +2,32 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "createPrintCompletionRules", {
+Object.defineProperty(exports, "createPrintCompletionSchema", {
     enumerable: true,
     get: function() {
-        return createPrintCompletionRules;
+        return createPrintCompletionSchema;
     }
 });
+const _zod = require("zod");
 const _octoprintwebsocketconstants = require("../octoprint/constants/octoprint-websocket.constants");
-const createPrintCompletionRules = {
-    fileName: "required",
-    status: `required|string|in:${Object.values(_octoprintwebsocketconstants.EVENT_TYPES)}`,
-    printerId: "required|string|mongoId",
-    completionLog: "string",
-    context: "required|object"
-};
+const _genericvalidation = require("../../controllers/validation/generic.validation");
+const createPrintCompletionSchema = (isSqlite)=>_zod.z.object({
+        fileName: _zod.z.string().min(1, "File name is required"),
+        status: _zod.z.enum(_octoprintwebsocketconstants.EVENT_TYPES_ARRAY, {
+            errorMap: (issue)=>{
+                if (issue.code === "invalid_type") {
+                    return {
+                        message: `Status must be one of: ${Object.values(_octoprintwebsocketconstants.EVENT_TYPES).join(", ")}`
+                    };
+                }
+                return {
+                    message: "Invalid status"
+                };
+            }
+        }),
+        printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
+        completionLog: _zod.z.string().optional(),
+        context: _zod.z.any()
+    });
 
 //# sourceMappingURL=print-completion-service.validation.js.map

package/dist/services/validators/print-completion-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/print-completion-service.validation.ts"],"names":["createPrintCompletionRules","fileName","status","Object","values","EVENT_TYPES","printerId","completionLog","context"],"mappings":";;;;+BAEaA;;;eAAAA;;;6CAFe;AAErB,MAAMA,6BAA6B;IACxCC,UAAU;IACVC,QAAQ,CAAC,mBAAmB,EAAEC,OAAOC,MAAM,CAACC,wCAAW,GAAG;IAC1DC,WAAW;IACXC,eAAe;IACfC,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/print-completion-service.validation.ts"],"names":["createPrintCompletionSchema","isSqlite","z","object","fileName","string","min","status","enum","EVENT_TYPES_ARRAY","errorMap","issue","code","message","Object","values","EVENT_TYPES","join","printerId","idRuleV2","completionLog","optional","context","any"],"mappings":";;;;+BAIaA;;;eAAAA;;;qBAJK;6CAC6B;mCACtB;AAElB,MAAMA,8BAA8B,CAACC,WAC1CC,MAAC,CAACC,MAAM,CAAC;QACPC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC,GAAG;QAC5BC,QAAQL,MAAC,CAACM,IAAI,CAACC,8CAAiB,EAA2B;YACzDC,UAAU,CAACC;gBACT,IAAIA,MAAMC,IAAI,KAAK,gBAAgB;oBACjC,OAAO;wBAAEC,SAAS,CAAC,uBAAuB,EAAEC,OAAOC,MAAM,CAACC,wCAAW,EAAEC,IAAI,CAAC,OAAO;oBAAC;gBACtF;gBACA,OAAO;oBAAEJ,SAAS;gBAAiB;YACrC;QACF;QACAK,WAAWC,IAAAA,2BAAQ,EAAClB;QACpBmB,eAAelB,MAAC,CAACG,MAAM,GAAGgB,QAAQ;QAClCC,SAASpB,MAAC,CAACqB,GAAG;IAChB"}

package/dist/services/validators/printer-service.validation.js

@@ -9,42 +9,125 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    createMongoPrinterRules: function() {
-        return createMongoPrinterRules;
+    createPrinterSchema: function() {
+        return createPrinterSchema;
     },
-    createPrinterRules: function() {
-        return createPrinterRules;
+    printerApiKeyValidator: function() {
+        return printerApiKeyValidator;
     },
-    updatePrinterDisabledReasonRule: function() {
-        return updatePrinterDisabledReasonRule;
+    printerDateAddedValidator: function() {
+        return printerDateAddedValidator;
     },
-    updatePrinterEnabledRule: function() {
-        return updatePrinterEnabledRule;
+    printerDisabledReasonValidator: function() {
+        return printerDisabledReasonValidator;
+    },
+    printerEnabledValidator: function() {
+        return printerEnabledValidator;
+    },
+    printerNameValidator: function() {
+        return printerNameValidator;
+    },
+    printerPasswordValidator: function() {
+        return printerPasswordValidator;
+    },
+    printerTypeValidator: function() {
+        return printerTypeValidator;
+    },
+    printerUrlValidator: function() {
+        return printerUrlValidator;
+    },
+    printerUsernameValidator: function() {
+        return printerUsernameValidator;
+    },
+    refineApiKeyValidator: function() {
+        return refineApiKeyValidator;
+    },
+    updatePrinterDisabledReasonSchema: function() {
+        return updatePrinterDisabledReasonSchema;
+    },
+    updatePrinterEnabledSchema: function() {
+        return updatePrinterEnabledSchema;
     }
 });
 const _serviceconstants = require("../../constants/service.constants");
 const _printerapiinterface = require("../printer-api.interface");
-const createMongoPrinterRules = {
-    _id: "not",
-    printerURL: "required|httpurl",
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
-    enabled: "boolean",
-    name: "string"
-};
-const createPrinterRules = {
-    printerURL: "required|httpurl",
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
-    enabled: "boolean",
-    name: "required|string"
-};
-const updatePrinterEnabledRule = {
-    enabled: "required|boolean"
-};
-const updatePrinterDisabledReasonRule = {
-    disabledReason: "required|nullable|string",
-    enabled: "boolean"
+const _zod = require("zod");
+const octoPrintApiKeySchema = _zod.z.string().min(_serviceconstants.apiKeyLengthMinDefault).max(_serviceconstants.apiKeyLengthMaxDefault).regex(/^[a-zA-Z0-9_-]+$/, "Alpha-numeric, dash, and underscore only");
+const printerApiKeyValidator = _zod.z.string().optional();
+const printerNameValidator = _zod.z.string();
+const printerUsernameValidator = _zod.z.string();
+const printerPasswordValidator = _zod.z.string();
+const printerEnabledValidator = _zod.z.boolean();
+const printerDisabledReasonValidator = _zod.z.string().optional();
+const printerUrlValidator = _zod.z.string().url();
+const printerTypeValidator = _zod.z.nativeEnum(_printerapiinterface.PrinterTypesEnum);
+const printerDateAddedValidator = _zod.z.number().optional();
+const prusaLinkAuthSchema = _zod.z.object({
+    username: printerUsernameValidator,
+    password: printerPasswordValidator
+});
+const basePrinterSchema = _zod.z.object({
+    dateAdded: printerDateAddedValidator,
+    printerURL: printerUrlValidator,
+    printerType: printerTypeValidator,
+    apiKey: printerApiKeyValidator,
+    username: printerUsernameValidator.optional(),
+    password: printerPasswordValidator.optional(),
+    enabled: printerEnabledValidator.optional(),
+    name: printerNameValidator
+}).strip();
+const apiKeyPrinterTypeSchema = _zod.z.object({
+    apiKey: printerApiKeyValidator,
+    printerType: printerTypeValidator,
+    username: printerUsernameValidator.optional(),
+    password: printerPasswordValidator.optional()
+});
+const refineApiKeyValidator = (data, ctx)=>{
+    if (data.printerType === _printerapiinterface.OctoprintType) {
+        const result = octoPrintApiKeySchema.safeParse(data.apiKey);
+        if (!result.success) {
+            result.error.issues.forEach((issue)=>{
+                ctx.addIssue({
+                    ...issue,
+                    path: [
+                        "apiKey",
+                        ...issue.path
+                    ]
+                });
+            });
+        }
+    } else if (data.printerType === _printerapiinterface.PrusaLinkType) {
+        const result = prusaLinkAuthSchema.safeParse({
+            username: data.username,
+            password: data.password
+        });
+        if (!result.success) {
+            result.error.issues.forEach((issue)=>{
+                ctx.addIssue({
+                    ...issue,
+                    path: [
+                        "username",
+                        ...issue.path
+                    ]
+                });
+                ctx.addIssue({
+                    ...issue,
+                    path: [
+                        "password",
+                        ...issue.path
+                    ]
+                });
+            });
+        }
+    }
 };
+const createPrinterSchema = basePrinterSchema.superRefine(refineApiKeyValidator);
+const updatePrinterEnabledSchema = _zod.z.object({
+    enabled: printerEnabledValidator
+});
+const updatePrinterDisabledReasonSchema = _zod.z.object({
+    disabledReason: printerDisabledReasonValidator,
+    enabled: printerEnabledValidator.optional()
+});
 
 //# sourceMappingURL=printer-service.validation.js.map

package/dist/services/validators/printer-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","printerURL","printerType","OctoprintType","MoonrakerType","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAGaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAYAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCApBkD;qCAClB;AAEtC,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMZ,qBAAqB;IAChCI,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMV,2BAA2B;IACtCS,SAAS;AACX;AAEO,MAAMV,kCAAkC;IAC7CY,gBAAgB;IAChBF,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","superRefine","disabledReason"],"mappings":";;;;;;;;;;;IAmFaA,mBAAmB;eAAnBA;;IAxEAC,sBAAsB;eAAtBA;;IAQAC,yBAAyB;eAAzBA;;IAHAC,8BAA8B;eAA9BA;;IADAC,uBAAuB;eAAvBA;;IAHAC,oBAAoB;eAApBA;;IAEAC,wBAAwB;eAAxBA;;IAIAC,oBAAoB;eAApBA;;IADAC,mBAAmB;eAAnBA;;IAJAC,wBAAwB;eAAxBA;;IAmCAC,qBAAqB;eAArBA;;IAyCAC,iCAAiC;eAAjCA;;IAJAC,0BAA0B;eAA1BA;;;kCArFkD;qCACA;qBAC9B;AAEjC,MAAMC,wBAAwBC,MAAC,CAC5BC,MAAM,GACNC,GAAG,CAACC,wCAAsB,EAC1BC,GAAG,CAACC,wCAAsB,EAC1BC,KAAK,CAAC,oBAAoB;AAGtB,MAAMnB,yBAAyBa,MAAC,CAACC,MAAM,GAAGM,QAAQ;AAClD,MAAMhB,uBAAuBS,MAAC,CAACC,MAAM;AACrC,MAAMN,2BAA2BK,MAAC,CAACC,MAAM;AACzC,MAAMT,2BAA2BQ,MAAC,CAACC,MAAM;AACzC,MAAMX,0BAA0BU,MAAC,CAACQ,OAAO;AACzC,MAAMnB,iCAAiCW,MAAC,CAACC,MAAM,GAAGM,QAAQ;AAC1D,MAAMb,sBAAsBM,MAAC,CAACC,MAAM,GAAGQ,GAAG;AAC1C,MAAMhB,uBAAuBO,MAAC,CAACU,UAAU,CAACC,qCAAgB;AAC1D,MAAMvB,4BAA4BY,MAAC,CAACY,MAAM,GAAGL,QAAQ;AAE5D,MAAMM,sBAAsBb,MAAC,CAACc,MAAM,CAAC;IACnCC,UAAUpB;IACVqB,UAAUxB;AACZ;AAEA,MAAMyB,oBAAoBjB,MAAC,CACxBc,MAAM,CAAC;IACNI,WAAW9B;IACX+B,YAAYzB;IACZ0B,aAAa3B;IACb4B,QAAQlC;IACR4B,UAAUpB,yBAAyBY,QAAQ;IAC3CS,UAAUxB,yBAAyBe,QAAQ;IAC3Ce,SAAShC,wBAAwBiB,QAAQ;IACzCgB,MAAMhC;AACR,GACCiC,KAAK;AAGR,MAAMC,0BAA0BzB,MAAC,CAACc,MAAM,CAAC;IACvCO,QAAQlC;IACRiC,aAAa3B;IACbsB,UAAUpB,yBAAyBY,QAAQ;IAC3CS,UAAUxB,yBAAyBe,QAAQ;AAC7C;AAGO,MAAMX,wBAAwB,CAAoC8B,MAASC;IAEhF,IAAID,KAAKN,WAAW,KAAKQ,kCAAa,EAAE;QACtC,MAAMC,SAAS9B,sBAAsB+B,SAAS,CAACJ,KAAKL,MAAM;QAC1D,IAAI,CAACQ,OAAOE,OAAO,EAAE;YACnBF,OAAOG,KAAK,CAACC,MAAM,CAACC,OAAO,CAAC,CAACC;gBAC3BR,IAAIS,QAAQ,CAAC;oBACX,GAAGD,KAAK;oBAERE,MAAM;wBAAC;2BAAaF,MAAME,IAAI;qBAAC;gBACjC;YACF;QACF;IACF,OAAO,IAAIX,KAAKN,WAAW,KAAKkB,kCAAa,EAAE;QAC7C,MAAMT,SAAShB,oBAAoBiB,SAAS,CAAC;YAC3Cf,UAAUW,KAAKX,QAAQ;YACvBC,UAAUU,KAAKV,QAAQ;QACzB;QACA,IAAI,CAACa,OAAOE,OAAO,EAAE;YACnBF,OAAOG,KAAK,CAACC,MAAM,CAACC,OAAO,CAAC,CAACC;gBAC3BR,IAAIS,QAAQ,CAAC;oBACX,GAAGD,KAAK;oBAERE,MAAM;wBAAC;2BAAeF,MAAME,IAAI;qBAAC;gBACnC;gBACAV,IAAIS,QAAQ,CAAC;oBACX,GAAGD,KAAK;oBAERE,MAAM;wBAAC;2BAAeF,MAAME,IAAI;qBAAC;gBACnC;YACF;QACF;IACF;AACF;AAEO,MAAMnD,sBAAsB+B,kBAAkBsB,WAAW,CAAC3C;AAE1D,MAAME,6BAA6BE,MAAC,CAACc,MAAM,CAAC;IACjDQ,SAAShC;AACX;AAEO,MAAMO,oCAAoCG,MAAC,CAACc,MAAM,CAAC;IACxD0B,gBAAgBnD;IAChBiC,SAAShC,wBAAwBiB,QAAQ;AAC3C"}