Mercurial Hosting > luan
annotate src/luan/modules/http/Http.luan @ 1261:198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Mon, 24 Sep 2018 13:09:16 -0600 |
| parents | 4b5b84853f6f |
| children | 382c444a6c77 |
| rev | line source |
|---|---|
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
1 java() |
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
2 local Luan = require "luan:Luan.luan" |
| 508 | 3 local error = Luan.error |
|
572
f1601a4ce1aa
fix stack when calling meta-methods
Franklin Schmidt <fschmidt@gmail.com>
parents:
568
diff
changeset
|
4 local ipairs = Luan.ipairs or error() |
|
f1601a4ce1aa
fix stack when calling meta-methods
Franklin Schmidt <fschmidt@gmail.com>
parents:
568
diff
changeset
|
5 local pairs = Luan.pairs or error() |
|
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1150
diff
changeset
|
6 local type = Luan.type 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" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
8 local Html = require "luan:Html.luan" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
9 local Table = require "luan:Table.luan" |
| 580 | 10 local clear = Table.clear or error() |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
11 local java_to_table_deep = Table.java_to_table_deep or error() |
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
12 local Package = require "luan:Package.luan" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
629
diff
changeset
|
13 local String = require "luan:String.luan" |
|
1166
7ef40e1923b7
add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents:
1165
diff
changeset
|
14 local lower = String.lower or error() |
|
583
1368ca798ccc
add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents:
580
diff
changeset
|
15 local matches = String.matches or error() |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
16 local IoLuan = require "java:luan.modules.IoLuan" |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
17 local LuanJava = require "java:luan.Luan" |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
18 local Request = require "java:luan.webserver.Request" |
| 1163 | 19 local Response = require "java:luan.webserver.Response" |
| 1160 | 20 local ResponseOutputStream = require "java:luan.webserver.ResponseOutputStream" |
| 1163 | 21 local Status = require "java:luan.webserver.Status" |
| 1160 | 22 local OutputStreamWriter = require "java:java.io.OutputStreamWriter" |
| 1163 | 23 local HashMap = require "java:java.util.HashMap" |
|
320
fed1893821bf
remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
300
diff
changeset
|
24 |
|
1152
21d157b153fe
change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1150
diff
changeset
|
25 |
|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1082
diff
changeset
|
26 local Http = {} |
|
320
fed1893821bf
remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
300
diff
changeset
|
27 |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
28 local old_java_to_table_shallow = Table.java_to_table_shallow or error() |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
29 |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
30 local function java_to_table_shallow(obj) |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
31 if type(obj)=="java" and obj.instanceof(Request.MultipartFile) then |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
32 return { |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
33 filename = obj.filename |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
34 content_type = obj.contentType |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
35 content = obj.content |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
36 } |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
37 end |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
38 return old_java_to_table_shallow(obj) |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
39 end |
|
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
40 |
| 1160 | 41 function Http.new_request(java) |
| 42 local this = {} | |
| 43 Http.request = this | |
| 44 if java == nil then | |
| 45 this.method = "GET" | |
| 1237 | 46 this.scheme = "http" |
| 1160 | 47 this.headers = {} |
| 48 this.parameters = {} | |
| 49 this.cookies = {} | |
| 50 else | |
| 51 this.java = java | |
|
1179
f9136432847e
add request.raw_head
Franklin Schmidt <fschmidt@gmail.com>
parents:
1171
diff
changeset
|
52 this.raw_head = java.rawHead or error() |
| 1160 | 53 this.method = java.method or error() |
| 54 this.raw_path = java.rawPath or error() | |
| 55 this.path = java.path or error() | |
| 56 this.protocol = java.protocol or error() | |
| 1237 | 57 this.scheme = java.scheme or error() |
|
1261
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
58 this.headers = java_to_table_deep(java.headers) |
|
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
59 this.parameters = java_to_table_deep(java.parameters,java_to_table_shallow) |
|
198d6af7330a
rename Luan.to_table to Table.java_to_table_shallow and Luan.to_luan to Table.java_to_table_deep
Franklin Schmidt <fschmidt@gmail.com>
parents:
1260
diff
changeset
|
60 this.cookies = java_to_table_deep(java.cookies) |
| 1160 | 61 end |
|
497
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
62 |
| 499 | 63 function this.url() |
| 1160 | 64 return this.scheme.."://"..this.headers["host"]..this.raw_path |
|
497
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
65 end |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
66 |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
67 return this |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
68 end |
|
55f9f74f1e55
Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
495
diff
changeset
|
69 |
| 503 | 70 local STATUS = { |
| 1109 | 71 OK = 200 |
| 72 MOVED_PERMANENTLY = 301 | |
| 1160 | 73 FOUND = 302 |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
74 -- add more as needed |
|
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
75 } |
|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1082
diff
changeset
|
76 Http.STATUS = STATUS |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
77 |
| 1163 | 78 function Http.new_response() |
| 1160 | 79 local this = {} |
| 80 Http.response = this | |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
81 |
| 1163 | 82 function this.reset() |
| 83 this.java = Response.new() | |
| 84 this.headers = {} | |
| 85 this.status = STATUS.OK | |
| 86 this.writer = nil | |
| 87 end | |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
88 |
| 1163 | 89 this.reset() |
|
1153
1f4da56abd4f
change http cookies interface
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
90 |
| 1160 | 91 function this.send_redirect(location) |
| 92 this.status = STATUS.FOUND | |
| 93 this.headers["location"] = location | |
| 94 end | |
| 95 | |
| 1161 | 96 function this.send_error(status,msg) |
| 1163 | 97 this.reset() |
| 1161 | 98 this.status = status |
| 99 if msg ~= nil then | |
|
1165
668f29bc52ea
clean up content-type
Franklin Schmidt <fschmidt@gmail.com>
parents:
1164
diff
changeset
|
100 this.headers["content-type"] = "text/plain; charset=utf-8" |
| 1161 | 101 local writer = this.text_writer() |
| 102 writer.write(msg) | |
| 103 end | |
| 104 end | |
| 105 | |
| 1160 | 106 function this.set_cookie(name,value,attributes) |
| 1163 | 107 attributes = attributes or {} |
| 1213 | 108 attributes["Path"] = attributes["Path"] or "/" |
| 1163 | 109 local attrMap = HashMap.new() |
| 110 for attr_name, attr_value in pairs(attributes) do | |
| 1164 | 111 type(attr_name)=="string" or "cookie attribute name must be string" |
| 112 type(attr_value)=="string" or "cookie attribute value must be string" | |
| 1163 | 113 attrMap.put(attr_name,attr_value) |
| 114 end | |
| 115 this.java.setCookie(name,value,attrMap) | |
| 1160 | 116 end |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
117 |
| 1160 | 118 function this.set_persistent_cookie(name,value,attributes) |
| 119 attributes = attributes or {} | |
| 120 attributes["Max-Age"] = "10000000" | |
| 121 this.set_cookie(name,value,attributes) | |
| 122 end | |
| 123 | |
| 124 function this.remove_cookie(name,attributes) | |
| 125 attributes = attributes or {} | |
| 126 attributes["Max-Age"] = "0" | |
| 127 this.set_cookie(name,"delete",attributes) | |
| 128 end | |
|
568
aa17ad66a370
fix http response headers
Franklin Schmidt <fschmidt@gmail.com>
parents:
509
diff
changeset
|
129 |
| 1160 | 130 function this.text_writer() |
| 1163 | 131 this.writer and "writer already set" |
| 1160 | 132 this.writer = ResponseOutputStream.new(this.java) |
| 133 this.writer = OutputStreamWriter.new(this.writer) | |
| 134 return IoLuan.textWriter(this.writer) | |
| 135 end | |
|
500
ab9c2afefb47
add response.binary_writer
Franklin Schmidt <fschmidt@gmail.com>
parents:
499
diff
changeset
|
136 |
| 1160 | 137 function this.binary_writer() |
| 1163 | 138 this.writer and "writer already set" |
| 1160 | 139 this.writer = ResponseOutputStream.new(this.java) |
| 140 return IoLuan.binaryWriter(this.writer) | |
| 141 end | |
| 580 | 142 |
|
498
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
143 return this |
|
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
144 end |
|
ee55be414a34
Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents:
497
diff
changeset
|
145 |
| 1163 | 146 function Http.finish() -- called only from java |
| 147 local response = Http.response or error() | |
| 148 local java = response.java or error() | |
| 149 java.status = Status.getStatus(response.status) | |
| 150 for name, value in pairs(response.headers) do | |
| 1164 | 151 type(name)=="string" or "header name must be string" |
|
1166
7ef40e1923b7
add back Thread.global
Franklin Schmidt <fschmidt@gmail.com>
parents:
1165
diff
changeset
|
152 name = lower(name) |
|
1259
e8020216dee7
add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents:
1257
diff
changeset
|
153 value = LuanJava.toJava(value) |
| 1163 | 154 java.headers.put(name,value) |
| 155 end | |
| 156 response.writer and response.writer.close() | |
| 157 return java | |
| 158 end | |
| 159 | |
|
1088
bae2d0c2576c
change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents:
1082
diff
changeset
|
160 return Http |