improve handler

3 files changed, 9 insertions, 5 deletions

diff --git a/xmake/modules/private/service/server/remote_build_server.lua b/xmake/modules/private/service/server/remote_build_server.lua
index a323132a6..678c38265 100644
--- a/xmake/modules/private/service/server/remote_build_server.lua
+++ b/xmake/modules/private/service/server/remote_build_server.lua
@@ -40,17 +40,16 @@ function remote_build_server:init(daemon)
 end
 
 -- handle ping message
-function remote_build_server:handle_ping(sock, msg)
-    local stream = socket_stream(sock)
+function remote_build_server:handle_ping(stream, msg)
     if stream:send_msg(message.new_ping()) and stream:flush() then
         print("send ok")
     end
 end
 
 -- on handle message
-function remote_build_server:on_handle(sock, msg)
+function remote_build_server:on_handle(stream, msg)
     if msg:is_ping() then
-        self:handle_ping(sock, msg)
+        self:handle_ping(stream, msg)
     end
 end
 
diff --git a/xmake/modules/private/service/server/server.lua b/xmake/modules/private/service/server/server.lua
index ea1831934..b9982b53c 100644
--- a/xmake/modules/private/service/server/server.lua
+++ b/xmake/modules/private/service/server/server.lua
@@ -125,7 +125,7 @@ function server:_handle_session(sock)
     while true do
         local msg = stream:recv_object()
         if msg then
-            self:_HANDLER(sock, message(msg))
+            self:_HANDLER(stream, message(msg))
         else
             break
         end
diff --git a/xmake/modules/private/service/socket_stream.lua b/xmake/modules/private/service/socket_stream.lua
index 74f71c330..1b428a936 100644
--- a/xmake/modules/private/service/socket_stream.lua
+++ b/xmake/modules/private/service/socket_stream.lua
@@ -37,6 +37,11 @@ function socket_stream:init(sock)
     self._WCACHE_SIZE = 0
 end
 
+-- get socket
+function socket_stream:sock()
+    return self._SOCK
+end
+
 -- flush data
 function socket_stream:flush()
     local cache = self._WCACHE