@fdm-monster/server 1.6.0-rc3 → 1.6.1

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

@@ -67,8 +67,6 @@ const API_STATE = {
 const octoPrintEvent = (event)=>`octoprint.${event}`;
 class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     octoPrintApiService;
-    eventEmitter;
-    configService;
     printerId;
     stateUpdated = false;
     stateUpdateTimestamp = null;
@@ -81,6 +79,8 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     reauthRequiredTimestamp = null;
     loginDto;
     logger;
+    eventEmitter;
+    configService;
     socketURL;
     sessionDto;
     username;
@@ -236,11 +236,11 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     async afterClosed(event) {
         this.setSocketState("closed");
         delete this.socket;
-        await this.emitEvent(Message.WS_CLOSED);
+        await this.emitEvent(Message.WS_CLOSED, "connection closed");
     }
     async onError(error) {
         this.setSocketState("error");
-        await this.emitEvent(Message.WS_ERROR, error);
+        await this.emitEvent(Message.WS_ERROR, error?.length ? error : "connection error");
     }
     async emitEvent(event, payload) {
         await this.eventEmitter.emitAsync(octoPrintEvent(event), {

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","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","log","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","emitEventSync","payload","emit","afterOpened","onMessage","message","data","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","emitEvent","afterClosed","onError","emitAsync","auth","session","state"],"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","printerId","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","loginDto","logger","eventEmitter","configService","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","log","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","emitEventSync","payload","emit","afterOpened","onMessage","message","data","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","emitEvent","afterClosed","onError","length","emitAsync","auth","session","state"],"mappings":"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"}

package/dist/services/orm/floor-position.service.js

@@ -28,7 +28,7 @@ class FloorPositionService extends (0, _baseservice.BaseService)(_floorpositione
     }
     findPrinterPosition(printerId) {
         return this.repository.findOneBy({
-            id: printerId
+            printerId
         });
     }
     deletePrinterPositionsByPrinterId(printerId) {

package/dist/services/orm/floor-position.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","x","y","repository","findOneBy","findPrinterPosition","printerId","id","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","floorId","toDto","entity"],"mappings":";;;;+BAOaA;;;eAAAA;;;qCAPiB;6BACF;0BAGA;AAGrB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9EC,YAAY,EAAEC,cAAc,EAAsC,CAAE;QAClE,KAAK,CAAC;YAAEA;QAAe;IACzB;IAEA,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,CAAS,EAAEC,CAAS,EAAE;QACjC,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEH;YAAGC;QAAE;IAC1C;IAEAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEG,IAAID;QAAU;IACnD;IAEAE,kCAAkCF,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACM,MAAM,CAAC;YAAEF,IAAID;QAAU;IAChD;IAEAI,2BAA2BC,OAAqB,EAAEL,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEO;YAASL;QAAU;IACxD;IAEAM,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLZ,GAAGY,OAAOZ,CAAC;YACXC,GAAGW,OAAOX,CAAC;YACXI,WAAWO,OAAOP,SAAS;YAC3BK,SAASE,OAAOF,OAAO;QACzB;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","id","findPrinterPositionOnFloor","floorId","toDto","entity"],"mappings":";;;;+BAOaA;;;eAAAA;;;qCAPiB;6BACF;0BAGA;AAGrB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9EC,YAAY,EAAEC,cAAc,EAAsC,CAAE;QAClE,KAAK,CAAC;YAAEA;QAAe;IACzB;IAEA,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,CAAS,EAAEC,CAAS,EAAE;QACjC,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEH;YAAGC;QAAE;IAC1C;IAEAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEC,IAAIH;QAAU;IAChD;IAEAI,2BAA2BC,OAAqB,EAAEL,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEO;YAASL;QAAU;IACxD;IAEAM,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLZ,GAAGY,OAAOZ,CAAC;YACXC,GAAGW,OAAOX,CAAC;YACXI,WAAWO,OAAOP,SAAS;YAC3BK,SAASE,OAAOF,OAAO;QACzB;IACF;AACF"}

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

@@ -31,7 +31,7 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
         });
         const printers = dto.printers;
         if (printers?.length) {
-            for (let printer of printers){
+            for (const printer of printers){
                 await this.addOrUpdatePrinter(floor.id, printer);
             }
         }
@@ -87,7 +87,7 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
         return floor;
     }
     async addOrUpdatePrinter(floorId, positionDto) {
-        const floor = await this.get(floorId);
+        await this.get(floorId);
         const position = await this.floorPositionService.findPrinterPosition(positionDto.printerId);
         if (position) {
             await this.floorPositionService.delete(position.id);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","id","get","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","Object","assign","updateFloorRules","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BAXe;0BACS;0BAKiC;4BACxC;wCACqB;mCACjB;AAE3B,MAAMA,qBACHC,IAAAA,wBAAW,EAACC,eAAK,EAAEC,kBAAQ,EAAgBC,wBAAc,EAAgBC,wBAAc;IAGvFC,qBAA2C;IAEnDC,YAAY,EACVD,oBAAoB,EACpBE,cAAc,EAIf,CAAE;QACD,KAAK,CAAC;YAAEA;QAAe;QACvB,IAAI,CAACF,oBAAoB,GAAGA;IAC9B;IAEA,MAAMG,OAAOC,GAAiC,EAAkB;QAC9D,MAAMC,IAAAA,yBAAa,EAACD,KAAKE,wCAAgB;QACzC,MAAMC,QAAQ,MAAM,KAAK,CAACJ,OAAO;YAC/BK,MAAMJ,IAAII,IAAI;YACdD,OAAOH,IAAIG,KAAK;YAChBE,UAAU,EAAE;QACd;QAEA,MAAMA,WAAWL,IAAIK,QAAQ;QAC7B,IAAIA,UAAUC,QAAQ;YACpB,KAAK,IAAIC,WAAWF,SAAU;gBAC5B,MAAM,IAAI,CAACG,kBAAkB,CAACL,MAAMM,EAAE,EAAEF;YAC1C;QACF;QAEA,OAAO,IAAI,CAACG,GAAG,CAACP,MAAMM,EAAE;IAC1B;IAEAE,MAAMR,KAAY,EAA0B;QAC1C,OAAO;YACLM,IAAIN,MAAMM,EAAE;YACZL,MAAMD,MAAMC,IAAI;YAChBD,OAAOA,MAAMA,KAAK;YAClBE,UAAUF,MAAME,QAAQ,CAACO,GAAG,CAAC,CAACC,IAAO,CAAA;oBACnCC,WAAWD,EAAEC,SAAS;oBACtBC,SAASF,EAAEE,OAAO;oBAClBC,GAAGH,EAAEG,CAAC;oBACNC,GAAGJ,EAAEI,CAAC;gBACR,CAAA;QACF;IACF;IAEA,MAAMC,qBAAqB;QACzB,MAAMf,QAAQ,MAAM,IAAI,CAACJ,MAAM,CAAC;YAC9BK,MAAM;YACND,OAAO;QACT;QAEA,OAAO,MAAM,IAAI,CAACO,GAAG,CAACP,MAAMM,EAAE;IAChC;IAEA,MAAMU,OAAOJ,OAAqB,EAAEI,MAAoC,EAAE;QACxE,MAAMhB,QAAQ,MAAM,IAAI,CAACO,GAAG,CAACK;QAC7B,MAAMK,cAAcC,OAAOC,MAAM,CAACnB,OAAOgB;QACzC,MAAMlB,IAAAA,yBAAa,EAACmB,aAAaG,wCAAgB;QACjD,MAAMlB,WAAWe,YAAYf,QAAQ;QACrC,IAAIA,UAAUC,QAAQ;YACpB,KAAK,IAAIC,WAAWF,SAAU;gBAC5B,MAAM,IAAI,CAACG,kBAAkB,CAACL,MAAMM,EAAE,EAAEF;YAC1C;QACF;QACA,OAAOa,YAAYf,QAAQ;QAE3B,OAAO,KAAK,CAACc,OAAOJ,SAASK;IAC/B;IAEA,MAAMI,WAAWT,OAAqB,EAAEX,IAAY,EAAE;QACpD,IAAID,QAAQ,MAAM,IAAI,CAACO,GAAG,CAACK;QAC3BZ,MAAMC,IAAI,GAAGA;QACbD,QAAQ,MAAM,IAAI,CAACgB,MAAM,CAACJ,SAAS;YAAEX;QAAK;QAC1C,OAAOD;IACT;IAEA,MAAMsB,YAAYV,OAAqB,EAAEW,KAAa,EAAkB;QACtE,IAAIvB,QAAQ,MAAM,IAAI,CAACO,GAAG,CAACK;QAC3BZ,MAAMA,KAAK,GAAGuB;QACdvB,QAAQ,MAAM,IAAI,CAACgB,MAAM,CAACJ,SAAS;YAAEZ,OAAOuB;QAAM;QAClD,OAAOvB;IACT;IAEA,MAAMK,mBAAmBO,OAAqB,EAAEY,WAAsC,EAAkB;QACtG,MAAMxB,QAAQ,MAAM,IAAI,CAACO,GAAG,CAACK;QAE7B,MAAMa,WAAW,MAAM,IAAI,CAAChC,oBAAoB,CAACiC,mBAAmB,CAACF,YAAYb,SAAS;QAC1F,IAAIc,UAAU;YACZ,MAAM,IAAI,CAAChC,oBAAoB,CAACkC,MAAM,CAACF,SAASnB,EAAE;QACpD;QAEA,MAAMsB,aAAa,MAAM,IAAI,CAACnC,oBAAoB,CAACoC,YAAY,CAACL,YAAYX,CAAC,EAAEW,YAAYV,CAAC;QAC5F,IAAIc,YAAY;YACd,MAAM,IAAI,CAACnC,oBAAoB,CAACkC,MAAM,CAACC,WAAWtB,EAAE;QACtD;QAEA,MAAMwB,cAAc,IAAIC,uBAAa;QACrCb,OAAOC,MAAM,CAACW,aAAa;YACzBjB,GAAGW,YAAYX,CAAC;YAChBC,GAAGU,YAAYV,CAAC;YAChBH,WAAWa,YAAYb,SAAS;YAChCC,SAASA;QACX;QAEA,MAAM,IAAI,CAACnB,oBAAoB,CAACG,MAAM,CAACkC;QAEvC,OAAO,IAAI,CAACvB,GAAG,CAACK;IAClB;IAEA,MAAMoB,cAAcpB,OAAqB,EAAED,SAAuB,EAAkB;QAClF,MAAMc,WAAW,MAAM,IAAI,CAAChC,oBAAoB,CAACwC,0BAA0B,CAACrB,SAASD;QACrF,IAAI,CAACc,UAAU;YACb,MAAM,IAAIS,oCAAiB,CAAC;QAC9B;QACA,MAAM,IAAI,CAACzC,oBAAoB,CAACkC,MAAM,CAACF,SAASnB,EAAE;QAClD,OAAO,MAAM,IAAI,CAACC,GAAG,CAACK;IACxB;IAEA,MAAMuB,0BAA0BxB,SAAuB,EAAiB;QACtE,MAAM,IAAI,CAAClB,oBAAoB,CAAC2C,iCAAiC,CAACzB;IACpE;AACF"}
+{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","id","get","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","Object","assign","updateFloorRules","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}

package/dist/services/orm/printer-group.service.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterGroupService", {
+    enumerable: true,
+    get: function() {
+        return PrinterGroupService;
+    }
+});
+const _baseservice = require("./base.service");
+const _printergroupentity = require("../../entities/printer-group.entity");
+const _printergroupdto = require("../interfaces/printer-group.dto");
+const _groupentity = require("../../entities/group.entity");
+const _classvalidator = require("class-validator");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+class PrinterGroupService extends (0, _baseservice.BaseService)(_printergroupentity.PrinterGroup, _printergroupdto.PrinterGroupDto) {
+    groupRepository;
+    constructor({ typeormService }){
+        super({
+            typeormService
+        });
+        this.groupRepository = typeormService.getDataSource().getRepository(_groupentity.Group);
+    }
+    async listGroups() {
+        const groups = await this.groupRepository.find();
+        const groupListing = {};
+        for (const group of groups){
+            groupListing[group.id] = {
+                id: group.id,
+                name: group.name,
+                printers: []
+            };
+        }
+        for (const group of groups){
+            groupListing[group.id].printers = await this.repository.findBy({
+                groupId: group.id
+            });
+        }
+        return Object.values(groupListing);
+    }
+    async getGroup(groupId) {
+        const group = await this.groupRepository.findOneBy({
+            id: groupId
+        });
+        if (!group) {
+            throw new _runtimeexceptions.NotFoundException("Group does not exist");
+        }
+        return group;
+    }
+    async getGroupWithPrinters(groupId) {
+        const group = await this.getGroup(groupId);
+        const printerGroups = await this.repository.findBy({
+            groupId: group.id
+        });
+        return {
+            id: group.id,
+            name: group.name,
+            printers: printerGroups
+        };
+    }
+    async createGroup(dto) {
+        if (dto.id) {
+            delete dto.id;
+        }
+        await (0, _classvalidator.validate)(dto);
+        const entity = this.groupRepository.create(dto);
+        await (0, _classvalidator.validate)(entity);
+        const group = await this.groupRepository.save(entity);
+        return await this.getGroupWithPrinters(group.id);
+    }
+    async updateGroupName(groupId, name) {
+        const entity = await this.getGroup(groupId);
+        const updateDto = {
+            name
+        };
+        await (0, _classvalidator.validate)(updateDto);
+        await (0, _classvalidator.validate)(Object.assign(entity, updateDto));
+        await this.groupRepository.update(entity.id, updateDto);
+    }
+    async deleteGroup(groupId) {
+        const group = await this.getGroup(groupId);
+        await this.groupRepository.delete({
+            id: group.id
+        });
+    }
+    async addPrinterToGroup(groupId, printerId) {
+        const group = await this.getGroup(groupId);
+        const alreadyExisting = await this.repository.findOneBy({
+            groupId: group.id,
+            printerId
+        });
+        if (alreadyExisting) return alreadyExisting;
+        return await this.create({
+            groupId: group.id,
+            printerId
+        });
+    }
+    async removePrinterFromGroup(groupId, printerId) {
+        await this.getGroup(groupId);
+        await this.repository.delete({
+            groupId,
+            printerId
+        });
+    }
+    toDto(entity) {
+        return {
+            printerId: entity.printerId,
+            groupId: entity.groupId
+        };
+    }
+}
+
+//# sourceMappingURL=printer-group.service.js.map

package/dist/services/orm/printer-group.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}

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

@@ -98,6 +98,21 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
         });
         return newPrinters;
     }
