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