@fdm-monster/server 1.9.0-rc1 → 1.9.0

package/.env.template

@@ -4,6 +4,7 @@ SERVER_PORT=4000
 NODE_ENV=development
 # Optional, default: mongodb://127.0.0.1:27017/fdm-monster
 MONGO=mongodb://127.0.0.1:27017/fdm-monster
+ENABLE_COLORED_LOGS=false
 
 # Github Personal Access Token, allows downloading the Client bundle without hitting a Github API rate limit
 GITHUB_PAT=1234567890abcdef1234567890abcdef12345678
@@ -39,7 +40,6 @@ OVERRIDE_DEMO_ROLE=ADMIN
 # Debug express routes
 DEBUG_ROUTES=false
 DEBUG_SOCKET_STATES=false
-DEBUG_FILE_WRITE_PRINTER_STATES=false
 
 # Enables TypeORM
 ENABLE_EXPERIMENTAL_TYPEORM=false

package/README.md

@@ -20,7 +20,7 @@
     </a>
 </p>
 
-FDM Monster is a server for managing your 3D printer farm through [OctoPrint](https://octoprint.org/) as well as [Klipper](https://www.klipper3d.org/) using [Moonraker](https://github.com/Arksine/moonraker).
+FDM Monster is a server for managing your 3D printer farm through [OctoPrint](https://octoprint.org/) as well as [Klipper](https://www.klipper3d.org/) using [Moonraker](https://github.com/Arksine/moonraker) and [Prusa-Link](https://github.com/prusa3d/Prusa-Link).
 
 ## Check out our [documentation](https://docs.fdm-monster.net)
 
@@ -29,7 +29,7 @@ FDM Monster is a server for managing your 3D printer farm through [OctoPrint](ht
 ## Features 🖨️
 Here is a list of features that make FDM Monster stand out:
 
-- Adding OctoPrint and Moonraker instances
+- Adding OctoPrint, Moonraker and Prusa-Link instances
 - Dragging or creating new printers on a customizable grid
 - Drag n drop GCode to print
 - Select printers and print one GCode file in batch 

package/RELEASE_NOTES.MD

@@ -1,6 +1,25 @@
 # Develop
 
+# FDM Monster 1.9.0
+
 ## Features
+
+- Introduce separate upload timeout setting for better control and resilience
+- Ability to add startPrint to specify print or not after upload
+
+## Fixes
+
+- OctoPrint 1.8.7 needs explicit passive flag in body instead of header to login
+- PrusaLink subfeature was not added to printer type feature (new client packaged)
+- Improve Moonraker error logging
+- Make colored logs opt-in with "ENABLE_COLORED_LOGS: true" env var
+- SocketIO gateway logs errors more explicitly
+- Logger is now static, reducing memory usage and test duration
+
+# FDM Monster 1.9.0-rc1
+
+## Features
+
 - Introduce PrusaLink adapter for limited printer support for these printers: MK3S(+) (needs PrusaLink extension with Raspberry Pi), Mini(+), MK4(S), XL, Core One
 - Add opt-in Prometheus integration (still experimental)
 - Add opt-in Loki integration (still experimental)

package/dist/constants/server-settings.constants.js

@@ -83,7 +83,8 @@ const getDefaultFrontendSettings = ()=>({
     });
 const timeoutSettingKey = "timeout";
 const getDefaultTimeout = ()=>({
-        apiTimeout: 10000
+        apiTimeout: 10000,
+        apiUploadTimeout: 30000
     });
 const printerFileCleanSettingKey = "printerFileClean";
 const getDefaultFileCleanSettings = ()=>({

package/dist/constants/server-settings.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWizardSettings","printerFileCleanSettingKey","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","experimentalPrusaLinkSupport","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","apiTimeout","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","jwtSecret","uuidv4"],"mappings":";;;;;;;;;;;IA+BaA,qBAAqB;eAArBA;;IAUAC,kBAAkB;eAAlBA;;IATAC,4BAA4B;eAA5BA;;IAuBAC,2BAA2B;eAA3BA;;IAbAC,0BAA0B;eAA1BA;;IAtBAC,wBAAwB;eAAxBA;;IAyCAC,kBAAkB;eAAlBA;;IAXAC,iBAAiB;eAAjBA;;IArCAC,wBAAwB;eAAxBA;;IAyCAC,0BAA0B;eAA1BA;;IAnCAC,iBAAiB;eAAjBA;;IA8BAC,iBAAiB;eAAjBA;;IArCAC,gBAAgB;eAAhBA;;;iCAZgB;sBASA;AAGtB,MAAMA,mBAAmB;AACzB,MAAMJ,2BAA2B,IAA0B,CAAA;QAChEK,iBAAiB;QACjBC,mBAAmB;QACnBC,eAAe;IACjB,CAAA;AAEO,MAAML,oBAAoB;AAC1B,MAAML,2BAA2B,IAA0B,CAAA;QAChEW,0BAA0B;QAC1BC,eAAe;QACfC,cAAc;QACdC,8BAA8B;QAC9BC,4BAA4B;QAC5BC,2BAA2B;QAC3BC,8BAA8B;QAC9BC,8BAA8B;IAChC,CAAA;AAEO,MAAMvB,wBAAwB;AAC9B,MAAME,+BAA+B,IAA8B,CAAA;QAExEsB,cAAcC,6BAAY,CAACC,sBAAsB;QAEjDC,sBAAsBF,6BAAY,CAACG,8BAA8B;QAEjEC,oBAAoBJ,6BAAY,CAACK,4BAA4B;IAC/D,CAAA;AAEO,MAAM7B,qBAAqB;AAC3B,MAAMG,6BAA6B,IAA4B,CAAA;QACpE2B,UAAU;QACVC,UAAU;QACVC,YAAY;QACZC,+BAA+B;IACjC,CAAA;AAEO,MAAMvB,oBAAoB;AAC1B,MAAMJ,oBAAoB,IAA2B,CAAA;QAC1D4B,YAAY;IACd,CAAA;AAEO,MAAM1B,6BAA6B;AACnC,MAAMN,8BAA8B,IAA6B,CAAA;QACtEiC,gCAAgC;QAChCC,0BAA0B;QAC1BC,iCAAiC;IACnC,CAAA;AAEO,MAAMhC,qBAAqB,IAAO,CAAA;QACvC,CAACI,kBAAkB,EAAEL;QACrB,CAACO,iBAAiB,EAAEJ;QACpB,CAACR,sBAAsB,EAAE;YACvB,GAAGE,8BAA8B;YACjCqC,WAAWC,IAAAA,QAAM;QACnB;QACA,CAAC/B,2BAA2B,EAAEN;QAC9B,CAACF,mBAAmB,EAAEG;QACtB,CAACO,kBAAkB,EAAEJ;IACvB,CAAA"}
+{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWizardSettings","printerFileCleanSettingKey","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","experimentalPrusaLinkSupport","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","apiTimeout","apiUploadTimeout","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","jwtSecret","uuidv4"],"mappings":";;;;;;;;;;;IA+BaA,qBAAqB;eAArBA;;IAUAC,kBAAkB;eAAlBA;;IATAC,4BAA4B;eAA5BA;;IAwBAC,2BAA2B;eAA3BA;;IAdAC,0BAA0B;eAA1BA;;IAtBAC,wBAAwB;eAAxBA;;IA0CAC,kBAAkB;eAAlBA;;IAZAC,iBAAiB;eAAjBA;;IArCAC,wBAAwB;eAAxBA;;IA0CAC,0BAA0B;eAA1BA;;IApCAC,iBAAiB;eAAjBA;;IA8BAC,iBAAiB;eAAjBA;;IArCAC,gBAAgB;eAAhBA;;;iCAZgB;sBASA;AAGtB,MAAMA,mBAAmB;AACzB,MAAMJ,2BAA2B,IAA0B,CAAA;QAChEK,iBAAiB;QACjBC,mBAAmB;QACnBC,eAAe;IACjB,CAAA;AAEO,MAAML,oBAAoB;AAC1B,MAAML,2BAA2B,IAA0B,CAAA;QAChEW,0BAA0B;QAC1BC,eAAe;QACfC,cAAc;QACdC,8BAA8B;QAC9BC,4BAA4B;QAC5BC,2BAA2B;QAC3BC,8BAA8B;QAC9BC,8BAA8B;IAChC,CAAA;AAEO,MAAMvB,wBAAwB;AAC9B,MAAME,+BAA+B,IAA8B,CAAA;QAExEsB,cAAcC,6BAAY,CAACC,sBAAsB;QAEjDC,sBAAsBF,6BAAY,CAACG,8BAA8B;QAEjEC,oBAAoBJ,6BAAY,CAACK,4BAA4B;IAC/D,CAAA;AAEO,MAAM7B,qBAAqB;AAC3B,MAAMG,6BAA6B,IAA4B,CAAA;QACpE2B,UAAU;QACVC,UAAU;QACVC,YAAY;QACZC,+BAA+B;IACjC,CAAA;AAEO,MAAMvB,oBAAoB;AAC1B,MAAMJ,oBAAoB,IAA2B,CAAA;QAC1D4B,YAAY;QACZC,kBAAkB;IACpB,CAAA;AAEO,MAAM3B,6BAA6B;AACnC,MAAMN,8BAA8B,IAA6B,CAAA;QACtEkC,gCAAgC;QAChCC,0BAA0B;QAC1BC,iCAAiC;IACnC,CAAA;AAEO,MAAMjC,qBAAqB,IAAO,CAAA;QACvC,CAACI,kBAAkB,EAAEL;QACrB,CAACO,iBAAiB,EAAEJ;QACpB,CAACR,sBAAsB,EAAE;YACvB,GAAGE,8BAA8B;YACjCsC,WAAWC,IAAAA,QAAM;QACnB;QACA,CAAChC,2BAA2B,EAAEN;QAC9B,CAACF,mBAAmB,EAAEG;QACtB,CAACO,kBAAkB,EAAEJ;IACvB,CAAA"}

package/dist/controllers/printer-files.controller.js

@@ -149,6 +149,8 @@ class PrinterFilesController {
     async uploadPrinterFile(req, res) {
         const { currentPrinterId } = (0, _printerresolver.getScopedPrinter)(req);
         const files = await this.multerService.multerLoadFileAsync(req, res, _serverconstants.AppConstants.defaultAcceptedGcodeExtensions, true);
+        const { startPrint: startPrintString } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.uploadFileSchema);
+        const startPrint = startPrintString === "true";
         if (!files?.length) {
             throw new _runtimeexceptions.ValidationException({
                 error: `No file was available for upload. Did you upload files with one of these extensions: ${_serverconstants.AppConstants.defaultAcceptedGcodeExtensions.join(", ")}?`
@@ -165,7 +167,7 @@ class PrinterFilesController {
         }
         const uploadedFile = files[0];
         const token = this.multerService.startTrackingSession(uploadedFile, currentPrinterId);
-        await this.printerApi.uploadFile(uploadedFile, token).catch((e)=>{
+        await this.printerApi.uploadFile(uploadedFile, startPrint, token).catch((e)=>{
             try {
                 this.multerService.clearUploadedFile(uploadedFile);
             } catch (e) {

package/dist/controllers/printer-files.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","logger","constructor","loggerFactory","printerApi","printerLogin","printerFilesStore","printerFileCleanTask","settingsStore","multerService","printerThumbnailCache","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileSchema","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","params","id","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","downloadFile","path","downloadFileSchema","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileSchema","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","toString","uploadPrinterFile","multerLoadFileAsync","AppConstants","defaultAcceptedGcodeExtensions","ValidationException","join","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","catch","clearUploadedFile","loadPrinterThumbnailLocal","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","logger","constructor","loggerFactory","printerApi","printerLogin","printerFilesStore","printerFileCleanTask","settingsStore","multerService","printerThumbnailCache","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileSchema","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","params","id","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","downloadFile","path","downloadFileSchema","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileSchema","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","toString","uploadPrinterFile","multerLoadFileAsync","AppConstants","defaultAcceptedGcodeExtensions","startPrintString","uploadFileSchema","ValidationException","join","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","catch","clearUploadedFile","loadPrinterThumbnailLocal","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}

package/dist/controllers/server-public.controller.js

@@ -53,6 +53,7 @@ class ServerPublicController {
     getFeatures(req, res) {
         const serverSettings = this.settingsStore.getServerSettings();
         const moonrakerEnabled = serverSettings.experimentalMoonrakerSupport;
+        const prusaLinkEnabled = serverSettings.experimentalPrusaLinkSupport;
         res.send({
             printerGroupsApi: {
                 available: this.isTypeormMode,
@@ -63,11 +64,14 @@ class ServerPublicController {
                 available: true,
                 version: 1,
                 subFeatures: {
-                    types: moonrakerEnabled ? [
+                    types: [
                         "octoprint",
-                        "klipper"
-                    ] : [
-                        "octoprint"
+                        ...moonrakerEnabled ? [
+                            "klipper"
+                        ] : [],
+                        ...prusaLinkEnabled ? [
+                            "prusaLink"
+                        ] : []
                     ]
                 }
             }

package/dist/controllers/server-public.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","constructor","settingsStore","serverVersion","serverReleaseService","monsterPiService","isTypeormMode","welcome","req","res","getSettings","getLoginRequired","send","message","getFeatures","serverSettings","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","printerGroupsApi","available","version","subFeatures","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","authenticate","permission","PERMS","ServerInfo","Get","apiRoute"],"mappings":";;;;+BAWaA;;;eAAAA;;;+BAXsB;iCACN;0BACN;8BACkB;wCACnB;+BACQ;sCACO;kCACJ;yBACC;;;;;;;;;;AAG3B,MAAMA;;;;;;IACXC,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,EACtC,AAAiBC,oBAA0C,EAC3D,AAAiBC,gBAAkC,EACnD,AAAiBC,aAAsB,CACvC;aALiBJ,gBAAAA;aACAC,gBAAAA;aACAC,uBAAAA;aACAC,mBAAAA;aACAC,gBAAAA;IAChB;IAKHC,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACnC,IAAI,CAACP,aAAa,CAACQ,WAAW;QAE9B,IAAI,CAAC,IAAI,CAACR,aAAa,CAACS,gBAAgB,IAAI;YAC1C,OAAOF,IAAIG,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOJ,IAAIG,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAKAC,YAAYN,GAAY,EAAEC,GAAa,EAAE;QACvC,MAAMM,iBAAiB,IAAI,CAACb,aAAa,CAACc,iBAAiB;QAC3D,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpET,IAAIG,IAAI,CAAC;YACPO,kBAAkB;gBAEhBC,WAAW,IAAI,CAACd,aAAa;gBAC7Be,SAAS;gBACTC,aAAa,CAAC;YAChB;YACAC,yBAAyB;gBACvBH,WAAW;gBACXC,SAAS;gBACTC,aAAa;oBACXE,OAAOP,mBAAmB;wBAAC;wBAAa;qBAAU,GAAG;wBAAC;qBAAY;gBACpE;YACF;QACF;IACF;IAEA,MAGMQ,WAAWjB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAMiB,cAAc,IAAI,CAACtB,oBAAoB,CAACuB,QAAQ;QACtD,MAAMC,mBAAmB,IAAI,CAACvB,gBAAgB,CAACwB,uBAAuB;QAEtEpB,IAAIqB,IAAI,CAAC;YACPT,SAAS,IAAI,CAAClB,aAAa;YAC3B4B,QAAQA,IAAAA,gBAAM;YACdC,IAAIC,QAAQC,GAAG,CAACC,EAAE;YAClBC,WAAWR;YACXS,QAAQ;gBACNC,QAAQZ,YAAYY,MAAM;gBAC1BC,iBAAiBb,YAAYa,eAAe;gBAC5CC,WAAWd,YAAYc,SAAS;YAClC;QACF;IACF;IAEA,MAEMC,KAAKjC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIG,IAAI,CAAC;YACPC,SAAS;QACX;IACF;AACF;;;;;QAjEW6B,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;QAiB/CJ,IAAAA,0BAAY;;;;;;;;;;;;;QAuBZA,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;;;;;;;;4DApDtCC"}
+{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","constructor","settingsStore","serverVersion","serverReleaseService","monsterPiService","isTypeormMode","welcome","req","res","getSettings","getLoginRequired","send","message","getFeatures","serverSettings","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","printerGroupsApi","available","version","subFeatures","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","authenticate","permission","PERMS","ServerInfo","Get","apiRoute"],"mappings":";;;;+BAWaA;;;eAAAA;;;+BAXsB;iCACN;0BACN;8BACkB;wCACnB;+BACQ;sCACO;kCACJ;yBACC;;;;;;;;;;AAG3B,MAAMA;;;;;;IACXC,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,EACtC,AAAiBC,oBAA0C,EAC3D,AAAiBC,gBAAkC,EACnD,AAAiBC,aAAsB,CACvC;aALiBJ,gBAAAA;aACAC,gBAAAA;aACAC,uBAAAA;aACAC,mBAAAA;aACAC,gBAAAA;IAEnB;IAKAC,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACnC,IAAI,CAACP,aAAa,CAACQ,WAAW;QAE9B,IAAI,CAAC,IAAI,CAACR,aAAa,CAACS,gBAAgB,IAAI;YAC1C,OAAOF,IAAIG,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOJ,IAAIG,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAKAC,YAAYN,GAAY,EAAEC,GAAa,EAAE;QACvC,MAAMM,iBAAiB,IAAI,CAACb,aAAa,CAACc,iBAAiB;QAC3D,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QACpEX,IAAIG,IAAI,CAAC;YACPS,kBAAkB;gBAEhBC,WAAW,IAAI,CAAChB,aAAa;gBAC7BiB,SAAS;gBACTC,aAAa,CAAC;YAChB;YACAC,yBAAyB;gBACvBH,WAAW;gBACXC,SAAS;gBACTC,aAAa;oBACXE,OAAO;wBACL;2BACIT,mBAAmB;4BAAC;yBAAU,GAAG,EAAE;2BACnCE,mBAAmB;4BAAC;yBAAY,GAAG,EAAE;qBAC1C;gBACH;YACF;QACF;IACF;IAEA,MAGMQ,WAAWnB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAMmB,cAAc,IAAI,CAACxB,oBAAoB,CAACyB,QAAQ;QACtD,MAAMC,mBAAmB,IAAI,CAACzB,gBAAgB,CAAC0B,uBAAuB;QAEtEtB,IAAIuB,IAAI,CAAC;YACPT,SAAS,IAAI,CAACpB,aAAa;YAC3B8B,QAAQA,IAAAA,gBAAM;YACdC,IAAIC,QAAQC,GAAG,CAACC,EAAE;YAClBC,WAAWR;YACXS,QAAQ;gBACNC,QAAQZ,YAAYY,MAAM;gBAC1BC,iBAAiBb,YAAYa,eAAe;gBAC5CC,WAAWd,YAAYc,SAAS;YAClC;QACF;IACF;IAEA,MAEMC,KAAKnC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIG,IAAI,CAAC;YACPC,SAAS;QACX;IACF;AACF;;;;;QAtEW+B,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;QAiB/CJ,IAAAA,0BAAY;;;;;;;;;;;;;QA4BZA,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;;;;;;;;4DA1DtCC"}

package/dist/controllers/validation/printer-files-controller.validation.js

@@ -17,6 +17,9 @@ _export(exports, {
     },
     startPrintFileSchema: function() {
         return startPrintFileSchema;
+    },
+    uploadFileSchema: function() {
+        return uploadFileSchema;
     }
 });
 const _zod = require("zod");
@@ -29,5 +32,11 @@ const downloadFileSchema = _zod.z.object({
 const getFileSchema = _zod.z.object({
     path: _zod.z.string().min(1)
 });
+const uploadFileSchema = _zod.z.object({
+    startPrint: _zod.z.enum([
+        'true',
+        'false'
+    ])
+});
 
 //# sourceMappingURL=printer-files-controller.validation.js.map

package/dist/controllers/validation/printer-files-controller.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/printer-files-controller.validation.ts"],"names":["downloadFileSchema","getFileSchema","startPrintFileSchema","z","object","filePath","string","min","path"],"mappings":";;;;;;;;;;;IAMaA,kBAAkB;eAAlBA;;IAIAC,aAAa;eAAbA;;IARAC,oBAAoB;eAApBA;;;qBAFK;AAEX,MAAMA,uBAAuBC,MAAC,CAACC,MAAM,CAAC;IAC3CC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AAC3B;AAEO,MAAMP,qBAAqBG,MAAC,CAACC,MAAM,CAAC;IACzCI,MAAML,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AACvB;AAEO,MAAMN,gBAAgBE,MAAC,CAACC,MAAM,CAAC;IACpCI,MAAML,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AACvB"}
+{"version":3,"sources":["../../../src/controllers/validation/printer-files-controller.validation.ts"],"names":["downloadFileSchema","getFileSchema","startPrintFileSchema","uploadFileSchema","z","object","filePath","string","min","path","startPrint","enum"],"mappings":";;;;;;;;;;;IAMaA,kBAAkB;eAAlBA;;IAIAC,aAAa;eAAbA;;IARAC,oBAAoB;eAApBA;;IAYAC,gBAAgB;eAAhBA;;;qBAdK;AAEX,MAAMD,uBAAuBE,MAAC,CAACC,MAAM,CAAC;IAC3CC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AAC3B;AAEO,MAAMR,qBAAqBI,MAAC,CAACC,MAAM,CAAC;IACzCI,MAAML,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AACvB;AAEO,MAAMP,gBAAgBG,MAAC,CAACC,MAAM,CAAC;IACpCI,MAAML,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AACvB;AAEO,MAAML,mBAAmBC,MAAC,CAACC,MAAM,CAAC;IACvCK,YAAYN,MAAC,CAACO,IAAI,CAAC;QAAC;QAAQ;KAAQ;AACtC"}

package/dist/entities/settings.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;;;;;;;;;;IASrD,MAWA,OAQA,OAOA,OAOA,OAQA;AAzCA,OAACC,0CAAiB;AAWlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAQnB,QAACC,0CAAiB;AA9Cb,MAAMN;IAEXO,GAAW;IAGX,CAAA,KAAmB,CAQjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAKlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;;;;;;QA7CYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAUUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC"}
+{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;;;;;;;;;;IASrD,MAWA,OAQA,OAOA,OAOA,OAQA;AAzCA,OAACC,0CAAiB;AAWlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAQnB,QAACC,0CAAiB;AA9Cb,MAAMN;IAEXO,GAAW;IAGX,CAAA,KAAmB,CAQjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAKlB;IAGF,CAAA,MAAmB,CAGjB;AACJ;;;;;;;QA9CYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAUUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC"}

package/dist/handlers/logger-factory.js

@@ -10,8 +10,8 @@ Object.defineProperty(exports, "LoggerFactory", {
 });
 const _logger = require("./logger");
 function LoggerFactory() {
-    return (name, logToFile, logLevel)=>{
-        return new _logger.LoggerService(name, logToFile, logLevel);
+    return (name)=>{
+        return new _logger.LoggerService(name);
     };
 }
 

package/dist/handlers/logger-factory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/handlers/logger-factory.ts"],"names":["LoggerFactory","name","logToFile","logLevel","LoggerService"],"mappings":";;;;+BAIgBA;;;eAAAA;;;wBAJc;AAIvB,SAASA;IACd,OAAO,CAACC,MAAcC,WAAqBC;QACzC,OAAO,IAAIC,qBAAa,CAACH,MAAMC,WAAWC;IAC5C;AACF"}
+{"version":3,"sources":["../../src/handlers/logger-factory.ts"],"names":["LoggerFactory","name","LoggerService"],"mappings":";;;;+BAIgBA;;;eAAAA;;;wBAJc;AAIvB,SAASA;IACd,OAAO,CAACC;QACN,OAAO,IAAIC,qBAAa,CAACD;IAC3B;AACF"}

package/dist/handlers/logger.js

@@ -8,172 +8,30 @@ Object.defineProperty(exports, "LoggerService", {
         return LoggerService;
     }
 });
-const _winston = /*#__PURE__*/ _interop_require_default(require("winston"));
-const _path = require("path");
-const _luxon = require("luxon");
-const _serverconstants = require("../server.constants");
-const _fsutils = require("../utils/fs.utils");
-const _winstonloki = /*#__PURE__*/ _interop_require_default(require("winston-loki"));
-const _zod = require("zod");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const levelMap = {
-    error: "ERR",
-    warn: "WRN",
-    info: "INF",
-    debug: "DBG",
-    http: "HTT",
-    verbose: "VRB",
-    silly: "SLY"
-};
-const lokiLineClassProperty = "class";
-const lokiValidationSchema = _zod.z.object({
-    lokiEnabled: _zod.z.boolean(),
-    lokiAddress: _zod.z.string().url(),
-    lokiTimeoutSeconds: _zod.z.coerce.number().positive().default(30),
-    lokiInterval: _zod.z.coerce.number().positive().default(15)
-});
+const _staticlogger = require("./logging/static.logger");
 class LoggerService {
     name;
     logger;
-    constructor(name, enableFileLogs = true, logFilterLevel = ""){
-        const isProd = process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
-        const isTest = process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultTestEnv;
-        let effectiveLogLevel = logFilterLevel;
-        if (!effectiveLogLevel) {
-            effectiveLogLevel = isProd || isTest ? "warn" : "debug";
-        }
-        const isLokiEnabled = process.env[_serverconstants.AppConstants.ENABLE_LOKI_LOGGING] === "true";
-        const extraWinstonTransports = [];
-        if (isLokiEnabled) {
-            const lokiConfigValidationResult = lokiValidationSchema.safeParse({
-                lokiEnabled: isLokiEnabled,
-                lokiTimeoutSeconds: process.env[_serverconstants.AppConstants.LOKI_TIMEOUT_SECONDS],
-                lokiAddress: process.env[_serverconstants.AppConstants.LOKI_ADDRESS],
-                lokiInterval: process.env[_serverconstants.AppConstants.LOKI_INTERVAL]
-            });
-            if (lokiConfigValidationResult.success) {
-                extraWinstonTransports.push(new _winstonloki.default({
-                    level: effectiveLogLevel,
-                    host: lokiConfigValidationResult.data.lokiAddress,
-                    interval: lokiConfigValidationResult.data.lokiInterval,
-                    timeout: lokiConfigValidationResult.data.lokiTimeoutSeconds,
-                    handleExceptions: true,
-                    onConnectionError (error) {
-                        console.debug(`Loki logger enabled, but connection failed. ${error}`);
-                    },
-                    labels: {
-                        app: "fdm-monster-server"
-                    },
-                    json: false,
-                    useWinstonMetaAsLabels: false,
-                    format: _winston.default.format.json()
-                }));
-            }
-        }
+    constructor(name){
         this.name = name;
-        this.logger = _winston.default.createLogger({
-            transports: [
-                ...extraWinstonTransports,
-                new _winston.default.transports.Console({
-                    level: effectiveLogLevel,
-                    format: _winston.default.format.combine(_winston.default.format((info)=>{
-                        info.rawLevel = info.level;
-                        return info;
-                    })(), _winston.default.format.colorize({
-                        colors: {
-                            error: "red",
-                            warn: "yellow",
-                            info: "white",
-                            debug: "gray",
-                            http: "magenta",
-                            verbose: "cyan",
-                            silly: "gray"
-                        },
-                        level: true,
-                        message: true,
-                        all: false
-                    }), _winston.default.format.printf((info)=>{
-                        const now = new Date();
-                        const timestamp = `${now.toISOString().split("T")[0]} ${now.toTimeString().split(" ")[0]}.${now.getMilliseconds().toString().padStart(3, "0")}`;
-                        const levelAbbr = levelMap[info.rawLevel] || info.rawLevel.substring(0, 3).toUpperCase();
-                        const gray = "\x1b[90m";
-                        const reset = info.message.substring(0, 5) ?? "\x1b[0m";
-                        const numberRegex = /\b\d+\b/g;
-                        const coloredMessage = info.message.replace(numberRegex, (match)=>`\x1b[35m${match}${reset}`);
-                        let logEntry = `${gray}[${timestamp} ${reset}${levelAbbr}${reset}${gray}]${reset} ${gray}[${reset}${name}${gray}]${reset} ${coloredMessage}`;
-                        if (info.meta) {
-                            const metaString = JSON.stringify(info.meta);
-                            const coloredMeta = metaString.replace(numberRegex, (match)=>`\x1b[35m${match}${reset}`);
-                            logEntry += ` ${coloredMeta}`;
-                        }
-                        return logEntry;
-                    }))
-                })
-            ],
-            format: _winston.default.format.printf((info)=>{
-                const now = new Date();
-                const timestamp = `${now.toISOString().split("T")[0]} ${now.toTimeString().split(" ")[0]}.${now.getMilliseconds().toString().padStart(3, "0")}`;
-                const levelAbbr = levelMap[info.level] || `[${info.level.substring(0, 3).toUpperCase()}]`;
-                let message = `[${timestamp} ${levelAbbr}] [${name}] ${info.message}`;
-                if (info.meta) {
-                    const pascalCaseMeta = Object.entries(info.meta).reduce((acc, [key, value])=>{
-                        const pascalKey = key.charAt(0).toUpperCase() + key.slice(1);
-                        acc[pascalKey] = value;
-                        return acc;
-                    }, {});
-                    message += ` ${JSON.stringify(pascalCaseMeta)}`;
-                }
-                return message;
-            })
+        this.logger = (0, _staticlogger.getStaticLogger)().child({
+            [_staticlogger.logContextClassProperty]: this.name
         });
-        if (enableFileLogs) {
-            const date = _luxon.DateTime.now().toISODate();
-            const logFilePath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder, `${_serverconstants.AppConstants.logAppName}-${date}.log`);
-            this.logger.add(new _winston.default.transports.File({
-                level: isTest ? "warn" : "info",
-                filename: logFilePath,
-                maxsize: 5000000,
-                maxFiles: 5
-            }));
-        }
     }
     newDebug(object) {
-        this.logger.debug({
-            ...object,
-            [lokiLineClassProperty]: this.name
-        });
+        this.logger.debug(object);
     }
     log(message, meta) {
-        const enrichedMeta = {
-            ...meta,
-            [lokiLineClassProperty]: this.name
-        };
-        this.logger.log("info", message, enrichedMeta);
+        this.logger.log("info", message, meta);
     }
     warn(message, meta) {
-        const enrichedMeta = {
-            ...meta,
-            [lokiLineClassProperty]: this.name
-        };
-        this.logger.log("warn", message, enrichedMeta);
+        this.logger.log("warn", message, meta);
     }
     debug(message, meta) {
-        const enrichedMeta = {
-            ...meta,
-            [lokiLineClassProperty]: this.name
-        };
-        this.logger.log("debug", message, enrichedMeta);
+        this.logger.log("debug", message, meta);
     }
     error(message, meta) {
-        const enrichedMeta = {
-            ...meta,
-            [lokiLineClassProperty]: this.name
-        };
-        this.logger.log("error", message, enrichedMeta);
+        this.logger.log("error", message, meta);
     }
 }
 

package/dist/handlers/logger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/handlers/logger.ts"],"names":["LoggerService","levelMap","error","warn","info","debug","http","verbose","silly","lokiLineClassProperty","lokiValidationSchema","z","object","lokiEnabled","boolean","lokiAddress","string","url","lokiTimeoutSeconds","coerce","number","positive","default","lokiInterval","name","logger","constructor","enableFileLogs","logFilterLevel","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","isLokiEnabled","ENABLE_LOKI_LOGGING","extraWinstonTransports","lokiConfigValidationResult","safeParse","LOKI_TIMEOUT_SECONDS","LOKI_ADDRESS","LOKI_INTERVAL","success","push","LokiTransport","level","host","data","interval","timeout","handleExceptions","onConnectionError","console","labels","app","json","useWinstonMetaAsLabels","format","winston","createLogger","transports","Console","combine","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice","date","DateTime","toISODate","logFilePath","join","superRootPath","defaultLogsFolder","logAppName","add","File","filename","maxsize","maxFiles","newDebug","log","enrichedMeta"],"mappings":"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"}
+{"version":3,"sources":["../../src/handlers/logger.ts"],"names":["LoggerService","logger","constructor","name","getStaticLogger","child","logContextClassProperty","newDebug","object","debug","log","message","meta","warn","error"],"mappings":";;;;+BAGaA;;;eAAAA;;;8BAF4C;AAElD,MAAMA;;IACXC,OAAuB;IAEvBC,YAAY,AAAiBC,IAAY,CAAE;aAAdA,OAAAA;QAC3B,IAAI,CAACF,MAAM,GAAGG,IAAAA,6BAAe,IAAGC,KAAK,CAAC;YAAE,CAACC,qCAAuB,CAAC,EAAE,IAAI,CAACH,IAAI;QAAC;IAC/E;IAEAI,SAASC,MAAW,EAAE;QACpB,IAAI,CAACP,MAAM,CAACQ,KAAK,CAACD;IACpB;IAEAE,IAAIC,OAAe,EAAEC,IAAU,EAAE;QAC/B,IAAI,CAACX,MAAM,CAACS,GAAG,CAAC,QAAQC,SAASC;IACnC;IAEAC,KAAKF,OAAe,EAAEC,IAAU,EAAE;QAChC,IAAI,CAACX,MAAM,CAACS,GAAG,CAAC,QAAQC,SAASC;IACnC;IAEAH,MAAME,OAAe,EAAEC,IAAU,EAAE;QACjC,IAAI,CAACX,MAAM,CAACS,GAAG,CAAC,SAASC,SAASC;IACpC;IAEAE,MAAMH,OAAe,EAAEC,IAAU,EAAE;QACjC,IAAI,CAACX,MAAM,CAACS,GAAG,CAAC,SAASC,SAASC;IACpC;AACF"}

package/dist/handlers/logging/file-logging.transport.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createFileLoggingTransport", {
+    enumerable: true,
+    get: function() {
+        return createFileLoggingTransport;
+    }
+});
+const _luxon = require("luxon");
+const _path = require("path");
+const _fsutils = require("../../utils/fs.utils");
+const _serverconstants = require("../../server.constants");
+const _winston = /*#__PURE__*/ _interop_require_default(require("winston"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function createFileLoggingTransport(options) {
+    if (!options.enabled) {
+        return;
+    }
+    const date = _luxon.DateTime.now().toISODate();
+    const logFilePath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder, `${_serverconstants.AppConstants.logAppName}-${date}.log`);
+    return new _winston.default.transports.File({
+        level: options.isTest ? "warn" : "info",
+        filename: logFilePath,
+        maxsize: 5000000,
+        maxFiles: 5
+    });
+}
+
+//# sourceMappingURL=file-logging.transport.js.map

package/dist/handlers/logging/file-logging.transport.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/handlers/logging/file-logging.transport.ts"],"names":["createFileLoggingTransport","options","enabled","date","DateTime","now","toISODate","logFilePath","join","superRootPath","AppConstants","defaultLogsFolder","logAppName","winston","transports","File","level","isTest","filename","maxsize","maxFiles"],"mappings":";;;;+BAWgBA;;;eAAAA;;;uBAXS;sBACJ;yBACS;iCACD;gEACT;;;;;;AAOb,SAASA,2BAA2BC,OAA0B;IACnE,IAAI,CAACA,QAAQC,OAAO,EAAE;QACpB;IACF;IAEA,MAAMC,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;IACrC,MAAMC,cAAcC,IAAAA,UAAI,EACtBC,IAAAA,sBAAa,KACbC,6BAAY,CAACC,iBAAiB,EAC9B,GAAGD,6BAAY,CAACE,UAAU,CAAC,CAAC,EAAET,KAAK,IAAI,CAAC;IAG1C,OAAO,IAAIU,gBAAO,CAACC,UAAU,CAACC,IAAI,CAAC;QACjCC,OAAOf,QAAQgB,MAAM,GAAG,SAAS;QACjCC,UAAUX;QACVY,SAAS;QACTC,UAAU;IACZ;AACF"}

package/dist/handlers/logging/loki-logging.transport.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createLokiLoggingTransport", {
+    enumerable: true,
+    get: function() {
+        return createLokiLoggingTransport;
+    }
+});
+const _winstonloki = /*#__PURE__*/ _interop_require_default(require("winston-loki"));
+const _winston = /*#__PURE__*/ _interop_require_default(require("winston"));
+const _nodeprocess = /*#__PURE__*/ _interop_require_default(require("node:process"));
+const _serverconstants = require("../../server.constants");
+const _zod = require("zod");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const lokiValidationSchema = _zod.z.object({
+    lokiEnabled: _zod.z.boolean(),
+    lokiAddress: _zod.z.string().url(),
+    lokiTimeoutSeconds: _zod.z.coerce.number().positive().default(30),
+    lokiInterval: _zod.z.coerce.number().positive().default(15)
+});
+function createLokiLoggingTransport(options) {
+    const lokiConfigValidationResult = lokiValidationSchema.safeParse({
+        lokiEnabled: _nodeprocess.default.env[_serverconstants.AppConstants.ENABLE_LOKI_LOGGING] === "true",
+        lokiTimeoutSeconds: _nodeprocess.default.env[_serverconstants.AppConstants.LOKI_TIMEOUT_SECONDS],
+        lokiAddress: _nodeprocess.default.env[_serverconstants.AppConstants.LOKI_ADDRESS],
+        lokiInterval: _nodeprocess.default.env[_serverconstants.AppConstants.LOKI_INTERVAL]
+    });
+    if (!lokiConfigValidationResult.success || !lokiConfigValidationResult.data.lokiEnabled) {
+        return;
+    }
+    return new _winstonloki.default({
+        level: options.logLevel ?? "info",
+        host: lokiConfigValidationResult.data.lokiAddress,
+        interval: lokiConfigValidationResult.data.lokiInterval,
+        timeout: lokiConfigValidationResult.data.lokiTimeoutSeconds,
+        handleExceptions: true,
+        onConnectionError (error) {
+            console.debug(`Loki logger enabled, but connection failed. ${error}`);
+        },
+        labels: {
+            app: "fdm-monster-server"
+        },
+        json: false,
+        useWinstonMetaAsLabels: false,
+        format: _winston.default.format.json()
+    });
+}
+
+//# sourceMappingURL=loki-logging.transport.js.map

package/dist/handlers/logging/loki-logging.transport.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/handlers/logging/loki-logging.transport.ts"],"names":["createLokiLoggingTransport","lokiValidationSchema","z","object","lokiEnabled","boolean","lokiAddress","string","url","lokiTimeoutSeconds","coerce","number","positive","default","lokiInterval","options","lokiConfigValidationResult","safeParse","process","env","AppConstants","ENABLE_LOKI_LOGGING","LOKI_TIMEOUT_SECONDS","LOKI_ADDRESS","LOKI_INTERVAL","success","data","LokiTransport","level","logLevel","host","interval","timeout","handleExceptions","onConnectionError","error","console","debug","labels","app","json","useWinstonMetaAsLabels","format","winston"],"mappings":";;;;+BAiBgBA;;;eAAAA;;;oEAjBU;gEACN;oEACA;iCACS;qBACX;;;;;;AAMlB,MAAMC,uBAAuBC,MAAC,CAACC,MAAM,CAAC;IACpCC,aAAaF,MAAC,CAACG,OAAO;IACtBC,aAAaJ,MAAC,CAACK,MAAM,GAAGC,GAAG;IAC3BC,oBAAoBP,MAAC,CAACQ,MAAM,CAACC,MAAM,GAAGC,QAAQ,GAAGC,OAAO,CAAC;IACzDC,cAAcZ,MAAC,CAACQ,MAAM,CAACC,MAAM,GAAGC,QAAQ,GAAGC,OAAO,CAAC;AACrD;AAEO,SAASb,2BAA2Be,OAA0B;IACnE,MAAMC,6BAA6Bf,qBAAqBgB,SAAS,CAAC;QAChEb,aAAac,oBAAO,CAACC,GAAG,CAACC,6BAAY,CAACC,mBAAmB,CAAC,KAAK;QAC/DZ,oBAAoBS,oBAAO,CAACC,GAAG,CAACC,6BAAY,CAACE,oBAAoB,CAAC;QAClEhB,aAAaY,oBAAO,CAACC,GAAG,CAACC,6BAAY,CAACG,YAAY,CAAC;QACnDT,cAAcI,oBAAO,CAACC,GAAG,CAACC,6BAAY,CAACI,aAAa,CAAC;IACvD;IAEA,IAAI,CAACR,2BAA2BS,OAAO,IAAI,CAACT,2BAA2BU,IAAI,CAACtB,WAAW,EAAE;QACvF;IACF;IAEA,OAAO,IAAIuB,oBAAa,CAAC;QACvBC,OAAOb,QAAQc,QAAQ,IAAI;QAC3BC,MAAMd,2BAA2BU,IAAI,CAACpB,WAAW;QACjDyB,UAAUf,2BAA2BU,IAAI,CAACZ,YAAY;QACtDkB,SAAShB,2BAA2BU,IAAI,CAACjB,kBAAkB;QAC3DwB,kBAAkB;QAClBC,mBAAkBC,KAAc;YAC9BC,QAAQC,KAAK,CAAC,CAAC,4CAA4C,EAAEF,OAAO;QACtE;QAEAG,QAAQ;YACNC,KAAK;QACP;QAEAC,MAAM;QAENC,wBAAwB;QAExBC,QAAQC,gBAAO,CAACD,MAAM,CAACF,IAAI;IAC7B;AACF"}