@fdm-monster/server 1.5.4 → 1.6.0-rc1

package/dist/services/octoprint/octoprint-sockio.adapter.js

@@ -25,12 +25,12 @@ _export(exports, {
         return octoPrintEvent;
     }
 });
-const _websocketadapter = require("../../utils/websocket.adapter");
 const _httpstatuscodesconstants = require("../../constants/http-status-codes.constants");
 const _serverconstants = require("../../server.constants");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _urlutils = require("../../utils/url.utils");
 const _normalizeurl = require("../../utils/normalize-url");
+const _websocketadapter = require("../../shared/websocket.adapter");
 const Message = {
     connected: "connected",
     reauthRequired: "reauthRequired",
@@ -65,15 +65,10 @@ const API_STATE = {
 };
 const octoPrintEvent = (event)=>`octoprint.${event}`;
 class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
-    printerId;
-    loginDto;
-    socketURL;
-    sessionDto;
-    username;
     octoPrintApiService;
     eventEmitter;
-    logger;
     configService;
+    printerId;
     stateUpdated = false;
     stateUpdateTimestamp = null;
     socketState = SOCKET_STATE.unopened;
@@ -83,6 +78,11 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     lastMessageReceivedTimestamp = null;
     reauthRequired = false;
     reauthRequiredTimestamp = null;
+    loginDto;
+    logger;
+    socketURL;
+    sessionDto;
+    username;
     constructor({ loggerFactory, octoPrintApiService, eventEmitter2, configService }){
         super({
             loggerFactory
@@ -117,7 +117,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         wsUrl.pathname = "/sockjs/websocket";
         this.socketURL = wsUrl;
     }
-    open(_) {
+    open() {
         if (this.socket) {
             throw new Error(`Socket already exists (printerId: ${this.printerId}, ignoring open request`);
         }
@@ -188,39 +188,6 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             throw e;
         });
     }
-    async afterOpened(event) {
-        this.setSocketState(SOCKET_STATE.opened);
-        await this.sendAuth();
-        await this.sendThrottle(_serverconstants.AppConstants.defaultSocketThrottleRate);
-    }
-    async onMessage(message) {
-        this.lastMessageReceivedTimestamp = Date.now();
-        if (this.socketState !== SOCKET_STATE.authenticated) {
-            this.setSocketState(SOCKET_STATE.authenticated);
-        }
-        const data = JSON.parse(message);
-        const eventName = Object.keys(data)[0];
-        const payload = data[eventName];
-        if (eventName === Message.reauthRequired) {
-            this.setReauthRequired();
-        }
-        await this.emitEvent(eventName, payload);
-    }
-    async sendAuth() {
-        this.setSocketState(SOCKET_STATE.authenticating);
-        await this.sendMessage(JSON.stringify({
-            auth: `${this.username}:${this.sessionDto.session}`
-        }));
-    }
-    async afterClosed(event) {
-        this.setSocketState(SOCKET_STATE.closed);
-        delete this.socket;
-        await this.emitEvent(Message.WS_CLOSED);
-    }
-    async onError(error) {
-        this.setSocketState(SOCKET_STATE.error);
-        await this.emitEvent(Message.WS_ERROR, error);
-    }
     setReauthRequired() {
         this.reauthRequired = true;
         this.reauthRequiredTimestamp = Date.now();
@@ -252,20 +219,51 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         this.emitEventSync(Message.WS_STATE_UPDATED, state);
     }
     async emitEvent(event, payload) {
-        const data = {
+        await this.eventEmitter.emitAsync(octoPrintEvent(event), {
             event,
             payload,
             printerId: this.printerId
-        };
-        await this.eventEmitter.emitAsync(octoPrintEvent(event), data);
+        });
     }
     emitEventSync(event, payload) {
-        const data = {
+        this.eventEmitter.emit(octoPrintEvent(event), {
             event,
             payload,
             printerId: this.printerId
-        };
-        this.eventEmitter.emit(octoPrintEvent(event), data);
+        });
+    }
+    async afterOpened(event) {
+        this.setSocketState(SOCKET_STATE.opened);
+        await this.sendAuth();
+        await this.sendThrottle(_serverconstants.AppConstants.defaultSocketThrottleRate);
+    }
+    async onMessage(message) {
+        this.lastMessageReceivedTimestamp = Date.now();
+        if (this.socketState !== SOCKET_STATE.authenticated) {
+            this.setSocketState(SOCKET_STATE.authenticated);
+        }
+        const data = JSON.parse(message);
+        const eventName = Object.keys(data)[0];
+        const payload = data[eventName];
+        if (eventName === Message.reauthRequired) {
+            this.setReauthRequired();
+        }
+        await this.emitEvent(eventName, payload);
+    }
+    async afterClosed(event) {
+        this.setSocketState(SOCKET_STATE.closed);
+        delete this.socket;
+        await this.emitEvent(Message.WS_CLOSED);
+    }
+    async onError(error) {
+        this.setSocketState(SOCKET_STATE.error);
+        await this.emitEvent(Message.WS_ERROR, error);
+    }
+    async sendAuth() {
+        this.setSocketState(SOCKET_STATE.authenticating);
+        await this.sendMessage(JSON.stringify({
+            auth: `${this.username}:${this.sessionDto.session}`
+        }));
     }
 }
 

package/dist/services/octoprint/octoprint-sockio.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","printerId","loginDto","socketURL","sessionDto","username","octoPrintApiService","eventEmitter","logger","configService","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","_","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","afterOpened","onMessage","message","Date","now","data","parse","eventName","Object","keys","payload","setReauthRequired","emitEvent","auth","session","afterClosed","onError","state","log","emitEventSync","emitAsync","emit"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","octoPrintApiService","eventEmitter","configService","printerId","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","loginDto","logger","socketURL","sessionDto","username","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","setReauthRequired","Date","now","state","log","emitEventSync","emitEvent","payload","emitAsync","emit","afterOpened","onMessage","message","data","parse","eventName","Object","keys","afterClosed","onError","auth","session"],"mappings":"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"}

