@fdm-monster/server 2.0.0-rc1 → 2.0.1

package/dist/services/bambu/bambu-mqtt.adapter.js

@@ -77,10 +77,7 @@ class BambuMqttAdapter {
         if (!this.host || !this.accessCode || !this.serial) {
             throw new Error("Cannot open connection: credentials not registered");
         }
-        this.connect(this.host, this.accessCode, this.serial).catch((err)=>{
-            this.logger.error("Failed to open MQTT connection: " + err.toString());
-            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-        });
+        this.connect(this.host, this.accessCode, this.serial);
     }
     close() {
         this.disconnect().catch((err)=>{
@@ -102,14 +99,15 @@ class BambuMqttAdapter {
     disallowEmittingEvents() {
         this.eventsAllowed = false;
     }
-    async connect(host, accessCode, serial) {
+    connect(host, accessCode, serial) {
         if (this.mqttClient?.connected) {
             this.logger.debug("MQTT already connected");
             this.updateSocketState(_socketstatetype.SOCKET_STATE.opened);
             return;
         }
         if (this.isConnecting) {
-            throw new Error("Connection already in progress");
+            this.logger.warn("Connection already in progress");
+            return;
         }
         this.host = host;
         this.accessCode = accessCode;
@@ -119,80 +117,75 @@ class BambuMqttAdapter {
         const mqttUrl = `mqtts://${host}:8883`;
         const timeout = this.settingsStore.getTimeoutSettings().apiTimeout;
         this.logger.log(`Connecting to Bambu MQTT at ${mqttUrl}`);
-        return new Promise((resolve, reject)=>{
-            const connectionTimeout = setTimeout(()=>{
+        const connectionTimeout = setTimeout(()=>{
+            this.isConnecting = false;
+            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+            this.logger.error("MQTT connection timeout");
+            if (this.mqttClient) {
+                this.mqttClient.end(true);
+            }
+        }, timeout);
+        try {
+            this.mqttClient = _mqtt.default.connect(mqttUrl, {
+                username: "bblp",
+                password: accessCode,
+                clientId: `fdm_monster_${serial}_${Date.now()}`,
+                protocol: "mqtts",
+                connectTimeout: timeout,
+                reconnectPeriod: 0,
+                keepalive: 60,
+                rejectUnauthorized: false
+            });
+            this.mqttClient.on("connect", ()=>{
+                clearTimeout(connectionTimeout);
                 this.isConnecting = false;
-                this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-                this.cleanup();
-                reject(new Error("MQTT connection timeout"));
-            }, timeout);
-            try {
-                this.mqttClient = _mqtt.default.connect(mqttUrl, {
-                    username: "bblp",
-                    password: accessCode,
-                    clientId: `fdm_monster_${serial}_${Date.now()}`,
-                    protocol: "mqtts",
-                    connectTimeout: timeout,
-                    reconnectPeriod: 5000,
-                    keepalive: 60,
-                    rejectUnauthorized: false
-                });
-                this.mqttClient.on("connect", ()=>{
-                    clearTimeout(connectionTimeout);
-                    this.isConnecting = false;
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.authenticated);
-                    this.updateApiState(_apistatetype.API_STATE.responding);
-                    this.logger.log("MQTT connected successfully");
-                    const reportTopic = `device/${serial}/report`;
-                    this.mqttClient.subscribe(reportTopic, {
-                        qos: 0
-                    }, (err)=>{
-                        if (err) {
-                            this.logger.error(`Failed to subscribe to ${reportTopic}:`, err);
-                            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-                            reject(new Error(`Subscribe failed: ${err.message}`));
-                        } else {
-                            this.logger.debug(`Subscribed to ${reportTopic}`);
-                            resolve();
-                        }
-                    });
-                });
-                this.mqttClient.on("error", (error)=>{
-                    clearTimeout(connectionTimeout);
-                    this.isConnecting = false;
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-                    this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_ERROR, error.message).catch(()=>{});
-                    this.logger.error("MQTT error:", error);
-                    if (!this.mqttClient?.connected) {
-                        reject(error);
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.authenticated);
+                this.updateApiState(_apistatetype.API_STATE.responding);
+                this.logger.log("MQTT connected successfully");
+                const reportTopic = `device/${serial}/report`;
+                this.mqttClient.subscribe(reportTopic, {
+                    qos: 0
+                }, (err)=>{
+                    if (err) {
+                        this.logger.error(`Failed to subscribe to ${reportTopic}:`, err);
+                        this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+                    } else {
+                        this.logger.debug(`Subscribed to ${reportTopic}`);
                     }
                 });
-                this.mqttClient.on("message", (topic, message)=>{
-                    this.lastMessageReceivedTimestamp = Date.now();
-                    this.handleMessage(topic, message);
-                });
-                this.mqttClient.on("disconnect", ()=>{
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
-                    this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "disconnected").catch(()=>{});
-                    this.logger.warn("MQTT disconnected");
-                });
-                this.mqttClient.on("reconnect", ()=>{
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.opening);
-                    this.logger.debug("MQTT reconnecting...");
-                });
-                this.mqttClient.on("close", ()=>{
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
-                    this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "connection closed").catch(()=>{});
-                    this.logger.debug("MQTT connection closed");
-                });
-            } catch (error) {
-                clearTimeout(connectionTimeout);
+            });
+            this.mqttClient.on("error", (error)=>{
                 this.isConnecting = false;
                 this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+                this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_ERROR, error.message).catch(()=>{});
+                this.logger.error("MQTT error:", error);
+            });
+            this.mqttClient.on("message", (topic, message)=>{
+                this.lastMessageReceivedTimestamp = Date.now();
+                this.handleMessage(topic, message);
+            });
+            this.mqttClient.on("disconnect", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
+                this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "disconnected").catch(()=>{});
+                this.logger.warn("MQTT disconnected");
+            });
+            this.mqttClient.on("reconnect", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.opening);
+                this.logger.debug("MQTT reconnecting...");
+            });
+            this.mqttClient.on("close", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
+                this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "connection closed").catch(()=>{});
+                this.logger.debug("MQTT connection closed");
                 this.cleanup();
-                reject(error);
-            }
-        });
+            });
+        } catch (error) {
+            clearTimeout(connectionTimeout);
+            this.isConnecting = false;
+            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+            this.logger.error("Failed to create MQTT client:", error);
+            this.cleanup();
+        }
     }
     async disconnect() {
         if (!this.mqttClient) {
@@ -378,9 +371,12 @@ class BambuMqttAdapter {
             const payload = JSON.parse(message.toString());
             if (topic.endsWith("/report") && payload.print) {
                 this.lastState = payload.print;
-                this.logger.debug("Received printer state update");
                 const currentMessage = this.transformStateToCurrentMessage(this.lastState);
-                this.emitEvent("current", currentMessage).catch((err)=>{
+                const combinedPayload = {
+                    ...currentMessage,
+                    print: payload.print
+                };
+                this.emitEvent("current", combinedPayload).catch((err)=>{
                     this.logger.error("Failed to emit current event:", err);
                 });
             }
@@ -393,6 +389,7 @@ class BambuMqttAdapter {
             this.mqttClient.removeAllListeners();
             this.mqttClient = null;
         }
+        this.isConnecting = false;
         this.lastState = null;
     }
 }

package/dist/services/bambu/bambu-mqtt.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/bambu/bambu-mqtt.adapter.ts"],"names":["BambuMqttAdapter","bambuEvent","event","logger","settingsStore","eventEmitter2","printerType","BambuType","printerId","socketState","SOCKET_STATE","unopened","apiState","API_STATE","unset","login","lastMessageReceivedTimestamp","mqttClient","host","accessCode","serial","lastState","isConnecting","eventsAllowed","loggerFactory","name","registerCredentials","socketLogin","loginDto","printerURL","replace","password","username","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","reauthSession","debug","open","Error","connect","catch","err","toString","updateSocketState","close","disconnect","setupSocketSession","updateApiState","noResponse","opening","allowEmittingEvents","disallowEmittingEvents","connected","opened","mqttUrl","timeout","getTimeoutSettings","apiTimeout","log","Promise","resolve","reject","connectionTimeout","setTimeout","cleanup","mqtt","clientId","Date","now","protocol","connectTimeout","reconnectPeriod","keepalive","rejectUnauthorized","on","clearTimeout","authenticated","reportTopic","subscribe","qos","message","emitEvent","WsMessage","WS_ERROR","topic","handleMessage","WS_CLOSED","warn","end","getLastState","sendCommand","payload","requestTopic","JSON","stringify","publish","startPrint","filename","print","command","param","url","subtask_name","sequence_id","String","pausePrint","resumePrint","stopPrint","sendGcode","gcode","resetSocketState","state","emitEventSync","WS_STATE_UPDATED","API_STATE_UPDATED","emitAsync","emit","transformStateToCurrentMessage","isPrinting","gcode_state","mc_print_stage","isPaused","isPausedText","text","flags","operational","printing","paused","ready","print_error","cancelling","pausing","sdReady","closedOrError","temps","time","tool0","actual","nozzle_temper","target","nozzle_target_temper","bed","bed_temper","bed_target_temper","chamber","chamber_temper","progress","completion","mc_percent","printTime","printTimeLeft","mc_remaining_time","job","file","gcode_file","currentZ","layer_num","offsets","resends","count","transmitted","ratio","logs","messages","parse","endsWith","currentMessage","removeAllListeners"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/bambu/bambu-mqtt.adapter.ts"],"names":["BambuMqttAdapter","bambuEvent","event","logger","settingsStore","eventEmitter2","printerType","BambuType","printerId","socketState","SOCKET_STATE","unopened","apiState","API_STATE","unset","login","lastMessageReceivedTimestamp","mqttClient","host","accessCode","serial","lastState","isConnecting","eventsAllowed","loggerFactory","name","registerCredentials","socketLogin","loginDto","printerURL","replace","password","username","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","reauthSession","debug","open","Error","connect","close","disconnect","catch","err","setupSocketSession","updateSocketState","updateApiState","noResponse","opening","allowEmittingEvents","disallowEmittingEvents","connected","opened","warn","mqttUrl","timeout","getTimeoutSettings","apiTimeout","log","connectionTimeout","setTimeout","end","mqtt","clientId","Date","now","protocol","connectTimeout","reconnectPeriod","keepalive","rejectUnauthorized","on","clearTimeout","authenticated","reportTopic","subscribe","qos","emitEvent","WsMessage","WS_ERROR","message","topic","handleMessage","WS_CLOSED","cleanup","Promise","resolve","getLastState","sendCommand","payload","requestTopic","JSON","stringify","reject","publish","startPrint","filename","print","command","param","url","subtask_name","sequence_id","String","pausePrint","resumePrint","stopPrint","sendGcode","gcode","resetSocketState","state","emitEventSync","WS_STATE_UPDATED","API_STATE_UPDATED","emitAsync","emit","transformStateToCurrentMessage","isPrinting","gcode_state","mc_print_stage","isPaused","isPausedText","text","flags","operational","printing","paused","ready","print_error","cancelling","pausing","sdReady","closedOrError","temps","time","tool0","actual","nozzle_temper","target","nozzle_target_temper","bed","bed_temper","bed_target_temper","chamber","chamber_temper","progress","completion","mc_percent","printTime","printTimeLeft","mc_remaining_time","job","file","gcode_file","currentZ","layer_num","offsets","resends","count","transmitted","ratio","logs","messages","parse","toString","endsWith","currentMessage","combinedPayload","removeAllListeners"],"mappings":"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"}

package/dist/services/core/batch-call.service.js

@@ -85,31 +85,6 @@ class BatchCallService {
             }
         }
     }
