Mercurial Hosting > luan

annotate src/luan/modules/Rpc.luan @ 1380:04482e2a6ca3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix ssl
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 28 Jul 2019 11:06:37 -0600
parents a503be8b8dce
children 8d7a39ca2c0c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1353
8d95711f6615 replace java() with require "java"
Franklin Schmidt <fschmidt@gmail.com>
parents: 1280
diff changeset
1 require "java"
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
2 local Socket = require "java:java.net.Socket"
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
3 local ServerSocket = require "java:java.net.ServerSocket"
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
4 local SSLSocketFactory = require "java:javax.net.ssl.SSLSocketFactory"
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
5 local SSLServerSocketFactory = require "java:javax.net.ssl.SSLServerSocketFactory"
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
6 local RpcClient = require "java:luan.lib.rpc.RpcClient"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
7 local RpcServer = require "java:luan.lib.rpc.RpcServer"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
8 local RpcCall = require "java:luan.lib.rpc.RpcCall"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
9 local RpcResult = require "java:luan.lib.rpc.RpcResult"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
10 local RpcException = require "java:luan.lib.rpc.RpcException"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
11 local JavaRpc = require "java:luan.lib.rpc.Rpc"
1259
e8020216dee7 add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents: 1236
diff changeset
12 local LuanJava = require "java:luan.Luan"
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
13 local JavaUtils = require "java:luan.modules.Utils"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
14 local IoLuan = require "java:luan.modules.IoLuan"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
15 local ByteArrayInputStream = require "java:java.io.ByteArrayInputStream"
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
16 local Luan = require "luan:Luan.luan"
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
17 local error = Luan.error
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
18 local set_metatable = Luan.set_metatable or error()
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
19 local try = Luan.try or error()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
20 local ipairs = Luan.ipairs or error()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
21 local type = Luan.type or error()
1280
781ec0a92bb5 add Boot.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1261
diff changeset
22 local Boot = require "luan:Boot.luan"
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
23 local Io = require "luan:Io.luan"
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
24 local Thread = require "luan:Thread.luan"
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
25 local Table = require "luan:Table.luan"
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
26 local java_to_table_deep = Table.java_to_table_deep or error()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
27 local unpack = Table.unpack or error()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
28 local Logging = require "luan:logging/Logging.luan"
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
29 local logger = Logging.logger "Rpc"
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
30
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
31
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
32 local Rpc = {}
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
33
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
34 Rpc.port = 9101
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
35
1206
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
36 Rpc.cipher_suites = {
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
37 "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
38 "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
39 "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
40 "TLS_DH_anon_WITH_AES_128_CBC_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
41 "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
42 "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
43 "TLS_ECDH_anon_WITH_RC4_128_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
44 "SSL_DH_anon_WITH_RC4_128_MD5"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
45 "SSL_DH_anon_WITH_DES_CBC_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
46 "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
47 "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
48 }
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
49
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
50 local function java_args(list)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
51 for i,v in ipairs(list) do
1259
e8020216dee7 add Luan.to_luan and fix multipart/form-data
Franklin Schmidt <fschmidt@gmail.com>
parents: 1236
diff changeset
52 list[i] = LuanJava.toJava(v)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
53 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
54 return unpack(list)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
55 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
56
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
57 local function luan_args(list,binary_in)
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 list = java_to_table_deep(list)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
59 if binary_in ~= nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
60 local i_in = list[#list]
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
61 list[#list] = nil
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
62 local type = list[i_in]
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
63 if type == "binary" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
64 list[i_in] = JavaUtils.readAll(binary_in)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
65 elseif type == "input" then
1280
781ec0a92bb5 add Boot.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 1261
diff changeset
66 list[i_in] = Boot.new_LuanIn( IoLuan.LuanInput.new(binary_in) )
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
67 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
68 error(type)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
69 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
70 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
71 return unpack(list)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
72 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
73
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
74 local function encode_binary(args)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
75 local binary_in, len_in, i_in
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
76 for i,v in ipairs(args) do
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
77 if type(v) == "binary" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
78 binary_in==nil or error "can't have multiple binary args"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
79 i_in = i
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
80 binary_in = ByteArrayInputStream.new(v)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
81 len_in = #v
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
82 args[i] = "binary"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
83 elseif type(v) == "table" and v.java ~= nil and v.java.instanceof(IoLuan.LuanFile) then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
84 binary_in==nil or error "can't have multiple binary args"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
85 i_in = i
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
86 binary_in = v.java.inputStream()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
87 len_in = v.length()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
88 args[i] = "input"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
89 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
90 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
91 args[#args+1] = i_in
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
92 return binary_in, len_in
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
93 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
94
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
95 local function rpc_caller(socket)
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
96 local client = RpcClient.new(socket)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
97 return function(fn_name,...)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
98 local args = {...}
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
99 local binary_in, len_in = encode_binary(args)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
100 local call
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
101 if binary_in == nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
102 call = RpcCall.new(fn_name,java_args(args))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
103 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
104 call = RpcCall.new(binary_in,len_in,fn_name,java_args(args))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
105 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
106 client.write(call)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
107 if fn_name == "close" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
108 client.close()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
109 return
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
110 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
111 return try {
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
112 function()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
113 local result = client.read()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
114 return luan_args(result.returnValues,result["in"])
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
115 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
116 catch = function(e)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
117 local cause = e.java.getCause()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
118 if cause ~= nil and cause.instanceof(RpcException) and cause.getMessage() == "luan" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
119 error(cause.values.get(0))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
120 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
121 e.throw()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
122 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
123 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
124 }
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
125 end_function
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
126 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
127
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
128 Rpc.functions = {}
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
129
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
130 local function rpc_responder(socket,fns)
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
131 local server = RpcServer.new(socket)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
132 local responder = {}
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
133 function responder.is_closed()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
134 return server.isClosed()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
135 end_function
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
136 function responder.respond()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
137 local call = server.read()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
138 if call==nil then return end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
139 local cmd = call.cmd
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
140 if cmd == "close" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
141 server.close()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
142 return
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
143 end_if
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
144 local fn = fns[cmd]
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
145 if fn == nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
146 server.write(JavaRpc.COMMAND_NOT_FOUND)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
147 return
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
148 end_if
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
149 local rtn = try {
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
150 function()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
151 return {fn(luan_args(call.args,call["in"]))}
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
152 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
153 catch = function(e)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
154 logger.warn(e)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
155 local ex = RpcException.new("luan",e.get_message())
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
156 server.write(ex)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
157 return nil
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
158 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
159 }
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
160 if rtn==nil then return end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
161 local binary_in, len_in = encode_binary(rtn)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
162 local result
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
163 if binary_in == nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
164 result = RpcResult.new(java_args(rtn))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
165 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
166 result = RpcResult.new(binary_in,len_in,java_args(rtn))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
167 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
168 server.write(result)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
169 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
170 return responder
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
171 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
172
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
173 function Rpc.remote(domain)
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
174 local socket
1206
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
175 if Rpc.cipher_suites == nil then
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
176 socket = Socket.new(domain,Rpc.port)
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
177 else
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
178 socket = SSLSocketFactory.getDefault().createSocket(domain,Rpc.port)
1206
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
179 socket.setEnabledCipherSuites(Rpc.cipher_suites)
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
180 end
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
181 local call = rpc_caller(socket)
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
182 local mt = {}
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
183 function mt.__index(_,key)
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
184 return function(...)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
185 return call(key,...)
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
186 end
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
187 end
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
188 local t = {}
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
189 set_metatable(t,mt)
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
190 return t
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
191 end_function
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
192
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
193 function Rpc.serve(port,fns)
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
194 port = port or Rpc.port
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
195 fns = fns or Rpc.functions
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
196 local socket_server
1206
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
197 if Rpc.cipher_suites == nil then
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
198 socket_server = ServerSocket.new(port)
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
199 else
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
200 socket_server = SSLServerSocketFactory.getDefault().createServerSocket(port)
1206
6dfaf4e9ce71 use many anonymous cipher_suites
Franklin Schmidt <fschmidt@gmail.com>
parents: 1205
diff changeset
201 socket_server.setEnabledCipherSuites(Rpc.cipher_suites)
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
202 end
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
203 while true do
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
204 try {
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
205 function()
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
206 local socket = socket_server.accept()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
207 local function server()
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
208 try {
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
209 function()
1204
5d0cbd908582 remove Io socket support
Franklin Schmidt <fschmidt@gmail.com>
parents: 1201
diff changeset
210 local responder = rpc_responder(socket,fns)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
211 while not responder.is_closed() do
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
212 responder.respond()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
213 end
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
214 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
215 catch = function(e)
1236
5b9856045e51 rpc logging
Franklin Schmidt <fschmidt@gmail.com>
parents: 1206
diff changeset
216 logger.warn(e)
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
217 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
218 }
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
219 end
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
220 Thread.fork(server)
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
221 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
222 catch = function(e)
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
223 logger.error(e)
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
224 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
225 }
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
226 end_while
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
227 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
228
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
229 return Rpc