Version 12.3.0

erocha · Jul 12, 2016 · d903ecb · d903ecb
1 parent e89ec50
commit d903ecb
Show file tree

Hide file tree

Showing 38 changed files with 1,029 additions and 245 deletions.
diff --git a/ChromeWorker/ChromeWorker.pro b/ChromeWorker/ChromeWorker.pro
@@ -43,15 +43,16 @@ SOURCES += main.cpp \
     replaceall.cpp \
     convertencoding.cpp \
     fixcontentcharset.cpp \
-    extract_resources.cpp
+    extract_resources.cpp \
+    handlersmanager.cpp
 
 INCLUDEPATH += $(BAS_PATH_WORKER)/include
 
 
-LIBS += -L$(BAS_PATH_WORKER)/lib -llibiconv -llibcef -lcef_sandbox -llibcef_dll_wrapper -lAdvapi32 -luser32 -lPsapi -lshell32 -lDbgHelp -lgdi32 -llibcurl -llibeay32 -lssleay32 -lnetwork-uri
+LIBS += -L$(BAS_PATH_WORKER)/lib -llibiconv -llibcef -llibcef_dll_wrapper -lAdvapi32 -luser32 -lPsapi -lshell32 -lDbgHelp -lgdi32 -llibcurl -llibeay32 -lssleay32 -lnetwork-uri
 QMAKE_CXXFLAGS_RELEASE += /MT
 
-QMAKE_CXXFLAGS_DEBUG += /MTd /FS
+QMAKE_CXXFLAGS_DEBUG += /MTd
 
 HEADERS += \
     mainapp.h \
@@ -97,7 +98,8 @@ HEADERS += \
     replaceall.h \
     convertencoding.h \
     fixcontentcharset.h \
-    extract_resources.h
+    extract_resources.h \
+    handlersmanager.h
 
 INCLUDEPATH += xml json png
 

diff --git a/ChromeWorker/browserdata.h b/ChromeWorker/browserdata.h
@@ -36,6 +36,12 @@ class BrowserData
     InspectResult _Inspect;
     ModulesDataList _ModulesData;
 
+    //Dialogs
+    std::string _PromptResult;
+    std::string _HttpAuthLogin;
+    std::string _HttpAuthPassword;
+
+
     //Reset
     std::atomic_bool IsReset;
     std::atomic_bool IsAboutBlankLoaded;

diff --git a/ChromeWorker/commandparser.cpp b/ChromeWorker/commandparser.cpp
@@ -1,6 +1,7 @@
 #include "commandparser.h"
 #include "rapidxml.hpp"
 #include "log.h"
+#include "split.h"
 
 CommandParser::CommandParser()
 {
@@ -125,6 +126,30 @@ void CommandParser::Parse(const std::string& Xml)
                 f(value);
         }
 
+        CommandNode = MessagesNode->first_node("SetPromptResult");
+        if(CommandNode)
+        {
+            std::string value = CommandNode->value();
+            worker_log("EventSetPromptResult");
+            for(auto f:EventSetPromptResult)
+                f(value);
+        }
+
+        CommandNode = MessagesNode->first_node("SetHttpAuthResult");
+        if(CommandNode)
+        {
+            std::string value = CommandNode->value();
+            std::vector<std::string> s = split(value,':');
+            if(s.size() == 2)
+            {
+                std::string login = s[0];
+                std::string password = s[1];
+                worker_log("EventSetHttpAuthResult");
+                for(auto f:EventSetHttpAuthResult)
+                    f(login,password);
+            }
+        }
+
         CommandNode = MessagesNode->first_node("GetCookiesForUrl");
         if(CommandNode)
         {

diff --git a/ChromeWorker/commandparser.h b/ChromeWorker/commandparser.h
@@ -21,6 +21,9 @@ class CommandParser
     std::vector<std::function<void(const std::string&, const std::string&)> > EventAddHeader;
     std::vector<std::function<void(const std::string&)> > EventSetUserAgent;
     std::vector<std::function<void(const std::string&)> > EventSetOpenFileName;
+    std::vector<std::function<void(const std::string&)> > EventSetPromptResult;
+    std::vector<std::function<void(const std::string&,const std::string&)> > EventSetHttpAuthResult;
+
     std::vector<std::function<void()> > EventGetUrl;
     std::vector<std::function<void(int, int)> > EventResize;
     std::vector<std::function<void(const std::string&)> > EventSetWindow;

diff --git a/ChromeWorker/curlresourcehandler.cpp b/ChromeWorker/curlresourcehandler.cpp
@@ -191,6 +191,12 @@ void CurlThreadFunction(CurlResourceHandler::CurlThreadDataClass * Data)
             curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,Data->ProxyAuth.c_str());
     }
 
