Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-10-13 20:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update CoreManager.cs

Browse source
This commit is contained in:
xujie86 2025-09-25 05:48:37 +08:00 committed by GitHub
parent 82b69933f3
commit 6a31641228
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 64 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
v2rayN/ServiceLib/Manager/CoreManager.cs
View file

@ -17,6 +17,13 @@ public class CoreManager
private Func<bool, string, Task>? _updateFunc; private Func<bool, string, Task>? _updateFunc;
private const string _tag = "CoreHandler"; private const string _tag = "CoreHandler";
private sealed class ProcBindings
{
public DataReceivedEventHandler? DataHandler;
public EventHandler? ExitHandler;
}
private readonly Dictionary<int, ProcBindings> _procBindings = new();
public async Task Init(Config config, Func<bool, string, Task> updateFunc) public async Task Init(Config config, Func<bool, string, Task> updateFunc)
{ {
_config = config; _config = config;
@ -161,6 +168,23 @@ public class CoreManager
{ {
try { _process.CancelOutputRead(); } catch { } try { _process.CancelOutputRead(); } catch { }
try { _process.CancelErrorRead(); } catch { } try { _process.CancelErrorRead(); } catch { }
ProcBindings? b = null;
lock (_procBindings)
{
if (_process is not null)
{
_procBindings.TryGetValue(_process.Id, out b);
_procBindings.Remove(_process.Id);
}
}
if (b is not null)
{
try { _process.OutputDataReceived -= b.DataHandler; } catch { }
try { _process.ErrorDataReceived -= b.DataHandler; } catch { }
try { _process.Exited -= b.ExitHandler; } catch { }
}
await ProcUtils.ProcessKill(_process, Utils.IsWindows()); await ProcUtils.ProcessKill(_process, Utils.IsWindows());
try { _process.Dispose(); } catch { } try { _process.Dispose(); } catch { }
_process = null; _process = null;
@ -170,6 +194,23 @@ public class CoreManager
{ {
try { _processPre.CancelOutputRead(); } catch { } try { _processPre.CancelOutputRead(); } catch { }
try { _processPre.CancelErrorRead(); } catch { } try { _processPre.CancelErrorRead(); } catch { }
ProcBindings? b2 = null;
lock (_procBindings)
{
if (_processPre is not null)
{
_procBindings.TryGetValue(_processPre.Id, out b2);
_procBindings.Remove(_processPre.Id);
}
}
if (b2 is not null)
{
try { _processPre.OutputDataReceived -= b2.DataHandler; } catch { }
try { _processPre.ErrorDataReceived -= b2.DataHandler; } catch { }
try { _processPre.Exited -= b2.ExitHandler; } catch { }
}
await ProcUtils.ProcessKill(_processPre, Utils.IsWindows()); await ProcUtils.ProcessKill(_processPre, Utils.IsWindows());
try { _processPre.Dispose(); } catch { } try { _processPre.Dispose(); } catch { }
_processPre = null; _processPre = null;
@ -285,42 +326,48 @@ public class CoreManager
proc.StartInfo.Environment[kv.Key] = string.Format(kv.Value, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath); proc.StartInfo.Environment[kv.Key] = string.Format(kv.Value, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath);
} }
DataReceivedEventHandler? dataHandler = null; ProcBindings? bindings = null;
EventHandler? exitedHandler = null;
if (displayLog) if (displayLog)
{ {
dataHandler = (sender, e) => bindings = new ProcBindings();
bindings.DataHandler = (sender, e) =>
{ {
if (e.Data.IsNotEmpty()) if (e.Data.IsNotEmpty())
{ {
_ = UpdateFunc(false, e.Data + Environment.NewLine); _ = UpdateFunc(false, e.Data + Environment.NewLine);
} }
}; };
proc.OutputDataReceived += dataHandler; proc.OutputDataReceived += bindings.DataHandler;
proc.ErrorDataReceived += dataHandler; proc.ErrorDataReceived += bindings.DataHandler;
exitedHandler = (s, e) => bindings.ExitHandler = (s, e) =>
{ {
try { proc.CancelOutputRead(); } catch { } try { proc.CancelOutputRead(); } catch { }
try { proc.CancelErrorRead(); } catch { } try { proc.CancelErrorRead(); } catch { }
if (dataHandler is not null) if (bindings.DataHandler is not null)
{ {
try { proc.OutputDataReceived -= dataHandler; } catch { } try { proc.OutputDataReceived -= bindings.DataHandler; } catch { }
try { proc.ErrorDataReceived -= dataHandler; } catch { } try { proc.ErrorDataReceived -= bindings.DataHandler; } catch { }
} }
if (exitedHandler is not null) if (bindings.ExitHandler is not null)
{ {
try { proc.Exited -= exitedHandler; } catch { } try { proc.Exited -= bindings.ExitHandler; } catch { }
} }
lock (_procBindings) { _procBindings.Remove(proc.Id); }
}; };
proc.Exited += exitedHandler; proc.Exited += bindings.ExitHandler;
} }
proc.Start(); proc.Start();
if (displayLog) if (displayLog)
{ {
lock (_procBindings)
{
_procBindings[proc.Id] = bindings!;
}
proc.BeginOutputReadLine(); proc.BeginOutputReadLine();
proc.BeginErrorReadLine(); proc.BeginErrorReadLine();
} }
@ -329,13 +376,14 @@ public class CoreManager
AppManager.Instance.AddProcess(proc.Handle); AppManager.Instance.AddProcess(proc.Handle);
if (proc is null or { HasExited: true }) if (proc is null or { HasExited: true })
{ {
if (displayLog && dataHandler is not null) if (displayLog && bindings is not null)
{ {
try { proc.CancelOutputRead(); } catch { } try { proc.CancelOutputRead(); } catch { }
try { proc.CancelErrorRead(); } catch { } try { proc.CancelErrorRead(); } catch { }
try { proc.OutputDataReceived -= dataHandler; } catch { } try { proc.OutputDataReceived -= bindings.DataHandler; } catch { }
try { proc.ErrorDataReceived -= dataHandler; } catch { } try { proc.ErrorDataReceived -= bindings.DataHandler; } catch { }
if (exitedHandler is not null) { try { proc.Exited -= exitedHandler; } catch { } } try { proc.Exited -= bindings.ExitHandler; } catch { }
lock (_procBindings) { _procBindings.Remove(proc.Id); }
} }
throw new Exception(ResUI.FailedToRunCore); throw new Exception(ResUI.FailedToRunCore);
} }