@fdm-monster/server 2.0.6 → 2.0.8

package/dist/services/orm/print-job.service.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "PrintJobService", {
 });
 const _printjobentity = require("../../entities/print-job.entity");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+const _jobstatsutil = require("../../utils/job-stats.util");
 class PrintJobService {
     printJobRepository;
     eventEmitter2;
@@ -215,22 +216,9 @@ class PrintJobService {
             this.logger.warn(`Filename mismatch on completion: expected "${job.fileName}", got "${fileName}"`);
         }
         const endedAt = new Date();
-        const actualTimeSeconds = job.startedAt ? (endedAt.getTime() - job.startedAt.getTime()) / 1000 : null;
+        const actualTimeSeconds = (0, _jobstatsutil.calculateJobDuration)(job.startedAt, endedAt);
         job.status = "COMPLETED";
-        job.endedAt = endedAt;
-        job.progress = 100;
-        if (!job.statistics) {
-            job.statistics = {
-                startedAt: job.startedAt,
-                endedAt,
-                actualPrintTimeSeconds: actualTimeSeconds,
-                progress: 100
-            };
-        } else {
-            job.statistics.endedAt = endedAt;
-            job.statistics.actualPrintTimeSeconds = actualTimeSeconds;
-            job.statistics.progress = 100;
-        }
+        (0, _jobstatsutil.updateStatisticsForCompletion)(job, endedAt);
         await this.printJobRepository.save(job);
         this.eventEmitter2.emit("printJob.completed", {
             jobId: job.id,
@@ -257,25 +245,8 @@ class PrintJobService {
             return null;
         }
         const endedAt = new Date();
-        const actualTimeSeconds = job.startedAt ? (endedAt.getTime() - job.startedAt.getTime()) / 1000 : null;
         job.status = "FAILED";
-        job.statusReason = reason;
-        job.endedAt = endedAt;
-        if (!job.statistics) {
-            job.statistics = {
-                startedAt: job.startedAt,
-                endedAt,
-                actualPrintTimeSeconds: actualTimeSeconds,
-                progress: job.progress,
-                failureReason: reason,
-                failureTime: endedAt
-            };
-        } else {
-            job.statistics.endedAt = endedAt;
-            job.statistics.actualPrintTimeSeconds = actualTimeSeconds;
-            job.statistics.failureReason = reason;
-            job.statistics.failureTime = endedAt;
-        }
+        (0, _jobstatsutil.updateStatisticsForFailure)(job, reason, endedAt);
         await this.printJobRepository.save(job);
         this.eventEmitter2.emit("printJob.failed", {
             jobId: job.id,
@@ -302,21 +273,8 @@ class PrintJobService {
             return null;
         }
         const endedAt = new Date();
-        const actualTimeSeconds = job.startedAt ? (endedAt.getTime() - job.startedAt.getTime()) / 1000 : null;
         job.status = "CANCELLED";
-        job.statusReason = reason || "Print cancelled by user";
-        job.endedAt = endedAt;
-        if (!job.statistics) {
-            job.statistics = {
-                startedAt: job.startedAt,
-                endedAt,
-                actualPrintTimeSeconds: actualTimeSeconds,
-                progress: job.progress
-            };
-        } else {
-            job.statistics.endedAt = endedAt;
-            job.statistics.actualPrintTimeSeconds = actualTimeSeconds;
-        }
+        (0, _jobstatsutil.updateStatisticsForCancellation)(job, reason, endedAt);
         await this.printJobRepository.save(job);
         this.eventEmitter2.emit("printJob.cancelled", {
             jobId: job.id,
@@ -534,6 +492,56 @@ class PrintJobService {
         });
         this.logger.log(`Triggered file download and analysis for job ${jobId}`);
     }
+    async markAsCompleted(jobId, reason) {
+        const job = await this.getJobByIdOrFail(jobId);
+        job.status = "COMPLETED";
+        (0, _jobstatsutil.updateStatisticsForCompletion)(job);
+        if (reason) {
+            job.statusReason = reason;
+        } else {
+            job.statusReason = "Manually marked as completed by user";
+        }
+        await this.printJobRepository.save(job);
+        this.logger.log(`Job ${jobId} manually marked as COMPLETED`);
+        return job;
+    }
+    async markAsFailed(jobId, reason) {
+        const job = await this.getJobByIdOrFail(jobId);
+        job.status = "FAILED";
+        (0, _jobstatsutil.updateStatisticsForFailure)(job, reason);
+        await this.printJobRepository.save(job);
+        this.logger.log(`Job ${jobId} manually marked as FAILED: ${reason}`);
+        return job;
+    }
+    async markAsCancelled(jobId, reason) {
+        const job = await this.getJobByIdOrFail(jobId);
+        job.status = "CANCELLED";
+        (0, _jobstatsutil.updateStatisticsForCancellation)(job, reason);
+        await this.printJobRepository.save(job);
+        this.logger.log(`Job ${jobId} manually marked as CANCELLED`);
+        return job;
+    }
+    async markAsUnknown(jobId, reason) {
+        const job = await this.getJobByIdOrFail(jobId);
+        job.status = "UNKNOWN";
+        job.statusReason = reason || "Manually marked as unknown by user (state uncertain)";
+        await this.printJobRepository.save(job);
+        this.logger.log(`Job ${jobId} manually marked as UNKNOWN`);
+        return job;
+    }
+    async countJobsReferencingFile(fileStorageId) {
+        return await this.printJobRepository.count({
+            where: {
+                fileStorageId
+            }
+        });
+    }
+    async updateJob(job) {
+        return await this.printJobRepository.save(job);
+    }
+    async deleteJob(job) {
+        await this.printJobRepository.remove(job);
+    }
 }
 
 //# sourceMappingURL=print-job.service.js.map

package/dist/services/orm/print-job.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/print-job.service.ts"],"names":["PrintJobService","printJobRepository","eventEmitter2","logger","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","getJobByIdOrFail","id","relations","job","findOne","where","NotFoundException","handleFileAnalyzed","jobId","metadata","thumbnails","Error","analysisState","analyzedAt","Date","fileFormat","save","emit","printerId","log","fileName","handlePrintStarted","printerName","existingJob","status","order","startedAt","statusReason","endedAt","warn","createdAt","create","progress","statistics","actualPrintTimeSeconds","handlePrintProgress","currentLayer","totalLayers","Math","min","max","undefined","handlePrintCompleted","actualTimeSeconds","getTime","estimatedTimeSeconds","gcodePrintTimeSeconds","toFixed","handlePrintFailed","reason","failureReason","failureTime","failedAt","handlePrintCancelled","cancelledAt","handlePrintPaused","handlePrintResumed","cleanupStaleJobs","staleJobs","find","length","getActivePrintJob","getPrintJobHistory","limit","take","markStarted","markProgress","markFinished","markFailed","updateJobMetadata","partialMetadata","debug","updatedMetadata","key","value","Object","entries","hasData","values","some","v","searchPrintJobs","searchPrinter","searchFile","startDate","endDate","query","createQueryBuilder","andWhere","Number","parseInt","orderBy","getMany","searchPrintJobsPaged","page","pageSize","skip","getManyAndCount","createPendingJob","hasAnalysisData","filamentUsedGrams","totalFilamentUsedGrams","layerHeight","fileSize","toLowerCase","triggerFileAnalysis"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/print-job.service.ts"],"names":["PrintJobService","printJobRepository","eventEmitter2","logger","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","getJobByIdOrFail","id","relations","job","findOne","where","NotFoundException","handleFileAnalyzed","jobId","metadata","thumbnails","Error","analysisState","analyzedAt","Date","fileFormat","save","emit","printerId","log","fileName","handlePrintStarted","printerName","existingJob","status","order","startedAt","statusReason","endedAt","warn","createdAt","create","progress","statistics","actualPrintTimeSeconds","handlePrintProgress","currentLayer","totalLayers","Math","min","max","undefined","handlePrintCompleted","actualTimeSeconds","calculateJobDuration","updateStatisticsForCompletion","estimatedTimeSeconds","gcodePrintTimeSeconds","toFixed","handlePrintFailed","reason","updateStatisticsForFailure","failedAt","handlePrintCancelled","updateStatisticsForCancellation","cancelledAt","handlePrintPaused","handlePrintResumed","cleanupStaleJobs","staleJobs","find","length","getActivePrintJob","getPrintJobHistory","limit","take","markStarted","markProgress","markFinished","markFailed","updateJobMetadata","partialMetadata","debug","updatedMetadata","key","value","Object","entries","hasData","values","some","v","searchPrintJobs","searchPrinter","searchFile","startDate","endDate","query","createQueryBuilder","andWhere","Number","parseInt","orderBy","getMany","searchPrintJobsPaged","page","pageSize","skip","getManyAndCount","createPendingJob","hasAnalysisData","filamentUsedGrams","totalFilamentUsedGrams","layerHeight","fileSize","toLowerCase","triggerFileAnalysis","markAsCompleted","markAsFailed","markAsCancelled","markAsUnknown","countJobsReferencingFile","fileStorageId","count","updateJob","deleteJob","remove"],"mappings":"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"}

package/dist/services/print-queue.service.js

@@ -10,26 +10,58 @@ Object.defineProperty(exports, "PrintQueueService", {
 });
 const _typeorm = require("typeorm");
 const _printjobentity = require("../entities/print-job.entity");
+const _printerentity = require("../entities/printer.entity");
+const _socketstatetype = require("../shared/dtos/socket-state.type");
+const _apistatetype = require("../shared/dtos/api-state.type");
 const _node = require("@sentry/node");
 class PrintQueueService {
     printerApiFactory;
     fileStorageService;
+    printerSocketStore;
     printJobRepository;
+    printerRepository;
     eventEmitter2;
     logger;
-    constructor(loggerFactory, typeormService, eventEmitter2, printerApiFactory, fileStorageService){
+    constructor(loggerFactory, typeormService, eventEmitter2, printerApiFactory, fileStorageService, printerSocketStore){
         this.printerApiFactory = printerApiFactory;
         this.fileStorageService = fileStorageService;
+        this.printerSocketStore = printerSocketStore;
         this.printJobRepository = typeormService.getDataSource().getRepository(_printjobentity.PrintJob);
+        this.printerRepository = typeormService.getDataSource().getRepository(_printerentity.Printer);
         this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(PrintQueueService.name);
         this.eventEmitter2.on("printQueue.jobSubmitted", (event)=>{
-            this.handleJobSubmission(event.printerId, event.jobId, event.fileName, event.fileStorageId).catch((error)=>{
+            this.handleJobSubmission(event.printerId, event.jobId, event.fileName, event.fileStorageId, event.queuePosition).catch((error)=>{
                 this.logger.error(`Failed to handle job submission for job ${event.jobId}`, error);
                 (0, _node.captureException)(error);
             });
         });
-        this.logger.log("Print queue service initialized");
+    }
+    isPrinterConnected(printerId) {
+        const socket = this.printerSocketStore.getPrinterSocket(printerId);
+        if (!socket) {
+            return {
+                connected: false,
+                reason: "No socket connection found"
+            };
+        }
+        const socketState = socket.socketState;
+        const apiState = socket.apiState;
+        if (socketState !== _socketstatetype.SOCKET_STATE.opened && socketState !== _socketstatetype.SOCKET_STATE.authenticated) {
+            return {
+                connected: false,
+                reason: `Socket not connected (state: ${socketState})`
+            };
+        }
+        if (apiState !== _apistatetype.API_STATE.responding) {
+            return {
+                connected: false,
+                reason: `Printer not responding (API state: ${apiState})`
+            };
+        }
+        return {
+            connected: true
+        };
     }
     async addToQueue(printerId, jobId, position) {
         const job = await this.printJobRepository.findOne({
@@ -40,11 +72,7 @@ class PrintQueueService {
         if (!job) {
             throw new Error(`Print job ${jobId} not found`);
         }
-        if (!job.printerId) {
-            job.printerId = printerId;
-        } else if (job.printerId !== printerId) {
-            throw new Error(`Job ${jobId} belongs to printer ${job.printerId}, cannot add to printer ${printerId}`);
-        }
+        this.ensurePrinterAssignment(job, printerId);
         if (position === undefined || position === null) {
             const maxPosition = await this.getMaxQueuePosition(printerId);
             job.queuePosition = (maxPosition ?? -1) + 1;
@@ -107,6 +135,23 @@ class PrintQueueService {
                 createdAt: j.createdAt
             }));
     }
+    async getGlobalQueuePaged(page, pageSize) {
+        const skip = (page - 1) * pageSize;
+        return await this.printJobRepository.findAndCount({
+            where: {
+                status: "QUEUED"
+            },
+            order: {
+                printerId: "ASC",
+                queuePosition: "ASC"
+            },
+            relations: [
+                'printer'
+            ],
+            take: pageSize,
+            skip: skip
+        });
+    }
     async getNextInQueue(printerId) {
         return this.printJobRepository.findOne({
             where: {
@@ -126,7 +171,7 @@ class PrintQueueService {
                     id: jobIds[i]
                 }
             });
-            if (job && job.printerId === printerId) {
+            if (job?.printerId === printerId) {
                 job.queuePosition = i;
                 await this.printJobRepository.save(job);
             }
@@ -168,6 +213,13 @@ class PrintQueueService {
         });
         return nextJob;
     }
+    ensurePrinterAssignment(job, printerId) {
+        if (!job.printerId) {
+            job.printerId = printerId;
+        } else if (job.printerId !== printerId) {
+            throw new Error(`Job ${job.id} belongs to printer ${job.printerId}, cannot submit to printer ${printerId}`);
+        }
+    }
     async getMaxQueuePosition(printerId) {
         const result = await this.printJobRepository.createQueryBuilder("job").select("MAX(job.queuePosition)", "max").where("job.printerId = :printerId", {
             printerId
@@ -192,15 +244,6 @@ class PrintQueueService {
             removedPosition
         }).execute();
     }
-    async handleJobCompleted(printerId) {
-        const nextJob = await this.getNextInQueue(printerId);
-        if (nextJob) {
-            this.logger.log(`Auto-processing queue after completion: starting job ${nextJob.id}`);
-            await this.processQueue(printerId);
-        } else {
-            this.logger.log(`Queue empty for printer ${printerId} after job completion`);
-        }
-    }
     async submitToPrinter(printerId, jobId) {
         const job = await this.printJobRepository.findOne({
             where: {
@@ -210,39 +253,55 @@ class PrintQueueService {
         if (!job) {
             throw new Error(`Print job ${jobId} not found`);
         }
-        if (job.printerId && job.printerId !== printerId) {
-            throw new Error(`Job ${jobId} belongs to printer ${job.printerId}, cannot submit to printer ${printerId}`);
-        }
-        if (!job.printerId) {
-            job.printerId = printerId;
-        }
+        this.ensurePrinterAssignment(job, printerId);
+        const queuePosition = job.queuePosition;
         if (job.queuePosition !== null) {
             const oldPosition = job.queuePosition;
             job.queuePosition = null;
             await this.compactQueuePositions(printerId, oldPosition);
         }
         job.status = "PRINTING";
+        job.startedAt = new Date();
         await this.printJobRepository.save(job);
         this.logger.log(`Submitting job ${jobId} (${job.fileName}) to printer ${printerId}`);
         this.eventEmitter2.emit("printQueue.jobSubmitted", {
             printerId,
             jobId: job.id,
             fileName: job.fileName,
-            fileStorageId: job.fileStorageId
+            fileStorageId: job.fileStorageId,
+            queuePosition
         });
     }
-    async handleJobSubmission(printerId, jobId, fileName, fileStorageId) {
+    async handleJobSubmission(printerId, jobId, fileName, fileStorageId, queuePosition) {
         this.logger.log(`Handling job submission for job ${jobId} on printer ${printerId}`);
         try {
             if (!fileStorageId) {
                 throw new Error(`Job ${jobId} has no fileStorageId - cannot submit to printer`);
             }
-            const fileBuffer = this.fileStorageService.readFile(fileStorageId);
-            this.logger.log(`Read ${fileBuffer.length} bytes for job ${jobId}`);
             const printerApi = this.printerApiFactory.getById(printerId);
+            const fileSize = this.fileStorageService.getFileSize(fileStorageId);
+            const fileStream = this.fileStorageService.readFileStream(fileStorageId);
             this.logger.log(`Uploading file ${fileName} to printer ${printerId} and starting print`);
-            await printerApi.uploadFile(fileBuffer, true);
+            await printerApi.uploadFile({
+                stream: fileStream,
+                fileName,
+                contentLength: fileSize,
+                startPrint: true
+            });
             this.logger.log(`Successfully submitted job ${jobId} to printer ${printerId}`);
+            if (queuePosition !== null && queuePosition !== undefined) {
+                const job = await this.printJobRepository.findOne({
+                    where: {
+                        id: jobId
+                    }
+                });
+                if (job?.queuePosition === queuePosition) {
+                    job.queuePosition = null;
+                    await this.printJobRepository.save(job);
+                    await this.compactQueuePositions(printerId, queuePosition);
+                    this.logger.log(`Removed job ${jobId} from queue after successful submission`);
+                }
+            }
         } catch (error) {
             this.logger.error(`Failed to submit job ${jobId} to printer ${printerId}`, error);
             try {
@@ -254,8 +313,9 @@ class PrintQueueService {
                 if (job) {
                     job.status = "FAILED";
                     job.statusReason = `Print submission failed: ${error instanceof Error ? error.message : "Unknown error"}`;
+                    job.endedAt = new Date();
                     await this.printJobRepository.save(job);
-                    this.logger.log(`Updated job ${jobId} status to FAILED`);
+                    this.logger.log(`Updated job ${jobId} status to FAILED (still in queue for retry)`);
                 }
             } catch (updateError) {
                 this.logger.error(`Failed to update job ${jobId} status after submission error`, updateError);

package/dist/services/print-queue.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-queue.service.ts"],"names":["PrintQueueService","printJobRepository","eventEmitter2","logger","loggerFactory","typeormService","printerApiFactory","fileStorageService","getDataSource","getRepository","PrintJob","name","on","event","handleJobSubmission","printerId","jobId","fileName","fileStorageId","catch","error","captureException","log","addToQueue","position","job","findOne","where","id","Error","undefined","maxPosition","getMaxQueuePosition","queuePosition","shiftQueuePositions","status","save","emit","removeFromQueue","oldPosition","compactQueuePositions","getQueue","jobs","find","Not","IsNull","order","map","j","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","createdAt","getNextInQueue","reorderQueue","jobIds","i","length","clearQueue","processQueue","nextJob","result","createQueryBuilder","select","getRawOne","max","fromPosition","update","set","andWhere","execute","removedPosition","handleJobCompleted","submitToPrinter","fileBuffer","readFile","printerApi","getById","uploadFile","statusReason","message","updateError"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/print-queue.service.ts"],"names":["PrintQueueService","printJobRepository","printerRepository","eventEmitter2","logger","loggerFactory","typeormService","printerApiFactory","fileStorageService","printerSocketStore","getDataSource","getRepository","PrintJob","Printer","name","on","event","handleJobSubmission","printerId","jobId","fileName","fileStorageId","queuePosition","catch","error","captureException","isPrinterConnected","socket","getPrinterSocket","connected","reason","socketState","apiState","SOCKET_STATE","opened","authenticated","API_STATE","responding","addToQueue","position","job","findOne","where","id","Error","ensurePrinterAssignment","undefined","maxPosition","getMaxQueuePosition","shiftQueuePositions","status","save","log","emit","removeFromQueue","oldPosition","compactQueuePositions","getQueue","jobs","find","Not","IsNull","order","map","j","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","createdAt","getGlobalQueuePaged","page","pageSize","skip","findAndCount","relations","take","getNextInQueue","reorderQueue","jobIds","i","length","clearQueue","processQueue","nextJob","result","createQueryBuilder","select","getRawOne","max","fromPosition","update","set","andWhere","execute","removedPosition","submitToPrinter","startedAt","Date","printerApi","getById","fileSize","getFileSize","fileStream","readFileStream","uploadFile","stream","contentLength","startPrint","statusReason","message","endedAt","updateError"],"mappings":"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"}

package/dist/services/printer-api.interface.js

@@ -26,8 +26,21 @@ _export(exports, {
     },
     get ReprintState () {
         return ReprintState;
+    },
+    get uploadFileInputSchema () {
+        return uploadFileInputSchema;
     }
 });
+const _zod = require("zod");
+const uploadFileInputSchema = _zod.z.object({
+    stream: _zod.z.custom((val)=>{
+        return val && typeof val === "object" && "pipe" in val && typeof val.pipe === "function";
+    }, "Must be a readable stream"),
+    fileName: _zod.z.string().min(1),
+    contentLength: _zod.z.number().int().positive(),
+    startPrint: _zod.z.boolean(),
+    uploadToken: _zod.z.string().optional()
+});
 const OctoprintType = 0;
 const MoonrakerType = 1;
 const PrusaLinkType = 2;

package/dist/services/printer-api.interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;QAUaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;QA6CDC;eAAAA;;;AA/CL,MAAMH,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AACtB,MAAMJ,YAAY;AAElB,IAAA,AAAKG,0CAAAA;;;;;WAAAA;;AA0CL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}
+{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState","uploadFileInputSchema","z","object","stream","custom","val","pipe","fileName","string","min","contentLength","number","int","positive","startPrint","boolean","uploadToken","optional"],"mappings":";;;;;;;;;;;QAwBaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;QA6CDC;eAAAA;;QA3DCC;eAAAA;;;qBAHK;AAGX,MAAMA,wBAAwBC,MAAC,CAACC,MAAM,CAAC;IAC5CC,QAAQF,MAAC,CAACG,MAAM,CAAW,CAACC;QAC1B,OAAOA,OAAO,OAAOA,QAAQ,YAAY,UAAUA,OAAO,OAAOA,IAAIC,IAAI,KAAK;IAChF,GAAG;IACHC,UAAUN,MAAC,CAACO,MAAM,GAAGC,GAAG,CAAC;IACzBC,eAAeT,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,QAAQ;IACxCC,YAAYb,MAAC,CAACc,OAAO;IACrBC,aAAaf,MAAC,CAACO,MAAM,GAAGS,QAAQ;AAClC;AAIO,MAAMrB,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AACtB,MAAMJ,YAAY;AAElB,IAAA,AAAKG,0CAAAA;;;;;WAAAA;;AA0CL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}

package/dist/services/prusa-link/prusa-link.api.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "PrusaLinkApi", {
 });
 const _printerapiinterface = require("../printer-api.interface");
 const _prusalinkhttpclientbuilder = require("./utils/prusa-link-http-client.builder");
-const _fs = require("fs");
 const _eventconstants = require("../../constants/event.constants");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const defaultLog = {
@@ -143,37 +142,28 @@ class PrusaLinkApi {
                 Range: `bytes=${startBytes}-${endBytes}`
             })).get(pathUrl);
     }
-    async uploadFile(multerFileOrBuffer, startPrint, progressToken) {
+    async uploadFile(input) {
+        const validated = _printerapiinterface.uploadFileInputSchema.parse(input);
         try {
-            let fileBuffer;
-            const filename = multerFileOrBuffer.originalname;
-            if (Buffer.isBuffer(multerFileOrBuffer)) {
-                this.logger.log("Using file directly from memory buffer for upload");
-                fileBuffer = multerFileOrBuffer;
-            } else {
-                const filePath = multerFileOrBuffer.path;
-                this.logger.log(`Reading file from disk for upload: ${filePath}`);
-                fileBuffer = (0, _fs.readFileSync)(filePath);
-            }
-            const contentLength = fileBuffer.length;
             const response = await this.createClient((b)=>{
                 b.withHeaders({
-                    "Content-Length": contentLength.toString(),
+                    "Content-Type": "application/octet-stream",
+                    "Content-Length": validated.contentLength.toString(),
                     Overwrite: "?1",
-                    "Print-After-Upload": startPrint ? "?1" : "?0"
+                    "Print-After-Upload": validated.startPrint ? "?1" : "?0"
                 }).withTimeout(this.settingsStore.getTimeoutSettings().apiUploadTimeout).withOnUploadProgress((p)=>{
-                    if (progressToken) {
-                        this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(progressToken)}`, progressToken, p);
+                    if (validated.uploadToken) {
+                        this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(validated.uploadToken)}`, validated.uploadToken, p);
                     }
                 });
-            }).put(`/api/v1/files/usb/${encodeURIComponent(filename)}`, fileBuffer);
-            if (progressToken) {
-                this.eventEmitter2.emit(`${(0, _eventconstants.uploadDoneEvent)(progressToken)}`, progressToken);
+            }).put(`/api/v1/files/usb/${encodeURIComponent(validated.fileName)}`, validated.stream);
+            if (validated.uploadToken) {
+                this.eventEmitter2.emit(`${(0, _eventconstants.uploadDoneEvent)(validated.uploadToken)}`, validated.uploadToken);
             }
             return response.data;
         } catch (e) {
-            if (progressToken) {
-                this.eventEmitter2.emit(`${(0, _eventconstants.uploadFailedEvent)(progressToken)}`, progressToken, e?.message);
+            if (validated.uploadToken) {
+                this.eventEmitter2.emit(`${(0, _eventconstants.uploadFailedEvent)(validated.uploadToken)}`, validated.uploadToken, e?.message);
             }
             let data;
             try {

package/dist/services/prusa-link/prusa-link.api.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","validateConnection","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","multerFileOrBuffer","progressToken","fileBuffer","filename","originalname","Buffer","isBuffer","log","filePath","readFileSync","contentLength","length","b","toString","Overwrite","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","encodeURIComponent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","config","method","toUpperCase","url","withAuthHeader"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","validateConnection","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","input","validated","uploadFileInputSchema","parse","b","contentLength","toString","Overwrite","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","uploadToken","emit","uploadProgressEvent","encodeURIComponent","fileName","stream","uploadDoneEvent","e","uploadFailedEvent","message","JSON","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","log","config","method","toUpperCase","url","withAuthHeader"],"mappings":"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"}