@fdm-monster/server 1.5.4 → 1.6.0-rc1

package/dist/shared/dtos/printer-login.dto.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterLoginDto", {
+    enumerable: true,
+    get: function() {
+        return PrinterLoginDto;
+    }
+});
+const _classvalidator = require("class-validator");
+const _serviceconstants = require("../../constants/service.constants");
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class PrinterLoginDto {
+    printerURL;
+    apiKey;
+    context = null;
+    constructor(printerURL, apiKey, context = null){
+        this.printerURL = printerURL;
+        this.apiKey = apiKey;
+        this.context = context;
+    }
+    validateParams() {
+        return (0, _classvalidator.validateSync)(this);
+    }
+    toSocketLogin(printerId, protocol = "ws") {
+        return {
+            printerId,
+            loginDto: this,
+            protocol
+        };
+    }
+}
+_ts_decorate([
+    (0, _classvalidator.IsNotEmpty)(),
+    (0, _classvalidator.IsUrl)(),
+    _ts_metadata("design:type", String)
+], PrinterLoginDto.prototype, "printerURL", void 0);
+_ts_decorate([
+    (0, _classvalidator.Length)(_serviceconstants.apiKeyLengthMinimumDefault),
+    (0, _classvalidator.IsAlphanumeric)(),
+    (0, _classvalidator.IsNotEmpty)(),
+    _ts_metadata("design:type", String)
+], PrinterLoginDto.prototype, "apiKey", void 0);
+_ts_decorate([
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Object)
+], PrinterLoginDto.prototype, "context", void 0);
+
+//# sourceMappingURL=printer-login.dto.js.map

package/dist/shared/dtos/printer-login.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/shared/dtos/printer-login.dto.ts"],"names":["PrinterLoginDto","printerURL","apiKey","context","constructor","validateParams","validateSync","toSocketLogin","printerId","protocol","loginDto","IsNotEmpty","IsUrl","Length","apiKeyLengthMinimumDefault","IsAlphanumeric","IsOptional"],"mappings":";;;;+BAIaA;;;eAAAA;;;gCAJuE;kCAEzC;;;;;;;;;;AAEpC,MAAMA;IAGXC,WAAmB;IAKnBC,OAAe;IAGfC,UAAe,KAAK;IAEpBC,YAAYH,UAAkB,EAAEC,MAAc,EAAEC,UAAe,IAAI,CAAE;QACnE,IAAI,CAACF,UAAU,GAAGA;QAClB,IAAI,CAACC,MAAM,GAAGA;QACd,IAAI,CAACC,OAAO,GAAGA;IACjB;IAGOE,iBAAiB;QACtB,OAAOC,IAAAA,4BAAY,EAAC,IAAI;IAC1B;IAEAC,cAAcC,SAAiB,EAAEC,WAAuB,IAAI,EAAuB;QACjF,OAAO;YACLD;YACAE,UAAU,IAAI;YACdD;QACF;IACF;AACF;;IA9BGE,IAAAA,0BAAU;IACVC,IAAAA,qBAAK;;GAFKZ;;IAKVa,IAAAA,sBAAM,EAACC,4CAA0B;IACjCC,IAAAA,8BAAc;IACdJ,IAAAA,0BAAU;;GAPAX;;IAUVgB,IAAAA,0BAAU;;GAVAhB"}

package/dist/{utils → shared}/websocket.adapter.js

