Merge branch 'master' into nnyh

.gitignore

@@ -66,3 +66,6 @@ bin/configs
 .gitignore
 .DS_Store
 /.idea/
+*.mdb
+*.lock
+*.mdb-lock

.luacheckrc

@@ -6,7 +6,7 @@ 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"
+        "codec", "crypt", "stdfs", "luabus", "luakit", "json", "protobuf", "curl", "timer", "aoi", "log", "worker", "http", "bson", "detour", "lmdb"
     }
 }
 std = "max+quanta"

Makefile

@@ -31,6 +31,7 @@ luaext:
 	cd extend/lcurl; make SOLUTION_DIR=$(CUR_DIR) -f lcurl.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/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;

bin/template/monitor.conf

@@ -21,6 +21,9 @@ set_env("QUANTA_SERVICE", "monitor")
 --服务模式
 set_env("QUANTA_MODE", "3")
 
+--监控开关
+set_env("QUANTA_MONITOR", "0")
+
 --DB连接池大小
 set_env("QUANTA_DB_POOL_COUNT", "{{%= QUANTA_DB_POOL_COUNT or 2 %}}")
 

bin/template/share.conf

@@ -103,6 +103,8 @@ set_env("QUANTA_HOTFIX", "{{%= QUANTA_HOTFIX or 1 %}}")
 set_env("QUANTA_GM_SERVER", "{{%= QUANTA_GM_SERVER or 1 %}}")
 --客户端GM开关
 set_env("QUANTA_GM_CLIENT", "{{%= QUANTA_GM_CLIENT or 1 %}}")
+--监控开关
+set_env("QUANTA_MONITOR", "{{%= QUANTA_MONITOR or 1 %}}")
 
 
 --webhook日志等级
@@ -131,6 +133,8 @@ set_env("QUANTA_LARK_URL", "{{%= QUANTA_LARK_URL %}}")
 set_env("QUANTA_SANDBOX", "sandbox")
 --定义协议文件路径，多个路径使用";"隔开
 set_env("QUANTA_PROTO_PATH", "./proto/")
+--定义LMDB路径
+set_env("QUANTA_LMDB_PATH", "./lmdb/")
 
 --定义lua代码查询路径/扩展库查询路径
 if platform == "windows" then

core/luabus/src/luabus.cpp

