sim0n00ps/OF-DL
32
35
Fork 9
Code Issues 21 Pull Requests 2 Actions Packages Projects Releases 6 Wiki Activity

fix: add widevine request retry logic to work around ratelimits #47

Open
ddirty830 wants to merge 1 commits from ddirty830/OF-DL:fix-widevine-cloudflare-retry into master
pull from: ddirty830/OF-DL:fix-widevine-cloudflare-retry
merge into: sim0n00ps:master
Conversation 0 Commits 1 Files Changed 3 +81 -28
3 changed files with 81 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c8dbb04ed - Show all commits

4
OF DL/Helpers/APIHelper.cs
View File

@ -2805,11 +2805,11 @@ public class APIHelper : IAPIHelper
try try
{ {
var resp1 = PostData(licenceURL, drmHeaders, new byte[] { 0x08, 0x04 }); var resp1 = await PostData(licenceURL, drmHeaders, new byte[] { 0x08, 0x04 });
var certDataB64 = Convert.ToBase64String(resp1); var certDataB64 = Convert.ToBase64String(resp1);
var cdm = new CDMApi(); var cdm = new CDMApi();
var challenge = cdm.GetChallenge(pssh, certDataB64, false, false); var challenge = cdm.GetChallenge(pssh, certDataB64, false, false);
var resp2 = PostData(licenceURL, drmHeaders, challenge); var resp2 = await PostData(licenceURL, drmHeaders, challenge);
var licenseB64 = Convert.ToBase64String(resp2); var licenseB64 = Convert.ToBase64String(resp2);
Log.Debug($"resp1: {resp1}"); Log.Debug($"resp1: {resp1}");
Log.Debug($"certDataB64: {certDataB64}"); Log.Debug($"certDataB64: {certDataB64}");

3
OF DL/Helpers/Constants.cs
View File

@ -3,4 +3,7 @@ namespace OF_DL.Helpers;
public static class Constants public static class Constants
{ {
public const string API_URL = "https://onlyfans.com/api2/v2"; public const string API_URL = "https://onlyfans.com/api2/v2";
public const int WIDEVINE_RETRY_DELAY = 10;
public const int WIDEVINE_MAX_RETRIES = 3;
} }

102
OF DL/HttpUtil.cs
View File

@ -1,4 +1,5 @@
using System; using OF_DL.Helpers;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
@ -13,46 +14,66 @@ namespace WidevineClient
//Proxy = null //Proxy = null
}); });
public static byte[] PostData(string URL, Dictionary<string, string> headers, string postData) public static async Task<byte[]> PostData(string URL, Dictionary<string, string> headers, string postData)
{ {
var mediaType = postData.StartsWith("{") ? "application/json" : "application/x-www-form-urlencoded"; var mediaType = postData.StartsWith("{") ? "application/json" : "application/x-www-form-urlencoded";
StringContent content = new StringContent(postData, Encoding.UTF8, mediaType); var response = await PerformOperation(async () =>
//ByteArrayContent content = new ByteArrayContent(postData); {
StringContent content = new StringContent(postData, Encoding.UTF8, mediaType);
//ByteArrayContent content = new ByteArrayContent(postData);
HttpResponseMessage response = Post(URL, headers, content); return await Post(URL, headers, content);
byte[] bytes = response.Content.ReadAsByteArrayAsync().Result; });
byte[] bytes = await response.Content.ReadAsByteArrayAsync();
return bytes; return bytes;
} }
public static byte[] PostData(string URL, Dictionary<string, string> headers, byte[] postData) public static async Task<byte[]> PostData(string URL, Dictionary<string, string> headers, byte[] postData)
{ {
ByteArrayContent content = new ByteArrayContent(postData); var response = await PerformOperation(async () =>
{
ByteArrayContent content = new ByteArrayContent(postData);
HttpResponseMessage response = Post(URL, headers, content); return await Post(URL, headers, content);
byte[] bytes = response.Content.ReadAsByteArrayAsync().Result; });
byte[] bytes = await response.Content.ReadAsByteArrayAsync();
return bytes; return bytes;
} }
public static byte[] PostData(string URL, Dictionary<string, string> headers, Dictionary<string, string> postData) public static async Task<byte[]> PostData(string URL, Dictionary<string, string> headers, Dictionary<string, string> postData)
{ {
FormUrlEncodedContent content = new FormUrlEncodedContent(postData); var response = await PerformOperation(async () =>
{
FormUrlEncodedContent content = new FormUrlEncodedContent(postData);
HttpResponseMessage response = Post(URL, headers, content); return await Post(URL, headers, content);
byte[] bytes = response.Content.ReadAsByteArrayAsync().Result; });
byte[] bytes = await response.Content.ReadAsByteArrayAsync();
return bytes; return bytes;
} }
public static string GetWebSource(string URL, Dictionary<string, string> headers = null) public static async Task<string> GetWebSource(string URL, Dictionary<string, string> headers = null)
{ {
HttpResponseMessage response = Get(URL, headers); var response = await PerformOperation(async () =>
byte[] bytes = response.Content.ReadAsByteArrayAsync().Result; {
return await Get(URL, headers);
});
byte[] bytes = await response.Content.ReadAsByteArrayAsync();
return Encoding.UTF8.GetString(bytes); return Encoding.UTF8.GetString(bytes);
} }
public static byte[] GetBinary(string URL, Dictionary<string, string> headers = null) public static async Task<byte[]> GetBinary(string URL, Dictionary<string, string> headers = null)
{ {
HttpResponseMessage response = Get(URL, headers); var response = await PerformOperation(async () =>
byte[] bytes = response.Content.ReadAsByteArrayAsync().Result; {
return await Get(URL, headers);
});
byte[] bytes = await response.Content.ReadAsByteArrayAsync();
return bytes; return bytes;
} }
public static string GetString(byte[] bytes) public static string GetString(byte[] bytes)
@ -60,7 +81,7 @@ namespace WidevineClient
return Encoding.UTF8.GetString(bytes); return Encoding.UTF8.GetString(bytes);
} }
static HttpResponseMessage Get(string URL, Dictionary<string, string> headers = null) private static async Task<HttpResponseMessage> Get(string URL, Dictionary<string, string> headers = null)
{ {
HttpRequestMessage request = new HttpRequestMessage() HttpRequestMessage request = new HttpRequestMessage()
{ {
@ -72,10 +93,10 @@ namespace WidevineClient
foreach (KeyValuePair<string, string> header in headers) foreach (KeyValuePair<string, string> header in headers)
request.Headers.TryAddWithoutValidation(header.Key, header.Value); request.Headers.TryAddWithoutValidation(header.Key, header.Value);
return Send(request); return await Send(request);
} }
static HttpResponseMessage Post(string URL, Dictionary<string, string> headers, HttpContent content) private static async Task<HttpResponseMessage> Post(string URL, Dictionary<string, string> headers, HttpContent content)
{ {
HttpRequestMessage request = new HttpRequestMessage() HttpRequestMessage request = new HttpRequestMessage()
{ {
@ -88,12 +109,41 @@ namespace WidevineClient
foreach (KeyValuePair<string, string> header in headers) foreach (KeyValuePair<string, string> header in headers)
request.Headers.TryAddWithoutValidation(header.Key, header.Value); request.Headers.TryAddWithoutValidation(header.Key, header.Value);
return Send(request); return await Send(request);
} }
static HttpResponseMessage Send(HttpRequestMessage request) private static async Task<HttpResponseMessage> Send(HttpRequestMessage request)
{ {
return Client.SendAsync(request).Result; return await Client.SendAsync(request);
}
private static async Task<HttpResponseMessage> PerformOperation(Func<Task<HttpResponseMessage>> operation)
{
var response = await operation();
var retryCount = 0;
while (retryCount < Constants.WIDEVINE_MAX_RETRIES && response.StatusCode == System.Net.HttpStatusCode.TooManyRequests)
{
//
// We've hit a rate limit, so we should wait before retrying.
//
var retryAfterSeconds = Constants.WIDEVINE_RETRY_DELAY * (retryCount + 1); // Default retry time. Increases with each retry.
if (response.Headers.RetryAfter != null && response.Headers.RetryAfter.Delta.HasValue)
{
if (response.Headers.RetryAfter.Delta.Value.TotalSeconds > 0)
retryAfterSeconds = (int)response.Headers.RetryAfter.Delta.Value.TotalSeconds + 1; // Add 1 second to ensure we wait a bit longer than the suggested time
}
await Task.Delay(retryAfterSeconds * 1000); // Peform the delay
response = await operation();
retryCount++;
}
response.EnsureSuccessStatusCode(); // Throw an exception if the response is not successful
return response;
} }
} }
} }