@fdm-monster/server 1.8.3 → 1.9.0

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

@@ -2,24 +2,20 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "SettingsService2", {
+Object.defineProperty(exports, "SettingsService", {
     enumerable: true,
     get: function() {
-        return SettingsService2;
+        return SettingsService;
     }
 });
 const _entities = require("../../entities");
 const _serversettingsconstants = require("../../constants/server-settings.constants");
 const _baseservice = require("./base.service");
 const _settingsdto = require("../interfaces/settings.dto");
-class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
-    configService;
-    constructor({ configService, typeormService }){
-        super({
-            typeormService
-        });
-        this.configService = configService;
-    }
+const _settingsservicevalidation = require("../validators/settings-service.validation");
+const _runtimesettingsmigration = require("../../shared/runtime-settings.migration");
+const _validators = require("../../handlers/validators");
+class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
     toDto(entity) {
         return {
             [_serversettingsconstants.serverSettingsKey]: {
@@ -33,168 +29,76 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
         };
     }
     async getOrCreate() {
-        let settings = await this.get();
+        let settings = await this.getOptional();
         if (!settings) {
-            const settings = await this.create({
-                [_serversettingsconstants.serverSettingsKey]: (0, _serversettingsconstants.getDefaultServerSettings)(),
-                [_serversettingsconstants.credentialSettingsKey]: (0, _serversettingsconstants.getDefaultCredentialSettings)(),
-                [_serversettingsconstants.wizardSettingKey]: (0, _serversettingsconstants.getDefaultWizardSettings)(),
-                [_serversettingsconstants.printerFileCleanSettingKey]: (0, _serversettingsconstants.getDefaultFileCleanSettings)(),
-                [_serversettingsconstants.frontendSettingKey]: (0, _serversettingsconstants.getDefaultFrontendSettings)(),
-                [_serversettingsconstants.timeoutSettingKey]: (0, _serversettingsconstants.getDefaultTimeout)()
-            });
-            return settings;
+            return await this.create((0, _serversettingsconstants.getDefaultSettings)());
         } else {
-            settings = this.migrateSettingsRuntime(settings);
+            settings = (0, _runtimesettingsmigration.migrateSettingsRuntime)(settings);
+            const settingsId = settings.id;
+            return await this.update(settingsId, settings);
         }
-        return settings;
     }
     async getServerSettings() {
         const settings = await this.getOrCreate();
         return settings[_serversettingsconstants.serverSettingsKey];
     }
-    async patchServerSettings(serverSettingsPartial) {
-        const entity = await this.getOrCreate();
-        if (!entity[_serversettingsconstants.serverSettingsKey]) {
-            throw new Error("No existing server settings found, cant patch");
-        }
-        const newServerSettings = {
-            ...entity[_serversettingsconstants.serverSettingsKey],
-            ...serverSettingsPartial
-        };
-        return await this.updateServerSettings(newServerSettings);
-    }
-    async updateServerSettings(serverSettings) {
+    async updateServerSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.serverSettingsUpdateSchema);
         const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.serverSettingsKey] = serverSettings;
+        entity[_serversettingsconstants.serverSettingsKey] = validatedInput;
         await this.update(entity.id, entity);
         return entity;
     }
-    async updateCredentialSettings(credentialSettings) {
+    async updateJwtSecretCredentialSetting(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.jwtSecretCredentialSettingUpdateSchema);
         const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.credentialSettingsKey] = credentialSettings;
+        entity[_serversettingsconstants.credentialSettingsKey].jwtSecret = validatedInput.jwtSecret;
         await this.update(entity.id, entity);
         return entity;
     }
-    async updateFileCleanSettings(fileCleanSettings) {
+    async updateCredentialSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.credentialSettingUpdateSchema);
         const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.printerFileCleanSettingKey] = fileCleanSettings;
+        entity[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry = validatedInput.refreshTokenExpiry;
+        entity[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts = validatedInput.refreshTokenAttempts;
+        entity[_serversettingsconstants.credentialSettingsKey].jwtExpiresIn = validatedInput.jwtExpiresIn;
         await this.update(entity.id, entity);
         return entity;
     }
-    async updateFrontendSettings(frontendSettings) {
+    async updateFileCleanSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.fileCleanSettingsUpdateSchema);
         const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.frontendSettingKey] = frontendSettings;
+        entity[_serversettingsconstants.printerFileCleanSettingKey] = validatedInput;
         await this.update(entity.id, entity);
         return entity;
     }
-    async updateTimeoutSettings(timeoutSettings) {
+    async updateFrontendSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.frontendSettingsUpdateSchema);
         const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.timeoutSettingKey] = timeoutSettings;
