@fdm-monster/server 1.9.4 → 2.0.0

package/dist/server.host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","logger","loggerFactory","configService","isTypeormMode","settingsStore","bootTask","socketIoGateway","typeormService","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","use","req","res","next","originalUrl","startsWith","history","loadControllersFunc","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","_","path","resource","endsWith","error","NotFoundException","exceptionFilter","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer","settings","getServerSettings","experimentalClientSupport"],"mappings":"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"}
+{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","logger","loggerFactory","configService","bootTask","socketIoGateway","typeormService","exceptionFilter","name","boot","app","quick_boot","listenRequests","serveControllerRoutes","runOnce","httpListen","hasConnected","swaggerDisabled","process","env","AppConstants","DISABLE_SWAGGER_OPENAPI","use","req","res","next","originalUrl","startsWith","history","loadControllersFunc","log","setupSwagger","bundleDistPath","join","superRootPath","defaultClientBundleStorage","backupClientPath","clientPackageName","express","static","get","_","path","resource","endsWith","error","NotFoundException","handle","bind","port","fetchServerPort","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","attachServer"],"mappings":";;;;+BAiBaA;;;eAAAA;;;gEAjBwB;kFACjB;0BAEC;2BAEW;mCACE;iCACL;yBACC;iCAMM;yBACP;;;;;;AAEtB,MAAMA;;;;;;IACMC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,aAA6B,EAC9C,AAAiBC,QAAkB,EACnC,AAAiBC,eAAgC,EACjD,AAAiBC,cAA8B,EAC/C,AAAiBC,eAAgC,CACjD;aALiBJ,gBAAAA;aACAC,WAAAA;aACAC,kBAAAA;aACAC,iBAAAA;aACAC,kBAAAA;QAEjB,IAAI,CAACN,MAAM,GAAGC,cAAcF,WAAWQ,IAAI;IAC7C;IAEA,MAAMC,KAAKC,GAAgB,EAAEC,aAAa,KAAK,EAAEC,iBAAiB,IAAI,EAAE;QACtE,MAAM,IAAI,CAACC,qBAAqB,CAACH;QAEjC,IAAI,CAACC,YAAY;YACf,MAAM,IAAI,CAACP,QAAQ,CAACU,OAAO;QAC7B;QAEA,IAAIF,gBAAgB,OAAO,IAAI,CAACG,UAAU,CAACL;IAC7C;IAEAM,eAAe;QACb,OAAO,IAAI,CAACV,cAAc,CAACU,YAAY;IACzC;IAEA,MAAMH,sBAAsBH,GAAgB,EAAE;QAC5C,MAAMO,kBAAkBC,QAAQC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,CAAC,KAAK;QAG9EX,IACGY,GAAG,CAAC,CAACC,KAAKC,KAAKC;YACd,IACE,CAACF,IAAIG,WAAW,CAACC,UAAU,CAAC,eAC5B,CAACJ,IAAIG,WAAW,CAACC,UAAU,CAAC,WAC5B,CAACJ,IAAIG,WAAW,CAACC,UAAU,CAAC,gBAC5B,CAACJ,IAAIG,WAAW,CAACC,UAAU,CAAC,eAC5B;gBACAC,IAAAA,kCAAO,IAAGL,KAAKC,KAAKC;YACtB,OAAO;gBACLA;YACF;QACF,GACCH,GAAG,CAACO,IAAAA,oCAAmB;QAG1B,IAAIZ,iBAAiB;YACnB,IAAI,CAAChB,MAAM,CAAC6B,GAAG,CAAC;QAClB,OAAO;YACL,MAAMC,IAAAA,qBAAY,EAACrB,KAAK,IAAI,CAACT,MAAM;YACnC,IAAI,CAACA,MAAM,CAAC6B,GAAG,CAAC;QAClB;QAEA,MAAME,iBAAiBC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAId,6BAAY,CAACe,0BAA0B,EAAE;QACtF,MAAMC,mBAAmBH,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI,gBAAgBd,6BAAY,CAACiB,iBAAiB,EAAE;QAG/F3B,IAAIY,GAAG,CAACgB,gBAAO,CAACC,MAAM,CAACP;QAGvBtB,IAAIY,GAAG,CAACgB,gBAAO,CAACC,MAAM,CAACH;QAEvB1B,IAAI8B,GAAG,CAAC,KAAK,CAACjB,KAAKkB;YACjB,MAAMC,OAAOnB,IAAIG,WAAW;YAE5B,IAAIiB,WAAW;YACf,IAAID,KAAKf,UAAU,CAAC,iBAAiBe,KAAKf,UAAU,CAAC,WAAWe,KAAKf,UAAU,CAAC,eAAee,KAAKf,UAAU,CAAC,cAAc;gBAC3HgB,WAAW;YACb,OAAO,IAAID,KAAKE,QAAQ,CAAC,YAAY;gBACnCD,WAAW;YACb;YAEA,IAAI,CAAC1C,MAAM,CAAC4C,KAAK,CAAC,GAAGF,SAAS,cAAc,EAAED,KAAK,eAAe,CAAC;YAEnE,IAAI,CAACA,KAAKf,UAAU,CAAC,eAAe;gBAClC,MAAM,IAAImB,oCAAiB,CAAC,GAAGH,SAAS,uBAAuB,CAAC,EAAED;YACpE;QACF;QAEAhC,IAAIY,GAAG,CAAC,IAAI,CAACf,eAAe,CAACwC,MAAM,CAACC,IAAI,CAAC,IAAI,CAACzC,eAAe;IAC/D;IAEA,MAAMQ,WAAWL,GAAgB,EAAE;QACjC,MAAMuC,OAAOC,IAAAA,0BAAe;QAE5B,IAAI,CAACD,QAAQE,OAAOC,KAAK,CAACD,OAAOE,QAAQ,CAACJ,QAAQ;YAChD,MAAM,IAAIK,MAAM;QAClB;QAEA,MAAMrC,kBAAkBC,QAAQC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,CAAC,KAAK;QAC9E,MAAMkC,aAAa;QACnB,MAAMC,SAAS9C,IAAI+C,MAAM,CAACN,OAAOE,QAAQ,CAACJ,OAAOM,YAAY;YAC3D,IAAI,CAACtD,MAAM,CAAC6B,GAAG,CAAC,CAAC,8CAA8C,EAAEmB,MAAM;YACvE,IAAI,CAAChC,iBAAiB;gBACpB,IAAI,CAAChB,MAAM,CAAC6B,GAAG,CAAC,CAAC,gDAAgD,EAAEmB,KAAK,SAAS,CAAC;YACpF;QACF;QACA,IAAI,CAAC5C,eAAe,CAACqD,YAAY,CAACF;IACpC;AACF"}

package/dist/services/authentication/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","blacklistedJwtCache","loggerFactory","userService","jwtService","settingsStore","refreshTokenService","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","captureException","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","user","getUser","deleteRefreshToken","InvalidOrExpiredRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","blacklistedJwtCache","loggerFactory","userService","jwtService","settingsStore","refreshTokenService","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","captureException","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","user","getUser","deleteRefreshToken","InvalidOrExpiredRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":"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"}

package/dist/services/authentication/jwt.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","settingsStore","configService","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","toString","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAOaA;;;eAAAA;;;8BAPQ;iCACQ;AAMtB,MAAMA;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA6B,CAC9C;aAFiBD,gBAAAA;aACAC,gBAAAA;IAChB;IAEH,MAAMC,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACN,aAAa,CAACO,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACX,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAAChB,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","settingsStore","configService","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","toString","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAMaA;;;eAAAA;;;8BANQ;iCACQ;AAKtB,MAAMA;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA6B,CAC9C;aAFiBD,gBAAAA;aACAC,gBAAAA;IAChB;IAEH,MAAMC,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACN,aAAa,CAACO,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACX,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAAChB,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}