package/dist/services/octoprint/utils/api.utils.js

@@ -12,12 +12,6 @@ _export(exports, {
     constructHeaders: function() {
         return constructHeaders;
     },
-    processGotResponse: function() {
-        return processGotResponse;
-    },
-    processResponse: function() {
-        return processResponse;
-    },
     validateLogin: function() {
         return validateLogin;
     }
@@ -39,34 +33,5 @@ function constructHeaders(apiKey, contentType = _octoprintserviceconstants.jsonC
         [_octoprintserviceconstants.apiKeyHeaderKey]: apiKey
     };
 }
-function processResponse(response, options = {
-    unwrap: true
-}) {
-    if (options.unwrap) {
-        return response?.data;
-    }
-    if (options.simple) {
-        return {
-            status: response.status,
-            data: response.data
-        };
-    }
-    return response;
-}
-async function processGotResponse(response, options = {
-    unwrap: true
-}) {
-    if (options.unwrap) {
-        return JSON.parse(response.body);
-    }
-    if (options.simple) {
-        const data = JSON.parse(response.body);
-        return {
-            status: response.statusCode,
-            data
-        };
-    }
-    return response;
-}
 
 //# sourceMappingURL=api.utils.js.map

package/dist/services/octoprint/utils/api.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","processGotResponse","processResponse","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey","response","options","unwrap","data","simple","status","JSON","parse","body","statusCode"],"mappings":";;;;;;;;;;;IAmBgBA,gBAAgB;eAAhBA;;IA6BMC,kBAAkB;eAAlBA;;IAhBNC,eAAe;eAAfA;;IAxBAC,aAAa;eAAbA;;;2CAJT;mCAC6B;AAG7B,SAASA,cAAcC,KAAe;IAC3C,IAAI,CAACA,MAAMC,MAAM,IAAI,CAACD,MAAME,UAAU,EAAE;QACtC,MAAM,IAAIC,sCAAmB,CAAC;IAChC;IAEA,OAAO;QACLF,QAAQD,MAAMC,MAAM;QACpBC,YAAYF,MAAME,UAAU;IAC9B;AACF;AAEO,SAASN,iBAAiBK,MAAc,EAAEG,cAAcC,0CAAe;IAC5E,OAAO;QACL,CAACC,+CAAoB,CAAC,EAAEF;QACxB,CAACG,0CAAe,CAAC,EAAEN;IACrB;AACF;AAQO,SAASH,gBAAgBU,QAAQ,EAAEC,UAAU;IAAEC,QAAQ;AAAK,CAAC;IAClE,IAAID,QAAQC,MAAM,EAAE;QAClB,OAAOF,UAAUG;IACnB;IACA,IAAIF,QAAQG,MAAM,EAAE;QAClB,OAAO;YAAEC,QAAQL,SAASK,MAAM;YAAEF,MAAMH,SAASG,IAAI;QAAC;IACxD;IACA,OAAOH;AACT;AAQO,eAAeX,mBAAmBW,QAAQ,EAAEC,UAAU;IAAEC,QAAQ;AAAK,CAAC;IAC3E,IAAID,QAAQC,MAAM,EAAE;QAClB,OAAOI,KAAKC,KAAK,CAACP,SAASQ,IAAI;IACjC;IACA,IAAIP,QAAQG,MAAM,EAAE;QAClB,MAAMD,OAAOG,KAAKC,KAAK,CAACP,SAASQ,IAAI;QACrC,OAAO;YAAEH,QAAQL,SAASS,UAAU;YAAEN;QAAK;IAC7C;IACA,OAAOH;AACT"}
+{"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey"],"mappings":";;;;;;;;;;;IAmBgBA,gBAAgB;eAAhBA;;IAXAC,aAAa;eAAbA;;;2CAJT;mCAC6B;AAG7B,SAASA,cAAcC,KAAe;IAC3C,IAAI,CAACA,MAAMC,MAAM,IAAI,CAACD,MAAME,UAAU,EAAE;QACtC,MAAM,IAAIC,sCAAmB,CAAC;IAChC;IAEA,OAAO;QACLF,QAAQD,MAAMC,MAAM;QACpBC,YAAYF,MAAME,UAAU;IAC9B;AACF;AAEO,SAASJ,iBAAiBG,MAAc,EAAEG,cAAcC,0CAAe;IAC5E,OAAO;QACL,CAACC,+CAAoB,CAAC,EAAEF;QACxB,CAACG,0CAAe,CAAC,EAAEN;IACrB;AACF"}

