@fdm-monster/server 2.0.3 → 2.0.5

package/.env.template

@@ -45,7 +45,6 @@ DATABASE_PATH=./database
 # Optional, default: fdm-monster.sqlite
 DATABASE_FILE=fdm-monster.sqlite
 
-ENABLE_PROMETHEUS=false
 ENABLE_LOKI=false
 LOKI_ADDRESS=
 ENABLE_PROMETHEUS_METRICS=false

package/README.md

@@ -44,11 +44,11 @@ Here is a list of features that make FDM Monster stand out:
 
 ### Quick Install (Linux)
 ```bash
-curl -fsSL https://raw.githubusercontent.com/fdm-monster/fdm-monster/main/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/fdm-monster/fdm-monster-scripts/main/install/linux/install.sh | bash
 ```
 
 ### Other Methods
-- [One-Click Linux Install](https://docs.fdm-monster.net/installing/one-click-linux)
+ 
 - [Docker image](https://hub.docker.com/r/fdmmonster/fdm-monster)
 - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
 - [Unraid Community App](https://unraid.net/community/apps?q=fdm+monster)
@@ -166,23 +166,21 @@ the [CONTRIBUTING](CONTRIBUTING.md) file.
 
 ### Development Progress
 
-- [x] :rocket: Docker amd64 image
-- [x] :rocket: Quick copy paste of FDM Monster printers
+- [x] :rocket: Docker amd64 and arm64 image
+- [x] :rocket: Quick duplication of FDM Monster printers
 - [x] 🛡️ Complete API test coverage
 - [x] :rocket: Floor management
-- [x] Auto-clean old OctoPrint files (opt-in and configurable) 
-- [x] :rocket: Windows and Linux Service
-- [x] Printer completion/failure tracking (with statistics page)
+- [x] :rocket: Linux 1-click install
+- [x] Printer Job History
 - [x] Printer placement using drag n drop 
 - [x] 🔌 Raspberry Pi image (https://github.com/fdm-monster/MonsterPi)
 - [x] :rocket: Documentation (https://docs.fdm-monster.net)
-- [x] 🛡️ Login and user management
+- [x] 🛡️ Login and User management (with roles)
 - [x] OctoFarm printer import 
-- [x] Klipper and Moonraker API integration
+- [x] OctoPrint, Bambu, PrusaLink Klipper and Moonraker API integration
 - [x] GCode Thumbnail support
-- [x] `.bgcode` support
-- [x] Modernized UI layout and tile design
-- [x] History and statistics
+- [x] `.gcode`, `.bgcode` and `.gcode.3mf` support
+- [x] Modern UI layout and tile design
 - [x] Print Queue
 - [x] Extended webcam integration
 - [ ] Spoolman integration

package/RELEASE_NOTES.MD

@@ -1,5 +1,26 @@
 # Develop
 
+# FDM Monster 2.0.4
+
+## Hotfix
+
+- DATABASE_FILE and DATABASE_PATH weren't picked up from .env as dotenv path was wrong
+
+# FDM Monster 2.0.4
+
+## Feature
+
+- Added mdns based Docker image for advanced users, who want to enable mDNS with Docker and a Docker bridge network connected to a MAC-VLAN.
+
+## Fixes
+
+- YAML import was too strict for printer properties: disabledReason, username and password. feedRate, flowRate and assignee are now also imported
+
+## Chore
+
+- Remove unnecessary debug logging for job analysis service when it had nothing to do
+- Remove install.sh
+
 # FDM Monster 2.0.3
 
 Hotfix release

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

@@ -393,7 +393,7 @@ app.post("/api/login", async (req, res)=>{
     });
 });
 app.post("/api/files/local/:path(*)", _express.default.json(), (req, res)=>{
-    const filePath = req.params.path;
+    const filePath = req.params["path(*)"];
     const { command, print } = req.body;
     _nodeconsole.log(`[PORT ${port}] POST /api/files/local/${filePath} - command: ${command}, print: ${print}`);
     if (command === "select") {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/consoles/mock-octoprint.server.ts"],"names":["isPrinting","isPaused","isFinished","currentPrintFile","printProgress","printStartTime","PRINT_DURATION","getCurrentMessage","updatePrintProgress","elapsedSeconds","Date","now","remainingSeconds","Math","max","stateText","fileName","finishedFileName","hasFile","current","state","text","flags","operational","printing","cancelling","pausing","resuming","finishing","closedOrError","error","paused","ready","sdReady","finished","job","file","name","path","display","origin","size","date","estimatedPrintTime","averagePrintTime","lastPrintTime","filament","tool0","length","volume","user","currentZ","floor","progress","completion","filepos","printTime","printTimeLeft","printTimeLeftOrigin","offsets","resends","count","transmitted","ratio","serverTime","temps","busyFiles","logs","messages","min","console","log","getJobResponse","hasJob","port","process","argv","Number","parseInt","uploadsDir","join","__dirname","toString","WS_MESSAGE_INTERVAL","fs","existsSync","mkdirSync","recursive","cleanupUploads","upload","multer","dest","app","express","server","http","createServer","wss","WebSocketServer","clients","Map","AuthSchema","z","object","command","literal","token","string","regex","on","ws","clientId","authenticated","messageInterval","message","msgString","includes","json","JSON","parse","close","parts","auth","split","set","setTimeout","send","stringify","fileError","setupMessageInterval","validationError","clearInterval","delete","baseInterval","getRandomizedInterval","baseMs","variationFactor","random","sendPeriodicMessage","readyState","OPEN","get","req","res","api","permissions","groups","method","toUpperCase","url","status","printerHistorySuccessResponse","connectionSuccessResponse","post","action","body","round","pausedProgress","filesSuccessResponse","_is_external_client","_login_mechanism","session","filePath","params","print","endsWith","single","originalname","mimetype","done","files","local","refs","resource","use","listen","exit","readdirSync","unlinkSync"],"mappings":";;;;gEAAoB;+DACD;+DACJ;iEACE;oBACoC;iEACpC;qBACC;qEACO;6BAKlB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGP,IAAIA,aAAa;AACjB,IAAIC,WAAW;AACf,IAAIC,aAAa;AACjB,IAAIC,mBAAmB;AACvB,IAAIC,gBAAgB;AACpB,IAAIC,iBAAiB;AACrB,MAAMC,iBAAiB;AAGvB,SAASC;IACPC;IAEA,MAAMC,iBAAiBT,aAAa,AAACU,CAAAA,KAAKC,GAAG,KAAKN,cAAa,IAAK,OAAO;IAC3E,MAAMO,mBAAmBZ,aAAaa,KAAKC,GAAG,CAAC,GAAGR,iBAAiBG,kBAAkB;IAGrF,IAAIM,YAAY;IAEhB,IAAIf,cAAcC,UAAUc,YAAY;SACnC,IAAIf,YAAYe,YAAY;IAGjC,MAAMC,WAAWd,aAAae,mBAAoBd,oBAAoB;IACtE,MAAMe,UAAUlB,cAAcE;IAE9B,OAAO;QACLiB,SAAS;YACPC,OAAO;gBACLC,MAAMN;gBACNO,OAAO;oBACLC,aAAa;oBACbC,UAAUxB,cAAc,CAACC;oBACzBwB,YAAY;oBACZC,SAAS;oBACTC,UAAU;oBACVC,WAAW;oBACXC,eAAe;oBACfC,OAAO;oBACPC,QAAQ9B;oBACR+B,OAAO,CAAChC,cAAc,CAACE;oBACvB+B,SAAS;oBACTC,UAAUhC;gBACZ;gBACA4B,OAAO;YACT;YACAK,KAAK;gBACHC,MAAM;oBACJC,MAAMrB;oBACNsB,MAAMtB;oBACNuB,SAASvB;oBACTwB,QAAQtB,UAAU,UAAU;oBAC5BuB,MAAMvB,UAAU,UAAU;oBAC1BwB,MAAMxB,UAAUb,iBAAiB,OAAO;gBAC1C;gBACAsC,oBAAoBzB,UAAUZ,iBAAiB;gBAC/CsC,kBAAkB;gBAClBC,eAAe;gBACfC,UAAU5B,UAAU;oBAAE6B,OAAO;wBAAEC,QAAQ;wBAAMC,QAAQ;oBAAI;gBAAE,IAAI;gBAC/DC,MAAM;YACR;YACAC,UAAUnD,aAAaa,KAAKuC,KAAK,CAAChD,gBAAgB,KAAK;YACvDiD,UAAU;gBACRC,YAAYpD,aAAa,MAAOF,aAAaI,gBAAgB;gBAC7DmD,SAASrC,UAAUL,KAAKuC,KAAK,CAAC,AAAElD,CAAAA,aAAa,MAAME,aAAY,IAAK,MAAO,WAAW;gBACtFoD,WAAWtD,aAAaI,iBAAkBN,aAAaa,KAAKuC,KAAK,CAAC3C,kBAAkB;gBACpFgD,eAAevD,aAAa,IAAKU,qBAAqB,OAAOC,KAAKuC,KAAK,CAACxC,oBAAoB;gBAC5F8C,qBAAqBxC,UAAU,aAAa;YAC9C;YACAyC,SAAS,CAAC;YACVC,SAAS;gBAAEC,OAAO;gBAAGC,aAAa;gBAAGC,OAAO;YAAE;YAC9CC,YAAYtD,KAAKC,GAAG,KAAK;YACzBsD,OAAO,EAAE;YACTC,WAAW,EAAE;YACbC,MAAM,EAAE;YACRC,UAAU,EAAE;QACd;IACF;AACF;AAGA,IAAInD,mBAAmB;AACvB,SAAST;IAEP,IAAIN,YAAY;QACdA,aAAa;QACbe,mBAAmB;QACnBd,mBAAmB;QACnBC,gBAAgB;QAChB;IACF;IAEA,IAAIJ,cAAc,CAACC,UAAU;QAC3B,MAAMQ,iBAAiB,AAACC,CAAAA,KAAKC,GAAG,KAAKN,cAAa,IAAK;QACvDD,gBAAgBS,KAAKwD,GAAG,CAAC,AAAC5D,iBAAiBH,iBAAkB,KAAK;QAElE,IAAIF,iBAAiB,KAAK;YAExBF,aAAa;YACbe,mBAAmBd;YACnBH,aAAa;YACbI,gBAAgB;YAChBkE,aAAQC,GAAG,CAAC,CAAC,wBAAwB,EAAEpE,kBAAkB;QAC3D;IACF;AACF;AAEA,SAASqE;IACPhE;IAEA,MAAMQ,WAAWd,aAAae,mBAAmBd;IACjD,MAAMsE,SAASzE,cAAcE;IAE7B,IAAI,CAACuE,QAAQ;QACX,OAAO;YACLtC,KAAK;gBAAEC,MAAM;oBAAEC,MAAM;oBAAMG,QAAQ;oBAAMC,MAAM;oBAAMC,MAAM;gBAAK;gBAAGC,oBAAoB;gBAAMG,UAAU;YAAK;YAC5GO,UAAU;gBAAEC,YAAY;gBAAMC,SAAS;gBAAMC,WAAW;gBAAMC,eAAe;YAAK;YAClFrC,OAAO;QACT;IACF;IAEA,MAAMX,iBAAiB,AAACC,CAAAA,KAAKC,GAAG,KAAKN,cAAa,IAAK;IACvD,MAAMO,mBAAmBC,KAAKC,GAAG,CAAC,GAAGR,iBAAiBG;IAEtD,IAAIW,QAAQ;IACZ,IAAIlB,YAAYkB,QAAQ;SACnB,IAAInB,UAAUmB,QAAQ;IAE3B,OAAO;QACLe,KAAK;YACHC,MAAM;gBAAEC,MAAMrB;gBAAUwB,QAAQ;gBAASC,MAAM;gBAASC,MAAMrC,iBAAiB;YAAK;YACpFsC,oBAAoBrC;YACpBwC,UAAU;gBAAEC,OAAO;oBAAEC,QAAQ;oBAAMC,QAAQ;gBAAI;YAAE;QACnD;QACAI,UAAU;YACRC,YAAYpD,aAAa,MAAME;YAC/BmD,SAAS1C,KAAKuC,KAAK,CAAC,AAAElD,CAAAA,aAAa,MAAME,aAAY,IAAK,MAAO;YACjEoD,WAAWtD,aAAaI,iBAAiBO,KAAKuC,KAAK,CAAC3C;YACpDgD,eAAevD,aAAa,IAAIW,KAAKuC,KAAK,CAACxC;QAC7C;QACAQ;IACF;AACF;AAEA,MAAMsD,OAAOC,QAAQC,IAAI,CAAC,EAAE,GAAGC,OAAOC,QAAQ,CAACH,QAAQC,IAAI,CAAC,EAAE,IAAI;AAClE,MAAMG,aAAazC,iBAAI,CAAC0C,IAAI,CAACC,WAAW,WAAW,CAAC,OAAO,EAAGP,KAAKQ,QAAQ,IAAK;AAChF,MAAMC,sBAAsB;AAE5B,IAAI,CAACC,eAAE,CAACC,UAAU,CAACN,aAAa;IAC9BT,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,0BAA0B,EAAGK,YAAa;IACtEK,eAAE,CAACE,SAAS,CAACP,YAAY;QAAEQ,WAAW;IAAK;AAC7C;AAGAC;AAEA,MAAMC,SAASC,IAAAA,eAAM,EAAC;IAAEC,MAAMZ;AAAW;AAEzC,MAAMa,MAAMC,IAAAA,gBAAO;AACnB,MAAMC,SAASC,iBAAI,CAACC,YAAY,CAACJ;AAGjC,MAAMK,MAAM,IAAIC,UAAe,CAAC;IAAEJ;AAAO;AAGzC,MAAMK,UAAU,IAAIC;AAGpB,MAAMC,aAAaC,MAAC,CAACC,MAAM,CAAC;IAC1BC,SAASF,MAAC,CAACG,OAAO,CAAC;IACnBvD,MAAMoD,MAAC,CAACG,OAAO,CAAC;IAChBC,OAAOJ,MAAC,CAACK,MAAM,GAAGC,KAAK,CAAC;AAC1B;AAGAX,IAAIY,EAAE,CAAC,cAAc,CAACC;IACpB,MAAMC,WAAWrG,KAAKC,GAAG,GAAGuE,QAAQ;IACpCZ,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,sCAAsC,CAAC;IACnE,IAAIsC,gBAAgB;IACpB,IAAIC,kBAAyC;IAE7CH,GAAGD,EAAE,CAAC,WAAW,OAAOK;QACtB,IAAI;YACF,MAAMC,YAAYD,QAAQhC,QAAQ;YAClC,IAAIiC,UAAUC,QAAQ,CAAC,aAAa;gBAClC9C,aAAQC,GAAG,CAAC,CAAC,0BAA0B,EAAG4C,WAAY;gBACtD;YACF;YAEA,MAAME,OAAOC,KAAKC,KAAK,CAACJ;YAGxB,IAAIH,eAAe;gBAEjB1C,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,4CAA4C,CAAC;gBACzE;YACF;YAEA,IAAI,CAAC2C,MAAM;gBACT/C,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,6BAA6B,CAAC;gBAC1DoC,GAAGU,KAAK;gBACR;YACF;YAEA,IAAI;gBAEF,MAAMC,QAAQJ,KAAKK,IAAI,CAACC,KAAK,CAAC;gBAC9BtB,WAAWkB,KAAK,CAAC;oBACff,SAAS;oBACTtD,MAAMuE,KAAK,CAAC,EAAE;oBACdf,OAAOe,KAAK,CAAC,EAAE;gBACjB;gBAEAnD,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,qCAAqC,CAAC;gBAClEsC,gBAAgB;gBAGhBb,QAAQyB,GAAG,CAACb,UAAU;oBAAED;oBAAIE;gBAAc;gBAG1Ca,WAAW;oBACT,IAAI;wBACFf,GAAGgB,IAAI,CAACR,KAAKS,SAAS,CAACxH;oBACzB,EAAE,OAAOyH,WAAW;wBAClB1D,aAAQxC,KAAK,CAAC,CAAC,MAAM,EAAG4C,KAAM,6BAA6B,CAAC,EAAEsD;wBAC9DlB,GAAGgB,IAAI,CAACR,KAAKS,SAAS,CAAC;4BAAEjG,OAAO;wBAAiC;oBACnE;gBACF,GAAG;gBAGHmF,kBAAkBgB,qBAAqBnB,IAAIC,UAAU5B;YACvD,EAAE,OAAO+C,iBAAiB;gBACxB5D,aAAQC,GAAG,CACT,CAAC,MAAM,EAAGG,KAAM,8CAA8C,EAAG4C,KAAKS,SAAS,CAACV,MAAO,CAAC,EAAGa,iBAAkB;gBAE/GpB,GAAGU,KAAK;YACV;QAEF,EAAE,OAAO1F,OAAO;YACdwC,aAAQxC,KAAK,CAAC,CAAC,MAAM,EAAG4C,KAAM,2BAA2B,CAAC,EAAE5C;YAC5DgF,GAAGU,KAAK;QACV;IACF;IAEAV,GAAGD,EAAE,CAAC,SAAS;QACbvC,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,8BAA8B,EAAGqC,UAAW;QAExE,IAAIE,iBAAiB;YACnBkB,cAAclB;YACdA,kBAAkB;QACpB;QAEAd,QAAQiC,MAAM,CAACrB;IACjB;IAGA,MAAMkB,uBAAuB,CAACnB,IAAeC,UAAkBsB;QAE7D,IAAIpB,iBAAiB;YACnBkB,cAAclB;YACdA,kBAAkB;QACpB;QAGA,MAAMqB,wBAAwB,CAACC;YAE7B,MAAMC,kBAAkB,OAAO3H,KAAK4H,MAAM,KAAK;YAC/C,OAAO5H,KAAKuC,KAAK,CAACmF,SAASC;QAC7B;QAGA,MAAME,sBAAsB;YAC1B,IAAI;gBACF,IAAI5B,GAAG6B,UAAU,KAAK7B,GAAG8B,IAAI,EAAE;oBAC7B9B,GAAGgB,IAAI,CAACR,KAAKS,SAAS,CAACxH;oBACvB+D,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,uCAAuC,EAAGqC,SAAU,CAAC,CAAC;oBAGlFE,kBAAkBY,WAAWa,qBAAqBJ,sBAAsBD;gBAC1E,OAAO;oBAEL/D,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,4CAA4C,EAAGqC,SAAU,CAAC,CAAC;oBACvFE,kBAAkB;gBACpB;YACF,EAAE,OAAOnF,OAAO;gBACdwC,aAAQxC,KAAK,CAAC,CAAC,MAAM,EAAG4C,KAAM,iCAAiC,CAAC,EAAE5C;gBAElEmF,kBAAkB;YACpB;QACF;QAGAA,kBAAkBY,WAAWa,qBAAqBJ,sBAAsBD;QACxE,OAAOpB;IACT;AACF;AAEArB,IAAIiD,GAAG,CAAC,gBAAgB,OAAOC,KAAKC;IAClCA,IAAIjB,IAAI,CAAC;QACPhC,QAAQ;QACRkD,KAAK;QACL3H,MAAM;IACR;AACF;AAEAuE,IAAIiD,GAAG,CAAC,oBAAoB,OAAOC,KAAKC;IACtCA,IAAIjB,IAAI,CAAC;QACPzF,MAAM;QACN4G,aAAa,EAAE;QACfC,QAAQ,EAAE;IACZ;AACF;AAEAtD,IAAIiD,GAAG,CAAC,gBAAgB,OAAOC,KAAKC;IAClCzE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,EAAE,EAAGoE,IAAIK,MAAM,CAACC,WAAW,GAAI,CAAC,EAAGN,IAAIO,GAAG,CAAE,QAAQ,CAAC;IACjFN,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAACkC,0CAA6B;AACpD;AAEA3D,IAAIiD,GAAG,CAAC,mBAAmB,OAAOC,KAAKC;IACrCzE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,EAAE,EAAGoE,IAAIK,MAAM,CAACC,WAAW,GAAI,CAAC,EAAGN,IAAIO,GAAG,CAAE,QAAQ,CAAC;IACjFN,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAACmC,sCAAyB;AAChD;AAEA5D,IAAIiD,GAAG,CAAC,YAAY,OAAOC,KAAKC;IAC9BzE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,EAAE,EAAGoE,IAAIK,MAAM,CAACC,WAAW,GAAI,CAAC,EAAGN,IAAIO,GAAG,CAAE,QAAQ,CAAC;IACjFN,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAAC7C;AACvB;AAGAoB,IAAI6D,IAAI,CAAC,YAAY5D,gBAAO,CAACwB,IAAI,IAAI,OAAOyB,KAAKC;IAC/C,MAAM,EAAEvC,OAAO,EAAEkD,MAAM,EAAE,GAAGZ,IAAIa,IAAI;IACpCrF,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,2BAA2B,EAAG8B,QAAS,UAAU,EAAGkD,QAAS;IAEzF,IAAIlD,YAAY,UAAU;QACxB,IAAIxG,YAAY;YACdA,aAAa;YACbC,WAAW;YACXG,gBAAgB;YAChBD,mBAAmB;YACnBmE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,iBAAiB,CAAC;QAChD;QACA,OAAOqE,IAAIO,MAAM,CAAC,KAAKxB,IAAI;IAC7B;IAEA,IAAItB,YAAY,SAAS;QACvB,IAAIkD,WAAW,WAAW1J,cAAc,CAACC,UAAU;YACjDA,WAAW;YACXqE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,kBAAkB,EAAG7D,KAAK+I,KAAK,CAACxJ,eAAgB,CAAC,CAAC;QAChF,OAAO,IAAIsJ,WAAW,YAAY1J,cAAcC,UAAU;YACxDA,WAAW;YAEX,MAAM4J,iBAAiBzJ;YACvBC,iBAAiBK,KAAKC,GAAG,KAAK,AAACkJ,iBAAiB,MAAOvJ,iBAAiB;YACxEgE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,qBAAqB,EAAG7D,KAAK+I,KAAK,CAACC,gBAAiB,CAAC,CAAC;QACpF;QACA,OAAOd,IAAIO,MAAM,CAAC,KAAKxB,IAAI;IAC7B;IAEAiB,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAAC;QAAEvF,OAAO;IAAkB;AAClD;AAEA8D,IAAIiD,GAAG,CAAC,oBAAoB,OAAOC,KAAKC;IACtCzE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,EAAE,EAAGoE,IAAIK,MAAM,CAACC,WAAW,GAAI,CAAC,EAAGN,IAAIO,GAAG,CAAE,QAAQ,CAAC;IACjFN,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAACyC,iCAAoB;AAC3C;AAEAlE,IAAI6D,IAAI,CAAC,cAAc,OAAOX,KAAKC;IACjCA,IAAIjB,IAAI,CAAC;QACPiC,qBAAqB;QACrBC,kBAAkB;QAClBC,SAAS;IACX;AACF;AAGArE,IAAI6D,IAAI,CAAC,6BAA6B5D,gBAAO,CAACwB,IAAI,IAAI,CAACyB,KAAKC;IAC1D,MAAMmB,WAAWpB,IAAIqB,MAAM,CAAC7H,IAAI;IAChC,MAAM,EAAEkE,OAAO,EAAE4D,KAAK,EAAE,GAAGtB,IAAIa,IAAI;IAEnCrF,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,wBAAwB,EAAGwF,SAAU,YAAY,EAAG1D,QAAS,SAAS,EAAG4D,OAAQ;IAE7G,IAAI5D,YAAY,UAAU;QAExB,IAAI,CAAC0D,SAASG,QAAQ,CAAC,aAAa,CAACH,SAASG,QAAQ,CAAC,cAAc,CAACH,SAASG,QAAQ,CAAC,SAAS;YAC/F/F,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,qCAAqC,EAAGwF,UAAW;YAC/E,OAAOnB,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBAAEvF,OAAO;YAA6E;QACpH;QAEA3B,mBAAmB+J;QACnB5F,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,iBAAiB,EAAGwF,UAAW;QAG3D,IAAIE,UAAU,MAAM;YAClBpK,aAAa;YACbC,WAAW;YACXI,iBAAiBK,KAAKC,GAAG;YACzBP,gBAAgB;YAChBkE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,kBAAkB,EAAGwF,SAAU,EAAE,EAAG5J,eAAgB,iBAAiB,CAAC;QACpG;QAEA,OAAOyI,IAAIO,MAAM,CAAC,KAAKxB,IAAI;IAC7B;IAEA,IAAItB,YAAY,QAAQ;QACtBlC,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,6BAA6B,EAAGwF,UAAW;QACvE,OAAOnB,IAAIO,MAAM,CAAC,KAAKxB,IAAI;IAC7B;IAEAiB,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAAC;QAAEvF,OAAO;IAAkB;AAClD;AAGA8D,IAAI6D,IAAI,CAAC,oBAAoBhE,OAAO6E,MAAM,CAAC,SAAS,CAACxB,KAAKC;IACxD,MAAM,EAAEqB,KAAK,EAAE,GAAGtB,IAAIa,IAAI;IAC1B,MAAMvH,OAAO0G,IAAI1G,IAAI;IAErB,IAAI,CAACA,MAAM;QACT,OAAO2G,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAAC;YAAEvF,OAAO;QAAe;IACtD;IAEAwC,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,gBAAgB,CAAC,EAAEtC,KAAKmI,YAAY;IAChEjG,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,YAAY,CAAC,EAAEtC,KAAKK,IAAI;IACpD6B,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,YAAY,CAAC,EAAEtC,KAAKoI,QAAQ;IACxDlG,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,QAAQ,CAAC,EAAE0F,OAAO,CAAC,OAAO,CAAC;IAGvD,IAAIA,UAAU,QAAQ;QACpBjK,mBAAmBiC,KAAKmI,YAAY;QACpCvK,aAAa;QACbC,WAAW;QACXI,iBAAiBK,KAAKC,GAAG;QACzBP,gBAAgB;QAChBkE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,kBAAkB,EAAGtC,KAAKmI,YAAY,CAAE,EAAE,EAAGjK,eAAgB,iBAAiB,CAAC;IAC7G;IAEAyI,IAAI1B,IAAI,CAAC;QACPoD,MAAM;QACNC,OAAO;YACLC,OAAO;gBACLtI,MAAMD,KAAKmI,YAAY;gBACvB/H,QAAQ;gBACRoI,MAAM;oBAAEC,UAAU,CAAC,iBAAiB,EAAGzI,KAAKmI,YAAY,EAAG;gBAAC;YAC9D;QACF;IACF;AACF;AAEA3E,IAAIkF,GAAG,CAAC,CAAChC,KAAKC;IACZzE,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,EAAE,EAAGoE,IAAIK,MAAM,CAACC,WAAW,GAAI,CAAC,EAAGN,IAAIO,GAAG,CAAE,UAAU,CAAC;IACnFN,IAAIO,MAAM,CAAC,KAAKjC,IAAI,CAAC;QAAEvF,OAAO;IAAY;AAC5C;AAEAgE,OAAOiF,MAAM,CAACrG,MAAM;IAClBJ,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,wCAAwC,EAAGA,MAAO;IAC9EJ,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,kDAAkD,EAAGA,MAAO;AAC1F;AAGAC,QAAQkC,EAAE,CAAC,UAAU;IACnBvC,aAAQC,GAAG,CAAC;IACZiB;IACAM,OAAO0B,KAAK,CAAC;QACXlD,aAAQC,GAAG,CAAC;QACZI,QAAQqG,IAAI,CAAC;IACf;AACF;AAEArG,QAAQkC,EAAE,CAAC,WAAW;IACpBvC,aAAQC,GAAG,CAAC;IACZiB;IACAM,OAAO0B,KAAK,CAAC;QACXlD,aAAQC,GAAG,CAAC;QACZI,QAAQqG,IAAI,CAAC;IACf;AACF;AAEA,SAASxF;IACP,IAAI;QACFlB,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,+BAA+B,CAAC;QAC5D,MAAMgG,QAAQtF,eAAE,CAAC6F,WAAW,CAAClG;QAE7B,KAAK,MAAM3C,QAAQsI,MAAO;YACxB,MAAMR,WAAW5H,iBAAI,CAAC0C,IAAI,CAACD,YAAY3C;YACvCgD,eAAE,CAAC8F,UAAU,CAAChB;YACd5F,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,WAAW,EAAGwF,UAAW;QACvD;QAEA5F,aAAQC,GAAG,CAAC,CAAC,MAAM,EAAGG,KAAM,iCAAiC,CAAC;IAChE,EAAE,OAAO5C,OAAO;QACdwC,aAAQxC,KAAK,CAAC,CAAC,MAAM,EAAG4C,KAAM,mCAAmC,CAAC,EAAE5C;IACtE;AACF"}
+{"version":3,"sources":["../../src/consoles/mock-octoprint.server.ts"],"names":["isPrinting","isPaused","isFinished","currentPrintFile","printProgress","printStartTime","PRINT_DURATION","getCurrentMessage","updatePrintProgress","elapsedSeconds","Date","now","remainingSeconds","Math","max","stateText","fileName","finishedFileName","hasFile","current","state","text","flags","operational","printing","cancelling","pausing","resuming","finishing","closedOrError","error","paused","ready","sdReady","finished","job","file","name","path","display","origin","size","date","estimatedPrintTime","averagePrintTime","lastPrintTime","filament","tool0","length","volume","user","currentZ","floor","progress","completion","filepos","printTime","printTimeLeft","printTimeLeftOrigin","offsets","resends","count","transmitted","ratio","serverTime","temps","busyFiles","logs","messages","min","console","log","getJobResponse","hasJob","port","process","argv","Number","parseInt","uploadsDir","join","__dirname","toString","WS_MESSAGE_INTERVAL","fs","existsSync","mkdirSync","recursive","cleanupUploads","upload","multer","dest","app","express","server","http","createServer","wss","WebSocketServer","clients","Map","AuthSchema","z","object","command","literal","token","string","regex","on","ws","clientId","authenticated","messageInterval","message","msgString","includes","json","JSON","parse","close","parts","auth","split","set","setTimeout","send","stringify","fileError","setupMessageInterval","validationError","clearInterval","delete","baseInterval","getRandomizedInterval","baseMs","variationFactor","random","sendPeriodicMessage","readyState","OPEN","get","req","res","api","permissions","groups","method","toUpperCase","url","status","printerHistorySuccessResponse","connectionSuccessResponse","post","action","body","round","pausedProgress","filesSuccessResponse","_is_external_client","_login_mechanism","session","filePath","params","print","endsWith","single","originalname","mimetype","done","files","local","refs","resource","use","listen","exit","readdirSync","unlinkSync"],"mappings":"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"}

package/dist/data-source.js

@@ -10,8 +10,6 @@ Object.defineProperty(exports, "AppDataSource", {
 });
 require("reflect-metadata");
 const _typeorm = require("typeorm");
-const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
-const _nodepath = require("node:path");
 const _fsutils = require("./utils/fs.utils");
 const _floorentity = require("./entities/floor.entity");
 const _floorpositionentity = require("./entities/floor-position.entity");
@@ -39,20 +37,10 @@ const _1767370191762ChangeFloorNonUniqueOrder = require("./migrations/1767370191
 const _1767432108916RenameGroupToTag = require("./migrations/1767432108916-RenameGroupToTag");
 const _1767451444137AddPrintJob = require("./migrations/1767451444137-AddPrintJob");
 const _1767909428129AddPrinterMaintenanceLog = require("./migrations/1767909428129-AddPrinterMaintenanceLog");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-if (process.env.NODE_ENV !== "test") {
-    _dotenv.default.config({
-        path: process.env.ENV_FILE || (0, _nodepath.join)("../.env"),
-        quiet: true
-    });
-}
+const databaseFilePath = (0, _fsutils.getDatabaseFilePath)();
 const AppDataSource = new _typeorm.DataSource({
     type: "better-sqlite3",
-    database: (0, _fsutils.getDatabaseFilePath)(),
+    database: databaseFilePath,
     synchronize: false,
     logging: false,
     entities: [

package/dist/data-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","process","env","NODE_ENV","dotenv","config","path","ENV_FILE","join","quiet","DataSource","type","database","getDatabaseFilePath","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","Role","RefreshToken","UserRole","Tag","PrinterTag","PrintJob","PrinterMaintenanceLog","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","ChangeCameraPrinterOnDeleteSetNull1767278216516","DropCustomGcode1767279607392","DropPrintCompletions1767291804417","DropSettingsFileClean1767352862576","ChangeFloorNonUniqueOrder1767370191762","RenameGroupToTag1767432108916","AddPrintJob1767451444137","AddPrinterMaintenanceLog1767909428129","subscribers"],"mappings":";;;;+BA2CaA;;;eAAAA;;;QA3CN;yBACoB;+DACR;0BACE;yBACe;6BACd;qCACQ;+BACN;gCACC;0BAC2C;oCACvC;4BACR;gCACI;yCACe;kCACb;2BACP;2CACsB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;8CACX;iEAGtC;8CACsC;mDACK;oDACC;wDACI;+CACT;0CACL;uDACa;;;;;;AAEtD,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAML,QAAQC,GAAG,CAACK,QAAQ,IAAIC,IAAAA,cAAI,EAAC;QACnCC,OAAO;IACT;AACF;AAEO,MAAMT,gBAAgB,IAAIU,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUC,IAAAA,4BAAmB;IAC7BC,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,gBAAI;QACJC,sBAAY;QACZC,wBAAQ;QACRC,cAAG;QACHC,4BAAU;QACVC,kBAAQ;QACRC,+BAAqB;KACtB;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;QAC5BC,gGAA+C;QAC/CC,0DAA4B;QAC5BC,oEAAiC;QACjCC,sEAAkC;QAClCC,8EAAsC;QACtCC,4DAA6B;QAC7BC,kDAAwB;QACxBC,4EAAqC;KACtC;IACDC,aAAa,EAAE;AACjB"}
+{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","databaseFilePath","getDatabaseFilePath","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","Role","RefreshToken","UserRole","Tag","PrinterTag","PrintJob","PrinterMaintenanceLog","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","ChangeCameraPrinterOnDeleteSetNull1767278216516","DropCustomGcode1767279607392","DropPrintCompletions1767291804417","DropSettingsFileClean1767352862576","ChangeFloorNonUniqueOrder1767370191762","RenameGroupToTag1767432108916","AddPrintJob1767451444137","AddPrinterMaintenanceLog1767909428129","subscribers"],"mappings":";;;;+BAoCaA;;;eAAAA;;;QApCN;yBACoB;yBACS;6BACd;qCACQ;+BACN;gCACC;0BAC2C;oCACvC;4BACR;gCACI;yCACe;kCACb;2BACP;2CACsB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;8CACX;iEAGtC;8CACsC;mDACK;oDACC;wDACI;+CACT;0CACL;uDACa;AAEtD,MAAMC,mBAAmBC,IAAAA,4BAAmB;AAErC,MAAMF,gBAAgB,IAAIG,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUJ;IACVK,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,gBAAI;QACJC,sBAAY;QACZC,wBAAQ;QACRC,cAAG;QACHC,4BAAU;QACVC,kBAAQ;QACRC,+BAAqB;KACtB;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;QAC5BC,gGAA+C;QAC/CC,0DAA4B;QAC5BC,oEAAiC;QACjCC,sEAAkC;QAClCC,8EAAsC;QACtCC,4DAA6B;QAC7BC,kDAAwB;QACxBC,4EAAqC;KACtC;IACDC,aAAa,EAAE;AACjB"}

package/dist/index.js

@@ -2,24 +2,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
-const _nodepath = require("node:path");
 const _node = require("@sentry/node");
 const _serverenv = require("./server.env");
 const _servercore = require("./server.core");
 const _containertokens = require("./container.tokens");
 const _logger = require("./handlers/logger");
 const _staticlogger = require("./handlers/logging/static.logger");
-const _fsutils = require("./utils/fs.utils");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-_dotenv.default.config({
-    path: process.env.ENV_FILE || (0, _nodepath.join)((0, _fsutils.superRootPath)(), ".env"),
-    quiet: true
-});
 (0, _staticlogger.createStaticLogger)({
     enableFileLogs: true
 });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["dotenv","config","path","process","env","ENV_FILE","join","superRootPath","quiet","createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","on","err","error","reason","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","captureException","flush","exit"],"mappings":";;;;+DAAmB;0BACE;sBACmB;2BACT;4BACH;iCACH;wBAEe;8BACL;yBACL;;;;;;AAE9BA,eAAM,CAACC,MAAM,CAAC;IACZC,MAAMC,QAAQC,GAAG,CAACC,QAAQ,IAAIC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI;IACpDC,OAAO;AACT;AAEAC,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAC1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdX,QAAQY,EAAE,CAAC,qBAAqB,CAACC;IAC/BL,OAAOM,KAAK,CAAC,sBAAsBD;AACrC;AAEAb,QAAQY,EAAE,CAAC,sBAAsB,CAACG;IAChCP,OAAOM,KAAK,CAAC,+BAA+BC;AAC9C;AAEAC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQZ,KAAK,CAAC,2DAA2DW;QAEzEE,IAAAA,sBAAgB,EAACF;QACjB,MAAMG,IAAAA,WAAK,EAAC;QACZ5B,QAAQ6B,IAAI,CAAC;IACf;AACJ"}
+{"version":3,"sources":["../src/index.ts"],"names":["createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","process","on","err","error","reason","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","captureException","flush","exit"],"mappings":";;;;sBAEwC;2BACT;4BACH;iCACH;wBAEe;8BACL;AAGnCA,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAC1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdC,QAAQC,EAAE,CAAC,qBAAqB,CAACC;IAC/BN,OAAOO,KAAK,CAAC,sBAAsBD;AACrC;AAEAF,QAAQC,EAAE,CAAC,sBAAsB,CAACG;IAChCR,OAAOO,KAAK,CAAC,+BAA+BC;AAC9C;AAEAC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQZ,KAAK,CAAC,2DAA2DW;QAEzEE,IAAAA,sBAAgB,EAACF;QACjB,MAAMG,IAAAA,WAAK,EAAC;QACZjB,QAAQkB,IAAI,CAAC;IACf;AACJ"}

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.0",
+    defaultClientMinimum: "2.2.4",
     defaultWebsocketHandshakeTimeout: 3000,
     defaultSocketThrottleRate: 1,
     debugSocketStatesKey: "DEBUG_SOCKET_STATES",

package/dist/server.env.js

@@ -78,7 +78,7 @@ function setupEnvConfig() {
         process.env[_serverconstants.AppConstants.NODE_ENV_KEY] = newEnvName;
         logger.warn(`NODE_ENV=${environment} was not set, or not known. Defaulting to NODE_ENV=${newEnvName}`);
     } else {
-        logger.log(`✓ NODE_ENV variable correctly set (${environment})!`);
+        logger.log(`✓ NODE_ENV variable correctly set (${environment})`);
     }
     ensurePackageVersionSet();
     setupSentry();

package/dist/server.env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.env.ts"],"names":["ensurePortSet","fetchServerPort","setupEnvConfig","setupSentry","logger","Logger","environment","process","env","AppConstants","NODE_ENV_KEY","knownEnvNames","includes","newEnvName","defaultProductionEnv","warn","log","ensurePackageVersionSet","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","packageJsonVersion","require","packageJsonPath","version","VERSION_KEY","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","isTestEnvironment","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","docsUrl"],"mappings":"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"}
+{"version":3,"sources":["../src/server.env.ts"],"names":["ensurePortSet","fetchServerPort","setupEnvConfig","setupSentry","logger","Logger","environment","process","env","AppConstants","NODE_ENV_KEY","knownEnvNames","includes","newEnvName","defaultProductionEnv","warn","log","ensurePackageVersionSet","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","packageJsonVersion","require","packageJsonPath","version","VERSION_KEY","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","isTestEnvironment","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","docsUrl"],"mappings":"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"}

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

@@ -405,8 +405,10 @@ class YamlService {
         const updateByNameTags = [];
         for (const tag of upsertTags){
             const comparedProperty = tag.name.toLowerCase();
-            const foundIndex = names.findIndex((n)=>n === comparedProperty);
-            if (foundIndex !== -1) {
+            const foundIndex = names.indexOf(comparedProperty);
+            if (foundIndex === -1) {
+                insertTags.push(tag);
+            } else {
                 if (!ids[foundIndex]) {
                     throw new Error("IDS not found, tag name");
                 }
@@ -416,8 +418,6 @@ class YamlService {
                     value: tag
                 });
                 break;
-            } else {
-                insertTags.push(tag);
             }
         }
         return {
@@ -455,7 +455,10 @@ class YamlService {
                     printerURL: p.printerURL,
                     apiKey,
                     username,
-                    password
+                    password,
+                    assignee: p.assignee,
+                    flowRate: p.flowRate,
+                    feedRate: p.feedRate
                 };
             });
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","logger","loggerFactory","printerTagService","printerService","printerCache","floorStore","floorService","userService","roleService","settingsStore","name","importYaml","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportSettings","exportUsers","config","normalizeYamlData","importData","validateInput","importPrintersFloorsYamlSchema","hasSystemData","validateSystemTablesEmpty","settings","log","importSettings","users","length","importUsers","floors","floor","importPrinterPositionsSchema","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printers","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameTags","insertTags","analyseUpsertTags","tags","printerIdMap","newPrinter","state","create","id","Error","JSON","stringify","error","updatePrinterSpec","updateId","printerId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","tag","createdTag","createTag","color","printer","addPrinterToTag","updateTagSpec","existingTag","getPrintersByTag","tagId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","includes","removePrinterFromTag","nonExistingNewId","server","updateServerSettings","timeout","updateTimeoutSettings","frontend","updateFrontendSettings","wizard","wizardCompleted","importedWizardVersion","wizardVersion","setWizardCompleted","credential","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","slicerApiKey","updateCoreCredentialSettings","getCredentialSettings","setSlicerApiKey","loadSettings","allRoles","roles","user","Number","parseInt","roleNames","roleName","some","r","register","username","password","isRootUser","isDemoUser","isVerified","needsPasswordChange","updatePasswordHashUnsafeByUsername","passwordHash","errors","getWizardSettings","existingSettings","getSettings","Object","keys","existingUsers","listUsers","join","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","order","comparedProperty","upsertTags","existingTags","listTags","exportYaml","options","input","exportPrintersFloorsYamlSchema","exportFloors","exportTags","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","user_roles","apiKey","getLoginDto","disabledReason","enabled","printerType","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","t","getSettingsSensitive","u","userDto","toDto","createdAt","dump","printerName","settingsAppearance","OctoprintType","MoonrakerType","PrusaLinkType","BambuType","groups","exportGroups"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","logger","loggerFactory","printerTagService","printerService","printerCache","floorStore","floorService","userService","roleService","settingsStore","name","importYaml","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportSettings","exportUsers","config","normalizeYamlData","importData","validateInput","importPrintersFloorsYamlSchema","hasSystemData","validateSystemTablesEmpty","settings","log","importSettings","users","length","importUsers","floors","floor","importPrinterPositionsSchema","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printers","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameTags","insertTags","analyseUpsertTags","tags","printerIdMap","newPrinter","state","create","id","Error","JSON","stringify","error","updatePrinterSpec","updateId","printerId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","tag","createdTag","createTag","color","printer","addPrinterToTag","updateTagSpec","existingTag","getPrintersByTag","tagId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","includes","removePrinterFromTag","nonExistingNewId","server","updateServerSettings","timeout","updateTimeoutSettings","frontend","updateFrontendSettings","wizard","wizardCompleted","importedWizardVersion","wizardVersion","setWizardCompleted","credential","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","slicerApiKey","updateCoreCredentialSettings","getCredentialSettings","setSlicerApiKey","loadSettings","allRoles","roles","user","Number","parseInt","roleNames","roleName","some","r","register","username","password","isRootUser","isDemoUser","isVerified","needsPasswordChange","updatePasswordHashUnsafeByUsername","passwordHash","errors","getWizardSettings","existingSettings","getSettings","Object","keys","existingUsers","listUsers","join","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","order","comparedProperty","upsertTags","existingTags","listTags","indexOf","exportYaml","options","input","exportPrintersFloorsYamlSchema","exportFloors","exportTags","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","user_roles","apiKey","getLoginDto","disabledReason","enabled","printerType","dateAdded","assignee","flowRate","feedRate","listCache","f","dumpedFloor","fPrinterId","x","y","t","getSettingsSensitive","u","userDto","toDto","createdAt","dump","printerName","settingsAppearance","OctoprintType","MoonrakerType","PrusaLinkType","BambuType","groups","exportGroups"],"mappings":"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"}

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

@@ -70,8 +70,8 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
             apiKey,
             enabled,
             printerType,
-            password,
-            username
+            password: password ?? undefined,
+            username: username ?? undefined
         });
         this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
             printer
@@ -80,12 +80,14 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
     }
     async batchImport(printers) {
         if (!printers?.length) return [];
-        this.logger.log("Validation passed");
+        const validatedPrinters = [];
         for (let printer of printers){
-            await this.validateAndDefault(printer);
+            const validated = await this.validateAndDefault(printer);
+            validatedPrinters.push(validated);
         }
+        this.logger.log("Validation passed");
         const newPrinters = [];
-        for (let printer of printers){
+        for (let printer of validatedPrinters){
             const createdPrinter = await this.create(printer, false);
             newPrinters.push(createdPrinter);
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updatePrinterDisabledReasonSchema","updateEnabled","updatePrinterEnabledSchema","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","undefined","printerUpdated","batchImport","printers","length","validatedPrinters","validated","push","log","newPrinters","createdPrinter","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updatePrinterDisabledReasonSchema","updateEnabled","updatePrinterEnabledSchema","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}

package/dist/services/validators/printer-service.validation.js

@@ -55,8 +55,8 @@ const _zod = require("zod");
 const octoPrintApiKeySchema = _zod.z.string().min(_serviceconstants.apiKeyLengthMinDefault).max(_serviceconstants.apiKeyLengthMaxDefault).regex(/^[a-zA-Z0-9_-]+$/, "Alpha-numeric, dash, and underscore only");
 const printerApiKeyValidator = _zod.z.string().optional();
 const printerNameValidator = _zod.z.string();
-const printerUsernameValidator = _zod.z.string();
-const printerPasswordValidator = _zod.z.string();
+const printerUsernameValidator = _zod.z.string().nullable();
+const printerPasswordValidator = _zod.z.string().nullable();
 const printerEnabledValidator = _zod.z.boolean();
 const printerDisabledReasonValidator = _zod.z.string().nullable();
 const printerUrlValidator = _zod.z.string().url();

package/dist/services/validators/printer-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","nullable","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","BambuType","superRefine","disabledReason"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","nullable","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","BambuType","superRefine","disabledReason"],"mappings":"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"}

package/dist/services/validators/yaml-service.validation.js

@@ -63,7 +63,7 @@ const importPrinterPositionsSchema = _zod.z.object({
 });
 const importPrintersFloorsYamlSchema = _zod.z.object({
     version: _zod.z.string().optional(),
-    exportedAt: _zod.z.date().optional(),
+    exportedAt: _zod.z.any().optional(),
     databaseType: _zod.z.enum([
         "mongo",
         "sqlite"
@@ -95,11 +95,15 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
         username: _printerservicevalidation.printerUsernameValidator.optional(),
         password: _printerservicevalidation.printerPasswordValidator.optional(),
         enabled: _printerservicevalidation.printerEnabledValidator,
+        disabledReason: _printerservicevalidation.printerDisabledReasonValidator.optional(),
         name: _printerservicevalidation.printerNameValidator,
         printerName: _zod.z.string().optional(),
         settingsAppearance: _zod.z.object({
             name: _zod.z.string().optional()
-        }).optional()
+        }).optional(),
+        feedRate: _zod.z.string().nullable().optional(),
+        flowRate: _zod.z.string().nullable().optional(),
+        assignee: _zod.z.string().nullable().optional()
     })).min(0).default([]),
     floors: _zod.z.array(_zod.z.object({
         id: numberOrStringIdValidator,

package/dist/services/validators/yaml-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","date","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","username","printerUsernameValidator","password","printerPasswordValidator","enabled","printerEnabledValidator","name","printerNameValidator","printerName","settingsAppearance","floors","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","any","users","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","any","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","username","printerUsernameValidator","password","printerPasswordValidator","enabled","printerEnabledValidator","disabledReason","printerDisabledReasonValidator","name","printerNameValidator","printerName","settingsAppearance","feedRate","nullable","flowRate","assignee","floors","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","users","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","date","roles"],"mappings":";;;;;;;;;;;QAiBaA;eAAAA;;QA6BAC;eAAAA;;QAIAC;eAAAA;;QAjBAC;eAAAA;;QAEAC;eAAAA;;;qBAnCK;0CASX;wCAMA;AAEA,MAAMJ,iCAAiCK,MAAC,CAACC,MAAM,CAAC;IACrDC,gBAAgBF,MAAC,CAACG,OAAO;IACzBC,iBAAiBJ,MAAC,CAACG,OAAO;IAC1BE,cAAcL,MAAC,CAACG,OAAO;IACvBG,YAAYN,MAAC,CAACG,OAAO;IAErBI,cAAcP,MAAC,CAACG,OAAO,GAAGK,QAAQ;IAClCC,gBAAgBT,MAAC,CAACG,OAAO,GAAGO,OAAO,CAAC;IACpCC,aAAaX,MAAC,CAACG,OAAO,GAAGO,OAAO,CAAC;IACjCE,uCAAuCZ,MAAC,CACrCa,KAAK,CAACb,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;YAAC;YAAQ;YAAO;SAAK,CAACC,QAAQ,CAACD,OAChEE,GAAG,CAAC;IACPC,qCAAqCnB,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;YAAC;YAAQ;YAAS;SAAK,CAACC,QAAQ,CAACD;IACjGI,OAAOpB,MAAC,CAACc,MAAM,GAAGN,QAAQ;AAC5B;AAEO,MAAMV,4BAA4BE,MAAC,CAACqB,KAAK,CAAC;IAACrB,MAAC,CAACsB,MAAM;IAAItB,MAAC,CAACc,MAAM;CAAG;AAElE,MAAMf,yBAAyBC,MAAC,CACpCa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;IACPsB,WAAWzB;IACX0B,SAAS1B,0BAA0BU,QAAQ;IAC3CiB,GAAGC,kCAAU;IACbC,GAAGC,kCAAU;AACf,IAEDV,GAAG,CAAC;AAEA,MAAMtB,+BAA+BI,MAAC,CAACC,MAAM,CAAC;IACnD4B,UAAU9B,uBAAuBS,QAAQ;AAC3C;AAEO,MAAMX,iCAAiCG,MAAC,CAACC,MAAM,CAAC;IACrD6B,SAAS9B,MAAC,CAACc,MAAM,GAAGN,QAAQ;IAC5BuB,YAAY/B,MAAC,CAACgC,GAAG,GAAGxB,QAAQ;IAC5ByB,cAAcjC,MAAC,CAACkC,IAAI,CAAC;QAAC;QAAS;KAAS,EAAExB,OAAO,CAAC;IAClDyB,QAAQnC,MAAC,CAACC,MAAM,CAAC;QACfC,gBAAgBF,MAAC,CAACG,OAAO;QACzBC,iBAAiBJ,MAAC,CAACG,OAAO;QAC1BE,cAAcL,MAAC,CAACG,OAAO;QACvBG,YAAYN,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAEhCD,cAAcP,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAClCC,gBAAgBT,MAAC,CAACG,OAAO,GAAGK,QAAQ,GAAGE,OAAO,CAAC;QAC/CC,aAAaX,MAAC,CAACG,OAAO,GAAGK,QAAQ,GAAGE,OAAO,CAAC;QAC5CE,uCAAuCZ,MAAC,CACrCa,KAAK,CAACb,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;gBAAC;gBAAQ;gBAAO;aAAK,CAACC,QAAQ,CAACD,OAChEE,GAAG,CAAC;QACPC,qCAAqCnB,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;gBAAC;gBAAQ;gBAAS;aAAK,CAACC,QAAQ,CAACD;IACnG;IACAa,UAAU7B,MAAC,CACRa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJuC,YAAYC,6CAAmB;QAC/BC,aAAaC,8CAAoB;QACjCC,QAAQC,gDAAsB;QAC9BC,UAAUC,kDAAwB,CAACpC,QAAQ;QAC3CqC,UAAUC,kDAAwB,CAACtC,QAAQ;QAC3CuC,SAASC,iDAAuB;QAChCC,gBAAgBC,wDAA8B,CAAC1C,QAAQ;QACvD2C,MAAMC,8CAAoB;QAE1BC,aAAarD,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAChC8C,oBAAoBtD,MAAC,CAClBC,MAAM,CAAC;YACNkD,MAAMnD,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAC3B,GACCA,QAAQ;QACX+C,UAAUvD,MAAC,CAACc,MAAM,GAAG0C,QAAQ,GAAGhD,QAAQ;QACxCiD,UAAUzD,MAAC,CAACc,MAAM,GAAG0C,QAAQ,GAAGhD,QAAQ;QACxCkD,UAAU1D,MAAC,CAACc,MAAM,GAAG0C,QAAQ,GAAGhD,QAAQ;IAC1C,IAEDU,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbiD,QAAQ3D,MAAC,CACNa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJ8D,OAAOC,2CAAmB;QAE1BC,OAAOD,2CAAmB,CAACrD,QAAQ;QACnC2C,MAAMY,0CAAkB;QACxBlC,UAAU9B;IACZ,IAEDmB,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbsD,MAAMhE,MAAC,CACJa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJqD,MAAMnD,MAAC,CAACc,MAAM;QACdmD,OAAOjE,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAC1BqB,UAAU7B,MAAC,CAACa,KAAK,CACfb,MAAC,CAACC,MAAM,CAAC;YACPsB,WAAWzB;QACb;IAEJ,IAEDoB,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbwD,UAAUlE,MAAC,CAACgC,GAAG,GAAGxB,QAAQ;IAC1B2D,OAAOnE,MAAC,CACLa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJ6C,UAAU3C,MAAC,CAACc,MAAM;QAClBsD,YAAYpE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChC6D,YAAYrE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChC8D,YAAYtE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChC+D,qBAAqBvE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QACzCgE,cAAcxE,MAAC,CAACc,MAAM;QACtB2D,WAAWzE,MAAC,CAAC0E,IAAI,GAAGlE,QAAQ;QAC5BmE,OAAO3E,MAAC,CAACa,KAAK,CAACb,MAAC,CAACgC,GAAG,IAAIxB,QAAQ;IAClC,IAEDA,QAAQ,GACRE,OAAO,CAAC,EAAE;AACf"}

package/dist/state/test-printer-socket.store.js

@@ -47,8 +47,8 @@ class TestPrinterSocketStore {
             printerId: testPrinterId,
             loginDto: {
                 apiKey: printer.apiKey,
-                username: printer.username,
-                password: printer.password,
+                username: printer.username ?? undefined,
+                password: printer.password ?? undefined,
                 printerURL: printer.printerURL,
                 printerType: printer.printerType
             }