fix: fix setTimeout can't be cancelled #219

Author: ShrBox

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed setTimeout can't be cancelled #219
+
 ## [0.9.3] - 2025-01-30
 
 ### Fixed

src/legacy/engine/TimeTaskSystem.cpp

@@ -51,8 +51,14 @@ int NewTimeout(Local<Function> func, std::vector<Local<Value>> paras, int timeou
     ll::coro::keepThis([timeout, tid, data]() -> ll::coro::CoroTask<> {
         co_await std::chrono::milliseconds(timeout);
         try {
-            if ((ll::getGamingStatus() == ll::GamingStatus::Stopping) || !EngineManager::isValid(data.engine))
+            if (!CheckTimeTask(tid)) {
                 co_return;
+            }
+
+            if ((ll::getGamingStatus() == ll::GamingStatus::Stopping) || !EngineManager::isValid(data.engine)) {
+                ClearTimeTask(tid);
+                co_return;
+            }
 
             EngineScope scope(data.engine);
             if (!data.func.isEmpty()) {
@@ -83,8 +89,14 @@ int NewTimeout(Local<String> func, int timeout) {
     ll::coro::keepThis([timeout, tid, data]() -> ll::coro::CoroTask<> {
         co_await std::chrono::milliseconds(timeout);
         try {
-            if ((ll::getGamingStatus() == ll::GamingStatus::Stopping) || !EngineManager::isValid(data.engine))
+            if (!CheckTimeTask(tid)) {
                 co_return;
+            }
+
+            if ((ll::getGamingStatus() == ll::GamingStatus::Stopping) || !EngineManager::isValid(data.engine)) {
+                ClearTimeTask(tid);
+                co_return;
+            }
 
             EngineScope scope(data.engine);
             if (!data.code.isEmpty()) {

xmake.lua

@@ -3,9 +3,9 @@ add_rules("mode.debug", "mode.release")
 add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
 
 if is_config("target_type", "server") then
-    add_requires("levilamina 1.0.0", {configs = {target_type = "server"}})
+    add_requires("levilamina 1.0.1", {configs = {target_type = "server"}})
 else
-    add_requires("levilamina 1.0.0", {configs = {target_type = "client"}})
+    add_requires("levilamina 1.0.1", {configs = {target_type = "client"}})
 end
 
 add_requires("levibuildscript")