@fdm-monster/server 1.8.2 → 1.9.0-rc1

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/prusa-link/dto/file.dto.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# 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":""}

package/dist/services/prusa-link/prusa-link-http-polling.adapter.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrusaLinkHttpPollingAdapter", {
+    enumerable: true,
+    get: function() {
+        return PrusaLinkHttpPollingAdapter;
+    }
+});
+const _printerapiinterface = require("../printer-api.interface");
+const _errorutils = require("../../utils/error.utils");
+const _prusalinkconstants = require("./constants/prusalink.constants");
+const defaultLog = {
+    adapter: "prusa-link"
+};
+class PrusaLinkHttpPollingAdapter {
+    prusaLinkApi;
+    eventEmitter2;
+    configService;
+    printerType;
+    printerId;
+    login;
+    socketState;
+    apiState;
+    lastMessageReceivedTimestamp;
+    refreshPrinterCurrentInterval;
+    eventEmittingAllowed;
+    constructor(loggerFactory, prusaLinkApi, eventEmitter2, configService){
+        this.prusaLinkApi = prusaLinkApi;
+        this.eventEmitter2 = eventEmitter2;
+        this.configService = configService;
+        this.printerType = _printerapiinterface.PrusaLinkType;
+        this.eventEmittingAllowed = true;
+        this.logger = loggerFactory(PrusaLinkHttpPollingAdapter.name);
+    }
+    allowEmittingEvents() {
+        this.eventEmittingAllowed = true;
+    }
+    disallowEmittingEvents() {
+        this.eventEmittingAllowed = false;
+    }
+    needsReopen() {
+        return !this.refreshPrinterCurrentInterval;
+    }
+    needsSetup() {
+        return !this.refreshPrinterCurrentInterval;
+    }
+    needsReauth() {
+        throw new Error("Method not implemented.");
+    }
+    isClosedOrAborted() {
+        throw new Error("Method not implemented.");
+    }
+    reauthSession() {
+        throw new Error("Method not implemented.");
+    }
+    registerCredentials(socketLogin) {
+        this.login = socketLogin.loginDto;
+        this.printerId = socketLogin.printerId;
+    }
+    open() {
+        this.startPolling();
+    }
+    close() {
+        this.logger.debug("Polling adapter attempting stoppage.", this.logMeta());
+        this.stopPolling();
+    }
+    setupSocketSession() {
+        this.logger.warn("SetupSocketSession", defaultLog);
+        return Promise.resolve();
+    }
+    resetSocketState() {
+        this.logger.warn("ResetSocketState", defaultLog);
+    }
+    startPolling() {
+        this.stopPolling();
+        this.logger.debug("Polling adapter starting, setting interval.", this.logMeta());
+        this.refreshPrinterCurrentInterval = setInterval(async ()=>{
+            if (!this.printerId) {
+                this.logger.warn("Printer ID is not set, skipping status check.", this.logMeta());
+                this.stopPolling();
+                return;
+            }
+            this.socketState = "opening";
+            try {
+                this.prusaLinkApi.login = {
+                    printerURL: this.login.printerURL,
+                    username: this.login.username,
+                    password: this.login.password,
+                    apiKey: "",
+                    printerType: _printerapiinterface.PrusaLinkType
+                };
+                this.socketState = "authenticating";
+                const printerState = await this.prusaLinkApi.getPrinterState();
+                if (printerState.state.flags?.link_state && printerState.state.flags?.link_state !== "PRINTING") {
+                    printerState.state.text = printerState.state.flags.link_state;
+                }
+                const jobState = await this.prusaLinkApi.getJobState();
+                this.socketState = "authenticated";
+                this.apiState = "responding";
+                await this.emitEvent("current", {
+                    ...printerState,
+                    job: jobState.job,
+                    progress: {
+                        printTime: jobState.progress?.printTime,
+                        printTimeLeft: jobState.progress?.printTimeLeft,
+                        completion: jobState.progress?.completion * 100
+                    }
+                });
+            } catch (error) {
+                this.socketState = "error";
+                this.logger.error(`Failed to fetch PrusaLink status ${(0, _errorutils.errorSummary)(error)}`, this.logMeta());
+            }
+        }, 5000);
+    }
+    stopPolling() {
+        if (this.refreshPrinterCurrentInterval) {
+            this.logger.debug("Polling adapter stopping, clearing interval.", this.logMeta());
+            clearInterval(this.refreshPrinterCurrentInterval);
+            this.refreshPrinterCurrentInterval = undefined;
+            this.socketState = "closed";
+        }
+    }
+    async emitEvent(event, payload) {
+        if (!this.eventEmittingAllowed) {
+            return;
+        }
+        this.logger.debug(`Emitting event ${(0, _prusalinkconstants.prusaLinkEvent)(event)}`, this.logMeta());
+        await this.eventEmitter2.emitAsync((0, _prusalinkconstants.prusaLinkEvent)(event), {
+            event,
+            payload,
+            printerId: this.printerId,
+            printerType: _printerapiinterface.PrusaLinkType
+        });
+    }
+    logMeta() {
+        return defaultLog;
+    }
+}
+
+//# sourceMappingURL=prusa-link-http-polling.adapter.js.map

package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","constructor","loggerFactory","prusaLinkApi","eventEmitter2","configService","PrusaLinkType","logger","name","allowEmittingEvents","disallowEmittingEvents","needsReopen","needsSetup","needsReauth","Error","isClosedOrAborted","reauthSession","registerCredentials","socketLogin","loginDto","open","startPolling","close","debug","logMeta","stopPolling","setupSocketSession","warn","Promise","resolve","resetSocketState","setInterval","printerURL","username","password","apiKey","printerState","getPrinterState","state","flags","link_state","text","jobState","getJobState","emitEvent","job","progress","printTime","printTimeLeft","completion","error","errorSummary","clearInterval","undefined","event","payload","prusaLinkEvent","emitAsync"],"mappings":"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"}