@fdm-monster/server 2.0.7 → 2.0.9

package/README.md

@@ -137,7 +137,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
     <tr>
       <td align="center" valign="top" width="10%"><a href="https://github.com/Tbwan"><img src="https://avatars.githubusercontent.com/u/44231748?v=4?s=40" width="40px;" alt="Tbwan"/><br /><sub><b>Tbwan</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3ATbwan" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="10%"><a href="https://github.com/nuvious"><img src="https://avatars.githubusercontent.com/u/5287736?v=4?s=40" width="40px;" alt="David Cheeseman"/><br /><sub><b>David Cheeseman</b></sub></a><br /><a href="#ideas-nuvious" title="Ideas, Planning, & Feedback">🤔</a> <a href="#platform-nuvious" title="Packaging/porting to new platform">📦</a> <a href="#infra-nuvious" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="10%"><a href="https://github.com/thatguy-jaysenodell"><img src="https://avatars.githubusercontent.com/u/118288184?v=4?s=40" width="40px;" alt="That Guy Jaysen"/><br /><sub><b>That Guy Jaysen</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Athatguy-jaysenodell" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="10%"><a href="https://github.com/thatguy-jaysenodell"><img src="https://avatars.githubusercontent.com/u/118288184?v=4?s=40" width="40px;" alt="That Guy Jaysen"/><br /><sub><b>That Guy Jaysen</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Athatguy-jaysenodell" title="Bug reports">🐛</a> <a href="#ideas-thatguy-jaysenodell" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/commits?author=thatguy-jaysenodell" title="Code">💻</a></td>
       <td align="center" valign="top" width="10%"><a href="http://design.zagethy.com"><img src="https://avatars.githubusercontent.com/u/6075740?v=4?s=40" width="40px;" alt="Zagethy"/><br /><sub><b>Zagethy</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3AZagethy" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>

package/RELEASE_NOTES.MD

@@ -1,5 +1,40 @@
 # Develop
 
+# FDM Monster 2.0.9
+
+## Features
+
+- Implemented directory navigation with optional recursive mode for printer file listings across all 4 implementations
+- Added `dir` field to `FileDto` to distinguish files from directories (OctoPrint and Moonraker support recursive, PrusaLink and Bambu non-recursive only)
+
+## Refactor
+
+- Updated `getFiles()` signature to support `recursive` and `startDir` parameters with non-recursive as default for performance
+- Removed in-memory file cache system - files are now fetched fresh from printer APIs
+
+# 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/container.js

@@ -18,11 +18,9 @@ const _settingsstore = require("./state/settings.store");
 const _serverreleaseservice = require("./services/core/server-release.service");
 const _taskmanagerservice = require("./services/task-manager.service");
 const _githubservice = require("./services/core/github.service");
-const _filecache = require("./state/file.cache");
 const _printerwebsockettask = require("./tasks/printer-websocket.task");
 const _socketiotask = require("./tasks/socketio.task");
 const _socketfactory = require("./services/socket.factory");
-const _printerfilesstore = require("./state/printer-files.store");
 const _eventemitter = require("./handlers/event-emitter");
 const _serverconstants = require("./server.constants");
 const _softwareupdatetask = require("./tasks/software-update.task");
@@ -34,7 +32,6 @@ const _boottask = require("./tasks/boot.task");
 const _userservice = require("./services/orm/user.service");
 const _roleservice = require("./services/orm/role.service");
 const _permissionservice = require("./services/orm/permission.service");
-const _printerfilesloadtask = require("./tasks/printer-files-load.task");
 const _authorizationconstants = require("./constants/authorization.constants");
 const _printerwebsocketrestoretask = require("./tasks/printer-websocket-restore.task");
 const _configservice = require("./services/core/config.service");
