fallback if httpc is unavailable

include/matrixclient.h

@@ -38,6 +38,12 @@ enum struct RequestError : u8 {
 	timeout,
 };
 
+enum struct ForceRequest : u8 {
+	none,
+	curl,
+	httpc,
+};
+
 typedef void (*eventCallback)(std::string roomId, json_t* event);
 typedef void (*roomInfoCallback)(std::string roomId, RoomInfo info);
 typedef void (*roomLimitedCallback)(std::string roomId, std::string prevBatch);
@@ -65,7 +71,7 @@ public:
 	void registerFilter();
 	json_t* doSync(std::string token, std::string filter, u32 timeout);
 	void syncLoop();
-	json_t* doRequest(const char* method, std::string path, json_t* body = NULL, u32 timeout = 5);
+	json_t* doRequest(const char* method, std::string path, json_t* body = NULL, u32 timeout = 5, ForceRequest forceRequest = ForceRequest::none);
 	json_t* doRequestCurl(const char* method, std::string url, json_t* body, u32 timeout);
 	json_t* doRequestHttpc(const char* method, std::string url, json_t* body, u32 timeout);
 public:
@@ -73,7 +79,7 @@ public:
 	std::string getToken();
 	bool login(std::string username, std::string password);
 	void logout();
-	std::string getUserId();
+	std::string getUserId(ForceRequest forceRequest = ForceRequest::none);
 	std::string resolveRoom(std::string alias);
 	std::vector<std::string> getJoinedRooms();
 	RoomInfo getRoomInfo(std::string roomId);

source/matrixclient.cpp

@@ -41,6 +41,7 @@ namespace Matrix {
 
 static u32 *SOC_buffer = NULL;
 bool HTTPC_inited = false;
+bool haveHttpcSupport = false;
 
 Client::Client(std::string homeserverUrl, std::string matrixToken, Store* clientStore) {
 	hsUrl = homeserverUrl;
@@ -91,11 +92,22 @@ void Client::logout() {
 	}
 }
 
-std::string Client::getUserId() {
+std::string Client::getUserId(ForceRequest forceRequest) {
-	if (userIdCache != "") {
+	if (forceRequest == ForceRequest::none) {
-		return userIdCache;
+		if (userIdCache != "") {
+			return userIdCache;
+		}
+		std::string userIdHttpc = getUserId(ForceRequest::httpc);
+		std::string userIdCurl = getUserId(ForceRequest::curl);
+		haveHttpcSupport = userIdHttpc == userIdCurl;
+		if (haveHttpcSupport) {
+			printf_top("httpc support present\n");
+		} else {
+			printf_top("httpc support not present\n");
+		}
+		return userIdCurl;
 	}
-	json_t* ret = doRequest("GET", "/_matrix/client/r0/account/whoami");
+	json_t* ret = doRequest("GET", "/_matrix/client/r0/account/whoami", NULL, 5, forceRequest);
 	const char* userIdCStr = json_object_get_string_value(ret, "user_id");
 	if (!userIdCStr) {
 		if (ret) json_decref(ret);
@@ -721,22 +733,50 @@ size_t DoRequestWriteCallback(char *contents, size_t size, size_t nmemb, void *u
 bool doingCurlRequest = false;
 bool doingHttpcRequest = false;
 
-json_t* Client::doRequest(const char* method, std::string path, json_t* body, u32 timeout) {
+json_t* Client::doRequest(const char* method, std::string path, json_t* body, u32 timeout, ForceRequest forceRequest) {
 	std::string url = hsUrl + path;
 	requestId++;
-	
+	if (forceRequest == ForceRequest::curl) {
-	if (!doingCurlRequest) {
+		while(doingCurlRequest) {
+			svcSleepThread((u64)1000000ULL);
+		}
 		doingCurlRequest = true;
 		json_t* ret = doRequestCurl(method, url, body, timeout);
 		doingCurlRequest = false;
 		return ret;
-	} else if (!doingHttpcRequest) {
+	}
+	if (forceRequest == ForceRequest::httpc) {
+		while(doingHttpcRequest) {
+			svcSleepThread((u64)1000000ULL);
+		}
 		doingHttpcRequest = true;
 		json_t* ret = doRequestHttpc(method, url, body, timeout);
 		doingHttpcRequest = false;
 		return ret;
+	}
+	if (haveHttpcSupport) {
+		while(doingCurlRequest && doingHttpcRequest) {
+			svcSleepThread((u64)1000000ULL);
+		}
+		if (!doingCurlRequest) {
+			doingCurlRequest = true;
+			json_t* ret = doRequestCurl(method, url, body, timeout);
+			doingCurlRequest = false;
+			return ret;
+		} else {
+			doingHttpcRequest = true;
+			json_t* ret = doRequestHttpc(method, url, body, timeout);
+			doingHttpcRequest = false;
+			return ret;
+		}
 	} else {
-		return doRequestCurl(method, url, body, timeout);
+		while(doingCurlRequest) {
+			svcSleepThread((u64)1000000ULL);
+		}
+		doingCurlRequest = true;
+		json_t* ret = doRequestCurl(method, url, body, timeout);
+		doingCurlRequest = false;
+		return ret;
 	}
 }
 
@@ -851,7 +891,7 @@ json_t* Client::doRequestHttpc(const char* method, std::string url, json_t* body
 		ret = httpcBeginRequest(&context);
 		if (bodyStr) free(bodyStr);
 		if (ret) {
-			printf_top("Failed to perform request %ld\n", ret);
+			printf_top("Failed to perform request %lu\n", ret);
 			httpcCloseContext(&context);
 			return NULL;
 		}
@@ -862,8 +902,10 @@ json_t* Client::doRequestHttpc(const char* method, std::string url, json_t* body
 			url = std::string(newUrl);
 		}
 	} while ((statusCode >= 301 && statusCode <= 303) || (statusCode >= 307 && statusCode <= 308));
+//	printf_top("Status code: %lu\n", statusCode);
 	ret = httpcGetDownloadSizeState(&context, NULL, &contentSize);
 	if (ret != 0) {
+		printf_top("Failed getDownloadSizeState %lu\n", ret);
 		httpcCloseContext(&context);
 		return NULL;
 	}