+    if(!Data->HttpAuthLogin.empty() && !Data->HttpAuthPassword.empty())
+    {
+        curl_easy_setopt(curl_handle,CURLOPT_USERNAME,Data->HttpAuthLogin.c_str());
+        curl_easy_setopt(curl_handle,CURLOPT_PASSWORD,Data->HttpAuthPassword.c_str());
+    }
+
     //if(write_logs)
     //{
         //curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L);
@@ -300,6 +306,12 @@ bool CurlResourceHandler::ProcessRequest(CefRefPtr<CefRequest> request, CefRefPt
         CurlThreadData.ProxyAuth = _BrowserData->_Proxy.AuthToString();
     }
 
+    {
+        LOCK_HTTP_AUTH
+        CurlThreadData.HttpAuthLogin = _BrowserData->_HttpAuthLogin;
+        CurlThreadData.HttpAuthPassword = _BrowserData->_HttpAuthPassword;
+    }
+
     CefRequest::HeaderMap ReqestHeaderMap;
     request->GetHeaderMap(ReqestHeaderMap);
 

diff --git a/ChromeWorker/curlresourcehandler.h b/ChromeWorker/curlresourcehandler.h
@@ -51,6 +51,8 @@ class CurlResourceHandler : public CefResourceHandler
             std::vector<char> PostData;
             std::string Proxy;
             std::string ProxyAuth;
+            std::string HttpAuthLogin;
+            std::string HttpAuthPassword;
 
             /* Sync */
             std::atomic_bool StopRequest = false;

diff --git a/ChromeWorker/devtoolshandler.cpp b/ChromeWorker/devtoolshandler.cpp
@@ -4,13 +4,27 @@
 DevToolsHandler::DevToolsHandler()
 {
     OpenAfterClose = false;
+    DoClose = false;
+    DevToolsBrowserId = -1;
 }
 
 void DevToolsHandler::SetData(BrowserData *Data)
 {
     this->Data = Data;
 }
 
+void DevToolsHandler::SetLayout(MainLayout *Layout)
+{
+    this->Layout = Layout;
+}
+
+
+void DevToolsHandler::SetHandlersManager(HandlersManager *_HandlersManager)
+{
+    this->_HandlersManager = _HandlersManager;
+    this->_HandlersManager->EventNeedToCloseDevTools.push_back(std::bind(&DevToolsHandler::CloseDevTools,this));
+}
+
 void DevToolsHandler::Timer()
 {
     if(OpenAfterClose)
@@ -24,18 +38,80 @@ void DevToolsHandler::Timer()
             window_info.SetAsChild(Data->_MainWindowHandle, rect);
             CefBrowserSettings browser_settings;
 
-            Browser->GetHost()->ShowDevTools(window_info, Handler, browser_settings, Point);
+            _HandlersManager->GetBrowser()->GetHost()->ShowDevTools(window_info, this, browser_settings, Point);
+
+        }
+    }
+
+    if(DoClose)
+    {
+        AfterCloseTimer--;
+        if(AfterCloseTimer<0)
+        {
+            DoClose = false;
+            DevToolsBrowserId = -1;
+            //OpenDevTools();
         }
     }
 }
 
