Commit 8493eba18a4ca50d13612d7df3728afc08ddc106
2024-12-03T21:48:43
wip httpd
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211
diff --git a/lib/kc3/0.1/httpd.kc3 b/lib/kc3/0.1/httpd.kc3
index 1c52c9e..e1ec192 100644
--- a/lib/kc3/0.1/httpd.kc3
+++ b/lib/kc3/0.1/httpd.kc3
@@ -120,13 +120,19 @@ defmodule HTTPd do
def server = fn (host, port) {
def socket = Socket.listen(host, port)
- daemonize()
- puts("KC3 HTTPd: listening on #{host}:#{port}")
- load_app()
- threads = List.map(List.count(1), fn (x) {
- Thread.new(server_thread)
- })
- List.map(threads, Thread.delete)
+ if socket do
+ daemonize()
+ puts("KC3 HTTPd: listening on #{host}:#{port}")
+ load_app()
+ threads = List.map(List.count(1), fn (x) {
+ Thread.new(HTTPd.server_thread)
+ })
+ List.map(threads, Thread.delete)
+ 0
+ else
+ puts("KC3 HTTPd: cannot listen on #{host}:#{port}")
+ -1
+ end
}
def main = fn {
@@ -288,87 +294,7 @@ defmodule HTTPd do
end
}
}
-
- def def_static_route = fn (prefix, root_dir, url_skip) {
- #puts("def_static_route: #{inspect(prefix)}, #{inspect(root_dir)}, #{url_skip}")
- directory_page = HTTPd.fn (request) {
- url = URL.eat(request.url, url_skip)
- files = List.sort(File.list(root_dir + url))
- file_li = HTTPd.fn (file) {
- slash = if Str.ends_with?(url, "/") do "" else "/" end
- real_path = "#{root_dir}#{url}#{slash}#{file}"
- dir? = File.is_directory?(real_path)
- dir_slash = if dir? do "/" else "" end
- path = "#{prefix}#{url}#{slash}#{file}#{dir_slash}"
- mode = if dir? do "dr-xr-xr-x" else "-r--r--r--" end
- """<li>#{mode} <a href="#{URL.escape(path)}">#{HTML.escape(file)}</a>#{dir_slash}</li>\n"""
- }
- body = """
-<html>
- <head>
- <title>Index of #{prefix}#{url}</title>
- <style type="text/css">
- ul { font-family: monospace; }
- </style>
- </head>
- <body>
- <h1>Index of #{prefix}#{url}</h1>
- <ul>
- #{str(List.map(files, file_li))}
- </ul>
- </body>
-</html>
-"""
- %HTTP.Response{body: body}
- }
- show_page = HTTPd.fn (request) {
- url = URL.eat(request.url, url_skip)
- ext = File.ext(url)
- path = root_dir + url
- if (! File.exists?(path)) do
- slash = if Str.ends_with?(path, "/") do "" else "/" end
- path = "#{path}#{slash}index.html"
- end
- if File.exists?(path) do
- mime = HTTP.mime_type(ext)
- stat = File.stat(path)
- last_modified = Str.ftime(stat.st_mtim, "%a, %d %b %G %T %Z")
- range = HTTP.Request.header(request, "Range")
- {range_start, range_end} = parse_range(range, stat.st_size)
- headers = [{"Content-Type", (Str) mime},
- {"Content-Length", (Str) stat.st_size},
- {"Content-Range", "bytes=#{range_start}-#{range_end}"},
- {"Last-Modified", last_modified}]
- fd = File.open_r(path)
- body = %{fd: fd, start: range_start, end_: range_end}
- %HTTP.Response{body: body, headers: headers}
- end
- }
- route = HTTPd.fn (request) {
- #puts("def_static_route: route: request.url: #{inspect(request.url)}")
- #puts("def_static_route: route: url_skip: #{url_skip}")
- url = URL.eat(request.url, url_skip)
- #puts("def_static_route: route: url: #{inspect(url)}")
- render = if (Str.starts_with?(url, "/") &&
- ! Str.has_str?(url, "/../") &&
- ! Str.ends_with?(url, "/..")) do
- path = root_dir + url
- #puts("def_static_route: route: path: #{inspect(path)}")
- if File.exists?(path) do
- if File.is_directory?(path) do
- directory_page
- else
- show_page
- end
- end
- end
- if render do
- render(request)
- end
- }
- def_route(prefix, route)
- }
- def_static_route("", "./static/", 0)
+ HTTPd.Route.def_static_route("", "./static/", 0)
end
diff --git a/lib/kc3/0.1/httpd/route.kc3 b/lib/kc3/0.1/httpd/route.kc3
index c30a733..c2cd3c6 100644
--- a/lib/kc3/0.1/httpd/route.kc3
+++ b/lib/kc3/0.1/httpd/route.kc3
@@ -5,6 +5,86 @@ defmodule HTTPd.Route do
defstruct [path: "/",
controller: ?]
+ def def_static_route = fn (prefix, root_dir, url_skip) {
+ #puts("def_static_route: #{inspect(prefix)}, #{inspect(root_dir)}, #{url_skip}")
+ directory_page = HTTPd.fn (request) {
+ url = URL.eat(request.url, url_skip)
+ files = List.sort(File.list(root_dir + url))
+ file_li = HTTPd.fn (file) {
+ slash = if Str.ends_with?(url, "/") do "" else "/" end
+ real_path = "#{root_dir}#{url}#{slash}#{file}"
+ dir? = File.is_directory?(real_path)
+ dir_slash = if dir? do "/" else "" end
+ path = "#{prefix}#{url}#{slash}#{file}#{dir_slash}"
+ mode = if dir? do "dr-xr-xr-x" else "-r--r--r--" end
+ """<li>#{mode} <a href="#{URL.escape(path)}">#{HTML.escape(file)}</a>#{dir_slash}</li>\n"""
+ }
+ body = """
+<html>
+ <head>
+ <title>Index of #{prefix}#{url}</title>
+ <style type="text/css">
+ ul { font-family: monospace; }
+ </style>
+ </head>
+ <body>
+ <h1>Index of #{prefix}#{url}</h1>
+ <ul>
+ #{str(List.map(files, file_li))}
+ </ul>
+ </body>
+</html>
+"""
+ %HTTP.Response{body: body}
+ }
+ show_page = HTTPd.fn (request) {
+ url = URL.eat(request.url, url_skip)
+ ext = File.ext(url)
+ path = root_dir + url
+ if (! File.exists?(path)) do
+ slash = if Str.ends_with?(path, "/") do "" else "/" end
+ path = "#{path}#{slash}index.html"
+ end
+ if File.exists?(path) do
+ mime = HTTP.mime_type(ext)
+ stat = File.stat(path)
+ last_modified = Str.ftime(stat.st_mtim, "%a, %d %b %G %T %Z")
+ range = HTTP.Request.header(request, "Range")
+ {range_start, range_end} = parse_range(range, stat.st_size)
+ headers = [{"Content-Type", (Str) mime},
+ {"Content-Length", (Str) stat.st_size},
+ {"Content-Range", "bytes=#{range_start}-#{range_end}"},
+ {"Last-Modified", last_modified}]
+ fd = File.open_r(path)
+ body = %{fd: fd, start: range_start, end_: range_end}
+ %HTTP.Response{body: body, headers: headers}
+ end
+ }
+ route = HTTPd.fn (request) {
+ #puts("def_static_route: route: request.url: #{inspect(request.url)}")
+ #puts("def_static_route: route: url_skip: #{url_skip}")
+ url = URL.eat(request.url, url_skip)
+ #puts("def_static_route: route: url: #{inspect(url)}")
+ render = if (Str.starts_with?(url, "/") &&
+ ! Str.has_str?(url, "/../") &&
+ ! Str.ends_with?(url, "/..")) do
+ path = root_dir + url
+ #puts("def_static_route: route: path: #{inspect(path)}")
+ if File.exists?(path) do
+ if File.is_directory?(path) do
+ directory_page
+ else
+ show_page
+ end
+ end
+ end
+ if render do
+ render(request)
+ end
+ }
+ HTTPd.def_route(prefix, route)
+ }
+
def match = fn (route, request) {
if (route.path == "" ||
route.path == "/" ||