package/dist/services/bambu/bambu-ftp.adapter.js

@@ -55,8 +55,8 @@ class BambuFtpAdapter {
                 secure: true,
                 secureOptions: {
                     rejectUnauthorized: false,
-                    minVersion: 'TLSv1.2',
-                    maxVersion: 'TLSv1.3'
+                    minVersion: "TLSv1.2",
+                    maxVersion: "TLSv1.3"
                 }
             });
             this.isConnecting = false;
@@ -93,7 +93,7 @@ class BambuFtpAdapter {
         }
     }
     getFileStoragePath(filename) {
-        const storagePath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
+        const storagePath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
         if (!(0, _nodefs.existsSync)(storagePath)) {
             (0, _nodefs.mkdirSync)(storagePath, {
                 recursive: true

package/dist/services/bambu/bambu-ftp.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","rejectUnauthorized","minVersion","maxVersion","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","getFileStoragePath","filename","storagePath","join","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","mkdirSync","recursive","uploadFile","fileBuffer","progressToken","remotePath","tempPath","Date","now","writeFileSync","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","unlinkSync","cleanupError","warn","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","stream","createReadStream","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","rejectUnauthorized","minVersion","maxVersion","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","getFileStoragePath","filename","storagePath","join","superRootPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","fileBuffer","progressToken","remotePath","tempPath","Date","now","writeFileSync","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","unlinkSync","cleanupError","warn","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","stream","createReadStream","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}

package/dist/services/bambu/bambu-mqtt.adapter.js

@@ -53,7 +53,7 @@ class BambuMqttAdapter {
         const { printerId, loginDto } = socketLogin;
         this.printerId = printerId;
         this.login = loginDto;
-        this.host = loginDto.printerURL?.replace(/^https?:\/\//, '');
+        this.host = loginDto.printerURL?.replace(/^https?:\/\//, "");
         this.accessCode = loginDto.password || null;
         this.serial = loginDto.username || null;
     }
@@ -77,10 +77,7 @@ class BambuMqttAdapter {
         if (!this.host || !this.accessCode || !this.serial) {
             throw new Error("Cannot open connection: credentials not registered");
         }
-        this.connect(this.host, this.accessCode, this.serial).catch((err)=>{
-            this.logger.error("Failed to open MQTT connection: " + err.toString());
-            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-        });
+        this.connect(this.host, this.accessCode, this.serial);
     }
     close() {
         this.disconnect().catch((err)=>{
@@ -102,14 +99,15 @@ class BambuMqttAdapter {
     disallowEmittingEvents() {
         this.eventsAllowed = false;
     }
-    async connect(host, accessCode, serial) {
+    connect(host, accessCode, serial) {
         if (this.mqttClient?.connected) {
             this.logger.debug("MQTT already connected");
             this.updateSocketState(_socketstatetype.SOCKET_STATE.opened);
             return;
         }
         if (this.isConnecting) {
-            throw new Error("Connection already in progress");
+            this.logger.warn("Connection already in progress");
+            return;
         }
         this.host = host;
         this.accessCode = accessCode;
@@ -119,80 +117,75 @@ class BambuMqttAdapter {
         const mqttUrl = `mqtts://${host}:8883`;
         const timeout = this.settingsStore.getTimeoutSettings().apiTimeout;
         this.logger.log(`Connecting to Bambu MQTT at ${mqttUrl}`);
-        return new Promise((resolve, reject)=>{
-            const connectionTimeout = setTimeout(()=>{
+        const connectionTimeout = setTimeout(()=>{
+            this.isConnecting = false;
+            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+            this.logger.error("MQTT connection timeout");
+            if (this.mqttClient) {
+                this.mqttClient.end(true);
+            }
+        }, timeout);
+        try {
+            this.mqttClient = _mqtt.default.connect(mqttUrl, {
+                username: "bblp",
+                password: accessCode,
+                clientId: `fdm_monster_${serial}_${Date.now()}`,
+                protocol: "mqtts",
+                connectTimeout: timeout,
+                reconnectPeriod: 0,
+                keepalive: 60,
+                rejectUnauthorized: false
+            });
+            this.mqttClient.on("connect", ()=>{
+                clearTimeout(connectionTimeout);
                 this.isConnecting = false;
-                this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-                this.cleanup();
-                reject(new Error("MQTT connection timeout"));
-            }, timeout);
-            try {
-                this.mqttClient = _mqtt.default.connect(mqttUrl, {
-                    username: "bblp",
-                    password: accessCode,
-                    clientId: `fdm_monster_${serial}_${Date.now()}`,
-                    protocol: "mqtts",
-                    connectTimeout: timeout,
-                    reconnectPeriod: 5000,
-                    keepalive: 60,
-                    rejectUnauthorized: false
-                });
-                this.mqttClient.on("connect", ()=>{
-                    clearTimeout(connectionTimeout);
-                    this.isConnecting = false;
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.authenticated);
-                    this.updateApiState(_apistatetype.API_STATE.responding);
-                    this.logger.log("MQTT connected successfully");
-                    const reportTopic = `device/${serial}/report`;
-                    this.mqttClient.subscribe(reportTopic, {
-                        qos: 0
-                    }, (err)=>{
-                        if (err) {
-                            this.logger.error(`Failed to subscribe to ${reportTopic}:`, err);
-                            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-                            reject(new Error(`Subscribe failed: ${err.message}`));
-                        } else {
-                            this.logger.debug(`Subscribed to ${reportTopic}`);
-                            resolve();
-                        }
-                    });
-                });
-                this.mqttClient.on("error", (error)=>{
-                    clearTimeout(connectionTimeout);
-                    this.isConnecting = false;
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
-                    this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_ERROR, error.message).catch(()=>{});
-                    this.logger.error("MQTT error:", error);
-                    if (!this.mqttClient?.connected) {
-                        reject(error);
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.authenticated);
+                this.updateApiState(_apistatetype.API_STATE.responding);
+                this.logger.log("MQTT connected successfully");
+                const reportTopic = `device/${serial}/report`;
+                this.mqttClient.subscribe(reportTopic, {
+                    qos: 0
+                }, (err)=>{
+                    if (err) {
+                        this.logger.error(`Failed to subscribe to ${reportTopic}:`, err);
+                        this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+                    } else {
+                        this.logger.debug(`Subscribed to ${reportTopic}`);
                     }
                 });
-                this.mqttClient.on("message", (topic, message)=>{
-                    this.lastMessageReceivedTimestamp = Date.now();
-                    this.handleMessage(topic, message);
-                });
-                this.mqttClient.on("disconnect", ()=>{
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
-                    this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "disconnected").catch(()=>{});
-                    this.logger.warn("MQTT disconnected");
-                });
-                this.mqttClient.on("reconnect", ()=>{
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.opening);
-                    this.logger.debug("MQTT reconnecting...");
-                });
-                this.mqttClient.on("close", ()=>{
-                    this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
-                    this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "connection closed").catch(()=>{});
-                    this.logger.debug("MQTT connection closed");
-                });
-            } catch (error) {
-                clearTimeout(connectionTimeout);
+            });
+            this.mqttClient.on("error", (error)=>{
                 this.isConnecting = false;
                 this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+                this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_ERROR, error.message).catch(()=>{});
+                this.logger.error("MQTT error:", error);
+            });
+            this.mqttClient.on("message", (topic, message)=>{
+                this.lastMessageReceivedTimestamp = Date.now();
+                this.handleMessage(topic, message);
+            });
+            this.mqttClient.on("disconnect", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
+                this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "disconnected").catch(()=>{});
+                this.logger.warn("MQTT disconnected");
+            });
+            this.mqttClient.on("reconnect", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.opening);
+                this.logger.debug("MQTT reconnecting...");
+            });
+            this.mqttClient.on("close", ()=>{
+                this.updateSocketState(_socketstatetype.SOCKET_STATE.closed);
+                this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "connection closed").catch(()=>{});
+                this.logger.debug("MQTT connection closed");
                 this.cleanup();
-                reject(error);
-            }
-        });
+            });
+        } catch (error) {
+            clearTimeout(connectionTimeout);
+            this.isConnecting = false;
+            this.updateSocketState(_socketstatetype.SOCKET_STATE.error);
+            this.logger.error("Failed to create MQTT client:", error);
+            this.cleanup();
+        }
     }
     async disconnect() {
         if (!this.mqttClient) {
@@ -378,9 +371,12 @@ class BambuMqttAdapter {
             const payload = JSON.parse(message.toString());
             if (topic.endsWith("/report") && payload.print) {
                 this.lastState = payload.print;
-                this.logger.debug("Received printer state update");
                 const currentMessage = this.transformStateToCurrentMessage(this.lastState);
-                this.emitEvent("current", currentMessage).catch((err)=>{
+                const combinedPayload = {
+                    ...currentMessage,
+                    print: payload.print
+                };
+                this.emitEvent("current", combinedPayload).catch((err)=>{
                     this.logger.error("Failed to emit current event:", err);
                 });
             }
@@ -393,6 +389,7 @@ class BambuMqttAdapter {
             this.mqttClient.removeAllListeners();
             this.mqttClient = null;
         }
+        this.isConnecting = false;
         this.lastState = null;
     }
 }

package/dist/services/bambu/bambu-mqtt.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/bambu/bambu-mqtt.adapter.ts"],"names":["BambuMqttAdapter","bambuEvent","event","logger","settingsStore","eventEmitter2","printerType","BambuType","printerId","socketState","SOCKET_STATE","unopened","apiState","API_STATE","unset","login","lastMessageReceivedTimestamp","mqttClient","host","accessCode","serial","lastState","isConnecting","eventsAllowed","loggerFactory","name","registerCredentials","socketLogin","loginDto","printerURL","replace","password","username","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","reauthSession","debug","open","Error","connect","catch","err","toString","updateSocketState","close","disconnect","setupSocketSession","updateApiState","noResponse","opening","allowEmittingEvents","disallowEmittingEvents","connected","opened","mqttUrl","timeout","getTimeoutSettings","apiTimeout","log","Promise","resolve","reject","connectionTimeout","setTimeout","cleanup","mqtt","clientId","Date","now","protocol","connectTimeout","reconnectPeriod","keepalive","rejectUnauthorized","on","clearTimeout","authenticated","reportTopic","subscribe","qos","message","emitEvent","WsMessage","WS_ERROR","topic","handleMessage","WS_CLOSED","warn","end","getLastState","sendCommand","payload","requestTopic","JSON","stringify","publish","startPrint","filename","print","command","param","url","subtask_name","sequence_id","String","pausePrint","resumePrint","stopPrint","sendGcode","gcode","resetSocketState","state","emitEventSync","WS_STATE_UPDATED","API_STATE_UPDATED","emitAsync","emit","transformStateToCurrentMessage","isPrinting","gcode_state","mc_print_stage","isPaused","isPausedText","text","flags","operational","printing","paused","ready","print_error","cancelling","pausing","sdReady","closedOrError","temps","time","tool0","actual","nozzle_temper","target","nozzle_target_temper","bed","bed_temper","bed_target_temper","chamber","chamber_temper","progress","completion","mc_percent","printTime","printTimeLeft","mc_remaining_time","job","file","gcode_file","currentZ","layer_num","offsets","resends","count","transmitted","ratio","logs","messages","parse","endsWith","currentMessage","removeAllListeners"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/bambu/bambu-mqtt.adapter.ts"],"names":["BambuMqttAdapter","bambuEvent","event","logger","settingsStore","eventEmitter2","printerType","BambuType","printerId","socketState","SOCKET_STATE","unopened","apiState","API_STATE","unset","login","lastMessageReceivedTimestamp","mqttClient","host","accessCode","serial","lastState","isConnecting","eventsAllowed","loggerFactory","name","registerCredentials","socketLogin","loginDto","printerURL","replace","password","username","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","reauthSession","debug","open","Error","connect","close","disconnect","catch","err","setupSocketSession","updateSocketState","updateApiState","noResponse","opening","allowEmittingEvents","disallowEmittingEvents","connected","opened","warn","mqttUrl","timeout","getTimeoutSettings","apiTimeout","log","connectionTimeout","setTimeout","end","mqtt","clientId","Date","now","protocol","connectTimeout","reconnectPeriod","keepalive","rejectUnauthorized","on","clearTimeout","authenticated","reportTopic","subscribe","qos","emitEvent","WsMessage","WS_ERROR","message","topic","handleMessage","WS_CLOSED","cleanup","Promise","resolve","getLastState","sendCommand","payload","requestTopic","JSON","stringify","reject","publish","startPrint","filename","print","command","param","url","subtask_name","sequence_id","String","pausePrint","resumePrint","stopPrint","sendGcode","gcode","resetSocketState","state","emitEventSync","WS_STATE_UPDATED","API_STATE_UPDATED","emitAsync","emit","transformStateToCurrentMessage","isPrinting","gcode_state","mc_print_stage","isPaused","isPausedText","text","flags","operational","printing","paused","ready","print_error","cancelling","pausing","sdReady","closedOrError","temps","time","tool0","actual","nozzle_temper","target","nozzle_target_temper","bed","bed_temper","bed_target_temper","chamber","chamber_temper","progress","completion","mc_percent","printTime","printTimeLeft","mc_remaining_time","job","file","gcode_file","currentZ","layer_num","offsets","resends","count","transmitted","ratio","logs","messages","parse","toString","endsWith","currentMessage","combinedPayload","removeAllListeners"],"mappings":"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"}

package/dist/services/bambu/bambu.client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/bambu/bambu.client.ts"],"names":["BambuClient","eventEmitter2","settingsStore","logger","ftpAdapter","connected","loggerFactory","bambuFtpAdapter","name","connect","login","host","extractHost","printerURL","accessCode","password","Error","log","error","disconnect","ftp","isConnected","url","URL","hostname","replace","split","getApiVersion","_login","_timeout","version"],"mappings":";;;;+BAkBaA;;;eAAAA;;;AAAN,MAAMA;IACFC,cAA6B;IAC7BC,cAA6B;IACnBC,OAAsB;IACxBC,WAA4B;IACrCC,YAAY,MAAM;IAE1B,YACEH,aAA4B,EAC5BI,aAA6B,EAC7BL,aAA4B,EAC5BM,eAAgC,CAChC;QACA,IAAI,CAACL,aAAa,GAAGA;QACrB,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACE,MAAM,GAAGG,cAAcN,YAAYQ,IAAI;QAC5C,IAAI,CAACJ,UAAU,GAAGG;IACpB;IAKA,MAAME,QAAQC,KAAe,EAAiB;QAC5C,MAAMC,OAAO,IAAI,CAACC,WAAW,CAACF,MAAMG,UAAU;QAC9C,MAAMC,aAAaJ,MAAMK,QAAQ,IAAI;QAErC,IAAI,CAACD,YAAY;YACf,MAAM,IAAIE,MAAM;QAClB;QAEA,IAAI,CAACb,MAAM,CAACc,GAAG,CAAC,CAAC,uCAAuC,EAAEN,MAAM;QAEhE,IAAI;YACF,MAAM,IAAI,CAACP,UAAU,CAACK,OAAO,CAACE,MAAMG;YACpC,IAAI,CAACT,SAAS,GAAG;YACjB,IAAI,CAACF,MAAM,CAACc,GAAG,CAAC;QAClB,EAAE,OAAOC,OAAO;YACd,IAAI,CAACf,MAAM,CAACe,KAAK,CAAC,+CAA+CA;YACjE,MAAM,IAAI,CAACC,UAAU;YACrB,MAAMD;QACR;IACF;IAKA,MAAMC,aAA4B;QAChC,IAAI,CAAChB,MAAM,CAACc,GAAG,CAAC;QAChB,MAAM,IAAI,CAACb,UAAU,CAACe,UAAU;QAChC,IAAI,CAACd,SAAS,GAAG;QACjB,IAAI,CAACF,MAAM,CAACc,GAAG,CAAC;IAClB;IAKA,IAAIG,MAAuB;QACzB,OAAO,IAAI,CAAChB,UAAU;IACxB;IAKA,IAAIiB,cAAuB;QACzB,OAAO,IAAI,CAAChB,SAAS,IAAI,IAAI,CAACD,UAAU,CAACiB,WAAW;IACtD;IAKQT,YAAYC,UAAkB,EAAU;QAC9C,IAAI;YACF,MAAMS,MAAM,IAAIC,IAAIV;YACpB,OAAOS,IAAIE,QAAQ;QACrB,EAAE,OAAM;YAEN,OAAOX,WAAWY,OAAO,CAAC,gBAAgB,IAAIC,KAAK,CAAC,IAAI,CAAC,EAAE,CAACA,KAAK,CAAC,IAAI,CAAC,EAAE;QAC3E;IACF;IAMA,MAAMC,cAAcC,MAAgB,EAAEC,QAAiB,EAAgC;QAErF,OAAO;YAACC,SAAS;QAAW;IAC9B;AACF"}
+{"version":3,"sources":["../../../src/services/bambu/bambu.client.ts"],"names":["BambuClient","eventEmitter2","settingsStore","logger","ftpAdapter","connected","loggerFactory","bambuFtpAdapter","name","connect","login","host","extractHost","printerURL","accessCode","password","Error","log","error","disconnect","ftp","isConnected","url","URL","hostname","replace","split","getApiVersion","_login","_timeout","version"],"mappings":";;;;+BAkBaA;;;eAAAA;;;AAAN,MAAMA;IACFC,cAA6B;IAC7BC,cAA6B;IACnBC,OAAsB;IACxBC,WAA4B;IACrCC,YAAY,MAAM;IAE1B,YACEH,aAA4B,EAC5BI,aAA6B,EAC7BL,aAA4B,EAC5BM,eAAgC,CAChC;QACA,IAAI,CAACL,aAAa,GAAGA;QACrB,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACE,MAAM,GAAGG,cAAcN,YAAYQ,IAAI;QAC5C,IAAI,CAACJ,UAAU,GAAGG;IACpB;IAKA,MAAME,QAAQC,KAAe,EAAiB;QAC5C,MAAMC,OAAO,IAAI,CAACC,WAAW,CAACF,MAAMG,UAAU;QAC9C,MAAMC,aAAaJ,MAAMK,QAAQ,IAAI;QAErC,IAAI,CAACD,YAAY;YACf,MAAM,IAAIE,MAAM;QAClB;QAEA,IAAI,CAACb,MAAM,CAACc,GAAG,CAAC,CAAC,uCAAuC,EAAEN,MAAM;QAEhE,IAAI;YACF,MAAM,IAAI,CAACP,UAAU,CAACK,OAAO,CAACE,MAAMG;YACpC,IAAI,CAACT,SAAS,GAAG;YACjB,IAAI,CAACF,MAAM,CAACc,GAAG,CAAC;QAClB,EAAE,OAAOC,OAAO;YACd,IAAI,CAACf,MAAM,CAACe,KAAK,CAAC,+CAA+CA;YACjE,MAAM,IAAI,CAACC,UAAU;YACrB,MAAMD;QACR;IACF;IAKA,MAAMC,aAA4B;QAChC,IAAI,CAAChB,MAAM,CAACc,GAAG,CAAC;QAChB,MAAM,IAAI,CAACb,UAAU,CAACe,UAAU;QAChC,IAAI,CAACd,SAAS,GAAG;QACjB,IAAI,CAACF,MAAM,CAACc,GAAG,CAAC;IAClB;IAKA,IAAIG,MAAuB;QACzB,OAAO,IAAI,CAAChB,UAAU;IACxB;IAKA,IAAIiB,cAAuB;QACzB,OAAO,IAAI,CAAChB,SAAS,IAAI,IAAI,CAACD,UAAU,CAACiB,WAAW;IACtD;IAKQT,YAAYC,UAAkB,EAAU;QAC9C,IAAI;YACF,MAAMS,MAAM,IAAIC,IAAIV;YACpB,OAAOS,IAAIE,QAAQ;QACrB,EAAE,OAAM;YAEN,OAAOX,WACJY,OAAO,CAAC,gBAAgB,IACxBC,KAAK,CAAC,IAAI,CAAC,EAAE,CACbA,KAAK,CAAC,IAAI,CAAC,EAAE;QAClB;IACF;IAMA,MAAMC,cAAcC,MAAgB,EAAEC,QAAiB,EAAgC;QAErF,OAAO;YAAEC,SAAS;QAAY;IAChC;AACF"}

package/dist/services/bambu.api.js

@@ -59,6 +59,17 @@ class BambuApi {
         const response = await this.client.getApiVersion(this.printerLogin);
         return response.version;
     }
+    async validateConnection() {
+        this.logger.debug("Validating Bambu connection", this.logMeta());
+        try {
+            await this.ensureFtpConnected();
+            const files = await this.client.ftp.listFiles("/");
+            this.logger.debug(`FTP connection successful - found ${files.length} directories`, this.logMeta());
+        } catch (ftpError) {
+            this.logger.debug(`FTP validation failed: ${ftpError}`, this.logMeta());
+            throw new Error(`Bambu FTP connection failed: ${ftpError}`);
+        }
+    }
     async connect() {
         await this.client.connect(this.printerLogin);
     }

package/dist/services/bambu.api.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/bambu.api.ts"],"names":["BambuApi","defaultLog","adapter","logger","client","printerLogin","printerSocketStore","printerId","bambuClient","loggerFactory","name","debug","logMeta","setPrinterId","getMqttAdapter","Error","getPrinterSocket","BambuMqttAdapter","ensureFtpConnected","isConnected","connect","type","BambuType","login","getVersion","response","getApiVersion","version","disconnect","restartServer","warn","restartHost","restartPrinterFirmware","startPrint","path","log","mqttAdapter","pausePrint","resumePrint","cancelPrint","stopPrint","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","getFile","files","ftp","listFiles","file","find","f","endsWith","size","date","modifiedAt","Date","getTime","getFiles","filter","isFile","map","downloadFile","remotePath","startsWith","stream","tempPath","downloadFileAsStream","stats","statSync","filename","split","pop","data","status","statusText","headers","String","config","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","fileBuffer","Buffer","isBuffer","now","filePath","originalname","readFileSync","length","error","message","deleteFile","deleteFolder","getSettings","getReprintState","state","getLastState","reprintState","ReprintState","PrinterNotAvailable","connectionState","lastFile","gcode_file","NoLastPrint","LastPrintReady"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/bambu.api.ts"],"names":["BambuApi","defaultLog","adapter","logger","client","printerLogin","printerSocketStore","printerId","bambuClient","loggerFactory","name","debug","logMeta","setPrinterId","getMqttAdapter","Error","getPrinterSocket","BambuMqttAdapter","ensureFtpConnected","isConnected","connect","type","BambuType","login","getVersion","response","getApiVersion","version","validateConnection","files","ftp","listFiles","length","ftpError","disconnect","restartServer","warn","restartHost","restartPrinterFirmware","startPrint","path","log","mqttAdapter","pausePrint","resumePrint","cancelPrint","stopPrint","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","getFile","file","find","f","endsWith","size","date","modifiedAt","Date","getTime","getFiles","filter","isFile","map","downloadFile","remotePath","startsWith","stream","tempPath","downloadFileAsStream","stats","statSync","filename","split","pop","data","status","statusText","headers","String","config","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","fileBuffer","Buffer","isBuffer","now","filePath","originalname","readFileSync","error","message","deleteFile","deleteFolder","getSettings","getReprintState","state","getLastState","reprintState","ReprintState","PrinterNotAvailable","connectionState","lastFile","gcode_file","NoLastPrint","LastPrintReady"],"mappings":"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"}

package/dist/services/core/batch-call.service.js

@@ -85,31 +85,6 @@ class BatchCallService {
             }
         }
     }
