kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ws transfer + send + receive / improved logging (contributed by Matt DeBoer)

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-29 17:21:52 -07:00
parent f6bf2531bb
commit d1fc31b894
3 changed files with 69 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ws/ws_receive.cpp
View File

@ -74,7 +74,7 @@ namespace ix
void WebSocketReceiver::waitForConnection()
{
std::cout << "Connecting..." << std::endl;
std::cout << "ws_receive: Connecting..." << std::endl;
std::unique_lock<std::mutex> lock(_conditionVariableMutex);
_condition.wait(lock);
@ -82,7 +82,7 @@ namespace ix
void WebSocketReceiver::waitForMessage()
{
std::cout << "Waiting for message..." << std::endl;
std::cout << "ws_receive: Waiting for message..." << std::endl;
std::unique_lock<std::mutex> lock(_conditionVariableMutex);
_condition.wait(lock);
@ -118,27 +118,27 @@ namespace ix
void WebSocketReceiver::handleMessage(const std::string& str)
{
std::cerr << "Received message: " << str.size() << std::endl;
std::cerr << "ws_receive: Received message: " << str.size() << std::endl;
std::string errMsg;
MsgPack data = MsgPack::parse(str, errMsg);
if (!errMsg.empty())
{
handleError("Invalid MsgPack", std::string());
handleError("ws_receive: Invalid MsgPack", std::string());
return;
}
std::cout << "id: " << data["id"].string_value() << std::endl;
std::vector<uint8_t> content = data["content"].binary_items();
std::cout << "Content size: " << content.size() << std::endl;
std::cout << "ws_receive: Content size: " << content.size() << std::endl;
// Validate checksum
uint64_t cksum = ix::djb2Hash(content);
auto cksumRef = data["djb2_hash"].string_value();
std::cout << "Computed hash: " << cksum << std::endl;
std::cout << "Reference hash: " << cksumRef << std::endl;
std::cout << "ws_receive: Computed hash: " << cksum << std::endl;
std::cout << "ws_receive: Reference hash: " << cksumRef << std::endl;
if (std::to_string(cksum) != cksumRef)
{
@ -151,12 +151,12 @@ namespace ix
std::string filenameTmp = filename + ".tmp";
std::cout << "Writing to disk: " << filenameTmp << std::endl;
std::cout << "ws_receive: Writing to disk: " << filenameTmp << std::endl;
std::ofstream out(filenameTmp);
out.write((char*) &content.front(), content.size());
out.close();
std::cout << "Renaming " << filenameTmp << " to " << filename << std::endl;
std::cout << "ws_receive: Renaming " << filenameTmp << " to " << filename << std::endl;
rename(filenameTmp.c_str(), filename.c_str());
std::map<MsgPack, MsgPack> pdu;
@ -172,13 +172,12 @@ namespace ix
void WebSocketReceiver::start()
{
_webSocket.setUrl(_url);
ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(
_enablePerMessageDeflate, false, false, 15, 15);
_webSocket.setPerMessageDeflateOptions(webSocketPerMessageDeflateOptions);
std::stringstream ss;
log(std::string("Connecting to url: ") + _url);
log(std::string("ws_receive: Connecting to url: ") + _url);
_webSocket.setOnMessageCallback([this](const ix::WebSocketMessagePtr& msg) {
std::stringstream ss;
@ -231,7 +230,7 @@ namespace ix
}
else
{
ss << "Invalid ix::WebSocketMessageType";
ss << "ws_receive: Invalid ix::WebSocketMessageType";
log(ss.str());
}
});
@ -251,7 +250,7 @@ namespace ix
std::chrono::duration<double, std::milli> duration(1000);
std::this_thread::sleep_for(duration);
std::cout << "Done !" << std::endl;
std::cout << "ws_receive: Done !" << std::endl;
webSocketReceiver.stop();
}