Skip to content

Commit

Permalink
Turn RequestBroker::Get/SaveUserInfoAsync into a request derived from…
Browse files Browse the repository at this point in the history 
… Download

Also move everything http_ into Download and DownloadManager and nuke RequestBroker.
  • Loading branch information
@LBPHacker @jacob1
LBPHacker authored and jacob1 committed Mar 8, 2019
1 parent af4d022 commit 1864a86
Show file tree
Hide file tree
Showing 31 changed files with 260 additions and 1,200 deletions.
38 changes: 38 additions & 0 deletions src/client/APIRequest.cpp
View file
@@ -0,0 +1,38 @@
#include "APIRequest.h"

#include "client/Client.h"

namespace http
{
APIRequest::APIRequest(ByteString url) : Download(url)
{
User user = Client::Ref().GetAuthUser();
AuthHeaders(ByteString::Build(user.UserID), user.SessionID);
}

APIRequest::~APIRequest()
{
}

APIRequest::Result APIRequest::Finish()
{
Result result;
try
{
ByteString data = Download::Finish(&result.status);
Client::Ref().ParseServerReturn(data, result.status, true);
if (result.status == 200 && data.size())
{
std::istringstream dataStream(data);
Json::Value objDocument;
dataStream >> objDocument;
result.document = std::unique_ptr<Json::Value>(new Json::Value(objDocument));
}
}
catch (std::exception & e)
{
}
return result;
}
}

30 changes: 30 additions & 0 deletions src/client/APIRequest.h
View file
@@ -0,0 +1,30 @@
#ifndef APIREQUEST2_H
#define APIREQUEST2_H

#include "Download.h"
#include "common/String.h"
#include "json/json.h"

#include <memory>
#include <map>

namespace http
{
class APIRequest : public Download
{
public:
struct Result
{
int status;
std::unique_ptr<Json::Value> document;
};

APIRequest(ByteString url);
virtual ~APIRequest();

Result Finish();
};
}

#endif // APIREQUEST2_H

4 changes: 4 additions & 0 deletions src/client/AvatarRequest.cpp
View file
Expand Up @@ -7,5 +7,9 @@ namespace http
ImageRequest(ByteString::Build("http://" STATICSERVER "/avatars/", username, ".pti"), width, height)
{
}

AvatarRequest::~AvatarRequest()
{
}
}

1 change: 1 addition & 0 deletions src/client/AvatarRequest.h
View file
Expand Up @@ -10,6 +10,7 @@ namespace http
{
public:
AvatarRequest(ByteString username, int width, int height);
virtual ~AvatarRequest();
};
}

Expand Down
209 changes: 3 additions & 206 deletions src/client/Client.cpp
View file
Expand Up @@ -34,7 +34,6 @@
#include "Misc.h"
#include "Platform.h"
#include "Update.h"
#include "HTTP.h"

#include "simulation/SaveRenderer.h"
#include "gui/interface/Point.h"
Expand All @@ -45,10 +44,7 @@
#include "gui/preview/Comment.h"
#include "ClientListener.h"
#include "client/Download.h"
#include "requestbroker/RequestBroker.h"
#include "requestbroker/WebRequest.h"
#include "requestbroker/APIRequest.h"
#include "requestbroker/APIResultParser.h"
#include "client/DownloadManager.h"

#include "json/json.h"

Expand Down Expand Up @@ -115,10 +111,7 @@ void Client::Initialise(ByteString proxyString)
update_finish();
}

if (proxyString.length())
http_init((char*)proxyString.c_str());
else
http_init(NULL);
http::DownloadManager::Ref().Initialise(proxyString);

//Read stamps library
std::ifstream stampsLib;
Expand Down Expand Up @@ -439,15 +432,6 @@ bool Client::DoInstallation()
#endif
}

void Client::SetProxy(ByteString proxy)
{
http_done();
if(proxy.length())
http_init((char*)proxy.c_str());
else
http_init(NULL);
}

