@fdm-monster/server 1.8.1 → 1.8.3

package/dist/services/octoprint/plugin-base.service.js

@@ -31,16 +31,16 @@ class PluginBaseService {
         return this._pluginName;
     }
     async isPluginUpToDate(printerLogin) {
-        const response = await this.#queryInstalledPlugin(printerLogin);
+        const response = await this.queryInstalledPlugin(printerLogin);
         const result = this.pluginRepositoryCache.getPlugin(this.pluginName);
         return result?.github?.latest_release.name === response.version;
     }
-    async #queryInstalledPlugin(printerLogin) {
+    async queryInstalledPlugin(printerLogin) {
         const response = await this.octoprintClient.getPluginManagerPlugin(printerLogin, this.pluginName);
-        if (!response) {
+        if (!response.data) {
             throw new _runtimeexceptions.InternalServerException("Plugin query response was empty");
         }
-        return response.plugin;
+        return response.data.plugin;
     }
     async isPluginInstalled(printerLogin) {
         const foundPlugin = await this.findPluginFromListQuery(printerLogin);
@@ -48,10 +48,10 @@ class PluginBaseService {
     }
     async findPluginFromListQuery(printerLogin) {
         const response = await this.octoprintClient.getPluginManagerPlugins(printerLogin);
-        if (!response?.plugins?.length) {
+        if (!response.data?.plugins?.length) {
             throw new _runtimeexceptions.InternalServerException("Plugin query response was empty");
         }
-        return this.findPluginInList(response.plugins);
+        return this.findPluginInList(response.data.plugins);
     }
     findPluginInList(pluginList) {
         return pluginList.find((p)=>p.key.toLowerCase() === this.pluginName.toLowerCase());
@@ -59,40 +59,40 @@ class PluginBaseService {
     async updatePlugin(login) {
         return await this.octoprintClient.postSoftwareUpdate(login, [
             this.pluginName
-        ], this.pluginUrl);
+        ]);
     }
     async installPlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.install.name;
         const plugin = this.pluginRepositoryCache.getPlugin(this.pluginName);
         await this.octoprintClient.postApiPluginManagerCommand(login, command, plugin.archive);
-        await this.#conditionalRestartCommand(login, restartAfter);
+        await this.conditionalRestartCommand(login, restartAfter);
     }
     async uninstallPlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.uninstall.name;
         await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
-        await this.#conditionalRestartCommand(login, restartAfter);
+        await this.conditionalRestartCommand(login, restartAfter);
     }
     async enablePlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.enable.name;
         await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
-        await this.#conditionalRestartCommand(login, restartAfter);
+        await this.conditionalRestartCommand(login, restartAfter);
     }
     async disablePlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.disable.name;
         await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
-        await this.#conditionalRestartCommand(login, restartAfter);
+        await this.conditionalRestartCommand(login, restartAfter);
     }
     async cleanupPlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.cleanup.name;
         await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
-        await this.#conditionalRestartCommand(login, restartAfter);
+        await this.conditionalRestartCommand(login, restartAfter);
     }
     async cleanupAllPlugins(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.cleanup_all.name;
-        await this.octoprintClient.postApiPluginManagerCommand(login, command);
-        await this.#conditionalRestartCommand(login, restartAfter);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginUrl);
+        await this.conditionalRestartCommand(login, restartAfter);
     }
-    async #conditionalRestartCommand(printerLogin, restartAfter = false) {
+    async conditionalRestartCommand(printerLogin, restartAfter = false) {
         if (!restartAfter) return;
         await this.octoprintClient.postServerRestartCommand(printerLogin);
     }

package/dist/services/octoprint/plugin-base.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoprintClient","pluginRepositoryCache","_pluginName","pluginUrl","logger","constructor","loggerFactory","pluginName","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","findPluginFromListQuery","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postServerRestartCommand"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoprintClient","pluginRepositoryCache","_pluginName","pluginUrl","logger","constructor","loggerFactory","pluginName","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","queryInstalledPlugin","result","github","latest_release","name","version","getPluginManagerPlugin","data","InternalServerException","plugin","isPluginInstalled","foundPlugin","findPluginFromListQuery","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","conditionalRestartCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postServerRestartCommand"],"mappings":"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"}

package/dist/services/octoprint/plugin-firmware-update.service.js

