separated JSConsole core

eth/main.cpp

@@ -41,7 +41,7 @@
 
 #include <libwebthree/WebThree.h>
 #if ETH_JSCONSOLE || !ETH_TRUE
-#include <libjsconsole/JSConsole.h>
+#include <libjsconsole/JSLocalConsole.h>
 #endif
 #if ETH_READLINE || !ETH_TRUE
 #include <readline/readline.h>
@@ -1696,7 +1696,7 @@ int main(int argc, char** argv)
 		if (useConsole)
 		{
 #if ETH_JSCONSOLE
-			JSConsole console(web3, make_shared<SimpleAccountHolder>([&](){return web3.ethereum();}, getAccountPassword, keyManager));
+			JSLocalConsole console(web3, make_shared<SimpleAccountHolder>([&](){return web3.ethereum();}, getAccountPassword, keyManager));
 			while (!g_exit)
 			{
 				console.repl();

libjsconsole/JSConsole.cpp

@@ -20,66 +20,5 @@
  * Ethereum client.
  */
 
-#include <iostream>
-#include <libdevcore/Log.h>
-#include <libweb3jsonrpc/WebThreeStubServer.h>
-#include "JSConsole.h"
-#include "JSV8Connector.h"
-
-// TODO! make readline optional!
-#include <readline/readline.h>
-#include <readline/history.h>
-
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-JSConsole::JSConsole(WebThreeDirect& _web3, shared_ptr<AccountHolder> const& _accounts):
-	m_engine(),
-	m_printer(m_engine)
-{
-	m_jsonrpcConnector.reset(new JSV8Connector(m_engine));
-	m_jsonrpcServer.reset(new WebThreeStubServer(*m_jsonrpcConnector.get(), _web3, _accounts, vector<KeyPair>()));
-}
-
-JSConsole::~JSConsole() {}
 
-void JSConsole::repl() const
-{
-	string cmd = "";
-	g_logPost = [](std::string const& a, char const*) { cout << "\r           \r" << a << endl << flush; rl_forced_update_display(); };
-
-	bool isEmpty = true;
-	int openBrackets = 0;
-	do {
-		char* buff = readline(promptForIndentionLevel(openBrackets).c_str());
-		isEmpty = !(buff && *buff);
-		if (!isEmpty)
-		{
-			cmd += string(buff);
-			cmd += " ";
-			free(buff);
-			int open = count(cmd.begin(), cmd.end(), '{');
-			open += count(cmd.begin(), cmd.end(), '(');
-			int closed = count(cmd.begin(), cmd.end(), '}');
-			closed += count(cmd.begin(), cmd.end(), ')');
-			openBrackets = open - closed;
-		}
-	} while (openBrackets > 0);
-
-	if (!isEmpty)
-	{
-		add_history(cmd.c_str());
-		auto value = m_engine.eval(cmd.c_str());
-		string result = m_printer.prettyPrint(value).cstr();
-		cout << result << endl;
-	}
-}
-
-std::string JSConsole::promptForIndentionLevel(int _i) const
-{
-	if (_i == 0)
-		return "> ";
-
-	return string((_i + 1) * 2, ' ');
-}
+#include "JSConsole.h"

libjsconsole/JSConsole.h

@@ -22,33 +22,66 @@
 
 #pragma once
 
-#include <libjsengine/JSV8Engine.h>
-#include <libjsengine/JSV8Printer.h>
-
-class WebThreeStubServer;
-namespace jsonrpc { class AbstractServerConnector; }
+#include <libdevcore/Log.h>
+// TODO! make readline optional!
+#include <readline/readline.h>
+#include <readline/history.h>
 
 namespace dev
 {
 namespace eth
 {
 
-class AccountHolder;
-
+template<typename Engine, typename Printer>
 class JSConsole
 {
 public:
-	JSConsole(WebThreeDirect& _web3, std::shared_ptr<AccountHolder> const& _accounts);
-	~JSConsole();
-	void repl() const;
+	JSConsole(): m_engine(Engine()), m_printer(Printer(m_engine)) {};
+	~JSConsole() {};
+
+	void repl() const
+	{
+		std::string cmd = "";
+		g_logPost = [](std::string const& a, char const*) { std::cout << "\r           \r" << a << std::endl << std::flush; rl_forced_update_display(); };
+
+		bool isEmpty = true;
+		int openBrackets = 0;
+		do {
+			char* buff = readline(promptForIndentionLevel(openBrackets).c_str());
+			isEmpty = !(buff && *buff);
+			if (!isEmpty)
+			{
+				cmd += std::string(buff);
+				cmd += " ";
+				free(buff);
+				int open = std::count(cmd.begin(), cmd.end(), '{');
+				open += std::count(cmd.begin(), cmd.end(), '(');
+				int closed = std::count(cmd.begin(), cmd.end(), '}');
+				closed += std::count(cmd.begin(), cmd.end(), ')');
+				openBrackets = open - closed;
+			}
+		} while (openBrackets > 0);
+
+		if (!isEmpty)
+		{
+			add_history(cmd.c_str());
+			auto value = m_engine.eval(cmd.c_str());
+			std::string result = m_printer.prettyPrint(value).cstr();
+			std::cout << result << std::endl;
+		}
+	}
+
+protected:
+	Engine m_engine;
+	Printer m_printer;
 
-private:
-	std::string promptForIndentionLevel(int _i) const;
+	virtual std::string promptForIndentionLevel(int _i) const
+	{
+		if (_i == 0)
+			return "> ";
 
-	JSV8Engine m_engine;
-	JSV8Printer m_printer;
-	std::unique_ptr<WebThreeStubServer> m_jsonrpcServer;
-	std::unique_ptr<jsonrpc::AbstractServerConnector> m_jsonrpcConnector;
+		return std::string((_i + 1) * 2, ' ');
+	}
 };
 
 }

libjsconsole/JSLocalConsole.cpp

@@ -0,0 +1,36 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum 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.
+
+	cpp-ethereum 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 cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file JSLocalConsole.cpp
+ * @author Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ * Ethereum client.
+ */
+
+#include <iostream>
+#include <libweb3jsonrpc/WebThreeStubServer.h>
+#include "JSLocalConsole.h"
+#include "JSV8Connector.h"
+
+using namespace std;
+using namespace dev;
+using namespace dev::eth;
+
+JSLocalConsole::JSLocalConsole(WebThreeDirect& _web3, shared_ptr<AccountHolder> const& _accounts)
+{
+	m_jsonrpcConnector.reset(new JSV8Connector(m_engine));
+//	m_jsonrpcServer.reset(new WebThreeStubServer(*m_jsonrpcConnector.get(), _web3, _accounts, vector<KeyPair>()));
+}

libjsconsole/JSLocalConsole.h

@@ -0,0 +1,51 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum 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.
+
+	cpp-ethereum 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 cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file JSLocalConsole.h
+ * @author Marek Kotewicz <marek@ethdev.com>
+ * @date 2015
+ * Ethereum client.
+ */
+
+#pragma once
+
+#include <libjsengine/JSV8Engine.h>
+#include <libjsengine/JSV8Printer.h>
+#include "JSConsole.h"
+
+class WebThreeStubServer;
+namespace jsonrpc { class AbstractServerConnector; }
+
+namespace dev
+{
+namespace eth
+{
+
+class AccountHolder;
+
+class JSLocalConsole: public JSConsole<JSV8Engine, JSV8Printer>
+{
+public:
+	JSLocalConsole(WebThreeDirect& _web3, std::shared_ptr<AccountHolder> const& _accounts);
+	virtual ~JSLocalConsole() {};
+
+private:
+	std::unique_ptr<WebThreeStubServer> m_jsonrpcServer;
+	std::unique_ptr<jsonrpc::AbstractServerConnector> m_jsonrpcConnector;
+};
+
+}
+}