@@ -12,9 +12,9 @@ const _serverconstants = require("../server.constants");
 const _ws = require("ws");
 class WebsocketAdapter {
     socket;
-    #logger;
+    logger;
     constructor({ loggerFactory }){
-        this.#logger = loggerFactory(WebsocketAdapter.name);
+        this.logger = loggerFactory(WebsocketAdapter.name);
     }
     get isOpened() {
         return this.socket?.readyState === _ws.WebSocket.OPEN;
@@ -34,7 +34,7 @@ class WebsocketAdapter {
     }
     async sendMessage(payload) {
         if (!this.isOpened || !this.socket) {
-            this.#logger.error("Websocket is not opened, cant send a message");
+            this.logger.error("Websocket is not opened, cant send a message");
             return;
         }
         return await new Promise((resolve, reject)=>{

package/dist/shared/websocket.adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOaA;;;eAAAA;;;iCAPgB;oBAC6C;AAMnE,MAAMA;IACXC,OAAmB;IACTC,OAAsB;IAEhCC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IASAU,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACX,MAAM,GAAG,IAAIO,aAAS,CAACI,KAAK;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,IAAI,CAACd,MAAM,CAACe,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAAChB,MAAM,CAACkB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAAChB,MAAM,CAACuB,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAACvB,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACkB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAC/B,MAAM,CAAEgC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASUV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQxD,MAAcC,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}

package/dist/state/file-upload-tracker.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","percent","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","percent","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}

package/dist/state/file.cache.js

@@ -8,9 +8,7 @@ Object.defineProperty(exports, "FileCache", {
         return FileCache;
     }
 });
-const _findpredicateutils = require("../utils/find-predicate.utils");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-const _serviceconstants = require("../constants/service.constants");
 class FileCache {
     printerFileStorage = {};
     totalFileCount = 0;
@@ -18,45 +16,24 @@ class FileCache {
     constructor({ loggerFactory }){
         this.logger = loggerFactory(FileCache.name);
     }
-    cachePrinterFileStorage(printerId, { fileList, storage }) {
-        this.cachePrinterStorage(printerId, storage);
-        this.cachePrinterFiles(printerId, fileList);
-    }
-    cachePrinterFiles(printerId, fileList) {
-        const printerFileStorage = this.getPrinterFileStorage(printerId);
-        printerFileStorage.fileList = fileList;
-        this.updateCacheFileRefCount();
-    }
-    cachePrinterStorage(printerId, storage) {
-        const printerFileStorage = this.getPrinterFileStorage(printerId);
-        printerFileStorage.storage = storage;
-        this.updateCacheFileRefCount();
-    }
-    getPrinterFileStorage(printerId) {
+    cachePrinterFiles(printerId, files) {
         if (!printerId) {
             throw new Error("File Cache cant get a null/undefined printer id");
         }
-        let fileStorage = this.printerFileStorage[printerId];
-        if (!fileStorage) {
-            fileStorage = this.printerFileStorage[printerId] = {
-                fileList: (0, _serviceconstants.getFileListDefault)(),
-                storage: undefined
-            };
-        }
-        return fileStorage;
+        this.printerFileStorage[printerId] = files;
+        this.updateCacheFileRefCount();
     }
     getPrinterFiles(printerId) {
-        const fileStorage = this.getPrinterFileStorage(printerId);
-        return fileStorage?.fileList;
-    }
-    getPrinterStorage(printerId) {
-        const fileStorage = this.getPrinterFileStorage(printerId);
-        return fileStorage?.storage;
+        if (!printerId) {
+            throw new Error("File Cache cant get a null/undefined printer id");
+        }
+        this.printerFileStorage[printerId] = this.getPrinterFileStorage(printerId);
+        return this.getPrinterFileStorage(printerId);
     }
     updateCacheFileRefCount() {
         let totalFiles = 0;
         for (const storage of Object.values(this.printerFileStorage)){
-            totalFiles += storage.fileList?.files?.length || 0;
+            totalFiles += storage?.length || 0;
         }
         if (totalFiles !== this.totalFileCount) {
             this.totalFileCount = totalFiles;
@@ -77,15 +54,22 @@ class FileCache {
         this.logger.log(`Purged printerId '${printerId}' file cache`);
     }
     purgeFile(printerId, filePath) {
-        const { fileList } = this.getPrinterFileStorage(printerId);
-        const fileIndex = (0, _findpredicateutils.findFileIndex)(fileList, filePath);
+        const files = this.getPrinterFileStorage(printerId);
+        if (!files) return;
+        const fileIndex = files.findIndex((f)=>f.path === filePath);
         if (fileIndex === -1) {
             this.logger.warn(`A file removal was ordered but this file was not found in files cache for printer Id ${printerId}`, filePath);
             return this.logger.log("File was not found in cached printer fileList");
         }
-        fileList.files.splice(fileIndex, 1);
+        files.splice(fileIndex, 1);
         this.logger.log(`File ${filePath} was removed`);
     }
+    getPrinterFileStorage(printerId) {
+        if (!printerId) {
+            throw new Error("File Cache cant get a null/undefined printer id");
+        }
+        return this.printerFileStorage[printerId];
+    }
 }
 
 //# sourceMappingURL=file.cache.js.map

package/dist/state/file.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFileStorage","printerId","fileList","storage","cachePrinterStorage","cachePrinterFiles","getPrinterFileStorage","updateCacheFileRefCount","Error","fileStorage","getFileListDefault","undefined","getPrinterFiles","getPrinterStorage","totalFiles","Object","values","files","length","log","purgePrinterId","ValidationException","warn","purgeFile","filePath","fileIndex","findFileIndex","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","getPrinterFileStorage","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAOaA;;;eAAAA;;;mCAPuB;AAO7B,MAAMA;IACHC,qBAAwE,CAAC,EAAE;IAC3EC,iBAAiB,EAAE;IAEnBC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAwC,EAAE;QAC7E,IAAI,CAACD,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACO,UAAU,GAAGC;QACrC,IAAI,CAACE,uBAAuB;IAC9B;IAEAC,gBAAgBJ,SAAiB,EAAE;QACjC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACO,UAAU,GAAG,IAAI,CAACK,qBAAqB,CAACL;QAChE,OAAO,IAAI,CAACK,qBAAqB,CAACL;IACpC;IAEAG,0BAA0B;QACxB,IAAIG,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAAChB,kBAAkB,EAAG;YAC5Da,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACZ,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGY;YACtB,IAAI,CAACX,MAAM,CAACgB,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAACjB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOY;IACT;IAEAM,eAAeZ,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIa,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACrB,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACc,aAAa;YAChB,IAAI,CAACnB,MAAM,CAACoB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACtB,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACgB,GAAG,CAAC,CAAC,kBAAkB,EAAEX,UAAU,YAAY,CAAC;IAC9D;IAEAgB,UAAUhB,SAAiB,EAAEiB,QAAgB,EAAE;QAC7C,MAAMhB,QAAQ,IAAI,CAACI,qBAAqB,CAACL;QACzC,IAAI,CAACC,OAAO;QAEZ,MAAMiB,YAAYjB,MAAMkB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACvB,MAAM,CAACoB,IAAI,CACd,CAAC,qFAAqF,EAAEf,UAAU,CAAC,EACnGiB;YAGF,OAAO,IAAI,CAACtB,MAAM,CAACgB,GAAG,CAAC;QACzB;QAEAV,MAAMqB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACvB,MAAM,CAACgB,GAAG,CAAC,CAAC,KAAK,EAAEM,SAAS,YAAY,CAAC;IAChD;IAEQZ,sBAAsBL,SAAiB,EAAE;QAC/C,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QAEA,OAAO,IAAI,CAACT,kBAAkB,CAACO,UAAU;IAC3C;AACF"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getServerSettings","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","eventName","payload","receivedAt","Date","now","setSubEvent","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getServerSettings","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","eventName","payload","receivedAt","Date","now","setSubEvent","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":";;;;+BAkBaA;;;eAAAA;;;8BAlBgB;6BACJ;gCACK;AAgBvB,MAAMA,2BAA2BC,0BAAY;IAClDC,OAAsB;IACtBC,cAA6B;IAC7BC,cAA6B;IAE7BC,YAAY,EACVF,aAAa,EACbG,aAAa,EACbF,aAAa,EAKd,CAAE;QACD,KAAK;QACL,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACF,MAAM,GAAGI,cAAcN,mBAAmBO,IAAI;QACnD,IAAI,CAACJ,aAAa,GAAGA;QAErB,IAAI,CAACK,iBAAiB;IACxB;IAEA,IAAIC,aAAa;QACf,OAAO,IAAI,CAACL,aAAa,CAACM,iBAAiB,GAAGC,aAAa,EAAEC;IAC/D;IAEA,MAAMC,uBAAuBC,EAAU,EAAE;QACvC,OAAO,IAAI,CAACC,aAAa,CAACD,GAAG;IAC/B;IAEA,MAAME,kBAAkBC,SAAiB,EAAE;QACzC,IAAIC,MAAM,MAAM,IAAI,CAACC,QAAQ,CAACF;QAC9B,IAAI,CAACC,KAAK;YACRA,MAAM;gBAAEE,SAAS;gBAAMC,SAAS;gBAAMC,WAAW;gBAAMC,OAAO,CAAC;gBAAGC,QAAQ,CAAC;YAAE;YAC7E,MAAM,IAAI,CAACC,WAAW,CAACR,WAAWC;QACpC;QACA,OAAOA;IACT;IAEA,MAAMQ,SAAST,SAAiB,EAAEU,KAAa,EAAEC,SAAiB,EAAEC,OAAO,EAAE;QAC3E,MAAMX,MAAM,MAAM,IAAI,CAACF,iBAAiB,CAACC;QACzCC,GAAG,CAACS,MAAM,GAAG;YACXE;YACAC,YAAYC,KAAKC,GAAG;QACtB;QACA,MAAM,IAAI,CAACP,WAAW,CAACR,WAAWC;IACpC;IAEA,MAAMe,YAAYhB,SAAiB,EAAEU,KAAa,EAAEC,SAAiB,EAAEC,OAAO,EAAE;QAC9E,MAAMX,MAAM,MAAM,IAAI,CAACF,iBAAiB,CAACC;QACzCC,GAAG,CAACS,MAAM,CAACC,UAAU,GAAG;YACtBC;YACAC,YAAYC,KAAKC,GAAG;QACtB;QACA,MAAM,IAAI,CAACP,WAAW,CAACR,WAAWC;IACpC;IAEA,MAAMgB,sBAAsB,EAAEC,UAAU,EAA4B,EAAE;QACpE,MAAM,IAAI,CAACC,eAAe,CAACD;IAC7B;IAEQ3B,oBAAoB;QAC1B,IAAI,CAACL,aAAa,CAACkC,EAAE,CAAC,eAAe,CAACC,IAAM,IAAI,CAACC,sBAAsB,CAACD;QACxE,IAAI,CAACnC,aAAa,CAACkC,EAAE,CAACG,6BAAa,CAACC,eAAe,EAAE,IAAI,CAACP,qBAAqB,CAACQ,IAAI,CAAC,IAAI;IAC3F;IAEA,MAAcH,uBAAuBD,CAAoB,EAAE;QACzD,MAAMrB,YAAYqB,EAAErB,SAAS;QAC7B,IAAIqB,EAAEf,KAAK,KAAK,YAAYe,EAAEf,KAAK,KAAK,SAAS;YAC/C,MAAM,IAAI,CAACG,QAAQ,CAACT,WAAWqB,EAAEf,KAAK,EAAE,MAAMe,EAAEf,KAAK,KAAK,YAAY,IAAI,CAACoB,mBAAmB,CAACL,EAAET,OAAO,IAAIS,EAAET,OAAO;YACrH,IAAI,IAAI,CAACpB,UAAU,EAAE;gBACnB,IAAI,CAACP,MAAM,CAAC0C,GAAG,CAAC,CAAC,SAAS,EAAEN,EAAEf,KAAK,CAAC,iBAAiB,EAAEsB,IAAAA,qBAAQ,EAACP,EAAET,OAAO,EAAE,CAAC,EAAES,EAAErB,SAAS;YAC3F;QACF,OAAO,IAAIqB,EAAEf,KAAK,KAAK,UAAU;YAC/B,MAAM,IAAI,CAACU,WAAW,CAAChB,WAAW,UAAUqB,EAAET,OAAO,CAACL,MAAM,EAAEc,EAAET,OAAO;QACzE,OAAO,IAAIS,EAAEf,KAAK,KAAK,SAAS;YAC9B,MAAMuB,YAAYR,EAAET,OAAO,CAACkB,IAAI;YAChC,MAAM,IAAI,CAACd,WAAW,CAAChB,WAAW,SAAS6B,WAAWR,EAAET,OAAO,CAACA,OAAO;YACvE,IAAI,IAAI,CAACpB,UAAU,EAAE;gBACnB,IAAI,CAACP,MAAM,CAAC0C,GAAG,CAAC,CAAC,OAAO,EAAEE,UAAU,UAAU,CAAC,EAAER,EAAErB,SAAS;YAC9D;QACF,OAAO;YACL,IAAI,CAACf,MAAM,CAAC0C,GAAG,CAAC,CAAC,SAAS,EAAEN,EAAEf,KAAK,CAAC,UAAU,CAAC,EAAEe,EAAErB,SAAS;QAC9D;IACF;IAEQ0B,oBAAoBd,OAAO,EAAE;QACnC,OAAOA,QAAQmB,IAAI;QACnB,OAAOnB,QAAQoB,KAAK;QACpB,OAAOpB,QAAQqB,QAAQ;QACvB,OAAOrB;IACT;AACF"}

package/dist/state/printer-files.store.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "PrinterFilesStore", {
     }
 });
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
+const _errorutils = require("../utils/error.utils");
 class PrinterFilesStore {
     printerCache;
     printerFilesService;
@@ -26,21 +27,19 @@ class PrinterFilesStore {
         const printers = await this.printerCache.listCachedPrinters(true);
         for (let printer of printers){
             try {
-                const printerFileStorage = await this.printerFilesService.getPrinterFilesStorage(printer.id);
-                this.fileCache.cachePrinterFileStorage(printer.id, printerFileStorage);
+                const printerFiles = await this.printerFilesService.getPrinterFiles(printer.id);
+                this.fileCache.cachePrinterFiles(printer.id, printerFiles);
             } catch (e) {
-                this.logger.error("Files store failed to reconstruct files from database.", e.stack);
+                this.logger.error("Files store failed to reconstruct files from database.", (0, _errorutils.errorSummary)(e));
             }
         }
     }
     async eagerLoadPrinterFiles(printerId, recursive) {
         const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
-        const response = await this.octoPrintApiService.getFiles(loginDto, recursive, {
-            unwrap: false,
-            simple: true
-        });
-        await this.updatePrinterFiles(printerId, response.data);
-        return response;
+        const response = await this.octoPrintApiService.getLocalFiles(loginDto, recursive);
+        const files = response?.files;
+        await this.updatePrinterFiles(printerId, files);
+        return files;
     }
     getFiles(printerId) {
         return this.fileCache.getPrinterFiles(printerId);
@@ -48,9 +47,9 @@ class PrinterFilesStore {
     getOutdatedFiles(printerId, ageDaysMax) {
         if (!ageDaysMax) throw new _runtimeexceptions.ValidationException("ageDaysMax property is required to get printer's outdated files");
         const printerFiles = this.getFiles(printerId);
-        if (!printerFiles?.files?.length) return [];
+        if (!printerFiles?.length) return [];
         const nowTimestampSeconds = Date.now() / 1000;
-        return printerFiles.files.filter((file)=>!!file.date && file.date + ageDaysMax * 86400 < nowTimestampSeconds);
+        return printerFiles.filter((file)=>!!file.date && file.date + ageDaysMax * 86400 < nowTimestampSeconds);
     }
     async deleteOutdatedFiles(printerId, ageDaysMax) {
         const failedFiles = [];
@@ -99,15 +98,13 @@ class PrinterFilesStore {
     }
     async appendOrSetPrinterFile(printerId, addedFile) {
         const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
-        const { fileList, lastPrintedFile } = await this.printerFilesService.appendOrReplaceFile(printer.id, addedFile);
-        await this.fileCache.cachePrinterFiles(printer.id, fileList);
-        await this.printerFilesService.setPrinterLastPrintedFile(printer.id, lastPrintedFile.fileName);
-    }
-    async setExistingFileForPrint(printerId, filePath) {
-        await this.printerFilesService.setPrinterLastPrintedFile(printerId, filePath);
+        const files = await this.printerFilesService.appendOrReplaceFile(printer.id, addedFile);
+        await this.fileCache.cachePrinterFiles(printer.id, files);
     }
     async deleteFile(printerId, filePath, throwError) {
-        const serviceActionResult = await this.printerFilesService.deleteFile(printerId, filePath, throwError);
+        const serviceActionResult = await this.printerFilesService.deletePrinterFiles(printerId, [
+            filePath
+        ], throwError);
         this.fileCache.purgeFile(printerId, filePath);
         return {
             service: serviceActionResult

package/dist/state/printer-files.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFileStorage","getPrinterFilesStorage","id","cachePrinterFileStorage","e","error","stack","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getFiles","unwrap","simple","updatePrinterFiles","data","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","printerFiles","files","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","printerFileList","updateFiles","cachePrinterFiles","appendOrSetPrinterFile","addedFile","fileList","lastPrintedFile","appendOrReplaceFile","setPrinterLastPrintedFile","fileName","setExistingFileForPrint","filePath","deleteFile","throwError","serviceActionResult","purgeFile","service"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFiles","getPrinterFiles","id","cachePrinterFiles","e","error","errorSummary","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getLocalFiles","files","updatePrinterFiles","getFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","printerFileList","updateFiles","appendOrSetPrinterFile","addedFile","appendOrReplaceFile","deleteFile","filePath","throwError","serviceActionResult","deletePrinterFiles","purgeFile","service"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","listCachedPrinters","includeDisabled","printers","getAllValues","filter","enabled","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","listCachedPrinters","includeDisabled","printers","getAllValues","filter","enabled","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}

package/dist/state/settings.store.js

@@ -168,7 +168,12 @@ class SettingsStore {
             this.logger.log("Disabling Sentry for remote diagnostics");
         }
         if ((0, _envutils.isTestEnvironment)()) return;
-        (0, _node.getCurrentHub)().getClient().getOptions().enabled = sentryEnabled;
+        const client = (0, _node.getCurrentHub)().getClient();
+        if (!client) {
+            this.logger.warn("Could not apply Sentry. Was the SDK initialized?");
+            return;
+        }
+        client.getOptions().enabled = sentryEnabled;
     }
 }
 

package/dist/state/settings.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","getCurrentHub","getClient","getOptions","enabled"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}

package/dist/tasks/print-completion.socketio.task.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "PrintCompletionSocketIoTask", {
 const _eventconstants = require("../constants/event.constants");
 const _octoprintwebsocketconstants = require("../services/octoprint/constants/octoprint-websocket.constants");
 const _correlationtokenutil = require("../utils/correlation-token.util");
-const _socketiogateway = require("../state/socket-io.gateway");
 class PrintCompletionSocketIoTask {
     eventEmitter2;
     socketIoGateway;
@@ -31,46 +30,42 @@ class PrintCompletionSocketIoTask {
     get contexts() {
         return this.contextCache;
     }
-    async handleMessage(fdmEvent, octoPrintEvent, data) {
-        const printerId = fdmEvent.replace("octoprint.", "");
+    async handleMessage(fdmEvent, data) {
+        const printerId = data.printerId;
         if (!printerId) {
             this.logger.log(`Skipping print completion log for FDM event ${fdmEvent}`);
         }
-        if (octoPrintEvent !== "event") {
+        if (data.event !== "event") {
             return;
         }
-        this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.CompletionEvent, JSON.stringify({
-            fdmEvent,
-            octoPrintEvent,
-            data
-        }));
         const completion = {
-            status: data.type,
-            fileName: data.payload?.name,
+            status: data.payload.type,
+            fileName: data.payload?.payload?.name,
             createdAt: Date.now(),
             completionLog: data.payload?.error,
             printerId,
-            context: {}
+            context: {
+                correlationId: null
+            }
         };
-        if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.EStop || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelling || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelled || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Home || data.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferStarted || data.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferDone || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected || data.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisStarted || data.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisFinished || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Error) {
+        if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.EStop || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelling || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelled || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Home || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferStarted || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferDone || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisStarted || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisFinished || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Error) {
             this.contextCache[printerId] = {
                 ...this.contextCache[printerId],
-                [data.type]: completion
+                [data.payload.type]: completion
             };
             const corrId = this.contextCache[printerId].correlationId;
             await this.printCompletionService.updateContext(corrId, this.contextCache[printerId]);
             return;
         }
-        if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
+        if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
             const token = (0, _correlationtokenutil.generateCorrelationToken)();
             this.contextCache[printerId] = {
                 correlationId: token
             };
-            completion.correlationId = token;
             completion.context = this.contextCache[printerId];
             await this.printCompletionService.create(completion);
-        } else if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone) {
-            completion.context = this.contextCache[printerId] || {};
+        } else if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone) {
+            completion.context = this.contextCache[printerId];
             await this.printCompletionService.create(completion);
             this.eventEmitter2.emit((0, _eventconstants.fdmMonsterPrinterStoppedEvent)(printerId));
             this.contextCache[printerId] = {};

package/dist/tasks/print-completion.socketio.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","send","IO_MESSAGES","CompletionEvent","JSON","stringify","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","context","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}

package/dist/tasks/printer-websocket.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getServerSettings","debugSettings","debugSocketReconnect","log"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IAIXC,mBAAmB;IAInBC,cAAc;IAIdC,oBAAoB;IAIpBC,mBAAmB;IAKnBC,OAAO;IAEPC,YAAY,EAAEL,kBAAkB,EAAEE,mBAAmB,EAAED,aAAa,EAAEE,kBAAkB,EAAEG,aAAa,EAAE,CAAE;QACzG,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,iBAAiB,GAAGC,aAAa,EAAEC,sBAAsB;YAC9E,IAAI,CAACZ,MAAM,CAACa,GAAG,CAAC,CAAC,kBAAkB,EAAEP,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getServerSettings","debugSettings","debugSocketReconnect","log"],"mappings":";;;;+BAOaA;;;eAAAA;;;AAAN,MAAMA;IACXC,mBAAuC;IACvCC,cAA6B;IAC7BC,oBAAyC;IACzCC,mBAAuC;IAEvCC,OAAsB;IAEtBC,YAAY,EACVL,kBAAkB,EAClBE,mBAAmB,EACnBD,aAAa,EACbE,kBAAkB,EAClBG,aAAa,EAOd,CAAE;QACD,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,iBAAiB,GAAGC,aAAa,EAAEC,sBAAsB;YAC9E,IAAI,CAACZ,MAAM,CAACa,GAAG,CAAC,CAAC,kBAAkB,EAAEP,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}

package/dist/utils/env.utils.js

@@ -67,16 +67,6 @@ function isNodemon() {
 function isNode() {
     return "NODE" in process.env;
 }
-function stringifyDotEnv(obj) {
-    let result = "";
-    for (const [key, value] of Object.entries(obj)){
-        if (key) {
-            const line = `${key}=${String(value)}`;
-            result += line + "\n";
-        }
-    }
-    return result;
-}
 function verifyPackageJsonRequirements(rootPath) {
     const dirConts = _fs.default.readdirSync(rootPath);
     const hasPackageJson = dirConts.includes("package.json");

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;6CApDD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAAST,gBAAgBU,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASX;IACd,OAAOY,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASZ;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASd;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAAShB;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACO,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASpB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAMA,SAASS,gBAAgBC,GAAQ;IAC/B,IAAIC,SAAS;IACb,KAAK,MAAM,CAACf,KAAKgB,MAAM,IAAIC,OAAOC,OAAO,CAACJ,KAAM;QAC9C,IAAId,KAAK;YACP,MAAMmB,OAAO,CAAC,EAAEnB,IAAI,CAAC,EAAEoB,OAAOJ,OAAO,CAAC;YACtCD,UAAUI,OAAO;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASlB,8BAA8BwB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASV,QAAQ,CAAC;IACzC,IAAI,CAACa,gBAAgB;QACnB3B,OAAO4B,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAvB,OAAO6B,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChB9B,OAAO4B,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOzB,6BAAY,CAAC0B,iBAAiB,EAAE;QAChEnC,OAAO4B,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEAlC,OAAO6B,KAAK,CAAC;IACb,OAAO;AACT"}
+{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAoBAC,6BAA6B;eAA7BA;;;6CArCD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAAST,gBAAgBU,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASX;IACd,OAAOY,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASZ;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASd;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAAShB;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACO,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASpB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAEO,SAASP,8BAA8BgB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASF,QAAQ,CAAC;IACzC,IAAI,CAACK,gBAAgB;QACnBnB,OAAOoB,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAf,OAAOqB,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChBtB,OAAOoB,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOjB,6BAAY,CAACkB,iBAAiB,EAAE;QAChE3B,OAAOoB,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEA1B,OAAOqB,KAAK,CAAC;IACb,OAAO;AACT"}