增加便利性 Lua API

muyuanjin · muyuanjin · commit bb563e306ad4 · 2025-03-26T12:29:30.000+08:00
日志正确显示 LuaDB 存储数量
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,6 +62,7 @@ jobs:
           tag_name: release-${{ steps.date.outputs.formattedDate }}
           files: kcd2db-${{ steps.date.outputs.formattedDate }}.zip
           make_latest: true
+          generate_release_notes: true
           body: |
             ## Installation
 
diff --git a/src/db/Database.cpp b/src/db/Database.cpp
@@ -162,8 +162,15 @@ void Database::OnSaveGame(ISaveGame* pSaveGame)
         std::lock_guard lock(m_mutex);
         if (!m_saveCache.empty())
         {
-            BatchOperation(*m_db, m_saveCache, newSave);
-            LogInfo("Data saved: %d entries", m_saveCache.size());
+            if (const int successCount = BatchOperation(*m_db, m_saveCache, newSave);
+                successCount == m_saveCache.size())
+            {
+                LogInfo("Data saved: %d entries", m_saveCache.size());
+            }
+            else
+            {
+                LogError("Save data error: %d/%d entries saved", successCount, m_saveCache.size());
+            }
         }
     }
     catch (const std::exception& e)
@@ -181,9 +188,12 @@ void Database::OnPostUpdate(float /*fDeltaTime*/)
     std::lock_guard lock(m_mutex);
     if (!m_globalDirty) return;
     if (const auto now = steady_clock::now(); now - m_lastSaveTime < SAVE_INTERVAL) return;
+
+    int successCount = 0;
+
     try
     {
-        ExecuteTransaction([this](SQLite::Database& db)
+        ExecuteTransaction([this, &successCount](const SQLite::Database& db)
         {
             SQLite::Statement clearStmt(db, "DELETE FROM Store WHERE savefile = ''");
             clearStmt.exec();
@@ -201,12 +211,20 @@ void Database::OnPostUpdate(float /*fDeltaTime*/)
                     stmt.bind(3, *val);
                     stmt.exec();
                     stmt.reset();
+                    successCount++;
                 }
             }
         });
         m_globalDirty = false;
         m_lastSaveTime = steady_clock::now();
