4 files changed, 289 insertions, 206 deletions

diff --git a/src/lua/net/lua_net_Buffer.h b/src/lua/net/lua_net_Buffer.h
new file mode 100644
index 0000000..51c7598
--- /dev/null
+++ b/src/lua/net/lua_net_Buffer.h
@@ -0,0 +1,92 @@
+#ifndef __JIN_LUA_NET_NETBUFFER_H
+#define __JIN_LUA_NET_NETBUFFER_H
+
+#include <cstring>
+#include <cstdlib>
+
+namespace jin
+{
+namespace lua
+{
+namespace net
+{
+
+    class Buffer
+    {
+    public:
+        Buffer(size_t s = 0)
+        {
+            size = s;
+            buffer = new char[size];
+            memset(buffer, 0, size);
+        }
+
+        Buffer(const char* data, size_t s)
+        {
+            size = s;
+            buffer = new char[size];
+            memcpy(buffer, data, size);
+        }
+
+        ~Buffer()
+        {
+            delete[] buffer;
+            buffer = nullptr;
+            size = 0;
+        }
+
+        void append(const void* data, size_t s)
+        {
+            if (data == nullptr)
+                return;
+            char* buf = buffer;
+            buffer = new char[size + s];
+            memcpy(buffer, buf, size);
+            memcpy(buffer + size, data, s);
+            delete[] buf;
+            size += s;
+            return;
+        }
+
+        const char* grabString(int* length, int offset = 0)
+        {
+            int l = offset;
+            for (; l < size; ++l)
+            {
+                if (buffer[l] == 0)
+                    break;
+            }
+            *length = l - offset + 1;
+            char* str = (char*)malloc(*length);
+            memcpy(str, buffer + offset, *length);
+            return str;
+        }
+
+        int grabInteger(int* length, int offset = 0)
+        {
+            *length = sizeof(int);
+            return *((int*)buffer);
+        }
+
+        float grabFloat(int* length, int offset = 0)
+        {
+            *length = sizeof(float);
+            return *((float*)buffer);
+        }
+
+        bool grabBoolean(int* length, int offset = 0)
+        {
+            *length = sizeof(bool);
+            return *((bool*)buffer);
+        }
+
+        char* buffer;
+        size_t size;
+
+    };
+
+} // net
+} // lua
+} // jin
+
+#endif
\ No newline at end of file
diff --git a/src/lua/net/luaopen_Buffer.cpp b/src/lua/net/luaopen_Buffer.cpp
index 6e10f25..3a8353b 100644
--- a/src/lua/net/luaopen_Buffer.cpp
+++ b/src/lua/net/luaopen_Buffer.cpp
@@ -1,6 +1,7 @@
 #include "lua/luax.h"
 #include "../luaopen_types.h"
 #include "libjin/jin.h"
