Fix bridge bug & Refactor ContentGeneratorAPI

controller/StaticWebPageController.cpp

@@ -11,15 +11,7 @@ using namespace xc::processor;
 
 namespace xc::controller {
 
-    static ContentGenerator staticWebPageController([] (auto p) {
-        if (p.getMethod() != "GET") { return false; }
-        struct stat buffer;
-        string filePath = "html/" + p.getURL();
-        return stat(filePath.c_str(), &buffer) == 0;
-    }, [] (auto p) {
-        string filePath = "html/" + p.getURL();
-        return new BinaryResponseData(200, filePath, "");
-    });
+
 
 }
 

httpserver/ClientConnection.cpp

@@ -37,6 +37,7 @@ namespace xc {
             this->clWrite = clWrite;
             char *requestBuff = (char *)::malloc(urlRequestBuffSize);
             this->requestBuff = requestBuff;
+
             ::fgets(requestBuff, urlRequestBuffSize, clRead);
 
             if (::strstr(requestBuff, "HTTP/") == NULL) {
@@ -62,6 +63,8 @@ namespace xc {
                 ostringstream body;
 
                 bool isHeader = true;
+                bool lastLineIsEmpty = false;
+                bool lastLineEmptyAndZero = false;
                 while (::fgets(requestBuff, urlRequestBuffSize, clRead)) {
                     int len = ::strlen(requestBuff);
                     char *lineBuff = (char *) ::malloc(len + 1), *pLineBuff = lineBuff;
@@ -86,8 +89,23 @@ namespace xc {
                     }
                     if (::strlen(lineBuff) == 0) {
                         isHeader = false;
+                        lastLineIsEmpty = true;
+                        if (lastLineEmptyAndZero) {
+                            break;
+                        } else {
+                            lastLineEmptyAndZero = false;
+                        }
+                        if (method == "GET") {
+                            break;
+                        }
                         continue;
                     }
+                    if (lineBuff[0] == '0') {
+                        if (lastLineIsEmpty) {
+                            lastLineEmptyAndZero = true;
+                            lastLineIsEmpty = false;
+                        }
+                    }
                     if (isHeader) {
                         char *headerValue;
                         char *headerName = strtok_r(lineBuff, ":", &headerValue);

main.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "webui.h"
+#include <sys/stat.h>
 
 #include "httpserver/http-server.h"
 #include "utils/utils.h"
@@ -8,17 +8,29 @@
 using namespace xc::httpserver;
 using namespace xc::processor;
 
+ContentGeneratorDefine({
+    if (request.getMethod() != "GET") { return false; }
+    struct stat buffer;
+    string filePath = "html/" + request.getURL();
+    return stat(filePath.c_str(), &buffer) == 0;
+}, {
+    string filePath = "html" + request.getURL();
+    return new BinaryResponseData(200, filePath, mimeTypeOfFile(filePath));
+})
+
+ContentGeneratorDefine(return request.getURL() == "/test1", {
+    return new TextResponseData(200, "test1 controller response");
+})
+
+ContentGeneratorDefine(return request.getURL() == "/test2", {
+    return new TextResponseData(200, "test2 controller response");
+})
+
 int main() {
     std::cout << "Hello, World!" << std::endl;
     HTTPServer server(8192);
-    thread serverThread([&server] {
-        server.serverLoop();
-    });
-    serverThread.detach();
+    thread([&server] { server.serverLoop(); }).detach();
     RequestProcessWorker worker;
-    thread workerThread([&worker] {
-        worker.workerLoop();
-    });
-    while (true) ;
-    return 0;
+    thread([&worker] { worker.workerLoop(); }).detach();
+    while (true) usleep(1000);
 }

processor/ContentGenerator.cpp

@@ -6,12 +6,13 @@
 
 namespace xc {
     namespace processor {
-        extern vector<ContentGenerator *> generators;
+        ContentGenerator *generators[1024];
+        int generatorsCnt = 0;
 
         ContentGenerator::ContentGenerator(RequestCheckBlock checker, ContentGenerateBlock generator) {
             this->checker = checker;
             this->generator = generator;
-            generators.push_back(this);
+            generators[generatorsCnt++] = this;
         }
 
         bool ContentGenerator::matchRequest(RequestData request) {

processor/ContentGenerator.h

@@ -7,6 +7,13 @@
 #include "processor-private.h"
 #include "../utils/utils.h"
 
+#define __merge_body(a, b) a ## b
+#define __merge(a, b) __merge_body(a, b)
+#define __uniqueVarName(name) __merge(name, __LINE__)
+
+#define ContentGeneratorDefine(cond, eval) \
+const ContentGenerator __uniqueVarName(AutoContentGenerator)([] (auto request) { cond; }, [] (auto request) { eval; });
+
 using namespace std;
 
 namespace xc {

processor/RequestProcessWorker.cpp

@@ -9,14 +9,13 @@
 namespace xc {
     namespace processor {
 
-        vector<ContentGenerator *> generators;
-
         void RequestProcessWorker::workerLoop() {
             while (true) {
-                RequestProcessTask task = processor::dequeueTaskSync();
+                RequestProcessTask *task = processor::dequeueTaskSync();
                 ContentGenerator *generator = nullptr;
-                for (auto it : generators) {
-                    if (it->matchRequest(task.getRequest())) {
+                for (int i = 0; i < generatorsCnt; i++) {
+                    auto it = generators[i];
+                    if (it->matchRequest(task->getRequest())) {
                         generator = it;
                     }
                 }
@@ -24,9 +23,9 @@ namespace xc {
                 if (generator == nullptr) {
                     resp = new FileResponseData(conf::errorPage404);
                 } else {
-                    resp = generator->generateResponse(task.getRequest());
+                    resp = generator->generateResponse(task->getRequest());
                 }
-                task.processFinish(resp);
+                task->processFinish(resp);
             }
         }
 

processor/RequestProcessorManager.cpp

@@ -21,11 +21,11 @@ namespace xc {
             taskQueueMutex.unlock();
         }
 
-        RequestProcessTask dequeueTaskSync() {
+        RequestProcessTask *dequeueTaskSync() {
             while (true) {
                 taskQueueMutex.lock();
                 if (!taskQueue.empty()) {
-                    RequestProcessTask task = *taskQueue.front();
+                    RequestProcessTask *task = taskQueue.front();
                     taskQueue.pop_front();
                     taskQueueMutex.unlock();
                     return task;

processor/RequestProcessorManager.h

@@ -16,6 +16,6 @@ namespace xc {
         void deleteTask(RequestProcessTask *task);
 
         /*从处理队列中取出一个，如果没有则等待*/
-        RequestProcessTask dequeueTaskSync();
+        RequestProcessTask *dequeueTaskSync();
     }
 }

processor/processor-private.h

@@ -19,3 +19,9 @@
 
 using namespace std;
 using namespace xc::utils;
+
+namespace xc::processor {
+    class ContentGenerator;
+    extern ContentGenerator *generators[];
+    extern int generatorsCnt;
+}

utils/BinaryResponseData.cpp

@@ -57,7 +57,7 @@ namespace xc {
                 if (inputFile) {
                     ::uint8_t buff[mtu];
                     long readPerPack = 0;
-                    while ((readPerPack = ::fread(buff, 1, mtu, inputFile)) == mtu) {
+                    while ((readPerPack = ::fread(buff, 1, mtu, inputFile)) > 0) {
                         ::fwrite(buff, 1, readPerPack, fp);
                     }
                 } else {

utils/FileReader.cpp

@@ -20,4 +20,18 @@ namespace xc::utils {
         fin.close();
         return str;
     }
+
+    string mimeTypeOfFile(string filePath) {
+        std::filesystem::path p(filePath);
+        string ext = p.extension();
+        auto cit = conf::fileExtensionToMimeTypes.find(ext);
+        if (cit != conf::fileExtensionToMimeTypes.end()) {
+            return cit->second;
+        }
+        cit = conf::fileExtensionToMimeTypes.find("default");
+        if (cit != conf::fileExtensionToMimeTypes.end()) {
+            return cit->second;
+        }
+        return "data";
+    }
 }

utils/utils.h

@@ -14,4 +14,5 @@ using namespace std;
 
 namespace xc::utils {
     string contentsOfTextFile(string filePath);
+    string mimeTypeOfFile(string filePath);
 }