package/dist/services/orm/base.interface.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=base.interface.js.map

package/dist/services/orm/base.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/base.interface.ts"],"names":[],"mappings":""}

package/dist/services/orm/base.service.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "BaseService", {
+    enumerable: true,
+    get: function() {
+        return BaseService;
+    }
+});
+const _typeorm = require("typeorm");
+const _classvalidator = require("class-validator");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+const _pageinterface = require("../interfaces/page.interface");
+function BaseService(entity, dto, createDTO, updateDto) {
+    class BaseServiceHost {
+        typeormService;
+        repository;
+        constructor({ typeormService }){
+            this.typeormService = typeormService;
+            this.repository = typeormService.getDataSource().getRepository(entity);
+        }
+        async get(id, throwIfNotFound = true) {
+            try {
+                return this.repository.findOneByOrFail({
+                    id
+                });
+            } catch (e) {
+                if (throwIfNotFound && e instanceof _typeorm.EntityNotFoundError) {
+                    throw new _runtimeexceptions.NotFoundException(`The entity ${entity} with id '${id}' was not found.`);
+                }
+                return undefined;
+            }
+        }
+        async list(options) {
+            return this.repository.find(options);
+        }
+        async listPaged(page = _pageinterface.DEFAULT_PAGE, options) {
+            return this.repository.find({
+                take: page.pageSize,
+                skip: page.pageSize * page.page,
+                ...options
+            });
+        }
+        async update(id, updateDto) {
+            const entity = await this.get(id);
+            await (0, _classvalidator.validate)(updateDto);
+            await (0, _classvalidator.validate)(Object.assign(entity, updateDto));
+            await this.repository.update(entity.id, updateDto);
+            return entity;
+        }
+        async create(dto) {
+            await (0, _classvalidator.validate)(dto);
+            const entity = this.repository.create(dto);
+            await (0, _classvalidator.validate)(entity);
+            return await this.repository.save(entity);
+        }
+        async delete(id, throwIfNotFound = true) {
+            const entity = await this.get(id, throwIfNotFound);
+            return await this.repository.delete(entity.id);
+        }
+        async deleteMany(ids, emitEvent = true) {
+            return await this.repository.delete(ids);
+        }
+    }
+    return BaseServiceHost;
+}
+
+//# sourceMappingURL=base.service.js.map

