Merge pull request #1101 from ethcore/apps-api

Apps listing API & Home webapp.

Cargo.lock

@@ -356,10 +356,15 @@ dependencies = [
  "jsonrpc-core 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-idmanager 0.1.3 (git+https://github.com/ethcore/parity-idmanager-rs.git)",
+ "parity-idmanager 0.2.2 (git+https://github.com/ethcore/parity-idmanager-rs.git)",
- "parity-status 0.4.1 (git+https://github.com/ethcore/parity-status.git)",
+ "parity-status 0.4.3 (git+https://github.com/ethcore/parity-status.git)",
- "parity-wallet 0.3.0 (git+https://github.com/ethcore/parity-wallet.git)",
+ "parity-wallet 0.4.0 (git+https://github.com/ethcore/parity-wallet.git)",
- "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)",
+ "parity-webapp 0.2.0 (git+https://github.com/ethcore/parity-webapp.git)",
+ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -831,32 +836,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "parity-idmanager"
-version = "0.1.3"
+version = "0.2.2"
-source = "git+https://github.com/ethcore/parity-idmanager-rs.git#efb69592b87854f41d8882de75982c8f1e748666"
+source = "git+https://github.com/ethcore/parity-idmanager-rs.git#e93ef48a78722561d52ab88c3dfcc5c1465558ac"
 dependencies = [
- "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)",
+ "parity-webapp 0.2.0 (git+https://github.com/ethcore/parity-webapp.git)",
 ]
 
 [[package]]
 name = "parity-status"
-version = "0.4.1"
+version = "0.4.3"
-source = "git+https://github.com/ethcore/parity-status.git#f121ebd1f49986545d9fc262ba210cdf07039e6d"
+source = "git+https://github.com/ethcore/parity-status.git#1d383d74010f6ebcd712b60b8fc5ff547b44f4e5"
 dependencies = [
- "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)",
+ "parity-webapp 0.2.0 (git+https://github.com/ethcore/parity-webapp.git)",
 ]
 
 [[package]]
 name = "parity-wallet"
-version = "0.3.0"
+version = "0.4.0"
-source = "git+https://github.com/ethcore/parity-wallet.git#664fd2b85dd94ca184868bd3965e14a4ba68c03f"
+source = "git+https://github.com/ethcore/parity-wallet.git#5391a89dc5dbf162d1beeba555f03c24bfd619bd"
 dependencies = [
- "parity-webapp 0.1.0 (git+https://github.com/ethcore/parity-webapp.git)",
+ "parity-webapp 0.2.0 (git+https://github.com/ethcore/parity-webapp.git)",
 ]
 
 [[package]]
 name = "parity-webapp"
-version = "0.1.0"
+version = "0.2.0"
-source = "git+https://github.com/ethcore/parity-webapp.git#0bf133f193863ba0e88b0b824a5c330037cce3f1"
+source = "git+https://github.com/ethcore/parity-webapp.git#f31681af69631bcadfbef89a7e60dcc49552f7c6"
 
 [[package]]
 name = "primal"

webapp/Cargo.toml

@@ -4,6 +4,7 @@ name = "ethcore-webapp"
 version = "1.2.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
+build = "build.rs"
 
 [lib]
 
@@ -13,15 +14,24 @@ jsonrpc-core = "2.0"
 jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
 hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
 url = "1.0"
+rustc-serialize = "0.3"
+serde = "0.7.0"
+serde_json = "0.7.0"
+serde_macros = { version = "0.7.0", optional = true }
 ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
-parity-webapp = { git = "https://github.com/ethcore/parity-webapp.git" }
+parity-webapp = { git = "https://github.com/ethcore/parity-webapp.git", version = "0.2" }
 # List of apps
-parity-status = { git = "https://github.com/ethcore/parity-status.git", version = "0.4.1" }
+parity-status = { git = "https://github.com/ethcore/parity-status.git", version = "0.4.3" }
-parity-idmanager = { git = "https://github.com/ethcore/parity-idmanager-rs.git", version = "0.1.3" }
+parity-idmanager = { git = "https://github.com/ethcore/parity-idmanager-rs.git", version = "0.2.2" }
-parity-wallet = { git = "https://github.com/ethcore/parity-wallet.git", version = "0.3.0", optional = true }
+parity-wallet = { git = "https://github.com/ethcore/parity-wallet.git", version = "0.4.0", optional = true }
 clippy = { version = "0.0.67", optional = true}
 
+[build-dependencies]
+serde_codegen = { version = "0.7.0", optional = true }
+syntex = "0.32.0"
+
 [features]
-default = ["parity-wallet"]
+default = ["parity-wallet", "serde_codegen"]
+nightly = ["serde_macros"]
 dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]

webapp/build.rs

@@ -0,0 +1,45 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#[cfg(not(feature = "serde_macros"))]
+mod inner {
+    extern crate syntex;
+    extern crate serde_codegen;
+
+    use std::env;
+    use std::path::Path;
+
+    pub fn main() {
+        let out_dir = env::var_os("OUT_DIR").unwrap();
+
+        let src = Path::new("./src/api/mod.rs.in");
+        let dst = Path::new(&out_dir).join("mod.rs");
+
+        let mut registry = syntex::Registry::new();
+
+        serde_codegen::register(&mut registry);
+        registry.expand("", &src, &dst).unwrap();
+    }
+}
+
+#[cfg(feature = "serde_macros")]
+mod inner {
+    pub fn main() {}
+}
+
+fn main() {
+    inner::main();
+}

webapp/src/api/api.rs

@@ -14,15 +14,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Simple REST API
-
 use std::sync::Arc;
-use endpoint::{Endpoint, Endpoints, ContentHandler, Handler, EndpointPath};
+use endpoint::{Endpoint, Endpoints, Handler, EndpointPath};
+
+use api::response::as_json;
 
 pub struct RestApi {
 	endpoints: Arc<Endpoints>,
 }
 
+#[derive(Debug, PartialEq, Serialize)]
+struct App {
+	pub id: String,
+	pub name: String,
+	pub description: String,
+	pub version: String,
+	pub author: String,
+	#[serde(rename="iconUrl")]
+	pub icon_url: String,
+}
+
 impl RestApi {
 	pub fn new(endpoints: Arc<Endpoints>) -> Box<Endpoint> {
 		Box::new(RestApi {
@@ -30,20 +41,23 @@ impl RestApi {
 		})
 	}
 
-	fn list_pages(&self) -> String {
+	fn list_apps(&self) -> Vec<App> {
-		let mut s = "[".to_owned();
+		self.endpoints.iter().filter_map(|(ref k, ref e)| {
-		for name in self.endpoints.keys() {
+			e.info().map(|ref info| App {
-			s.push_str(&format!("\"{}\",", name));
+				id: k.to_owned().clone(),
-		}
+				name: info.name.clone(),
-		s.push_str("\"rpc\"");
+				description: info.description.clone(),
-		s.push_str("]");
+				version: info.version.clone(),
-		s
+				author: info.author.clone(),
+				icon_url: info.icon_url.clone(),
+			})
+		}).collect()
 	}
 }
 
 impl Endpoint for RestApi {
 	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
-		Box::new(ContentHandler::new(self.list_pages(), "application/json".to_owned()))
+		as_json(&self.list_apps())
 	}
 }
 

webapp/src/api/mod.rs

@@ -0,0 +1,28 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! REST API
+
+#![warn(missing_docs)]
+#![cfg_attr(feature="nightly", feature(custom_derive, custom_attribute, plugin))]
+#![cfg_attr(feature="nightly", plugin(serde_macros, clippy))]
+
+#[cfg(feature = "serde_macros")]
+include!("mod.rs.in");
+
+#[cfg(not(feature = "serde_macros"))]
+include!(concat!(env!("OUT_DIR"), "/mod.rs"));
+

webapp/src/api/mod.rs.in

@@ -0,0 +1,20 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+mod api;
+mod response;
+
+pub use self::api::RestApi;

webapp/src/api/response.rs

@@ -0,0 +1,23 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use serde::Serialize;
+use serde_json;
+use endpoint::{ContentHandler, Handler};
+
+pub fn as_json<T : Serialize>(val: &T) -> Box<Handler> {
+	Box::new(ContentHandler::new(serde_json::to_string(val).unwrap(), "application/json".to_owned()))
+}

webapp/src/apps.rs

@@ -30,7 +30,7 @@ pub const API_PATH : &'static str =  "api";
 pub const UTILS_PATH : &'static str =  "parity-utils";
 
 pub fn main_page() -> &'static str {
-	"/status/"
+	"/home/"
 }
 
 pub fn utils() -> Box<Endpoint> {
@@ -43,6 +43,7 @@ pub fn all_endpoints() -> Endpoints {
 
 	insert::<parity_status::App>(&mut pages, "status");
 	insert::<parity_status::App>(&mut pages, "parity");
+	insert::<parity_idmanager::App>(&mut pages, "home");
 
 	wallet_page(&mut pages);
 	pages

webapp/src/endpoint.rs

@@ -30,7 +30,18 @@ pub struct EndpointPath {
 	pub port: u16,
 }
 
+#[derive(Debug, PartialEq)]
+pub struct EndpointInfo {
+	pub name: String,
+	pub description: String,
+	pub version: String,
+	pub author: String,
+	pub icon_url: String,
+}
+
 pub trait Endpoint : Send + Sync {
+	fn info(&self) -> Option<EndpointInfo> { None }
+
 	fn to_handler(&self, path: EndpointPath) -> Box<server::Handler<HttpStream>>;
 }
 

webapp/src/lib.rs

@@ -47,6 +47,8 @@
 extern crate log;
 extern crate url;
 extern crate hyper;
+extern crate serde;
+extern crate serde_json;
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
 extern crate parity_webapp;

webapp/src/page/mod.rs

@@ -22,8 +22,8 @@ use hyper::header;
 use hyper::status::StatusCode;
 use hyper::net::HttpStream;
 use hyper::{Decoder, Encoder, Next};
-use endpoint::{Endpoint, EndpointPath};
+use endpoint::{Endpoint, EndpointInfo, EndpointPath};
-use parity_webapp::WebApp;
+use parity_webapp::{WebApp, Info};
 
 pub struct PageEndpoint<T : WebApp + 'static> {
 	/// Content of the files
@@ -39,6 +39,7 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 			prefix: None,
 		}
 	}
+
 	pub fn with_prefix(app: T, prefix: String) -> Self {
 		PageEndpoint {
 			app: Arc::new(app),
@@ -48,6 +49,11 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 }
 
 impl<T: WebApp> Endpoint for PageEndpoint<T> {
+
+	fn info(&self) -> Option<EndpointInfo> {
+		Some(EndpointInfo::from(self.app.info()))
+	}
+
 	fn to_handler(&self, path: EndpointPath) -> Box<server::Handler<HttpStream>> {
 		Box::new(PageHandler {
 			app: self.app.clone(),
@@ -59,6 +65,18 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
 	}
 }
 
+impl From<Info> for EndpointInfo {
+	fn from(info: Info) -> Self {
+		EndpointInfo {
+			name: info.name,
+			description: info.description,
+			author: info.author,
+			icon_url: info.icon_url,
+			version: info.version,
+		}
+	}
+}
+
 struct PageHandler<T: WebApp + 'static> {
 	app: Arc<T>,
 	prefix: Option<String>,