@fdm-monster/server 1.8.1 → 1.8.2

package/.yarnrc.yml

@@ -1,4 +1,4 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs
 httpTimeout: 1000000

package/README.md

@@ -5,7 +5,7 @@
 </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://discord.gg/mwA8uP8CMc"><img src="https://img.shields.io/discord/864835453773807686?label=Discord&logo=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">
@@ -36,11 +36,18 @@ Here is a list of features that make FDM Monster stand out:
 - 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
 
-## Getting started 🔌
+## Installation methods ⚙️
+
+- [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)
+
+Would you like to add a method of running FDM Monster? Please reach out or create an issue/pull-request!
+
+## Getting started 😎
 
 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).
@@ -75,7 +82,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-20-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -110,6 +117,9 @@ 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/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>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nuvious"><img src="https://avatars.githubusercontent.com/u/5287736?v=4?s=80" width="80px;" 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>
+    </tr>
   </tbody>
 </table>
 

package/RELEASE_NOTES.MD

@@ -1,5 +1,23 @@
 # Develop
 
+# FDM Monster 03/01/2025 1.8.2
+
+## Changes 
+
+Update client to 1.8.8
+
+## Chore
+
+- Change developer setup to be node based only (remove concurrently and nodemon packages)
+- Replace server restart with NotImplementedException
+- Remove simple-git package
+- Remove git-pull-based server update mechanic
+- Remove unnecessary environment utilities
+
+## Fixes
+
+- OctoPrint client: filter folders on calling getLocalFiles for OctoPrint
+
 # FDM Monster 13/12/2024 1.8.1
 
 ## Changes

package/dist/container.js

@@ -17,7 +17,6 @@ _export(exports, {
     }
 });
 const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
-const _simplegit = /*#__PURE__*/ _interop_require_default(require("simple-git"));
 const _octokit = require("octokit");
 const _awilix = require("awilix");
 const _toadscheduler = require("toad-scheduler");
@@ -28,7 +27,6 @@ const _settingsstore = require("./state/settings.store");
 const _settingsservice = require("./services/mongoose/settings.service");
 const _serverreleaseservice = require("./services/core/server-release.service");
 const _taskmanagerservice = require("./services/core/task-manager.service");
-const _serverupdateservice = require("./services/core/server-update.service");
 const _githubservice = require("./services/core/github.service");
 const _filecache = require("./state/file.cache");
 const _printerwebsockettask = require("./tasks/printer-websocket.task");
