@fdm-monster/server 1.9.4 → 2.0.0

package/.env.template

@@ -2,8 +2,6 @@
 SERVER_PORT=4000
 # Optional, default: production, possible values: "development", "production"
 NODE_ENV=development
-# Optional, default: mongodb://127.0.0.1:27017/fdm-monster
-MONGO=mongodb://127.0.0.1:27017/fdm-monster
 ENABLE_COLORED_LOGS=false
 
 # Github Personal Access Token, allows downloading the Client bundle without hitting a Github API rate limit
@@ -26,7 +24,7 @@ OVERRIDE_JWT_EXPIRES_IN=3600
 # Optional, changing this will invalidate all existing logins
 OVERRIDE_JWT_ISSUER=fdm-monster-server-2023
 # Optional, changing this will invalidate all existing logins
-OVERRIDE_JWT_AUDIENCE=fdm-monster-client-2023
+OVERRIDE_JWT_AUDIENCE=fdm-monster-client-next-2026
 
 # Demo mode, will set wizard to completed
 OVERRIDE_IS_DEMO_MODE=true
@@ -37,12 +35,9 @@ OVERRIDE_DEMO_PASSWORD=demo2023
 # Optional, default: ADMIN, logical values: "ADMIN", "OPERATOR"
 OVERRIDE_DEMO_ROLE=ADMIN
 
-# Debug express routes
-DEBUG_ROUTES=false
+# Debug socket states
 DEBUG_SOCKET_STATES=false
 
-# Enables TypeORM
-ENABLE_EXPERIMENTAL_TYPEORM=false
 # Saves SQLite database to ./database/fdm-monster.sqlite
 DATABASE_PATH=./database
 # Optional, default: fdm-monster.sqlite
@@ -52,3 +47,9 @@ ENABLE_PROMETHEUS=false
 ENABLE_LOKI=false
 LOKI_ADDRESS=
 ENABLE_PROMETHEUS_METRICS=false
+
+# Swagger/OpenAPI Documentation
+# Optional, default: false. Set to true to disable Swagger UI and OpenAPI documentation endpoints
+DISABLE_SWAGGER_OPENAPI=false
+# Optional, default: false. Set to true to generate swagger.json file in media folder
+GENERATE_SWAGGER_JSON=false

package/CONTRIBUTING.md

