Merge branch 'jb_connect_login_at_start_fails_fix'

src/slic3r/GUI/GUI_Init.cpp

@@ -26,6 +26,7 @@
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/utility/setup/file.hpp>
+#include <boost/log/utility/setup/console.hpp>
 
 #if __APPLE__
     #include <signal.h>
@@ -52,7 +53,7 @@ int GUI_Run(GUI_InitParams &params)
 #ifdef SLIC3R_LOG_TO_FILE
     auto sink = boost::log::add_file_log(get_default_datadir() + "/slicer.log");
     sink->locked_backend()->auto_flush();
-    boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::info);
+    boost::log::add_console_log();
 #endif // SLIC3R_LOG_TO_FILE
     try {
         GUI::GUI_App* gui = new GUI::GUI_App(params.start_as_gcodeviewer ? GUI::GUI_App::EAppMode::GCodeViewer : GUI::GUI_App::EAppMode::Editor);

src/slic3r/GUI/WebViewDialog.cpp

@@ -7,7 +7,7 @@
 #include "slic3r/GUI/UserAccount.hpp"
 #include "slic3r/GUI/format.hpp"
 #include "slic3r/GUI/WebView.hpp"
-
+#include "slic3r/GUI/MsgDialog.hpp"
 
 #include <wx/webview.h>
 
@@ -27,12 +27,37 @@ namespace Slic3r {
 namespace GUI {
 
 
+WebViewPanel::~WebViewPanel()
+{
+    SetEvtHandlerEnabled(false);
+#ifdef DEBUG_URL_PANEL
+    delete m_tools_menu;
+#endif
+}
+
+void WebViewPanel::load_url(const wxString& url)
+{
+    if (!m_browser)
+        return;
+
+    this->on_page_will_load();
+
+    this->Show();
+    this->Raise();
+#ifdef DEBUG_URL_PANEL
+    m_url->SetLabelText(url);
+#endif
+    m_browser->LoadURL(url);
+    m_browser->SetFocus();
+}
+
+
 WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const std::vector<std::string>& message_handler_names, const std::string& loading_html/* = "loading"*/)
-        : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
+    : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
-        , m_default_url (default_url)
+    , m_default_url (default_url)
-        , m_loading_html(loading_html)
+    , m_loading_html(loading_html)
-        , m_script_message_hadler_names(message_handler_names)
+    , m_script_message_hadler_names(message_handler_names)
- {
+{
     wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
 #ifdef DEBUG_URL_PANEL
     // Create the button
@@ -91,7 +116,7 @@ WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const
     m_tools_menu->AppendSeparator();
 
     wxMenu* script_menu = new wxMenu;
-   
+
     m_script_custom = script_menu->Append(wxID_ANY, "Custom script");
     m_tools_menu->AppendSubMenu(script_menu, "Run Script");
     wxMenuItem* addUserScript = m_tools_menu->Append(wxID_ANY, "Add user script");
@@ -129,29 +154,6 @@ WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const
 #endif
     //Connect the idle events
     Bind(wxEVT_IDLE, &WebViewPanel::on_idle, this);
- }
-
-WebViewPanel::~WebViewPanel()
-{
-    SetEvtHandlerEnabled(false);
-#ifdef DEBUG_URL_PANEL
-    delete m_tools_menu;
-#endif
-}
-
-
-void WebViewPanel::load_url(const wxString& url)
-{
-    if (!m_browser)
-        return;
-
-    this->Show();
-    this->Raise();
-#ifdef DEBUG_URL_PANEL
-    m_url->SetLabelText(url);
-#endif
-    m_browser->LoadURL(url);
-    m_browser->SetFocus();
 }
 
 void WebViewPanel::load_default_url_delayed()
@@ -258,6 +260,10 @@ void WebViewPanel::on_navigation_request(wxWebViewEvent &evt)
 {
 }
 
+void WebViewPanel::on_page_will_load()
+{
+}
+
 /**
     * Invoked when user selects the "View Source" menu item
     */
@@ -318,7 +324,7 @@ void WebViewPanel::run_script(const wxString& javascript)
     // Remember the script we run in any case, so the next time the user opens
     // the "Run Script" dialog box, it is shown there for convenient updating.
     m_javascript = javascript;
-    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript;
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << "\n";
     m_browser->RunScriptAsync(javascript);
 }
 
@@ -353,7 +359,9 @@ void WebViewPanel::on_add_user_script(wxCommandEvent& WXUNUSED(evt))
     if (dialog.ShowModal() != wxID_OK)
         return;
 
-    if (!m_browser->AddUserScript(dialog.GetValue()))
+    const wxString& javascript = dialog.GetValue();
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << "\n";
+    if (!m_browser->AddUserScript(javascript))
         wxLogError("Could not add user script");
 }
 
@@ -478,6 +486,7 @@ ConnectRequestHandler::ConnectRequestHandler()
     m_actions["SELECT_PRINTER"] = std::bind(&ConnectRequestHandler::on_connect_action_select_printer, this, std::placeholders::_1);
     m_actions["PRINT"] = std::bind(&ConnectRequestHandler::on_connect_action_print, this, std::placeholders::_1);
     m_actions["REQUEST_OPEN_IN_BROWSER"] = std::bind(&ConnectRequestHandler::on_connect_action_request_open_in_browser, this, std::placeholders::_1);
+    m_actions["ERROR"] = std::bind(&ConnectRequestHandler::on_connect_action_error, this, std::placeholders::_1);
 }
 ConnectRequestHandler::~ConnectRequestHandler()
 {
@@ -516,6 +525,11 @@ void ConnectRequestHandler::handle_message(const std::string& message)
     }
 }
 
