@fdm-monster/server 2.0.0-rc1 → 2.0.1

package/dist/container.tokens.js

@@ -15,6 +15,7 @@ const DITokens = {
     appDefaultRoleNoLogin: "appDefaultRoleNoLogin",
     typeormService: "typeormService",
     serverHost: "serverHost",
+    exceptionFilter: "exceptionFilter",
     loggerFactory: "loggerFactory",
     httpClientFactory: "httpClientFactory",
     socketIoGateway: "socketIoGateway",
@@ -24,9 +25,13 @@ const DITokens = {
     toadScheduler: "toadScheduler",
     eventEmitter2: "eventEmitter2",
     printerService: "printerService",
-    printerGroupService: "printerGroupService",
+    printerTagService: "printerTagService",
     floorPositionService: "floorPositionService",
-    printCompletionService: "printCompletionService",
+    printJobService: "printJobService",
+    printQueueService: "printQueueService",
+    fileStorageService: "fileStorageService",
+    fileAnalysisService: "fileAnalysisService",
+    printFileDownloaderService: "printFileDownloaderService",
     floorService: "floorService",
     yamlService: "yamlService",
     settingsService: "settingsService",
@@ -60,7 +65,6 @@ const DITokens = {
     batchCallService: "batchCallService",
     influxDbV2BaseService: "influxDbV2BaseService",
     systemInfoBundleService: "systemInfoBundleService",
-    customGCodeService: "customGCodeService",
     floorStore: "floorStore",
     settingsStore: "settingsStore",
     printerSocketStore: "printerSocketStore",
@@ -78,10 +82,10 @@ const DITokens = {
     softwareUpdateTask: "softwareUpdateTask",
     clientDistDownloadTask: "clientDistDownloadTask",
     socketIoTask: "socketIoTask",
-    printCompletionSocketIoTask: "printCompletionSocketIoTask",
     printerWebsocketTask: "printerWebsocketTask",
     printerWebsocketRestoreTask: "printerWebsocketRestoreTask",
-    printerFileCleanTask: "printerFileCleanTask"
+    printerFilesLoadTask: "printerFilesLoadTask",
+    printJobAnalysisTask: "printJobAnalysisTask"
 };
 
 //# sourceMappingURL=container.tokens.js.map

package/dist/container.tokens.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","cradleService","serverVersion","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClientFactory","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","printerService","printerGroupService","floorPositionService","printCompletionService","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","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","prusaLinkPollingAdapter","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IACtBC,eAAe;IAEfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,mBAAmB;IACnBC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,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;IACzBC,oBAAoB;IAEpBC,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,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,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","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,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"}

package/dist/controllers/batch-call.controller.js

@@ -30,11 +30,6 @@ class BatchCallController {
     constructor(batchCallService){
         this.batchCallService = batchCallService;
     }
-    async batchSettingsGet(req, res) {
-        const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterSchema);
-        const results = await this.batchCallService.batchSettingsGet(printerIds);
-        res.send(results);
-    }
     async batchConnectUsb(req, res) {
         const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterSchema);
         const results = await this.batchCallService.batchConnectUsb(printerIds);
@@ -61,16 +56,6 @@ class BatchCallController {
         res.send(results);
     }
 }
-_ts_decorate([
-    (0, _awilixexpress.POST)(),
-    (0, _awilixexpress.route)("/settings/get"),
-    _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)
-], BatchCallController.prototype, "batchSettingsGet", null);
 _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/connect/usb"),

package/dist/controllers/batch-call.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","batchCallService","batchSettingsGet","req","res","printerIds","validateInput","body","batchPrinterSchema","results","send","batchConnectUsb","batchConnectSocket","getLastPrintedFiles","files","getBatchPrinterReprintFile","batchReprintFiles","prints","executeBatchRePrinterSchema","batchReprintCalls","batchTogglePrintersEnabled","enabled","batchPrintersEnabledSchema","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":";;;;+BAeaA;;;eAAAA;;;+BAfuB;4BACN;2CAKvB;iCACsB;8BACgB;wCACvB;kCACW;yBACC;;;;;;;;;;AAI3B,MAAMA;;IACX,YAAY,AAAiBC,gBAAkC,CAAE;aAApCA,mBAAAA;IAAqC;IAElE,MAEMC,iBAAiBC,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,MAAMC,UAAU,MAAM,IAAI,CAACR,gBAAgB,CAACC,gBAAgB,CAACG;QAC7DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAEME,gBAAgBR,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,MAAMC,UAAU,MAAM,IAAI,CAACR,gBAAgB,CAACU,eAAe,CAACN;QAC5DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAEMG,mBAAmBT,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,IAAI,CAACP,gBAAgB,CAACW,kBAAkB,CAACP;QACzCD,IAAIM,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMG,oBAAoBV,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,MAAMM,QAAQ,MAAM,IAAI,CAACb,gBAAgB,CAACc,0BAA0B,CAACV;QACrED,IAAIM,IAAI,CAACI;IACX;IAEA,MAEME,kBAAkBb,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEa,MAAM,EAAE,GAAG,MAAMX,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEW,sDAA2B;QAC5E,MAAMJ,QAAQ,MAAM,IAAI,CAACb,gBAAgB,CAACkB,iBAAiB,CAACF;QAC5Db,IAAIM,IAAI,CAACI;IACX;IAEA,MAEMM,2BAA2BjB,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAEC,UAAU,EAAEgB,OAAO,EAAE,GAAG,MAAMf,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEe,qDAA0B;QACxF,MAAMb,UAAU,MAAM,IAAI,CAACR,gBAAgB,CAACmB,0BAA0B,CAACf,YAAYgB;QACnFjB,IAAIM,IAAI,CAACD;IACX;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BApDOc,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;YAAED,6BAAK,CAACE,QAAQ;SAAC"}
+{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","batchCallService","batchConnectUsb","req","res","printerIds","validateInput","body","batchPrinterSchema","results","send","batchConnectSocket","getLastPrintedFiles","files","getBatchPrinterReprintFile","batchReprintFiles","prints","executeBatchRePrinterSchema","batchReprintCalls","batchTogglePrintersEnabled","enabled","batchPrintersEnabledSchema","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":";;;;+BAeaA;;;eAAAA;;;+BAfuB;4BACN;2CAKvB;iCACsB;8BACgB;wCACvB;kCACW;yBACC;;;;;;;;;;AAI3B,MAAMA;;IACX,YAAY,AAAiBC,gBAAkC,CAAE;aAApCA,mBAAAA;IAC7B;IAEA,MAEMC,gBAAgBC,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,MAAMC,UAAU,MAAM,IAAI,CAACR,gBAAgB,CAACC,eAAe,CAACG;QAC5DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAEME,mBAAmBR,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,IAAI,CAACP,gBAAgB,CAACU,kBAAkB,CAACN;QACzCD,IAAIM,IAAI,CAAC,CAAC;IACZ;IAEA,MAEME,oBAAoBT,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,6CAAkB;QACvE,MAAMK,QAAQ,MAAM,IAAI,CAACZ,gBAAgB,CAACa,0BAA0B,CAACT;QACrED,IAAIM,IAAI,CAACG;IACX;IAEA,MAEME,kBAAkBZ,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEY,MAAM,EAAE,GAAG,MAAMV,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEU,sDAA2B;QAC5E,MAAMJ,QAAQ,MAAM,IAAI,CAACZ,gBAAgB,CAACiB,iBAAiB,CAACF;QAC5DZ,IAAIM,IAAI,CAACG;IACX;IAEA,MAEMM,2BAA2BhB,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAEC,UAAU,EAAEe,OAAO,EAAE,GAAG,MAAMd,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEc,qDAA0B;QACxF,MAAMZ,UAAU,MAAM,IAAI,CAACR,gBAAgB,CAACkB,0BAA0B,CAACd,YAAYe;QACnFhB,IAAIM,IAAI,CAACD;IACX;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA7COa,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;YAAED,6BAAK,CAACE,QAAQ;SAAC"}

package/dist/controllers/file-storage.controller.js

@@ -0,0 +1,319 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "FileStorageController", {
+    enumerable: true,
+    get: function() {
+        return FileStorageController;
+    }
+});
+const _awilixexpress = require("awilix-express");
+const _serverconstants = require("../server.constants");
+const _express = require("express");
+const _authenticate = require("../middleware/authenticate");
+const _authorizationconstants = require("../constants/authorization.constants");
+const _filestorageservice = require("../services/file-storage.service");
+const _multerservice = require("../services/core/multer.service");
+const _loggerfactory = require("../handlers/logger-factory");
+const _fileanalysisservice = require("../services/file-analysis.service");
+const _nodefs = require("node:fs");
+const _nodepath = require("node:path");
+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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class FileStorageController {
+    fileStorageService;
+    multerService;
+    fileAnalysisService;
+    logger;
+    constructor(loggerFactory, fileStorageService, multerService, fileAnalysisService){
+        this.fileStorageService = fileStorageService;
+        this.multerService = multerService;
+        this.fileAnalysisService = fileAnalysisService;
+        this.logger = loggerFactory(FileStorageController.name);
+    }
+    async listFiles(req, res) {
+        try {
+            const files = await this.fileStorageService.listAllFiles();
+            res.send({
+                files: files.map((file)=>({
+                        fileStorageId: file.fileStorageId,
+                        fileName: file.fileName,
+                        fileFormat: file.fileFormat,
+                        fileSize: file.fileSize,
+                        fileHash: file.fileHash,
+                        createdAt: file.createdAt,
+                        thumbnailCount: file.thumbnailCount,
+                        thumbnailsUrl: file.thumbnailCount > 0 ? `/api/file-storage/${file.fileStorageId}/thumbnail/0` : null,
+                        metadata: file.metadata
+                    })),
+                totalCount: files.length
+            });
+        } catch (error) {
+            this.logger.error(`Failed to list files: ${error}`);
+            res.status(500).send({
+                error: "Failed to list files"
+            });
+        }
+    }
+    async getFileMetadata(req, res) {
+        const { fileStorageId } = req.params;
+        try {
+            const file = await this.fileStorageService.getFileInfo(fileStorageId);
+            if (!file) {
+                res.status(404).send({
+                    error: "File not found"
+                });
+                return;
+            }
+            res.send({
+                fileStorageId: file.fileStorageId,
+                fileName: file.fileName,
+                fileFormat: file.fileFormat,
+                fileSize: file.fileSize,
+                fileHash: file.fileHash,
+                createdAt: file.createdAt,
+                thumbnailCount: file.thumbnailCount,
+                thumbnailsUrl: file.thumbnailCount > 0 ? `/api/file-storage/${file.fileStorageId}/thumbnail/0` : null,
+                metadata: file.metadata
+            });
+        } catch (error) {
+            this.logger.error(`Failed to get file metadata for ${fileStorageId}: ${error}`);
+            res.status(500).send({
+                error: "Failed to get file metadata"
+            });
+        }
+    }
+    async deleteFile(req, res) {
+        const { fileStorageId } = req.params;
+        try {
+            await this.fileStorageService.deleteFile(fileStorageId);
+            this.logger.log(`Deleted file ${fileStorageId}`);
+            res.send({
+                message: "File deleted successfully",
+                fileStorageId
+            });
+        } catch (error) {
+            this.logger.error(`Failed to delete file ${fileStorageId}: ${error}`);
+            res.status(500).send({
+                error: "Failed to delete file"
+            });
+        }
+    }
+    async analyzeFile(req, res) {
+        const { fileStorageId } = req.params;
+        try {
+            const filePath = this.fileStorageService.getFilePath(fileStorageId);
+            const fileExists = await this.fileStorageService.fileExists(fileStorageId);
+            if (!fileExists) {
+                res.status(404).send({
+                    error: "File not found"
+                });
+                return;
+            }
+            this.logger.log(`Analyzing file: ${fileStorageId}`);
+            const existingMetadata = await this.fileStorageService.loadMetadata(fileStorageId);
+            const analysisResult = await this.fileAnalysisService.analyzeFile(filePath);
+            const metadata = analysisResult.metadata;
+            const thumbnails = analysisResult.thumbnails;
+            this.logger.log(`Analysis complete for ${fileStorageId}: format=${metadata.fileFormat}, layers=${metadata.totalLayers}, time=${metadata.gcodePrintTimeSeconds}s, thumbnails=${thumbnails.length}`);
+            const fileHash = await this.fileStorageService.calculateFileHash(filePath);
+            const originalFileName = existingMetadata?._originalFileName || fileStorageId;
+            metadata.fileName = originalFileName;
+            let thumbnailMetadata = [];
+            if (thumbnails.length > 0) {
+                thumbnailMetadata = await this.fileStorageService.saveThumbnails(fileStorageId, thumbnails);
+                this.logger.log(`Saved ${thumbnailMetadata.length} thumbnails for ${fileStorageId}`);
+            }
+            await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, originalFileName, thumbnailMetadata);
+            res.send({
+                message: "File analyzed successfully",
+                fileStorageId,
+                metadata,
+                thumbnailCount: thumbnails.length
+            });
+        } catch (error) {
+            this.logger.error(`Failed to analyze file ${fileStorageId}: ${error}`);
+            res.status(500).send({
+                error: `Failed to analyze file: ${error}`
+            });
+        }
+    }
+    async getThumbnail(req, res) {
+        const { fileStorageId, index } = req.params;
+        const thumbnailIndex = Number.parseInt(index);
+        if (Number.isNaN(thumbnailIndex)) {
+            res.status(400).send({
+                error: "Invalid thumbnail index"
+            });
+            return;
+        }
+        try {
+            const thumbnail = await this.fileStorageService.getThumbnail(fileStorageId, thumbnailIndex);
+            if (!thumbnail) {
+                res.status(404).send({
+                    error: "Thumbnail not found"
+                });
+                return;
+            }
+            const isJPG = thumbnail[0] === 0xFF && thumbnail[1] === 0xD8;
+            let contentType = 'image/png';
+            if (isJPG) contentType = 'image/jpeg';
+            res.setHeader('Content-Type', contentType);
+            res.setHeader('Cache-Control', 'public, max-age=3600');
+            res.setHeader('ETag', `"${fileStorageId}-${thumbnailIndex}"`);
+            res.send(thumbnail);
+        } catch (error) {
+            this.logger.error(`Failed to get thumbnail ${thumbnailIndex} for ${fileStorageId}: ${error}`);
+            res.status(500).send({
+                error: "Failed to get thumbnail"
+            });
+        }
+    }
+    async uploadFile(req, res) {
+        try {
+            const acceptedExtensions = [
+                '.gcode',
+                '.3mf',
+                '.bgcode'
+            ];
+            const files = await this.multerService.multerLoadFileAsync(req, res, acceptedExtensions, true);
+            if (!files?.length) {
+                res.status(400).send({
+                    error: "No file uploaded"
+                });
+                return;
+            }
+            if (files.length > 1) {
+                res.status(400).send({
+                    error: "Only 1 file can be uploaded at a time"
+                });
+                return;
+            }
+            const file = files[0];
+            const ext = (0, _nodepath.extname)(file.originalname);
+            const tempPathWithExt = file.path + ext;
+            try {
+                (0, _nodefs.copyFileSync)(file.path, tempPathWithExt);
+                const fileHash = await this.fileStorageService.calculateFileHash(tempPathWithExt);
+                this.logger.log(`Analyzing file: ${file.originalname} (ext: ${ext})`);
+                const analysisResult = await this.fileAnalysisService.analyzeFile(tempPathWithExt);
+                const metadata = analysisResult.metadata;
+                const thumbnails = analysisResult.thumbnails;
+                this.logger.log(`Analysis complete: format=${metadata.fileFormat}, layers=${metadata.totalLayers}, ` + `time=${metadata.gcodePrintTimeSeconds}s, filament=${metadata.filamentUsedGrams}g, ` + `thumbnails=${thumbnails.length}`);
+                const fileStorageId = await this.fileStorageService.saveFile(file, fileHash);
+                this.logger.log(`Uploaded file ${file.originalname} as ${fileStorageId}`);
+                let thumbnailMetadata = [];
+                if (thumbnails.length > 0) {
+                    thumbnailMetadata = await this.fileStorageService.saveThumbnails(fileStorageId, thumbnails);
+                    this.logger.log(`Saved ${thumbnailMetadata.length} thumbnail(s) for ${fileStorageId}`);
+                }
+                await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, file.originalname, thumbnailMetadata);
+                this.logger.log(`Saved metadata JSON for ${fileStorageId}`);
+                res.send({
+                    message: "File uploaded successfully",
+                    fileStorageId,
+                    fileName: file.originalname,
+                    fileSize: file.size,
+                    fileHash,
+                    metadata,
+                    thumbnailCount: thumbnails.length
+                });
+            } finally{
+                if ((0, _nodefs.existsSync)(tempPathWithExt)) {
+                    (0, _nodefs.unlinkSync)(tempPathWithExt);
+                }
+            }
+        } catch (error) {
+            this.logger.error(`Failed to upload file: ${error}`);
+            res.status(500).send({
+                error: "Failed to upload file"
+            });
+        }
+    }
+}
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    _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)
+], FileStorageController.prototype, "listFiles", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/:fileStorageId"),
+    _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)
+], FileStorageController.prototype, "getFileMetadata", null);
+_ts_decorate([
+    (0, _awilixexpress.DELETE)(),
+    (0, _awilixexpress.route)("/:fileStorageId"),
+    _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)
+], FileStorageController.prototype, "deleteFile", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:fileStorageId/analyze"),
+    _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)
+], FileStorageController.prototype, "analyzeFile", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/:fileStorageId/thumbnail/: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)
+], FileStorageController.prototype, "getThumbnail", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/upload"),
+    _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)
+], FileStorageController.prototype, "uploadFile", null);
+FileStorageController = _ts_decorate([
+    (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/file-storage"),
+    (0, _awilixexpress.before)([
+        (0, _authenticate.authenticate)(),
+        (0, _authenticate.authorizeRoles)([
+            _authorizationconstants.ROLES.ADMIN,
+            _authorizationconstants.ROLES.OPERATOR
+        ])
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
+        typeof _filestorageservice.FileStorageService === "undefined" ? Object : _filestorageservice.FileStorageService,
+        typeof _multerservice.MulterService === "undefined" ? Object : _multerservice.MulterService,
+        typeof _fileanalysisservice.FileAnalysisService === "undefined" ? Object : _fileanalysisservice.FileAnalysisService
+    ])
+], FileStorageController);
+
+//# sourceMappingURL=file-storage.controller.js.map

package/dist/controllers/file-storage.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/controllers/file-storage.controller.ts"],"names":["FileStorageController","logger","loggerFactory","fileStorageService","multerService","fileAnalysisService","name","listFiles","req","res","files","listAllFiles","send","map","file","fileStorageId","fileName","fileFormat","fileSize","fileHash","createdAt","thumbnailCount","thumbnailsUrl","metadata","totalCount","length","error","status","getFileMetadata","params","getFileInfo","deleteFile","log","message","analyzeFile","filePath","getFilePath","fileExists","existingMetadata","loadMetadata","analysisResult","thumbnails","totalLayers","gcodePrintTimeSeconds","calculateFileHash","originalFileName","_originalFileName","thumbnailMetadata","saveThumbnails","saveMetadata","getThumbnail","index","thumbnailIndex","Number","parseInt","isNaN","thumbnail","isJPG","contentType","setHeader","uploadFile","acceptedExtensions","multerLoadFileAsync","ext","extname","originalname","tempPathWithExt","path","copyFileSync","filamentUsedGrams","saveFile","size","existsSync","unlinkSync","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":"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"}

package/dist/controllers/first-time-setup.controller.js

@@ -85,7 +85,8 @@ class FirstTimeSetupController {
             throw new _runtimeexceptions.ForbiddenError("Wizard already completed. Cannot import during first-time setup once wizard is complete.");
         }
         const files = await this.multerService.multerLoadFileAsync(req, res, [
-            ".yaml"
+            ".yaml",
+            ".yml"
         ], false);
         const firstFile = files[0];
         await this.yamlService.importYaml(firstFile.buffer.toString());

package/dist/controllers/first-time-setup.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/first-time-setup.controller.ts"],"names":["FirstTimeSetupController","settingsStore","roleService","userService","yamlService","multerService","validateWizard","req","res","rootUsername","validateMiddleware","wizardSettingsSchema","getSynchronizedRoleByName","ROLES","ADMIN","isWizardCompleted","ForbiddenError","user","findRawByUsername","toLowerCase","BadRequestException","send","completeWizard","loginRequired","registration","rootPassword","register","username","password","roles","isRootUser","isVerified","isDemoUser","needsPasswordChange","setLoginRequired","setRegistrationEnabled","setWizardCompleted","AppConstants","currentWizardVersion","importYamlFile","files","multerLoadFileAsync","firstFile","importYaml","buffer","toString","success","apiRoute"],"mappings":";;;;+BAcaA;;;eAAAA;;;+BAde;iCACC;4BACM;mCACE;mCACe;wCAC9B;+BACQ;yBACI;sCACL;sCACA;6BACD;+BACE;;;;;;;;;;AAGvB,MAAMA;;;;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,WAAyB,EAC1C,AAAiBC,WAAwB,EACzC,AAAiBC,aAA4B,CAC7C;aALiBJ,gBAAAA;aACAC,cAAAA;aACAC,cAAAA;aACAC,cAAAA;aACAC,gBAAAA;IAChB;IAEH,MAEMC,eAAeC,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAEC,YAAY,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACH,KAAKI,uCAAoB;QAC3E,MAAM,IAAI,CAACT,WAAW,CAACU,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAE5D,IAAI,IAAI,CAACb,aAAa,CAACc,iBAAiB,IAAI;YAC1C,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QAEA,MAAMC,OAAO,MAAM,IAAI,CAACd,WAAW,CAACe,iBAAiB,CAACT,cAAcU;QACpE,IAAIF,MAAM;YACR,MAAM,IAAIG,sCAAmB,CAAC;QAChC;QAEA,OAAOZ,IAAIa,IAAI;IACjB;IAEA,MAEMC,eAAef,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAEe,aAAa,EAAEC,YAAY,EAAEf,YAAY,EAAEgB,YAAY,EAAE,GAAG,MAAMf,IAAAA,8BAAkB,EAC1FH,KACAI,uCAAoB;QAGtB,IAAI,IAAI,CAACV,aAAa,CAACc,iBAAiB,IAAI;YAC1C,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QAEA,MAAM,IAAI,CAACd,WAAW,CAACU,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAC5D,MAAMG,OAAO,MAAM,IAAI,CAACd,WAAW,CAACe,iBAAiB,CAACT,cAAcU;QACpE,IAAIF,MAAM;YACR,MAAM,IAAIG,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAACjB,WAAW,CAACuB,QAAQ,CAAC;YAC9BC,UAAUlB;YACVmB,UAAUH;YACVI,OAAO;gBAAChB,6BAAK,CAACC,KAAK;aAAC;YACpBgB,YAAY;YACZC,YAAY;YACZC,YAAY;YACZC,qBAAqB;QACvB;QACA,MAAM,IAAI,CAAChC,aAAa,CAACiC,gBAAgB,CAACX;QAC1C,MAAM,IAAI,CAACtB,aAAa,CAACkC,sBAAsB,CAACX;QAChD,MAAM,IAAI,CAACvB,aAAa,CAACmC,kBAAkB,CAACC,6BAAY,CAACC,oBAAoB;QAE7E,OAAO9B,IAAIa,IAAI;IACjB;IAEA,MAEMkB,eAAehC,GAAY,EAAEC,GAAa,EAAE;QAChD,IAAI,IAAI,CAACP,aAAa,CAACc,iBAAiB,IAAI;YAC1C,MAAM,IAAIC,iCAAc,CACtB;QAEJ;QAEA,MAAMwB,QAAQ,MAAM,IAAI,CAACnC,aAAa,CAACoC,mBAAmB,CAAClC,KAAKC,KAAK;YAAC;SAAQ,EAAE;QAChF,MAAMkC,YAAYF,KAAK,CAAC,EAAE;QAE1B,MAAM,IAAI,CAACpC,WAAW,CAACuC,UAAU,CAACD,UAAUE,MAAM,CAACC,QAAQ;QAE3D,OAAOrC,IAAIa,IAAI,CAAC;YACdyB,SAAS;QACX;IACF;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAhFOT,6BAAY,CAACU,QAAQ,GAAG"}
+{"version":3,"sources":["../../src/controllers/first-time-setup.controller.ts"],"names":["FirstTimeSetupController","settingsStore","roleService","userService","yamlService","multerService","validateWizard","req","res","rootUsername","validateMiddleware","wizardSettingsSchema","getSynchronizedRoleByName","ROLES","ADMIN","isWizardCompleted","ForbiddenError","user","findRawByUsername","toLowerCase","BadRequestException","send","completeWizard","loginRequired","registration","rootPassword","register","username","password","roles","isRootUser","isVerified","isDemoUser","needsPasswordChange","setLoginRequired","setRegistrationEnabled","setWizardCompleted","AppConstants","currentWizardVersion","importYamlFile","files","multerLoadFileAsync","firstFile","importYaml","buffer","toString","success","apiRoute"],"mappings":";;;;+BAcaA;;;eAAAA;;;+BAde;iCACC;4BACM;mCACE;mCACe;wCAC9B;+BACQ;yBACI;sCACL;sCACA;6BACD;+BACE;;;;;;;;;;AAGvB,MAAMA;;;;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,WAAyB,EAC1C,AAAiBC,WAAwB,EACzC,AAAiBC,aAA4B,CAC7C;aALiBJ,gBAAAA;aACAC,cAAAA;aACAC,cAAAA;aACAC,cAAAA;aACAC,gBAAAA;IAChB;IAEH,MAEMC,eAAeC,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAEC,YAAY,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACH,KAAKI,uCAAoB;QAC3E,MAAM,IAAI,CAACT,WAAW,CAACU,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAE5D,IAAI,IAAI,CAACb,aAAa,CAACc,iBAAiB,IAAI;YAC1C,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QAEA,MAAMC,OAAO,MAAM,IAAI,CAACd,WAAW,CAACe,iBAAiB,CAACT,cAAcU;QACpE,IAAIF,MAAM;YACR,MAAM,IAAIG,sCAAmB,CAAC;QAChC;QAEA,OAAOZ,IAAIa,IAAI;IACjB;IAEA,MAEMC,eAAef,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAEe,aAAa,EAAEC,YAAY,EAAEf,YAAY,EAAEgB,YAAY,EAAE,GAAG,MAAMf,IAAAA,8BAAkB,EAC1FH,KACAI,uCAAoB;QAGtB,IAAI,IAAI,CAACV,aAAa,CAACc,iBAAiB,IAAI;YAC1C,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QAEA,MAAM,IAAI,CAACd,WAAW,CAACU,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAC5D,MAAMG,OAAO,MAAM,IAAI,CAACd,WAAW,CAACe,iBAAiB,CAACT,cAAcU;QACpE,IAAIF,MAAM;YACR,MAAM,IAAIG,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAACjB,WAAW,CAACuB,QAAQ,CAAC;YAC9BC,UAAUlB;YACVmB,UAAUH;YACVI,OAAO;gBAAChB,6BAAK,CAACC,KAAK;aAAC;YACpBgB,YAAY;YACZC,YAAY;YACZC,YAAY;YACZC,qBAAqB;QACvB;QACA,MAAM,IAAI,CAAChC,aAAa,CAACiC,gBAAgB,CAACX;QAC1C,MAAM,IAAI,CAACtB,aAAa,CAACkC,sBAAsB,CAACX;QAChD,MAAM,IAAI,CAACvB,aAAa,CAACmC,kBAAkB,CAACC,6BAAY,CAACC,oBAAoB;QAE7E,OAAO9B,IAAIa,IAAI;IACjB;IAEA,MAEMkB,eAAehC,GAAY,EAAEC,GAAa,EAAE;QAChD,IAAI,IAAI,CAACP,aAAa,CAACc,iBAAiB,IAAI;YAC1C,MAAM,IAAIC,iCAAc,CACtB;QAEJ;QAEA,MAAMwB,QAAQ,MAAM,IAAI,CAACnC,aAAa,CAACoC,mBAAmB,CAAClC,KAAKC,KAAK;YAAC;YAAS;SAAO,EAAE;QACxF,MAAMkC,YAAYF,KAAK,CAAC,EAAE;QAE1B,MAAM,IAAI,CAACpC,WAAW,CAACuC,UAAU,CAACD,UAAUE,MAAM,CAACC,QAAQ;QAE3D,OAAOrC,IAAIa,IAAI,CAAC;YACdyB,SAAS;QACX;IACF;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAhFOT,6BAAY,CAACU,QAAQ,GAAG"}

package/dist/controllers/floor.controller.js

@@ -49,8 +49,8 @@ class FloorController {
         const floor = await this.floorStore.updateName(req.local.id, req.body.name);
         res.send(floor);
     }
-    async updateFloorNumber(req, res) {
-        const floor = await this.floorStore.updateFloorNumber(req.local.id, req.body.floor);
+    async updateFloorOrder(req, res) {
+        const floor = await this.floorStore.updateFloorOrder(req.local.id, req.body.order);
         res.send(floor);
     }
     async addPrinterToFloor(req, res) {
@@ -66,7 +66,7 @@ _ts_decorate([
     (0, _awilixexpress.GET)(),
     (0, _awilixexpress.route)("/"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.List)
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.List)
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -79,7 +79,7 @@ _ts_decorate([
     (0, _awilixexpress.GET)(),
     (0, _awilixexpress.route)("/:id"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Get),
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Get),
         (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
@@ -93,7 +93,7 @@ _ts_decorate([
     (0, _awilixexpress.DELETE)(),
     (0, _awilixexpress.route)("/:id"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Delete),
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Delete),
         (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
@@ -107,7 +107,7 @@ _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Create)
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Create)
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -120,7 +120,7 @@ _ts_decorate([
     (0, _awilixexpress.PATCH)(),
     (0, _awilixexpress.route)("/:id/name"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Update),
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Update),
         (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
@@ -132,9 +132,9 @@ _ts_decorate([
 ], FloorController.prototype, "updateName", null);
 _ts_decorate([
     (0, _awilixexpress.PATCH)(),
-    (0, _awilixexpress.route)("/:id/floor-number"),
+    (0, _awilixexpress.route)("/:id/floor-order"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Update),
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Update),
         (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
@@ -143,12 +143,12 @@ _ts_decorate([
         typeof _express.Response === "undefined" ? Object : _express.Response
     ]),
     _ts_metadata("design:returntype", Promise)
-], FloorController.prototype, "updateFloorNumber", null);
+], FloorController.prototype, "updateFloorOrder", null);
 _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/:id/printer"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Update),
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Update),
         (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
@@ -162,7 +162,7 @@ _ts_decorate([
     (0, _awilixexpress.DELETE)(),
     (0, _awilixexpress.route)("/:id/printer"),
     (0, _awilixexpress.before)([
-        (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFloors.Update),
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.Floors.Update),
         (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),

package/dist/controllers/floor.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/floor.controller.ts"],"names":["FloorController","floorStore","list","req","res","floors","listCache","send","get","floor","getFloor","local","id","delete","create","body","updateName","name","updateFloorNumber","addPrinterToFloor","addOrUpdatePrinter","removePrinterFromFloor","removePrinter","printerId","permission","PERMS","PrinterFloors","List","Get","ParamId","Delete","Create","Update","AppConstants","apiRoute","authenticate"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/floor.controller.ts"],"names":["FloorController","floorStore","list","req","res","floors","listCache","send","get","floor","getFloor","local","id","delete","create","body","updateName","name","updateFloorOrder","order","addPrinterToFloor","addOrUpdatePrinter","removePrinterFromFloor","removePrinter","printerId","permission","PERMS","Floors","List","Get","ParamId","Delete","Create","Update","AppConstants","apiRoute","authenticate"],"mappings":"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"}