@fdm-monster/server 1.8.3 → 1.9.0-rc1

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

@@ -12,11 +12,8 @@ const _models = require("../../models");
 const _serversettingsconstants = require("../../constants/server-settings.constants");
 const _validators = require("../../handlers/validators");
 const _settingsservicevalidation = require("../validators/settings-service.validation");
+const _runtimesettingsmigration = require("../../shared/runtime-settings.migration");
 class SettingsService {
-    configService;
-    constructor({ configService }){
-        this.configService = configService;
-    }
     toDto(entity) {
         return {
             [_serversettingsconstants.serverSettingsKey]: {
@@ -30,122 +27,98 @@ class SettingsService {
         };
     }
     async getOrCreate() {
-        let settings = await _models.Settings.findOne();
+        let settings = await this.getOptional();
         if (!settings) {
             const defaultSettings = new _models.Settings((0, _serversettingsconstants.getDefaultSettings)());
             await defaultSettings.save();
             return defaultSettings;
         } else {
-            settings = this.migrateSettingsRuntime(settings);
-            return _models.Settings.findOneAndUpdate({
+            settings = (0, _runtimesettingsmigration.migrateSettingsRuntime)(settings);
+            return await _models.Settings.findOneAndUpdate({
                 _id: settings.id
             }, settings, {
                 new: true
             });
         }
     }
-    migrateSettingsRuntime(knownSettings) {
-        const doc = knownSettings;
-        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)();
-        }
-        if (!doc[_serversettingsconstants.timeoutSettingKey]) {
-            doc[_serversettingsconstants.timeoutSettingKey] = (0, _serversettingsconstants.getDefaultTimeout)();
-        }
-        if (!doc[_serversettingsconstants.serverSettingsKey]) {
-            doc[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
-        } else {
-            doc[_serversettingsconstants.serverSettingsKey] = {
-                debugSettings: doc[_serversettingsconstants.serverSettingsKey].debugSettings,
-                loginRequired: doc[_serversettingsconstants.serverSettingsKey].loginRequired,
-                registration: doc[_serversettingsconstants.serverSettingsKey].registration,
-                experimentalClientSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
-                experimentalMoonrakerSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
-                sentryDiagnosticsEnabled: doc[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
-                experimentalThumbnailSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
-            };
-        }
-        if (!doc[_serversettingsconstants.credentialSettingsKey]) {
-            doc[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
-        }
-        if (!doc[_serversettingsconstants.frontendSettingKey]) {
-            doc[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
-        }
-        return knownSettings;
-    }
-    async patchFileCleanSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.fileCleanSettingsUpdateRules);
+    async updateFileCleanSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.fileCleanSettingsUpdateSchema);
         const settingsDoc = await this.getOrCreate();
         settingsDoc[_serversettingsconstants.printerFileCleanSettingKey] = Object.assign(settingsDoc[_serversettingsconstants.printerFileCleanSettingKey], validatedInput);
-        return _models.Settings.findOneAndUpdate({
+        return await _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {
             new: true
         });
     }
-    async patchWizardSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.wizardUpdateRules);
+    async updateWizardSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.wizardUpdateSchema);
         const settingsDoc = await this.getOrCreate();
         settingsDoc[_serversettingsconstants.wizardSettingKey] = Object.assign(settingsDoc[_serversettingsconstants.wizardSettingKey], validatedInput);
-        return _models.Settings.findOneAndUpdate({
+        return await _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {
             new: true
         });
     }
-    async updateFrontendSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.frontendSettingsUpdateRules);
+    async updateFrontendSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.frontendSettingsUpdateSchema);
         const settingsDoc = await this.getOrCreate();
         const frontendSettings = settingsDoc[_serversettingsconstants.frontendSettingKey];
         Object.assign(frontendSettings, validatedInput);
-        return _models.Settings.findOneAndUpdate({
+        return await _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {
             new: true
         });
     }
-    async patchCredentialSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.credentialSettingPatchRules);
+    async updateJwtSecretCredentialSetting(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.jwtSecretCredentialSettingUpdateSchema);
         const settingsDoc = await this.getOrCreate();
         const credentialSettings = settingsDoc[_serversettingsconstants.credentialSettingsKey];
         Object.assign(credentialSettings, validatedInput);
-        return _models.Settings.findOneAndUpdate({
+        return await _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {
             new: true
         });
     }
-    async patchServerSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.serverSettingsUpdateRules);
+    async updateCredentialSettings(patchUpdate) {
+        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.credentialSettingUpdateSchema);
+        const settingsDoc = await this.getOrCreate();
+        const credentialSettings = settingsDoc[_serversettingsconstants.credentialSettingsKey];
+        Object.assign(credentialSettings, validatedInput);
+        return await _models.Settings.findOneAndUpdate({
+            _id: settingsDoc.id
+        }, settingsDoc, {
+            new: true
+        });
+    }
+    async updateServerSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.serverSettingsUpdateSchema);
         const settingsDoc = await this.getOrCreate();
         const serverSettings = settingsDoc[_serversettingsconstants.serverSettingsKey];
         Object.assign(serverSettings, validatedInput);
-        return _models.Settings.findOneAndUpdate({
+        return await _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {
             new: true
         });
     }
     async updateTimeoutSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.timeoutSettingsUpdateRules);
+        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.timeoutSettingsUpdateSchema);
         const settingsDoc = await this.getOrCreate();
         const timeoutSettings = settingsDoc[_serversettingsconstants.timeoutSettingKey];
         Object.assign(timeoutSettings, validatedInput);