-        LogInfo("Global data saved: %d entries", m_globalCache.size());
+        if (successCount == m_globalCache.size())
+        {
+            LogInfo("Global data saved: %d entries", m_globalCache.size());
+        }
+        else
+        {
+            LogError("Global save failed: %d/%d entries saved", successCount, m_globalCache.size());
+        }
     }
     catch (const std::exception& e)
     {
@@ -221,7 +239,7 @@ void Database::ExecuteTransaction(const std::function<void(SQLite::Database&)>&
     transaction.commit();
 }
 
-void Database::BatchOperation(SQLite::Database& db, const Cache& cache, const std::string& savefile)
+int Database::BatchOperation(SQLite::Database& db, const Cache& cache, const std::string& savefile)
 {
     static constexpr auto UPSERT_SQL = R"sql(
         INSERT INTO Store (key, savefile, type, value, updated_at)
@@ -235,6 +253,8 @@ void Database::BatchOperation(SQLite::Database& db, const Cache& cache, const st
     SQLite::Statement stmt(db, UPSERT_SQL);
     SQLite::Transaction transaction(db);
 
+    int count = 0;
+
     for (const auto& [k, v] : cache)
     {
         if (auto val = SerializeAnyValue(v))
@@ -246,8 +266,10 @@ void Database::BatchOperation(SQLite::Database& db, const Cache& cache, const st
             stmt.exec();
             stmt.reset();
         }
+        count++;
     }
     transaction.commit();
+    return count;
 }
 
 std::optional<ScriptAnyValue> Database::ParseAnyValue(const int type, const std::string& value)
@@ -341,7 +363,7 @@ int Database::Dump(IFunctionHandler* pH)
 
     dumpCache(m_globalCache, "[Global Data]");
     std::ostringstream oss;
-    oss << "[Save Data For : " << (m_currentSaveGame.empty() ? "No active save file" : m_currentSaveGame) <<"]";
+    oss << "[Save Data For : " << (m_currentSaveGame.empty() ? "No active save file" : m_currentSaveGame) << "]";
     dumpCache(m_saveCache, oss.str());
     return pH->EndFunction();
 }
diff --git a/src/db/Database.h b/src/db/Database.h
@@ -50,7 +50,7 @@ class Database final : public CScriptableBase, public IGameFrameworkListener {
         bool& changedFlag;
     };
 
-    static void BatchOperation(SQLite::Database& db, const Cache& cache, const std::string& savefile);
+    static int BatchOperation(SQLite::Database& db, const Cache& cache, const std::string& savefile);
 
     int GenericAccess(IFunctionHandler* pH, AccessType action, bool isGlobal = false);
     void SyncCacheWithDatabase();
diff --git a/src/kcd2db.cpp b/src/kcd2db.cpp
@@ -10,6 +10,8 @@
 #include "kcd2/env.h"
 #include "kcd2/IConsole.h"
 #include "log/log.h"
+#include "lua/db.h"
+
 
 std::optional<uintptr_t> find_env_addr()
 {
@@ -56,14 +58,19 @@ void start()
             return;
         }
         LogDebug("Found environment address: 0x%llX", *env_addr);
+
         auto* env_ptr = reinterpret_cast<SSystemGlobalEnvironment*>(env_addr.value());
         while (env_ptr->pGame == nullptr)
         {
             Sleep(1000);
         }
         LogDebug("Game Started");
+
         gEnv = *env_ptr;
         const auto db = new Database(env_ptr);
+
+        env_ptr->pScriptSystem->ExecuteBuffer(db_lua, strlen(db_lua), "db.lua");
+
         LogInfo("Database initialized...%s", db->getName());
     }
     else
