mirror of
https://github.com/2dust/v2rayN.git
synced 2026-05-17 20:54:36 +03:00
Add periodic update checks and core support
This commit is contained in:
@@ -50,6 +50,50 @@ public sealed class CoreInfoManager
|
||||
return fileName;
|
||||
}
|
||||
|
||||
public List<ECoreType> GetCheckUpdateCoreTypes()
|
||||
{
|
||||
var lst = new List<ECoreType>();
|
||||
|
||||
if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
|
||||
{
|
||||
if (IsCheckUpdateSupported(ECoreType.v2rayN))
|
||||
{
|
||||
lst.Add(ECoreType.v2rayN);
|
||||
}
|
||||
|
||||
if (!(Utils.IsWindows() && Environment.OSVersion.Version.Major < 10))
|
||||
{
|
||||
lst.Add(ECoreType.Xray);
|
||||
lst.Add(ECoreType.mihomo);
|
||||
lst.Add(ECoreType.sing_box);
|
||||
}
|
||||
}
|
||||
|
||||
return lst;
|
||||
}
|
||||
|
||||
public bool IsCheckUpdateSupported(ECoreType type)
|
||||
{
|
||||
return type switch
|
||||
{
|
||||
ECoreType.v2rayN => !Utils.IsPackagedInstall(),
|
||||
ECoreType.Xray => true,
|
||||
ECoreType.mihomo => true,
|
||||
ECoreType.sing_box => true,
|
||||
_ => false,
|
||||
};
|
||||
}
|
||||
|
||||
public bool GetCheckPreRelease(ECoreType type, bool preRelease)
|
||||
{
|
||||
return type switch
|
||||
{
|
||||
ECoreType.v2rayN => preRelease,
|
||||
ECoreType.Xray => preRelease,
|
||||
_ => false,
|
||||
};
|
||||
}
|
||||
|
||||
private void InitCoreInfo()
|
||||
{
|
||||
var urlN = GetCoreUrl(ECoreType.v2rayN);
|
||||
|
||||
@@ -70,6 +70,18 @@ public class TaskManager
|
||||
}
|
||||
}
|
||||
|
||||
//Execute once 24 hour
|
||||
if (numOfExecuted % 1440 == 1)
|
||||
{
|
||||
try
|
||||
{
|
||||
await UpdateTaskRunCheckUpdate();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logging.SaveLog("ScheduledTasks - UpdateTaskRunCheckUpdate", ex);
|
||||
}
|
||||
}
|
||||
numOfExecuted++;
|
||||
}
|
||||
}
|
||||
@@ -117,4 +129,18 @@ public class TaskManager
|
||||
}).UpdateGeoFileAll();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task UpdateTaskRunCheckUpdate()
|
||||
{
|
||||
Logging.SaveLog("Execute check update");
|
||||
|
||||
var updateService = new UpdateService(_config, async (success, msg) => await Task.CompletedTask);
|
||||
|
||||
var msgs = await updateService.CheckHasUpdateOnlyAll(_config.CheckUpdateItem.CheckPreReleaseUpdate);
|
||||
foreach (var msg in msgs)
|
||||
{
|
||||
await _updateFunc?.Invoke(false, msg);
|
||||
}
|
||||
NoticeManager.Instance.Enqueue(string.Join("\n", msgs));
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+9
@@ -1887,6 +1887,15 @@ namespace ServiceLib.Resx {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 {0} has a new version available: {1} 的本地化字符串。
|
||||
/// </summary>
|
||||
public static string MsgCheckUpdateHasNewVersion {
|
||||
get {
|
||||
return ResourceManager.GetString("MsgCheckUpdateHasNewVersion", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找类似 Core '{0}' does not support network type '{1}' 的本地化字符串。
|
||||
/// </summary>
|
||||
|
||||
@@ -1731,4 +1731,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>Export v2rayN Internal Share Link to Clipboard</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} has a new version available: {1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1728,4 +1728,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>Export v2rayN Internal Share Link to Clipboard</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} has a new version available: {1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1731,4 +1731,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>Export v2rayN Internal Share Link to Clipboard</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} has a new version available: {1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1731,4 +1731,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>Export v2rayN Internal Share Link to Clipboard</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} has a new version available: {1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1731,4 +1731,7 @@
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>Экспорт внутренней ссылки v2rayN в буфер обмена</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} has a new version available: {1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1728,4 +1728,7 @@
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>导出 v2rayN 内部分享链接至剪贴板 (多选)</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} 有新版本可用:{1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1728,4 +1728,7 @@
|
||||
<data name="menuExport2InnerUri" xml:space="preserve">
|
||||
<value>匯出 v2rayN 內部分享連結至剪貼簿(多選)</value>
|
||||
</data>
|
||||
<data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
|
||||
<value>{0} 有新版本可用:{1}</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -100,6 +100,32 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<UpdateResult> CheckHasUpdateOnly(ECoreType type, bool preRelease)
|
||||
{
|
||||
if (!CoreInfoManager.Instance.IsCheckUpdateSupported(type))
|
||||
{
|
||||
return new UpdateResult(false, "Not Support");
|
||||
}
|
||||
|
||||
var downloadHandle = new DownloadService();
|
||||
var checkPreRelease = CoreInfoManager.Instance.GetCheckPreRelease(type, preRelease);
|
||||
return await CheckUpdateAsync(downloadHandle, type, checkPreRelease);
|
||||
}
|
||||
|
||||
public async Task<List<string>> CheckHasUpdateOnlyAll(bool preRelease)
|
||||
{
|
||||
var msgs = new List<string>();
|
||||
foreach (var type in CoreInfoManager.Instance.GetCheckUpdateCoreTypes())
|
||||
{
|
||||
var result = await CheckHasUpdateOnly(type, preRelease);
|
||||
if (result.Success && result.Version != null)
|
||||
{
|
||||
msgs.Add(string.Format(ResUI.MsgCheckUpdateHasNewVersion, type, result.Version));
|
||||
}
|
||||
}
|
||||
return msgs;
|
||||
}
|
||||
|
||||
public async Task UpdateGeoFileAll()
|
||||
{
|
||||
await UpdateGeoFiles();
|
||||
|
||||
@@ -37,17 +37,11 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||
{
|
||||
CheckUpdateModels.Clear();
|
||||
|
||||
if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
|
||||
foreach (var type in CoreInfoManager.Instance.GetCheckUpdateCoreTypes())
|
||||
{
|
||||
CheckUpdateModels.Add(GetCheckUpdateModel(_v2rayN));
|
||||
//Not Windows and under Win10
|
||||
if (!(Utils.IsWindows() && Environment.OSVersion.Version.Major < 10))
|
||||
{
|
||||
CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.Xray.ToString()));
|
||||
CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.mihomo.ToString()));
|
||||
CheckUpdateModels.Add(GetCheckUpdateModel(ECoreType.sing_box.ToString()));
|
||||
}
|
||||
CheckUpdateModels.Add(GetCheckUpdateModel(type.ToString()));
|
||||
}
|
||||
|
||||
CheckUpdateModels.Add(GetCheckUpdateModel(_geo));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user