@fdm-monster/server 2.0.4 → 2.0.6

package/RELEASE_NOTES.MD

@@ -1,5 +1,17 @@
 # Develop
 
+# FDM Monster 2.0.6
+
+## Hotfix
+
+- OctoPrint temperatures were flashing on the printer grid. 
+
+# FDM Monster 2.0.5
+
+## Hotfix
+
+- DATABASE_FILE and DATABASE_PATH weren't picked up from .env as dotenv path was wrong
+
 # FDM Monster 2.0.4
 
 ## Feature

package/dist/data-source.js

@@ -10,8 +10,6 @@ Object.defineProperty(exports, "AppDataSource", {
 });
 require("reflect-metadata");
 const _typeorm = require("typeorm");
-const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
-const _nodepath = require("node:path");
 const _fsutils = require("./utils/fs.utils");
 const _floorentity = require("./entities/floor.entity");
 const _floorpositionentity = require("./entities/floor-position.entity");
@@ -39,20 +37,10 @@ const _1767370191762ChangeFloorNonUniqueOrder = require("./migrations/1767370191
 const _1767432108916RenameGroupToTag = require("./migrations/1767432108916-RenameGroupToTag");
 const _1767451444137AddPrintJob = require("./migrations/1767451444137-AddPrintJob");
 const _1767909428129AddPrinterMaintenanceLog = require("./migrations/1767909428129-AddPrinterMaintenanceLog");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-if (process.env.NODE_ENV !== "test") {
-    _dotenv.default.config({
-        path: process.env.ENV_FILE || (0, _nodepath.join)("../.env"),
-        quiet: true
-    });
-}
+const databaseFilePath = (0, _fsutils.getDatabaseFilePath)();
 const AppDataSource = new _typeorm.DataSource({
     type: "better-sqlite3",
-    database: (0, _fsutils.getDatabaseFilePath)(),
+    database: databaseFilePath,
     synchronize: false,
     logging: false,
     entities: [

package/dist/data-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","process","env","NODE_ENV","dotenv","config","path","ENV_FILE","join","quiet","DataSource","type","database","getDatabaseFilePath","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","Role","RefreshToken","UserRole","Tag","PrinterTag","PrintJob","PrinterMaintenanceLog","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","ChangeCameraPrinterOnDeleteSetNull1767278216516","DropCustomGcode1767279607392","DropPrintCompletions1767291804417","DropSettingsFileClean1767352862576","ChangeFloorNonUniqueOrder1767370191762","RenameGroupToTag1767432108916","AddPrintJob1767451444137","AddPrinterMaintenanceLog1767909428129","subscribers"],"mappings":";;;;+BA2CaA;;;eAAAA;;;QA3CN;yBACoB;+DACR;0BACE;yBACe;6BACd;qCACQ;+BACN;gCACC;0BAC2C;oCACvC;4BACR;gCACI;yCACe;kCACb;2BACP;2CACsB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;8CACX;iEAGtC;8CACsC;mDACK;oDACC;wDACI;+CACT;0CACL;uDACa;;;;;;AAEtD,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAML,QAAQC,GAAG,CAACK,QAAQ,IAAIC,IAAAA,cAAI,EAAC;QACnCC,OAAO;IACT;AACF;AAEO,MAAMT,gBAAgB,IAAIU,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUC,IAAAA,4BAAmB;IAC7BC,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,gBAAI;QACJC,sBAAY;QACZC,wBAAQ;QACRC,cAAG;QACHC,4BAAU;QACVC,kBAAQ;QACRC,+BAAqB;KACtB;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;QAC5BC,gGAA+C;QAC/CC,0DAA4B;QAC5BC,oEAAiC;QACjCC,sEAAkC;QAClCC,8EAAsC;QACtCC,4DAA6B;QAC7BC,kDAAwB;QACxBC,4EAAqC;KACtC;IACDC,aAAa,EAAE;AACjB"}
+{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","databaseFilePath","getDatabaseFilePath","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","Role","RefreshToken","UserRole","Tag","PrinterTag","PrintJob","PrinterMaintenanceLog","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","ChangeCameraPrinterOnDeleteSetNull1767278216516","DropCustomGcode1767279607392","DropPrintCompletions1767291804417","DropSettingsFileClean1767352862576","ChangeFloorNonUniqueOrder1767370191762","RenameGroupToTag1767432108916","AddPrintJob1767451444137","AddPrinterMaintenanceLog1767909428129","subscribers"],"mappings":";;;;+BAoCaA;;;eAAAA;;;QApCN;yBACoB;yBACS;6BACd;qCACQ;+BACN;gCACC;0BAC2C;oCACvC;4BACR;gCACI;yCACe;kCACb;2BACP;2CACsB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;8CACX;iEAGtC;8CACsC;mDACK;oDACC;wDACI;+CACT;0CACL;uDACa;AAEtD,MAAMC,mBAAmBC,IAAAA,4BAAmB;AAErC,MAAMF,gBAAgB,IAAIG,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUJ;IACVK,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,gBAAI;QACJC,sBAAY;QACZC,wBAAQ;QACRC,cAAG;QACHC,4BAAU;QACVC,kBAAQ;QACRC,+BAAqB;KACtB;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;QAC5BC,gGAA+C;QAC/CC,0DAA4B;QAC5BC,oEAAiC;QACjCC,sEAAkC;QAClCC,8EAAsC;QACtCC,4DAA6B;QAC7BC,kDAAwB;QACxBC,4EAAqC;KACtC;IACDC,aAAa,EAAE;AACjB"}

package/dist/index.js

@@ -2,24 +2,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
-const _nodepath = require("node:path");
 const _node = require("@sentry/node");
 const _serverenv = require("./server.env");
 const _servercore = require("./server.core");
 const _containertokens = require("./container.tokens");
 const _logger = require("./handlers/logger");
 const _staticlogger = require("./handlers/logging/static.logger");
-const _fsutils = require("./utils/fs.utils");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-_dotenv.default.config({
-    path: process.env.ENV_FILE || (0, _nodepath.join)((0, _fsutils.superRootPath)(), ".env"),
-    quiet: true
-});
 (0, _staticlogger.createStaticLogger)({
     enableFileLogs: true
 });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["dotenv","config","path","process","env","ENV_FILE","join","superRootPath","quiet","createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","on","err","error","reason","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","captureException","flush","exit"],"mappings":";;;;+DAAmB;0BACE;sBACmB;2BACT;4BACH;iCACH;wBAEe;8BACL;yBACL;;;;;;AAE9BA,eAAM,CAACC,MAAM,CAAC;IACZC,MAAMC,QAAQC,GAAG,CAACC,QAAQ,IAAIC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI;IACpDC,OAAO;AACT;AAEAC,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAC1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdX,QAAQY,EAAE,CAAC,qBAAqB,CAACC;IAC/BL,OAAOM,KAAK,CAAC,sBAAsBD;AACrC;AAEAb,QAAQY,EAAE,CAAC,sBAAsB,CAACG;IAChCP,OAAOM,KAAK,CAAC,+BAA+BC;AAC9C;AAEAC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQZ,KAAK,CAAC,2DAA2DW;QAEzEE,IAAAA,sBAAgB,EAACF;QACjB,MAAMG,IAAAA,WAAK,EAAC;QACZ5B,QAAQ6B,IAAI,CAAC;IACf;AACJ"}
+{"version":3,"sources":["../src/index.ts"],"names":["createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","process","on","err","error","reason","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","captureException","flush","exit"],"mappings":";;;;sBAEwC;2BACT;4BACH;iCACH;wBAEe;8BACL;AAGnCA,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAC1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdC,QAAQC,EAAE,CAAC,qBAAqB,CAACC;IAC/BN,OAAOO,KAAK,CAAC,sBAAsBD;AACrC;AAEAF,QAAQC,EAAE,CAAC,sBAAsB,CAACG;IAChCR,OAAOO,KAAK,CAAC,+BAA+BC;AAC9C;AAEAC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQZ,KAAK,CAAC,2DAA2DW;QAEzEE,IAAAA,sBAAgB,EAACF;QACjB,MAAMG,IAAAA,WAAK,EAAC;QACZjB,QAAQkB,IAAI,CAAC;IACf;AACJ"}

package/dist/server.constants.js

@@ -76,7 +76,7 @@ const AppConstants = {
     docsUrl: "https://docs.fdm-monster.net",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "2.2.3",
+    defaultClientMinimum: "2.2.6",
     defaultWebsocketHandshakeTimeout: 3000,
     defaultSocketThrottleRate: 1,
     debugSocketStatesKey: "DEBUG_SOCKET_STATES",

package/dist/server.env.js

@@ -78,7 +78,7 @@ function setupEnvConfig() {
         process.env[_serverconstants.AppConstants.NODE_ENV_KEY] = newEnvName;
         logger.warn(`NODE_ENV=${environment} was not set, or not known. Defaulting to NODE_ENV=${newEnvName}`);
     } else {
-        logger.log(`✓ NODE_ENV variable correctly set (${environment})!`);
+        logger.log(`✓ NODE_ENV variable correctly set (${environment})`);
     }
     ensurePackageVersionSet();
     setupSentry();

package/dist/server.env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.env.ts"],"names":["ensurePortSet","fetchServerPort","setupEnvConfig","setupSentry","logger","Logger","environment","process","env","AppConstants","NODE_ENV_KEY","knownEnvNames","includes","newEnvName","defaultProductionEnv","warn","log","ensurePackageVersionSet","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","packageJsonVersion","require","packageJsonPath","version","VERSION_KEY","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","isTestEnvironment","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","docsUrl"],"mappings":"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"}
+{"version":3,"sources":["../src/server.env.ts"],"names":["ensurePortSet","fetchServerPort","setupEnvConfig","setupSentry","logger","Logger","environment","process","env","AppConstants","NODE_ENV_KEY","knownEnvNames","includes","newEnvName","defaultProductionEnv","warn","log","ensurePackageVersionSet","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","packageJsonVersion","require","packageJsonPath","version","VERSION_KEY","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","isTestEnvironment","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","docsUrl"],"mappings":"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"}

package/dist/state/printer-events.cache.js

@@ -59,15 +59,18 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         };
         await this.setKeyValue(printerId, ref);
     }
-    async setSubState(printerId, label, substateName, payload) {
+    async setEventPartial(printerId, label, payload, keysToUpdate) {
         const ref = await this.getOrCreateEvents(printerId);
         if (!ref[label]) {
-            ref[label] = {};
+            ref[label] = {
+                payload: {},
+                receivedAt: Date.now()
+            };
         }
-        ref[label][substateName] = {
-            payload,
-            receivedAt: Date.now()
-        };
+        for (const key of keysToUpdate){
+            ref[label].payload[key] = payload[key];
+        }
+        ref[label].receivedAt = Date.now();
         await this.setKeyValue(printerId, ref);
     }
     async handlePrintersDeleted(event) {
@@ -92,8 +95,19 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
     async onOctoPrintSocketMessage(e) {
         const printerId = e.printerId;
         if (e.event === _octoprinteventdto.messages.current && e.payload) {
-            await this.setEvent(printerId, _octoprinteventdto.messages.current, e.payload);
             const payload = e.payload;
+            const keysToUpdate = [
+                'state',
+                'job',
+                'progress',
+                'currentZ',
+                'offsets',
+                'resends'
+            ];
+            if (Array.isArray(payload.temps) && payload.temps.length > 0) {
+                keysToUpdate.push('temps');
+            }
+            await this.setEventPartial(printerId, _octoprinteventdto.messages.current, payload, keysToUpdate);
             const flags = payload?.state?.flags;
             const filePath = payload?.job?.file?.path;
             const completion = payload?.progress?.completion;
@@ -125,15 +139,16 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
             if (typeof completion === "number" && filePath) {
                 await this.printJobService.markProgress(printerId, filePath, completion);
             }
-            if ((flags?.finished || flags?.error) && filePath) {
-                const reason = flags?.error ? "Error" : "Finished";
-                if (flags?.finished) {
+            if ((flags?.finishing || flags?.error || flags?.cancelling) && filePath) {
+                if (flags?.finishing) {
                     const job = await this.printJobService.markFinished(printerId, filePath);
                     if (job) {
                         await this.printerThumbnailCache.handleJobCompleted(printerId, job.id);
                     }
+                } else if (flags?.cancelling) {
+                    await this.printJobService.markFailed(printerId, filePath, "Cancelled");
                 } else {
-                    await this.printJobService.markFailed(printerId, filePath, reason);
+                    await this.printJobService.markFailed(printerId, filePath, "Error");
                 }
             }
         }

package/dist/state/printer-events.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","loggerFactory","printJobService","printerCache","printerThumbnailCache","name","subscribeToEvents","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","get","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubState","substateName","handlePrintersDeleted","event","deleteKeysBatch","printerIds","on","octoPrintEvent","e","onOctoPrintSocketMessage","moonrakerEvent","onMoonrakerSocketMessage","prusaLinkEvent","onPrusaLinkPollMessage","bambuEvent","onBambuSocketMessage","printerEvents","printersDeleted","bind","getPrinterName","printer","error","debug","undefined","messages","flags","state","filePath","job","file","path","completion","progress","printing","printerName","markStarted","handleJobStarted","fileStorageId","analysisState","log","triggerFileAnalysis","metadata","gcodePrintTimeSeconds","estimatedTime","estimatedPrintTime","filament","tool0","updateJobMetadata","Math","round","nozzleDiameterMm","filamentDiameterMm","filamentDensityGramsCm3","filamentUsedMm","length","filamentUsedCm3","volume","filamentUsedGrams","totalFilamentUsedGrams","markProgress","finished","reason","markFinished","handleJobCompleted","markFailed","eventType","includes","status","result","filename","print_stats","display_status","display","warn","print","percent","mc_percent","gcode_file","subtask_name","stage","mc_print_stage","gcode_state","remainingMinutes","mc_remaining_time","totalLayers","total_layer_num","estimatedSeconds","tray","ams","tray_now","vt_tray","filamentDiameter","tray_diameter","parseFloat","activeJob","getActivePrintJob","handlePrintCancelled"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","loggerFactory","printJobService","printerCache","printerThumbnailCache","name","subscribeToEvents","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","get","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setEventPartial","keysToUpdate","key","handlePrintersDeleted","event","deleteKeysBatch","printerIds","on","octoPrintEvent","e","onOctoPrintSocketMessage","moonrakerEvent","onMoonrakerSocketMessage","prusaLinkEvent","onPrusaLinkPollMessage","bambuEvent","onBambuSocketMessage","printerEvents","printersDeleted","bind","getPrinterName","printer","error","debug","undefined","messages","Array","isArray","temps","length","push","flags","state","filePath","job","file","path","completion","progress","printing","printerName","markStarted","handleJobStarted","fileStorageId","analysisState","log","triggerFileAnalysis","metadata","gcodePrintTimeSeconds","estimatedTime","estimatedPrintTime","filament","tool0","updateJobMetadata","Math","round","nozzleDiameterMm","filamentDiameterMm","filamentDensityGramsCm3","filamentUsedMm","filamentUsedCm3","volume","filamentUsedGrams","totalFilamentUsedGrams","markProgress","finishing","cancelling","markFinished","handleJobCompleted","markFailed","eventType","includes","status","result","filename","print_stats","display_status","display","warn","print","percent","mc_percent","gcode_file","subtask_name","stage","mc_print_stage","gcode_state","remainingMinutes","mc_remaining_time","totalLayers","total_layer_num","estimatedSeconds","tray","ams","tray_now","vt_tray","filamentDiameter","tray_diameter","parseFloat","activeJob","getActivePrintJob","handlePrintCancelled"],"mappings":"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"}

package/dist/utils/env.utils.js

@@ -26,6 +26,19 @@ _export(exports, {
     }
 });
 const _serverconstants = require("../server.constants");
+const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
+const _nodepath = require("node:path");
+const _fsutils = require("./fs.utils");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+if (process.env.NODE_ENV !== "test") {
+    _dotenv.default.config({
+        path: process.env.ENV_FILE || (0, _nodepath.join)((0, _fsutils.superRootPath)(), ".env")
+    });
+}
 function getEnvOrDefault(key, defaultValue) {
     if (!Object.keys(process.env).includes(key) || !process.env[key]?.length) {
         return defaultValue;

package/dist/utils/env.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","key","defaultValue","Object","keys","process","env","includes","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;QAEgBA;eAAAA;;QAOAC;eAAAA;;QAYAC;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;iCAba;AAEtB,SAASJ,gBAAmBK,GAAW,EAAEC,YAAe;IAC7D,IAAI,CAACC,OAAOC,IAAI,CAACC,QAAQC,GAAG,EAAEC,QAAQ,CAACN,QAAQ,CAACI,QAAQC,GAAG,CAACL,IAAI,EAAEO,QAAQ;QACxE,OAAON;IACT;IACA,OAAOG,QAAQC,GAAG,CAACL,IAAI;AACzB;AAEO,SAASJ;IACd,OAAOQ,QAAQC,GAAG,CAACG,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASX;IACd,OAAOK,QAAQC,GAAG,CAACG,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASb;IACd,OAAOM,QAAQC,GAAG,CAACG,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASf;IACd,OAAO,UAAUO,QAAQC,GAAG;AAC9B"}
+{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","process","env","NODE_ENV","dotenv","config","path","ENV_FILE","join","superRootPath","key","defaultValue","Object","keys","includes","length","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;QAWgBA;eAAAA;;QAOAC;eAAAA;;QAYAC;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;iCAtBa;+DACV;0BACE;yBACS;;;;;;AAE9B,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAML,QAAQC,GAAG,CAACK,QAAQ,IAAIC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI;IACtD;AACF;AAEO,SAASb,gBAAmBc,GAAW,EAAEC,YAAe;IAC7D,IAAI,CAACC,OAAOC,IAAI,CAACZ,QAAQC,GAAG,EAAEY,QAAQ,CAACJ,QAAQ,CAACT,QAAQC,GAAG,CAACQ,IAAI,EAAEK,QAAQ;QACxE,OAAOJ;IACT;IACA,OAAOV,QAAQC,GAAG,CAACQ,IAAI;AACzB;AAEO,SAASb;IACd,OAAOI,QAAQC,GAAG,CAACC,QAAQ,KAAKa,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASjB;IACd,OAAOC,QAAQC,GAAG,CAACC,QAAQ,KAAKa,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASnB;IACd,OAAOE,QAAQC,GAAG,CAACC,QAAQ,KAAKa,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASrB;IACd,OAAO,UAAUG,QAAQC,GAAG;AAC9B"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "bin": {
     "fdm-monster-server": "dist/index.js",
     "fdmm-server": "dist/index.js"
@@ -59,16 +59,16 @@
     "tr46": "6.0.0"
   },
   "dependencies": {
-    "@fdm-monster/client-next": "2.2.3",
+    "@fdm-monster/client-next": "2.2.6",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "10.33.0",
+    "@sentry/node": "10.35.0",
     "adm-zip": "0.5.16",
     "awilix": "12.0.5",
     "awilix-express": "9.0.2",
     "axios": "1.13.2",
     "basic-ftp": "5.1.0",
     "bcryptjs": "3.0.3",
-    "better-sqlite3": "12.6.0",
+    "better-sqlite3": "12.6.2",
     "class-validator": "0.14.3",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.7",
@@ -106,7 +106,7 @@
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
     "@swc/cli": "0.7.10",
-    "@swc/core": "1.15.8",
+    "@swc/core": "1.15.10",
     "@swc/jest": "0.2.39",
     "@types/adm-zip": "0.5.7",
     "@types/connect-history-api-fallback": "1.5.4",
@@ -118,7 +118,7 @@
     "@types/lodash": "4.17.23",
     "@types/luxon": "3.7.1",
     "@types/multer": "2.0.0",
-    "@types/node": "24.10.8",
+    "@types/node": "24.10.9",
     "@types/passport-anonymous": "1.0.5",
     "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.7.1",