@fdm-monster/server 2.0.7 → 2.0.8

package/RELEASE_NOTES.MD

@@ -1,5 +1,28 @@
 # Develop
 
+# FDM Monster 2.0.8
+
+## Features
+
+- Enhanced BGCode parser with MMU (Multi-Material Unit) support
+  - Detects MMU configurations by analyzing metadata fields for multiple values
+  - Parses filament data as arrays for MMU prints (per-extruder values)
+  - Provides `totalFilamentUsedGrams` for sum of all extruders in MMU mode
+  - Extracts thumbnails from BGCode files with QOI and Heatshrink decompression
+  - Supports comprehensive metadata including print times, temperatures, and layer information
+
+## Refactor
+
+- Refactored printer file upload system to use native streams across all printer API implementations (OctoPrint, Moonraker, PrusaLink, Bambu)
+- Introduced Zod schema validation for upload file parameters with `UploadFileInput` type
+- Added `getFileSize()` method to FileStorageService for consistent file size retrieval
+- Improved memory efficiency for large file uploads by eliminating buffer conversions where possible
+  - OctoPrint: Native multipart/form-data streaming with `knownLength` optimization
+  - Moonraker: Native multipart/form-data streaming with `knownLength` optimization
+  - PrusaLink: Native streaming via `application/octet-stream` PUT requests
+  - Bambu: Native FTP streaming using basic-ftp's `uploadFrom()` with stream support
+- Simplified print queue service by removing redundant comments and extracting printer assignment logic
+
 # FDM Monster 2.0.7
 
 ## Fixes

package/dist/controllers/print-job.controller.js

@@ -21,6 +21,7 @@ const _filestorageservice = require("../services/file-storage.service");
 const _loggerfactory = require("../handlers/logger-factory");
 const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
