Fix nwjs#916: Support SetProxyConfig API

rogerwang · rogerwang · commit 324ebf187361 · 2014-11-18T15:44:53.000+08:00
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -44,10 +44,17 @@
 #include "content/nw/src/nw_shell.h"
 #include "content/nw/src/shell_browser_context.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/render_process_host.h"
+#include "net/proxy/proxy_config.h"
+#include "net/proxy/proxy_config_service_fixed.h"
+#include "net/proxy/proxy_service.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 
 using base::MessageLoop;
+using content::BrowserThread;
 using content::Shell;
 using content::ShellBrowserContext;
 using content::RenderProcessHost;
@@ -81,6 +88,17 @@ void GetRenderProcessHosts(std::set<RenderProcessHost*>& rphs) {
   }
 }
 
+void SetProxyConfigCallback(
+    base::WaitableEvent* done,
+    net::URLRequestContextGetter* url_request_context_getter,
+    const net::ProxyConfig& proxy_config) {
+  net::ProxyService* proxy_service =
+      url_request_context_getter->GetURLRequestContext()->proxy_service();
+  proxy_service->ResetConfigService(
+      new net::ProxyConfigServiceFixed(proxy_config));
+  done->Signal();
+}
+
 }  // namespace
 
 // static
@@ -133,16 +151,16 @@ void App::Call(Shell* shell,
 #if defined(OS_WIN)
     base::string16 path;
     arguments.GetString(0, &path);
-
-    base::win::ShortcutProperties props;
-    base::string16 appID;
-    if (content::Shell::GetPackage()->root()->GetString("app-id", &appID) == false)
-      content::Shell::GetPackage()->root()->GetString(switches::kmName, &appID);
-    const std::wstring appName = base::UTF8ToWide(content::Shell::GetPackage()->GetName());
-    props.set_app_id(appID);
-
-    base::FilePath processPath;
-    PathService::Get(base::FILE_EXE, &processPath);
+
+    base::win::ShortcutProperties props;
+    base::string16 appID;
+    if (content::Shell::GetPackage()->root()->GetString("app-id", &appID) == false)
+      content::Shell::GetPackage()->root()->GetString(switches::kmName, &appID);
+    const std::wstring appName = base::UTF8ToWide(content::Shell::GetPackage()->GetName());
+    props.set_app_id(appID);
+
+    base::FilePath processPath;
+    PathService::Get(base::FILE_EXE, &processPath);
     props.set_target(processPath);
     result->AppendBoolean(base::win::CreateOrUpdateShortcutLink(base::FilePath(path), props, base::win::SHORTCUT_CREATE_ALWAYS));
 #else
@@ -177,6 +195,11 @@ void App::Call(Shell* shell,
     GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
         shortcut->GetAccelerator(), shortcut);
     return;
+  } else if (method == "SetProxyConfig") {
+    std::string proxy_config;
+    arguments.GetString(0, &proxy_config);
+    SetProxyConfig(GetRenderProcessHost(), proxy_config);
+    return;
   }
 
   NOTREACHED() << "Calling unknown sync method " << method << " of App";
@@ -266,4 +289,20 @@ void App::ClearCache(content::RenderProcessHost* render_process_host) {
                           render_process_host->GetID());
 }
 
+void App::SetProxyConfig(content::RenderProcessHost* render_process_host,
+                         const std::string& proxy_config) {
+  net::ProxyConfig config;
+  config.proxy_rules().ParseFromString(proxy_config);
+  net::URLRequestContextGetter* context_getter =
+    render_process_host->GetBrowserContext()->
+    GetRequestContextForRenderProcess(render_process_host->GetID());
+
+  base::WaitableEvent done(false, false);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&SetProxyConfigCallback, &done,
+                 make_scoped_refptr(context_getter), config));
+  done.Wait();
+
+}
 }  // namespace nwapi
diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -60,6 +60,8 @@ class App {
   static void EmitReopenEvent();
 
   static void ClearCache(content::RenderProcessHost* render_view_host);
+  static void SetProxyConfig(content::RenderProcessHost* render_process_host,
+                             const std::string& proxy_config);
 
  private:
   App();
diff --git a/src/api/app/app.js b/src/api/app/app.js
@@ -65,6 +65,10 @@ App.prototype.getProxyForURL = function (url) {
   return nw.callStaticMethodSync('App', 'getProxyForURL', [ url ]);
 }
 
+App.prototype.setProxyConfig = function (proxy_config) {
+  return nw.callStaticMethodSync('App', 'SetProxyConfig', [ proxy_config ]);
+}
+
 App.prototype.addOriginAccessWhitelistEntry = function(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains) {
     return nw.callStaticMethodSync('App', 'AddOriginAccessWhitelistEntry', sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains);
 }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ App.prototype.getProxyForURL = function (url) {`
`65`	`65`	`return nw.callStaticMethodSync('App', 'getProxyForURL', [ url ]);`
`66`	`66`	`}`
`67`	`67`
	`68`	`+App.prototype.setProxyConfig = function (proxy_config) {`
	`69`	`+ return nw.callStaticMethodSync('App', 'SetProxyConfig', [ proxy_config ]);`
	`70`	`+}`
	`71`	`+`
`68`	`72`	`App.prototype.addOriginAccessWhitelistEntry = function(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains) {`
`69`	`73`	`return nw.callStaticMethodSync('App', 'AddOriginAccessWhitelistEntry', sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains);`
`70`	`74`	`}`