Add underlying-proxy, smart policy group support for surge and renaming surge wireguard section

.gitignore

@@ -3,3 +3,4 @@ subconverter.exe
 cmake-build-debug
 .idea
 base/cache
+build

src/config/binding.h

@@ -64,6 +64,16 @@ namespace toml
  case "ssid"_hash:
  conf.Type = ProxyGroupType::SSID;
  break;
+ case "smart"_hash:
+ conf.Type = ProxyGroupType::Smart;
+ conf.Url = toml::find<String>(v, "url");
+ conf.Interval = toml::find<Integer>(v, "interval");
+ conf.Tolerance = toml::find_or<Integer>(v, "tolerance", 0);
+ if(v.contains("lazy"))
+ conf.Lazy = toml::find_or<bool>(v, "lazy", false);
+ if(v.contains("evaluate-before-use"))
+ conf.EvaluateBeforeUse = toml::find_or(v, "evaluate-before-use", conf.EvaluateBeforeUse.get());
+ break;
  default:
  throw toml::syntax_error("Proxy Group has incorrect type, should be one of following:\n select, url-test, load-balance, fallback, relay, ssid", v.at("type").location());
  }
@@ -220,6 +230,9 @@ namespace INIBinding
  case "ssid"_hash:
  conf.Type = ProxyGroupType::SSID;
  break;
+ case "smart"_hash:
+ conf.Type = ProxyGroupType::Smart;
+ break;
  default:
  continue;
  }

src/config/proxygroup.h

@@ -10,7 +10,8 @@ enum class ProxyGroupType
  Fallback,
  LoadBalance,
  Relay,
- SSID
+ SSID,
+ Smart
 };
 
 enum class BalanceStrategy
@@ -45,6 +46,7 @@ struct ProxyGroupConfig
  case ProxyGroupType::Fallback: return "fallback";
  case ProxyGroupType::Relay: return "relay";
  case ProxyGroupType::SSID: return "ssid";
+ case ProxyGroupType::Smart: return "smart";
  }
  return "";
  }

src/generator/config/subexport.cpp

@@ -518,7 +518,10 @@ void proxyToClash(std::vector<Proxy> &nodes, YAML::Node &yamlnode, const ProxyGr
  string_array filtered_nodelist;
 
  singlegroup["name"] = x.Name;
- singlegroup["type"] = x.TypeStr();
+ if (x.Type == ProxyGroupType::Smart)
+ singlegroup["type"] = "url-test";
+ else
+ singlegroup["type"] = x.TypeStr();
 
  switch(x.Type)
  {
@@ -528,6 +531,8 @@ void proxyToClash(std::vector<Proxy> &nodes, YAML::Node &yamlnode, const ProxyGr
  case ProxyGroupType::LoadBalance:
  singlegroup["strategy"] = x.StrategyStr();
  [[fallthrough]];
+ case ProxyGroupType::Smart:
+ [[fallthrough]];
  case ProxyGroupType::URLTest:
  if(!x.Lazy.is_undef())
  singlegroup["lazy"] = x.Lazy.get();
@@ -691,7 +696,7 @@ std::string proxyToSurge(std::vector<Proxy> &nodes, const std::string &base_conf
 
  processRemark(x.Remark, remarks_list);
 
- std::string &hostname = x.Hostname, &username = x.Username, &password = x.Password, &method = x.EncryptMethod, &id = x.UserId, &transproto = x.TransferProtocol, &host = x.Host, &edge = x.Edge, &path = x.Path, &protocol = x.Protocol, &protoparam = x.ProtocolParam, &obfs = x.OBFS, &obfsparam = x.OBFSParam, &plugin = x.Plugin, &pluginopts = x.PluginOption;
+ std::string &hostname = x.Hostname, &username = x.Username, &password = x.Password, &method = x.EncryptMethod, &id = x.UserId, &transproto = x.TransferProtocol, &host = x.Host, &edge = x.Edge, &path = x.Path, &protocol = x.Protocol, &protoparam = x.ProtocolParam, &obfs = x.OBFS, &obfsparam = x.OBFSParam, &plugin = x.Plugin, &pluginopts = x.PluginOption, &underlying_proxy = x.UnderlyingProxy;
  std::string port = std::to_string(x.Port);
  bool &tlssecure = x.TLSSecure;
 
@@ -704,7 +709,9 @@ std::string proxyToSurge(std::vector<Proxy> &nodes, const std::string &base_conf
  std::string proxy, section, real_section;
  string_array args, headers;
 
- switch(x.Type)
+ std::stringstream ss;
+
+ switch (x.Type)
  {
  case ProxyType::Shadowsocks:
  if(surge_ver >= 3 || surge_ver == -3)
@@ -833,7 +840,8 @@ std::string proxyToSurge(std::vector<Proxy> &nodes, const std::string &base_conf
  case ProxyType::WireGuard:
  if(surge_ver < 4 && surge_ver != -3)
  continue;
- section = randomStr(5);
+ ss << std::hex << hash_(x.Remark);
+ section = ss.str().substr(0, 5);
  real_section = "WireGuard " + section;
  proxy = "wireguard, section-name=" + section;
  if(!x.TestUrl.empty())
@@ -861,7 +869,10 @@ std::string proxyToSurge(std::vector<Proxy> &nodes, const std::string &base_conf
  if(!udp.is_undef())
  proxy += ", udp-relay=" + udp.get_str();
 
- if(ext.nodelist)
+ if (underlying_proxy != "")
+ proxy += ", underlying-proxy=" + underlying_proxy;
+
+ if (ext.nodelist)
  output_nodelist += x.Remark + " = " + proxy + "\n";
  else
  {
@@ -884,6 +895,7 @@ std::string proxyToSurge(std::vector<Proxy> &nodes, const std::string &base_conf
  switch(x.Type)
  {
  case ProxyGroupType::Select:
+ case ProxyGroupType::Smart:
  case ProxyGroupType::URLTest:
  case ProxyGroupType::Fallback:
  break;

src/parser/config/proxy.h

@@ -85,6 +85,8 @@ struct Proxy
  tribool AllowInsecure;
  tribool TLS13;
 
+ String UnderlyingProxy;
+
  uint16_t SnellVersion = 0;
  String ServerName;