@@ -146,7 +144,6 @@ function configureContainer(isSqlite = false) {
         [di.cacheManager]: (0, _awilix.asFunction)(_cachemanager.configureCacheManager).singleton(),
         [di.serverReleaseService]: (0, _awilix.asClass)(_serverreleaseservice.ServerReleaseService).singleton(),
         [di.monsterPiService]: (0, _awilix.asClass)(_monsterpiservice.MonsterPiService).singleton(),
-        [di.serverUpdateService]: (0, _awilix.asClass)(_serverupdateservice.ServerUpdateService).singleton(),
         [di.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
         [di.octokitService]: (0, _awilix.asFunction)((cradle)=>{
             const config = cradle.configService;
@@ -167,7 +164,6 @@ function configureContainer(isSqlite = false) {
         }),
         [di.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
         [di.logDumpService]: (0, _awilix.asClass)(_logsmanagerservice.LogDumpService),
-        [di.simpleGitService]: (0, _awilix.asValue)((0, _simplegit.default)()),
         [di.httpClient]: (0, _awilix.asValue)(_axios.default.create({
             maxBodyLength: 1000 * 1000 * 1000,
             maxContentLength: 1000 * 1000 * 1000

package/dist/container.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
+{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}

package/dist/container.tokens.js

@@ -18,7 +18,6 @@ const DITokens = {
     loggerFactory: "loggerFactory",
     httpClient: "httpClient",
     socketIoGateway: "socketIoGateway",
-    simpleGitService: "simpleGitService",
     multerService: "multerService",
     configService: "configService",
     taskManagerService: "taskManagerService",
@@ -34,7 +33,6 @@ const DITokens = {
     settingsService: "settingsService",
     serverReleaseService: "serverReleaseService",
     monsterPiService: "monsterPiService",
-    serverUpdateService: "serverUpdateService",
     githubService: "githubService",
     octokitService: "octokitService",
     clientBundleService: "clientBundleService",

package/dist/container.tokens.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
+{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}

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

@@ -22,7 +22,6 @@ const _authenticate = require("../middleware/authenticate");
 const _logger = require("../handlers/logger");
 const _serverconstants = require("../server.constants");
 const _authorizationconstants = require("../constants/authorization.constants");
-const _envutils = require("../utils/env.utils");
 const _validators = require("../handlers/validators");
 const _demomiddleware = require("../middleware/demo.middleware");
 class ServerPrivateController {
@@ -35,11 +34,9 @@ class ServerPrivateController {
     multerService;
     logDumpService;
     logger = new _logger.LoggerService(ServerPrivateController.name);
-    serverUpdateService;
     serverReleaseService;
-    constructor({ serverUpdateService, serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
+    constructor({ serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
         this.serverReleaseService = serverReleaseService;
-        this.serverUpdateService = serverUpdateService;
         this.clientBundleService = clientBundleService;
         this.githubService = githubService;
         this.logDumpService = logDumpService;
@@ -92,17 +89,6 @@ class ServerPrivateController {
         const updateState = this.serverReleaseService.getState();
         res.send(updateState);
     }
-    async pullGitUpdates(req, res) {
-        const result = await this.serverUpdateService.checkGitUpdates();
-        res.send(result);
-    }
-    async restartServer(req, res) {
-        if (!(0, _envutils.isTestEnvironment)()) {
-            this.logger.warn("Server restart command fired. Expect the server to be unavailable for a moment");
-        }
-        const result = await this.serverUpdateService.restartServer();
-        res.send(result);
-    }
     async importPrintersAndFloorsYaml(req, res) {
         const files = await this.multerService.multerLoadFileAsync(req, res, [
             ".yaml"
@@ -145,6 +131,6 @@ const _default = (0, _awilixexpress.createController)(ServerPrivateController).p
         _authorizationconstants.ROLES.ADMIN
     ]),
     _demomiddleware.demoUserNotAllowed
-]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").post("/git-update", "pullGitUpdates").post("/restart", "restartServer").get("/dump-fdm-monster-logs", "dumpLogZips").post("/dump-fdm-monster-logs", "dumpLogZips").delete("/clear-outdated-fdm-monster-logs", "clearLogs").delete("/delete-all-printers", "deleteAllPrinters");
+]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").get("/dump-fdm-monster-logs", "dumpLogZips").post("/dump-fdm-monster-logs", "dumpLogZips").delete("/clear-outdated-fdm-monster-logs", "clearLogs").delete("/delete-all-printers", "deleteAllPrinters");
 
 //# sourceMappingURL=server-private.controller.js.map

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","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","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/controllers/server-public.controller.js

@@ -130,9 +130,7 @@ class ServerPublicController {
         res.json({
             version: this.serverVersion,
             isDockerContainer: (0, _isdocker.isDocker)(),
-            isNodemon: (0, _envutils.isNodemon)(),
             isNode: (0, _envutils.isNode)(),
-            isPm2: (0, _envutils.isPm2)(),
             os: process.env.OS,
             monsterPi: monsterPiVersion,
             update: {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}

package/dist/server.constants.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "AppConstants", {
     }
 });
 const AppConstants = {
-    NON_NPM_MODE_KEY: "NON_NPM_MODE",
     NODE_ENV_KEY: "NODE_ENV",
     VERSION_KEY: "npm_package_version",
     SERVER_PORT_KEY: "SERVER_PORT",
@@ -71,7 +70,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.8.4",
+    defaultClientMinimum: "1.8.8",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}

package/dist/server.env.js

@@ -36,7 +36,6 @@ _export(exports, {
 });
 const _migratemongo = require("migrate-mongo");
 const _path = require("path");
-const _child_process = require("child_process");
 const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
 const _dotenv = require("dotenv");
 const _serverconstants = require("./server.constants");
@@ -105,32 +104,12 @@ function ensureNodeEnvSet() {
         logger.log(`✓ NODE_ENV variable correctly set (${environment})!`);
     }
 }
-function ensureEnvNpmVersionSet() {
+function ensurePackageVersionSet() {
     const packageJsonVersion = require(packageJsonPath).version;
     if (!process.env[_serverconstants.AppConstants.VERSION_KEY]) {
         process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
-        process.env[_serverconstants.AppConstants.NON_NPM_MODE_KEY] = "true";
-        logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]} in non-NPM mode!`);
-    } else {
-        logger.debug(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]} in NPM mode!`);
-    }
-    if (process.env[_serverconstants.AppConstants.VERSION_KEY] !== packageJsonVersion) {
-        process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
-        logger.debug(`~ Had to synchronize FDM version to '${packageJsonVersion}' as it was outdated.`);
-    }
-}
-function removePm2Service(reason) {
-    logger.error(`Removing PM2 service as Server failed to start: ${reason}`);
-    (0, _child_process.execSync)(`pm2 delete ${_serverconstants.AppConstants.pm2ServiceName}`);
-}
-function setupPackageJsonVersionOrThrow() {
-    const result = (0, _envutils.verifyPackageJsonRequirements)((0, _fsutils.superRootPath)());
-    if (!result) {
-        if ((0, _envutils.isPm2)()) {
-            removePm2Service("didnt pass startup validation (package.json)");
-        }
-        throw new Error("Aborting server.");
     }
+    logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
 }
 function printInstructionsURL() {
     logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
@@ -190,8 +169,7 @@ function setupEnvConfig(skipDotEnv = false) {
         logger.log("✓ Parsed environment and (optional) .env file");
     }
     ensureNodeEnvSet();
-    setupPackageJsonVersionOrThrow();
-    ensureEnvNpmVersionSet();
+    ensurePackageVersionSet();
     setupSentry();
     ensureMongoDBConnectionStringSet();
     ensurePortSet();

package/dist/server.env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensureEnvNpmVersionSet","packageJsonVersion","require","version","VERSION_KEY","NON_NPM_MODE_KEY","debug","removePm2Service","reason","error","execSync","pm2ServiceName","setupPackageJsonVersionOrThrow","result","verifyPackageJsonRequirements","isPm2","Error","printInstructionsURL","MONGO_KEY","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
+{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}

package/dist/services/moonraker/moonraker-websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","wsUrl","httpToWsUrl","printerURL","pathname","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","wsUrl","httpToWsUrl","printerURL","pathname","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}

package/dist/services/octoprint/octoprint.client.js

@@ -189,7 +189,7 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
     async getLocalFiles(login, recursive = false) {
         const { url, options } = this.prepareRequest(login, this.apiGetFiles(recursive));
         const response = await this.httpClient.get(url, options);
-        return response?.data?.files?.filter((f)=>f.date).map((f)=>{
+        return response?.data?.files?.filter((f)=>f.date && f.type === "machinecode").map((f)=>{
             return (0, _fileutils.normalizePrinterFile)(f);
         }) || [];
     }