@fdm-monster/server 1.8.3 → 1.9.0

package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20211029110742-user-password-passwordhash.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","password","endSession","down","passwordHash"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEC,UAAU;oBAAe;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEI,cAAc;oBAAW;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMV,QAAQQ,UAAU;QAC1B;IACF;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20211029110742-user-password-passwordhash.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","password","endSession","down","passwordHash"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEC,UAAU;oBAAe;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAGA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEI,cAAc;oBAAW;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMV,QAAQQ,UAAU;QAC1B;IACF;AACF"}

package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20230414141005-floor-remove-groupinfloor.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","collections","listCollections","toArray","find","c","name","collection","update","$unset","printerGroups","multi","$set","printers","rename","endSession","down","Error"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,cAAc,MAAMJ,OAAOD,EAAE,GAAGM,eAAe,GAAGC,OAAO;gBAC/D,IAAIF,YAAYG,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,kBAAkB;oBACvD,MAAMV,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;wBAAEC,QAAQ;4BAAEC,eAAe;wBAAE;oBAAE,GAAG;wBAAEC,OAAO;oBAAK;oBAChG,MAAMf,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;wBAAEI,MAAM;4BAAEC,UAAU,EAAE;wBAAC;oBAAE,GAAG;wBAAEF,OAAO;oBAAK;oBAC1F,MAAMf,GAAGW,UAAU,CAAC,iBAAiBO,MAAM,CAAC;gBAC9C;YACF;QACF,SAAU;YACR,MAAMhB,QAAQiB,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKpB,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAME,cAAc,MAAMJ,OAAOD,EAAE,GAAGM,eAAe,GAAGC,OAAO;YAC/D,IAAIF,YAAYG,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,WAAW;gBAChD,MAAMV,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;oBAAEI,MAAM;wBAAEF,eAAe,EAAE;oBAAC;gBAAE,GAAG;oBAAEC,OAAO;gBAAK;gBAC/F,MAAMf,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEI,UAAU;oBAAE;gBAAE,GAAG;oBAAEF,OAAO;gBAAK;gBAC3F,MAAMf,GAAGW,UAAU,CAAC,UAAUO,MAAM,CAAC;YACvC;YAEA,IAAI,CAACb,YAAYG,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,kBAAkB;gBACxD,MAAM,IAAIW,MAAM;YAClB;QACF,SAAU;YACR,MAAMnB,QAAQiB,UAAU;QAC1B;IACF;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20230414141005-floor-remove-groupinfloor.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","collections","listCollections","toArray","find","c","name","collection","update","$unset","printerGroups","multi","$set","printers","rename","endSession","down","Error"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,cAAc,MAAMJ,OAAOD,EAAE,GAAGM,eAAe,GAAGC,OAAO;gBAE/D,IAAIF,YAAYG,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,kBAAkB;oBACvD,MAAMV,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;wBAAEC,QAAQ;4BAAEC,eAAe;wBAAE;oBAAE,GAAG;wBAAEC,OAAO;oBAAK;oBAChG,MAAMf,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;wBAAEI,MAAM;4BAAEC,UAAU,EAAE;wBAAC;oBAAE,GAAG;wBAAEF,OAAO;oBAAK;oBAC1F,MAAMf,GAAGW,UAAU,CAAC,iBAAiBO,MAAM,CAAC;gBAC9C;YACF;QACF,SAAU;YACR,MAAMhB,QAAQiB,UAAU;QAC1B;IACF;IAGA,MAAMC,MAAKpB,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAME,cAAc,MAAMJ,OAAOD,EAAE,GAAGM,eAAe,GAAGC,OAAO;YAE/D,IAAIF,YAAYG,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,WAAW;gBAChD,MAAMV,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;oBAAEI,MAAM;wBAAEF,eAAe,EAAE;oBAAC;gBAAE,GAAG;oBAAEC,OAAO;gBAAK;gBAC/F,MAAMf,GAAGW,UAAU,CAAC,iBAAiBC,MAAM,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEI,UAAU;oBAAE;gBAAE,GAAG;oBAAEF,OAAO;gBAAK;gBAC3F,MAAMf,GAAGW,UAAU,CAAC,UAAUO,MAAM,CAAC;YACvC;YAGA,IAAI,CAACb,YAAYG,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAK,kBAAkB;gBACxD,MAAM,IAAIW,MAAM;YAClB;QACF,SAAU;YACR,MAAMnB,QAAQiB,UAAU;QAC1B;IACF;AACF"}

