GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-30 19:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新 Controller类

Browse Source 
改善错误输出
This commit is contained in:
ChsBuffer
2020-07-17 19:18:29 +08:00
parent a779295525
commit 281c67aced
17 changed files with 195 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Netch/Controllers/EncryptedProxy/SSController.cs
View File

@@ -1,5 +1,4 @@
using System.Diagnostics;
using System.Text;
using System.Text;
using System.Threading;
using Netch.Models;
using Netch.Utils;
@@ -10,8 +9,10 @@ namespace Netch.Controllers
{
public SSController()
{
MainFile = "Shadowsocks";
InitCheck();
Name = "Shadowsocks";
MainFile = "Shadowsocks.exe";
StartedKeywords("listening at");
StoppedKeywords("Invalid config path","usage","plugin service exit unexpectedly");
}
public override bool Start(Server server, Mode mode)
@@ -45,8 +46,7 @@ namespace Netch.Controllers
return true;
}
if (!Ready) return false;
Instance = GetProcess("bin\\Shadowsocks.exe");
Instance = GetProcess();
Instance.StartInfo.Arguments = $"-s {server.Hostname} -p {server.Port} -b {Global.Settings.LocalAddress} -l {Global.Settings.Socks5LocalPort} -m {server.EncryptMethod} -k \"{server.Password}\" -u";
if (!string.IsNullOrWhiteSpace(server.Plugin) && !string.IsNullOrWhiteSpace(server.PluginOption))
@@ -89,18 +89,5 @@ namespace Netch.Controllers
else
StopInstance();
}
public override void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
{
if (!Write(e.Data)) return;
if (State == State.Starting)
{
if (Instance.HasExited)
State = State.Stopped;
else if (e.Data.Contains("listening at"))
State = State.Started;
else if (e.Data.Contains("Invalid config path") || e.Data.Contains("usage") || e.Data.Contains("plugin service exit unexpectedly")) State = State.Stopped;
}
}
}
}