+#include "lua_net_Buffer.h"
 
 namespace jin
 {
@@ -9,183 +10,120 @@ namespace lua
 namespace net
 {
 
-    class Buffer
+    static inline Buffer* checkNetBuffer(lua_State* L)
     {
-    public:
-        Buffer(size_t size);
-        Buffer(const char* data, size_t size);
-        ~Buffer()
-        {
-        }
-
-        void append(char* data, size_t size)
-        {
-
-        }
-
-        const char* grabString(int offset = 0)
-        {
-            int l = offset;
-            for (; l < size; ++l)
-            {
-                if (buffer[l] == 0)
-                {
-
-                }
-            }
-            return nullptr;
-        }
-
-        int grabInteger(int offset = 0)
-        {
-
-        }
-
-        float grabfloat(int offset = 0)
-        {
-
-        }
-
-        bool grabboolean(int offset = 0)
-        {
-
-        }
-
-    private:
-        char* buffer;
-        size_t size;
-
-    };
-
-    static int l_buffer(lua_State* L)
-    {
-        int size = luax_checkinteger(L, 1);
-        char* buffer = (char*)malloc(size);
-        memset(buffer, 0, size);
-        luax_pushlstring(L, buffer, size);
-        return 1;
+        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_BUFFER);
+        if (proxy != 0 && proxy != nullptr)
+            return (Buffer*)proxy->object;
+        return nullptr;
     }
 
-    // return buffer, size
-    static int l_write(lua_State* L)
+    // net.Buffer:append(value) -> value_length
+    static int l_append(lua_State* L)
     {
-        const char* data = luax_checklstring(L, 1, NULL);
-        int len = luax_checkinteger(L, 2);
-        if (luax_isinteger(L, 3))
+        Buffer* buffer = checkNetBuffer(L);
+        const int vp = 2;
+        if (luax_isinteger(L, vp))
         {
-            int n = luax_checkinteger(L, 3);
-            int size = len + sizeof(n);
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, &n, sizeof(n));
-            //free((void*)data);
-            luax_pushlstring(L, buffer, size);
+            int n = luax_checkinteger(L, vp);
+            int size = sizeof(n);
+            buffer->append(&n, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
-        else if (luax_isfloat(L, 3))
+        else if (luax_isfloat(L, vp))
         {
-            float n = luax_checknumber(L, 3);
-            int size = len + sizeof(n);
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, &n, sizeof(n));
-            //free((void*)data);
-            luax_pushlstring(L, buffer, size);
+            float n = luax_checknumber(L, vp);
+            int size = sizeof(n);
+            buffer->append(&n, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
-        else if (luax_isboolean(L, 3))
+        else if (luax_isboolean(L, vp))
         {
-            bool b = luax_checkbool(L, 3);
-            int size = len + sizeof(b);
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, &b, sizeof(b));
-            //free((void*)data);
-            luax_pushlstring(L, buffer, size);
+            bool n = luax_checkbool(L, vp);
+            int size = sizeof(n);
+            buffer->append(&n, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
-        else if (luax_isstring(L, 3))
+        else if (luax_isstring(L, vp))
         {
-            const char* s = luax_checkstring(L, 3);
-            int l = strlen(s) + 1; // with \0
-            int size = len + l;
-            char* buffer = (char*)malloc(size);
-            memcpy(buffer, data, len);
-            memcpy(buffer + len, s, l);
-            luax_pushlstring(L, buffer, size);
+            const char* str = luax_checkstring(L, vp);
+            int size = strlen(str) + 1;
+            buffer->append(str, size);
             luax_pushinteger(L, size);
-            return 2;
+            return 1;
         }
         else
         {
-            luax_typerror(L, 3, "number, bool or string");
+            luax_typerror(L, vp, "number, bool or string");
             return 0;
         }
     }
 
-    // jin.shift(buffer, shift)
-    static int l_shift(lua_State* L)
+    // net.Buffer:grabString(offset) -> string, length
+    static int l_grabString(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        int shift = luax_checkinteger(L, 3);
-        int ss = size - shift;
-        luax_pushlstring(L, buffer + shift, ss);
-        luax_pushinteger(L, ss);
+        Buffer* buffer = checkNetBuffer(L);
+        int offset = luax_checkinteger(L, 2);
+        int len;
+        const char* str = buffer->grabString(&len, offset);
+        luax_pushstring(L, str);
+        luax_pushinteger(L, len);
         return 2;
     }
 
-    // jin.bit.grabstring(buffer, size)
-    static int l_grabstring(lua_State* L)
+    // net.Buffer:grabInteger(offset) -> integer, length
+    static int l_grabInteger(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        int l = 0;
-        for (; l < size; ++l)
-        {
-            if (buffer[l] == 0)
-            {
-                int len = l + 1;
-                char* str = (char*)malloc(len);
-                memcpy(str, buffer, len);
-                luax_pushstring(L, str);
-                luax_pushinteger(L, l);
-                return 2;
-            }
-        }
-        return 0;
+        Buffer* buffer = checkNetBuffer(L);
+        int offset = luax_checkinteger(L, 2);
+        int len;
+        int integer = buffer->grabInteger(&len, offset);
+        luax_pushinteger(L, integer);
+        luax_pushinteger(L, len);
+        return 1;
     }
 
-    static int l_grabinteger(lua_State* L)
+    static int l_grabFloat(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        int n = *((int*)buffer);
-        luax_pushinteger(L, n);
+        Buffer* buffer = checkNetBuffer(L);
+        int offset = luax_checkinteger(L, 2);
+        int len;
+        float floatv = buffer->grabFloat(&len, offset);
+        luax_pushnumber(L, floatv);
+        luax_pushinteger(L, len);
         return 1;
     }
 
-    static int l_grabfloat(lua_State* L)
+    static int l_grabBoolean(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        float n = *((float*)buffer);
-        luax_pushnumber(L, n);
+        Buffer* buffer = checkNetBuffer(L);
+        int offset = luax_checkinteger(L, 2);
+        int len;
+        bool boolean = buffer->grabBoolean(&len, offset);
+        luax_pushboolean(L, boolean);
+        luax_pushinteger(L, len);
         return 1;
     }
 
-    static int l_grabboolean(lua_State* L)
+    static const luaL_Reg netbuffer_function[] = {
+        { "append",         l_append },
+        { "grabString",     l_grabString },
+        { "grabInteger",    l_grabInteger },
+        { "grabBoolean",    l_grabBoolean },
+        { "grabFloat",      l_grabFloat },
+        { 0, 0 }
+    };
+
+} // net
+
+    int luaopen_Buffer(lua_State* L)
     {
-        const char* buffer = luax_checklstring(L, 1, NULL);
-        int size = luax_checkinteger(L, 2);
-        bool n = *((bool*)buffer);
-        luax_pushboolean(L, n);
-        return 1;
+        luax_newtype(L, JIN_NETWORK_BUFFER, net::netbuffer_function);
+        return 0;
     }
 
-} // net
 } // lua
 } // jin
