@fdm-monster/server 1.8.3 → 1.9.0

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,58 +54,66 @@ 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() {
@@ -122,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) {

package/dist/state/settings.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","isTypeOrmMode","settingsService","logger","settings","constructor","loggerFactory","isTypeormMode","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","moonrakerEnabled","setExperimentalThumbnailSupport","thumbnailsEnabled","setExperimentalClientSupport","experimentalClientEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","logger","settings","constructor","loggerFactory","settingsService","isTypeormMode","name","getSettings","throwIfSettingsUnset","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","updateCredentialSettings","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","updateWizardSettings","wizardCompletedAt","Date","getLoginRequired","setLoginRequired","updateServerSettings","setRegistrationEnabled","serverSettings","updateTimeoutSettings","timeoutSettings","updateFileCleanSettings","fileClean","setRefreshTokenSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","setExperimentalThumbnailSupport","setExperimentalPrusaLinkSupport","setExperimentalClientSupport","updateFrontendSettings","frontendSettings","InternalServerException","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}

package/dist/state/socket-io.gateway.js

@@ -19,37 +19,37 @@ _export(exports, {
 const _socketio = require("socket.io");
 const _eventconstants = require("../constants/event.constants");
 const _passport = require("../middleware/passport");
-const _passportjwt = require("passport-jwt");
-const authorize = (settingsStore, options, verify)=>{
-    const strategy = new _passportjwt.Strategy(options, verify);
-    return async function authorizeCallback(socket, next) {
-        if (!await settingsStore.getLoginRequired()) {
-            return next();
-        }
-        strategy.success = function success(user) {
-            socket.handshake.user = user;
-            next();
-        };
-        strategy.fail = (info)=>next(new Error(info));
-        strategy.error = (error)=>next(error);
-        strategy.authenticate(socket, {});
-    };
-};
+const _socketiomiddleware = require("../middleware/socketio.middleware");
+const _promclient = require("prom-client");
+const socketIoGatewaySessions = new _promclient.Gauge({
+    name: "socketio_gateway_sessions",
+    help: "Gateway active sessions"
+});
+const socketIoGatewayDisconnects = new _promclient.Counter({
+    name: "socketio_gateway_disconnects",
+    help: "Gateway connections closed"
+});
+const socketIoGatewayMessagesSent = new _promclient.Counter({
+    name: "socketio_messages_sent",
+    help: "Gateway messages sent"
+});
+const socketIoGatewayMessageSentSize = new _promclient.Gauge({
+    name: "socketio_message_size",
+    help: "Gateway message sent size"
+});
 class SocketIoGateway {
-    logger;
     eventEmitter2;
-    io;
-    authService;
     settingsStore;
-    configService;
     userService;
-    constructor({ loggerFactory, eventEmitter2, settingsStore, authService, configService, userService }){
-        this.logger = loggerFactory(SocketIoGateway.name);
+    configService;
+    logger;
+    io;
+    constructor(loggerFactory, eventEmitter2, settingsStore, userService, configService){
         this.eventEmitter2 = eventEmitter2;
         this.settingsStore = settingsStore;
-        this.authService = authService;
         this.userService = userService;
         this.configService = configService;
+        this.logger = loggerFactory(SocketIoGateway.name);
     }
     attachServer(httpServer) {
         this.io = new _socketio.Server(httpServer, {
@@ -58,34 +58,37 @@ class SocketIoGateway {
             }
         });
         const opts = (0, _passport.getPassportJwtOptions)(this.settingsStore, this.configService, (value)=>value.handshake.auth.token);
-        const verify = (0, _passport.verifyUserCallback)(this.userService);
-        this.io.use(authorize(this.settingsStore, opts, verify));
+        this.io.use((0, _socketiomiddleware.authorize)(this.settingsStore, opts, this.logger, (0, _passport.verifyUserCallback)(this.userService)));
         this.io.on("connection", (socket)=>this.onConnect.bind(this)(socket));
     }
     onConnect(socket) {
-        this.logger.debug("SocketIO Client connected", socket.id);
+        this.logger.debug("SocketIO Client connected", {
+            socketId: socket.id
+        });
         this.eventEmitter2.emit(_eventconstants.socketIoConnectedEvent, socket.id);
+        socketIoGatewaySessions.inc();
         socket.on("disconnect", ()=>{
-            this.logger.debug("SocketIO Client disconnected", socket.id);
+            this.logger.debug("SocketIO Client disconnected", {
+                socketId: socket.id
+            });
+            socketIoGatewaySessions.dec(1);
+            socketIoGatewayDisconnects.inc();
         });
     }
     send(event, data) {
         if (!this.io) {
-            this.logger.debug("No io server setup yet");
+            this.logger.debug(`Cant send event ${event}, socketio gateway must be created first`);
             return;
         }
-        if (this.settingsStore.getServerSettings().debugSettings?.debugSocketIoEvents) {
-            this.logger.log(`Sending event ${event}`);
-        }
         this.io.emit(event, data);
+        socketIoGatewayMessagesSent.inc();
+        const payload = JSON.stringify(data);
+        const sizeInBytes = Buffer.byteLength(payload);
+        socketIoGatewayMessageSentSize.set(sizeInBytes);
     }
 }
 const IO_MESSAGES = {
-    LegacyUpdate: "legacy-update",
-    LegacyPrinterTest: "legacy-printer-test",
-    CompletionEvent: "completion-event",
-    HostState: "host-state",
-    ApiAccessibility: "api-accessibility"
+    LegacyUpdate: "legacy-update"
 };
 
 //# sourceMappingURL=socket-io.gateway.js.map

package/dist/state/socket-io.gateway.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","debug","id","emit","socketIoConnectedEvent","send","event","data","getServerSettings","debugSettings","debugSocketIoEvents","log","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,KAAK,CAAC,6BAA6BnC,OAAOoC,EAAE;QAExD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,KAAK,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC7D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAACwB,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAACzC,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAACjC,MAAM,CAACkC,GAAG,CAAC,CAAC,cAAc,EAAEL,OAAO;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}
+{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","socketIoGatewaySessions","Gauge","name","help","socketIoGatewayDisconnects","Counter","socketIoGatewayMessagesSent","socketIoGatewayMessageSentSize","logger","io","constructor","loggerFactory","eventEmitter2","settingsStore","userService","configService","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","handshake","auth","token","use","authorize","verifyUserCallback","on","socket","onConnect","bind","debug","socketId","id","emit","socketIoConnectedEvent","inc","dec","send","event","data","payload","JSON","stringify","sizeInBytes","Buffer","byteLength","set","LegacyUpdate"],"mappings":";;;;;;;;;;;IAsFaA,WAAW;eAAXA;;IArDAC,eAAe;eAAfA;;;0BAjCkB;gCACQ;0BAMmB;oCAGhC;4BACK;AAE/B,MAAMC,0BAA0B,IAAIC,iBAAK,CAAC;IACxCC,MAAM;IACNC,MAAM;AACR;AAEA,MAAMC,6BAA6B,IAAIC,mBAAO,CAAC;IAC7CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMG,8BAA8B,IAAID,mBAAO,CAAC;IAC9CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMI,iCAAiC,IAAIN,iBAAK,CAAC;IAC/CC,MAAM;IACNC,MAAM;AACR;AAEO,MAAMJ;;;;;IACXS,OAAsB;IAEtBC,GAAW;IAEXC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA6B,CAC9C;aAJiBH,gBAAAA;aACAC,gBAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACP,MAAM,GAAGG,cAAcZ,gBAAgBG,IAAI;IAClD;IAEAc,aAAaC,UAAsB,EAAE;QACnC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAChC,IAAI,CAACT,aAAa,EAClB,IAAI,CAACE,aAAa,EAClB,CAACQ,QAAkBA,MAAMC,SAAS,CAACC,IAAI,CAACC,KAAK;QAE/C,IAAI,CAACjB,EAAE,CAACkB,GAAG,CAACC,IAAAA,6BAAS,EAAC,IAAI,CAACf,aAAa,EAAEQ,MAAM,IAAI,CAACb,MAAM,EAAEqB,IAAAA,4BAAkB,EAAC,IAAI,CAACf,WAAW;QAChG,IAAI,CAACL,EAAE,CAACqB,EAAE,CAAC,cAAc,CAACC,SAAW,IAAI,CAACC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEF;IACjE;IAEAC,UAAUD,MAAc,EAAE;QACxB,IAAI,CAACvB,MAAM,CAAC0B,KAAK,CAAC,6BAA6B;YAAEC,UAAUJ,OAAOK,EAAE;QAAC;QACrE,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEP,OAAOK,EAAE;QACzDpC,wBAAwBuC,GAAG;QAE3BR,OAAOD,EAAE,CAAC,cAAc;YACtB,IAAI,CAACtB,MAAM,CAAC0B,KAAK,CAAC,gCAAgC;gBAAEC,UAAUJ,OAAOK,EAAE;YAAC;YACxEpC,wBAAwBwC,GAAG,CAAC;YAC5BpC,2BAA2BmC,GAAG;QAChC;IACF;IAEAE,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAClC,EAAE,EAAE;YACZ,IAAI,CAACD,MAAM,CAAC0B,KAAK,CAAC,CAAC,gBAAgB,EAAEQ,MAAM,wCAAwC,CAAC;YACpF;QACF;QAEA,IAAI,CAACjC,EAAE,CAAC4B,IAAI,CAACK,OAAOC;QACpBrC,4BAA4BiC,GAAG;QAE/B,MAAMK,UAAUC,KAAKC,SAAS,CAACH;QAC/B,MAAMI,cAAcC,OAAOC,UAAU,CAACL;QACtCrC,+BAA+B2C,GAAG,CAACH;IACrC;AACF;AAEO,MAAMjD,cAAc;IACzBqD,cAAc;AAChB"}

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

@@ -16,33 +16,34 @@ const _serverconstants = require("../server.constants");
 const _errorutils = require("../utils/error.utils");
 const _node = require("@sentry/node");
 const _socketstatetype = require("../shared/dtos/socket-state.type");
-const _websocketconstants = require("../services/moonraker/constants/websocket.constants");
+const _moonrakerconstants = require("../services/moonraker/constants/moonraker.constants");
 const _eventconstants = require("../constants/event.constants");
 class TestPrinterSocketStore {
-    testSocket;
-    socketIoGateway;
     socketFactory;
+    socketIoGateway;
     eventEmitter2;
+    testSocket;
     logger;
-    constructor({ socketFactory, socketIoGateway, eventEmitter2, loggerFactory }){
+    constructor(loggerFactory, socketFactory, socketIoGateway, eventEmitter2){
         this.socketFactory = socketFactory;
         this.socketIoGateway = socketIoGateway;
         this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(TestPrinterSocketStore.name);
     }
-    async setupTestPrinter(printer) {
+    async setupTestPrinter(correlationToken, printer) {
         if (this.testSocket) {
             this.testSocket.close();
-            this.testSocket = null;
+            delete this.testSocket;
         }
-        const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterRules);
+        const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterSchema);
         validatedData.enabled = true;
-        const { correlationToken } = printer;
         this.testSocket = this.socketFactory.createInstance(printer.printerType);
         this.testSocket.registerCredentials({
             printerId: correlationToken,
             loginDto: {
                 apiKey: printer.apiKey,
+                username: printer.username,
+                password: printer.password,
                 printerURL: printer.printerURL,
                 printerType: printer.printerType
             }
@@ -53,11 +54,11 @@ class TestPrinterSocketStore {
             (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
             (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
             (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR),
-            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED),
-            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
-            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
-            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
-            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
+            (0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED),
+            (0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
+            (0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
+            (0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
+            (0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
         ];
         const listener = ({ event, payload, printerId })=>{
             if (printerId !== correlationToken) {
@@ -77,11 +78,15 @@ class TestPrinterSocketStore {
             await this.testSocket.setupSocketSession();
             this.logger.log("Test socket connection started");
             const promise = new Promise(async (resolve, reject)=>{
+                if (!this.testSocket) {
+                    this.logger.error("Aborting test as testSocket is undefined.");
+                    return;
+                }
                 this.testSocket.open();
-                for await (const startTime of (0, _promises.setInterval)(100)){
+                for await (const _startTime of (0, _promises.setInterval)(100)){
                     if (!this.testSocket) {
                         this.logger.warn("Test without socket, rejecting");
-                        reject();
+                        reject(new Error("Test without socket, rejecting"));
                         return;
                     }
                     if (this.testSocket.socketState === _socketstatetype.SOCKET_STATE.authenticated) {