Merge branch 'release' into dev

altmp · Feb 17, 2024 · 3259320 · 3259320
2 parents 02f155f + 133161b
commit 3259320
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 16 deletions.
diff --git a/client/src/coreclr/CoreClrValidation.cpp b/client/src/coreclr/CoreClrValidation.cpp
@@ -127,6 +127,19 @@ void CoreClr::DownloadRuntime(alt::IHttpClient* httpClient, Progress& progress)
             return;
         } catch (std::runtime_error& e) {
             cs::Log::Error << "Failed to extract zip: " << e.what() << cs::Log::Endl;
+
+            auto path = GetDataDirectoryPath() / "runtime.zip";
+            try
+            {
+                cs::Log::Info << "Writing debug ZIP to: " << path.string() << cs::Log::Endl;
+                std::ofstream os(path);
+                os << response.body;
+                os.close();
+                cs::Log::Info << "Writing debug ZIP finished" << cs::Log::Endl;
+            } catch(std::runtime_error& e)
+            {
+                cs::Log::Info << "Writing debug ZIP failed: " << e.what() << cs::Log::Endl;
+            }
         }
     }
 }

diff --git a/client/src/utils.h b/client/src/utils.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <codecvt>
 #include <future>
+#include <Log.h>
 
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
@@ -100,24 +101,34 @@ namespace utils
     }
 
     inline alt::IHttpClient::HttpResponse download_file_sync(alt::IHttpClient* httpClient, const std::string& url) {
-        std::promise<alt::IHttpClient::HttpResponse> promise;
-        std::future<alt::IHttpClient::HttpResponse> future = promise.get_future();
+        auto attempt = 0;
+
+        while (true)
+        {
+            if (++attempt > 5) throw std::runtime_error("Failed to download file " + url);
+
+            std::promise<alt::IHttpClient::HttpResponse> promise;
+            std::future<alt::IHttpClient::HttpResponse> future = promise.get_future();
 
-        httpClient->Get([](alt::IHttpClient::HttpResponse response, const void* data) {
-            const auto innerPromise = (std::promise<alt::IHttpClient::HttpResponse>*) data;
+            httpClient->Get([](alt::IHttpClient::HttpResponse response, const void* data) {
+                const auto innerPromise = (std::promise<alt::IHttpClient::HttpResponse>*) data;
 
-            if (response.statusCode != 200) {
-                innerPromise->set_exception(std::make_exception_ptr(std::runtime_error("Failed to download file")));
-                return;
-            }
+                if (response.statusCode != 200) {
+                    std::stringstream ss;
+                    ss << "HTTP " << response.statusCode << " " << response.body;
+                    innerPromise->set_exception(std::make_exception_ptr(std::runtime_error(ss.str())));
+                    return;
+                }
 
-            innerPromise->set_value(response);
-        }, url, &promise);
-
-        try {
-            return future.get();
-        } catch(const std::exception&) {
-            throw std::runtime_error("Failed to download file " + url);
+                innerPromise->set_value(response);
+            }, url, &promise);
+
+            try {
+                return future.get();
+            } catch(const std::exception& e) {
+                cs::Log::Warning << "Failed to download file " << url << ", attempt " << attempt << ": " << e.what() << cs::Log::Endl;
+                std::this_thread::sleep_for(std::chrono::seconds(1));
+            }
         }
     }
 

diff --git a/cpp-sdk b/cpp-sdk
diff --git a/server/src/CSharpResourceImpl.cpp b/server/src/CSharpResourceImpl.cpp
@@ -853,7 +853,12 @@ case alt::CEvent::Type::SYNCED_META_CHANGE:
             auto name = scriptRPCEvent->GetName();
             auto args = scriptRPCEvent->GetArgs();
             auto size = args.size();
+
+#ifdef _WIN32
             auto constArgs = new alt::MValueConst*[size];
+#else
+            alt::MValueConst* constArgs[size];
+#endif
 
             for (uint64_t i = 0; i < size; i++)
             {