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

Added back improved version of validateMethod

Browse Source 
Reduced MIME types list to save memory

Fixed argument parsing! this is biggie

General cleanup and bugfixes
This commit is contained in:
Marcos Kirsch 2015-02-22 16:25:31 -06:00
parent 796d17b205
commit d73bd73211
1 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
httpserver.lua
View File

@ -8,19 +8,11 @@ module("httpserver", package.seeall)
-- given an HTTP method, returns it or if invalid returns nil -- given an HTTP method, returns it or if invalid returns nil
local function validateMethod(method) local function validateMethod(method)
-- HTTP Request Methods. local httpMethods = {GET=true, HEAD=true, POST=true, PUT=true, DELETE=true, TRACE=true, OPTIONS=true, CONNECT=true, PATCH=true}
-- HTTP servers are required to implement at least the GET and HEAD methods if httpMethods[method] then return method else return nil end
-- http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods
local httpMethods = {"GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "OPTIONS", "CONNECT", "PATCH"}
for i=1,#httpMethods do
if httpMethods[i] == method then
return method
end
end
return nil
end end
function parseRequest(request) local function parseRequest(request)
local e = request:find("\r\n", 1, true) local e = request:find("\r\n", 1, true)
if not e then return nil end if not e then return nil end
local line = request:sub(1, e - 1) local line = request:sub(1, e - 1)
@ -39,49 +31,61 @@ local function onError(connection, errorCode, errorString)
connection:send("<html><head><title>" .. errorCode .. " - " .. errorString .. "</title></head><body><h1>" .. errorCode .. " - " .. errorString .. "</h1></body></html>\r\n") connection:send("<html><head><title>" .. errorCode .. " - " .. errorString .. "</title></head><body><h1>" .. errorCode .. " - " .. errorString .. "</h1></body></html>\r\n")
end end
local function parseArgs(args)
local r = {}; i=1
if args == nil or args == "" then return r end
for arg in string.gmatch(args, "([^&]+)") do
local name, value = string.match(arg, "(.*)=(.*)")
if name ~= nil then r[name] = value end
i = i + 1
end
return r
end
local function parseUri(uri) local function parseUri(uri)
local r = {}
if uri == nil then return r end
if uri == "/" then uri = "/index.html" end if uri == "/" then uri = "/index.html" end
questionMarkPos, b, c, d, e, f = uri:find("?") questionMarkPos, b, c, d, e, f = uri:find("?")
r = {}
if questionMarkPos == nil then if questionMarkPos == nil then
r.file = uri:sub(1, questionMarkPos) r.file = uri:sub(1, questionMarkPos)
r.args = {}
else else
r.file = uri:sub(1, questionMarkPos - 1) r.file = uri:sub(1, questionMarkPos - 1)
r.args = uri:sub(questionMarkPos+1, #uri) r.args = parseArgs(uri:sub(questionMarkPos+1, #uri))
end end
_, r.ext = r.file:match("(.+)%.(.+)") _, r.ext = r.file:match("(.+)%.(.+)")
r.isScript = r.ext == "lua" r.isScript = r.ext == "lua" or r.ext == "lc"
r.file = uriToFilename(r.file)
return r return r
end end
local function getMimeType(ext) local function getMimeType(ext)
-- A few MIME types. No need to go crazy in this list. If you need something that is missing, let's add it. -- A few MIME types. No need to go crazy in this list. If you need something that is missing, let's add it.
local mimeTypes = {} local mt = {}
mimeTypes.css = "text/css" mt.css = "text/css"
mimeTypes.gif = "image/gif" mt.gif = "image/gif"
mimeTypes.htm = "text/html" mt.html = "text/html"
mimeTypes.html = "text/html" mt.ico = "image/x-icon"
mimeTypes.ico = "image/x-icon" mt.jpeg = "image/jpeg"
mimeTypes.jpe = "image/jpeg" mt.jpg = "image/jpeg"
mimeTypes.jpeg = "image/jpeg" mt.js = "application/javascript"
mimeTypes.jpg = "image/jpeg" mt.png = "image/png"
mimeTypes.js = "application/javascript" if mt[ext] then return mt[ext] end
mimeTypes.png = "image/png"
mimeTypes.txt = "text/plain"
if mimeTypes[ext] then return mimeTypes[ext] end
-- default to text. -- default to text.
return "text/plain" return "text/plain"
end end
local function onGet(connection, uri) local function onGet(connection, uri)
uri = parseUri(uri) local uri = parseUri(uri)
local fileExists = file.open(uriToFilename(uri.file), "r") local fileExists = file.open(uri.file, "r")
if not fileExists then if not fileExists then
onError(connection, 404, "Not Found") onError(connection, 404, "Not Found")
else else
if uri.isScript then if uri.isScript then
file.close() file.close()
dofile(uriToFilename(uri.file))(connection, uri.args) collectgarbage()
dofile(uri.file)(connection, uri.args)
else else
-- Use HTTP/1.0 to ensure client closes connection. -- Use HTTP/1.0 to ensure client closes connection.
connection:send("HTTP/1.0 200 OK\r\nContent-Type: " .. getMimeType(uri.ext) .. "\r\Cache-Control: private, no-store\r\n\r\n") connection:send("HTTP/1.0 200 OK\r\nContent-Type: " .. getMimeType(uri.ext) .. "\r\Cache-Control: private, no-store\r\n\r\n")
@ -100,36 +104,25 @@ end
local function onReceive(connection, payload) local function onReceive(connection, payload)
--print(payload) -- for debugging --print(payload) -- for debugging
-- parse payload and decide what to serve. -- parse payload and decide what to serve.
local parsedRequest = parseRequest(payload) local req = parseRequest(payload)
print("Requested URI: " .. parsedRequest.uri) print("Requested URI: " .. req.uri)
parsedRequest.method = validateMethod(parsedRequest.method) req.method = validateMethod(req.method)
if parsedRequest.method == nil then onError(connection, 400, "Bad Request") if req.method == nil then onError(connection, 400, "Bad Request")
elseif parsedRequest.method == "GET" then onGet(connection, parsedRequest.uri) elseif req.method == "GET" then onGet(connection, req.uri)
else onNotImplemented(connection, 501, "Not Implemented") end else onError(connection, 501, "Not Implemented") end
connection:close() connection:close()
end end
local function onSent(connection)
print ("onSent: Thank you, come again.")
end
local function handleRequest(connection) local function handleRequest(connection)
connection:on("receive", onReceive) connection:on("receive", onReceive)
connection:on("sent", onSent)
end end
-- Starts web server in the specified port. -- Starts web server in the specified port.
function httpserver.start(port, clientTimeoutInSeconds) function httpserver.start(port, clientTimeoutInSeconds)
server = net.createServer(net.TCP, clientTimeoutInSeconds) s = net.createServer(net.TCP, clientTimeoutInSeconds)
server:listen(port, handleRequest) s:listen(port, handleRequest)
print("nodemcu-httpserver running at " .. wifi.sta.getip() .. ":" .. port) print("nodemcu-httpserver running at " .. wifi.sta.getip() .. ":" .. port)
return server return s
end
-- Stops the server.
function httpserver.stop(server)
server:close()
end end