@fdm-monster/server 1.6.2 → 1.6.4

package/dist/services/octoprint/dto/server/server.dto.js

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

package/dist/services/octoprint/dto/server/server.dto.js.map

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

package/dist/services/octoprint/dto/server/version.dto.js

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

package/dist/services/octoprint/dto/server/version.dto.js.map

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

package/dist/services/octoprint/dto/settings/serial-settings.dto.js

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

package/dist/services/octoprint/dto/settings/serial-settings.dto.js.map

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

package/dist/services/octoprint/dto/settings/settings-parts.type.js

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

package/dist/services/octoprint/dto/settings/settings-parts.type.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/settings/settings-parts.type.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/settings/settings.dto.js

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

package/dist/services/octoprint/dto/settings/settings.dto.js.map

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

package/dist/services/octoprint/dto/settings/virtual-printer-settings.dto.js

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

package/dist/services/octoprint/dto/settings/virtual-printer-settings.dto.js.map

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

package/dist/services/octoprint/dto/{octoprint-system-info.dto.js → system/system-info.dto.js}

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "OctoprintSystemInfoDto", {
+Object.defineProperty(exports, "SystemInfoDto", {
     enumerable: true,
     get: function() {
-        return OctoprintSystemInfoDto;
+        return SystemInfoDto;
     }
 });
-class OctoprintSystemInfoDto {
+class SystemInfoDto {
     "browser.user_agent";
     "connectivity.connection_check";
     "connectivity.connection_ok";
@@ -38,4 +38,4 @@ class OctoprintSystemInfoDto {
     "systeminfo.generator";
 }
 
-//# sourceMappingURL=octoprint-system-info.dto.js.map
+//# sourceMappingURL=system-info.dto.js.map

package/dist/services/octoprint/dto/system/system-info.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/system/system-info.dto.ts"],"names":["SystemInfoDto"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACX,qBAA6B;IAC7B,gCAAwC;IACxC,6BAAsC;IACtC,uBAAgC;IAChC,sBAA+B;IAC/B,gCAAwC;IACxC,6BAAsC;IACtC,qBAA6B;IAC7B,oBAA4B;IAC5B,mBAA2B;IAC3B,cAAsB;IACtB,YAAoB;IACpB,kBAA0B;IAC1B,+BAAuC;IACvC,gDAAyD;IACzD,mDAA4D;IAC5D,wCAAgD;IAChD,iBAAyB;IACzB,qBAA6B;IAC7B,wBAAiC;IACjC,gCAAwC;IACxC,kCAA0C;IAC1C,sBAA+B;IAC/B,oBAA4B;IAC5B,mBAA2B;IAC3B,uBAA+B;IAC/B,uBAA+B;AACjC"}

package/dist/services/octoprint/dto/websocket/connection-message.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/connection-message.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/websocket/current-message.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/current-message.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/websocket/event-message.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/event-message.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/websocket/event.type.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "eventTypes", {
+    enumerable: true,
+    get: function() {
+        return eventTypes;
+    }
+});
+const eventTypes = {
+    ClientAuthed: "ClientAuthed",
+    ClientClosed: "ClientClosed",
+    ClientOpened: "ClientOpened",
+    Connected: "Connected",
+    Connecting: "Connecting",
+    Disconnecting: "Disconnecting",
+    Disconnected: "Disconnected",
+    Dwelling: "Dwelling",
+    Eject: "Eject",
+    Error: "Error",
+    EStop: "EStop",
+    FileAdded: "FileAdded",
+    FileDeselected: "FileDeselected",
+    FileRemoved: "FileRemoved",
+    FirmwareData: "FirmwareData",
+    FolderAdded: "FolderAdded",
+    FolderRemoved: "FolderRemoved",
+    Home: "Home",
+    MetadataAnalysisFinished: "MetadataAnalysisFinished",
+    MetadataAnalysisStarted: "MetadataAnalysisStarted",
+    MetadataStatisticsUpdated: "MetadataStatisticsUpdated",
+    PositionUpdate: "PositionUpdate",
+    PowerOff: "PowerOff",
+    PowerOn: "PowerOn",
+    PrintCancelled: "PrintCancelled",
+    PrintCancelling: "PrintCancelling",
+    PrintDone: "PrintDone",
+    PrintFailed: "PrintFailed",
+    PrintPaused: "PrintPaused",
+    PrintResumed: "PrintResumed",
+    PrintStarted: "PrintStarted",
+    PrinterStateChanged: "PrinterStateChanged",
+    TransferDone: "TransferDone",
+    TransferStarted: "TransferStarted",
+    UpdatedFiles: "UpdatedFiles",
+    Upload: "Upload",
+    UserLoggedIn: "UserLoggedIn",
+    Waiting: "Waiting",
+    ZChange: "ZChange"
+};
+
+//# sourceMappingURL=event.type.js.map

package/dist/services/octoprint/dto/websocket/event.type.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/event.type.ts"],"names":["eventTypes","ClientAuthed","ClientClosed","ClientOpened","Connected","Connecting","Disconnecting","Disconnected","Dwelling","Eject","Error","EStop","FileAdded","FileDeselected","FileRemoved","FirmwareData","FolderAdded","FolderRemoved","Home","MetadataAnalysisFinished","MetadataAnalysisStarted","MetadataStatisticsUpdated","PositionUpdate","PowerOff","PowerOn","PrintCancelled","PrintCancelling","PrintDone","PrintFailed","PrintPaused","PrintResumed","PrintStarted","PrinterStateChanged","TransferDone","TransferStarted","UpdatedFiles","Upload","UserLoggedIn","Waiting","ZChange"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,aAAa;IACxBC,cAAc;IACdC,cAAc;IACdC,cAAc;IACdC,WAAW;IACXC,YAAY;IACZC,eAAe;IACfC,cAAc;IACdC,UAAU;IACVC,OAAO;IACPC,OAAO;IACPC,OAAO;IACPC,WAAW;IACXC,gBAAgB;IAChBC,aAAa;IACbC,cAAc;IACdC,aAAa;IACbC,eAAe;IACfC,MAAM;IACNC,0BAA0B;IAC1BC,yBAAyB;IACzBC,2BAA2B;IAC3BC,gBAAgB;IAChBC,UAAU;IACVC,SAAS;IACTC,gBAAgB;IAChBC,iBAAiB;IACjBC,WAAW;IACXC,aAAa;IACbC,aAAa;IACbC,cAAc;IACdC,cAAc;IACdC,qBAAqB;IACrBC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,QAAQ;IACRC,cAAc;IACdC,SAAS;IACTC,SAAS;AACX"}

