mirror of
https://github.com/sp-tarkov/modules.git
synced 2025-02-13 09:50:43 -05:00
9c89c31c68
This PR won't affect modders who have already updated their mods to 3.8.0. They just need to re-compile. This is a resubmission of my previous PR (SPT-AKI/Modules#99) with additional code cleanup and fixes. Instead of outright removing the functionality, this time I deprecate it instead (marked for removal in next release). Requires SPT-AKI/Server#274 to function. ## Overview - HTTP modernization - Adds `Aki.Common.Http.Client`, a replacement for `Aki.Common.Http.Request` and builds on top of `System.Net.Http.HttpClient` - Implements failsafe retries when requesting during busy connections - Improved debugging - Improved performance - Deprecades old request code - Bundle system - Fixes remote downloaded bundles using external IP - Implements functional bundle caching from remote sources - Implements multi-threaded bundle downloads - Implements Unity-compatible bundle format support - Extensive cleanup - Deprecated unneccecary models ## Why? In it's current state, the bundle system is ducktaped together in 2021, fundumentally broken and in desperate need of a cleanup and fixes. The HTTP code hasn't been updated since 2021, and `HttpWebRequest` has been deprecated by Microsoft for a while now. There was also a lot of opportunity left for simple performance gains that even reduces the complexity of the code. As for why not two separate PRs (HTTP modernization, bundle rework): both were deeply interconnected. A change in one requires modification in the other. Hence the current approach. ## Testing The code has been validated and tested by @TheSparta and me. A large section of the code has been implemented and tested extensively by modders. ### Local 1. Start the game from 127.0.0.1 2. The game starts loading bundles from the mods path ### Remote, full re-aquire 1. Start the server from LAN IP (http.json, set host to `cmd > ipconfig` address, example: `192.168.178.32`) 2. Start the game from LAN IP 3. A folder named `user/cache/bundles` is created ### Remote, partial-aquire (deleted) 1. Ensure all bundles are cached 2. Delete one of the aquired bundles from cache 3. Start the server from LAN IP (http.json, set host to `cmd > ipconfig` address, example: `192.168.178.32`) 4. Start the game from LAN IP 5. The bundle is redownloaded ### Remote, partial-aquire (invalid crc) 1. Ensure all bundles are cached 2. Update a bundle mod with a new bundle on the same path 3. Start the server from LAN IP (http.json, set host to `cmd > ipconfig` address, example: `192.168.178.32`) 4. Start the game from LAN IP 5. The bundle is redownloaded ### Remote, use cache 1. Ensure all bundles are cached 2. Start the server from LAN IP (http.json, set host to `cmd > ipconfig` address, example: `192.168.178.32`) 3. Start the game from LAN IP 4. The game starts loading bundles from the cache path ## Risk assessment In order to reduce friction between releases, this PR introduces a deprecation system. Obsolete classes and methods have been marked deprecated. These will remain available for the current release and continue to function as normal for this release. A warning will be displayed during build when a modder relies on the deprecated functionality. The marked classes and methods are to be removed in the next release. The server-side changes have no impact on modders. ## Deprecation The following classes are affected: - `Aki.Common.Http.Request`: Replaced by `Aki.Common.Http.Request` - `Aki.Common.Http.WebConstants`: Replaced by functionality from `System.Net.Http` - `Aki.Custom.Models.BundleInfo`: Replaced by `Aki.Custom.Models.BundleItem` The following methods are affected: - `Aki.Common.Http.RequestHandler.GetData(path, hasHost)`: `hasHost` enables connection outside intended host. - `Aki.Common.Http.RequestHandler.GetJson(path, hasHost)`: `hasHost` enables connection outside intended host. - `Aki.Common.Http.RequestHandler.PostJson(path, json, hasHost)`: `hasHost` enables connection outside intended host. - `Aki.Common.Http.RequestHandler.PutJson(path, json, hasHost)`: `hasHost` enables connection outside intended host. The deprecated methods and `Aki.Custom.Models.BundleInfo` are self-contained and can be removed independently. The deprecated classes require removal of all deprecated code at once. Reviewed-on: SPT-AKI/Modules#104 Reviewed-by: TheSparta <thesparta@noreply.dev.sp-tarkov.com> Co-authored-by: Merijn Hendriks <merijn.d.hendriks@gmail.com> Co-committed-by: Merijn Hendriks <merijn.d.hendriks@gmail.com>
78 lines
2.7 KiB
C#
78 lines
2.7 KiB
C#
#region DEPRECATED, REMOVE IN 3.8.1
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
|
|
namespace Aki.Common.Http
|
|
{
|
|
[Obsolete("WebConstants is deprecated, please use System.Net.Http functionality instead.")]
|
|
public static class WebConstants
|
|
{
|
|
[Obsolete("Get is deprecated, please use HttpMethod.Get instead.")]
|
|
public const string Get = "GET";
|
|
|
|
[Obsolete("Head is deprecated, please use HttpMethod.Head instead.")]
|
|
public const string Head = "HEAD";
|
|
|
|
[Obsolete("Post is deprecated, please use HttpMethod.Post instead.")]
|
|
public const string Post = "POST";
|
|
|
|
[Obsolete("Put is deprecated, please use HttpMethod.Put instead.")]
|
|
public const string Put = "PUT";
|
|
|
|
[Obsolete("Delete is deprecated, please use HttpMethod.Delete instead.")]
|
|
public const string Delete = "DELETE";
|
|
|
|
[Obsolete("Connect is deprecated, please use HttpMethod.Connect instead.")]
|
|
public const string Connect = "CONNECT";
|
|
|
|
[Obsolete("Options is deprecated, please use HttpMethod.Options instead.")]
|
|
public const string Options = "OPTIONS";
|
|
|
|
[Obsolete("Trace is deprecated, please use HttpMethod.Trace instead.")]
|
|
public const string Trace = "TRACE";
|
|
|
|
[Obsolete("Mime is deprecated, there is sadly no replacement.")]
|
|
public static Dictionary<string, string> Mime { get; private set; }
|
|
|
|
static WebConstants()
|
|
{
|
|
Mime = new Dictionary<string, string>()
|
|
{
|
|
{ ".bin", "application/octet-stream" },
|
|
{ ".txt", "text/plain" },
|
|
{ ".htm", "text/html" },
|
|
{ ".html", "text/html" },
|
|
{ ".css", "text/css" },
|
|
{ ".js", "text/javascript" },
|
|
{ ".jpeg", "image/jpeg" },
|
|
{ ".jpg", "image/jpeg" },
|
|
{ ".png", "image/png" },
|
|
{ ".ico", "image/vnd.microsoft.icon" },
|
|
{ ".json", "application/json" }
|
|
};
|
|
}
|
|
|
|
[Obsolete("IsValidMethod is deprecated, please check against HttpMethod entries instead.")]
|
|
public static bool IsValidMethod(string method)
|
|
{
|
|
return method == Get
|
|
|| method == Head
|
|
|| method == Post
|
|
|| method == Put
|
|
|| method == Delete
|
|
|| method == Connect
|
|
|| method == Options
|
|
|| method == Trace;
|
|
}
|
|
|
|
[Obsolete("isValidMime is deprecated, there is sadly no replacement available.")]
|
|
public static bool IsValidMime(string mime)
|
|
{
|
|
return Mime.Any(x => x.Value == mime);
|
|
}
|
|
}
|
|
}
|
|
|
|
#endregion |