Lots of fixes, begin to think about timeouts

main.cpp

@@ -1,20 +1,21 @@
 #include "uWS.h"
 
 std::string buffer;
+int connections = 0;
+
+template<int SIZE, class T>
+void respond(T *s) {
+    s->writeStatus("200 OK")->write([](int offset) {
+        return std::string_view(buffer.data() + offset, SIZE - offset);
+    }, SIZE);
+}
 
 //#define USE_SSL
 
 int main(int argc, char **argv) {
 
-    // dynamically set respinse size from arguments
+    // 50 mb for huge
-    if (argc == 2) {
+    buffer.resize(52428800);
-        int bytes = atoi(argv[1]);
-        std::cout << "Server going to respond with " << bytes << " bytes of data" << std::endl;
-        buffer.resize(bytes);
-    } else {
-        std::cout << "Usage: uWS_test bytesInResponse" << std::endl;
-        return -1;
-    }
 
     //uWS::init();
     //uWS::Loop loop();
@@ -28,13 +29,20 @@ int main(int argc, char **argv) {
     uWS::App app;
 #endif
 
+    // todo: add timeouts and socket shutdown!
+
     app.onGet("/", [](auto *s, auto *req, auto *args) {
-
+        s->writeStatus("200 OK")->writeHeader("Content-type", "text/html; charset=utf-8")->end("<h1>Welcome to µWebSockets v0.15!</h1>");
-        // streams need to expose more information about lifetime!
+    }).onGet("/tiny", [](auto *s, auto *req, auto *args) {
-        s->writeStatus("200 OK")->write([](int offset) {
+        respond<512>(s);
-            return std::string_view(buffer.data() + offset, buffer.length() - offset);
+    }).onGet("/small", [](auto *s, auto *req, auto *args) {
-        }, buffer.length());
+        respond<4096>(s);
-
+    }).onGet("/medium", [](auto *s, auto *req, auto *args) {
+        respond<16384>(s);
+    }).onGet("/large", [](auto *s, auto *req, auto *args) {
+        respond<51200>(s);
+    }).onGet("/huge", [](auto *s, auto *req, auto *args) {
+        respond<52428800>(s);
     }).onPost("/upload", [](auto *s, auto *req, auto *args) {
 
         s->read([s](std::string_view chunk) {
@@ -45,6 +53,10 @@ int main(int argc, char **argv) {
 
     }).onWebSocket("/wsApi", []() {
 
+    }).onHttpConnection([](auto *s) {
+        std::cout << "Connections: " << ++connections << std::endl;
+    }).onHttpDisconnection([](auto *s) {
+        std::cout << "Connections: " << --connections << std::endl;
     }).listen("localhost", 3000, 0);
 
     uWS::run();

src/App.h

@@ -71,6 +71,20 @@ protected:
                 if (appData->onHttpConnection) {
                     appData->onHttpConnection((HttpSocket<SSL> *) s);
                 }
+
+                // we should already be linked!
+                //static_dispatch(us_ssl_socket_context_link, us_socket_context_link)(httpServerContext, s);
+
+                // this should absolutely not be exposed like this!
+                // fix up timers!
+                // this goes hand in hand with fixing up shutdown also!
+                if constexpr (!SSL) {
+                    us_socket_context_link(us_socket_get_context(s), s);
+                }
+
+                // start a timeout on this socket of 10 seconds
+                std::cout << "Arming socket timeout" << std::endl;
+                static_dispatch(us_ssl_socket_timeout, us_socket_timeout)(s, 10);
             });
 
             static_dispatch(us_ssl_socket_context_on_close, us_socket_context_on_close)(httpServerContext, [](auto *s) {
@@ -97,6 +111,10 @@ protected:
             static_dispatch(us_ssl_socket_context_on_writable, us_socket_context_on_writable)(httpServerContext, [](auto *s) {
                 ((HttpSocket<SSL> *) s)->onWritable();
             });
+
+            static_dispatch(us_ssl_socket_context_on_timeout, us_socket_context_on_timeout)(httpServerContext, [](auto *s) {
+                std::cout << "Some socket timed out!" << std::endl;
+            });
         }
 
 public:
@@ -122,6 +140,19 @@ public:
         return *this;
     }
 
+    // why even bother with these?
+    AppBase &onHttpConnection(std::function<void(HttpSocket<SSL> *)> handler) {
+        data->onHttpConnection = handler;
+
+        return *this;
+    }
+
+    AppBase &onHttpDisconnection(std::function<void(HttpSocket<SSL> *)> handler) {
+        data->onHttpDisconnection = handler;
+
+        return *this;
+    }
+
     // for client and server
     AppBase &onWebSocket(std::string pattern, std::function<void()> handler) {
         return *this;

src/HttpRouter.h

@@ -158,7 +158,12 @@ public:
     }
 
     void route(const char *method, unsigned int method_length, const char *url, unsigned int url_length, USERDATA userData) {
-        handlers[lookup(url, url_length)](userData, &params);
+
+        int index = lookup(url, url_length);
+        if (index != -1) {
+            handlers[index](userData, &params);
+        }
+
         params.clear();
     }
 };

src/HttpSocket.h

@@ -133,7 +133,7 @@ struct HttpSocket {
 
             // write that off!
             if constexpr (SSL) {
-
+                httpData->offset = us_ssl_socket_write((SOCKET_TYPE *) this, chunk.data(), chunk.length());
             } else {
                 httpData->offset = us_socket_write((SOCKET_TYPE *) this, chunk.data(), chunk.length(), 0);
             }
@@ -155,7 +155,7 @@ struct HttpSocket {
 
         // write that off!
         if constexpr (SSL) {
-
+            httpData->offset += us_ssl_socket_write((SOCKET_TYPE *) this, chunk.data(), chunk.length());
         } else {
             httpData->offset += us_socket_write((SOCKET_TYPE *) this, chunk.data(), chunk.length(), 0);
         }

src/Loop.h

@@ -13,7 +13,7 @@ struct Loop {
     us_loop *loop;
 
     static const int CORK_BUFFER_SIZE = 16 * 1024;
-    static const int MAX_COPY_DISTANCE = 4 * 1024;
+    static const int MAX_COPY_DISTANCE = 4096;
 
     struct Data {