@fdm-monster/server 1.6.3 → 1.6.4

package/dist/services/octoprint/{octoprint-sockio.adapter.js → octoprint-websocket.adapter.js}

@@ -9,17 +9,11 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    API_STATE: function() {
-        return API_STATE;
-    },
     OctoPrintMessage: function() {
         return OctoPrintMessage;
     },
-    OctoPrintSockIoAdapter: function() {
-        return OctoPrintSockIoAdapter;
-    },
-    SOCKET_STATE: function() {
-        return SOCKET_STATE;
+    OctoprintWebsocketAdapter: function() {
+        return OctoprintWebsocketAdapter;
     },
     WsMessage: function() {
         return WsMessage;
@@ -35,6 +29,8 @@ const _urlutils = require("../../utils/url.utils");
 const _normalizeurl = require("../../utils/normalize-url");
 const _websocketadapter = require("../../shared/websocket.adapter");
 const _nodefs = require("node:fs");
+const _socketstatetype = require("../../shared/dtos/socket-state.type");
+const _apistatetype = require("../../shared/dtos/api-state.type");
 const WsMessage = {
     WS_OPENED: "WS_OPENED",
     WS_CLOSED: "WS_CLOSED",
@@ -52,49 +48,34 @@ const OctoPrintMessage = {
     timelapse: "timelapse",
     slicingProgress: "slicingProgress"
 };
-const SOCKET_STATE = {
-    unopened: "unopened",
-    opening: "opening",
-    authenticating: "authenticating",
-    opened: "opened",
-    authenticated: "authenticated",
-    aborted: "aborted",
-    error: "error",
-    closed: "closed"
-};
-const API_STATE = {
-    unset: "unset",
-    noResponse: "noResponse",
-    globalKey: "globalKey",
-    authFail: "authFail",
-    responding: "responding"
-};
 const octoPrintEvent = (event)=>`octoprint.${event}`;
-class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
-    octoPrintApiService;
+class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
+    printerType = 0;
+    octoprintClient;
     printerId;
     stateUpdated = false;
     stateUpdateTimestamp = null;
-    socketState = SOCKET_STATE.unopened;
+    socketState = _socketstatetype.SOCKET_STATE.unopened;
     apiStateUpdated = false;
     apiStateUpdateTimestamp = null;
-    apiState = API_STATE.unset;
+    apiState = _apistatetype.API_STATE.unset;
     lastMessageReceivedTimestamp = null;
     reauthRequired = false;
     reauthRequiredTimestamp = null;
-    loginDto;
+    login;
     logger;
     eventEmitter;
     configService;
     socketURL;
     sessionDto;
     username;
-    constructor({ loggerFactory, octoPrintApiService, eventEmitter2, configService }){
+    refreshPrinterCurrentInterval;
+    constructor({ loggerFactory, octoprintClient, eventEmitter2, configService }){
         super({
             loggerFactory
         });
-        this.logger = loggerFactory(OctoPrintSockIoAdapter.name);
-        this.octoPrintApiService = octoPrintApiService;
+        this.logger = loggerFactory(OctoprintWebsocketAdapter.name);
+        this.octoprintClient = octoprintClient;
         this.eventEmitter = eventEmitter2;
         this.configService = configService;
     }
@@ -102,23 +83,23 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         return this.configService.get(_serverconstants.AppConstants.debugSocketStatesKey, _serverconstants.AppConstants.defaultDebugSocketStates) === "true";
     }
     needsReopen() {
-        const isApiOnline = this.apiState === API_STATE.responding;
-        return isApiOnline && (this.socketState === SOCKET_STATE.closed || this.socketState === SOCKET_STATE.error);
+        const isApiOnline = this.apiState === _apistatetype.API_STATE.responding;
+        return isApiOnline && (this.socketState === _socketstatetype.SOCKET_STATE.closed || this.socketState === _socketstatetype.SOCKET_STATE.error);
     }
     needsSetup() {
-        return this.socketState === SOCKET_STATE.unopened;
+        return this.socketState === _socketstatetype.SOCKET_STATE.unopened;
     }
     needsReauth() {
         return this.reauthRequired;
     }
     isClosedOrAborted() {
-        return this.socketState === SOCKET_STATE.closed || this.socketState === SOCKET_STATE.aborted;
+        return this.socketState === _socketstatetype.SOCKET_STATE.closed || this.socketState === _socketstatetype.SOCKET_STATE.aborted;
     }
     registerCredentials(socketLogin) {
         const { printerId, loginDto, protocol } = socketLogin;
         this.printerId = printerId;
-        this.loginDto = loginDto;
-        const httpUrl = (0, _normalizeurl.normalizeUrl)(this.loginDto.printerURL);
+        this.login = loginDto;
+        const httpUrl = (0, _normalizeurl.normalizeUrl)(this.login.printerURL);
         const wsUrl = (0, _urlutils.httpToWsUrl)(httpUrl, protocol);
         wsUrl.pathname = "/sockjs/websocket";
         this.socketURL = wsUrl;
@@ -130,6 +111,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         super.open(this.socketURL);
     }
     close() {
+        clearInterval(this.refreshPrinterCurrentInterval);
         super.close();
     }
     async sendThrottle(throttle = _serverconstants.AppConstants.defaultSocketThrottleRate) {
@@ -145,7 +127,8 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     }
     async setupSocketSession() {
         this.resetSocketState();
-        this.sessionDto = await this.octoPrintApiService.login(this.loginDto).then((r)=>{
+        this.sessionDto = await this.octoprintClient.login(this.login).then((d)=>{
+            const r = d.data;
             if (r.name === "_api") {
                 this.setApiState("globalKey");
                 this.setSocketState("aborted");
@@ -175,7 +158,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             }
             throw e;
         });
-        this.username = await this.octoPrintApiService.getAdminUserOrDefault(this.loginDto).catch((e)=>{
+        this.username = await this.octoprintClient.getAdminUserOrDefault(this.login).catch((e)=>{
             const status = e.response?.status;
             if (status === _httpstatuscodesconstants.HttpStatusCode.FORBIDDEN) {
                 this.setApiState("authFail");
@@ -194,6 +177,44 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             }
             throw e;
         });
+        await this.updateCurrentStateSafely();
+        this.logger.log("Setting up printer current interval loop");
+        if (this.refreshPrinterCurrentInterval) {
+            clearInterval(this.refreshPrinterCurrentInterval);
+        }
+        this.refreshPrinterCurrentInterval = setInterval(async ()=>{
+            await this.updateCurrentStateSafely();
+        }, 10000);
+    }
+    async updateCurrentStateSafely() {
+        try {
+            const current = await this.octoprintClient.getPrinterCurrent(this.login, true);
+            this.setApiState(_apistatetype.API_STATE.responding);
+            return await this.emitEvent("current", current.data);
+        } catch (e) {
+            if (e.isAxiosError) {
+                const castError = e;
+                if (castError?.response?.status == 409) {
+                    this.logger.error(`Printer current interval loop error`);
+                    await this.emitEvent("current", {
+                        state: {
+                            flags: {
+                                operational: false,
+                                error: false
+                            },
+                            text: "USB disconnected",
+                            error: castError?.response.data.error
+                        }
+                    });
+                    return;
+                }
+                this.logger.error(`Could not update Octoprint current due to a request error`);
+                this.setApiState(_apistatetype.API_STATE.noResponse);
+                return;
+            }
+            this.logger.error(`Could not update Octoprint current due to an unknown error`);
+            this.setApiState(_apistatetype.API_STATE.noResponse);
+        }
     }
     setReauthRequired() {
         this.reauthRequired = true;
@@ -214,14 +235,14 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             printerId: this.printerId
         });
     }
-    async afterOpened(event) {
+    async afterOpened(_) {
         this.setSocketState("opened");
         await this.sendAuth();
         await this.sendThrottle(_serverconstants.AppConstants.defaultSocketThrottleRate);
     }
     async onMessage(message) {
         this.lastMessageReceivedTimestamp = Date.now();
-        if (this.socketState !== SOCKET_STATE.authenticated) {
+        if (this.socketState !== _socketstatetype.SOCKET_STATE.authenticated) {
             this.setSocketState("authenticated");
         }
         const data = JSON.parse(message);
@@ -251,11 +272,12 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         await this.eventEmitter.emitAsync(octoPrintEvent(event), {
             event,
             payload,
-            printerId: this.printerId
+            printerId: this.printerId,
+            printerType: 0
         });
     }
     async sendAuth() {
-        this.setSocketState(SOCKET_STATE.authenticating);
+        this.setSocketState(_socketstatetype.SOCKET_STATE.authenticating);
         await this.sendMessage(JSON.stringify({
             auth: `${this.username}:${this.sessionDto.session}`
         }));
@@ -270,6 +292,9 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         this.emitEventSync(WsMessage.WS_STATE_UPDATED, state);
     }
     setApiState(state) {
+        if (state === _apistatetype.API_STATE.globalKey) {
+            this.logger.warn("Global API Key WS State detected");
+        }
         this.apiState = state;
         this.apiStateUpdated = true;
         this.apiStateUpdateTimestamp = Date.now();
@@ -280,4 +305,4 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     }
 }
 
-//# sourceMappingURL=octoprint-sockio.adapter.js.map
+//# sourceMappingURL=octoprint-websocket.adapter.js.map

package/dist/services/octoprint/octoprint-websocket.adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WebsocketAdapter","printerType","octoprintClient","printerId","stateUpdated","stateUpdateTimestamp","socketState","SOCKET_STATE","unopened","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","logger","eventEmitter","configService","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","getPrinterCurrent","emitEvent","isAxiosError","castError","state","flags","operational","text","noResponse","setReauthRequired","Date","now","emitEventSync","payload","emit","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","afterClosed","onError","length","emitAsync","authenticating","auth","session","globalKey"],"mappings":"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"}

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,52 +124,57 @@ 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.axiosClient.get(url, options);
+        const response = await this.httpClient.get(url, options);
         return response?.data;
     }
     async getAdminUserOrDefault(login) {
@@ -182,20 +183,20 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
     }
     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