diff --git a/src/lua/db.h b/src/lua/db.h
@@ -0,0 +1,109 @@
+//
+// Created by muyuanjin on 2025/3/26.
+//
+
+#ifndef DB_H
+#define DB_H
+
+inline auto db_lua = R"lua(
+_G.DB = _G.DB or (function()
+    -- 检查 json 是否可用
+    local _json_available = false
+
+    local json_available = function()
+        if _json_available == false then
+            _json_available = type(json) == "table" and type(json.encode) == "function" and type(json.decode) == "function"
+        end
+        return _json_available
+    end
+
+    local function encode_value(value)
+        if json_available() then
+            return json.encode(value)
+        end
+        return value
+    end
+
+    local function decode_value(value)
+        if json_available() and type(value) == "string" then
+            local success, result = pcall(json.decode, value)
+            if success then
+                return result
+            end
+        end
+        return value
+    end
+
+    -- 主模块表
+    local M = {}
+
+    -- 创建带命名空间的 DB 实例
+    function M.Create(namespace)
+        assert(type(namespace) == "string" and #namespace > 0,
+               "Namespace must be a non-empty string")
+
+        -- 确保命名空间以冒号结尾，作为分隔符
+        if not namespace:match(":$") then
+            namespace = namespace .. ":"
+        end
+
+        local instance = {}
+
+        -- 内部方法：添加命名空间前缀
+        local function prefix_key(key)
+            if type(key) ~= "string" then
+                key = encode_value(key)
+            end
+            return namespace .. key
+        end
+
+
+        -- 存档关联API
+
+        function instance.Set(key, value)
+            return LuaDB.Set(prefix_key(key), encode_value(value))
+        end
+
+        function instance.Get(key)
+            return decode_value(LuaDB.Get(prefix_key(key)))
+        end
+
+        function instance.Del(key)
+            return LuaDB.Del(prefix_key(key))
+        end
+
+        function instance.Exi(key)
+            return LuaDB.Exi(prefix_key(key))
+        end
+
+        -- 全局API（跨存档）
+
+        function instance.SetG(key, value)
+            return LuaDB.SetG(prefix_key(key), encode_value(value))
+        end
+
+        function instance.GetG(key)
+            return decode_value(LuaDB.GetG(prefix_key(key)))
+        end
+
+        function instance.DelG(key)
+            return LuaDB.DelG(prefix_key(key))
+        end
+
+        function instance.ExiG(key)
+            return LuaDB.ExiG(prefix_key(key))
+        end
+
+        -- 调试命令，在实现特定前缀查询前原样转发
+        function instance.Dump()
+            return LuaDB.Dump()
+        end
+
+        return instance
+    end
+
+    return M
+end)()
+)lua";
+
+#endif //DB_H

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,15 @@ void Database::OnSaveGame(ISaveGame* pSaveGame)`
`162`	`162`	`std::lock_guard lock(m_mutex);`
`163`	`163`	`if (!m_saveCache.empty())`
`164`	`164`	`{`
`165`		`- BatchOperation(*m_db, m_saveCache, newSave);`
`166`		`- LogInfo("Data saved: %d entries", m_saveCache.size());`
	`165`	`+ if (const int successCount = BatchOperation(*m_db, m_saveCache, newSave);`
	`166`	`+ successCount == m_saveCache.size())`
	`167`	`+ {`
	`168`	`+ LogInfo("Data saved: %d entries", m_saveCache.size());`
	`169`	`+ }`
	`170`	`+ else`
	`171`	`+ {`
	`172`	`+ LogError("Save data error: %d/%d entries saved", successCount, m_saveCache.size());`
	`173`	`+ }`
`167`	`174`	`}`
`168`	`175`	`}`
`169`	`176`	`catch (const std::exception& e)`
`@@ -181,9 +188,12 @@ void Database::OnPostUpdate(float /fDeltaTime/)`
`181`	`188`	`std::lock_guard lock(m_mutex);`
`182`	`189`	`if (!m_globalDirty) return;`
`183`	`190`	`if (const auto now = steady_clock::now(); now - m_lastSaveTime < SAVE_INTERVAL) return;`
	`191`	`+`
	`192`	`+ int successCount = 0;`
	`193`	`+`
`184`	`194`	`try`
`185`	`195`	`{`
`186`		`- ExecuteTransaction([this](SQLite::Database& db)`
	`196`	`+ ExecuteTransaction([this, &successCount](const SQLite::Database& db)`
`187`	`197`	`{`
`188`	`198`	`SQLite::Statement clearStmt(db, "DELETE FROM Store WHERE savefile = ''");`
`189`	`199`	`clearStmt.exec();`
`@@ -201,12 +211,20 @@ void Database::OnPostUpdate(float /fDeltaTime/)`
`201`	`211`	`stmt.bind(3, *val);`
`202`	`212`	`stmt.exec();`
`203`	`213`	`stmt.reset();`
	`214`	`+ successCount++;`
`204`	`215`	`}`
`205`	`216`	`}`
`206`	`217`	`});`
`207`	`218`	`m_globalDirty = false;`
`208`	`219`	`m_lastSaveTime = steady_clock::now();`
`209`		`- LogInfo("Global data saved: %d entries", m_globalCache.size());`
	`220`	`+ if (successCount == m_globalCache.size())`
	`221`	`+ {`
	`222`	`+ LogInfo("Global data saved: %d entries", m_globalCache.size());`
	`223`	`+ }`
	`224`	`+ else`
	`225`	`+ {`
	`226`	`+ LogError("Global save failed: %d/%d entries saved", successCount, m_globalCache.size());`
	`227`	`+ }`
`210`	`228`	`}`
`211`	`229`	`catch (const std::exception& e)`
`212`	`230`	`{`
`@@ -221,7 +239,7 @@ void Database::ExecuteTransaction(const std::function<void(SQLite::Database&)>&`
`221`	`239`	`transaction.commit();`
`222`	`240`	`}`
`223`	`241`
`224`		`-void Database::BatchOperation(SQLite::Database& db, const Cache& cache, const std::string& savefile)`
	`242`	`+int Database::BatchOperation(SQLite::Database& db, const Cache& cache, const std::string& savefile)`
`225`	`243`	`{`
`226`	`244`	`static constexpr auto UPSERT_SQL = R"sql(`
`227`	`245`	`INSERT INTO Store (key, savefile, type, value, updated_at)`
`@@ -235,6 +253,8 @@ void Database::BatchOperation(SQLite::Database& db, const Cache& cache, const st`
`235`	`253`	`SQLite::Statement stmt(db, UPSERT_SQL);`
`236`	`254`	`SQLite::Transaction transaction(db);`
`237`	`255`
	`256`	`+ int count = 0;`
	`257`	`+`
`238`	`258`	`for (const auto& [k, v] : cache)`
`239`	`259`	`{`
`240`	`260`	`if (auto val = SerializeAnyValue(v))`
`@@ -246,8 +266,10 @@ void Database::BatchOperation(SQLite::Database& db, const Cache& cache, const st`
`246`	`266`	`stmt.exec();`
`247`	`267`	`stmt.reset();`
`248`	`268`	`}`
	`269`	`+ count++;`
`249`	`270`	`}`
`250`	`271`	`transaction.commit();`
	`272`	`+ return count;`
`251`	`273`	`}`
`252`	`274`
`253`	`275`	`std::optional<ScriptAnyValue> Database::ParseAnyValue(const int type, const std::string& value)`
`@@ -341,7 +363,7 @@ int Database::Dump(IFunctionHandler* pH)`
`341`	`363`
`342`	`364`	`dumpCache(m_globalCache, "[Global Data]");`
`343`	`365`	`std::ostringstream oss;`
`344`		`- oss << "[Save Data For : " << (m_currentSaveGame.empty() ? "No active save file" : m_currentSaveGame) <<"]";`
	`366`	`+ oss << "[Save Data For : " << (m_currentSaveGame.empty() ? "No active save file" : m_currentSaveGame) << "]";`
`345`	`367`	`dumpCache(m_saveCache, oss.str());`
`346`	`368`	`return pH->EndFunction();`
`347`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`#include "kcd2/env.h"`
`11`	`11`	`#include "kcd2/IConsole.h"`
`12`	`12`	`#include "log/log.h"`
	`13`	`+#include "lua/db.h"`
	`14`	`+`
`13`	`15`
`14`	`16`	`std::optional<uintptr_t> find_env_addr()`
`15`	`17`	`{`
`@@ -56,14 +58,19 @@ void start()`
`56`	`58`	`return;`
`57`	`59`	`}`
`58`	`60`	`LogDebug("Found environment address: 0x%llX", *env_addr);`
	`61`	`+`
`59`	`62`	`auto* env_ptr = reinterpret_cast<SSystemGlobalEnvironment*>(env_addr.value());`
`60`	`63`	`while (env_ptr->pGame == nullptr)`
`61`	`64`	`{`
`62`	`65`	`Sleep(1000);`
`63`	`66`	`}`
`64`	`67`	`LogDebug("Game Started");`
	`68`	`+`
`65`	`69`	`gEnv = *env_ptr;`
`66`	`70`	`const auto db = new Database(env_ptr);`
	`71`	`+`
	`72`	`+ env_ptr->pScriptSystem->ExecuteBuffer(db_lua, strlen(db_lua), "db.lua");`
	`73`	`+`
`67`	`74`	`LogInfo("Database initialized...%s", db->getName());`
`68`	`75`	`}`
`69`	`76`	`else`