Mercurial Hosting > luan
annotate src/luan/modules/http/tools/Shell.luan @ 1521:d3e61cd2aca0
docs and shell bug fix
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Thu, 25 Jun 2020 23:17:14 -0600 |
| parents | d9a5405a3102 |
| children | c922446f53aa |
| rev | line source |
|---|---|
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
609
diff
changeset
|
1 local Luan = require "luan:Luan.luan" |
|
554
18504c41b0be
move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents:
506
diff
changeset
|
2 local error = Luan.error |
|
18504c41b0be
move debug() to Io and remove Debug module;
Franklin Schmidt <fschmidt@gmail.com>
parents:
506
diff
changeset
|
3 local load = Luan.load or error() |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
4 local to_string = Luan.to_string or error() |
| 1295 | 5 local range = Luan.range or error() |
| 1277 | 6 local Table = require "luan:Table.luan" |
| 1295 | 7 local concat = Table.concat or error() |
| 1277 | 8 local pack = Table.pack or error() |
| 9 local unpack = Table.unpack or error() | |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
10 local Time = require "luan:Time.luan" |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
11 local Thread = require "luan:Thread.luan" |
| 1295 | 12 local Html = require "luan:Html.luan" |
| 13 local html_encode = Html.encode or error() | |
| 14 local javascript_encode = Html.javascript_encode or error() | |
|
693
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
609
diff
changeset
|
15 local Io = require "luan:Io.luan" |
|
ca169567ce07
module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents:
609
diff
changeset
|
16 local Http = require "luan:http/Http.luan" |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
17 local Logging = require "luan:logging/Logging.luan" |
| 1218 | 18 local logger = Logging.logger "Shell" |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
19 |
|
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
20 |
| 1218 | 21 local Shell = {} |
| 503 | 22 |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
23 local count = 0 |
| 1322 | 24 local new_session = Thread.global_callable("shell.new_session",{next=function() |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
25 count = count + 1 |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
26 return to_string(count) |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
27 end}).next |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
28 |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
29 local env = {} |
| 1218 | 30 Shell.env = env |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
31 |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
32 local fns = {} |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
33 |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
34 function fns.run(cmd) |
| 1520 | 35 try |
|
1521
d3e61cd2aca0
docs and shell bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
36 local line |
| 1520 | 37 try |
|
1521
d3e61cd2aca0
docs and shell bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
38 line = load("return "..cmd,"<web_shell>",env) |
| 1520 | 39 catch e |
|
1521
d3e61cd2aca0
docs and shell bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
40 line = load(cmd,"<web_shell>",env) |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
41 end |
|
1521
d3e61cd2aca0
docs and shell bug fix
Franklin Schmidt <fschmidt@gmail.com>
parents:
1520
diff
changeset
|
42 return line() |
| 1520 | 43 catch e |
| 44 -- Io.print_to(Io.stderr,e) | |
| 45 return to_string(e) | |
| 46 end | |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
47 end |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
48 |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
49 local timeout = Time.period{hours=10} |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
50 |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
51 local function get_session(session_id) |
| 1322 | 52 return Thread.global_callable("shell.session"..session_id,fns,timeout) |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
53 end |
|
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
54 |
| 1218 | 55 function Shell.respond() |
| 1295 | 56 local cmd = Http.request.parameters.cmd |
| 57 if cmd ~= nil then | |
| 58 Http.response.headers["content-type"] = "application/javascript" | |
| 1352 | 59 Io.stdout = Http.response.text_writer() |
| 1295 | 60 local session_id = Http.request.parameters.session or error() |
| 61 local session = get_session(session_id) | |
| 62 local rtn = pack( session.run(cmd) ) | |
| 63 %> | |
| 64 var pre = document.querySelector('pre'); | |
| 65 pre.innerHTML += '\n> <%=javascript_encode(html_encode(cmd))%>'; | |
| 66 <% | |
| 67 if rtn.n > 0 then | |
| 68 local t = {} | |
| 69 for i in range(1,rtn.n) do | |
| 70 t[#t+1] = javascript_encode(html_encode(to_string(rtn[i]))) | |
| 71 end | |
| 72 %> | |
| 73 pre.innerHTML += '\n<%=concat(t,"\t")%>'; | |
| 74 <% | |
| 75 end | |
| 1300 | 76 %> |
| 77 var input = document.querySelector('input'); | |
| 78 input.scrollIntoView(); | |
| 79 input.blur(); input.focus(); // because Chrome is retarded | |
| 80 <% | |
| 1295 | 81 return |
|
1159
3ef883468fd0
remove Http.per_session_pages
Franklin Schmidt <fschmidt@gmail.com>
parents:
1152
diff
changeset
|
82 end |
| 1352 | 83 Io.stdout = Http.response.text_writer() |
|
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
84 %> |
| 1216 | 85 <!doctype html> |
|
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
86 <html> |
|
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
87 <head> |
|
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
88 <title>Luan Shell</title> |
| 1295 | 89 <script> |
| 90 | |
| 91 function ajax(url) { | |
| 92 var request = new XMLHttpRequest(); | |
| 93 request.open( 'GET', url ); | |
| 94 request.onload = function() { | |
| 95 if( request.status !== 200 ) { | |
| 96 console.log( 'ajax failed: ' + request.status ); | |
| 97 return; | |
| 98 } | |
| 99 //console.log( request.responseText ); | |
| 100 eval( request.responseText ); | |
| 101 }; | |
| 102 request.send(); | |
| 103 } | |
| 104 | |
| 105 function submitted() { | |
| 106 var input = document.querySelector('input'); | |
| 107 ajax( '?session=<%=new_session()%>&cmd=' + encodeURIComponent(input.value) ); | |
| 108 input.value = ''; | |
| 109 } | |
| 110 | |
| 111 </script> | |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
112 <style> |
|
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
113 body { |
| 1293 | 114 font-family: sans-serif; |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
115 } |
|
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
116 pre { |
|
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
117 font: inherit; |
| 1295 | 118 margin-bottom: 0; |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
119 } |
| 1295 | 120 table { |
| 121 width: 100%; | |
| 122 border-collapse: collapse; | |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
123 } |
| 1295 | 124 td { |
| 125 padding: 0; | |
| 126 } | |
| 127 td:last-child { | |
| 128 width: 100%; | |
| 129 } | |
| 130 input { | |
| 131 width: 100%; | |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
132 font: inherit; |
| 1295 | 133 outline: none; |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
134 } |
|
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
135 </style> |
|
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
136 </head> |
|
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
137 <body> |
| 1295 | 138 <pre>Luan <%=Luan.VERSION%></pre> |
| 1300 | 139 <form onsubmit="submitted(); return false"> |
| 1295 | 140 <table> |
| 141 <tr> | |
| 142 <td>> </td> | |
| 143 <td><input name=cmd autofocus></td> | |
| 144 </tr> | |
| 145 </table> | |
|
560
2f39468680be
remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents:
554
diff
changeset
|
146 </form> |
|
391
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
147 </body> |
|
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
148 </html> |
|
2f5cc9c2cbf0
replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents:
347
diff
changeset
|
149 <% |
|
139
3b384dc5ca91
replace WebShell.java with web_shell.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
150 end |
| 503 | 151 |
| 1218 | 152 return Shell |