+        entity[_serversettingsconstants.frontendSettingKey] = validatedInput;
         await this.update(entity.id, entity);
         return entity;
     }
-    async patchWizardSettings(wizardSettingsPartial) {
+    async updateTimeoutSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.timeoutSettingsUpdateSchema);
         const entity = await this.getOrCreate();
-        if (!entity[_serversettingsconstants.wizardSettingKey]) {
-            throw new Error("No existing wizard settings found, cant patch");
-        }
-        const newWizardSettings = {
-            ...entity[_serversettingsconstants.wizardSettingKey],
-            ...wizardSettingsPartial
-        };
-        return await this.updateWizardSettings(newWizardSettings);
+        entity[_serversettingsconstants.timeoutSettingKey] = validatedInput;
+        await this.update(entity.id, entity);
+        return entity;
     }
-    async updateWizardSettings(wizardSettings) {
+    async updateWizardSettings(update) {
+        const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.wizardUpdateSchema);
         const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.wizardSettingKey] = wizardSettings;
+        entity[_serversettingsconstants.wizardSettingKey] = validatedInput;
         await this.update(entity.id, entity);
         return entity;
     }
-    async get() {
+    async getOptional() {
         const settingsList = await this.repository.find({
             take: 1
         });
         return settingsList?.length ? settingsList[0] : null;
     }
-    migrateSettingsRuntime(knownSettings) {
-        const entity = knownSettings;
-        if (!entity[_serversettingsconstants.printerFileCleanSettingKey]) {
-            entity[_serversettingsconstants.printerFileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
-        } else {
-            entity[_serversettingsconstants.printerFileCleanSettingKey] = {
-                autoRemoveOldFilesBeforeUpload: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
-                autoRemoveOldFilesAtBoot: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
-                autoRemoveOldFilesCriteriumDays: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesCriteriumDays
-            };
-        }
-        if (!entity[_serversettingsconstants.wizardSettingKey]) {
-            entity[_serversettingsconstants.wizardSettingKey] = (0, _serversettingsconstants.getDefaultWizardSettings)();
-        }
-        if (!entity[_serversettingsconstants.timeoutSettingKey]) {
-            entity[_serversettingsconstants.timeoutSettingKey] = (0, _serversettingsconstants.getDefaultTimeout)();
-        }
-        if (!entity[_serversettingsconstants.serverSettingsKey]) {
-            entity[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
-        } else {
-            entity[_serversettingsconstants.serverSettingsKey] = {
-                debugSettings: entity[_serversettingsconstants.serverSettingsKey].debugSettings,
-                loginRequired: entity[_serversettingsconstants.serverSettingsKey].loginRequired,
-                registration: entity[_serversettingsconstants.serverSettingsKey].registration,
-                experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
-                experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
-                sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
-                experimentalThumbnailSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport || false
-            };
-        }
-        if (!entity[_serversettingsconstants.credentialSettingsKey]) {
-            entity[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
-        }
-        if (!entity[_serversettingsconstants.frontendSettingKey]) {
-            entity[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
-        }
-        return entity;
-    }
-    async patchCredentialSettings(patchUpdate) {
-        const entity = await this.getOrCreate();
-        if (!entity[_serversettingsconstants.credentialSettingsKey]) {
-            throw new Error("No existing wizard settings found, cant patch");
-        }
-        const newCredentialSettings = {
-            ...entity[_serversettingsconstants.credentialSettingsKey],
-            ...patchUpdate
-        };
-        return await this.updateCredentialSettings(newCredentialSettings);
-    }
-    async patchFileCleanSettings(patchUpdate) {
-        const entity = await this.getOrCreate();
-        if (!entity[_serversettingsconstants.printerFileCleanSettingKey]) {
-            throw new Error("No existing wizard settings found, cant patch");
-        }
-        const newFileCleanSettings = {
-            ...entity[_serversettingsconstants.printerFileCleanSettingKey],
-            ...patchUpdate
-        };
-        return await this.updateFileCleanSettings(newFileCleanSettings);
-    }
-    async setLoginRequired(enabled) {
-        const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.serverSettingsKey].loginRequired = enabled;
-        await this.update(entity.id, entity);
-        return entity;
-    }
-    async setRegistrationEnabled(enabled) {
-        const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.serverSettingsKey].registration = enabled;
-        await this.update(entity.id, entity);
-        return entity;
-    }
-    async setSentryDiagnosticsEnabled(enabled) {
-        const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled = enabled;
-        await this.update(entity.id, entity);
-        return entity;
-    }
 }
 
 //# sourceMappingURL=settings.service.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","experimentalThumbnailSupport","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","setRegistrationEnabled","setSentryDiagnosticsEnabled"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","create","getDefaultSettings","migrateSettingsRuntime","settingsId","id","update","getServerSettings","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","updateCredentialSettings","credentialSettingUpdateSchema","refreshTokenExpiry","refreshTokenAttempts","jwtExpiresIn","updateFileCleanSettings","fileCleanSettingsUpdateSchema","updateFrontendSettings","frontendSettingsUpdateSchema","updateTimeoutSettings","timeoutSettingsUpdateSchema","updateWizardSettings","wizardUpdateSchema","settingsList","repository","find","take","length"],"mappings":"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"}

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

@@ -18,15 +18,10 @@ const _userservicevalidation = require("../validators/user-service.validation");
 const _cryptoutils = require("../../utils/crypto.utils");
 const _authorizationconstants = require("../../constants/authorization.constants");
 class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto.UserDto) {
-    typeormService;
     userRoleService;
     roleService;
-    constructor({ typeormService, userRoleService, roleService }){
-        super({
-            typeormService
-        });
-        this.userRoleService = userRoleService;
-        this.roleService = roleService;
+    constructor(typeormService, userRoleService, roleService){
+        super(typeormService), this.userRoleService = userRoleService, this.roleService = roleService;
     }
     toDto(user) {
         return {
@@ -37,7 +32,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
             isRootUser: user.isRootUser,
             username: user.username,
             needsPasswordChange: user.needsPasswordChange,
-            roles: user.roles?.map((r)=>r.roleId)
+            roles: (user.roles ?? []).map((r)=>r.roleId)
         };
     }
     listUsers(limit) {
@@ -45,8 +40,8 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
             take: limit
         });
     }
-    getUser(userId) {
-        return this.get(userId, true);
+    async getUser(userId) {
+        return this.get(userId);
     }
     async getUserRoleIds(userId) {
         const userRoles = await this.userRoleService.listUserRoles(userId);
@@ -78,6 +73,9 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         if (user.isRootUser) {
             throw new _runtimeexceptions.InternalServerException("Cannot delete a root user");
         }
+        if (!user.roles?.length) {
+            throw new _runtimeexceptions.InternalServerException("User:roles relation not loaded, cannot perform deletion role check");
+        }
         const role = this.roleService.getRoleByName(_authorizationconstants.ROLES.ADMIN);
         if (user.roles.find((r)=>r.roleId == role.id)) {
             const administrators = await this.findUsersByRoleId(role.id);
@@ -85,7 +83,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
                 throw new _runtimeexceptions.InternalServerException("Cannot delete the last user with ADMIN role");
             }
         }
-        return await this.delete(userId);
+        await this.delete(userId);
     }
     findRawByUsername(username) {
         return this.repository.findOneBy({
@@ -112,7 +110,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
     }
     async setUserRoleIds(userId, roleIds) {
         await this.userRoleService.setUserRoles(userId, roleIds);
-        return await this.get(userId, true);
+        return await this.get(userId);
     }
     async setVerifiedById(userId, isVerified) {
         const user = await this.getUser(userId);
@@ -138,7 +136,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         }
         const { password } = await (0, _validators.validateInput)({
             password: newPassword
-        }, _userservicevalidation.newPasswordRules);
+        }, _userservicevalidation.newPasswordSchema);
         const passwordHash = (0, _cryptoutils.hashPassword)(password);
         return await this.update(userId, {
             passwordHash,
@@ -148,7 +146,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
     async updatePasswordUnsafeByUsername(username, newPassword) {
         const { password } = await (0, _validators.validateInput)({
             password: newPassword
-        }, _userservicevalidation.newPasswordRules);
+        }, _userservicevalidation.newPasswordSchema);
         const passwordHash = (0, _cryptoutils.hashPassword)(password);
         const user = await this.findRawByUsername(username);
         if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
@@ -163,7 +161,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         });
     }
     async register(input) {
-        const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange, isVerified } = await (0, _validators.validateInput)(input, (0, _userservicevalidation.registerUserRules)(true));
+        const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange, isVerified } = await (0, _validators.validateInput)(input, (0, _userservicevalidation.registerUserSchema)(true));
         const passwordHash = (0, _cryptoutils.hashPassword)(password);
         const result = await this.create({
             username,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","roleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","find","administrators","length","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","NotFoundException","rootUsers","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","verifiedUsers","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserRules","result","create"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","constructor","typeormService","userRoleService","roleService","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","InternalServerException","length","role","getRoleByName","ROLES","ADMIN","find","administrators","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","NotFoundException","rootUsers","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","verifiedUsers","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserSchema","result","create"],"mappings":"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"}