\ No newline at end of file
diff --git a/src/lua/net/luaopen_Socket.cpp b/src/lua/net/luaopen_Socket.cpp
index 7dbfb33..395729a 100644
--- a/src/lua/net/luaopen_Socket.cpp
+++ b/src/lua/net/luaopen_Socket.cpp
@@ -1,120 +1,109 @@
 #include "lua/luax.h"
 #include "../luaopen_types.h"
 #include "libjin/jin.h"
+#include "lua_net_Buffer.h"
 
 namespace jin
 {
 namespace lua
 {
-    /**
-    * ���л�
-    * int 
-    * float 
-    * bool 
-    * 
-    * һ��message��һ��table
-    */
-    class DenseBuffer
-    {
-    public: 
-        DenseBuffer(int len)
-        {
-            this->len = len;
-            buffer = new char[len];
-            memset(buffer, 0, len);
-        }
-        ~DenseBuffer()
-        {
-            delete[] buffer;
-        }
-        char* operator&()
-        {
-            return buffer;
-        }
-        int size()
-        {
-            return len;
-        }
-
-    private:
-        int len;
-        char* buffer;
-    };
-
+    
     using namespace jin::net;
 
-    static inline Socket* checkSocket(lua_State* L)
+    const int BUFFER_SIZE = 1024;
+
+    static inline Socket* checkSocket(lua_State* L, int pos = 1)
     {
-        Proxy* proxy = (Proxy*)luax_checktype(L, 1, TYPE_SOCKET);
+        Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_SOCKET);
         if (proxy != 0 && proxy != nullptr)
             return (Socket*)proxy->object;
         return nullptr;
     }
 
-    /**
-    +---------------+
-    | message table | -1
-    +---------------+
-    |       ...     | -2 
-    +---------------+
-    |       ...     | ...
-    */
-    static char* serialize(lua_State* L)
+    static inline net::Buffer* checkNetBuffer(lua_State* L, int pos = 1)
     {
-        if (!luax_istable(L, -1))
-            luax_typerror(L, -1, "table");
-        DenseBuffer* buffer;
-
+        Proxy* proxy = (Proxy*)luax_checktype(L, pos, JIN_NETWORK_BUFFER);
+        if (proxy != 0 && proxy != nullptr)
+            return (net::Buffer*)proxy->object;
+        return nullptr;
     }
 
+    // return net.Buffer
     static int l_accept(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-    
+        Socket* client = socket->accept();
+        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+        proxy->bind(client, JIN_NETWORK_SOCKET);
+        return 1;
     }
     
+    // return net.Buffer
     static int l_receive(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-
+        char buffer[BUFFER_SIZE] = {0};
+        int size = socket->receive(buffer, BUFFER_SIZE);
+        net::Buffer* netBuffer = new net::Buffer(buffer, size);
+        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+        proxy->bind(netBuffer, JIN_NETWORK_BUFFER);
+        return 1;
     }
     
-    static int l_receive(lua_State* L) 
+    // Socket:receiveFrom(address, port)
+    static int l_receiveFrom(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-
+        int address = luax_checkinteger(L, 2);
+        int port = luax_checkinteger(L, 3);
+        char buffer[BUFFER_SIZE];
+        int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port);
+        net::Buffer* netBuffer = new net::Buffer(buffer, size);
+        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+        proxy->bind(netBuffer, JIN_NETWORK_BUFFER);
+        return 1;
     }
-    
+
+    // Socket:send(net.Buffer) -> data_length
     static int l_send(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-        DenseBuffer buffer(1024);
-        socket->send(&buffer, buffer.size());
+        net::Buffer* buffer = checkNetBuffer(L, 2);
+        int len = socket->send(buffer->buffer, buffer->size);
+        luax_pushinteger(L, len);
+        return 1;
     }
     
