Mercurial Hosting > luan
annotate src/luan/modules/http/Server.luan @ 1685:46cf5137cb6b
misc fixes
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Wed, 08 Jun 2022 20:13:54 -0600 |
parents | fa066aaa068c |
children | b82767112d8e |
rev | line source |
---|---|
743
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
1 local Luan = require "luan:Luan.luan" |
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
2 local error = Luan.error |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
3 local String = require "luan:String.luan" |
743
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
4 local gsub = String.gsub or error() |
1162 | 5 local match = String.match or error() |
743
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
6 local matches = String.matches or error() |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
7 local Io = require "luan:Io.luan" |
1315 | 8 local uri = Io.uri or error() |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
9 local Package = require "luan:Package.luan" |
743
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
10 local Rpc = require "luan:Rpc.luan" |
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
11 local Thread = require "luan:Thread.luan" |
1167 | 12 local Http = require "luan:http/Http.luan" |
743
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
13 local Logging = require "luan:logging/Logging.luan" |
2c41f2aec92f
improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents:
712
diff
changeset
|
14 local logger = Logging.logger "http/Server" |
174
609c5b3118db
add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
15 |
1353
8d95711f6615
replace java() with require "java"
Franklin Schmidt <fschmidt@gmail.com>
parents:
1347
diff
changeset
|
16 require "java" |
1402
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
17 local JavaServer = require "java:goodjava.webserver.Server" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
18 local FileHandler = require "java:goodjava.webserver.handlers.FileHandler" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
19 local DirHandler = require "java:goodjava.webserver.handlers.DirHandler" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
20 local IndexHandler = require "java:goodjava.webserver.handlers.IndexHandler" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
21 local ContentTypeHandler = require "java:goodjava.webserver.handlers.ContentTypeHandler" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
22 local SafeHandler = require "java:goodjava.webserver.handlers.SafeHandler" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
23 local LogHandler = require "java:goodjava.webserver.handlers.LogHandler" |
27efb1fcbcb5
move luan.lib to goodjava
Franklin Schmidt <fschmidt@gmail.com>
parents:
1358
diff
changeset
|
24 local ListHandler = require "java:goodjava.webserver.handlers.ListHandler" |
1607 | 25 local HeadersHandler = require "java:goodjava.webserver.handlers.HeadersHandler" |
1171 | 26 local LuanHandler = require "java:luan.modules.http.LuanHandler" |
1175
d6d0bd05ad8c
exit on bind conflict, serve "127.0.0.1" for serve_for_nginx
Franklin Schmidt <fschmidt@gmail.com>
parents:
1173
diff
changeset
|
27 local System = require "java:java.lang.System" |
1358
1d31c1f3ea30
better not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents:
1357
diff
changeset
|
28 local NotFound = require "java:luan.modules.http.NotFound" |
1160 | 29 |
174
609c5b3118db
add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
30 |
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1080
diff
changeset
|
31 local Server = {} |
174
609c5b3118db
add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
32 |
1184
2eba58842bbb
remove serve_for_nginx
Franklin Schmidt <fschmidt@gmail.com>
parents:
1178
diff
changeset
|
33 function Server.init_dir(dir) |
1256
c147e2e877e3
allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents:
1250
diff
changeset
|
34 if not matches(dir,":") then |
c147e2e877e3
allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents:
1250
diff
changeset
|
35 dir = "file:"..dir |
1162 | 36 end |
1256
c147e2e877e3
allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents:
1250
diff
changeset
|
37 dir = gsub(dir,"/$","") -- remove trailing '/' if any |
c147e2e877e3
allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents:
1250
diff
changeset
|
38 Http.dir = dir |
1414 | 39 Http.is_serving = true |
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
40 function Io.schemes.site(path) |
1424 | 41 local u = uri( dir..path ) |
1685 | 42 if u ~= nil then |
43 u.uri_string = "site:"..path | |
44 end | |
1424 | 45 return u |
264
9e0d4452e649
implement URL style module names
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
260
diff
changeset
|
46 end |
1172 | 47 end |
48 | |
1357 | 49 function Server.start(server) |
1520 | 50 try |
51 LuanHandler.start(server) | |
52 catch e | |
53 -- e.java.printStackTrace(); | |
54 Io.print_to(Io.stderr, e ) | |
55 System.exit(-1) | |
56 end | |
1178
49cf706c326a
serve_for_nginx on port 8081
Franklin Schmidt <fschmidt@gmail.com>
parents:
1176
diff
changeset
|
57 end |
1175
d6d0bd05ad8c
exit on bind conflict, serve "127.0.0.1" for serve_for_nginx
Franklin Schmidt <fschmidt@gmail.com>
parents:
1173
diff
changeset
|
58 |
1281 | 59 function Server.start_rpc(luan_handler) |
1173 | 60 function Rpc.functions.call(domain,fn_name,...) |
1281 | 61 return luan_handler.call_rpc(fn_name,...) |
1173 | 62 end |
63 Thread.fork(Rpc.serve) | |
64 end | |
65 | |
1242 | 66 function Server.serve(dir,port) |
67 port = port or 8080 | |
1256
c147e2e877e3
allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents:
1250
diff
changeset
|
68 Server.init_dir(dir) |
c147e2e877e3
allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents:
1250
diff
changeset
|
69 local dir_path = match(Http.dir,"^file:(.*)$") or error "server dir must be scheme 'file:'" |
1167 | 70 local file_handler = FileHandler.new(dir_path) |
1605
ef9d96aeb541
use FileHandler in WebHandler
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
71 local luan_handler = LuanHandler.new() |
ef9d96aeb541
use FileHandler in WebHandler
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
72 local handler = ListHandler.new( luan_handler, file_handler ) |
1607 | 73 handler = ContentTypeHandler.new(handler) |
1605
ef9d96aeb541
use FileHandler in WebHandler
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
74 handler = IndexHandler.new(handler) |
1168 | 75 local dir_handler = DirHandler.new(file_handler) |
1358
1d31c1f3ea30
better not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents:
1357
diff
changeset
|
76 local not_found_hander = NotFound.new(luan_handler) |
1607 | 77 not_found_hander = ContentTypeHandler.new(not_found_hander) |
1358
1d31c1f3ea30
better not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents:
1357
diff
changeset
|
78 handler = ListHandler.new( handler, dir_handler, not_found_hander ) |
1607 | 79 handler = HeadersHandler.new(handler) |
1160 | 80 handler = SafeHandler.new(handler) |
81 handler = LogHandler.new(handler) | |
1281 | 82 local server = JavaServer.new(port,handler) |
1357 | 83 Server.start(server) |
1281 | 84 return server, luan_handler |
174
609c5b3118db
add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
85 end |
503 | 86 |
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1080
diff
changeset
|
87 return Server |