std::vector<ByteString> Client::DirectorySearch(ByteString directory, ByteString search, ByteString extension)
{
std::vector<ByteString> extensions;
Expand Down Expand Up @@ -722,8 +706,6 @@ RequestStatus Client::ParseServerReturn(ByteString &result, int status, bool jso

void Client::Tick()
{
//Check thumbnail queue
RequestBroker::Ref().FlushThumbQueue();
if (versionCheckRequest)
{
if (CheckUpdate(versionCheckRequest, true))
Expand Down Expand Up @@ -931,8 +913,7 @@ void Client::WritePrefs()

void Client::Shutdown()
{
RequestBroker::Ref().Shutdown();
http_done();
http::DownloadManager::Ref().Shutdown();

//Save config
WritePrefs();
Expand Down Expand Up @@ -1243,86 +1224,6 @@ std::vector<unsigned char> Client::GetSaveData(int saveID, int saveDate)
return saveData;
}

RequestBroker::Request * Client::GetSaveDataAsync(int saveID, int saveDate)
{
ByteString url;
if(saveDate){
url = ByteString::Build("http://", STATICSERVER, "/", saveID, "_", saveDate, ".cps");
} else {
url = ByteString::Build("http://", STATICSERVER, "/", saveID, ".cps");
}
return new WebRequest(url);
}

RequestBroker::Request * Client::SaveUserInfoAsync(UserInfo info)
{
class StatusParser: public APIResultParser
{
virtual void * ProcessResponse(unsigned char * data, int dataLength)
{
try
{
std::istringstream dataStream((char*)data);
Json::Value objDocument;
dataStream >> objDocument;
return (void*)(objDocument["Status"].asInt() == 1);
}
catch (std::exception & e)
{
return 0;
}
}
virtual void Cleanup(void * objectPtr)
{
//delete (UserInfo*)objectPtr;
}
virtual ~StatusParser() { }
};
std::map<ByteString, ByteString> postData;
postData.insert(std::pair<ByteString, ByteString>("Location", info.location.ToUtf8()));
postData.insert(std::pair<ByteString, ByteString>("Biography", info.biography.ToUtf8()));
return new APIRequest("http://" SERVER "/Profile.json", postData, new StatusParser());
}

RequestBroker::Request * Client::GetUserInfoAsync(ByteString username)
{
class UserInfoParser: public APIResultParser
{
virtual void * ProcessResponse(unsigned char * data, int dataLength)
{
try
{
std::istringstream dataStream((char*)data);
Json::Value objDocument;
dataStream >> objDocument;
Json::Value tempUser = objDocument["User"];
return new UserInfo(tempUser["ID"].asInt(),
tempUser["Age"].asInt(),
tempUser["Username"].asString(),
ByteString(tempUser["Biography"].asString()).FromUtf8(),
ByteString(tempUser["Location"].asString()).FromUtf8(),
tempUser["Website"].asString(),
tempUser["Saves"]["Count"].asInt(),
tempUser["Saves"]["AverageScore"].asInt(),
tempUser["Saves"]["HighestScore"].asInt(),
tempUser["Forum"]["Topics"].asInt(),
tempUser["Forum"]["Replies"].asInt(),
tempUser["Forum"]["Reputation"].asInt());
}
catch (std::exception &e)
{
return 0;
}
}
virtual void Cleanup(void * objectPtr)
{
delete (UserInfo*)objectPtr;
}
virtual ~UserInfoParser() { }
};
return new APIRequest("http://" SERVER "/User.json?Name=" + username, new UserInfoParser());
}

LoginStatus Client::Login(ByteString username, ByteString password, User & user)
{
lastError = "";
Expand Down Expand Up @@ -1594,110 +1495,6 @@ SaveInfo * Client::GetSave(int saveID, int saveDate)
return NULL;
}

RequestBroker::Request * Client::GetSaveAsync(int saveID, int saveDate)
{
ByteStringBuilder urlStream;
urlStream << "http://" << SERVER << "/Browse/View.json?ID=" << saveID;
if(saveDate)
{
urlStream << "&Date=" << saveDate;
}

class SaveInfoParser: public APIResultParser
{
virtual void * ProcessResponse(unsigned char * data, int dataLength)
{
try
{
std::istringstream dataStream((char*)data);
Json::Value objDocument;
dataStream >> objDocument;

int tempID = objDocument["ID"].asInt();
int tempScoreUp = objDocument["ScoreUp"].asInt();
int tempScoreDown = objDocument["ScoreDown"].asInt();
int tempMyScore = objDocument["ScoreMine"].asInt();
ByteString tempUsername = objDocument["Username"].asString();
String tempName = ByteString(objDocument["Name"].asString()).FromUtf8();
String tempDescription = ByteString(objDocument["Description"].asString()).FromUtf8();
int tempCreatedDate = objDocument["DateCreated"].asInt();
int tempUpdatedDate = objDocument["Date"].asInt();
bool tempPublished = objDocument["Published"].asBool();
bool tempFavourite = objDocument["Favourite"].asBool();
int tempComments = objDocument["Comments"].asInt();
int tempViews = objDocument["Views"].asInt();
int tempVersion = objDocument["Version"].asInt();

Json::Value tagsArray = objDocument["Tags"];
std::list<ByteString> tempTags;
for (Json::UInt j = 0; j < tagsArray.size(); j++)
tempTags.push_back(tagsArray[j].asString());

SaveInfo * tempSave = new SaveInfo(tempID, tempCreatedDate, tempUpdatedDate, tempScoreUp,
tempScoreDown, tempMyScore, tempUsername, tempName,
tempDescription, tempPublished, tempTags);
tempSave->Comments = tempComments;
tempSave->Favourite = tempFavourite;
tempSave->Views = tempViews;
tempSave->Version = tempVersion;
return tempSave;
}
catch (std::exception &e)
{
return NULL;
}
}
virtual void Cleanup(void * objectPtr)
{
delete (SaveInfo*)objectPtr;
}
virtual ~SaveInfoParser() { }
};
return new APIRequest(urlStream.Build(), new SaveInfoParser());
}

RequestBroker::Request * Client::GetCommentsAsync(int saveID, int start, int count)
{
class CommentsParser: public APIResultParser
{
virtual void * ProcessResponse(unsigned char * data, int dataLength)
{
std::vector<SaveComment*> * commentArray = new std::vector<SaveComment*>();
try
{
std::istringstream dataStream((char*)data);
Json::Value commentsArray;
dataStream >> commentsArray;

for (Json::UInt j = 0; j < commentsArray.size(); j++)
{
int userID = ByteString(commentsArray[j]["UserID"].asString()).ToNumber<int>();
ByteString username = commentsArray[j]["Username"].asString();
ByteString formattedUsername = commentsArray[j]["FormattedUsername"].asString();
if (formattedUsername == "jacobot")
formattedUsername = "\bt" + formattedUsername;
String comment = ByteString(commentsArray[j]["Text"].asString()).FromUtf8();
commentArray->push_back(new SaveComment(userID, username, formattedUsername, comment));
}
return commentArray;
}
catch (std::exception &e)
{
delete commentArray;
return NULL;
}
}
virtual void Cleanup(void * objectPtr)
{
delete (std::vector<SaveComment*>*)objectPtr;
}
virtual ~CommentsParser() { }
};

ByteString url = ByteString::Build("http://", SERVER, "/Browse/Comments.json?ID=", saveID, "&Start=", start, "&Count=", count);
return new APIRequest(url, new CommentsParser());
}

std::vector<std::pair<ByteString, int> > * Client::GetTags(int start, int count, String query, int & resultCount)
{
lastError = "";
Expand Down
11 changes: 0 additions & 11 deletions src/client/Client.h
View file
Expand Up @@ -14,8 +14,6 @@

#include "json/json.h"

#include "requestbroker/RequestBroker.h"

class SaveInfo;
class SaveFile;
class SaveComment;
Expand Down Expand Up @@ -121,7 +119,6 @@ class Client: public Singleton<Client> {
String GetMessageOfTheDay();

void Initialise(ByteString proxyString);
void SetProxy(ByteString proxy);
bool IsFirstRun();

int MakeDirectory(const char * dirname);
Expand All @@ -147,22 +144,14 @@ class Client: public Singleton<Client> {

RequestStatus AddComment(int saveID, String comment);

//Retrieves a "UserInfo" object
RequestBroker::Request * GetUserInfoAsync(ByteString username);
RequestBroker::Request * SaveUserInfoAsync(UserInfo info);

RequestBroker::Request * GetSaveDataAsync(int saveID, int saveDate);
unsigned char * GetSaveData(int saveID, int saveDate, int & dataLength);
std::vector<unsigned char> GetSaveData(int saveID, int saveDate);

LoginStatus Login(ByteString username, ByteString password, User & user);
std::vector<SaveInfo*> * SearchSaves(int start, int count, String query, ByteString sort, ByteString category, int & resultCount);
std::vector<std::pair<ByteString, int> > * GetTags(int start, int count, String query, int & resultCount);

RequestBroker::Request * GetCommentsAsync(int saveID, int start, int count);

SaveInfo * GetSave(int saveID, int saveDate);
RequestBroker::Request * GetSaveAsync(int saveID, int saveDate);

RequestStatus DeleteSave(int saveID);
RequestStatus ReportSave(int saveID, String message);
Expand Down

0 comments on commit 1864a86

Please sign in to comment.