@@ -164,9 +161,7 @@ function configureContainer() {
         [di.batchCallService]: (0, _awilix.asClass)(_batchcallservice.BatchCallService).singleton(),
         [di.floorStore]: (0, _awilix.asClass)(_floorstore.FloorStore).singleton(),
         [di.printerThumbnailCache]: (0, _awilix.asClass)(_printerthumbnailcache.PrinterThumbnailCache).singleton(),
-        [di.fileCache]: (0, _awilix.asClass)(_filecache.FileCache).singleton(),
         [di.fileUploadTrackerCache]: (0, _awilix.asClass)(_fileuploadtrackercache.FileUploadTrackerCache).singleton(),
-        [di.printerFilesStore]: (0, _awilix.asClass)(_printerfilesstore.PrinterFilesStore).singleton(),
         [di.printerCache]: (0, _awilix.asClass)(_printercache.PrinterCache).singleton(),
         [di.printerEventsCache]: (0, _awilix.asClass)(_printereventscache.PrinterEventsCache).singleton(),
         [di.printerSocketStore]: (0, _awilix.asClass)(_printersocketstore.PrinterSocketStore).singleton(),
@@ -182,7 +177,6 @@ function configureContainer() {
         [di.clientDistDownloadTask]: (0, _awilix.asClass)(_clientbundletask.ClientDistDownloadTask).singleton(),
         [di.printerWebsocketTask]: (0, _awilix.asClass)(_printerwebsockettask.PrinterWebsocketTask).singleton(),
         [di.printerWebsocketRestoreTask]: (0, _awilix.asClass)(_printerwebsocketrestoretask.PrinterWebsocketRestoreTask).singleton(),
-        [di.printerFilesLoadTask]: (0, _awilix.asClass)(_printerfilesloadtask.PrinterFilesLoadTask).singleton(),
         [di.printJobAnalysisTask]: (0, _awilix.asClass)(_printjobanalysistask.PrintJobAnalysisTask).singleton()
     });
     return container;