package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20230427202911-printer-remove-sortindex.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","collection","update","$unset","sortIndex","multi","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMJ,GAAGK,UAAU,CAAC,YAAYC,MAAM,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,WAAW;oBAAE;gBAAE,GAAG;oBAAEC,OAAO;gBAAK;YACzF;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMD,GAAGK,UAAU,CAAC,YAAYC,MAAM,CAAC,CAAC,GAAG;YAAEM,MAAM;gBAAEJ,WAAW;YAAE;QAAE,GAAG;YAAEC,OAAO;QAAK;IACvF;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20230427202911-printer-remove-sortindex.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","collection","update","$unset","sortIndex","multi","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMJ,GAAGK,UAAU,CAAC,YAAYC,MAAM,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,WAAW;oBAAE;gBAAE,GAAG;oBAAEC,OAAO;gBAAK;YACzF;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAGA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMD,GAAGK,UAAU,CAAC,YAAYC,MAAM,CAAC,CAAC,GAAG;YAAEM,MAAM;gBAAEJ,WAAW;YAAE;QAAE,GAAG;YAAEC,OAAO;QAAK;IACvF;AACF"}

package/dist/mongo-migrations/20230716065316-user-remove-name.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20230716065316-user-remove-name.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","collection","update","$unset","name","multi","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMJ,GAAGK,UAAU,CAAC,SAASC,MAAM,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,MAAM;oBAAE;gBAAE,GAAG;oBAAEC,OAAO;gBAAK;YACjF;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMD,GAAGK,UAAU,CAAC,YAAYC,MAAM,CAAC,CAAC,GAAG;YAAEM,MAAM;gBAAEJ,MAAM;YAAU;QAAE,GAAG;YAAEC,OAAO;QAAK;IAC1F;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20230716065316-user-remove-name.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","collection","update","$unset","name","multi","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMJ,GAAGK,UAAU,CAAC,SAASC,MAAM,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,MAAM;oBAAE;gBAAE,GAAG;oBAAEC,OAAO;gBAAK;YACjF;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAGA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMD,GAAGK,UAAU,CAAC,YAAYC,MAAM,CAAC,CAAC,GAAG;YAAEM,MAAM;gBAAEJ,MAAM;YAAU;QAAE,GAAG;YAAEC,OAAO;QAAK;IAC1F;AACF"}

package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20231111081809-printer-flatten-name.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","endSession","down","name"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAE,2BAA2B;oBAAO;gBAAE;YACrF;QACF,SAAU;YACR,MAAMN,QAAQO,UAAU;QAC1B;IAIF;IAEA,MAAMC,MAAKV,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEG,MAAM;oBAA0B;gBAAE;YACnF;QACF,SAAU;YACR,MAAMT,QAAQO,UAAU;QAC1B;IACF;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20231111081809-printer-flatten-name.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","endSession","down","name"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAE,2BAA2B;oBAAO;gBAAE;YACrF;QACF,SAAU;YACR,MAAMN,QAAQO,UAAU;QAC1B;IAIF;IAGA,MAAMC,MAAKV,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEG,MAAM;oBAA0B;gBAAE;YACnF;QACF,SAAU;YACR,MAAMT,QAAQO,UAAU;QAC1B;IACF;AACF"}

package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20231111082521-printer-remove-settingsappearance.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$unset","settingsAppearance","e","console","log","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,oBAAoB;oBAAE;gBAAE;YACxE;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,gCAAgCF;YAC5C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IAIF;IAEA,MAAMC,MAAKd,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEQ,MAAM;wBAAEN,oBAAoB,CAAC;oBAAE;gBAAE;YACvE;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,kCAAkCF;YAC9C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20231111082521-printer-remove-settingsappearance.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$unset","settingsAppearance","e","console","log","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,oBAAoB;oBAAE;gBAAE;YACxE;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,gCAAgCF;YAC5C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IAIF;IAGA,MAAMC,MAAKd,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEQ,MAAM;wBAAEN,oBAAoB,CAAC;oBAAE;gBAAE;YACvE;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,kCAAkCF;YAC9C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;AACF"}

