Fixed #7

Author: sea5kg

src/http_handlers/http_handler_web_folder_example.cpp

@@ -45,11 +45,11 @@ bool HttpHandlerWebFolderExample::handle(const std::string &sWorkerId, WSJCppLig
 
     std::string sFilePath = m_sWebFolder + sRequestPath; // TODO check /../ in path
     if (WSJCppCore::fileExists(sFilePath)) {
-        WSJCppLightWebHttpResponse resp(pRequest->sockFd());
+        WSJCppLightWebHttpResponse resp(pRequest->getSockFd());
         resp.cacheSec(60).ok().sendFile(sFilePath);
     } else {
         std::string sFilePath = m_sWebFolder + "/index.html";
-        WSJCppLightWebHttpResponse resp(pRequest->sockFd());
+        WSJCppLightWebHttpResponse resp(pRequest->getSockFd());
         resp.cacheSec(60).ok().sendFile(sFilePath);    
     }
     return true;

src/wsjcpp_light_web_http_request.cpp

@@ -18,6 +18,7 @@
 
 WSJCppLightWebHttpRequest::WSJCppLightWebHttpRequest(int nSockFd, const std::string &sAddress) {
     TAG = "WSJCppLightWebHttpRequest";
+    m_sUniqueId = WSJCppCore::createUuid();
     m_nSockFd = nSockFd;
     m_sAddress = sAddress;
     m_bClosed = false;
@@ -30,12 +31,18 @@ WSJCppLightWebHttpRequest::WSJCppLightWebHttpRequest(int nSockFd, const std::str
 
 // ----------------------------------------------------------------------
 
-int WSJCppLightWebHttpRequest::sockFd() {
+int WSJCppLightWebHttpRequest::getSockFd() {
     return m_nSockFd;
 }
 
 // ----------------------------------------------------------------------
 
+std::string WSJCppLightWebHttpRequest::getUniqueId() {
+    return m_sUniqueId;
+}
+
+// ----------------------------------------------------------------------
+
 std::string WSJCppLightWebHttpRequest::requestType() {
     return m_sRequestType;
 }
@@ -60,7 +67,7 @@ std::map<std::string,std::string> &WSJCppLightWebHttpRequest::requestQueryParams
 
 // ----------------------------------------------------------------------
 
-std::string WSJCppLightWebHttpRequest::address() {
+std::string WSJCppLightWebHttpRequest::getAddress() {
     return m_sAddress;
 }
 

src/wsjcpp_light_web_http_request.h

@@ -30,11 +30,12 @@ class WSJCppLightWebHttpRequest {
         );
         ~WSJCppLightWebHttpRequest() {};
 
-        int sockFd();
+        int getSockFd();
+        std::string getUniqueId();
         void appendRecieveRequest(const std::string &sRequestPart);
         bool isEnoughAppendReceived();
 
-        std::string address();
+        std::string getAddress();
         std::string requestType();
         std::string requestPath();
         std::string requestBody();
@@ -56,6 +57,7 @@ class WSJCppLightWebHttpRequest {
         EnumParserState m_nParserState;
         std::vector<std::string> m_vHeaders;
         int m_nContentLength;
+        std::string m_sUniqueId;
         std::string m_sRequest;
         std::string m_sAddress;
         std::string m_sRequestType;

src/wsjcpp_light_web_server.cpp

@@ -116,7 +116,7 @@ void WSJCppLightWebHttpThreadWorker::run() {
         bool bExists = pInfo != nullptr;
         // TODO refactor
         if (bExists) {
-            int nSockFd = pInfo->sockFd();
+            int nSockFd = pInfo->getSockFd();
 
             // set timeout options
             struct timeval timeout;

unit-tests.wsjcpp/src/unit_test_parse_http_request.cpp

@@ -19,7 +19,60 @@ void UnitTestParseHttpRequest::init() {
 
 bool UnitTestParseHttpRequest::run() {
     bool bTestSuccess = true;
-    // compareB(bTestSuccess, "Not implemented", true, false);
+    struct LPartsOfRequest {
+        LPartsOfRequest(std::string sPart, bool enough) {
+            this->sPart = sPart;
+            this->enough = enough;
+        }
+        std::string sPart;
+        bool enough;
+    };
+
+    struct LTest {
+        LTest(
+            int sockFd, 
+            std::string address, 
+            std::vector<LPartsOfRequest> parts
+        ) {
+            this->sockFd = sockFd;
+            this->address = address;
+            this->parts = parts;
+        }
+        int sockFd;
+        std::string address;
+        std::vector<LPartsOfRequest> parts;
+    };
+
+    std::vector<LTest> tests;
+    tests.push_back(LTest(0, "some-address", { 
+        LPartsOfRequest("GET /pub/WWW/TheProject.html HTTP/1.1\n", false), 
+        LPartsOfRequest("Host: www.w3.org\n", false),
+        LPartsOfRequest("Content-Length: 0\n", false),
+        LPartsOfRequest("\n", true)
+    }));
+
+    tests.push_back(LTest(1, "some-address2", { 
+        LPartsOfRequest("GET /pub/WWW/TheProject.html HTTP/1.1\n", false),
+        LPartsOfRequest("Host: www.w3.org\n", false),
+        LPartsOfRequest("Content-Length: 1\n", false),
+        LPartsOfRequest("\n", false),
+        LPartsOfRequest("1", true)
+    }));
+
+    for (int i = 0; i < tests.size(); i++) {
+        LTest test = tests[i];
+        WSJCppLightWebHttpRequest request(test.sockFd, test.address);
+        std::string sNTest = "test" + std::to_string(i) + "#";
+
+        compareS(bTestSuccess, sNTest + " request address", request.getAddress(), test.address);
+        compareN(bTestSuccess, sNTest + " request sockfd", request.getSockFd(), test.sockFd);
+
+        for (int n = 0; n < test.parts.size(); n++) {
+            std::string sNTest2 = sNTest + " append part" + std::to_string(n) + "#";
+            request.appendRecieveRequest(test.parts[n].sPart);
+            compareB(bTestSuccess, sNTest2, request.isEnoughAppendReceived(), test.parts[n].enough);
+        }
+    }
     return bTestSuccess;
 }