@@ -35,7 +35,7 @@ Sorry we do not have a documentation with F.A.Q. yet. Please visit us on discord
 FDM Monster currently consists of two active repositories:
 
 - [FDM Monster](https://github.com/fdm-monster/fdm-monster) - the server
-- [FDM Monster Client](https://github.com/fdm-monster/fdm-monster-client) - the client UI
+- [FDM Monster Client](https://github.com/fdm-monster/fdm-monster-client-next) - the client UI
 - [FDM Connector](https://github.com/fdm-monster/fdm-connector) - the OctoPrint plugin (not in use yet)
 
 ### Design decisions
@@ -43,7 +43,7 @@ FDM Monster currently consists of two active repositories:
 Server design
 
 - **FDM Monster server** was chosen to be a Node.js server. The backend is currently structured as a REST API. It might be surprising that we use `awilix` as Inversion-of-Control implementation, but if you study the resulting architecture it will show its fresh and quick-to-develop benefits rapidly.
-- **FDM Monster server** runs using MongoDB as database and Mongoose as ORM
+- **FDM Monster server** runs using Sqlite as database and Typeorm as ORM
 - **FDM Monster server** caches data in-memory using a self-written store/cache system between the database (no redis!)
 - **FDM Monster server** API is built up using `awilix-express` and uses `node-input-validation` as API validation
 - **FDM Monster server** is equipped with a task scheduler (ToadScheduler) which gives the capability to run workloads in the background.
@@ -94,7 +94,7 @@ Explain the problem and include additional details to help maintainers reproduce
 You might be delighted to know that the FDM Monster server was structured consistently for other developers to be able to work with it rapidly.
 
 1. Clone the repository from the development branch (git clone https://github.com/fdm-monster/fdm-monster.git)
-2. Ensure MongoDb (5+) and Node (v16) are installed
+2. Ensure Node (v24) is installed
 3. Adjust/create a `.env` with NODE_ENV=development **inside the server folder**
 4. `npm install` **inside the server folder** to create the `node_modules` folder
 5. Run the server with `npm run dev` to let nodemon detect and apply any changes you make
@@ -109,11 +109,11 @@ Please make sure you understand the meaning of these files/folders:
 - server.constants.js
 - constants
 - controllers (API)
+- entities (typeorm)
 - exceptions
 - handlers
 - middleware
-- models (mongoose)
-- migrations (mongodb/mongoose)
+- migrations (typeorm/sqlite)
 - services // services/octoprint/...
 - state // state/printer.state.js // state/files.store.js // state/data/...
 - tasks // tasks/boot.task.js // printer-websocket.task.js

package/README.md

@@ -1,6 +1,6 @@
 <p align="center" style="margin-bottom: 0">
     <a href="https://docs.fdm-monster.net/" target="_blank" rel="noopener noreferrer">
-        <img width="150" src="https://github.com/fdm-monster/fdm-monster-client/blob/main/public/img/logo.png?raw=true" alt="FDM Monster">
+        <img width="150" src="https://github.com/fdm-monster/fdm-monster-client-next/blob/main/public/img/logo.png?raw=true" alt="FDM Monster">
     </a>
 </p>
 <h1 align="center" style="padding-top: 0; margin-top: 10px">FDM Monster</h1>
@@ -38,7 +38,7 @@ Here is a list of features that make FDM Monster stand out:
 - Import printers from software like OctoFarm
 - YAML backup and import
 - Thumbnail support
-- SQLite as well as MongoDB support
+- SQLite database
 
 ## Installation methods ⚙️
 
@@ -75,7 +75,7 @@ Thanks to the following parties for their financial support:
 
 | Tier 1 | Tier 2 | Tier 3 | Tier 4 | One time |
 |--------|--------|--------|--------|-----------|
-|  | [thatguymendel](https://github.com/thatguymendel) | | [doucettom](https://github.com/doucettom) | [th3dstudio](https://github.com/th3dstudio) |
+|  | [thatguymendel](https://github.com/thatguymendel) | [MrHitchcock](https://github.com/MrHitchcock) | [doucettom](https://github.com/doucettom) | [th3dstudio](https://github.com/th3dstudio) |
 
 
 ## Contributors ✨
@@ -83,7 +83,7 @@ Thanks to the following parties for their financial support:
 These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -119,6 +119,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
       <td align="center" valign="top" width="10%"><a href="https://github.com/Tbwan"><img src="https://avatars.githubusercontent.com/u/44231748?v=4?s=40" width="40px;" alt="Tbwan"/><br /><sub><b>Tbwan</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3ATbwan" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="10%"><a href="https://github.com/nuvious"><img src="https://avatars.githubusercontent.com/u/5287736?v=4?s=40" width="40px;" alt="David Cheeseman"/><br /><sub><b>David Cheeseman</b></sub></a><br /><a href="#ideas-nuvious" title="Ideas, Planning, & Feedback">🤔</a> <a href="#platform-nuvious" title="Packaging/porting to new platform">📦</a> <a href="#infra-nuvious" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
       <td align="center" valign="top" width="10%"><a href="https://github.com/thatguy-jaysenodell"><img src="https://avatars.githubusercontent.com/u/118288184?v=4?s=40" width="40px;" alt="That Guy Jaysen"/><br /><sub><b>That Guy Jaysen</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Athatguy-jaysenodell" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="10%"><a href="http://design.zagethy.com"><img src="https://avatars.githubusercontent.com/u/6075740?v=4?s=40" width="40px;" alt="Zagethy"/><br /><sub><b>Zagethy</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3AZagethy" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>
@@ -147,7 +148,6 @@ the [CONTRIBUTING](CONTRIBUTING.md) file.
 ### Development Progress
 
 - [x] :rocket: Docker amd64 image
-- [x] 🛡️ MongoDB 5 & 6 support
 - [x] :rocket: Quick copy paste of FDM Monster printers
 - [x] 🛡️ Complete API test coverage
 - [x] :rocket: Floor management
@@ -158,13 +158,14 @@ the [CONTRIBUTING](CONTRIBUTING.md) file.
 - [x] 🔌 Raspberry Pi image (https://github.com/fdm-monster/MonsterPi)
 - [x] :rocket: Documentation (https://docs.fdm-monster.net)
 - [x] 🛡️ Login and user management
-- [x] OctoFarm export 
+- [x] OctoFarm printer import 
 - [x] Klipper and Moonraker API integration
 - [x] GCode Thumbnail support
 - [x] `.bgcode` support
 - [x] Modernized UI layout and tile design
-- [ ] History and statistics
-- [ ] Extended webcam integration
+- [x] History and statistics
+- [x] Print Queue
+- [x] Extended webcam integration
 - [ ] Spoolman integration
 
 ## License

package/RELEASE_NOTES.MD

@@ -1,5 +1,57 @@
 # Develop
 
+# FDM Monster 2.0.0
+
+## Feat
+
+- All UI features in https://github.com/fdm-monster/fdm-monster-client-next/blob/main/RELEASE_NOTES.MD
+- Add mock camera console to project (for development)
+- Add swagger and OpenAPI integration
+- UI Client is now fdm-monster-client-next at v2.0.0
+- Add color option to tag
+- Add API to upload from slicer
+- Change API to /api/v2
+- Queue
+- PrintJob
+- File Analysis
+
+## Fixes
+
+- Renames PrinterFloors permission group to Floors
+- Load printer files in background instead of synchronously
+- BambuLab connection rejections cannot cause server crashes anymore
+- Default grid size is now 4 by 2 (which is less overwhelming)
+- Floor service wouldn't update printer position, comparison was x==x, y==x
+- ExceptionFilter now logs using loggerFactory
+- YAML import service was brittle against printer type failures, added robustness
+- Camera should tolerate printer deletion: SET NULL applied to Foreign Key
+- Quick stop API endpoint moved to printer controller, removing the need for custom gcode api controller.
+- Drop printer file clean task, outdated concept
+- File uploads now go to media/file-uploads instead of media
+- First-time-setup api filter now allows swagger endpoints
+- Floor order change not properly implemented in API service
+- Remove experimental thumbnail support
+
+## Chore
+- Remove batch/single set gcode analysis to false
+- Removed client next experimental setting
+- Drop unused Custom Gcode table
+- Drop broken PrintCompletion table
+- Rename PrinterGroup to PrinterTag, and Group to Tag
+
+# FDM Monster 2.0.0-rc1
+
+## Features
+
+- Remove mongodb support (breaking change)
+- Reimplement role system based on RoleName (not id and name)
+- Cleanup and remove unused permission table
+- Key-diff cache is now Map instead of Object
+
+## Fixes
+
+- Update printer now replaces old socket with new one
+
 # FDM Monster 1.9.4
 
 ## Fixes

package/SECURITY.md

@@ -7,7 +7,7 @@ currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.3.x   | :white_check_mark: |
+| 1.9.x   | :white_check_mark: |
 | 1.0.0   | :x:                |
 | < 1.0   | :x:                |
 

package/biome.json

@@ -1,13 +1,12 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.10/schema.json",
   "vcs": {
     "enabled": false,
     "clientKind": "git",
     "useIgnoreFile": false
   },
   "files": {
-    "ignoreUnknown": false,
-    "ignore": []
+    "ignoreUnknown": false
   },
   "formatter": {
     "enabled": true,
@@ -15,8 +14,12 @@
     "indentWidth": 2,
     "lineWidth": 120
   },
-  "organizeImports": {
-    "enabled": true
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
   },
   "linter": {
     "enabled": true,

package/dist/consoles/download-github-releases.js

@@ -12,7 +12,7 @@ function _interop_require_default(obj) {
 }
 const fetchReleases = async ()=>{
     try {
-        const response = await _axios.default.get("https://api.github.com/repos/fdm-monster/fdm-monster-client/releases");
+        const response = await _axios.default.get("https://api.github.com/repos/fdm-monster/fdm-monster-client-next/releases");
         const releases = response.data;
         const releaseData = releases.map((release)=>({
                 tag_name: release.tag_name,
@@ -29,7 +29,7 @@ const fetchReleases = async ()=>{
 };
 const fetchLatest = async ()=>{
     try {
-        const response = await _axios.default.get("https://api.github.com/repos/fdm-monster/fdm-monster-client/releases/latest");
+        const response = await _axios.default.get("https://api.github.com/repos/fdm-monster/fdm-monster-client-next/releases/latest");
         const release = response.data;
         const releaseData = {
             tag_name: release.tag_name,
@@ -37,7 +37,7 @@ const fetchLatest = async ()=>{
             published_at: release.published_at,
             body: release.body
         };
-        const outputPath = _path.default.join(__dirname, "github-releases-latest-client-slim-oct-2024.data.json");
+        const outputPath = _path.default.join(__dirname, "github-releases-latest-client-slim.data.json");
         _fs.default.writeFileSync(outputPath, JSON.stringify(releaseData, null, 2));
         console.log(`Releases data written to ${outputPath}`);
     } catch (error) {

package/dist/consoles/launch-http-servers.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-const _child_process = require("child_process");
-const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _nodechild_process = require("node:child_process");
+const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -14,8 +14,8 @@ const instanceCount = 10;
 console.log(`Starting ${instanceCount} fake OctoPrint servers...`);
 for(let i = 0; i < instanceCount; i++){
     const port = startPort + i;
-    const process = (0, _child_process.spawn)("node", [
-        _path.default.join(__dirname, "./mock-octoprint.server.js"),
+    const process = (0, _nodechild_process.spawn)("node", [
+        _nodepath.default.join(__dirname, "./mock-octoprint.server.js"),
         port.toString()
     ]);
     process.stdout.on("data", (data)=>{

package/dist/consoles/launch-http-servers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/consoles/launch-http-servers.ts"],"names":["startPort","instanceCount","console","log","i","port","process","spawn","path","join","__dirname","toString","stdout","on","data","trim","stderr","error"],"mappings":";;;;+BAAsB;6DACL;;;;;;AAEjB,MAAMA,YAAY;AAClB,MAAMC,gBAAgB;AAEtBC,QAAQC,GAAG,CAAC,CAAC,SAAS,EAAEF,cAAc,0BAA0B,CAAC;AAEjE,IAAK,IAAIG,IAAI,GAAGA,IAAIH,eAAeG,IAAK;IACtC,MAAMC,OAAOL,YAAYI;IACzB,MAAME,UAAUC,IAAAA,oBAAK,EAAC,QAAQ;QAACC,aAAI,CAACC,IAAI,CAACC,WAAW;QAA+BL,KAAKM,QAAQ;KAAG;IAEnGL,QAAQM,MAAM,CAACC,EAAE,CAAC,QAAQ,CAACC;QACzBZ,QAAQC,GAAG,CAAC,CAAC,QAAQ,EAAEC,IAAI,EAAE,QAAQ,EAAEC,KAAK,GAAG,EAAES,KAAKH,QAAQ,GAAGI,IAAI,IAAI;IAC3E;IAEAT,QAAQU,MAAM,CAACH,EAAE,CAAC,QAAQ,CAACC;QACzBZ,QAAQe,KAAK,CAAC,CAAC,QAAQ,EAAEb,IAAI,EAAE,QAAQ,EAAEC,KAAK,SAAS,EAAES,KAAKH,QAAQ,GAAGI,IAAI,IAAI;IACnF;IAEAb,QAAQC,GAAG,CAAC,CAAC,eAAe,EAAEC,IAAI,EAAE,SAAS,EAAEC,MAAM;AACvD;AAEAH,QAAQC,GAAG,CAAC"}
+{"version":3,"sources":["../../src/consoles/launch-http-servers.ts"],"names":["startPort","instanceCount","console","log","i","port","process","spawn","path","join","__dirname","toString","stdout","on","data","trim","stderr","error"],"mappings":";;;;mCAAsB;iEACL;;;;;;AAEjB,MAAMA,YAAY;AAClB,MAAMC,gBAAgB;AAEtBC,QAAQC,GAAG,CAAC,CAAC,SAAS,EAAEF,cAAc,0BAA0B,CAAC;AAEjE,IAAK,IAAIG,IAAI,GAAGA,IAAIH,eAAeG,IAAK;IACtC,MAAMC,OAAOL,YAAYI;IACzB,MAAME,UAAUC,IAAAA,wBAAK,EAAC,QAAQ;QAACC,iBAAI,CAACC,IAAI,CAACC,WAAW;QAA+BL,KAAKM,QAAQ;KAAG;IAEnGL,QAAQM,MAAM,CAACC,EAAE,CAAC,QAAQ,CAACC;QACzBZ,QAAQC,GAAG,CAAC,CAAC,QAAQ,EAAEC,IAAI,EAAE,QAAQ,EAAEC,KAAK,GAAG,EAAES,KAAKH,QAAQ,GAAGI,IAAI,IAAI;IAC3E;IAEAT,QAAQU,MAAM,CAACH,EAAE,CAAC,QAAQ,CAACC;QACzBZ,QAAQe,KAAK,CAAC,CAAC,QAAQ,EAAEb,IAAI,EAAE,QAAQ,EAAEC,KAAK,SAAS,EAAES,KAAKH,QAAQ,GAAGI,IAAI,IAAI;IACnF;IAEAb,QAAQC,GAAG,CAAC,CAAC,eAAe,EAAEC,IAAI,EAAE,SAAS,EAAEC,MAAM;AACvD;AAEAH,QAAQC,GAAG,CAAC"}

package/dist/consoles/mock-bambu.server.js

@@ -18,7 +18,7 @@ const DEFAULT_MQTT_PORT = 8883;
 const DEFAULT_SERIAL = "01P00A000000001";
 const DEFAULT_ACCESS_CODE = "12345678";
 const MESSAGE_INTERVAL = 1000;
-const DEFAULT_USERNAME = 'bblp';
+const DEFAULT_USERNAME = "bblp";
 const port = process.argv[2] ? Number.parseInt(process.argv[2]) : DEFAULT_PORT;
 const mqttPort = process.argv[3] ? Number.parseInt(process.argv[3]) : DEFAULT_MQTT_PORT;
 const serial = process.argv[4] || DEFAULT_SERIAL;
@@ -48,21 +48,21 @@ async function generateSelfSignedCert() {
     console.log(`[BAMBU MOCK] Generating self-signed certificate for TLS...`);
     const attrs = [
         {
-            name: 'commonName',
-            value: 'BambuLab Mock Printer'
+            name: "commonName",
+            value: "BambuLab Mock Printer"
         },
         {
-            name: 'countryName',
-            value: 'US'
+            name: "countryName",
+            value: "US"
         },
         {
-            name: 'organizationName',
-            value: 'Bambu Lab Mock'
+            name: "organizationName",
+            value: "Bambu Lab Mock"
         }
     ];
     const options = {
         days: 365,
-        algorithm: 'sha256',
+        algorithm: "sha256",
         keySize: 2048
     };
     const pems = await _selfsigned.default.generate(attrs, options);
@@ -70,12 +70,14 @@ async function generateSelfSignedCert() {
     return {
         key: pems.private,
         cert: pems.cert,
-        minVersion: 'TLSv1.2',
-        ciphers: 'HIGH:!aNULL:!MD5'
+        minVersion: "TLSv1.2",
+        ciphers: "HIGH:!aNULL:!MD5"
     };
 }
 let isPrinting = false;
+let isFinished = false;
 let currentPrintFile = "";
+let finishedFileName = "";
 let printProgress = 0;
 let isPaused = false;
 let nozzleTemp = 25;
@@ -95,7 +97,7 @@ const PRINT_DURATION = 20;
             "Welcome to Bambu Lab Mock FTP Server"
         ]
     });
-    ftpServer.on("login", ({ connection, username, password }, resolve, reject)=>{
+    ftpServer.on("login", ({ username, password }, resolve, reject)=>{
         console.log(`[BAMBU MOCK FTP] Login attempt - Username: ${username}`);
         if (username === "bblp" && password === accessCode) {
             console.log(`[BAMBU MOCK FTP] Authentication successful`);
@@ -107,7 +109,7 @@ const PRINT_DURATION = 20;
             reject(new Error("Invalid username or password"));
         }
     });
-    ftpServer.on("client-error", ({ connection, context, error })=>{
+    ftpServer.on("client-error", ({ error })=>{
         console.error(`[BAMBU MOCK FTP] Client error:`, error);
     });
     ftpServer.listen().then(()=>{
@@ -133,7 +135,12 @@ const PRINT_DURATION = 20;
             }
         });
         const publishState = ()=>{
-            if (isPrinting && !isPaused) {
+            if (isFinished) {
+                isFinished = false;
+                finishedFileName = "";
+                currentPrintFile = "";
+                printProgress = 0;
+            } else if (isPrinting && !isPaused) {
                 const elapsedSeconds = (Date.now() - printStartTime) / 1000;
                 printProgress = Math.min(elapsedSeconds / PRINT_DURATION * 100, 100);
                 if (printProgress < 10) {
@@ -144,16 +151,24 @@ const PRINT_DURATION = 20;
                     bedTemp = 60;
                 }
                 if (printProgress >= 100) {
+                    isFinished = true;
+                    finishedFileName = currentPrintFile;
                     isPrinting = false;
-                    printProgress = 0;
-                    currentPrintFile = "";
-                    console.log(`[BAMBU MOCK MQTT] Print completed`);
+                    printProgress = 100;
+                    console.log(`[BAMBU MOCK MQTT] Print completed: ${currentPrintFile}`);
                 }
             }
-            if (!isPrinting && nozzleTemp > 25) {
+            if (!isPrinting && !isFinished && nozzleTemp > 25) {
                 nozzleTemp = Math.max(nozzleTemp - 2, 25);
                 bedTemp = Math.max(bedTemp - 1, 25);
             }
+            let gcodeState = "IDLE";
+            if (isFinished) gcodeState = "FINISHED";
+            else if (isPrinting && isPaused) gcodeState = "PAUSE";
+            else if (isPrinting) gcodeState = "PRINTING";
+            const fileName = isFinished ? finishedFileName : currentPrintFile;
+            const hasJob = isPrinting || isFinished;
+            const printingLabel = isPaused ? "paused" : isFinished ? "finished" : "printing";
             const state = {
                 print: {
                     nozzle_temper: Math.round(nozzleTemp),
@@ -161,15 +176,15 @@ const PRINT_DURATION = 20;
                     bed_temper: Math.round(bedTemp),
                     bed_target_temper: isPrinting ? 60 : 0,
                     chamber_temper: 30,
-                    mc_percent: Math.round(printProgress),
-                    mc_remaining_time: isPrinting ? Math.round(PRINT_DURATION - (Date.now() - printStartTime) / 1000) : 0,
-                    mc_print_stage: isPrinting ? isPaused ? "paused" : "printing" : "idle",
-                    gcode_state: isPrinting ? "PRINTING" : "IDLE",
-                    gcode_file: isPrinting ? currentPrintFile : "",
+                    mc_percent: isFinished ? 100 : Math.round(printProgress),
+                    mc_remaining_time: hasJob ? Math.round(Math.max(0, (PRINT_DURATION - (Date.now() - printStartTime) / 1000) / 60)) : 0,
+                    mc_print_stage: hasJob ? printingLabel : "idle",
+                    gcode_state: gcodeState,
+                    gcode_file: fileName || "",
                     wifi_signal: "-45dBm",
-                    layer_num: isPrinting ? Math.floor(printProgress / 2) : 0,
-                    total_layer_num: isPrinting ? 50 : 0,
-                    subtask_name: isPrinting ? currentPrintFile : "",
+                    layer_num: hasJob ? Math.floor((isFinished ? 100 : printProgress) / 2) : 0,
+                    total_layer_num: hasJob ? 50 : 0,
+                    subtask_name: fileName || "",
                     heatbreak_fan_speed: isPrinting ? "5000" : "0",
                     cooling_fan_speed: isPrinting ? "8000" : "0",
                     big_fan1_speed: isPrinting ? "3000" : "0",
@@ -198,12 +213,12 @@ const PRINT_DURATION = 20;
         try {
             const payload = JSON.parse(message.toString());
             console.log(`[BAMBU MOCK MQTT] Received command on ${topic}:`, JSON.stringify(payload));
-            if (payload.print && payload.print.command) {
+            if (payload.print?.command) {
                 const command = payload.print.command;
                 console.log(`[BAMBU MOCK MQTT] Processing command: ${command}`);
                 if (command === "project_file" || command === "start") {
                     const filename = payload.print.param || payload.print.subtask_name || "unknown.gcode";
-                    if (filename.endsWith('.gcode') || filename.endsWith('.3mf')) {
+                    if (filename.endsWith(".gcode") || filename.endsWith(".3mf")) {
                         isPrinting = true;
                         isPaused = false;
                         printStartTime = Date.now();
@@ -227,11 +242,16 @@ const PRINT_DURATION = 20;
                     }
                 } else if (command === "stop") {
                     if (isPrinting) {
+                        const stoppedFile = currentPrintFile;
                         isPrinting = false;
                         isPaused = false;
                         printProgress = 0;
-                        currentPrintFile = "";
-                        console.log(`[BAMBU MOCK MQTT] Stopping print`);
+                        console.log(`[BAMBU MOCK MQTT] Stopping print: ${stoppedFile}`);
+                        setTimeout(()=>{
+                            if (!isPrinting) {
+                                currentPrintFile = "";
+                            }
+                        }, MESSAGE_INTERVAL * 2);
                     }
                 }
             }
@@ -266,7 +286,7 @@ const PRINT_DURATION = 20;
     });
     console.log(`[BAMBU MOCK] Mock server is running. Press Ctrl+C to stop.`);
 })().catch((error)=>{
-    console.error('[BAMBU MOCK] Fatal error during startup:', error);
+    console.error("[BAMBU MOCK] Fatal error during startup:", error);
     process.exit(1);
 });
 

package/dist/consoles/mock-bambu.server.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/consoles/mock-bambu.server.ts"],"names":["DEFAULT_PORT","DEFAULT_MQTT_PORT","DEFAULT_SERIAL","DEFAULT_ACCESS_CODE","MESSAGE_INTERVAL","DEFAULT_USERNAME","port","process","argv","Number","parseInt","mqttPort","serial","accessCode","console","log","ftpDir","path","join","os","tmpdir","sdcardDir","fs","existsSync","mkdirSync","recursive","generateSelfSignedCert","attrs","name","value","options","days","algorithm","keySize","pems","selfsigned","generate","key","private","cert","minVersion","ciphers","isPrinting","currentPrintFile","printProgress","isPaused","nozzleTemp","bedTemp","printStartTime","PRINT_DURATION","tlsCerts","ftpServer","FtpSrv","url","pasv_url","pasv_min","pasv_max","tls","anonymous","greeting","on","connection","username","password","resolve","reject","root","Error","context","error","listen","then","mqttClient","mqtt","connect","clientId","Date","now","rejectUnauthorized","reportTopic","requestTopic","subscribe","err","publishState","elapsedSeconds","Math","min","max","state","print","nozzle_temper","round","nozzle_target_temper","bed_temper","bed_target_temper","chamber_temper","mc_percent","mc_remaining_time","mc_print_stage","gcode_state","gcode_file","wifi_signal","layer_num","floor","total_layer_num","subtask_name","heatbreak_fan_speed","cooling_fan_speed","big_fan1_speed","big_fan2_speed","spd_lvl","spd_mag","print_error","lifecycle","command","msg","sequence_id","String","publish","JSON","stringify","qos","setInterval","topic","message","payload","parse","toString","filename","param","endsWith","pausedProgress","connected","endAsync","close","exit","catch"],"mappings":"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"}
+{"version":3,"sources":["../../src/consoles/mock-bambu.server.ts"],"names":["DEFAULT_PORT","DEFAULT_MQTT_PORT","DEFAULT_SERIAL","DEFAULT_ACCESS_CODE","MESSAGE_INTERVAL","DEFAULT_USERNAME","port","process","argv","Number","parseInt","mqttPort","serial","accessCode","console","log","ftpDir","path","join","os","tmpdir","sdcardDir","fs","existsSync","mkdirSync","recursive","generateSelfSignedCert","attrs","name","value","options","days","algorithm","keySize","pems","selfsigned","generate","key","private","cert","minVersion","ciphers","isPrinting","isFinished","currentPrintFile","finishedFileName","printProgress","isPaused","nozzleTemp","bedTemp","printStartTime","PRINT_DURATION","tlsCerts","ftpServer","FtpSrv","url","pasv_url","pasv_min","pasv_max","tls","anonymous","greeting","on","username","password","resolve","reject","root","Error","error","listen","then","mqttClient","mqtt","connect","clientId","Date","now","rejectUnauthorized","reportTopic","requestTopic","subscribe","err","publishState","elapsedSeconds","Math","min","max","gcodeState","fileName","hasJob","printingLabel","state","print","nozzle_temper","round","nozzle_target_temper","bed_temper","bed_target_temper","chamber_temper","mc_percent","mc_remaining_time","mc_print_stage","gcode_state","gcode_file","wifi_signal","layer_num","floor","total_layer_num","subtask_name","heatbreak_fan_speed","cooling_fan_speed","big_fan1_speed","big_fan2_speed","spd_lvl","spd_mag","print_error","lifecycle","command","msg","sequence_id","String","publish","JSON","stringify","qos","setInterval","topic","message","payload","parse","toString","filename","param","endsWith","pausedProgress","stoppedFile","setTimeout","connected","endAsync","close","exit","catch"],"mappings":"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"}