@fdm-monster/server 2.0.6 → 2.0.8

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);
@@ -51,8 +52,21 @@ class PrintJobController {
         const { page, pageSize, searchPrinter, searchFile, startDate, endDate } = await (0, _validators.validateInput)(req.query, _printjobvalidation.searchJobsPagedSchema);
         const endDateObj = endDate ? this.toEndOfDay(new Date(endDate)) : undefined;
         const [items, count] = await this.printJobService.searchPrintJobsPaged(searchPrinter, searchFile, startDate ? new Date(startDate) : undefined, endDateObj, page, pageSize);
+        const itemsWithThumbnails = await Promise.all(items.map(async (job)=>{
+            let thumbnails = [];
+            if (job.fileStorageId) {
+                try {
+                    const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
+                    thumbnails = (0, _thumbnailutil.extractThumbnailsFromMetadata)(metadata);
+                } catch  {}
+            }
+            return {
+                ...job,
+                thumbnails
+            };
+        }));
         res.send({
-            items,
+            items: itemsWithThumbnails,
             count,
             pages: Math.ceil(count / pageSize)
         });
@@ -63,15 +77,14 @@ class PrintJobController {
             'printer'
         ]);
         try {
-            let thumbnailCount = 0;
+            let thumbnails = [];
             if (job.fileStorageId) {
-                const thumbnails = await this.fileStorageService.listThumbnails(job.fileStorageId);
-                thumbnailCount = thumbnails.length;
+                const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
+                thumbnails = (0, _thumbnailutil.extractThumbnailsFromMetadata)(metadata);
             }
             res.send({
                 ...job,
-                thumbnailCount,
-                thumbnailsUrl: thumbnailCount > 0 ? `/api/print-jobs/${jobId}/thumbnails` : null
+                thumbnails
             });
         } catch (error) {
             this.logger.error(`Failed to get job ${jobId}: ${error}`);
@@ -84,36 +97,23 @@ class PrintJobController {
         const jobId = req.local.id;
         const job = await this.printJobService.getJobByIdOrFail(jobId);
         try {
-            if (job.status !== "UNKNOWN") {
+            if ([
+                "PENDING",
+                "QUEUED"
+            ].includes(job.status)) {
                 res.status(400).send({
-                    error: "Can only mark UNKNOWN jobs as completed",
+                    error: "Can only mark jobs which are not \"PENDING\" | \"QUEUED\" as completed",
                     currentStatus: job.status,
                     suggestion: "This endpoint is for resolving jobs with unknown state"
                 });
                 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) {
@@ -141,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,
@@ -194,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,
@@ -243,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,
@@ -284,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) {
@@ -325,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);
@@ -374,124 +326,6 @@ class PrintJobController {
             });
         }
     }
-    async getThumbnails(req, res) {
-        const jobId = req.local.id;
-        const job = await this.printJobService.getJobByIdOrFail(jobId);
-        if (!job.fileStorageId) {
-            res.send({
-                jobId,
-                thumbnails: []
-            });
-            return;
-        }
-        try {
-            const metadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
-            const thumbnailMetadata = metadata?._thumbnails || [];
-            res.send({
-                jobId,
-                fileStorageId: job.fileStorageId,
-                thumbnails: thumbnailMetadata.map((thumb)=>({
-                        index: thumb.index,
-                        url: `/api/print-jobs/${jobId}/thumbnails/${thumb.index}`,
-                        filename: thumb.filename,
-                        width: thumb.width,
-                        height: thumb.height,
-                        format: thumb.format,
-                        size: thumb.size
-                    }))
-            });
-        } catch (error) {
-            this.logger.error(`Failed to get thumbnails for job ${jobId}: ${error}`);
-            res.status(500).send({
-                error: "Failed to get thumbnails"
-            });
-        }
-    }
-    async getThumbnail(req, res) {
-        const jobId = req.local.id;
-        const index = req.local.index;
-        const job = await this.printJobService.getJobByIdOrFail(jobId);
-        if (!job.fileStorageId) {
-            throw new _runtimeexceptions.NotFoundException("Job has no stored file");
-        }
-        try {
-            const thumbnail = await this.fileStorageService.getThumbnail(job.fileStorageId, index);
-            if (!thumbnail) {
-                throw new _runtimeexceptions.NotFoundException(`Thumbnail ${index} not found`);
-            }
-            const isPNG = thumbnail[0] === 0x89 && thumbnail[1] === 0x50 && thumbnail[2] === 0x4E && thumbnail[3] === 0x47;
-            const isJPG = thumbnail[0] === 0xFF && thumbnail[1] === 0xD8;
-            const isQOI = thumbnail[0] === 0x71 && thumbnail[1] === 0x6F && thumbnail[2] === 0x69 && thumbnail[3] === 0x66;
-            let contentType = 'image/png';
-            if (isPNG) contentType = 'image/png';
-            else if (isJPG) contentType = 'image/jpeg';
-            else if (isQOI) contentType = 'image/qoi';
-            res.setHeader('Content-Type', contentType);
-            res.setHeader('Cache-Control', 'public, max-age=3600');
-            res.setHeader('ETag', `"${job.fileStorageId}-${index}"`);
-            res.setHeader('Cross-Origin-Resource-Policy', 'cross-origin');
-            res.send(thumbnail);
-        } catch (error) {
-            this.logger.error(`Failed to get thumbnail ${index} for job ${jobId}: ${error}`);
-            res.status(500).send({
-                error: "Failed to get thumbnail"
-            });
-        }
-    }
-    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);
@@ -609,43 +443,6 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", Promise)
 ], PrintJobController.prototype, "deleteJob", null);
-_ts_decorate([
-    (0, _awilixexpress.GET)(),
-    (0, _awilixexpress.route)("/:id/thumbnails"),
-    (0, _awilixexpress.before)([
-        (0, _paramconvertermiddleware.ParamId)("id")
-    ]),
-    _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, "getThumbnails", null);
-_ts_decorate([
-    (0, _awilixexpress.GET)(),
-    (0, _awilixexpress.route)("/:id/thumbnails/:index"),
-    (0, _awilixexpress.before)([
-        (0, _paramconvertermiddleware.ParamId)("id"),
-        (0, _paramconvertermiddleware.ParamInt)("index")
-    ]),
-    _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, "getThumbnail", 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","pages","Math","ceil","getJob","jobId","local","id","job","getJobByIdOrFail","thumbnailCount","fileStorageId","thumbnails","listThumbnails","length","thumbnailsUrl","error","status","setCompleted","currentStatus","suggestion","log","endedAt","progress","statusReason","statistics","startedAt","actualPrintTimeSeconds","printJobRepository","save","message","previousStatus","newStatus","Error","setFailed","includes","actualTimeSeconds","getTime","failureReason","failureTime","setCancelled","setUnknown","reAnalyzeJob","triggerFileAnalysis","filePath","getFilePath","exists","needsAnalysis","NotFoundException","analysisState","metadata","analyzeFile","thumbnailMetadata","saveThumbnails","handleFileAnalyzed","fileHash","saveMetadata","fileName","deleteJob","deleteFileParam","deleteFile","remove","otherJobs","where","fileDeleted","warn","remainingReferences","getThumbnails","loadMetadata","_thumbnails","map","thumb","index","url","filename","width","height","format","size","getThumbnail","thumbnail","isPNG","isJPG","isQOI","contentType","setHeader","createJobFromFile","printerId","body","fileExists","printerName","createPendingJob","_originalFileName","_fileHash","analyzedAt","fileFormat","createdAt","date","endOfDay","setHours","ParamId","ParamInt","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);