annotate src/luan/modules/http/impl/Http.luan @ 1165:668f29bc52ea

clean up content-type
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 07 Feb 2018 23:16:12 -0700
parents 1f9d34a6f308
children 7ef40e1923b7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
9218f9cf45d3 various fixes
Franklin Schmidt <fschmidt@gmail.com>
parents: 504
diff changeset
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"
572
f1601a4ce1aa fix stack when calling meta-methods
Franklin Schmidt <fschmidt@gmail.com>
parents: 568
diff changeset
9 local url_encode = Html.url_encode or error()
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 629
diff changeset
10 local Table = require "luan:Table.luan"
580
1e69d9c21461 add Table.clear();
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
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"
583
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
14 local matches = String.matches or error()
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
15 local HttpServicer = require "java:luan.modules.http.impl.HttpServicer"
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"
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
17 local JavaLuan = require "java:luan.Luan"
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
18 local Response = require "java:luan.webserver.Response"
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
19 local ResponseOutputStream = require "java:luan.webserver.ResponseOutputStream"
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
20 local Status = require "java:luan.webserver.Status"
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
21 local OutputStreamWriter = require "java:java.io.OutputStreamWriter"
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
22 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
23
1152
21d157b153fe change http parameters interface
Franklin Schmidt <fschmidt@gmail.com>
parents: 1150
diff changeset
24
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1082
diff changeset
25 local Http = {}
320
fed1893821bf remove global namespace
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 300
diff changeset
26
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
27 function Http.new_request(java)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
28 local this = {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
29 Http.request = this
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
30 if java == nil then
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
31 this.method = "GET"
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
32 this.headers = {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
33 this.parameters = {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
34 this.cookies = {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
35 else
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
36 this.java = java
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
37 this.method = java.method or error()
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
38 this.raw_path = java.rawPath or error()
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
39 this.path = java.path or error()
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
40 this.protocol = java.protocol or error()
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
41 this.headers = JavaLuan.toLuan(java.headers)
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
42 this.parameters = JavaLuan.toLuan(java.parameters)
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
43 this.cookies = JavaLuan.toLuan(java.cookies)
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
44 end
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
45 this.scheme = "http"
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
46
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
47 function this.full_path() -- compatible with jetty
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
48 return this.raw_path or this.path
499
fa4af530697f add http/dump
Franklin Schmidt <fschmidt@gmail.com>
parents: 498
diff changeset
49 end
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
50
499
fa4af530697f add http/dump
Franklin Schmidt <fschmidt@gmail.com>
parents: 498
diff changeset
51 function this.url()
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
52 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
53 end
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
54
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
55 return this
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
56 end
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
57
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 500
diff changeset
58 local STATUS = {
1109
Franklin Schmidt <fschmidt@gmail.com>
parents: 1102
diff changeset
59 OK = 200
Franklin Schmidt <fschmidt@gmail.com>
parents: 1102
diff changeset
60 MOVED_PERMANENTLY = 301
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
61 FOUND = 302
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
62 -- add more as needed
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
63 }
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1082
diff changeset
64 Http.STATUS = STATUS
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
65
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
66 function Http.new_response()
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
67 local this = {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
68 Http.response = this
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
69
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
70 function this.reset()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
71 this.java = Response.new()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
72 this.headers = {}
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
73 this.status = STATUS.OK
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
74 this.writer = nil
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
75 end
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
76
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
77 this.reset()
1153
1f4da56abd4f change http cookies interface
Franklin Schmidt <fschmidt@gmail.com>
parents: 1152
diff changeset
78
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
79 function this.send_redirect(location)
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
80 this.reset()
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
81 this.status = STATUS.FOUND
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
82 this.headers["location"] = location
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
83 end
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
84
1161
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
85 function this.send_error(status,msg)
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
86 this.reset()
1161
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
87 this.status = status
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
88 if msg ~= nil then
1165
668f29bc52ea clean up content-type
Franklin Schmidt <fschmidt@gmail.com>
parents: 1164
diff changeset
89 this.headers["content-type"] = "text/plain; charset=utf-8"
1161
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
90 local writer = this.text_writer()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
91 writer.write(msg)
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
92 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
93 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1160
diff changeset
94
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
95 function this.set_cookie(name,value,attributes)
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
96 attributes = attributes or {}
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
97 local attrMap = HashMap.new()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
98 for attr_name, attr_value in pairs(attributes) do
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
99 type(attr_name)=="string" or "cookie attribute name must be string"
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
100 type(attr_value)=="string" or "cookie attribute value must be string"
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
101 attrMap.put(attr_name,attr_value)
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
102 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
103 this.java.setCookie(name,value,attrMap)
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
104 end
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
105
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
106 function this.set_persistent_cookie(name,value,attributes)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
107 attributes = attributes or {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
108 attributes["Max-Age"] = "10000000"
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
109 this.set_cookie(name,value,attributes)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
110 end
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
111
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
112 function this.remove_cookie(name,attributes)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
113 attributes = attributes or {}
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
114 attributes["Max-Age"] = "0"
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
115 this.set_cookie(name,"delete",attributes)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
116 end
568
aa17ad66a370 fix http response headers
Franklin Schmidt <fschmidt@gmail.com>
parents: 509
diff changeset
117
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
118 function this.text_writer()
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
119 this.writer and "writer already set"
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
120 this.writer = ResponseOutputStream.new(this.java)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
121 this.writer = OutputStreamWriter.new(this.writer)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
122 return IoLuan.textWriter(this.writer)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
123 end
500
ab9c2afefb47 add response.binary_writer
Franklin Schmidt <fschmidt@gmail.com>
parents: 499
diff changeset
124
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
125 function this.binary_writer()
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
126 this.writer and "writer already set"
1160
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
127 this.writer = ResponseOutputStream.new(this.java)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
128 return IoLuan.binaryWriter(this.writer)
4beabb087be6 add http/impl
Franklin Schmidt <fschmidt@gmail.com>
parents: 1159
diff changeset
129 end
580
1e69d9c21461 add Table.clear();
Franklin Schmidt <fschmidt@gmail.com>
parents: 572
diff changeset
130
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
131 return this
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
132 end
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
133
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
134 function Http.finish() -- called only from java
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
135 local response = Http.response or error()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
136 local java = response.java or error()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
137 java.status = Status.getStatus(response.status)
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
138 for name, value in pairs(response.headers) do
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
139 type(name)=="string" or "header name must be string"
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1163
diff changeset
140 value = JavaLuan.toJava(value)
1163
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
141 java.headers.put(name,value)
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
142 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
143 response.writer and response.writer.close()
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
144 return java
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
145 end
Franklin Schmidt <fschmidt@gmail.com>
parents: 1162
diff changeset
146
504
dbdf4b8193a8 add Http.per_session()
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
147
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1082
diff changeset
148 function Http.uncache_site()
583
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
149 for k in pairs(Table.copy(Package.loaded)) do
629
35dde32c02ab change String.matches()
Franklin Schmidt <fschmidt@gmail.com>
parents: 626
diff changeset
150 if matches(k,"^site:") then
583
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
151 Package.loaded[k] = nil
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
152 end
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
153 end
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
154 end
1368ca798ccc add Http.uncache_site
Franklin Schmidt <fschmidt@gmail.com>
parents: 580
diff changeset
155
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1082
diff changeset
156 return Http