@fdm-monster/server 1.7.0 → 1.7.1

package/README.md

@@ -86,7 +86,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
   <tbody>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/davidzwa"><img src="https://avatars.githubusercontent.com/u/6005355?v=4?s=80" width="80px;" alt="David Zwart"/><br /><sub><b>David Zwart</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Adavidzwa" title="Bug reports">🐛</a> <a href="https://github.com/fdm-monster/fdm-monster/commits?author=davidzwa" title="Code">💻</a> <a href="#maintenance-davidzwa" title="Maintenance">🚧</a> <a href="#userTesting-davidzwa" title="User Testing">📓</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://kevenaar.name"><img src="https://avatars.githubusercontent.com/u/834643?v=4?s=80" width="80px;" alt="Maurice Kevenaar"/><br /><sub><b>Maurice Kevenaar</b></sub></a><br /><a href="#security-mkevenaar" title="Security">🛡️</a> <a href="#maintenance-mkevenaar" title="Maintenance">🚧</a> <a href="#ideas-mkevenaar" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Amkevenaar" title="Bug reports">🐛</a> <a href="https://github.com/fdm-monster/fdm-monster/pulls?q=is%3Apr+reviewed-by%3Amkevenaar" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://kevenaar.name"><img src="https://avatars.githubusercontent.com/u/834643?v=4?s=80" width="80px;" alt="Maurice Kevenaar"/><br /><sub><b>Maurice Kevenaar</b></sub></a><br /><a href="#security-mkevenaar" title="Security">🛡️</a> <a href="#maintenance-mkevenaar" title="Maintenance">🚧</a> <a href="#ideas-mkevenaar" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Amkevenaar" title="Bug reports">🐛</a> <a href="https://github.com/fdm-monster/fdm-monster/pulls?q=is%3Apr+reviewed-by%3Amkevenaar" title="Reviewed Pull Requests">👀</a> <a href="#infra-mkevenaar" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tobikisss"><img src="https://avatars.githubusercontent.com/u/45754890?v=4?s=80" width="80px;" alt="Tobias"/><br /><sub><b>Tobias</b></sub></a><br /><a href="#ideas-Tobikisss" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-Tobikisss" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://tideline3d.com"><img src="https://avatars.githubusercontent.com/u/12903320?v=4?s=80" width="80px;" alt="tideline3d"/><br /><sub><b>tideline3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Atideline3d" title="Bug reports">🐛</a> <a href="#ideas-tideline3d" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/windarrow3d"><img src="https://avatars.githubusercontent.com/u/91099282?v=4?s=80" width="80px;" alt="WindArrow3d"/><br /><sub><b>WindArrow3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Awindarrow3d" title="Bug reports">🐛</a> <a href="#financial-windarrow3d" title="Financial">💵</a> <a href="#ideas-windarrow3d" title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-windarrow3d" title="User Testing">📓</a> <a href="#platform-windarrow3d" title="Packaging/porting to new platform">📦</a></td>

package/RELEASE_NOTES.MD

@@ -1,12 +1,30 @@
 # Develop
 
-# FDM Monster 01/11/2024 1.6.4
+# FDM Monster 04/11/2024 1.7.1
+
+## Changes:
+
+- Remove PrinterStateUpdatePollTask, it was slowing development down
+- Stopped pushing to old davidzwa dockerhub organization
+
+## Fixes:
+
+- Octoprint does not require api key, but moonraker does not. Adjust API validation.
+- Only printers which OctoPrint controlled need a USB silence check for restoring the websocket connectivity
+- ApiKey requiredNotIf validation does not work (?)
+- Batch service: missing implementation for batch get settings and batch connect
+- Batch service: get and submit moonraker reprint based on history and webhooks objects
+- Printer current state update task missed information about printer job and progress, caused null progress/job state
+- Test connection: Moonraker adapter would not hook required events for connectivity tests
+- Docker ARM64 release now tracks main instead of develop (and 1, 1.x and 1.x.y versions)
+
+# FDM Monster 01/11/2024 1.7.0
 
 ## Chore:
 
 - Workflows: upgrade github actions to node 20
 - Introduce nock to test everything (except for octokit based tests)