+    async delete(printerId, emitEvent = true) {
+        const result = await this.repository.delete([
+            printerId
+        ]);
+        if (emitEvent) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
+                printerIds: [
+                    [
+                        printerId
+                    ]
+                ]
+            });
+        }
+        return result;
+    }
     async deleteMany(printerIds, emitEvent = true) {
         const result = await this.repository.delete(printerIds);
         if (emitEvent) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","logger","eventEmitter2","constructor","loggerFactory","typeormService","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeURLWithProtocol","Object","assign","validateInput","createPrinterRules","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","deleteMany","printerIds","result","delete","printersDeleted","updateConnectionSettings","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","logger","eventEmitter2","constructor","loggerFactory","typeormService","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeURLWithProtocol","Object","assign","validateInput","createPrinterRules","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","result","printersDeleted","printerIds","deleteMany","updateConnectionSettings","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}

package/dist/services/validators/yaml-service.validation.js

@@ -24,12 +24,13 @@ const exportPrintersFloorsYamlRules = {
     exportPrinters: "required|boolean",
     exportFloorGrid: "required|boolean",
     exportFloors: "required|boolean",
+    exportGroups: "boolean",
     printerComparisonStrategiesByPriority: "required|arrayUnique|minLength:1",
     "printerComparisonStrategiesByPriority.*": "required|string|in:name,url,id",
     floorComparisonStrategiesByPriority: "required|string|in:name,floor,id",
     notes: "string"
 };