-    async batchSettingsGet(printerIds) {
-        const promises = [];
-        for (const printerId of printerIds){
-            const login = await this.printerCache.getLoginDtoAsync(printerId);
-            const time = Date.now();
-            const client = this.getPrinter(login);
-            const promise = client.getSettings().then((r)=>{
-                return {
-                    success: true,
-                    printerId,
-                    time: Date.now() - time,
-                    value: r
-                };
-            }).catch((e)=>{
-                return {
-                    failure: true,
-                    error: e.message,
-                    printerId,
-                    time: Date.now() - time
-                };
-            });
-            promises.push(promise);
-        }
-        return await Promise.all(promises);
-    }
     async batchConnectUsb(printerIds) {
         const promises = [];
         for (const printerId of printerIds){

package/dist/services/core/batch-call.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","logger","loggerFactory","printerApiFactory","printerCache","printerSocketStore","printerService","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","undefined","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","warn","push","Promise","all","batchConnectSocket","reconnectPrinterAdapter","captureException","errorSummary","batchSettingsGet","getLoginDtoAsync","client","getSettings","r","value","batchConnectUsb","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","logger","loggerFactory","printerApiFactory","printerCache","printerSocketStore","printerService","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","undefined","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","warn","push","Promise","all","batchConnectSocket","reconnectPrinterAdapter","captureException","errorSummary","batchConnectUsb","getLoginDtoAsync","client","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}

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

@@ -67,14 +67,14 @@ class MulterService {
         return this.fileUploadTrackerCache.addUploadTracker(multerFile, printerId);
     }
     clearUploadsFolder() {
-        const fileStoragePath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
-        if (!(0, _nodefs.existsSync)(fileStoragePath)) return;
-        const files = (0, _nodefs.readdirSync)(fileStoragePath, {
+        const fileUploadsPath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
+        if (!(0, _nodefs.existsSync)(fileUploadsPath)) return;
+        const files = (0, _nodefs.readdirSync)(fileUploadsPath, {
             withFileTypes: true
         }).filter((item)=>!item.isDirectory()).map((item)=>item.name);
         for (const file of files){
             try {
-                (0, _nodefs.rmSync)((0, _nodepath.join)(fileStoragePath, file));
+                (0, _nodefs.rmSync)((0, _nodepath.join)(fileUploadsPath, file));
             } catch (error) {
                 this.logger.error(`Could not clear upload file in temporary folder ${(0, _errorutils.errorSummary)(error)}`);
             }
@@ -87,10 +87,6 @@ class MulterService {
             this.logger.warn("Cannot unlink temporarily uploaded file as it was not found");
         }
     }
-    fileExists(downloadFilename, collection) {
-        const downloadPath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
-        return (0, _nodefs.existsSync)(downloadPath);
-    }
     getMulterGCodeFileFilter(storeAsFile = true) {
         return this.getMulterFileFilter(storeAsFile);
     }
@@ -123,7 +119,7 @@ class MulterService {
     getMulterFileFilter(storeAsFile = true) {
         return (0, _multer.default)({
             storage: storeAsFile ? (0, _multer.diskStorage)({
-                destination: (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder)
+                destination: (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage)
             }) : (0, _multer.memoryStorage)()
         }).any();
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","loggerFactory","fileUploadTrackerCache","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileStoragePath","join","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","files","readdirSync","withFileTypes","filter","item","isDirectory","map","file","rmSync","error","errorSummary","clearUploadedFile","path","warn","fileExists","downloadFilename","collection","downloadPath","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","res","fileExtensions","Promise","resolve","reject","err","validateUploadedFiles","allowedExtensions","length","ext","extname","originalname","toLowerCase","includes","e","ValidationException","multer","storage","diskStorage","destination","memoryStorage","any","getSessions","getUploads"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","loggerFactory","fileUploadTrackerCache","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileUploadsPath","join","superRootPath","AppConstants","defaultFileUploadsStorage","existsSync","files","readdirSync","withFileTypes","filter","item","isDirectory","map","file","rmSync","error","errorSummary","clearUploadedFile","path","warn","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","res","fileExtensions","Promise","resolve","reject","err","validateUploadedFiles","allowedExtensions","length","ext","extname","originalname","toLowerCase","includes","e","ValidationException","multer","storage","diskStorage","destination","memoryStorage","any","getSessions","getUploads"],"mappings":"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"}