Update aurora & borealis

src/dusk/mods/svc/http.cpp

@@ -183,7 +183,6 @@ HttpError map_error(borealis::http::Error error) {
     case borealis::http::Error::Io:
         return HTTP_ERROR_IO;
     case borealis::http::Error::NoBackend:
-    case borealis::http::Error::NotInitialized:
     case borealis::http::Error::Network:
         return HTTP_ERROR_NETWORK;
     default:
@@ -438,14 +437,12 @@ ModResult start_request(LoadedMod& mod, const HttpRequestDesc& desc, HttpComplet
         .connectTimeout = desc.connect_timeout_ms != 0 ?
                               std::chrono::milliseconds{desc.connect_timeout_ms} :
                               DefaultTimeout,
-        .idleTimeout = desc.idle_timeout_ms != 0 ?
-                           std::chrono::milliseconds{desc.idle_timeout_ms} :
-                           DefaultTimeout,
+        .idleTimeout = desc.idle_timeout_ms != 0 ? std::chrono::milliseconds{desc.idle_timeout_ms} :
+                                                   DefaultTimeout,
         .totalTimeout = desc.total_timeout_ms != 0 ?
                             std::optional{std::chrono::milliseconds{desc.total_timeout_ms}} :
                             std::nullopt,
-        .maxBodyBytes =
-            desc.max_body_bytes != 0 ? desc.max_body_bytes : DefaultResponseBodyBytes,
+        .maxBodyBytes = desc.max_body_bytes != 0 ? desc.max_body_bytes : DefaultResponseBodyBytes,
     };
     request.headers.reserve(desc.header_count + 1);
     for (uint32_t i = 0; i < desc.header_count; ++i) {
@@ -463,9 +460,7 @@ ModResult start_request(LoadedMod& mod, const HttpRequestDesc& desc, HttpComplet
         if (!immediate.has_value()) {
             return MOD_UNAVAILABLE;
         }
-        if (immediate->error == borealis::http::Error::NoBackend ||
-            immediate->error == borealis::http::Error::NotInitialized)
-        {
+        if (immediate->error == borealis::http::Error::NoBackend) {
             return MOD_UNAVAILABLE;
         }
         task = borealis::detail::make_ready_task(std::move(*immediate));
@@ -550,7 +545,7 @@ void http_shutdown() {
 }
 
 bool http_available() {
-    return borealis::http::available() && borealis::http::initialize();
+    return borealis::http::available();
 }
 
 constexpr HttpService s_httpService{

src/m_Do/m_Do_main.cpp

@@ -47,9 +47,9 @@
 #include <borealis/aurora_log.h>
 #include <borealis/cli.hpp>
 #include <borealis/crash.hpp>
-#include <borealis/http.hpp>
 #include <borealis/io.hpp>
 #include <borealis/sentry.hpp>
+#include <borealis/task.hpp>
 #include <borealis/version.h>
 #include <filesystem>
 #include <system_error>
@@ -758,6 +758,7 @@ int game_main(int argc, char* argv[]) {
     // Run ImGui UI loop if Aurora couldn't initialize a backend
     if (auroraInfo.backend == BACKEND_NULL) {
         launchUILoop();
+        borealis::shutdown();
         borealis::sentry::shutdown();
         borealis::log::shutdown();
         fflush(stdout);
@@ -770,10 +771,6 @@ int game_main(int argc, char* argv[]) {
         return 0;
     }
 
-    if (borealis::http::available() && !borealis::http::initialize()) {
-        DuskLog.warn("Failed to initialize the HTTP worker pool");
-    }
-
     if (dusk::getSettings().game.enableHighQualityMinimapTextures.getValue()) {
         dusk::hq_minimap::set_active(true);
     }
@@ -890,7 +887,7 @@ int game_main(int argc, char* argv[]) {
 
             // pre game launch ui main loop
             if (!launchUILoop()) {
-                borealis::http::shutdown();
+                borealis::shutdown();
                 borealis::sentry::shutdown();
                 borealis::log::shutdown();
                 fflush(stdout);
@@ -981,7 +978,7 @@ int game_main(int argc, char* argv[]) {
     OSReport("Starting main01 (Game Loop)...\n");
 
     main01();
-    borealis::http::shutdown();
+    borealis::shutdown();
 
     // We need to cleanly shut down the threads to avoid crashes on shutdown.
     if (daMP_c::m_myObj) {