@@ -39,6 +39,7 @@ namespace luabus {
 
         lluabus.set_function("udp", create_udp);
         lluabus.set_function("tcp", create_tcp);
+        lluabus.set_function("host", gethostip);
         lluabus.set_function("dns", gethostbydomain);
         lluabus.set_function("create_socket_mgr", create_socket_mgr);
         lluabus.new_enum("eproto_type",

core/luabus/src/socket_dns.h

@@ -1,9 +1,32 @@
 #pragma once
+#include "socket_helper.h"
 
 #ifndef WIN32
 #include <netdb.h>
 #endif
 
+inline int gethostip(lua_State* L) {
+    int sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
+    struct sockaddr_in remote_addr;
+    struct sockaddr_in local_addr;
+    remote_addr.sin_family = AF_INET;
+    remote_addr.sin_port = htons(53);
+    remote_addr.sin_addr.s_addr = inet_addr("1.1.1.1");
+    if (connect(sock_fd, (struct sockaddr*)&remote_addr, sizeof(struct sockaddr_in)) != 0) {
+        closesocket(sock_fd);
+        return 0;
+    }
+    socklen_t len = sizeof(struct sockaddr_in);
+    getsockname(sock_fd, (struct sockaddr*)&local_addr, &len);
+    char* local_ip = inet_ntoa(local_addr.sin_addr);
+    closesocket(sock_fd);
+    if (local_ip) {
+        lua_pushstring(L, local_ip);
+        return 1;
+    }
+    return 0;
+}
+
 inline int gethostbydomain(lua_State* L, std::string domain) {
     struct addrinfo hints;
     memset(&hints, 0, sizeof(struct addrinfo));

core/quanta/src/quanta.cpp

@@ -81,13 +81,6 @@ const char* quanta_app::get_env(const char* key) {
 int quanta_app::set_env(lua_State* L) {
     const char* key = lua_tostring(L, 1);
     const char* value = lua_tostring(L, 2);
-    if (getenv(key)){
-        int overwrite = luaL_optinteger(L, 3, 0);
-        if (overwrite || m_environs.find(key) != m_environs.end()) {
-            setenv(key, value, 1);
-        }
-        return 0;
-    }
     m_environs[key] = value;
     setenv(key, value, 1);
     return 0;
@@ -153,6 +146,7 @@ void quanta_app::run() {
     quanta.set_function("default_signal", [](int n) { signal(n, SIG_DFL); });
     quanta.set_function("register_signal", [](int n) { signal(n, on_signal); });
     quanta.set_function("getenv", [&](const char* key) { return get_env(key); });
+    quanta.set_function("setenv", [&](lua_State* L) { return set_env(L); });
 
     const char* env_log_path = get_env("QUANTA_LOG_PATH");
     if (env_log_path) {

extend/laoi/src/aoi.h

@@ -36,7 +36,7 @@ namespace laoi {
             grid_x = x;
             grid_z = z;
         }
-        aoi_obj(uint64_t id, aoi_type typ) : eid(id), type(typ) {}
+        aoi_obj(uint64_t id, aoi_type typ) : type(typ), eid(id){}
     };
     #pragma pack()
 

extend/ljson/src/ljson.h

@@ -154,10 +154,11 @@ namespace ljson {
         }
 
         yyjson_mut_val* array_encode(lua_State* L, yyjson_mut_doc* doc, bool emy_as_arr, int index, int depth) {
-            lua_pushnil(L);
+            int asize = lua_rawlen(L, index);
             yyjson_mut_val* array = yyjson_mut_arr(doc);
             if (!array) throw invalid_argument("json encode memory not enough!");
-            while (lua_next(L, index) != 0) {
+            for (int i = 1; i <= asize; ++i){
+                lua_geti(L, index, i);
                 auto value = encode_one(L, doc, emy_as_arr, -1, depth);
                 if (!value) throw invalid_argument("json encode memory not enough!");
                 yyjson_mut_arr_append(array, value);

extend/lmdb/lmdb.lmak

@@ -0,0 +1,38 @@
+--工程名字
+PROJECT_NAME = "lmdb"
+
+--目标名字
+TARGET_NAME = "lmdb"
+
+----工程类型: static/dynamic/exe
+PROJECT_TYPE = "dynamic"
+
+EX_FLAGS = {
+    "Wno-implicit-fallthrough"
+}
+
+--需要的include目录
+INCLUDES = {
+    "../lua/lua",
+    "../luakit/include"
+}
+
+MIMALLOC = false
+
+--需要连接的库文件
+LIBS = {
+    "lua"
+}
+
+--WINDOWS需要定义的选项
+WINDOWS_DEFINES = {
+    "LUA_BUILD_AS_DLL"
+}
+
+--依赖项目
+DEPS = {
+    "lualib"
+}
+
+--分组定义
+GROUP = "luaext"

extend/lmdb/lmdb.mak

@@ -0,0 +1,130 @@
+#工程名字
+PROJECT_NAME = lmdb
+
+#目标名字
+TARGET_NAME = lmdb
+
+#系统环境
+UNAME_S = $(shell uname -s)
+
+#伪目标
+.PHONY: clean all target pre_build post_build
+all : pre_build target post_build
+
+#CFLAG
+MYCFLAGS =
+
+#需要定义的FLAG
+MYCFLAGS += -Wsign-compare
+MYCFLAGS += -Wno-sign-compare
+MYCFLAGS += -Wno-unused-variable
+MYCFLAGS += -Wno-unused-parameter
+MYCFLAGS += -Wno-unused-but-set-variable
+MYCFLAGS += -Wno-unused-but-set-parameter
+MYCFLAGS += -Wno-unknown-pragmas
+MYCFLAGS += -Wno-implicit-fallthrough
+
+#c标准库版本
+#gnu99/gnu11/gnu17
+STDC = -std=gnu99
+
+#c++标准库版本
+#c++11/c++14/c++17/c++20
+STDCPP = -std=c++17
+
+#需要的include目录
+MYCFLAGS += -I../lua/lua
+MYCFLAGS += -I../luakit/include
+
+#需要定义的选项
+
+#LDFLAGS
+LDFLAGS =
+
+
+#源文件路径
+SRC_DIR = src
+
+#需要排除的源文件,目录基于$(SRC_DIR)
+EXCLUDE =
+
+#需要连接的库文件
+LIBS =
+#自定义库
+LIBS += -llua
+#系统库
+LIBS += -lm -ldl -lstdc++ -lpthread
+
+#定义基础的编译选项
+ifndef CC
+CC = gcc
+endif
+ifndef CX
+CX = c++
+endif
+CFLAGS = -g -O2 -Wall -Wno-deprecated -Wextra $(STDC) $(MYCFLAGS)
+CXXFLAGS = -g -O2 -Wall -Wno-deprecated -Wextra $(STDCPP) $(MYCFLAGS)
+
+#项目目录
+ifndef SOLUTION_DIR
+SOLUTION_DIR=./
+endif
+
+#临时文件目录
+INT_DIR = $(SOLUTION_DIR)temp/$(PROJECT_NAME)
+
+#目标文件前缀，定义则.so和.a加lib前缀，否则不加
+PROJECT_PREFIX =
+
+#目标定义
+MYCFLAGS += -fPIC
+TARGET_DIR = $(SOLUTION_DIR)bin
+TARGET_DYNAMIC =  $(TARGET_DIR)/$(PROJECT_PREFIX)$(TARGET_NAME).so
+#soname
+ifeq ($(UNAME_S), Linux)
+LDFLAGS += -Wl,-soname,$(PROJECT_PREFIX)$(TARGET_NAME).so
+endif
+#install_name
+ifeq ($(UNAME_S), Darwin)
+LDFLAGS += -Wl,-install_name,$(PROJECT_PREFIX)$(TARGET_NAME).so
+endif
+
+#link添加.so目录
+LDFLAGS += -L$(SOLUTION_DIR)bin
+LDFLAGS += -L$(SOLUTION_DIR)library
+
+#自动生成目标
+OBJS =
+#根目录
+OBJS += $(patsubst $(SRC_DIR)/%.c, $(INT_DIR)/%.o, $(filter-out $(EXCLUDE), $(wildcard $(SRC_DIR)/*.c)))
+OBJS += $(patsubst $(SRC_DIR)/%.m, $(INT_DIR)/%.o, $(filter-out $(EXCLUDE), $(wildcard $(SRC_DIR)/*.m)))
+OBJS += $(patsubst $(SRC_DIR)/%.cc, $(INT_DIR)/%.o, $(filter-out $(EXCLUDE), $(wildcard $(SRC_DIR)/*.cc)))
+OBJS += $(patsubst $(SRC_DIR)/%.cpp, $(INT_DIR)/%.o, $(filter-out $(EXCLUDE), $(wildcard $(SRC_DIR)/*.cpp)))
+
+# 编译所有源文件
+$(INT_DIR)/%.o : $(SRC_DIR)/%.c
+	$(CC) $(CFLAGS) -c $< -o $@
+$(INT_DIR)/%.o : $(SRC_DIR)/%.m
+	$(CC) $(CFLAGS) -c $< -o $@
+$(INT_DIR)/%.o : $(SRC_DIR)/%.cc
+	$(CX) $(CXXFLAGS) -c $< -o $@
+$(INT_DIR)/%.o : $(SRC_DIR)/%.cpp
+	$(CX) $(CXXFLAGS) -c $< -o $@
+
+$(TARGET_DYNAMIC) : $(OBJS)
+	$(CC) -o $@ -shared $(OBJS) $(LDFLAGS) $(LIBS)
+
+#target伪目标
+target : $(TARGET_DYNAMIC)
+
+#clean伪目标
+clean :
+	rm -rf $(INT_DIR)
+
+#预编译
+pre_build:
+	mkdir -p $(INT_DIR)
+	mkdir -p $(TARGET_DIR)
+
+#后编译
+post_build:

extend/lmdb/lmdb.vcxproj

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Develop|x64">
+      <Configuration>Develop</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\llmdb.h" />
+    <ClInclude Include="src\lmdb.h" />
+    <ClInclude Include="src\midl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\llmdb.cpp" />
+    <ClCompile Include="src\mdb.c" />
+    <ClCompile Include="src\midl.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{23753351-8C67-4966-7E36-7F900FE18D1B}</ProjectGuid>
+    <RootNamespace>lmdb</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>lmdb</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">
+    <TargetName>lmdb</TargetName>
+    <OutDir>$(SolutionDir)temp\bin\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)temp\$(ProjectName)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\lua\lua;..\luakit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader></PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)library\$(Platform);;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>$(SolutionDir)library\$(Platform)\$(TargetName).lib</ImportLibrary>
+      <ProgramDatabaseFile>$(SolutionDir)temp\$(ProjectName)\$(Platform)\$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalDependencies>lua.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ForceFileOutput>
+      </ForceFileOutput>
+    </Link>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>copy /y $(TargetPath) $(SolutionDir)bin</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>