Dapp refresh

dapps/Cargo.toml

@@ -14,6 +14,7 @@ futures = "0.1"
 linked-hash-map = "0.3"
 log = "0.3"
 parity-dapps-glue = "1.7"
+parking_lot = "0.4"
 mime = "0.2"
 mime_guess = "1.6.1"
 rand = "0.3"

dapps/src/apps/mod.rs

@@ -17,6 +17,7 @@
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 use std::sync::Arc;
+use parking_lot::RwLock;
 
 use endpoint::{Endpoints, Endpoint};
 use page::PageEndpoint;
@@ -80,7 +81,7 @@ pub fn all_endpoints<F: Fetch>(
 	pages.insert("proxy".into(), ProxyPac::boxed(ui_address.clone(), dapps_domain));
 	pages.insert(WEB_PATH.into(), Web::boxed(ui_address.clone(), web_proxy_tokens.clone(), remote.clone(), fetch.clone()));
 
-	Arc::new(pages)
+	Arc::new(RwLock::new(pages))
 }
 
 fn insert<T : WebApp + Default + 'static>(pages: &mut BTreeMap<String, Box<Endpoint>>, id: &str, embed_at: Embeddable) {

dapps/src/endpoint.rs

@@ -17,6 +17,7 @@
 //! URL Endpoint traits
 
 use std::sync::Arc;
+use parking_lot::RwLock;
 use std::collections::BTreeMap;
 
 use hyper::{self, server, net};
@@ -39,7 +40,7 @@ pub struct EndpointInfo {
 	pub icon_url: String,
 }
 
-pub type Endpoints = Arc<BTreeMap<String, Box<Endpoint>>>;
+pub type Endpoints = Arc<RwLock<BTreeMap<String, Box<Endpoint>>>>;
 pub type Handler = server::Handler<net::HttpStream> + Send;
 
 pub trait Endpoint : Send + Sync {

dapps/src/lib.rs

@@ -41,6 +41,7 @@ extern crate parity_dapps_glue as parity_dapps;
 extern crate parity_hash_fetch as hash_fetch;
 extern crate parity_reactor;
 extern crate parity_ui;
+extern crate parking_lot;
 
 #[macro_use]
 extern crate log;
@@ -106,7 +107,7 @@ pub struct Endpoints {
 impl Endpoints {
 	/// Returns a current list of app endpoints.
 	pub fn list(&self) -> Vec<apps::App> {
-		self.endpoints.iter().filter_map(|(ref k, ref e)| {
+		self.endpoints.read().iter().filter_map(|(ref k, ref e)| {
 			e.info().map(|ref info| apps::App::from_info(k, info))
 		}).collect()
 	}

dapps/src/router.rs

@@ -60,15 +60,17 @@ impl http::RequestMiddleware for Router {
 		let is_get_request = *req.method() == hyper::Method::Get;
 		let is_head_request = *req.method() == hyper::Method::Head;
 
+		info!(target: "dapps", "Routing request to {:?}. Details: {:?}", url, req);
 		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", url, req);
+		let endpoints = self.endpoints.as_ref().map(|endpoints| endpoints.read());
 
 		let control = control.clone();
 		debug!(target: "dapps", "Handling endpoint request: {:?}", endpoint);
 		let handler: Option<Box<Handler>> = match (endpoint.0, endpoint.1, referer) {
 			// Handle invalid web requests that we can recover from
 			(ref path, SpecialEndpoint::None, Some((ref referer, ref referer_url)))
 				if referer.app_id == apps::WEB_PATH
-					&& self.endpoints.as_ref().map(|ep| ep.contains_key(apps::WEB_PATH)).unwrap_or(false)
+					&& endpoints.as_ref().map(|ep| ep.contains_key(apps::WEB_PATH)).unwrap_or(false)
 					&& !is_web_endpoint(path)
 				=>
 			{
@@ -87,9 +89,9 @@ impl http::RequestMiddleware for Router {
 					.map(|special| special.to_async_handler(path.clone().unwrap_or_default(), control))
 			},
 			// Then delegate to dapp
-			(Some(ref path), _, _) if self.endpoints.as_ref().map(|ep| ep.contains_key(&path.app_id)).unwrap_or(false) => {
+			(Some(ref path), _, _) if endpoints.as_ref().map(|ep| ep.contains_key(&path.app_id)).unwrap_or(false) => {
 				trace!(target: "dapps", "Resolving to local/builtin dapp.");
-				Some(self.endpoints
+				Some(endpoints
 					.as_ref()
 					.expect("endpoints known to be set; qed")
 					.get(&path.app_id)