mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-29 03:22:52 +00:00
Compare commits
No commits in common. "120e8d0686157497e838af0339c2290df5ef57ac" and "95e3ebd8156f2b402a6a64a576ffa21e87bd0b78" have entirely different histories.
120e8d0686
...
95e3ebd815
5 changed files with 114 additions and 206 deletions
|
|
@ -466,9 +466,7 @@ public class Global
|
||||||
1280,
|
1280,
|
||||||
1408,
|
1408,
|
||||||
1500,
|
1500,
|
||||||
4064,
|
9000
|
||||||
9000,
|
|
||||||
65535
|
|
||||||
];
|
];
|
||||||
|
|
||||||
public static readonly List<string> TunStacks =
|
public static readonly List<string> TunStacks =
|
||||||
|
|
|
||||||
|
|
@ -1412,11 +1412,6 @@ public class ConfigHandler
|
||||||
{
|
{
|
||||||
profileItem = V2rayFmt.ResolveFull(strData, subRemarks);
|
profileItem = V2rayFmt.ResolveFull(strData, subRemarks);
|
||||||
}
|
}
|
||||||
//Is Html Page
|
|
||||||
if (profileItem is null && HtmlPageFmt.IsHtmlPage(strData))
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
//Is Clash configuration
|
//Is Clash configuration
|
||||||
if (profileItem is null)
|
if (profileItem is null)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,14 @@ public class BaseFmt
|
||||||
|
|
||||||
protected static bool Contains(string str, params string[] s)
|
protected static bool Contains(string str, params string[] s)
|
||||||
{
|
{
|
||||||
return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
|
foreach (var item in s)
|
||||||
|
{
|
||||||
|
if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static string WriteAllText(string strData, string ext = "json")
|
protected static string WriteAllText(string strData, string ext = "json")
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
using SkiaSharp;
|
|
||||||
|
|
||||||
namespace ServiceLib.Handler.Fmt;
|
|
||||||
|
|
||||||
public class HtmlPageFmt : BaseFmt
|
|
||||||
{
|
|
||||||
public static bool IsHtmlPage(string strData)
|
|
||||||
{
|
|
||||||
return Contains(strData, "<html", "<!doctype html", "<head");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -15,144 +15,63 @@ public class SubscriptionHandler
|
||||||
|
|
||||||
foreach (var item in subItem)
|
foreach (var item in subItem)
|
||||||
{
|
{
|
||||||
try
|
var id = item.Id.TrimEx();
|
||||||
|
var url = item.Url.TrimEx();
|
||||||
|
var userAgent = item.UserAgent.TrimEx();
|
||||||
|
var hashCode = $"{item.Remarks}->";
|
||||||
|
if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
|
||||||
{
|
{
|
||||||
if (!IsValidSubscription(item, subId))
|
//_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var hashCode = $"{item.Remarks}->";
|
|
||||||
if (item.Enabled == false)
|
if (item.Enabled == false)
|
||||||
{
|
{
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
|
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create download handler
|
|
||||||
var downloadHandle = CreateDownloadHandler(hashCode, updateFunc);
|
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
|
|
||||||
|
|
||||||
// Get all subscription content (main subscription + additional subscriptions)
|
|
||||||
var result = await DownloadAllSubscriptions(config, item, blProxy, downloadHandle);
|
|
||||||
|
|
||||||
// Process download result
|
|
||||||
await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc);
|
|
||||||
|
|
||||||
updateFunc?.Invoke(false, "-------------------------------------------------------");
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
var hashCode = $"{item.Remarks}->";
|
|
||||||
Logging.SaveLog("UpdateSubscription", ex);
|
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
|
|
||||||
updateFunc?.Invoke(false, "-------------------------------------------------------");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool IsValidSubscription(SubItem item, string subId)
|
|
||||||
{
|
|
||||||
var id = item.Id.TrimEx();
|
|
||||||
var url = item.Url.TrimEx();
|
|
||||||
|
|
||||||
if (id.IsNullOrEmpty() || url.IsNullOrEmpty())
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (subId.IsNotEmpty() && item.Id != subId)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static DownloadService CreateDownloadHandler(string hashCode, Action<bool, string> updateFunc)
|
|
||||||
{
|
|
||||||
var downloadHandle = new DownloadService();
|
var downloadHandle = new DownloadService();
|
||||||
downloadHandle.Error += (sender2, args) =>
|
downloadHandle.Error += (sender2, args) =>
|
||||||
{
|
{
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
|
updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
|
||||||
};
|
};
|
||||||
return downloadHandle;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<string> DownloadSubscriptionContent(DownloadService downloadHandle, string url, bool blProxy, string userAgent)
|
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
|
||||||
{
|
|
||||||
var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
|
|
||||||
|
|
||||||
// If download with proxy fails, try direct connection
|
//one url
|
||||||
if (blProxy && result.IsNullOrEmpty())
|
url = Utils.GetPunycode(url);
|
||||||
{
|
//convert
|
||||||
result = await downloadHandle.TryDownloadString(url, false, userAgent);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result ?? string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<string> DownloadAllSubscriptions(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
|
|
||||||
{
|
|
||||||
// Download main subscription content
|
|
||||||
var result = await DownloadMainSubscription(config, item, blProxy, downloadHandle);
|
|
||||||
|
|
||||||
// Process additional subscription links (if any)
|
|
||||||
if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
|
|
||||||
{
|
|
||||||
result = await DownloadAdditionalSubscriptions(item, result, blProxy, downloadHandle);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<string> DownloadMainSubscription(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
|
|
||||||
{
|
|
||||||
// Prepare subscription URL and download directly
|
|
||||||
var url = Utils.GetPunycode(item.Url.TrimEx());
|
|
||||||
|
|
||||||
// If conversion is needed
|
|
||||||
if (item.ConvertTarget.IsNotEmpty())
|
if (item.ConvertTarget.IsNotEmpty())
|
||||||
{
|
{
|
||||||
var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty()
|
var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
|
||||||
? Global.SubConvertUrls.FirstOrDefault()
|
|
||||||
: config.ConstItem.SubConvertUrl;
|
|
||||||
|
|
||||||
url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
|
url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
|
||||||
|
|
||||||
if (!url.Contains("target="))
|
if (!url.Contains("target="))
|
||||||
{
|
{
|
||||||
url += string.Format("&target={0}", item.ConvertTarget);
|
url += string.Format("&target={0}", item.ConvertTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!url.Contains("config="))
|
if (!url.Contains("config="))
|
||||||
{
|
{
|
||||||
url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
|
url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
|
||||||
// Download and return result directly
|
if (blProxy && result.IsNullOrEmpty())
|
||||||
return await DownloadSubscriptionContent(downloadHandle, url, blProxy, item.UserAgent);
|
{
|
||||||
|
result = await downloadHandle.TryDownloadString(url, false, userAgent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<string> DownloadAdditionalSubscriptions(SubItem item, string mainResult, bool blProxy, DownloadService downloadHandle)
|
//more url
|
||||||
|
if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
|
||||||
{
|
{
|
||||||
var result = mainResult;
|
|
||||||
|
|
||||||
// If main subscription result is Base64 encoded, decode it first
|
|
||||||
if (result.IsNotEmpty() && Utils.IsBase64String(result))
|
if (result.IsNotEmpty() && Utils.IsBase64String(result))
|
||||||
{
|
{
|
||||||
result = Utils.Base64Decode(result);
|
result = Utils.Base64Decode(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process additional URL list
|
|
||||||
var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
|
var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
|
||||||
foreach (var it in lstUrl)
|
foreach (var it in lstUrl)
|
||||||
{
|
{
|
||||||
|
|
@ -162,53 +81,53 @@ public class SubscriptionHandler
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var additionalResult = await DownloadSubscriptionContent(downloadHandle, url2, blProxy, item.UserAgent);
|
var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
|
||||||
|
if (blProxy && result2.IsNullOrEmpty())
|
||||||
if (additionalResult.IsNotEmpty())
|
|
||||||
{
|
{
|
||||||
// Process additional subscription results, add to main result
|
result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
|
||||||
if (Utils.IsBase64String(additionalResult))
|
}
|
||||||
|
if (result2.IsNotEmpty())
|
||||||
{
|
{
|
||||||
result += Environment.NewLine + Utils.Base64Decode(additionalResult);
|
if (Utils.IsBase64String(result2))
|
||||||
|
{
|
||||||
|
result += Environment.NewLine + Utils.Base64Decode(result2);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
result += Environment.NewLine + additionalResult;
|
result += Environment.NewLine + result2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task ProcessDownloadResult(Config config, string id, string result, string hashCode, Action<bool, string> updateFunc)
|
|
||||||
{
|
|
||||||
if (result.IsNullOrEmpty())
|
if (result.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
|
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
|
updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
|
||||||
|
if (result?.Length < 99)
|
||||||
// If result is too short, display content directly
|
|
||||||
if (result.Length < 99)
|
|
||||||
{
|
{
|
||||||
updateFunc?.Invoke(false, $"{hashCode}{result}");
|
updateFunc?.Invoke(false, $"{hashCode}{result}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add servers to configuration
|
|
||||||
var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
|
var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
{
|
{
|
||||||
Logging.SaveLog("FailedImportSubscription");
|
Logging.SaveLog("FailedImportSubscription");
|
||||||
Logging.SaveLog(result);
|
Logging.SaveLog(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update completion message
|
|
||||||
updateFunc?.Invoke(false,
|
updateFunc?.Invoke(false,
|
||||||
ret > 0
|
ret > 0
|
||||||
? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
|
? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
|
||||||
: $"{hashCode}{ResUI.MsgFailedImportSubscription}");
|
: $"{hashCode}{ResUI.MsgFailedImportSubscription}");
|
||||||
}
|
}
|
||||||
|
updateFunc?.Invoke(false, "-------------------------------------------------------");
|
||||||
|
|
||||||
|
//await ConfigHandler.DedupServerList(config, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue