diff --git a/Client/origin-client/autoloads/Auth.gd.uid b/Client/origin-client/autoloads/Auth.gd.uid new file mode 100644 index 0000000..a17e2c6 --- /dev/null +++ b/Client/origin-client/autoloads/Auth.gd.uid @@ -0,0 +1 @@ +uid://c8shlv2lkcut5 diff --git a/Client/origin-client/autoloads/ContentCache.gd.uid b/Client/origin-client/autoloads/ContentCache.gd.uid new file mode 100644 index 0000000..109a19d --- /dev/null +++ b/Client/origin-client/autoloads/ContentCache.gd.uid @@ -0,0 +1 @@ +uid://duh25h0rqb3bm diff --git a/Client/origin-client/autoloads/Network.gd.uid b/Client/origin-client/autoloads/Network.gd.uid new file mode 100644 index 0000000..b88c4f8 --- /dev/null +++ b/Client/origin-client/autoloads/Network.gd.uid @@ -0,0 +1 @@ +uid://d3ucly2mykovj diff --git a/Client/origin-client/export_presets.cfg b/Client/origin-client/export_presets.cfg index 28b9b4a..daa05f3 100644 --- a/Client/origin-client/export_presets.cfg +++ b/Client/origin-client/export_presets.cfg @@ -1,17 +1,29 @@ [preset.0] + name="HTML5" platform="Web" runnable=true +advanced_options=true dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="build/web/index.html" +export_path="../../../SOR-Client-Export/HTML5/index.html" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false script_export_mode=1 -script_encryption_key="" [preset.0.options] + +custom_template/debug="" +custom_template/release="" +variant/extensions_support=false +variant/thread_support=false vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=true html/export_icon=true @@ -21,3 +33,13 @@ html/canvas_resize_policy=2 html/focus_canvas_on_start=true html/experimental_virtual_keyboard=false progressive_web_app/enabled=false +progressive_web_app/ensure_cross_origin_isolation_headers=true +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color(0, 0, 0, 1) +threads/emscripten_pool_size=8 +threads/godot_pool_size=4 diff --git a/Client/origin-client/project.godot b/Client/origin-client/project.godot index da06958..59462ea 100644 --- a/Client/origin-client/project.godot +++ b/Client/origin-client/project.godot @@ -11,9 +11,9 @@ config_version=5 [application] config/name="Origin-Client" +run/main_scene="res://scenes/login/LoginScreen.tscn" config/features=PackedStringArray("4.5", "GL Compatibility") config/icon="res://icon.svg" -run/main_scene="res://scenes/login/LoginScreen.tscn" [autoload] @@ -29,3 +29,4 @@ pointing/emulate_touch_from_mouse=true renderer/rendering_method="gl_compatibility" renderer/rendering_method.mobile="gl_compatibility" +textures/vram_compression/import_etc2_astc=true diff --git a/Client/origin-client/scenes/collection/collection_screen.gd.uid b/Client/origin-client/scenes/collection/collection_screen.gd.uid new file mode 100644 index 0000000..adbfbe5 --- /dev/null +++ b/Client/origin-client/scenes/collection/collection_screen.gd.uid @@ -0,0 +1 @@ +uid://va08baxglyg5 diff --git a/Client/origin-client/scenes/collection/components/card_widget.gd.uid b/Client/origin-client/scenes/collection/components/card_widget.gd.uid new file mode 100644 index 0000000..c5062eb --- /dev/null +++ b/Client/origin-client/scenes/collection/components/card_widget.gd.uid @@ -0,0 +1 @@ +uid://cqrcq3lrws6qm diff --git a/Client/origin-client/scenes/collection/components/deck_list_item.gd.uid b/Client/origin-client/scenes/collection/components/deck_list_item.gd.uid new file mode 100644 index 0000000..7714558 --- /dev/null +++ b/Client/origin-client/scenes/collection/components/deck_list_item.gd.uid @@ -0,0 +1 @@ +uid://dd5u354cto2ia diff --git a/Client/origin-client/scenes/collection/views/cars_view.gd.uid b/Client/origin-client/scenes/collection/views/cars_view.gd.uid new file mode 100644 index 0000000..673b005 --- /dev/null +++ b/Client/origin-client/scenes/collection/views/cars_view.gd.uid @@ -0,0 +1 @@ +uid://d26atv3dne7jl diff --git a/Client/origin-client/scenes/collection/views/decks_view.gd.uid b/Client/origin-client/scenes/collection/views/decks_view.gd.uid new file mode 100644 index 0000000..b81d8c5 --- /dev/null +++ b/Client/origin-client/scenes/collection/views/decks_view.gd.uid @@ -0,0 +1 @@ +uid://vbuabpoyb47 diff --git a/Client/origin-client/scenes/init/init_screen.gd.uid b/Client/origin-client/scenes/init/init_screen.gd.uid new file mode 100644 index 0000000..8c373a7 --- /dev/null +++ b/Client/origin-client/scenes/init/init_screen.gd.uid @@ -0,0 +1 @@ +uid://nxc7w7cps02h diff --git a/Client/origin-client/scenes/login/login_screen.gd.uid b/Client/origin-client/scenes/login/login_screen.gd.uid new file mode 100644 index 0000000..9d2df2a --- /dev/null +++ b/Client/origin-client/scenes/login/login_screen.gd.uid @@ -0,0 +1 @@ +uid://yqc7mxil4y06 diff --git a/Client/origin-client/scenes/main/main_screen.gd.uid b/Client/origin-client/scenes/main/main_screen.gd.uid new file mode 100644 index 0000000..3c0c04f --- /dev/null +++ b/Client/origin-client/scenes/main/main_screen.gd.uid @@ -0,0 +1 @@ +uid://n8qjxx4qlim7 diff --git a/Server/src/SOR.Host/Program.cs b/Server/src/SOR.Host/Program.cs index ce42a37..bd0cee8 100644 --- a/Server/src/SOR.Host/Program.cs +++ b/Server/src/SOR.Host/Program.cs @@ -30,6 +30,7 @@ using StackExchange.Redis; using NATS.Client.Core; using NATS.Client.Hosting; using Microsoft.AspNetCore.WebSockets; +using Microsoft.AspNetCore.Server.Kestrel.Core; using SOR.Auth.Handlers; // ── ENABLED_SERVICES ────────────────────────────────────────────────────────── @@ -55,6 +56,23 @@ bool IsEnabled(string name) => var builder = WebApplication.CreateBuilder(args); +// Local cleartext gRPC requires a dedicated HTTP/2 listener. +// When Auth is enabled in this process and Services:Auth points to a loopback http:// URL, +// bind that port explicitly so Gateway can reach the Auth gRPC handler over h2c. +if (IsEnabled("auth") && + Uri.TryCreate(builder.Configuration["Services:Auth"], UriKind.Absolute, out var authServiceUri) && + string.Equals(authServiceUri.Scheme, Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) && + authServiceUri.IsLoopback) +{ + builder.WebHost.ConfigureKestrel(options => + { + options.ListenLocalhost(authServiceUri.Port, listenOptions => + { + listenOptions.Protocols = HttpProtocols.Http2; + }); + }); +} + // ── Logging ─────────────────────────────────────────────────────────────────── // Replace .NET's default logger with Serilog. // Configuration comes from the "Serilog" section of appsettings.json.