Merge pull request #22 from ejt1/feat-libuv

libuv implementation

CMakeLists.txt

@@ -76,7 +76,10 @@ set(D2BS_SRCS
   "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Core/JS/JSScript.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Core/JS/JSSocket.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Core/JS/JSUnit.cpp"
+
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Core/JSTimer.cc"
 
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Engine/Bindings.cc"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Engine/js32.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Engine/Script.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/Spidermonkey Engine/Engine/ScriptEngine.cpp"
@@ -123,6 +126,8 @@ target_link_libraries(D2BS PRIVATE
 
   # vendor dependencies
   libquickjs
-  minhook)
+  minhook
+  # libuv
+  uv_a)
 
 install(TARGETS D2BS RUNTIME DESTINATION bin/d2bs)

dist/d2bs/kolbot/libs/SoloPlay/Functions/AttackOverrides.js

@@ -1633,7 +1633,9 @@ Attack.pwnDia = function () {
         if (me.mp > manaStatic + manaTP + manaTP
           && diabloMissiles.length < 3 && !dia.attacking
           && dia.hpPercent > Config.CastStatic) {
-          let [x, y] = me;
+          //let [x, y] = me; // BUG(ejt): TypeError: value is not iterable
+          let x = me.x;
+          let y = me.y;
           ClassAttack.switchCurse(dia, true); // curse him if we can
           // re-check his mode
           if (!dia.attacking) {

dist/d2bs/kolbot/libs/core/Misc.js

@@ -646,7 +646,7 @@ const Misc = {
    * @param {string} [script] 
    */
   errorReport: function (error, script) {
-    let msg, oogmsg, filemsg, source, stack;
+    let msg, oogmsg, filemsg, source = "<unknown>", lineNumber = 0, stack;
     let stackLog = "";
 
     let date = new Date();
@@ -658,10 +658,15 @@ const Misc = {
       oogmsg = error.replace(/ÿc[0-9!"+<:;.*]/gi, "");
       filemsg = dateString + " <" + me.profile + "> " + error.replace(/ÿc[0-9!"+<:;.*]/gi, "") + "\n";
     } else {
-      source = error.fileName.substring(error.fileName.lastIndexOf("\\") + 1, error.fileName.length);
-      msg = "ÿc1Error in ÿc0" + script + " ÿc1(" + source + " line ÿc1" + error.lineNumber + "): ÿc1" + error.message;
+      if (error.fileName) {
+        source = error.fileName.substring(error.fileName.lastIndexOf("\\") + 1, error.fileName.length);
+      }
+      if (error.lineNumber) {
+        lineNumber = error.lineNumber;
+      }
+      msg = "ÿc1Error in ÿc0" + script + " ÿc1(" + source + " line ÿc1" + lineNumber + "): ÿc1" + error.message;
       oogmsg = (
-        "Error in " + script + " (" + source + " #" + error.lineNumber + ") " + error.message
+        "Error in " + script + " (" + source + " #" + lineNumber + ") " + error.message
         + " (Area: " + me.area + ", Ping:" + me.ping + ", Game: " + me.gamename + ")"
       );
       filemsg = dateString + " <" + me.profile + "> " + msg.replace(/ÿc[0-9!"+<:;.*]/gi, "") + "\n";

src/Diablo II/Handlers/D2Handlers.cpp

@@ -88,7 +88,7 @@ void __fastcall GamePlayerAssignment(D2UnitStrc* pPlayer) {
 
 void GameLeave(void) {
   Vars.bQuitting = false;
-  sScriptEngine->ForEachScript(StopIngameScript, NULL, 0);
+  sScriptEngine->ForEachScript(StopIngameScript, NULL);
   ActMap::ClearCache();
 }
 

src/Engine.cc

@@ -17,7 +17,7 @@
 #include <MinHook.h>
 #include <mutex>
 
-Engine::Engine() : m_hModule(nullptr), m_pScriptEngine(std::make_unique<ScriptEngine>()) {
+Engine::Engine() : m_hModule(nullptr), m_loop(uv_default_loop()), m_pScriptEngine(std::make_unique<ScriptEngine>()) {
   m_instance = this;
   m_fnWndProc = nullptr;
   m_fnCreateWindow = nullptr;
@@ -26,6 +26,7 @@ Engine::Engine() : m_hModule(nullptr), m_pScriptEngine(std::make_unique<ScriptEn
 }
 
 Engine::~Engine() {
+  uv_loop_close(m_loop);
 }
 
 bool Engine::Initialize(HMODULE hModule) {
@@ -172,6 +173,9 @@ void Engine::OnUpdate() {
     Print("ÿc2D2BSÿc0 :: Engine startup complete!");
   });
 
+  // spin the event loop
+  uv_run(m_loop, UV_RUN_NOWAIT);
+
   static bool beginStarter = true;
   static bool bInGame = false;
 
@@ -187,11 +191,11 @@ void Engine::OnUpdate() {
 
         D2CLIENT_InitInventory();
         sScriptEngine->ForEachScript(
-            [](Script* script, void*, uint32_t) {
+            [](Script* script, void*) {
               script->UpdatePlayerGid();
               return true;
             },
-            NULL, 0);
+            NULL);
         sScriptEngine->UpdateConsole();
         Vars.bQuitting = false;
         OnGameEntered();

src/Engine.h

@@ -3,6 +3,8 @@
 #include "ScreenHook.h"
 #include "Globals.h"
 
+#include <uv.h>
+
 class Engine final {
  public:
   Engine();
@@ -44,5 +46,6 @@ class Engine final {
   static void HandleGameDrawMenu();
 
   HMODULE m_hModule;
+  uv_loop_t* m_loop;
   std::unique_ptr<ScriptEngine> m_pScriptEngine;
 };

src/Globals.h

@@ -64,7 +64,6 @@ struct Variables {
   std::queue<std::string> qPrintBuffer;
   std::map<unsigned __int32, D2CellFileStrc*> mCachedCellFiles;
   std::vector<std::pair<DWORD, DWORD>> vUnitList;
-  // std::list<Event*> EventList;
   CRITICAL_SECTION cEventSection;
   CRITICAL_SECTION cPrintSection;
   CRITICAL_SECTION cTextHookSection;