+void ConnectRequestHandler::on_connect_action_error(const std::string &message_data)
+{
+    BOOST_LOG_TRIVIAL(error) << "WebKit runtime error: " << message_data;
+}
+
 void ConnectRequestHandler::resend_config()
 {
     on_connect_action_request_config({});
@@ -560,10 +574,26 @@ ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent)
 {  
     //m_browser->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandler("https")));
 
+    wxGetApp().plater()->Bind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
+}
+
+ConnectWebViewPanel::~ConnectWebViewPanel()
+{
+    m_browser->Unbind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
+}
+
+wxString ConnectWebViewPanel::get_login_script(bool refresh)
+{
     Plater* plater = wxGetApp().plater();
-    m_browser->AddUserScript(wxString::Format(
+    const std::string& access_token = plater->get_user_account()->get_access_token();
+    assert(!access_token.empty());
+    auto javascript = wxString::Format(
 
 #if AUTH_VIA_FETCH_OVERRIDE
+        refresh
+            ?
+            "window.__access_token = '%s';window.__access_token_version = (window.__access_token_version || 0) + 1;console.log('Updated Auth token', window.__access_token);"
+            :
         /*
          * Notes:
          * - The fetch() function has two distinct prototypes (i.e. input args):
@@ -594,44 +624,49 @@ ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent)
             window.__access_token_version = 0;
         )",
 #else
-    R"(
+        R"(
         console.log('Preparing login');
-        window.fetch('/slicer/login', {method: 'POST', headers: {Authorization: 'Bearer %s'}})
+        function errorHandler(err) {
-            .then((resp) => {
+            const msg = {
+                action: 'ERROR',
+                error: JSON.stringify(err),
+                critical: false
+            };
+            console.error('Login error occurred', msg);
+            window._prusaSlicer.postMessage(msg);
+        };
+        window.fetch('/slicer/loginx', {method: 'POST', headers: {Authorization: 'Bearer %s'}})
+            .then(function (resp) {
                 console.log('Login resp', resp);
-                resp.text().then((json) => console.log('Login resp body', json));
+                resp.text()
-            });
+                    .then(function (json) { console.log('Login resp body', json); })
+                    .then(function (body) {
+                        if (resp.status >= 400) errorHandler({status: resp.status, body});
+                    });
+            })
+            .catch(errorHandler);
         )",
 #endif
-        plater->get_user_account()->get_access_token()
+        access_token
-    ));
+    );
-    plater->Bind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
+    return javascript;
 }
 
-ConnectWebViewPanel::~ConnectWebViewPanel()
+void ConnectWebViewPanel::on_page_will_load()
 {
-    m_browser->Unbind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
+    auto javascript = get_login_script(false);
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << "\n";
+    m_browser->AddUserScript(javascript);
 }
 
 void ConnectWebViewPanel::on_user_token(UserAccountSuccessEvent& e)
 {
     e.Skip();
-    wxString javascript = wxString::Format(
+    auto access_token = wxGetApp().plater()->get_user_account()->get_access_token();
-#if AUTH_VIA_FETCH_OVERRIDE
+    assert(!access_token.empty());
-        "window.__access_token = '%s';window.__access_token_version = (window.__access_token_version || 0) + 1;console.log('Updated Auth token', window.__access_token);",
+    wxString javascript = get_login_script(true);
-#else
-        R"(
-        console.log('Preparing login');
-        window.fetch('/slicer/login', {method: 'POST', headers: {Authorization: 'Bearer %s'}})
-            .then((resp) => {
-                console.log('Login resp', resp);
-                resp.text().then((json) => console.log('Login resp body', json));
-            });
-        )",
-#endif
-        wxGetApp().plater()->get_user_account()->get_access_token()
-    );
     //m_browser->AddUserScript(javascript, wxWEBVIEW_INJECT_AT_DOCUMENT_END);
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << "\n";
     m_browser->RunScriptAsync(javascript);
 }
 
@@ -654,23 +689,41 @@ void ConnectWebViewPanel::on_navigation_request(wxWebViewEvent &evt)
         evt.Veto();
     }
 }
+
+void ConnectWebViewPanel::on_connect_action_error(const std::string &message_data)
+{
+    ConnectRequestHandler::on_connect_action_error(message_data);
+    // TODO: make this more user friendly (and make sure only once opened if multiple errors happen)
+//    MessageDialog dialog(
+//        this,
+//        GUI::format_wxstr(_L("WebKit Runtime Error encountered:\n\n%s"), message_data),
+//        "WebKit Runtime Error",
+//        wxOK
+//    );
+//    dialog.ShowModal();
+
+}
+
 void ConnectWebViewPanel::logout()
 {
     wxString script = L"window._prusaConnect_v1.logout()";
     run_script(script);
 
     Plater* plater = wxGetApp().plater();
-    m_browser->RunScript(wxString::Format(
+    auto javascript = wxString::Format(
-        R"(
+                     R"(
             console.log('Preparing login');
             window.fetch('/slicer/logout', {method: 'POST', headers: {Authorization: 'Bearer %s'}})
-                .then((resp) => {
+                .then(function (resp){
                     console.log('Login resp', resp);
-                    resp.text().then((json) => console.log('Login resp body', json));
+                    resp.text().then(function (json) { console.log('Login resp body', json) });
                 });
         )",
-        plater->get_user_account()->get_access_token()
+                     plater->get_user_account()->get_access_token()
-    ));
+    );
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << "\n";
+    m_browser->RunScript(javascript);
+
 }
 
 void ConnectWebViewPanel::sys_color_changed()
@@ -729,6 +782,7 @@ void PrinterWebViewPanel::send_api_key()
     key);
 
     m_browser->RemoveAllUserScripts();
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << script << "\n";
     m_browser->AddUserScript(script);
     m_browser->Reload();
     
@@ -754,7 +808,9 @@ void PrinterWebViewPanel::send_credentials()
 )", usr, psk);
     
     m_browser->RemoveAllUserScripts();
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << script << "\n";
     m_browser->AddUserScript(script);
+    
     m_browser->Reload();
     
 }
@@ -1038,7 +1094,9 @@ void WebViewDialog::on_add_user_script(wxCommandEvent& WXUNUSED(evt))
     if (dialog.ShowModal() != wxID_OK)
         return;
 
-    if (!m_browser->AddUserScript(dialog.GetValue()))
+    const wxString& javascript = dialog.GetValue();
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript <<"\n";
+    if (!m_browser->AddUserScript(javascript))
         wxLogError("Could not add user script");
 }
 
@@ -1145,7 +1203,7 @@ void WebViewDialog::run_script(const wxString& javascript)
     // Remember the script we run in any case, so the next time the user opens
     // the "Run Script" dialog box, it is shown there for convenient updating.
     m_javascript = javascript;
-    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript;
+    BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << "\n";
     m_browser->RunScriptAsync(javascript);
 }
 

src/slic3r/GUI/WebViewDialog.hpp

@@ -59,6 +59,10 @@ public:
     void set_default_url(const wxString& url) { m_default_url = url; }
 
     virtual void sys_color_changed();
+protected:
+
+    virtual void on_page_will_load();
+
 protected:
 
     wxWebView* m_browser { nullptr };
@@ -177,6 +181,7 @@ public:
     void resend_config();
 protected:
     // action callbacs stored in m_actions
+    virtual void on_connect_action_error(const std::string& message_data);
     virtual void on_connect_action_request_config(const std::string& message_data);
     virtual void on_connect_action_request_open_in_browser(const std::string& message_data);
     virtual void on_connect_action_select_printer(const std::string& message_data) = 0;
@@ -201,7 +206,10 @@ protected:
     void on_connect_action_print(const std::string& message_data) override;
     void on_connect_action_webapp_ready(const std::string& message_data) override {}
     void run_script_bridge(const wxString& script) override {run_script(script); }
+    void on_page_will_load() override;
+    void on_connect_action_error(const std::string &message_data) override;
 private:
+    static wxString get_login_script(bool refresh);
     void on_user_token(UserAccountSuccessEvent& e);
     bool m_reached_default_url {false};
 };