-    // thread:sendTo(address, port, table)
+    // Socket:sendTo(address, port, net.Buffer)
     static int l_sendTo(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-
+        int address = luax_checkinteger(L, 2);
+        int port = luax_checkinteger(L, 3);
+        net::Buffer* buffer = checkNetBuffer(L, 4);
+        socket->sendTo(buffer->buffer, buffer->size, address, port);
+        return 0;
     }
     
     static int l_close(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-
+        socket->close();
+        return 0;
     }
 
     static int l_configBlocking(lua_State* L) 
     {
         Socket* socket = checkSocket(L);
-
+        bool blocking = luax_checkbool(L, 2);
+        socket->configureBlocking(blocking);
+        return 0;
     }
 
     static const luaL_Reg socket_function[] = {
         { "accept",         l_accept },
         { "receive",        l_receive },
-        { "receiveFrom",    l_receive },
+        { "receiveFrom",    l_receiveFrom },
         { "send",           l_send },
         { "sendTo",         l_sendTo },
         { "close",          l_close },
@@ -124,9 +113,9 @@ namespace lua
 
     int luaopen_Socket(lua_State* L)
     {
-        luax_newtype(L, TYPE_SOURCE, socket_function);
+        luax_newtype(L, JIN_NETWORK_SOCKET, socket_function);
         return 0;
     }
 
-}
-}
\ No newline at end of file
+} // lua
+} // jin
\ No newline at end of file
diff --git a/src/lua/net/luaopen_net.cpp b/src/lua/net/luaopen_net.cpp
index 8d67487..4bbb7e8 100644
--- a/src/lua/net/luaopen_net.cpp
+++ b/src/lua/net/luaopen_net.cpp
@@ -1,31 +1,95 @@
 #include "lua/luax.h"
 #include "libjin/jin.h"
+#include "../luaopen_types.h"
+#include "lua_net_Buffer.h"
 
 namespace jin
 {
 namespace lua
 {
 
+    using namespace jin::net;
+
     static int l_initNetwork(lua_State* L)
     {
         jin::net::Net::get()->init();
         return 1;
     }
+    
+    // jin.net.toSocket(lightuserdata)
+    static int l_toSocket(lua_State*L)
+    {
+        Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_NETWORK_SOCKET);
+        //Proxy * socketProxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+
+        return 1;
+    }
+
+    // jin.net.Socket()
+    static int l_Socket(lua_State* L)
+    {
+        const char* socketType = luax_checkstring(L, 1);
+        SocketInformation info = { 0 };
+        if (strcmp(socketType, "TCP") == 0)
+            info.type = SocketType::TCP;
+        else if (strcmp(socketType, "UDP") == 0)
+            info.type = SocketType::UDP;
+        else
+        {
+            luax_error(L, "jin.net.Socket() first paramter wrong, must be TCP or UDP");
+            return 0;
+        }
+        // type, port
+        if (luax_gettop(L) == 2)
+        {
+            info.port = luax_checkinteger(L, 2);
+        }
+        // type, address, port
+        else if (luax_gettop(L) == 3)
+        {
+            if (luax_isstring(L, 2))
+                info.address = tk_strtohl(luax_checkstring(L, 2));
+            else if(luax_isinteger(L, 2))
+                info.address = luax_checkinteger(L, 2);
+            info.port = luax_checkinteger(L, 3);
+        }
+        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_SOCKET, sizeof(Proxy));
+        Socket* socket = new Socket(info);
+        proxy->bind(socket, JIN_NETWORK_SOCKET);
+        return 1;
+    }
+
+    // jin.net.Buffer()
+    static int l_Buffer(lua_State* L)
+    {
+        int size = luax_checkinteger(L, 1);
+        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy));
+        net::Buffer* buffer = new net::Buffer();
+        proxy->bind(buffer, JIN_NETWORK_BUFFER);
+        return 1;
+    }
 
     static const luaL_Reg f[] = {
-        { "init", l_initNetwork},
+        { "init", l_initNetwork },
+        { "toSocket", l_toSocket }, 
+        { "Socket", l_Socket },
+        { "Buffer", l_Buffer },
         { 0, 0 }
     };
 
     extern int luaopen_Socket(lua_State* L);
+    extern int luaopen_Buffer(lua_State* L);
 
     // only tcp
     int luaopen_net(lua_State* L)
     {
+        luaopen_Socket(L);
+        luaopen_Buffer(L);
+
         luax_newlib(L, f);
 
         return 1;
     }
 
-}
-}
\ No newline at end of file
+} // lua
+} // jin
\ No newline at end of file