Enhancements

Fix not correctly loading configuration file when api_mode is false. Add support for exporting Surge DOMAIN-SET. Add INSERT group match flag to match insert_url only. Optimize codes.
2025-10-29 21:03:00 +00:00 · 2020-04-28 14:46:28 +08:00
parent cb6f6ec6e9
commit a22c77c877
3 changed files with 46 additions and 21 deletions
--- a/src/interfaces.cpp
+++ b/src/interfaces.cpp
@@ -96,12 +96,12 @@ const string_array quanx_rule_type = {basic_types, "USER-AGENT", "HOST", "HOST-S

 std::string getRuleset(RESPONSE_CALLBACK_ARGS)
 {
-    /// type: 1 for Surge, 2 for Quantumult X, 3 for Clash domain rule-provider, 4 for Clash ipcidr rule-provider
+    /// type: 1 for Surge, 2 for Quantumult X, 3 for Clash domain rule-provider, 4 for Clash ipcidr rule-provider, 5 for Surge DOMAIN-SET
    std::string url = urlsafe_base64_decode(getUrlArg(argument, "url")), type = getUrlArg(argument, "type"), group = urlsafe_base64_decode(getUrlArg(argument, "group"));
    std::string output_content, dummy;
    int type_int = to_int(type, 0);

-    if(!url.size() || !type.size() || (type_int == 2 && !group.size()) || (type_int < 1 && type_int > 4))
+    if(!url.size() || !type.size() || (type_int == 2 && !group.size()) || (type_int < 1 && type_int > 5))
    {
        *status_code = 400;
        return "Invalid request!";
@@ -172,6 +172,25 @@ std::string getRuleset(RESPONSE_CALLBACK_ARGS)
                continue;
            output_content += "  - '" + vArray[1] + "'\n";
            continue;
+        case 5:
+            if(!startsWith(strLine, "DOMAIN-SUFFIX,") && !startsWith(strLine, "DOMAIN,"))
+                continue;
+            vArray = split(strLine, ",");
+            if(vArray.size() < 2)
+                continue;
+            vArray[1] = regTrim(vArray[1]);
+            switch(hash_(vArray[0]))
+            {
+            case "DOMAIN-SUFFIX"_hash:
+            case "DOMAIN"_hash:
+                strLine = vArray[1];
+                break;
+            //case "DOMAIN_KEYWORD"_hash:
+                //strLine = "  - '." + vArray[1] + ".*'";
+                //break;
+            }
+            output_content += strLine + "\n";
+            continue;
        }

        lineSize = strLine.size();
@@ -199,7 +218,7 @@ std::string getRuleset(RESPONSE_CALLBACK_ARGS)
    if(type_int == 3 && output_content == "payload:\n")
        output_content += "  - '--placeholder--'";
    if(type_int == 4 && output_content == "payload:\n")
-        output_content += "  - '255.255.255.255/32'";
+        output_content += "  - '0.0.0.0/32'";
    return output_content;
 }

@@ -471,7 +490,7 @@ void readYAMLConf(YAML::Node &node)
        {
            strLine = std::accumulate(std::next(tempArray.begin()), tempArray.end(), tempArray[0], [](std::string a, std::string b)
            {
-                return std::move(a) + "|" + std::move(b);
+                return std::move(b) + "|" + std::move(a); // add in reverse order
            });
            insert_url = strLine;
            eraseElements(tempArray);
@@ -707,6 +726,12 @@ void readConf()
    ini.GetIfExist("api_access_token", access_token);
    ini.GetIfExist("default_url", default_url);
    ini.GetIfExist("insert_url", insert_url);
+    tempArray = split(insert_url, "|");
+    if(tempArray.size())
+        insert_url = std::accumulate(std::next(tempArray.begin()), tempArray.end(), tempArray[0], [](std::string a, std::string b)
+        {
+            return std::move(b) + "|" + std::move(a);
+        });
    if(ini.ItemPrefixExist("exclude_remarks"))
        ini.GetAll("exclude_remarks", def_exclude_remarks);
    if(ini.ItemPrefixExist("include_remarks"))
@@ -1075,13 +1100,16 @@ void generateBase()

 std::string subconverter(RESPONSE_CALLBACK_ARGS)
 {
+    //check if we need to read configuration
+    if((!api_mode || cfw_child_process) && !generator_mode)
+        readConf();
    std::string target = getUrlArg(argument, "target"), url = UrlDecode(getUrlArg(argument, "url")), emoji = getUrlArg(argument, "emoji");
    std::string group = UrlDecode(getUrlArg(argument, "group")), upload = getUrlArg(argument, "upload"), upload_path = getUrlArg(argument, "upload_path"), version = getUrlArg(argument, "ver");
    std::string append_type = getUrlArg(argument, "append_type"), tfo = getUrlArg(argument, "tfo"), udp = getUrlArg(argument, "udp"), nodelist = getUrlArg(argument, "list");
    std::string include = UrlDecode(getUrlArg(argument, "include")), exclude = UrlDecode(getUrlArg(argument, "exclude")), sort_flag = getUrlArg(argument, "sort");
    std::string scv = getUrlArg(argument, "scv"), fdn = getUrlArg(argument, "fdn"), expand = getUrlArg(argument, "expand"), append_sub_userinfo = getUrlArg(argument, "append_info");
    std::string dev_id = getUrlArg(argument, "dev_id"), filename = getUrlArg(argument, "filename"), interval_str = getUrlArg(argument, "interval"), strict_str = getUrlArg(argument, "strict");
-    std::string clash_new_field = getUrlArg(argument, "new_name"), clash_script = getUrlArg(argument, "script");
+    std::string clash_new_field = getUrlArg(argument, "new_name"), clash_script = getUrlArg(argument, "script"), add_insert = getUrlArg(argument, "insert");
    std::string base_content, output_content;
    string_array extra_group, extra_ruleset, include_remarks = def_include_remarks, exclude_remarks = def_exclude_remarks;
    std::string groups = urlsafe_base64_decode(getUrlArg(argument, "groups")), ruleset = urlsafe_base64_decode(getUrlArg(argument, "ruleset")), config = UrlDecode(getUrlArg(argument, "config"));
@@ -1090,6 +1118,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
    std::string subInfo, dummy;
    int interval = interval_str.size() ? to_int(interval_str, config_update_interval) : config_update_interval;
    bool ruleset_updated = false, authorized = !api_mode || getUrlArg(argument, "token") == access_token, strict = strict_str.size() ? strict_str == "true" : config_update_strict;
+    bool insert_flag = add_insert.empty() || add_insert == "true";

    if(std::find(regex_blacklist.cbegin(), regex_blacklist.cend(), include) != regex_blacklist.cend() || std::find(regex_blacklist.cbegin(), regex_blacklist.cend(), exclude) != regex_blacklist.cend())
        return "Invalid request!";
@@ -1101,7 +1130,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
    //validate urls
    if(!url.size() && (!api_mode || authorized))
        url = default_url;
-    if(insert_url.size())
+    if(insert_url.size() && insert_flag)
        url = insert_url + "|" + url;
    if(!url.size() || !target.size())
    {
@@ -1128,10 +1157,6 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
    tpl_args.global_vars = global_vars;
    tpl_args.request_params = req_arg_map;

-    //check if we need to read configuration
-    if((!api_mode || cfw_child_process) && !generator_mode)
-        readConf();
-
    //check for proxy settings
    std::string proxy = parseProxy(proxy_subscription);

@@ -1268,6 +1293,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
    string_array urls = split(url, "|");
    std::vector<nodeInfo> nodes;
    int groupID = 0;
+    groupID -= insert_url.empty() || !insert_flag ? 0 : std::count(insert_url.begin(), insert_url.end(), '|') + 1;

    //check custom include/exclude settings
    if(include.size() && regValid(include))
--- a/src/speedtestutil.cpp
+++ b/src/speedtestutil.cpp
@@ -2051,7 +2051,7 @@ time_t dateStringToTimestamp(std::string date)

 bool getSubInfoFromHeader(std::string &header, std::string &result)
 {
-    std::string pattern = "(?:[\\s\\S]*?)^(?i:Subscription-UserInfo): (.*?)\\s$(?:[\\s\\S]*)", retStr;
+    std::string pattern = R"((?:[\s\S]*?)^(?i:Subscription-UserInfo): (.*?)\s$(?:[\s\S]*))", retStr;
    if(regFind(header, pattern))
    {
        retStr = regReplace(header, pattern, "$1");
--- a/src/subexport.cpp
+++ b/src/subexport.cpp
@@ -799,6 +799,7 @@ void parseGroupTimes(const std::string &src, int *interval, int *tolerance, int
 void groupGenerate(std::string &rule, std::vector<nodeInfo> &nodelist, std::vector<std::string> &filtered_nodelist, bool add_direct)
 {
    std::string group;
+    const std::string groupid_regex = R"(^!!(?:GROUPID|INSERT)=([\d\-+!,]+)(?:!!(.*))?$)";
    if(rule.find("[]") == 0 && add_direct)
    {
        filtered_nodelist.emplace_back(rule.substr(2));
@@ -807,7 +808,7 @@ void groupGenerate(std::string &rule, std::vector<nodeInfo> &nodelist, std::vect
    {
        if(rule.find("!!", rule.find("!!") + 2) != rule.npos)
        {
-            group = rule.substr(8, rule.find("!!", rule.find("!!") + 2));
+            group = rule.substr(8, rule.find("!!", rule.find("!!") + 2) - 8);
            rule = rule.substr(rule.find("!!", rule.find("!!") + 2) + 2);

            for(nodeInfo &y : nodelist)
@@ -827,26 +828,24 @@ void groupGenerate(std::string &rule, std::vector<nodeInfo> &nodelist, std::vect
            }
        }
    }
-    else if(rule.find("!!GROUPID=") == 0)
+    else if(rule.find("!!GROUPID=") == 0 || rule.find("!!INSERT=") == 0)
    {
-        if(rule.find("!!", rule.find("!!") + 2) != rule.npos)
+        int dir = rule.find("!!INSERT=") == 0 ? -1 : 1;
+        group = regReplace(rule, groupid_regex, "$1");
+        rule = regReplace(rule, groupid_regex, "$2");
+        if(rule.empty())
        {
-            group = rule.substr(10, rule.find("!!", rule.find("!!") + 2) - 10);
-            rule = rule.substr(rule.find("!!", rule.find("!!") + 2) + 2);
-
            for(nodeInfo &y : nodelist)
            {
-                if(matchRange(group, y.groupID) && regFind(y.remarks, rule) && std::find(filtered_nodelist.begin(), filtered_nodelist.end(), y.remarks) == filtered_nodelist.end())
+                if(matchRange(group, dir * y.groupID) && std::find(filtered_nodelist.begin(), filtered_nodelist.end(), y.remarks) == filtered_nodelist.end())
                    filtered_nodelist.emplace_back(y.remarks);
            }
        }
        else
        {
-            group = rule.substr(10);
-
            for(nodeInfo &y : nodelist)
            {
-                if(matchRange(group, y.groupID) && std::find(filtered_nodelist.begin(), filtered_nodelist.end(), y.remarks) == filtered_nodelist.end())
+                if(matchRange(group, dir * y.groupID) && regFind(y.remarks, rule) && std::find(filtered_nodelist.begin(), filtered_nodelist.end(), y.remarks) == filtered_nodelist.end())
                    filtered_nodelist.emplace_back(y.remarks);
            }
        }