Resurrect ServerAgent for external tool access

CMakeLists.txt

@@ -150,6 +150,7 @@ option(USE_SYSTEM_LIBGLEW "Use the system's libglew" OFF)
 option(USE_SYSTEM_LIBLUA "Use the system's liblua" OFF)
 option(PROFILER_ENABLED "Build pioneer with profiling support built-in." OFF)
 option(REMOTE_LUA_REPL "Enable remote LUA console" OFF)
+option(USE_SERVER_AGENT "Enable server agent and HTTP access" ON)
 
 if (REMOTE_LUA_REPL)
 	set(REMOTE_LUA_REPL_PORT 12345 CACHE STRING "TCP port for remote LUA console")
@@ -235,6 +236,10 @@ if (PROFILER_ENABLED)
 	add_definitions(-DPIONEER_PROFILER=1)
 endif(PROFILER_ENABLED)
 
+if (USE_SERVER_AGENT)
+	add_definitions(-DENABLE_SERVER_AGENT=1)
+endif(USE_SERVER_AGENT)
+
 if (WIN32)
 	add_definitions(-DPSAPI_VERSION=1)
 endif (WIN32)

src/Pi.cpp

@@ -68,6 +68,10 @@
 #include "pigui/PerfInfo.h"
 #include "pigui/PiGui.h"
 
+#ifdef ENABLE_SERVER_AGENT
+#include "ServerAgent.h"
+#endif // ENABLE_SERVER_AGENT
+
 #include "sound/AmbientSounds.h"
 #include "sound/Sound.h"
 #include "sound/SoundMusic.h"

src/ServerAgent.cpp

@@ -11,9 +11,12 @@
 #pragma comment(lib, "libcurl.lib")
 #endif
 
+#include "buildopts.h"
 #include "ServerAgent.h"
 #include "StringF.h"
 #include <curl/curl.h>
+#include <SDL.h>
+#include <SDL_Thread.h>
 
 void NullServerAgent::Call(const std::string &method, const Json &data, SuccessCallback onSuccess, FailCallback onFail, void *userdata)
 {
@@ -153,8 +156,8 @@ void HTTPServerAgent::ThreadMain()
 		// done with the queue
 		SDL_UnlockMutex(m_requestQueueLock);
 
-		Json::FastWriter writer;
-		req.buffer = writer.write(req.data);
+		// serialise
+		req.buffer = req.data.dump();
 
 		Response resp(req.onSuccess, req.onFail, req.userdata);
 
@@ -178,10 +181,15 @@ void HTTPServerAgent::ThreadMain()
 		}
 
 		if (resp.success) {
-			Json::Reader reader;
-			resp.success = reader.parse(resp.buffer, resp.data, false);
-			if (!resp.success)
-				resp.buffer = std::string("JSON parse error: " + reader.getFormattedErrorMessages());
+			try {
+				resp.data = Json::parse(resp.buffer);
+				resp.success = resp.data.is_object();
+				if (!resp.success)
+					resp.buffer = std::string("Unknown JSON parse error");
+			} catch (const std::exception &excpt) {
+				resp.success = false;
+				resp.buffer = std::string("JSON parse exception: ") + std::string(excpt.what());
+			}
 		}
 
 		SDL_LockMutex(m_responseQueueLock);

src/ServerAgent.h

@@ -7,10 +7,15 @@
 
 #include "libs.h"
 #include <curl/curl.h>
-#include <json/json.h>
+#include "json.h"
 #include <map>
 #include <queue>
 
+// fwd decl
+struct SDL_Thread;
+struct SDL_mutex;
+struct SDL_cond;
+
 class ServerAgent {
 public:
 	virtual ~ServerAgent() {}

src/lua/Lua.cpp

@@ -20,6 +20,9 @@
 #include "LuaMusic.h"
 #include "LuaNameGen.h"
 #include "LuaSerializer.h"
+#ifdef ENABLE_SERVER_AGENT
+#include "LuaServerAgent.h"
+#endif // ENABLE_SERVER_AGENT
 #include "LuaShipDef.h"
 #include "LuaSpace.h"
 #include "LuaTimer.h"

src/lua/LuaServerAgent.cpp

@@ -8,7 +8,7 @@
 #include "LuaRef.h"
 #include "Pi.h"
 #include "ServerAgent.h"
-#include <json/json.h>
+#include "json.h"
 
 /*
  * Interface: ServerAgent
@@ -53,7 +53,7 @@ static Json _lua_to_json(lua_State *l, int idx)
 
 		// XXX handle arrays
 
-		Json object(Json::objectValue);
+		Json object(Json::object);
 
 		lua_pushnil(l);
 		while (lua_next(l, data)) {
@@ -82,27 +82,27 @@ static void _json_to_lua(lua_State *l, const Json &data)
 	LUA_DEBUG_START(l);
 
 	switch (data.type()) {
-	case Json::nullValue:
+	case Json::value_t::null:
 		lua_pushnil(l);
 		break;
 
-	case Json::intValue:
-	case Json::uintValue:
-	case Json::realValue:
-		lua_pushnumber(l, data.asDouble());
+	case Json::value_t::number_integer:
+	case Json::value_t::number_unsigned:
+	case Json::value_t::number_float:
+		lua_pushnumber(l, data.get<double>());
 		break;
 
-	case Json::stringValue: {
-		const std::string &str(data.asString());
+	case Json::value_t::string: {
+		const std::string &str(data.get<std::string>());
 		lua_pushlstring(l, str.c_str(), str.size());
 		break;
 	}
 
-	case Json::booleanValue:
-		lua_pushboolean(l, data.asBool());
+	case Json::value_t::boolean:
+		lua_pushboolean(l, data.get<bool>());
 		break;
 
-	case Json::arrayValue: {
+	case Json::value_t::array: {
 		lua_newtable(l);
 		for (int i = 0; i < int(data.size()); i++) {
 			lua_pushinteger(l, i + 1);
@@ -112,10 +112,10 @@ static void _json_to_lua(lua_State *l, const Json &data)
 		break;
 	}
 
-	case Json::objectValue: {
+	case Json::value_t::object: {
 		lua_newtable(l);
 		for (Json::const_iterator i = data.begin(); i != data.end(); ++i) {
-			const std::string &key(i.key().asString());
+			const std::string &key(i.key());
 			lua_pushlstring(l, key.c_str(), key.size());
 			_json_to_lua(l, *i);
 			lua_rawset(l, -3);