Bump version to v0.2.6

Move China Emoji rule to last position
Update local rulesets
2025-10-28 20:32:42 +00:00 · 2020-01-14 14:48:41 +08:00 · 2020-01-14 14:46:49 +08:00 · 2020-01-14 14:43:45 +08:00 · 2020-01-14 14:29:41 +08:00 · 2020-01-14 14:12:29 +08:00
158 changed files with 2854 additions and 1823 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,12 @@ stages:
      if: branch = master
 matrix:
    include:
-    - os: osx
+    - name: "macOS Build"
+      os: osx
      compiler: clang
      osx_image: xcode10.3
      script:
-      - chmod +x build.macos.release.sh
-      - ./build.macos.release.sh
+      - bash scripts/build.macos.release.sh
      deploy:
        provider: releases
        api_key: "$GITHUB_OAUTH_TOKEN"
@@ -21,10 +21,10 @@ matrix:
        draft: true
        on:
          tags: true
-    - services: docker
+    - name: "Linux x86_64 Build"
+      services: docker
      script:
-      - docker pull alpine:latest
-      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x build.alpine.release.sh && bash build.alpine.release.sh"
+      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
      deploy:
        provider: releases
        api_key: "$GITHUB_OAUTH_TOKEN"
@@ -33,3 +33,33 @@ matrix:
        draft: true
        on:
          tags: true