-    async batchSettingsGet(printerIds) {
-        const promises = [];
-        for (const printerId of printerIds){
-            const login = await this.printerCache.getLoginDtoAsync(printerId);
-            const time = Date.now();
-            const client = this.getPrinter(login);
-            const promise = client.getSettings().then((r)=>{
-                return {
-                    success: true,
-                    printerId,
-                    time: Date.now() - time,
-                    value: r
-                };
-            }).catch((e)=>{
-                return {
-                    failure: true,
-                    error: e.message,
-                    printerId,
-                    time: Date.now() - time
-                };
-            });
-            promises.push(promise);
-        }
-        return await Promise.all(promises);
-    }
     async batchConnectUsb(printerIds) {
         const promises = [];
         for (const printerId of printerIds){

package/dist/services/core/batch-call.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","logger","loggerFactory","printerApiFactory","printerCache","printerSocketStore","printerService","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","undefined","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","warn","push","Promise","all","batchConnectSocket","reconnectPrinterAdapter","captureException","errorSummary","batchSettingsGet","getLoginDtoAsync","client","getSettings","r","value","batchConnectUsb","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","logger","loggerFactory","printerApiFactory","printerCache","printerSocketStore","printerService","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","undefined","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","warn","push","Promise","all","batchConnectSocket","reconnectPrinterAdapter","captureException","errorSummary","batchConnectUsb","getLoginDtoAsync","client","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}

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

@@ -67,14 +67,14 @@ class MulterService {
         return this.fileUploadTrackerCache.addUploadTracker(multerFile, printerId);
     }
     clearUploadsFolder() {
-        const fileStoragePath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
-        if (!(0, _nodefs.existsSync)(fileStoragePath)) return;
-        const files = (0, _nodefs.readdirSync)(fileStoragePath, {
+        const fileUploadsPath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
+        if (!(0, _nodefs.existsSync)(fileUploadsPath)) return;
+        const files = (0, _nodefs.readdirSync)(fileUploadsPath, {
             withFileTypes: true
         }).filter((item)=>!item.isDirectory()).map((item)=>item.name);
         for (const file of files){
             try {
-                (0, _nodefs.rmSync)((0, _nodepath.join)(fileStoragePath, file));
+                (0, _nodefs.rmSync)((0, _nodepath.join)(fileUploadsPath, file));
             } catch (error) {
                 this.logger.error(`Could not clear upload file in temporary folder ${(0, _errorutils.errorSummary)(error)}`);
             }
@@ -87,10 +87,6 @@ class MulterService {
             this.logger.warn("Cannot unlink temporarily uploaded file as it was not found");
         }
     }
-    fileExists(downloadFilename, collection) {
-        const downloadPath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
-        return (0, _nodefs.existsSync)(downloadPath);
-    }
     getMulterGCodeFileFilter(storeAsFile = true) {
         return this.getMulterFileFilter(storeAsFile);
     }
@@ -123,7 +119,7 @@ class MulterService {
     getMulterFileFilter(storeAsFile = true) {
         return (0, _multer.default)({
             storage: storeAsFile ? (0, _multer.diskStorage)({
-                destination: (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder)
+                destination: (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage)
             }) : (0, _multer.memoryStorage)()
         }).any();
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","loggerFactory","fileUploadTrackerCache","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","fileExists","downloadFilename","collection","downloadPath","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","res","fileExtensions","Promise","resolve","reject","err","validateUploadedFiles","allowedExtensions","length","ext","extname","originalname","toLowerCase","includes","e","ValidationException","multer","storage","diskStorage","destination","memoryStorage","any","getSessions","getUploads"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","loggerFactory","fileUploadTrackerCache","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileUploadsPath","join","superRootPath","AppConstants","defaultFileUploadsStorage","existsSync","files","readdirSync","withFileTypes","filter","item","isDirectory","map","file","rmSync","error","errorSummary","clearUploadedFile","path","warn","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","res","fileExtensions","Promise","resolve","reject","err","validateUploadedFiles","allowedExtensions","length","ext","extname","originalname","toLowerCase","includes","e","ValidationException","multer","storage","diskStorage","destination","memoryStorage","any","getSessions","getUploads"],"mappings":"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"}