package/dist/services/printer-api.factory.js

@@ -11,20 +11,23 @@ Object.defineProperty(exports, "PrinterApiFactory", {
 const _printerapiinterface = require("./printer-api.interface");
 const _containertokens = require("../container.tokens");
 class PrinterApiFactory {
-    cradle;
-    constructor(cradle){
-        this.cradle = cradle;
+    cradleService;
+    constructor(cradleService){
+        this.cradleService = cradleService;
     }
     getById(id) {
-        const login = this.cradle[_containertokens.DITokens.printerCache].getLoginDto(id);
+        const printerCache = this.cradleService.resolve(_containertokens.DITokens.printerCache);
+        const login = printerCache.getLoginDto(id);
         return this.getScopedPrinter(login);
     }
     getScopedPrinter(login) {
         let printerApi;
         if (login.printerType === _printerapiinterface.OctoprintType) {
-            printerApi = this.cradle[_containertokens.DITokens.octoprintApi];
+            printerApi = this.cradleService.resolve(_containertokens.DITokens.octoprintApi);
         } else if (login.printerType === _printerapiinterface.MoonrakerType) {
-            printerApi = this.cradle[_containertokens.DITokens.moonrakerApi];
+            printerApi = this.cradleService.resolve(_containertokens.DITokens.moonrakerApi);
+        } else if (login.printerType === _printerapiinterface.PrusaLinkType) {
+            printerApi = this.cradleService.resolve(_containertokens.DITokens.prusaLinkApi);
         } else {
             throw new Error("PrinterType is unknown, cant pick the right socket adapter");
         }

package/dist/services/printer-api.factory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradle","constructor","getById","id","login","DITokens","printerCache","getLoginDto","getScopedPrinter","printerApi","printerType","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCAN6C;iCACjC;AAKlB,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,QAAQC,EAAU,EAAe;QAC/B,MAAMC,QAAQ,AAAC,IAAI,CAACJ,MAAM,CAACK,yBAAQ,CAACC,YAAY,CAAC,CAAkBC,WAAW,CAACJ;QAC/E,OAAO,IAAI,CAACK,gBAAgB,CAACJ;IAC/B;IAEAI,iBAAiBJ,KAAe,EAAe;QAC7C,IAAIK;QACJ,IAAIL,MAAMM,WAAW,KAAKC,kCAAa,EAAE;YACvCF,aAAa,IAAI,CAACT,MAAM,CAACK,yBAAQ,CAACO,YAAY,CAAC;QACjD,OAAO,IAAIR,MAAMM,WAAW,KAAKG,kCAAa,EAAE;YAC9CJ,aAAa,IAAI,CAACT,MAAM,CAACK,yBAAQ,CAACS,YAAY,CAAC;QACjD,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;QAEAN,WAAWL,KAAK,GAAGA;QACnB,OAAOK;IACT;AACF"}
+{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","constructor","cradleService","getById","id","printerCache","resolve","DITokens","login","getLoginDto","getScopedPrinter","printerApi","printerType","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","PrusaLinkType","prusaLinkApi","Error"],"mappings":";;;;+BAOaA;;;eAAAA;;;qCAP4D;iCAChD;AAMlB,MAAMA;;IACXC,YACE,AAAiBC,aAA4B,CAC7C;aADiBA,gBAAAA;IAEnB;IAEAC,QAAQC,EAAU,EAAe;QAC/B,MAAMC,eAAe,IAAI,CAACH,aAAa,CAACI,OAAO,CAAeC,yBAAQ,CAACF,YAAY;QACnF,MAAMG,QAAQH,aAAaI,WAAW,CAACL;QACvC,OAAO,IAAI,CAACM,gBAAgB,CAACF;IAC/B;IAEAE,iBAAiBF,KAAe,EAAe;QAC7C,IAAIG;QACJ,IAAIH,MAAMI,WAAW,KAAKC,kCAAa,EAAE;YACvCF,aAAa,IAAI,CAACT,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACO,YAAY;QAC5E,OAAO,IAAIN,MAAMI,WAAW,KAAKG,kCAAa,EAAE;YAC9CJ,aAAa,IAAI,CAACT,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACS,YAAY;QAC5E,OAAO,IAAIR,MAAMI,WAAW,KAAKK,kCAAa,EAAE;YAC9CN,aAAa,IAAI,CAACT,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACW,YAAY;QAC5E,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;QAEAR,WAAWH,KAAK,GAAGA;QACnB,OAAOG;IACT;AACF"}

package/dist/services/printer-api.interface.js

@@ -15,18 +15,25 @@ _export(exports, {
     OctoprintType: function() {
         return OctoprintType;
     },
+    PrinterTypesEnum: function() {
+        return PrinterTypesEnum;
+    },
+    PrusaLinkType: function() {
+        return PrusaLinkType;
+    },
     ReprintState: function() {
         return ReprintState;
-    },
-    capabilities: function() {
-        return capabilities;
     }
 });
 const OctoprintType = 0;
 const MoonrakerType = 1;
-const capabilities = {
-    startPrint: "startPrint"
-};
+const PrusaLinkType = 2;
+var PrinterTypesEnum = /*#__PURE__*/ function(PrinterTypesEnum) {
+    PrinterTypesEnum[PrinterTypesEnum["Octoprint"] = 0] = "Octoprint";
+    PrinterTypesEnum[PrinterTypesEnum["Moonraker"] = 1] = "Moonraker";
+    PrinterTypesEnum[PrinterTypesEnum["PrusaLink"] = 2] = "PrusaLink";
+    return PrinterTypesEnum;
+}({});
 var ReprintState = /*#__PURE__*/ function(ReprintState) {
     ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
     ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";

package/dist/services/printer-api.interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","ReprintState","capabilities","startPrint"],"mappings":";;;;;;;;;;;IAQaA,aAAa;eAAbA;;IADAC,aAAa;eAAbA;;IA2BDC,YAAY;eAAZA;;IAPCC,YAAY;eAAZA;;;AApBN,MAAMF,gBAAgB;AACtB,MAAMD,gBAAgB;AAmBtB,MAAMG,eAAe;IAE1BC,YAAY;AACd;AAIO,IAAA,AAAKF,sCAAAA;;;;WAAAA"}
+{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;IASaA,aAAa;eAAbA;;IADAC,aAAa;eAAbA;;IAIDC,gBAAgB;eAAhBA;;IAFCC,aAAa;eAAbA;;IA2CDC,YAAY;eAAZA;;;AA7CL,MAAMH,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AAEtB,IAAA,AAAKD,0CAAAA;;;;WAAAA;;AAyCL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}

package/dist/services/prusa-link/constants/prusalink-event.dto.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrusaLinkEventDto", {
+    enumerable: true,
+    get: function() {
+        return PrusaLinkEventDto;
+    }
+});
+class PrusaLinkEventDto {
+    event;
+    payload;
+    printerId;
+    printerType;
+}
+
+//# sourceMappingURL=prusalink-event.dto.js.map

package/dist/services/prusa-link/constants/prusalink-event.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/constants/prusalink-event.dto.ts"],"names":["PrusaLinkEventDto","event","payload","printerId","printerType"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,MAAS;IACTC,QAAW;IACXC,UAAa;IACbC,YAAe;AACjB"}

package/dist/services/prusa-link/constants/prusalink.constants.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "prusaLinkEvent", {
+    enumerable: true,
+    get: function() {
+        return prusaLinkEvent;
+    }
+});
+const prusaLinkEvent = (event)=>`prusalink.${event}`;
+
+//# sourceMappingURL=prusalink.constants.js.map

package/dist/services/prusa-link/constants/prusalink.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/constants/prusalink.constants.ts"],"names":["prusaLinkEvent","event"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,iBAAiB,CAACC,QAAkB,CAAC,UAAU,EAAEA,OAAO"}

package/dist/services/prusa-link/dto/file-response.dto.js

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

package/dist/services/prusa-link/dto/file-response.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/dto/file-response.dto.ts"],"names":[],"mappings":""}

package/dist/services/{octoprint/dto/plugin.dto.js → prusa-link/dto/file.dto.js}

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-//# sourceMappingURL=plugin.dto.js.map
+//# sourceMappingURL=file.dto.js.map

package/dist/services/prusa-link/dto/file.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/dto/file.dto.ts"],"names":[],"mappings":""}

package/dist/services/prusa-link/dto/job-state.dto.js

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

package/dist/services/prusa-link/dto/job-state.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/dto/job-state.dto.ts"],"names":[],"mappings":""}

package/dist/services/prusa-link/dto/printer-state.dto.js

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

package/dist/services/prusa-link/dto/printer-state.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/dto/printer-state.dto.ts"],"names":[],"mappings":""}

package/dist/services/prusa-link/dto/status.dto.js

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

package/dist/services/prusa-link/dto/status.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/dto/status.dto.ts"],"names":[],"mappings":""}

package/dist/services/prusa-link/dto/version.dto.js

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

package/dist/services/prusa-link/dto/version.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/prusa-link/dto/version.dto.ts"],"names":[],"mappings":""}