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

Update CoreManager.cs

Browse source
This commit is contained in:
JieXu 2025-09-25 04:58:11 +08:00 committed by GitHub
parent faff8e4ea2
commit 94e86c03c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,13 +159,19 @@ public class CoreManager
if (_process != null) if (_process != null)
{ {
try { _process.CancelOutputRead(); } catch { }
try { _process.CancelErrorRead(); } catch { }
await ProcUtils.ProcessKill(_process, Utils.IsWindows()); await ProcUtils.ProcessKill(_process, Utils.IsWindows());
try { _process.Dispose(); } catch { }
_process = null; _process = null;
} }
if (_processPre != null) if (_processPre != null)
{ {
try { _processPre.CancelOutputRead(); } catch { }
try { _processPre.CancelErrorRead(); } catch { }
await ProcUtils.ProcessKill(_processPre, Utils.IsWindows()); await ProcUtils.ProcessKill(_processPre, Utils.IsWindows());
try { _processPre.Dispose(); } catch { }
_processPre = null; _processPre = null;
} }
} }
@ -271,25 +277,46 @@ public class CoreManager
CreateNoWindow = true, CreateNoWindow = true,
StandardOutputEncoding = displayLog ? Encoding.UTF8 : null, StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
StandardErrorEncoding = displayLog ? Encoding.UTF8 : null, StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
} },
EnableRaisingEvents = true
}; };
foreach (var kv in coreInfo.Environment) foreach (var kv in coreInfo.Environment)
{ {
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;
EventHandler? exitedHandler = null;
if (displayLog) if (displayLog)
{ {
void dataHandler(object sender, DataReceivedEventArgs e) 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 += dataHandler;
proc.ErrorDataReceived += dataHandler; proc.ErrorDataReceived += dataHandler;
exitedHandler = (s, e) =>
{
try { proc.CancelOutputRead(); } catch { }
try { proc.CancelErrorRead(); } catch { }
if (dataHandler is not null)
{
try { proc.OutputDataReceived -= dataHandler; } catch { }
try { proc.ErrorDataReceived -= dataHandler; } catch { }
}
if (exitedHandler is not null)
{
try { proc.Exited -= exitedHandler; } catch { }
}
};
proc.Exited += exitedHandler;
} }
proc.Start(); proc.Start();
if (displayLog) if (displayLog)
@ -302,6 +329,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)
{
try { proc.CancelOutputRead(); } catch { }
try { proc.CancelErrorRead(); } catch { }
try { proc.OutputDataReceived -= dataHandler; } catch { }
try { proc.ErrorDataReceived -= dataHandler; } catch { }
if (exitedHandler is not null) { try { proc.Exited -= exitedHandler; } catch { } }
}
throw new Exception(ResUI.FailedToRunCore); throw new Exception(ResUI.FailedToRunCore);
} }
return proc; return proc;