@fdm-monster/server 2.0.6 → 2.0.7

package/dist/controllers/print-job.controller.js

@@ -51,8 +51,27 @@ class PrintJobController {
         const { page, pageSize, searchPrinter, searchFile, startDate, endDate } = await (0, _validators.validateInput)(req.query, _printjobvalidation.searchJobsPagedSchema);
         const endDateObj = endDate ? this.toEndOfDay(new Date(endDate)) : undefined;
         const [items, count] = await this.printJobService.searchPrintJobsPaged(searchPrinter, searchFile, startDate ? new Date(startDate) : undefined, endDateObj, page, pageSize);
+        const itemsWithThumbnails = await Promise.all(items.map(async (job)=>{
+            let thumbnails = [];
+            if (job.fileStorageId) {
+                try {
+                    const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
+                    thumbnails = (metadata?._thumbnails || []).map((thumb)=>({
+                            index: thumb.index,
+                            width: thumb.width,
+                            height: thumb.height,
+                            format: thumb.format,
+                            size: thumb.size
+                        }));
+                } catch  {}
+            }
+            return {
+                ...job,
+                thumbnails
+            };
+        }));
         res.send({
-            items,
+            items: itemsWithThumbnails,
             count,
             pages: Math.ceil(count / pageSize)
         });
@@ -63,15 +82,20 @@ class PrintJobController {
             'printer'
         ]);
         try {
-            let thumbnailCount = 0;
+            let thumbnails = [];
             if (job.fileStorageId) {
-                const thumbnails = await this.fileStorageService.listThumbnails(job.fileStorageId);
-                thumbnailCount = thumbnails.length;
+                const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
+                thumbnails = (metadata?._thumbnails || []).map((thumb)=>({
+                        index: thumb.index,
+                        width: thumb.width,
+                        height: thumb.height,
+                        format: thumb.format,
+                        size: thumb.size
+                    }));
             }
             res.send({
                 ...job,
-                thumbnailCount,
-                thumbnailsUrl: thumbnailCount > 0 ? `/api/print-jobs/${jobId}/thumbnails` : null
+                thumbnails
             });
         } catch (error) {
             this.logger.error(`Failed to get job ${jobId}: ${error}`);
@@ -84,9 +108,12 @@ class PrintJobController {
         const jobId = req.local.id;
         const job = await this.printJobService.getJobByIdOrFail(jobId);
         try {
-            if (job.status !== "UNKNOWN") {
+            if ([
+                "PENDING",
+                "QUEUED"
+            ].includes(job.status)) {
                 res.status(400).send({
-                    error: "Can only mark UNKNOWN jobs as completed",
+                    error: "Can only mark jobs which are not \"PENDING\" | \"QUEUED\" as completed",
                     currentStatus: job.status,
                     suggestion: "This endpoint is for resolving jobs with unknown state"
                 });
@@ -374,70 +401,6 @@ class PrintJobController {
             });
         }
     }
-    async getThumbnails(req, res) {
-        const jobId = req.local.id;
-        const job = await this.printJobService.getJobByIdOrFail(jobId);
-        if (!job.fileStorageId) {
-            res.send({
-                jobId,
-                thumbnails: []
-            });
-            return;
-        }
-        try {
-            const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
-            const thumbnailMetadata = metadata?._thumbnails || [];
-            res.send({
-                jobId,
-                fileStorageId: job.fileStorageId,
-                thumbnails: thumbnailMetadata.map((thumb)=>({
-                        index: thumb.index,
-                        url: `/api/print-jobs/${jobId}/thumbnails/${thumb.index}`,
-                        filename: thumb.filename,
-                        width: thumb.width,
-                        height: thumb.height,
-                        format: thumb.format,
-                        size: thumb.size
-                    }))
-            });
-        } catch (error) {
-            this.logger.error(`Failed to get thumbnails for job ${jobId}: ${error}`);
-            res.status(500).send({
-                error: "Failed to get thumbnails"
-            });
-        }
-    }
-    async getThumbnail(req, res) {
-        const jobId = req.local.id;
-        const index = req.local.index;
-        const job = await this.printJobService.getJobByIdOrFail(jobId);
-        if (!job.fileStorageId) {
-            throw new _runtimeexceptions.NotFoundException("Job has no stored file");
-        }
-        try {
-            const thumbnail = await this.fileStorageService.getThumbnail(job.fileStorageId, index);
-            if (!thumbnail) {
-                throw new _runtimeexceptions.NotFoundException(`Thumbnail ${index} not found`);
-            }
-            const isPNG = thumbnail[0] === 0x89 && thumbnail[1] === 0x50 && thumbnail[2] === 0x4E && thumbnail[3] === 0x47;
-            const isJPG = thumbnail[0] === 0xFF && thumbnail[1] === 0xD8;
-            const isQOI = thumbnail[0] === 0x71 && thumbnail[1] === 0x6F && thumbnail[2] === 0x69 && thumbnail[3] === 0x66;
-            let contentType = 'image/png';
-            if (isPNG) contentType = 'image/png';
-            else if (isJPG) contentType = 'image/jpeg';
-            else if (isQOI) contentType = 'image/qoi';
-            res.setHeader('Content-Type', contentType);
-            res.setHeader('Cache-Control', 'public, max-age=3600');
-            res.setHeader('ETag', `"${job.fileStorageId}-${index}"`);
-            res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin');
-            res.send(thumbnail);
-        } catch (error) {
-            this.logger.error(`Failed to get thumbnail ${index} for job ${jobId}: ${error}`);
-            res.status(500).send({
-                error: "Failed to get thumbnail"
-            });
-        }
-    }
     async createJobFromFile(req, res) {
         const { fileStorageId, printerId } = req.body;
         if (!fileStorageId) {
@@ -609,33 +572,6 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", Promise)
 ], PrintJobController.prototype, "deleteJob", null);
-_ts_decorate([
-    (0, _awilixexpress.GET)(),
-    (0, _awilixexpress.route)("/:id/thumbnails"),
-    (0, _awilixexpress.before)([
-        (0, _paramconvertermiddleware.ParamId)("id")
-    ]),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        typeof _express.Request === "undefined" ? Object : _express.Request,
-        typeof _express.Response === "undefined" ? Object : _express.Response
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], PrintJobController.prototype, "getThumbnails", null);
-_ts_decorate([
-    (0, _awilixexpress.GET)(),
-    (0, _awilixexpress.route)("/:id/thumbnails/:index"),
-    (0, _awilixexpress.before)([
-        (0, _paramconvertermiddleware.ParamId)("id"),
-        (0, _paramconvertermiddleware.ParamInt)("index")
-    ]),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        typeof _express.Request === "undefined" ? Object : _express.Request,
-        typeof _express.Response === "undefined" ? Object : _express.Response
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], PrintJobController.prototype, "getThumbnail", null);
 _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/from-file"),

package/dist/controllers/print-job.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/print-job.controller.ts"],"names":["PrintJobController","logger","loggerFactory","printJobService","fileAnalysisService","fileStorageService","name","searchJobs","req","res","searchPrinter","searchFile","startDate","endDate","validateInput","query","searchJobsSchema","endDateObj","toEndOfDay","Date","undefined","result","searchPrintJobs","send","searchJobsPaged","page","pageSize","searchJobsPagedSchema","items","count","searchPrintJobsPaged","pages","Math","ceil","getJob","jobId","local","id","job","getJobByIdOrFail","thumbnailCount","fileStorageId","thumbnails","listThumbnails","length","thumbnailsUrl","error","status","setCompleted","currentStatus","suggestion","log","endedAt","progress","statusReason","statistics","startedAt","actualPrintTimeSeconds","printJobRepository","save","message","previousStatus","newStatus","Error","setFailed","includes","actualTimeSeconds","getTime","failureReason","failureTime","setCancelled","setUnknown","reAnalyzeJob","triggerFileAnalysis","filePath","getFilePath","exists","needsAnalysis","NotFoundException","analysisState","metadata","analyzeFile","thumbnailMetadata","saveThumbnails","handleFileAnalyzed","fileHash","saveMetadata","fileName","deleteJob","deleteFileParam","deleteFile","remove","otherJobs","where","fileDeleted","warn","remainingReferences","getThumbnails","loadMetadata","_thumbnails","map","thumb","index","url","filename","width","height","format","size","getThumbnail","thumbnail","isPNG","isJPG","isQOI","contentType","setHeader","createJobFromFile","printerId","body","fileExists","printerName","createPendingJob","_originalFileName","_fileHash","analyzedAt","fileFormat","createdAt","date","endOfDay","setHours","ParamId","ParamInt","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/print-job.controller.ts"],"names":["PrintJobController","logger","loggerFactory","printJobService","fileAnalysisService","fileStorageService","name","searchJobs","req","res","searchPrinter","searchFile","startDate","endDate","validateInput","query","searchJobsSchema","endDateObj","toEndOfDay","Date","undefined","result","searchPrintJobs","send","searchJobsPaged","page","pageSize","searchJobsPagedSchema","items","count","searchPrintJobsPaged","itemsWithThumbnails","Promise","all","map","job","thumbnails","fileStorageId","metadata","loadMetadata","_thumbnails","thumb","index","width","height","format","size","pages","Math","ceil","getJob","jobId","local","id","getJobByIdOrFail","error","status","setCompleted","includes","currentStatus","suggestion","log","endedAt","progress","statusReason","statistics","startedAt","actualPrintTimeSeconds","printJobRepository","save","message","previousStatus","newStatus","Error","setFailed","actualTimeSeconds","getTime","failureReason","failureTime","setCancelled","setUnknown","reAnalyzeJob","triggerFileAnalysis","filePath","getFilePath","exists","needsAnalysis","NotFoundException","analysisState","analyzeFile","thumbnailMetadata","length","saveThumbnails","handleFileAnalyzed","fileHash","saveMetadata","fileName","thumbnailCount","deleteJob","deleteFileParam","deleteFile","remove","otherJobs","where","fileDeleted","warn","remainingReferences","createJobFromFile","printerId","body","fileExists","printerName","createPendingJob","_originalFileName","_fileHash","analyzedAt","fileFormat","createdAt","date","endOfDay","setHours","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN"],"mappings":"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"}

package/dist/server.constants.js

@@ -76,7 +76,7 @@ const AppConstants = {
     docsUrl: "https://docs.fdm-monster.net",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "2.2.6",
+    defaultClientMinimum: "2.2.7",
     defaultWebsocketHandshakeTimeout: 3000,
     defaultSocketThrottleRate: 1,
     debugSocketStatesKey: "DEBUG_SOCKET_STATES",

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

@@ -14,6 +14,7 @@ const _nodefs = require("node:fs");
 const _nodepath = require("node:path");
 const _serverconstants = require("../../server.constants");
 const _fsutils = require("../../utils/fs.utils");
+const _errorutils = require("../../utils/error.utils");
 class BambuFtpAdapter {
     settingsStore;
     eventEmitter2;
@@ -52,11 +53,12 @@ class BambuFtpAdapter {
                 port: 990,
                 user: "bblp",
                 password: sanitizedAccessCode,
-                secure: true,
+                secure: 'implicit',
                 secureOptions: {
-                    rejectUnauthorized: false,
-                    minVersion: "TLSv1.2",
-                    maxVersion: "TLSv1.3"
+                    checkServerIdentity: ()=>{
+                        return undefined;
+                    },
+                    rejectUnauthorized: false
                 }
             });
             this.isConnecting = false;
@@ -84,11 +86,12 @@ class BambuFtpAdapter {
     async listFiles(dirPath = "/") {
         this.ensureConnected();
         try {
+            this.logger.log(`Connecting ftp ${dirPath}`);
             const files = await this.ftpClient.list(dirPath);
             this.logger.debug(`Listed ${files.length} files in ${dirPath}`);
             return files;
         } catch (error) {
-            this.logger.error(`Failed to list files in ${dirPath}:`, error);
+            this.logger.error(`Failed to list files in ${dirPath}: ${(0, _errorutils.errorSummary)(error)}`);
             throw error;
         }
     }
@@ -101,10 +104,9 @@ class BambuFtpAdapter {
         }
         return (0, _nodepath.join)(storagePath, filename);
     }
-    async uploadFile(fileBuffer, filename, progressToken) {
+    async uploadFile(fileBuffer, remotePath, progressToken) {
         this.ensureConnected();
-        const remotePath = `/sdcard/${filename}`;
-        const tempPath = this.getFileStoragePath(`bambu-upload-${Date.now()}-${filename}`);
+        const tempPath = this.getFileStoragePath(`bambu-upload-${Date.now()}-${remotePath}`);
         try {
             (0, _nodefs.writeFileSync)(tempPath, fileBuffer);
             this.logger.debug(`Wrote temp file: ${tempPath}`);
@@ -116,18 +118,18 @@ class BambuFtpAdapter {
                     });
                 });
             }
-            this.logger.log(`Uploading ${filename} to ${remotePath}`);
+            this.logger.log(`Uploading ${tempPath} to ${remotePath}`);
             await this.ftpClient.uploadFrom(tempPath, remotePath);
             this.ftpClient.trackProgress();
             if (progressToken) {
                 this.eventEmitter2.emit(`${(0, _eventconstants.uploadDoneEvent)(progressToken)}`, progressToken);
             }
-            this.logger.log(`File uploaded successfully: ${filename}`);
+            this.logger.log(`File uploaded successfully: ${remotePath}`);
         } catch (error) {
             if (progressToken) {
                 this.eventEmitter2.emit(`${(0, _eventconstants.uploadFailedEvent)(progressToken)}`, progressToken, error?.message);
             }
-            this.logger.error(`Upload failed for ${filename}:`, error);
+            this.logger.error(`Upload failed for ${remotePath}:`, error);
             throw error;
         } finally{
             try {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","rejectUnauthorized","minVersion","maxVersion","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","getFileStoragePath","filename","storagePath","join","getMediaPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","fileBuffer","progressToken","remotePath","tempPath","Date","now","writeFileSync","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","unlinkSync","cleanupError","warn","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","stream","createReadStream","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","checkServerIdentity","undefined","rejectUnauthorized","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","errorSummary","getFileStoragePath","filename","storagePath","join","getMediaPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","fileBuffer","remotePath","progressToken","tempPath","Date","now","writeFileSync","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","unlinkSync","cleanupError","warn","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","stream","createReadStream","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}

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

@@ -44,6 +44,8 @@ class BambuMqttAdapter {
     lastState = null;
     isConnecting = false;
     eventsAllowed = true;
+    sequenceIdCounter = 10;
+    isFirstMessage = true;
     constructor(settingsStore, loggerFactory, eventEmitter2){
         this.settingsStore = settingsStore;
         this.eventEmitter2 = eventEmitter2;
@@ -120,20 +122,13 @@ class BambuMqttAdapter {
         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);
-            }
+            this.logger.error("MQTT connection timeout - will keep trying to reconnect");
         }, 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,
+                reconnectPeriod: 5000,
                 rejectUnauthorized: false
             });
             this.mqttClient.on("connect", ()=>{
@@ -142,6 +137,7 @@ class BambuMqttAdapter {
                 this.updateSocketState(_socketstatetype.SOCKET_STATE.authenticated);
                 this.updateApiState(_apistatetype.API_STATE.responding);
                 this.logger.log("MQTT connected successfully");
+                this.logger.debug(`Connected to MQTT broker at mqtts://${host}:8883`);
                 const reportTopic = `device/${serial}/report`;
                 this.mqttClient.subscribe(reportTopic, {
                     qos: 0
@@ -151,6 +147,9 @@ class BambuMqttAdapter {
                         this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
                     } else {
                         this.logger.debug(`Subscribed to ${reportTopic}`);
+                        this.sendPushallCommand().catch((err)=>{
+                            this.logger.error("Failed to send pushall command:", err);
+                        });
                     }
                 });
             });
@@ -171,13 +170,33 @@ class BambuMqttAdapter {
             });
             this.mqttClient.on("reconnect", ()=>{
                 this.updateSocketState(_socketstatetype.SOCKET_STATE.opening);
-                this.logger.debug("MQTT reconnecting...");
+                this.logger.log("MQTT attempting to reconnect...");
+                this.isFirstMessage = true;
             });
             this.mqttClient.on("close", ()=>{
                 this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
+                this.updateApiState(_apistatetype.API_STATE.noResponse);
                 this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "connection closed").catch(()=>{});
-                this.logger.debug("MQTT connection closed");
-                this.cleanup();
+                this.logger.warn("MQTT connection closed - automatic reconnection will be attempted");
+                if (this.lastState) {
+                    const offlineMessage = this.transformStateToCurrentMessage(this.lastState);
+                    this.emitEvent("current", {
+                        ...offlineMessage,
+                        print: this.lastState
+                    }).catch(()=>{});
+                }
+            });
+            this.mqttClient.on("offline", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
+                this.updateApiState(_apistatetype.API_STATE.noResponse);
+                this.logger.warn("MQTT client offline - automatic reconnection will be attempted");
+                if (this.lastState) {
+                    const offlineMessage = this.transformStateToCurrentMessage(this.lastState);
+                    this.emitEvent("current", {
+                        ...offlineMessage,
+                        print: this.lastState
+                    }).catch(()=>{});
+                }
             });
         } catch (error) {
             clearTimeout(connectionTimeout);
@@ -209,6 +228,20 @@ class BambuMqttAdapter {
     getLastState() {
         return this.lastState;
     }
+    async sendPushallCommand() {
+        const payload = {
+            pushing: {
+                sequence_id: this.sequenceIdCounter,
+                command: "pushall",
+                version: 1,
+                push_target: 1
+            }
+        };
+        this.logger.debug(`Sending command: ${JSON.stringify(payload)} with sequence ID: ${this.sequenceIdCounter}`);
+        this.sequenceIdCounter++;
+        await this.sendCommand(payload);
+        this.logger.debug("Connected to printer via MQTT");
+    }
     async sendCommand(payload) {
         if (!this.mqttClient?.connected) {
             throw new Error("MQTT not connected");
@@ -216,30 +249,44 @@ class BambuMqttAdapter {
         if (!this.serial) {
             throw new Error("Serial number not set");
         }
-        const requestTopic = `device/${this.serial}/request`;
+        const reportTopic = `device/${this.serial}/report`;
         const message = JSON.stringify(payload);
         return new Promise((resolve, reject)=>{
-            this.mqttClient.publish(requestTopic, message, {
+            this.mqttClient.publish(reportTopic, message, {
                 qos: 0
             }, (err)=>{
                 if (err) {
                     this.logger.error("Failed to send command:", err);
                     reject(err);
                 } else {
-                    this.logger.debug("Command sent:", payload);
+                    this.logger.debug(`Command sent: ${message}`);
                     resolve();
                 }
             });
         });
     }
-    async startPrint(filename) {
+    async startPrint(filename, subtask_name, amsMapping, plateNumber = 1) {
         await this.sendCommand({
             print: {
                 command: "project_file",
-                param: filename,
-                url: `file:///sdcard/${filename}`,
-                subtask_name: filename,
-                sequence_id: String(Date.now())
+                param: `Metadata/plate_${plateNumber}.gcode`,
+                project_id: "0",
+                profile_id: "0",
+                task_id: "0",
+                subtask_id: "0",
+                subtask_name: subtask_name ?? filename,
+                file: "",
+                url: `file:///${filename}`,
+                md5: "",
+                timelapse: true,
+                bed_type: "auto",
+                bed_levelling: true,
+                flow_cali: true,
+                vibration_cali: true,
+                layer_inspect: true,
+                ams_mapping: amsMapping ? amsMapping.join(",") : "",
+                use_ams: !!amsMapping && amsMapping.length > 0,
+                sequence_id: this.sequenceIdCounter++
             }
         });
     }
@@ -247,7 +294,7 @@ class BambuMqttAdapter {
         await this.sendCommand({
             print: {
                 command: "pause",
-                sequence_id: String(Date.now())
+                sequence_id: this.sequenceIdCounter++
             }
         });
     }
@@ -255,7 +302,7 @@ class BambuMqttAdapter {
         await this.sendCommand({
             print: {
                 command: "resume",
-                sequence_id: String(Date.now())
+                sequence_id: this.sequenceIdCounter++
             }
         });
     }
@@ -263,7 +310,7 @@ class BambuMqttAdapter {
         await this.sendCommand({
             print: {
                 command: "stop",
-                sequence_id: String(Date.now())
+                sequence_id: this.sequenceIdCounter++
             }
         });
     }
@@ -272,7 +319,7 @@ class BambuMqttAdapter {
             print: {
                 command: "gcode_line",
                 param: gcode,
-                sequence_id: String(Date.now())
+                sequence_id: this.sequenceIdCounter++
             }
         });
     }
@@ -312,20 +359,23 @@ class BambuMqttAdapter {
     transformStateToCurrentMessage(state) {
         const isPrinting = state.gcode_state === "PRINTING" || state.mc_print_stage === "printing";
         const isPaused = state.mc_print_stage === "paused";
+        const isConnected = this.mqttClient?.connected || false;
+        const hasError = !isConnected || state.print_error !== 0;
         const isPausedText = isPaused ? "Paused" : "Printing";
+        const onlineText = isPrinting ? isPausedText : "Operational";
         return {
             state: {
-                text: isPrinting ? isPausedText : "Operational",
+                text: isConnected ? onlineText : "Offline",
                 flags: {
-                    operational: true,
-                    printing: isPrinting && !isPaused,
-                    paused: isPaused,
-                    ready: !isPrinting,
-                    error: state.print_error !== 0,
+                    operational: isConnected,
+                    printing: isConnected && isPrinting && !isPaused,
+                    paused: isConnected && isPaused,
+                    ready: isConnected && !isPrinting,
+                    error: hasError,
                     cancelling: false,
                     pausing: false,
-                    sdReady: true,
-                    closedOrError: false
+                    sdReady: isConnected,
+                    closedOrError: !isConnected
                 }
             },
             temps: [
@@ -371,6 +421,10 @@ class BambuMqttAdapter {
             const payload = JSON.parse(message.toString());
             if (topic.endsWith("/report") && payload.print) {
                 this.lastState = payload.print;
+                if (this.isFirstMessage) {
+                    this.logger.debug("Initial message received");
+                    this.isFirstMessage = false;
+                }
                 const currentMessage = this.transformStateToCurrentMessage(this.lastState);
                 const combinedPayload = {
                     ...currentMessage,