package/dist/container.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","CLASSIC","di","DITokens","register","appDefaultRole","asValue","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","cradleService","asClass","CradleService","inject","socketFactory","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService","floorService","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraStreamService","printerService","PrinterService","printerMaintenanceLogService","PrinterMaintenanceLogService","printerTagService","PrinterTagService","refreshTokenService","RefreshTokenService","userService","UserService","userRoleService","UserRoleService","roleService","RoleService","permissionService","PermissionService","serverHost","ServerHost","exceptionFilter","ExceptionFilter","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","_retryAfter","options","_octokit","_retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClientFactory","HttpClientFactory","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","prusaLinkApi","PrusaLinkApi","prusaLinkPollingAdapter","PrusaLinkHttpPollingAdapter","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","bambuApi","BambuApi","bambuClient","BambuClient","bambuFtpAdapter","BambuFtpAdapter","bambuMqttAdapter","BambuMqttAdapter","batchCallService","BatchCallService","floorStore","FloorStore","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","printJobService","PrintJobService","printQueueService","PrintQueueService","fileStorageService","FileStorageService","fileAnalysisService","FileAnalysisService","printFileDownloaderService","PrintFileDownloaderService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFilesLoadTask","PrinterFilesLoadTask","printJobAnalysisTask","PrintJobAnalysisTask"],"mappings":"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"}
+{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","CLASSIC","di","DITokens","register","appDefaultRole","asValue","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","cradleService","asClass","CradleService","inject","socketFactory","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService","floorService","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraStreamService","printerService","PrinterService","printerMaintenanceLogService","PrinterMaintenanceLogService","printerTagService","PrinterTagService","refreshTokenService","RefreshTokenService","userService","UserService","userRoleService","UserRoleService","roleService","RoleService","permissionService","PermissionService","serverHost","ServerHost","exceptionFilter","ExceptionFilter","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","_retryAfter","options","_octokit","_retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClientFactory","HttpClientFactory","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","prusaLinkApi","PrusaLinkApi","prusaLinkPollingAdapter","PrusaLinkHttpPollingAdapter","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","bambuApi","BambuApi","bambuClient","BambuClient","bambuFtpAdapter","BambuFtpAdapter","bambuMqttAdapter","BambuMqttAdapter","batchCallService","BatchCallService","floorStore","FloorStore","printerThumbnailCache","PrinterThumbnailCache","fileUploadTrackerCache","FileUploadTrackerCache","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","printJobService","PrintJobService","printQueueService","PrintQueueService","fileStorageService","FileStorageService","fileAnalysisService","FileAnalysisService","printFileDownloaderService","PrintFileDownloaderService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printJobAnalysisTask","PrintJobAnalysisTask"],"mappings":"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"}

package/dist/container.tokens.js

@@ -70,14 +70,12 @@ const DITokens = {
     settingsStore: "settingsStore",
     printerSocketStore: "printerSocketStore",
     testPrinterSocketStore: "testPrinterSocketStore",
-    printerFilesStore: "printerFilesStore",
     prusaLinkPollingAdapter: "prusaLinkPollingAdapter",
     octoPrintSockIoAdapter: "octoPrintSockIoAdapter",
     moonrakerWebsocketAdapter: "moonrakerWebsocketAdapter",
     printerCache: "printerCache",
     printerEventsCache: "printerEventsCache",
     printerThumbnailCache: "printerThumbnailCache",
-    fileCache: "fileCache",
     fileUploadTrackerCache: "fileUploadTrackerCache",
     bootTask: "bootTask",
     softwareUpdateTask: "softwareUpdateTask",

package/dist/container.tokens.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","cradleService","serverVersion","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","exceptionFilter","loggerFactory","httpClientFactory","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","printerService","printerTagService","printerMaintenanceLogService","floorPositionService","printJobService","printQueueService","fileStorageService","fileAnalysisService","printFileDownloaderService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","prusaLinkApi","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","bambuApi","bambuClient","bambuFtpAdapter","bambuMqttAdapter","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","influxDbV2BaseService","systemInfoBundleService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","prusaLinkPollingAdapter","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFilesLoadTask","printJobAnalysisTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IACtBC,eAAe;IAEfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,iBAAiB;IACjBC,eAAe;IACfC,mBAAmB;IACnBC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,mBAAmB;IACnBC,8BAA8B;IAC9BC,sBAAsB;IACtBC,iBAAiB;IACjBC,mBAAmB;IACnBC,oBAAoB;IACpBC,qBAAqB;IACrBC,4BAA4B;IAC5BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,UAAU;IACVC,aAAa;IACbC,iBAAiB;IACjBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,yBAAyB;IAEzBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,yBAAyB;IACzBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;IACtBC,sBAAsB;AACxB"}
+{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","cradleService","serverVersion","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","exceptionFilter","loggerFactory","httpClientFactory","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","printerService","printerTagService","printerMaintenanceLogService","floorPositionService","printJobService","printQueueService","fileStorageService","fileAnalysisService","printFileDownloaderService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","prusaLinkApi","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","bambuApi","bambuClient","bambuFtpAdapter","bambuMqttAdapter","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","influxDbV2BaseService","systemInfoBundleService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","prusaLinkPollingAdapter","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileUploadTrackerCache","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFilesLoadTask","printJobAnalysisTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IACtBC,eAAe;IAEfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,iBAAiB;IACjBC,eAAe;IACfC,mBAAmB;IACnBC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,mBAAmB;IACnBC,8BAA8B;IAC9BC,sBAAsB;IACtBC,iBAAiB;IACjBC,mBAAmB;IACnBC,oBAAoB;IACpBC,qBAAqB;IACrBC,4BAA4B;IAC5BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,UAAU;IACVC,aAAa;IACbC,iBAAiB;IACjBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,yBAAyB;IAEzBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,yBAAyB;IACzBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,wBAAwB;IAExBC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;IACtBC,sBAAsB;AACxB"}

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":";;;;+BAiBaA;;;eAAAA;;;+BAjBoC;iCACpB;yBACK;8BACW;wCACvB;oCACkC;4BAC1B;iCACE;qCACI;oCACD;+BACJ;0CAEP;mCACU;;;;;;;;;;AAI3B,MAAMA;;;;IACMC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,eAAgC,EACjD,AAAiBC,mBAAwC,EACzD,AAAiBC,kBAAsC,CACvD;aAHiBF,kBAAAA;aACAC,sBAAAA;aACAC,qBAAAA;QAEjB,IAAI,CAACJ,MAAM,GAAGC,cAAcF,mBAAmBM,IAAI;IACrD;IAEA,MAEMC,WAAWC,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,EAAEC,aAAa,EAAEC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACN,IAAIO,KAAK,EAAEC,oCAAgB;QAGzG,MAAMC,aAAaJ,UAAU,IAAI,CAACK,UAAU,CAAC,IAAIC,KAAKN,YAAYO;QAElE,MAAMC,SAAS,MAAM,IAAI,CAAClB,eAAe,CAACmB,eAAe,CACvDZ,eACAC,YACAC,YAAY,IAAIO,KAAKP,aAAaQ,WAClCH;QAEFR,IAAIc,IAAI,CAACF;IACX;IAEA,MAEMG,gBAAgBhB,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEgB,IAAI,EAAEC,QAAQ,EAAEhB,aAAa,EAAEC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAC3FN,IAAIO,KAAK,EACTY,yCAAqB;QAIvB,MAAMV,aAAaJ,UAAU,IAAI,CAACK,UAAU,CAAC,IAAIC,KAAKN,YAAYO;QAElE,MAAM,CAACQ,OAAOC,MAAM,GAAG,MAAM,IAAI,CAAC1B,eAAe,CAAC2B,oBAAoB,CACpEpB,eACAC,YACAC,YAAY,IAAIO,KAAKP,aAAaQ,WAClCH,YACAQ,MACAC;QAGF,MAAMK,sBAAsB,MAAMC,QAAQC,GAAG,CAC3CL,MAAMM,GAAG,CAAC,OAAOC;YACf,IAAIC,aAAoB,EAAE;YAC1B,IAAID,IAAIE,aAAa,EAAE;gBACrB,IAAI;oBACF,MAAMC,WAAW,MAAM,IAAI,CAACjC,kBAAkB,CAACkC,YAAY,CAACJ,IAAIE,aAAa;oBAC7ED,aAAa,AAACE,CAAAA,UAAUE,eAAe,EAAE,AAAD,EAAGN,GAAG,CAAC,CAACO,QAAgB,CAAA;4BAC9DC,OAAOD,MAAMC,KAAK;4BAClBC,OAAOF,MAAME,KAAK;4BAClBC,QAAQH,MAAMG,MAAM;4BACpBC,QAAQJ,MAAMI,MAAM;4BACpBC,MAAML,MAAMK,IAAI;wBAClB,CAAA;gBACF,EAAE,OAAM,CAAC;YACX;YACA,OAAO;gBAAE,GAAGX,GAAG;gBAAEC;YAAW;QAC9B;QAGF3B,IAAIc,IAAI,CAAC;YAAEK,OAAOG;YAAqBF;YAAOkB,OAAOC,KAAKC,IAAI,CAACpB,QAAQH;QAAU;IACnF;IAEA,MAGMwB,OAAO1C,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAE1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH,OAAO;YAAC;SAAU;QAE1E,IAAI;YACF,IAAIf,aAAoB,EAAE;YAC1B,IAAID,IAAIE,aAAa,EAAE;gBACrB,MAAMC,WAAW,MAAM,IAAI,CAACjC,kBAAkB,CAACkC,YAAY,CAACJ,IAAIE,aAAa;gBAC7ED,aAAa,AAACE,CAAAA,UAAUE,eAAe,EAAE,AAAD,EAAGN,GAAG,CAAC,CAACO,QAAgB,CAAA;wBAC9DC,OAAOD,MAAMC,KAAK;wBAClBC,OAAOF,MAAME,KAAK;wBAClBC,QAAQH,MAAMG,MAAM;wBACpBC,QAAQJ,MAAMI,MAAM;wBACpBC,MAAML,MAAMK,IAAI;oBAClB,CAAA;YACF;YAEArC,IAAIc,IAAI,CAAC;gBACP,GAAGY,GAAG;gBACNC;YACF;QACF,EAAE,OAAOmB,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,kBAAkB,EAAEJ,MAAM,EAAE,EAAEI,OAAO;YACxD9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBAAEgC,OAAO;YAAoB;QACpD;IACF;IAEA,MAGME,aAAajD,GAAY,EAAEC,GAAa,EAAE;QAC9C,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAC1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH;QAExD,IAAI;YACF,IAAI;gBAAC;gBAAW;aAAS,CAACO,QAAQ,CAACvB,IAAIqB,MAAM,GAAG;gBAC9C/C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;oBACnBgC,OAAO;oBACPI,eAAexB,IAAIqB,MAAM;oBACzBI,YAAY;gBACd;gBACA;YACF;YAEA,IAAI,CAAC3D,MAAM,CAAC4D,GAAG,CAAC,CAAC,qBAAqB,EAAEV,MAAM,2BAA2B,CAAC;YAE1EhB,IAAIqB,MAAM,GAAG;YACbrB,IAAI2B,OAAO,GAAG,IAAI3C;YAClBgB,IAAI4B,QAAQ,GAAG;YACf5B,IAAI6B,YAAY,GAAG;YAEnB,IAAI7B,IAAI8B,UAAU,EAAE;gBAClB9B,IAAI8B,UAAU,CAACH,OAAO,GAAG3B,IAAI2B,OAAO;gBACpC3B,IAAI8B,UAAU,CAACF,QAAQ,GAAG;YAC5B,OAAO;gBACL5B,IAAI8B,UAAU,GAAG;oBACfC,WAAW/B,IAAI+B,SAAS;oBACxBJ,SAAS3B,IAAI2B,OAAO;oBACpBK,wBAAwB;oBACxBJ,UAAU;gBACZ;YACF;YAEA,MAAM,IAAI,CAAC5D,eAAe,CAACiE,kBAAkB,CAACC,IAAI,CAAClC;YAEnD,IAAI,CAAClC,MAAM,CAAC4D,GAAG,CAAC,CAAC,IAAI,EAAEV,MAAM,oBAAoB,CAAC;YAElD1C,IAAIc,IAAI,CAAC;gBACP+C,SAAS;gBACTnB;gBACAoB,gBAAgB;gBAChBC,WAAW;YACb;QACF,EAAE,OAAOjB,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,mBAAmB,EAAEJ,MAAM,eAAe,EAAEI,OAAO;YACtE9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPe,SAASf,iBAAiBkB,QAAQlB,MAAMe,OAAO,GAAG;YACpD;QACF;IACF;IAEA,MAGMI,UAAUlE,GAAY,EAAEC,GAAa,EAAE;QAC3C,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAC1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH;QAExD,MAAMoB,iBAAiBpC,IAAIqB,MAAM;QAGjC,IAAI,CAAC;YAAC;YAAW;YAAY;YAAa;SAAY,CAACE,QAAQ,CAACvB,IAAIqB,MAAM,GAAG;YAC3E/C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPI,eAAexB,IAAIqB,MAAM;YAC3B;YACA;QACF;QAEA,IAAI;YACF,IAAI,CAACvD,MAAM,CAAC4D,GAAG,CAAC,CAAC,qBAAqB,EAAEV,MAAM,gBAAgB,EAAEoB,eAAe,CAAC,CAAC;YAEjF,MAAMT,UAAU,IAAI3C;YACpB,MAAMwD,oBAAoBxC,IAAI+B,SAAS,GACnC,AAACJ,CAAAA,QAAQc,OAAO,KAAKzC,IAAI+B,SAAS,CAACU,OAAO,EAAC,IAAK,OAChD;YAEJzC,IAAIqB,MAAM,GAAG;YACbrB,IAAI2B,OAAO,GAAGA;YACd3B,IAAI6B,YAAY,GAAG;YAEnB,IAAI,CAAC7B,IAAI8B,UAAU,EAAE;gBACnB9B,IAAI8B,UAAU,GAAG;oBACfC,WAAW/B,IAAI+B,SAAS;oBACxBJ;oBACAK,wBAAwBQ;oBACxBZ,UAAU5B,IAAI4B,QAAQ;oBACtBc,eAAe;oBACfC,aAAahB;gBACf;YACF,OAAO;gBACL3B,IAAI8B,UAAU,CAACH,OAAO,GAAGA;gBACzB3B,IAAI8B,UAAU,CAACE,sBAAsB,GAAGQ;gBACxCxC,IAAI8B,UAAU,CAACY,aAAa,GAAG;gBAC/B1C,IAAI8B,UAAU,CAACa,WAAW,GAAGhB;YAC/B;YAEA,MAAM,IAAI,CAAC3D,eAAe,CAACiE,kBAAkB,CAACC,IAAI,CAAClC;YAEnD,IAAI,CAAClC,MAAM,CAAC4D,GAAG,CAAC,CAAC,IAAI,EAAEV,MAAM,iBAAiB,CAAC;YAE/C1C,IAAIc,IAAI,CAAC;gBACP+C,SAAS;gBACTnB;gBACAoB;gBACAC,WAAW;YACb;QACF,EAAE,OAAOjB,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,mBAAmB,EAAEJ,MAAM,YAAY,EAAEI,OAAO;YACnE9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPe,SAASf,iBAAiBkB,QAAQlB,MAAMe,OAAO,GAAG;YACpD;QACF;IACF;IAEA,MAGMS,aAAavE,GAAY,EAAEC,GAAa,EAAE;QAC9C,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAC1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH;QAExD,MAAMoB,iBAAiBpC,IAAIqB,MAAM;QAGjC,IAAI,CAAC;YAAC;YAAW;YAAY;SAAS,CAACE,QAAQ,CAACvB,IAAIqB,MAAM,GAAG;YAC3D/C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPI,eAAexB,IAAIqB,MAAM;YAC3B;YACA;QACF;QAEA,IAAI;YACF,IAAI,CAACvD,MAAM,CAAC4D,GAAG,CAAC,CAAC,qBAAqB,EAAEV,MAAM,mBAAmB,EAAEoB,eAAe,CAAC,CAAC;YAEpF,MAAMT,UAAU,IAAI3C;YACpB,MAAMwD,oBAAoBxC,IAAI+B,SAAS,GACnC,AAACJ,CAAAA,QAAQc,OAAO,KAAKzC,IAAI+B,SAAS,CAACU,OAAO,EAAC,IAAK,OAChD;YAEJzC,IAAIqB,MAAM,GAAG;YACbrB,IAAI2B,OAAO,GAAGA;YACd3B,IAAI6B,YAAY,GAAG;YAEnB,IAAI,CAAC7B,IAAI8B,UAAU,EAAE;gBACnB9B,IAAI8B,UAAU,GAAG;oBACfC,WAAW/B,IAAI+B,SAAS;oBACxBJ;oBACAK,wBAAwBQ;oBACxBZ,UAAU5B,IAAI4B,QAAQ;gBACxB;YACF,OAAO;gBACL5B,IAAI8B,UAAU,CAACH,OAAO,GAAGA;gBACzB3B,IAAI8B,UAAU,CAACE,sBAAsB,GAAGQ;YAC1C;YAEA,MAAM,IAAI,CAACxE,eAAe,CAACiE,kBAAkB,CAACC,IAAI,CAAClC;YAEnD,IAAI,CAAClC,MAAM,CAAC4D,GAAG,CAAC,CAAC,IAAI,EAAEV,MAAM,oBAAoB,CAAC;YAElD1C,IAAIc,IAAI,CAAC;gBACP+C,SAAS;gBACTnB;gBACAoB;gBACAC,WAAW;YACb;QACF,EAAE,OAAOjB,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,mBAAmB,EAAEJ,MAAM,eAAe,EAAEI,OAAO;YACtE9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPe,SAASf,iBAAiBkB,QAAQlB,MAAMe,OAAO,GAAG;YACpD;QACF;IACF;IAEA,MAGMU,WAAWxE,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAC1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH;QAExD,MAAMoB,iBAAiBpC,IAAIqB,MAAM;QAGjC,IAAI,CAAC;YAAC;YAAY;SAAS,CAACE,QAAQ,CAACvB,IAAIqB,MAAM,GAAG;YAChD/C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPI,eAAexB,IAAIqB,MAAM;gBACzBI,YAAY;YACd;YACA;QACF;QAEA,IAAI;YACF,IAAI,CAAC3D,MAAM,CAAC4D,GAAG,CAAC,CAAC,qBAAqB,EAAEV,MAAM,iBAAiB,EAAEoB,eAAe,CAAC,CAAC;YAElFpC,IAAIqB,MAAM,GAAG;YACbrB,IAAI6B,YAAY,GAAG;YAEnB,MAAM,IAAI,CAAC7D,eAAe,CAACiE,kBAAkB,CAACC,IAAI,CAAClC;YAEnD,IAAI,CAAClC,MAAM,CAAC4D,GAAG,CAAC,CAAC,IAAI,EAAEV,MAAM,kBAAkB,CAAC;YAEhD1C,IAAIc,IAAI,CAAC;gBACP+C,SAAS;gBACTnB;gBACAoB;gBACAC,WAAW;YACb;QACF,EAAE,OAAOjB,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,mBAAmB,EAAEJ,MAAM,aAAa,EAAEI,OAAO;YACpE9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPe,SAASf,iBAAiBkB,QAAQlB,MAAMe,OAAO,GAAG;YACpD;QACF;IACF;IAEA,MAGMW,aAAazE,GAAY,EAAEC,GAAa,EAAE;QAC9C,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAC1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH;QAExD,IAAI,CAAClD,MAAM,CAAC4D,GAAG,CAAC,CAAC,iBAAiB,EAAEV,OAAO;QAE3C,IAAI;YAEF,IAAI,CAAChB,IAAIE,aAAa,EAAE;gBAEtB,IAAI,CAACpC,MAAM,CAAC4D,GAAG,CAAC,CAAC,IAAI,EAAEV,MAAM,wDAAwD,CAAC;gBACtF,MAAM,IAAI,CAAChD,eAAe,CAAC+E,mBAAmB,CAAC/B;gBAE/C1C,IAAIc,IAAI,CAAC;oBACP+C,SAAS;oBACTnB;oBACAK,QAAQ;gBACV;gBACA;YACF;YAGA,MAAM2B,WAAW,IAAI,CAAC9E,kBAAkB,CAAC+E,WAAW,CAACjD,IAAIE,aAAa;YAGtE,MAAMgD,SAAS,MAAM,IAAI,CAACjF,mBAAmB,CAACkF,aAAa,CAACH;YAC5D,IAAI,CAACE,QAAQ;gBACX,MAAM,IAAIE,oCAAiB,CAAC,CAAC,2BAA2B,EAAEpD,IAAIE,aAAa,EAAE;YAC/E;YAEA,IAAI,CAACpC,MAAM,CAAC4D,GAAG,CAAC,CAAC,0BAA0B,EAAEV,MAAM,EAAE,EAAEgC,UAAU;YAGjEhD,IAAIqD,aAAa,GAAG;YACpB,MAAM,IAAI,CAACrF,eAAe,CAACiE,kBAAkB,CAACC,IAAI,CAAClC;YAGnD,MAAM,EAAEG,QAAQ,EAAEF,UAAU,EAAE,GAAG,MAAM,IAAI,CAAChC,mBAAmB,CAACqF,WAAW,CAACN;YAG5E,IAAIO,oBAA2B,EAAE;YACjC,IAAItD,cAAcA,WAAWuD,MAAM,GAAG,GAAG;gBACvCD,oBAAoB,MAAM,IAAI,CAACrF,kBAAkB,CAACuF,cAAc,CAACzD,IAAIE,aAAa,EAAED;gBACpF,IAAI,CAACnC,MAAM,CAAC4D,GAAG,CAAC,CAAC,MAAM,EAAE6B,kBAAkBC,MAAM,CAAC,sBAAsB,EAAExC,OAAO;YACnF;YAGA,MAAM,IAAI,CAAChD,eAAe,CAAC0F,kBAAkB,CAAC1C,OAAOb,UAAUF;YAG/D,MAAM0D,WAAW3D,IAAI2D,QAAQ,IAAI1E;YACjC,MAAM,IAAI,CAACf,kBAAkB,CAAC0F,YAAY,CAAC5D,IAAIE,aAAa,EAAEC,UAAUwD,UAAU3D,IAAI6D,QAAQ,EAAEN;YAEhG,IAAI,CAACzF,MAAM,CAAC4D,GAAG,CAAC,CAAC,6BAA6B,EAAEV,OAAO;YAEvD1C,IAAIc,IAAI,CAAC;gBACP+C,SAAS;gBACTnB;gBACAK,QAAQ;gBACRlB;gBACA2D,gBAAgB7D,YAAYuD,UAAU;YACxC;QACF,EAAE,OAAOpC,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,yBAAyB,EAAEJ,MAAM,EAAE,EAAEI,OAAO;YAC/D9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPe,SAASf,iBAAiBkB,QAAQlB,MAAMe,OAAO,GAAG;YACpD;QACF;IACF;IAEA,MAGM4B,UAAU1F,GAAY,EAAEC,GAAa,EAAE;QAC3C,MAAM0C,QAAQ3C,IAAI4C,KAAK,CAACC,EAAE;QAC1B,MAAMlB,MAAM,MAAM,IAAI,CAAChC,eAAe,CAACmD,gBAAgB,CAACH;QACxD,MAAMgD,kBAAkB3F,IAAIO,KAAK,CAACqF,UAAU,KAAK;QAGjD,IAAIjE,IAAIqB,MAAM,KAAK,cAAcrB,IAAIqB,MAAM,KAAK,UAAU;YACxD/C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPC,QAAQrB,IAAIqB,MAAM;gBAClBI,YAAY;YACd;YACA;QACF;QAEA,IAAI;YAEF,MAAMvB,gBAAgBF,IAAIE,aAAa;YACvC,MAAM2D,WAAW7D,IAAI6D,QAAQ;YAG7B,MAAM,IAAI,CAAC7F,eAAe,CAACiE,kBAAkB,CAACiC,MAAM,CAAClE;YACrD,IAAI,CAAClC,MAAM,CAAC4D,GAAG,CAAC,CAAC,YAAY,EAAEV,MAAM,EAAE,EAAE6C,UAAU;YAGnD,IAAI3D,iBAAiB8D,iBAAiB;gBAEpC,MAAMG,YAAY,MAAM,IAAI,CAACnG,eAAe,CAACiE,kBAAkB,CAACvC,KAAK,CAAC;oBACpE0E,OAAO;wBAAElE;oBAAc;gBACzB;gBAEA,IAAIiE,cAAc,GAAG;oBAEnB,IAAI;wBACF,MAAM,IAAI,CAACjG,kBAAkB,CAAC+F,UAAU,CAAC/D;wBACzC,IAAI,CAACpC,MAAM,CAAC4D,GAAG,CAAC,CAAC,2BAA2B,EAAExB,eAAe;wBAC7D5B,IAAIc,IAAI,CAAC;4BACP+C,SAAS;4BACTnB;4BACAqD,aAAa;wBACf;oBACF,EAAE,OAAOjD,OAAO;wBACd,IAAI,CAACtD,MAAM,CAACwG,IAAI,CAAC,CAAC,sBAAsB,EAAEpE,cAAc,EAAE,EAAEkB,OAAO;wBACnE9C,IAAIc,IAAI,CAAC;4BACP+C,SAAS;4BACTnB;4BACAqD,aAAa;wBACf;oBACF;gBACF,OAAO;oBAEL,IAAI,CAACvG,MAAM,CAAC4D,GAAG,CAAC,CAAC,KAAK,EAAExB,cAAc,qBAAqB,EAAEiE,UAAU,4BAA4B,CAAC;oBACpG7F,IAAIc,IAAI,CAAC;wBACP+C,SAAS;wBACTnB;wBACAqD,aAAa;wBACbE,qBAAqBJ;oBACvB;gBACF;YACF,OAAO;gBAEL7F,IAAIc,IAAI,CAAC;oBACP+C,SAAS;oBACTnB;oBACAqD,aAAa;gBACf;YACF;QACF,EAAE,OAAOjD,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,qBAAqB,EAAEJ,MAAM,EAAE,EAAEI,OAAO;YAC3D9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBACnBgC,OAAO;gBACPe,SAASf,iBAAiBkB,QAAQlB,MAAMe,OAAO,GAAG;YACpD;QACF;IACF;IAEA,MAEMqC,kBAAkBnG,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAE4B,aAAa,EAAEuE,SAAS,EAAE,GAAGpG,IAAIqG,IAAI;QAE7C,IAAI,CAACxE,eAAe;YAClB5B,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBAAEgC,OAAO;YAA4B;YAC1D;QACF;QAEA,IAAI,CAACqD,WAAW;YACdnG,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBAAEgC,OAAO;YAAwB;YACtD;QACF;QAEA,IAAI;YAEF,MAAMuD,aAAa,MAAM,IAAI,CAACzG,kBAAkB,CAACyG,UAAU,CAACzE;YAC5D,IAAI,CAACyE,YAAY;gBACf,MAAM,IAAIvB,oCAAiB,CAAC;YAC9B;YAGA,MAAMjD,WAAW,MAAM,IAAI,CAACjC,kBAAkB,CAACkC,YAAY,CAACF;YAC5D,IAAI,CAACC,UAAU;gBACb7B,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;oBAAEgC,OAAO;gBAAuD;gBACrF;YACF;YAGA,MAAMwD,cAAc,CAAC,QAAQ,EAAEH,WAAW;YAG1C,MAAMzE,MAAM,MAAM,IAAI,CAAChC,eAAe,CAAC6G,gBAAgB,CACrDJ,WACAtE,SAAS2E,iBAAiB,IAAI3E,SAAS0D,QAAQ,IAAI,WACnD1D,UACAyE;YAIF5E,IAAIE,aAAa,GAAGA;YACpBF,IAAI2D,QAAQ,GAAGxD,SAAS4E,SAAS;YACjC/E,IAAIqD,aAAa,GAAG;YACpBrD,IAAIgF,UAAU,GAAG,IAAIhG;YAGrB,IAAImB,SAAS8E,UAAU,EAAE;gBACvBjF,IAAIiF,UAAU,GAAG9E,SAAS8E,UAAU;YACtC;YAEA,MAAM,IAAI,CAACjH,eAAe,CAACiE,kBAAkB,CAACC,IAAI,CAAClC;YAEnD,IAAI,CAAClC,MAAM,CAAC4D,GAAG,CAAC,CAAC,YAAY,EAAE1B,IAAIkB,EAAE,CAAC,mBAAmB,EAAEhB,cAAc,aAAa,EAAEuE,WAAW;YAEnGnG,IAAIc,IAAI,CAAC;gBACP8B,IAAIlB,IAAIkB,EAAE;gBACVuD,WAAWzE,IAAIyE,SAAS;gBACxBG,aAAa5E,IAAI4E,WAAW;gBAC5Bf,UAAU7D,IAAI6D,QAAQ;gBACtB3D,eAAeF,IAAIE,aAAa;gBAChCmB,QAAQrB,IAAIqB,MAAM;gBAClBgC,eAAerD,IAAIqD,aAAa;gBAChC6B,WAAWlF,IAAIkF,SAAS;YAC1B;QACF,EAAE,OAAO9D,OAAO;YACd,IAAI,CAACtD,MAAM,CAACsD,KAAK,CAAC,CAAC,+BAA+B,EAAElB,cAAc,EAAE,EAAEkB,OAAO;YAC7E9C,IAAI+C,MAAM,CAAC,KAAKjC,IAAI,CAAC;gBAAEgC,OAAO;YAAiC;QACjE;IACF;IAKQrC,WAAWoG,IAAU,EAAQ;QACnC,MAAMC,WAAW,IAAIpG,KAAKmG;QAC1BC,SAASC,QAAQ,CAAC,IAAI,IAAI,IAAI;QAC9B,OAAOD;IACT;AACF;;;;;;;;;;;;;;;;;;;;;;;;;QAteWE,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QA+BRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAuDRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAiERA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QA6DRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QA4CRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QA0ERA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;;;;;;;;8BArZZC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC"}
+{"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);