+    - name: "Linux ARMHF Build"
+      services: docker
+      script:
+      - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:armhf-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      before_deploy:
+        - mv subconverter_linux64.tar.gz subconverter_armhf.tar.gz
+      deploy:
+        provider: releases
+        api_key: "$GITHUB_OAUTH_TOKEN"
+        file: "subconverter_armhf.tar.gz"
+        skip_cleanup: true
+        draft: true
+        on:
+          tags: true
+    - name: "Linux ARM64 Build"
+      services: docker
+      arch: arm64
+      script:
+      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      before_deploy:
+        - mv subconverter_linux64.tar.gz subconverter_aarch64.tar.gz
+      deploy:
+        provider: releases
+        api_key: "$GITHUB_OAUTH_TOKEN"
+        file: "subconverter_aarch64.tar.gz"
+        skip_cleanup: true
+        draft: true
+        on:
+          tags: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,92 @@
+project(subconverter LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.4)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+IF(NOT CMAKE_BUILD_TYPE)
+	SET(CMAKE_BUILD_TYPE Release)
+ENDIF()
+SET(CMAKE_CXX_STANDARD 17)
+ADD_DEFINITIONS(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result)
+
+OPTION(USING_STD_REGEX "Use std::regex from C++ library instead of PCRECPP." OFF)
+OPTION(USING_MALLOC_TRIM "Call malloc_trim after processing request to lower memory usage (Your system must support malloc_trim)." OFF)
+
+INCLUDE(CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES(
+"
+#include<string>
+int main(){std::to_string(0);return 0;}
+" HAVE_TO_STRING)
+
+IF(APPLE)
+	ADD_DEFINITIONS(-D_MACOS)
+ENDIF()
+
+IF(HAVE_TO_STRING)
+	ADD_DEFINITIONS(-DHAVE_TO_STRING)
+ENDIF()
+
+IF(USING_MALLOC_TRIM)
+	ADD_DEFINITIONS(-DMALLOC_TRIM)
+ENDIF()
+
+ADD_EXECUTABLE(subconverter 
+	src/logger.cpp
+	src/main.cpp
+	src/misc.cpp
+	src/multithread.cpp
+	src/nodemanip.cpp
+	src/rapidjson_extra.cpp
+	src/speedtestutil.cpp
+	src/subexport.cpp
+	src/webget.cpp
+	src/webserver_libevent.cpp)
+INCLUDE_DIRECTORIES(src)
+LINK_DIRECTORIES(${CMAKE_SOURCE_DIR})
+
+FIND_PACKAGE(PkgConfig REQUIRED)
+
+SET(THREADS_PREFER_PTHREAD_FLAG ON)
+FIND_PACKAGE(Threads REQUIRED)
+TARGET_LINK_LIBRARIES(subconverter ${CMAKE_THREAD_LIBS_INIT})
+
+PKG_CHECK_MODULES(LIBEVENT libevent REQUIRED)
+FIND_PATH(LIBEVENT_INCLUDE_DIR NAMES event.h PATHS ${LIBEVENT_INCLUDE_DIRS})
+FIND_LIBRARY(LIBEVENT_LIBRARY NAMES event PATHS ${LIBEVENT_LIBRARY_DIRS})
+LINK_DIRECTORIES(${LIBEVENT_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(subconverter ${LIBEVENT_LIBRARY})
+
+FIND_PACKAGE(CURL 7.54.0 REQUIRED)
+INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(subconverter ${CURL_LIBRARIES})
+ADD_DEFINITIONS(-DCURL_STATICLIB)
+
+FIND_PACKAGE(OpenSSL 1.1.0 REQUIRED)
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(subconverter ${OPENSSL_LIBRARIES})
+
+FIND_PACKAGE(Rapidjson REQUIRED)
+INCLUDE_DIRECTORIES(${RAPIDJSON_INCLUDE_DIRS})
+
+PKG_CHECK_MODULES(YAML_CPP yaml-cpp REQUIRED)
+FIND_LIBRARY(YAML_CPP_LIBRARY NAMES yaml-cpp yaml-cppd PATHS ${YAML_CPP_LIBRARY_DIRS})
+LINK_DIRECTORIES(${YAML_CPP_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(subconverter ${YAML_CPP_LIBRARY})
+
+IF(USING_STD_REGEX STREQUAL "ON")
+	ADD_DEFINITIONS(-DUSE_STD_REGEX)
+ELSE()
+	FIND_PACKAGE(PCRECPP REQUIRED)
+	INCLUDE_DIRECTORIES(${PCRECPP_INCLUDE_DIRS})
+	TARGET_LINK_LIBRARIES(subconverter ${PCRECPP_LIBRARIES})
+	ADD_DEFINITIONS(-DPCRE_STATIC)
+ENDIF()
+
+IF(WIN32)
+	TARGET_LINK_LIBRARIES(subconverter wsock32 ws2_32)
+ELSE()
+	INCLUDE(GNUInstallDirs)
+	INSTALL(TARGETS subconverter DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter)
+	INSTALL(DIRECTORY base/ DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter FILES_MATCHING PATTERN "*")
+ENDIF()
--- a/README-cn.md
+++ b/README-cn.md
@@ -4,286 +4,486 @@

 [![Build Status](https://travis-ci.com/tindy2013/subconverter.svg?branch=master)](https://travis-ci.com/tindy2013/subconverter)

- [subconverter](#subconverter)
-  - [支持类型](#支持类型)
-  - [用法](#用法)
-      - [旧接口](#旧接口)
-  - [**推荐阅读**](#推荐阅读)
-  - [pref.ini](#prefini)
-    - [common](#common)
-      - [api_mode](#api_mode)
-      - [default_url](#default_url)
-      - [exclude_remarks](#exclude_remarks)
-      - [include_remarks](#include_remarks)
-      - [clash_rule_base](#clash_rule_base)
-      - [surge_rule_base](#surge_rule_base)
-      - [surfboard_rule_base](#surfboard_rule_base)
-      - [rename_node](#rename_node)
-    - [managed_config](#managed_config)
-    - [emojis](#emojis)
-    - [ruleset](#ruleset)
-    - [clash_proxy_group](#clash_proxy_group)
-    - [server](#server)
-      - [listen](#listen)
-      - [port](#port)
-    - [advanced](#advanced)
-  - [gist](#gist)
-
-
+- [支持类型](#支持类型)
+- [简易用法](#简易用法)
+  - [调用地址](#调用地址)
+  - [调用说明](#调用说明)
+- [进阶用法](#进阶用法)
+  - [阅前提示](#阅前提示)
+  - [进阶地址](#进阶地址)
+  - [配置文件](#配置文件)
+- [自动上传](#自动上传)

 ## 支持类型

 | 类型         | 作为源类型 | 作为目标类型 | 参数        |
 | ------------ | :--------: | :----------: | ----------- |
-| clash        |     ✔      |      ✔       | clash       |
-| clashr       |     ✔      |      ✔       | clashr      |
-| surge2       |     ✔      |      ✔       | surge?ver=2 |
-| surge3       |     ✔      |      ✔       | surge?ver=3 |
-| surge4       |     ✔      |      ✔       | surge?ver=4 |
-| quantumult   |     ✔      |      ✔       | quan        |
-| quantumult X |     ✔      |      ✔       | quanx       |
-| surfboard    |     ✔      |      ✔       | surfboard   |
-| ss           |     ✔      |      ✔       | ss          |
-| ssr          |     ✔      |      ✔       | ssr         |
-| ssd          |     ✔      |      ✔       | ssd         |
-| v2ray        |     ✔      |      ✔       | v2ray       |
+| Clash        |     ✔      |      ✔       | clash       |
+| ClashR       |     ✔      |      ✔       | clashr      |
+| Quantumult   |     ✔      |      ✔       | quan        |
+| Quantumult X |     ✔      |      ✔       | quanx       |
+| SS (SIP002)  |     ✔      |      ✔       | ss          |
+| SS (软件订阅)|     ✔      |      ✔       | sssub       |
+| SSD          |     ✔      |      ✔       | ssd         |
+| SSR          |     ✔      |      ✔       | ssr         |
+| Surfboard    |     ✔      |      ✔       | surfboard   |
+| Surge 2      |     ✔      |      ✔       | surge&ver=2 |
+| Surge 3      |     ✔      |      ✔       | surge&ver=3 |
+| Surge 4      |     ✔      |      ✔       | surge&ver=4 |
+| V2Ray        |     ✔      |      ✔       | v2ray       |

+**注意**：Shadowrocket 用户可以使用 `ss`、`ssr`以及 `v2ray`参数

+---

-## 用法
+## 简易用法

-```
-http://127.0.0.1:25500/sub?target=clash&url=%URL_ENCODED_LINKS%
+> 即生成的配置文件默认套用 **神机规则**

-http://127.0.0.1:25500/sub?target=surge&ver=4&url=%URL_ENCODED_LINKS%
+### 调用地址

-http://127.0.0.1:25500/sub?target=v2ray&url=%URL_ENCODED_LINKS%
+```txt
+http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&config=%CONFIG%
 ```

-#### 旧接口
+### 调用说明

-```
-http://127.0.0.1:25500/clash?url=%URL_ENCODED_LINKS%
+| 调用参数 | 必要性 | 示例      | 解释         |
+| ------- | :----: | :------------------- | ---------------- |
+| target |  必要  | surge&ver=4   | 指想要生成的配置类型，详见上方 [支持类型](#支持类型) 中的参数 |
+| url  |  必要  | https%3A%2F%2Fwww.xxx.com | 指机场所提供的订阅链接，需要经过 [URLEncode](https://www.urlencoder.org/) 处理 |
+| config |  可选  | https%3A%2F%2Fwww.xxx.com | 指远程 `pref.ini` (包含分组和规则部分)，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，可查看 [示例仓库](https://github.com/lzdnico/subconverteriniexample) 寻找灵感，默认加载本地设置文件 |
+
+运行 subconverter 主程序后，按照 [调用说明](#调用说明) 的对应内容替换即可得到一份使用**神机规则**的配置文件。
+
+此外，如果你需要将多个订阅合成一份, 则要在上方所提及的 URLEncode 之前使用 '|' 来分隔链接。
+
+举个例子：
+
+```txt
+有以下两个订阅，且想合并转换成 Clash 的订阅:
+1. https://dler.cloud/subscribe/ABCDE?clash=vmess
+2. https://rich.cloud/subscribe/ABCDE?clash=vmess
+
+首先使用 '|' 将两个订阅分隔开:
+https://dler.cloud/subscribe/ABCDE?clash=vmess|https://rich.cloud/subscribe/ABCDE?clash=vmess
+
+接着通过 URLEncode 后可以得到:
+https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess%7Chttps%3A%2F%2Frich.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+然后将想要的 %TARGET% (即 clash) 和上一步所得到的 %URL% 填入调用地址中:
+http://127.0.0.1:25500/sub?target=clash&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess%7Chttps%3A%2F%2Frich.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+最后将该链接填写至 Clash 的订阅处就大功告成了。
 ```

-如果你有多个订阅, 在url encode之前使用 '|' 来分隔链接. <br>
+---

-e.g. <br>
-> 我有以下两个订阅: <br>
-`https://dler.cloud/subscribe/ABCDE?clash=vmess`
-`https://rich.cloud/subscribe/ABCDE?clash=vmess`
-<br> <br>
-使用'|'分隔: <br>
-`https://dler.cloud/subscribe/ABCDE?clash=vmess|https://rich.cloud/subscribe/ABCDE?clash=vmess`
-<br> <br>
-url encode后: <br>
-`https%3A//dler.cloud/subscribe/ABCDE%3Fclash%3Dvmess%7Chttps%3A//rich.cloud/subscribe/ABCDE%3Fclash%3Dvmess`
-<br> <br>
-添加到链接后面: <br>
-`http://127.0.0.1:25500/sub?target=clash&url=https%3A//dler.cloud/subscribe/ABCDE%3Fclash%3Dvmess%7Chttps%3A//rich.cloud/subscribe/ABCDE%3Fclash%3Dvmess`
-<br> <br>
-&nbsp;&nbsp;&#127830; 食用 &#127830;
-<br> <br>
+## 进阶用法

+> 在不满足于本程序所提供的神机规则或者对应的分组时，可以考虑尝试进阶用法
+>
+> 即 对 `调用地址` 甚至程序目录下的 `pref.ini` 进行个性化的编辑以满足不同的需求

- 想学更多姿势? 来瞅瞅[pref.ini](./pref.ini).
+### 阅前提示

+在进行下一步操作前，十分推荐您阅读以下内容：

+1. 与 `pref.ini` 相关的：[INI 语法介绍](https://zh.wikipedia.org/wiki/INI%E6%96%87%E4%BB%B6)
+1. 与 `Clash` 配置相关的： [YAML 语法介绍](https://zh.wikipedia.org/wiki/YAML#%E8%AA%9E%E6%B3%95)
+1. 会经常涉及到的： [正则表达式入门](https://github.com/ziishaned/learn-regex/blob/master/translations/README-cn.md)
+1. 当遇到问题需要提交 ISSUE 时的： [提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)

-## **推荐阅读**
+当您尝试进行进阶操作时，即默认您有相关的操作能力，本程序仅保证在默认配置文件下能够正常运行。

-> - [&#128220; 正则表达式 &#128220;](https://zh.wikipedia.org/zh-hans/%E6%AD%A3%E5%88%99%E8%A1%A8%E8%BE%BE%E5%BC%8F)
-> - [&#128221; yaml语法介绍 &#128221;](https://zh.wikipedia.org/wiki/YAML#%E8%AA%9E%E6%B3%95)
-> - [&#10068; 提问的智慧 &#10068;](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)
+### 进阶地址

+#### 调用地址 (进阶)

-
-## pref.ini
-
-### common
-
-#### api_mode
-
-> API模式，设置为true以防止直接加载本地订阅或直接提供本地文件.
-
-当值为`false`时, 每次更新配置都会读取`pref.ini`, 为`true`时则仅启动时读取.
-
-
-
-#### default_url
-
-> 无url参数时默认链接,不需要encode. 如果有多个链接, 使用 "|" 分隔, 支持`文件`/`url`.
-
-e.g.
-```ini
-default_url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+```txt
+http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&emoji=%EMOJI%····
 ```

-此时订阅
-`http://127.0.0.1:25500/clash`
+#### 调用说明 (进阶)

-相当于:
-<br>
-`http://127.0.0.1:25500/sub?target=clash&url=https%3A//dler.cloud/subscribe/ABCDE%3Fclash%3Dvmess`
+| 调用参数 | 必要性 | 示例  | 解释   |
+| -------- | :----: | :--------------- | :------------------------ |
+| target |  必要  | surge&ver=4   | 指想要生成的配置类型，详见上方 [支持类型](#支持类型) 中的参数   |
+| url   |  可选  | https%3A%2F%2Fwww.xxx.com | 指机场所提供的订阅链接，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，**可选的前提是在 `default_url` 中进行指定**    |
+| config |  可选  | https%3A%2F%2Fwww.xxx.com | 指远程 `pref.ini` (包含分组和规则部分)，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，可查看 [示例仓库](https://github.com/lzdnico/subconverteriniexample) 寻找灵感，默认加载本地设置文件 |
+| upload |  可选  | true / false  | 指将生成的订阅文件上传至 `Gist`，需要填写`gistconf.ini`，默认为 false (即不上传)    |
+| emoji |  可选  | true / false  | 指在节点名称前加入 Emoji，默认为 true  |
+| group |  可选  | MySS  | 指设置该订阅的组名，多用于 SSD/SSR  |
+| tfo |  可选  | true / false  | 指开启该订阅链接的 TCP Fast Open，默认为 false  |
+| udp |  可选  | true / false  | 指开启该订阅链接的 UDP，默认为 false  |
+| scv |  可选  | true / false  | 指关闭 TLS 节点的证书检查，默认为 false  |
+| list |  可选  | true / false  | 指输出 Surge Node List 或者 Clash Proxy Provider 或者 解码后的 SIP002 |
+| sort |  可选  | true / false  | 指对输出的节点或策略组进行再次排序，默认为 false  |
+| include |  可选  | 详见下文中 `include_remarks`  | 指仅保留匹配到的节点，支持正则匹配，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，会覆盖配置文件里的设置  |
+| exclude |  可选  | 详见下文中 `exclude_remarks`  | 指排除匹配到的节点，支持正则匹配，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，会覆盖配置文件里的设置  |

+举个例子：

+```txt
+有订阅 `https://dler.cloud/subscribe/ABCDE?clash=vmess`，想转换成 Surge 4 的订阅，且需要开启 TFO 和 UDP
+顺便再给节点名加上 EMOJI 同时排除掉订阅中显示流量和官网的节点（节点名为"剩余流量：1024G"，"官网地址：dler.cloud"）

-#### exclude_remarks
+首先确认需要用到的参数：
+target=surge&ver=4 、 tfo=true 、 udp=true 、 emoji=true 、exclude=(流量|官网)
+url=https://dler.cloud/subscribe/ABCDE?clash=vmess

-> 排除匹配到的节点, 支持正则.
+然后将需要 URLEncode 的部分进行处理：
+exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29
+url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess

-e.g.
-```ini
-exclude_remarks=(流量|时间|官网|产品)
+接着将所有元素进行拼接：
+http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+最后将该链接填写至 Surge 的订阅处就大功告成了。
 ```

+### 配置文件

+> 关于 subconverter 主程序目录中 `pref.ini` 文件的解释

-#### include_remarks
+由于此部分篇幅较长，点击下方条目即可展开详解：

-> 仅保留匹配到的节点, 支持正则.
+<details>
+<summary><b>[common] 部分</b></summary>

-e.g.
-```ini
-include_remarks=(?<=美).*(BGP|GIA|IPLC)
-```
+> 该部分主要涉及到的内容为 **全局的节点排除或保留** 、**各配置文件的基础**
+>
+> 其他设置项目可以保持默认或者在知晓作用的前提下进行修改

+1. **api_mode**

+    > API 模式，设置为 true 以防止直接加载本地订阅或直接提供本地文件。（多用于架设于服务器上）

-#### clash_rule_base
+    - 当值为 `false` 时, 每次更新配置都会读取 `pref.ini` , 为 `true` 时则仅启动时读取。

-> 生成的clash配置文件基础. 支持`文件`/`url`.
+1. **default_url**

-e.g.
-```ini
-clash_rule_base=clash.yaml
+    > 无 %URL% 参数时，默认加载的订阅链接， **不需要 URLEncode**。 如果有多个链接，仍然需要使用 "|" 分隔，支持`文件`/`url`

-clash_rule_base=https://raw.githubusercontent.com/ConnersHua/Profiles/master/Clash/Pro.yaml
-```
+    - 例如:

+     ```ini
+     default_url='https://dler.cloud/subscribe/ABCDE?clash=vmess'
+     ```

+    - 解释：

-#### surge_rule_base
+     ```txt
+     此时订阅链接:
+     http://127.0.0.1:25500/sub?target=clash
+     等同于:
+     http://127.0.0.1:25500/sub?target=clash&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+     ```

-> 生成的surge配置文件基础. 用法同上.
+1. **exclude_remarks**

+   > 排除匹配到的节点，支持正则匹配

+    - 例如:

-#### surfboard_rule_base
+     ```ini
+     exclude_remarks=(流量|时间|官网|产品)
+     ```

-> 生成的surfboard配置文件基础. 用法同上.
+1. **include_remarks**

+   > 仅保留匹配到的节点，支持正则匹配

+    - 例如:

-#### mellow_rule_base
+     ```ini
+     include_remarks=(?<=美).*(BGP|GIA|IPLC)
+     ```

-> 生成的mellow配置文件基础. 用法同上.
+1. **clash_rule_base**

+   > 生成的 Clash 配置文件基础。支持 `本地文件` 和 `在线URL`

+    - 例如:

-#### rename_node
+     ```ini
+     clash_rule_base=clash.yaml # 加载本地的 clash.yaml 文件作为基础
+     # 或者
+     clash_rule_base=https://raw.githubusercontent.com/ConnersHua/Profiles/master/Clash/Pro.yaml
+     # 加载神机的 Github 中相关文件作为基础
+     ```

-> 重命名节点, 支持正则.
+1. **surge_rule_base**

-e.g.
-```ini
-rename_node=中国@中
-rename_node=深圳@深
-```
+   > 生成的 Surge 配置文件基础，用法同上

+1. **surfboard_rule_base**

+   > 生成的 Surfboard 配置文件基础，用法同上

-### managed_config
+1. **mellow_rule_base**

-> 将'＃！MANAGED-CONFIG'信息附加到Surge配置.
+   > 生成的 Mellow 配置文件基础，用法同上

+1. **proxy_ruleset**

+   > 更新 RuleSet 时是否使用代理
+   >
+   > 填写 `NONE` 或者空白禁用，或者填写 `SYSTEM` 使用系统代理
+   >
+   > 也可填写如同 `socks5://127.0.0.1:1080` 的 HTTP 或 SOCKS 代理

-### emojis
+    - 例如:

-> 在匹配到的节点前添加自定义emojis, 支持正则.
+     ```ini
+     proxy_ruleset=SYSTEM # 使用系统代理
+     # 或者
+     proxy_ruleset=socks5://127.0.0.1:1080 # 使用本地的 1080 端口进行 SOCKS5 代理
+     ```

-e.g.
-```ini
-rule=(流量|时间|应急),⌛time
-rule=(美|美国|United States),🇺🇸
-```
+1. **proxy_subscription**

+   > 更新 原始订阅 时是否使用代理，用法同上

+1. **append_proxy_type**

-### ruleset
-> 如果你对原本订阅自带的规则不满意可以使用如下配置
+   > 节点名称是否需要加入属性，设置为 true 时在节点名称前加入 \[SS\] \[SSR\] \[VMess\] 以作区别，
+   >
+   > 默认为 false

-> 启用自定义规则集
-`enabled=true`
-> 覆盖原有规则
-`overwrite_original_rules=true`
-> 当其他程序更新订阅时更新规则集
-`update_ruleset_on_request=false`
+    - 例如（设置为 true时）：

-> 从本地或url获取规则片段.
-> []前缀后的文字将被当作规则而不是链接或路径
+     ```txt
+     [SS] 香港中转
+     [VMess] 美国 GIA
+     ```

-e.g.
-<img src="./doc/imgs/Snipaste_2019-11-18_14-11-52.png">
+</details>
+<details>
+<summary><b>[node_pref] 部分</b></summary>
+
+> 该部分主要涉及到的内容为 **开启节点的 UDP 及 TCP Fast Open** 、**节点的重命名** 、**重命名节点后的排序**
+>
+> 相关设置项目建议保持默认或者在知晓作用的前提下进行修改
+
+1. **udp_flag**
+
+   > 为节点打开 UDP 模式，设置为 true 时打开，默认为 false
+
+    - 当不清楚机场的设置时**请勿调整此项**。
+
+1. **tcp_fast_open_flag**
+
+   > 为节点打开 TFO (TCP Fast Open) 模式，设置为 true 时打开，默认为 false
+
+    - 当不清楚机场的设置时**请勿调整此项**。
+
+1. **sort_flag**
+
+   > 对生成的订阅中的节点进行 A-Z 的排序，设置为 true 时打开，默认为 false
+
+1. **skip_cert_verify_flag**
+
+   > 关闭 TLS 节点的证书检查。设置为 true 时打开，默认为 false
+
+    - **请勿随意将此设置修改为 true**
+
+1. **rename_node**
+
+   > 重命名节点，支持正则匹配
+   >
+   > 使用方式：原始命名@重命名
+
+    - 例如:
+
+     ```ini
+     rename_node=中国@中
+     rename_node=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?:?)|(x|X))\)?@(倍率:$1)
+     ```
+
+</details>
+<details>
+<summary><b>[managed_config] 部分</b></summary>
+
+> 该部分主要涉及到的内容为 **订阅文件的更新地址**
+
+1. **write_managed_config**
+
+   > 是否将 '#!MANAGED-CONFIG' 信息附加到 Surge 或 Surfboard 配置，设置为 true 时打开，默认为 true
+
+1. **managed_config_prefix**
+
+   > 具体的 '#!MANAGED-CONFIG' 信息，地址前缀不用添加 "/"。Surge 或 Surfboard 会向此地址发出更新请求
+   >
+   > 局域网用户需要将此处改为本程序运行设备的局域网 IP
+
+    - 例如:
+
+    ```ini
+    managed_config_prefix = http://192.168.1.5:25500
+    ```
+
+</details>
+<details>
+<summary><b>[surge_external_proxy] 部分</b></summary>
+
+> 为 Surge 添加 SSR 的支持路径
+
+</details>
+<details>
+<summary><b>[emojis] 部分</b></summary>
+
+1. **add_emoji**
+
+   > 是否在节点名称前加入下面自定义的 Emoji，设置为 true 时打开，默认为 true
+
+1. **remove_old_emoji**
+
+   > 是否移除原有订阅中存在的 Emoji，设置为 true 时打开，默认为 true
+
+1. **rule**
+
+   > 在匹配到的节点前添加自定义 emojis，支持正则匹配
+
+    - 例如:
+
+    ```ini
+    rule=(流量|时间|应急),⌛time
+    rule=(美|美国|United States),🇺🇸
+    ```
+
+</details>
+<details>
+<summary><b>[ruleset] 部分</b></summary>
+
+> 如果你对原本订阅自带的规则不满意时，可以使用如下配置
+
+1. **enabled**
+
+   > 启用自定义规则集的**总开关**，设置为 true 时打开，默认为 true
+
+1. **overwrite_original_rules**
+
+   > 覆盖原有规则，即 [common] 中 xxx_rule_base 中的内容，设置为 true 时打开，默认为 false
+
+1. **update_ruleset_on_request**
+
+   > 根据请求执行规则集更新，设置为 true 时打开，默认为 false
+
+1. **surge_ruleset**
+
+   > 从本地或 url 获取规则片段
+   >
+   > [] 前缀后的文字将被当作规则，而不是链接或路径，主要包含 `[]GEOIP` 和 `[]MATCH`(等同于 `[]FINAL`)。
+
+    - 例如：
+
+    ```ini
+    surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
+    # 表示引用 https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list 规则
+    # 且将此规则指向 [clash_proxy_group] 所设置 🍎 苹果服务 策略组
+    surge_ruleset=🎯 全球直连,rules/NobyDa/Surge/Download.list
+    # 表示引用本地 rules/NobyDa/Surge/Download.list 规则
+    # 且将此规则指向 [clash_proxy_group] 所设置 🎯 全球直连 策略组
+    surge_ruleset=🎯 全球直连,[]GEOIP,CN
+    # 表示引用 GEOIP 中关于中国的所有 IP
+    # 且将此规则指向 [clash_proxy_group] 所设置 🎯 全球直连 策略组
+    ```
+
+</details>
+<details>
+<summary><b>[clash_proxy_group] 部分</b></summary>
+
+> 为 Clash 、Mellow 、Surge 以及 Surfboard 等程序创建策略组, 可用正则来筛选节点
+>
+> [] 前缀后的文字将被当作引用策略组

 ```ini
-surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
-surge_ruleset=🎯 全球直连,rules/NobyDa/Surge/Download.list
-surge_ruleset=🎯 全球直连,[]GEOIP,CN
+custom_proxy_group=🍎 苹果服务`url-test`(美国|US)`http://www.gstatic.com/generate_204`300
+# 表示创建一个叫 🍎 苹果服务 的 url-test 策略组,并向其中添加名字含'美国','US'的节点，每隔300秒测试一次
+custom_proxy_group=🇯🇵 日本延迟最低`url-test`(日|JP)`http://www.gstatic.com/generate_204`300
+# 表示创建一个叫 🇯🇵 日本延迟最低 的 url-test 策略组,并向其中添加名字含'日','JP'的节点，每隔300秒测试一次
+custom_proxy_group=🇯🇵 JP`select`沪日`日本`[]🇯🇵 日本延迟最低
+# 表示创建一个叫 🇯🇵 JP 的 select 策略组,并向其中**依次**添加名字含'沪日','日本'的节点，以及引用上述所创建的 🇯🇵 日本延迟最低 策略组
 ```

-效果图:
+- 还可使用一些特殊筛选条件

-<img src="./doc/imgs/ruleset.png">
+  ```ini
+  custom_proxy_group=g1`select`!!GROUPID=0
+  # 指订阅链接中的第一条订阅
+  custom_proxy_group=g2`select`!!GROUPID=1
+  # 指订阅链接中的第二条订阅
+  custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
+  # 指订阅链接中组名为 V2RayProvider 的节点
+  ```

+- 现在也可以使用双条件进行筛选

+  ```ini
+  custom_proxy_group=g1hk`select`!!GROUPID=0!!(HGC|HKBN|PCCW|HKT|hk|港)
+  # 订阅链接中的第一条订阅内名字含 HGC、HKBN、PCCW、HKT、hk、港 的节点
+  ```

-### clash_proxy_group
+</details>
+<details>
+<summary><b>[server] 部分</b></summary>

-> clash的策略组, 可用正则来筛选节点.
+> 此部分通常**保持默认**即可

-e.g.
-```ini
-custom_proxy_group=🇺🇸US`url-test`(美|美国|United States)`http://www.gstatic.com/generate_204`300
-```
-表示创建一个叫 usUS的url-test策略组,并向其中添加名字包含'美','美国','United States'的节点~每隔300秒测试一次~(目前硬编码固定为300)
+1. **listen**

+   > 绑定到 Web 服务器的地址，将地址设为 0.0.0.0，则局域网内设备均可使用。

-效果图:
+1. **port**

-<img src="./doc/imgs/Snipaste_2019-11-18_14-47-30.png">
+   > 绑定到 Web 服务器地址的端口，默认为 25500

+</details>

-ssr/v2订阅默认没有组名, 可以使用这个方法来添加组名.
+<details>
+
+<summary><b>[advanced] 部分</b></summary>
+
+> 此部分通常**保持默认**即可
+
+</details>
+
+## 自动上传
+
+> 自动上传 gist ，可以用于 Clash For Android / Surge 等进行远程订阅
+
+在程序目录内的 [gistconf.ini](./base/gistconf.ini) 中添加 `Personal Access Token`（[在此创建](https://github.com/settings/tokens/new?scopes=gist&description=Subconverter)）例如：

 ```ini
-custom_proxy_group=g1`select`!!GROUPID=0
-custom_proxy_group=g2`select`!!GROUPID=1
-custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
+[common]
+;uncomment the following line and enter your token to enable upload function
+token = xxxxxxxxxxxxxxxxxxxxxxxx(所生成的 Personal Access Token)
 ```

+在 [调用地址](#调用地址) 或 [调用地址 (进阶)](#调用地址-进阶) 所生成的链接后加上 `&upload=true` 就会在更新好后自动上传 gist
+此时，subconverter 程序窗口内会出现如下所示的**神秘代码**：

-### server
+```cmd
+No gist id is provided. Creating new gist...
+Writing to Gist success!
+Generator: surge4
+Path: surge4
+Raw URL: https://gist.githubusercontent.com/xxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/raw/surge4
+Gist owner: xxxx
+```

-#### listen
+上方所提到的 `Raw URL: https://gist.githubusercontent.com/xxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/raw/surge4`
+中的 `https://gist.githubusercontent.com/xxxx/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/raw/surge4` 即是你的在线订阅链接。

-> 绑定到Web服务器的地址, 将地址设为0.0.0.0, 则局域网内设备均可使用.
-`listen=0.0.0.0`
+注意，本程序默认会将此链接设为**秘密状态**

-#### port
+根据 [`官方手册 - 创建 Gist`](https://help.github.com/cn/github/writing-on-github/creating-gists) 的解释为：

-> 绑定到Web服务器地址的端口.
-`port=25500`
+> 秘密 gists 不会显示在 Discover 中，也不可搜索。
+>
+> 秘密 gists 不是私人的。 如果将秘密 gist 的 URL 发送给朋友，他们可以查看。
+>
+> 但是，如果您不认识的人发现该 URL，也能看到您的 gist。

-### advanced
-
-> 无需描述.
-
-
-
-## gist
-
-> 自动上传gist.
-
-在[gistconf.ini](./gistconf.ini)中添加personal access token, 在链接后加上`upload=true`就会在更新好后自动上传gist.
+所以请务必保管好所生成的 `Raw URL` 链接。
--- a/base/example_external_config.ini
+++ b/base/example_external_config.ini
@@ -0,0 +1,35 @@
+[custom]
+custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
+custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=google`select`.*
+custom_proxy_group=netflix`select`.*
+custom_proxy_group=动画疯`select`(深台|彰化|新北|台)
+custom_proxy_group=fox+`select`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|新加坡|sg|hk|tw)
+custom_proxy_group=美区影视`select`(美|美国)
+custom_proxy_group=Global_media`select`.*
+custom_proxy_group=Domestic`select`[]DIRECT`[]Proxy
+custom_proxy_group=Apple`select`[]DIRECT`[]Proxy
+custom_proxy_group=Final`select`[]Proxy`[]DIRECT
+custom_proxy_group=屏蔽广告`select`[]REJECT`[]DIRECT
+custom_proxy_group=UnblockNeteaseMusic`select`云音乐解锁`[]DIRECT
+custom_proxy_group=Telegram`select`新加坡`[]Proxy
+
+enable_rule_generator=false
+;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list
+;surge_ruleset=⛔️ 广告拦截,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list
+;surge_ruleset=🚫 运营劫持,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Hijacking.list
+;surge_ruleset=🌌 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/YouTube.list
+;surge_ruleset=🎥 NETFLIX,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Netflix.list
+;surge_ruleset=HBO,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/HBO.list
+;surge_ruleset=Fox,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Fox.list
+;surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/GlobalMedia.list
+;surge_ruleset=🌏 港台媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/HKMTMedia.list
+;surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Telegram.list
+;surge_ruleset=🔰 节点选择,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Global.list
+;surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
+;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/China.list
+
+clash_rule_base=forcerule.yml
+;surge_rule_base=surge.conf
+;surfboard_rule_base=surfboard.conf
+;mellow_rule_base=mellow.conf
--- a/base/forcerule.yml
+++ b/base/forcerule.yml
--- a/base/gistconf.ini
+++ b/base/gistconf.ini
--- a/base/mellow.conf
+++ b/base/mellow.conf
--- a/base/pref.ini
+++ b/base/pref.ini
@@ -2,11 +2,14 @@
 ;API mode, set to true to prevent loading local subscriptions or serving local files directly
 api_mode=false

+;Access token used for performing critical action through Web interface
+api_access_token=password
+
 ;Default URLs, used when no URL is provided in request, use "|" to separate multiple subscription links, supports local files/URL
 default_url=

 ;Exclude nodes which remarks match the following patterns. Supports regular expression.
-exclude_remarks=(到期|流量|时间|官网|产品)
+exclude_remarks=(到期|剩余流量|时间|官网|产品)
 ;exclude_remarks=(other rule)

 ;Only include nodes which remarks match the following patterns. Supports regular expression.
@@ -32,6 +35,13 @@ proxy_subscription=NONE
 ;Append a proxy type string ([SS] [SSR] [VMess]) to node remark.
 append_proxy_type=false

+[node_pref]
+udp_flag=false
+tcp_fast_open_flag=false
+sort_flag=false
+skip_cert_verify_flag=false
+filter_deprecated_nodes=false
+
 ;Rename remarks with the following patterns. Supports regular expression.
 ;Format: Search_Pattern@Replace_Pattern
 ;rename_node=IPLC@专线
@@ -103,39 +113,45 @@ remove_old_emoji=true
 ;Rule to add emojis. Supports regular expression.
 ;Format: Remark_Search_Pattern,emoji

-rule=(流量|时间|应急),🏳️‍🌈
-rule=阿根廷,🇦🇷
+rule=(流量|时间|应急|过期|Bandwidth|expire),🏳️‍🌈
+rule=AC,🇦🇨
+rule=(AR|阿根廷),🇦🇷
 rule=(奥地利|维也纳),🇦🇹
-rule=(澳大利亚|悉尼),🇦🇺
-rule=(巴西|圣保罗),🇧🇷
-rule=(加拿大|蒙特利尔|温哥华),🇨🇦
+rule=(AU|Australia|Sydney|澳大利亚|悉尼),🇦🇺
+rule=BE,🇧🇪
+rule=(BR|Brazil|巴西|圣保罗),🇧🇷
+rule=(Canada|加拿大|蒙特利尔|温哥华|楓葉|枫叶),🇨🇦
 rule=(瑞士|苏黎世),🇨🇭
-rule=(德|德国|法兰克福),🇩🇪
-rule=(芬兰|赫尔辛基),🇫🇮
-rule=(法国|巴黎),🇫🇷
-rule=(英国|伦敦),🇬🇧
-rule=(港|香港|深港|沪港),🇭🇰
-rule=(印尼|印度尼西亚|雅加达),🇮🇩
-rule=(爱尔兰|都柏林),🇮🇪
-rule=(印度|孟买),🇮🇳
-rule=(意大利|米兰),🇮🇹
-rule=(日|日本|东京|大阪|埼玉|沪日),🇯🇵
-rule=朝鲜,🇰🇵
-rule=(韩国|首尔),🇰🇷
-rule=澳门,🇲🇴
-rule=马来西亚,🇲🇾
-rule=(荷兰|阿姆斯特丹),🇳🇱
-rule=菲律宾,🇵🇭
-rule=罗马尼亚,🇷🇴
-rule=(俄罗斯|伯力|莫斯科|圣彼得堡|西伯利亚|新西伯利亚),🇷🇺
-rule=(新|新加坡|狮城),🇸🇬
-rule=(泰国|曼谷),🇹🇭
-rule=(土耳其|伊斯坦布尔),🇹🇷
-rule=(台|台湾|台北|台中|新北|彰化),🇹🇼
-rule=(美|美国|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|沪美),🇺🇲
-rule=越南,🇻🇳
-rule=南非,🇿🇦
-rule=(中国|江苏|北京|上海|广州|深圳|杭州|徐州|青岛|宁波|镇江),🇨🇳
+rule=(DE|Germany|德国|法兰克福|德),🇩🇪
+rule=丹麦,🇩🇰
+rule=ES,🇪🇸
+rule=EU,🇪🇺
+rule=(Finland|芬兰|赫尔辛基),🇫🇮
+rule=(FR|France|法国|巴黎),🇫🇷
+rule=(UK|England|UnitedKingdom|英国|英|伦敦),🇬🇧
+rule=(HK|HongKong|香港|深港|沪港|呼港|HKT|HKBN|HGC|WTT|CMI|穗港|京港|港),🇭🇰
+rule=(Indonesia|印尼|印度尼西亚|雅加达),🇮🇩
+rule=(Ireland|爱尔兰|都柏林),🇮🇪
+rule=(India|印度|孟买),🇮🇳
+rule=(Italy|意大利|米兰),🇮🇹
+rule=(JP|Japan|日本|东京|大阪|埼玉|沪日|穗日|川日|中日|泉日|杭日),🇯🇵
+rule=(KP|朝鲜),🇰🇵
+rule=(KR|Korea|KOR|韩国|首尔|韩|韓),🇰🇷
+rule=(MO|Macao|澳门|CTM),🇲🇴
+rule=(MY|Malaysia|马来西亚),🇲🇾
+rule=(NL|Netherlands|荷兰|阿姆斯特丹),🇳🇱
+rule=(PH|Philippines|菲律宾),🇵🇭
+rule=(RO|罗马尼亚),🇷🇴
+rule=(RU|Russia|俄罗斯|伯力|莫斯科|圣彼得堡|西伯利亚|新西伯利亚|京俄|杭俄),🇷🇺
+rule=(沙特|迪拜),🇸🇦
+rule=(SE|Sweden),🇸🇪
+rule=(SG|Singapore|新加坡|狮城|沪新|京新|泉新|穗新|深新|杭新),🇸🇬
+rule=(TH|Thailand|泰国|曼谷),🇹🇭
+rule=(TR|Turkey|土耳其|伊斯坦布尔),🇹🇷
+rule=(US|America|UnitedStates|美国|美|京美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|沪美),🇺🇲
+rule=(VN|越南),🇻🇳
+rule=(ZA|南非),🇿🇦
+rule=(CN|China|回国|中国|江苏|北京|上海|广州|深圳|杭州|徐州|青岛|宁波|镇江|back|TW|Taiwan|台湾|台北|台中|新北|彰化|CHT|新北|台|HINET),🇨🇳

 [ruleset]
 ;Enable generating rules with rulesets
@@ -171,7 +187,7 @@ surge_ruleset=🛑 全球拦截,rules/NobyDa/Surge/AdRule.list
 surge_ruleset=🛑 全球拦截,rules/ConnersHua/Surge/Ruleset/Hijacking.list
 ;surge_ruleset=🎥 NETFLIX,rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
 surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🌏 国内媒体,rules/lhie1/Surge3/Domestic.list
+surge_ruleset=🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/AsianTV.list
 surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
 surge_ruleset=🔰 节点选择,rules/ConnersHua/Surge/Ruleset/Global.list
 surge_ruleset=🍎 苹果服务,rules/ConnersHua/Surge/Ruleset/Apple.list
@@ -194,6 +210,9 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;custom_proxy_group=g2`select`!!GROUPID=1
 ;custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider

+;custom_proxy_group=g1hk`select`!!GROUPID=0!!(HGC|HKBN|PCCW|HKT|hk|港)
+;custom_proxy_group=sstw`select`!!GROUP=V2RayProvider!!(深台|彰化|新北|台|tw)
+
 ;for forcerule.yml
 ;custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
 ;custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
@@ -216,7 +235,7 @@ custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/genera
 ;custom_proxy_group=🎥 NETFLIX`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 ;custom_proxy_group=⛔️ 广告拦截`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
 ;custom_proxy_group=🚫 运营劫持`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
-custom_proxy_group=🌍 国外媒体`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🌍 国外媒体`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
 custom_proxy_group=📲 电报信息`select`[]🔰 节点选择`.*`[]🎯 全球直连
 custom_proxy_group=🍎 苹果服务`select`[]🔰 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/rules/ConnersHua/Surge/BacktoCN.list
+++ b/base/rules/ConnersHua/Surge/BacktoCN.list
@@ -0,0 +1,75 @@
+# (Video)
+# AcFun
+USER-AGENT,AcFun*
+DOMAIN-SUFFIX,acfun.cn
+DOMAIN-SUFFIX,acfun.com
+DOMAIN-SUFFIX,aixifan.com
+# > bilibili
+USER-AGENT,bili-universal
+USER-AGENT,Bilibili*
+DOMAIN-SUFFIX,acgvideo.com
+DOMAIN-SUFFIX,bilibili.com
+DOMAIN-SUFFIX,hdslb.com
+# > HunanTV
+USER-AGENT,MGTV*
+DOMAIN-SUFFIX,hitv.com
+DOMAIN-SUFFIX,hunantv.com
+DOMAIN-SUFFIX,mgtv.com
+# > Migu
+USER-AGENT,MiguVideo*
+USER-AGENT,%E5%92%AA%E5%92%95%E8%A7%86%E9%A2%91
+DOMAIN-SUFFIX,cmvideo.cn
+DOMAIN-SUFFIX,migu.cn
+DOMAIN-SUFFIX,miguvideo.com
+# > iQiyi
+USER-AGENT,iQiYi*
+USER-AGENT,PPStream*
+USER-AGENT,QIYI*
+USER-AGENT,QYPlayer*
+DOMAIN-SUFFIX,iqiyi.com
+DOMAIN-SUFFIX,iqiyipic.com
+DOMAIN-SUFFIX,qy.net
+DOMAIN-SUFFIX,71.am
+# > Sohu
+DOMAIN-SUFFIX,56.com
+DOMAIN-SUFFIX,sohu.com
+DOMAIN-SUFFIX,sohu.com.cn
+DOMAIN-SUFFIX,itc.cn
+DOMAIN-SUFFIX,v-56.com
+# > Tencent
+USER-AGENT,live4iphone*
+USER-AGENT,qqlive4iphone*
+USER-AGENT,TencentMidasConnect*
+DOMAIN-SUFFIX,video.qq.com
+# > Youku
+USER-AGENT,Youku*
+USER-AGENT,%E4%BC%98%E9%85%B7*
+DOMAIN-SUFFIX,soku.com
+DOMAIN-SUFFIX,youku.com
+DOMAIN-SUFFIX,ykimg.com
+
+# (Music)
+# > Alibaba
+USER-AGENT,walkman*
+USER-AGENT,xiami*
+DOMAIN-SUFFIX,xiami.com
+DOMAIN-SUFFIX,xiami.net
+# > Netease
+USER-AGENT,NeteaseMusic*
+USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90*
+DOMAIN-SUFFIX,music.126.net
+DOMAIN-SUFFIX,music.163.com
+# > Tencent
+USER-AGENT,MOO%E9%9F%B3%E4%B9%90*
+USER-AGENT,QQ%E9%9F%B3%E4%B9%90
+DOMAIN-SUFFIX,qqmusic.qq.com
+DOMAIN-SUFFIX,y.qq.com
+DOMAIN,aqqmusic.tc.qq.com
+# Kugou and Kuwo
+DOMAIN-SUFFIX,kugou.com
+USER-AGENT,%E9%85%B7%E6%88%91%E9%9F%B3%E4%B9%90*
+DOMAIN-SUFFIX,kuwo.cn
+DOMAIN-SUFFIX,koowo.com
+# > Baidu
+USER-AGENT,baiduyinyue
+DOMAIN-SUFFIX,qianqian.com
--- a/base/rules/ConnersHua/Surge/Ruleset/Advertising.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Advertising.list
@@ -0,0 +1,422 @@
+# Advertising 广告（以及隐私追踪）
+# > General
+DOMAIN-KEYWORD,adservice
+DOMAIN-KEYWORD,analytics
+DOMAIN-KEYWORD,analysis
+
+DOMAIN-SUFFIX,42trck.com
+DOMAIN-SUFFIX,51.la
+DOMAIN-SUFFIX,adcolony.com
+DOMAIN-SUFFIX,adinfuse.com
+DOMAIN-SUFFIX,adjust.com
+DOMAIN-SUFFIX,adjust.io
+DOMAIN-SUFFIX,admaster.com.cn
+DOMAIN-SUFFIX,admob.com
+DOMAIN-SUFFIX,adnxs.com
+DOMAIN-SUFFIX,adnyg.com
+DOMAIN-SUFFIX,adsensor.org
+DOMAIN-SUFFIX,adsymptotic.com
+DOMAIN-SUFFIX,adtarget.tech
+DOMAIN-SUFFIX,adthor.com
+DOMAIN-SUFFIX,adwhirl.com
+DOMAIN-SUFFIX,amazon-adsystem.com
+DOMAIN-SUFFIX,amobee.com
+DOMAIN-SUFFIX,analysys.cn
+DOMAIN-SUFFIX,app-adforce.jp
+DOMAIN-SUFFIX,appads.com
+DOMAIN-SUFFIX,appcpi.net
+DOMAIN-SUFFIX,appier.net
+DOMAIN-SUFFIX,applift.com
+DOMAIN-SUFFIX,applovin.com
+DOMAIN-SUFFIX,applvn.com
+DOMAIN-SUFFIX,appsflyer.com
+DOMAIN-SUFFIX,apsalar.com
+DOMAIN-SUFFIX,apxadtracking.net
+DOMAIN-SUFFIX,axonix.com
+DOMAIN-SUFFIX,bayimob.com
+DOMAIN-SUFFIX,bjvvqu.cn
+DOMAIN-SUFFIX,bulldogcpi.com
+DOMAIN-SUFFIX,clotfun.mobi
+DOMAIN-SUFFIX,clotfun.online
+DOMAIN-SUFFIX,cloudmobi.net
+DOMAIN-SUFFIX,cnzz.com
+DOMAIN-SUFFIX,ctrmi.com
+DOMAIN-SUFFIX,exosrv.com
+DOMAIN-SUFFIX,flurry.com
+DOMAIN-SUFFIX,go2cloud.org
+DOMAIN-SUFFIX,growingio.com
+DOMAIN-SUFFIX,haloapps.com
+DOMAIN-SUFFIX,hypers.com
+DOMAIN-SUFFIX,idealads.net
+DOMAIN-SUFFIX,inmobi.cn
+DOMAIN-SUFFIX,inmobi.com
+DOMAIN-SUFFIX,inmobi.net
+DOMAIN-SUFFIX,inmobicdn.cn
+DOMAIN-SUFFIX,inmobicdn.net
+DOMAIN-SUFFIX,inner-active.mobi
+DOMAIN-SUFFIX,insurads.com
+DOMAIN-SUFFIX,ironsrc.com
+DOMAIN-SUFFIX,irs01.com
+DOMAIN-SUFFIX,iskyworker.com
+DOMAIN-SUFFIX,juicyads.com
+DOMAIN-SUFFIX,kochava.com
+DOMAIN-SUFFIX,leadboltmobile.net
+DOMAIN-SUFFIX,lenzmx.com
+DOMAIN-SUFFIX,liveadvert.com
+DOMAIN-SUFFIX,lnk0.com
+DOMAIN-SUFFIX,lnk8.cn
+DOMAIN-SUFFIX,localytics.com
+DOMAIN-SUFFIX,mdfull.com
+DOMAIN-SUFFIX,measurementapi.com
+DOMAIN-SUFFIX,medialytics.com
+DOMAIN-SUFFIX,meetrics.com
+DOMAIN-SUFFIX,meetrics.net
+DOMAIN-SUFFIX,miaozhen.com
+DOMAIN-SUFFIX,mmstat.com
+DOMAIN-SUFFIX,moatads.com
+DOMAIN-SUFFIX,mobclix.com
+DOMAIN-SUFFIX,mopub.com
+DOMAIN-SUFFIX,okjhb.xyz
+DOMAIN-SUFFIX,openx.net
+DOMAIN-SUFFIX,pubmatic.com
+DOMAIN-SUFFIX,qchannel01.cn
+DOMAIN-SUFFIX,rayjump.com
+DOMAIN-SUFFIX,rtbasia.com
+DOMAIN-SUFFIX,rubiconproject.com
+DOMAIN-SUFFIX,scorecardresearch.com
+DOMAIN-SUFFIX,sdkclick.com
+DOMAIN-SUFFIX,shuzilm.cn
+DOMAIN-SUFFIX,smaato.net
+DOMAIN-SUFFIX,smartadserver.com
+DOMAIN-SUFFIX,smartnews-ads.com
+DOMAIN-SUFFIX,supersonic.com
+DOMAIN-SUFFIX,supersonicads.com
+DOMAIN-SUFFIX,tagtic.cn
+DOMAIN-SUFFIX,tanv.com
+DOMAIN-SUFFIX,tanx.com
+DOMAIN-SUFFIX,tapjoy.com
+DOMAIN-SUFFIX,trafficjunky.net
+DOMAIN-SUFFIX,turn.com
+DOMAIN-SUFFIX,uri6.com
+DOMAIN-SUFFIX,vidoomy.com
+DOMAIN-SUFFIX,voicefive.com
+DOMAIN-SUFFIX,vungle.com
+DOMAIN-SUFFIX,wedolook.com
+DOMAIN-SUFFIX,xdrig.com
+DOMAIN-SUFFIX,zu08e.cn
+
+DOMAIN-SUFFIX,ad.daum.net
+DOMAIN-SUFFIX,track.xiachufang.com
+DOMAIN,abema-adx.ameba.jp
+DOMAIN,ad.12306.cn
+DOMAIN,ad.360in.com
+DOMAIN,ad.51wnl-cq.com
+DOMAIN,ad.caiyunapp.com
+DOMAIN,ad.huajiao.com
+DOMAIN,ad.hzyoka.com
+DOMAIN,ad.jiemian.com
+DOMAIN,ad.qingting.fm
+DOMAIN,ad.wappalyzer.com
+DOMAIN,ad-cn.jovcloud.com
+DOMAIN,adextra.51wnl-cq.com
+DOMAIN,ads.adadapted.com
+DOMAIN,ads.daydaycook.com.cn
+DOMAIN,ads.weilitoutiao.net
+DOMAIN,adsapi.manhuaren.com
+DOMAIN,adsdk.dmzj.com
+DOMAIN,adserver.pandora.com
+DOMAIN,adui.tg.meitu.com
+DOMAIN,adv.bandi.so
+DOMAIN,adxserver.ad.cmvideo.cn
+DOMAIN,app-ad.variflight.com
+DOMAIN,applog.mobike.com
+DOMAIN,appnext.hs.llnwd.net
+DOMAIN,appnext-a.akamaihd.net
+DOMAIN,ggs.myzaker.com
+DOMAIN,gs.getui.com
+DOMAIN,itad.linetv.tw
+DOMAIN,ja.chushou.tv
+DOMAIN,log.b612kaji.com
+DOMAIN,mads.suning.com
+DOMAIN,mobileads.msn.com
+DOMAIN,mopnativeadv.037201.com
+DOMAIN,nativeadv.dftoutiao.com
+DOMAIN,sugar.zhihu.com
+DOMAIN,toots-a.akamaihd.net
+DOMAIN,track.tiara.daum.net
+DOMAIN,track.tiara.kakao.com
+DOMAIN,trackapp.guahao.cn
+DOMAIN,traffic.mogujie.com
+DOMAIN,wmlog.meituan.com
+
+# (0~9)
+# > 58 同城
+DOMAIN,adshow.58.com
+DOMAIN,track.58.com
+DOMAIN,tracklog.58.com
+# (A)
+# > Apple
+DOMAIN-SUFFIX,iadsdk.apple.com
+DOMAIN-SUFFIX,ads.internal.unity3d.com
+DOMAIN-SUFFIX,ads.prd.ie.internal.unity3d.com
+DOMAIN-SUFFIX,unityads.unity3d.com
+# > Alibaba
+DOMAIN,acs4baichuan.m.taobao.com
+DOMAIN,adash.m.taobao.com
+DOMAIN,adash.man.aliyuncs.com
+DOMAIN,adashbc.ut.taobao.com
+DOMAIN,adash-c.ut.taobao.com
+DOMAIN,adashx.m.taobao.com
+DOMAIN,adashx4yt.m.taobao.com
+DOMAIN,adashxgc.ut.taobao.com
+DOMAIN,h-adashx.ut.taobao.com
+DOMAIN,nbsdk-baichuan.alicdn.com
+DOMAIN,optimus-ads.amap.com
+DOMAIN,optimus-ads.amap.com.w.alikunlun.com
+DOMAIN,tunion-api.m.taobao.com
+# > AutoHome
+DOMAIN,adproxy.autohome.com.cn
+DOMAIN,rd.autohome.com.cn
+DOMAIN,al.autohome.com.cn
+DOMAIN,applogapi.autohome.com.cn
+# (B)
+# > Baidu
+DOMAIN-SUFFIX,baidustatic.com
+DOMAIN-SUFFIX,cpro.baidu.com
+DOMAIN-SUFFIX,pos.baidu.com
+DOMAIN,afd.baidu.com
+DOMAIN,als.baidu.com
+DOMAIN,duclick.baidu.com
+DOMAIN,hm.baidu.com
+DOMAIN,hmma.baidu.com
+DOMAIN,mobads.baidu.com
+DOMAIN,mobads-logs.baidu.com
+DOMAIN,nsclick.baidu.com
+# > ByteDance
+DOMAIN,ad.toutiao.com
+DOMAIN,applog.musical.ly
+DOMAIN,track.toutiao.com
+DOMAIN,xlog.snssdk.com
+DOMAIN,xlog-va.byteoversea.com
+# > BitAuto
+DOMAIN,adx.yiche.com
+DOMAIN,log.ycapp.yiche.com
+# > 百词斩
+DOMAIN,advertise.baicizhan.com
+DOMAIN,advertise.baicizhan.org
+# (C)
+# > CNTV
+DOMAIN,galaxy.bjcathay.com
+DOMAIN,mdrecv.app.cntvwb.cn
+DOMAIN,sdapprecv.app.cntvwb.cn
+DOMAIN,vdapprecv.app.cntvwb.cn
+# > ChinaTelecom
+DOMAIN,ad.k.21cn.com
+DOMAIN,admarket.21cn.com
+DOMAIN,adshows.21cn.com
+# > 车来了
+DOMAIN,atrace.chelaile.net.cn
+DOMAIN,logs.chelaile.net.cn
+# (G)
+# > Google
+DOMAIN-SUFFIX,doubleclick.net
+DOMAIN-SUFFIX,googleadservices.com
+DOMAIN-SUFFIX,googleadsserving.cn
+DOMAIN-SUFFIX,googlesyndication.com
+DOMAIN-SUFFIX,googletagmanager.com
+DOMAIN-SUFFIX,googletagservices.com
+# (H)
+# > HunanTV
+DOMAIN-SUFFIX,da.mgtv.com
+DOMAIN-SUFFIX,da.hunantv.com
+DOMAIN-SUFFIX,log.hunantv.com
+DOMAIN,log.v2.hunantv.com
+DOMAIN,v2.log.hunantv.com
+# > Hupu
+DOMAIN,adx.hupu.com
+DOMAIN,adx-api.hupu.com
+DOMAIN,goblin.hupu.com
+# (I)
+# > iQiyi
+DOMAIN,ifacelog.iqiyi.com
+DOMAIN,msg.71.am
+DOMAIN,msg.qy.net
+DOMAIN,t7z.cupid.iqiyi.com
+IP-CIDR,101.227.97.240/32,no-resolve
+IP-CIDR,101.227.200.11/32,no-resolve
+IP-CIDR,101.227.200.28/32,no-resolve
+IP-CIDR,124.192.153.42/32,no-resolve
+# > Ifeng
+DOMAIN-SUFFIX,deliver.ifeng.com
+DOMAIN,api.newad.ifeng.com
+DOMAIN,ifengad.3g.ifeng.com
+# (K)
+# > KuGou and Kuwo
+DOMAIN,adserviceretry.kugou.com
+DOMAIN,ads.service.kugou.com
+DOMAIN,adsfile.bssdlbig.kugou.com
+DOMAIN,g.koowo.com
+DOMAIN,kgmobilestat.kugou.com
+DOMAIN,kgmobilestatbak.kugou.com
+DOMAIN,mobilelog.kugou.com
+DOMAIN,mobilead.kuwo.cn
+DOMAIN,rich.kuwo.cn
+# > Kingsoft
+DOMAIN,ad-stat.ksosoft.com
+DOMAIN,img.auction-ads.wpscdn.cn
+DOMAIN,counter.kingsoft.com
+DOMAIN,counter.ksosoft.com
+DOMAIN,minfo.wps.cn
+DOMAIN,mobad.ijinshan.com
+DOMAIN,ups.ksmobile.net
+DOMAIN,ws.ksmobile.net
+# (L)
+# > Le
+DOMAIN-SUFFIX,webp2p.letv.com
+DOMAIN,ark.letv.com
+DOMAIN,emma-414870e223.huodonghezi.com
+DOMAIN,g3.letv.com
+DOMAIN,n.mark.letv.com
+# > 乐播投屏
+DOMAIN,ad.hpplay.cn
+DOMAIN,adeng.hpplay.cn
+DOMAIN,rp.hpplay.cn
+# (M)
+# > MI
+DOMAIN-SUFFIX,ad.intl.xiaomi.com
+DOMAIN-SUFFIX,ad.xiaomi.com
+DOMAIN-SUFFIX,admob.xiaomi.com
+DOMAIN-SUFFIX,tracking.miui.com
+DOMAIN,adv.sec.intl.miui.com
+DOMAIN,adv.sec.miui.com
+DOMAIN,data.mistat.xiaomi.com
+DOMAIN,tracking.intl.miui.com
+# > 墨迹天气
+DOMAIN,ad.api.moji.com
+DOMAIN,adlaunch.moji.com
+DOMAIN,ads.mojicdn.com
+DOMAIN,v1.log.moji.com
+# (N)
+# > NetEase
+DOMAIN,ad.bn.netease.com
+DOMAIN,ad.yixin.im
+DOMAIN,admusicpic.music.126.net
+DOMAIN,gorgon.youdao.com
+DOMAIN,iadmat.nosdn.127.net
+DOMAIN,iadmusicmat.music.126.net
+DOMAIN,iadmusicmatvideo.music.126.net
+DOMAIN,impservice.dictapp.youdao.com
+DOMAIN,impservice.youdao.com
+DOMAIN,log.yex.youdao.com
+DOMAIN,log-yex.youdao.com
+DOMAIN,n.3g.163.com
+DOMAIN,nex.163.com
+DOMAIN,yt-adp.nosdn.127.net
+DOMAIN,yt-adp.ws.126.net
+# (P)
+# > PPTV
+DOMAIN,ads.aplus.pptv.com
+DOMAIN,ads.aplusapi.pptv.com
+DOMAIN,asimgs.pplive.cn
+DOMAIN,de.as.pptv.com
+# > Photoable
+DOMAIN,regist.fotoable.com
+DOMAIN,cdn.adapi.fotoable.com
+# > PeanutWiFiMpass
+DOMAIN,adnew.wifi8.com
+DOMAIN,adfile.wifi8.com
+# (S)
+# > Sina
+DOMAIN-SUFFIX,beacon.sina.com.cn
+DOMAIN,adimg.vue.weibo.com
+DOMAIN,u1.img.mobile.sina.cn
+DOMAIN,sax.sina.com.cn
+DOMAIN,saxs.sina.com.cn
+DOMAIN,saxn.sina.com.cn
+# > Sohu
+DOMAIN-SUFFIX,ad.sohu.com
+DOMAIN-SUFFIX,ads.sohu.com
+DOMAIN-SUFFIX,aty.sohu.com
+DOMAIN,imp.optaim.com
+DOMAIN,v2.reachmax.cn
+DOMAIN,track.sohu.com
+DOMAIN,hui.sohu.com
+# (T)
+# > Tencent
+DOMAIN-SUFFIX,beacon.qq.com
+DOMAIN-SUFFIX,bugly.qq.com
+DOMAIN-SUFFIX,e.qq.com
+DOMAIN-SUFFIX,gdt.qq.com
+DOMAIN-SUFFIX,l.qq.com
+DOMAIN-SUFFIX,rqd.qq.com
+DOMAIN,adsmind.tc.qq.com
+DOMAIN,adsmind.apdcdn.tc.qq.com
+DOMAIN,btrace.qq.com
+DOMAIN,mtrace.qq.com
+DOMAIN,oth.eve.mdt.qq.com
+DOMAIN,pgdt.gtimg.com
+DOMAIN,pgdt.gtimg.cn
+DOMAIN,pgdt.ugdtimg.com
+DOMAIN,pingma.qq.com
+DOMAIN,pingtcss.qq.com
+DOMAIN,splashqqlive.gtimg.com
+DOMAIN,tajs.qq.com
+DOMAIN,wxsnsdy.wxs.qq.com
+DOMAIN,wxsnsdythumb.wxs.qq.com
+# > The Paper
+DOMAIN,admonitor.thepaper.cn
+DOMAIN,adpai.thepaper.cn
+DOMAIN,imgadpai.thepaper.cn
+# > Thunder
+DOMAIN,adsp.xunlei.com
+DOMAIN,etl.xlmc.sandai.net
+# > 同花顺
+DOMAIN,adm.10jqka.com.cn
+DOMAIN,stat.10jqka.com.cn
+# > 太平洋
+DOMAIN,ad-analysis.pconline.com.cn
+DOMAIN,iad0ssl.pcauto.com.cn
+DOMAIN,iad0ssl.pconline.com.cn
+DOMAIN,imgad0.pcauto.com.cn
+DOMAIN,imgad0.pconline.com.cn
+DOMAIN,ivy.pchouse.com.cn
+# (U)
+# > UC
+DOMAIN,adtrack.ucweb.com
+DOMAIN,track.uc.cn
+# > Umeng
+DOMAIN,alog.umeng.co
+DOMAIN,alog.umeng.com
+DOMAIN,alogs.umeng.com
+DOMAIN,alog.umengcloud.com
+DOMAIN,alogs.umengcloud.com
+DOMAIN,ar.umeng.com
+DOMAIN,plbslog.umeng.com
+DOMAIN,ulogs.umeng.com
+DOMAIN,ulogs.umengcloud.com
+# (W)
+# > WiFi 万能钥匙
+DOMAIN,a.wkanx.com
+DOMAIN,cwx.lianwangtech.com
+DOMAIN,c1wx.lianwangtech.com
+# (X)
+# > 喜马拉雅
+DOMAIN,ad.ximalaya.com
+DOMAIN,adbs.ximalaya.com
+DOMAIN,adse.ximalaya.com
+DOMAIN,adse.wsa.ximalaya.com
+DOMAIN,adbehavior.wsa.ximalaya.com
+DOMAIN,adsebs.ximalaya.com
+# > 小红书
+DOMAIN,ads-video-qc.xhscdn.com
+DOMAIN,apm-track.xiaohongshu.com
+DOMAIN,t-ads.xiaohongshu.com
+# (Y)
+# > Youku
+DOMAIN-SUFFIX,atm.youku.com
+DOMAIN,ad.mobile.youku.com
+DOMAIN,iyes.youku.com
+# (Z)
+# > ZOL
+DOMAIN,apppv.zol.com.cn
+DOMAIN,pvnapp.zol.com.cn
--- a/base/rules/ConnersHua/Surge/Ruleset/Apple.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Apple.list
--- a/base/rules/ConnersHua/Surge/Ruleset/AppleNews.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/AppleNews.list
--- a/base/rules/ConnersHua/Surge/Ruleset/China.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/China.list
@@ -196,8 +196,10 @@ DOMAIN-SUFFIX,empornium.me
 DOMAIN-SUFFIX,gazellegames.net
 DOMAIN-SUFFIX,hdchina.org
 DOMAIN-SUFFIX,hdsky.me
+DOMAIN-SUFFIX,icetorrent.org
 DOMAIN-SUFFIX,jpopsuki.eu
 DOMAIN-SUFFIX,keepfrds.com
+DOMAIN-SUFFIX,madsrevolution.net
 DOMAIN-SUFFIX,m-team.cc
 DOMAIN-SUFFIX,nanyangpt.com
 DOMAIN-SUFFIX,ncore.cc
@@ -209,6 +211,63 @@ DOMAIN-SUFFIX,redacted.ch
 DOMAIN-SUFFIX,springsunday.net
 DOMAIN-SUFFIX,tjupt.org
 DOMAIN-SUFFIX,totheglory.im
+# > Scholar
+DOMAIN-SUFFIX,acm.org
+DOMAIN-SUFFIX,acs.org
+DOMAIN-SUFFIX,aip.org
+DOMAIN-SUFFIX,ams.org
+DOMAIN-SUFFIX,annualreviews.org
+DOMAIN-SUFFIX,aps.org
+DOMAIN-SUFFIX,ascelibrary.org
+DOMAIN-SUFFIX,asm.org
+DOMAIN-SUFFIX,asme.org
+DOMAIN-SUFFIX,astm.org
+DOMAIN-SUFFIX,bmj.com
+DOMAIN-SUFFIX,cambridge.org
+DOMAIN-SUFFIX,cas.org
+DOMAIN-SUFFIX,clarivate.com
+DOMAIN-SUFFIX,ebscohost.com
+DOMAIN-SUFFIX,emerald.com
+DOMAIN-SUFFIX,engineeringvillage.com
+DOMAIN-SUFFIX,icevirtuallibrary.com
+DOMAIN-SUFFIX,ieee.org
+DOMAIN-SUFFIX,imf.org
+DOMAIN-SUFFIX,iop.org
+DOMAIN-SUFFIX,jamanetwork.com
+DOMAIN-SUFFIX,jhu.edu
+DOMAIN-SUFFIX,jstor.org
+DOMAIN-SUFFIX,karger.com
+DOMAIN-SUFFIX,libguides.com
+DOMAIN-SUFFIX,madsrevolution.net
+DOMAIN-SUFFIX,mpg.de
+DOMAIN-SUFFIX,myilibrary.com
+DOMAIN-SUFFIX,nature.com
+DOMAIN-SUFFIX,oecd-ilibrary.org
+DOMAIN-SUFFIX,osapublishing.org
+DOMAIN-SUFFIX,oup.com
+DOMAIN-SUFFIX,ovid.com
+DOMAIN-SUFFIX,oxfordartonline.com
+DOMAIN-SUFFIX,oxfordbibliographies.com
+DOMAIN-SUFFIX,oxfordmusiconline.com
+DOMAIN-SUFFIX,pnas.org
+DOMAIN-SUFFIX,proquest.com
+DOMAIN-SUFFIX,rsc.org
+DOMAIN-SUFFIX,sagepub.com
+DOMAIN-SUFFIX,sciencedirect.com
+DOMAIN-SUFFIX,sciencemag.org
+DOMAIN-SUFFIX,scopus.com
+DOMAIN-SUFFIX,siam.org
+DOMAIN-SUFFIX,spiedigitallibrary.org
+DOMAIN-SUFFIX,springer.com
+DOMAIN-SUFFIX,springerlink.com
+DOMAIN-SUFFIX,tandfonline.com
+DOMAIN-SUFFIX,un.org
+DOMAIN-SUFFIX,uni-bielefeld.de
+DOMAIN-SUFFIX,webofknowledge.com
+DOMAIN-SUFFIX,westlaw.com
+DOMAIN-SUFFIX,wiley.com
+DOMAIN-SUFFIX,worldbank.org
+DOMAIN-SUFFIX,worldscientific.com
 # > Other
 DOMAIN-SUFFIX,cn
 DOMAIN-SUFFIX,360in.com
--- a/base/rules/ConnersHua/Surge/Ruleset/Cloudflare.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Cloudflare.list
--- a/base/rules/ConnersHua/Surge/Ruleset/DomesticMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/DomesticMedia.list
--- a/base/rules/ConnersHua/Surge/Ruleset/ForeignMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/ForeignMedia.list
@@ -26,6 +26,8 @@ DOMAIN-SUFFIX,pscdn.co
 DOMAIN-SUFFIX,scdn.co
 DOMAIN-SUFFIX,spotify.com
 DOMAIN-SUFFIX,spoti.fi
+DOMAIN-KEYWORD,spotify.com
+DOMAIN-KEYWORD,-spotify-com
 # > TIDAL
 USER-AGENT,TIDAL*
 DOMAIN-SUFFIX,tidal.com
@@ -53,8 +55,13 @@ USER-AGENT,Prime%20Video*
 DOMAIN-SUFFIX,aiv-cdn.net
 DOMAIN-SUFFIX,aiv-delivery.net
 DOMAIN-SUFFIX,amazonvideo.com
-DOMAIN-SUFFIX,media-amazon.com
 DOMAIN-SUFFIX,primevideo.com
+DOMAIN,avodmp4s3ww-a.akamaihd.net
+DOMAIN,d25xi40x97liuc.cloudfront.net
+DOMAIN,dmqdd6hw24ucf.cloudfront.net
+DOMAIN,d22qjgkvxw22r6.cloudfront.net
+DOMAIN,d1v5ir2lpwr8os.cloudfront.net
+DOMAIN-KEYWORD,avoddashs
 # > Bahamut
 USER-AGENT,Anime*
 DOMAIN-SUFFIX,bahamut.com.tw
--- a/base/rules/ConnersHua/Surge/Ruleset/Global.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Global.list
@@ -1,5 +1,6 @@
 # (DNS Cache Pollution Protection)
 # > Google
+DOMAIN-SUFFIX,ampproject.org
 DOMAIN-SUFFIX,appspot.com
 DOMAIN-SUFFIX,blogger.com
 DOMAIN-SUFFIX,getoutline.org
--- a/base/rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
@@ -26,6 +26,8 @@ DOMAIN-SUFFIX,pscdn.co
 DOMAIN-SUFFIX,scdn.co
 DOMAIN-SUFFIX,spotify.com
 DOMAIN-SUFFIX,spoti.fi
+DOMAIN-KEYWORD,spotify.com
+DOMAIN-KEYWORD,-spotify-com
 # > TIDAL
 USER-AGENT,TIDAL*
 DOMAIN-SUFFIX,tidal.com
@@ -53,8 +55,13 @@ USER-AGENT,Prime%20Video*
 DOMAIN-SUFFIX,aiv-cdn.net
 DOMAIN-SUFFIX,aiv-delivery.net
 DOMAIN-SUFFIX,amazonvideo.com
-DOMAIN-SUFFIX,media-amazon.com
 DOMAIN-SUFFIX,primevideo.com
+DOMAIN,avodmp4s3ww-a.akamaihd.net
+DOMAIN,d25xi40x97liuc.cloudfront.net
+DOMAIN,dmqdd6hw24ucf.cloudfront.net
+DOMAIN,d22qjgkvxw22r6.cloudfront.net
+DOMAIN,d1v5ir2lpwr8os.cloudfront.net
+DOMAIN-KEYWORD,avoddashs
 # > Bahamut
 USER-AGENT,Anime*
 DOMAIN-SUFFIX,bahamut.com.tw
--- a/base/rules/ConnersHua/Surge/Ruleset/Google.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Google.list
@@ -45,6 +45,7 @@ DOMAIN-SUFFIX,youtu.be
 DOMAIN-SUFFIX,yt.be
 DOMAIN-SUFFIX,ytimg.com
 # (DNS Cache Pollution Protection)
+DOMAIN-SUFFIX,ampproject.org
 DOMAIN-SUFFIX,appspot.com
 DOMAIN-SUFFIX,blogger.com
 DOMAIN-SUFFIX,getoutline.org
--- a/base/rules/ConnersHua/Surge/Ruleset/HKMTMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/HKMTMedia.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Hijacking.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Hijacking.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Mail.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Mail.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/AbemaTV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/AbemaTV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/All4.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/All4.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Amazon.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Amazon.list
@@ -0,0 +1,12 @@
+# > Amazon Prime Video
+USER-AGENT,InstantVideo.US*
+USER-AGENT,Prime%20Video*
+DOMAIN-SUFFIX,aiv-cdn.net
+DOMAIN-SUFFIX,aiv-delivery.net
+DOMAIN-SUFFIX,primevideo.com
+DOMAIN,avodmp4s3ww-a.akamaihd.net
+DOMAIN,d25xi40x97liuc.cloudfront.net
+DOMAIN,dmqdd6hw24ucf.cloudfront.net
+DOMAIN,d22qjgkvxw22r6.cloudfront.net
+DOMAIN,d1v5ir2lpwr8os.cloudfront.net
+DOMAIN-KEYWORD,avoddashs
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/BBC_iPlayer.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/BBC_iPlayer.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Bahamut.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Bahamut.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/DAZN.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/DAZN.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Deezer.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Deezer.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/DisneyPlus.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/DisneyPlus.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Fox.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Fox.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/HBO.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/HBO.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/HBO_GO_HKG.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/HBO_GO_HKG.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/HWTV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/HWTV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Hulu.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Hulu.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Hulu_Japan.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Hulu_Japan.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/ITV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/ITV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/JOOX.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/JOOX.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/KKBOX.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/KKBOX.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/KKTV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/KKTV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/LiTV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/LiTV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/LineTV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/LineTV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/My5.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/My5.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/PBS.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/PBS.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Pandora.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Pandora.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Pornhub.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Pornhub.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/SoundCloud.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/SoundCloud.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Spotify.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Spotify.list
@@ -4,4 +4,5 @@ DOMAIN-SUFFIX,pscdn.co
 DOMAIN-SUFFIX,scdn.co
 DOMAIN-SUFFIX,spotify.com
 DOMAIN-SUFFIX,spoti.fi
-IP-CIDR,35.186.224.47/32,no-resolve
+DOMAIN-KEYWORD,spotify.com
+DOMAIN-KEYWORD,-spotify-com
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/TIDAL.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/TIDAL.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/TaiWanGood.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/TaiWanGood.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/TikTok.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/TikTok.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Twitch.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Twitch.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/ViuTV.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/ViuTV.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/YouTube.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/YouTube.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/YouTubeMusic.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/YouTubeMusic.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/encoreTVB.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/encoreTVB.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/myTV_SUPER.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/myTV_SUPER.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/niconico.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/niconico.list
--- a/base/rules/ConnersHua/Surge/Ruleset/OneDrive.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/OneDrive.list
--- a/base/rules/ConnersHua/Surge/Ruleset/PayPal.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/PayPal.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Speedtest.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Speedtest.list
--- a/base/rules/ConnersHua/Surge/Ruleset/Telegram.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Telegram.list
@@ -3,12 +3,9 @@ DOMAIN-SUFFIX,tdesktop.com
 DOMAIN-SUFFIX,telegra.ph
 DOMAIN-SUFFIX,telegram.me
 DOMAIN-SUFFIX,telegram.org
-IP-CIDR,67.198.55.0/24,no-resolve
 IP-CIDR,91.108.4.0/22,no-resolve
 IP-CIDR,91.108.8.0/22,no-resolve
 IP-CIDR,91.108.12.0/22,no-resolve
 IP-CIDR,91.108.16.0/22,no-resolve
 IP-CIDR,91.108.56.0/22,no-resolve
-IP-CIDR,109.239.140.0/24,no-resolve
-IP-CIDR,149.154.160.0/20,no-resolve
-IP-CIDR,205.172.60.0/22,no-resolve
+IP-CIDR,149.154.160.0/20,no-resolve
--- a/base/rules/ConnersHua/Surge/Ruleset/Unbreak.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Unbreak.list
--- a/base/rules/LocalAreaNetwork.list
+++ b/base/rules/LocalAreaNetwork.list
@@ -0,0 +1,10 @@
+DOMAIN-SUFFIX,local
+IP-CIDR,192.168.0.0/16,no-resolve
+IP-CIDR,10.0.0.0/8,no-resolve
+IP-CIDR,172.16.0.0/12,no-resolve
+IP-CIDR,127.0.0.0/8,no-resolve
+IP-CIDR,100.64.0.0/10,no-resolve
+IP-CIDR6,::1/128,no-resolve
+IP-CIDR6,fc00::/7,no-resolve
+IP-CIDR6,fe80::/10,no-resolve
+IP-CIDR6,fd00::/8,no-resolve
--- a/base/rules/NobyDa/Surge/AdRule.list
+++ b/base/rules/NobyDa/Surge/AdRule.list
@@ -1,4 +1,4 @@
-# Update > 2019.11.25 Go advertising rule Integration lhie1 and shenji
+# Update > 2019.12.13 Go advertising rule Integration lhie1 and shenji
 DOMAIN-SUFFIX,idealads.net
 DOMAIN-SUFFIX,ironsrc.com
 DOMAIN-SUFFIX,apoll.m.taobao.com
@@ -18,7 +18,6 @@ DOMAIN-SUFFIX,cupid.iqiyi.com
 DOMAIN-SUFFIX,emoticon.sns.iqiyi.com
 DOMAIN-SUFFIX,game.pps.tv
 DOMAIN-SUFFIX,gamecenter.iqiyi.com
-DOMAIN-SUFFIX,hotchat-im.iqiyi.com
 DOMAIN-SUFFIX,mbdlog.iqiyi.com
 DOMAIN-SUFFIX,msg.iqiyi.com
 DOMAIN-SUFFIX,msg.video.qiyi.com
@@ -7977,7 +7976,6 @@ DOMAIN-SUFFIX,zzy1.quyaoya.com
 DOMAIN-SUFFIX,zzz7.52896368.com
 DOMAIN-SUFFIX,zzzzz4.52896368.com
 DOMAIN-SUFFIX,analytics.query.yahoo.com
-DOMAIN-SUFFIX,is.snssdk.com
 DOMAIN-KEYWORD,adservice
 DOMAIN-KEYWORD,analytics
 DOMAIN-KEYWORD,analysis
@@ -8397,7 +8395,6 @@ DOMAIN,api.whizzone.com
 DOMAIN-KEYWORD,traffic
 DOMAIN-SUFFIX,mmstat.com
 DOMAIN-KEYWORD,umeng
-DOMAIN-KEYWORD,track
 DOMAIN-SUFFIX,4paradigm.com
 DOMAIN-KEYWORD,talkingdata
 DOMAIN-SUFFIX,catch.gift
--- a/base/rules/NobyDa/Surge/AdRuleRegex.list
+++ b/base/rules/NobyDa/Surge/AdRuleRegex.list
--- a/base/rules/NobyDa/Surge/AdRuleTest.list
+++ b/base/rules/NobyDa/Surge/AdRuleTest.list
@@ -1,4 +1,4 @@
-#Update 2019.11.21 Self-use for testing only, there may be a lot of manslaughter.
+#Update 2020.1.10 Self-use for testing only, there may be a lot of manslaughter.
 DOMAIN-SUFFIX,admaster.com
 DOMAIN-SUFFIX,0z5jn.cn
 DOMAIN-SUFFIX,114so.cn
@@ -93,7 +93,6 @@ DOMAIN-SUFFIX,xiazai.mathtype.cn
 DOMAIN-SUFFIX,xiazai.ntfsformac.cn
 DOMAIN-SUFFIX,xiazai.xmindchina.cn
 DOMAIN-SUFFIX,yunpifu.cn
-DOMAIN-SUFFIX,uczzd.cn
 DOMAIN-SUFFIX,testin.cn
 DOMAIN-SUFFIX,cccwwwr.com
 DOMAIN-SUFFIX,mmkkiivv.com
@@ -1265,7 +1264,6 @@ DOMAIN-SUFFIX,optimizely.com
 DOMAIN-SUFFIX,umsns.com
 DOMAIN-SUFFIX,x.jd.com
 DOMAIN,log.tu.baixing.com
-DOMAIN-SUFFIX,sf3-ttcdn-tos.pstatp.com
 DOMAIN-SUFFIX,ads.api.vungle.com
 DOMAIN-SUFFIX,ads.wakamoment.tk
 DOMAIN,wa.gtimg.com
@@ -1291,7 +1289,6 @@ DOMAIN-SUFFIX,ios.bugly.qq.com
 DOMAIN-SUFFIX,iadsdk.apple.com
 DOMAIN-KEYWORD,adashx
 DOMAIN-KEYWORD,adsystem
-DOMAIN-KEYWORD,track
 DOMAIN-KEYWORD,talkingdata
 DOMAIN-KEYWORD,uploadMobileData
 DOMAIN-SUFFIX,www.jinshanju.com
--- a/base/rules/NobyDa/Surge/Download.list
+++ b/base/rules/NobyDa/Surge/Download.list
--- a/rules/lhie1/Surge3/Apple.list
+++ b/rules/lhie1/Surge3/Apple.list
@@ -1,12 +1,13 @@
-PROCESS-NAME,trustd
-USER-AGENT,*com.apple.mobileme.fmip1
-USER-AGENT,*WeatherFoundation*
 USER-AGENT,%E5%9C%B0%E5%9B%BE*
 USER-AGENT,%E8%AE%BE%E7%BD%AE*
+USER-AGENT,*com.apple.mobileme.fmip1
+USER-AGENT,*WeatherFoundation*
+USER-AGENT,AppleNews*
 USER-AGENT,AppStore*
 USER-AGENT,com.apple.appstored*
 USER-AGENT,com.apple.geod*
 USER-AGENT,com.apple.Maps
+USER-AGENT,com.apple.news*
 USER-AGENT,FindMyFriends*
 USER-AGENT,FindMyiPhone*
 USER-AGENT,FMDClient*
@@ -16,10 +17,12 @@ USER-AGENT,geod*
 USER-AGENT,locationd*
 USER-AGENT,Maps*
 USER-AGENT,TestFlight*
+DOMAIN,apple.comscoreresearch.com
+DOMAIN-SUFFIX,apple.cn
 DOMAIN-SUFFIX,apple.com
+DOMAIN-SUFFIX,apple.news
 DOMAIN-SUFFIX,icloud.com
 DOMAIN-SUFFIX,icloud-content.com
 DOMAIN-SUFFIX,itunes.com
 DOMAIN-SUFFIX,me.com
-DOMAIN-SUFFIX,mzstatic.com
-DOMAIN,api.smoot.apple.cn
+DOMAIN-SUFFIX,mzstatic.com
--- a/rules/lhie1/Surge3/AsianTV.list
+++ b/rules/lhie1/Surge3/AsianTV.list
@@ -1,4 +1,5 @@
 # > Bilibili
+USER-AGENT,*bili*
 DOMAIN-KEYWORD,bilibili
 DOMAIN-SUFFIX,acg.tv
 DOMAIN-SUFFIX,acgvideo.com
@@ -8,9 +9,9 @@ DOMAIN-SUFFIX,biliapi.net
 DOMAIN-SUFFIX,bilibili.com
 DOMAIN-SUFFIX,biligame.com
 DOMAIN-SUFFIX,biligame.net
+DOMAIN-SUFFIX,bilivideo.com
 DOMAIN-SUFFIX,hdslb.com
 DOMAIN-SUFFIX,im9.com
-USER-AGENT,*bili*

 # > IQIYI
 USER-AGENT,QIYI*
@@ -28,13 +29,6 @@ DOMAIN-SUFFIX,api.mob.app.letv.com
 USER-AGENT,MOO*
 USER-AGENT,TencentMidasConnect*

-# > NeteaseMusic
-USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90*
-USER-AGENT,NeteaseMusic*
-DOMAIN-SUFFIX,163yun.com
-DOMAIN-SUFFIX,music.126.net
-DOMAIN-SUFFIX,music.163.com
-
 # > Tencent Video
 DOMAIN-SUFFIX,vv.video.qq.com

--- a/rules/lhie1/Surge3/Domestic.list
+++ b/rules/lhie1/Surge3/Domestic.list
@@ -1,6 +1,3 @@
-# > Client
-PROCESS-NAME,ss-local
-
 # > UA
 USER-AGENT,hide*
 USER-AGENT,MicroMessenger*
@@ -19,6 +16,20 @@ DOMAIN-SUFFIX,battle.net
 DOMAIN-SUFFIX,battlenet.com
 DOMAIN-SUFFIX,blizzard.com

+# > Microsoft
+USER-AGENT,OneDrive*
+DOMAIN-KEYWORD,microsoft
+DOMAIN-SUFFIX,hotmail.com
+DOMAIN-SUFFIX,live.com
+DOMAIN-SUFFIX,live.net
+DOMAIN-SUFFIX,msn.com
+DOMAIN-SUFFIX,office.com
+DOMAIN-SUFFIX,office.net
+DOMAIN-SUFFIX,outlook.com
+DOMAIN-SUFFIX,windows.com
+DOMAIN-SUFFIX,windows.net
+DOMAIN-SUFFIX,windowsupdate.com
+
 # > Prior
 DOMAIN,client.amplifi.com
 DOMAIN,ip.bjango.com
@@ -129,13 +140,13 @@ DOMAIN-SUFFIX,fresh-ideas.cc
 DOMAIN-SUFFIX,geetest.com
 DOMAIN-SUFFIX,godic.net
 DOMAIN-SUFFIX,goodread.com
-DOMAIN-SUFFIX,google.cn
 DOMAIN-SUFFIX,gtimg.com
 DOMAIN-SUFFIX,haibian.com
 DOMAIN-SUFFIX,hao123.com
 DOMAIN-SUFFIX,haosou.com
 DOMAIN-SUFFIX,hdchina.org
 DOMAIN-SUFFIX,hdcmct.org
+DOMAIN-SUFFIX,hkserversolution.com
 DOMAIN-SUFFIX,hollisterco.com
 DOMAIN-SUFFIX,hongxiu.com
 DOMAIN-SUFFIX,hxcdn.net
@@ -265,7 +276,6 @@ DOMAIN-SUFFIX,weiphone.com
 DOMAIN-SUFFIX,weiphone.net
 DOMAIN-SUFFIX,wenku8.net
 DOMAIN-SUFFIX,werewolf.53site.com
-DOMAIN-SUFFIX,windowsupdate.com
 DOMAIN-SUFFIX,wkcdn.com
 DOMAIN-SUFFIX,workflowy.com
 DOMAIN-SUFFIX,xdrig.com
@@ -298,4 +308,4 @@ DOMAIN-SUFFIX,zhimg.com
 DOMAIN-SUFFIX,zimuzu.tv
 DOMAIN-SUFFIX,zmz002.com

-IP-CIDR,1.255.62.0/24,no-resolve
+IP-CIDR,1.255.62.0/24,no-resolve
--- a/rules/lhie1/Surge3/GlobalTV.list
+++ b/rules/lhie1/Surge3/GlobalTV.list
@@ -2,15 +2,12 @@
 DOMAIN-SUFFIX,edgedatg.com
 DOMAIN-SUFFIX,go.com

-# > AbemaTV
+# > Abema TV
 USER-AGENT,AbemaTV*
 DOMAIN-SUFFIX,abema.io
+DOMAIN-SUFFIX,akamaized.net
 DOMAIN-SUFFIX,ameba.jp
 DOMAIN-SUFFIX,hayabusa.io
-DOMAIN,abematv.akamaized.net
-DOMAIN,ds-linear-abematv.akamaized.net
-DOMAIN,ds-vod-abematv.akamaized.net
-DOMAIN,linear-abematv.akamaized.net

 # > Amazon Prime Video
 USER-AGENT,InstantVideo.US*
@@ -20,6 +17,11 @@ DOMAIN-SUFFIX,amazonaws.com
 DOMAIN-SUFFIX,amazonvideo.com
 DOMAIN-SUFFIX,llnwd.net

+# > Apple TV
+DOMAIN,np-edge.itunes.apple.com
+DOMAIN,play-edge.itunes.apple.com
+DOMAIN-SUFFIX,tv.apple.com
+
 # > Bahamut
 USER-AGENT,Anime*
 DOMAIN-SUFFIX,bahamut.com.tw
@@ -84,6 +86,7 @@ DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com
 DOMAIN-SUFFIX,hbo.com
 DOMAIN-SUFFIX,hboasia.com
 DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbogoasia.com
 DOMAIN-SUFFIX,hbogoasia.hk

 # > Hulu
@@ -135,7 +138,11 @@ DOMAIN-SUFFIX,scdn.co
 DOMAIN-SUFFIX,spoti.fi

 # > viuTV
+USER-AGENT,ViuTV*
+DOMAIN-SUFFIX,cloudfront.net
+DOMAIN-SUFFIX,viu.com
 DOMAIN-SUFFIX,viu.tv
+DOMAIN-SUFFIX,viu.now.com

 # > Youtube
 USER-AGENT,*youtube*
--- a/rules/lhie1/Surge3/Media/AbemaTV.list
+++ b/rules/lhie1/Surge3/Media/AbemaTV.list
--- a/3/Provider/Media/AbemaTV.list
+++ b/3/Provider/Media/AbemaTV.list
@@ -0,0 +1,7 @@
+# > AbemaTV
+USER-AGENT,AbemaTV*
+DOMAIN-SUFFIX,abema.io
+DOMAIN-SUFFIX,abema.tv
+DOMAIN-SUFFIX,akamaized.net
+DOMAIN-SUFFIX,ameba.jp
+DOMAIN-SUFFIX,hayabusa.io
--- a/rules/lhie1/Surge3/Media/Amazon.list
+++ b/rules/lhie1/Surge3/Media/Amazon.list
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,11 @@
+# > Apple News and Apple Map TOMTOM Version
+USER-AGENT,AppleNews*
+USER-AGENT,com.apple.news*
+DOMAIN,gspe1-ssl.ls.apple.com
+# USER-AGENT,News*
+# DOMAIN,apple.comscoreresearch.com
+# DOMAIN,gateway.icloud.com
+# DOMAIN,news-client.apple.com
+# DOMAIN,news-edge.apple.com
+# DOMAIN,news-events.apple.com
+# DOMAIN-SUFFIX,apple.news
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,4 @@
+# > Apple TV
+DOMAIN,np-edge.itunes.apple.com
+DOMAIN,play-edge.itunes.apple.com
+DOMAIN-SUFFIX,tv.apple.com
--- a/rules/lhie1/Surge3/Media/AppleNews.list
+++ b/rules/lhie1/Surge3/Media/AppleNews.list
--- a/rules/lhie1/Surge3/Media/BBC_iPlayer.list
+++ b/rules/lhie1/Surge3/Media/BBC_iPlayer.list
--- a/3/Provider/Media/BBC_iPlayer.list
+++ b/3/Provider/Media/BBC_iPlayer.list
@@ -0,0 +1,6 @@
+# > BBC iPlayer
+USER-AGENT,BBCiPlayer*
+DOMAIN-SUFFIX,bbc.co.uk
+DOMAIN-SUFFIX,bbci.co.uk
+DOMAIN-KEYWORD,bbcfmt
+DOMAIN-KEYWORD,uk-live
--- a/rules/lhie1/Surge3/Media/Bahamut.list
+++ b/rules/lhie1/Surge3/Media/Bahamut.list
--- a/rules/lhie1/Surge3/Media/Bilibili.list
+++ b/rules/lhie1/Surge3/Media/Bilibili.list
@@ -8,5 +8,6 @@ DOMAIN-SUFFIX,biliapi.net
 DOMAIN-SUFFIX,bilibili.com
 DOMAIN-SUFFIX,biligame.com
 DOMAIN-SUFFIX,biligame.net
+DOMAIN-SUFFIX,bilivideo.com
 DOMAIN-SUFFIX,hdslb.com
 DOMAIN-SUFFIX,im9.com
--- a/rules/lhie1/Surge3/Media/DisneyPlus.list
+++ b/rules/lhie1/Surge3/Media/DisneyPlus.list
--- a/rules/lhie1/Surge3/Media/Fox_Now.list
+++ b/rules/lhie1/Surge3/Media/Fox_Now.list
--- a/rules/lhie1/Surge3/Media/FoxPlus.list
+++ b/rules/lhie1/Surge3/Media/FoxPlus.list
--- a/3/Provider/Media/Fox_Now.list
+++ b/3/Provider/Media/Fox_Now.list
@@ -0,0 +1,5 @@
+# > Fox Now
+USER-AGENT,FOX%20NOW*
+DOMAIN-SUFFIX,fox.com
+DOMAIN-SUFFIX,foxdcg.com
+DOMAIN-SUFFIX,uplynk.com
--- a/rules/lhie1/Surge3/Media/HBO.list
+++ b/rules/lhie1/Surge3/Media/HBO.list
@@ -5,4 +5,5 @@ DOMAIN-SUFFIX,hbo.com
 DOMAIN-SUFFIX,hbogo.com
 DOMAIN-SUFFIX,hboasia.com
 DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbogoasia.com
 DOMAIN-SUFFIX,hbogoasia.hk
--- a/rules/lhie1/Surge3/Media/Hulu_Japan.list
+++ b/rules/lhie1/Surge3/Media/Hulu_Japan.list
--- a/rules/lhie1/Surge3/Media/Hulu.list
+++ b/rules/lhie1/Surge3/Media/Hulu.list
--- a/3/Provider/Media/Hulu_Japan.list
+++ b/3/Provider/Media/Hulu_Japan.list
@@ -0,0 +1,3 @@
+# > Hulu(フールー)
+DOMAIN-SUFFIX,happyon.jp
+DOMAIN-SUFFIX,hulu.jp
--- a/rules/lhie1/Surge3/Media/JOOX.list
+++ b/rules/lhie1/Surge3/Media/JOOX.list
--- a/rules/lhie1/Surge3/Media/Japonx.list
+++ b/rules/lhie1/Surge3/Media/Japonx.list
--- a/rules/lhie1/Surge3/Media/KKBOX.list
+++ b/rules/lhie1/Surge3/Media/KKBOX.list
--- a/rules/lhie1/Surge3/Media/Line_TV.list
+++ b/rules/lhie1/Surge3/Media/Line_TV.list
--- a/3/Provider/Media/Line_TV.list
+++ b/3/Provider/Media/Line_TV.list
@@ -0,0 +1,4 @@
+# > Line TV
+USER-AGENT,LINE*
+DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net
+DOMAIN-SUFFIX,linetv.tw
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,5 @@
+# > NeteaseMusic
+USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90
+USER-AGENT,NeteaseMusic*
+DOMAIN-SUFFIX,music.126.net
+DOMAIN-SUFFIX,music.163.com
--- a/3/Provider/Media/Netease_Music.list
+++ b/3/Provider/Media/Netease_Music.list
@@ -0,0 +1,5 @@
+# > NeteaseMusic
+USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90
+USER-AGENT,NeteaseMusic*
+DOMAIN-SUFFIX,music.126.net
+DOMAIN-SUFFIX,music.163.com
--- a/rules/lhie1/Surge3/Media/Netflix.list
+++ b/rules/lhie1/Surge3/Media/Netflix.list
--- a/rules/lhie1/Surge3/Media/PBS.list
+++ b/rules/lhie1/Surge3/Media/PBS.list
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tindy X	987c582859	Bump version to v0.2.6	2020-01-14 14:48:41 +08:00
Tindy X	2d3875543d	Move China Emoji rule to last position	2020-01-14 14:46:49 +08:00
Tindy X	8a5615f4ac	Update local rulesets	2020-01-14 14:43:45 +08:00
MelosBot	420a013cac	Update README-cn.md (#38 ) Update README-cn.md Fix description	2020-01-14 14:29:41 +08:00
Tindy X	66c7f3a070	Optimize codes	2020-01-14 14:12:29 +08:00
Tindy X	b186d805f3	Enhancements Fix support for Quantumult X style VMess subscription. Fix plugin support for Shadowsocks Android clients. Add support for exporting Shadowsocks Android subscription. Add regular expression blacklist to prevent high CPU usage. Move "rename_node" options to "[node_pref]" section. Optimize codes.	2020-01-14 13:18:43 +08:00
Tindy X	764b0e68d4	Update README-cn.md	2020-01-13 17:52:18 +08:00
Tindy X	4374a3e8bd	Fix support for some non-standard subscription Add Dockerfile for image auto update.	2020-01-13 15:08:08 +08:00
Tindy X	3a39977253	Tweak filter_deprecated_nodes option	2020-01-11 16:21:59 +08:00
Tindy X	d24a95168f	Fix a bug	2020-01-09 23:05:49 +08:00
Tindy X	5ff9018539	Bug fixes Fix support for parsing some non-standard subscriptions. Change cURL User-Agent to subconverter/latest. Optimize codes.	2020-01-09 23:02:40 +08:00
Tindy X	5eb54b4a46	Fix build script	2020-01-08 00:40:07 +08:00
Tindy X	8af22aceb1	Bump version to v0.2.5	2020-01-08 00:23:32 +08:00
Tindy X	3f4d764e42	Update build script	2020-01-07 23:36:21 +08:00
Tindy X	e6a5e55a69	Update build scripts	2020-01-07 23:30:34 +08:00
Tindy X	f2e12f1e4b	Fix build error	2020-01-07 15:57:15 +08:00
Tindy X	bebefd9511	Fix build error on some platform	2020-01-07 15:48:39 +08:00
Tindy X	b94dce44ed	Fix support for parsing some Shadowsocks/R subscriptions	2020-01-07 15:39:06 +08:00
Tindy X	d1bf8a13f2	Enhancements Fix dependency bug for compiling on some platforms. Add specifying port via environment variable. Add BacktoCN.list extracted from ConnersHua's original BakctoCN configuration.	2020-01-07 11:39:18 +08:00
Tindy X	6a61f29cf2	Update local rulesets	2020-01-07 10:17:26 +08:00
MelosBot	48568a950f	Update README-cn.md (#33 ) Makes creating token faster and fixes a few things	2020-01-05 21:35:11 +08:00
Tindy X	46a58f4394	Bump version to v0.2.4	2020-01-05 20:37:58 +08:00
Tindy X	2f44a216b5	Add ARM64 build to Travis CI script	2020-01-05 18:58:37 +08:00
Tindy X	15fab8f324	Add filter_deprecated_nodes flag to filter out nodes that are no longer supported by latest clients	2020-01-05 18:54:00 +08:00
Tindy X	5870ab2386	Enhancements Add skip-cert-verify flag for HTTPS / Socks 5 nodes in Clash / Surge subscriptions. Tweaked keys order in Clash subscriptions. Optimize codes.	2020-01-04 17:29:44 +08:00
Tindy X	215c467f2a	Enhancements Add auto filtering for nodes that are not supported by Clash/R core. Add skip_cert_verify for Surge, Quantumult and Quantumult X subscription. Add "separate links" option for exporting SIP002 subscriptions. Optimize codes.	2020-01-04 15:22:12 +08:00
Tindy X	a775c69121	Enhancements Fix crash when parsing HTTP nodes in Surge subscriptions. Fix section order problem for various subscriptions. Add more custom settings in external configuration file. Add no-resolve to LAN rules. Update README-cn.md.	2020-01-03 14:29:40 +08:00
Tindy X	9094270b65	Bug fixes Fix incorrect parameters for simple interface. Fix group generation support for Surge. Change default skip_cert_verify flag to false. Optimize codes.	2020-01-03 00:15:34 +08:00
MelosBot	24f5dc40d0	Update README-cn.md (#30 ) Update README-cn.md Modify the description and add updated parameters.	2020-01-03 00:13:38 +08:00
Tindy X	3077a7ca40	Revert Travis CI script	2020-01-01 22:39:16 +08:00
Tindy X	144725213f	Add support for adding skip-cert-verify flag to Clash/R subscription	2020-01-01 22:38:21 +08:00
Tindy X	d95990b094	Bump version to v0.2.3	2020-01-01 20:53:20 +08:00
Tindy X	e2c5e2bad1	Update Travis CI scripts to append version number	2020-01-01 20:44:31 +08:00
Tindy X	dd3389afe5	Update local rulesets	2020-01-01 20:21:04 +08:00
Tindy X	9196387fe6	Enhancements Add loading external custom configuration from URL. Optimize codes.	2020-01-01 14:30:41 +08:00
Tindy X	09c14e0222	Add error handling for loading base configurations and preference settings	2020-01-01 13:25:44 +08:00
Tindy X	b1f373ee58	Add placeholders to keep correct order of proxies, groups and rules	2019-12-31 23:57:44 +08:00
Tindy X	6d6d25417b	Fix a bug that when update_ruleset_on_request is set to true, rules will be missing in exported Clash/R and Mellow configurations	2019-12-31 23:50:16 +08:00
Tindy X	f7a7a4a15e	Fix default preferences Fix a regular expression which may filter out some normal nodes. Update flag rules.	2019-12-31 15:59:50 +08:00
Tindy X	68aa61fbef	Bump version to v0.2.2	2019-12-31 15:51:26 +08:00
Tindy X	3b4ad47dae	Bug fixes Fix support for exporting SSD-Android compatible SSD subscriptions. Fix format error in exporting SIP002 subscriptions.	2019-12-31 15:46:28 +08:00
Tindy X	c38c1b4cf5	Bug fixes Fix when rulesets and groups are provided in request URLs, new rules will not be used. Fix cached rule base not updating after calling "/readconf", "/refreshrules" or "/updateconf".	2019-12-29 19:31:17 +08:00
Tindy X	914c8e9fbb	Optimize codes	2019-12-28 18:40:08 +08:00
Tindy X	326db89e8c	Add example for double condition filtering	2019-12-28 17:57:22 +08:00
Tindy X	1003f2fefa	Bump version to v0.2.1	2019-12-28 17:52:49 +08:00
Tindy X	704a364dc2	Enhancements Add double condition for node filtering in group generator. Optimize codes.	2019-12-28 17:22:11 +08:00
Tindy X	579b30bfc3	Fix parser error for some Surge and Quantumult subscription	2019-12-28 15:59:45 +08:00
Tindy X	519207ae9a	Add support for parsing some Shadowrocket links	2019-12-28 15:51:30 +08:00
Tindy X	2c4fedc33d	Update local rulesets	2019-12-28 15:37:25 +08:00
Tindy X	80b9e0d0ad	Add switch for cURL verbose logs	2019-12-28 15:12:27 +08:00
Tindy X	175ad47d79	Enhancements Add pre-generated base for Clash/R and Mellow configuration. Add simple interface for quick usage. Add support for Clash v2ray-plugin.	2019-12-28 15:10:10 +08:00
Tindy X	fc7def5bfd	Add option for enabling malloc_trim	2019-12-28 15:00:15 +08:00
Tindy X	0d76b751f1	Fix CMake install permissions	2019-12-28 04:12:46 +08:00
Tindy X	c31edcc129	Fix CMake install process	2019-12-28 03:54:31 +08:00
Tindy X	2703435815	Add option for choosing between std::regex and pcrecpp	2019-12-28 03:05:54 +08:00
Tindy X	fe9a4c06ad	Update CMake scripts	2019-12-27 21:15:52 +08:00
Tindy X	b3fe174d13	Fix PCRECPP detection in CMake script	2019-12-27 13:54:55 +08:00
Tindy X	0676f1f4e4	Enhancements Fix support for Android Termux configuration. Fix support for OpenWRT SDK compilation. Optimize codes.	2019-12-27 12:48:09 +08:00
Tindy X	6b633d9153	Update CMake script	2019-12-26 11:16:38 -06:00
Tindy X	05fa5be1cc	Update CMake scripts	2019-12-26 23:54:31 +08:00
Tindy X	2b21d4d71a	Update build script	2019-12-26 23:39:47 +08:00
Tindy X	3971bcc688	Update build script	2019-12-26 23:25:08 +08:00
Tindy X	0992be1e2a	Update build scripts	2019-12-26 23:17:56 +08:00
Tindy X	cc4a20ddf7	Update build script	2019-12-26 23:14:30 +08:00
Tindy X	6f05d965cc	Update build script	2019-12-26 22:13:45 +08:00
Tindy X	c305b55e4c	Update build script	2019-12-26 21:59:17 +08:00
Tindy X	dc3ceac21d	Update build script	2019-12-26 21:50:20 +08:00
Tindy X	8fa917c308	Update build script	2019-12-26 21:40:51 +08:00
Tindy X	cc6ff62562	Update build script	2019-12-26 21:00:12 +08:00
Tindy X	df0d070c1d	Update build script	2019-12-26 20:53:42 +08:00
Tindy X	16fb35fe6f	Update build scripts	2019-12-26 20:47:08 +08:00
Tindy X	b89a8b1f7c	Add CMake support Clean up file structure. Update build scripts.	2019-12-26 20:37:47 +08:00
Tindy X	e5eb7a4ae2	Bump version to v0.2.0	2019-12-21 21:28:50 +08:00
Tindy X	889af53215	Bug fixes Fix broken UTF-8-BOM remover. Fix Gist upload for Clash/ClashR. Optimize codes.	2019-12-21 21:10:26 +08:00
Tindy X	d31bdd9597	Fix a bug in regex wrapper	2019-12-21 11:15:01 +08:00
Tindy X	97a1a123ba	Bug fixes Fix when parsing some subscription, the same node will appear multiple times. Fix incorrect plugin in exporting SSD subscription.	2019-12-21 03:08:51 +08:00
Tindy X	204e309086	Fix a bug	2019-12-21 02:45:54 +08:00
Tindy X	dc362a9660	Replacing regex library with PCRE Update build scripts	2019-12-21 02:40:57 +08:00
Tindy X	9449277e55	Update build script	2019-12-21 00:47:51 +08:00
Tindy X	c505be1503	Update build script	2019-12-20 17:03:50 +08:00
Tindy X	50bc187c59	Fix incorrect usage of default ruleset	2019-12-20 17:03:30 +08:00
Tindy X	49d8ebde5b	Update local rulesets	2019-12-20 17:02:52 +08:00
Tindy X	526de55095	Add remotely update configuration via Web interface	2019-12-19 09:50:05 +08:00
Tindy X	71bfd953f1	Add authorization for remote control interfaces	2019-12-18 23:29:02 +08:00
Tindy X	9a135f8be3	Add manual-select group to default GlobalMedia group	2019-12-18 16:04:49 +08:00
Tindy X	31c638a779	Enhancements Add support for exporting Clash proxy-provider. Add version info on Web server main page. Fix program crash when no nodes are available in generating Mellow configuration.	2019-12-18 15:30:00 +08:00
Tindy X	050fd8172c	Add missing header	2019-12-18 15:27:21 +08:00
Tindy X	a858554eca	Improve compatibility with some non-standard configuration	2019-12-14 20:09:35 +08:00
Tindy X	95e8c23287	Bump version to v0.1.1	2019-12-13 17:57:57 +08:00
Tindy X	53f31b5d3a	Enhancements Fix port generation for Surge ShadowsocksR configuration. Fix compatibility with some non-standard subscription. Add some node preference tags.	2019-12-13 17:56:39 +08:00