elimination of global variables and headeralways

Author: neomatrixcode

README.md

@@ -245,6 +245,11 @@ server.notfound("notfound.html")
 ```julia
 server.useCORS(true)
 ```
+###Headers always
+You can add headers that will always be returned in each request
+```julia
+server.headersalways("Strict-Transport-Security","max-age=10886400; includeSubDomains; preload")
+```
 
 ### Bonus
 If you forgot the MIME type of a file you can use the next instruction

src/Merly.jl

@@ -10,7 +10,6 @@ include("base.jl")
 include("mimetypes.jl")
 include("routes.jl")
 include("allformats.jl")
-include("webserver.jl")
 
 export app, @page, @route, GET,POST,PUT,DELETE,HEAD,OPTIONS,PATCH,Get,Post,Put,Delete
 

src/base.jl

@@ -18,29 +18,7 @@ mutable struct myrequest
   end
 end
 
-struct App
-  notfound::Function
-  start::Function
-  useCORS::Function
-  webserverfiles::Function
-  webserverpath::Function
-end
-
 my_headers= HTTP.mkheaders(["Content-Type" => "text/plain"])
-root=pwd()
-if root[end]=='/'
-  root=root[1:end-1]
-elseif Sys.iswindows() && root[end]=='\\'
-  root=root[1:end-1]
-end
-exten="\"\""::AbstractString
-notfound_message = "NotFound"::String
-
-
-function File(file::String)
-    path = normpath(root, file)
-    return String(read(path))
-end
 
 function searchroute_regex(ruta::String)
   for i in 1:length(routes_patterns_array)
@@ -96,50 +74,108 @@ function handler(request::HTTP.Messages.Request)
 end
 
 
-function app()
-  global exten
+struct app
+  notfound::Function
+  start::Function
+  useCORS::Function
+  webserverfiles::Function
+  webserverpath::Function
+  headersalways::Function
 
-  function useCORS(activate::Bool)
-   HTTP.setheader(my_headers,"Access-Control-Allow-Origin" => "*")
-   HTTP.setheader(my_headers,"Access-Control-Allow-Methods" => "POST,GET,OPTIONS")
-   return true
-  end
+  function app()
+    root=pwd()
 
-  function notfound(text::String)
-    if occursin(".html", text)
-    notfound_message= File(text)
-    else
-      notfound_message= text
+    function File(file::String)
+      path = normpath(root, file)
+      return String(read(path))
     end
-  end
 
-  function webserverfiles(load::AbstractString)
-    if load=="*"
-      WebServer(root)
-    else
-      exten=load::AbstractString
-      WebServer(root)
+    function files(arch::Array{Any,1})
+      roop=""
+      for i=1:length(arch)
+        roop=replace(replace(arch[i],root => ""),"\\" => "/")
+        extension="text/plain"
+        ext= split(roop,".")
+        if(length(ext)>1)
+          my_extension = ext[2]
+          if (haskey(mimetypes,my_extension))
+            extension=mimetypes[my_extension]
+          end
+        end
+        data = File(roop[2:end])
+        createurl("GET"*roop,(req,res)->(begin
+          res.headers["Content-Type"]= extension
+          res.status = 200
+          res.body= data
+        end))
+      end
     end
-  end
 
-  function webserverpath(path::AbstractString)
-    root= path
-  end
+    function WebServer(rootte::String,exten::String)
+      cd(rootte)
+      ls= readdir()
+      arrfile=[]
+      arrdir=[]
+      for i=1:length(ls)
+        if isfile(ls[i])
+          if ( (occursin(Regex("((.)*\\.(?!($exten)))"),ls[i])) && (!occursin(r"^(\.)",ls[i])))
+            push!(arrfile,normpath(rootte,ls[i]))
+          end
+        end
+        if isdir(ls[i])
+          push!(arrdir,normpath(rootte,ls[i]))
+        end
+      end
+      files(arrfile)
+      for i=1:length(arrdir)
+        WebServer(arrdir[i],exten)
+      end
+    end
 
-  function start(config=Dict("host" => "127.0.0.1","port" => 8000)::Dict)
-    host= Sockets.IPv4("127.0.0.1")
-    port=get(config, "port", 8000)::Int
-    my_host = get(config, "host", "127.0.0.1")::String
-    if ('.' in my_host) host=Sockets.IPv4(my_host) end
-    if (':' in my_host) host=Sockets.IPv6(my_host) end
-    http = (req)-> handler(req)
-    myserver= HTTP.Servers.Server(http, stdout)
-    @info("Listening on: $(host) : $(port)")
-    return HTTP.Servers.serve(myserver, host, port)
-  end
+    function useCORS(activate::Bool)
+     HTTP.setheader(my_headers,"Access-Control-Allow-Origin" => "*")
+     HTTP.setheader(my_headers,"Access-Control-Allow-Methods" => "POST,GET,OPTIONS")
+     return true
+    end
 
-  @info("App created")
-  return App(notfound,start,useCORS,webserverfiles,webserverpath)
-end
+    function headersalways(head::AbstractString,value::AbstractString)
+      HTTP.setheader(my_headers,head => value)
+    end
+
+    function notfound(text::String)
+      if occursin(".html", text)
+        notfound_message= File(text)
+       addnotfound(notfound_message)
+      else
+       addnotfound(text)
+      end
+    end
+
+    function webserverfiles(load::AbstractString)
+      if load=="*"
+        WebServer(root," ")
+      else
+        WebServer(root,load)
+      end
+    end
 
-#HSTS     HTTP.setheader(response,"Strict-Transport-Security" => "max-age=10886400; includeSubDomains; preload"
+    function webserverpath(path::AbstractString)
+      root = path
+    end
+
+    function start(config=Dict("host" => "127.0.0.1","port" => 8000)::Dict)
+      host= Sockets.IPv4("127.0.0.1")
+      port=get(config, "port", 8000)::Int
+      my_host = get(config, "host", "127.0.0.1")::String
+      if ('.' in my_host) host=Sockets.IPv4(my_host) end
+      if (':' in my_host) host=Sockets.IPv6(my_host) end
+      http = (req)-> handler(req)
+      myserver= HTTP.Servers.Server(http, stdout)
+      @info("Listening on: $(host) : $(port)")
+      return HTTP.Servers.serve(myserver, host, port)
+    end
+
+    @info("App created")
+    return new(notfound,start,useCORS,webserverfiles,webserverpath,headersalways)
+  end
+end

src/routes.jl

@@ -9,16 +9,21 @@ HEAD = "HEAD"
 OPTIONS = "OPTIONS"
 PATCH = "PATCH"
 
-function NotFound(req,res)
-  res.status = 404
-  return notfound_message
-end
+
 
 routes=Dict()
 routes_array=[]
 routes_patterns=Dict()
 routes_patterns_array=[]
-routes["notfound"] = NotFound
+
+function addnotfound(message::String)
+  routes["notfound"] = (req,res) -> begin
+    res.status = 404
+    return message
+  end
+end
+
+addnotfound("NotFound")
 
 function createurl(url::String,funtion::Function)
   if occursin(":",url)||occursin("(",url)

src/webserver.jl

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Document</title>
+</head>
+<body>
+Not found!!!
+</body>
+</html>

test/notfound.html

@@ -6,28 +6,27 @@ using JSON
 #Pkg.add("BenchmarkTools")
 #using BenchmarkTools
 
-ip = "127.0.0.1" #127.0.0.1
+ip = "127.0.0.1"
 port = 8086
 # write your own tests here
 server = Merly.app()
 
 @test server.useCORS(true) == true
