@fdm-monster/server 1.6.0-rc1 → 1.6.0-rc3

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PermissionService", {
+    enumerable: true,
+    get: function() {
+        return PermissionService;
+    }
+});
+const _baseservice = require("./base.service");
+const _entities = require("../../entities");
+const _permissiondto = require("../interfaces/permission.dto");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+const _authorizationconstants = require("../../constants/authorization.constants");
+class PermissionService extends (0, _baseservice.BaseService)(_entities.Permission, _permissiondto.PermissionDto) {
+    logger;
+    _permissions = [];
+    constructor({ loggerFactory, typeormService }){
+        super({
+            typeormService
+        });
+    }
+    get permissions() {
+        return this._permissions;
+    }
+    toDto(permission) {
+        return {
+            id: permission.id,
+            name: permission.name
+        };
+    }
+    authorizePermission(requiredPermission, assignedPermissions) {
+        return !!assignedPermissions.find((assignedPermission)=>{
+            const normalizePermission = this.normalizePermission(assignedPermission);
+            if (!normalizePermission) return false;
+            return normalizePermission === requiredPermission;
+        });
+    }
+    async getPermissionByName(permissionName) {
+        const permission = this.permissions.find((r)=>r.name === permissionName);
+        if (!permission) throw new _runtimeexceptions.NotFoundException("Permission not found");
+        return permission;
+    }
+    async getPermission(permissionId) {
+        const permission = this.permissions.find((r)=>r.id === permissionId);
+        if (!permission) throw new _runtimeexceptions.NotFoundException(`Permission Id '${permissionId}' not found`);
+        return permission;
+    }
+    async syncPermissions() {
+        this._permissions = [];
+        const permissionDefinition = (0, _authorizationconstants.flattenPermissionDefinition)();
+        for (let permission of permissionDefinition){
+            const storedPermission = await this.repository.findOneBy({
+                name: permission
+            });
+            if (!storedPermission) {
+                const newPermission = await this.create({
+                    name: permission
+                });
+                this._permissions.push(newPermission);
+            } else {
+                this._permissions.push(storedPermission);
+            }
+        }
+    }
+    normalizePermission(assignedPermission) {
+        const permissionInstance = this.permissions.find((r)=>r.id === assignedPermission || r.name === assignedPermission);
+        if (!permissionInstance) {
+            this.logger.warn(`The permission by ID ${assignedPermission} did not exist. Skipping.`);
+            return;
+        }
+        return permissionInstance.name;
+    }
+}
+
+//# sourceMappingURL=permission.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","permissions","toDto","permission","id","name","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BATe;0BACD;+BACG;mCACI;wCAIU;AAErC,MAAMA,0BACHC,IAAAA,wBAAW,EAACC,oBAAU,EAAEC,4BAAa;IAGrCC,OAAsB;IACtBC,eAA6B,EAAE,CAAC;IAExCC,YAAY,EAAEC,aAAa,EAAEC,cAAc,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAEA;QAAe;IACzB;IACA,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACJ,YAAY;IAC1B;IAEAK,MAAMC,UAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBC,MAAMF,WAAWE,IAAI;QACvB;IACF;IAEAC,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAW;QACtF,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAuB;QACrE,MAAMV,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAET,IAAI,KAAKQ;QAC3D,IAAI,CAACV,YAAY,MAAM,IAAIY,oCAAiB,CAAC;QAC7C,OAAOZ;IACT;IAEA,MAAMa,cAAcC,YAA0B,EAAuB;QACnE,MAAMd,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKa;QACzD,IAAI,CAACd,YAAY,MAAM,IAAIY,oCAAiB,CAAC,CAAC,eAAe,EAAEE,aAAa,WAAW,CAAC;QAExF,OAAOd;IACT;IAEA,MAAMe,kBAAiC;QACrC,IAAI,CAACrB,YAAY,GAAG,EAAE;QAEtB,MAAMsB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIjB,cAAcgB,qBAAsB;YAC3C,MAAME,mBAAmB,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAElB,MAAMF;YAAW;YAC5E,IAAI,CAACkB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAM,IAAI,CAACC,MAAM,CAAC;oBACtCpB,MAAMF;gBACR;gBACA,IAAI,CAACN,YAAY,CAAC6B,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAAC3B,YAAY,CAAC6B,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAAmC,EAAU;QAC/D,MAAMiB,qBAAqB,IAAI,CAAC1B,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKM,sBAAsBI,EAAET,IAAI,KAAKK;QAClG,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC/B,MAAM,CAACgC,IAAI,CAAC,CAAC,qBAAqB,EAAElB,mBAAmB,yBAAyB,CAAC;YACtF;QACF;QACA,OAAOiB,mBAAmBtB,IAAI;IAChC;AACF"}

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

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrintCompletionService", {
+    enumerable: true,
+    get: function() {
+        return PrintCompletionService;
+    }
+});
+const _baseservice = require("./base.service");
+const _entities = require("../../entities");
+const _printcompletiondto = require("../interfaces/print-completion.dto");
+const _typeorm = require("typeorm");
+const _octoprintwebsocketconstants = require("../octoprint/constants/octoprint-websocket.constants");
+const _arrayutil = require("../../utils/array.util");
+const _printcompletionshared = require("../print-completion.shared");
+class PrintCompletionService extends (0, _baseservice.BaseService)(_entities.PrintCompletion, _printcompletiondto.PrintCompletionDto) {
+    logger;
+    constructor({ typeormService, loggerFactory }){
+        super({
+            typeormService
+        });
+        this.logger = loggerFactory(PrintCompletionService.name);
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            completionLog: entity.completionLog,
+            context: entity.context,
+            fileName: entity.fileName,
+            createdAt: entity.createdAt,
+            printerReference: entity.printerReference,
+            status: entity.status,
+            printerId: entity.printerId
+        };
+    }
+    async create(input) {
+        return await super.create(input);
+    }
+    async findPrintCompletion(correlationId) {
+        const completions = await this.repository.findBy({});
+        console.log({
+            context: {
+                correlationId
+            }
+        });
+        return completions.filter((c)=>c.context?.correlationId === correlationId);
+    }
+    async updateContext(correlationId, context) {
+        const completionEntry = await this.repository.findOneBy({
+            context: {
+                correlationId
+            },
+            status: _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted
+        });
+        if (!completionEntry) {
+            this.logger.warn(`Print with correlationId ${correlationId} could not be updated with new context as it was not found`);
+            return;
+        }
+        completionEntry.context = context;
+        await this.update(completionEntry.id, completionEntry);
+    }
+    async listGroupByPrinterStatus() {
+        const limitedCompletions = await this.listPaged();
+        const printCompletionsAggr = (0, _arrayutil.groupArrayBy)(limitedCompletions, (val)=>val.printerId.toString());
+        const completions = Object.entries(printCompletionsAggr).map(([pc, val])=>({
+                printerId: parseInt(pc),
+                printEvents: val
+            }));
+        return (0, _printcompletionshared.processCompletions)(completions);
+    }
+    async loadPrintContexts() {
+        const completions = await this.repository.find({
+            where: {
+                status: (0, _typeorm.Not)((0, _typeorm.In)([
+                    _octoprintwebsocketconstants.EVENT_TYPES.PrintDone,
+                    _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed
+                ]))
+            },
+            order: {
+                printerId: 1,
+                createdAt: -1
+            }
+        });
+        return (0, _arrayutil.groupArrayBy)(completions, (val)=>val.id.toString());
+    }
+}
+
+//# sourceMappingURL=print-completion.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","console","log","filter","c","updateContext","completionEntry","findOneBy","EVENT_TYPES","PrintStarted","warn","update","listGroupByPrinterStatus","limitedCompletions","listPaged","printCompletionsAggr","groupArrayBy","val","toString","Object","entries","map","pc","parseInt","printEvents","processCompletions","loadPrintContexts","find","where","Not","In","PrintDone","PrintFailed","order"],"mappings":";;;;+BAaaA;;;eAAAA;;;6BAbe;0BACI;oCACqD;yBAG7D;6CACI;2BACC;uCAI2B;AAEjD,MAAMA,+BACHC,IAAAA,wBAAW,EAACC,yBAAe,EAAEC,sCAAkB;IAGvDC,OAAsB;IAEtBC,YAAY,EAAEC,cAAc,EAAEC,aAAa,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAED;QAAe;QACvB,IAAI,CAACF,MAAM,GAAGG,cAAcP,uBAAuBQ,IAAI;IACzD;IAEAC,MAAMC,MAAuB,EAAoC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,kBAAkBN,OAAOM,gBAAgB;YACzCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS;QAC7B;IACF;IAEA,MAAMC,OAAOC,KAA6C,EAAE;QAC1D,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,MAAMC,cAAc,MAAM,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC,CAAC;QAClDC,QAAQC,GAAG,CAAC;YAAEd,SAAS;gBAAES;YAAc;QAAE;QACzC,OAAOC,YAAYK,MAAM,CAAC,CAACC,IAAMA,EAAEhB,OAAO,EAAES,kBAAkBA;IAChE;IAEA,MAAMQ,cAAcR,aAAqB,EAAET,OAA+B,EAAiB;QACzF,MAAMkB,kBAAkB,MAAM,IAAI,CAACP,UAAU,CAACQ,SAAS,CAAC;YACtDnB,SAAS;gBAAES;YAAc;YACzBL,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QACA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC3B,MAAM,CAAC+B,IAAI,CAAC,CAAC,yBAAyB,EAAEb,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAS,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAM,IAAI,CAACuB,MAAM,CAACL,gBAAgBpB,EAAE,EAAEoB;IACxC;IAEA,MAAMM,2BAA2D;QAC/D,MAAMC,qBAAqB,MAAM,IAAI,CAACC,SAAS;QAC/C,MAAMC,uBAAuBC,IAAAA,uBAAY,EAACH,oBAAoB,CAACI,MAAQA,IAAIxB,SAAS,CAACyB,QAAQ;QAC7F,MAAMpB,cAAcqB,OAAOC,OAAO,CAACL,sBAAsBM,GAAG,CAAC,CAAC,CAACC,IAAIL,IAAI,GAAM,CAAA;gBAC3ExB,WAAW8B,SAASD;gBACpBE,aAAaP;YACf,CAAA;QACA,OAAOQ,IAAAA,yCAAkB,EAAC3B;IAC5B;IAEA,MAAM4B,oBAAgE;QACpE,MAAM5B,cAAc,MAAM,IAAI,CAACC,UAAU,CAAC4B,IAAI,CAAC;YAC7CC,OAAO;gBACLpC,QAAQqC,IAAAA,YAAG,EAACC,IAAAA,WAAE,EAAC;oBAACtB,wCAAW,CAACuB,SAAS;oBAAEvB,wCAAW,CAACwB,WAAW;iBAAC;YACjE;YACAC,OAAO;gBACLxC,WAAW;gBACXH,WAAW,CAAC;YACd;QACF;QAEA,OAAO0B,IAAAA,uBAAY,EAAClB,aAAa,CAACmB,MAAQA,IAAI/B,EAAE,CAACgC,QAAQ;IAC3D;AACF"}

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

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterFilesService", {
+    enumerable: true,
+    get: function() {
+        return PrinterFilesService;
+    }
+});
+const _baseservice = require("./base.service");
+const _printerfileentity = require("../../entities/printer-file.entity");
+const _printerfiledto = require("../interfaces/printer-file.dto");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+const _errorutils = require("../../utils/error.utils");
+class PrinterFilesService extends (0, _baseservice.BaseService)(_printerfileentity.PrinterFile, _printerfiledto.PrinterFileDto) {
+    printerService;
+    logger;
+    constructor({ printerService, loggerFactory, typeormService }){
+        super({
+            typeormService
+        });
+        this.printerService = printerService;
+        this.logger = loggerFactory(PrinterFilesService.name);
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            printerId: entity.printerId,
+            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 getPrinterFiles(printerId) {
+        const printer = await this.printerService.get(printerId);
+        return this.listPrinterFiles(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){
+            try {
+                await this.appendOrReplaceFile(printerId, newFile);
+            } catch (e) {
+                this.logger.error(`Error appending file ${(0, _errorutils.errorSummary)(e)}`);
+                throw e;
+            }
+        }
+        return await this.getPrinterFiles(printerId);
+    }
+    async appendOrReplaceFile(printerId, addedFile) {
+        const printer = await this.printerService.get(printerId);
+        addedFile.printerId = printer.id;
+        if (!addedFile.customData) {
+            addedFile.customData = {};
+        }
+        const foundFile = await this.getPrinterFile(printer.id, addedFile.path);
+        if (!foundFile) {
+            await this.create(addedFile);
+        } else {
+            await this.repository.update({
+                printerId: printer.id,
+                path: addedFile.path
+            }, addedFile);
+        }
+        return await this.getPrinterFiles(printer.id);
+    }
+    async clearFiles(printerId) {
+        const printer = await this.printerService.get(printerId);
+        await this.repository.delete({
+            printerId: printer.id
+        });
+    }
+    async deletePrinterFiles(printerId, filePaths, throwError) {
+        const printer = await this.printerService.get(printerId);
+        if (filePaths?.length === 0) return;
+        if (!filePaths?.length) {
+            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(printer.id, 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 ${printer.id}`, filePath);
+                } else {
+                    this.logger.warn("File was not found in PrinterFile table");
+                    return;
+                }
+            }
+            await this.delete(file.id);
+        }
+    }
+    async listPrinterFiles(printerId) {
+        return await this.list({
+            where: {
+                printerId
+            }
+        });
+    }
+    async getPrinterFile(printerId, filePath) {
+        const printer = await this.printerService.get(printerId);
+        return this.repository.findOneBy({
+            printerId: printer.id,
+            path: filePath
+        });
+    }
+}
+
+//# sourceMappingURL=printer-files.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/printer-files.service.ts"],"names":["PrinterFilesService","BaseService","PrinterFile","PrinterFileDto","printerService","logger","constructor","loggerFactory","typeormService","name","toDto","entity","id","printerId","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath","getPrinterFiles","printer","get","listPrinterFiles","updateFiles","newFiles","savedFiles","newPaths","map","f","deletableSavedFiles","filter","includes","deletableSavedFilePaths","deletePrinterFiles","newFile","appendOrReplaceFile","e","error","errorSummary","addedFile","customData","foundFile","getPrinterFile","create","repository","update","clearFiles","delete","filePaths","throwError","length","Error","filePath","file","NotFoundException","warn","list","where","findOneBy"],"mappings":"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"}

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

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterService", {
+    enumerable: true,
+    get: function() {
+        return PrinterService;
+    }
+});
+const _printerdto = require("../interfaces/printer.dto");
+const _printerentity = require("../../entities/printer.entity");
+const _baseservice = require("./base.service");
+const _urlutils = require("../../utils/url.utils");
+const _validators = require("../../handlers/validators");
+const _printerservicevalidation = require("../validators/printer-service.validation");
+const _eventconstants = require("../../constants/event.constants");
+class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printer, _printerdto.PrinterDto) {
+    logger;
+    eventEmitter2;
+    constructor({ loggerFactory, typeormService, eventEmitter2 }){
+        super({
+            typeormService
+        });
+        this.logger = loggerFactory(PrinterService.name);
+        this.eventEmitter2 = eventEmitter2;
+    }
+    toUnsafeDto(entity) {
+        return {
+            ...this.toDto(entity),
+            apiKey: entity.apiKey,
+            printerURL: entity.printerURL
+        };
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            name: entity.name,
+            enabled: entity.enabled,
+            disabledReason: entity.disabledReason,
+            dateAdded: entity.dateAdded
+        };
+    }
+    async list() {
+        return this.repository.find({
+            order: {
+                dateAdded: "ASC"
+            }
+        });
+    }
+    async create(newPrinter, emitEvent = true) {
+        if (newPrinter.id) {
+            delete newPrinter.id;
+        }
+        const mergedPrinter = await this.validateAndDefault(newPrinter);
+        mergedPrinter.dateAdded = Date.now();
+        const printer = await super.create(mergedPrinter);
+        if (emitEvent) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printerCreated, {
+                printer
+            });
+        }
+        return printer;
+    }
+    async update(printerId, partial) {
+        const printer = await this.get(printerId);
+        if (partial.printerURL) {
+            partial.printerURL = (0, _urlutils.normalizeURLWithProtocol)(partial.printerURL);
+        }
+        Object.assign(printer, partial);
+        const { printerURL, apiKey, enabled, name } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterRules);
+        const updatedPrinter = await super.update(printerId, {
+            printerURL,
+            name,
+            apiKey,
+            enabled
+        });
+        this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
+            printer,
+            updatedPrinter
+        });
+        return updatedPrinter;
+    }
+    async batchImport(printers) {
+        if (!printers?.length) return [];
+        this.logger.log(`Validating ${printers.length} printer objects`);
+        for (let printer of printers){
+            await this.validateAndDefault(printer);
+        }
+        const newPrinters = [];
+        for (let printer of printers){
+            const createdPrinter = await this.create(printer, false);
+            newPrinters.push(createdPrinter);
+        }
+        this.logger.log(`Successfully created ${printers.length} printers`);
+        this.eventEmitter2.emit(_eventconstants.printerEvents.batchPrinterCreated, {
+            printers: newPrinters
+        });
+        return newPrinters;
+    }
+    async deleteMany(printerIds, emitEvent = true) {
+        const result = await this.repository.delete(printerIds);
+        if (emitEvent) {
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
+                printerIds
+            });
+        }
+        return result;
+    }
+    updateConnectionSettings(printerId, partial) {
+        return this.update(printerId, partial);
+    }
+    updateDisabledReason(printerId, disabledReason) {
+        return this.update(printerId, {
+            disabledReason
+        });
+    }
+    updateEnabled(printerId, enabled) {
+        return this.update(printerId, {
+            enabled
+        });
+    }
+    updateFeedRate(printerId, feedRate) {
+        return this.update(printerId, {
+            feedRate
+        });
+    }
+    updateFlowRate(printerId, flowRate) {
+        return this.update(printerId, {
+            flowRate
+        });
+    }
+    async validateAndDefault(printer) {
+        const mergedPrinter = {
+            enabled: true,
+            ...printer
+        };
+        if (mergedPrinter.printerURL?.length) {
+            mergedPrinter.printerURL = (0, _urlutils.normalizeURLWithProtocol)(mergedPrinter.printerURL);
+        }
+        return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createPrinterRules);
+    }
+}
+
+//# sourceMappingURL=printer.service.js.map

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

@@ -0,0 +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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"}

package/dist/services/orm/refresh-token.service.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "RefreshTokenService", {
+    enumerable: true,
+    get: function() {
+        return RefreshTokenService;
+    }
+});
+const _baseservice = require("./base.service");
+const _entities = require("../../entities");
+const _refreshtokendto = require("../interfaces/refresh-token.dto");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+const _uuid = require("uuid");
+const _serverconstants = require("../../server.constants");
+const _typeorm = require("typeorm");
+const _authorizationconstants = require("../../constants/authorization.constants");
+class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.RefreshToken, _refreshtokendto.RefreshTokenDto) {
+    settingsStore;
+    logger;
+    constructor({ typeormService, settingsStore, loggerFactory }){
+        super({
+            typeormService
+        });
+        this.settingsStore = settingsStore;
+        this.logger = loggerFactory(RefreshTokenService.name);
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            userId: entity.userId,
+            expiresAt: entity.expiresAt,
+            refreshAttemptsUsed: entity.refreshAttemptsUsed
+        };
+    }
+    async getRefreshToken(refreshToken, throwNotFoundError = true) {
+        const entity = await this.repository.findOneBy({
+            refreshToken
+        });
+        if (!entity) {
+            if (throwNotFoundError) {
+                throw new _runtimeexceptions.AuthenticationError(`The entity ${_entities.RefreshToken.name} '${refreshToken}' was not found.`, _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
+            }
+            return null;
+        }
+        return entity;
+    }
+    async createRefreshTokenForUserId(userId) {
+        const { refreshTokenExpiry } = await this.settingsStore.getCredentialSettings();
+        const refreshToken = (0, _uuid.v4)();
+        const timespan = refreshTokenExpiry ?? _serverconstants.AppConstants.DEFAULT_REFRESH_TOKEN_EXPIRY;
+        if (!refreshTokenExpiry) {
+            this.logger.warn(`Refresh token expiry not set in Settings:credentials, using default ${timespan} seconds}`);
+        }
+        await this.create({
+            userId,
+            expiresAt: Date.now() + timespan * 1000,
+            refreshToken,
+            refreshAttemptsUsed: 0
+        });
+        return refreshToken;
+    }
+    async updateRefreshTokenAttempts(refreshToken, refreshAttemptsUsed) {
+        await this.getRefreshToken(refreshToken, true);
+        await this.repository.update({
+            refreshToken
+        }, {
+            refreshAttemptsUsed
+        });
+    }
+    async purgeAllOutdatedRefreshTokens() {
+        const result = await this.repository.delete({
+            expiresAt: (0, _typeorm.LessThan)(Date.now())
+        });
+        if (result.affected) {
+            this.logger.debug(`Removed ${result.affected} outdated refresh tokens`);
+        }
+    }
+    async deleteRefreshTokenByUserId(userId) {
+        const result = await this.repository.delete({
+            userId
+        });
+        if (result.affected) {
+            this.logger.debug(`Removed ${result.affected} login refresh tokens for user ${userId}`);
+        }
+    }
+    async deleteRefreshToken(refreshToken) {
+        const result = await this.repository.delete({
+            refreshToken
+        });
+        if (result.affected) {
+            this.logger.debug(`Removed ${result.affected} login refresh tokens`);
+        }
+    }
+    async purgeOutdatedRefreshTokensByUserId(userId) {
+        const result = await this.repository.delete({
+            userId,
+            expiresAt: (0, _typeorm.LessThan)(Date.now())
+        });
+        if (result.affected) {
+            this.logger.debug(`Removed ${result.affected} outdated login refresh tokens for user ${userId}`);
+        }
+    }
+}
+
+//# sourceMappingURL=refresh-token.service.js.map

package/dist/services/orm/refresh-token.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/refresh-token.service.ts"],"names":["RefreshTokenService","BaseService","RefreshToken","RefreshTokenDto","settingsStore","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","userId","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","throwNotFoundError","repository","findOneBy","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","update","purgeAllOutdatedRefreshTokens","result","delete","LessThan","affected","debug","deleteRefreshTokenByUserId","deleteRefreshToken","purgeOutdatedRefreshTokensByUserId"],"mappings":"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"}