godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor documentation, variable renaming, refactoring to increase readability. Basically, I want the socket callbacks to receive a pointer to a function names onWhatever and I don't want other functions to have such names.

Browse Source
This commit is contained in:
Marcos Kirsch 2016-02-21 22:14:01 -06:00
parent bf7f918d28
commit b84739dc1b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
httpserver.lua
View File

@ -9,17 +9,17 @@ return function (port)
port, port,
function (connection) function (connection)
-- This variable holds the thread used for sending data back to the user. -- This variable holds the thread (actually a Lua coroutine) used for sending data back to the user.
-- We do it in a separate thread because we need to yield when sending lots -- We do it in a separate thread because we need to send in little chunks and wait for the onSent event
-- of data in order to avoid overflowing the mcu's buffer. -- before we can send more, or we risk overflowing the mcu's buffer.
local connectionThread local connectionThread
local allowStatic = {GET=true, HEAD=true, POST=false, PUT=false, DELETE=false, TRACE=false, OPTIONS=false, CONNECT=false, PATCH=false} local allowStatic = {GET=true, HEAD=true, POST=false, PUT=false, DELETE=false, TRACE=false, OPTIONS=false, CONNECT=false, PATCH=false}
local function startServing(fileServeFunction, connection, req, args) local function startServing(fileServeFunction, connection, req, args)
connectionThread = coroutine.create(function(fileServeFunction, bufferedConnection, req, args) connectionThread = coroutine.create(function(fileServeFunction, bufferedConnection, req, args)
fileServeFunction(bufferedConnection, req, args) fileServeFunction(bufferedConnection, req, args)
-- The bufferedConnection may still hold some data that hasn't been sent. Flush it before closing.
if not bufferedConnection:flush() then if not bufferedConnection:flush() then
connection:close() connection:close()
connectionThread = nil connectionThread = nil
@ -32,10 +32,9 @@ return function (port)
if not status then if not status then
print("Error: ", err) print("Error: ", err)
end end
end end
local function onRequest(connection, req) local function handleRequest(connection, req)
collectgarbage() collectgarbage()
local method = req.method local method = req.method
local uri = req.uri local uri = req.uri
@ -110,7 +109,7 @@ return function (port)
end end
if user and req.methodIsValid and (req.method == "GET" or req.method == "POST" or req.method == "PUT") then if user and req.methodIsValid and (req.method == "GET" or req.method == "POST" or req.method == "PUT") then
onRequest(connection, req) handleRequest(connection, req)
else else
local args = {} local args = {}
local fileServeFunction = dofile("httpserver-error.lc") local fileServeFunction = dofile("httpserver-error.lc")
@ -143,14 +142,16 @@ return function (port)
end end
end end
connection:on("receive", onReceive) local function onDisconnect(connection, payload)
connection:on("sent", onSent)
connection:on("disconnection",function(c)
if connectionThread then if connectionThread then
connectionThread = nil connectionThread = nil
collectgarbage() collectgarbage()
end end
end) end
connection:on("receive", onReceive)
connection:on("sent", onSent)
connection:on("disconnection", onDisconnect)
end end
) )