improve socket

3 files changed, 21 insertions, 35 deletions

diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 95a338ce7..4bec31569 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -382,7 +382,7 @@ function _instance:sendfile(file, opt)
 end
 
 -- recv data from socket
-function _instance:recv(size, opt)
+function _instance:recv(buff, size, opt)
 
     -- ensure opened
     local ok, errors = self:_ensure_opened()
@@ -390,6 +390,11 @@ function _instance:recv(size, opt)
         return -1, errors
     end
 
+    -- check buffer
+    if not buff and buff:size() < size then
+        return -1, string.format("%s: too small buffer!", self)
+    end
+
     -- check size
     if size == 0 then
         return 0
@@ -404,15 +409,11 @@ function _instance:recv(size, opt)
     local wait = false
     local data_or_errors = nil
     if opt.block then
-        local results = {}
         while recv < size do
-            local buff = self:_recvbuff()
-            real, data_or_errors = io.socket_recv(self:cdata(), buff:caddr(), math.min(buff:size(), size - recv))
+            real, data_or_errors = io.socket_recv(self:cdata(), buff:caddr() + recv, math.min(buff:size() - recv, size - recv))
             if real > 0 then
                 recv = recv + real
                 wait = false
-                table.insert(results, bytes(buff, 1, real))
-                self:_recvbuff_clear()
             elseif real == 0 and not wait then
                 local events, waiterrs = _instance.wait(self, socket.EV_RECV, opt.timeout or -1)
                 if events == socket.EV_RECV then
@@ -426,16 +427,14 @@ function _instance:recv(size, opt)
             end
         end
         if recv == size then
-            data_or_errors = bytes(results)
+            data_or_errors = bytes(buff, 1, recv)
         else
             recv = -1
         end
     else
-        local buff = self:_recvbuff()
         recv, data_or_errors = io.socket_recv(self:cdata(), buff:caddr(), math.min(buff:size(), size))
         if recv > 0 then
             data_or_errors = bytes(buff, 1, recv)
-            self:_recvbuff_clear()
         end
     end
     if recv < 0 and data_or_errors then
@@ -498,7 +497,7 @@ function _instance:sendto(data, addr, port, opt)
 end
 
 -- recv udp data from peer
-function _instance:recvfrom(size, opt)
+function _instance:recvfrom(buff, size, opt)
 
     -- ensure opened
     local ok, errors = self:_ensure_opened()
@@ -511,6 +510,11 @@ function _instance:recvfrom(size, opt)
         return -1, string.format("%s: sendto() only for udp socket!", self)
     end
 
+    -- check buffer
+    if not buff and buff:size() < size then
+        return -1, string.format("%s: too small buffer!", self)
+    end
+
     -- check size
     if size == 0 then
         return 0
@@ -525,11 +529,9 @@ function _instance:recvfrom(size, opt)
     local data_or_errors = nil
     if opt.block then
         while true do
-            local buff = self:_recvbuff()
             recv, data_or_errors, addr, port = io.socket_recvfrom(self:cdata(), buff:caddr(), math.min(buff:size(), size))
             if recv > 0 then
                 data_or_errors = bytes(buff, 1, recv)
-                self:_recvbuff_clear()
                 break
             elseif recv == 0 and not wait then
                 local events, waiterrs = _instance.wait(self, socket.EV_RECV, opt.timeout or -1)
@@ -545,11 +547,9 @@ function _instance:recvfrom(size, opt)
             end
         end
     else
-        local buff = self:_recvbuff()
         recv, data_or_errors, addr, port = io.socket_recvfrom(self:cdata(), buff:caddr(), math.min(buff:size(), size))
         if recv > 0 then
             data_or_errors = bytes(buff, 1, recv)
-            self:_recvbuff_clear()
         end
     end
     if recv < 0 and data_or_errors then
@@ -606,21 +606,6 @@ function _instance:close()
     return ok
 end
 
--- get the recv buffer
-function _instance:_recvbuff()
-    local recvbuff = self._RECVBUFF
-    if not recvbuff then
-        recvbuff = bytes(8192)
-        self._RECVBUFF = recvbuff
-    end
-    return recvbuff
-end
-
--- clear the recv buffer
-function _instance:_recvbuff_clear()
-    self._RECVBUFF = nil
-end
-
 -- ensure the socket is opened
 function _instance:_ensure_opened()
     if not self:cdata() then
diff --git a/xmake/core/sandbox/modules/import/core/base/socket.lua b/xmake/core/sandbox/modules/import/core/base/socket.lua
index f15f54c15..b86f3b9c5 100644
--- a/xmake/core/sandbox/modules/import/core/base/socket.lua
+++ b/xmake/core/sandbox/modules/import/core/base/socket.lua
@@ -137,8 +137,8 @@ function sandbox_core_base_socket_instance.sendfile(sock, file, opt)
 end
 
 -- recv data from socket
-function sandbox_core_base_socket_instance.recv(sock, size, opt)
-    local real, data_or_errors = sock:_recv(size, opt)
+function sandbox_core_base_socket_instance.recv(sock, buff, size, opt)
+    local real, data_or_errors = sock:_recv(buff, size, opt)
     if real < 0 and data_or_errors then
         raise(data_or_errors)
     end
@@ -155,8 +155,8 @@ function sandbox_core_base_socket_instance.sendto(sock, data, addr, port, opt)
 end
 
 -- recv udp data from peer
-function sandbox_core_base_socket_instance.recvfrom(sock, size, opt)
-    local real, data_or_errors, addr, port = sock:_recvfrom(size, opt)
+function sandbox_core_base_socket_instance.recvfrom(sock, buff, size, opt)
+    local real, data_or_errors, addr, port = sock:_recvfrom(buff, size, opt)
     if real < 0 and data_or_errors then
         raise(data_or_errors)
     end
diff --git a/xmake/modules/private/service/server/server.lua b/xmake/modules/private/service/server/server.lua
index e5898c416..96adf49dd 100644
--- a/xmake/modules/private/service/server/server.lua
+++ b/xmake/modules/private/service/server/server.lua
@@ -20,6 +20,7 @@
 
 -- imports
 import("core.base.object")
+import("core.base.bytes")
 import("core.base.socket")
 import("core.base.scheduler")
 import("private.service.stream")
@@ -123,9 +124,9 @@ function server:_handle_session(sock)
     local recv = 0
     local data = nil
     local wait = false
-    local results = {}
+    local buff = bytes(8192)
     while true do
-        real, data = sock:recv(8192)
+        real, data = sock:recv(buff, 8192)
         if real > 0 then
             if data then
             end