@@ -71,7 +71,7 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
     }
     async getPrinterFirmwareVersion(printerLogin) {
         const response = await this.octoprintClient.getSystemInfo(printerLogin);
-        const systemInfo = response.systeminfo;
+        const systemInfo = response.data.systeminfo;
         if (!Object.keys(systemInfo).includes(connectivityProp) || !Object.keys(systemInfo).includes(firmwareProp)) {
             throw new _runtimeexceptions.ValidationException("Could not retrieve printer firmware version as the OctoPrint response was not recognized. Is it connected?");
         }

package/dist/services/octoprint/plugin-firmware-update.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","octoprintClient","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","octoprintClient","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":"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"}

package/dist/services/octoprint/plugin-repository.cache.js

@@ -34,7 +34,8 @@ class PluginRepositoryCache {
         ];
     }
     async queryCache() {
-        this.pluginCache = await this.octoprintClient.fetchOctoPrintPlugins() || [];
+        const response = await this.octoprintClient.fetchOctoPrintPlugins();
+        this.pluginCache = response.data || [];
         this.wasCached = true;
         this.lastQueried = Date.now();
         this.logger.log(`Plugin Cache filled with ${this.pluginCache?.length || "?"} plugins`);

package/dist/services/octoprint/plugin-repository.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/plugin-repository.cache.ts"],"names":["PluginRepositoryCache","octoprintClient","logger","wasCached","pluginCache","lastQueried","undefined","constructor","loggerFactory","name","getPlugin","pluginName","isTestEnvironment","warn","getCache","find","p","id","toLowerCase","queryCache","fetchOctoPrintPlugins","Date","now","log","length"],"mappings":";;;;+BAKaA;;;eAAAA;;;0BALqB;AAK3B,MAAMA;IACXC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,MAAM;IAClBC,cAAc,EAAE,CAAC;IACjBC,cAAcC,UAAU;IAExBC,YAAY,EAAEN,eAAe,EAAEO,aAAa,EAAuE,CAAE;QACnH,IAAI,CAACP,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGM,cAAcR,sBAAsBS,IAAI;IACxD;IAEAC,UAAUC,UAAkB,EAAE;QAC5B,IAAI,CAAC,IAAI,CAACR,SAAS,EAAE;YACnB,IAAI,CAACS,IAAAA,2BAAiB,KAAI;gBACxB,IAAI,CAACV,MAAM,CAACW,IAAI,CAAC,CAAC,wBAAwB,EAAEF,WAAW,0BAA0B,CAAC;YACpF;YACA;QACF;QAEA,OAAO,IAAI,CAACG,QAAQ,GAAGC,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,CAACC,WAAW,OAAOP,WAAWO,WAAW;IAClF;IAEAJ,WAAW;QACT,OAAO;eAAI,IAAI,CAACV,WAAW;SAAC;IAC9B;IAEA,MAAMe,aAAa;QACjB,IAAI,CAACf,WAAW,GAAG,AAAC,MAAM,IAAI,CAACH,eAAe,CAACmB,qBAAqB,MAAO,EAAE;QAC7E,IAAI,CAACjB,SAAS,GAAG;QACjB,IAAI,CAACE,WAAW,GAAGgB,KAAKC,GAAG;QAE3B,IAAI,CAACpB,MAAM,CAACqB,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACnB,WAAW,EAAEoB,UAAU,IAAI,QAAQ,CAAC;QAErF,OAAO,IAAI,CAACV,QAAQ;IACtB;AACF"}
+{"version":3,"sources":["../../../src/services/octoprint/plugin-repository.cache.ts"],"names":["PluginRepositoryCache","octoprintClient","logger","wasCached","pluginCache","lastQueried","undefined","constructor","loggerFactory","name","getPlugin","pluginName","isTestEnvironment","warn","getCache","find","p","id","toLowerCase","queryCache","response","fetchOctoPrintPlugins","data","Date","now","log","length"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BANqB;AAM3B,MAAMA;IACXC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,MAAM;IAClBC,cAA8B,EAAE,CAAC;IACjCC,cAAuBC,UAAU;IAEjCC,YAAY,EAAEN,eAAe,EAAEO,aAAa,EAAuE,CAAE;QACnH,IAAI,CAACP,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGM,cAAcR,sBAAsBS,IAAI;IACxD;IAEAC,UAAUC,UAAkB,EAAE;QAC5B,IAAI,CAAC,IAAI,CAACR,SAAS,EAAE;YACnB,IAAI,CAACS,IAAAA,2BAAiB,KAAI;gBACxB,IAAI,CAACV,MAAM,CAACW,IAAI,CAAC,CAAC,wBAAwB,EAAEF,WAAW,0BAA0B,CAAC;YACpF;YACA;QACF;QAEA,OAAO,IAAI,CAACG,QAAQ,GAAGC,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,CAACC,WAAW,OAAOP,WAAWO,WAAW;IAClF;IAEAJ,WAAW;QACT,OAAO;eAAI,IAAI,CAACV,WAAW;SAAC;IAC9B;IAEA,MAAMe,aAAa;QACjB,MAAMC,WAAW,MAAM,IAAI,CAACnB,eAAe,CAACoB,qBAAqB;QACjE,IAAI,CAACjB,WAAW,GAAGgB,SAASE,IAAI,IAAI,EAAE;QACtC,IAAI,CAACnB,SAAS,GAAG;QACjB,IAAI,CAACE,WAAW,GAAGkB,KAAKC,GAAG;QAE3B,IAAI,CAACtB,MAAM,CAACuB,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACrB,WAAW,EAAEsB,UAAU,IAAI,QAAQ,CAAC;QAErF,OAAO,IAAI,CAACZ,QAAQ;IACtB;AACF"}

package/dist/services/octoprint/utils/octoprint-http-client.builder.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "OctoprintHttpClientBuilder", {
+    enumerable: true,
+    get: function() {
+        return OctoprintHttpClientBuilder;
+    }
+});
+const _defaulthttpclientbuilder = require("../../../shared/default-http-client.builder");
+const _octoprintserviceconstants = require("../constants/octoprint-service.constants");
+class OctoprintHttpClientBuilder extends _defaulthttpclientbuilder.DefaultHttpClientBuilder {
+    build() {
+        if (!this.axiosOptions.baseURL) {
+            throw new Error("Base URL is required");
+        }
+        return super.build();
+    }
+    withXApiKeyHeader(apiKey) {
+        if (!apiKey?.length) {
+            throw new Error("XApiKey header may not be an empty string");
+        }
+        this.withHeaders({
+            [_octoprintserviceconstants.apiKeyHeaderKey]: apiKey
+        });
+        return this;
+    }
+}
+
+//# sourceMappingURL=octoprint-http-client.builder.js.map

package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/octoprint/utils/octoprint-http-client.builder.ts"],"names":["OctoprintHttpClientBuilder","DefaultHttpClientBuilder","build","axiosOptions","baseURL","Error","withXApiKeyHeader","apiKey","length","withHeaders","apiKeyHeaderKey"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;2CACT;AAGzB,MAAMA,mCAAmCC,kDAAwB;IACtDC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,OAAO,KAAK,CAACH;IACf;IAEOI,kBAAkBC,MAAc,EAA8B;QACnE,IAAI,CAACA,QAAQC,QAAQ;YACnB,MAAM,IAAIH,MAAM;QAClB;QAEA,IAAI,CAACI,WAAW,CAAC;YAAE,CAACC,0CAAe,CAAC,EAAEH;QAAO;QAE7C,OAAO,IAAI;IACb;AACF"}

package/dist/services/octoprint.api.js

@@ -104,12 +104,14 @@ class OctoprintApi {
         await this.client.deleteFileOrFolder(this.login, path);
     }
     async getSettings() {
-        return await this.client.getSettings(this.login);
+        const response = await this.client.getSettings(this.login);
+        return response.data;
     }
     async getReprintState() {
-        const connected = await this.client.getConnection(this.login);
-        const connectionState = connected.current?.state;
-        const selectedJob = await this.client.getJob(this.login);
+        const connectedResponse = await this.client.getConnection(this.login);
+        const connectionState = connectedResponse.data.current?.state;
+        const selectedJobResponse = await this.client.getJob(this.login);
+        const selectedJob = selectedJobResponse.data;
         const currentJobFile = selectedJob?.job?.file;
         if (!currentJobFile?.name) {
             return {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","file","size","date","getFiles","files","getLocalFiles","map","f","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","getReprintState","connected","getConnection","connectionState","current","state","selectedJob","getJob","currentJobFile","job","name","reprintState","ReprintState","NoLastPrint","LastPrintReady","getThumbnail"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","file","size","date","getFiles","files","getLocalFiles","map","f","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","name","reprintState","ReprintState","NoLastPrint","LastPrintReady","getThumbnail"],"mappings":"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"}

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

@@ -11,10 +11,11 @@ Object.defineProperty(exports, "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");
+const _normalizeurl = require("../../utils/normalize-url");
+const _urlutils = require("../../utils/url.utils");
 class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printer, _printerdto.PrinterDto) {
     logger;
     eventEmitter2;
@@ -66,7 +67,9 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
     async update(printerId, partial) {
         const printer = await this.get(printerId);
         if (partial.printerURL) {
-            partial.printerURL = (0, _urlutils.normalizeURLWithProtocol)(partial.printerURL);
+            partial.printerURL = (0, _normalizeurl.normalizeUrl)(partial.printerURL, {
+                defaultProtocol: _urlutils.defaultHttpProtocol
+            });
         }
         Object.assign(printer, partial);
         const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterRules);
@@ -153,7 +156,9 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
             ...printer
         };
         if (mergedPrinter.printerURL?.length) {
-            mergedPrinter.printerURL = (0, _urlutils.normalizeURLWithProtocol)(mergedPrinter.printerURL);
+            mergedPrinter.printerURL = (0, _normalizeurl.normalizeUrl)(mergedPrinter.printerURL, {
+                defaultProtocol: _urlutils.defaultHttpProtocol
+            });
         }
         return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createPrinterRules);
     }

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","printerType","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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"}
+{"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","printerType","id","enabled","disabledReason","dateAdded","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","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/shared/default-http-client.builder.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "DefaultHttpClientBuilder", {
+    enumerable: true,
+    get: function() {
+        return DefaultHttpClientBuilder;
+    }
+});
+const _serversettingsconstants = require("../constants/server-settings.constants");
+const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
+const _octoprintserviceconstants = require("../services/octoprint/constants/octoprint-service.constants");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+class DefaultHttpClientBuilder {
+    axiosOptions;
+    constructor(){
+        this.axiosOptions = {
+            baseURL: "",
+            timeout: (0, _serversettingsconstants.getDefaultTimeout)().apiTimeout,
+            headers: {
+                [_octoprintserviceconstants.contentTypeHeaderKey]: _octoprintserviceconstants.jsonContentType
+            }
+        };
+    }
+    build() {
+        const axiosConfig = {
+            baseURL: this.axiosOptions.baseURL,
+            timeout: this.axiosOptions.timeout,
+            headers: this.axiosOptions.headers,
+            data: this.axiosOptions.data,
+            maxBodyLength: this.axiosOptions.maxBodyLength ?? 1000 * 1000 * 1000,
+            maxContentLength: this.axiosOptions.maxContentLength ?? 1000 * 1000 * 1000,
+            responseType: this.axiosOptions.responseType,
+            onUploadProgress: this.axiosOptions.onUploadProgress
+        };
+        return _axios.default.create(axiosConfig);
+    }
+    withMaxBodyLength(maxBodyLength) {
+        this.axiosOptions.maxBodyLength = maxBodyLength;
+        return this;
+    }
+    withMaxContentLength(maxContentLength) {
+        this.axiosOptions.maxContentLength = maxContentLength;
+        return this;
+    }
+    withBaseUrl(baseUrl) {
+        if (!baseUrl?.length) {
+            throw new Error("Base address may not be an empty string");
+        }
+        this.axiosOptions.baseURL = baseUrl;
+        return this;
+    }
+    withTimeout(timeout) {
+        if (!timeout || timeout <= 0) {
+            throw new Error("Timeout value (milliseconds) must be greater than 0");
+        }
+        this.axiosOptions.timeout = timeout;
+        return this;
+    }
+    withMultiPartFormData() {
+        this.withHeaders({
+            "Content-Type": _octoprintserviceconstants.multiPartContentType
+        });
+        return this;
+    }
+    withStreamResponse() {
+        this.axiosOptions.responseType = "stream";
+        return this;
+    }
+    withOnUploadProgress(handler) {
+        this.axiosOptions.onUploadProgress = handler;
+        return this;
+    }
+    withJsonContentTypeHeader() {
+        this.withHeaders({
+            [_octoprintserviceconstants.contentTypeHeaderKey]: _octoprintserviceconstants.jsonContentType
+        });
+        return this;
+    }
+    withHeaders(headers) {
+        this.axiosOptions.headers = {
+            ...this.axiosOptions.headers,
+            ...headers
+        };
+        return this;
+    }
+}
+
+//# sourceMappingURL=default-http-client.builder.js.map

