@fdm-monster/server 1.9.0-rc1 → 1.9.0

package/dist/handlers/logging/static.logger.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    createStaticLogger: function() {
+        return createStaticLogger;
+    },
+    getStaticLogger: function() {
+        return getStaticLogger;
+    },
+    logContextClassProperty: function() {
+        return logContextClassProperty;
+    }
+});
+const _winston = /*#__PURE__*/ _interop_require_default(require("winston"));
+const _nodeprocess = /*#__PURE__*/ _interop_require_default(require("node:process"));
+const _serverconstants = require("../../server.constants");
+const _lokiloggingtransport = require("./loki-logging.transport");
+const _fileloggingtransport = require("./file-logging.transport");
+const _envutils = require("../../utils/env.utils");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+let staticLogger = null;
+const levelMap = {
+    error: "ERR",
+    warn: "WRN",
+    info: "INF",
+    debug: "DBG",
+    http: "HTT",
+    verbose: "VRB",
+    silly: "SLY"
+};
+const logContextClassProperty = "class";
+function getStaticLogger() {
+    if (!staticLogger) {
+        throw new Error("Logger not yet initialized.");
+    }
+    return staticLogger;
+}
+function createStaticLogger(config) {
+    if (staticLogger) {
+        return;
+    }
+    const isProd = _nodeprocess.default.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
+    const isTest = _nodeprocess.default.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultTestEnv;
+    const effectiveLogLevel = isProd || isTest ? "warn" : "debug";
+    const lokiTransport = (0, _lokiloggingtransport.createLokiLoggingTransport)({
+        logLevel: effectiveLogLevel
+    });
+    const extraWinstonTransports = [];
+    if (lokiTransport) {
+        extraWinstonTransports.push(lokiTransport);
+    }
+    const fileLoggerTransport = (0, _fileloggingtransport.createFileLoggingTransport)({
+        enabled: config.enableFileLogs,
+        isTest
+    });
+    if (fileLoggerTransport) {
+        extraWinstonTransports.push(fileLoggerTransport);
+    }
+    staticLogger = _winston.default.createLogger({
+        transports: [
+            ...extraWinstonTransports,
+            new _winston.default.transports.Console({
+                level: effectiveLogLevel,
+                format: _winston.default.format.combine(...(0, _envutils.isDevelopmentEnvironment)() && _nodeprocess.default.env[_serverconstants.AppConstants.ENABLE_COLORED_LOGS_KEY] == "true" ? [
+                    _winston.default.format((info)=>{
+                        info.rawLevel = info.level;
+                        return info;
+                    })(),
+                    _winston.default.format.colorize({
+                        colors: {
+                            error: "red",
+                            warn: "yellow",
+                            info: "white",
+                            debug: "gray",
+                            http: "magenta",
+                            verbose: "cyan",
+                            silly: "gray"
+                        },
+                        level: true,
+                        message: true,
+                        all: false
+                    }),
+                    _winston.default.format.printf((info)=>{
+                        const now = new Date();
+                        const timestamp = `${now.toISOString().split("T")[0]} ${now.toTimeString().split(" ")[0]}.${now.getMilliseconds().toString().padStart(3, "0")}`;
+                        const levelAbbr = levelMap[info.rawLevel] ?? info.rawLevel.substring(0, 3).toUpperCase();
+                        const gray = "\x1b[90m";
+                        const reset = info.message.substring(0, 5) ?? "\x1b[0m";
+                        const numberRegex = /\b\d+\b/g;
+                        const coloredMessage = info.message.replace(numberRegex, (match)=>`\x1b[35m${match}${reset}`);
+                        const serviceName = info[logContextClassProperty] ?? "unknown";
+                        let logEntry = `${gray}[${timestamp} ${reset}${levelAbbr}${reset}${gray}]${reset} ${gray}[${reset}${serviceName}${gray}]${reset} ${coloredMessage}`;
+                        if (info.meta) {
+                            const metaString = JSON.stringify(info.meta);
+                            const coloredMeta = metaString.replace(numberRegex, (match)=>`\x1b[35m${match}${reset}`);
+                            logEntry += ` ${coloredMeta}`;
+                        }
+                        return logEntry;
+                    })
+                ] : [])
+            })
+        ],
+        format: _winston.default.format.printf((info)=>{
+            const now = new Date();
+            const timestamp = `${now.toISOString().split("T")[0]} ${now.toTimeString().split(" ")[0]}.${now.getMilliseconds().toString().padStart(3, "0")}`;
+            const levelAbbr = levelMap[info.level] || `[${info.level.substring(0, 3).toUpperCase()}]`;
+            const serviceName = info[logContextClassProperty] ?? "unknown";
+            let message = `[${timestamp} ${levelAbbr}] [${serviceName}] ${info.message}`;
+            if (info.meta) {
+                const pascalCaseMeta = Object.entries(info.meta).reduce((acc, [key, value])=>{
+                    const pascalKey = key.charAt(0).toUpperCase() + key.slice(1);
+                    acc[pascalKey] = value;
+                    return acc;
+                }, {});
+                message += ` ${JSON.stringify(pascalCaseMeta)}`;
+            }
+            return message;
+        })
+    });
+}
+
+//# sourceMappingURL=static.logger.js.map

package/dist/handlers/logging/static.logger.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/handlers/logging/static.logger.ts"],"names":["createStaticLogger","getStaticLogger","logContextClassProperty","staticLogger","levelMap","error","warn","info","debug","http","verbose","silly","Error","config","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","lokiTransport","createLokiLoggingTransport","logLevel","extraWinstonTransports","push","fileLoggerTransport","createFileLoggingTransport","enabled","enableFileLogs","winston","createLogger","transports","Console","level","format","combine","isDevelopmentEnvironment","ENABLE_COLORED_LOGS_KEY","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","serviceName","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice"],"mappings":"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"}