-
+server.headersalways("Strict-Transport-Security","max-age=10886400; includeSubDomains; preload")
 @test server.notfound("<!DOCTYPE html>
               <html>
               <head><title>Not found</title></head>
               <body><h1>404, Not found</h1></body>
-              </html>") == "<!DOCTYPE html>
-              <html>
-              <head><title>Not found</title></head>
-              <body><h1>404, Not found</h1></body>
-              </html>"
+              </html>") == server.notfound("<!DOCTYPE html>\n              <html>\n              <head><title>Not found</title></head>\n              <body><h1>404, Not found</h1></body>\n              </html>")
+server.notfound("notfound.html")
 
 u="hello"
 
 @page "/" "Hello World!"
 @page "/hola/:usr>" "<b>Hello {{usr}}!</b>"
 
+@page "/mifile" File("Index.html")
+
 @route GET "/get/:data>" begin
   "get this back: {{data}}"
 end
@@ -71,6 +70,8 @@ Post("/data", (req,res)->(begin
 end))
 
 server.webserverfiles("jl")
+#server.webserverpath("C:\\Users\\ito\\.julia\\dev\\Merly\\prueba")
+#server.webserverfiles("*")
 
 @async server.start(Dict("host" => "$(ip)","port" => port))
 
@@ -103,7 +104,7 @@ r = HTTP.get("http://$(ip):$(port)/data")
 @test String(r.body) == "byedata"
 
 
-
+my_headers = HTTP.mkheaders(["Accept" => "application/json"])
 r = HTTP.post("http://$(ip):$(port)/post",my_headers,JSON.json(myjson))
 @test r.status == 200
 @test String(r.body) == "I did something!"
@@ -119,33 +120,40 @@ r = HTTP.put("http://$(ip):$(port)/",my_headers,JSON.json(myjson))
 r = HTTP.delete("http://$(ip):$(port)/")
 @test r.status == 200
 @test String(r.body) == "I did something!"
-@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/plain", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Transfer-Encoding"=>"chunked"]
+@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/plain", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Strict-Transport-Security"=>"max-age=10886400; includeSubDomains; preload", "Transfer-Encoding"=>"chunked"]
 
 try
 r = HTTP.get("http://$(ip):$(port)/nada")
 catch e
   @test e.status == 404
-  @test String(e.response.body) == "NotFound"
+  if Sys.iswindows()
+  @test String(e.response.body) == "<!DOCTYPE html>\r\n<html lang=\"en\">\r\n<head>\r\n\t<meta charset=\"UTF-8\">\r\n\t<title>Document</title>\r\n</head>\r\n<body>\r\nNot found!!!\r\n</body>\r\n</html>"
+  else
+    @test String(e.response.body) == "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n\t<meta charset=\"UTF-8\">\n\t<title>Document</title>\n</head>\n<body>\nNot found!!!\n</body>\n</html>"
+  end
 end
 
 r = HTTP.get("http://$(ip):$(port)/prueba.txt")
 @test r.status == 200
 @test String(r.body) == "probando webserver"
-@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/plain", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Transfer-Encoding"=>"chunked"]
+@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/plain", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Strict-Transport-Security"=>"max-age=10886400; includeSubDomains; preload", "Transfer-Encoding"=>"chunked"]
 
-r = HTTP.get("http://$(ip):$(port)/index.html")
+r = HTTP.get("http://$(ip):$(port)/Index.html")
 @test r.status == 200
 if Sys.iswindows()
   @test String(r.body) == "<!DOCTYPE html>\r\n<html lang=\"en\">\r\n<head>\r\n\t<meta charset=\"UTF-8\">\r\n\t<title>Document</title>\r\n</head>\r\n<body>\r\n<h1>hola</h1>\r\n</body>\r\n</html>"
 else
   @test String(r.body) == "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n\t<meta charset=\"UTF-8\">\n\t<title>Document</title>\n</head>\n<body>\n<h1>hola</h1>\n</body>\n</html>"
 end
-
-@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/html", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Transfer-Encoding"=>"chunked"]
+@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/html", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Strict-Transport-Security"=>"max-age=10886400; includeSubDomains; preload", "Transfer-Encoding"=>"chunked"]
 
 
 r= HTTP.get("http://$(ip):$(port)/regex/test1")
 @test String(r.body) == "datos test1"
+
+#r= HTTP.get("http://$(ip):$(port)/prueba/file.txt")
+#@test String(r.body) == "texto de prueba"
+
 #@btime HTTP.get("http://$(ip):$(port)/?hola=5") # 3.864 ms (8304 allocations: 381.20 KiB)
 #@btime HTTP.get("http://$(ip):$(port)/hola/usuario") # 4.211 ms (7685 allocations: 353.44 KiB)
 #@btime r= HTTP.get("http://$(ip):$(port)/get/testdata") # 3.906 ms (7693 allocations: 353.78 KiB)