package/dist/shared/default-http-client.builder.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/shared/default-http-client.builder.ts"],"names":["DefaultHttpClientBuilder","axiosOptions","constructor","baseURL","timeout","getDefaultTimeout","apiTimeout","headers","contentTypeHeaderKey","jsonContentType","build","axiosConfig","data","maxBodyLength","maxContentLength","responseType","onUploadProgress","axios","create","withMaxBodyLength","withMaxContentLength","withBaseUrl","baseUrl","length","Error","withTimeout","withMultiPartFormData","withHeaders","multiPartContentType","withStreamResponse","withOnUploadProgress","handler","withJsonContentTypeHeader"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCAZqB;8DAC2C;2CAKtE;;;;;;AAMA,MAAMA;IACDC,aAAiC;IAE3CC,aAAc;QACZ,IAAI,CAACD,YAAY,GAAG;YAClBE,SAAS;YACTC,SAASC,IAAAA,0CAAiB,IAAGC,UAAU;YACvCC,SAAS;gBACP,CAACC,+CAAoB,CAAC,EAAEC,0CAAe;YACzC;QACF;IACF;IAEAC,QAAgC;QAC9B,MAAMC,cAAqC;YACzCR,SAAS,IAAI,CAACF,YAAY,CAACE,OAAO;YAClCC,SAAS,IAAI,CAACH,YAAY,CAACG,OAAO;YAClCG,SAAS,IAAI,CAACN,YAAY,CAACM,OAAO;YAClCK,MAAM,IAAI,CAACX,YAAY,CAACW,IAAI;YAC5BC,eAAe,IAAI,CAACZ,YAAY,CAACY,aAAa,IAAI,OAAO,OAAO;YAChEC,kBAAkB,IAAI,CAACb,YAAY,CAACa,gBAAgB,IAAI,OAAO,OAAO;YACtEC,cAAc,IAAI,CAACd,YAAY,CAACc,YAAY;YAC5CC,kBAAkB,IAAI,CAACf,YAAY,CAACe,gBAAgB;QACtD;QAEA,OAAOC,cAAK,CAACC,MAAM,CAACP;IACtB;IAEAQ,kBAAkBN,aAAqB,EAA4B;QACjE,IAAI,CAACZ,YAAY,CAACY,aAAa,GAAGA;QAClC,OAAO,IAAI;IACb;IAEAO,qBAAqBN,gBAAwB,EAA4B;QACvE,IAAI,CAACb,YAAY,CAACa,gBAAgB,GAAGA;QACrC,OAAO,IAAI;IACb;IAEAO,YAAYC,OAAe,EAA4B;QACrD,IAAI,CAACA,SAASC,QAAQ;YACpB,MAAM,IAAIC,MAAM;QAClB;QAEA,IAAI,CAACvB,YAAY,CAACE,OAAO,GAAGmB;QAC5B,OAAO,IAAI;IACb;IAMAG,YAAYrB,OAAe,EAA4B;QACrD,IAAI,CAACA,WAAWA,WAAW,GAAG;YAC5B,MAAM,IAAIoB,MAAM;QAClB;QAEA,IAAI,CAACvB,YAAY,CAACG,OAAO,GAAGA;QAC5B,OAAO,IAAI;IACb;IAEAsB,wBAA8B;QAC5B,IAAI,CAACC,WAAW,CAAC;YACf,gBAAgBC,+CAAoB;QACtC;QACA,OAAO,IAAI;IACb;IAEAC,qBAA2B;QACzB,IAAI,CAAC5B,YAAY,CAACc,YAAY,GAAG;QACjC,OAAO,IAAI;IACb;IAEAe,qBAAqBC,OAAoD,EAAQ;QAC/E,IAAI,CAAC9B,YAAY,CAACe,gBAAgB,GAAGe;QACrC,OAAO,IAAI;IACb;IAEAC,4BAAsD;QACpD,IAAI,CAACL,WAAW,CAAC;YAAE,CAACnB,+CAAoB,CAAC,EAAEC,0CAAe;QAAC;QAC3D,OAAO,IAAI;IACb;IAEAkB,YAAYpB,OAA+B,EAA4B;QACrE,IAAI,CAACN,YAAY,CAACM,OAAO,GAAG;YAC1B,GAAG,IAAI,CAACN,YAAY,CAACM,OAAO;YAC5B,GAAGA,OAAO;QACZ;QACA,OAAO,IAAI;IACb;AACF"}