-        return _models.Settings.findOneAndUpdate({
+        return await _models.Settings.findOneAndUpdate({
             _id: settingsDoc.id
         }, settingsDoc, {
             new: true
         });
     }
+    async getOptional() {
+        return _models.Settings.findOne();
+    }
 }
 
 //# sourceMappingURL=settings.service.js.map

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","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","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","experimentalThumbnailSupport","credentialSettingsKey","getDefaultCredentialSettings","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","defaultSettings","Settings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","updateFileCleanSettings","update","validatedInput","validateInput","fileCleanSettingsUpdateSchema","settingsDoc","Object","assign","updateWizardSettings","wizardUpdateSchema","updateFrontendSettings","frontendSettingsUpdateSchema","frontendSettings","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettings","credentialSettingsKey","updateCredentialSettings","patchUpdate","credentialSettingUpdateSchema","updateServerSettings","serverSettingsUpdateSchema","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateSchema","timeoutSettings","findOne"],"mappings":";;;;+BA2BaA;;;eAAAA;;;wBA3BY;yCASlB;4BACuB;2CASvB;0CAMgC;AAEhC,MAAMA;IACXC,MAAMC,MAAiB,EAAe;QACpC,OAAO;YAEL,CAACC,0CAAiB,CAAC,EAAE;gBACnB,GAAGD,MAAM,CAACC,0CAAiB,CAAC;gBAC5BC,4BAA4B;YAC9B;YACA,CAACC,yCAAgB,CAAC,EAAEH,MAAM,CAACG,yCAAgB,CAAC;YAC5C,CAACC,2CAAkB,CAAC,EAAEJ,MAAM,CAACI,2CAAkB,CAAC;YAChD,CAACC,mDAA0B,CAAC,EAAEL,MAAM,CAACK,mDAA0B,CAAC;YAChE,CAACC,0CAAiB,CAAC,EAAEN,MAAM,CAACM,0CAAiB,CAAC;QAChD;IACF;IAEA,MAAMC,cAAc;QAClB,IAAIC,WAA6B,MAAM,IAAI,CAACC,WAAW;QACvD,IAAI,CAACD,UAAU;YACb,MAAME,kBAAkB,IAAIC,gBAAQ,CAACC,IAAAA,2CAAkB;YACvD,MAAMF,gBAAgBG,IAAI;YAG1B,OAAOH;QACT,OAAO;YAELF,WAAWM,IAAAA,gDAAsB,EAACN;YAElC,OAAQ,MAAMG,gBAAQ,CAACI,gBAAgB,CAAC;gBAAEC,KAAKR,SAASS,EAAE;YAAC,GAAGT,UAAU;gBAAEU,KAAK;YAAK;QACtF;IACF;IAEA,MAAMC,wBAAwBC,MAAqD,EAAE;QACnF,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,QAAQG,wDAA6B;QAEhF,MAAMC,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1CiB,WAAW,CAACnB,mDAA0B,CAAC,GAAGoB,OAAOC,MAAM,CAACF,WAAW,CAACnB,mDAA0B,CAAC,EAAEgB;QACjG,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAMS,qBAAqBP,MAA0C,EAAE;QACrE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,QAAQQ,6CAAkB;QAErE,MAAMJ,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1CiB,WAAW,CAACrB,yCAAgB,CAAC,GAAGsB,OAAOC,MAAM,CAACF,WAAW,CAACrB,yCAAgB,CAAC,EAAEkB;QAC7E,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAMW,uBAAuBT,MAAoD,EAAE;QACjF,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,QAAQU,uDAA4B;QAE/E,MAAMN,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1C,MAAMwB,mBAAmBP,WAAW,CAACpB,2CAAkB,CAAC;QACxDqB,OAAOC,MAAM,CAACK,kBAAkBV;QAChC,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAMc,iCAAiCZ,MAA8D,EAAE;QACrG,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,QAAQa,iEAAsC;QAEzF,MAAMT,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1C,MAAM2B,qBAAqBV,WAAW,CAACW,8CAAqB,CAAC;QAC7DV,OAAOC,MAAM,CAACQ,oBAAoBb;QAClC,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAMkB,yBAAyBC,WAA0D,EAAE;QACzF,MAAMhB,iBAAiB,MAAMC,IAAAA,yBAAa,EAACe,aAAaC,wDAA6B;QAErF,MAAMd,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1C,MAAM2B,qBAAqBV,WAAW,CAACW,8CAAqB,CAAC;QAC7DV,OAAOC,MAAM,CAACQ,oBAAoBb;QAClC,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAMqB,qBAAqBnB,MAAkD,EAAE;QAC7E,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,QAAQoB,qDAA0B;QAE7E,MAAMhB,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1C,MAAMkC,iBAAiBjB,WAAW,CAACvB,0CAAiB,CAAC;QACrDwB,OAAOC,MAAM,CAACe,gBAAgBpB;QAC9B,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAMwB,sBAAsBL,WAAwD,EAAE;QACpF,MAAMhB,iBAAiB,MAAMC,IAAAA,yBAAa,EAACe,aAAaM,sDAA2B;QAEnF,MAAMnB,cAAc,MAAM,IAAI,CAACjB,WAAW;QAC1C,MAAMqC,kBAAkBpB,WAAW,CAAClB,0CAAiB,CAAC;QACtDmB,OAAOC,MAAM,CAACkB,iBAAiBvB;QAC/B,OAAQ,MAAMV,gBAAQ,CAACI,gBAAgB,CAAC;YAAEC,KAAKQ,YAAYP,EAAE;QAAC,GAAGO,aAAa;YAC5EN,KAAK;QACP;IACF;IAEA,MAAcT,cAAyC;QACrD,OAAOE,gBAAQ,CAACkC,OAAO;IACzB;AACF"}

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

