add opensock

6 files changed, 193 insertions, 1 deletions

diff --git a/core/src/xmake/io/socket_close.c b/core/src/xmake/io/socket_close.c
new file mode 100644
index 000000000..fe0d24f32
--- /dev/null
+++ b/core/src/xmake/io/socket_close.c
@@ -0,0 +1,57 @@
+/*!A cross-platform build utility based on Lua
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright (C) 2015 - 2019, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        socket_close.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "socket_close"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * interfaces
+ */
+
+// io.socket_close(sock)
+tb_int_t xm_io_socket_close(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // is user data?
+    if (!lua_isuserdata(lua, 1)) 
+        return 0;
+
+    // get socket
+    tb_socket_ref_t sock = (tb_socket_ref_t)lua_touserdata(lua, 1);
+    tb_check_return_val(sock, 0);
+
+    // exit socket
+    lua_pushboolean(lua, tb_socket_exit(sock));
+
+    // ok
+    return 1;
+}
+
diff --git a/core/src/xmake/io/socket_open.c b/core/src/xmake/io/socket_open.c
new file mode 100644
index 000000000..1c50c9d37
--- /dev/null
+++ b/core/src/xmake/io/socket_open.c
@@ -0,0 +1,50 @@
+/*!A cross-platform build utility based on Lua
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright (C) 2015 - 2019, TBOOX Open Source Group.
+ *
+ * @author      ruki
+ * @file        socket_open.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "socket_open"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+
+/*
+ * io.socket_open()
+ */
+tb_int_t xm_io_socket_open(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // init socket
+    tb_socket_ref_t sock = tb_socket_init(TB_SOCKET_TYPE_TCP, TB_IPADDR_FAMILY_IPV4);
+    if (sock) lua_pushlightuserdata(lua, (tb_pointer_t)sock);
+    else lua_pushnil(lua);
+    return 1;
+}
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index b98e60236..412106985 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -109,6 +109,10 @@ tb_int_t xm_io_filelock_unlock(lua_State* lua);
 tb_int_t xm_io_filelock_trylock(lua_State* lua);
 tb_int_t xm_io_filelock_close(lua_State* lua);
 
+// the io/socket functions
+tb_int_t xm_io_socket_open(lua_State* lua);
+tb_int_t xm_io_socket_close(lua_State* lua);
+
 // the path functions
 tb_int_t xm_path_relative(lua_State* lua);
 tb_int_t xm_path_absolute(lua_State* lua);
@@ -241,6 +245,8 @@ static luaL_Reg const g_io_functions[] =
 ,   { "filelock_trylock",   xm_io_filelock_trylock }
 ,   { "filelock_unlock",    xm_io_filelock_unlock  }
 ,   { "filelock_close",     xm_io_filelock_close   }
+,   { "socket_open",        xm_io_socket_open      }
+,   { "socket_close",       xm_io_socket_close     }
 ,   { tb_null,              tb_null                }
 };
 
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 996123191..1572cecbf 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -60,6 +60,8 @@ xmake_C_FILES 			+= \
 						io/filelock_unlock \
 						io/filelock_trylock \
 						io/filelock_close \
+						io/socket_open \
+						io/socket_close \
 						path/relative \
 						path/absolute \
 						path/translate \
diff --git a/xmake/core/base/io.lua b/xmake/core/base/io.lua
index f6c931970..5aaebc1af 100644
--- a/xmake/core/base/io.lua
+++ b/xmake/core/base/io.lua
@@ -22,6 +22,7 @@
 local io        = io or {}
 local _file     = _file or {}
 local _filelock = _filelock or {}
+local _socket   = _socket or {}
 
 -- load modules
 local path   = require("base/path")
@@ -31,6 +32,7 @@ local string = require("base/string")
 -- save metatable and builtin functions
 io._file        = _file
 io._filelock    = _filelock
+io._socket      = _socket
 io._stdfile     = io._stdfile or io.stdfile
 
 -- new an file
@@ -212,7 +214,7 @@ function _file:load()
     end
 end
 
--- new an filelock
+-- new a filelock
 function _filelock.new(lockpath, lock)
     local filelock = table.inherit(_filelock)
     filelock._NAME = path.filename(lockpath)
@@ -317,6 +319,44 @@ function _filelock:__gc()
     end
 end
 
+-- new a socket
+function _socket.new(sock)
+    local socket = table.inherit(_socket)
+    socket._SOCK = sock
+    socket._NAME = ""
+    setmetatable(socket, _socket)
+    return socket
+end
+
+-- get the socket name 
+function _socket:name()
+    return self._NAME
+end
+
+-- close socket
+function _socket:close()
+    if not self._SOCK then
+        return false, string.format("socket(%s) has been closed!", self:name())
+    end
+    local ok = io.socket_close(self._SOCK)
+    if ok then
+        self._SOCK = nil
+    end
+    return ok
+end
+
+-- tostring(socket)
+function _socket:__tostring()
+    return "socket: " .. self:name()
+end
+
+-- gc(socket)
+function _socket:__gc()
+    if self._SOCK and io.socket_close(self._SOCK) then
+        self._SOCK = nil
+    end
+end
+
 -- read all lines from file
 function io.lines(filepath, opt)
 
@@ -456,6 +496,18 @@ function io.openlock(filepath)
     end
 end
 
+-- open a socket
+function io.opensock()
+
+    -- open it
+    local sock = io.socket_open()
+    if sock then
+        return _socket.new(filepath, sock)
+    else
+        return nil, string.format("failed to open socket!")
+    end
+end
+
 -- close file
 function io.close(file)
     return (file or io.stdout):close()
diff --git a/xmake/core/sandbox/modules/io.lua b/xmake/core/sandbox/modules/io.lua
index 1a02a77e6..ab2fc71f1 100644
--- a/xmake/core/sandbox/modules/io.lua
+++ b/xmake/core/sandbox/modules/io.lua
@@ -29,8 +29,10 @@ local vformat   = require("sandbox/modules/vformat")
 local sandbox_io          = sandbox_io or {}
 local sandbox_io_file     = sandbox_io_file or {}
 local sandbox_io_filelock = sandbox_io_filelock or {}
+local sandbox_io_socket   = sandbox_io_socket or {}
 sandbox_io._file          = sandbox_io._file or io._file
 sandbox_io._filelock      = sandbox_io._filelock or io._filelock
+sandbox_io._socket        = sandbox_io._socket or io._socket
 sandbox_io.lines          = io.lines
 
 -- get file size
@@ -272,6 +274,29 @@ function sandbox_io.openlock(filepath)
     return lock
 end
 
+-- open socket
+function sandbox_io.opensock()
+
+    -- open sock
+    local sock, errors = io.opensock()
+    if not sock then
+        raise(errors)
+    end
+
+    -- hook socket interfaces
+    local hooked = {}
+    for name, func in pairs(sandbox_io_socket) do
+        if not name:startswith("_") and type(func) == "function" then
+            hooked["_" .. name] = sock["_" .. name] or sock[name]
+            hooked[name] = func
+        end
+    end
+    for name, func in pairs(hooked) do
+        sock[name] = func
+    end
+    return sock
+end
+
 -- load object from the given file
 function sandbox_io.load(filepath, opt)