package/dist/shared/websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","eventEmittingAllowed","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","allowEmittingEvents","disallowEmittingEvents","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOaA;;;eAAAA;;;iCAPgB;oBAC2D;AAMjF,MAAMA;IACXC,OAAmB;IACTC,OAAsB;IAChCC,uBAAgC,KAAK;IAErCC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACH,MAAM,GAAGG,cAAcL,iBAAiBM,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACN,MAAM,EAAEO,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACV,MAAM,EAAEU;QACb,OAAO,IAAI,CAACV,MAAM;IACpB;IAEOW,sBAAsB;QAC3B,IAAI,CAACT,oBAAoB,GAAG;IAC9B;IAEOU,yBAAyB;QAC9B,IAAI,CAACV,oBAAoB,GAAG;IAC9B;IASAW,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACd,MAAM,GAAG,IAAIQ,aAAS,CAACM,KAAK;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,IAAI,CAACjB,MAAM,CAACkB,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACtB,MAAM,CAACwB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAACnB,MAAM,CAAC0B,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAACzB,QAAQ,IAAI,CAAC,IAAI,CAACN,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACqB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAClC,MAAM,CAAEmC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASUV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQxD,MAAcC,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}
+{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","eventEmittingAllowed","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","allowEmittingEvents","disallowEmittingEvents","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOaA;;;eAAAA;;;iCAPgB;oBAC2D;AAMjF,MAAMA;IACXC,OAAmB;IACTC,OAAsB;IAChCC,uBAAgC,KAAK;IAErCC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACH,MAAM,GAAGG,cAAcL,iBAAiBM,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACN,MAAM,EAAEO,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACV,MAAM,EAAEU;QACb,OAAO,IAAI,CAACV,MAAM;IACpB;IAEOW,sBAAsB;QAC3B,IAAI,CAACT,oBAAoB,GAAG;IAC9B;IAEOU,yBAAyB;QAC9B,IAAI,CAACV,oBAAoB,GAAG;IAC9B;IASAW,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACd,MAAM,GAAG,IAAIQ,aAAS,CAACM,KAAK;YAC/BC,kBAAkBC,6BAAY,CAACC,gCAAgC;QACjE;QACA,IAAI,CAACjB,MAAM,CAACkB,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACtB,MAAM,CAACwB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAACnB,MAAM,CAAC0B,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAACzB,QAAQ,IAAI,CAAC,IAAI,CAACN,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACqB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAClC,MAAM,CAAEmC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASUV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQxD,MAAcC,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}

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