-void DevToolsHandler::OpenNewDevTools(CefPoint Point,CefRefPtr<DevToolsHandler> Handler,CefRefPtr<CefBrowser> Browser, RECT rect)
+void DevToolsHandler::OpenDevTools()
 {
+    if(DevToolsBrowserId > 0)
+        return;
+    CefWindowInfo window_info;
+    RECT rect = Layout->GetDevToolsRectangle(Data->WidthBrowser,Data->HeightBrowser,Data->WidthAll,Data->HeightAll);
+    window_info.SetAsChild(Data->_MainWindowHandle, rect);
+    CefBrowserSettings browser_settings;
+    _HandlersManager->GetBrowser()->GetHost()->ShowDevTools(window_info, this, browser_settings, CefPoint(0,0));
+    DevToolsBrowserId = _HandlersManager->GetBrowser()->GetIdentifier();
+    //_HandlersManager->SetDevToolsBorwserId(DevToolsBrowserId);
+}
+
+void DevToolsHandler::OpenDevTools(CefPoint Point)
+{
+    if(DoClose)
+        return;
+
+    if(OpenAfterClose)
+        return;
+
+    RECT rect = Layout->GetDevToolsRectangle(Data->WidthBrowser,Data->HeightBrowser,Data->WidthAll,Data->HeightAll);
+    HWND HDevTools = Layout->GetDevToolsHandle();
+    if(HDevTools)
+    {
+        DestroyWindow(HDevTools);
+    }
+
     OpenAfterClose = true;
     AfterCloseTimer = 10;
 
     this->Point = Point;
-    this->Handler = Handler;
-    this->Browser = Browser;
     this->rect = rect;
+
+    DevToolsBrowserId = _HandlersManager->GetBrowser()->GetIdentifier();
+    //_HandlersManager->SetDevToolsBorwserId(DevToolsBrowserId);
+}
+
+void DevToolsHandler::CloseDevTools()
+{
+    if(DoClose)
+        return;
+
+    if(OpenAfterClose)
+        return;
+
+    if(DevToolsBrowserId < 0)
+        return;
+
+    HWND HDevTools = Layout->GetDevToolsHandle();
+    if(HDevTools)
+    {
+        DestroyWindow(HDevTools);
+        DoClose = true;
+        AfterCloseTimer = 10;
+    }
+
+
+
 }
diff --git a/ChromeWorker/devtoolshandler.h b/ChromeWorker/devtoolshandler.h
@@ -2,24 +2,33 @@
 #define DEVTOOLSHANDLER_H
 #include "include/cef_client.h"
 #include "browserdata.h"
+#include "handlersmanager.h"
+#include "mainlayout.h"
 
 class DevToolsHandler : public CefClient
 {
 
     CefPoint Point;
-    CefRefPtr<DevToolsHandler> Handler;
-    CefRefPtr<CefBrowser> Browser;
+    HandlersManager *_HandlersManager = 0;
     RECT rect;
     BrowserData *Data;
+    MainLayout *Layout;
 
     bool OpenAfterClose;
+    bool DoClose;
+
     int AfterCloseTimer;
+    int DevToolsBrowserId;
+
 public:
     DevToolsHandler();
 
     void SetData(BrowserData *Data);
-
-    void OpenNewDevTools(CefPoint Point,CefRefPtr<DevToolsHandler> Handler,CefRefPtr<CefBrowser> Browser, RECT rect);
+    void SetLayout(MainLayout *Layout);
+    void SetHandlersManager(HandlersManager *_HandlersManager);
+    void OpenDevTools();
+    void OpenDevTools(CefPoint Point);
+    void CloseDevTools();
     void Timer();
 private:
     IMPLEMENT_REFCOUNTING(DevToolsHandler);