@fdm-monster/server 1.6.4 → 1.7.1

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

@@ -53,6 +53,8 @@ class ServerPublicController {
         });
     }
     getFeatures(req, res) {
+        const serverSettings = this.settingsStore.getServerSettings();
+        const moonrakerEnabled = serverSettings.experimentalMoonrakerSupport;
         res.send({
             batchReprintCalls: {
                 available: true,
@@ -112,7 +114,10 @@ class ServerPublicController {
                 available: true,
                 version: 1,
                 subFeatures: {
-                    types: [
+                    types: moonrakerEnabled ? [
+                        "octoprint",
+                        "klipper"
+                    ] : [
                         "octoprint"
                     ]
                 }

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","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","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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"}

package/dist/controllers/settings.controller.js

@@ -24,16 +24,21 @@ const _validators = require("../handlers/validators");
 const _settingsservicevalidation = require("../services/validators/settings-service.validation");
 const _ip = require("ip");
 const _demomiddleware = require("../middleware/demo.middleware");
+const _printerapiinterface = require("../services/printer-api.interface");
 class SettingsController {
     settingsStore;
     logger;
+    printerCache;
+    printerService;
     configService;
     serverVersion;
-    constructor({ settingsStore, serverVersion, loggerFactory, configService }){
+    constructor({ settingsStore, printerCache, printerService, serverVersion, loggerFactory, configService }){
         this.settingsStore = settingsStore;
         this.logger = loggerFactory(SettingsController.name);
         this.serverVersion = serverVersion;
         this.configService = configService;
+        this.printerCache = printerCache;
+        this.printerService = printerService;
     }
     getSettings(req, res) {
         let connection;
@@ -62,6 +67,23 @@ class SettingsController {
         const result = this.settingsStore.setSentryDiagnosticsEnabled(enabled);
         res.send(result);
     }
+    async updateMoonrakerSupport(req, res) {
+        const { enabled } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.moonrakerSupportRules);
+        const result = await this.settingsStore.setExperimentalMoonrakerSupport(enabled);
+        if (!enabled) {
+            const printers = await this.printerCache.listCachedPrinters(false);
+            const klipperPrinters = printers.filter((p)=>p.printerType === _printerapiinterface.MoonrakerType);
+            for (const printer of klipperPrinters){
+                await this.printerService.updateEnabled(printer.id, false);
+            }
+        }
+        res.send(result);
+    }
+    async updateClientSupport(req, res) {
+        const { enabled } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.clientNextRules);
+        const result = await this.settingsStore.setExperimentalClientSupport(enabled);
+        res.send(result);
+    }
     async updateWhitelistSettings(req, res) {
         const { whitelistEnabled, whitelistedIpAddresses } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.whitelistSettingUpdateRules);
         if (!whitelistedIpAddresses.includes("127.0.0.1")) {
@@ -120,7 +142,21 @@ const _default = (0, _awilixexpress.createController)(SettingsController).prefix
         ]),
         _demomiddleware.demoUserNotAllowed
     ]
-}).patch("/sentry-diagnostics", "updateSentryDiagnosticsEnabled", _demomiddleware.demoUserNotAllowedInterceptor).put("/server", "updateServerSettings", {
+}).patch("/sentry-diagnostics", "updateSentryDiagnosticsEnabled", _demomiddleware.demoUserNotAllowedInterceptor).put("/experimental-moonraker-support", "updateMoonrakerSupport", {
+    before: [
+        (0, _authenticate.authorizeRoles)([
+            _authorizationconstants.ROLES.ADMIN
+        ]),
+        _demomiddleware.demoUserNotAllowed
+    ]
+}).put("/experimental-client-support", "updateClientSupport", {
+    before: [
+        (0, _authenticate.authorizeRoles)([
+            _authorizationconstants.ROLES.ADMIN
+        ]),
+        _demomiddleware.demoUserNotAllowed
+    ]
+}).put("/server", "updateServerSettings", {
     before: [
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN

package/dist/controllers/settings.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","isWhitelistFeatureEnabled","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":";;;;;;;;;;;IAuBaA,kBAAkB;eAAlBA;;IA6Gb,OAa+G;eAb/G;;;+BApIiC;8BACY;iCAChB;wCACP;4BACQ;2CASvB;oBAGiB;gCAI0C;AAG3D,MAAMA;IACXC,cAA6B;IAC7BC,OAAsB;IACtBC,cAA8B;IAC9BC,cAAsB;IAEtBC,YAAY,EACVJ,aAAa,EACbG,aAAa,EACbE,aAAa,EACbH,aAAa,EAMd,CAAE;QACD,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGI,cAAcN,mBAAmBO,IAAI;QACnD,IAAI,CAACH,aAAa,GAAGA;QACrB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,YAAYC,GAAY,EAAEC,GAAa,EAAE;QAEvC,IAAIC;QACJ,IAAI;YACF,MAAMC,WAAWC,IAAAA,WAAO;YACxBF,aAAa;gBACXG,UAAUL,IAAIM,MAAM,EAAEC;gBACtBC,IAAIL;gBACJM,SAAS,IAAI,CAACd,aAAa;YAC7B;QACF,EAAE,OAAOe,GAAG;YACV,IAAI,CAACjB,MAAM,CAACkB,IAAI,CAAC;QACnB;QACA,MAAMC,WAAW,IAAI,CAACpB,aAAa,CAACO,WAAW;QAC/CE,IAAIY,IAAI,CAAC;YAAE,GAAGD,QAAQ;YAAEV;QAAW;IACrC;IAEA,MAAMY,qBAAqBd,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMW,WAAW,IAAI,CAACpB,aAAa,CAACsB,oBAAoB;QACxDb,IAAIY,IAAI,CAACD;IACX;IAEA,MAAMG,+BAA+Bf,GAAY,EAAEC,GAAa,EAAE;QAChE,MAAM,EAAEe,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEC,wDAA6B;QAC/E,MAAMC,SAAS,IAAI,CAAC5B,aAAa,CAAC6B,2BAA2B,CAACL;QAC9Df,IAAIY,IAAI,CAACO;IACX;IAEA,MAAME,wBAAwBtB,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM,EAAEsB,gBAAgB,EAAEC,sBAAsB,EAAE,GAAG,MAAMP,IAAAA,yBAAa,EACtEjB,IAAIkB,IAAI,EACRO,sDAA2B;QAE7B,IAAI,CAACD,uBAAuBE,QAAQ,CAAC,cAAc;YACjDF,uBAAuBG,IAAI,CAAC;QAC9B;QACA,MAAM,IAAI,CAACnC,aAAa,CAACoC,YAAY,CAACL,kBAAkBC;QACxDvB,IAAIY,IAAI;IACV;IAEA,MAAMgB,uBAAuB7B,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM6B,iBAAiB,MAAMb,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEa,sDAA2B;QAChF,MAAMX,SAAS,MAAM,IAAI,CAAC5B,aAAa,CAACqC,sBAAsB,CAACC;QAC/D7B,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMY,qBAAqBhC,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMgC,4BACJ,IAAI,CAACvC,aAAa,CAACwC,GAAG,CAACC,6BAAY,CAACC,sCAAsC,EAAE,aAAa;QAC3F,MAAMN,iBAAiB,MAAMb,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEmB,IAAAA,oDAAyB,EAACJ;QAC/E,MAAMb,SAAS,MAAM,IAAI,CAAC5B,aAAa,CAACwC,oBAAoB,CAACF;QAC7D7B,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMkB,4BAA4BtC,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,EAAEsC,aAAa,EAAE,GAAG,MAAMtB,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE;YAAEqB,eAAe;QAAmB;QAC5F,MAAMnB,SAAS,MAAM,IAAI,CAAC5B,aAAa,CAACgD,gBAAgB,CAACD;QACzDtC,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMqB,kCAAkCzC,GAAY,EAAEC,GAAa,EAAE;QACnE,MAAM,EAAEyC,mBAAmB,EAAE,GAAG,MAAMzB,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE;YAAEwB,qBAAqB;QAAmB;QACxG,MAAMtB,SAAS,MAAM,IAAI,CAAC5B,aAAa,CAACmD,sBAAsB,CAACD;QAC/DzC,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMwB,yBAAyB5C,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM6B,iBAAiB,MAAMb,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE2B,sDAA2B;QAChF,MAAM,IAAI,CAACrD,aAAa,CAACoD,wBAAwB,CAACd;QAClD7B,IAAIY,IAAI;IACV;IAEA,MAAMiC,wBAAwB9C,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM6B,iBAAiB,MAAMb,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE6B,uDAA4B;QACjF,MAAM3B,SAAS,MAAM,IAAI,CAAC5B,aAAa,CAACwD,sBAAsB,CAAClB;QAC/D7B,IAAIY,IAAI,CAACO;IACX;IAEA,MAAM6B,sBAAsBjD,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM6B,iBAAiB,MAAMb,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEgC,qDAA0B;QAC/E,MAAM9B,SAAS,MAAM,IAAI,CAAC5B,aAAa,CAACyD,qBAAqB,CAACnB;QAC9D7B,IAAIY,IAAI,CAACO;IACX;AACF;MAGA,WAAe+B,IAAAA,+BAAgB,EAAC5D,oBAC3B6D,MAAM,CAACjB,6BAAY,CAACkB,QAAQ,GAAG,aAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBrB,GAAG,CAAC,KAAK,eACTA,GAAG,CAAC,cAAc,wBAAwB;IAAEoB,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACxGC,KAAK,CAAC,uBAAuB,kCAAkCC,6CAA6B,EAC5FC,GAAG,CAAC,WAAW,wBAAwB;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACrGG,GAAG,CAAC,mBAAmB,+BAA+B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACpHG,GAAG,CAAC,yBAAyB,qCAAqC;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAChIG,GAAG,CAAC,eAAe,4BAA4B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC7GG,GAAG,CAAC,eAAe,2BAA2B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC5GG,GAAG,CAAC,cAAc,2BAA2B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC3GG,GAAG,CAAC,aAAa,0BAA0B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;KAAE;AAAC,GACrFI,GAAG,CAAC,YAAY,yBAAyB;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC"}
+{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","printerCache","printerService","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportRules","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updateClientSupport","clientNextRules","setExperimentalClientSupport","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","isWhitelistFeatureEnabled","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":";;;;;;;;;;;IA4BaA,kBAAkB;eAAlBA;;IAyIb,OAe+G;eAf/G;;;+BArKiC;8BACY;iCAChB;wCACP;4BACQ;2CAWvB;oBAGiB;gCAI0C;qCAGpC;AAGvB,MAAMA;IACXC,cAA6B;IAC7BC,OAAsB;IACtBC,aAA2B;IAC3BC,eAAgC;IAChCC,cAA8B;IAC9BC,cAAsB;IAEtBC,YAAY,EACVN,aAAa,EACbE,YAAY,EACZC,cAAc,EACdE,aAAa,EACbE,aAAa,EACbH,aAAa,EAQd,CAAE;QACD,IAAI,CAACJ,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGM,cAAcR,mBAAmBS,IAAI;QACnD,IAAI,CAACH,aAAa,GAAGA;QACrB,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACC,cAAc,GAAGA;IACxB;IAEAM,YAAYC,GAAY,EAAEC,GAAa,EAAE;QAEvC,IAAIC;QACJ,IAAI;YACF,MAAMC,WAAWC,IAAAA,WAAO;YACxBF,aAAa;gBACXG,UAAUL,IAAIM,MAAM,EAAEC;gBACtBC,IAAIL;gBACJM,SAAS,IAAI,CAACd,aAAa;YAC7B;QACF,EAAE,OAAOe,GAAG;YACV,IAAI,CAACnB,MAAM,CAACoB,IAAI,CAAC;QACnB;QACA,MAAMC,WAAW,IAAI,CAACtB,aAAa,CAACS,WAAW;QAC/CE,IAAIY,IAAI,CAAC;YAAE,GAAGD,QAAQ;YAAEV;QAAW;IACrC;IAEA,MAAMY,qBAAqBd,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMW,WAAW,IAAI,CAACtB,aAAa,CAACwB,oBAAoB;QACxDb,IAAIY,IAAI,CAACD;IACX;IAEA,MAAMG,+BAA+Bf,GAAY,EAAEC,GAAa,EAAE;QAChE,MAAM,EAAEe,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEC,wDAA6B;QAC/E,MAAMC,SAAS,IAAI,CAAC9B,aAAa,CAAC+B,2BAA2B,CAACL;QAC9Df,IAAIY,IAAI,CAACO;IACX;IAEA,MAAME,uBAAuBtB,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAEe,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEK,gDAAqB;QACvE,MAAMH,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAACkC,+BAA+B,CAACR;QAExE,IAAI,CAACA,SAAS;YACZ,MAAMS,WAAW,MAAM,IAAI,CAACjC,YAAY,CAACkC,kBAAkB,CAAC;YAC5D,MAAMC,kBAAkBF,SAASG,MAAM,CAAC,CAACC,IAAMA,EAAEC,WAAW,KAAKC,kCAAa;YAC9E,KAAK,MAAMC,WAAWL,gBAAiB;gBACrC,MAAM,IAAI,CAAClC,cAAc,CAACwC,aAAa,CAACD,QAAQE,EAAE,EAAE;YACtD;QACF;QACAjC,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMe,oBAAoBnC,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,EAAEe,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEkB,0CAAe;QACjE,MAAMhB,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAAC+C,4BAA4B,CAACrB;QACrEf,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMkB,wBAAwBtC,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM,EAAEsC,gBAAgB,EAAEC,sBAAsB,EAAE,GAAG,MAAMvB,IAAAA,yBAAa,EACtEjB,IAAIkB,IAAI,EACRuB,sDAA2B;QAE7B,IAAI,CAACD,uBAAuBE,QAAQ,CAAC,cAAc;YACjDF,uBAAuBG,IAAI,CAAC;QAC9B;QACA,MAAM,IAAI,CAACrD,aAAa,CAACsD,YAAY,CAACL,kBAAkBC;QACxDvC,IAAIY,IAAI;IACV;IAEA,MAAMgC,uBAAuB7C,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM6C,iBAAiB,MAAM7B,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE6B,sDAA2B;QAChF,MAAM3B,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAACuD,sBAAsB,CAACC;QAC/D7C,IAAIY,IAAI,CAACO;IACX;IAEA,MAAM4B,qBAAqBhD,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMgD,4BACJ,IAAI,CAACvD,aAAa,CAACwD,GAAG,CAACC,6BAAY,CAACC,sCAAsC,EAAE,aAAa;QAC3F,MAAMN,iBAAiB,MAAM7B,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEmC,IAAAA,oDAAyB,EAACJ;QAC/E,MAAM7B,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAAC0D,oBAAoB,CAACF;QAC7D7C,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMkC,4BAA4BtD,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,EAAEsD,aAAa,EAAE,GAAG,MAAMtC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE;YAAEqC,eAAe;QAAmB;QAC5F,MAAMnC,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAACkE,gBAAgB,CAACD;QACzDtD,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMqC,kCAAkCzD,GAAY,EAAEC,GAAa,EAAE;QACnE,MAAM,EAAEyD,mBAAmB,EAAE,GAAG,MAAMzC,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE;YAAEwC,qBAAqB;QAAmB;QACxG,MAAMtC,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAACqE,sBAAsB,CAACD;QAC/DzD,IAAIY,IAAI,CAACO;IACX;IAEA,MAAMwC,yBAAyB5D,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM6C,iBAAiB,MAAM7B,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE2C,sDAA2B;QAChF,MAAM,IAAI,CAACvE,aAAa,CAACsE,wBAAwB,CAACd;QAClD7C,IAAIY,IAAI;IACV;IAEA,MAAMiD,wBAAwB9D,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM6C,iBAAiB,MAAM7B,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAE6C,uDAA4B;QACjF,MAAM3C,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAAC0E,sBAAsB,CAAClB;QAC/D7C,IAAIY,IAAI,CAACO;IACX;IAEA,MAAM6C,sBAAsBjE,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM6C,iBAAiB,MAAM7B,IAAAA,yBAAa,EAACjB,IAAIkB,IAAI,EAAEgD,qDAA0B;QAC/E,MAAM9C,SAAS,MAAM,IAAI,CAAC9B,aAAa,CAAC2E,qBAAqB,CAACnB;QAC9D7C,IAAIY,IAAI,CAACO;IACX;AACF;MAGA,WAAe+C,IAAAA,+BAAgB,EAAC9E,oBAC3B+E,MAAM,CAACjB,6BAAY,CAACkB,QAAQ,GAAG,aAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBrB,GAAG,CAAC,KAAK,eACTA,GAAG,CAAC,cAAc,wBAAwB;IAAEoB,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACxGC,KAAK,CAAC,uBAAuB,kCAAkCC,6CAA6B,EAC5FC,GAAG,CAAC,mCAAmC,0BAA0B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC/HG,GAAG,CAAC,gCAAgC,uBAAuB;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACzHG,GAAG,CAAC,WAAW,wBAAwB;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACrGG,GAAG,CAAC,mBAAmB,+BAA+B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GACpHG,GAAG,CAAC,yBAAyB,qCAAqC;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAChIG,GAAG,CAAC,eAAe,4BAA4B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC7GG,GAAG,CAAC,eAAe,2BAA2B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC5GG,GAAG,CAAC,cAAc,2BAA2B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC,GAC3GG,GAAG,CAAC,aAAa,0BAA0B;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;KAAE;AAAC,GACrFI,GAAG,CAAC,YAAY,yBAAyB;IAAER,QAAQ;QAACE,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB;KAAC;AAAC"}

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

@@ -43,8 +43,8 @@ const feedRateRules = {
     feedRate: "required|between:10,200|integer"
 };
 const testPrinterApiRules = {
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
-    apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
     printerURL: "required|httpurl"
 };
 const updatePrinterDisabledReasonRules = {
@@ -54,9 +54,9 @@ const updatePrinterEnabledRule = {
     enabled: "required|boolean"
 };
 const updatePrinterConnectionSettingRules = {
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
+    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","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;qCACE;AAEvB,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,EAAE;IACnDC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd;AAEO,MAAMR,mCAAmC;IAC9CS,gBAAgB;AAClB;AAEO,MAAMR,2BAA2B;IACtCS,SAAS;AACX;AAEO,MAAMX,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,EAAE;IACnDG,YAAY;IACZF,QAAQ,CAAC,mBAAmB,EAAEC,6BAAW,CAAC,WAAW,EAAEA,6BAAW,EAAE;AACtE;AAEO,MAAMb,6BAA6B;IACxCiB,SAAS;IACT,aAAa;AACf;AAEO,MAAMd,0BAA0B;IACrCe,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/entities/settings.entity.js

@@ -24,7 +24,7 @@ var _key, _key1, _key2, _key3, _key4, _key5;
 _key = _serversettingsconstants.serverSettingsKey;
 _key1 = _serversettingsconstants.credentialSettingsKey;
 _key2 = _serversettingsconstants.wizardSettingKey;
-_key3 = _serversettingsconstants.fileCleanSettingKey;
+_key3 = _serversettingsconstants.printerFileCleanSettingKey;
 _key4 = _serversettingsconstants.frontendSettingKey;
 _key5 = _serversettingsconstants.timeoutSettingKey;
 class Settings extends _baseentity.BaseEntity {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","fileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,MAiBA,OAQA,OAOA,OAOA,OAOA;AA9CA,OAACC,0CAAiB;AAiBlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,4CAAmB;AAOpB,QAACC,2CAAkB;AAOnB,QAACC,0CAAiB;AAnDb,MAAMN,iBAAiBO,sBAAU;IAEtCC,GAAY;IAGZ,CAAA,KAAmB,CAcjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAAqB,CAInB;IAGF,CAAA,MAAoB,CAIlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;;;;;;QAlDYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAgBUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC"}
+{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,MAmBA,OAQA,OAOA,OAOA,OAOA;AAhDA,OAACC,0CAAiB;AAmBlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAOnB,QAACC,0CAAiB;AArDb,MAAMN,iBAAiBO,sBAAU;IAEtCC,GAAY;IAGZ,CAAA,KAAmB,CAgBjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAIlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;;;;;;QApDYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAkBUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC"}

package/dist/handlers/cache-manager.js

@@ -8,16 +8,9 @@ Object.defineProperty(exports, "configureCacheManager", {
         return configureCacheManager;
     }
 });
-const _cachemanager = /*#__PURE__*/ _interop_require_default(require("cache-manager"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+const _cachemanager = require("cache-manager");
 function configureCacheManager() {
-    return _cachemanager.default.caching({
-        store: "memory",
-        max: 100,
+    return (0, _cachemanager.createCache)({
         ttl: 100
     });
 }

package/dist/handlers/cache-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/handlers/cache-manager.ts"],"names":["configureCacheManager","cacheManager","caching","store","max","ttl"],"mappings":";;;;+BAEgBA;;;eAAAA;;;qEAFS;;;;;;AAElB,SAASA;IACd,OAAOC,qBAAY,CAACC,OAAO,CAAC;QAAEC,OAAO;QAAUC,KAAK;QAAKC,KAAK;IAAI;AACpE"}
+{"version":3,"sources":["../../src/handlers/cache-manager.ts"],"names":["configureCacheManager","createCache","ttl"],"mappings":";;;;+BAEgBA;;;eAAAA;;;8BAFY;AAErB,SAASA;IACd,OAAOC,IAAAA,yBAAW,EAAC;QACjBC,KAAK;IACP;AACF"}

package/dist/middleware/printer.js

@@ -35,6 +35,8 @@ const printerLoginToken = "printerLogin";
 const printerResolveMiddleware = (key = "id")=>{
     return (req, res, next)=>{
         const printerCache = req.container.resolve(_containertokens.DITokens.printerCache);
+        const settingsService = req.container.resolve(_containertokens.DITokens.settingsStore);
+        const moonrakerEnabled = settingsService.getServerSettings().experimentalMoonrakerSupport;
         let scopedPrinter = undefined;
         let loginDto = undefined;
         const printerId = req.params[key];
@@ -54,8 +56,9 @@ const printerResolveMiddleware = (key = "id")=>{
                     });
                     break;
                 case _printerapiinterface.MoonrakerType:
+                    const moonrakerInstance = req.container.resolve(_containertokens.DITokens.moonrakerApi);
                     req.container.register({
-                        [printerApiToken]: (0, _awilix.asValue)(octoprintApiInstance)
+                        [printerApiToken]: moonrakerEnabled ? (0, _awilix.asValue)(moonrakerInstance) : (0, _awilix.asValue)(undefined)
                     });
                     break;
             }

package/dist/middleware/printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","octoprintApiInstance","octoprintApi","printerType","OctoprintType","MoonrakerType"],"mappings":";;;;;;;;;;;IAWaA,mBAAmB;eAAnBA;;IADAC,eAAe;eAAfA;;IADAC,cAAc;eAAdA;;IAGAC,iBAAiB;eAAjBA;;IAEAC,wBAAwB;eAAxBA;;;wBAdoB;iCACR;qCAIoB;AAItC,MAAMF,iBAAiB;AACvB,MAAMD,kBAAkB;AACxB,MAAMD,sBAAsB;AAC5B,MAAMG,oBAAoB;AAE1B,MAAMC,2BAA2B,CAACC,MAAM,IAAI;IACjD,OAAO,CAACC,KAAcC,KAAeC;QACnC,MAAMC,eAAeH,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACH,YAAY;QAE9E,IAAII,gBAAgBC;QACpB,IAAIC,WAAWD;QAEf,MAAME,YAAYV,IAAIW,MAAM,CAACZ,IAAI;QACjC,IAAIW,WAAW;YACbH,gBAAgBJ,aAAaS,uBAAuB,CAACF;YACrDD,WAAWN,aAAaU,WAAW,CAACH;YAEpCV,IAAII,SAAS,CAACU,QAAQ,CAAC;gBACrB,CAACpB,oBAAoB,EAAEqB,IAAAA,eAAO,EAACR;gBAC/B,CAACV,kBAAkB,EAAEkB,IAAAA,eAAO,EAACN;gBAC7B,CAACb,eAAe,EAAEmB,IAAAA,eAAO,EAACL;YAC5B;YAEA,MAAMM,uBAAuBhB,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACW,YAAY;YACtF,OAAQV,cAAcW,WAAW;gBAC/B,KAAKC,kCAAa;oBAChBnB,IAAII,SAAS,CAACU,QAAQ,CAAC;wBACrB,CAACnB,gBAAgB,EAAEoB,IAAAA,eAAO,EAACC;oBAC7B;oBACA;gBACF,KAAKI,kCAAa;oBAMhBpB,IAAII,SAAS,CAACU,QAAQ,CAAC;wBACrB,CAACnB,gBAAgB,EAAEoB,IAAAA,eAAO,EAACC;oBAC7B;oBACA;YACJ;QACF,OAAO;YACLhB,IAAII,SAAS,CAACU,QAAQ,CAAC;gBACrB,CAACpB,oBAAoB,EAAEqB,IAAAA,eAAO,EAACP;gBAC/B,CAACX,kBAAkB,EAAEkB,IAAAA,eAAO,EAACP;gBAC7B,CAACZ,eAAe,EAAEmB,IAAAA,eAAO,EAACP;gBAC1B,CAACb,gBAAgB,EAAEoB,IAAAA,eAAO,EAACP;YAC7B;QACF;QAEAN;IACF;AACF"}
+{"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","octoprintApiInstance","octoprintApi","printerType","OctoprintType","MoonrakerType","moonrakerInstance","moonrakerApi"],"mappings":";;;;;;;;;;;IAWaA,mBAAmB;eAAnBA;;IADAC,eAAe;eAAfA;;IADAC,cAAc;eAAdA;;IAGAC,iBAAiB;eAAjBA;;IAEAC,wBAAwB;eAAxBA;;;wBAdoB;iCACR;qCAIoB;AAItC,MAAMF,iBAAiB;AACvB,MAAMD,kBAAkB;AACxB,MAAMD,sBAAsB;AAC5B,MAAMG,oBAAoB;AAE1B,MAAMC,2BAA2B,CAACC,MAAM,IAAI;IACjD,OAAO,CAACC,KAAcC,KAAeC;QACnC,MAAMC,eAAeH,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACH,YAAY;QAC9E,MAAMI,kBAAkBP,IAAII,SAAS,CAACC,OAAO,CAAMC,yBAAQ,CAACE,aAAa;QACzE,MAAMC,mBAAmBF,gBAAgBG,iBAAiB,GAAGC,4BAA4B;QAEzF,IAAIC,gBAAgBC;QACpB,IAAIC,WAAWD;QAEf,MAAME,YAAYf,IAAIgB,MAAM,CAACjB,IAAI;QACjC,IAAIgB,WAAW;YACbH,gBAAgBT,aAAac,uBAAuB,CAACF;YACrDD,WAAWX,aAAae,WAAW,CAACH;YAEpCf,IAAII,SAAS,CAACe,QAAQ,CAAC;gBACrB,CAACzB,oBAAoB,EAAE0B,IAAAA,eAAO,EAACR;gBAC/B,CAACf,kBAAkB,EAAEuB,IAAAA,eAAO,EAACN;gBAC7B,CAAClB,eAAe,EAAEwB,IAAAA,eAAO,EAACL;YAC5B;YAEA,MAAMM,uBAAuBrB,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACgB,YAAY;YACtF,OAAQV,cAAcW,WAAW;gBAC/B,KAAKC,kCAAa;oBAChBxB,IAAII,SAAS,CAACe,QAAQ,CAAC;wBACrB,CAACxB,gBAAgB,EAAEyB,IAAAA,eAAO,EAACC;oBAC7B;oBACA;gBACF,KAAKI,kCAAa;oBAChB,MAAMC,oBAAoB1B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACqB,YAAY;oBACnF3B,IAAII,SAAS,CAACe,QAAQ,CAAC;wBACrB,CAACxB,gBAAgB,EAAEc,mBAAmBW,IAAAA,eAAO,EAACM,qBAAqBN,IAAAA,eAAO,EAACP;oBAC7E;oBACA;YACJ;QACF,OAAO;YACLb,IAAII,SAAS,CAACe,QAAQ,CAAC;gBACrB,CAACzB,oBAAoB,EAAE0B,IAAAA,eAAO,EAACP;gBAC/B,CAAChB,kBAAkB,EAAEuB,IAAAA,eAAO,EAACP;gBAC7B,CAACjB,eAAe,EAAEwB,IAAAA,eAAO,EAACP;gBAC1B,CAAClB,gBAAgB,EAAEyB,IAAAA,eAAO,EAACP;YAC7B;QACF;QAEAX;IACF;AACF"}

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/models/Settings.js

@@ -28,7 +28,7 @@ const SettingsSchema = new _mongoose.Schema({
             required: true
         }
     },
-    [_serversettingsconstants.fileCleanSettingKey]: {
+    [_serversettingsconstants.printerFileCleanSettingKey]: {
         autoRemoveOldFilesBeforeUpload: {
             type: Boolean,
             default: false,
@@ -135,7 +135,17 @@ const SettingsSchema = new _mongoose.Schema({
             {
                 type: String
             }
-        ]
+        ],
+        experimentalMoonrakerSupport: {
+            type: Boolean,
+            default: false,
+            required: true
+        },
+        experimentalClientSupport: {
+            type: Boolean,
+            default: false,
+            required: true
+        }
     },
     [_serversettingsconstants.frontendSettingKey]: {
         gridCols: {

package/dist/models/Settings.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","fileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA8NaA;;;eAAAA;;;0BA9NiB;yCAQvB;AA4DP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,4CAAmB,CAAC,EAAE;QACrBC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QAEA+B,kBAAkB;YAChBlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,wBAAwB;YACtB;gBACEnC,MAAMc;YACR;SACD;IACH;IACA,CAACsB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRrC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAmC,UAAU;YACRtC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAoC,YAAY;YACVvC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACqC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVzC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAW+C,IAAAA,eAAK,EAAC,kBAAkB9C"}
+{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","experimentalMoonrakerSupport","experimentalClientSupport","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA0OaA;;;eAAAA;;;0BA1OiB;yCAQvB;AA8DP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QAEA+B,kBAAkB;YAChBlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,wBAAwB;YACtB;gBACEnC,MAAMc;YACR;SACD;QACDsB,8BAA8B;YAC5BpC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAkC,2BAA2B;YACzBrC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACmC,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRvC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAqC,UAAU;YACRxC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAsC,YAAY;YACVzC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACuC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACV3C,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAWiD,IAAAA,eAAK,EAAC,kBAAkBhD"}

package/dist/server.constants.js

@@ -58,13 +58,15 @@ const AppConstants = {
     ],
     GITHUB_PAT: "GITHUB_PAT",
     serverPackageName: "@fdm-monster/server",
+    serverRepoName: "fdm-monster",
     clientPackageName: "@fdm-monster/client",
     clientRepoName: "fdm-monster-client",
-    serverRepoName: "fdm-monster",
+    clientNextPackageName: "@fdm-monster/client-next",
+    clientNextRepoName: "fdm-monster-client-next",
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.6.0",
+    defaultClientMinimum: "1.6.7",
     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","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","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","clientPackageName","clientRepoName","serverRepoName","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,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,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,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,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","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","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","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,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,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.host.js

@@ -31,17 +31,17 @@ class ServerHost {
     appInstance = null;
     configService;
     typeormService;
-    moonrakerClient;
+    settingsStore;
     isTypeormMode;
     logger;
-    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode, moonrakerClient }){
+    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode, settingsStore }){
         this.logger = loggerFactory(ServerHost.name);
         this.bootTask = bootTask;
         this.taskManagerService = taskManagerService;
         this.socketIoGateway = socketIoGateway;
         this.configService = configService;
         this.typeormService = typeormService;
-        this.moonrakerClient = moonrakerClient;
+        this.settingsStore = settingsStore;
         this.isTypeormMode = isTypeormMode;
     }
     async boot(app, quick_boot = false, listenRequests = true) {
@@ -74,9 +74,17 @@ class ServerHost {
             cwd: __dirname,
             ignore: "**/*.map"
         })).use(_exceptionfilter.exceptionFilter);
+        const nextClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientNextPackageName, "dist");
         const bundleDistPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist");
-        app.use(_express.default.static(bundleDistPath));
         const backupClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientPackageName, "dist");
+        app.use((req, res, next)=>{
+            if (this.isClientNextEnabled()) {
+                _express.default.static(nextClientPath)(req, res, next);
+            } else {
+                next();
+            }
+        });
+        app.use(_express.default.static(bundleDistPath));
         app.use(_express.default.static(backupClientPath));
         app.get("*", (req, res)=>{
             const path = req.originalUrl;
@@ -92,6 +100,10 @@ class ServerHost {
             }
         }).use(_exceptionfilter.exceptionFilter);
     }
+    isClientNextEnabled() {
+        const settings = this.settingsStore.getServerSettings();
+        return settings.experimentalClientSupport;
+    }
     async httpListen() {
         const port = (0, _serverenv.fetchServerPort)();
         if (!(0, _envutils.isProductionEnvironment)() && this.configService.get(_serverconstants.AppConstants.debugRoutesKey, "false") === "true") {

package/dist/server.host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","moonrakerClient","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
+{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","settingsStore","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","path","resource","endsWith","error","NotFoundException","settings","getServerSettings","experimentalClientSupport","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}

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) {
-                        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,