Minor fixes, added user events to tbconnection

Author: Develo

httpserver-request.lua

@@ -105,19 +105,20 @@ end
 -- Parses the client's request. Returns a dictionary containing pretty much everything
 -- the server needs to know about the uri.
 return function (request)
-   local e = request:find("\r\n", 1, true)
-   if not e then 
-     print("httpserver-request.lc: nil e")
-     return nil 
-   end
-   local line = request:sub(1, e - 1)
-   local r = {}
-   local _ = {}
-   local i = {}
-   _, i, r.method, r.request = line:find("^([A-Z]+) (.-) HTTP/[1-9]+.[0-9]+$")
-   r.methodIsValid = validateMethod(r.method)
-   r.uri = parseUri(r.request)
-   r.getRequestData = getRequestData(request)
-   collectgarbage()
-   return r
+    local r = {}
+    local e = request:find("\r\n", 1, true)
+    if not e then 
+        print("httpserver-request.lc: nil e")
+        r.methodIsValid = false
+        return r
+    end
+    local line = request:sub(1, e - 1)
+    local _ = {}
+    local i = {}
+    _, i, r.method, r.request = line:find("^([A-Z]+) (.-) HTTP/[1-9]+.[0-9]+$")
+    r.methodIsValid = validateMethod(r.method)
+    r.uri = parseUri(r.request)
+    r.getRequestData = getRequestData(request)
+    collectgarbage()
+    return r
 end

httpserver-servefunction.lua

@@ -15,12 +15,12 @@ return function (connection, payload)
     end
 
     local req = dofile("httpserver-request.lc")(payload)
-    print(req.method .. ": " .. req.request)
 
     local serveFunction = nil
     local methodIsAllowed = {GET=true, POST=true, PUT=true}
 
     if user and req.methodIsValid and methodIsAllowed[req.method] and #(req.uri.file) <= 31 then
+        print(req.method .. ": " .. req.request)
         local uri = req.uri
 
         local fileExists = file.exists(uri.file)

tbconnection.lua

@@ -51,7 +51,8 @@ return function(connectionArg, keepconnectionArg)
 
 
     local connectionThread = nil
-    local onDisconnectionUserCallback = nil
+    local onDisconnectionUserCallback = nil --called when connection gets dropped 
+    local onSentUserCallback = nil --called when functionArg is done sending (i.e.: returns in coroutine). Call is done via node.task.post, so callback executes in main thread instead of coroutine.
 
     -- clean up closure context
     local function cleanup()
@@ -61,6 +62,7 @@ return function(connectionArg, keepconnectionArg)
         end
         connectionThread = nil
         onDisconnectionUserCallback = nil
+        onSentUserCallback = nil
         collectgarbage()    
     end
 
@@ -138,7 +140,11 @@ return function(connectionArg, keepconnectionArg)
                 bconn:flush()
                 bconn = nil
                 collectgarbage()
+                if onSentUserCallback then
+                    node.task.post(node.task.MEDIUM_PRIORITY, onSentUserCallback)
+                end
                 cleanup()
+                collectgarbage()
             end
         )
 
@@ -148,12 +154,22 @@ return function(connectionArg, keepconnectionArg)
             print("Error: ", err)
         end
     end
- 
+
     function threadedBufferedConnection:close()
         connection:close()
         cleanup()
     end
 
+    function threadedBufferedConnection:on(event, callback)
+        if event == "disconnection" then
+            onDisconnectionUserCallback = callback
+        elseif event == "sent" then
+            onSentUserCallback = callback
+        else
+            error("Error: unknown event: "..event)
+        end
+    end
+
     local function onDisconnection(conn)
         if onDisconnectionUserCallback then
             onDisconnectionUserCallback(conn)