- 
+
 ## Features:
 
 - Setting: add experimental moonraker support setting to model, validation and API endpoints
@@ -34,7 +52,7 @@
 
 ## Fixes:
 
-- Print completion service would throw exception that correlationId was not provided (SQLite didnt like that). This error is prevented.
+- Print completion service would throw exception that correlationId was not provided (SQLite didn't like that). This error is prevented.
 - Moonraker type printers will resort to OctoPrint implementation (edge case in development)
 - Yaml import service will not assume printerType is provided, therefore defaulting to OctoprintType for older FDM Monster versions
 - Reprint will now take selected job instead of scanning the unreliable file list for latest print date

package/dist/container.js

@@ -83,7 +83,6 @@ const _jwtservice = require("./services/authentication/jwt.service");
 const _authservice = require("./services/authentication/auth.service");
 const _refreshtokenservice = require("./services/authentication/refresh-token.service");
 const _pluginthrottling = require("@octokit/plugin-throttling");
-const _printerstateupdatepolltask = require("./tasks/printer-state-update-poll.task");
 const _refreshtokenservice1 = require("./services/orm/refresh-token.service");
 const _settingsservice1 = require("./services/orm/settings.service");
 const _floorservice1 = require("./services/orm/floor.service");
@@ -203,7 +202,6 @@ function configureContainer(isSqlite = false) {
         [di.printCompletionSocketIoTask]: (0, _awilix.asClass)(_printcompletionsocketiotask.PrintCompletionSocketIoTask).singleton(),
         [di.printerWebsocketTask]: (0, _awilix.asClass)(_printerwebsockettask.PrinterWebsocketTask).singleton(),
         [di.printerWebsocketRestoreTask]: (0, _awilix.asClass)(_printerwebsocketrestoretask.PrinterWebsocketRestoreTask).singleton(),
-        [di.printerStateUpdatePollTask]: (0, _awilix.asClass)(_printerstateupdatepolltask.PrinterStateUpdatePollTask).singleton(),
         [di.printerFileCleanTask]: (0, _awilix.asClass)(_printerfilecleantask.PrinterFileCleanTask).singleton()
     });
     return container;

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","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerStateUpdatePollTask","PrinterStateUpdatePollTask","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","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","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","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

