@fdm-monster/server 1.6.2 → 1.6.4

package/dist/services/octoprint/{octoprint-api.service.js → octoprint.client.js}

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "OctoPrintApiService", {
+Object.defineProperty(exports, "OctoprintClient", {
     enumerable: true,
     get: function() {
-        return OctoPrintApiService;
+        return OctoprintClient;
     }
 });
-const _fs = _interop_require_wildcard(require("fs"));
-const _path = _interop_require_default(require("path"));
-const _formdata = _interop_require_default(require("form-data"));
+const _fs = /*#__PURE__*/ _interop_require_wildcard(require("fs"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
 const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
 const _eventconstants = require("../../constants/event.constants");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _octoprintapiroutes = require("./octoprint-api.routes");
-const _axios = _interop_require_default(require("axios"));
+const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
 const _fileutils = require("./utils/file.utils");
 const _node = require("@sentry/node");
 function _interop_require_default(obj) {
@@ -64,37 +64,33 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
+class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
     eventEmitter2;
-    axiosClient;
+    httpClient;
     logger;
     constructor({ settingsStore, httpClient, loggerFactory, eventEmitter2 }){
         super({
             settingsStore
         });
-        this.axiosClient = httpClient;
+        this.httpClient = httpClient;
         this.eventEmitter2 = eventEmitter2;
-        this.logger = loggerFactory(OctoPrintApiService.name);
+        this.logger = loggerFactory(OctoprintClient.name);
     }
-    async getVersion(login, timeout) {
+    async getApiVersion(login, timeout) {
         const { url, options } = this.prepareRequest(login, this.apiVersion, timeout);
-        const response = await this.axiosClient.get(url, options);
-        return response?.data;
+        return await this.httpClient.get(url, options);
     }
     async getServer(login) {
         const { url, options } = this.prepareRequest(login, this.apiServer);
-        const response = await this.axiosClient.get(url, options);
-        return response?.data;
+        return await this.httpClient.get(url, options);
     }
     async login(login) {
         const { url, options } = this.prepareRequest(login, this.apiLogin);
-        const response = await this.axiosClient.post(url, {}, options);
-        return response?.data;
+        return await this.httpClient.post(url, {}, options);
     }
     async sendConnectionCommand(login, commandData) {
         const { url, options, data } = this.prepareJsonRequest(login, this.apiConnection, commandData);
-        const response = await this.axiosClient.post(url, data, options);
-        return response?.data;
+        await this.httpClient.post(url, data, options);
     }
     async sendPrintHeadJogCommand(login, amounts) {
         const axesToHome = {
@@ -128,74 +124,79 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
     }
     async sendPrintHeadCommand(login, commandData) {
         const { url, options, data } = this.prepareJsonRequest(login, this.apiPrinterHead, commandData);
-        const response = await this.axiosClient.post(url, data, options);
+        const response = await this.httpClient.post(url, data, options);
         return response?.data;
     }
     async sendCustomGCodeCommand(login, commandString) {
         const { url, options, data } = this.prepareJsonRequest(login, this.apiPrinterCustomCommand, {
             command: commandString
         });
-        const response = await this.axiosClient.post(url, data, options);
+        const response = await this.httpClient.post(url, data, options);
+        return response?.data;
+    }
+    async getJob(login) {
+        const { url, options } = this.prepareRequest(login, this.apiJob);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async sendJobCommand(login, commandData) {
         const { url, options, data } = this.prepareJsonRequest(login, this.apiJob, commandData);
-        const response = await this.axiosClient.post(url, data, options);
+        const response = await this.httpClient.post(url, data, options);
         return response?.data;
     }
     async sendBedTempCommand(login, targetTemp) {
         const { url, options, data } = this.prepareJsonRequest(login, this.apiPrinterBed, this.getBedTargetCommand(targetTemp));
-        const response = await this.axiosClient.post(url, data, options);
+        const response = await this.httpClient.post(url, data, options);
         return response?.data;
     }
     async getSettings(login) {
         const { url, options } = this.prepareRequest(login, this.apiSettingsPart);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async updatePrinterNameSetting(login, printerName) {
         const { url, options } = this.prepareRequest(login, this.apiSettingsPart);
         const settingPatch = this.printerNameSetting(printerName);
-        const response = await this.axiosClient.post(url, settingPatch, options);
+        const response = await this.httpClient.post(url, settingPatch, options);
         return response?.data;
     }
     async updateFirmwareUpdaterSettings(login, firmwareUpdateConfig) {
         const { url, options } = this.prepareRequest(login, this.apiSettingsPart);
         const settingPatch = this.pluginFirmwareUpdaterSettings(firmwareUpdateConfig);
-        const response = await this.axiosClient.post(url, settingPatch, options);
+        const response = await this.httpClient.post(url, settingPatch, options);
         return response?.data;
     }
     async setGCodeAnalysis(login, enabled) {
         const { url, options } = this.prepareRequest(login, this.apiSettingsPart);
         const settingPatch = this.gcodeAnalysisSetting(enabled);
-        const response = await this.axiosClient.post(url, settingPatch, options);
+        const response = await this.httpClient.post(url, settingPatch, options);
+        return response?.data;
+    }
+    async getCurrentUser(login) {
+        const { url, options } = this.prepareRequest(login, this.apiCurrentUser);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getAdminUserOrDefault(login) {
-        const data = await this.getUsers(login);
-        let opAdminUserName = "admin";
-        if (!!data?.users && Array.isArray(data.users)) {
-            const adminUser = data.users.find((user)=>!!user.admin);
-            if (!!adminUser) opAdminUserName = adminUser.name;
-        }
-        return opAdminUserName;
+        const currentUser = await this.getCurrentUser(login);
+        return currentUser?.name;
     }
     async getUsers(login) {
         const { url, options } = this.prepareRequest(login, this.apiUsers);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getLocalFiles(login, recursive = false) {
         const { url, options } = this.prepareRequest(login, this.apiGetFiles(recursive));
-        const response = await this.axiosClient.get(url, options);
-        return response?.data?.files.filter((f)=>f.date).map((f)=>{
+        const response = await this.httpClient.get(url, options);
+        return response?.data?.files?.filter((f)=>f.date).map((f)=>{
             return (0, _fileutils.normalizePrinterFile)(f);
         }) || [];
     }
     async getFile(login, path) {
         const pathUrl = this.apiFile(path);
         const { url, options } = this.prepareRequest(login, pathUrl);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         try {
             return (0, _fileutils.normalizePrinterFile)(response?.data);
         } catch (e) {
@@ -204,8 +205,16 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
             return;
         }
     }
+    async downloadFile(login, path) {
+        const pathUrl = this.downloadFileLocal(path);
+        const { url, options } = this.prepareRequest(login, pathUrl);
+        return await this.httpClient.get(url, {
+            responseType: "stream",
+            ...options
+        });
+    }
     async createFolder(login, path, foldername) {
-        const { url, options } = this.prepareRequest(login, this.apiFilesLocation);
+        const { url, options } = this.prepareRequest(login, this.apiFilesLocal);
         const formData = new _formdata.default();
         formData.append("path", path);
         formData.append("foldername", foldername);
@@ -214,7 +223,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
             ...formData.getHeaders(),
             "Content-Length": formData.getLengthSync()
         };
-        const response = await this.axiosClient.post(url, formData, {
+        const response = await this.httpClient.post(url, formData, {
             headers
         });
         return response?.data;
@@ -222,17 +231,16 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
     async moveFileOrFolder(login, path, destination) {
         const { url, options } = this.prepareRequest(login, this.apiFile(path));
         const command = this.moveFileCommand(destination);
-        const response = await this.axiosClient.post(url, command, options);
+        const response = await this.httpClient.post(url, command, options);
         return response?.data;
     }
-    async selectPrintFile(login, path, print) {
+    async postSelectPrintFile(login, path, print) {
         const { url, options } = this.prepareRequest(login, this.apiFile(path));
         const command = this.selectCommand(print);
-        const response = await this.axiosClient.post(url, command, options);
-        return response?.data;
+        await this.httpClient.post(url, command, options);
     }
     async uploadFileAsMultiPart(login, multerFileOrBuffer, commands, token) {
-        const { url, options } = this.prepareRequest(login, this.apiFilesLocation, null, _octoprintserviceconstants.multiPartContentType);
+        const { url, options } = this.prepareRequest(login, this.apiFilesLocal, null, _octoprintserviceconstants.multiPartContentType);
         const formData = new _formdata.default();
         if (commands.select) {
             formData.append("select", "true");
@@ -293,46 +301,45 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
     }
     async deleteFileOrFolder(login, path) {
         const { url, options } = this.prepareRequest(login, this.apiFile(path));
-        const response = await this.axiosClient.delete(url, options);
+        const response = await this.httpClient.delete(url, options);
         return response?.data;
     }
     async getPrinterCurrent(login, history, limit, exclude) {
         const pathUrl = this.apiPrinterCurrent(history, limit, exclude);
         const { url, options } = this.prepareRequest(login, pathUrl);
-        const response = await this.axiosClient.get(url, options);
-        return response?.data;
+        return await this.httpClient.get(url, options);
     }
     async getConnection(login) {
         const { url, options } = this.prepareRequest(login, this.apiConnection);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getPrinterProfiles(login) {
         const { url, options } = this.prepareRequest(login, this.apiPrinterProfiles);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async postSoftwareUpdate(login, targets) {
         const { url, options } = this.prepareJsonRequest(login, this.pluginSoftwareUpdateUpdate, {
             targets
         });
-        const response = await this.axiosClient.post(url, {}, options);
+        const response = await this.httpClient.post(url, {}, options);
         return response?.data;
     }
     async getPluginManagerPlugins(login) {
         const { url, options } = this.prepareRequest(login, this.pluginManagerPlugins);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getPluginManagerPlugin(login, pluginName) {
         const { url, options } = this.prepareRequest(login, this.pluginManagerPlugin(pluginName));
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async postApiPluginManagerCommand(login, pluginCommand, pluginUrl) {
         const { url, options } = this.prepareRequest(login, this.apiPluginManager);
         const command = this.pluginManagerCommand(pluginCommand, pluginUrl);
-        const response = await this.axiosClient.post(url, command, options);
+        const response = await this.httpClient.post(url, command, options);
         return response?.data;
     }
     async postPluginFirmwareUpdateFlash(currentPrinterId, login, firmwarePath) {
@@ -350,7 +357,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
                 ...options.headers,
                 ...formData.getHeaders()
             };
-            const response = await this.axiosClient.post(url, {
+            const response = await this.httpClient.post(url, {
                 body: formData,
                 headers,
                 uploadProgress: (p)=>{
@@ -381,76 +388,76 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
     }
     async getPluginFirmwareUpdateStatus(login) {
         const { url, options } = this.prepareRequest(login, this.pluginFirmwareUpdaterStatus);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async fetchOctoPrintPlugins() {
         const { url, options } = this.prepareAnonymousRequest(_octoprintserviceconstants.pluginRepositoryUrl);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getSystemInfo(login) {
         const { url, options } = this.prepareRequest(login, this.apiSystemInfo);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getSystemCommands(login) {
         const { url, options } = this.prepareRequest(login, this.apiSystemCommands);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
-    async postSystemRestartCommand(login) {
-        const { url, options } = this.prepareRequest(login, this.apiSystemRestartCommand);
-        const response = await this.axiosClient.post(url, {}, options);
+    async postServerRestartCommand(login) {
+        const { url, options } = this.prepareRequest(login, this.apiServerRestartCommand);
+        const response = await this.httpClient.post(url, {}, options);
         return response?.data;
     }
     async getSoftwareUpdateCheck(login, force) {
         const { url, options } = this.prepareRequest(login, this.apiSoftwareUpdateCheck(force));
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getPluginPiSupport(login) {
         const { url, options } = this.prepareRequest(login, this.apiPluginPiSupport);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async deleteTimeLapse(login, fileName) {
         const path = `${this.apiTimelapse}/${fileName}`;
         const { url, options } = this.prepareRequest(login, path);
-        const response = await this.axiosClient.delete(url, options);
+        const response = await this.httpClient.delete(url, options);
         return response?.data;
     }
     async listUnrenderedTimeLapses(login) {
         const path = `${this.apiTimelapse}?unrendered=true`;
         const { url, options } = this.prepareRequest(login, path);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async listProfiles(login) {
         const { url, options } = this.prepareRequest(login, this.apiProfiles);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getBackupOverview(login) {
         const { url, options } = this.prepareRequest(login, this.pluginBackupIndex);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getBackups(login) {
         const { url, options } = this.prepareRequest(login, this.pluginBackupEndpoint);
-        const response = await this.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async createBackup(login, excludeArray) {
         const { url, options } = this.prepareRequest(login, this.pluginBackupEndpoint);
-        const response = await this.axiosClient.post(url, {
+        const response = await this.httpClient.post(url, {
             exclude: excludeArray
         }, options);
         return response?.data;
     }
     async getDownloadBackupStream(login, filename) {
         const { url, options } = this.prepareRequest(login, this.pluginBackupFileDownload(filename));
-        const response = await this.axiosClient.get(url, {
+        const response = await this.httpClient.get(url, {
             responseType: "stream",
             ...options
         }).catch((e)=>{
@@ -469,7 +476,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
         formData.append("file", buffer, {
             filename: "op-fdmm-restore.zip"
         });
-        const response = await this.axiosClient.post(url, formData, {
+        const response = await this.httpClient.post(url, formData, {
             headers: {
                 ...options.headers,
                 ...formData.getHeaders()
@@ -486,9 +493,9 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
     }
     async deleteBackup(login, filename) {
         const { url, options } = this.prepareRequest(login, this.pluginBackupFile(filename));
-        const response = await this.axiosClient.delete(url, options);
+        const response = await this.httpClient.delete(url, options);
         return response?.data;
     }
 }
 
-//# sourceMappingURL=octoprint-api.service.js.map
+//# sourceMappingURL=octoprint.client.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","eventEmitter2","httpClient","logger","constructor","settingsStore","loggerFactory","name","getApiVersion","login","timeout","url","options","prepareRequest","apiVersion","get","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","data","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","response","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUser","getUsers","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","captureException","error","downloadFile","downloadFileLocal","responseType","createFolder","foldername","apiFilesLocal","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","createReadStream","filename","originalname","result","Promise","resolve","reject","getLength","err","length","axios","method","onUploadProgress","p","emit","uploadProgressEvent","failed","JSON","parse","body","ExternalServiceError","message","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","uploadProgress","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}

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

@@ -11,13 +11,13 @@ Object.defineProperty(exports, "PluginBaseService", {
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
 class PluginBaseService {
-    octoPrintApiService;
+    octoprintClient;
     pluginRepositoryCache;
     _pluginName;
     _pluginUrl;
     logger;
-    constructor({ octoPrintApiService, pluginRepositoryCache, loggerFactory }, { pluginName, pluginUrl }){
-        this.octoPrintApiService = octoPrintApiService;
+    constructor({ octoprintClient, pluginRepositoryCache, loggerFactory }, { pluginName, pluginUrl }){
+        this.octoprintClient = octoprintClient;
         this.pluginRepositoryCache = pluginRepositoryCache;
         this._pluginName = pluginName;
         this.logger = loggerFactory(`Plugin-${pluginName}`);
@@ -36,7 +36,7 @@ class PluginBaseService {
         return result?.github?.latest_release.name === response.version;
     }
     async #queryInstalledPlugin(printerLogin) {
-        const response = await this.octoPrintApiService.getPluginManagerPlugin(printerLogin, this.pluginName);
+        const response = await this.octoprintClient.getPluginManagerPlugin(printerLogin, this.pluginName);
         if (!response) {
             throw new _runtimeexceptions.InternalServerException("Plugin query response was empty");
         }
@@ -47,7 +47,7 @@ class PluginBaseService {
         return !!foundPlugin;
     }
     async #findPluginFromListQuery(printerLogin) {
-        const response = await this.octoPrintApiService.getPluginManagerPlugins(printerLogin);
+        const response = await this.octoprintClient.getPluginManagerPlugins(printerLogin);
         if (!response?.plugins?.length) {
             throw new _runtimeexceptions.InternalServerException("Plugin query response was empty");
         }
@@ -57,44 +57,44 @@ class PluginBaseService {
         return pluginList.find((p)=>p.key.toLowerCase() === this.pluginName.toLowerCase());
     }
     async updatePlugin(login) {
-        return await this.octoPrintApiService.postSoftwareUpdate(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.octoPrintApiService.postApiPluginManagerCommand(login, command, plugin.archive);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command, plugin.archive);
         await this.#conditionalRestartCommand(login, restartAfter);
     }
     async uninstallPlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.uninstall.name;
-        await this.octoPrintApiService.postApiPluginManagerCommand(login, command, this.pluginName);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
         await this.#conditionalRestartCommand(login, restartAfter);
     }
     async enablePlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.enable.name;
-        await this.octoPrintApiService.postApiPluginManagerCommand(login, command, this.pluginName);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
         await this.#conditionalRestartCommand(login, restartAfter);
     }
     async disablePlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.disable.name;
-        await this.octoPrintApiService.postApiPluginManagerCommand(login, command, this.pluginName);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
         await this.#conditionalRestartCommand(login, restartAfter);
     }
     async cleanupPlugin(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.cleanup.name;
-        await this.octoPrintApiService.postApiPluginManagerCommand(login, command, this.pluginName);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
         await this.#conditionalRestartCommand(login, restartAfter);
     }
     async cleanupAllPlugins(login, restartAfter = false) {
         const command = _octoprintserviceconstants.pluginManagerCommands.cleanup_all.name;
-        await this.octoPrintApiService.postApiPluginManagerCommand(login, command);
+        await this.octoprintClient.postApiPluginManagerCommand(login, command);
         await this.#conditionalRestartCommand(login, restartAfter);
     }
     async #conditionalRestartCommand(printerLogin, restartAfter = false) {
         if (!restartAfter) return;
-        await this.octoPrintApiService.postSystemRestartCommand(printerLogin);
+        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","octoPrintApiService","pluginRepositoryCache","_pluginName","_pluginUrl","logger","constructor","loggerFactory","pluginName","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","queryInstalledPlugin","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","conditionalRestartCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postSystemRestartCommand"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","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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"}

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

@@ -23,18 +23,18 @@ const connectivityProp = "connectivity.connection_ok";
 const firmwareProp = "printer.firmware";
 const firmwareDownloadPath = "firmware-downloads";
 class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
-    octoPrintApiService;
+    octoprintClient;
     githubService;
     multerService;
     prusaFirmwareReleases;
     latestFirmware;
-    constructor({ octoPrintApiService, pluginRepositoryCache, githubService, multerService, loggerFactory }){
+    constructor({ octoprintClient, pluginRepositoryCache, githubService, multerService, loggerFactory }){
         super({
-            octoPrintApiService,
+            octoprintClient,
             pluginRepositoryCache,
             loggerFactory
         }, config);
-        this.octoPrintApiService = octoPrintApiService;
+        this.octoprintClient = octoprintClient;
         this.githubService = githubService;
         this.multerService = multerService;
     }
@@ -71,7 +71,7 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
         }
     }
     async getPrinterFirmwareVersion(printerLogin) {
-        const response = await this.octoPrintApiService.getSystemInfo(printerLogin);
+        const response = await this.octoprintClient.getSystemInfo(printerLogin);
         const systemInfo = response.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?");
@@ -87,14 +87,14 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
         return firmware;
     }
     async getPluginFirmwareStatus(printerLogin) {
-        return await this.octoPrintApiService.getPluginFirmwareUpdateStatus(printerLogin);
+        return await this.octoprintClient.getPluginFirmwareUpdateStatus(printerLogin);
     }
     async configureFirmwareUpdaterSettings(printerLogin) {
-        return await this.octoPrintApiService.updateFirmwareUpdaterSettings(printerLogin, _firmwareupdatesettingsconstants.defaultFirmwareUpdaterSettings);
+        return await this.octoprintClient.updateFirmwareUpdaterSettings(printerLogin, _firmwareupdatesettingsconstants.defaultFirmwareUpdaterSettings);
     }
     async flashPrusaFirmware(currentPrinterId, printerLogin) {
         const latestHexFilePath = this.multerService.getNewestFile(firmwareDownloadPath);
-        return await this.octoPrintApiService.postPluginFirmwareUpdateFlash(currentPrinterId, printerLogin, latestHexFilePath);
+        return await this.octoprintClient.postPluginFirmwareUpdateFlash(currentPrinterId, printerLogin, latestHexFilePath);
     }
 }
 

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","octoPrintApiService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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","octoprintClient","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","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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"}