@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/state/printer-socket.store.js

@@ -13,27 +13,25 @@ const _errorutils = require("../utils/error.utils");
 const _eventconstants = require("../constants/event.constants");
 const _printerapiinterface = require("../services/printer-api.interface");
 class PrinterSocketStore {
-    socketIoGateway;
     socketFactory;
     eventEmitter2;
     printerCache;
-    printerSocketAdaptersById = {};
+    printerSocketAdaptersById;
     logger;
-    configService;
-    settingsStore;
-    constructor({ socketFactory, socketIoGateway, settingsStore, eventEmitter2, printerCache, loggerFactory, configService }){
-        this.printerCache = printerCache;
-        this.socketIoGateway = socketIoGateway;
+    constructor(loggerFactory, socketFactory, eventEmitter2, printerCache){
         this.socketFactory = socketFactory;
         this.eventEmitter2 = eventEmitter2;
-        this.settingsStore = settingsStore;
+        this.printerCache = printerCache;
+        this.printerSocketAdaptersById = {};
         this.logger = loggerFactory(PrinterSocketStore.name);
-        this.configService = configService;
         this.subscribeToEvents();
     }
     getSocketStatesById() {
         const socketStatesById = {};
         Object.values(this.printerSocketAdaptersById).forEach((s)=>{
+            if (!s.printerId) {
+                return;
+            }
             socketStatesById[s.printerId] = {
                 printerId: s.printerId,
                 printerType: s.printerType,
@@ -45,24 +43,24 @@ class PrinterSocketStore {
     }
     async loadPrinterSockets() {
         await this.printerCache.loadCache();
-        const printerDocs = await this.printerCache.listCachedPrinters(false);
+        const printerDtoList = await this.printerCache.listCachedPrinters(false);
         this.printerSocketAdaptersById = {};
-        for (const doc of printerDocs){
+        for (const printerDto of printerDtoList){
             try {
-                await this.handlePrinterCreated({
-                    printer: doc
+                this.handlePrinterCreated({
+                    printer: printerDto
                 });
             } catch (e) {
                 (0, _node.captureException)(e);
-                this.logger.error("PrinterSocketStore failed to construct new OctoPrint socket.", (0, _errorutils.errorSummary)(e));
+                this.logger.error("PrinterSocketStore failed to construct new socket.", (0, _errorutils.errorSummary)(e));
             }
         }
-        this.logger.log(`Loaded ${Object.keys(this.printerSocketAdaptersById).length} printer OctoPrint sockets`);
+        this.logger.log(`Loaded ${Object.keys(this.printerSocketAdaptersById).length} printer sockets`);
     }
     listPrinterSockets() {
         return Object.values(this.printerSocketAdaptersById);
     }
-    reconnectOctoPrint(id) {
+    reconnectPrinterAdapter(id) {
         const socket = this.getPrinterSocket(id);
         if (!socket) return;
         socket.close();
@@ -77,44 +75,29 @@ class PrinterSocketStore {
         const socketStates = {};
         const apiStates = {};
         const promisesReauth = [];
-        const failedSocketsReauth = [];
         for (const socket of Object.values(this.printerSocketAdaptersById)){
             try {
                 if (socket.printerType === _printerapiinterface.OctoprintType && socket.needsReauth()) {
                     reauthRequested++;
-                    const promise = socket.reauthSession().catch((_)=>{
-                        failedSocketsReauth.push(socket.printerId);
-                    });
+                    const promise = socket.reauthSession().catch();
                     promisesReauth.push(promise);
                 }
             } catch (e) {
-                if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
-                    this.logger.log("Failed to reauth printer socket", (0, _errorutils.errorSummary)(e));
-                }
                 (0, _node.captureException)(e);
             }
         }
         await Promise.all(promisesReauth);
         const promisesOpenSocket = [];
-        const failedSocketReopened = [];
         for (const socket of Object.values(this.printerSocketAdaptersById)){
             try {
                 if (socket.needsSetup() || socket.needsReopen()) {
-                    if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
-                        this.logger.log(`Reopening socket for printerId '${socket.printerId}' (setup: ${socket.needsSetup()}, reopen: ${socket.needsReopen()})`);
-                    }
                     socketSetupRequested++;
                     const promise = socket.setupSocketSession().then(()=>{
                         socket.open();
-                    }).catch((_)=>{
-                        failedSocketReopened.push(socket.printerId);
-                    });
+                    }).catch();
                     promisesOpenSocket.push(promise);
                 }
             } catch (e) {
-                if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
-                    this.logger.log(`Failed to setup printer socket ${(0, _errorutils.errorSummary)(e)}`);
-                }
                 (0, _node.captureException)(e);
             }
             const keySocket = socket.socketState;
@@ -125,14 +108,6 @@ class PrinterSocketStore {
             apiStates[keyApi] = valApi ? valApi + 1 : 1;
         }
         await Promise.all(promisesOpenSocket);
-        return {
-            reauth: reauthRequested,
-            failedSocketReopened,
-            failedSocketsReauth,
-            socketSetup: socketSetupRequested,
-            socket: socketStates,
-            api: apiStates
-        };
     }
     createOrUpdateSocket(printer) {
         const { enabled, id } = printer;
@@ -153,28 +128,30 @@ class PrinterSocketStore {
             printerId: printer.id.toString(),
             loginDto: {
                 apiKey: printer.apiKey,
+                username: printer.username,
+                password: printer.password,
                 printerURL: printer.printerURL,
                 printerType: printer.printerType
             }
         });
         foundAdapter.resetSocketState();
     }
-    handleBatchPrinterCreated({ printers }) {
-        for (const p of printers){
+    handleBatchPrinterCreated(event) {
+        for (const printer of event.printers){
             this.handlePrinterCreated({
-                printer: p
+                printer
             });
         }
     }
-    handlePrinterCreated({ printer }) {
-        this.createOrUpdateSocket(printer);
+    handlePrinterCreated(event) {
+        this.createOrUpdateSocket(event.printer);
     }
-    handlePrinterUpdated({ printer }) {
+    handlePrinterUpdated(event) {
         this.logger.log(`Printer updated. Updating socket`);
-        this.createOrUpdateSocket(printer);
+        this.createOrUpdateSocket(event.printer);
     }
-    handlePrintersDeleted({ printerIds }) {
-        printerIds.forEach((id)=>{
+    handlePrintersDeleted(event) {
+        event.printerIds.forEach((id)=>{
             this.deleteSocket(id);
         });
     }

package/dist/state/printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","OctoprintType","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated","disallowEmittingEvents"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","printerSocketAdaptersById","logger","constructor","loggerFactory","socketFactory","eventEmitter2","printerCache","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDtoList","listCachedPrinters","printerDto","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectPrinterAdapter","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","OctoprintType","needsReauth","promise","reauthSession","catch","push","Promise","all","promisesOpenSocket","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","username","password","printerURL","handleBatchPrinterCreated","event","printers","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated","disallowEmittingEvents"],"mappings":"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"}

package/dist/state/printer-thumbnail.cache.js

@@ -31,16 +31,12 @@ const gcodeMaxLinesToRead = 10000;
 class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
     printerCache;
     printerApiFactory;
-    logger;
     eventEmitter2;
     settingsStore;
-    constructor({ printerCache, printerApiFactory, loggerFactory, eventEmitter2, settingsStore }){
-        super();
-        this.printerCache = printerCache;
-        this.printerApiFactory = printerApiFactory;
+    logger;
+    constructor(loggerFactory, printerCache, printerApiFactory, eventEmitter2, settingsStore){
+        super(), this.printerCache = printerCache, this.printerApiFactory = printerApiFactory, this.eventEmitter2 = eventEmitter2, this.settingsStore = settingsStore;
         this.logger = loggerFactory(PrinterThumbnailCache.name);
-        this.eventEmitter2 = eventEmitter2;
-        this.settingsStore = settingsStore;
         this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
     }
     async resetCache() {
@@ -64,9 +60,9 @@ class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
             }
         }
     }
-    async handlePrintersDeleted({ printerIds }) {
+    async handlePrintersDeleted(event) {
         if (!this.settingsStore.isThumbnailSupportEnabled()) return;
-        for (const printerId of printerIds){
+        for (const printerId of event.printerIds){
             await this.removeThumbnailFile(printerId);
             await this.unsetPrinterThumbnail(printerId);
         }

package/dist/state/printer-thumbnail.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-thumbnail.cache.ts"],"names":["PrinterThumbnailCache","gcodeMaxLinesToRead","KeyDiffCache","printerCache","printerApiFactory","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","on","printerEvents","printersDeleted","handlePrintersDeleted","bind","resetCache","keys","Object","keyValueStore","deleteKeysBatch","loadCache","isThumbnailSupportEnabled","printers","listCachedPrinters","baseFolder","join","superRootPath","AppConstants","defaultPrinterThumbnailsStorage","resetDiffs","forEach","key","printer","printerIdStr","id","toString","thumbnailFile","existsSync","data","readFileSync","setPrinterThumbnail","printerIds","printerId","removeThumbnailFile","unsetPrinterThumbnail","imageData","setKeyValue","thumbnailBase64","deleteKeyValue","loadPrinterThumbnailRemote","login","file","thumbnailData","extractRemoteThumbnailBase64","writeThumbnailFile","e","error","captureException","loadPrinterThumbnailLocal","extractThumbnailBase64","length","thumbnailPath","ensureDirExists","writeFile","rmSync","lines","readRemoteGcodeLines","Error","collecting","currentThumbnailBase64","index","line","startsWith","includes","trim","replace","numberOfLines","fromEnd","endCondition","getScopedPrinter","fileData","getFile","fileSize","size","position","iterationsLeft","bytesToRead","Math","min","gcodeScanningChunkSize","start","end","remoteChunk","getFileChunk","chunkLines","split","concat","endIndex","findIndex","slice","gcodePath","fileStream","createReadStream","rl","createInterface","input","crlfDelay","Infinity","close","Buffer","from"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-thumbnail.cache.ts"],"names":["PrinterThumbnailCache","gcodeMaxLinesToRead","KeyDiffCache","logger","constructor","loggerFactory","printerCache","printerApiFactory","eventEmitter2","settingsStore","name","on","printerEvents","printersDeleted","handlePrintersDeleted","bind","resetCache","keys","Object","keyValueStore","deleteKeysBatch","loadCache","isThumbnailSupportEnabled","printers","listCachedPrinters","baseFolder","join","superRootPath","AppConstants","defaultPrinterThumbnailsStorage","resetDiffs","forEach","key","printer","printerIdStr","id","toString","thumbnailFile","existsSync","data","readFileSync","setPrinterThumbnail","event","printerId","printerIds","removeThumbnailFile","unsetPrinterThumbnail","imageData","setKeyValue","thumbnailBase64","deleteKeyValue","loadPrinterThumbnailRemote","login","file","thumbnailData","extractRemoteThumbnailBase64","writeThumbnailFile","e","error","captureException","loadPrinterThumbnailLocal","extractThumbnailBase64","length","thumbnailPath","ensureDirExists","writeFile","rmSync","lines","readRemoteGcodeLines","Error","collecting","currentThumbnailBase64","index","line","startsWith","includes","trim","replace","numberOfLines","fromEnd","endCondition","getScopedPrinter","fileData","getFile","fileSize","size","position","iterationsLeft","bytesToRead","Math","min","gcodeScanningChunkSize","start","end","remoteChunk","getFileChunk","chunkLines","split","concat","endIndex","findIndex","slice","gcodePath","fileStream","createReadStream","rl","createInterface","input","crlfDelay","Infinity","close","Buffer","from"],"mappings":"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"}

package/dist/state/printer.cache.js

@@ -14,10 +14,8 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 class PrinterCache extends _keydiffcache.KeyDiffCache {
     printerService;
     eventEmitter2;
-    constructor({ printerService, eventEmitter2 }){
-        super();
-        this.printerService = printerService;
-        this.eventEmitter2 = eventEmitter2;
+    constructor(printerService, eventEmitter2){
+        super(), this.printerService = printerService, this.eventEmitter2 = eventEmitter2;
         this.eventEmitter2.on(_eventconstants.printerEvents.batchPrinterCreated, this.handleBatchPrinterCreated.bind(this));
         this.eventEmitter2.on(_eventconstants.printerEvents.printerCreated, this.handlePrinterCreatedOrUpdated.bind(this));
         this.eventEmitter2.on(_eventconstants.printerEvents.printerUpdated, this.handlePrinterCreatedOrUpdated.bind(this));
@@ -70,6 +68,8 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
         return {
             printerURL: printer.printerURL,
             apiKey: printer.apiKey,
+            username: printer.username,
+            password: printer.password,
             printerType: printer.printerType
         };
     }
@@ -78,23 +78,25 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
         return {
             printerURL: printer.printerURL,
             apiKey: printer.apiKey,
-            printerType: printer.printerType
+            printerType: printer.printerType,
+            username: printer.username,
+            password: printer.password
         };
     }
-    async handleBatchPrinterCreated({ printers }) {
-        const mappedPrinters = this.mapArray(printers);
+    async handleBatchPrinterCreated(event) {
+        const mappedPrinters = this.mapArray(event.printers);
         const keyValues = mappedPrinters.map((p)=>({
                 key: this.getId(p),
                 value: p
             }));
         await this.setKeyValuesBatch(keyValues, true);
     }
-    async handlePrinterCreatedOrUpdated({ printer }) {
-        const printerDto = this.map(printer);
+    async handlePrinterCreatedOrUpdated(event) {
+        const printerDto = this.map(event.printer);
         await this.setKeyValue(printerDto.id, printerDto, true);
     }
-    async handlePrintersDeleted({ printerIds }) {
-        await this.deleteKeysBatch(printerIds, true);
+    async handlePrintersDeleted(event) {
+        await this.deleteKeysBatch(event.printerIds, true);
     }
     getId(value) {
         return value.id.toString();
@@ -105,7 +107,7 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
         });
     }
     map(entity) {
-        return this.printerService.toUnsafeDto(entity);
+        return this.printerService.toDto(entity);
     }
 }
 

package/dist/state/printer.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","constructor","printerService","eventEmitter2","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","username","password","printerType","getLoginDto","event","mappedPrinters","printerDto","setKeyValue","deleteKeysBatch","printerIds","toString","entities","entity","toDto"],"mappings":"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"}

package/dist/state/settings.store.js

@@ -14,25 +14,27 @@ const _node = require("@sentry/node");
 const _envutils = require("../utils/env.utils");
 const _serverconstants = require("../server.constants");
 class SettingsStore {
-    isTypeOrmMode;
     settingsService;
+    isTypeormMode;
     logger;
-    settings = null;
-    constructor({ settingsService, loggerFactory, isTypeormMode }){
+    settings;
+    constructor(loggerFactory, settingsService, isTypeormMode){
         this.settingsService = settingsService;
+        this.isTypeormMode = isTypeormMode;
+        this.settings = null;
         this.logger = loggerFactory(SettingsStore.name);
-        this.isTypeOrmMode = isTypeormMode;
     }
     getSettings() {
+        this.throwIfSettingsUnset();
         const settings = this.settings;
-        if (!settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
         return Object.freeze({
             [_serversettingsconstants.serverSettingsKey]: {
                 loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
                 registration: settings[_serversettingsconstants.serverSettingsKey].registration,
                 sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
                 experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
-                experimentalTypeormSupport: this.isTypeOrmMode,
+                experimentalPrusaLinkSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport,
+                experimentalTypeormSupport: this.isTypeormMode,
                 experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
                 experimentalThumbnailSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
             },
@@ -43,8 +45,8 @@ class SettingsStore {
         });
     }
     getSettingsSensitive() {
+        this.throwIfSettingsUnset();
         const settings = this.settings;
-        if (!settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
         return Object.freeze({
             [_serversettingsconstants.credentialSettingsKey]: {
                 jwtExpiresIn: settings[_serversettingsconstants.credentialSettingsKey].jwtExpiresIn,
@@ -52,63 +54,74 @@ class SettingsStore {
                 refreshTokenExpiry: settings[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry
             },
             [_serversettingsconstants.serverSettingsKey]: {
-                debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
                 experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
-                experimentalTypeormSupport: this.isTypeOrmMode,
+                experimentalTypeormSupport: this.isTypeormMode,
                 experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
                 experimentalThumbnailSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
             }
         });
     }
-    getDebugSettingsSensitive() {
-        return this.getSettingsSensitive()[_serversettingsconstants.serverSettingsKey].debugSettings;
-    }
     async loadSettings() {
         this.settings = await this.settingsService.getOrCreate();
         await this.processSentryEnabled();
     }
     async getCredentialSettings() {
+        this.throwIfSettingsUnset();
         return this.settings[_serversettingsconstants.credentialSettingsKey];
     }
     async getAnonymousDiagnosticsEnabled() {
+        this.throwIfSettingsUnset();
         return this.settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled;
     }
     async persistOptionalCredentialSettings(overrideJwtSecret, overrideJwtExpiresIn) {
-        if (overrideJwtSecret) {
-            await this.updateCredentialSettings({
+        this.throwIfSettingsUnset();
+        const credentialSettings = await this.getCredentialSettings();
+        if (overrideJwtSecret?.length) {
+            await this.settingsService.updateJwtSecretCredentialSetting({
                 jwtSecret: overrideJwtSecret
             });
         }
-        if (overrideJwtExpiresIn) {
+        if (overrideJwtExpiresIn?.length) {
             await this.updateCredentialSettings({
+                refreshTokenExpiry: credentialSettings.refreshTokenExpiry,
+                refreshTokenAttempts: credentialSettings.refreshTokenAttempts,
                 jwtExpiresIn: parseInt(overrideJwtExpiresIn)
             });
         }
+        this.settings[_serversettingsconstants.credentialSettingsKey] = await this.getCredentialSettings();
     }
     getWizardState() {
+        this.throwIfSettingsUnset();
+        const settings = this.settings;
         return {
-            wizardCompleted: this.settings[_serversettingsconstants.wizardSettingKey].wizardCompleted,
-            wizardVersion: this.settings[_serversettingsconstants.wizardSettingKey].wizardVersion,
+            wizardCompleted: settings[_serversettingsconstants.wizardSettingKey].wizardCompleted,
+            wizardVersion: settings[_serversettingsconstants.wizardSettingKey].wizardVersion,
             latestWizardVersion: _serverconstants.AppConstants.currentWizardVersion
         };
     }
     isWizardCompleted() {
-        return this.settings[_serversettingsconstants.wizardSettingKey].wizardCompleted && this.settings[_serversettingsconstants.wizardSettingKey].wizardVersion === _serverconstants.AppConstants.currentWizardVersion;
+        this.throwIfSettingsUnset();
+        const settings = this.settings;
+        return settings[_serversettingsconstants.wizardSettingKey].wizardCompleted && settings[_serversettingsconstants.wizardSettingKey].wizardVersion === _serverconstants.AppConstants.currentWizardVersion;
     }
     getWizardSettings() {
+        this.throwIfSettingsUnset();
         return this.settings[_serversettingsconstants.wizardSettingKey];
     }
     isRegistrationEnabled() {
-        if (!this.settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
+        this.throwIfSettingsUnset();
         return this.settings[_serversettingsconstants.serverSettingsKey].registration;
     }
     isThumbnailSupportEnabled() {
-        if (!this.settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
+        this.throwIfSettingsUnset();
         return this.settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport;
     }
     getServerSettings() {
         return this.getSettings()[_serversettingsconstants.serverSettingsKey];
     }
+    getTimeoutSettings() {
+        return this.getSettings()[_serversettingsconstants.timeoutSettingKey];
+    }
     getFrontendSettings() {
         return this.getSettings()[_serversettingsconstants.frontendSettingKey];
     }
@@ -119,73 +132,87 @@ class SettingsStore {
         return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey]?.autoRemoveOldFilesBeforeUpload;
     }
     async setWizardCompleted(version) {
-        this.settings = await this.settingsService.patchWizardSettings({
+        this.settings = await this.settingsService.updateWizardSettings({
             wizardCompleted: true,
             wizardCompletedAt: new Date(),
             wizardVersion: version
         });
         return this.getSettings();
     }
-    async setRegistrationEnabled(registration = true) {
-        this.settings = await this.settingsService.patchServerSettings({
-            registration
-        });
-        return this.getSettings();
-    }
     async getLoginRequired() {
         return this.getServerSettings().loginRequired;
     }
     async setLoginRequired(loginRequired = true) {
-        this.settings = await this.settingsService.patchServerSettings({
-            loginRequired
-        });
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].loginRequired = loginRequired;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
+        return this.getSettings();
+    }
+    async setRegistrationEnabled(registration = true) {
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].registration = registration;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
         return this.getSettings();
     }
     async updateServerSettings(serverSettings) {
-        this.settings = await this.settingsService.patchServerSettings(serverSettings);
+        this.settings = await this.settingsService.updateServerSettings(serverSettings);
         return this.getSettings();
     }
     async updateTimeoutSettings(timeoutSettings) {
         this.settings = await this.settingsService.updateTimeoutSettings(timeoutSettings);
         return this.getSettings();
     }
-    async patchFileCleanSettings(fileClean) {
-        this.settings = await this.settingsService.patchFileCleanSettings(fileClean);
+    async updateFileCleanSettings(fileClean) {
+        this.settings = await this.settingsService.updateFileCleanSettings(fileClean);
         return this.getSettings();
     }
     async updateCredentialSettings(credentialSettings) {
-        this.settings = await this.settingsService.patchCredentialSettings(credentialSettings);
-        return this.getSettings();
+        this.settings = await this.settingsService.updateCredentialSettings(credentialSettings);
+    }
+    async setRefreshTokenSettings({ refreshTokenAttempts, refreshTokenExpiry }) {
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts = refreshTokenAttempts;
+        this.settings[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry = refreshTokenExpiry;
+        await this.updateCredentialSettings(this.settings[_serversettingsconstants.credentialSettingsKey]);
     }
     async setSentryDiagnosticsEnabled(sentryDiagnosticsEnabled) {
-        this.settings = await this.settingsService.patchServerSettings({
-            sentryDiagnosticsEnabled
-        });
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled = sentryDiagnosticsEnabled;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
         await this.processSentryEnabled();
         return this.getSettings();
     }
-    async setExperimentalMoonrakerSupport(moonrakerEnabled) {
-        this.settings = await this.settingsService.patchServerSettings({
-            experimentalMoonrakerSupport: moonrakerEnabled
-        });
+    async setExperimentalMoonrakerSupport(experimentalMoonrakerSupport) {
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport = experimentalMoonrakerSupport;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
         return this.getSettings();
     }
-    async setExperimentalThumbnailSupport(thumbnailsEnabled) {
-        this.settings = await this.settingsService.patchServerSettings({
-            experimentalThumbnailSupport: thumbnailsEnabled
-        });
+    async setExperimentalThumbnailSupport(experimentalThumbnailSupport) {
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport = experimentalThumbnailSupport;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
         return this.getSettings();
     }
-    async setExperimentalClientSupport(experimentalClientEnabled) {
-        this.settings = await this.settingsService.patchServerSettings({
-            experimentalClientSupport: experimentalClientEnabled
-        });
+    async setExperimentalPrusaLinkSupport(experimentalPrusaLinkSupport) {
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport = experimentalPrusaLinkSupport;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
+        return this.getSettings();
+    }
+    async setExperimentalClientSupport(experimentalClientSupport) {
+        this.throwIfSettingsUnset();
+        this.settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport = experimentalClientSupport;
+        this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
         return this.getSettings();
     }
     async updateFrontendSettings(frontendSettings) {
         this.settings = await this.settingsService.updateFrontendSettings(frontendSettings);
         return this.getSettings();
     }
+    throwIfSettingsUnset() {
+        if (!this.settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded)");
+    }
     async processSentryEnabled() {
         const sentryEnabled = await this.getAnonymousDiagnosticsEnabled();
         if (sentryEnabled) {
@@ -194,7 +221,7 @@ class SettingsStore {
             this.logger.log("Disabling Sentry for remote diagnostics");
         }
         if ((0, _envutils.isTestEnvironment)()) return;
-        const client = (0, _node.getCurrentHub)().getClient();
+        const client = (0, _node.getClient)();
         if (!client) {
             this.logger.warn("Could not apply Sentry. Was the SDK initialized?");
             return;