@@ -12,58 +12,53 @@ const _correlationtokenutil = require("../utils/correlation-token.util");
 const _eventconstants = require("../constants/event.constants");
 class FileUploadTrackerCache {
     currentUploads = [];
-    uploadsDone = [];
-    uploadsFailed = [];
     eventEmitter2;
     logger;
     constructor({ loggerFactory, eventEmitter2 }){
         this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(FileUploadTrackerCache.name);
+        this.eventEmitter2.on((0, _eventconstants.uploadProgressEvent)("*"), (token, progress)=>this.handleUploadProgress(token, progress));
+        this.eventEmitter2.on((0, _eventconstants.uploadDoneEvent)("*"), (token)=>this.handleUploadDone(token));
+        this.eventEmitter2.on((0, _eventconstants.uploadFailedEvent)("*"), (token, reason)=>this.handleUploadFailed(token, reason));
     }
-    progressCallback = (token, p)=>{
-        this.updateUploadProgress(token, p);
-    };
-    getUploads(filterHourOld = false) {
-        const currentTime = Date.now();
-        const done = this.uploadsDone.filter((d)=>currentTime - d.startedAt < 60 * 60 * 1000);
-        const failed = this.uploadsFailed.filter((d)=>currentTime - d.startedAt < 60 * 60 * 1000);
-        return filterHourOld ? {
-            current: this.currentUploads,
-            done,
-            failed
-        } : {
-            current: this.currentUploads,
-            done: this.uploadsDone,
-            failed: this.uploadsFailed
+    getUploads() {
+        return {
+            current: this.currentUploads
         };
     }
     getUpload(correlationToken) {
         return this.currentUploads.find((cu)=>cu.correlationToken === correlationToken);
     }
-    addUploadTracker(multerFile) {
+    addUploadTracker(multerFile, printerId) {
         const correlationToken = (0, _correlationtokenutil.generateCorrelationToken)();
         this.logger.log(`Starting upload session with token ${correlationToken}`);
-        this.eventEmitter2.on((0, _eventconstants.uploadProgressEvent)(correlationToken), this.progressCallback);
         this.currentUploads.push({
             correlationToken,
+            printerId,
             startedAt: Date.now(),
             multerFile,
-            progress: {}
+            progress: 0,
+            completed: false,
+            completedAt: null,
+            success: null,
+            reason: null
         });
         return correlationToken;
     }
-    updateUploadProgress(token, progress, reason) {
-        if (progress.progress === 1) {
-            this.logger.log("Upload tracker completed");
-            this.markUploadDone(token, true);
-            this.eventEmitter2.off((0, _eventconstants.uploadProgressEvent)(token), this.progressCallback);
-        } else if (progress.failed) {
-            this.markUploadDone(token, false, reason);
-            this.eventEmitter2.off((0, _eventconstants.uploadProgressEvent)(token), this.progressCallback);
-        } else {
-            const upload = this.getUpload(token);
-            upload.progress = progress;
+    handleUploadProgress(token, event) {
+        const upload = this.getUpload(token);
+        if (!upload) {
+            return;
         }
+        upload.progress = event.progress;
+    }
+    handleUploadFailed(token, reason) {
+        this.logger.log(`Upload tracker ${token} completed with failure`);
+        this.markUploadDone(token, false, reason);
+    }
+    handleUploadDone(token) {
+        this.logger.log(`Upload tracker ${token} completed with success`);
+        this.markUploadDone(token, true);
     }
     markUploadDone(token, success, reason) {
         const trackedUploadIndex = this.currentUploads.findIndex((cu)=>cu.correlationToken === token);
@@ -72,15 +67,10 @@ class FileUploadTrackerCache {
             return;
         }
         const trackedUpload = this.currentUploads[trackedUploadIndex];
-        if (success) {
-            trackedUpload.failedAt = Date.now();
-            trackedUpload.reason = reason;
-            this.uploadsDone.push(trackedUpload);
-        } else {
-            trackedUpload.succeededAt = Date.now();
-            this.uploadsFailed.push(trackedUpload);
-        }
-        this.currentUploads.splice(trackedUploadIndex, 1);
+        trackedUpload.completed = true;
+        trackedUpload.success = success;
+        trackedUpload.completedAt = Date.now();
+        trackedUpload.reason = reason;
     }
 }
 

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","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","eventEmitter2","logger","constructor","loggerFactory","name","on","uploadProgressEvent","token","progress","handleUploadProgress","uploadDoneEvent","handleUploadDone","uploadFailedEvent","reason","handleUploadFailed","getUploads","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","printerId","generateCorrelationToken","log","push","startedAt","Date","now","completed","completedAt","success","event","upload","markUploadDone","trackedUploadIndex","findIndex","warn","trackedUpload"],"mappings":";;;;+BASaA;;;eAAAA;;;sCAT4B;gCAC+B;AAQjE,MAAMA;IACHC,iBAAkC,EAAE,CAAC;IACrCC,cAA6B;IAC7BC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAEH,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGE,cAAcL,uBAAuBM,IAAI;QAEvD,IAAI,CAACJ,aAAa,CAACK,EAAE,CAACC,IAAAA,mCAAmB,EAAC,MAAM,CAACC,OAAOC,WAAa,IAAI,CAACC,oBAAoB,CAACF,OAAOC;QACtG,IAAI,CAACR,aAAa,CAACK,EAAE,CAACK,IAAAA,+BAAe,EAAC,MAAM,CAACH,QAAkB,IAAI,CAACI,gBAAgB,CAACJ;QACrF,IAAI,CAACP,aAAa,CAACK,EAAE,CAACO,IAAAA,iCAAiB,EAAC,MAAM,CAACL,OAAeM,SAAoB,IAAI,CAACC,kBAAkB,CAACP,OAAOM;IACnH;IAEAE,aAAa;QACX,OAAO;YACLC,SAAS,IAAI,CAACjB,cAAc;QAC9B;IACF;IAEAkB,UAAUC,gBAAwB,EAAE;QAClC,OAAO,IAAI,CAACnB,cAAc,CAACoB,IAAI,CAAC,CAACC,KAAOA,GAAGF,gBAAgB,KAAKA;IAClE;IAEAG,iBAAiBC,UAA+B,EAAEC,SAAiB,EAAE;QACnE,MAAML,mBAAmBM,IAAAA,8CAAwB;QACjD,IAAI,CAACvB,MAAM,CAACwB,GAAG,CAAC,CAAC,mCAAmC,EAAEP,kBAAkB;QAExE,IAAI,CAACnB,cAAc,CAAC2B,IAAI,CAAC;YACvBR;YACAK;YACAI,WAAWC,KAAKC,GAAG;YACnBP;YACAd,UAAU;YACVsB,WAAW;YACXC,aAAa;YACbC,SAAS;YACTnB,QAAQ;QACV;QAEA,OAAOK;IACT;IAEAT,qBAAqBF,KAAa,EAAE0B,KAAyB,EAAE;QAC7D,MAAMC,SAAS,IAAI,CAACjB,SAAS,CAACV;QAC9B,IAAI,CAAC2B,QAAQ;YACX;QACF;QACAA,OAAO1B,QAAQ,GAAGyB,MAAMzB,QAAQ;IAClC;IAEAM,mBAAmBP,KAAa,EAAEM,MAAe,EAAE;QACjD,IAAI,CAACZ,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO,OAAOM;IACpC;IAEAF,iBAAiBJ,KAAa,EAAE;QAC9B,IAAI,CAACN,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO;IAC7B;IAEA4B,eAAe5B,KAAa,EAAEyB,OAAgB,EAAEnB,MAAe,EAAE;QAC/D,MAAMuB,qBAAqB,IAAI,CAACrC,cAAc,CAACsC,SAAS,CAAC,CAACjB,KAAOA,GAAGF,gBAAgB,KAAKX;QACzF,IAAI6B,uBAAuB,CAAC,GAAG;YAC7B,IAAI,CAACnC,MAAM,CAACqC,IAAI,CAAC,CAAC,sDAAsD,EAAE/B,MAAM,8BAA8B,CAAC;YAC/G;QACF;QAEA,MAAMgC,gBAAgB,IAAI,CAACxC,cAAc,CAACqC,mBAAmB;QAE7DG,cAAcT,SAAS,GAAG;QAC1BS,cAAcP,OAAO,GAAGA;QACxBO,cAAcR,WAAW,GAAGH,KAAKC,GAAG;QACpCU,cAAc1B,MAAM,GAAGA;IACzB;AACF"}

package/dist/state/settings.store.js

@@ -109,6 +109,9 @@ class SettingsStore {
     getServerSettings() {
         return this.getSettings()[_serversettingsconstants.serverSettingsKey];
     }
+    getTimeoutSettings() {
+        return this.getSettings()[_serversettingsconstants.timeoutSettingKey];
+    }
     getFrontendSettings() {
         return this.getSettings()[_serversettingsconstants.frontendSettingKey];
     }
@@ -194,7 +197,7 @@ class SettingsStore {
             this.logger.log("Disabling Sentry for remote diagnostics");
         }
         if ((0, _envutils.isTestEnvironment)()) return;
-        const client = (0, _node.getCurrentHub)().getClient();
+        const client = (0, _node.getClient)();
         if (!client) {
             this.logger.warn("Could not apply Sentry. Was the SDK initialized?");
             return;