@fdm-monster/server 1.8.1 → 1.8.3

package/dist/services/core/multer.service.js

@@ -8,28 +8,65 @@ Object.defineProperty(exports, "MulterService", {
         return MulterService;
     }
 });
-const _multer = /*#__PURE__*/ _interop_require_default(require("multer"));
+const _multer = /*#__PURE__*/ _interop_require_wildcard(require("multer"));
 const _path = require("path");
 const _fs = require("fs");
 const _fsutils = require("../../utils/fs.utils");
 const _serverconstants = require("../../server.constants");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
+const _nodefs = require("node:fs");
+const _errorutils = require("../../utils/error.utils");
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
     };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
 }
 class MulterService {
     fileUploadTrackerCache;
-    httpClient;
-    constructor({ fileUploadTrackerCache, httpClient }){
+    httpClientFactory;
+    logger;
+    constructor({ fileUploadTrackerCache, httpClientFactory, loggerFactory }){
         this.fileUploadTrackerCache = fileUploadTrackerCache;
-        this.httpClient = httpClient;
+        this.httpClientFactory = httpClientFactory;
+        this.logger = loggerFactory(MulterService.name);
     }
-    getNewestFile(collection) {
-        const dirPath = this.collectionPath(collection);
-        const files = this.orderRecentFiles(dirPath);
-        const latestFile = files.length ? files[0] : undefined;
-        return latestFile ? (0, _path.join)(dirPath, latestFile.file) : undefined;
+    startTrackingSession(multerFile, printerId) {
+        return this.fileUploadTrackerCache.addUploadTracker(multerFile, printerId);
     }
     clearUploadsFolder() {
         const fileStoragePath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
@@ -38,11 +75,26 @@ class MulterService {
             withFileTypes: true
         }).filter((item)=>!item.isDirectory()).map((item)=>item.name);
         for (const file of files){
-            (0, _fs.unlink)((0, _path.join)(fileStoragePath, file), (err)=>{
-                if (err) throw err;
-            });
+            try {
+                (0, _nodefs.rmSync)((0, _path.join)(fileStoragePath, file));
+            } catch (error) {
+                this.logger.error(`Could not clear upload file in temporary folder ${(0, _errorutils.errorSummary)(error)}`);
+            }
         }
     }
+    clearUploadedFile(multerFile) {
+        if ((0, _fs.existsSync)(multerFile.path)) {
+            (0, _nodefs.rmSync)(multerFile.path);
+        } else {
+            this.logger.warn("Cannot unlink temporarily uploaded file as it was not found");
+        }
+    }
+    getNewestFile(collection) {
+        const dirPath = this.collectionPath(collection);
+        const files = this.orderRecentFiles(dirPath);
+        const latestFile = files.length ? files[0] : undefined;
+        return latestFile ? (0, _path.join)(dirPath, latestFile.file) : undefined;
+    }
     fileExists(downloadFilename, collection) {
         const downloadPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
         return (0, _fs.existsSync)(downloadPath);
@@ -56,7 +108,8 @@ class MulterService {
         }
         const downloadPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
         const fileStream = (0, _fs.createWriteStream)(downloadPath);
-        const res = await this.httpClient.get(downloadUrl);
+        const defaultHttpClient = this.httpClientFactory.createDefaultClient();
+        const res = await defaultHttpClient.get(downloadUrl);
         return await new Promise((resolve, reject)=>{
             fileStream.write(res.data);
             fileStream.on("error", (err)=>{
@@ -84,14 +137,14 @@ class MulterService {
     }
     getMulterFileFilter(fileExtensions, storeAsFile = true) {
         return (0, _multer.default)({
-            storage: storeAsFile ? _multer.default.diskStorage({
+            storage: storeAsFile ? (0, _multer.diskStorage)({
                 destination: (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder)
-            }) : _multer.default.memoryStorage(),
+            }) : (0, _multer.memoryStorage)(),
             fileFilter: this.multerFileFilter(fileExtensions)
         }).any();
     }
     multerFileFilter(extensions) {
-        return (req, file, callback)=>{
+        return (_, file, callback)=>{
             const ext = (0, _path.extname)(file.originalname);
             if (extensions?.length && !extensions.includes(ext?.toLowerCase())) {
                 return callback(new Error(`Only files with extensions ${extensions} are allowed`));
@@ -99,9 +152,6 @@ class MulterService {
             return callback(null, true);
         };
     }
-    startTrackingSession(multerFile) {
-        return this.fileUploadTrackerCache.addUploadTracker(multerFile);
-    }
     getSessions() {
         return this.fileUploadTrackerCache.getUploads();
     }

package/dist/services/core/multer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","defaultAcceptedGcodeExtensions","multerLoadFileAsync","req","fileExtensions","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extensions","callback","ext","extname","originalname","includes","toLowerCase","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClientFactory","logger","constructor","loggerFactory","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileStoragePath","join","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","files","readdirSync","withFileTypes","filter","item","isDirectory","map","file","rmSync","error","errorSummary","clearUploadedFile","path","warn","getNewestFile","collection","dirPath","collectionPath","orderRecentFiles","latestFile","length","undefined","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","defaultHttpClient","createDefaultClient","res","get","Promise","resolve","reject","write","data","on","err","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","defaultAcceptedGcodeExtensions","multerLoadFileAsync","req","fileExtensions","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extensions","_","callback","ext","extname","originalname","includes","toLowerCase","Error","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}

package/dist/services/interfaces/file-upload-tracker.interface.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=file-upload-tracker.interface.js.map

package/dist/services/interfaces/file-upload-tracker.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/interfaces/file-upload-tracker.interface.ts"],"names":[],"mappings":""}

package/dist/services/interfaces/printer.dto.js

@@ -14,6 +14,9 @@ _export(exports, {
     },
     PrinterUnsafeDto: function() {
         return PrinterUnsafeDto;
+    },
+    PrinterUnsafeWithCorrelationDto: function() {
+        return PrinterUnsafeWithCorrelationDto;
     }
 });
 const _sharedconstants = require("../../shared.constants");
@@ -28,5 +31,8 @@ class PrinterUnsafeDto extends PrinterDto {
     printerURL;
     printerType;
 }
+class PrinterUnsafeWithCorrelationDto extends PrinterUnsafeDto {
+    correlationToken;
+}
 
 //# sourceMappingURL=printer.dto.js.map

package/dist/services/interfaces/printer.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","PrinterUnsafeDto","IdDto","name","enabled","disabledReason","dateAdded","apiKey","printerURL","printerType"],"mappings":";;;;;;;;;;;IAEaA,UAAU;eAAVA;;IAOAC,gBAAgB;eAAhBA;;;iCATS;AAEf,MAAMD,mBAA4BE,sBAAK;IAC5CC,KAAa;IACbC,QAAiB;IACjBC,eAAuB;IACvBC,UAAkB;AACpB;AAEO,MAAML,yBAAkCD;IAC7CO,OAAe;IACfC,WAAmB;IACnBC,YAAoB;AACtB"}
+{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","PrinterUnsafeDto","PrinterUnsafeWithCorrelationDto","IdDto","name","enabled","disabledReason","dateAdded","apiKey","printerURL","printerType","correlationToken"],"mappings":";;;;;;;;;;;IAEaA,UAAU;eAAVA;;IAOAC,gBAAgB;eAAhBA;;IAMAC,+BAA+B;eAA/BA;;;iCAfS;AAEf,MAAMF,mBAA4BG,sBAAK;IAC5CC,KAAa;IACbC,QAAiB;IACjBC,eAAuB;IACvBC,UAAkB;AACpB;AAEO,MAAMN,yBAAkCD;IAC7CQ,OAAe;IACfC,WAAmB;IACnBC,YAAoB;AACtB;AAEO,MAAMR,wCAAiDD;IAC5DU,iBAAyB;AAC3B"}

package/dist/services/mongoose/printer.service.js

@@ -13,6 +13,7 @@ const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _validators = require("../../handlers/validators");
 const _printerservicevalidation = require("../validators/printer-service.validation");
 const _eventconstants = require("../../constants/event.constants");
+const _normalizeurl = require("../../utils/normalize-url");
 const _urlutils = require("../../utils/url.utils");
 class PrinterService {
     eventEmitter2;
@@ -69,7 +70,9 @@ class PrinterService {
     }
     async update(printerId, updateData) {
         const printer = await this.get(printerId);
-        updateData.printerURL = (0, _urlutils.normalizeURLWithProtocol)(updateData.printerURL);
+        updateData.printerURL = (0, _normalizeurl.normalizeUrl)(updateData.printerURL, {
+            defaultProtocol: _urlutils.defaultHttpProtocol
+        });
         const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
         printer.printerURL = printerURL;
         printer.apiKey = apiKey;
@@ -156,7 +159,9 @@ class PrinterService {
     }
     async updateConnectionSettings(printerId, { printerURL, apiKey, printerType }) {
         const update = {
-            printerURL: (0, _urlutils.normalizeURLWithProtocol)(printerURL),
+            printerURL: (0, _normalizeurl.normalizeUrl)(printerURL, {
+                defaultProtocol: _urlutils.defaultHttpProtocol
+            }),
             apiKey,
             printerType
         };
@@ -212,7 +217,9 @@ class PrinterService {
             ...printer
         };
         if (mergedPrinter.printerURL?.length) {
-            mergedPrinter.printerURL = (0, _urlutils.normalizeURLWithProtocol)(mergedPrinter.printerURL);
+            mergedPrinter.printerURL = (0, _normalizeurl.normalizeUrl)(mergedPrinter.printerURL, {
+                defaultProtocol: _urlutils.defaultHttpProtocol
+            });
         }
         return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createMongoPrinterRules);
     }

package/dist/services/mongoose/printer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeURLWithProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateFlowRate","flowRate","findByIdAndUpdate","new","useFindAndModify","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeUrl","defaultProtocol","defaultHttpProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateFlowRate","flowRate","findByIdAndUpdate","new","useFindAndModify","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"],"mappings":"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"}

package/dist/services/moonraker/moonraker-websocket.adapter.js

@@ -18,6 +18,7 @@ const _prettyprintutils = require("../../utils/pretty-print.utils");
 const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
 const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
 const _printerapiinterface = require("../printer-api.interface");
+const _normalizeurl = require("../../utils/normalize-url");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -89,8 +90,11 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         const { printerId, loginDto } = socketLogin;
         this.printerId = printerId;
         this.login = loginDto;
-        const wsUrl = (0, _urlutils.httpToWsUrl)(this.login.printerURL);
-        wsUrl.pathname = "/websocket";
+        const httpUrlString = (0, _normalizeurl.normalizeUrl)(this.login.printerURL);
+        const httpUrl = new URL(httpUrlString);
+        const httpUrlPath = httpUrl.pathname;
+        const wsUrl = (0, _urlutils.httpToWsUrl)(httpUrlString);
+        wsUrl.pathname = (httpUrlPath ?? "/") + "websocket";
         this.socketURL = wsUrl;
     }
     open() {

package/dist/services/moonraker/moonraker-websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","wsUrl","httpToWsUrl","printerURL","pathname","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","httpUrlString","normalizeUrl","printerURL","httpUrl","URL","httpUrlPath","pathname","wsUrl","httpToWsUrl","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}