@fdm-monster/server 1.6.4 → 1.7.0

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

@@ -43,7 +43,7 @@ const feedRateRules = {
     feedRate: "required|between:10,200|integer"
 };
 const testPrinterApiRules = {
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
+    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
     apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
     printerURL: "required|httpurl"
 };
@@ -54,7 +54,7 @@ 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}`
 };

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

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/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.5",
     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

@@ -147,7 +147,7 @@ class BatchCallService {
                     const connectionState = connected.current?.state;
                     const selectedJob = await this.octoprintClient.getJob(login);
                     const currentJobFile = selectedJob?.job?.file;
-                    if (!currentJobFile) {
+                    if (!currentJobFile?.name) {
                         return resolve({
                             connectionState,
                             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","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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"}

package/dist/services/core/client-bundle.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","e","RequestError","error","errorSummary","ExternalServiceError","message","InternalServerException","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingClientVersion","shouldUpdate","currentVersion","targetVersion","reason","getMaximumOfVersionsSafe","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","clientOutdated","clientOutdatedResponse","minimumComparison","compare","newComparison","isDowngrade","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","assetName","asset","find","NotFoundException","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","distPath","zip","AdmZip","debug","fileOrDir","readdir","rm","force","recursive","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json","version"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","e","RequestError","error","errorSummary","ExternalServiceError","message","InternalServerException","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingClientVersion","shouldUpdate","currentVersion","targetVersion","reason","getMaximumOfVersionsSafe","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","clientOutdated","clientOutdatedResponse","minimumComparison","compare","newComparison","isDowngrade","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","assetName","asset","find","NotFoundException","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","distPath","zip","AdmZip","debug","fileOrDir","readdir","rm","force","recursive","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json","version"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getRateLimit","rest","rateLimit","get","getLatestRelease","owner","repo","repos","e","status","NotFoundException","getReleases","listReleases","getReleaseByTag","tag","catch","requestAsset","assetId","request","headers","Accept","asset_id"],"mappings":";;;;+BAKaA;;;eAAAA;;;mCALqB;AAK3B,MAAMA;IACXC,eAAwB;IACxBC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAEH,cAAc,EAA8D,CAAE;QACzG,IAAI,CAACC,MAAM,GAAGE,cAAcJ,cAAcK,IAAI,EAAE;QAChD,IAAI,CAACJ,cAAc,GAAGA;IACxB;IAEA,MAAMK,mBAAmB;QACvB,MAAMC,SAAS,MAAM,IAAI,CAACN,cAAc,CAACO,IAAI;QAC7C,OAAOD,QAAQE,SAAS;IAC1B;IAEA,MAAMC,eAAe;QACnB,OAAO,IAAI,CAACT,cAAc,CAACU,IAAI,CAACC,SAAS,CAACC,GAAG;IAC/C;IAEA,MAAMC,iBAAiBC,KAAa,EAAEC,IAAY,EAAE;QAClD,IAAI;YACF,OAAO,MAAM,IAAI,CAACf,cAAc,CAACU,IAAI,CAACM,KAAK,CAACH,gBAAgB,CAAC;gBAC3DC;gBACAC;YACF;QACF,EAAE,OAAOE,GAAG;YACV,IAAIA,GAAGb,SAAS,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,CAAC;YAC7D;YAEA,MAAMF;QACR;IACF;IAEA,MAAMG,YAAYN,KAAa,EAAEC,IAAY,EAAE;QAC7C,IAAI;YACF,OAAO,MAAM,IAAI,CAACf,cAAc,CAACU,IAAI,CAACM,KAAK,CAACK,YAAY,CAAC;gBACvDP;gBACAC;YACF;QACF,EAAE,OAAOE,GAAG;YACV,IAAIA,GAAGb,SAAS,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,uBAAuB,CAAC;YACvD;YAEA,MAAMF;QACR;IACF;IAEA,MAAMK,gBAAgBR,KAAa,EAAEC,IAAY,EAAEQ,GAAW,EAAE;QAC9D,OAAO,MAAM,IAAI,CAACvB,cAAc,CAACU,IAAI,CAACM,KAAK,CACxCM,eAAe,CAAC;YACfR;YACAC;YACAQ;QACF,GACCC,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEb,IAAI,KAAK,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,gCAAgC,EAAEI,KAAK;YACtE;YAEA,MAAMN;QACR;IACJ;IAEA,MAAMQ,aAAaX,KAAa,EAAEC,IAAY,EAAEW,OAAY,EAAE;QAC5D,OAAO,MAAM,IAAI,CAAC1B,cAAc,CAC7B2B,OAAO,CAAC,qDAAqD;YAC5DC,SAAS;gBACPC,QAAQ;YACV;YACAf;YACAC;YACAe,UAAUJ;QACZ,GACCF,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEb,IAAI,KAAK,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,EAAEO,SAAS;YACvE;YAEA,MAAMT;QACR;IACJ;AACF"}
+{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getRateLimit","rest","rateLimit","get","getLatestRelease","owner","repo","repos","e","status","NotFoundException","getReleases","listReleases","getReleaseByTag","tag","catch","requestAsset","assetId","request","headers","Accept","asset_id"],"mappings":";;;;+BAKaA;;;eAAAA;;;mCALqB;AAK3B,MAAMA;IACXC,eAAwB;IACxBC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAEH,cAAc,EAA8D,CAAE;QACzG,IAAI,CAACC,MAAM,GAAGE,cAAcJ,cAAcK,IAAI,EAAE;QAChD,IAAI,CAACJ,cAAc,GAAGA;IACxB;IAEA,MAAMK,mBAAmB;QACvB,MAAMC,SAAU,MAAM,IAAI,CAACN,cAAc,CAACO,IAAI;QAC9C,OAAOD,QAAQE,SAAS;IAC1B;IAEA,MAAMC,eAAe;QACnB,OAAO,IAAI,CAACT,cAAc,CAACU,IAAI,CAACC,SAAS,CAACC,GAAG;IAC/C;IAEA,MAAMC,iBAAiBC,KAAa,EAAEC,IAAY,EAAE;QAClD,IAAI;YACF,OAAO,MAAM,IAAI,CAACf,cAAc,CAACU,IAAI,CAACM,KAAK,CAACH,gBAAgB,CAAC;gBAC3DC;gBACAC;YACF;QACF,EAAE,OAAOE,GAAQ;YACf,IAAIA,GAAGb,SAAS,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,CAAC;YAC7D;YAEA,MAAMF;QACR;IACF;IAEA,MAAMG,YAAYN,KAAa,EAAEC,IAAY,EAAE;QAC7C,IAAI;YACF,OAAO,MAAM,IAAI,CAACf,cAAc,CAACU,IAAI,CAACM,KAAK,CAACK,YAAY,CAAC;gBACvDP;gBACAC;YACF;QACF,EAAE,OAAOE,GAAQ;YACf,IAAIA,GAAGb,SAAS,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,uBAAuB,CAAC;YACvD;YAEA,MAAMF;QACR;IACF;IAEA,MAAMK,gBAAgBR,KAAa,EAAEC,IAAY,EAAEQ,GAAW,EAAE;QAC9D,OAAO,MAAM,IAAI,CAACvB,cAAc,CAACU,IAAI,CAACM,KAAK,CACxCM,eAAe,CAAC;YACfR;YACAC;YACAQ;QACF,GACCC,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEb,IAAI,KAAK,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,gCAAgC,EAAEI,KAAK;YACtE;YAEA,MAAMN;QACR;IACJ;IAEA,MAAMQ,aAAaX,KAAa,EAAEC,IAAY,EAAEW,OAAY,EAAE;QAC5D,OAAO,MAAM,IAAI,CAAC1B,cAAc,CAC7B2B,OAAO,CAAC,qDAAqD;YAC5DC,SAAS;gBACPC,QAAQ;YACV;YACAf;YACAC;YACAe,UAAUJ;QACZ,GACCF,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEb,IAAI,KAAK,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,EAAEO,SAAS;YACvE;YAEA,MAAMT;QACR;IACJ;AACF"}

package/dist/services/core/server-release.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","serverVersion","constructor","loggerFactory","name","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","serverVersion","constructor","loggerFactory","name","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"mappings":"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"}

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

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

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

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

package/dist/services/interfaces/settings.dto.js

@@ -25,7 +25,7 @@ class SettingsDto {
     [_serversettingsconstants.serverSettingsKey];
     [_serversettingsconstants.wizardSettingKey];
     [_serversettingsconstants.frontendSettingKey];
-    [_serversettingsconstants.fileCleanSettingKey];
+    [_serversettingsconstants.printerFileCleanSettingKey];
     [_serversettingsconstants.timeoutSettingKey];
 }
 

package/dist/services/interfaces/settings.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,4CAAmB,CAAC,CAAuB;IAC5C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
+{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA8CAC,WAAW;eAAXA;;;yCA1DN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AA2CO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}

package/dist/services/mongoose/print-completion.shared.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","filter","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","filter","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":";;;;+BA2CgBA;;;eAAAA;;;2BA3Ca;6CACD;AAI5B,MAAMC,kBAAkB,KAAK,KAAK,KAAK;AAsChC,SAASD,mBAAmBE,WAAkC;IACnE,OAAOA,YAAYC,GAAG,CAAC,CAACC;QACtBA,GAAGC,SAAS,GAAGD,GAAGC,SAAS,IAAID,GAAGE,GAAG;QACrC,OAAOF,GAAGE,GAAG;QACb,MAAMC,OAAOC,IAAAA,uBAAY,EAACJ,GAAGK,WAAW,EAAE,CAACC,IAAMA,EAAEC,OAAO,EAAEC;QAC5DR,GAAGS,SAAS,GAAGC,OAAOC,OAAO,CAACR,MAAMJ,GAAG,CAAC,CAAC,CAACa,IAAIC,OAAO;YACnD,MAAMC,WAAWD,OAAOd,GAAG,CAAC,CAAC,EAAEgB,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,aAAa,EAAE,GAAM,CAAA;oBAC/EH;oBACAC;oBACAC;oBACAC;gBACF,CAAA;YACA,OAAO;gBACLV,eAAeI;gBACfC,QAAQC;gBACRK,WAAWL,SAASM,MAAM,CAAC,CAACC,IAAIC,KAAQD,GAAGL,SAAS,GAAGM,GAAGN,SAAS,GAAGK,KAAKC;YAC7E;QACF;QACAtB,GAAGuB,cAAc,GAAGvB,GAAGS,SAAS,CAACV,GAAG,CAAC,CAACyB,IAAMA,EAAEhB,aAAa;QAC3DR,GAAGyB,UAAU,GAAGzB,GAAGuB,cAAc,EAAEG;QACnC1B,GAAG2B,UAAU,GAAG3B,GAAGK,WAAW,CAACqB,MAAM;QAErC,MAAME,eAAe5B,GAAGK,WAAW,CAACN,GAAG,CAAC,CAAC,EAAEgB,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAEV,OAAO,EAAEW,aAAa,EAAE,GAAM,CAAA;gBACpGH;gBACAC;gBACAC;gBACAV;gBACAW;YACF,CAAA;QAEA,MAAMW,gBAAgBD,aAAaE,MAAM,CAAC,CAACxB,IAAMA,EAAES,MAAM,KAAKgB,wCAAW,CAACC,WAAW;QACrFhC,GAAGiC,YAAY,GAAGJ,eAAeH;QACjC1B,GAAGkC,WAAW,GAAGL,eAAeH,SAASG,cAAcT,MAAM,CAAC,CAACe,IAAIC,KAAQD,GAAGnB,SAAS,GAAGoB,GAAGpB,SAAS,GAAGmB,KAAKC,MAAO;QACrHpC,GAAGqC,qBAAqB,GAAGR,cAAcC,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACxG1B,GAAGwC,oBAAoB,GAAGX,cAAcC,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACvG1B,GAAGyC,oBAAoB,GAAGZ,cAAcC,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK1C,kBAAkB6B;QAEnG,MAAMgB,gBAAgBd,aAAaE,MAAM,CAAC,CAACxB,IAAMA,EAAES,MAAM,KAAKgB,wCAAW,CAACY,SAAS;QACnF3C,GAAG4C,YAAY,GAAGF,eAAehB;QACjC1B,GAAG6C,WAAW,GAAGH,eAAehB,SAASgB,eAAetB,OAAO,CAACe,IAAIC,KAAQD,GAAGnB,SAAS,GAAGoB,GAAGpB,SAAS,GAAGmB,KAAKC,MAAO;QACtHpC,GAAG8C,qBAAqB,GAAGJ,cAAcZ,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACxG1B,GAAG+C,oBAAoB,GAAGL,cAAcZ,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACvG1B,GAAGgD,oBAAoB,GAAGN,cAAcZ,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK1C,kBAAkB6B;QAGnG,OAAO1B,GAAGK,WAAW;QAErB,OAAOL;IACT;AACF"}

package/dist/services/mongoose/settings.service.js

@@ -21,10 +21,13 @@ class SettingsService {
     }
     toDto(entity) {
         return {
-            [_serversettingsconstants.serverSettingsKey]: entity[_serversettingsconstants.serverSettingsKey],
+            [_serversettingsconstants.serverSettingsKey]: {
+                ...entity[_serversettingsconstants.serverSettingsKey],
+                experimentalTypeormSupport: false
+            },
             [_serversettingsconstants.wizardSettingKey]: entity[_serversettingsconstants.wizardSettingKey],
             [_serversettingsconstants.frontendSettingKey]: entity[_serversettingsconstants.frontendSettingKey],
-            [_serversettingsconstants.fileCleanSettingKey]: entity[_serversettingsconstants.fileCleanSettingKey],
+            [_serversettingsconstants.printerFileCleanSettingKey]: entity[_serversettingsconstants.printerFileCleanSettingKey],
             [_serversettingsconstants.timeoutSettingKey]: entity[_serversettingsconstants.timeoutSettingKey]
         };
     }
@@ -45,8 +48,14 @@ class SettingsService {
     }
     migrateSettingsRuntime(knownSettings) {
         const doc = knownSettings;
-        if (!doc[_serversettingsconstants.fileCleanSettingKey]) {
-            doc[_serversettingsconstants.fileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
+        if (!doc[_serversettingsconstants.printerFileCleanSettingKey]) {
+            doc[_serversettingsconstants.printerFileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
+        } else {
+            doc[_serversettingsconstants.printerFileCleanSettingKey] = {
+                autoRemoveOldFilesBeforeUpload: doc[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
+                autoRemoveOldFilesAtBoot: doc[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
+                autoRemoveOldFilesCriteriumDays: doc[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesCriteriumDays
+            };
         }
         if (!doc[_serversettingsconstants.wizardSettingKey]) {
             doc[_serversettingsconstants.wizardSettingKey] = (0, _serversettingsconstants.getDefaultWizardSettings)();
@@ -74,7 +83,7 @@ class SettingsService {
     async patchFileCleanSettings(patchUpdate) {
         const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.fileCleanSettingsUpdateRules);
         const settingsDoc = await this.getOrCreate();
-        settingsDoc[_serversettingsconstants.fileCleanSettingKey] = Object.assign(settingsDoc[_serversettingsconstants.fileCleanSettingKey], validatedInput);
+        settingsDoc[_serversettingsconstants.printerFileCleanSettingKey] = Object.assign(settingsDoc[_serversettingsconstants.printerFileCleanSettingKey], validatedInput);
         return _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {

package/dist/services/mongoose/settings.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","length","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","setWhitelist","enabled","ipAddresses","BadRequestException","whitelistSettingUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","experimentalTypeormSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","length","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","setWhitelist","enabled","ipAddresses","BadRequestException","whitelistSettingUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}