@fdm-monster/server 1.9.4 → 2.0.0

package/dist/state/socket-io.gateway.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","socketIoGatewaySessions","Gauge","name","help","socketIoGatewayDisconnects","Counter","socketIoGatewayMessagesSent","socketIoGatewayMessageSentSize","logger","io","loggerFactory","eventEmitter2","settingsStore","userService","configService","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","handshake","auth","token","use","authorize","verifyUserCallback","on","socket","onConnect","bind","debug","socketId","id","emit","socketIoConnectedEvent","inc","dec","send","event","data","payload","JSON","stringify","sizeInBytes","Buffer","byteLength","set","LegacyUpdate"],"mappings":";;;;;;;;;;;QAsFaA;eAAAA;;QArDAC;eAAAA;;;0BAjCkB;gCACQ;0BAMmB;oCAGhC;4BACK;AAE/B,MAAMC,0BAA0B,IAAIC,iBAAK,CAAC;IACxCC,MAAM;IACNC,MAAM;AACR;AAEA,MAAMC,6BAA6B,IAAIC,mBAAO,CAAC;IAC7CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMG,8BAA8B,IAAID,mBAAO,CAAC;IAC9CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMI,iCAAiC,IAAIN,iBAAK,CAAC;IAC/CC,MAAM;IACNC,MAAM;AACR;AAEO,MAAMJ;;;;;IACXS,OAAsB;IAEtBC,GAAW;IAEX,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA6B,CAC9C;aAJiBH,gBAAAA;aACAC,gBAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACN,MAAM,GAAGE,cAAcX,gBAAgBG,IAAI;IAClD;IAEAa,aAAaC,UAAsB,EAAE;QACnC,IAAI,CAACP,EAAE,GAAG,IAAIQ,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAChC,IAAI,CAACT,aAAa,EAClB,IAAI,CAACE,aAAa,EAClB,CAACQ,QAAkBA,MAAMC,SAAS,CAACC,IAAI,CAACC,KAAK;QAE/C,IAAI,CAAChB,EAAE,CAACiB,GAAG,CAACC,IAAAA,6BAAS,EAAC,IAAI,CAACf,aAAa,EAAEQ,MAAM,IAAI,CAACZ,MAAM,EAAEoB,IAAAA,4BAAkB,EAAC,IAAI,CAACf,WAAW;QAChG,IAAI,CAACJ,EAAE,CAACoB,EAAE,CAAC,cAAc,CAACC,SAAW,IAAI,CAACC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEF;IACjE;IAEAC,UAAUD,MAAc,EAAE;QACxB,IAAI,CAACtB,MAAM,CAACyB,KAAK,CAAC,6BAA6B;YAAEC,UAAUJ,OAAOK,EAAE;QAAC;QACrE,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEP,OAAOK,EAAE;QACzDnC,wBAAwBsC,GAAG;QAE3BR,OAAOD,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACyB,KAAK,CAAC,gCAAgC;gBAAEC,UAAUJ,OAAOK,EAAE;YAAC;YACxEnC,wBAAwBuC,GAAG,CAAC;YAC5BnC,2BAA2BkC,GAAG;QAChC;IACF;IAEAE,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAACjC,EAAE,EAAE;YACZ,IAAI,CAACD,MAAM,CAACyB,KAAK,CAAC,CAAC,gBAAgB,EAAEQ,MAAM,wCAAwC,CAAC;YACpF;QACF;QAEA,IAAI,CAAChC,EAAE,CAAC2B,IAAI,CAACK,OAAOC;QACpBpC,4BAA4BgC,GAAG;QAE/B,MAAMK,UAAUC,KAAKC,SAAS,CAACH;QAC/B,MAAMI,cAAcC,OAAOC,UAAU,CAACL;QACtCpC,+BAA+B0C,GAAG,CAACH;IACrC;AACF;AAEO,MAAMhD,cAAc;IACzBoD,cAAc;AAChB"}
+{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","socketIoGatewaySessions","Gauge","name","help","socketIoGatewayDisconnects","Counter","socketIoGatewayMessagesSent","socketIoGatewayMessageSentSize","logger","io","loggerFactory","eventEmitter2","settingsStore","userService","configService","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","handshake","auth","token","use","authorize","verifyUserCallback","on","socket","onConnect","bind","debug","socketId","id","emit","socketIoConnectedEvent","inc","dec","send","event","data","payload","JSON","stringify","sizeInBytes","Buffer","byteLength","set","Update"],"mappings":";;;;;;;;;;;QAsFaA;eAAAA;;QArDAC;eAAAA;;;0BAjCkB;gCACQ;0BAMmB;oCAGhC;4BACK;AAE/B,MAAMC,0BAA0B,IAAIC,iBAAK,CAAC;IACxCC,MAAM;IACNC,MAAM;AACR;AAEA,MAAMC,6BAA6B,IAAIC,mBAAO,CAAC;IAC7CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMG,8BAA8B,IAAID,mBAAO,CAAC;IAC9CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMI,iCAAiC,IAAIN,iBAAK,CAAC;IAC/CC,MAAM;IACNC,MAAM;AACR;AAEO,MAAMJ;;;;;IACXS,OAAsB;IAEtBC,GAAW;IAEX,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA6B,CAC9C;aAJiBH,gBAAAA;aACAC,gBAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACN,MAAM,GAAGE,cAAcX,gBAAgBG,IAAI;IAClD;IAEAa,aAAaC,UAAsB,EAAE;QACnC,IAAI,CAACP,EAAE,GAAG,IAAIQ,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAChC,IAAI,CAACT,aAAa,EAClB,IAAI,CAACE,aAAa,EAClB,CAACQ,QAAkBA,MAAMC,SAAS,CAACC,IAAI,CAACC,KAAK;QAE/C,IAAI,CAAChB,EAAE,CAACiB,GAAG,CAACC,IAAAA,6BAAS,EAAC,IAAI,CAACf,aAAa,EAAEQ,MAAM,IAAI,CAACZ,MAAM,EAAEoB,IAAAA,4BAAkB,EAAC,IAAI,CAACf,WAAW;QAChG,IAAI,CAACJ,EAAE,CAACoB,EAAE,CAAC,cAAc,CAACC,SAAW,IAAI,CAACC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEF;IACjE;IAEAC,UAAUD,MAAc,EAAE;QACxB,IAAI,CAACtB,MAAM,CAACyB,KAAK,CAAC,6BAA6B;YAAEC,UAAUJ,OAAOK,EAAE;QAAC;QACrE,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEP,OAAOK,EAAE;QACzDnC,wBAAwBsC,GAAG;QAE3BR,OAAOD,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACyB,KAAK,CAAC,gCAAgC;gBAAEC,UAAUJ,OAAOK,EAAE;YAAC;YACxEnC,wBAAwBuC,GAAG,CAAC;YAC5BnC,2BAA2BkC,GAAG;QAChC;IACF;IAEAE,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAACjC,EAAE,EAAE;YACZ,IAAI,CAACD,MAAM,CAACyB,KAAK,CAAC,CAAC,gBAAgB,EAAEQ,MAAM,wCAAwC,CAAC;YACpF;QACF;QAEA,IAAI,CAAChC,EAAE,CAAC2B,IAAI,CAACK,OAAOC;QACpBpC,4BAA4BgC,GAAG;QAE/B,MAAMK,UAAUC,KAAKC,SAAS,CAACH;QAC/B,MAAMI,cAAcC,OAAOC,UAAU,CAACL;QACtCpC,+BAA+B0C,GAAG,CAACH;IACrC;AACF;AAEO,MAAMhD,cAAc;IACzBoD,QAAQ;AACV"}

package/dist/state/test-printer-socket.store.js

@@ -20,6 +20,8 @@ const _moonrakerconstants = require("../services/moonraker/constants/moonraker.c
 const _bambumqttadapter = require("../services/bambu/bambu-mqtt.adapter");
 const _prusalinkconstants = require("../services/prusa-link/constants/prusalink.constants");
 const _eventconstants = require("../constants/event.constants");
+const TEST_PRINTER_ID_BASE = 100000;
+let testPrinterIdCounter = 0;
 class TestPrinterSocketStore {
     socketFactory;
     socketIoGateway;
@@ -39,9 +41,10 @@ class TestPrinterSocketStore {
         }
         const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterSchema);
         validatedData.enabled = true;
+        const testPrinterId = TEST_PRINTER_ID_BASE + ++testPrinterIdCounter;
         this.testSocket = this.socketFactory.createInstance(printer.printerType);
         this.testSocket.registerCredentials({
-            printerId: correlationToken,
+            printerId: testPrinterId,
             loginDto: {
                 apiKey: printer.apiKey,
                 username: printer.username,
@@ -73,7 +76,7 @@ class TestPrinterSocketStore {
             (0, _prusalinkconstants.prusaLinkEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
         ];
         const listener = ({ event, payload, printerId })=>{
-            if (printerId !== correlationToken) {
+            if (printerId !== testPrinterId) {
                 return;
             }
             this.socketIoGateway.send("test-printer-state", {
@@ -123,7 +126,7 @@ class TestPrinterSocketStore {
             }
             this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
                 printerIds: [
-                    correlationToken
+                    testPrinterId
                 ]
             });
             delete this.testSocket;

package/dist/state/test-printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","logger","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","bambuEvent","prusaLinkEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","TEST_PRINTER_ID_BASE","testPrinterIdCounter","testSocket","logger","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","testPrinterId","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","bambuEvent","prusaLinkEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}

package/dist/tasks/boot.task.js

@@ -8,81 +8,38 @@ Object.defineProperty(exports, "BootTask", {
         return BootTask;
     }
 });
-const _mongoose = /*#__PURE__*/ _interop_require_wildcard(require("mongoose"));
-const _serverenv = require("../server.env");
 const _containertokens = require("../container.tokens");
 const _serverconstants = require("../server.constants");
 const _tasks = require("../tasks");
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
 class BootTask {
     taskManagerService;
     settingsStore;
     multerService;
     printerSocketStore;
-    printerFilesStore;
     permissionService;
     roleService;
     userService;
     floorStore;
     configService;
     typeormService;
-    isTypeormMode;
     printerThumbnailCache;
+    printFileDownloaderService;
+    fileStorageService;
     logger;
-    constructor(loggerFactory, taskManagerService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, floorStore, configService, typeormService, isTypeormMode, printerThumbnailCache){
+    constructor(loggerFactory, taskManagerService, settingsStore, multerService, printerSocketStore, permissionService, roleService, userService, floorStore, configService, typeormService, printerThumbnailCache, printFileDownloaderService, fileStorageService){
         this.taskManagerService = taskManagerService;
         this.settingsStore = settingsStore;
         this.multerService = multerService;
         this.printerSocketStore = printerSocketStore;
-        this.printerFilesStore = printerFilesStore;
         this.permissionService = permissionService;
         this.roleService = roleService;
         this.userService = userService;
         this.floorStore = floorStore;
         this.configService = configService;
         this.typeormService = typeormService;
-        this.isTypeormMode = isTypeormMode;
         this.printerThumbnailCache = printerThumbnailCache;
+        this.printFileDownloaderService = printFileDownloaderService;
+        this.fileStorageService = fileStorageService;
         this.logger = loggerFactory(BootTask.name);
     }
     async runOnce() {
@@ -91,26 +48,9 @@ class BootTask {
         await this.run();
     }
     async run() {
-        if (this.isTypeormMode) {
-            await this.typeormService.createConnection();
-        } else {
-            try {
-                await this.createConnection();
-                await this.migrateDatabase();
-            } catch (e) {
-                if (e instanceof _mongoose.default.Error) {
-                    if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
-                        if (e.message.includes("ECONNREFUSED")) {
-                            this.logger.error("Database connection timed-out. Retrying in 5000.");
-                        } else {
-                            this.logger.error(`Database connection error: ${e.message}`);
-                        }
-                        this.taskManagerService.scheduleDisabledJob(_containertokens.DITokens.bootTask, false);
-                        return;
-                    }
-                }
-            }
-        }
+        await this.typeormService.createConnection();
+        this.logger.log("Ensuring file storage directories exist");
+        await this.fileStorageService.ensureStorageDirectories();
         this.logger.log("Loading and synchronizing Server Settings");
         await this.settingsStore.loadSettings();
         this.logger.log("Synchronizing user permission and roles definition");
@@ -142,8 +82,6 @@ class BootTask {
         this.multerService.clearUploadsFolder();
         this.logger.log("Loading printer sockets");
         await this.printerSocketStore.loadPrinterSockets();
-        this.logger.log("Loading files store");
-        await this.printerFilesStore.loadFilesStore();
         this.logger.log("Loading floor store");
         await this.floorStore.loadStore();
         this.logger.log("Loading printer thumbnail cache");
@@ -163,7 +101,6 @@ class BootTask {
         const demoUsername = this.configService.get(_serverconstants.AppConstants.OVERRIDE_DEMO_USERNAME, _serverconstants.AppConstants.DEFAULT_DEMO_USERNAME);
         const demoPassword = this.configService.get(_serverconstants.AppConstants.OVERRIDE_DEMO_PASSWORD, _serverconstants.AppConstants.DEFAULT_DEMO_PASSWORD);
         const demoRole = this.configService.get(_serverconstants.AppConstants.OVERRIDE_DEMO_ROLE, _serverconstants.AppConstants.DEFAULT_DEMO_ROLE);
-        const adminRole = this.roleService.getRoleByName(demoRole);
         const demoUserId = await this.userService.getDemoUserId();
         if (!demoUserId) {
             await this.userService.register({
@@ -174,7 +111,7 @@ class BootTask {
                 isRootUser: false,
                 needsPasswordChange: false,
                 roles: [
-                    adminRole.id
+                    demoRole
                 ]
             });
             this.logger.log("Created demo account");
@@ -182,29 +119,12 @@ class BootTask {
             await this.userService.setVerifiedById(demoUserId, true);
             await this.userService.setIsRootUserById(demoUserId, false);
             await this.userService.updatePasswordUnsafeByUsername(demoUsername, demoPassword);
-            await this.userService.setUserRoleIds(demoUserId, [
-                adminRole.id
+            await this.userService.setUserRoles(demoUserId, [
+                demoRole
             ]);
             this.logger.log("Updated demo account");
         }
     }
-    async createConnection() {
-        if (!this.isTypeormMode) {
-            const envUrl = (0, _serverenv.fetchMongoDBConnectionString)();
-            if (!envUrl?.length) {
-                throw new Error("Mongodb connection string not set");
-            }
-            await (0, _mongoose.connect)(envUrl, {
-                serverSelectionTimeoutMS: 1500
-            });
-            await (0, _mongoose.syncIndexes)();
-        }
-    }
-    async migrateDatabase() {
-        if (!this.isTypeormMode) {
-            await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());
-        }
-    }
 }
 
 //# sourceMappingURL=boot.task.js.map

package/dist/tasks/boot.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","loggerFactory","taskManagerService","settingsStore","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","floorStore","configService","typeormService","isTypeormMode","printerThumbnailCache","name","runOnce","registerJobOrTask","ServerTasks","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","loadCache","length","getAllValues","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","loggerFactory","taskManagerService","settingsStore","multerService","printerSocketStore","permissionService","roleService","userService","floorStore","configService","typeormService","printerThumbnailCache","printFileDownloaderService","fileStorageService","name","runOnce","registerJobOrTask","ServerTasks","SERVER_BOOT_TASK","log","run","createConnection","ensureStorageDirectories","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadStore","loadCache","length","getAllValues","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","DITokens","bootTask","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoles"],"mappings":"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"}

package/dist/tasks/print-job-analysis.task.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrintJobAnalysisTask", {
+    enumerable: true,
+    get: function() {
+        return PrintJobAnalysisTask;
+    }
+});
+const _printjobentity = require("../entities/print-job.entity");
+class PrintJobAnalysisTask {
+    printJobService;
+    fileAnalysisService;
+    fileStorageService;
+    logger;
+    printJobRepository;
+    constructor(loggerFactory, printJobService, fileAnalysisService, fileStorageService, typeormService){
+        this.printJobService = printJobService;
+        this.fileAnalysisService = fileAnalysisService;
+        this.fileStorageService = fileStorageService;
+        this.logger = loggerFactory(PrintJobAnalysisTask.name);
+        this.printJobRepository = typeormService.getDataSource().getRepository(_printjobentity.PrintJob);
+    }
+    async run() {
+        try {
+            const pendingJobs = await this.printJobRepository.find({
+                where: [
+                    {
+                        analysisState: "NOT_ANALYZED",
+                        status: "PENDING"
+                    },
+                    {
+                        analysisState: "ANALYZING"
+                    }
+                ],
+                take: 10
+            });
+            if (pendingJobs.length === 0) {
+                this.logger.debug("No pending print jobs to analyze");
+                return;
+            }
+            this.logger.log(`Found ${pendingJobs.length} print job(s) to analyze`);
+            for (const job of pendingJobs){
+                try {
+                    await this.analyzeJob(job);
+                } catch (error) {
+                    this.logger.error(`Failed to analyze job ${job.id}: ${job.fileName}`, error);
+                    job.analysisState = "FAILED";
+                    job.statusReason = `Analysis failed: ${error instanceof Error ? error.message : "Unknown error"}`;
+                    await this.printJobRepository.save(job);
+                }
+            }
+            this.logger.log(`Completed analysis of ${pendingJobs.length} print job(s)`);
+        } catch (error) {
+            this.logger.error("Failed to run print job analysis task", error);
+        }
+    }
+    async analyzeJob(job) {
+        this.logger.log(`Analyzing print job ${job.id}: ${job.fileName}`);
+        job.analysisState = "ANALYZING";
+        await this.printJobRepository.save(job);
+        if (!job.fileStorageId) {
+            throw new Error("Job has no fileStorageId - cannot analyze");
+        }
+        const cachedMetadata = await this.fileStorageService.loadMetadata(job.fileStorageId);
+        let metadata;
+        let thumbnails = [];
+        if (cachedMetadata) {
+            this.logger.log(`Using cached metadata for job ${job.id} (storageId: ${job.fileStorageId})`);
+            metadata = cachedMetadata;
+            thumbnails = [];
+        } else {
+            const filePath = await this.resolveFilePath(job);
+            if (!filePath) {
+                throw new Error("File path could not be resolved");
+            }
+            const exists = await this.fileAnalysisService.needsAnalysis(filePath);
+            if (!exists) {
+                throw new Error(`File not found: ${filePath}`);
+            }
+            const analysisResult = await this.fileAnalysisService.analyzeFile(filePath);
+            metadata = analysisResult.metadata;
+            thumbnails = analysisResult.thumbnails;
+            let thumbnailMetadata = [];
+            if (thumbnails && thumbnails.length > 0) {
+                thumbnailMetadata = await this.fileStorageService.saveThumbnails(job.fileStorageId, thumbnails);
+                this.logger.log(`Saved ${thumbnailMetadata.length} thumbnail(s) for job ${job.id}`);
+            }
+            const fileHash = job.fileHash || undefined;
+            await this.fileStorageService.saveMetadata(job.fileStorageId, metadata, fileHash, job.fileName, thumbnailMetadata);
+            this.logger.log(`Cached metadata JSON for job ${job.id}`);
+        }
+        await this.printJobService.handleFileAnalyzed(job.id, metadata, thumbnails);
+        this.logger.log(`Successfully analyzed job ${job.id}: ${job.fileName}`);
+    }
+    async resolveFilePath(job) {
+        if (job.fileStorageId) {
+            try {
+                const exists = await this.fileStorageService.fileExists(job.fileStorageId);
+                if (!exists) {
+                    this.logger.warn(`File ${job.fileStorageId} not found in storage for job ${job.id}`);
+                    return null;
+                }
+                return this.fileStorageService.getFilePath(job.fileStorageId);
+            } catch (error) {
+                this.logger.error(`Failed to resolve file path for job ${job.id}: ${error}`);
+                return null;
+            }
+        }
+        this.logger.debug(`Job ${job.id} has no fileStorageId - cannot analyze remotely stored file`);
+        return null;
+    }
+}
+
+//# sourceMappingURL=print-job-analysis.task.js.map

package/dist/tasks/print-job-analysis.task.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/tasks/print-job-analysis.task.ts"],"names":["PrintJobAnalysisTask","logger","printJobRepository","loggerFactory","printJobService","fileAnalysisService","fileStorageService","typeormService","name","getDataSource","getRepository","PrintJob","run","pendingJobs","find","where","analysisState","status","take","length","debug","log","job","analyzeJob","error","id","fileName","statusReason","Error","message","save","fileStorageId","cachedMetadata","loadMetadata","metadata","thumbnails","filePath","resolveFilePath","exists","needsAnalysis","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","fileHash","undefined","saveMetadata","handleFileAnalyzed","fileExists","warn","getFilePath"],"mappings":"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"}

package/dist/tasks/printer-files-load.task.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterFilesLoadTask", {
+    enumerable: true,
+    get: function() {
+        return PrinterFilesLoadTask;
+    }
+});
+class PrinterFilesLoadTask {
+    printerFilesStore;
+    logger;
+    constructor(loggerFactory, printerFilesStore){
+        this.printerFilesStore = printerFilesStore;
+        this.logger = loggerFactory(PrinterFilesLoadTask.name);
+    }
+    async run() {
+        this.logger.log("Loading files store in background");
+        try {
+            await this.printerFilesStore.loadFilesStore();
+            this.logger.log("Files store loaded successfully in background");
+        } catch (error) {
+            this.logger.error("Failed to load files store in background", error);
+        }
+    }
+}
+
+//# sourceMappingURL=printer-files-load.task.js.map

package/dist/tasks/printer-files-load.task.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/tasks/printer-files-load.task.ts"],"names":["PrinterFilesLoadTask","logger","loggerFactory","printerFilesStore","name","run","log","loadFilesStore","error"],"mappings":";;;;+BAQaA;;;eAAAA;;;AAAN,MAAMA;;IACXC,OAAsB;IAEtB,YACEC,aAA6B,EAC7B,AAAiBC,iBAAoC,CACrD;aADiBA,oBAAAA;QAEjB,IAAI,CAACF,MAAM,GAAGC,cAAcF,qBAAqBI,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,IAAI,CAACJ,MAAM,CAACK,GAAG,CAAC;QAChB,IAAI;YACF,MAAM,IAAI,CAACH,iBAAiB,CAACI,cAAc;YAC3C,IAAI,CAACN,MAAM,CAACK,GAAG,CAAC;QAClB,EAAE,OAAOE,OAAO;YACd,IAAI,CAACP,MAAM,CAACO,KAAK,CAAC,4CAA4CA;QAChE;IACF;AACF"}

package/dist/tasks/socketio.task.js

@@ -48,7 +48,7 @@ class SocketIoTask {
             printerEvents,
             trackedUploads
         };
-        this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.LegacyUpdate, socketIoData);
+        this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.Update, socketIoData);
     }
 }
 

package/dist/tasks/socketio.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","logger","loggerFactory","socketIoGateway","floorStore","printerSocketStore","printerEventsCache","printerCache","fileUploadTrackerCache","eventEmitter2","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","send","IO_MESSAGES","LegacyUpdate"],"mappings":";;;;+BAWaA;;;eAAAA;;;iCAXgC;gCACN;AAUhC,MAAMA;;;;;;;;IACXC,OAAsB;IAEtB,YACEC,aAA6B,EAC7B,AAAiBC,eAAgC,EACjD,AAAiBC,UAAsB,EACvC,AAAiBC,kBAAsC,EACvD,AAAiBC,kBAAsC,EACvD,AAAiBC,YAA0B,EAC3C,AAAiBC,sBAA8C,EAC/D,AAAiBC,aAA4B,CAC7C;aAPiBN,kBAAAA;aACAC,aAAAA;aACAC,qBAAAA;aACAC,qBAAAA;aACAC,eAAAA;aACAC,yBAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACR,MAAM,GAAGC,cAAcF,aAAaU,IAAI;QAE7C,IAAI,CAACD,aAAa,CAACE,EAAE,CAACC,sCAAsB,EAAE;YAC5C,MAAM,IAAI,CAACC,UAAU;QACvB;IACF;IAEA,MAAMC,MAAM;QACV,MAAM,IAAI,CAACD,UAAU;IACvB;IAEA,MAAMA,aAAa;QACjB,MAAME,SAAS,MAAM,IAAI,CAACX,UAAU,CAACY,SAAS;QAC9C,MAAMC,WAAW,MAAM,IAAI,CAACV,YAAY,CAACW,kBAAkB,CAAC;QAC5D,MAAMC,eAAe,IAAI,CAACd,kBAAkB,CAACe,mBAAmB;QAChE,MAAMC,gBAAgB,MAAM,IAAI,CAACf,kBAAkB,CAACgB,eAAe;QACnE,MAAMC,iBAAiB,IAAI,CAACf,sBAAsB,CAACgB,UAAU;QAE7D,MAAMC,eAAe;YACnBR;YACAF;YACAI;YACAE;YACAE;QACF;QAEA,IAAI,CAACpB,eAAe,CAACuB,IAAI,CAACC,4BAAW,CAACC,YAAY,EAAEH;IACtD;AACF"}
+{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","logger","loggerFactory","socketIoGateway","floorStore","printerSocketStore","printerEventsCache","printerCache","fileUploadTrackerCache","eventEmitter2","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","send","IO_MESSAGES","Update"],"mappings":";;;;+BAWaA;;;eAAAA;;;iCAXgC;gCACN;AAUhC,MAAMA;;;;;;;;IACXC,OAAsB;IAEtB,YACEC,aAA6B,EAC7B,AAAiBC,eAAgC,EACjD,AAAiBC,UAAsB,EACvC,AAAiBC,kBAAsC,EACvD,AAAiBC,kBAAsC,EACvD,AAAiBC,YAA0B,EAC3C,AAAiBC,sBAA8C,EAC/D,AAAiBC,aAA4B,CAC7C;aAPiBN,kBAAAA;aACAC,aAAAA;aACAC,qBAAAA;aACAC,qBAAAA;aACAC,eAAAA;aACAC,yBAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACR,MAAM,GAAGC,cAAcF,aAAaU,IAAI;QAE7C,IAAI,CAACD,aAAa,CAACE,EAAE,CAACC,sCAAsB,EAAE;YAC5C,MAAM,IAAI,CAACC,UAAU;QACvB;IACF;IAEA,MAAMC,MAAM;QACV,MAAM,IAAI,CAACD,UAAU;IACvB;IAEA,MAAMA,aAAa;QACjB,MAAME,SAAS,MAAM,IAAI,CAACX,UAAU,CAACY,SAAS;QAC9C,MAAMC,WAAW,MAAM,IAAI,CAACV,YAAY,CAACW,kBAAkB,CAAC;QAC5D,MAAMC,eAAe,IAAI,CAACd,kBAAkB,CAACe,mBAAmB;QAChE,MAAMC,gBAAgB,MAAM,IAAI,CAACf,kBAAkB,CAACgB,eAAe;QACnE,MAAMC,iBAAiB,IAAI,CAACf,sBAAsB,CAACgB,UAAU;QAE7D,MAAMC,eAAe;YACnBR;YACAF;YACAI;YACAE;YACAE;QACF;QAEA,IAAI,CAACpB,eAAe,CAACuB,IAAI,CAACC,4BAAW,CAACC,MAAM,EAAEH;IAChD;AACF"}

package/dist/tasks.js

@@ -36,9 +36,10 @@ class ServerTasks {
         registerTask(_containertokens.DITokens.softwareUpdateTask, _taskpresets.TASK_PRESETS.RUNDELAYED, 1500),
         registerTask(_containertokens.DITokens.clientDistDownloadTask, _taskpresets.TASK_PRESETS.RUNONCE),
         registerTask(_containertokens.DITokens.socketIoTask, _taskpresets.TASK_PRESETS.PERIODIC, 500),
-        registerTask(_containertokens.DITokens.printerFileCleanTask, _taskpresets.TASK_PRESETS.RUNONCE, 60 * 1000, true),
         registerTask(_containertokens.DITokens.printerWebsocketTask, _taskpresets.TASK_PRESETS.PERIODIC, 2000, true),
-        registerTask(_containertokens.DITokens.printerWebsocketRestoreTask, _taskpresets.TASK_PRESETS.PERIODIC, 15 * 1000, false)
+        registerTask(_containertokens.DITokens.printerWebsocketRestoreTask, _taskpresets.TASK_PRESETS.PERIODIC, 15 * 1000, false),
+        registerTask(_containertokens.DITokens.printerFilesLoadTask, _taskpresets.TASK_PRESETS.RUNDELAYED, 1000),
+        registerTask(_containertokens.DITokens.printJobAnalysisTask, _taskpresets.TASK_PRESETS.PERIODIC, 30 * 1000, false)
     ];
 }
 

package/dist/tasks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;QAkBaA;eAAAA;;QAXGC;eAAAA;;;6BAP4B;iCACnB;AAMlB,SAASA,aAAaC,IAAS,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACpG,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,kBAAkB;IAChD,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAcS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IAC7G,OAAcC,aAAa;QACzBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAC1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACa,2BAA2B,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
+{"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printerWebsocketTask","printerWebsocketRestoreTask","printerFilesLoadTask","printJobAnalysisTask"],"mappings":";;;;;;;;;;;QAkBaA;eAAAA;;QAXGC;eAAAA;;;6BAP4B;iCACnB;AAMlB,SAASA,aAAaC,IAAS,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACpG,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,kBAAkB;IAChD,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAuBS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IACtH,OAAuBC,aAAa;QAClCb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAE1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACY,2BAA2B,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;QAEpFnB,aAAaS,yBAAQ,CAACa,oBAAoB,EAAEX,yBAAW,CAACI,UAAU,EAAE;QAEpEf,aAAaS,yBAAQ,CAACc,oBAAoB,EAAEZ,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KAC9E,CAAC;AACJ"}

package/dist/utils/cache/key-diff.cache.js

@@ -11,83 +11,43 @@ Object.defineProperty(exports, "KeyDiffCache", {
 class KeyDiffCache {
     deletedKeys = [];
     updatedKeys = [];
-    keyValueStore = {};
+    keyValueStore = new Map();
     async getAllValues() {
-        const keys = Object.keys(this.keyValueStore);
-        return await this.getValuesBatch(keys);
+        return Array.from(this.keyValueStore.values());
     }
     async getAllKeyValues() {
-        return this.keyValueStore;
+        return Object.fromEntries(this.keyValueStore);
     }
     async getValue(key) {
-        const keyString = key?.toString();
-        if (!keyString?.length) {
-            throw new Error("Key must be a non-empty serializable string");
-        }
-        return this.keyValueStore[keyString];
-    }
-    async processStateDiffs() {
-        const updatedKeys = [
-            ...this.updatedKeys
-        ];
-        const updatedValues = await this.getValuesBatch(updatedKeys);
-        const deletedKeys = [
-            ...this.deletedKeys
-        ];
-        this.resetDiffs();
-        return {
-            updatedKeys,
-            updatedValues,
-            deletedKeys
-        };
+        return this.keyValueStore.get(key);
     }
     async setKeyValuesBatch(keyValues, markUpdated = true) {
-        keyValues.forEach(({ key, value })=>{
-            this.setKeyValue(key, value);
-        });
+        for (const { key, value } of keyValues){
+            await this.setKeyValue(key, value, false);
+        }
         if (markUpdated) {
             const updatedKeys = keyValues.map(({ key })=>key);
             this.batchMarkUpdated(updatedKeys);
         }
     }
     async deleteKeysBatch(keys, markDeleted = true) {
-        keys.forEach((key)=>{
-            this.deleteKeyValue(key);
-        });
+        for (const key of keys){
+            await this.deleteKeyValue(key, false);
+        }
         if (markDeleted) {
             this.batchMarkDeleted(keys);
         }
     }
-    async getValuesBatch(keys) {
-        const keyStrings = keys.map((key)=>key?.toString());
-        if (keyStrings.some((key)=>!key?.length)) {
-            throw new Error("Key must be a non-empty serializable string, and one of them is not");
-        }
-        const values = [];
-        for (const keyString of keyStrings){
-            const value = await this.getValue(keyString.toString());
-            values.push(value);
-        }
-        return values;
-    }
     async setKeyValue(key, value, markUpdated = true) {
-        const keyString = this.convertToKeyString(key);
-        if (!keyString?.length) {
-            throw new Error("Key must be a non-empty serializable string");
-        }
-        this.keyValueStore[keyString] = value;
+        this.keyValueStore.set(key, value);
         if (markUpdated) {
-            this.markUpdated(keyString);
+            this.markUpdated(key);
         }
     }
     async deleteKeyValue(key, markDeleted = true) {
-        const keyString = this.convertToKeyString(key);
-        if (!keyString?.length) {
-            throw new Error("Key must be a non-empty serializable string");
-        }
-        delete this.keyValueStore[keyString];
+        this.keyValueStore.delete(key);
         if (markDeleted) {
-            this.markDeleted(keyString);
+            this.markDeleted(key);
         }
     }
     batchMarkDeleted(keys) {
@@ -96,24 +56,23 @@ class KeyDiffCache {
         }
     }
     markUpdated(key) {
-        if (this.deletedKeys.includes(key)) {
-            this.deletedKeys.splice(this.deletedKeys.indexOf(key), 1);
+        const deletedIndex = this.deletedKeys.indexOf(key);
+        if (deletedIndex !== -1) {
+            this.deletedKeys.splice(deletedIndex, 1);
         }
         if (!this.updatedKeys.includes(key)) {
             this.updatedKeys.push(key);
         }
     }
     markDeleted(key) {
-        if (this.updatedKeys.includes(key)) {
-            this.updatedKeys.splice(this.updatedKeys.indexOf(key), 1);
+        const updatedIndex = this.updatedKeys.indexOf(key);
+        if (updatedIndex !== -1) {
+            this.updatedKeys.splice(updatedIndex, 1);
         }
         if (!this.deletedKeys.includes(key)) {
             this.deletedKeys.push(key);
         }
     }
-    convertToKeyString(key) {
-        return key?.toString();
-    }
     resetDiffs() {
         this.deletedKeys = [];
         this.updatedKeys = [];