package/dist/services/orm/base.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","findOneByOrFail","e","EntityNotFoundError","NotFoundException","undefined","list","options","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAWgBA;;;eAAAA;;;yBAR0F;gCACjF;mCAGS;+BACQ;AAGnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YAClD,IAAI;gBACF,OAAO,IAAI,CAACN,UAAU,CAACO,eAAe,CAAC;oBAAEF;gBAAG;YAC9C,EAAE,OAAOG,GAAG;gBACV,IAAIF,mBAAmBE,aAAaC,4BAAmB,EAAE;oBACvD,MAAM,IAAIC,oCAAiB,CAAC,CAAC,WAAW,EAAEhB,OAAO,UAAU,EAAEW,GAAG,gBAAgB,CAAC;gBACnF;gBACA,OAAOM;YACT;QACF;QAEA,MAAMC,KAAKC,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACb,UAAU,CAACc,IAAI,CAACD;QAC9B;QAEA,MAAME,UAAUC,OAAoBC,2BAAY,EAAEJ,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACb,UAAU,CAACc,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGH,OAAO;YAAC;QACjG;QAEA,MAAMQ,OAAOhB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMiB,IAAAA,wBAAQ,EAACzB;YACf,MAAMyB,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC9B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACqB,MAAM,CAAC3B,OAAOW,EAAE,EAAER;YACxC,OAAOH;QACT;QAEA,MAAM+B,OAAO9B,GAAc,EAAE;YAC3B,MAAM2B,IAAAA,wBAAQ,EAAC3B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAACyB,MAAM,CAAC9B;YACtC,MAAM2B,IAAAA,wBAAQ,EAAC5B;YACf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC0B,IAAI,CAAChC;QACpC;QAEA,MAAMiC,OAAOtB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC2B,MAAM,CAACjC,OAAOW,EAAE;QAC/C;QAEA,MAAMuB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC9B,UAAU,CAAC2B,MAAM,CAACE;QACtC;IACF;IAEA,OAAO/B;AACT"}

package/dist/services/print-completion.service.js

@@ -25,7 +25,6 @@ class PrintCompletionService {
             context: entity.context,
             fileName: entity.fileName,
             createdAt: entity.createdAt,
-            correlationId: entity.correlationId,
             status: entity.status,
             printerId: entity.printerId.toString()
         };

package/dist/services/print-completion.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","correlationId","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,eAAeN,OAAOM,aAAa;YACnCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEJ,QAAQ,EAAEF,aAAa,EAAEK,MAAM,EAAEJ,OAAO,EAAE,GAAG,MAAMS,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAJ;YACAF;YACAK;YACAF,WAAWU,KAAKC,GAAG;YACnBb;QACF;IACF;IAEA,MAAMc,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBb,aAAqB,EAAE;QAC/C,OAAOQ,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBZ;QAC3B;IACF;IAEA,MAAMc,cAAcd,aAAqB,EAAEH,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMP,uBAAe,CAACQ,OAAO,CAAC;YACpD,yBAAyBhB;YACzBC,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEnB,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAe,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMd,uBAAe,CAACe,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEtB,WAAW;oBAAGH,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B1B,QAAQ;wBAAE0B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN3B,QAAQ;wBACN4B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAEjC,SAAS,GAAGiC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAEjC,SAAS;gBAAEiC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM7B,uBAAe,CAACe,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLrC,WAAW;4BACXL,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVG,QAAQ;4BACRF,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}
+{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,QAAQN,OAAOM,MAAM;YACrBC,WAAWP,OAAOO,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEH,QAAQ,EAAEF,aAAa,EAAEI,MAAM,EAAEH,OAAO,EAAE,GAAG,MAAMQ,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAH;YACAF;YACAI;YACAD,WAAWS,KAAKC,GAAG;YACnBZ;QACF;IACF;IAEA,MAAMa,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,OAAON,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBE;QAC3B;IACF;IAEA,MAAMC,cAAcD,aAAqB,EAAEhB,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMR,uBAAe,CAACS,OAAO,CAAC;YACpD,yBAAyBH;YACzBb,QAAQiB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEN,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAE,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMf,uBAAe,CAACgB,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEvB,WAAW;oBAAGF,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B3B,QAAQ;wBAAE2B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN5B,QAAQ;wBACN6B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAElC,SAAS,GAAGkC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAElC,SAAS;gBAAEkC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM9B,uBAAe,CAACgB,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLtC,WAAW;4BACXJ,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVE,QAAQ;4BACRD,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}