package/dist/index.js

@@ -6,6 +6,19 @@ const _node = require("@sentry/node");
 const _serverenv = require("./server.env");
 const _servercore = require("./server.core");
 const _containertokens = require("./container.tokens");
+const _dotenv = require("dotenv");
+const _logger = require("./handlers/logger");
+const _path = require("path");
+const _fsutils = require("./utils/fs.utils");
+const _staticlogger = require("./handlers/logging/static.logger");
+(0, _dotenv.config)({
+    path: (0, _path.join)((0, _fsutils.superRootPath)(), "./.env")
+});
+(0, _staticlogger.createStaticLogger)({
+    enableFileLogs: true
+});
+const logger = new _logger.LoggerService("FDM-Environment");
+logger.log("✓ Parsed environment with (optional) .env file, created static logger");
 (0, _serverenv.setupEnvConfig)();
 (0, _servercore.setupServer)().then(({ httpServer, container })=>{
     container.resolve(_containertokens.DITokens.serverHost).boot(httpServer).catch(async (e)=>{

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["setupEnvConfig","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","error","captureException","flush","process","exit"],"mappings":";;;;sBAAwC;2BACT;4BACH;iCACH;AAGzBA,IAAAA,yBAAc;AAEdC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQC,KAAK,CAAC,2DAA2DF;QAEzEG,IAAAA,sBAAgB,EAACH;QACjB,MAAMI,IAAAA,WAAK,EAAC;QACZC,QAAQC,IAAI,CAAC;IACf;AACJ"}
+{"version":3,"sources":["../src/index.ts"],"names":["config","path","join","superRootPath","createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","error","captureException","flush","process","exit"],"mappings":";;;;sBAAwC;2BACT;4BACH;iCACH;wBAEF;wBACiB;sBACnB;yBACS;8BACK;AAEnCA,IAAAA,cAAM,EAAC;IAAEC,MAAMC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAAU;AAC/CC,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAE1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQC,KAAK,CAAC,2DAA2DF;QAEzEG,IAAAA,sBAAgB,EAACH;QACjB,MAAMI,IAAAA,WAAK,EAAC;QACZC,QAAQC,IAAI,CAAC;IACf;AACJ"}

package/dist/middleware/socketio.middleware.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "authorize", {
     }
 });
 const _passportjwt = require("passport-jwt");
-const authorize = (settingsStore, options, verify)=>{
+const authorize = (settingsStore, options, logger, verify)=>{
     const strategy = new _passportjwt.Strategy(options, verify);
     return async function authorizeCallback(socket, next) {
         if (!await settingsStore.getLoginRequired()) {
@@ -18,8 +18,16 @@ const authorize = (settingsStore, options, verify)=>{
         strategy.success = function success(_user) {
             next();
         };
-        strategy.fail = (info)=>next(new Error(info));
-        strategy.error = (error)=>next(error);
+        strategy.fail = (info)=>{
+            logger.warn(`Failure authenticating SocketIO user, reason: '${info}'`, {
+                reason: info
+            });
+            next(new Error(info));
+        };
+        strategy.error = (error)=>{
+            logger.warn("Error authenticating SocketIO user");
+            next(error);
+        };
         strategy.authenticate(socket, {});
     };
 };

package/dist/middleware/socketio.middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/socketio.middleware.ts"],"names":["authorize","settingsStore","options","verify","strategy","PassportJwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","_user","fail","info","Error","error","authenticate"],"mappings":";;;;+BAOaA;;;eAAAA;;;6BANkF;AAMxF,MAAMA,YAAY,CACvBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAmB,CAACH,SAASC;IAElD,OAAO,eAAeG,kBACpBC,MAAkD,EAClDC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,KAAY;YAG9CH;QACF;QACAJ,SAASQ,IAAI,GAAG,CAACC,OAASL,KAAK,IAAIM,MAAMD;QACzCT,SAASW,KAAK,GAAG,CAACA,QAAUP,KAAKO;QAEjCX,SAASY,YAAY,CAACT,QAAe,CAAC;IACxC;AACF"}
+{"version":3,"sources":["../../src/middleware/socketio.middleware.ts"],"names":["authorize","settingsStore","options","logger","verify","strategy","PassportJwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","_user","fail","info","warn","reason","Error","error","authenticate"],"mappings":";;;;+BAQaA;;;eAAAA;;;6BAPkF;AAOxF,MAAMA,YAAY,CACvBC,eACAC,SACAC,QACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAmB,CAACJ,SAASE;IAElD,OAAO,eAAeG,kBACpBC,MAAkD,EAClDC,IAAmC;QAEnC,IAAI,CAAE,MAAMR,cAAcS,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,KAAY;YAG9CH;QACF;QACAJ,SAASQ,IAAI,GAAG,CAACC;YACfX,OAAOY,IAAI,CAAC,CAAC,+CAA+C,EAAED,KAAK,CAAC,CAAC,EAAE;gBAAEE,QAAQF;YAAK;YACtFL,KAAK,IAAIQ,MAAMH;QACjB;QACAT,SAASa,KAAK,GAAG,CAACA;YAChBf,OAAOY,IAAI,CAAC;YACZN,KAAKS;QACP;QAEAb,SAASc,YAAY,CAACX,QAAe,CAAC;IACxC;AACF"}

package/dist/models/Settings.js

@@ -130,7 +130,12 @@ const SettingsSchema = new _mongoose.Schema({
     [_serversettingsconstants.timeoutSettingKey]: {
         apiTimeout: {
             type: Number,
-            default: 1000,
+            default: (0, _serversettingsconstants.getDefaultTimeout)().apiTimeout,
+            required: true
+        },
+        apiUploadTimeout: {
+            type: Number,
+            default: (0, _serversettingsconstants.getDefaultTimeout)().apiUploadTimeout,
             required: true
         }
     }

package/dist/models/Settings.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","serverSettingsKey","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","experimentalThumbnailSupport","experimentalPrusaLinkSupport","frontendSettingKey","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA2LaA;;;eAAAA;;;0BA3LiB;yCAQvB;AAqDP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACiB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBrB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAmB,eAAe;YACbtB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAoB,cAAc;YACZvB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAqB,8BAA8B;YAC5BxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,2BAA2B;YACzBzB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAuB,8BAA8B;YAC5B1B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAwB,8BAA8B;YAC5B3B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACyB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACR7B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA2B,UAAU;YACR9B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA4B,YAAY;YACV/B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA6B,+BAA+B;YAC7BhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAAC8B,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVlC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAWwC,IAAAA,eAAK,EAAC,kBAAkBvC"}
+{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","serverSettingsKey","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","experimentalThumbnailSupport","experimentalPrusaLinkSupport","frontendSettingKey","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","timeoutSettingKey","apiTimeout","getDefaultTimeout","apiUploadTimeout","model"],"mappings":";;;;+BAkMaA;;;eAAAA;;;0BAlMiB;yCASvB;AAsDP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACiB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBrB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAmB,eAAe;YACbtB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAoB,cAAc;YACZvB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAqB,8BAA8B;YAC5BxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,2BAA2B;YACzBzB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAuB,8BAA8B;YAC5B1B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAwB,8BAA8B;YAC5B3B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACyB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACR7B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA2B,UAAU;YACR9B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA4B,YAAY;YACV/B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA6B,+BAA+B;YAC7BhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAAC8B,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVlC,MAAMO;YACNL,SAASiC,IAAAA,0CAAiB,IAAGD,UAAU;YACvC/B,UAAU;QACZ;QACAiC,kBAAkB;YAChBpC,MAAMO;YACNL,SAASiC,IAAAA,0CAAiB,IAAGC,gBAAgB;YAC7CjC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAW0C,IAAAA,eAAK,EAAC,kBAAkBzC"}

package/dist/server.constants.js

@@ -53,6 +53,7 @@ const AppConstants = {
     OVERRIDE_DEMO_ROLE: "OVERRIDE_DEMO_ROLE",
     DEFAULT_DEMO_ROLE: "ADMIN",
     defaultDevelopmentEnv: "development",
+    ENABLE_COLORED_LOGS_KEY: "ENABLE_COLORED_LOGS",
     defaultTestEnv: "test",
     defaultProductionEnv: "production",
     knownEnvNames: [
@@ -70,7 +71,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.10.1",
+    defaultClientMinimum: "1.11.1",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","ENABLE_COLORED_LOGS_KEY","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,yBAAyB;IACzBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}

package/dist/server.env.js

@@ -37,7 +37,6 @@ _export(exports, {
 const _migratemongo = require("migrate-mongo");
 const _path = require("path");
 const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
-const _dotenv = require("dotenv");
 const _serverconstants = require("./server.constants");
 const _logger = require("./handlers/logger");
 const _envutils = require("./utils/env.utils");
@@ -85,10 +84,8 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-const logger = new _logger.LoggerService("FDM-Environment", false);
 const instructionsReferralURL = "https://docs.fdm-monster.net";
 const packageJsonPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./package.json");
-const dotEnvPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./.env");
 function isEnvTest() {
     return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultTestEnv;
 }
@@ -96,6 +93,7 @@ function isEnvProd() {
     return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
 }
 function ensureNodeEnvSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const environment = process.env[_serverconstants.AppConstants.NODE_ENV_KEY];
     if (!environment || !_serverconstants.AppConstants.knownEnvNames.includes(environment)) {
         const newEnvName = _serverconstants.AppConstants.defaultProductionEnv;
@@ -106,14 +104,17 @@ function ensureNodeEnvSet() {
     }
 }
 function ensurePackageVersionSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const packageJsonVersion = require(packageJsonPath).version;
     process.env[_serverconstants.AppConstants.VERSION_KEY] ??= packageJsonVersion;
     logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
 }
 function printInstructionsURL() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
 }
 function fetchMongoDBConnectionString() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     if (!process.env[_serverconstants.AppConstants.MONGO_KEY]) {
         logger.debug(`~ ${_serverconstants.AppConstants.MONGO_KEY} environment variable is not set. Assuming default`);
         printInstructionsURL();
@@ -130,6 +131,7 @@ function fetchServerPort() {
     return port;
 }
 function ensureMongoDbConnectionStringSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const dbConnectionString = process.env[_serverconstants.AppConstants.MONGO_KEY];
     if (!dbConnectionString) {
         fetchMongoDBConnectionString();
@@ -138,6 +140,7 @@ function ensureMongoDbConnectionStringSet() {
     }
 }
 function setupSentry() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const sentryDsnToken = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.sentryCustomDsnToken, _serverconstants.AppConstants.sentryCustomDsnDefault);
     _node.init({
         dsn: sentryDsnToken,
@@ -153,6 +156,7 @@ function setupSentry() {
     });
 }
 function ensurePortSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     fetchServerPort();
     if (!process.env[_serverconstants.AppConstants.SERVER_PORT_KEY]) {
         logger.log(`~ ${_serverconstants.AppConstants.SERVER_PORT_KEY} environment variable is not set`);
@@ -160,13 +164,7 @@ function ensurePortSet() {
         process.env[_serverconstants.AppConstants.SERVER_PORT_KEY] = _serverconstants.AppConstants.defaultServerPort.toString();
     }
 }
-function setupEnvConfig(skipDotEnv = false) {
-    if (!skipDotEnv) {
-        (0, _dotenv.config)({
-            path: dotEnvPath
-        });
-        logger.log("✓ Parsed environment and (optional) .env file");
-    }
+function setupEnvConfig() {
     ensureNodeEnvSet();
     ensurePackageVersionSet();
     setupSentry();
@@ -180,6 +178,7 @@ function setupEnvConfig(skipDotEnv = false) {
     }
 }
 async function runMigrations(db, client) {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const migrationsStatus = await (0, _migratemongo.status)(db);
     const pendingMigrations = migrationsStatus.filter((m)=>m.appliedAt === "PENDING");
     if (pendingMigrations.length) {

package/dist/server.env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDbConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
+{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDbConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","instructionsReferralURL","packageJsonPath","join","superRootPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","logger","Logger","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}

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

@@ -14,7 +14,7 @@ class GithubService {
     logger;
     constructor(loggerFactory, octokitService){
         this.octokitService = octokitService;
-        this.logger = loggerFactory(GithubService.name, false);
+        this.logger = loggerFactory(GithubService.name);
     }
     async wasAuthenticated() {
         const result = await this.octokitService.auth();

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

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

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

@@ -25,6 +25,7 @@ function _interop_require_default(obj) {
     };
 }
 class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRpcExtendedAdapter {
+    moonrakerClient;
     eventEmitter2;
     configService;
     serverVersion;
@@ -40,15 +41,13 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
     printerId;
     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 = {
+        super(loggerFactory), this.moonrakerClient = moonrakerClient, 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";
@@ -103,7 +102,13 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         super.close();
     }
     async setupSocketSession() {
-        await this.client.getApiVersion(this.login);
+        this.resetSocketState();
+        await this.moonrakerClient.getApiVersion(this.login).catch((e)=>{
+            this.setSocketState("aborted");
+            this.logger.error(`Printer (${this.printerId}) network or transport error, marking it as unreachable; ${e}`);
+            this.setApiState("noResponse");
+            throw e;
+        });
         this.setApiState(_apistatetype.API_STATE.responding);
         await this.updateCurrentStateSafely();
         if (this.refreshPrinterObjectsInterval) {
@@ -145,7 +150,7 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
         });
         try {
             const query = this.subscriptionObjects;
-            const result = await this.client.postSubscribePrinterObjects(this.login, response.result.connection_id, query);
+            const result = await this.moonrakerClient.postSubscribePrinterObjects(this.login, response.result.connection_id, query);
             this.printerObjects = result.data.result;
             await this.emitCurrentEvent(this.printerObjects);
         } catch (e) {
@@ -227,7 +232,7 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
     async updateCurrentStateSafely() {
         try {
             const query = this.subscriptionObjects;
-            const objects = await this.client.getPrinterObjectsQuery(this.login, query);
+            const objects = await this.moonrakerClient.getPrinterObjectsQuery(this.login, query);
             this.printerObjects = objects.data.result;
             this.setApiState(_apistatetype.API_STATE.responding);
             return await this.emitCurrentEvent(this.printerObjects);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","socketState","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","login","printerId","refreshPrinterObjectsInterval","printerObjects","client","socketURL","constructor","loggerFactory","moonrakerClient","eventEmitter2","configService","serverVersion","SOCKET_STATE","unopened","API_STATE","unset","eventtime","status","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","httpUrlString","normalizeUrl","printerURL","httpUrl","URL","httpUrlPath","pathname","wsUrl","httpToWsUrl","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","emitEventSync","event","payload","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","setSocketState","isClosedOrAborted","closed","aborted","afterOpened","_","opened","response","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","query","result","postSubscribePrinterObjects","connection_id","data","emitCurrentEvent","e","ae","isAxiosError","warn","PP","error","message","noResponse","onEventMessage","Date","now","authenticated","eventName","log","JSON","stringify","substring","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","subState","Object","keys","includes","merge","emitEvent","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","objects","getPrinterObjectsQuery","castError","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","completion","state","systemState","printState","idleState","print_duration","toUpperCase","progress","currentMessage","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":";;;;+BAkEaA;;;eAAAA;;;iCA3DgB;0BACD;2CAEF;oCACK;iCACW;8BACN;kCAsBjB;+DAIL;qCAGsC;6CAKR;8BAEf;;;;;;AAiBtB,MAAMA,kCAAkCC,wDAA2B;;;;IAC/DC,YAAgB;IACzBC,YAAiD;IACjDC,6BAAmD;IACnDC,aAAqB;IACrBC,qBAA2C;IAC3CC,gBAAwB;IACxBC,wBAA8C;IAC9CC,SAAqC;IAErCC,MAAgB;IAChBC,UAAmB;IACnBC,8BAA+C;IAC/CC,eAGE;IAEeC,OAAwB;IACjCC,UAAgB;IAExBC,YACEC,aAA6B,EAC7BC,eAAgC,EAChC,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,CACtC;QACA,KAAK,CAACJ,qBAJWE,gBAAAA,oBACAC,gBAAAA,oBACAC,gBAAAA,oBAzBVnB,cAAc,QACvBC,cAA2BmB,6BAAY,CAACC,QAAQ,OAChDnB,+BAA8C,WAC9CC,eAAe,YACfC,uBAAsC,WACtCC,kBAAkB,YAClBC,0BAAyC,WACzCC,WAAqBe,uBAAS,CAACC,KAAK,OAKpCZ,iBAAkE;YAChEa,WAAW;YACXC,QAAQ;QACV;QAcE,IAAI,CAACC,MAAM,GAAGX,cAAcjB,0BAA0B6B,IAAI;QAC1D,IAAI,CAACf,MAAM,GAAGI;IAChB;IAEA,IAAIY,aAAa;QACf,OAAO,IAAI,CAACV,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACC,oBAAoB,EAAED,6BAAY,CAACE,wBAAwB,MAAM;IAC9G;IAEA,IAAYC,sBAAsB;QAChC,OAAO;YACLC,cAAc,EAAE;YAChBC,cAAc,EAAE;YAChBC,aAAa,EAAE;YACfC,SAAS,EAAE;YACXC,YAAY,EAAE;YACdC,UAAU,EAAE;YACZC,gBAAgB,EAAE;YAClBC,UAAU,EAAE;YACZC,gBAAgB,EAAE;YAClBC,YAAY,EAAE;YACdC,gBAAgB,EAAE;YAClBC,KAAK,EAAE;YACPC,eAAe,EAAE;YACjBC,cAAc,EAAE;QAGlB;IAGF;IAEAC,cAAc;QACZ,OAAO;IACT;IAEAC,aAAa;QACX,OAAO,IAAI,CAAChD,WAAW,KAAKmB,6BAAY,CAACC,QAAQ;IACnD;IAEA6B,cAAc;QACZ,OAAO;IACT;IAEA,MAAMC,gBAAgB,CACtB;IAEAC,oBAAoBC,WAAyB,EAAE;QAC7C,MAAM,EAAE5C,SAAS,EAAE6C,QAAQ,EAAE,GAAGD;QAChC,IAAI,CAAC5C,SAAS,GAAGA;QACjB,IAAI,CAACD,KAAK,GAAG8C;QAEb,MAAMC,gBAAgBC,IAAAA,0BAAY,EAAC,IAAI,CAAChD,KAAK,CAACiD,UAAU;QACxD,MAAMC,UAAU,IAAIC,IAAIJ;QACxB,MAAMK,cAAcF,QAAQG,QAAQ;QAEpC,MAAMC,QAAQC,IAAAA,qBAAW,EAACR;QAC1BO,MAAMD,QAAQ,GAAG,AAACD,CAAAA,eAAe,GAAE,IAAK;QACxC,IAAI,CAAC/C,SAAS,GAAGiD;IACnB;IAEAE,OAAO;QACL,IAAI,IAAI,CAACC,MAAM,EAAE;YACf,MAAM,IAAIC,MAAM,CAAC,yDAAyD,CAAC;QAC7E;QAEA,KAAK,CAACF,KAAK,IAAI,CAACnD,SAAS;IAC3B;IAEAsD,QAAQ;QACNC,cAAc,IAAI,CAAC1D,6BAA6B;QAChD,KAAK,CAACyD;IACR;IAEA,MAAME,qBAAoC;QAMxC,MAAM,IAAI,CAACzD,MAAM,CAAC0D,aAAa,CAAC,IAAI,CAAC9D,KAAK;QAC1C,IAAI,CAAC+D,WAAW,CAACjD,uBAAS,CAACkD,UAAU;QAErC,MAAM,IAAI,CAACC,wBAAwB;QAEnC,IAAI,IAAI,CAAC/D,6BAA6B,EAAE;YACtC0D,cAAc,IAAI,CAAC1D,6BAA6B;QAClD;QACA,IAAI,CAACA,6BAA6B,GAAGgE,YAAY;YAC/C,MAAM,IAAI,CAACD,wBAAwB;QACrC,GAAG;IACL;IAEAE,cAAcC,KAAa,EAAEC,OAAY,EAAE;QACzC,IAAI,CAAC,IAAI,CAACC,oBAAoB,EAAE;YAC9B;QACF;QAEA,IAAI,CAAC7D,aAAa,CAAC8D,IAAI,CAACC,IAAAA,kCAAc,EAACJ,QAAQ;YAC7CA;YACAC;YACApE,WAAW,IAAI,CAACA,SAAS;QAC3B;IACF;IAEAwE,mBAAmB;QACjB,IAAI,CAACC,cAAc,CAAC;QACpB,IAAI,CAACX,WAAW,CAAC;IACnB;IAEAY,oBAAoB;QAClB,OAAO,IAAI,CAAClF,WAAW,KAAKmB,6BAAY,CAACgE,MAAM,IAAI,IAAI,CAACnF,WAAW,KAAKmB,6BAAY,CAACiE,OAAO;IAC9F;IAEA,MAAgBC,YAAYC,CAAU,EAAiB;QACrD,IAAI,CAACL,cAAc,CAAC9D,6BAAY,CAACoE,MAAM;QAEvC,MAAMC,WAAW,MAAM,IAAI,CAACC,WAAW,CAAuD;YAC5FC,SAAS;YACTC,QAAQ;YACRC,QAAQ;gBACNC,aAAa;gBACbC,SAAS,IAAI,CAAC5E,aAAa;gBAC3B6E,MAAM;gBACNC,KAAKnE,6BAAY,CAACoE,SAAS;YAC7B;YACAC,IAAI;QACN;QAEA,IAAI;YACF,MAAMC,QAAiD,IAAI,CAACnE,mBAAmB;YAE/E,MAAMoE,SAAS,MAAM,IAAI,CAACzF,MAAM,CAAC0F,2BAA2B,CAC1D,IAAI,CAAC9F,KAAK,EACViF,SAASY,MAAM,CAACE,aAAa,EAC7BH;YAEF,IAAI,CAACzF,cAAc,GAAG0F,OAAOG,IAAI,CAACH,MAAM;YACxC,MAAM,IAAI,CAACI,gBAAgB,CAAC,IAAI,CAAC9F,cAAc;QACjD,EAAE,OAAO+F,GAAG;YACV,MAAMC,KAAKD;YACX,IAAIC,GAAGC,YAAY,EAAE;gBACnB,IAAID,GAAGlB,QAAQ,EAAEhE,WAAW,KAAK;oBAE/B,IAAI,CAACC,MAAM,CAACmF,IAAI,CAAC,CAAC,mBAAmB,EAAEC,IAAAA,oBAAE,EAACH,GAAGlB,QAAQ,CAACe,IAAI,EAAEO,OAAOC,UAAU;gBAC/E,OAAO,IAAIL,GAAGlB,QAAQ,EAAEhE,WAAW,KAAK;oBACtC,IAAI,CAACC,MAAM,CAACqF,KAAK,CAAC;gBACpB;gBACA,IAAI,CAACxC,WAAW,CAACjD,uBAAS,CAAC2F,UAAU;gBACrC;YACF;YAEA,IAAI,CAACvF,MAAM,CAACqF,KAAK,CAAC;YAClB,IAAI,CAACxC,WAAW,CAACjD,uBAAS,CAAC2F,UAAU;QACvC;IACF;IAEA,MAAgBC,eAAetC,KAAsB,EAAiB;QACpE,IAAI,CAAC1E,4BAA4B,GAAGiH,KAAKC,GAAG;QAE5C,IAAI,IAAI,CAACnH,WAAW,KAAKmB,6BAAY,CAACiG,aAAa,EAAE;YACnD,IAAI,CAACnC,cAAc,CAAC;QACtB;QAEA,MAAMoC,YAAY1C,MAAMgB,MAAM;QAC9B,IAAI,IAAI,CAAChE,UAAU,EAAE;YACnB,IAAI,CAACF,MAAM,CAAC6F,GAAG,CAAC,CAAC,OAAO,EAAED,UAAU,CAAC,EAAEE,KAAKC,SAAS,CAAC7C,MAAMiB,MAAM,GAAG6B,UAAU,GAAG,IAAI,GAAG,CAAC;QAC5F;QAGA,MAAM7C,UAAUD,MAAMiB,MAAM,EAAE8B,SAAS/C,MAAMiB,MAAM,CAAC,EAAE,GAAG+B;QAEzD,IAAIN,cAAc,gCAAgC;YAChD,IAAI,CAAC1C,MAAMiB,MAAM,EAAE;gBAEjB,IAAI,CAACnE,MAAM,CAACqF,KAAK,CAAC;gBAClB;YACF;YACA,MAAMc,iBAAiBjD,MAAMiB,MAAM,CAAC,EAAE;YACtC,IACEgC,eAAeC,OAAO,EAAEC,gBACxBF,eAAeG,WAAW,EAAED,gBAC5BF,eAAeI,SAAS,EAAEF,cAC1B;gBACA,IAAI,CAACrG,MAAM,CAAC6F,GAAG,CAAC;gBAChB,MAAM,IAAI,CAAClD,kBAAkB;YAC/B;YACA;QACF;QACA,IAAIiD,cAAc,uBAAuB;YACvC,IAAI,CAAC5F,MAAM,CAAC6F,GAAG,CAAC;YAChB,OAAO,MAAM,IAAI,CAAClD,kBAAkB;QACtC;QACA,IAAIiD,cAAc,8BAA8B;YAC9C,IAAI,CAAC5F,MAAM,CAAC6F,GAAG,CAAC;YAChB,OAAO,MAAM,IAAI,CAAClD,kBAAkB;QACtC;QACA,IAAIiD,cAAc,0BAA0B;YAC1C,IAAI,CAAC5F,MAAM,CAAC6F,GAAG,CAAC;YAChB,OAAO,MAAM,IAAI,CAAClD,kBAAkB;QACtC;QAEA,IAAIiD,cAAc,wBAAwB;YACxC,IAAI,CAAC1C,MAAMiB,MAAM,EAAE;gBAEjB,IAAI,CAACnE,MAAM,CAACqF,KAAK,CAAC;gBAClB;YACF;YAEA,MAAM,CAACP,MAAMhF,UAAU,GAAG,AAACoD,MAA+CiB,MAAM;YAEhF,MAAMqC,WAAWC,OAAOC,IAAI,CAAC5B,KAAK,CAAC,EAAE;YACrC,IAAI2B,OAAOC,IAAI,CAAC,AAAC,IAAI,CAACzH,cAAc,CAA8Cc,MAAM,EAAE4G,QAAQ,CAACH,WAAW;gBAC5G,IAAI,CAACvH,cAAc,CAACc,MAAM,GAAG8D,eAAC,CAAC+C,KAAK,CAAC,IAAI,CAAC3H,cAAc,CAACc,MAAM,EAAE+E;gBACjE,IAAI,CAAC7F,cAAc,CAACa,SAAS,GAAGA;gBAChC,MAAM,IAAI,CAACiF,gBAAgB,CAAC,IAAI,CAAC9F,cAAc;YACjD,OAAO;gBACL,IAAI,CAACe,MAAM,CAACmF,IAAI,CAAC,CAAC,SAAS,EAAEqB,SAAS,QAAQ,CAAC;YACjD;YACA;QACF;QAEA,MAAM,IAAI,CAACK,SAAS,CAACjB,WAAWzC;IAClC;IAEA,MAAgB2D,YAAY5D,KAAU,EAAE;QACtC,IAAI,CAACM,cAAc,CAAC;QACpB,OAAO,IAAI,CAACjB,MAAM;QAClB,MAAM,IAAI,CAACsE,SAAS,CAACE,oCAAS,CAACC,SAAS,EAAE;IAC5C;IAEA,MAAgBC,QAAQ5B,KAAU,EAAE;QAClC,IAAI,CAAC7B,cAAc,CAAC;QACpB,MAAM,IAAI,CAACqD,SAAS,CAACE,oCAAS,CAACG,QAAQ,EAAE7B,OAAOY,SAASZ,QAAQ;IACnE;IAEA,MAActC,2BAA2B;QACvC,IAAI;YACF,MAAM2B,QAAiD,IAAI,CAACnE,mBAAmB;YAC/E,MAAM4G,UAAU,MAAM,IAAI,CAACjI,MAAM,CAACkI,sBAAsB,CACtD,IAAI,CAACtI,KAAK,EACV4F;YAEF,IAAI,CAACzF,cAAc,GAAGkI,QAAQrC,IAAI,CAACH,MAAM;YACzC,IAAI,CAAC9B,WAAW,CAACjD,uBAAS,CAACkD,UAAU;YACrC,OAAO,MAAM,IAAI,CAACiC,gBAAgB,CAAC,IAAI,CAAC9F,cAAc;QACxD,EAAE,OAAO+F,GAAG;YAKV,MAAMqC,YAAYrC;YAClB,IAAIqC,UAAUnC,YAAY,EAAE;gBAC1B,IAAImC,WAAWtD,UAAUhE,UAAU,KAAK;oBACtC,IAAI,CAACd,cAAc,CAACc,MAAM,GAAG;oBAC7B,IAAI,CAACd,cAAc,CAACa,SAAS,GAAG2F,KAAKC,GAAG;oBACxC,OAAO,MAAM,IAAI,CAACX,gBAAgB,CAAC,IAAI,CAAC9F,cAAc;gBACxD;gBACA,IAAI,CAACe,MAAM,CAACqF,KAAK,CAAC;gBAClB,IAAI,CAACxC,WAAW,CAACjD,uBAAS,CAAC2F,UAAU;gBACrC;YACF;YAEA,IAAI,CAACvF,MAAM,CAACqF,KAAK,CAAC,CAAC,0DAA0D,CAAC;YAC9E,IAAI,CAACxC,WAAW,CAACjD,uBAAS,CAAC2F,UAAU;QACvC;IACF;IAEA,MAAcR,iBAAiBuC,aAA8D,EAAE;QAC7F,MAAMC,yBAAyBD,cAAcvH,MAAM;QASnD,MAAMyH,QAAQ;YACZC,aAAa;YACbC,UAAU;YACVC,YAAY;YACZC,SAAS;YACTC,QAAQ;YACRC,UAAU;YACVC,WAAW;YACXC,eAAe;YACf3C,OAAO;YACP4C,OAAO;YACPC,SAAS;QACX;QACA,IAAIC,WAAW;QACf,IAAIC,YAAY;QAEhB,IAAIC,YAAY;QAChB,IAAIhD,QAAQ;QACZ,IAAIiD,aAA4B;QAEhC,IAAIf,0BAA0B,MAAM;YAClCc,YAAYd,uBAAuBzG,cAAc,EAAEwE;YACnD,IAAIiC,uBAAuB7G,WAAW,EAAE6H,OAAOtC,QAAQ;gBACrD,MAAMuC,cAAcjB,uBAAuBxG,QAAQ;gBACnD,MAAM0H,aAAalB,uBAAuB7G,WAAW,CAAC6H,KAAK;gBAE3D,MAAMG,YAAYnB,uBAAuB9G,YAAY,EAAE8H;gBACvDJ,WAAWZ,uBAAuB7G,WAAW,CAACyH,QAAQ;gBACtDC,YAAYb,uBAAuB7G,WAAW,CAACiI,cAAc;gBAE7DnB,MAAMC,WAAW,GAAGe,YAAYD,KAAK,KAAK;gBAE1C,IAAIf,MAAMC,WAAW,EAAE;oBACrBD,MAAME,QAAQ,GAAGe,eAAe;oBAChCjB,MAAMK,MAAM,GAAGY,eAAe;oBAC9BjB,MAAMS,KAAK,GAAGQ,eAAe,aAAaC,cAAc;oBACxDlB,MAAMU,OAAO,GAAG;gBAClB,OAAO;oBACLV,MAAMnC,KAAK,GAAG;oBACdgD,YAAY,sBAAuBG,CAAAA,YAAYD,KAAK,IAAI,SAAQ,GAAIK;gBACtE;YACF;YAEAN,aAAa,AAACf,CAAAA,uBAAuBzG,cAAc,EAAE+H,YAAY,CAAA,IAAK;QACxE;QAEA,MAAMC,iBAAuC;YAC3CD,UAAU;gBACRT;gBACAE;YACF;YACAC,OAAO;gBACLQ,MAAMV;gBACNhD;gBACAmC;YACF;YACAwB,KAAK;gBACHC,MAAM;oBACJhJ,MAAMkI;oBACNe,MAAMf;gBACR;YACF;QACF;QAEA,MAAM,IAAI,CAACtB,SAAS,CAAC,wBAAwBU;QAC7C,MAAM,IAAI,CAACV,SAAS,CAAC,WAAWiC;IAClC;IAEA,MAAcjC,UAAU3D,KAAa,EAAEC,OAAa,EAAE;QACpD,IAAI,CAAC,IAAI,CAACC,oBAAoB,EAAE;YAC9B;QACF;QAEA,MAAM,IAAI,CAAC7D,aAAa,CAAC4J,SAAS,CAAC7F,IAAAA,kCAAc,EAACJ,QAAQ;YACxDA;YACAC;YACApE,WAAW,IAAI,CAACA,SAAS;YACzBT,aAAa8K,kCAAa;QAC5B;IACF;IAEQ5F,eAAe+E,KAAkB,EAAE;QACzC,IAAI,CAAChK,WAAW,GAAGgK;QACnB,IAAI,CAAC9J,YAAY,GAAG;QACpB,IAAI,CAACC,oBAAoB,GAAG+G,KAAKC,GAAG;QACpC,IAAI,IAAI,CAACxF,UAAU,EAAE;YACnB,IAAI,CAACF,MAAM,CAAC6F,GAAG,CAAC,GAAG,IAAI,CAAC9G,SAAS,CAAC,0BAA0B,CAAC,GAAGwJ;QAClE;QACA,IAAI,CAACtF,aAAa,CAAC8D,oCAAS,CAACsC,gBAAgB,EAAEd;IACjD;IAEQ1F,YAAY0F,KAAe,EAAE;QACnC,IAAIA,UAAU3I,uBAAS,CAAC0J,SAAS,EAAE;YACjC,MAAM,IAAI9G,MAAM;QAClB;QACA,IAAI,CAAC3D,QAAQ,GAAG0J;QAChB,IAAI,CAAC5J,eAAe,GAAG;QACvB,IAAI,CAACC,uBAAuB,GAAG6G,KAAKC,GAAG;QACvC,IAAI,IAAI,CAACxF,UAAU,EAAE;YACnB,IAAI,CAACF,MAAM,CAAC6F,GAAG,CAAC,GAAG,IAAI,CAAC9G,SAAS,CAAC,uBAAuB,CAAC,GAAGwJ;QAC/D;QACA,IAAI,CAACtF,aAAa,CAAC8D,oCAAS,CAACwC,iBAAiB,EAAEhB;IAClD;AACF"}
+{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","socketState","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","login","printerId","refreshPrinterObjectsInterval","printerObjects","socketURL","constructor","loggerFactory","moonrakerClient","eventEmitter2","configService","serverVersion","SOCKET_STATE","unopened","API_STATE","unset","eventtime","status","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","httpUrlString","normalizeUrl","printerURL","httpUrl","URL","httpUrlPath","pathname","wsUrl","httpToWsUrl","open","socket","Error","close","clearInterval","setupSocketSession","resetSocketState","getApiVersion","catch","e","setSocketState","error","setApiState","responding","updateCurrentStateSafely","setInterval","emitEventSync","event","payload","eventEmittingAllowed","emit","moonrakerEvent","isClosedOrAborted","closed","aborted","afterOpened","_","opened","response","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","query","result","postSubscribePrinterObjects","connection_id","data","emitCurrentEvent","ae","isAxiosError","warn","PP","message","noResponse","onEventMessage","Date","now","authenticated","eventName","log","JSON","stringify","substring","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","subState","Object","keys","includes","merge","emitEvent","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","objects","getPrinterObjectsQuery","castError","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","completion","state","systemState","printState","idleState","print_duration","toUpperCase","progress","currentMessage","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}

package/dist/services/moonraker/moonraker.client.js

@@ -21,10 +21,12 @@ function _interop_require_default(obj) {
 class MoonrakerClient {
     httpClientFactory;
     eventEmitter2;
+    settingsStore;
     logger;
-    constructor(loggerFactory, httpClientFactory, eventEmitter2){
+    constructor(loggerFactory, httpClientFactory, eventEmitter2, settingsStore){
         this.httpClientFactory = httpClientFactory;
         this.eventEmitter2 = eventEmitter2;
+        this.settingsStore = settingsStore;
         this.logger = loggerFactory(MoonrakerClient.name);
     }
     async getServerInfo(login) {
@@ -195,7 +197,7 @@ class MoonrakerClient {
             }
         });
     }
-    async postServerFileUpload(login, multerFileOrBuffer, progressToken, root, path, checksum) {
+    async postServerFileUpload(login, multerFileOrBuffer, startPrint, progressToken, root, path, checksum) {
         const formData = new _formdata.default();
         if (root?.length) {
             formData.append("root", root);
@@ -206,7 +208,9 @@ class MoonrakerClient {
         if (checksum?.length) {
             formData.append("checksum", checksum);
         }
-        formData.append("print", "true");
+        if (startPrint) {
+            formData.append("print", "true");
+        }
         let fileBuffer = multerFileOrBuffer.buffer;
         const filename = multerFileOrBuffer.originalname;
         if (fileBuffer) {
@@ -230,7 +234,7 @@ class MoonrakerClient {
         });
         try {
             const response = await this.createClient(login, (b)=>{
-                b.withMultiPartFormData().withHeaders({
+                b.withMultiPartFormData().withTimeout(this.settingsStore.getTimeoutSettings().apiUploadTimeout).withHeaders({
                     ...formData.getHeaders(),
                     "Content-Length": result.toString()
                 }).withOnUploadProgress((p)=>{