package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mongo-migrations/20231202183902-printer-files-simpler.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$set","fileList","e","console","log","endSession","down"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,UAAU,EAAE;oBAAC;gBAAE;YAC7D;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,gCAAgCF;YAC5C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKd,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,UAAU,CAAC;oBAAE;gBAAE;YAC7D;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,kCAAkCF;YAC9C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;AACF"}
+{"version":3,"sources":["../../src/mongo-migrations/20231202183902-printer-files-simpler.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$set","fileList","e","console","log","endSession","down"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IAEf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,UAAU,EAAE;oBAAC;gBAAE;YAC7D;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,gCAAgCF;YAC5C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;IAGA,MAAMC,MAAKd,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,UAAU,CAAC;oBAAE;gBAAE;YAC7D;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,kCAAkCF;YAC9C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;AACF"}

package/dist/server.constants.js

@@ -53,6 +53,7 @@ const AppConstants = {
     OVERRIDE_DEMO_ROLE: "OVERRIDE_DEMO_ROLE",
     DEFAULT_DEMO_ROLE: "ADMIN",
     defaultDevelopmentEnv: "development",
+    ENABLE_COLORED_LOGS_KEY: "ENABLE_COLORED_LOGS",
     defaultTestEnv: "test",
     defaultProductionEnv: "production",
     knownEnvNames: [
@@ -70,7 +71,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.9.0",
+    defaultClientMinimum: "1.11.1",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",
@@ -79,8 +80,6 @@ const AppConstants = {
     defaultSocketThrottleRate: 1,
     debugSocketStatesKey: "DEBUG_SOCKET_STATES",
     defaultDebugSocketStates: "false",
-    debugFileWritePrinterStatesKey: "DEBUG_FILE_WRITE_PRINTER_STATES",
-    defaultDebugFileWritePrinterStates: "false",
     enableMqttAutoDiscoveryToken: "ENABLE_MQTT_AUTODISCOVERY",
     enableMqttAutoDiscoveryDefault: "false",
     mqttUrlToken: "MQTT_HOST",
@@ -93,7 +92,12 @@ const AppConstants = {
     sentryCustomDsnDefault: "https://164b8028a8a745bba3dbcab991b84ae7@o4503975545733120.ingest.sentry.io/4505101598261248",
     debugRoutesKey: "DEBUG_ROUTES",
     ENABLE_EXPERIMENTAL_TYPEORM: "ENABLE_EXPERIMENTAL_TYPEORM",
-    enableExperimentalTypeormDefault: "false"
+    enableExperimentalTypeormDefault: "false",
+    ENABLE_PROMETHEUS_METRICS: "ENABLE_PROMETHEUS_METRICS",
+    ENABLE_LOKI_LOGGING: "ENABLE_LOKI_LOGGING",
+    LOKI_ADDRESS: "LOKI_ADDRESS",
+    LOKI_TIMEOUT_SECONDS: "LOKI_TIMEOUT_SECONDS",
+    LOKI_INTERVAL: "LOKI_INTERVAL"
 };
 
 //# sourceMappingURL=server.constants.js.map

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","ENABLE_COLORED_LOGS_KEY","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,yBAAyB;IACzBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}

package/dist/server.core.js

@@ -22,6 +22,8 @@ const _serverconstants = require("./server.constants");
 const _path = require("path");
 const _fsutils = require("./utils/fs.utils");
 const _envutils = require("./utils/env.utils");
+const _promclient = require("prom-client");
+const _logger = require("./handlers/logger");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -68,16 +70,41 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+const httpRequestsTotal = new _promclient.Counter({
+    name: "http_requests_total",
+    help: "HTTP requests executed"
+});
 async function setupServer() {
     const httpServer = (0, _express.default)();
     const experimentalTypeormEnabled = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_TYPEORM, _serverconstants.AppConstants.enableExperimentalTypeormDefault) === "true";
     if (experimentalTypeormEnabled) {
-        const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] || "./database";
+        const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] ?? "./database";
         (0, _fsutils.ensureDirExists)((0, _path.join)((0, _fsutils.superRootPath)(), dbFolder));
     }
     const container = (0, _container.configureContainer)(experimentalTypeormEnabled);
     (0, _passport1.initializePassportStrategies)(_passport.default, container);
-    httpServer.use((0, _cors.default)({
+    httpServer.use((req, res, next)=>{
+        const route = req.route?.path ?? req.path ?? "unknown";
+        if (route.includes("/api")) {
+            const start = process.hrtime();
+            res.on("finish", ()=>{
+                httpRequestsTotal.inc();
+                const delta = process.hrtime(start);
+                const duration = delta[0] + delta[1] / 1e9;
+                const logger = new _logger.LoggerService("HttpRequest");
+                logger.newDebug({
+                    message: `HTTP request ${req.method} ${req.originalUrl} ${res.statusCode}`,
+                    method: req.method,
+                    path: req.originalUrl,
+                    statusCode: res.statusCode,
+                    responseTimeMs: duration.toFixed(2),
+                    clientIp: req.ip,
+                    userAgent: req.get("User-Agent")
+                });
+            });
+        }
+        next();
+    }).use((0, _cors.default)({
         origin: "*",
         methods: "GET,HEAD,PUT,PATCH,POST,DELETE"
     })).use((0, _helmet.default)({

package/dist/server.core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;iEAfoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACiB;2BACX;iCAChB;sBACR;yBAC0B;0BACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,yCAAuB,EAC3BhB,GAAG,CAACiB,gCAAc;IAErB,OAAO;QACLnC;QACAc;IACF;AACF"}
+{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpRequestsTotal","Counter","name","help","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","req","res","next","route","path","includes","start","hrtime","on","inc","delta","duration","logger","LoggerService","newDebug","message","method","originalUrl","statusCode","responseTimeMs","toFixed","clientIp","ip","userAgent","get","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAsBsBA;;;eAAAA;;;iEAtBoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACiB;2BACX;iCAChB;sBACR;yBAC0B;0BACf;4BACR;wBACM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9B,MAAMC,oBAAoB,IAAIC,mBAAO,CAAC;IACpCC,MAAM;IACNC,MAAM;AACR;AAEO,eAAeJ;IACpB,MAAMK,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CAAC,CAACC,KAAKC,KAAKC;QACd,MAAMC,QAAQ,AAACH,IAAIG,KAAK,EAAEC,QAAQJ,IAAII,IAAI,IAAK;QAE/C,IAAID,MAAME,QAAQ,CAAC,SAAS;YAC1B,MAAMC,QAAQjB,QAAQkB,MAAM;YAE5BN,IAAIO,EAAE,CAAC,UAAU;gBACf/B,kBAAkBgC,GAAG;gBAErB,MAAMC,QAAQrB,QAAQkB,MAAM,CAACD;gBAC7B,MAAMK,WAAWD,KAAK,CAAC,EAAE,GAAGA,KAAK,CAAC,EAAE,GAAG;gBACvC,MAAME,SAAS,IAAIC,qBAAa,CAAC;gBACjCD,OAAOE,QAAQ,CAAC;oBACdC,SAAS,CAAC,aAAa,EAAEf,IAAIgB,MAAM,CAAC,CAAC,EAAEhB,IAAIiB,WAAW,CAAC,CAAC,EAAEhB,IAAIiB,UAAU,EAAE;oBAC1EF,QAAQhB,IAAIgB,MAAM;oBAClBZ,MAAMJ,IAAIiB,WAAW;oBACrBC,YAAYjB,IAAIiB,UAAU;oBAC1BC,gBAAgBR,SAASS,OAAO,CAAC;oBACjCC,UAAUrB,IAAIsB,EAAE;oBAChBC,WAAWvB,IAAIwB,GAAG,CAAC;gBACrB;YACF;QACF;QAEAtB;IACF,GACCH,GAAG,CACF0B,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAED5B,GAAG,CACF6B,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAED9B,GAAG,CAAC+B,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBhC,GAAG,CAACiC,IAAAA,qBAAY,KAChBjC,GAAG,CAACkC,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCnC,GAAG,CAACD,iBAAQ,CAACqC,UAAU,IACvBpC,GAAG,CAACD,iBAAQ,CAACsC,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEtC,GAAG,CAACuC,IAAAA,8BAAe,EAAC3C,YACpBI,GAAG,CAACwC,gCAAsB,EAE1BxC,GAAG,CAACyC,yCAAuB,EAC3BzC,GAAG,CAAC0C,gCAAc;IAErB,OAAO;QACL5D;QACAc;IACF;AACF"}

package/dist/server.env.js

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    ensureMongoDBConnectionStringSet: function() {
-        return ensureMongoDBConnectionStringSet;
+    ensureMongoDbConnectionStringSet: function() {
+        return ensureMongoDbConnectionStringSet;
     },
     ensurePortSet: function() {
         return ensurePortSet;
@@ -37,12 +37,12 @@ _export(exports, {
 const _migratemongo = require("migrate-mongo");
 const _path = require("path");
 const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
-const _dotenv = require("dotenv");
 const _serverconstants = require("./server.constants");
 const _logger = require("./handlers/logger");
 const _envutils = require("./utils/env.utils");
 const _errorutils = require("./utils/error.utils");
 const _fsutils = require("./utils/fs.utils");
+const _promclient = require("prom-client");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -84,10 +84,8 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-const logger = new _logger.LoggerService("FDM-Environment", false);
 const instructionsReferralURL = "https://docs.fdm-monster.net";
 const packageJsonPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./package.json");
-const dotEnvPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./.env");
 function isEnvTest() {
     return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultTestEnv;
 }
@@ -95,6 +93,7 @@ function isEnvProd() {
     return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
 }
 function ensureNodeEnvSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const environment = process.env[_serverconstants.AppConstants.NODE_ENV_KEY];
     if (!environment || !_serverconstants.AppConstants.knownEnvNames.includes(environment)) {
         const newEnvName = _serverconstants.AppConstants.defaultProductionEnv;
@@ -105,16 +104,17 @@ function ensureNodeEnvSet() {
     }
 }
 function ensurePackageVersionSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const packageJsonVersion = require(packageJsonPath).version;
-    if (!process.env[_serverconstants.AppConstants.VERSION_KEY]) {
-        process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
-    }
+    process.env[_serverconstants.AppConstants.VERSION_KEY] ??= packageJsonVersion;
     logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
 }
 function printInstructionsURL() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
 }
 function fetchMongoDBConnectionString() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     if (!process.env[_serverconstants.AppConstants.MONGO_KEY]) {
         logger.debug(`~ ${_serverconstants.AppConstants.MONGO_KEY} environment variable is not set. Assuming default`);
         printInstructionsURL();
@@ -130,8 +130,9 @@ function fetchServerPort() {
     }
     return port;
 }
-function ensureMongoDBConnectionStringSet() {
-    let dbConnectionString = process.env[_serverconstants.AppConstants.MONGO_KEY];
+function ensureMongoDbConnectionStringSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
+    const dbConnectionString = process.env[_serverconstants.AppConstants.MONGO_KEY];
     if (!dbConnectionString) {
         fetchMongoDBConnectionString();
     } else {
@@ -139,6 +140,7 @@ function ensureMongoDBConnectionStringSet() {
     }
 }
 function setupSentry() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const sentryDsnToken = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.sentryCustomDsnToken, _serverconstants.AppConstants.sentryCustomDsnDefault);
     _node.init({
         dsn: sentryDsnToken,
@@ -154,6 +156,7 @@ function setupSentry() {
     });
 }
 function ensurePortSet() {
+    const logger = new _logger.LoggerService("FDM-Environment");
     fetchServerPort();
     if (!process.env[_serverconstants.AppConstants.SERVER_PORT_KEY]) {
         logger.log(`~ ${_serverconstants.AppConstants.SERVER_PORT_KEY} environment variable is not set`);
@@ -161,20 +164,21 @@ function ensurePortSet() {
         process.env[_serverconstants.AppConstants.SERVER_PORT_KEY] = _serverconstants.AppConstants.defaultServerPort.toString();
     }
 }
-function setupEnvConfig(skipDotEnv = false) {
-    if (!skipDotEnv) {
-        (0, _dotenv.config)({
-            path: dotEnvPath
-        });
-        logger.log("✓ Parsed environment and (optional) .env file");
-    }
+function setupEnvConfig() {
     ensureNodeEnvSet();
     ensurePackageVersionSet();
     setupSentry();
-    ensureMongoDBConnectionStringSet();
+    ensureMongoDbConnectionStringSet();
     ensurePortSet();
+    if (process.env[_serverconstants.AppConstants.ENABLE_PROMETHEUS_METRICS] === "true") {
+        (0, _promclient.collectDefaultMetrics)({
+            register: _promclient.register
+        });
+        _promclient.register.removeSingleMetric("nodejs_version_info");
+    }
 }
 async function runMigrations(db, client) {
+    const logger = new _logger.LoggerService("FDM-Environment");
     const migrationsStatus = await (0, _migratemongo.status)(db);
     const pendingMigrations = migrationsStatus.filter((m)=>m.appliedAt === "PENDING");
     if (pendingMigrations.length) {

package/dist/server.env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":";;;;;;;;;;;IAoEgBA,gCAAgC;eAAhCA;;IA6BAC,aAAa;eAAbA;;IAhDAC,4BAA4B;eAA5BA;;IASAC,eAAe;eAAfA;;IArCAC,SAAS;eAATA;;IAoGMC,aAAa;eAAbA;;IAdNC,cAAc;eAAdA;;IA9BAC,WAAW;eAAXA;;;8BA7EW;sBACN;8DACG;wBACD;iCACM;wBACW;0BACiB;4BAC5B;yBACC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9B,MAAMC,SAAS,IAAIC,qBAAM,CAAC,mBAAmB;AAG7C,MAAMC,0BAA0B;AAChC,MAAMC,kBAAkBC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAC9C,MAAMC,aAAaF,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAEzC,SAASE;IACP,OAAOC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACE,cAAc;AAC/E;AAEO,SAAShB;IACd,OAAOY,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACG,oBAAoB;AACrF;AAEA,SAASC;IACP,MAAMC,cAAcP,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC;IAC1D,IAAI,CAACI,eAAe,CAACL,6BAAY,CAACM,aAAa,CAACC,QAAQ,CAACF,cAAc;QACrE,MAAMG,aAAaR,6BAAY,CAACG,oBAAoB;QACpDL,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,GAAGO;QACzClB,OAAOmB,IAAI,CAAC,CAAC,SAAS,EAAEJ,YAAY,mDAAmD,EAAEG,YAAY;IACvG,OAAO;QACLlB,OAAOoB,GAAG,CAAC,CAAC,mCAAmC,EAAEL,YAAY,EAAE,CAAC;IAClE;AACF;AAEA,SAASM;IACP,MAAMC,qBAAqBC,QAAQpB,iBAAiBqB,OAAO;IAC3D,IAAI,CAAChB,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,EAAE;QAC1CjB,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,GAAGH;IAC1C;IAEAtB,OAAOoB,GAAG,CAAC,CAAC,yBAAyB,EAAEZ,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,EAAE;AAChF;AAEA,SAASC;IACP1B,OAAOoB,GAAG,CAAC,CAAC,yBAAyB,EAAElB,wBAAwB,sBAAsB,CAAC;AACxF;AAEO,SAASR;IACd,IAAI,CAACc,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC,EAAE;QACxC3B,OAAO4B,KAAK,CAAC,CAAC,EAAE,EAAElB,6BAAY,CAACiB,SAAS,CAAC,kDAAkD,CAAC;QAC5FD;QACAlB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC,GAAGjB,6BAAY,CAACmB,iCAAiC;IACtF;IACA,OAAOrB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC;AAC5C;AAEO,SAAShC;IACd,IAAImC,OAAOtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC;IACpD,IAAIC,OAAOC,KAAK,CAACC,SAASJ,QAAS;QAEjCtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,GAAGrB,6BAAY,CAACyB,iBAAiB,CAACC,QAAQ;QACnFN,OAAOtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC;IAClD;IACA,OAAOD;AACT;AAEO,SAAStC;IACd,IAAI6C,qBAAqB7B,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC;IAC5D,IAAI,CAACU,oBAAoB;QACvB3C;IACF,OAAO;QACLM,OAAOoB,GAAG,CAAC,CAAC,EAAE,EAAEV,6BAAY,CAACiB,SAAS,CAAC,0BAA0B,CAAC;IACpE;AACF;AAEO,SAAS5B;IACd,MAAMuC,iBAAiBC,IAAAA,yBAAe,EAAC7B,6BAAY,CAAC8B,oBAAoB,EAAE9B,6BAAY,CAAC+B,sBAAsB;IAE7GC,MAAOC,IAAI,CAAC;QACVC,KAAKN;QACLvB,aAAaP,QAAQC,GAAG,CAACoC,QAAQ;QACjCC,SAAStC,QAAQC,GAAG,CAACsC,mBAAmB;QACxCC,SAAS,CAACzC;QACV0C,kBAAkBC,IAAAA,iCAAuB,MAAK,OAAO;IACvD;IAEA1C,QAAQ2C,EAAE,CAAC,sBAAsB,CAACC;QAChC,MAAMC,UAAU,CAAC,4BAA4B,EAAEC,IAAAA,wBAAY,EAACF,IAAI;QAChEpD,OAAOuD,KAAK,CAACF;QAGbX,MAAOc,gBAAgB,CAACJ;IAC1B;AACF;AAEO,SAAS3D;IACdE;IAEA,IAAI,CAACa,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,EAAE;QAC9C/B,OAAOoB,GAAG,CAAC,CAAC,EAAE,EAAEV,6BAAY,CAACqB,eAAe,CAAC,gCAAgC,CAAC;QAC9EL;QACAlB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,GAAGrB,6BAAY,CAACyB,iBAAiB,CAACC,QAAQ;IACrF;AACF;AAEO,SAAStC,eAAe2D,aAAa,KAAK;IAC/C,IAAI,CAACA,YAAY;QAEfC,IAAAA,cAAM,EAAC;YAAEC,MAAMrD;QAAW;QAC1BN,OAAOoB,GAAG,CAAC;IACb;IAEAN;IACAO;IACAtB;IACAP;IACAC;AACF;AAEO,eAAeI,cAAc+D,EAAO,EAAEC,MAAW;IACtD,MAAMC,mBAAmB,MAAMC,IAAAA,oBAAM,EAACH;IACtC,MAAMI,oBAAoBF,iBAAiBG,MAAM,CAAC,CAACC,IAAMA,EAAEC,SAAS,KAAK;IAEzE,IAAIH,kBAAkBI,MAAM,EAAE;QAC5BpE,OAAOoB,GAAG,CACR,CAAC,cAAc,EAAE4C,kBAAkBI,MAAM,CAAC,yBAAyB,EAAEN,iBAAiBM,MAAM,CAAC,qBAAqB,CAAC;IAEvH,OAAO;QACLpE,OAAOoB,GAAG,CAAC,CAAC,gCAAgC,EAAE0C,iBAAiBM,MAAM,CAAC,mBAAmB,CAAC;IAC5F;IAEA,MAAMC,kBAAkB,MAAMC,IAAAA,gBAAE,EAACV,IAAIC;IACrC,IAAIQ,iBAAiBD,SAAS,GAAG;QAC/BpE,OAAOoB,GAAG,CAAC,CAAC,QAAQ,EAAEiD,gBAAgBD,MAAM,CAAC,wBAAwB,CAAC,EAAEC;IAC1E,OAAO;QACLrE,OAAOoB,GAAG,CAAC;IACb;AACF"}
+{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDbConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","instructionsReferralURL","packageJsonPath","join","superRootPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","logger","Logger","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}

package/dist/server.host.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "ServerHost", {
 const _express = /*#__PURE__*/ _interop_require_default(require("express"));
 const _mongoose = /*#__PURE__*/ _interop_require_default(require("mongoose"));
 const _connecthistoryapifallback = /*#__PURE__*/ _interop_require_default(require("connect-history-api-fallback"));
-const _awilixexpress = require("awilix-express");
 const _path = require("path");
 const _exceptionfilter = require("./middleware/exception.filter");
 const _serverenv = require("./server.env");
@@ -19,41 +18,38 @@ const _runtimeexceptions = require("./exceptions/runtime.exceptions");
 const _serverconstants = require("./server.constants");
 const _fsutils = require("./utils/fs.utils");
 const _envutils = require("./utils/env.utils");
+const _loadcontrollers = require("./shared/load-controllers");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 class ServerHost {
+    configService;
+    isTypeormMode;
+    settingsStore;
     bootTask;
-    taskManagerService;
     socketIoGateway;
-    appInstance = null;
-    configService;
     typeormService;
-    settingsStore;
-    isTypeormMode;
     logger;
-    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode, settingsStore }){
-        this.logger = loggerFactory(ServerHost.name);
+    constructor(loggerFactory, configService, isTypeormMode, settingsStore, bootTask, socketIoGateway, typeormService){
+        this.configService = configService;
+        this.isTypeormMode = isTypeormMode;
+        this.settingsStore = settingsStore;
         this.bootTask = bootTask;
-        this.taskManagerService = taskManagerService;
         this.socketIoGateway = socketIoGateway;
-        this.configService = configService;
         this.typeormService = typeormService;
-        this.settingsStore = settingsStore;
-        this.isTypeormMode = isTypeormMode;
+        this.logger = loggerFactory(ServerHost.name);
     }
     async boot(app, quick_boot = false, listenRequests = true) {
         if (!this.isTypeormMode) {
             _mongoose.default.set("strictQuery", true);
         }
-        this.appInstance = app;
-        this.serveControllerRoutes(this.appInstance);
+        this.serveControllerRoutes(app);
         if (!quick_boot) {
             await this.bootTask.runOnce();
         }
-        if (listenRequests) return this.httpListen();
+        if (listenRequests) return this.httpListen(app);
     }
     hasConnected() {
         if (this.isTypeormMode) {
@@ -63,19 +59,13 @@ class ServerHost {
         }
     }
     serveControllerRoutes(app) {
-        const routePath = "./controllers";
         app.use((req, res, next)=>{
-            if (!req.originalUrl.startsWith("/api") && !req.originalUrl.startsWith("/socket.io")) {
+            if (!req.originalUrl.startsWith("/metrics") && !req.originalUrl.startsWith("/api") && !req.originalUrl.startsWith("/socket.io")) {
                 (0, _connecthistoryapifallback.default)()(req, res, next);
             } else {
                 next();
             }
-        }).use((0, _awilixexpress.loadControllers)(`${routePath}/*.controller.*`, {
-            cwd: __dirname,
-            ignore: [
-                "**/*.map"
-            ]
-        })).use(_exceptionfilter.exceptionFilter);
+        }).use((0, _loadcontrollers.loadControllersFunc)());
         const nextClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientNextPackageName, "dist");
         const bundleDistPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist");
         const backupClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientPackageName, "dist");
@@ -88,10 +78,10 @@ class ServerHost {
         });
         app.use(_express.default.static(bundleDistPath));
         app.use(_express.default.static(backupClientPath));
-        app.get("*", (req, res)=>{
+        app.get("*", (req, _)=>{
             const path = req.originalUrl;
             let resource = "MVC";
-            if (path.startsWith("/socket.io") || path.startsWith("/api") || path.startsWith("/plugins")) {
+            if (path.startsWith("/socket.io") || path.startsWith("/api") || path.startsWith("/metrics")) {
                 resource = "API";
             } else if (path.endsWith(".min.js")) {
                 resource = "client-bundle";
@@ -100,17 +90,14 @@ class ServerHost {
             if (!path.startsWith("/socket.io")) {
                 throw new _runtimeexceptions.NotFoundException(`${resource} resource was not found`, path);
             }
-        }).use(_exceptionfilter.exceptionFilter);
-    }
-    isClientNextEnabled() {
-        const settings = this.settingsStore.getServerSettings();
-        return settings.experimentalClientSupport;
+        });
+        app.use(_exceptionfilter.exceptionFilter);
     }
-    async httpListen() {
+    async httpListen(app) {
         const port = (0, _serverenv.fetchServerPort)();
         if (!(0, _envutils.isProductionEnvironment)() && this.configService.get(_serverconstants.AppConstants.debugRoutesKey, "false") === "true") {
             const expressListRoutes = require("express-list-routes");
-            expressListRoutes(this.appInstance, {
+            expressListRoutes(app, {
                 prefix: "/"
             });
         }
@@ -118,11 +105,15 @@ class ServerHost {
             throw new Error("The FDM Server requires a numeric port input argument to run");
         }
         const hostOrFqdn = "0.0.0.0";
-        const server = this.appInstance.listen(parseInt(port), hostOrFqdn, ()=>{
+        const server = app.listen(parseInt(port), hostOrFqdn, ()=>{
             this.logger.log(`Server started... open it at http://127.0.0.1:${port}`);
         });
         this.socketIoGateway.attachServer(server);
     }
+    isClientNextEnabled() {
+        const settings = this.settingsStore.getServerSettings();
+        return settings.experimentalClientSupport;
+    }
 }
 
 //# sourceMappingURL=server.host.js.map

package/dist/server.host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","settingsStore","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","path","resource","endsWith","error","NotFoundException","settings","getServerSettings","experimentalClientSupport","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
+{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","logger","constructor","loggerFactory","configService","isTypeormMode","settingsStore","bootTask","socketIoGateway","typeormService","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","use","req","res","next","originalUrl","startsWith","history","loadControllersFunc","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","_","path","resource","endsWith","error","NotFoundException","exceptionFilter","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer","settings","getServerSettings","experimentalClientSupport"],"mappings":"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"}

package/dist/services/authentication/auth.service.js

@@ -13,18 +13,19 @@ const _cryptoutils = require("../../utils/crypto.utils");
 const _authorizationconstants = require("../../constants/authorization.constants");
 const _node = require("@sentry/node");
 class AuthService {
-    logger;
     userService;
     jwtService;
     settingsStore;
     refreshTokenService;
-    blacklistedJwtCache = {};
-    constructor({ userService, jwtService, loggerFactory, settingsStore, refreshTokenService }){
+    logger;
+    blacklistedJwtCache;
+    constructor(loggerFactory, userService, jwtService, settingsStore, refreshTokenService){
         this.userService = userService;
         this.jwtService = jwtService;
-        this.logger = loggerFactory(AuthService.name);
         this.settingsStore = settingsStore;
         this.refreshTokenService = refreshTokenService;
+        this.blacklistedJwtCache = {};
+        this.logger = loggerFactory(AuthService.name);
     }
     async loginUser(username, password) {
         const userDoc = await this.userService.findRawByUsername(username);
@@ -35,7 +36,7 @@ class AuthService {
         if (!result) {
             throw new _runtimeexceptions.AuthenticationError("Login incorrect", _authorizationconstants.AUTH_ERROR_REASON.IncorrectCredentials);
         }
-        const userId = userDoc.id.toString();
+        const userId = userDoc.id;
         const token = await this.signJwtToken(userId);
         await this.refreshTokenService.purgeOutdatedRefreshTokensByUserId(userId);
         await this.purgeOutdatedBlacklistedJwtCache();
@@ -73,15 +74,12 @@ class AuthService {
     }
     async logoutUserRefreshToken(refreshToken) {
         const userRefreshToken = await this.getValidRefreshToken(refreshToken);
-        await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
+        await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId);
     }
     async renewLoginByRefreshToken(refreshToken) {
-        const userRefreshToken = await this.getValidRefreshToken(refreshToken, false);
-        if (!userRefreshToken) {
-            throw new _runtimeexceptions.AuthenticationError("The refresh token was invalid or expired, could not refresh user token", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
-        }
-        const userId = userRefreshToken.userId.toString();
-        const user = await this.userService.getUser(userId, false);
+        const userRefreshToken = await this.getValidRefreshToken(refreshToken);
+        const userId = userRefreshToken.userId;
+        const user = await this.userService.getUser(userId);
         if (!user) {
             await this.refreshTokenService.deleteRefreshToken(refreshToken);
             throw new _runtimeexceptions.AuthenticationError("User not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
@@ -93,13 +91,10 @@ class AuthService {
     isJwtTokenBlacklisted(jwtToken) {
         return this.blacklistedJwtCache[jwtToken];
     }
-    async getValidRefreshToken(refreshToken, throwNotFoundError = true) {
-        const userRefreshToken = await this.refreshTokenService.getRefreshToken(refreshToken, throwNotFoundError);
-        if (!userRefreshToken) {
-            return null;
-        }
+    async getValidRefreshToken(refreshToken) {
+        const userRefreshToken = await this.refreshTokenService.getRefreshToken(refreshToken);
         if (Date.now() > userRefreshToken.expiresAt) {
-            await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
+            await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId);
             throw new _runtimeexceptions.AuthenticationError("Refresh token expired, login required", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
         }
         return userRefreshToken;
@@ -110,14 +105,14 @@ class AuthService {
         const attemptsUsed = userRefreshToken.refreshAttemptsUsed;
         if (refreshTokenAttempts !== -1) {
             if (attemptsUsed >= refreshTokenAttempts) {
-                await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
+                await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId);
                 throw new _runtimeexceptions.AuthenticationError("Refresh token attempts exceeded, login required", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
             }
         }
         await this.refreshTokenService.updateRefreshTokenAttempts(refreshToken, attemptsUsed + 1);
     }
     async signJwtToken(userId) {
-        const user = await this.userService.getUser(userId, false);
+        const user = await this.userService.getUser(userId);
         if (!user) {
             throw new _runtimeexceptions.AuthenticationError("User not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
         }