Demo分析自动化增强

Author: Co1Swet

bin/MulNX/CS2Injector/CS2Injector.exe

@@ -47,7 +47,7 @@ Size=663,340
 Collapsed=0
 
 [Window][Demo辅助]
-Pos=464,428
+Pos=183,736
 Size=736,716
 Collapsed=0
 DockId=0x00000004,2
@@ -86,7 +86,7 @@ Collapsed=0
 DockId=0x00000002,0
 
 [Window][Demo]
-Pos=464,428
+Pos=183,736
 Size=736,716
 Collapsed=0
 DockId=0x00000004,0
@@ -196,7 +196,7 @@ Collapsed=0
 DockId=0x00000004,1
 
 [Window][Demo Recorder]
-Pos=1202,428
+Pos=921,736
 Size=640,521
 Collapsed=0
 DockId=0x00000008,0
@@ -207,13 +207,13 @@ Size=358,674
 Collapsed=0
 
 [Window][录制任务创建]
-Pos=464,428
+Pos=183,736
 Size=736,716
 Collapsed=0
 DockId=0x00000004,1
 
 [Window][录制参数调节]
-Pos=1202,951
+Pos=921,1259
 Size=640,193
 Collapsed=0
 DockId=0x00000009,0
@@ -273,7 +273,7 @@ DockId=0x0000000C,0
 
 [Window][时间轴]
 Pos=0,0
-Size=1920,37
+Size=1920,57
 Collapsed=0
 DockId=0x00000001,0
 
@@ -283,16 +283,16 @@ Size=530,226
 Collapsed=0
 
 [Docking][Data]
-DockNode      ID=0x00000003 Pos=464,428 Size=1378,716 Split=X Selected=0x448D10F7
+DockNode      ID=0x00000003 Pos=183,736 Size=1378,716 Split=X Selected=0x448D10F7
   DockNode    ID=0x00000004 Parent=0x00000003 SizeRef=838,992 Selected=0xE555D201
   DockNode    ID=0x00000007 Parent=0x00000003 SizeRef=729,992 Split=Y Selected=0x8538678F
     DockNode  ID=0x00000008 Parent=0x00000007 SizeRef=729,644 Selected=0x3C0020BC
     DockNode  ID=0x00000009 Parent=0x00000007 SizeRef=729,238 Selected=0x8538678F
 DockNode      ID=0x0000000A Pos=820,750 Size=685,394 Split=X
   DockNode    ID=0x0000000B Parent=0x0000000A SizeRef=1042,407 Selected=0x2D59FDA6
   DockNode    ID=0x0000000C Parent=0x0000000A SizeRef=606,407 Selected=0x4DB1B67D
-DockNode      ID=0x0000000D Pos=1458,620 Size=433,378 Selected=0xC12FA4B6
+DockNode      ID=0x0000000D Pos=1458,620 Size=433,378 Selected=0x7773E0DE
 DockSpace     ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1920,1080 Split=Y Selected=0xC52A91C6
-  DockNode    ID=0x00000001 Parent=0x633F05CB SizeRef=1920,37 Selected=0x38DB91B6
-  DockNode    ID=0x00000002 Parent=0x633F05CB SizeRef=1920,1041 CentralNode=1
+  DockNode    ID=0x00000001 Parent=0x633F05CB SizeRef=1920,57 Selected=0x38DB91B6
+  DockNode    ID=0x00000002 Parent=0x633F05CB SizeRef=1920,1021 CentralNode=1
 

bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll

@@ -19,73 +19,96 @@ bool DemoAnalyzer::Init() {
 void DemoAnalyzer::ProcessMsg(MulNX::Message& msg) {
     switch (msg.type) {
     case "Demo/Analyze"_hash: {
-        std::string demoPath = msg.asp.get<MulNX::NetExt>()->str1;
-        this->LogInfo("Received demo path: " + demoPath);
-        this->AnalyzeDemoWithCSDA(std::move(demoPath)).resume();
+        std::string str = msg.asp.get<MulNX::NetExt>()->str1;
+        std::filesystem::path demoPath(str);
+        // 确保为绝对路径（正常情况下已经是）
+        if (!demoPath.is_absolute()) {
+            this->LogWarning("收到非绝对路径: " + str);
+            demoPath = std::filesystem::absolute(demoPath);
+        }
+        this->LogInfo("Received demo path: " + demoPath.string());
+        this->HandleAnalyzeRequest(std::move(demoPath));
         break;
     }
     default:
         break;
     }
 }
 
-MulNX::CoTask DemoAnalyzer::AnalyzeDemoWithCSDA(std::filesystem::path&& pthDemo) {
-    // ---------- 调用 csda.exe ----------
-    // 1. 构建命令行字符串，注意路径带引号，以防空格
-    std::ostringstream cmdLine;
-    cmdLine << "\"" << this->csdaPath.string() << "\" "
-        << "-demo-path=" << pthDemo << " "
-        << "-output=\"" << this->dirData.string() << "\" "
-        << "-format=json";   // 可根据需要加 -positions 等
-
-    std::string cmdStr = cmdLine.str();
-    this->LogInfo("Executing: " + cmdStr);
-
-    // 准备 STARTUPINFO 和 PROCESS_INFORMATION
-    STARTUPINFOW si;
-    PROCESS_INFORMATION pi;
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
-    ZeroMemory(&pi, sizeof(pi));
-
-    // 注意：需要将 cmdStr 复制到可修改的缓冲区，因为 CreateProcess 可能会修改它
+void DemoAnalyzer::HandleAnalyzeRequest(std::filesystem::path demoPath) {
+    std::string stem = demoPath.stem().string();
+    std::filesystem::path jsonPath = this->dirData / (stem + ".json");
+
+    // 1. JSON 已存在 → 直接发送加载消息
+    if (std::filesystem::exists(jsonPath)) {
+        this->LogInfo("分析结果已存在，直接加载: " + demoPath.string());
+        auto [msg, rp] = MulNX::Message::Create<MulNX::NetExt>("Demo/JSON/Load"_hash);
+        rp->str1 = stem;
+        this->PublishAsync(std::move(msg));
+        return;
+    }
+
+    // 2. 检查是否正在分析
+    {
+        std::unique_lock lock(this->smutex);
+        if (this->analyzingSet.find(demoPath) != this->analyzingSet.end()) {
+            this->LogWarning("该 Demo 正在分析中: " + demoPath.string());
+            return;
+        }
+        else {
+            this->analyzingSet.insert(demoPath);
+        }
+    }
+
+    this->LogInfo("开始分析: " + demoPath.string());
+    this->AnalyzeDemoWithCSDA(std::move(demoPath)).resume();
+}
+
+MulNX::CoTask DemoAnalyzer::AnalyzeDemoWithCSDA(std::filesystem::path demoPath) {
+    std::string stem = demoPath.stem().string();
+
+    // RAII：分析结束时从队列移除
+    auto cleanup = scope_exit([this, demoPath] {
+        std::unique_lock lock(this->smutex);
+        analyzingSet.erase(demoPath);
+        });
+
+    // 构造 csda 命令行，确保路径包含引号以处理空格
+    std::string cmdStr = "\"" + this->csdaPath.string() + "\" "
+        + "-demo-path=\"" + demoPath.string() + "\" "
+        + "-output=\"" + this->dirData.string() + "\" "
+        + "-format=json";
+
+    this->LogInfo("执行: " + cmdStr);
+
+    STARTUPINFOW si{ sizeof(si) };
+    PROCESS_INFORMATION pi{};
     auto cmdBuffer = MulNX::CharUtility::U8ToW(cmdStr);
 
-    // 创建进程
-    BOOL success = CreateProcessW(
-        nullptr,               // 应用程序名
-        cmdBuffer.data(),      // 命令行（注意是可修改的）
-        nullptr,
-        nullptr,
-        FALSE,
-        CREATE_NO_WINDOW,
-        nullptr,
-        nullptr,
-        &si,
-        &pi
-    );
-
-    if (!success) {
-        DWORD err = GetLastError();
-        this->LogError("Failed to create process, error code: " + std::to_string(err));
-        co_return;
+    if (!CreateProcessW(nullptr, cmdBuffer.data(), nullptr, nullptr,
+        FALSE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi)) {
+        this->LogError("创建进程失败，错误码: " + std::to_string(GetLastError()));
+        co_return;   // cleanup 自动执行，不发送消息
     }
 
-    co_await this->WaitUntil([hProcess = pi.hProcess] {
-        return WaitForSingleObject(hProcess, 0) == WAIT_OBJECT_0;
+    co_await this->WaitUntil([h = pi.hProcess] {
+        return WaitForSingleObject(h, 0) == WAIT_OBJECT_0;
         });
 
-    // 获取退出码并检查
     DWORD exitCode = 0;
     GetExitCodeProcess(pi.hProcess, &exitCode);
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
+
     if (exitCode != 0) {
-        this->LogError("csda.exe exited with code: " + std::to_string(exitCode));
+        this->LogError("csda.exe 退出码: " + std::to_string(exitCode));
     }
     else {
-        this->LogInfo("Demo analysis completed successfully.");
+        this->LogInfo("Demo 分析成功完成。");
+        // 仅成功时发送加载消息
+        auto [msg, rp] = MulNX::Message::Create<MulNX::NetExt>("Demo/JSON/Load"_hash);
+        rp->str1 = stem;
+        this->PublishAsync(std::move(msg));
     }
-
-    // 清理句柄
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
+    // cleanup 析构，移除队列
 }

bin/MulNX/CS2OBTool/CS2OBTool.dll

@@ -2,10 +2,13 @@
 #include <Intro/CSModuleBase.hpp>
 
 class DemoAnalyzer final : public CSModuleBase {
-    std::filesystem::path csdaPath{};
-    std::filesystem::path dirData{};
-    MulNX::CoTask AnalyzeDemoWithCSDA(std::filesystem::path&& pthDemo);
-public:
-    bool Init()override;
-    void ProcessMsg(MulNX::Message& msg)override;
+    std::filesystem::path csdaPath;
+    std::filesystem::path dirData;
+    std::set<std::filesystem::path> analyzingSet;            // 正在分析的 demo 绝对路径
+
+    void HandleAnalyzeRequest(std::filesystem::path demoPath);
+    MulNX::CoTask AnalyzeDemoWithCSDA(std::filesystem::path demoPath);
+
+    bool Init() override;
+    void ProcessMsg(MulNX::Message& msg) override;
 };

bin/MulNX/CS2OBTool/UISystem/Config/MulNXUIConfig.ini

@@ -11,30 +11,91 @@ bool HookDemo::Init() {
     return true;
 }
 void HookDemo::HookPlayDemo(CCmd* pCmd) {
-    auto pf = pCmd->m_pCommandCallback;
-    this->hkPlaydemo = MulNX::Hook::Create((uint8_t*)pCmd->m_pCommandCallback, [this](MulNX::Hook* hk, RegContext* ctx) {
-        auto cmd = (CCommand*)ctx->rdx;
-        hk->CallMaybeOrigin(0, ctx);
-        std::string_view raw(cmd->pRawString);
-        raw = raw.substr(raw.find(' ') + 1);
-        this->LogInfo(std::format("播放Demo: {}", raw));
-        return MulNX::Hook::Then::Return;
-        }).value();
-    this->hkPlaydemo->Attach();
-    this->LogSucc(I18n("hook.attached", "PlayDemo"));
+    this->hkPlaydemo = this->CreateHook(
+        "PlayDemo", (uint8_t*)pCmd->m_pCommandCallback,
+        [this](MulNX::Hook* hk, RegContext* ctx) {
+            auto cmd = (CCommand*)ctx->rdx;
+            hk->CallMaybeOrigin(0, ctx);
+            std::string_view raw(cmd->pRawString);
+            raw = raw.substr(raw.find(' ') + 1);
+            this->BeforePlay(raw);
+            return MulNX::Hook::Then::Return;
+        }
+    ).value();
+    this->hkPlaydemo.Attach();
 }
 void HookDemo::HookDemoGotoTick(CCmd* pCmd) {
     auto pf = pCmd->m_pCommandCallback;
-    this->hkDemoGotoTick = MulNX::Hook::Create((uint8_t*)pCmd->m_pCommandCallback, [this](MulNX::Hook* hk, RegContext* ctx) {
-        auto cmd = (CCommand*)ctx->rdx;
-        hk->CallMaybeOrigin(0, ctx);
-        auto msg = MulNX::Message("Demo/GotoTick/Complete"_hash);
-        auto&& [jumpTick] = msg.Access<int>();
-        sscanf_s(cmd->pRawString, "demo_gototick %d", &jumpTick);
-        this->LogInfo(std::format("跳转到tick: {}", jumpTick));
-        this->PublishAsync(std::move(msg));
-        return MulNX::Hook::Then::Return;
+    this->hkDemoGotoTick = this->CreateHook(
+        "DemoGotoTick", (uint8_t*)pCmd->m_pCommandCallback,
+        [this](MulNX::Hook* hk, RegContext* ctx) {
+            auto cmd = (CCommand*)ctx->rdx;
+            hk->CallMaybeOrigin(0, ctx);
+            auto msg = MulNX::Message("Demo/GotoTick/Complete"_hash);
+            auto&& [jumpTick] = msg.Access<int>();
+            sscanf_s(cmd->pRawString, "demo_gototick %d", &jumpTick);
+            this->LogInfo(std::format("跳转到tick: {}", jumpTick));
+            this->PublishAsync(std::move(msg));
+            return MulNX::Hook::Then::Return;
         }).value();
     this->hkDemoGotoTick->Attach();
-    this->LogSucc(I18n("hook.attached", "DemoGotoTick"));
+}
+void HookDemo::BeforePlay(std::string_view rawArg) {
+    // 1. 去除首尾空白
+    std::string rawPath(rawArg);
+    size_t start = rawPath.find_first_not_of(" \t");
+    if (start == std::string::npos) {
+        this->LogError("解析Demo名失败");
+        return;
+    }
+    size_t end = rawPath.find_last_not_of(" \t");
+    rawPath = rawPath.substr(start, end - start + 1);
+
+    // 2. 去除可能存在的成对引号
+    if (rawPath.size() >= 2) {
+        if ((rawPath.front() == '"' && rawPath.back() == '"') ||
+            (rawPath.front() == '\'' && rawPath.back() == '\'')) {
+            rawPath = rawPath.substr(1, rawPath.size() - 2);
+        }
+    }
+
+    auto& dirDemos = this->CS2Paths->demo;
+    std::filesystem::path demoPath(rawPath);
+    if (!demoPath.is_absolute()) {
+        demoPath = dirDemos / demoPath;
+    }
+
+    // 3. 检查文件是否存在，若不存在且缺少 .dem 后缀则自动补全
+    bool fileFound = false;
+    if (std::filesystem::exists(demoPath) && std::filesystem::is_regular_file(demoPath)) {
+        fileFound = true;   // 原路径直接有效
+    }
+    else if (demoPath.extension() != ".dem") {
+        // 尝试追加 .dem
+        std::filesystem::path tryPath = demoPath;
+        tryPath += ".dem";
+        if (std::filesystem::exists(tryPath) && std::filesystem::is_regular_file(tryPath)) {
+            demoPath = tryPath;
+            fileFound = true;
+            this->LogWarning(std::format("已自动补充 .dem 后缀: {}", demoPath.string()));
+        }
+    }
+
+    if (!fileFound) {
+        this->LogError(std::format("找不到Demo文件: {}", demoPath.string()));
+        return;
+    }
+
+    // 4. 最终确定，输出播放日志
+    this->LogInfo(std::format("播放Demo: {}", demoPath.string()));
+
+    // 发送分析请求（包含完整路径）
+    auto [msg, rp] = MulNX::Message::Create<MulNX::NetExt>("Demo/Analyze"_hash);
+    rp->str1 = demoPath.string();
+    this->PublishAsync(std::move(msg));
+
+    // 发送设置当前操作的 Demo（使用不带扩展名的文件名）
+    auto [msg2, rp2] = MulNX::Message::Create<MulNX::NetExt>("Demo/SetOperating"_hash);
+    rp2->str1 = demoPath.stem().string();  // 例如 "111"
+    this->PublishAsync(std::move(msg2));
 }

bin/MulNX/Log/Log_CS2Injector.txt

@@ -3,10 +3,10 @@
 #include <Intro/HookConsole/HookConsole.hpp>
 
 class HookDemo final :public CSModuleBase {
-    std::unique_ptr<MulNX::Hook>hkPlaydemo = nullptr;
-    std::unique_ptr<MulNX::Hook>hkDemoGotoTick = nullptr;
+    WrapHook hkPlaydemo{};
+    WrapHook hkDemoGotoTick{};
     void HookPlayDemo(CCmd* cmd);
     void HookDemoGotoTick(CCmd* cmd);
-public:
+    void BeforePlay(std::string_view rawArg);
     bool Init()override;
 };