package/dist/services/printer-files.service.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "PrinterFilesService", {
     }
 });
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-const _findpredicateutils = require("../utils/find-predicate.utils");
+const _models = require("../models");
 class PrinterFilesService {
     printerService;
     logger;
@@ -17,70 +17,91 @@ class PrinterFilesService {
         this.printerService = printerService;
         this.logger = loggerFactory(PrinterFilesService.name);
     }
-    async getPrinterFilesStorage(printerId) {
-        const printer = await this.printerService.get(printerId);
+    toDto(entity) {
         return {
-            fileList: printer.fileList,
-            storage: printer.storage
+            id: entity.id,
+            printerId: entity.printerId?.toString(),
+            name: entity.name,
+            date: entity.date,
+            display: entity.display,
+            gcodeAnalysis: entity.gcodeAnalysis,
+            hash: entity.hash,
+            origin: entity.origin,
+            path: entity.path,
+            prints: entity.prints,
+            refs: entity.refs,
+            size: entity.size,
+            statistics: entity.statistics,
+            type: entity.type,
+            typePath: entity.typePath
         };
     }
-    async updateFiles(printerId, fileList) {
+    async getPrinterFiles(printerId) {
         const printer = await this.printerService.get(printerId);
-        printer.fileList = fileList;
-        printer.markModified("fileList");
-        await printer.save();
-        return printer.fileList;
+        return _models.PrinterFile.find({
+            printerId: printer.id
+        });
+    }
+    async updateFiles(printerId, newFiles) {
+        const savedFiles = await this.getPrinterFiles(printerId);
+        const newPaths = newFiles.map((f)=>f.path);
+        const deletableSavedFiles = savedFiles.filter((f)=>!newPaths.includes(f.path));
+        const deletableSavedFilePaths = deletableSavedFiles.map((f)=>f.path);
+        await this.deletePrinterFiles(printerId, deletableSavedFilePaths, false);
+        for (const newFile of newFiles){
+            await this.appendOrReplaceFile(printerId, newFile);
+        }
+        return await this.getPrinterFiles(printerId);
     }
     async appendOrReplaceFile(printerId, addedFile) {
         const printer = await this.printerService.get(printerId);
-        const foundFileIndex = printer.fileList.files.findIndex((f)=>f.path === addedFile.path);
-        if (foundFileIndex === -1) {
-            printer.fileList.files.push(addedFile);
+        addedFile.printerId = printer.id;
+        const foundFile = await this.getPrinterFile(printer.id, addedFile.path);
+        if (!foundFile) {
+            await _models.PrinterFile.create(addedFile);
         } else {
-            printer.fileList.files[foundFileIndex] = addedFile;
+            await _models.PrinterFile.replaceOne({
+                printerId: printer.id,
+                id: foundFile.id
+            }, addedFile);
         }
-        printer.markModified("fileList");
-        await printer.save();
-        let lastPrintedFile = {};
-        try {
-            lastPrintedFile = await this.setPrinterLastPrintedFile(printerId, addedFile.name);
-        } catch (e) {
-            this.logger.warn(`Parsing printer file did not succeed. Filename: ${addedFile}`);
-        }
-        return {
-            fileList: printer.fileList,
-            lastPrintedFile
-        };
-    }
-    async setPrinterLastPrintedFile(printerId, fileName) {
-        await this.printerService.get(printerId);
-        const lastPrintedFile = {
-            fileName,
-            editTimestamp: Date.now()
-        };
-        const printer = await this.printerService.updateLastPrintedFile(printerId, lastPrintedFile);
-        this.logger.log("Parsed and updated printer file", printer.lastPrintedFile);
-        return printer.lastPrintedFile;
+        return await this.getPrinterFiles(printer.id);
     }
     async clearFiles(printerId) {
         const printer = await this.printerService.get(printerId);
-        printer.fileList.files = [];
-        printer.markModified("fileList");
-        await printer.save();
+        await _models.PrinterFile.deleteMany({
+            printerId: printer.id
+        });
     }
-    async deleteFile(printerId, filePath, throwError = true) {
+    async deletePrinterFiles(printerId, filePaths, throwError = true) {
         const printer = await this.printerService.get(printerId);
-        const fileIndex = (0, _findpredicateutils.findFileIndex)(printer.fileList, filePath);
-        if (fileIndex === -1) {
-            if (throwError) {
-                throw new _runtimeexceptions.NotFoundException(`A file removal was ordered but this file was not found in database for printer Id ${printerId}`, filePath);
-            } else {
-                this.logger.warn("File was not found in printer fileList");
+        if (!!filePaths && !filePaths?.length) {
+            return;
+        } else if (!filePaths) {
+            throw new Error("Cant delete specific printer files without specific file path array being provided");
+        }
+        for (const filePath of filePaths){
+            const file = await this.getPrinterFile(printerId, filePath);
+            if (!file) {
+                if (throwError) {
+                    throw new _runtimeexceptions.NotFoundException(`A file removal was ordered but this file was not found in database for printer Id ${printerId}`, filePath);
+                } else {
+                    this.logger.warn("File was not found in PrinterFile table");
+                    return;
+                }
             }
+            await _models.PrinterFile.deleteOne({
+                printerId: printer.id,
+                path: filePath
+            });
         }
-        printer.fileList.files.splice(fileIndex, 1);
-        printer.markModified("fileList");
-        await printer.save();
+    }
+    async getPrinterFile(printerId, filePath) {
+        const printer = await this.printerService.get(printerId);
+        return _models.PrinterFile.findOne({
+            printerId: printer.id,
+            path: filePath
+        });
     }
 }
 

package/dist/services/printer-files.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","getPrinterFilesStorage","printerId","printer","get","fileList","storage","updateFiles","markModified","save","appendOrReplaceFile","addedFile","foundFileIndex","files","findIndex","f","path","push","lastPrintedFile","setPrinterLastPrintedFile","e","warn","fileName","editTimestamp","Date","now","updateLastPrintedFile","log","clearFiles","deleteFile","filePath","throwError","fileIndex","findFileIndex","NotFoundException","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","toDto","entity","id","printerId","toString","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath","getPrinterFiles","printer","get","PrinterFile","find","updateFiles","newFiles","savedFiles","newPaths","map","f","deletableSavedFiles","filter","includes","deletableSavedFilePaths","deletePrinterFiles","newFile","appendOrReplaceFile","addedFile","foundFile","getPrinterFile","create","replaceOne","clearFiles","deleteMany","filePaths","throwError","length","Error","filePath","file","NotFoundException","warn","deleteOne","findOne"],"mappings":"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"}

package/dist/services/printer.service.js

@@ -12,7 +12,6 @@ const _models = require("../models");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _validators = require("../handlers/validators");
 const _printerservicevalidation = require("./validators/printer-service.validation");
-const _serviceconstants = require("../constants/service.constants");
 const _eventconstants = require("../constants/event.constants");
 const _urlutils = require("../utils/url.utils");
 class PrinterService {
@@ -221,7 +220,6 @@ class PrinterService {
     }
     async validateAndDefault(printer) {
         const mergedPrinter = {
-            ...(0, _serviceconstants.getDefaultPrinterEntry)(),
             enabled: true,
             ...printer
         };

package/dist/services/printer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeURLWithProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateLastPrintedFile","lastPrintedFile","findByIdAndUpdate","new","useFindAndModify","updateFlowRate","flowRate","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule","getDefaultPrinterEntry"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeURLWithProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateLastPrintedFile","lastPrintedFile","findByIdAndUpdate","new","useFindAndModify","updateFlowRate","flowRate","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"],"mappings":"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"}