@@ -16,7 +16,7 @@ const _authorizationconstants = require("../../constants/authorization.constants
 const _cryptoutils = require("../../utils/crypto.utils");
 class UserService {
     roleService;
-    constructor({ roleService }){
+    constructor(roleService){
         this.roleService = roleService;
     }
     toDto(user) {
@@ -49,7 +49,8 @@ class UserService {
         });
     }
     async isUserRootUser(userId) {
-        return (await _models.User.findById(userId))?.isRootUser;
+        const entity = await this.getUser(userId);
+        return entity.isRootUser;
     }
     async findRootUsers() {
         return _models.User.find({
@@ -66,9 +67,9 @@ class UserService {
             username
         });
     }
-    async getUser(userId, throwNotFoundError = true) {
+    async getUser(userId) {
         const user = await _models.User.findById(userId);
-        if (!user && throwNotFoundError) throw new _runtimeexceptions.NotFoundException("User not found");
+        if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
         return user;
     }
     async getUserRoleIds(userId) {
@@ -111,7 +112,7 @@ class UserService {
         }
         const { password } = await (0, _validators.validateInput)({
             password: newPassword
-        }, _userservicevalidation.newPasswordRules);
+        }, _userservicevalidation.newPasswordSchema);
         user.passwordHash = (0, _cryptoutils.hashPassword)(password);
         user.needsPasswordChange = false;
         return await user.save();
@@ -119,7 +120,7 @@ class UserService {
     async updatePasswordUnsafeByUsername(username, newPassword) {
         const { password } = await (0, _validators.validateInput)({
             password: newPassword
-        }, _userservicevalidation.newPasswordRules);
+        }, _userservicevalidation.newPasswordSchema);
         const passwordHash = (0, _cryptoutils.hashPassword)(password);
         const user = await this.findRawByUsername(username);
         if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
@@ -155,7 +156,7 @@ class UserService {
         await user.save();
     }
     async register(input) {
-        const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange, isVerified } = await (0, _validators.validateInput)(input, (0, _userservicevalidation.registerUserRules)(false));
+        const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange, isVerified } = await (0, _validators.validateInput)(input, (0, _userservicevalidation.registerUserSchema)(false));
         const passwordHash = (0, _cryptoutils.hashPassword)(password);
         return await _models.User.create({
             username,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/user.service.ts"],"names":["UserService","roleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUsersByRoleId","roleId","$in","findVerifiedUsers","isUserRootUser","userId","findById","findRootUsers","getDemoUserId","findOne","findRawByUsername","getUser","throwNotFoundError","NotFoundException","getUserRoleIds","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafeByUsername","setIsRootUserById","rootUsers","setVerifiedById","verifiedUsers","register","input","registerUserRules","create"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZQ;mCACsC;4BAC7B;uCACsB;wCAC9B;6BAC4B;AAO3C,MAAMA;IACXC,YAAyB;IAEzBC,YAAY,EAAED,WAAW,EAAgC,CAAE;QACzD,IAAI,CAACA,WAAW,GAAGA;IACrB;IAEAE,MAAMC,IAAW,EAAW;QAC1B,OAAO;YACLC,IAAID,KAAKC,EAAE;YACXC,WAAWF,KAAKE,SAAS;YACzBC,YAAYH,KAAKG,UAAU;YAC3BC,YAAYJ,KAAKI,UAAU;YAC3BC,YAAYL,KAAKK,UAAU;YAC3BC,UAAUN,KAAKM,QAAQ;YACvBC,qBAAqBP,KAAKO,mBAAmB;YAC7CC,OAAOR,KAAKQ,KAAK,CAACC,GAAG,CAAC,CAACC,IAAMA,EAAEC,QAAQ;QACzC;IACF;IAEA,MAAMC,UAAUC,QAAQ,EAAE,EAAE;QAC1B,OAAOC,YAAI,CAACC,IAAI,GAAGF,KAAK,CAACA;IAC3B;IAEA,MAAMG,kBAAkBC,MAAmB,EAAE;QAC3C,OAAOH,YAAI,CAACC,IAAI,CAAC;YAAEP,OAAO;gBAAEU,KAAK;oBAACD;iBAAO;YAAC;QAAE;IAC9C;IAEA,MAAME,oBAAoB;QACxB,OAAOL,YAAI,CAACC,IAAI,CAAC;YAAEZ,YAAY;QAAK;IACtC;IAEA,MAAMiB,eAAeC,MAAmB,EAAE;QACxC,OAAQ,CAAA,MAAMP,YAAI,CAACQ,QAAQ,CAACD,OAAM,GAAIhB;IACxC;IAEA,MAAMkB,gBAAgB;QACpB,OAAOT,YAAI,CAACC,IAAI,CAAC;YAAEV,YAAY;QAAK;IACtC;IAEA,MAAMmB,gBAAgB;QACpB,OAAQ,CAAA,MAAMV,YAAI,CAACW,OAAO,CAAC;YAAErB,YAAY;QAAK,EAAC,GAAIH;IACrD;IAEA,MAAMyB,kBAAkBpB,QAAgB,EAAE;QACxC,OAAOQ,YAAI,CAACW,OAAO,CAAC;YAClBnB;QACF;IACF;IAEA,MAAMqB,QAAQN,MAAmB,EAAEO,qBAA8B,IAAI,EAAkB;QACrF,MAAM5B,OAAO,MAAMc,YAAI,CAACQ,QAAQ,CAACD;QACjC,IAAI,CAACrB,QAAQ4B,oBAAoB,MAAM,IAAIC,oCAAiB,CAAC;QAE7D,OAAO7B;IACT;IAEA,MAAM8B,eAAeT,MAAmB,EAAE;QACxC,MAAMrB,OAAO,MAAM,IAAI,CAAC2B,OAAO,CAACN;QAChC,OAAOrB,KAAKQ,KAAK,EAAEC,IAAI,CAACC,IAAMA,EAAEC,QAAQ;IAC1C;IAEA,MAAMoB,eAAeV,MAAmB,EAAEW,OAAsB,EAAkB;QAChF,MAAMhC,OAAO,MAAMc,YAAI,CAACQ,QAAQ,CAACD;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QACvC,MAAMrB,QAAQ,IAAI,CAACX,WAAW,CAACoC,YAAY,CAACD;QAE5ChC,KAAKQ,KAAK,GAAGA,MAAMC,GAAG,CAAC,CAACC,IAAMA,EAAET,EAAE;QAClCD,KAAKQ,KAAK,GAAG0B,MAAMC,IAAI,CAAC,IAAIC,IAAIpC,KAAKQ,KAAK;QAE1C,OAAO,MAAMR,KAAKqC,IAAI;IACxB;IAEA,MAAMC,WAAWjB,MAAmB,EAAE;QAEpC,MAAMrB,OAAO,MAAM,IAAI,CAAC2B,OAAO,CAACN;QAEhC,IAAIrB,KAAKK,UAAU,EAAE;YACnB,MAAM,IAAIkC,0CAAuB,CAAC;QACpC;QAGA,MAAMC,OAAO,IAAI,CAAC3C,WAAW,CAAC4C,aAAa,CAACC,6BAAK,CAACC,KAAK;QACvD,IAAI3C,KAAKQ,KAAK,CAACoC,QAAQ,CAACJ,KAAKvC,EAAE,GAAG;YAChC,MAAM4C,iBAAiB,MAAM,IAAI,CAAC7B,iBAAiB,CAACwB,KAAKvC,EAAE;YAC3D,IAAI4C,gBAAgBC,WAAW,KAAKD,cAAc,CAAC,EAAE,CAAC5C,EAAE,KAAKoB,QAAQ;gBACnE,MAAM,IAAIkB,0CAAuB,CAAC;YACpC;QACF;QAEA,MAAMzB,YAAI,CAACiC,iBAAiB,CAAC/C,KAAKC,EAAE;IACtC;IAEA,MAAM+C,mBAAmB3B,MAAmB,EAAE4B,WAAmB,EAAE;QACjE,MAAMjD,OAAO,MAAMc,YAAI,CAACQ,QAAQ,CAACD;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC7B,KAAKM,QAAQ,GAAG2C;QAChB,OAAO,MAAMjD,KAAKqC,IAAI;IACxB;IAEA,MAAMa,mBAAmB7B,MAAmB,EAAE8B,WAAmB,EAAEC,WAAmB,EAAE;QACtF,MAAMpD,OAAO,MAAMc,YAAI,CAACQ,QAAQ,CAACD;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,IAAI,CAACwB,IAAAA,gCAAmB,EAACF,aAAanD,KAAKsD,YAAY,GAAG;YACxD,MAAM,IAAIzB,oCAAiB,CAAC;QAC9B;QAEA,MAAM,EAAE0B,QAAQ,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAAC;YAAED,UAAUH;QAAY,GAAGK,uCAAgB;QACpFzD,KAAKsD,YAAY,GAAGI,IAAAA,yBAAY,EAACH;QACjCvD,KAAKO,mBAAmB,GAAG;QAC3B,OAAO,MAAMP,KAAKqC,IAAI;IACxB;IAEA,MAAMsB,+BAA+BrD,QAAgB,EAAE8C,WAAmB,EAAE;QAC1E,MAAM,EAAEG,QAAQ,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAAC;YAAED,UAAUH;QAAY,GAAGK,uCAAgB;QACpF,MAAMH,eAAeI,IAAAA,yBAAY,EAACH;QAClC,MAAMvD,OAAO,MAAM,IAAI,CAAC0B,iBAAiB,CAACpB;QAC1C,IAAI,CAACN,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC7B,KAAKsD,YAAY,GAAGA;QACpBtD,KAAKO,mBAAmB,GAAG;QAC3B,OAAO,MAAMP,KAAKqC,IAAI;IACxB;IAEA,MAAMuB,kBAAkBvC,MAAmB,EAAEhB,UAAmB,EAAE;QAChE,MAAML,OAAO,MAAMc,YAAI,CAACQ,QAAQ,CAACD;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,IAAI,CAACxB,YAAY;YAEf,MAAMwD,YAAY,MAAM,IAAI,CAACtC,aAAa;YAC1C,IAAIsC,UAAUf,MAAM,KAAK,KAAKe,SAAS,CAAC,EAAE,CAAC5D,EAAE,KAAKoB,QAAQ;gBACxD,MAAM,IAAIkB,0CAAuB,CAAC;YACpC;QACF;QAEAvC,KAAKK,UAAU,GAAGA;QAClB,MAAML,KAAKqC,IAAI;IACjB;IAEA,MAAMyB,gBAAgBzC,MAAmB,EAAElB,UAAmB,EAAE;QAC9D,MAAMH,OAAO,MAAMc,YAAI,CAACQ,QAAQ,CAACD;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,IAAI,CAAC1B,YAAY;YACf,IAAIH,KAAKK,UAAU,EAAE;gBACnB,MAAM,IAAIkC,0CAAuB,CAAC;YACpC;YAGA,MAAMwB,gBAAgB,MAAM,IAAI,CAAC5C,iBAAiB;YAClD,IAAI4C,cAAcjB,MAAM,KAAK,GAAG;gBAC9B,MAAM,IAAIP,0CAAuB,CAAC;YACpC;QACF;QAEAvC,KAAKG,UAAU,GAAGA;QAClB,MAAMH,KAAKqC,IAAI;IACjB;IAEA,MAAM2B,SAASC,KAAmC,EAAE;QAClD,MAAM,EAAE3D,QAAQ,EAAEiD,QAAQ,EAAE/C,KAAK,EAAEJ,UAAU,EAAEC,UAAU,EAAEE,mBAAmB,EAAEJ,UAAU,EAAE,GAAG,MAAMqD,IAAAA,yBAAa,EAChHS,OACAC,IAAAA,wCAAiB,EAAC;QAGpB,MAAMZ,eAAeI,IAAAA,yBAAY,EAACH;QAClC,OAAO,MAAMzC,YAAI,CAACqD,MAAM,CAAC;YACvB7D;YACAgD;YACA9C;YACAL,YAAYA,cAAc;YAC1BC,YAAYA,cAAc;YAC1BC,YAAYA,cAAc;YAC1BE,qBAAqBA,uBAAuB;QAC9C;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/mongoose/user.service.ts"],"names":["UserService","constructor","roleService","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUsersByRoleId","roleId","$in","findVerifiedUsers","isUserRootUser","userId","entity","getUser","findRootUsers","getDemoUserId","findOne","findRawByUsername","findById","NotFoundException","getUserRoleIds","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","setIsRootUserById","rootUsers","setVerifiedById","verifiedUsers","register","input","registerUserSchema","create"],"mappings":";;;;+BAaaA;;;eAAAA;;;wBAbQ;mCACsC;4BAC7B;uCACwB;wCAChC;6BAC4B;AAQ3C,MAAMA;;IACXC,YAAY,AAAiBC,WAAwB,CAAE;aAA1BA,cAAAA;IAC7B;IAEAC,MAAMC,IAAW,EAAW;QAC1B,OAAO;YACLC,IAAID,KAAKC,EAAE;YACXC,WAAWF,KAAKE,SAAS;YACzBC,YAAYH,KAAKG,UAAU;YAC3BC,YAAYJ,KAAKI,UAAU;YAC3BC,YAAYL,KAAKK,UAAU;YAC3BC,UAAUN,KAAKM,QAAQ;YACvBC,qBAAqBP,KAAKO,mBAAmB;YAC7CC,OAAOR,KAAKQ,KAAK,CAACC,GAAG,CAAC,CAACC,IAAMA,EAAEC,QAAQ;QACzC;IACF;IAEA,MAAMC,UAAUC,QAAQ,EAAE,EAAE;QAC1B,OAAOC,YAAI,CAACC,IAAI,GAAGF,KAAK,CAACA;IAC3B;IAEA,MAAMG,kBAAkBC,MAAmB,EAAE;QAC3C,OAAOH,YAAI,CAACC,IAAI,CAAC;YAAEP,OAAO;gBAAEU,KAAK;oBAACD;iBAAO;YAAC;QAAE;IAC9C;IAEA,MAAME,oBAAoB;QACxB,OAAOL,YAAI,CAACC,IAAI,CAAC;YAAEZ,YAAY;QAAK;IACtC;IAEA,MAAMiB,eAAeC,MAAmB,EAAE;QACxC,MAAMC,SAAS,MAAM,IAAI,CAACC,OAAO,CAACF;QAClC,OAAOC,OAAOjB,UAAU;IAC1B;IAEA,MAAMmB,gBAAgB;QACpB,OAAOV,YAAI,CAACC,IAAI,CAAC;YAAEV,YAAY;QAAK;IACtC;IAEA,MAAMoB,gBAAkD;QACtD,OAAQ,CAAA,MAAMX,YAAI,CAACY,OAAO,CAAC;YAAEtB,YAAY;QAAK,EAAC,GAAIH;IACrD;IAEA,MAAM0B,kBAAkBrB,QAAgB,EAAE;QACxC,OAAOQ,YAAI,CAACY,OAAO,CAAC;YAClBpB;QACF;IACF;IAEA,MAAMiB,QAAQF,MAAmB,EAAkB;QACjD,MAAMrB,OAAO,MAAMc,YAAI,CAACc,QAAQ,CAACP;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,OAAO7B;IACT;IAEA,MAAM8B,eAAeT,MAAmB,EAAE;QACxC,MAAMrB,OAAO,MAAM,IAAI,CAACuB,OAAO,CAACF;QAChC,OAAOrB,KAAKQ,KAAK,EAAEC,IAAI,CAACC,IAAMA,EAAEC,QAAQ;IAC1C;IAEA,MAAMoB,eAAeV,MAAmB,EAAEW,OAAsB,EAAkB;QAChF,MAAMhC,OAAO,MAAMc,YAAI,CAACc,QAAQ,CAACP;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QACvC,MAAMrB,QAAQ,IAAI,CAACV,WAAW,CAACmC,YAAY,CAACD;QAE5ChC,KAAKQ,KAAK,GAAGA,MAAMC,GAAG,CAAC,CAACC,IAAMA,EAAET,EAAE;QAClCD,KAAKQ,KAAK,GAAG0B,MAAMC,IAAI,CAAC,IAAIC,IAAIpC,KAAKQ,KAAK;QAE1C,OAAO,MAAMR,KAAKqC,IAAI;IACxB;IAEA,MAAMC,WAAWjB,MAAmB,EAAE;QACpC,MAAMrB,OAAO,MAAM,IAAI,CAACuB,OAAO,CAACF;QAEhC,IAAIrB,KAAKK,UAAU,EAAE;YACnB,MAAM,IAAIkC,0CAAuB,CAAC;QACpC;QAGA,MAAMC,OAAO,IAAI,CAAC1C,WAAW,CAAC2C,aAAa,CAACC,6BAAK,CAACC,KAAK;QACvD,IAAI,AAAC3C,KAAKQ,KAAK,CAA2BoC,QAAQ,CAACJ,KAAKvC,EAAE,GAAG;YAC3D,MAAM4C,iBAAiB,MAAM,IAAI,CAAC7B,iBAAiB,CAACwB,KAAKvC,EAAE;YAC3D,IAAI4C,gBAAgBC,WAAW,KAAKD,cAAc,CAAC,EAAE,CAAC5C,EAAE,KAAKoB,QAAQ;gBACnE,MAAM,IAAIkB,0CAAuB,CAAC;YACpC;QACF;QAEA,MAAMzB,YAAI,CAACiC,iBAAiB,CAAC/C,KAAKC,EAAE;IACtC;IAEA,MAAM+C,mBAAmB3B,MAAmB,EAAE4B,WAAmB,EAAE;QACjE,MAAMjD,OAAO,MAAMc,YAAI,CAACc,QAAQ,CAACP;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC7B,KAAKM,QAAQ,GAAG2C;QAChB,OAAO,MAAMjD,KAAKqC,IAAI;IACxB;IAEA,MAAMa,mBAAmB7B,MAAmB,EAAE8B,WAAmB,EAAEC,WAAmB,EAAE;QACtF,MAAMpD,OAAO,MAAMc,YAAI,CAACc,QAAQ,CAACP;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,IAAI,CAACwB,IAAAA,gCAAmB,EAACF,aAAanD,KAAKsD,YAAY,GAAG;YACxD,MAAM,IAAIzB,oCAAiB,CAAC;QAC9B;QAEA,MAAM,EAAE0B,QAAQ,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAAC;YAAED,UAAUH;QAAY,GAAGK,wCAAiB;QACrFzD,KAAKsD,YAAY,GAAGI,IAAAA,yBAAY,EAACH;QACjCvD,KAAKO,mBAAmB,GAAG;QAC3B,OAAO,MAAMP,KAAKqC,IAAI;IACxB;IAEA,MAAMsB,+BAA+BrD,QAAgB,EAAE8C,WAAmB,EAAE;QAC1E,MAAM,EAAEG,QAAQ,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAAC;YAAED,UAAUH;QAAY,GAAGK,wCAAiB;QACrF,MAAMH,eAAeI,IAAAA,yBAAY,EAACH;QAClC,MAAMvD,OAAO,MAAM,IAAI,CAAC2B,iBAAiB,CAACrB;QAC1C,IAAI,CAACN,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC7B,KAAKsD,YAAY,GAAGA;QACpBtD,KAAKO,mBAAmB,GAAG;QAC3B,OAAO,MAAMP,KAAKqC,IAAI;IACxB;IAEA,MAAMuB,kBAAkBvC,MAAmB,EAAEhB,UAAmB,EAAE;QAChE,MAAML,OAAO,MAAMc,YAAI,CAACc,QAAQ,CAACP;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,IAAI,CAACxB,YAAY;YAEf,MAAMwD,YAAY,MAAM,IAAI,CAACrC,aAAa;YAC1C,IAAIqC,UAAUf,MAAM,KAAK,KAAKe,SAAS,CAAC,EAAE,CAAC5D,EAAE,KAAKoB,QAAQ;gBACxD,MAAM,IAAIkB,0CAAuB,CAAC;YACpC;QACF;QAEAvC,KAAKK,UAAU,GAAGA;QAClB,MAAML,KAAKqC,IAAI;IACjB;IAEA,MAAMyB,gBAAgBzC,MAAmB,EAAElB,UAAmB,EAAE;QAC9D,MAAMH,OAAO,MAAMc,YAAI,CAACc,QAAQ,CAACP;QACjC,IAAI,CAACrB,MAAM,MAAM,IAAI6B,oCAAiB,CAAC;QAEvC,IAAI,CAAC1B,YAAY;YACf,IAAIH,KAAKK,UAAU,EAAE;gBACnB,MAAM,IAAIkC,0CAAuB,CAAC;YACpC;YAGA,MAAMwB,gBAAgB,MAAM,IAAI,CAAC5C,iBAAiB;YAClD,IAAI4C,cAAcjB,MAAM,KAAK,GAAG;gBAC9B,MAAM,IAAIP,0CAAuB,CAAC;YACpC;QACF;QAEAvC,KAAKG,UAAU,GAAGA;QAClB,MAAMH,KAAKqC,IAAI;IACjB;IAEA,MAAM2B,SAASC,KAAmC,EAAE;QAClD,MAAM,EAAE3D,QAAQ,EAAEiD,QAAQ,EAAE/C,KAAK,EAAEJ,UAAU,EAAEC,UAAU,EAAEE,mBAAmB,EAAEJ,UAAU,EAAE,GAAG,MAAMqD,IAAAA,yBAAa,EAChHS,OACAC,IAAAA,yCAAkB,EAAC;QAGrB,MAAMZ,eAAeI,IAAAA,yBAAY,EAACH;QAClC,OAAO,MAAMzC,YAAI,CAACqD,MAAM,CAAC;YACvB7D;YACAgD;YACA9C;YACAL,YAAYA,cAAc;YAC1BC,YAAYA,cAAc;YAC1BC,YAAYA,cAAc;YAC1BE,qBAAqBA,uBAAuB;QAC9C;IACF;AACF"}

package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js}

@@ -10,4 +10,4 @@ Object.defineProperty(exports, "moonrakerEvent", {
 });
 const moonrakerEvent = (event)=>`moonraker.${event}`;
 
-//# sourceMappingURL=websocket.constants.js.map
+//# sourceMappingURL=moonraker.constants.js.map

package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map}

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/moonraker/constants/websocket.constants.ts"],"names":["moonrakerEvent","event"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,iBAAiB,CAACC,QAAkB,CAAC,UAAU,EAAEA,OAAO"}
+{"version":3,"sources":["../../../../src/services/moonraker/constants/moonraker.constants.ts"],"names":["moonrakerEvent","event"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,iBAAiB,CAACC,QAAkB,CAAC,UAAU,EAAEA,OAAO"}

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

@@ -11,13 +11,13 @@ Object.defineProperty(exports, "MoonrakerWebsocketAdapter", {
 const _serverconstants = require("../../server.constants");
 const _urlutils = require("../../utils/url.utils");
 const _octoprintwebsocketadapter = require("../octoprint/octoprint-websocket.adapter");
-const _websocketconstants = require("./constants/websocket.constants");
+const _moonrakerconstants = require("./constants/moonraker.constants");
 const _socketstatetype = require("../../shared/dtos/socket-state.type");
 const _apistatetype = require("../../shared/dtos/api-state.type");
 const _prettyprintutils = require("../../utils/pretty-print.utils");
 const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
-const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
 const _printerapiinterface = require("../printer-api.interface");
+const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
 const _normalizeurl = require("../../utils/normalize-url");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -25,22 +25,34 @@ function _interop_require_default(obj) {
     };
 }
 class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRpcExtendedAdapter {
-    printerType = 1;
-    client;
-    eventEmitter;
+    eventEmitter2;
     configService;
-    socketState = _socketstatetype.SOCKET_STATE.unopened;
-    lastMessageReceivedTimestamp = null;
-    stateUpdated = false;
-    stateUpdateTimestamp = null;
-    apiStateUpdated = false;
-    apiStateUpdateTimestamp = null;
-    apiState = _apistatetype.API_STATE.unset;
+    serverVersion;
+    printerType;
+    socketState;
+    lastMessageReceivedTimestamp;
+    stateUpdated;
+    stateUpdateTimestamp;
+    apiStateUpdated;
+    apiStateUpdateTimestamp;
+    apiState;
     login;
-    socketURL;
     printerId;
-    serverVersion;
     refreshPrinterObjectsInterval;
+    printerObjects;
+    client;
+    socketURL;
+    constructor(loggerFactory, moonrakerClient, eventEmitter2, configService, serverVersion){
+        super(loggerFactory), this.eventEmitter2 = eventEmitter2, this.configService = configService, this.serverVersion = serverVersion, this.printerType = 1, this.socketState = _socketstatetype.SOCKET_STATE.unopened, this.lastMessageReceivedTimestamp = null, this.stateUpdated = false, this.stateUpdateTimestamp = null, this.apiStateUpdated = false, this.apiStateUpdateTimestamp = null, this.apiState = _apistatetype.API_STATE.unset, this.printerObjects = {
+            eventtime: null,
+            status: null
+        };
+        this.logger = loggerFactory(MoonrakerWebsocketAdapter.name);
+        this.client = moonrakerClient;
+    }
+    get _debugMode() {
+        return this.configService.get(_serverconstants.AppConstants.debugSocketStatesKey, _serverconstants.AppConstants.defaultDebugSocketStates) === "true";
+    }
     get subscriptionObjects() {
         return {
             pause_resume: [],
@@ -59,23 +71,6 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
             system_stats: []
         };
     }
-    printerObjects = {
-        eventtime: null,
-        status: null
-    };
-    constructor({ moonrakerClient, loggerFactory, eventEmitter2, configService, serverVersion }){
-        super({
-            loggerFactory
-        });
-        this.client = moonrakerClient;
-        this.logger = loggerFactory(MoonrakerWebsocketAdapter.name);
-        this.eventEmitter = eventEmitter2;
-        this.configService = configService;
-        this.serverVersion = serverVersion;
-    }
-    get _debugMode() {
-        return this.configService.get(_serverconstants.AppConstants.debugSocketStatesKey, _serverconstants.AppConstants.defaultDebugSocketStates) === "true";
-    }
     needsReopen() {
         return false;
     }
@@ -85,7 +80,7 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
     needsReauth() {
         return false;
     }
-    reauthSession() {}
+    async reauthSession() {}
     registerCredentials(socketLogin) {
         const { printerId, loginDto } = socketLogin;
         this.printerId = printerId;
@@ -118,28 +113,22 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
             await this.updateCurrentStateSafely();
         }, 15000);
     }
-    async updateCurrentStateSafely() {
-        try {
-            const query = this.subscriptionObjects;
-            const objects = await this.client.getPrinterObjectsQuery(this.login, query);
-            this.printerObjects = objects.data.result;
-            this.setApiState(_apistatetype.API_STATE.responding);
-            return await this.emitCurrentEvent(this.printerObjects);
-        } catch (e) {
-            const castError = e;
-            if (castError.isAxiosError) {
-                if (castError?.response?.status == 503) {
-                    this.printerObjects.status = {};
-                    this.printerObjects.eventtime = Date.now();
-                    return await this.emitCurrentEvent(this.printerObjects);
-                }
-                this.logger.error("Could not update Moonraker printer objects due to a request error");
-                this.setApiState(_apistatetype.API_STATE.noResponse);
-                return;
-            }
-            this.logger.error(`Could not update Moonraker current due to an unknown error`);
-            this.setApiState(_apistatetype.API_STATE.noResponse);
+    emitEventSync(event, payload) {
+        if (!this.eventEmittingAllowed) {
+            return;
         }
+        this.eventEmitter2.emit((0, _moonrakerconstants.moonrakerEvent)(event), {
+            event,
+            payload,
+            printerId: this.printerId
+        });
+    }
+    resetSocketState() {
+        this.setSocketState("unopened");
+        this.setApiState("unset");
+    }
+    isClosedOrAborted() {
+        return this.socketState === _socketstatetype.SOCKET_STATE.closed || this.socketState === _socketstatetype.SOCKET_STATE.aborted;
     }
     async afterOpened(_) {
         this.setSocketState(_socketstatetype.SOCKET_STATE.opened);
@@ -162,9 +151,9 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         } catch (e) {
             const ae = e;
             if (ae.isAxiosError) {
-                if (ae.response.status === 503) {
+                if (ae.response?.status === 503) {
                     this.logger.warn(`Klipper host issue ${(0, _prettyprintutils.PP)(ae.response.data?.error?.message)}`);
-                } else if (ae.response.status === 404) {
+                } else if (ae.response?.status === 404) {
                     this.logger.error("Error while afterOpened (404) - usually this means Moonraker is still starting");
                 }
                 this.setApiState(_apistatetype.API_STATE.noResponse);
@@ -185,6 +174,10 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         }
         const payload = event.params?.length ? event.params[0] : undefined;
         if (eventName === "notify_service_state_changed") {
+            if (!event.params) {
+                this.logger.error("Received 'notify_service_state_changed' but service indicators params were undefined");
+                return;
+            }
             const serviceChanged = event.params[0];
             if (serviceChanged.klipper?.active_state || serviceChanged.klipper_mcu?.active_state || serviceChanged.moonraker?.active_state) {
                 this.logger.log("Received notify_service_state_changed, reloading Moonraker printer objects");
@@ -205,36 +198,23 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
             return await this.setupSocketSession();
         }
         if (eventName === "notify_status_update") {
+            if (!event.params) {
+                this.logger.error("Received 'notify_status_update' but service indicators params were undefined");
+                return;
+            }
             const [data, eventtime] = event.params;
-            const substate = Object.keys(data)[0];
-            if (Object.keys(this.printerObjects.status).includes(substate)) {
+            const subState = Object.keys(data)[0];
+            if (Object.keys(this.printerObjects.status).includes(subState)) {
                 this.printerObjects.status = _lodash.default.merge(this.printerObjects.status, data);
                 this.printerObjects.eventtime = eventtime;
                 await this.emitCurrentEvent(this.printerObjects);
             } else {
-                this.logger.warn(`Substate ${substate} unknown`);
+                this.logger.warn(`Substate ${subState} unknown`);
             }
             return;
         }
         await this.emitEvent(eventName, payload);
     }
-    emitEventSync(event, payload) {
-        if (!this.eventEmittingAllowed) {
-            return;
-        }
-        this.eventEmitter.emit((0, _websocketconstants.moonrakerEvent)(event), {
-            event,
-            payload,
-            printerId: this.printerId
-        });
-    }
-    resetSocketState() {
-        this.setSocketState("unopened");
-        this.setApiState("unset");
-    }
-    isClosedOrAborted() {
-        return this.socketState === _socketstatetype.SOCKET_STATE.closed || this.socketState === _socketstatetype.SOCKET_STATE.aborted;
-    }
     async afterClosed(event) {
         this.setSocketState("closed");
         delete this.socket;
@@ -244,6 +224,29 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         this.setSocketState("error");
         await this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_ERROR, error?.length ? error : "connection error");
     }
+    async updateCurrentStateSafely() {
+        try {
+            const query = this.subscriptionObjects;
+            const objects = await this.client.getPrinterObjectsQuery(this.login, query);
+            this.printerObjects = objects.data.result;
+            this.setApiState(_apistatetype.API_STATE.responding);
+            return await this.emitCurrentEvent(this.printerObjects);
+        } catch (e) {
+            const castError = e;
+            if (castError.isAxiosError) {
+                if (castError?.response?.status == 503) {
+                    this.printerObjects.status = null;
+                    this.printerObjects.eventtime = Date.now();
+                    return await this.emitCurrentEvent(this.printerObjects);
+                }
+                this.logger.error("Could not update Moonraker printer objects due to a request error");
+                this.setApiState(_apistatetype.API_STATE.noResponse);
+                return;
+            }
+            this.logger.error(`Could not update Moonraker current due to an unknown error`);
+            this.setApiState(_apistatetype.API_STATE.noResponse);
+        }
+    }
     async emitCurrentEvent(printerObject) {
         const originalKlipperObjects = printerObject.status;
         const flags = {
@@ -261,29 +264,34 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         };
         let filename = "";
         let printTime = null;
-        let stateText = originalKlipperObjects.display_status?.message ?? "Error";
+        let stateText = "Unset";
         let error = "";
-        if (originalKlipperObjects.print_stats?.state?.length) {
-            const systemState = originalKlipperObjects.webhooks;
-            const printState = originalKlipperObjects.print_stats.state;
-            const idleState = originalKlipperObjects.idle_timeout?.state;
-            filename = originalKlipperObjects.print_stats.filename;
-            printTime = originalKlipperObjects.print_stats.print_duration;
-            flags.operational = systemState.state === "ready";
-            if (flags.operational) {
-                flags.printing = printState === "printing";
-                flags.paused = printState === "paused";
-                flags.ready = printState === "standby" && idleState !== "Printing";
-                flags.sdReady = true;
-            } else {
-                flags.error = true;
-                stateText = "Klipper reports: " + (systemState.state ?? "unknown")?.toUpperCase();
+        let completion = null;
+        if (originalKlipperObjects != null) {
+            stateText = originalKlipperObjects.display_status?.message;
+            if (originalKlipperObjects.print_stats?.state?.length) {
+                const systemState = originalKlipperObjects.webhooks;
+                const printState = originalKlipperObjects.print_stats.state;
+                const idleState = originalKlipperObjects.idle_timeout?.state;
+                filename = originalKlipperObjects.print_stats.filename;
+                printTime = originalKlipperObjects.print_stats.print_duration;
+                flags.operational = systemState.state === "ready";
+                if (flags.operational) {
+                    flags.printing = printState === "printing";
+                    flags.paused = printState === "paused";
+                    flags.ready = printState === "standby" && idleState !== "Printing";
+                    flags.sdReady = true;
+                } else {
+                    flags.error = true;
+                    stateText = "Klipper reports: " + (systemState.state ?? "unknown")?.toUpperCase();
+                }
             }
+            completion = (originalKlipperObjects.display_status?.progress ?? 0) * 100.0;
         }
         const currentMessage = {
             progress: {
-                printTime: printTime,
-                completion: (originalKlipperObjects.display_status?.progress ?? 0) * 100.0
+                printTime,
+                completion
             },
             state: {
                 text: stateText,
@@ -304,7 +312,7 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         if (!this.eventEmittingAllowed) {
             return;
         }
-        await this.eventEmitter.emitAsync((0, _websocketconstants.moonrakerEvent)(event), {
+        await this.eventEmitter2.emitAsync((0, _moonrakerconstants.moonrakerEvent)(event), {
             event,
             payload,
             printerId: this.printerId,