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

Add a start up error receiver.

Browse source
This commit is contained in:
Minghao Hu 2024-02-12 22:12:57 +09:00
parent b0fb00d597
commit 44cfa2d8dc
1 changed files with 19 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
v2rayN/v2rayN/Handler/CoreHandler.cs
View file

@ -154,7 +154,9 @@ namespace v2rayN.Handler
} }
} }
private string CoreFindexe(CoreInfo coreInfo) #region Private
private string CoreFindExe(CoreInfo coreInfo)
{ {
string fileName = string.Empty; string fileName = string.Empty;
foreach (string name in coreInfo.coreExes) foreach (string name in coreInfo.coreExes)
@ -233,52 +235,11 @@ namespace v2rayN.Handler
ShowMsg(false, configPath); ShowMsg(false, configPath);
try try
{ {
var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray); var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
string fileName = CoreFindexe(coreInfo); var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
if (fileName == "") return -1; if (proc is null)
Process p = new()
{ {
StartInfo = new ProcessStartInfo return -1;
{
FileName = fileName,
Arguments = "-config stdin:",
WorkingDirectory = Utils.GetConfigPath(),
UseShellExecute = false,
RedirectStandardInput = true,
RedirectStandardOutput = true,
RedirectStandardError = true,
CreateNoWindow = true,
StandardOutputEncoding = Encoding.UTF8,
StandardErrorEncoding = Encoding.UTF8
}
};
p.OutputDataReceived += (sender, e) =>
{
if (!String.IsNullOrEmpty(e.Data))
{
string msg = e.Data + Environment.NewLine;
ShowMsg(false, msg);
}
};
p.ErrorDataReceived += (sender, e) =>
{
if (!string.IsNullOrEmpty(e.Data))
{
string msg = e.Data + Environment.NewLine;
ShowMsg(false, msg);
}
};
p.Start();
p.BeginOutputReadLine();
p.BeginErrorReadLine();
p.StandardInput.Write(configStr);
p.StandardInput.Close();
if (p.WaitForExit(1000))
{
throw new Exception(p.StandardError.ReadToEnd());
} }
return proc.Id; return proc.Id;
@ -325,6 +286,8 @@ namespace v2rayN.Handler
StandardErrorEncoding = displayLog ? Encoding.UTF8 : null, StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
} }
}; };
var startUpErrorMessage = new StringBuilder();
var startUpSuccessful = false;
if (displayLog) if (displayLog)
{ {
proc.OutputDataReceived += (sender, e) => proc.OutputDataReceived += (sender, e) =>
@ -341,6 +304,11 @@ namespace v2rayN.Handler
{ {
string msg = e.Data + Environment.NewLine; string msg = e.Data + Environment.NewLine;
update(false, msg); update(false, msg);
if (!startUpSuccessful)
{
startUpErrorMessage.Append(msg);
}
} }
}; };
} }
@ -354,7 +322,11 @@ namespace v2rayN.Handler
if (proc.WaitForExit(1000)) if (proc.WaitForExit(1000))
{ {
proc.CancelErrorRead(); proc.CancelErrorRead();
throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)"); throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
}
else
{
startUpSuccessful = true;
} }
LazyConfig.Instance.AddProcess(proc.Handle); LazyConfig.Instance.AddProcess(proc.Handle);