@fdm-monster/server 1.8.3 → 1.9.0-rc1

package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrusaLinkHttpClientBuilder", {
+    enumerable: true,
+    get: function() {
+        return PrusaLinkHttpClientBuilder;
+    }
+});
+const _defaulthttpclientbuilder = require("../../../shared/default-http-client.builder");
+const _octoprintserviceconstants = require("../../octoprint/constants/octoprint-service.constants");
+const _digestauthutil = require("./digest-auth.util");
+const _nodecrypto = require("node:crypto");
+class PrusaLinkHttpClientBuilder extends _defaulthttpclientbuilder.DefaultHttpClientBuilder {
+    maxRetries = 1;
+    username;
+    password;
+    authHeaderContext;
+    onAuthError;
+    onAuthSuccess;
+    onRequestRetry;
+    build() {
+        if (!this.axiosOptions.baseURL) {
+            throw new Error("Base URL is required");
+        }
+        const axiosInstance = super.build();
+        if (this.username && this.password) {
+            axiosInstance.interceptors.request.use(async (config)=>{
+                if (this.authHeaderContext) {
+                    const computedDigestHeader = this.generateDigestHeader(config.method?.toUpperCase() ?? "GET", config.url ?? "/");
+                    config.headers[_octoprintserviceconstants.authorizationHeaderKey] = computedDigestHeader;
+                }
+                return config;
+            });
+            axiosInstance.interceptors.response.use((response)=>response, async (error)=>{
+                const originalRequest = error.config;
+                if (error.response?.status === 401 && this.username?.length && this.password?.length && (!originalRequest._retryCount || originalRequest._retryCount < this.maxRetries)) {
+                    const wwwAuthHeader = error.response.headers[_octoprintserviceconstants.wwwAuthenticationHeaderKey];
+                    if (wwwAuthHeader) {
+                        if (typeof this.onAuthSuccess === "function") {
+                            this.onAuthSuccess(wwwAuthHeader);
+                        }
+                        this.saveParsedAuthHeaderContext(wwwAuthHeader);
+                        originalRequest._retryCount = (originalRequest._retryCount ?? 0) + 1;
+                        if (typeof this.onRequestRetry === "function") {
+                            this.onRequestRetry(error, originalRequest._retryCount);
+                        }
+                        return axiosInstance(originalRequest);
+                    }
+                }
+                if (error.response?.status === 401 && this.onAuthError && typeof this.onAuthError === "function") {
+                    this.onAuthError(error);
+                }
+                return Promise.reject(error);
+            });
+        }
+        return axiosInstance;
+    }
+    withDigestAuth(username, password, onAuthError, onRequestRetry, onAuthSuccess) {
+        if (!username?.length) {
+            throw new Error("username may not be an empty string");
+        }
+        if (!password?.length) {
+            throw new Error("password may not be an empty string");
+        }
+        if (onAuthError && typeof onAuthError !== "function") {
+            throw new Error("onAuthError must be a function");
+        }
+        if (onAuthSuccess && typeof onAuthSuccess !== "function") {
+            throw new Error("onAuthSuccess must be a function");
+        }
+        if (onRequestRetry && typeof onRequestRetry !== "function") {
+            throw new Error("onRequestRetry must be a function");
+        }
+        this.username = username;
+        this.password = password;
+        this.onAuthError = onAuthError;
+        this.onRequestRetry = onRequestRetry;
+        this.onAuthSuccess = onAuthSuccess;
+        return this;
+    }
+    withAuthHeader(authHeader) {
+        if (!authHeader?.length) {
+            throw new Error("Digest header may not be an empty string");
+        }
+        this.saveParsedAuthHeaderContext(authHeader);
+        return this;
+    }
+    saveParsedAuthHeaderContext(authHeader) {
+        const headerValue = authHeader.startsWith("Digest ") ? authHeader.substring(7) : authHeader;
+        const authParams = Object.fromEntries(headerValue.split(", ").map((param)=>{
+            const parts = param.split("=");
+            if (parts.length === 2) {
+                return [
+                    parts[0],
+                    parts[1].replace(/"/g, "")
+                ];
+            }
+            return [
+                parts[0],
+                ""
+            ];
+        }));
+        this.authHeaderContext = {
+            realm: authParams.realm,
+            nonce: authParams.nonce,
+            qop: authParams.qop,
+            hasQop: "qop" in authParams
+        };
+    }
+    generateDigestHeader(method, uri) {
+        if (!this.authHeaderContext || !this.username || !this.password) {
+            throw new Error("Digest auth not properly configured");
+        }
+        const { realm, nonce, qop, hasQop } = this.authHeaderContext;
+        return (0, _digestauthutil.generateDigestAuthHeader)({
+            username: this.username,
+            password: this.password,
+            method,
+            uri,
+            realm,
+            nonce,
+            qop: hasQop ? qop : undefined,
+            nc: hasQop ? "00000001" : undefined,
+            cnonce: hasQop ? (0, _nodecrypto.randomBytes)(8).toString("hex") : undefined
+        });
+    }
+}
+
+//# sourceMappingURL=prusa-link-http-client.builder.js.map

package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/utils/prusa-link-http-client.builder.ts"],"names":["PrusaLinkHttpClientBuilder","DefaultHttpClientBuilder","maxRetries","username","password","authHeaderContext","onAuthError","onAuthSuccess","onRequestRetry","build","axiosOptions","baseURL","Error","axiosInstance","interceptors","request","use","config","computedDigestHeader","generateDigestHeader","method","toUpperCase","url","headers","authorizationHeaderKey","response","error","originalRequest","status","length","_retryCount","wwwAuthHeader","wwwAuthenticationHeaderKey","saveParsedAuthHeaderContext","Promise","reject","withDigestAuth","withAuthHeader","authHeader","headerValue","startsWith","substring","authParams","Object","fromEntries","split","map","param","parts","replace","realm","nonce","qop","hasQop","uri","generateDigestAuthHeader","undefined","nc","cnonce","randomBytes","toString"],"mappings":"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"}

package/dist/services/socket.factory.js

@@ -11,18 +11,21 @@ Object.defineProperty(exports, "SocketFactory", {
 const _containertokens = require("../container.tokens");
 const _printerapiinterface = require("./printer-api.interface");
 class SocketFactory {
-    cradle;
-    constructor(cradle){
-        this.cradle = cradle;
+    cradleService;
+    constructor(cradleService){
+        this.cradleService = cradleService;
     }
     createInstance(printerType) {
-        const settingsStore = this.cradle[_containertokens.DITokens.settingsStore];
+        const settingsStore = this.cradleService.resolve(_containertokens.DITokens.settingsStore);
         const serverSettings = settingsStore.getServerSettings();
         const moonrakerSupport = serverSettings.experimentalMoonrakerSupport;
+        const prusaLinkSupport = serverSettings.experimentalPrusaLinkSupport;
         if (printerType === _printerapiinterface.OctoprintType) {
-            return this.cradle[_containertokens.DITokens.octoPrintSockIoAdapter];
+            return this.cradleService.resolve(_containertokens.DITokens.octoPrintSockIoAdapter);
         } else if (moonrakerSupport && printerType === _printerapiinterface.MoonrakerType) {
-            return this.cradle[_containertokens.DITokens.moonrakerWebsocketAdapter];
+            return this.cradleService.resolve(_containertokens.DITokens.moonrakerWebsocketAdapter);
+        } else if (prusaLinkSupport && printerType === _printerapiinterface.PrusaLinkType) {
+            return this.cradleService.resolve(_containertokens.DITokens.prusaLinkPollingAdapter);
         } else {
             throw new Error("PrinterType is unknown, cant pick the right socket adapter");
         }

package/dist/services/socket.factory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","cradle","constructor","createInstance","printerType","settingsStore","DITokens","serverSettings","getServerSettings","moonrakerSupport","experimentalMoonrakerSupport","OctoprintType","octoPrintSockIoAdapter","MoonrakerType","moonrakerWebsocketAdapter","Error"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALY;qCACoB;AAItC,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,eAAeC,WAAmB,EAAqB;QACrD,MAAMC,gBAAgB,IAAI,CAACJ,MAAM,CAACK,yBAAQ,CAACD,aAAa,CAAC;QACzD,MAAME,iBAAiBF,cAAcG,iBAAiB;QACtD,MAAMC,mBAAmBF,eAAeG,4BAA4B;QAEpE,IAAIN,gBAAgBO,kCAAa,EAAE;YACjC,OAAO,IAAI,CAACV,MAAM,CAACK,yBAAQ,CAACM,sBAAsB,CAAC;QACrD,OAAO,IAAIH,oBAAoBL,gBAAgBS,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAACZ,MAAM,CAACK,yBAAQ,CAACQ,yBAAyB,CAAC;QACxD,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;IACF;AACF"}
+{"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","constructor","cradleService","createInstance","printerType","settingsStore","resolve","DITokens","serverSettings","getServerSettings","moonrakerSupport","experimentalMoonrakerSupport","prusaLinkSupport","experimentalPrusaLinkSupport","OctoprintType","octoPrintSockIoAdapter","MoonrakerType","moonrakerWebsocketAdapter","PrusaLinkType","prusaLinkPollingAdapter","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANY;qCACmC;AAKrD,MAAMA;;IACXC,YAAY,AAAiBC,aAA4B,CAAE;aAA9BA,gBAAAA;IAA+B;IAE5DC,eAAeC,WAAmB,EAAqB;QACrD,MAAMC,gBAAgB,IAAI,CAACH,aAAa,CAACI,OAAO,CAAgBC,yBAAQ,CAACF,aAAa;QACtF,MAAMG,iBAAiBH,cAAcI,iBAAiB;QACtD,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QAEpE,IAAIT,gBAAgBU,kCAAa,EAAE;YACjC,OAAO,IAAI,CAACZ,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACQ,sBAAsB;QACnE,OAAO,IAAIL,oBAAoBN,gBAAgBY,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAACd,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACU,yBAAyB;QACtE,OAAO,IAAIL,oBAAoBR,gBAAgBc,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAAChB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACY,uBAAuB;QACpE,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;IACF;AACF"}

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"}