CSM: Use server-like (and safe) HTTP API instead of Mainmenu-like

diff --git a/builtin/client/util.lua b/builtin/client/util.lua
index aea15e00ff59dc83789d203c4f28fb5f2d123f98..440f99ebc7ecf7429616b176aff6c1f89a701519 100644 (file)
--- a/builtin/client/util.lua
+++ b/builtin/client/util.lua
@@ -58,3 +58,23 @@ end
 function core.get_nearby_objects(radius)
        return core.get_objects_inside_radius(core.localplayer:get_pos(), radius)
 end
+
+-- HTTP callback interface
+
+function core.http_add_fetch(httpenv)
+       httpenv.fetch = function(req, callback)
+               local handle = httpenv.fetch_async(req)
+
+               local function update_http_status()
+                       local res = httpenv.fetch_async_get(handle)
+                       if res.completed then
+                               callback(res)
+                       else
+                               core.after(0, update_http_status)
+                       end
+               end
+               core.after(0, update_http_status)
+       end
+
+       return httpenv
+end

diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp
index 0bf9cfbad7431d7be295c9a89c27f75996d1a9fa..5ea3b3f996f0143ea4300f111166825a3ae0b12a 100644 (file)
--- a/src/script/lua_api/l_http.cpp
+++ b/src/script/lua_api/l_http.cpp
@@ -239,8 +239,18 @@ int ModApiHttp::l_get_http_api(lua_State *L)
 void ModApiHttp::Initialize(lua_State *L, int top)
 {
 #if USE_CURL
-       API_FCT(get_http_api);
-       API_FCT(request_http_api);
+
+       bool isMainmenu = false;
+#ifndef SERVER
+       isMainmenu = ModApiBase::getGuiEngine(L) != nullptr;
+#endif
+
+       if (isMainmenu) {
+               API_FCT(get_http_api);
+       } else {
+               API_FCT(request_http_api);
+       }
+
 #endif
 }