@fdm-monster/server 1.8.0 → 1.8.1

package/README.md

@@ -4,79 +4,78 @@
     </a>
 </p>
 <h1 align="center" style="padding-top: 0; margin-top: 10px">FDM Monster</h1>
-
 <p align="center">
-<a href="https://discord.gg/mwA8uP8CMc">
-    <img src="https://img.shields.io/discord/864835453773807686?label=Discord"/>
-</a>
-<a href="https://github.com/fdm-monster/fdm-monster/releases/latest">
-    <img src="https://img.shields.io/github/release/fdm-monster/fdm-monster"/>
-</a>
-<a href="https://github.com/fdm-monster/fdm-monster/stargazers">
-    <img src="https://img.shields.io/github/stars/fdm-monster/fdmonster"/>
-</a>
-
-<a href="https://github.com/fdm-monster/fdm-monster/issues">
-    <img src="https://img.shields.io/github/issues/fdm-monster/fdm-monster"/>
-</a> 
-<a href="https://app.codecov.io/gh/fdm-monster/fdm-monster">
-    <img src="https://codecov.io/gh/fdm-monster/fdm-monster/branch/develop/graph/badge.svg?flag=server-nodejs&precision=0"/>
-</a>
-<br/>
-<a href="https://unraid.net/community/apps?q=fdm+monster">
-    <img src="https://img.shields.io/badge/Unraid%20Community%20Application-fc832e"/>
-</a>
-
+    <a href="https://discord.gg/mwA8uP8CMc"><img src="https://img.shields.io/discord/864835453773807686?label=Discord"/></a>
+    <a href="https://github.com/fdm-monster/fdm-monster/releases/latest">
+        <img src="https://img.shields.io/github/release/fdm-monster/fdm-monster"/></a>
+    <a href="https://github.com/fdm-monster/fdm-monster/stargazers">
+        <img src="https://img.shields.io/github/stars/fdm-monster/fdmonster"/></a>
+    <a href="https://github.com/fdm-monster/fdm-monster/issues">
+        <img src="https://img.shields.io/github/issues/fdm-monster/fdm-monster"/></a>
+    <a href="https://app.codecov.io/gh/fdm-monster/fdm-monster">
+        <img src="https://codecov.io/gh/fdm-monster/fdm-monster/branch/develop/graph/badge.svg?flag=server-nodejs&precision=0"/></a>
+    <br/>
+    <a href="https://unraid.net/community/apps?q=fdm+monster">
+        <img src="https://img.shields.io/badge/Unraid%20Community%20Application-fc832e"/>
+    </a>
 </p>
 
