@fdm-monster/server 1.5.1 → 1.5.4

package/dist/utils/normalize-url.js

@@ -1,4 +1,3 @@
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
@@ -38,11 +37,9 @@ const normalizeDataURL = (urlString, { stripHash })=>{
         mediaType.pop();
         isBase64 = true;
     }
-    // Lowercase MIME type
     const mimeType = mediaType.shift()?.toLowerCase() ?? "";
     const attributes = mediaType.map((attribute)=>{
         let [key, value = ""] = attribute.split("=").map((string)=>string.trim());
-        // Lowercase `charset`
         if (key === "charset") {
             value = value.toLowerCase();
             if (value === DATA_URL_DEFAULT_CHARSET) {
@@ -82,12 +79,10 @@ function normalizeUrl(urlString, options) {
         sortQueryParameters: true,
         ...options
     };
-    // Legacy: Append `:` to the protocol if missing.
     if (typeof options.defaultProtocol === "string" && !options.defaultProtocol.endsWith(":")) {
         options.defaultProtocol = `${options.defaultProtocol}:`;
     }
     urlString = urlString.trim();
-    // Data URL
     if (/^data:/i.test(urlString)) {
         return normalizeDataURL(urlString, options);
     }
@@ -96,7 +91,6 @@ function normalizeUrl(urlString, options) {
     }
     const hasRelativeProtocol = urlString.startsWith("//");
     const isRelativeUrl = !hasRelativeProtocol && /^\.*\//.test(urlString);
-    // Prepend protocol
     if (!isRelativeUrl) {
         urlString = urlString.replace(/^(?!(?:\w+:)?\/\/)|^\/\//, options.defaultProtocol);
     }
@@ -110,26 +104,16 @@ function normalizeUrl(urlString, options) {
     if (options.forceHttps && urlObject.protocol === "http:") {
         urlObject.protocol = "https:";
     }
-    // Remove auth
     if (options.stripAuthentication) {
         urlObject.username = "";
         urlObject.password = "";
     }
-    // Remove hash
     if (options.stripHash) {
         urlObject.hash = "";
     } else if (options.stripTextFragment) {
         urlObject.hash = urlObject.hash.replace(/#?:~:text.*?$/i, "");
     }
-    // Remove duplicate slashes if not preceded by a protocol
-    // NOTE: This could be implemented using a single negative lookbehind
-    // regex, but we avoid that to maintain compatibility with older js engines
-    // which do not have support for that feature.
     if (urlObject.pathname) {
-        // TODO: Replace everything below with `urlObject.pathname = urlObject.pathname.replace(/(?<!\b[a-z][a-z\d+\-.]{1,50}:)\/{2,}/g, '/');` when Safari supports negative lookbehind.
-        // Split the string by occurrences of this protocol regex, and perform
-        // duplicate-slash replacement on the strings between those occurrences
-        // (if any).
         const protocolRegex = /\b[a-z][a-z\d+\-.]{1,50}:\/\//g;
         let lastIndex = 0;
         let result = "";
@@ -149,13 +133,11 @@ function normalizeUrl(urlString, options) {
         result += remnant.replace(/\/{2,}/g, "/");
         urlObject.pathname = result;
     }
-    // Decode URI octets
     if (urlObject.pathname) {
         try {
             urlObject.pathname = decodeURI(urlObject.pathname);
         } catch  {}
     }
-    // Remove directory index
     if (options.removeDirectoryIndex === true) {
         options.removeDirectoryIndex = [
             /^index\.[a-z]+$/
@@ -170,20 +152,12 @@ function normalizeUrl(urlString, options) {
         }
     }
     if (urlObject.hostname) {
-        // Remove trailing dot
         urlObject.hostname = urlObject.hostname.replace(/\.$/, "");
-        // Remove `www.`
         if (options.stripWWW && /^www\.(?!www\.)[a-z\-\d]{1,63}\.[a-z.\-\d]{2,63}$/.test(urlObject.hostname)) {
-            // Each label should be max 63 at length (min: 1).
-            // Source: https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
-            // Each TLD should be up to 63 characters long (min: 2).
-            // It is technically possible to have a single character TLD, but none currently exist.
             urlObject.hostname = urlObject.hostname.replace(/^www\./, "");
         }
     }
-    // Remove query unwanted parameters
     if (Array.isArray(options.removeQueryParameters)) {
-        // eslint-disable-next-line unicorn/no-useless-spread -- We are intentionally spreading to get a copy.
         for (const key of [
             ...urlObject.searchParams.keys()
         ]){
@@ -195,9 +169,7 @@ function normalizeUrl(urlString, options) {
     if (!Array.isArray(options.keepQueryParameters) && options.removeQueryParameters === true) {
         urlObject.search = "";
     }
-    // Keep wanted query parameters
     if (Array.isArray(options.keepQueryParameters) && options.keepQueryParameters.length > 0) {
-        // eslint-disable-next-line unicorn/no-useless-spread -- We are intentionally spreading to get a copy.
         for (const key of [
             ...urlObject.searchParams.keys()
         ]){
@@ -206,10 +178,8 @@ function normalizeUrl(urlString, options) {
             }
         }
     }
-    // Sort query parameters
     if (options.sortQueryParameters) {
         urlObject.searchParams.sort();
-        // Calling `.sort()` encodes the search parameters, so we need to decode them again.
         try {
             urlObject.search = decodeURIComponent(urlObject.search);
         } catch  {}
@@ -217,25 +187,20 @@ function normalizeUrl(urlString, options) {
     if (options.removeTrailingSlash) {
         urlObject.pathname = urlObject.pathname.replace(/\/$/, "");
     }
-    // Remove an explicit port number, excluding a default port number, if applicable
     if (options.removeExplicitPort && urlObject.port) {
         urlObject.port = "";
     }
     const oldUrlString = urlString;
-    // Take advantage of many of the Node `url` normalizations
     urlString = urlObject.toString();
     if (!options.removeSingleSlash && urlObject.pathname === "/" && !oldUrlString.endsWith("/") && urlObject.hash === "") {
         urlString = urlString.replace(/\/$/, "");
     }
-    // Remove ending `/` unless removeSingleSlash is false
     if ((options.removeTrailingSlash || urlObject.pathname === "/") && urlObject.hash === "" && options.removeSingleSlash) {
         urlString = urlString.replace(/\/$/, "");
     }
-    // Restore relative protocol, if applicable
     if (hasRelativeProtocol && !options.normalizeProtocol) {
         urlString = urlString.replace(/^http:\/\//, "//");
     }
-    // Remove http/https
     if (options.stripProtocol) {
         urlString = urlString.replace(/^(?:https?:)?\/\//, "");
     }

package/dist/utils/normalize-url.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/normalize-url.ts"],"names":["normalizeUrl","DATA_URL_DEFAULT_MIME_TYPE","DATA_URL_DEFAULT_CHARSET","testParameter","name","filters","some","filter","RegExp","test","supportedProtocols","Set","hasCustomProtocol","urlString","protocol","URL","endsWith","has","normalizeDataURL","stripHash","match","exec","Error","type","data","hash","groups","mediaType","split","isBase64","length","pop","mimeType","shift","toLowerCase","attributes","map","attribute","key","value","string","trim","Boolean","normalizedMediaType","push","unshift","join","options","defaultProtocol","normalizeProtocol","forceHttp","forceHttps","stripAuthentication","stripTextFragment","stripWWW","removeQueryParameters","removeTrailingSlash","removeSingleSlash","removeDirectoryIndex","removeExplicitPort","sortQueryParameters","hasRelativeProtocol","startsWith","isRelativeUrl","replace","urlObject","username","password","pathname","protocolRegex","lastIndex","result","protocolAtIndex","index","intermediate","slice","remnant","decodeURI","Array","isArray","pathComponents","lastComponent","hostname","searchParams","keys","delete","keepQueryParameters","search","sort","decodeURIComponent","port","oldUrlString","toString","stripProtocol"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/normalize-url.ts"],"names":["normalizeUrl","DATA_URL_DEFAULT_MIME_TYPE","DATA_URL_DEFAULT_CHARSET","testParameter","name","filters","some","filter","RegExp","test","supportedProtocols","Set","hasCustomProtocol","urlString","protocol","URL","endsWith","has","normalizeDataURL","stripHash","match","exec","Error","type","data","hash","groups","mediaType","split","isBase64","length","pop","mimeType","shift","toLowerCase","attributes","map","attribute","key","value","string","trim","Boolean","normalizedMediaType","push","unshift","join","options","defaultProtocol","normalizeProtocol","forceHttp","forceHttps","stripAuthentication","stripTextFragment","stripWWW","removeQueryParameters","removeTrailingSlash","removeSingleSlash","removeDirectoryIndex","removeExplicitPort","sortQueryParameters","hasRelativeProtocol","startsWith","isRelativeUrl","replace","urlObject","username","password","pathname","protocolRegex","lastIndex","result","protocolAtIndex","index","intermediate","slice","remnant","decodeURI","Array","isArray","pathComponents","lastComponent","hostname","searchParams","keys","delete","keepQueryParameters","search","sort","decodeURIComponent","port","oldUrlString","toString","stripProtocol"],"mappings":"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"}

package/dist/utils/semver.utils.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "checkVersionSatisfiesMinimum", {
 const _semver = require("semver");
 function checkVersionSatisfiesMinimum(newVersion, minimumVersion) {
     const comparison = (0, _semver.compare)(newVersion, minimumVersion);
-    // Values 0 or 1 mean the client version is less than the minimum and should be force updated
     return comparison > -1;
 }
 

package/dist/utils/semver.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/semver.utils.ts"],"names":["checkVersionSatisfiesMinimum","newVersion","minimumVersion","comparison","compare"],"mappings":";;;;+BAEgBA;;;eAAAA;;;wBAFQ;AAEjB,SAASA,6BAA6BC,UAAkB,EAAEC,cAAsB;IACrF,MAAMC,aAAaC,IAAAA,eAAO,EAACH,YAAYC;IACvC,6FAA6F;IAC7F,OAAOC,aAAa,CAAC;AACvB"}
+{"version":3,"sources":["../../src/utils/semver.utils.ts"],"names":["checkVersionSatisfiesMinimum","newVersion","minimumVersion","comparison","compare"],"mappings":";;;;+BAEgBA;;;eAAAA;;;wBAFQ;AAEjB,SAASA,6BAA6BC,UAAkB,EAAEC,cAAsB;IACrF,MAAMC,aAAaC,IAAAA,eAAO,EAACH,YAAYC;IAEvC,OAAOC,aAAa,CAAC;AACvB"}

package/dist/utils/url.utils.js

@@ -24,6 +24,7 @@ function httpToWsUrl(url, protocol = "ws") {
     return wsUrl;
 }
 function normalizeURLWithProtocol(printerURL) {
+    if (!printerURL) return;
     if (!printerURL.startsWith("http://") && !printerURL.startsWith("https://")) {
         printerURL = `http://${printerURL}`;
     }

package/dist/utils/url.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["httpToWsUrl","normalizeURLWithProtocol","url","protocol","wsUrl","URL","normalizeUrl","pathname","printerURL","startsWith"],"mappings":";;;;;;;;;;;IAEgBA,WAAW;eAAXA;;IAOAC,wBAAwB;eAAxBA;;;8BATa;AAEtB,SAASD,YAAYE,GAAW,EAAEC,WAAW,IAAI;IACtD,MAAMC,QAAQ,IAAIC,IAAI,qBAAqBC,IAAAA,0BAAY,EAACJ;IACxDE,MAAMD,QAAQ,GAAG,CAAC,EAAEA,SAAS,CAAC;IAC9BC,MAAMG,QAAQ,GAAG;IACjB,OAAOH;AACT;AAEO,SAASH,yBAAyBO,UAAkB;IACzD,IAAI,CAACA,WAAWC,UAAU,CAAC,cAAc,CAACD,WAAWC,UAAU,CAAC,aAAa;QAC3ED,aAAa,CAAC,OAAO,EAAEA,WAAW,CAAC;IACrC;IAEA,OAAOF,IAAAA,0BAAY,EAACE;AACtB"}
+{"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["httpToWsUrl","normalizeURLWithProtocol","url","protocol","wsUrl","URL","normalizeUrl","pathname","printerURL","startsWith"],"mappings":";;;;;;;;;;;IAEgBA,WAAW;eAAXA;;IAOAC,wBAAwB;eAAxBA;;;8BATa;AAEtB,SAASD,YAAYE,GAAW,EAAEC,WAAW,IAAI;IACtD,MAAMC,QAAQ,IAAIC,IAAI,qBAAqBC,IAAAA,0BAAY,EAACJ;IACxDE,MAAMD,QAAQ,GAAG,CAAC,EAAEA,SAAS,CAAC;IAC9BC,MAAMG,QAAQ,GAAG;IACjB,OAAOH;AACT;AAEO,SAASH,yBAAyBO,UAAkB;IACzD,IAAI,CAACA,YAAY;IAEjB,IAAI,CAACA,WAAWC,UAAU,CAAC,cAAc,CAACD,WAAWC,UAAU,CAAC,aAAa;QAC3ED,aAAa,CAAC,OAAO,EAAEA,WAAW,CAAC;IACrC;IAEA,OAAOF,IAAAA,0BAAY,EAACE;AACtB"}

package/dist/utils/websocket.adapter.js

@@ -23,13 +23,7 @@ class WebsocketAdapter {
         this.socket?.close();
         delete this.socket;
     }
-    /**
-   * @protected
-   * Open a WebSocket connection.
-   *
-   * @param {string|URL} url - The URL to connect to.
-   * @returns {void}
-   */ open(url) {
+    open(url) {
         this.socket = new _ws.WebSocket(url, {
             handshakeTimeout: _serverconstants.AppConstants.defaultWebsocketHandshakeTimeout
         });
@@ -38,13 +32,7 @@ class WebsocketAdapter {
         this.socket.onclose = (event)=>this.onClose(event);
         this.socket.onmessage = (message)=>this.onMessage(message.data);
     }
-    /**
-   * @protected
-   * Send a message through the WebSocket connection.
-   *
-   * @param {string} payload - The message payload to send.
-   * @returns {Promise<void>} A promise that resolves when the message is sent successfully.
-   */ async sendMessage(payload) {
+    async sendMessage(payload) {
         if (!this.isOpened || !this.socket) {
             this.#logger.error("Websocket is not opened, cant send a message");
             return;
@@ -56,48 +44,14 @@ class WebsocketAdapter {
             });
         });
     }
-    /**
-   * Handle error event.
-   * @protected
-   * @abstract
-   * @param {Event} error - The error event object.
-   * @returns {Promise<void> | void} A promise that resolves when the error handling is complete, or void if no promise is returned.
-   */ onError(error) {}
-    /**
-   * Handle after opened event.
-   * @protected
-   * @abstract
-   * @param {Event} event - The event object.
-   * @returns {Promise<void> | void} A promise that resolves when the after opened handling is complete, or void if no promise is returned.
-   */ afterOpened(event) {}
-    /**
-   * Handle after closed event.
-   * @protected
-   * @abstract
-   * @param {CloseEvent} event - The event object.
-   * @returns {Promise<void> | void} A promise that resolves when the after closed handling is complete, or void if no promise is returned.
-   */ afterClosed(event) {}
-    /**
-   * Handle message event.
-   * @protected
-   * @abstract
-   * @param {Data} event - The event object.
-   * @returns {Promise<void> | void} A promise that resolves when the message handling is complete, or void if no promise is returned.
-   */ onMessage(event) {}
-    /**
-   * Handle open event.
-   * @private
-   * @param {Event} event - The event object.
-   * @returns {Promise<void>} A promise that resolves when the open handling is complete.
-   */ async onOpen(event) {
+    onError(error) {}
+    afterOpened(event) {}
+    afterClosed(event) {}
+    onMessage(event) {}
+    async onOpen(event) {
         await this.afterOpened(event);
     }
-    /**
-   * Handle close event.
-   * @private
-   * @param {CloseEvent} event - The event object.
-   * @returns {Promise<void>} A promise that resolves when the close handling is complete.
-   */ async onClose(event) {
+    async onClose(event) {
         await this.afterClosed(event);
     }
 }

package/dist/utils/websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALgB;oBAC6C;AAInE,MAAMA;IACXC,OAAmB;IACnB,CAACC,MAAM,CAAgB;IAEvBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAAC,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACpD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEAC,QAAQ;QACN,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IAEA;;;;;;GAMC,GACDU,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACX,MAAM,GAAG,IAAIO,aAAS,CAACI,KAAK;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,IAAI,CAACd,MAAM,CAACe,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAAChB,MAAM,CAACkB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAAChB,MAAM,CAACuB,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IAEA;;;;;;GAMC,GACD,MAAMC,YAAYC,OAAe,EAAiB;QAChD,IAAI,CAAC,IAAI,CAACvB,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAAC,CAACC,MAAM,CAACkB,KAAK,CAAC;YACnB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAC/B,MAAM,CAAEgC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IAEA;;;;;;GAMC,GACDV,QAAQD,KAAiB,EAAwB,CAAC;IAElD;;;;;;GAMC,GACDc,YAAYjB,KAAc,EAAwB,CAAC;IAEnD;;;;;;GAMC,GACDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAEtD;;;;;;GAMC,GACDS,UAAUT,KAAW,EAAwB,CAAC;IAE9C;;;;;GAKC,GACD,MAAMC,OAAOD,KAAc,EAAiB;QAC1C,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAEA;;;;;GAKC,GACD,MAAMM,QAAQN,KAAiB,EAAiB;QAC9C,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}
+{"version":3,"sources":["../../src/utils/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALgB;oBAC6C;AAInE,MAAMA;IACXC,OAAmB;IACnB,CAACC,MAAM,CAAgB;IAEvBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAAC,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACpD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEAC,QAAQ;QACN,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IASAU,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACX,MAAM,GAAG,IAAIO,aAAS,CAACI,KAAK;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,IAAI,CAACd,MAAM,CAACe,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAAChB,MAAM,CAACkB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAAChB,MAAM,CAACuB,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAMC,YAAYC,OAAe,EAAiB;QAChD,IAAI,CAAC,IAAI,CAACvB,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAAC,CAACC,MAAM,CAACkB,KAAK,CAAC;YACnB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAC/B,MAAM,CAAEgC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASAV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQ9C,MAAMC,OAAOD,KAAc,EAAiB;QAC1C,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAMM,QAAQN,KAAiB,EAAiB;QAC9C,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}

package/package.json

@@ -7,7 +7,7 @@
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
   "private": false,
-  "version": "1.5.1",
+  "version": "1.5.4",
   "description": "FDM Monster is a bulk OctoPrint manager to set up, configure and monitor 3D printers. Our aim is to provide extremely optimized websocket performance and reliability.",
   "main": "dist/index.js",
   "scripts": {
@@ -17,7 +17,7 @@
     "build:watch": "swc src -w -d dist",
     "start:dev": "ts-node src/index.ts",
     "start": "cross-env NODE_ENV=production node dist/index.js",
-    "migration:create": "migrate-mongo create printer-remove-sortindex",
+    "migration:create": "migrate-mongo create printer-remove-settingsappearance",
     "migration:up": "migrate-mongo up",
     "migration:down": "migrate-mongo down",
     "migration:status": "migrate-mongo status",
@@ -39,13 +39,13 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.4.1",
+    "@fdm-monster/client": "1.4.4",
     "@influxdata/influxdb-client": "1.33.2",
-    "@sentry/node": "7.77.0",
+    "@sentry/node": "7.82.0",
     "adm-zip": "0.5.10",
     "awilix": "9.0.0",
     "awilix-express": "8.0.0",
-    "axios": "1.6.0",
+    "axios": "1.6.2",
     "bcryptjs": "2.4.3",
     "cache-manager": "4.1.0",
     "class-validator": "0.14.0",
@@ -58,25 +58,25 @@
     "express": "4.18.2",
     "form-data": "4.0.0",
     "got": "11.8.6",
-    "helmet": "7.0.0",
+    "helmet": "7.1.0",
     "ip": "1.1.8",
     "js-yaml": "4.1.0",
     "jsonwebtoken": "9.0.2",
     "lodash": "4.17.21",
-    "luxon": "3.4.3",
+    "luxon": "3.4.4",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.12.2",
-    "mqtt": "5.1.4",
+    "mongoose": "6.12.3",
+    "mqtt": "5.3.0",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
     "nodemon": "3.0.1",
-    "octokit": "3.1.1",
+    "octokit": "3.1.2",
     "passport": "0.6.0",
     "passport-anonymous": "1.0.1",
     "passport-jwt": "4.0.1",
     "reflect-metadata": "0.1.13",
     "semver": "7.5.4",
-    "simple-git": "3.20.0",
+    "simple-git": "3.21.0",
     "socket.io": "4.7.2",
     "toad-scheduler": "3.0.0",
     "uuid": "9.0.1",
@@ -86,32 +86,32 @@
   "devDependencies": {
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
-    "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.95",
+    "@swc/cli": "0.1.63",
+    "@swc/core": "1.3.99",
     "@swc/jest": "0.2.29",
-    "@types/adm-zip": "0.5.3",
-    "@types/bcryptjs": "2.4.5",
-    "@types/cache-manager": "4.0.4",
-    "@types/connect-history-api-fallback": "1.5.2",
-    "@types/cookie-parser": "1.4.5",
-    "@types/express": "4.17.20",
-    "@types/express-session": "1.17.9",
-    "@types/ip": "1.1.2",
-    "@types/jest": "29.5.7",
-    "@types/js-yaml": "4.0.8",
-    "@types/lodash": "4.14.200",
-    "@types/luxon": "3.3.3",
-    "@types/migrate-mongo": "10.0.3",
-    "@types/multer": "1.4.9",
-    "@types/node": "20.8.10",
-    "@types/passport-anonymous": "1.0.4",
-    "@types/passport-jwt": "3.0.12",
-    "@types/semver": "7.5.4",
-    "@types/supertest": "2.0.15",
-    "@types/uuid": "9.0.6",
+    "@types/adm-zip": "0.5.5",
+    "@types/bcryptjs": "2.4.6",
+    "@types/cache-manager": "4.0.6",
+    "@types/connect-history-api-fallback": "1.5.4",
+    "@types/cookie-parser": "1.4.6",
+    "@types/express": "4.17.21",
+    "@types/express-session": "1.17.10",
+    "@types/ip": "1.1.3",
+    "@types/jest": "29.5.10",
+    "@types/js-yaml": "4.0.9",
+    "@types/lodash": "4.14.202",
+    "@types/luxon": "3.3.5",
+    "@types/migrate-mongo": "10.0.4",
+    "@types/multer": "1.4.11",
+    "@types/node": "20.10.0",
+    "@types/passport-anonymous": "1.0.5",
+    "@types/passport-jwt": "3.0.13",
+    "@types/semver": "7.5.6",
+    "@types/supertest": "2.0.16",
+    "@types/uuid": "9.0.7",
     "chokidar": "3.5.3",
     "concurrently": "8.2.2",
-    "eslint": "8.53.0",
+    "eslint": "8.54.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-config-standard": "17.1.0",
@@ -122,12 +122,12 @@
     "express-list-routes": "1.1.9",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
-    "mongodb-memory-server": "9.0.1",
-    "nock": "13.3.8",
+    "mongodb-memory-server": "9.1.1",
+    "nock": "13.4.0",
     "prettier": "2.8.8",
     "supertest": "6.3.3",
     "ts-node": "10.9.1",
-    "typescript": "5.2.2"
+    "typescript": "5.3.2"
   },
   "resolutions": {
     "got": "11.8.6"

package/dist/state/files.store.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/state/files.store.ts"],"names":["FilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFileStorage","getPrinterFilesStorage","id","cachePrinterFileStorage","e","error","stack","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getFiles","unwrap","simple","updatePrinterFiles","data","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","printerFiles","files","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","printerName","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","printerFileList","updateFiles","cachePrinterFiles","appendOrSetPrinterFile","addedFile","fileList","lastPrintedFile","appendOrReplaceFile","setPrinterLastPrintedFile","fileName","setExistingFileForPrint","filePath","deleteFile","throwError","serviceActionResult","cacheActionResult","purgeFile","service","cache"],"mappings":"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"}

package/dist/utils/mapper.utils.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    mapMongoDb: function() {
-        return mapMongoDb;
-    },
-    mapMongoDbArray: function() {
-        return mapMongoDbArray;
-    }
-});
-function mapMongoDbArray(docs) {
-    if (!docs?.length) return [];
-    return docs.map(mapMongoDb);
-}
-function mapMongoDb(doc) {
-    if (!doc) return;
-    const data = doc.toJSON();
-    const id = data._id?.toString();
-    delete data._id;
-    delete data.__v;
-    data.id = id;
-    return data;
-}
-
-//# sourceMappingURL=mapper.utils.js.map

package/dist/utils/mapper.utils.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/mapper.utils.ts"],"names":["mapMongoDb","mapMongoDbArray","docs","length","map","doc","data","toJSON","id","_id","toString","__v"],"mappings":";;;;;;;;;;;IAUgBA,UAAU;eAAVA;;IAVAC,eAAe;eAAfA;;;AAAT,SAASA,gBAAgBC,IAAI;IAClC,IAAI,CAACA,MAAMC,QAAQ,OAAO,EAAE;IAE5B,OAAOD,KAAKE,GAAG,CAACJ;AAClB;AAMO,SAASA,WAAWK,GAAQ;IACjC,IAAI,CAACA,KAAK;IAEV,MAAMC,OAAOD,IAAIE,MAAM;IACvB,MAAMC,KAAKF,KAAKG,GAAG,EAAEC;IACrB,OAAOJ,KAAKG,GAAG;IACf,OAAOH,KAAKK,GAAG;IACfL,KAAKE,EAAE,GAAGA;IACV,OAAOF;AACT"}