-const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFloors, isTypeormMode)=>{
+const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFloors, importGroups, isTypeormMode)=>{
     const idVal = isTypeormMode ? "integer|min:1" : "mongoId";
     return {
         version: "required|string",
@@ -37,24 +38,28 @@ const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFl
         "config.exportPrinters": "required|boolean",
         "config.exportFloorGrid": "required|boolean",
         "config.exportFloors": "required|boolean",
+        "config.exportGroups": "boolean",
         "config.printerComparisonStrategiesByPriority": "required|arrayUnique|minLength:1",
         "config.printerComparisonStrategiesByPriority.*": "required|string|in:name,url,id",
         "config.floorComparisonStrategiesByPriority": "required|string|in:name,floor,id",
         printers: `${!!importPrinters ? "array|minLength:0" : "not"}`,
-        "printers.*.id": `${idVal}`,
+        "printers.*.id": "required",
         "printers.*.apiKey": `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
         "printers.*.printerURL": "required|httpurl",
         "printers.*.enabled": "boolean",
         "printers.*.name": "required|string",
         floors: `${!!importFloors ? "array|minLength:0" : "not"}`,
-        "floors.*.id": `${idVal}`,
+        "floors.*.id": "required",
         "floors.*.floor": "required|integer",
-        "floors.*.name": "required|string"
+        "floors.*.name": "required|string",
+        groups: `${!!importGroups ? "array|minLength:0" : "not"}`,
+        "groups.*.id": "required",
+        "groups.*.name": "required|string"
     };
 };
 const importPrinterPositionsRules = (isTypeormMode)=>({
         printers: "array|minLength:0",
-        "printers.*.printerId": isTypeormMode ? "integer|min:1" : "mongoId",
+        "printers.*.printerId": "required",
         "printers.*.x": "required|integer|min:0|max:12",
         "printers.*.y": "required|integer|min:0|max:12"
     });

package/dist/services/validators/yaml-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","isTypeormMode","idVal","version","config","printers","UUID_LENGTH","floors"],"mappings":";;;;;;;;;;;IAEaA,6BAA6B;eAA7BA;;IA6CAC,2BAA2B;eAA3BA;;IA7BAC,6BAA6B;eAA7BA;;;kCAlBe;AAErB,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMN,gCAAgC,CAC3CO,gBACAC,iBACAC,cACAC;IAEA,MAAMC,QAAQD,gBAAgB,kBAAkB;IAChD,OAAO;QACLE,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,CAAC,EAAE,CAAC,CAACP,iBAAiB,sBAAsB,MAAM,CAAC;QAC7D,iBAAiB,CAAC,EAAEI,MAAM,CAAC;QAC3B,qBAAqB,CAAC,gBAAgB,EAAEI,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,mBAAmB;QACnBC,QAAQ,CAAC,EAAE,CAAC,CAACP,eAAe,sBAAsB,MAAM,CAAC;QACzD,eAAe,CAAC,EAAEE,MAAM,CAAC;QACzB,kBAAkB;QAClB,iBAAiB;IACnB;AACF;AAEO,MAAMZ,8BAA8B,CAACW,gBAA4B,CAAA;QACtEI,UAAU;QACV,wBAAwBJ,gBAAgB,kBAAkB;QAC1D,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","isTypeormMode","idVal","version","config","printers","UUID_LENGTH","floors","groups"],"mappings":";;;;;;;;;;;IAEaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCApBe;AAErB,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC,cACAC;IAEA,MAAMC,QAAQD,gBAAgB,kBAAkB;IAChD,OAAO;QACLE,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,CAAC,EAAE,CAAC,CAACR,iBAAiB,sBAAsB,MAAM,CAAC;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAES,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,mBAAmB;QACnBC,QAAQ,CAAC,EAAE,CAAC,CAACR,eAAe,sBAAsB,MAAM,CAAC;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QACjBS,QAAQ,CAAC,EAAE,CAAC,CAACR,eAAe,sBAAsB,MAAM,CAAC;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACa,gBAA4B,CAAA;QACtEI,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}

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

@@ -53,7 +53,7 @@ class FileUploadTrackerCache {
         return correlationToken;
     }
     updateUploadProgress(token, progress, reason) {
-        if (progress.done || progress.percent === 1) {
+        if (progress.progress === 1) {
             this.logger.log("Upload tracker completed");
             this.markUploadDone(token, true);
             this.eventEmitter2.off((0, _eventconstants.uploadProgressEvent)(token), this.progressCallback);

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","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}

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

@@ -9,13 +9,26 @@ Object.defineProperty(exports, "PrinterConnectionCache", {
     }
 });
 const _keydiffcache = require("../utils/cache/key-diff.cache");
+const _eventconstants = require("../constants/event.constants");
 class PrinterConnectionCache extends _keydiffcache.KeyDiffCache {
+    eventEmitter2;
+    constructor({ eventEmitter2 }){
+        super();
+        this.eventEmitter2 = eventEmitter2;
+        this.subscribeToEvents();
+    }
+    async handlePrintersDeleted({ printerIds }) {
+        await this.deleteKeysBatch(printerIds);
+    }
     async getPrinterConnection(printerId, connection) {
         await this.setKeyValue(printerId, connection);
     }
     async setPrinterConnection(printerId, connection) {
         await this.setKeyValue(printerId, connection);
     }
+    subscribeToEvents() {
+        this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
+    }
 }
 
 //# sourceMappingURL=printer-connection.cache.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-connection.cache.ts"],"names":["PrinterConnectionCache","KeyDiffCache","getPrinterConnection","printerId","connection","setKeyValue","setPrinterConnection"],"mappings":";;;;+BAMaA;;;eAAAA;;;8BAJgB;AAItB,MAAMA,+BAA+BC,0BAAY;IACtD,MAAMC,qBAAqBC,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;IAEA,MAAME,qBAAqBH,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;AACF"}
+{"version":3,"sources":["../../src/state/printer-connection.cache.ts"],"names":["PrinterConnectionCache","KeyDiffCache","eventEmitter2","constructor","subscribeToEvents","handlePrintersDeleted","printerIds","deleteKeysBatch","getPrinterConnection","printerId","connection","setKeyValue","setPrinterConnection","on","printerEvents","printersDeleted","bind"],"mappings":";;;;+BAMaA;;;eAAAA;;;8BAJgB;gCACC;AAGvB,MAAMA,+BAA+BC,0BAAY;IACtDC,cAA6B;IAE7BC,YAAY,EAAED,aAAa,EAAoC,CAAE;QAC/D,KAAK;QACL,IAAI,CAACA,aAAa,GAAGA;QAErB,IAAI,CAACE,iBAAiB;IACxB;IAEA,MAAMC,sBAAsB,EAAEC,UAAU,EAA4B,EAAE;QACpE,MAAM,IAAI,CAACC,eAAe,CAACD;IAC7B;IAEA,MAAME,qBAAqBC,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;IAEA,MAAME,qBAAqBH,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;IAEQN,oBAAoB;QAC1B,IAAI,CAACF,aAAa,CAACW,EAAE,CAACC,6BAAa,CAACC,eAAe,EAAE,IAAI,CAACV,qBAAqB,CAACW,IAAI,CAAC,IAAI;IAC3F;AACF"}

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

@@ -61,6 +61,7 @@ class PrinterSocketStore {
     }
     reconnectOctoPrint(id) {
         const socket = this.getPrinterSocket(id);
+        if (!socket) return;
         socket.close();
         socket.resetSocketState();
     }
@@ -130,20 +131,6 @@ class PrinterSocketStore {
             api: apiStates
         };
     }
-    handleBatchPrinterCreated({ printers }) {
-        for (const p of printers){
-            this.handlePrinterCreated({
-                printer: p
-            });
-        }
-    }
-    handlePrinterCreated({ printer }) {
-        this.createOrUpdateSocket(printer);
-    }
-    handlePrinterUpdated({ printer }) {
-        this.logger.log(`Printer '${printer.id}' updated. Updating socket.`);
-        this.createOrUpdateSocket(printer);
-    }
     createOrUpdateSocket(printer) {
         const { enabled, id } = printer;
         let foundAdapter = this.printerSocketAdaptersById[id.toString()];
@@ -169,6 +156,20 @@ class PrinterSocketStore {
         });
         foundAdapter.resetSocketState();
     }
+    handleBatchPrinterCreated({ printers }) {
+        for (const p of printers){
+            this.handlePrinterCreated({
+                printer: p
+            });
+        }
+    }
+    handlePrinterCreated({ printer }) {
+        this.createOrUpdateSocket(printer);
+    }
+    handlePrinterUpdated({ printer }) {
+        this.logger.log(`Printer '${printer.id}' updated. Updating socket.`);
+        this.createOrUpdateSocket(printer);
+    }
     handlePrintersDeleted({ printerIds }) {
         printerIds.forEach((id)=>{
             this.deleteSocket(id);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","handleBatchPrinterCreated","printers","p","createOrUpdateSocket","handlePrinterUpdated","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}

package/dist/state/test-printer-socket.store.js

@@ -13,15 +13,19 @@ const _validators = require("../handlers/validators");
 const _createtestprintervalidation = require("./validation/create-test-printer.validation");
 const _octoprintsockioadapter = require("../services/octoprint/octoprint-sockio.adapter");
 const _serverconstants = require("../server.constants");
+const _errorutils = require("../utils/error.utils");
+const _node = require("@sentry/node");
 class TestPrinterSocketStore {
     testSocket;
     socketIoGateway;
     socketFactory;
     eventEmitter2;
-    constructor({ socketFactory, socketIoGateway, eventEmitter2 }){
+    logger;
+    constructor({ socketFactory, socketIoGateway, eventEmitter2, loggerFactory }){
         this.socketFactory = socketFactory;
         this.socketIoGateway = socketIoGateway;
         this.eventEmitter2 = eventEmitter2;
+        this.logger = loggerFactory(TestPrinterSocketStore.name);
     }
     async setupTestPrinter(printer) {
         if (this.testSocket) {
@@ -60,28 +64,42 @@ class TestPrinterSocketStore {
         testEvents.forEach((te)=>{
             this.eventEmitter2.on(te, listener);
         });
-        await this.testSocket.setupSocketSession();
-        const promise = new Promise(async (resolve, reject)=>{
-            this.testSocket.open();
-            for await (const startTime of (0, _promises.setInterval)(100)){
-                if (!this.testSocket) {
-                    return;
-                }
-                if (this.testSocket.socketState === _octoprintsockioadapter.SOCKET_STATE.authenticated) {
-                    resolve();
-                    break;
+        try {
+            this.logger.log("Test API calls for authentication and session");
+            await this.testSocket.setupSocketSession();
+            this.logger.log("Test socket connection started");
+            const promise = new Promise(async (resolve, reject)=>{
+                this.testSocket.open();
+                for await (const startTime of (0, _promises.setInterval)(100)){
+                    if (!this.testSocket) {
+                        this.logger.warn("Test without socket, rejecting");
+                        reject();
+                        return;
+                    }
+                    if (this.testSocket.socketState === _octoprintsockioadapter.SOCKET_STATE.authenticated) {
+                        this.logger.log("Test completed successfully, resolving");
+                        resolve(true);
+                        break;
+                    }
                 }
+            });
+            await Promise.race([
+                promise,
+                (0, _promises.setTimeout)(_serverconstants.AppConstants.defaultWebsocketHandshakeTimeout)
+            ]);
+            this.logger.log("Test finalized");
+        } catch (e) {
+            this.logger.error(`Test harness error ${(0, _errorutils.errorSummary)(e)}`);
+            (0, _node.captureException)(e);
+        } finally{
+            if (this.testSocket) {
+                this.testSocket.close();
             }
-        });
-        await Promise.race([
-            promise,
-            (0, _promises.setTimeout)(_serverconstants.AppConstants.defaultWebsocketHandshakeTimeout)
-        ]);
-        this.testSocket.close();
-        delete this.testSocket;
-        testEvents.forEach((te)=>{
-            this.eventEmitter2.off(te, listener);
-        });
+            delete this.testSocket;
+            testEvents.forEach((te)=>{
+                this.eventEmitter2.off(te, listener);
+            });
+        }
     }
 }