package/dist/services/octoprint/dto/websocket/history-message.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/history-message.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/websocket/plugin-message.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/plugin-message.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/websocket/timelapse-message.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket/timelapse-message.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/octoprint-api.routes.js

@@ -2,24 +2,25 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "OctoPrintRoutes", {
+Object.defineProperty(exports, "OctoprintRoutes", {
     enumerable: true,
     get: function() {
-        return OctoPrintRoutes;
+        return OctoprintRoutes;
     }
 });
 const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
 const _apiutils = require("./utils/api.utils");
 const _serversettingsconstants = require("../../constants/server-settings.constants");
 const _normalizeurl = require("../../utils/normalize-url");
-class OctoPrintRoutes {
+class OctoprintRoutes {
     octoPrintBase = "/";
     apiBase = `${this.octoPrintBase}api`;
     apiVersion = `${this.apiBase}/version`;
     apiServer = `${this.apiBase}/server`;
+    apiCurrentUser = `${this.apiBase}/currentuser`;
     apiSettingsPart = `${this.apiBase}/settings`;
     apiFiles = `${this.apiBase}/files`;
-    apiFilesLocation = `${this.apiFiles}/local`;
+    apiFilesLocal = `${this.apiFiles}/local`;
     apiConnection = `${this.apiBase}/connection`;
     apiJob = `${this.apiBase}/job`;
     apiPrinter = `${this.apiBase}/printer`;
@@ -30,7 +31,7 @@ class OctoPrintRoutes {
     apiSystem = `${this.apiBase}/system`;
     apiSystemInfo = `${this.apiSystem}/info`;
     apiSystemCommands = `${this.apiSystem}/commands`;
-    apiSystemRestartCommand = `${this.apiSystemCommands}/core/restart`;
+    apiServerRestartCommand = `${this.apiSystemCommands}/core/restart`;
     apiUsers = `${this.apiBase}/users`;
     apiLogin = `${this.apiBase}/login?passive=true`;
     apiPluginPiSupport = `${this.apiBase}/plugin/pi_support`;
@@ -100,7 +101,8 @@ class OctoPrintRoutes {
         const limitParam = !!limit ? "&limit=limit" : "";
         return `${this.apiPrinter}?history=${!!history}${limitParam}${excludeParam}`;
     };
-    apiFile = (path)=>`${this.apiFilesLocation}/${path}`;
+    apiFile = (path)=>`${this.apiFilesLocal}/${path}`;
+    downloadFileLocal = (path)=>`${this.octoPrintBase}downloads/files/local/${path}`;
     apiGetFiles = (recursive = false)=>`${this.apiFiles}/local?recursive=${recursive}`;
     apiSoftwareUpdateCheck = (force)=>`${this.octoPrintBase}plugin/softwareupdate/check${force ? "?force=true" : ""}`;
     selectCommand(print = false) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","settingsStore","timeouts","constructor","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","prepareAnonymousRequest","contentTypeHeaderKey","prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","settingsStore","timeouts","constructor","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","downloadFileLocal","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","prepareAnonymousRequest","contentTypeHeaderKey","prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"mappings":"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"}

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

@@ -9,17 +9,14 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    API_STATE: function() {
-        return API_STATE;
+    OctoPrintMessage: function() {
+        return OctoPrintMessage;
     },
-    Message: function() {
-        return Message;
+    OctoprintWebsocketAdapter: function() {
+        return OctoprintWebsocketAdapter;
     },
-    OctoPrintSockIoAdapter: function() {
-        return OctoPrintSockIoAdapter;
-    },
-    SOCKET_STATE: function() {
-        return SOCKET_STATE;
+    WsMessage: function() {
+        return WsMessage;
     },
     octoPrintEvent: function() {
         return octoPrintEvent;
@@ -32,7 +29,16 @@ const _urlutils = require("../../utils/url.utils");
 const _normalizeurl = require("../../utils/normalize-url");
 const _websocketadapter = require("../../shared/websocket.adapter");
 const _nodefs = require("node:fs");
-const Message = {
+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",
+    WS_ERROR: "WS_ERROR",
+    API_STATE_UPDATED: "API_STATE_UPDATED",
+    WS_STATE_UPDATED: "WS_STATE_UPDATED"
+};
+const OctoPrintMessage = {
     connected: "connected",
     reauthRequired: "reauthRequired",
     current: "current",
@@ -40,56 +46,36 @@ const Message = {
     event: "event",
     plugin: "plugin",
     timelapse: "timelapse",
-    slicingProgress: "slicingProgress",
-    WS_OPENED: "WS_OPENED",
-    WS_CLOSED: "WS_CLOSED",
-    WS_ERROR: "WS_ERROR",
-    API_STATE_UPDATED: "API_STATE_UPDATED",
-    WS_STATE_UPDATED: "WS_STATE_UPDATED"
-};
-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"
+    slicingProgress: "slicingProgress"
 };
 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;
     }
@@ -97,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;
@@ -125,6 +111,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         super.open(this.socketURL);
     }
     close() {
+        clearInterval(this.refreshPrinterCurrentInterval);
         super.close();
     }
     async sendThrottle(throttle = _serverconstants.AppConstants.defaultSocketThrottleRate) {
@@ -140,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");
@@ -170,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");
@@ -189,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;
@@ -209,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);
@@ -225,10 +251,10 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         if (this._debugMode) {
             this.logger.log(`RX Msg ${eventName} ${message.substring(0, 140)}...`);
         }
-        if (eventName === Message.reauthRequired) {
+        if (eventName === OctoPrintMessage.reauthRequired) {
             this.logger.log("Received 'reauthRequired', acting on it");
             this.setReauthRequired();
-        } else if (eventName === Message.current && this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true") {
+        } else if (eventName === OctoPrintMessage.current && this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true") {
             (0, _nodefs.writeFileSync)(`websocket_current_${this.printerId}.txt`, JSON.stringify(payload, null, 2));
         }
         await this.emitEvent(eventName, payload);
@@ -236,21 +262,22 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     async afterClosed(event) {
         this.setSocketState("closed");
         delete this.socket;
-        await this.emitEvent(Message.WS_CLOSED, "connection closed");
+        await this.emitEvent(WsMessage.WS_CLOSED, "connection closed");
     }
     async onError(error) {
         this.setSocketState("error");
-        await this.emitEvent(Message.WS_ERROR, error?.length ? error : "connection error");
+        await this.emitEvent(WsMessage.WS_ERROR, error?.length ? error : "connection error");
     }
     async emitEvent(event, payload) {
         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}`
         }));
@@ -262,17 +289,20 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         if (this._debugMode) {
             this.logger.log(`${this.printerId} Socket state updated to: ` + state);
         }
-        this.emitEventSync(Message.WS_STATE_UPDATED, state);
+        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();
         if (this._debugMode) {
             this.logger.log(`${this.printerId} API state updated to: ` + state);
         }
-        this.emitEventSync(Message.API_STATE_UPDATED, state);
+        this.emitEventSync(WsMessage.API_STATE_UPDATED, state);
     }
 }
 
-//# 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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"}