@@ -79,7 +79,6 @@ const DITokens = {
     socketIoTask: "socketIoTask",
     printCompletionSocketIoTask: "printCompletionSocketIoTask",
     printerWebsocketTask: "printerWebsocketTask",
-    printerStateUpdatePollTask: "printerStateUpdatePollTask",
     printerWebsocketRestoreTask: "printerWebsocketRestoreTask",
     printerFileCleanTask: "printerFileCleanTask"
 };

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","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerStateUpdatePollTask","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,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,4BAA4B;IAC5BC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
+{"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","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","floorStore","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,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,YAAY;IACZC,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/validation/printer-controller.validation.js

@@ -44,7 +44,7 @@ const feedRateRules = {
 };
 const testPrinterApiRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
     printerURL: "required|httpurl"
 };
 const updatePrinterDisabledReasonRules = {
@@ -56,7 +56,7 @@ const updatePrinterEnabledRule = {
 const updatePrinterConnectionSettingRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
     printerURL: "required|httpurl",
-    apiKey: `required|minLength:${_serviceconstants.UUID_LENGTH}|maxLength:${_serviceconstants.UUID_LENGTH}`
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`
 };
 const createOctoPrintBackupRules = {
     exclude: "array",

package/dist/controllers/validation/printer-controller.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["createOctoPrintBackupRules","feedRateRules","flowRateRules","getOctoPrintBackupRules","testPrinterApiRules","updatePrinterConnectionSettingRules","updatePrinterDisabledReasonRules","updatePrinterEnabledRule","flowRate","feedRate","printerType","OctoprintType","MoonrakerType","apiKey","UUID_LENGTH","printerURL","disabledReason","enabled","exclude","fileName"],"mappings":";;;;;;;;;;;IA+BaA,0BAA0B;eAA1BA;;IAxBAC,aAAa;eAAbA;;IAJAC,aAAa;eAAbA;;IAiCAC,uBAAuB;eAAvBA;;IAzBAC,mBAAmB;eAAnBA;;IAcAC,mCAAmC;eAAnCA;;IARAC,gCAAgC;eAAhCA;;IAIAC,wBAAwB;eAAxBA;;;kCArBe;qCACiB;AAEtC,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd;AAEO,MAAMT,mCAAmC;IAC9CU,gBAAgB;AAClB;AAEO,MAAMT,2BAA2B;IACtCU,SAAS;AACX;AAEO,MAAMZ,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEG,YAAY;IACZF,QAAQ,CAAC,mBAAmB,EAAEC,6BAAW,CAAC,WAAW,EAAEA,6BAAW,EAAE;AACtE;AAEO,MAAMd,6BAA6B;IACxCkB,SAAS;IACT,aAAa;AACf;AAEO,MAAMf,0BAA0B;IACrCgB,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["createOctoPrintBackupRules","feedRateRules","flowRateRules","getOctoPrintBackupRules","testPrinterApiRules","updatePrinterConnectionSettingRules","updatePrinterDisabledReasonRules","updatePrinterEnabledRule","flowRate","feedRate","printerType","OctoprintType","MoonrakerType","apiKey","UUID_LENGTH","printerURL","disabledReason","enabled","exclude","fileName"],"mappings":";;;;;;;;;;;IA+BaA,0BAA0B;eAA1BA;;IAxBAC,aAAa;eAAbA;;IAJAC,aAAa;eAAbA;;IAiCAC,uBAAuB;eAAvBA;;IAzBAC,mBAAmB;eAAnBA;;IAcAC,mCAAmC;eAAnCA;;IARAC,gCAAgC;eAAhCA;;IAIAC,wBAAwB;eAAxBA;;;kCArBe;qCACiB;AAEtC,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,YAAY;AACd;AAEO,MAAMT,mCAAmC;IAC9CU,gBAAgB;AAClB;AAEO,MAAMT,2BAA2B;IACtCU,SAAS;AACX;AAEO,MAAMZ,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEG,YAAY;IACZF,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;AACrG;AAEO,MAAMd,6BAA6B;IACxCkB,SAAS;IACT,aAAa;AACf;AAEO,MAAMf,0BAA0B;IACrCgB,UAAU;AACZ"}

package/dist/entities/printer.entity.js

@@ -58,7 +58,9 @@ _ts_decorate([
     _ts_metadata("design:type", Number)
 ], Printer.prototype, "printerType", void 0);
 _ts_decorate([
-    (0, _typeorm.Column)(),
+    (0, _typeorm.Column)({
+        default: ""
+    }),
     (0, _classvalidator.IsAlphanumeric)(),
     _ts_metadata("design:type", String)
 ], Printer.prototype, "apiKey", void 0);

package/dist/entities/printer.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","BaseEntity","id","name","printerURL","printerType","apiKey","enabled","disabledReason","assignee","printCompletions","printerGroups","dateAdded","feedRate","flowRate","default","OctoprintType","nullable","PrintCompletion","pc","printer","PrinterGroup","type"],"mappings":";;;;+BAQaA;;;eAAAA;;;gCARkB;yBAC+D;uCAC9D;4BACL;oCACE;qCACC;;;;;;;;;;AAGvB,MAAMA,gBAAgBC,sBAAU;IAErCC,GAAY;IAGZC,KAAc;IAGdC,WAAoB;IAGpBC,YAAqB;IAIrBC,OAAgB;IAMhBC,UAAmB,KAAK;IAKxBC,eAAwB;IAKxBC,SAAkB;IAGlBC,iBAA+C;IAG/CC,cAAyC;IAGzCC,UAAmB;IAGnBC,SAAkB;IAGlBC,SAAkB;AACpB;;;;;;;;;;;;;;;QArCYC,SAASC,kCAAa;QAAEC,UAAU;;;;;;;;;;;QAQ1CA,UAAU;QACVF,SAAS;;;;;;QAKTE,UAAU;;;;;;QAKVA,UAAU;;;;;gCAIKC,sCAAe,GAAGC,KAAOA,GAAGC,OAAO;;;;gCAGnCC,gCAAY,GAAGF,KAAOA,GAAGC,OAAO;;;;;QAG7BE,MAAM;;;;;;QAGhBL,UAAU;;;;;;QAGVA,UAAU"}
+{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","BaseEntity","id","name","printerURL","printerType","apiKey","enabled","disabledReason","assignee","printCompletions","printerGroups","dateAdded","feedRate","flowRate","default","OctoprintType","nullable","PrintCompletion","pc","printer","PrinterGroup","type"],"mappings":";;;;+BAQaA;;;eAAAA;;;gCARkB;yBAC+D;uCAC9D;4BACL;oCACE;qCACC;;;;;;;;;;AAGvB,MAAMA,gBAAgBC,sBAAU;IAErCC,GAAY;IAGZC,KAAc;IAGdC,WAAoB;IAGpBC,YAAqB;IAIrBC,OAAgB;IAMhBC,UAAmB,KAAK;IAKxBC,eAAwB;IAKxBC,SAAkB;IAGlBC,iBAA+C;IAG/CC,cAAyC;IAGzCC,UAAmB;IAGnBC,SAAkB;IAGlBC,SAAkB;AACpB;;;;;;;;;;;;;;;QArCYC,SAASC,kCAAa;QAAEC,UAAU;;;;;;QAGlCF,SAAS;;;;;;;QAKjBE,UAAU;QACVF,SAAS;;;;;;QAKTE,UAAU;;;;;;QAKVA,UAAU;;;;;gCAIKC,sCAAe,GAAGC,KAAOA,GAAGC,OAAO;;;;gCAGnCC,gCAAY,GAAGF,KAAOA,GAAGC,OAAO;;;;;QAG7BE,MAAM;;;;;;QAGhBL,UAAU;;;;;;QAGVA,UAAU"}

package/dist/models/Printer.js

@@ -21,7 +21,7 @@ const _printerapiinterface = require("../services/printer-api.interface");
 const PrinterSchema = new _mongoose.Schema({
     apiKey: {
         type: String,
-        required: true
+        default: ""
     },
     printerURL: {
         type: String,

package/dist/models/Printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","printerType","Number","default","OctoprintType","enabled","Boolean","disabledReason","assignee","name","currentUser","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoEaA,OAAO;eAAPA;;IAlDAC,aAAa;eAAbA;;;0BAlBiB;qCACA;AAiBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,aAAa;QACXJ,MAAMK;QACNH,UAAU;QACVI,SAASC,kCAAa;IACxB;IACAC,SAAS;QACPR,MAAMS;QACNP,UAAU;QACVI,SAAS;IACX;IACAI,gBAAgB;QACdV,MAAMC;QACNC,UAAU;IACZ;IACAS,UAAU;QACRX,MAAMC;QACNC,UAAU;IACZ;IACAU,MAAM;QACJZ,MAAMC;QACNC,UAAU;IACZ;IAEAW,aAAa;QACXb,MAAMC;QACNC,UAAU;IACZ;IACAY,WAAW;QACTd,MAAMK;QACNH,UAAU;IACZ;IACAa,UAAU;QACRf,MAAMK;QACNH,UAAU;IACZ;IACAc,UAAU;QACRhB,MAAMK;QACNH,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUqB,IAAAA,eAAK,EAAC,WAAWpB"}
+{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","default","printerURL","required","printerType","Number","OctoprintType","enabled","Boolean","disabledReason","assignee","name","currentUser","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoEaA,OAAO;eAAPA;;IAlDAC,aAAa;eAAbA;;;0BAlBiB;qCACe;AAiBtC,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,SAAS;IACX;IACAC,YAAY;QACVH,MAAMC;QACNG,UAAU;IACZ;IACAC,aAAa;QACXL,MAAMM;QACNF,UAAU;QACVF,SAASK,kCAAa;IACxB;IACAC,SAAS;QACPR,MAAMS;QACNL,UAAU;QACVF,SAAS;IACX;IACAQ,gBAAgB;QACdV,MAAMC;QACNG,UAAU;IACZ;IACAO,UAAU;QACRX,MAAMC;QACNG,UAAU;IACZ;IACAQ,MAAM;QACJZ,MAAMC;QACNG,UAAU;IACZ;IAEAS,aAAa;QACXb,MAAMC;QACNG,UAAU;IACZ;IACAU,WAAW;QACTd,MAAMM;QACNF,UAAU;IACZ;IACAW,UAAU;QACRf,MAAMM;QACNF,UAAU;IACZ;IACAY,UAAU;QACRhB,MAAMM;QACNF,UAAU;IACZ;AACF;AAEO,MAAMR,UAAUqB,IAAAA,eAAK,EAAC,WAAWpB"}

package/dist/server.constants.js

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

package/dist/services/core/batch-call.service.js

@@ -10,22 +10,17 @@ Object.defineProperty(exports, "BatchCallService", {
 });
 const _node = require("@sentry/node");
 const _errorutils = require("../../utils/error.utils");
-var ReprintState = /*#__PURE__*/ function(ReprintState) {
-    ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
-    ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";
-    ReprintState[ReprintState["LastPrintReady"] = 2] = "LastPrintReady";
-    return ReprintState;
-}(ReprintState || {});
+const _printerapiinterface = require("../printer-api.interface");
 class BatchCallService {
-    octoprintClient;
+    printerApiFactory;
     printerSocketStore;
     printerCache;
     printerEventsCache;
     printerFilesStore;
     printerService;
     logger;
-    constructor({ octoprintClient, printerCache, printerEventsCache, printerSocketStore, printerFilesStore, printerService, loggerFactory }){
-        this.octoprintClient = octoprintClient;
+    constructor({ printerApiFactory, printerCache, printerEventsCache, printerSocketStore, printerFilesStore, printerService, loggerFactory }){
+        this.printerApiFactory = printerApiFactory;
         this.printerCache = printerCache;
         this.printerEventsCache = printerEventsCache;
         this.printerSocketStore = printerSocketStore;
@@ -33,6 +28,9 @@ class BatchCallService {
         this.printerService = printerService;
         this.logger = loggerFactory(BatchCallService.name);
     }
+    getPrinter(login) {
+        return this.printerApiFactory.getScopedPrinter(login);
+    }
     async batchTogglePrintersEnabled(printerIds, enabled) {
         const promises = [];
         for (const printerId of printerIds){
@@ -92,9 +90,10 @@ class BatchCallService {
     async batchSettingsGet(printerIds) {
         const promises = [];
         for (const printerId of printerIds){
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
+            const login = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const promise = this.octoprintClient.getSettings(printerLogin).then((r)=>{
+            const client = this.getPrinter(login);
+            const promise = client.getSettings().then((r)=>{
                 return {
                     success: true,
                     printerId,
@@ -116,10 +115,10 @@ class BatchCallService {
     async batchConnectUsb(printerIds) {
         const promises = [];
         for (const printerId of printerIds){
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
+            const login = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const command = this.octoprintClient.connectCommand;
-            const promise = this.octoprintClient.sendConnectionCommand(printerLogin, command).then(()=>{
+            const client = this.getPrinter(login);
+            const promise = client.connect().then(()=>{
                 return {
                     success: true,
                     printerId,
@@ -143,29 +142,18 @@ class BatchCallService {
             const promise = new Promise(async (resolve, _)=>{
                 try {
                     const login = await this.printerCache.getLoginDtoAsync(printerId);
-                    const connected = await this.octoprintClient.getConnection(login);
-                    const connectionState = connected.current?.state;
-                    const selectedJob = await this.octoprintClient.getJob(login);
-                    const currentJobFile = selectedJob?.job?.file;
-                    if (!currentJobFile?.name) {
-                        return resolve({
-                            connectionState,
-                            printerId,
-                            reprintState: 1
-                        });
-                    }
+                    const client = this.getPrinter(login);
+                    const partialReprintState = await client.getReprintState();
                     return resolve({
-                        connectionState,
-                        file: currentJobFile,
-                        printerId,
-                        reprintState: 2
+                        ...partialReprintState,
+                        printerId
                     });
                 } catch (e) {
                     (0, _node.captureException)(e);
                     return resolve({
                         connectionState: null,
                         printerId,
-                        reprintState: 0
+                        reprintState: _printerapiinterface.ReprintState.PrinterNotAvailable
                     });
                 }
             });
@@ -177,9 +165,10 @@ class BatchCallService {
         const promises = [];
         for (const printerIdFile of printerIdFileList){
             const { printerId, path } = printerIdFile;
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
+            const login = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const promise = this.octoprintClient.postSelectPrintFile(printerLogin, path, true).then(()=>{
+            const client = this.getPrinter(login);
+            const promise = client.startPrint(path).then(()=>{
                 return {
                     success: true,
                     printerId,

package/dist/services/core/batch-call.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoprintClient","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","connected","getConnection","connectionState","current","state","selectedJob","getJob","currentJobFile","job","file","reprintState","batchReprintCalls","printerIdFileList","printerIdFile","path","postSelectPrintFile"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","printerApiFactory","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","getLoginDtoAsync","client","getSettings","r","value","batchConnectUsb","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}

package/dist/services/interfaces/printer-file.dto.js

@@ -2,34 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    CreateOrUpdatePrinterFileDto: function() {
-        return CreateOrUpdatePrinterFileDto;
-    },
-    PrinterFileDto: function() {
-        return PrinterFileDto;
-    }
-});
-const _sharedconstants = require("../../shared.constants");
-class CreateOrUpdatePrinterFileDto {
-    printerId;
-    name;
-    date;
-    path;
-    size;
-}
-class PrinterFileDto extends _sharedconstants.IdDto {
-    printerId;
-    name;
-    date;
-    path;
-    size;
-}
 
 //# sourceMappingURL=printer-file.dto.js.map

package/dist/services/interfaces/printer-file.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer-file.dto.ts"],"names":["CreateOrUpdatePrinterFileDto","PrinterFileDto","printerId","name","date","path","size","IdDto"],"mappings":";;;;;;;;;;;IAiCaA,4BAA4B;eAA5BA;;IAqBAC,cAAc;eAAdA;;;iCArDiB;AAgCvB,MAAMD;IACXE,UAAoB;IAEpBC,KAAa;IACbC,KAAa;IAMbC,KAAa;IAGbC,KAAa;AAMf;AAEO,MAAML,uBAAyCM,sBAAK;IACzDL,UAAmB;IAEnBC,KAAa;IACbC,KAAa;IAMbC,KAAa;IAGbC,KAAa;AAMf"}
+{"version":3,"sources":["../../../src/services/interfaces/printer-file.dto.ts"],"names":[],"mappings":""}

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

@@ -15,9 +15,10 @@ const _octoprintwebsocketadapter = require("../octoprint/octoprint-websocket.ada
 const _websocketconstants = require("./constants/websocket.constants");
 const _socketstatetype = require("../../shared/dtos/socket-state.type");
 const _apistatetype = require("../../shared/dtos/api-state.type");
-const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
 const _prettyprintutils = require("../../utils/pretty-print.utils");
 const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
+const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
+const _printerapiinterface = require("../printer-api.interface");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -84,6 +85,7 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
     needsReauth() {
         return false;
     }
+    reauthSession() {}
     registerCredentials(socketLogin) {
         const { printerId, loginDto, protocol } = socketLogin;
         this.printerId = printerId;
@@ -298,7 +300,7 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
             event,
             payload,
             printerId: this.printerId,
-            printerType: 1
+            printerType: _printerapiinterface.MoonrakerType
         });
     }
     setSocketState(state) {

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","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","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","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","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","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","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","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/moonraker/moonraker.client.js

@@ -489,7 +489,13 @@ class MoonrakerClient {
         return this.httpClient.get(`${login.printerURL}/api/printerprofiles`);
     }
     async getServerHistoryList(login, limit, start, since, before, order = "desc") {
-        const params = `limit=${limit}&start=${start}&before=${before}&since=${since}&order=${order}`;
+        let params = `limit=${limit}&start=${start}&order=${order}`;
+        if (!!before || before === 0) {
+            params += "&before=" + before;
+        }
+        if (!!since || since === 0) {
+            params += "&since=" + since;
+        }
         return this.httpClient.get(`${login.printerURL}/server/history/list?${params}`);
     }
     async getServerHistoryTotals(login) {