合并主干代码

.luacheckrc

@@ -6,8 +6,8 @@ stds.quanta = {
         "quanta", "environ", "signal", "service", "logger",
         "import", "class", "enum", "mixin", "property", "singleton", "super", "implemented",
         "logfeature", "db_property", "classof", "is_class", "is_subclass", "instanceof", "conv_class", "class_review",
-        "codec", "crypt", "stdfs", "luabus", "luakit", "json", "protobuf", "curl", "timer", "aoi", "log", "worker", "http", "bson", "detour",
-        "lmdb", "unqlite", "sqlite"
+        "codec", "stdfs", "luabus", "luakit", "json", "protobuf", "timer", "aoi", "log", "worker", "http", "bson",
+        "detour", "lmdb", "unqlite", "sqlite", "ssl"
     }
 }
 std = "max+quanta"

Makefile

@@ -27,11 +27,11 @@ luaext:
 	cd extend/laoi; make SOLUTION_DIR=$(CUR_DIR) -f laoi.mak;
 	cd extend/lbson; make SOLUTION_DIR=$(CUR_DIR) -f lbson.mak;
 	cd extend/lcodec; make SOLUTION_DIR=$(CUR_DIR) -f lcodec.mak;
-	cd extend/lcrypt; make SOLUTION_DIR=$(CUR_DIR) -f lcrypt.mak;
 	cd extend/ldetour; make SOLUTION_DIR=$(CUR_DIR) -f ldetour.mak;
 	cd extend/ljson; make SOLUTION_DIR=$(CUR_DIR) -f ljson.mak;
 	cd extend/lmdb; make SOLUTION_DIR=$(CUR_DIR) -f lmdb.mak;
 	cd extend/lsqlite; make SOLUTION_DIR=$(CUR_DIR) -f lsqlite.mak;
+	cd extend/lssl; make SOLUTION_DIR=$(CUR_DIR) -f lssl.mak;
 	cd extend/lstdfs; make SOLUTION_DIR=$(CUR_DIR) -f lstdfs.mak;
 	cd extend/ltimer; make SOLUTION_DIR=$(CUR_DIR) -f ltimer.mak;
 	cd extend/lualog; make SOLUTION_DIR=$(CUR_DIR) -f lualog.mak;

core/luabus/src/lua_socket_node.cpp

@@ -42,7 +42,7 @@ int lua_socket_node::call_data(lua_State* L) {
     if (m_codec) {
         size_t data_len = 0;
         char* data = (char*)m_codec->encode(L, 1, &data_len);
-        if (data_len <= SOCKET_PACKET_MAX){
+        if (data_len > 0 && data_len <= SOCKET_PACKET_MAX){
             m_mgr->send(m_token, data, data_len);
             lua_pushinteger(L, data_len);
             return 1;

core/luabus/src/socket_stream.cpp

@@ -236,7 +236,7 @@ void socket_stream::stream_send(const char* data, size_t data_len)
         while (data_len > 0) {
             int send_len = ::send(m_socket, data, (int)data_len, 0);
             if (send_len == 0) {
-                on_error("connection-lost");
+                on_error("connection-send-lost");
                 return;
             }
             if (send_len == SOCKET_ERROR) {
@@ -369,7 +369,7 @@ void socket_stream::do_send(size_t max_len, bool is_eof) {
             return;
         }
         if (send_len == 0) {
-            on_error("connection-lost");
+            on_error("connection-send-lost");
             return;
         }
         total_send += send_len;
@@ -380,8 +380,7 @@ void socket_stream::do_send(size_t max_len, bool is_eof) {
     }
 }
 
-void socket_stream::do_recv(size_t max_len, bool is_eof)
-{
+void socket_stream::do_recv(size_t max_len, bool is_eof) {
     size_t total_recv = 0;
     while (total_recv < max_len && m_link_status == elink_status::link_connected) {
         auto* space = m_recv_buffer->peek_space(SOCKET_RECV_LEN);
@@ -412,7 +411,7 @@ void socket_stream::do_recv(size_t max_len, bool is_eof)
             return;
         }
         if (recv_len == 0) {
-            on_error("connection-lost");
+            on_error("connection-recv-lost");
             return;
         }
         total_recv += recv_len;

core/quanta/src/mainlib.cpp

@@ -6,13 +6,13 @@
 extern "C" {
 #endif
 
+int luaopen_lssl(lua_State* L);
 int luaopen_lbson(lua_State* L);
 int luaopen_ljson(lua_State* L);
 int luaopen_luapb(lua_State* L);
 int luaopen_lualog(lua_State* L);
 int luaopen_luabus(lua_State* L);
 int luaopen_lcodec(lua_State* L);
-int luaopen_lcrypt(lua_State* L);
 int luaopen_lstdfs(lua_State* L);
 int luaopen_ltimer(lua_State* L);
 int luaopen_lsqlite(lua_State* L);
@@ -29,13 +29,13 @@ int luaopen_lworker(lua_State* L);
 #define QUANTA_ARGS_NUM 2
 
 static void luaL_open_worldlibs(lua_State* L) {
+    luaopen_lssl(L);
     luaopen_lbson(L);
     luaopen_ljson(L);
     luaopen_luapb(L);
     luaopen_lualog(L);
     luaopen_luabus(L);
     luaopen_lcodec(L);
-    luaopen_lcrypt(L);
     luaopen_lstdfs(L);
     luaopen_ltimer(L);
     luaopen_lsqlite(L);

extend/lcodec/src/http.h

@@ -285,6 +285,8 @@ namespace lcodec {
             if (parts.size() < 2) {
                 throw lua_exception("invalid http header");
             }
+            //proto
+            lua_pushstring(L, "HTTP");
             //status
             string status = string(parts[1]);
             if (lua_stringtonumber(L, status.c_str()) == 0) {