annotate src/luan/modules/Rpc.luan @ 1164:1f9d34a6f308

remove assertions
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 07 Feb 2018 17:36:38 -0700
parents ba4daf107e07
children 7f4a12fb7716
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
1 java()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
2 local RpcClient = require "java:luan.lib.rpc.RpcClient"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
3 local RpcServer = require "java:luan.lib.rpc.RpcServer"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
4 local RpcCall = require "java:luan.lib.rpc.RpcCall"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
5 local RpcResult = require "java:luan.lib.rpc.RpcResult"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
6 local RpcException = require "java:luan.lib.rpc.RpcException"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
7 local JavaRpc = require "java:luan.lib.rpc.Rpc"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
8 local JavaLuan = require "java:luan.Luan"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
9 local JavaUtils = require "java:luan.modules.Utils"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
10 local IoLuan = require "java:luan.modules.IoLuan"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
11 local ByteArrayInputStream = require "java:java.io.ByteArrayInputStream"
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
12 local Luan = require "luan:Luan.luan"
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
13 local error = Luan.error
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
14 local set_metatable = Luan.set_metatable or error()
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
15 local try = Luan.try or error()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
16 local ipairs = Luan.ipairs or error()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
17 local type = Luan.type or error()
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
18 local Io = require "luan:Io.luan"
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
19 local Thread = require "luan:Thread.luan"
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
20 local Table = require "luan:Table.luan"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
21 local unpack = Table.unpack or error()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
22 require "luan:logging/init.luan" -- initialize logging
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
23 local Logging = require "luan:logging/Logging.luan"
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
24 local logger = Logging.logger "Rpc"
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
25
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
26
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
27 local Rpc = {}
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
28
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
29 Rpc.port = 9101
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
30
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
31 local function java_args(list)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
32 for i,v in ipairs(list) do
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
33 list[i] = JavaLuan.toJava(v)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
34 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
35 return unpack(list)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
36 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
37
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
38 local function luan_args(list,binary_in)
1164
1f9d34a6f308 remove assertions
Franklin Schmidt <fschmidt@gmail.com>
parents: 1133
diff changeset
39 list = JavaLuan.table(list)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
40 for i,v in ipairs(list) do
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
41 list[i] = JavaLuan.toLuan(v)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
42 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
43 if binary_in ~= nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
44 local i_in = list[#list]
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
45 list[#list] = nil
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
46 local type = list[i_in]
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
47 if type == "binary" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
48 list[i_in] = JavaUtils.readAll(binary_in)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
49 elseif type == "input" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
50 list[i_in] = IoLuan.LuanInput.new(binary_in).table()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
51 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
52 error(type)
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 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
55 return unpack(list)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
56 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
57
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
58 local function encode_binary(args)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
59 local binary_in, len_in, i_in
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
60 for i,v in ipairs(args) do
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
61 if type(v) == "binary" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
62 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
63 i_in = i
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
64 binary_in = ByteArrayInputStream.new(v)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
65 len_in = #v
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
66 args[i] = "binary"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
67 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
68 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
69 i_in = i
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
70 binary_in = v.java.inputStream()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
71 len_in = v.length()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
72 args[i] = "input"
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
73 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
74 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
75 args[#args+1] = i_in
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
76 return binary_in, len_in
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
77 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
78
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
79 function Rpc.caller(socket)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
80 local java_socket = socket.java.socket
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
81 local client = RpcClient.new(java_socket)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
82 return function(fn_name,...)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
83 local args = {...}
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
84 local binary_in, len_in = encode_binary(args)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
85 local call
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
86 if binary_in == nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
87 call = RpcCall.new(fn_name,java_args(args))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
88 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
89 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
90 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
91 client.write(call)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
92 if fn_name == "close" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
93 client.close()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
94 return
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
95 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
96 return try {
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
97 function()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
98 local result = client.read()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
99 return luan_args(result.returnValues,result["in"])
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
100 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
101 catch = function(e)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
102 local cause = e.java.getCause()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
103 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
104 error(cause.values.get(0))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
105 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
106 e.throw()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
107 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
108 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
109 }
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
110 end_function
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
111 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
112
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
113 Rpc.functions = {}
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
114
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
115 function Rpc.responder(socket,fns)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
116 fns = fns or Rpc.functions
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
117 local java_socket = socket.java.socket
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
118 local server = RpcServer.new(java_socket)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
119 local responder = {}
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
120 function responder.is_closed()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
121 return server.isClosed()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
122 end_function
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
123 function responder.respond()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
124 local call = server.read()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
125 if call==nil then return end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
126 local cmd = call.cmd
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
127 if cmd == "close" then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
128 server.close()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
129 return
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
130 end_if
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
131 local fn = fns[cmd]
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
132 if fn == nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
133 server.write(JavaRpc.COMMAND_NOT_FOUND)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
134 return
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
135 end_if
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
136 local rtn = try {
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
137 function()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
138 return {fn(luan_args(call.args,call["in"]))}
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
139 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
140 catch = function(e)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
141 logger.warn(e)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
142 local ex = RpcException.new("luan",e.get_message())
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
143 server.write(ex)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
144 return nil
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
145 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
146 }
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
147 if rtn==nil then return end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
148 local binary_in, len_in = encode_binary(rtn)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
149 local result
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
150 if binary_in == nil then
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
151 result = RpcResult.new(java_args(rtn))
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
152 else
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
153 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
154 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
155 server.write(result)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
156 end
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
157 return responder
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
158 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
159
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
160 function Rpc.remote_socket(socket_uri)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
161 local socket = Io.uri(socket_uri)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
162 local call = Rpc.caller(socket)
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
163 local mt = {}
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
164 function mt.__index(_,key)
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
165 return function(...)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
166 return call(key,...)
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
167 end
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
168 end
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
169 local t = {}
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
170 set_metatable(t,mt)
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
171 return t
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
172 end_function
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
173
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
174 function Rpc.remote(domain)
1133
ba4daf107e07 fix security bug
Franklin Schmidt <fschmidt@gmail.com>
parents: 1120
diff changeset
175 local socket = "socket:"..domain..":"..Rpc.port
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
176 return Rpc.remote_socket(socket)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
177 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
178
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
179 function Rpc.serve(port,fns)
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
180 local socket_server = Io.socket_server(port or Rpc.port)
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
181 while true do
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
182 try {
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
183 function()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
184 local socket = socket_server()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
185 local function server()
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
186 try {
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
187 function()
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
188 local responder = Rpc.responder(socket)
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
189 while not responder.is_closed() do
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
190 responder.respond()
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
191 end
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
192 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
193 catch = function(e)
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
194 logger.error(e)
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
195 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
196 }
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
197 end
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
198 Thread.fork(server)
762
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
199 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
200 catch = function(e)
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
201 logger.error(e)
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
202 end
3f461f85243d better rpc thread handling
Franklin Schmidt <fschmidt@gmail.com>
parents: 743
diff changeset
203 }
1120
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
204 end_while
e8fc6712b468 luan Rpc uses luan.lib.rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
205 end_function
743
2c41f2aec92f improve Rpc and implement rpc call for local webserver
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
206
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
207 return Rpc