diff --git a/octoprint_simplyprint/__init__.py b/octoprint_simplyprint/__init__.py index 474668e..6cfbbbc 100644 --- a/octoprint_simplyprint/__init__.py +++ b/octoprint_simplyprint/__init__.py @@ -43,6 +43,7 @@ Events.CONNECTED, Events.DISCONNECTING, Events.DISCONNECTED, + Events.CLIENT_AUTHED, Events.STARTUP, Events.SHUTDOWN, diff --git a/octoprint_simplyprint/static/js/SimplyPrint.js b/octoprint_simplyprint/static/js/SimplyPrint.js index 511e529..cf3f639 100644 --- a/octoprint_simplyprint/static/js/SimplyPrint.js +++ b/octoprint_simplyprint/static/js/SimplyPrint.js @@ -66,6 +66,15 @@ $(function () { self.loading = ko.observable(true); + self.ws_connected_server = ko.observable(); + self.current_endpoint = ko.observable(); + self.SimplyPrintPanelURL = ko.pureComputed(function(){ + return (self.current_endpoint() === "test") ? "https://rewrite.simplyprint.io/panel" : "https://simplyprint.io/panel"; + }); + self.SimplyPrintEndpoint = ko.pureComputed(function(){ + return "SimplyPrint active on " + self.current_endpoint() + " endpoint."; + }); + self.onAfterBinding = function () { // Chose #wizard_plugin_corewizard_onlinecheck because it seemed likely it would be there for all first time if (!self.settingsViewModel.settings.plugins.SimplyPrint.is_set_up() && !$('#wizard_plugin_corewizard_onlinecheck').length) { @@ -78,14 +87,14 @@ $(function () { } self.loading(false); - } + }; self.onWizardFinish = function(){ // Show the welcome dialog if corewizard was open if (!self.settingsViewModel.settings.plugins.SimplyPrint.is_set_up() && $('#wizard_plugin_corewizard_onlinecheck').length) { $('#SimplyPrintWelcome').modal("show"); } - } + }; function SetupRecommended() { setTimeout(function () { @@ -112,7 +121,7 @@ $(function () { SetupRecommended(); } }); - } + }; $("body").on("click", "#navbar_systemmenu ul li:nth-child(4)", function () { if (!self.settingsViewModel.settings.plugins.SimplyPrint.is_set_up()) { @@ -240,10 +249,10 @@ $(function () { /*$("#wizard_dialog .button-finish[name='finish']").on("click", function () { $("#simplyprint_dialog").modal("show"); });*/ - } + }; self.pluginsLoadedCheck = function () { - let pluginSettings = self.settingsViewModel.settings.plugins.SimplyPrint + let pluginSettings = self.settingsViewModel.settings.plugins.SimplyPrint; if ($("#settings_plugin_pluginmanager_pluginlist tbody").html().length) { //Plugins have been loaded (being called from the API async, not loaded with the page) if (typeof pluginSettings.sp_installed_plugins === "undefined" || !Array.isArray(pluginSettings.sp_installed_plugins) || !pluginSettings.sp_installed_plugins.length) { @@ -271,14 +280,14 @@ $(function () { } else { setTimeout(self.pluginsLoadedCheck, 500); } - } + }; self.ManagedBySimplyPrintAlert = function (extra = "", onlyPartly = false) { return `
SimplyPrint logo (all rights reserved) ${onlyPartly ? "Some features here are managed by SimplyPrint" : "This feature is managed by SimplyPrint"}${extra.length ? ". " + extra : ""}
`; - } + }; self.DisableOverwrittenUI = function () { //Printer profiles @@ -301,18 +310,17 @@ $(function () { $("#settings_gcodeScripts [data-bind=\"value: scripts_gcode_afterPrintCancelled\"]").prop("disabled", true); $("#settings_gcodeScripts [data-bind=\"value: scripts_gcode_afterPrintPaused\"]").prop("disabled", true); $("#settings_gcodeScripts [data-bind=\"value: scripts_gcode_beforePrintResumed\"]").prop("disabled", true); - } + }; self.DisableOverwrittenUI(); self.OctoSetupChanges(); // Support for installing and uninstalling the SimplyPrintRpiSoftware (CP) - self.requestInProgress = ko.observable() + self.requestInProgress = ko.observable(); self.doSetup = function () { - console.log("installing") self.requestInProgress(true); - OctoPrint.simpleApiCommand("SimplyPrint", "setup") - } + OctoPrint.simpleApiCommand("SimplyPrint", "setup"); + }; self.onDataUpdaterPluginMessage = function (plugin, data) { if (plugin !== "SimplyPrint") { @@ -333,19 +341,23 @@ $(function () { "text": "It looks like the dependency has been uninstalled. Please reinstall the plugin or contact us at contact@simplyprint.io", "type": "error", "hide": false, - }) + }); } else if (data.message === "sp-rpi_error") { new PNotify({ "title": "Unknown error enabling the SimplyPrint software", "text": "Please get in contact so we can resolve this! contact@simplyprint.io", "type": "error", "hide": false, - }) + }); + } else if (data.message === "sp-ws-connection") { + self.ws_connected_server(data.server); + self.current_endpoint(data.endpoint); } } - } + }; + self.doUninstall = function () { - self.requestInProgress(true) + self.requestInProgress(true); OctoPrint.simpleApiCommand("SimplyPrint", "uninstall") .done(function (response) { self.requestInProgress(false); @@ -362,11 +374,11 @@ $(function () { "text": "It looks like the dependency has already been uninstalled. Failed to uninstall it again or contact us at contact@simplyprint.io", "type": "error", "hide": false, - }) + }); } } - }) - } + }); + }; } OCTOPRINT_VIEWMODELS.push({ diff --git a/octoprint_simplyprint/templates/SimplyPrint_navbar.jinja2 b/octoprint_simplyprint/templates/SimplyPrint_navbar.jinja2 index a502ed9..b787dc1 100644 --- a/octoprint_simplyprint/templates/SimplyPrint_navbar.jinja2 +++ b/octoprint_simplyprint/templates/SimplyPrint_navbar.jinja2 @@ -1,6 +1,6 @@
- SimplyPrint logo (all rights reserved) + SimplyPrint logo (all rights reserved) v{{ plugin_SimplyPrint_version }} diff --git a/octoprint_simplyprint/templates/SimplyPrint_settings.jinja2 b/octoprint_simplyprint/templates/SimplyPrint_settings.jinja2 index 6a97725..504e326 100644 --- a/octoprint_simplyprint/templates/SimplyPrint_settings.jinja2 +++ b/octoprint_simplyprint/templates/SimplyPrint_settings.jinja2 @@ -3,7 +3,8 @@

There isn't much to see in here :) All settings are located in the SimplyPrint panel, and everything that needs to be synced to OctoPrint and your Raspberry Pi, will do so automatically.

-Go to the SimplyPrint panel +

Currently connected to endpoint on server .

+Go to the SimplyPrint panel {#

diff --git a/octoprint_simplyprint/websocket/simplyprint.py b/octoprint_simplyprint/websocket/simplyprint.py index e21aacc..8c8d04a 100644 --- a/octoprint_simplyprint/websocket/simplyprint.py +++ b/octoprint_simplyprint/websocket/simplyprint.py @@ -37,7 +37,7 @@ from ..comm.monitor import Monitor import octoprint.server import octoprint.util -from octoprint.plugin import PluginSettings +from octoprint.plugin import PluginSettings, PluginManager from octoprint.printer import PrinterInterface from octoprint.filemanager import FileManager, FileDestinations from octoprint.events import Events, EventManager @@ -88,6 +88,7 @@ def __init__(self, plugin: SimplyPrint) -> None: self.settings = cast(PluginSettings, plugin._settings) self.printer = cast(PrinterInterface, plugin._printer) self.file_manager = cast(FileManager, plugin._file_manager) + self.plugin_manager = cast(PluginManager, plugin._plugin_manager) self.sys_manager = SystemManager(self) self._event_bus = cast(EventManager, plugin._event_bus) if self.settings.get_boolean(["debug_logging"]): @@ -98,6 +99,7 @@ def __init__(self, plugin: SimplyPrint) -> None: self.connected = False self.is_set_up = self.settings.get(["is_set_up"]) self._set_ws_url() + self.ws_connected_server = "" self.simplyprint_thread = threading.Thread( target=self._run_simplyprint_thread @@ -274,6 +276,11 @@ def on_event(self, event: str, payload: Dict[str, Any]) -> None: add_callback(self.send_sp, "power_controller", {"on": True}) elif event == "plugin_simplypowercontroller_power_off": add_callback(self.send_sp, "power_controller", {"on": False}) + elif event == Events.CLIENT_AUTHED: + self.plugin_manager.send_plugin_message(self.plugin._identifier, {"message": "sp-ws-connection", + "server": self.ws_connected_server, + "endpoint": self.settings.get( + ["endpoint"])}) if event in [ "plugin_pluginmanager_install_plugin", "plugin_pluginmanager_uninstall_plugin", @@ -431,6 +438,10 @@ def _process_message(self, msg: str) -> None: name = data.get("name") if name is not None: self._save_item("printer_name", name) + self.ws_connected_server = data.get("region", "") + self.plugin_manager.send_plugin_message(self.plugin._identifier, {"message": "sp-ws-connection", + "server": self.ws_connected_server, + "endpoint": self.settings.get(["endpoint"])}) self.reconnect_delay = 1. self._push_initial_state() elif event == "error": diff --git a/setup.py b/setup.py index 9c1327f..4f6c448 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module # Remember to bump the version in octoprint_simplyprint/__init__.py as well -plugin_version = "4.0.5dev2" +plugin_version = "4.0.5dev3" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module