Mercurial Hosting > luan

annotate src/luan/modules/http/Server.luan @ 1605:ef9d96aeb541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use FileHandler in WebHandler
author Franklin Schmidt <fschmidt@gmail.com>
date Sat, 17 Apr 2021 18:11:37 -0600
parents d9a5405a3102
children fa066aaa068c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
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
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
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
7e6f28c769a1 better handlers
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
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"
1171
794ddcfbee20 remove http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1168
diff changeset
25 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
26 local System = require "java:java.lang.System"
1358
1d31c1f3ea30 better not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1357
diff changeset
27 local NotFound = require "java:luan.modules.http.NotFound"
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1149
diff changeset
28
174
609c5b3118db add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
29
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1080
diff changeset
30 local Server = {}
174
609c5b3118db add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
31
1184
2eba58842bbb remove serve_for_nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1178
diff changeset
32 function Server.init_dir(dir)
1256
c147e2e877e3 allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents: 1250
diff changeset
33 if not matches(dir,":") then
c147e2e877e3 allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents: 1250
diff changeset
34 dir = "file:"..dir
1162
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
35 end
1256
c147e2e877e3 allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents: 1250
diff changeset
36 dir = gsub(dir,"/$","") -- remove trailing '/' if any
c147e2e877e3 allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents: 1250
diff changeset
37 Http.dir = dir
1414
4abf88ec66de add Http.is_serving
Franklin Schmidt <fschmidt@gmail.com>
parents: 1402
diff changeset
38 Http.is_serving = true
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
39 function Io.schemes.site(path)
1424
9ab267b9427c better load_file()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1414
diff changeset
40 local u = uri( dir..path )
9ab267b9427c better load_file()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1414
diff changeset
41 u.uri_string = "site:"..path
9ab267b9427c better load_file()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1414
diff changeset
42 return u
264
9e0d4452e649 implement URL style module names
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 260
diff changeset
43 end
1172
1aa6dd74f3fc add serve_for_nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1171
diff changeset
44 end
1aa6dd74f3fc add serve_for_nginx
Franklin Schmidt <fschmidt@gmail.com>
parents: 1171
diff changeset
45
1357
Franklin Schmidt <fschmidt@gmail.com>
parents: 1353
diff changeset
46 function Server.start(server)
1520
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
47 try
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
48 LuanHandler.start(server)
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
49 catch e
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
50 -- e.java.printStackTrace();
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
51 Io.print_to(Io.stderr, e )
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
52 System.exit(-1)
d9a5405a3102 try statement
Franklin Schmidt <fschmidt@gmail.com>
parents: 1424
diff changeset
53 end
1178
49cf706c326a serve_for_nginx on port 8081
Franklin Schmidt <fschmidt@gmail.com>
parents: 1176
diff changeset
54 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
55
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
56 function Server.start_rpc(luan_handler)
1173
Franklin Schmidt <fschmidt@gmail.com>
parents: 1172
diff changeset
57 function Rpc.functions.call(domain,fn_name,...)
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
58 return luan_handler.call_rpc(fn_name,...)
1173
Franklin Schmidt <fschmidt@gmail.com>
parents: 1172
diff changeset
59 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1172
diff changeset
60 Thread.fork(Rpc.serve)
Franklin Schmidt <fschmidt@gmail.com>
parents: 1172
diff changeset
61 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1172
diff changeset
62
1242
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
63 function Server.serve(dir,port)
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
64 port = port or 8080
1256
c147e2e877e3 allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents: 1250
diff changeset
65 Server.init_dir(dir)
c147e2e877e3 allow subclassing of HttpServicer
Franklin Schmidt <fschmidt@gmail.com>
parents: 1250
diff changeset
66 local dir_path = match(Http.dir,"^file:(.*)$") or error "server dir must be scheme 'file:'"
1167
7e6f28c769a1 better handlers
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
67 local file_handler = FileHandler.new(dir_path)
1605
ef9d96aeb541 use FileHandler in WebHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1520
diff changeset
68 local luan_handler = LuanHandler.new()
ef9d96aeb541 use FileHandler in WebHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1520
diff changeset
69 local handler = ListHandler.new( luan_handler, file_handler )
ef9d96aeb541 use FileHandler in WebHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1520
diff changeset
70 handler = IndexHandler.new(handler)
1168
Franklin Schmidt <fschmidt@gmail.com>
parents: 1167
diff changeset
71 local dir_handler = DirHandler.new(file_handler)
1358
1d31c1f3ea30 better not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1357
diff changeset
72 local not_found_hander = NotFound.new(luan_handler)
1d31c1f3ea30 better not_found_handler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1357
diff changeset
73 handler = ListHandler.new( handler, dir_handler, not_found_hander )
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1149
diff changeset
74 handler = ContentTypeHandler.new(handler)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1149
diff changeset
75 handler = SafeHandler.new(handler)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1149
diff changeset
76 handler = LogHandler.new(handler)
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
77 local server = JavaServer.new(port,handler)
1357
Franklin Schmidt <fschmidt@gmail.com>
parents: 1353
diff changeset
78 Server.start(server)
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
79 return server, luan_handler
174
609c5b3118db add Web_server.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
80 end
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 494
diff changeset
81
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
82 function Server.serve_for_proxy(dir,port,LuanHandlerClass)
1265
3f4644246e39 LuanHandler cleanup and add Server.serve_for_proxy
Franklin Schmidt <fschmidt@gmail.com>
parents: 1256
diff changeset
83 port = port or 8080
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
84 LuanHandlerClass = LuanHandlerClass or LuanHandler
1265
3f4644246e39 LuanHandler cleanup and add Server.serve_for_proxy
Franklin Schmidt <fschmidt@gmail.com>
parents: 1256
diff changeset
85 Server.init_dir(dir)
1315
5763597ca5c0 add DomainHandler
Franklin Schmidt <fschmidt@gmail.com>
parents: 1314
diff changeset
86 local luan_handler = LuanHandlerClass.new()
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
87 local handler = IndexHandler.new(luan_handler)
1265
3f4644246e39 LuanHandler cleanup and add Server.serve_for_proxy
Franklin Schmidt <fschmidt@gmail.com>
parents: 1256
diff changeset
88 handler = ContentTypeHandler.new(handler)
3f4644246e39 LuanHandler cleanup and add Server.serve_for_proxy
Franklin Schmidt <fschmidt@gmail.com>
parents: 1256
diff changeset
89 handler = SafeHandler.new(handler)
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
90 local server = JavaServer.new(port,handler)
1357
Franklin Schmidt <fschmidt@gmail.com>
parents: 1353
diff changeset
91 Server.start(server)
1281
7fc83fd2a39a http/Server cleanup
Franklin Schmidt <fschmidt@gmail.com>
parents: 1265
diff changeset
92 return server, luan_handler
1265
3f4644246e39 LuanHandler cleanup and add Server.serve_for_proxy
Franklin Schmidt <fschmidt@gmail.com>
parents: 1256
diff changeset
93 end
3f4644246e39 LuanHandler cleanup and add Server.serve_for_proxy
Franklin Schmidt <fschmidt@gmail.com>
parents: 1256
diff changeset
94
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1080
diff changeset
95 return Server