+const _thumbnailutil = require("../utils/thumbnail.util");
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -56,13 +57,7 @@ class PrintJobController {
             if (job.fileStorageId) {
                 try {
                     const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
-                    thumbnails = (metadata?._thumbnails || []).map((thumb)=>({
-                            index: thumb.index,
-                            width: thumb.width,
-                            height: thumb.height,
-                            format: thumb.format,
-                            size: thumb.size
-                        }));
+                    thumbnails = (0, _thumbnailutil.extractThumbnailsFromMetadata)(metadata);
                 } catch  {}
             }
             return {
@@ -85,13 +80,7 @@ class PrintJobController {
             let thumbnails = [];
             if (job.fileStorageId) {
                 const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
-                thumbnails = (metadata?._thumbnails || []).map((thumb)=>({
-                        index: thumb.index,
-                        width: thumb.width,
-                        height: thumb.height,
-                        format: thumb.format,
-                        size: thumb.size
-                    }));
+                thumbnails = (0, _thumbnailutil.extractThumbnailsFromMetadata)(metadata);
             }
             res.send({
                 ...job,
@@ -119,28 +108,12 @@ class PrintJobController {
                 });
                 return;
             }
-            this.logger.log(`Manually marking job ${jobId} as COMPLETED (was UNKNOWN)`);
-            job.status = "COMPLETED";
-            job.endedAt = new Date();
-            job.progress = 100;
-            job.statusReason = "Manually marked as completed by user";
-            if (job.statistics) {
-                job.statistics.endedAt = job.endedAt;
-                job.statistics.progress = 100;
-            } else {
-                job.statistics = {
-                    startedAt: job.startedAt,
-                    endedAt: job.endedAt,
-                    actualPrintTimeSeconds: null,
-                    progress: 100
-                };
-            }
-            await this.printJobService.printJobRepository.save(job);
-            this.logger.log(`Job ${jobId} marked as COMPLETED`);
+            const previousStatus = job.status;
+            await this.printJobService.markAsCompleted(jobId);
             res.send({
                 message: "Job marked as completed",
                 jobId,
-                previousStatus: "UNKNOWN",
+                previousStatus,
                 newStatus: "COMPLETED"
             });
         } catch (error) {
@@ -168,29 +141,7 @@ class PrintJobController {
             return;
         }
         try {
-            this.logger.log(`Manually marking job ${jobId} as FAILED (was ${previousStatus})`);
-            const endedAt = new Date();
-            const actualTimeSeconds = job.startedAt ? (endedAt.getTime() - job.startedAt.getTime()) / 1000 : null;
-            job.status = "FAILED";
-            job.endedAt = endedAt;
-            job.statusReason = "Manually marked as failed by user";
-            if (!job.statistics) {
-                job.statistics = {
-                    startedAt: job.startedAt,
-                    endedAt,
-                    actualPrintTimeSeconds: actualTimeSeconds,
-                    progress: job.progress,
-                    failureReason: "Manually marked as failed by user",
-                    failureTime: endedAt
-                };
-            } else {
-                job.statistics.endedAt = endedAt;
-                job.statistics.actualPrintTimeSeconds = actualTimeSeconds;
-                job.statistics.failureReason = "Manually marked as failed by user";
-                job.statistics.failureTime = endedAt;
-            }
-            await this.printJobService.printJobRepository.save(job);
-            this.logger.log(`Job ${jobId} marked as FAILED`);
+            await this.printJobService.markAsFailed(jobId, "Manually marked as failed by user");
             res.send({
                 message: "Job marked as failed",
                 jobId,
@@ -221,25 +172,7 @@ class PrintJobController {
             return;
         }
         try {
-            this.logger.log(`Manually marking job ${jobId} as CANCELLED (was ${previousStatus})`);
-            const endedAt = new Date();
-            const actualTimeSeconds = job.startedAt ? (endedAt.getTime() - job.startedAt.getTime()) / 1000 : null;
-            job.status = "CANCELLED";
-            job.endedAt = endedAt;
-            job.statusReason = "Manually marked as cancelled by user";
-            if (!job.statistics) {
-                job.statistics = {
-                    startedAt: job.startedAt,
-                    endedAt,
-                    actualPrintTimeSeconds: actualTimeSeconds,
-                    progress: job.progress
-                };
-            } else {
-                job.statistics.endedAt = endedAt;
-                job.statistics.actualPrintTimeSeconds = actualTimeSeconds;
-            }
-            await this.printJobService.printJobRepository.save(job);
-            this.logger.log(`Job ${jobId} marked as CANCELLED`);
+            await this.printJobService.markAsCancelled(jobId, "Manually marked as cancelled by user");
             res.send({
                 message: "Job marked as cancelled",
                 jobId,
@@ -270,11 +203,7 @@ class PrintJobController {
             return;
         }
         try {
-            this.logger.log(`Manually marking job ${jobId} as UNKNOWN (was ${previousStatus})`);
-            job.status = "UNKNOWN";
-            job.statusReason = "Manually marked as unknown by user (state uncertain)";
-            await this.printJobService.printJobRepository.save(job);
-            this.logger.log(`Job ${jobId} marked as UNKNOWN`);
+            await this.printJobService.markAsUnknown(jobId);
             res.send({
                 message: "Job marked as unknown",
                 jobId,
@@ -311,7 +240,7 @@ class PrintJobController {
             }
             this.logger.log(`Re-analyzing file for job ${jobId}: ${filePath}`);
             job.analysisState = "ANALYZING";
-            await this.printJobService.printJobRepository.save(job);
+            await this.printJobService.updateJob(job);
             const { metadata, thumbnails } = await this.fileAnalysisService.analyzeFile(filePath);
             let thumbnailMetadata = [];
             if (thumbnails && thumbnails.length > 0) {
@@ -352,14 +281,10 @@ class PrintJobController {
         try {
             const fileStorageId = job.fileStorageId;
             const fileName = job.fileName;
-            await this.printJobService.printJobRepository.remove(job);
+            await this.printJobService.deleteJob(job);
             this.logger.log(`Deleted job ${jobId}: ${fileName}`);
             if (fileStorageId && deleteFileParam) {
-                const otherJobs = await this.printJobService.printJobRepository.count({
-                    where: {
-                        fileStorageId
-                    }
-                });
+                const otherJobs = await this.printJobService.countJobsReferencingFile(fileStorageId);
                 if (otherJobs === 0) {
                     try {
                         await this.fileStorageService.deleteFile(fileStorageId);
@@ -401,60 +326,6 @@ class PrintJobController {
             });
         }
     }
-    async createJobFromFile(req, res) {
-        const { fileStorageId, printerId } = req.body;
-        if (!fileStorageId) {
-            res.status(400).send({
-                error: "fileStorageId is required"
-            });
-            return;
-        }
-        if (!printerId) {
-            res.status(400).send({
-                error: "printerId is required"
-            });
-            return;
-        }
-        try {
-            const fileExists = await this.fileStorageService.fileExists(fileStorageId);
-            if (!fileExists) {
-                throw new _runtimeexceptions.NotFoundException("File not found in storage");
-            }
-            const metadata = await this.fileStorageService.loadMetadata(fileStorageId);
-            if (!metadata) {
-                res.status(400).send({
-                    error: "File has no metadata. Please analyze the file first."
-                });
-                return;
-            }
-            const printerName = `Printer ${printerId}`;
-            const job = await this.printJobService.createPendingJob(printerId, metadata._originalFileName || metadata.fileName || "Unknown", metadata, printerName);
-            job.fileStorageId = fileStorageId;
-            job.fileHash = metadata._fileHash;
-            job.analysisState = "ANALYZED";
-            job.analyzedAt = new Date();
-            if (metadata.fileFormat) {
-                job.fileFormat = metadata.fileFormat;
-            }
-            await this.printJobService.printJobRepository.save(job);
-            this.logger.log(`Created job ${job.id} from file storage ${fileStorageId} for printer ${printerId}`);
-            res.send({
-                id: job.id,
-                printerId: job.printerId,
-                printerName: job.printerName,
-                fileName: job.fileName,
-                fileStorageId: job.fileStorageId,
-                status: job.status,
-                analysisState: job.analysisState,
-                createdAt: job.createdAt
-            });
-        } catch (error) {
-            this.logger.error(`Failed to create job from file ${fileStorageId}: ${error}`);
-            res.status(500).send({
-                error: "Failed to create job from file"
-            });
-        }
-    }
     toEndOfDay(date) {
         const endOfDay = new Date(date);
         endOfDay.setHours(23, 59, 59, 999);
@@ -572,16 +443,6 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", Promise)
 ], PrintJobController.prototype, "deleteJob", null);
-_ts_decorate([
-    (0, _awilixexpress.POST)(),
-    (0, _awilixexpress.route)("/from-file"),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        typeof _express.Request === "undefined" ? Object : _express.Request,
-        typeof _express.Response === "undefined" ? Object : _express.Response
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], PrintJobController.prototype, "createJobFromFile", null);
 PrintJobController = _ts_decorate([
     (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/print-jobs"),
     (0, _awilixexpress.before)([

package/dist/controllers/print-job.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/print-job.controller.ts"],"names":["PrintJobController","logger","loggerFactory","printJobService","fileAnalysisService","fileStorageService","name","searchJobs","req","res","searchPrinter","searchFile","startDate","endDate","validateInput","query","searchJobsSchema","endDateObj","toEndOfDay","Date","undefined","result","searchPrintJobs","send","searchJobsPaged","page","pageSize","searchJobsPagedSchema","items","count","searchPrintJobsPaged","itemsWithThumbnails","Promise","all","map","job","thumbnails","fileStorageId","metadata","loadMetadata","_thumbnails","thumb","index","width","height","format","size","pages","Math","ceil","getJob","jobId","local","id","getJobByIdOrFail","error","status","setCompleted","includes","currentStatus","suggestion","log","endedAt","progress","statusReason","statistics","startedAt","actualPrintTimeSeconds","printJobRepository","save","message","previousStatus","newStatus","Error","setFailed","actualTimeSeconds","getTime","failureReason","failureTime","setCancelled","setUnknown","reAnalyzeJob","triggerFileAnalysis","filePath","getFilePath","exists","needsAnalysis","NotFoundException","analysisState","analyzeFile","thumbnailMetadata","length","saveThumbnails","handleFileAnalyzed","fileHash","saveMetadata","fileName","thumbnailCount","deleteJob","deleteFileParam","deleteFile","remove","otherJobs","where","fileDeleted","warn","remainingReferences","createJobFromFile","printerId","body","fileExists","printerName","createPendingJob","_originalFileName","_fileHash","analyzedAt","fileFormat","createdAt","date","endOfDay","setHours","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/print-job.controller.ts"],"names":["PrintJobController","logger","loggerFactory","printJobService","fileAnalysisService","fileStorageService","name","searchJobs","req","res","searchPrinter","searchFile","startDate","endDate","validateInput","query","searchJobsSchema","endDateObj","toEndOfDay","Date","undefined","result","searchPrintJobs","send","searchJobsPaged","page","pageSize","searchJobsPagedSchema","items","count","searchPrintJobsPaged","itemsWithThumbnails","Promise","all","map","job","thumbnails","fileStorageId","metadata","loadMetadata","extractThumbnailsFromMetadata","pages","Math","ceil","getJob","jobId","local","id","getJobByIdOrFail","error","status","setCompleted","includes","currentStatus","suggestion","previousStatus","markAsCompleted","message","newStatus","Error","setFailed","markAsFailed","setCancelled","markAsCancelled","setUnknown","markAsUnknown","reAnalyzeJob","log","triggerFileAnalysis","filePath","getFilePath","exists","needsAnalysis","NotFoundException","analysisState","updateJob","analyzeFile","thumbnailMetadata","length","saveThumbnails","handleFileAnalyzed","fileHash","saveMetadata","fileName","thumbnailCount","deleteJob","deleteFileParam","deleteFile","otherJobs","countJobsReferencingFile","fileDeleted","warn","remainingReferences","date","endOfDay","setHours","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN"],"mappings":"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"}

package/dist/controllers/print-queue.controller.js

@@ -14,8 +14,12 @@ const _express = require("express");
 const _authenticate = require("../middleware/authenticate");
 const _authorizationconstants = require("../constants/authorization.constants");
 const _printqueueservice = require("../services/print-queue.service");
+const _printjobservice = require("../services/orm/print-job.service");
+const _filestorageservice = require("../services/file-storage.service");
+const _printercache = require("../state/printer.cache");
 const _loggerfactory = require("../handlers/logger-factory");
 const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
+const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -27,9 +31,15 @@ function _ts_metadata(k, v) {
 }
 class PrintQueueController {
     printQueueService;
+    printJobService;
+    fileStorageService;
+    printerCache;
     logger;
-    constructor(loggerFactory, printQueueService){
+    constructor(loggerFactory, printQueueService, printJobService, fileStorageService, printerCache){
         this.printQueueService = printQueueService;
+        this.printJobService = printJobService;
+        this.fileStorageService = fileStorageService;
+        this.printerCache = printerCache;
         this.logger = loggerFactory(PrintQueueController.name);
     }
     async getGlobalQueue(req, res) {
@@ -42,21 +52,7 @@ class PrintQueueController {
                 });
                 return;
             }
-            const skip = (page - 1) * pageSize;
-            const [jobs, totalCount] = await this.printQueueService.printJobRepository.findAndCount({
-                where: {
-                    status: "QUEUED"
-                },
-                order: {
-                    printerId: "ASC",
-                    queuePosition: "ASC"
-                },
-                relations: [
-                    'printer'
-                ],
-                take: pageSize,
-                skip: skip
-            });
+            const [jobs, totalCount] = await this.printQueueService.getGlobalQueuePaged(page, pageSize);
             const queueItems = jobs.map((job)=>({
                     jobId: job.id,
                     fileName: job.fileName,
@@ -221,6 +217,59 @@ class PrintQueueController {
             });
         }
     }
+    async createJobFromFile(req, res) {
+        const printerId = req.local.printerId;
+        const { fileStorageId, addToQueue = true, position } = req.body;
+        if (!fileStorageId) {
+            res.status(400).send({
+                error: "fileStorageId is required"
+            });
+            return;
+        }
+        try {
+            const fileExists = await this.fileStorageService.fileExists(fileStorageId);
+            if (!fileExists) {
+                throw new _runtimeexceptions.NotFoundException("File not found in storage");
+            }
+            const metadata = await this.fileStorageService.loadMetadata(fileStorageId);
+            if (!metadata) {
+                res.status(400).send({
+                    error: "File has no metadata. Please analyze the file first."
+                });
+                return;
+            }
+            const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
+            const job = await this.printJobService.createPendingJob(printerId, metadata._originalFileName || metadata.fileName || "Unknown", metadata, printer.name);
+            job.fileStorageId = fileStorageId;
+            job.fileHash = metadata._fileHash;
+            job.analysisState = "ANALYZED";
+            job.analyzedAt = new Date();
+            if (metadata.fileFormat) {
+                job.fileFormat = metadata.fileFormat;
+            }
+            await this.printJobService.updateJob(job);
+            if (addToQueue) {
+                await this.printQueueService.addToQueue(printerId, job.id, position);
+            }
+            this.logger.log(`Created job ${job.id} from file storage ${fileStorageId} for printer ${printerId}${addToQueue ? " and added to queue" : ""}`);
+            res.send({
+                id: job.id,
+                printerId: job.printerId,
+                printerName: job.printerName,
+                fileName: job.fileName,
+                fileStorageId: job.fileStorageId,
+                status: job.status,
+                analysisState: job.analysisState,
+                createdAt: job.createdAt,
+                addedToQueue: addToQueue
+            });
+        } catch (error) {
+            this.logger.error(`Failed to create job from file ${fileStorageId}: ${error}`);
+            res.status(500).send({
+                error: "Failed to create job from file"
+            });
+        }
+    }
     async submitToPrinter(req, res) {
         const printerId = req.local.printerId;
         const jobId = req.local.jobId;
@@ -342,6 +391,19 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", Promise)
 ], PrintQueueController.prototype, "processQueue", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:printerId/from-file"),
+    (0, _awilixexpress.before)([
+        (0, _paramconvertermiddleware.ParamId)("printerId")
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], PrintQueueController.prototype, "createJobFromFile", null);
 _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/:printerId/submit/:jobId"),
@@ -368,7 +430,10 @@ PrintQueueController = _ts_decorate([
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
-        typeof _printqueueservice.PrintQueueService === "undefined" ? Object : _printqueueservice.PrintQueueService
+        typeof _printqueueservice.PrintQueueService === "undefined" ? Object : _printqueueservice.PrintQueueService,
+        typeof _printjobservice.PrintJobService === "undefined" ? Object : _printjobservice.PrintJobService,
+        typeof _filestorageservice.FileStorageService === "undefined" ? Object : _filestorageservice.FileStorageService,
+        typeof _printercache.PrinterCache === "undefined" ? Object : _printercache.PrinterCache
     ])
 ], PrintQueueController);
 

package/dist/controllers/print-queue.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/print-queue.controller.ts"],"names":["PrintQueueController","logger","loggerFactory","printQueueService","name","getGlobalQueue","req","res","page","Number","parseInt","query","pageSize","status","send","error","skip","jobs","totalCount","printJobRepository","findAndCount","where","order","printerId","queuePosition","relations","take","queueItems","map","job","jobId","id","fileName","printerName","printer","createdAt","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","items","totalPages","Math","ceil","getQueue","local","queue","count","length","addToQueue","position","body","undefined","message","Error","reorderQueue","jobIds","Array","isArray","clearQueue","removeFromQueue","getNextInQueue","nextJob","processQueue","submitToPrinter","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/print-queue.controller.ts"],"names":["PrintQueueController","logger","loggerFactory","printQueueService","printJobService","fileStorageService","printerCache","name","getGlobalQueue","req","res","page","Number","parseInt","query","pageSize","status","send","error","jobs","totalCount","getGlobalQueuePaged","queueItems","map","job","jobId","id","fileName","printerId","printerName","printer","queuePosition","createdAt","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","items","totalPages","Math","ceil","getQueue","local","queue","count","length","addToQueue","position","body","undefined","message","Error","reorderQueue","jobIds","Array","isArray","clearQueue","removeFromQueue","getNextInQueue","nextJob","processQueue","createJobFromFile","fileStorageId","fileExists","NotFoundException","loadMetadata","getCachedPrinterOrThrowAsync","createPendingJob","_originalFileName","fileHash","_fileHash","analysisState","analyzedAt","Date","fileFormat","updateJob","log","addedToQueue","submitToPrinter","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":"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"}

package/dist/controllers/printer-files.controller.js

@@ -148,7 +148,13 @@ class PrinterFilesController {
         }
         const uploadedFile = files[0];
         const token = this.multerService.startTrackingSession(uploadedFile, currentPrinterId);
-        await this.printerApi.uploadFile(uploadedFile, startPrint, token).catch((e)=>{
+        await this.printerApi.uploadFile({
+            stream: (0, _nodefs.createReadStream)(uploadedFile.path),
+            fileName: uploadedFile.originalname,
+            contentLength: uploadedFile.size,
+            startPrint,
+            uploadToken: token
+        }).catch((e)=>{
             try {
                 this.multerService.clearUploadedFile(uploadedFile);
             } catch (e) {
@@ -215,7 +221,7 @@ class PrinterFilesController {
             const job = await this.printJobService.createPendingJob(currentPrinterId, uploadedFile.originalname, metadata, currentPrinter.name);
             job.fileStorageId = fileStorageId;
             job.fileHash = fileHash;
-            await this.printJobService.printJobRepository.save(job);
+            await this.printJobService.updateJob(job);
             this.logger.log(`Created job ${job.id}: format=${job.fileFormat}, ` + `state=${job.analysisState}, ` + `storageId=${fileStorageId}, ` + `hash=${fileHash.substring(0, 8)}...`);
             if ((0, _nodefs.existsSync)(tempPathWithExt)) {
                 (0, _nodefs.unlinkSync)(tempPathWithExt);

package/dist/controllers/printer-files.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","logger","loggerFactory","printerApi","printerFilesStore","printJobService","fileAnalysisService","fileStorageService","multerService","printerThumbnailCache","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","startPrintFile","filePath","validateInput","body","startPrintFileSchema","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","id","downloadFile","params","path","downloadFileSchema","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileSchema","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","e","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","uploadPrinterFile","acceptedExtensions","getAcceptedFileExtensions","printerType","multerLoadFileAsync","startPrintString","uploadFileSchema","ValidationException","error","join","uploadedFile","token","startTrackingSession","uploadFile","catch","clearUploadedFile","errorSummary","ext","extname","originalname","tempPathWithExt","existsSync","NotFoundException","copyFileSync","fileHash","calculateFileHash","substring","existingJob","findDuplicateByHash","metadata","fileStorageId","cachedMetadata","loadMetadata","fileName","analysisState","saveMetadata","existingFilePath","getFilePath","analysisResult","analyzeFile","fileFormat","totalLayers","gcodePrintTimeSeconds","filamentUsedGrams","saveFile","thumbnailMetadata","saveThumbnails","job","createPendingJob","printJobRepository","save","unlinkSync","captureException","BambuType","AppConstants","defaultAcceptedBambuExtensions","defaultAcceptedGcodeExtensions","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","logger","loggerFactory","printerApi","printerFilesStore","printJobService","fileAnalysisService","fileStorageService","multerService","printerThumbnailCache","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","startPrintFile","filePath","validateInput","body","startPrintFileSchema","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","id","downloadFile","params","path","downloadFileSchema","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileSchema","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","e","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","uploadPrinterFile","acceptedExtensions","getAcceptedFileExtensions","printerType","multerLoadFileAsync","startPrintString","uploadFileSchema","ValidationException","error","join","uploadedFile","token","startTrackingSession","uploadFile","stream","createReadStream","fileName","originalname","contentLength","size","uploadToken","catch","clearUploadedFile","errorSummary","ext","extname","tempPathWithExt","existsSync","NotFoundException","copyFileSync","fileHash","calculateFileHash","substring","existingJob","findDuplicateByHash","metadata","fileStorageId","cachedMetadata","loadMetadata","analysisState","saveMetadata","existingFilePath","getFilePath","analysisResult","analyzeFile","fileFormat","totalLayers","gcodePrintTimeSeconds","filamentUsedGrams","saveFile","thumbnailMetadata","saveThumbnails","job","createPendingJob","updateJob","unlinkSync","captureException","BambuType","AppConstants","defaultAcceptedBambuExtensions","defaultAcceptedGcodeExtensions","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}

package/dist/controllers/printer.controller.js

@@ -223,10 +223,10 @@ class PrinterController {
                         }
                     default:
                         {
-                            if (!e.response?.status) {
-                                throw new _faileddependencyexception.FailedDependencyException(`Reaching Printer service failed without status (code ${e.code})`);
-                            } else {
+                            if (e.response?.status) {
                                 throw new _faileddependencyexception.FailedDependencyException(`Reaching Printer service failed with status (code ${e.code})`, e.response?.status);
+                            } else {
+                                throw new _faileddependencyexception.FailedDependencyException(`Reaching Printer service failed without status (code ${e.code})`);
                             }
                         }
                 }