fix: fix nodejs engine

Author: ShrBox

src/legacy/main/NodeJsHelper.cpp

@@ -10,19 +10,19 @@
 #include "engine/EngineOwnData.h"
 #include "engine/RemoteCall.h"
 #include "ll/api/chrono/GameChrono.h"
+#include "ll/api/coro/CoroTask.h"
 #include "ll/api/io/FileUtils.h"
-#include "ll/api/schedule/Scheduler.h"
-#include "ll/api/schedule/Task.h"
 #include "ll/api/service/ServerInfo.h"
+#include "ll/api/thread/ThreadPoolExecutor.h"
 #include "ll/api/utils/StringUtils.h"
 #include "main/Configs.h"
 #include "main/Global.h"
 #include "uv/uv.h"
 #include "v8/v8.h"
 
 #include <functional>
+#include <ll/api/service/GamingStatus.h>
 
-ll::schedule::ServerTimeScheduler nodeScheduler;
 using ll::chrono_literals::operator""_tick;
 
 // pre-declare
@@ -38,8 +38,8 @@ std::unique_ptr<node::MultiIsolatePlatform>
 std::unordered_map<script::ScriptEngine*, node::Environment*>                             environments;
 std::unordered_map<script::ScriptEngine*, std::unique_ptr<node::CommonEnvironmentSetup>>* setups =
     new std::unordered_map<script::ScriptEngine*, std::unique_ptr<node::CommonEnvironmentSetup>>();
-std::unordered_map<node::Environment*, bool>   isRunning;
-std::unordered_map<node::Environment*, uint64> uvLoopTask;
+std::unordered_map<node::Environment*, bool> isRunning;
+std::vector<node::Environment*>              uvLoopTask;
 
 bool initNodeJs() {
     // Init NodeJs
@@ -165,22 +165,23 @@ bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, s
         }
 
         // Start libuv event loop
-        uvLoopTask[env] =
-            nodeScheduler
-                .add<ll::schedule::RepeatTask>(
-                    2_tick,
-                    [engine, env, isRunningMap{&isRunning}, eventLoop{it->second->event_loop()}]() {
-                        if (!(ll::getGamingStatus() != ll::GamingStatus::Running) && (*isRunningMap)[env]) {
-                            EngineScope enter(engine);
-                            uv_run(eventLoop, UV_RUN_NOWAIT);
-                        }
-                        if ((ll::getGamingStatus() != ll::GamingStatus::Running)) {
-                            uv_stop(eventLoop);
-                            lse::getSelfPluginInstance().getLogger().debug("Destroy ServerStopping");
-                        }
+        uvLoopTask.push_back(env);
+        ll::coro::keepThis(
+            [engine, env, isRunningMap{&isRunning}, eventLoop{it->second->event_loop()}]() -> ll::coro::CoroTask<> {
+                using namespace ll::chrono_literals;
+                while (std::find(uvLoopTask.begin(), uvLoopTask.end(), env) != uvLoopTask.end()) {
+                    co_await 2_tick;
+                    if (!(ll::getGamingStatus() != ll::GamingStatus::Running) && (*isRunningMap)[env]) {
+                        EngineScope enter(engine);
+                        uv_run(eventLoop, UV_RUN_NOWAIT);
                     }
-                )
-                ->getId();
+                    if ((ll::getGamingStatus() != ll::GamingStatus::Running)) {
+                        uv_stop(eventLoop);
+                        lse::getSelfPluginInstance().getLogger().debug("Destroy ServerStopping");
+                    }
+                }
+            }
+        ).launch(ll::thread::ThreadPoolExecutor::getDefault());
 
         return true;
     } catch (...) {
@@ -210,9 +211,9 @@ bool stopEngine(node::Environment* env) {
         node::Stop(env);
 
         // Stop libuv event loop
-        auto it = uvLoopTask.find(env);
+        auto it = std::find(uvLoopTask.begin(), uvLoopTask.end(), env);
         if (it != uvLoopTask.end()) {
-            nodeScheduler.remove(it->second);
+            uvLoopTask.erase(it);
         }
 
         return true;

src/lse/PluginMigration.cpp

@@ -98,8 +98,8 @@ auto migratePlugin(const PluginManager& pluginManager, const std::filesystem::pa
         .name  = ll::string_utils::u8str2str(pluginFileBaseName.u8string()),
         .type  = pluginType,
         .dependencies =
-            std::unordered_set<ll::mod::Dependency>{
-                                                    ll::mod::Dependency{
+            ll::SmallDenseSet<ll::mod::Dependency>{
+                                                   ll::mod::Dependency{
                     .name = self.getManifest().name,
                 }, },
     };