-## Support the project
-
-Github ![GitHub Sponsor](https://img.shields.io/github/sponsors/fdm-monster?label=Sponsor&logo=GitHub)
+FDM Monster is a server for managing your 3D printer farm through [OctoPrint](https://octoprint.org/) as well as [Klipper](https://www.klipper3d.org/) using [Moonraker](https://github.com/Arksine/moonraker).
 
-Ko-Fi [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V6XFWY0)
+## Check out our [documentation](https://docs.fdm-monster.net)
 
-<h2 align="center">
-<a href="https://docs.fdm-monster.net/" target="_blank">Documentation</a>
-</h2>
+![fdm-monster-main-grid](https://github.com/user-attachments/assets/4137d8d6-0365-44db-b9a9-53e3820a4cb3)
 
-## What is FDM Monster?
+## Features 🖨️
+Here is a list of features that make FDM Monster stand out:
 
-FDM Monster is a server for managing your 3D printer farm through [OctoPrint](https://octoprint.org/).
-Our efforts are focused on providing a professional print-farming workflow that is suitable for hobby and commercial farms alike.
-
-This server has been battle-tested in the field for 100+ printers, so give it a star ⭐and enhance your 3D Printing Farm's workflow!
-
-## Features
-- Adding OctoPrint instances
-- Dragging printers on grid
-- Dropping GCode to print
-- Batch select and print GCode
-- Marking printers as maintenance mode
-- Import printers from OctoFarm
+- Adding OctoPrint and Moonraker instances
+- Dragging or creating new printers on a customizable grid
+- Drag n drop GCode to print
+- Select printers and print one GCode file in batch 
+- Marking printers as 'under maintenance'
+- Import printers from software like OctoFarm
+- YAML backup and import
 - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
+- Thumbnail support
+- SQLite as well as MongoDB support
 
-![docs/images/server-running.png](https://raw.githubusercontent.com/fdm-monster/fdm-monster-docs/main/docs/images/server-running.png)
-_The FDM Monster grid after placing one OctoPrint instance._
-
-## Getting started
+## Getting started 🔌
 
-Check out the [Documentation](https://docs.fdm-monster.net). Are you interested in running the Raspberry Pi image?
+Check out the [documentation](https://docs.fdm-monster.net) to install or deploy FDM Monster for your farm. Are you interested in running the Raspberry Pi image?
 Please jump ahead [MonsterPi Section](https://docs.fdm-monster.net/guides/monsterpi).
 
-### Reach out for questions
+## Reach out for questions or ideas ❔
 
 Please join the discord, but stay professional and proactive!
 
 - Discord server: https://discord.gg/mwA8uP8CMc
 - Website: [https://fdm-monster.net](https://fdm-monster.net)
-- Mail: davidzwa@gmail.com
+ 
+## Support the project 💸
+
+Is the project helping you? Please consider these options. FDM Monster would not exist without all your support! 
+
+![GitHub Sponsor](https://img.shields.io/github/sponsors/fdm-monster?label=Sponsor&logo=GitHub)
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V6XFWY0)
+
+## Sponsors 🤩
+
+Please consider sponsoring FDM Monster to help this project! You can find the [GitHub Sponsorship Tiers here](https://github.com/sponsors/fdm-monster).
+
+Thanks to the following parties for their financial support:
+
+| Tier 1 | Tier 2 | Tier 3 | Tier 4 | One time |
+|--------|--------|--------|--------|-----------|
+|  | [WindArrow3d](https://github.com/WindArrow3d), [thatguymendel](https://github.com/thatguymendel) | | [doucettom](https://github.com/doucettom) | [th3dstudio](https://github.com/th3dstudio) |
+
 
 ## Contributors ✨
 
 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-19-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -108,6 +107,8 @@ These are the people involved in the project. Find the meaning of the emoji keys
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LyfeOnEdge"><img src="https://avatars.githubusercontent.com/u/26140376?v=4?s=80" width="80px;" alt="Andrew (LyfeOnEdge) (ArcticGentoo)"/><br /><sub><b>Andrew (LyfeOnEdge) (ArcticGentoo)</b></sub></a><br /><a href="#ideas-LyfeOnEdge" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/callanova"><img src="https://avatars.githubusercontent.com/u/175639705?v=4?s=80" width="80px;" alt="callanova"/><br /><sub><b>callanova</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Acallanova" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/thatguymendel"><img src="https://avatars.githubusercontent.com/u/67444998?v=4?s=80" width="80px;" alt="thatguymendel"/><br /><sub><b>thatguymendel</b></sub></a><br /><a href="#ideas-thatguymendel" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/julien-printerbox"><img src="https://avatars.githubusercontent.com/u/134132189?v=4?s=80" width="80px;" alt="julien-printerbox"/><br /><sub><b>julien-printerbox</b></sub></a><br /><a href="#ideas-julien-printerbox" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tbwan"><img src="https://avatars.githubusercontent.com/u/44231748?v=4?s=80" width="80px;" 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>
     </tr>
   </tbody>
 </table>
@@ -127,16 +128,6 @@ These are the people involved in the project. Find the meaning of the emoji keys
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-## Sponsors
-
-Please consider sponsoring FDM Monster to help this project! You can find the [GitHub Sponsorship Tiers here](https://github.com/sponsors/fdm-monster).
-
-Thanks to the following parties for their financial support:
-
-| Tier 4 | Tier 3 | Tier 2 | Tier 1 | One Time |
-|--------|--------|--------|--------|-----------|
-|  | [WindArrow3d](https://github.com/WindArrow3d) | | [doucettom](https://github.com/doucettom) | [th3dstudio](https://github.com/th3dstudio) |
-
 
 ## Contribute
 
@@ -158,11 +149,14 @@ the [CONTRIBUTING](CONTRIBUTING.md) file.
 - [x] :rocket: Documentation (https://docs.fdm-monster.net)
 - [x] 🛡️ Login and user management
 - [x] OctoFarm export 
-- [ ] Klipper and Moonraker API integration
-- [ ] OctoKlipper integration
+- [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
 - [ ] Spoolman integration
 
-
 ## License
 
 FDM Monster is licensed with [AGPL-3.0](LICENSE). For details, please consult the [LICENSE](LICENSE) file.

package/RELEASE_NOTES.MD

@@ -1,5 +1,16 @@
 # Develop
 
+# FDM Monster 13/12/2024 1.8.1
+
+## Changes
+
+- Update to client 1.8.4
+
+## Fixes 
+
+- YAML import: regression caused all imports to fail validation
+- YAML import: a bug caused all import with printers without api key to fail validation
+
 # FDM Monster 02/12/2024 1.8.0
 
 ## Chores

package/dist/controllers/server-private.controller.js

@@ -104,7 +104,9 @@ class ServerPrivateController {
         res.send(result);
     }
     async importPrintersAndFloorsYaml(req, res) {
-        const files = await this.multerService.multerLoadFileAsync(req, res, ".yaml", false);
+        const files = await this.multerService.multerLoadFileAsync(req, res, [
+            ".yaml"
+        ], false);
         const firstFile = files[0];
         const spec = await this.yamlService.importPrintersAndFloors(firstFile.buffer.toString());
         res.send({

package/dist/controllers/server-private.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","serverUpdateService","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","downloadRelease","allowDowngrade","updateDto","validateMiddleware","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","tag_name","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","getReleaseStateInfo","syncLatestRelease","updateState","getState","pullGitUpdates","result","checkGitUpdates","restartServer","isTestEnvironment","warn","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","serverUpdateService","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","downloadRelease","allowDowngrade","updateDto","validateMiddleware","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","tag_name","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","getReleaseStateInfo","syncLatestRelease","updateState","getState","pullGitUpdates","result","checkGitUpdates","restartServer","isTestEnvironment","warn","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}

package/dist/server.constants.js

@@ -71,7 +71,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.8.0",
+    defaultClientMinimum: "1.8.4",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

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

@@ -50,7 +50,7 @@ class YamlService {
             if (![
                 _printerapiinterface.OctoprintType,
                 _printerapiinterface.MoonrakerType
-            ].includes[printer.printerType]) {
+            ].includes(printer.printerType)) {
                 printer.printerType = _printerapiinterface.OctoprintType;
             }
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","printerGroupService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportFloors","exportGroups","config","printer","printers","printerName","settingsAppearance","id","parseInt","OctoprintType","MoonrakerType","includes","printerType","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","length","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","printerGroupService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportFloors","exportGroups","config","printer","printers","printerName","settingsAppearance","id","parseInt","OctoprintType","MoonrakerType","includes","printerType","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","length","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"mappings":"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"}

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

@@ -44,7 +44,7 @@ const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFl
         "config.floorComparisonStrategiesByPriority": "required|string|in:name,floor,id",
         printers: `${!!importPrinters ? "array|minLength:0" : "not"}`,
         "printers.*.id": "required",
-        "printers.*.apiKey": `required|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
+        "printers.*.apiKey": `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
         "printers.*.printerURL": "required|httpurl",
         "printers.*.enabled": "boolean",
         "printers.*.printerType": `integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","OctoprintType","MoonrakerType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBkD;qCAClB;AAEtC,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAEO,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;QACpG,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;QACxE,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBU,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACsB,gBAA4B,CAAA;QACtEP,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","OctoprintType","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","MoonrakerType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBkD;qCAClB;AAEtC,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,uBAAuB,EAAEO,kCAAa,CAAC,QAAQ,EAAEC,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;QACnI,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEF,kCAAa,CAAC,CAAC,EAAEG,kCAAa,EAAE;QACxE,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBU,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACsB,gBAA4B,CAAA;QACtEP,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -53,25 +53,25 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.8.0",
-    "@fdm-monster/client-next": "0.0.11",
+    "@fdm-monster/client": "1.8.4",
+    "@fdm-monster/client-next": "0.0.14",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "8.42.0",
+    "@sentry/node": "8.45.0",
     "adm-zip": "0.5.16",
-    "awilix": "12.0.3",
+    "awilix": "12.0.4",
     "awilix-express": "9.0.1",
-    "axios": "1.7.8",
+    "axios": "1.7.9",
     "bcryptjs": "2.4.3",
-    "better-sqlite3": "11.6.0",
-    "cache-manager": "6.2.0",
+    "better-sqlite3": "11.7.0",
+    "cache-manager": "6.3.1",
     "class-validator": "0.14.1",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.7",
     "cors": "2.8.5",
     "cross-env": "7.0.3",
-    "dotenv": "16.4.5",
+    "dotenv": "16.4.7",
     "eventemitter2": "6.4.9",
-    "express": "4.21.1",
+    "express": "4.21.2",
     "form-data": "4.0.1",
     "helmet": "8.0.0",
     "js-yaml": "4.1.0",
@@ -82,7 +82,7 @@
     "mongoose": "6.13.5",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
-    "nodemon": "3.1.7",
+    "nodemon": "3.1.9",
     "octokit": "3.2.1",
     "passport": "0.7.0",
     "passport-anonymous": "1.0.1",
@@ -101,7 +101,7 @@
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
     "@swc/cli": "0.5.2",
-    "@swc/core": "1.9.3",
+    "@swc/core": "1.10.1",
     "@swc/jest": "0.2.37",
     "@types/adm-zip": "0.5.7",
     "@types/bcryptjs": "2.4.6",
@@ -116,7 +116,7 @@
     "@types/luxon": "3.4.2",
     "@types/migrate-mongo": "10.0.5",
     "@types/multer": "1.4.12",
-    "@types/node": "22.10.1",
+    "@types/node": "22.10.2",
     "@types/passport-anonymous": "1.0.5",
     "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.5.8",
@@ -130,7 +130,7 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-n": "17.14.0",
+    "eslint-plugin-n": "17.15.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-promise": "7.2.1",
     "express-list-routes": "1.2.4",