Fix build script

Bump version to v0.2.5
Update build script
2025-10-29 12:52:37 +00:00 · 2020-01-08 00:40:07 +08:00 · 2020-01-08 00:23:32 +08:00 · 2020-01-07 23:36:21 +08:00 · 2020-01-07 23:30:34 +08:00 · 2020-01-07 15:57:15 +08:00
156 changed files with 3564 additions and 1778 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,265 +4,435 @@

 [![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          |
+| 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参数时默认链接. 如果有多个链接, 使用 "|" 分隔, 支持`文件`/`url`.
-
-这种用法:
-```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 nodelist 或者 Clash proxy provider  |
+| 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.exe 目录中 `pref.ini` 文件的解释

-#### include_remarks
+#### [common] 部分

-> 仅保留匹配到的节点, 支持正则.
+> 该部分主要涉及到的内容为 **全局的节点排除或保留** 、**节点的重命名**
+>
+> 其他设置项目可以保持默认或者在知晓作用的前提下进行修改

-e.g.
-```ini
-include_remarks=(?<=美).*(BGP|GIA|IPLC)
-```
+1. **api_mode**

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

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

-#### clash_rule_base
+1. **default_url**

-> 生成的clash配置文件基础. 支持`文件`/`url`.
+    > 无 %URL% 参数时，默认加载的订阅链接， **不需要 URLEncode**。 如果有多个链接，仍然需要使用 "|" 分隔，支持`文件`/`url`

-e.g.
-```ini
-clash_rule_base=clash.yaml
+    - 例如:

-clash_rule_base=https://raw.githubusercontent.com/ConnersHua/Profiles/master/Clash/Pro.yaml
-```
+     ```ini
+     default_url='https://dler.cloud/subscribe/ABCDE?clash=vmess'
+     ```

+    - 解释：

+     ```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_rule_base
+1. **exclude_remarks**

-> 生成的surge配置文件基础. 用法同上.
+   > 排除匹配到的节点，支持正则匹配

+    - 例如:

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

-#### surfboard_rule_base
+1. **include_remarks**

-> 生成的surfboard配置文件基础. 用法同上.
+   > 仅保留匹配到的节点，支持正则匹配

+    - 例如:

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

-#### rename_node
+1. **clash_rule_base**

-> 重命名节点, 支持正则.
+   > 生成的 Clash 配置文件基础。支持 `本地文件` 和 `在线URL`

-e.g.
-```ini
-rename_node=中国@中
-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**

-### managed_config
+   > 生成的 Surge 配置文件基础，用法同上

-> 将'＃！MANAGED-CONFIG'信息附加到Surge配置.
+1. **surfboard_rule_base**

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

+1. **mellow_rule_base**

-### emojis
+   > 生成的 Mellow 配置文件基础，用法同上

-> 添加识别到的第一个国家国旗在节点名称前, 支持正则.
+1. **proxy_ruleset**

-e.g.
-```ini
-rule=(流量|时间|应急),⌛time
-rule=(美|美国|United States),🇺🇸
-```
+   > 更新 RuleSet 时是否使用代理
+   >
+   > 填写 `NONE` 或者空白禁用，或者填写 `SYSTEM` 使用系统代理
+   >
+   > 也可填写如同 `socks5://127.0.0.1:1080` 的 HTTP 或 SOCKS 代理

+    - 例如:

+     ```ini
+     proxy_ruleset=SYSTEM # 使用系统代理
+     # 或者
+     proxy_ruleset=socks5://127.0.0.1:1080 # 使用本地的 1080 端口进行 SOCKS5 代理
+     ```

-### ruleset
+1. **proxy_subscription**

-> 规则片段.
+   > 更新 原始订阅 时是否使用代理，用法同上

-e.g.
-<img src="./doc/imgs/Snipaste_2019-11-18_14-11-52.png">
+1. **append_proxy_type**
+
+   > 节点名称是否需要加入属性，设置为 true 时在节点名称前加入 \[SS\] \[SSR\] \[VMess\] 以作区别，
+   >
+   > 默认为 false
+
+    - 例如（设置为 true时）：
+
+     ```txt
+     [SS] 香港中转
+     [VMess] 美国 GIA
+     ```
+
+1. **rename_node**
+
+   > 重命名节点，支持正则匹配
+   >
+   > 使用方式：原始命名@重命名
+
+    - 例如:
+
+     ```ini
+     rename_node=中国@中
+     rename_node=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?:?)|(x|X))\)?@(倍率:$1)
+     ```
+
+#### [node_pref] 部分
+
+> 该部分主要涉及到的内容为 **开启节点的UDP及TCP** 、**重命名节点后的排序**
+> 
+> 相关设置项目建议保持默认或者在知晓作用的前提下进行修改
+
+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**
+
+#### [managed_config] 部分
+
+> 该部分主要涉及到的内容为 **订阅文件的更新地址**
+
+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
+    ```
+
+#### [surge_external_proxy] 部分
+
+> 为 Surge 添加 SSR 的支持路径
+
+#### [emojis] 部分
+
+1. add_emoji
+
+   > 是否在节点名称前加入下面自定义的 Emoji，设置为 true 时打开，默认为 true
+
+1. remove_old_emoji
+
+   > 是否移除原有订阅中存在的 Emoji，设置为 true 时打开，默认为 true
+
+1. rule
+
+   > 在匹配到的节点前添加自定义 emojis，支持正则匹配
+
+    - 例如:
+
+    ```ini
+    rule=(流量|时间|应急),⌛time
+    rule=(美|美国|United States),🇺🇸
+    ```
+
+#### [ruleset] 部分
+
+> 如果你对原本订阅自带的规则不满意时，可以使用如下配置
+
+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] 所设置 🎯 全球直连 策略组
+    ```
+
+#### [clash_proxy_group] 部分
+
+> 为 Clash 、Mellow 、Surge 以及 Surfboard 等程序创建策略组, 可用正则来筛选节点
+>
+> [] 前缀后的文字将被当作引用策略组

 ```ini
-ruleset=🌹 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Media/YouTube.list
+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 策略组,并向其中**依次**添加名字含'沪日','日本'的节点，以及引用上述所创建的 🇯🇵 日本延迟最低 策略组
 ```

-效果图:
+- ssr/v2 订阅默认没有组名, 可以使用这个方法来添加组名

-<img src="./doc/imgs/Snipaste_2019-11-18_14-15-54.png">
+  ```ini
+  custom_proxy_group=g1`select`!!GROUPID=0
+  # 指订阅链接中的第一条订阅
+  custom_proxy_group=g2`select`!!GROUPID=1
+  # 指订阅链接中的第二条订阅
+  custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
+  ```

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

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

-### clash_proxy_group
+#### [server] 部分

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

-e.g.
-```ini
-custom_proxy_group=🇺🇸US`url-test`(美|美国|United States)`http://www.gstatic.com/generate_204`300
-```
+1. **listen**

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

-<img src="./doc/imgs/Snipaste_2019-11-18_14-47-30.png">
+1. **port**

+   > 绑定到 Web 服务器地址的端口，默认为 25500

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

 ```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)
 ```
-
-
-### server
-
-#### listen
-
-> 绑定到Web服务器的地址, 将地址设为0.0.0.0, 则局域网内设备均可使用.
-
-#### port
-
-> 绑定到Web服务器地址的端口.
-
-
-### advanced
-
-> 无需描述.
-
-
-
-## gist
-
-> 自动上传gist.
-
-在[gistconf.ini](./gistconf.ini)中添加personal access token, 在链接后加上`upload=true`就会在更新好后自动上传gist.
--- 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.
@@ -86,6 +89,13 @@ append_proxy_type=false
 ; times RE
 rename_node=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x

+[node_pref]
+udp_flag=false
+tcp_fast_open_flag=false
+sort_flag=false
+skip_cert_verify_flag=false
+filter_deprecated_nodes=false
+
 [managed_config]
 ;Append a '#!MANAGED-CONFIG' info to Surge configurations
 write_managed_config=true
@@ -93,6 +103,9 @@ write_managed_config=true
 ;Address prefix for MANAGED-CONFIG info, without the trailing "/".
 managed_config_prefix=http://127.0.0.1:25500

+[surge_external_proxy]
+;surge_ssr_path=/usr/bin/ssr-local
+
 [emojis]
 add_emoji=true
 remove_old_emoji=true
@@ -100,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=(CN|China|回国|中国|江苏|北京|上海|广州|深圳|杭州|徐州|青岛|宁波|镇江|back|TW|Taiwan|台湾|台北|台中|新北|彰化|CHT|新北|台|HINET),🇨🇳
+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|南非),🇿🇦

 [ruleset]
 ;Enable generating rules with rulesets
@@ -162,12 +181,13 @@ update_ruleset_on_request=false
 ;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

+surge_ruleset=🎯 全球直连,rules/LocalAreaNetwork.list
 surge_ruleset=🎯 全球直连,rules/ConnersHua/Surge/Ruleset/Unbreak.list
 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=🎥 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/Surge3/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
@@ -190,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
@@ -209,12 +232,12 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;for Surge rulesets
 custom_proxy_group=🔰 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🎥 NETFLIX`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+;custom_proxy_group=🎥 NETFLIX`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`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
+custom_proxy_group=📲 电报信息`select`[]🔰 节点选择`.*`[]🎯 全球直连
 custom_proxy_group=🍎 苹果服务`select`[]🔰 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
--- 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
@@ -15,6 +15,7 @@ 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
@@ -33,16 +34,19 @@ 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
@@ -74,8 +78,10 @@ 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
@@ -204,7 +210,7 @@ DOMAIN,galaxy.bjcathay.com
 DOMAIN,mdrecv.app.cntvwb.cn
 DOMAIN,sdapprecv.app.cntvwb.cn
 DOMAIN,vdapprecv.app.cntvwb.cn
-# > ChinaNet
+# > ChinaTelecom
 DOMAIN,ad.k.21cn.com
 DOMAIN,admarket.21cn.com
 DOMAIN,adshows.21cn.com
@@ -344,6 +350,7 @@ 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
@@ -401,6 +408,7 @@ 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)
@@ -415,7 +423,7 @@ DOMAIN,pvnapp.zol.com.cn

 # URL
 # 0~9
-# > 21epaper
+# > 21经济
 URL-REGEX,^https?:\/\/api\.21jingji\.com\/ad\/
 # > 360doc
 URL-REGEX,^https?:\/\/mobi\.360doc\.com\/v\d{2}\/Ajax\/festival\.ashx\?op=getfestivaltheme
@@ -426,8 +434,8 @@ URL-REGEX,^https?:\/\/app\.58\.com\/api\/log\/
 URL-REGEX,^https?:\/\/.+\.58cdn\.com\.cn\/brandads\/

 # A
-# > Alibaba
-URL-REGEX,^https?:\/\/gw\.alicdn\.com\/.*\.jpg_(9\d{2}|\d{4})
+# > 阿里巴巴
+URL-REGEX,^https?:\/\/(gw|heic)\.alicdn\.com\/.*\.jpg_(9\d{2}|\d{4})
 # >> 闲鱼
 URL-REGEX,^https?:\/\/acs\.m\.taobao\.com\/gw\/mtop\.taobao\.idle\.home\.welcome\/
 # >> 飞猪
@@ -438,11 +446,12 @@ URL-REGEX,^https?:\/\/acs\.m\.taobao\.com\/gw\/mtop\.film\.mtopadvertiseapi\.que
 URL-REGEX,^https?:\/\/render\.alipay\.com\/p\/s\/h5data\/prod\/spring-festival-2019-h5data\/popup-h5data\.json
 URL-REGEX,^https?:\/\/acs\.m\.taobao\.com\/gw\/mtop\.o2o\.ad\.gateway\.get\/
 URL-REGEX,^https?:\/\/guide-acs\.m\.taobao\.com\/gw\/mtop\.taobao\.wireless\.home\.splash\.awesome\.get\/
-# >> UC
-URL-REGEX,^https?:\/\/huichuan\.sm\.cn\/jsad
-URL-REGEX,^https?:\/\/iflow\.uczzd\.cn\/log\/
-# >> AMap
+# >> 高德地图
 URL-REGEX,^https?:\/\/m\d\.amap\.com\/ws\/valueadded\/alimama\/splash_screen\/
+# >> 优酷
+URL-REGEX,^https?:\/\/.+\.mp4\?ccode=0902
+URL-REGEX,^https?:\/\/.+\.mp4\?sid=
+URL-REGEX,^https?:\/\/vali\.cp31\.ott\.cibntv\.net\/youku\/.+\.mp4\?sid=
 # > AcFun
 URL-REGEX,^https?:\/\/aes\.acfun\.cn\/s\?adzones
 # > 爱回收
@@ -451,9 +460,10 @@ URL-REGEX,^https?:\/\/gw\.aihuishou\.com\/app-portal\/home\/getadvertisement
 URL-REGEX,^https?:\/\/a\.apicloud\.com\/start_page\/

 # B
-# > Baidu
+# > 百度
 # >> 百度网盘
-URL-REGEX,^https?:\/\/update\.pan\.baidu\.com\/statistics
+URL-REGEX,^https?:\/\/pan\.baidu\.com\/rest\/2.0\/pcs\/adx
+URL-REGEX,^https?:\/\/pan\.baidu\.com\/act\/api\/activityentry
 URL-REGEX,^https?:\/\/issuecdn\.baidupcs\.com\/issue\/netdisk\/guanggao\/
 # >> 百度贴吧
 URL-REGEX,^https?:\/\/c\.tieba\.baidu\.com\/c\/s\/splashSchedule
@@ -462,13 +472,14 @@ URL-REGEX,^https?:\/\/c\.tieba\.baidu\.com\/\w+\/\w+\/(sync|newRnSync|mlog)
 # >> 百度地图
 # URL-REGEX,^https?:\/\/.+\/client\/phpui2\/
 URL-REGEX,^https?:\/\/ss0\.bdstatic\.com/.+_\d{3}_\d{4}\.jpg
-# > ByteDance
-URL-REGEX,^https?:\/\/.+\.pstatp\.com\/img\/ad
-URL-REGEX,^https?:\/\/.+\.(musical|snssdk|tiktokv)\.(com|ly)\/(api|motor)\/ad\/
-URL-REGEX,^https?:\/\/dsp\.toutiao\.com\/api\/xunfei\/ads\/
-URL-REGEX,^https?:\/\/.+\.snssdk\.com\/motor\/operation\/activity\/display\/config\/V2\/
-# > bilibili
-URL-REGEX,^https?:\/\/app\.bilibili\.com\/x\/v2\/splash\/
+# >> 爱奇艺
+URL-REGEX,^https?:\/\/iface\.iqiyi\.com\/api\/getNewAdInfo
+URL-REGEX,^https?:\/\/.+\/(mixer|track2)\?
+URL-REGEX,^https?:\/\/act\.vip\.iqiyi\.com\/interact\/api\/show.do
+URL-REGEX,^https?:\/\/act\.vip\.iqiyi\.com\/interact\/api\/v2\/show
+# > 哔哩哔哩
+URL-REGEX,^https?:\/\/app\.bilibili\.com\/x\/v\d\/splash\/
+URL-REGEX,^https?:\/\/manga\.bilibili\.com\/twirp\/comic\.v\d\.Comic\/Flash
 # > 抱抱
 URL-REGEX,^https?:\/\/www\.myhug\.cn\/ad\/
 # > 百词斩
@@ -479,29 +490,10 @@ URL-REGEX,^https?:\/\/channel\.beitaichufang\.com\/channel\/api\/v\d\/promote\/i
 URL-REGEX,^https?:\/\/iapi\.bishijie\.com\/actopen\/advertising\/
 # > 贝壳找房
 URL-REGEX,^https?:\/\/app\.api\.ke\.com\/config\/config\/bootpage
-# > Bank of China
-URL-REGEX,^https?:\/\/mlife\.jf365\.boc\.cn\/AppPrj\/FirstPic\.do\?
-# > Boohee
+# > 薄荷
 URL-REGEX,^https?:\/\/status\.boohee\.com\/api\/v\d\/app_square\/start_up_with_ad

 # C
-# > China CITIC Bank
-URL-REGEX,^https?:\/\/m\.creditcard\.ecitic\.com\/citiccard\/mbk\/.+\/appStartAdv
-# > Industrial and Commercial Bank of China
-URL-REGEX,^https?:\/\/v\.icbc\.com\.cn\/userfiles\/Resources\/WAP\/advertisement\/
-# > China Merchants Bank
-URL-REGEX,^https?:\/\/mlife\.cmbchina\.com/ClientFaceService\/preCacheAdvertise\.json
-URL-REGEX,^https?:\/\/mlife\.cmbchina\.com\/ClientFaceService\/getAdvertisement\.json
-URL-REGEX,^https?:\/\/pic1cdn\.cmbchina\.com\/appinitads\/
-# > China Merchants Bank
-URL-REGEX,^https?:\/\/www\.cmbc\.com\.cn\/m\/image\/loadingpage\/
-# > China Guangfa Bank
-URL-REGEX,^https?:\/\/mps\.95508\.com\/mps\/club\/cardPortals\/adv\/.{25}\.jpg
-# > China Mobile
-URL-REGEX,^https?:\/\/clientaccess\.10086\.cn\/biz-orange\/DN\/init\/startInit
-# > China Unicom
-URL-REGEX,^https?:\/\/m\.client\.10010\.com\/mobileService\/customer\/accountListData\.htm
-URL-REGEX,^https?:\/\/m\.client\.10010\.com\/uniAdmsInterface\/getWelcomeAd
 # > CNTV
 URL-REGEX,^https?:\/\/cntv\.hls\.cdn\.myqcloud\.com\/.+\?maxbr=850
 URL-REGEX,^https?:\/\/asp\.cntv\.myalicdn\.com\/.+\?maxbr=850
@@ -515,23 +507,21 @@ URL-REGEX,^https?:\/\/api\.chelaile\.net\.cn\/goocity\/advert\/
 URL-REGEX,^https?:\/\/pic\d\.chelaile\.net\.cn\/adv\/
 # > 曹操出行
 URL-REGEX,^https?:\/\/cap\.caocaokeji\.cn\/advert-bss\/
-# > CamScanner
-URL-REGEX,^https?:\/\/api\.intsig\.net\/user\/cs\/operating\/app\/get_startpic\/
 # > 财经
 URL-REGEX,^https?:\/\/api\.caijingmobile\.com\/(ad|advert)\/
+# > 超级课程表
+URL-REGEX,^https?:\/\/.+/V\d\/splash\/getSplashV\d\.action
+# > 超级星饭团
+URL-REGEX,^https?:\/\/g\.cdn\.pengpengla\.com\/starfantuan\/boot-screen-info\/

 # D
-# > 豆瓣
-# (154.8.131.* 疑似自签证书不可验证)
-URL-REGEX,^https?:\/\/.+\/v2\/app_ads\/
+# > 豆瓣 (154.8.131.* 自签证书不可用)
+URL-REGEX,^https?:\/\/api\.douban\.com\/v\d\/app_ads\/
 # > 斗鱼
 URL-REGEX,^https?:\/\/rtbapi\.douyucdn\.cn\/japi\/sign\/app\/getinfo
 # > 当当
 URL-REGEX,^https?:\/\/mapi\.dangdang\.com\/index\.php\?action=init
 URL-REGEX,^https?:\/\/e\.dangdang\.com\/.+getDeviceStartPage
-# > DayDayCook
-URL-REGEX,^https?:\/\/api\.daydaycook\.com\.cn\/daydaycook\/server\/ad\/
-URL-REGEX,^https?:\/\/cms\.daydaycook\.com\.cn\/api\/cms\/advertisement\/
 # > 蛋蛋赞
 URL-REGEX,^https?:\/\/www\.dandanzan\.com\/res\/gdsefse\.js
 # > 叨鱼
@@ -541,11 +531,13 @@ URL-REGEX,^https?:\/\/dxy\.com\/app\/i\/ask\/biz\/feed\/launch
 # > 嘀嗒出行
 URL-REGEX,^https?:\/\/capis(-slb)?\.didapinche\.com\/ad\/
 URL-REGEX,^https?:\/\/www\.didapinche\.com\/app\/adstat\/
+# > 电视家
+URL-REGEX,^https?:\/\/api\.gaoqingdianshi\.com\/api\/v\d\/ad\/

 # E
-# > eLong
-URL-REGEX,^https?:\/\/123\.59\.31\.1\/(adgateway|adv)\/
-URL-REGEX,^https?:\/\/119\.18\.193\.135\/(adgateway|adv)\/
+# > 艺龙 (123.59.31.1,119.18.193.135)
+# (仅 Surge 可用因其支持 force-http-engine-hosts)
+URL-REGEX,^https?:\/\/((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\/(adgateway|adv)\/
 # > e代驾
 URL-REGEX,^https?:\/\/pic\.edaijia\.cn\/adsplash\/

@@ -559,25 +551,17 @@ URL-REGEX,^https?:\/\/www\.flyertea\.com\/source\/plugin\/mobile\/mobile\.php\?m
 # > 飞常准
 URL-REGEX,^https?:\/\/app\.variflight\.com\/ad\/
 URL-REGEX,^https?:\/\/app\.variflight\.com\/v\d\/advert\/
-# > FENG
-URL-REGEX,^https?:\/\/api\.feng\.com\/v\d\/advertisement\/.*Claunch
+# > 凤凰秀
+URL-REGEX,^https?:\/\/dsa-mfp\.fengshows\.cn\/mfp\/mfpMultipleDelivery\.do\?.+adunitid

 # G
 # > Google
-URL-REGEX,^https?:\/\/.+\.googlevideo\.com\/.+&oad
-URL-REGEX,^https?:\/\/.+\.googlevideo\.com\/.+ctier
+URL-REGEX,^https?:\/\/.+\.googlevideo\.com\/.+(&oad|ctier)
 URL-REGEX,^https?:\/\/youtubei\.googleapis\.com\/youtubei\/.+ad_
-URL-REGEX,^https?:\/\/youtubei\.googleapis\.com\/youtubei\/.+log_
-URL-REGEX,^https?:\/\/.+\.youtube\.com\/get_midroll_
-URL-REGEX,^https?:\/\/premiumyva\.appspot\.com\/vmclickstoadvertisersite
-URL-REGEX,^https?:\/\/.+\.youtube\.com\/api\/stats\/ads
-URL-REGEX,^https?:\/\/.+\.youtube\.com\/api\/stats\/.+adformat
-URL-REGEX,^https?:\/\/.+\.youtube\.com\/pagead\/
-URL-REGEX,^https?:\/\/.+\.youtube\.com\/ptracking
+URL-REGEX,^https?:\/\/\w+\.youtube\.com\/api\/stats\/(ads|.+adformat)
+URL-REGEX,^https?:\/\/\w+\.youtube\.com\/(pagead|ptracking)
 # > Gofun
 URL-REGEX,^https?:\/\/gateway\.shouqiev\.com\/fsda\/app\/bootImage\.json
-# > GoodBodivis
-URL-REGEX,^https?:\/\/www\.bodivis\.com\.cn\/app\/splashAdvertise
 # > 国泰君安
 URL-REGEX,^https?:\/\/dl\.app\.gtja\.com\/dzswem\/kvController\/.+\.jpg$

@@ -588,6 +572,7 @@ URL-REGEX,^https?:\/\/m\.ibuscloud.com\/v2\/app\/getStartPage
 URL-REGEX,^https?:\/\/smkmp\.96225.com\/smkcenter\/ad/
 # > 虎扑
 URL-REGEX,^https?:\/\/games\.mobileapi\.hupu\.com\/.+\/(interfaceAdMonitor|interfaceAd)\/
+URL-REGEX,^https?:\/\/business\.msstatic\.com\/advertiser\/
 # > 韩剧社
 URL-REGEX,^https?:\/\/47\.97\.20\.12\/ad\/
 # > 火猫
@@ -596,22 +581,17 @@ URL-REGEX,^https?:\/\/api\.huomao\.com\/channels\/loginAd
 URL-REGEX,^https?:\/\/consumer\.fcbox\.com\/v\d\/ad\/
 # > 好好住
 URL-REGEX,^https?:\/\/api\.haohaozhu\.cn\/index\.php\/home\/AppInit\/getStartPhoto
+# > 花生地铁
+URL-REGEX,^https?:\/\/cmsapi\.wifi8\.com\/v\d\/(emptyAd|adNew)\/

 # I
-# > iFlytek
+# > 讯飞
 URL-REGEX,^https?:\/\/imeclient\.openspeech\.cn\/adservice\/
-# > iQiyi
-URL-REGEX,^https?:\/\/iface\.iqiyi\.com\/api\/getNewAdInfo
-URL-REGEX,^https?:\/\/.+\/(mixer|track2)\?
-URL-REGEX,^https?:\/\/act\.vip\.iqiyi\.com\/interact\/api\/show.do
-URL-REGEX,^https?:\/\/act\.vip\.iqiyi\.com\/interact\/api\/v2\/show
-# > iReader
-URL-REGEX,^https?:\/\/ih2\.ireader\.com\/zyapi\/bookstore\/ad\/
-URL-REGEX,^https?:\/\/ih2\.ireader\.com\/zyapi\/self\/screen\/ad
-URL-REGEX,^https?:\/\/ih2\.ireader\.com\/zycl\/api\/ad\/
+# > 好体知
+URL-REGEX,^https?:\/\/www\.bodivis\.com\.cn\/app\/splashAdvertise

 # J
-# > JD
+# > 京东
 URL-REGEX,^https?:\/\/api\.m\.jd.com\/client\.action\?functionId=(start|queryMaterialAdverts)
 URL-REGEX,^https?:\/\/(bdsp-x|dsp-x)\.jd\.com\/adx\/
 URL-REGEX,^https?:\/\/ms\.jr\.jd\.com\/gw\/generic\/base\/na\/m\/adInfo
@@ -623,27 +603,28 @@ URL-REGEX,^https?:\/\/api\.jxedt\.com\/ad\/
 URL-REGEX,^https?:\/\/richmanapi\.jxedt\.com\/api\/ad\/
 # > 驾考宝典
 URL-REGEX,^https?:\/\/.+\.kakamobi\.cn\/api\/open\/v\d\/advert-sdk\/
+# > 金山 WPS
+URL-REGEX,^https?:\/\/ios\.wps\.cn\/ad-statistics-service
+URL-REGEX,^https?:\/\/mobile-pic\.cache\.iciba\.com\/feeds_ad\/
+URL-REGEX,^https?:\/\/\w+\.kingsoft-office-service\.com\/ad
+# > 金山词霸
+URL-REGEX,^https?:\/\/dict-mobile\.iciba\.com\/interface\/index\.php\?.+(c=ad|collectFeedsAdShowCount|KSFeedsAdCardViewController)
+URL-REGEX,^https?:\/\/service\.iciba\.com\/popo\/open\/screens\/v\d\?adjson

 # K
 # > Keep
 URL-REGEX,^https?:\/\/api\.gotokeep\.com\/ads
-# > Kingsoft WPS
-URL-REGEX,^https?:\/\/ios\.wps\.cn\/ad-statistics-service
-URL-REGEX,^https?:\/\/mobile-pic\.cache\.iciba\.com\/feeds_ad\/
-URL-REGEX,^https?:\/\/.+\.kingsoft-office-service\.com\/ad
-# > Kingsoft PowerWord
-URL-REGEX,^https?:\/\/dict-mobile\.iciba\.com\/interface\/index\.php\?.+(c=ad|collectFeedsAdShowCount|KSFeedsAdCardViewController)
-URL-REGEX,^https?:\/\/service\.iciba\.com\/popo\/open\/screens\/v\d\?adjson
 # > 快看漫画
 URL-REGEX,^https?:\/\/api\.kkmh\.com\/.+(ad|advertisement)\/
-# > Kuwo
-URL-REGEX,^https?:\/\/122\.14\.246\.33\/MobileAdServer\/
-URL-REGEX,^https?:\/\/(2(5[0-5]{1}|[0-4]\d{1})|[0-1]?\d{1,2})(\.(2(5[0-5]{1}|[0-4]\d{1})|[0-1]?\d{1,2})){3}\/EcomResourceServer/AdPlayPage/adinfo
+# > 酷我 (122.14.246.33,175.102.178.52)
+# (仅 Surge 可用因其支持 force-http-engine-hosts)
+URL-REGEX,^https?:\/\/((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\/MobileAdServer\/
+URL-REGEX,^https?:\/\/((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\/EcomResourceServer/AdPlayPage/adinfo
 # > 看理想
 URL-REGEX,^https?:\/\/api\.vistopia\.com\.cn\/api\/v\d\/home\/advertisement

 # L
-# > Le
+# > 乐视
 URL-REGEX,^https?:\/\/.+\/letv-gug\/
 # > 来疯直播
 URL-REGEX,^https?:\/\/api\.laifeng\.com\/v\d\/start\/ads
@@ -651,15 +632,14 @@ URL-REGEX,^https?:\/\/api\.laifeng\.com\/v\d\/start\/ads
 URL-REGEX,^https?:\/\/ios\.lantouzi\.com\/api\/startpage

 # M
-# > MI
+# > 小米
 URL-REGEX,^https?:\/\/api\.m\.mi\.com\/v\d\/app\/start
 URL-REGEX,^https?:\/\/api\.jr\.mi\.com\/v\d\/adv\/
 URL-REGEX,^https?:\/\/api\.jr\.mi\.com\/jr\/api\/playScreen
-# > MI_Fit
 URL-REGEX,^https?:\/\/api-mifit.+\.huami\.com\/discovery\/mi\/discovery\/.+_ad\?
-# > MogoRenter
+# > 蘑菇租房
 URL-REGEX,^https?:\/\/api\.mgzf\.com\/renter-operation\/home\/startHomePage
-# > MojiWeather
+# > 墨迹天气
 URL-REGEX,^https?:\/\/cdn\.moji\.com\/(adoss|adlink)\/
 # > 埋堆堆
 URL-REGEX,^https?:\/\/mob\.mddcloud\.com\.cn\/api\/(ad|advert)\/
@@ -672,11 +652,6 @@ URL-REGEX,^https?:\/\/p\d\.meituan\.net\/movie\/[A-Za-z0-9]+\.jpg\?may_covertWeb
 URL-REGEX,^https?:\/\/s3plus\.meituan\.net\/.+\/linglong\/.+\.(gif|jpg|mp4)
 # > 美味不用等
 URL-REGEX,^https?:\/\/capi.mwee.cn/app-api/V\d{2}/app/(ad|getstartad)
-# > 咪咕
-URL-REGEX,^https?:\/\/.+\/v\d\/iflyad\/
-URL-REGEX,^https?:\/\/.+\/cdn-adn\/
-URL-REGEX,^https?:\/\/ggic\d?\.cmvideo\.cn\/ad\/
-URL-REGEX,^https?:\/\/.+/img\/ad\.union\.api\/
 # > 秒拍
 URL-REGEX,^https?:\/\/b-api\.ins\.miaopai\.com\/\d\/ad/
 # > 马蜂窝
@@ -684,23 +659,6 @@ URL-REGEX,^https?:\/\/mapi\.mafengwo\.cn\/ad\/
 URL-REGEX,^https?:\/\/mapi\.mafengwo\.cn\/travelguide\/ad\/

 # N
-# > NetEase Mail
-URL-REGEX,^https?:\/\/appconf\.mail\.163\.com\/mmad\/
-# > NetEase Youdao
-URL-REGEX,^https?:\/\/oimage([a-z])([0-9])\.ydstatic\.com\/.+adpublish
-URL-REGEX,^https?:\/\/dsp-impr2\.youdao\.com\/adload.s\?
-# > NetEase News
-URL-REGEX,^https?:\/\/c\.m\.163\.com\/nc\/gl\/
-# > NetEase MoneyKeeper
-URL-REGEX,^https?:\/\/client\.mail\.163\.com\/apptrack\/confinfo\/searchMultiAds
-# > NetEase CloudMusic
-URL-REGEX,^https?:\/\/.+\/eapi\/(ad|log)\/
-# > NetEase 考拉
-URL-REGEX,^https?:\/\/sp\.kaola\.com\/api\/openad
-# > NetEase Yanxuan
-URL-REGEX,^https?:\/\/support\.you\.163\.com\/xhr\/boot\/getBootMedia\.json
-# > NetEase SnailReader
-URL-REGEX,^https?:\/\/easyreadfs\.nosdn\.127\.net\/ad-material\/
 # > 爱南宁
 URL-REGEX,^https?:\/\/nnapp\.cloudbae\.cn\/mc\/api\/advert/
 # > NationalGeographic
@@ -715,21 +673,21 @@ URL-REGEX,^https?:\/\/ma\.ofo\.com\/ads\/
 URL-REGEX,^https?:\/\/activity2\.api\.ofo\.com\/ofo\/Api\/v2\/ads
 URL-REGEX,^https?:\/\/ma\.ofo\.com\/adImage\/
 # > Oray
-URL-REGEX,^https?:\/\/slapi.oray.net/client/ad
+URL-REGEX,^https?:\/\/slapi\.oray\.net\/client\/ad

 # P
-# > PeanutWiFiMpass
-URL-REGEX,^https?:\/\/cmsapi\.wifi8\.com\/v\d\/(emptyAd|adNew)\/
 # > 票根
 URL-REGEX,^https?:\/\/pss\.txffp\.com\/piaogen\/images\/launchScreen/
+# > 拼多多
+URL-REGEX,^https?:\/\/api\.yangkeduo\.com\/api\/cappuccino\/splash

 # Q
 # > Qdaily
-URL-REGEX,^https?:\/\/app3\.qdaily\.com\/app3\/boot_advertisements\.json
-URL-REGEX,^https?:\/\/notch\.qdaily\.com\/api\/v2\/boot_ad
+URL-REGEX,^https?:\/\/app\d\.qdaily\.com\/app\d\/boot_advertisements\.json
+URL-REGEX,^https?:\/\/notch\.qdaily\.com\/api\/v\d\/boot_ad
 # > 穷游
 URL-REGEX,^https?:\/\/open\.qyer\.com\/qyer\/startpage\/
-URL-REGEX,^https?:\/\/open\.qyer.com\/qyer\/config\/get
+URL-REGEX,^https?:\/\/open\.qyer\.com\/qyer\/config\/get
 URL-REGEX,^https?:\/\/media\.qyer\.com\/ad\/
 # > 亲宝宝
 URL-REGEX,^https?:\/\/api\.qbb6\.com\/ad\/
@@ -739,69 +697,65 @@ URL-REGEX,^https?:\/\/api\.qbb6\.com\/ad\/
 URL-REGEX,^https?:\/\/msspjh\.emarbox\.com\/getAdConfig
 URL-REGEX,^https?:\/\/api\.videozhishi\.com\/api\/getAdvertising
 URL-REGEX,^https?:\/\/api\.rr\.tv\/ad\/
+# > 人人影视
+URL-REGEX,^https?:\/\/ctrl\.(playcvn|zmzapi)\.(com|net)\/app\/(ads|init)
+# > 日日煮
+URL-REGEX,^https?:\/\/api\.daydaycook\.com\.cn\/daydaycook\/server\/ad\/
+URL-REGEX,^https?:\/\/cms\.daydaycook\.com\.cn\/api\/cms\/advertisement\/

 # S
-# > Sina
-URL-REGEX,^https?:\/\/edit\.sinaapp\.com\/ua\?t=adv
-# > Sina Weibo
-URL-REGEX,^https?:\/\/sdkapp\.uve\.weibo\.com\/interface\/sdk\/sdkad\.php
-URL-REGEX,^https?:\/\/wbapp\.uve\.weibo\.com\/wbapplua\/wbpullad\.lua
-URL-REGEX,^https?:\/\/sdkapp\.uve\.weibo\.com/\interface\/sdk\/actionad\.php
-URL-REGEX,^https?:\/\/weibointl\.api\.weibo\.cn\/portal\.php\?a=get_coopen_ads
-# > Sina 天气通
-URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/overall\/redirect\.php\?r=tqt_sdkad
-URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/overall\/redirect\.php\?r=tqtad
-URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/.+advert\.index
-URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/api\/advert\/
-# > Sohu
+# > 搜狐
 URL-REGEX,^https?:\/\/api\.k\.sohu\.com\/api\/news\/adsense
 URL-REGEX,^https?:\/\/pic\.k\.sohu\.com\/img8\/wb\/tj\/
 URL-REGEX,^https?:\/\/s1\.api\.tv\.itc\.cn\/v4\/mobile\/control\/switch\.json
 URL-REGEX,^https?:\/\/api\.tv\.sohu\.com\/agg\/api\/app\/config\/bootstrap
-# > StarFans
-URL-REGEX,^https?:\/\/g\.cdn\.pengpengla\.com\/starfantuan\/boot-screen-info\/
 # > 什么值得买
 URL-REGEX,^https?:\/\/api\.smzdm\.com\/v\d\/util\/loading
+URL-REGEX,^https?:\/\/app-api\.smzdm\.com\/util\/loading
+URL-REGEX,^https?:\/\/s\d\.zdmimg\.com\/www\/api\/v\d\/api\/thirdAd\.php
 # > 四季線上影視4gTV
 URL-REGEX,^https?:\/\/service\.4gtv\.tv\/4gtv\/Data\/(GetAD|ADLog)
 # > 肆客足球
 URL-REGEX,^https?:\/\/api\.qiuduoduo\.cn\/guideimage
 # > 识货
-URL-REGEX,^https?:\/\/www\.shihuo\.cn\/app3\/saveAppInfo
+URL-REGEX,^https?:\/\/www\.shihuo\.cn\/app\d\/saveAppInfo
 # > 首汽约车
 URL-REGEX,^https?:\/\/gw-passenger\.01zhuanche\.com\/gw-passenger\/car-rest\/webservice\/passenger\/recommendADs
 URL-REGEX,^https?:\/\/gw-passenger\.01zhuanche\.com\/gw-passenger\/zhuanche-passenger-token\/leachtoken\/webservice\/homepage\/queryADs
-# > Suning
+# > 苏宁
 URL-REGEX,^https?:\/\/image\.suning\.cn\/uimg\/ma\/ad\/
 # > 神舟专车
 URL-REGEX,^https?:\/\/img01\.10101111cdn\.com\/adpos\/
-# > SuperFriday
-URL-REGEX,^https?:\/\/.+/V\d\/splash\/getSplashV\d\.action
+# > 扫描全能王
+URL-REGEX,^https?:\/\/api\.intsig\.net\/user\/cs\/operating\/app\/get_startpic\/
+# > 省点
+URL-REGEX,^https?:\/\/api\.waitwaitpay\.com\/\/api\/splash
+# > 搜狗
+URL-REGEX,^https?:\/\/business-cdn\.shouji\.sogou\.com\/wapdl\/hole\/.+\.jpg

 # T
-# > Tencent
-# >> Tencent Futubull
-URL-REGEX,^https?:\/\/api5\.futunn\.com\/ad\/
-# >> Tencent Game
+# > 腾讯
+# >> 富途牛牛
+URL-REGEX,^https?:\/\/api\d\.futunn\.com\/ad\/
+# >> 腾讯游戏
 URL-REGEX,^https?:\/\/ssl\.kohsocialapp\.qq\.com:10001\/game\/buttons
 URL-REGEX,^https?:\/\/qt\.qq\.com\/lua\/mengyou\/get_splash_screen_info
-# >> Tencent Maps
+# >> 腾讯地图
 URL-REGEX,^https?:\/\/3gimg\.qq\.com\/tencentMapTouch\/app\/activity\/
 URL-REGEX,^https?:\/\/3gimg\.qq\.com\/tencentMapTouch\/splash\/
 URL-REGEX,^https?:\/\/4gimg\.map\.qq\.com\/mwaSplash\/
-# >> Tencent QQLive
+# >> 腾讯视频
 URL-REGEX,^https?:\/\/btrace.qq.com
 URL-REGEX,^https?:\/\/vv\.video\.qq\.com\/getvmind\?
-URL-REGEX,^https?:\/\/.+\.mp4.+&sdtfrom=v3004
-# >> Tencent QQNews
+# URL-REGEX,^https?:\/\/.+\.mp4.+&sdtfrom=v3004
+URL-REGEX,^https?:\/\/((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\/.+\.tc\.qq\.com\/.+p201\.1\.mp4\?
+# >> 腾讯新闻
 URL-REGEX,^https?:\/\/r\.inews\.qq\.com\/(adsBlacklist|getFullScreenPic|getQQNewsRemoteConfig)
-# >> Tencent WeChat
+# >> 腾讯体育
+URL-REGEX,^https?:\/\/news\.ssp\.qq\.com\/app
+# >> 微信
 URL-REGEX,^https?:\/\/mp\.weixin\.qq\.com\/mp\/(ad_|advertisement|getappmsgad)
-# > Thunder
-URL-REGEX,^https?:\/\/images\.client\.vip\.xunlei\.com\/.+\/advert\/
-# > TV_Home
-URL-REGEX,^https?:\/\/api\.gaoqingdianshi\.com\/api\/v\d\/ad\/
-# > The_Paper
+# > 澎湃新闻
 URL-REGEX,^https?:\/\/adpai\.thepaper\.cn\/.+&ad=
 # > 太平洋
 URL-REGEX,^https?:\/\/agent-count\.pconline\.com\.cn\/counter\/adAnalyse\/
@@ -809,6 +763,8 @@ URL-REGEX,^https?:\/\/mrobot\.pconline\.com\.cn\/v\d\/ad2p
 URL-REGEX,^https?:\/\/mrobot\.pconline\.com\.cn\/s\/onlineinfo\/ad\/
 URL-REGEX,^https?:\/\/mrobot\.pcauto\.com\.cn\/v\d\/ad2p
 URL-REGEX,^https?:\/\/mrobot\.pcauto\.com\.cn\/xsp\/s\/auto\/info\/preload\.xsp
+# > 途牛
+URL-REGEX,^https?:\/\/m\.tuniu\.com\/api\/operation\/splash\/

 # V
 # > VUE
@@ -816,7 +772,26 @@ URL-REGEX,^https?:\/\/static\.vuevideo\.net\/styleAssets\/.+\/splash_ad
 URL-REGEX,^https?:\/\/static\.vuevideo\.net\/styleAssets\/advertisement\/

 # W
-# > WeDoctor
+# > 网易
+# >> 网易邮箱
+URL-REGEX,^https?:\/\/appconf\.mail\.163\.com\/mmad\/
+# >> 网易新闻
+URL-REGEX,^https?:\/\/c\.m\.163\.com\/nc\/gl\/
+# >> 网易有钱
+URL-REGEX,^https?:\/\/client\.mail\.163\.com\/apptrack\/confinfo\/searchMultiAds
+# >> 网易云音乐
+URL-REGEX,^https?:\/\/.+\/eapi\/(ad|log)\/
+# >> 网易考拉
+URL-REGEX,^https?:\/\/sp\.kaola\.com\/api\/openad
+# >> 网易严选
+URL-REGEX,^https?:\/\/support\.you\.163\.com\/xhr\/boot\/getBootMedia\.json
+# >> 网易蜗牛读书
+URL-REGEX,^https?:\/\/easyreadfs\.nosdn\.127\.net\/ad-material\/
+URL-REGEX,^https?:\/\/p\.du\.163\.com\/ad\/
+# >> 有道词典
+URL-REGEX,^https?:\/\/oimage([a-z])([0-9])\.ydstatic\.com\/.+adpublish
+URL-REGEX,^https?:\/\/dsp-impr2\.youdao\.com\/adload.s\?
+# > 微医
 URL-REGEX,^https?:\/\/app\.wy\.guahao\.com\/json\/white\/dayquestion\/getpopad
 # > Weico
 URL-REGEX,^https?:\/\/overseas\.weico\.cc/portal\.php\?a=get_coopen_ads
@@ -832,10 +807,23 @@ URL-REGEX,^https?:\/\/nochange\.ggsafe\.com\/ad\/
 URL-REGEX,^https?:\/\/thor\.weidian\.com\/ares\/home\.splash\/
 # > 华尔街见闻
 URL-REGEX,^https?:\/\/api\.wallstreetcn\.com\/apiv\d\/advertising\/
+# > 威锋
+URL-REGEX,^https?:\/\/api\.feng\.com\/v\d\/advertisement\/.*Claunch

 # X
+# > 新浪
+URL-REGEX,^https?:\/\/edit\.sinaapp\.com\/ua\?t=adv
+# >> 新浪微博
+URL-REGEX,^https?:\/\/sdkapp\.uve\.weibo\.com\/interface\/sdk\/(actionad|sdkad)\.php
+URL-REGEX,^https?:\/\/wbapp\.uve\.weibo\.com\/wbapplua\/wbpullad\.lua
+URL-REGEX,^https?:\/\/weibointl\.api\.weibo\.cn\/portal\.php\?a=get_coopen_ads
+# >> 新浪天气通
+URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/overall\/redirect\.php\?r=tqt_sdkad
+URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/overall\/redirect\.php\?r=tqtad
+URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/.+advert\.index
+URL-REGEX,^https?:\/\/tqt\.weibo\.cn\/api\/advert\/
 # > 下厨房
-URL-REGEX,^https?:\/\/api\.xiachufang\.com\/v2\/ad/
+URL-REGEX,^https?:\/\/api\.xiachufang\.com\/v\d\/ad/
 # > 虾米
 URL-REGEX,^https?:\/\/acs\.m\.taobao\.com\/gw\/mtop\.alimusic\.common\.mobileservice\.startinit\/
 # > 小睡眠
@@ -844,20 +832,16 @@ URL-REGEX,^https?:\/\/api\.psy-1\.com\/cosleep\/startup
 URL-REGEX,^https?:\/\/portal-xunyou\.qingcdn\.com\/api\/v\d\/ios\/configs\/(splash_ad|ad_urls)
 URL-REGEX,^https?:\/\/portal-xunyou\.qingcdn\.com\/api\/v\d\/ios\/ads\/
 # > 喜马拉雅
-URL-REGEX,^https?:\/\/.+\/api\/v\d\/adRealTime
+URL-REGEX,^https?:\/\/\w+\.ximalaya\.com\/api\/v\d\/adRealTime
+URL-REGEX,^https?:\/\/((25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\/ting\/preload\/
 # > 小站
 URL-REGEX,^https?:\/\/tiku\.zhan\.com\/Common\/newAd\/

 # Y
 # > Yahoo!
-URL-REGEX,^https?:\/\/m\.yap\.yahoo\.com\/v18\/getAds\.do
+URL-REGEX,^https?:\/\/m\.yap\.yahoo\.com\/v\d{2}\/getAds\.do
 # > Youtube++
-URL-REGEX,^https?:\/\/api\.catch\.gift\/api\/v3\/pagead\/
-# > YOUKU
-URL-REGEX,^https?:\/\/.+\.mp4\?ccode=0902
-URL-REGEX,^https?:\/\/.+\.mp4\?sid=
-# > YYeTs
-URL-REGEX,^https?:\/\/ctrl\.(playcvn|zmzapi)\.(com|net)\/app\/(ads|init)
+URL-REGEX,^https?:\/\/api\.catch\.gift\/api\/v\d\/pagead\/
 # > 萤石云视频
 URL-REGEX,^https?:\/\/i\.ys7\.com\/api\/ads
 # > 运动世界
@@ -870,6 +854,10 @@ URL-REGEX,^https?:\/\/app\.yinxiang\.com\/ads\/
 URL-REGEX,^https?:\/\/restapi\.iyunmai\.com\/api\/ios\/ad\/
 # > 育学园
 URL-REGEX,^https?:\/\/yxyapi\d\.drcuiyutao\.com\/yxy-api-gateway\/api\/json\/advert\/
+# > 迅雷
+URL-REGEX,^https?:\/\/images\.client\.vip\.xunlei\.com\/.+\/advert\/
+# > 讯飞
+URL-REGEX,^https?:\/\/imeclient\.openspeech\.cn\/adservice\/

 # Z
 # > 直播吧
@@ -879,6 +867,8 @@ URL-REGEX,^https?:\/\/.+\/allOne\.php\?ad_name
 URL-REGEX,^https?:\/\/www\.zhihu\.com\/api\/v4\/community-ad\/
 URL-REGEX,^https?:\/\/api\.zhihu\.com\/(launch|real_time)
 URL-REGEX,^https?:\/\/api\.zhihu\.com\/commercial_api\/(launch|real_time)
+URL-REGEX,^https?:\/\/api\.zhihu\.com\/fringe\/ad
+URL-REGEX,^https?:\/\/api\.zhihu\.com\/ad-
 # > 追书神器
 URL-REGEX,^https?:\/\/(api|b)\.zhuishushenqi\.com\/advert
 URL-REGEX,^https?:\/\/api\.zhuishushenqi\.com\/splashes\/ios
@@ -888,4 +878,41 @@ URL-REGEX,^https?:\/\/itunes\.apple\.com\/lookup\?id=575826903
 # > 作业帮
 URL-REGEX,^https?:\/\/www\.zybang\.com\/adx\/
 # > 最右
-URL-REGEX,^https?:\/\/api\.izuiyou\.com\/ad\/
+URL-REGEX,^https?:\/\/api\.izuiyou\.com\/ad\/
+# > 字节跳动
+URL-REGEX,^https?:\/\/.+\.pstatp\.com\/img\/ad
+URL-REGEX,^https?:\/\/.+\.(amemv|musical|snssdk|tiktokv)\.(com|ly)\/(api|motor)\/ad\/
+URL-REGEX,^https?:\/\/dsp\.toutiao\.com\/api\/xunfei\/ads\/
+URL-REGEX,^https?:\/\/.+\.snssdk\.com\/motor\/operation\/activity\/display\/config\/V2\/
+URL-REGEX,^https?:\/\/.+/img\/ad\.union\.api\/
+# > 中国银行
+URL-REGEX,^https?:\/\/mlife\.jf365\.boc\.cn\/AppPrj\/FirstPic\.do\?
+# > 中信银行
+URL-REGEX,^https?:\/\/m\.creditcard\.ecitic\.com\/citiccard\/mbk\/.+\/appStartAdv
+# > 中国工商银行
+URL-REGEX,^https?:\/\/v\.icbc\.com\.cn\/userfiles\/Resources\/WAP\/advertisement\/
+# > 中国招商银行
+URL-REGEX,^https?:\/\/mlife\.cmbchina\.com\/ClientFaceService\/preCacheAdvertise\.json
+URL-REGEX,^https?:\/\/mlife\.cmbchina\.com\/ClientFaceService\/getAdvertisement\.json
+URL-REGEX,^https?:\/\/pic1cdn\.cmbchina\.com\/appinitads\/
+# > 中国民生银行
+URL-REGEX,^https?:\/\/www\.cmbc\.com\.cn\/m\/image\/loadingpage\/
+# > 中国广发银行
+URL-REGEX,^https?:\/\/mps\.95508\.com\/mps\/club\/cardPortals\/adv\/.{25}\.jpg
+# > 中国移动
+# >> 手机营业厅
+URL-REGEX,^https?:\/\/clientaccess\.10086\.cn\/biz-orange\/DN\/init\/startInit
+# >> 江苏
+URL-REGEX,^https?:\/\/wap\.js\.10086\.cn\/jsmccClient\/cd\/market_content\/api\/v\d\/market_content\.page\.query
+# >> 咪咕
+URL-REGEX,^https?:\/\/gg\w+\.cmvideo\.cn\/v\d\/iflyad\/
+URL-REGEX,^https?:\/\/ggic(\d)?\.cmvideo\.cn\/ad\/
+URL-REGEX,^https?:\/\/ggx\.cmvideo\.cn\/request\/
+URL-REGEX,^https?:\/\/.+\/cdn-adn\/
+# > 中国联通
+URL-REGEX,^https?:\/\/m\.client\.10010\.com\/mobileService\/customer\/accountListData\.htm
+URL-REGEX,^https?:\/\/m\.client\.10010\.com\/uniAdmsInterface\/getWelcomeAd
+# > 掌阅
+URL-REGEX,^https?:\/\/ih2\.ireader\.com\/zyapi\/bookstore\/ad\/
+URL-REGEX,^https?:\/\/ih2\.ireader\.com\/zyapi\/self\/screen\/ad
+URL-REGEX,^https?:\/\/ih2\.ireader\.com\/zycl\/api\/ad\/
--- 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
@@ -85,30 +92,32 @@ USER-AGENT,encoreTVB*
 DOMAIN-SUFFIX,encoretvb.com
 DOMAIN,edge.api.brightcove.com
 DOMAIN,bcbolt446c5271-a.akamaihd.net
-# > Fox+ & Fox Now
+# > FOX NOW
 USER-AGENT,FOX%20NOW*
-USER-AGENT,FOXPlus*
-DOMAIN-SUFFIX,dashasiafox.akamaized.net
 DOMAIN-SUFFIX,fox.com
 DOMAIN-SUFFIX,foxdcg.com
-DOMAIN-SUFFIX,foxplus.com
-DOMAIN-SUFFIX,staticasiafox.akamaized.net
 DOMAIN-SUFFIX,theplatform.com
 DOMAIN-SUFFIX,uplynk.com
-# > HBO Now & HBO GO
+# > HBO NOW
 USER-AGENT,HBO%20NOW*
-USER-AGENT,HBO%20GO*
-USER-AGENT,HBOAsia*
 DOMAIN-SUFFIX,hbo.com
 DOMAIN-SUFFIX,hbogo.com
-DOMAIN-SUFFIX,hboasia.com
-DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbonow.com
+# > HBO GO HKG
+USER-AGENT,HBO%20GO%20PROD%20HKG*
+DOMAIN-SUFFIX,hbogoasia.com
 DOMAIN-SUFFIX,hbogoasia.hk
-DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
 DOMAIN,bcbolthboa-a.akamaihd.net
-DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
-DOMAIN,manifest.prod.boltdns.net
+DOMAIN,players.brightcove.net
 DOMAIN,s3-ap-southeast-1.amazonaws.com
+DOMAIN,dai3fd1oh325y.cloudfront.net
+DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
+DOMAIN,hboasia1-i.akamaihd.net
+DOMAIN,hboasia2-i.akamaihd.net
+DOMAIN,hboasia3-i.akamaihd.net
+DOMAIN,hboasia4-i.akamaihd.net
+DOMAIN,hboasia5-i.akamaihd.net
+DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
 # > 华文电视
 USER-AGENT,HWTVMobile*
 DOMAIN-SUFFIX,5itv.tv
@@ -156,6 +165,16 @@ DOMAIN-SUFFIX,nflximg.com
 DOMAIN-SUFFIX,nflximg.net
 DOMAIN-SUFFIX,nflxso.net
 DOMAIN-SUFFIX,nflxvideo.net
+DOMAIN-SUFFIX,netflixdnstest0.com
+DOMAIN-SUFFIX,netflixdnstest1.com
+DOMAIN-SUFFIX,netflixdnstest2.com
+DOMAIN-SUFFIX,netflixdnstest3.com
+DOMAIN-SUFFIX,netflixdnstest4.com
+DOMAIN-SUFFIX,netflixdnstest5.com
+DOMAIN-SUFFIX,netflixdnstest6.com
+DOMAIN-SUFFIX,netflixdnstest7.com
+DOMAIN-SUFFIX,netflixdnstest8.com
+DOMAIN-SUFFIX,netflixdnstest9.com
 IP-CIDR,23.246.0.0/18,no-resolve
 IP-CIDR,37.77.184.0/21,no-resolve
 IP-CIDR,45.57.0.0/17,no-resolve
@@ -186,6 +205,7 @@ DOMAIN,hamifans.emome.net
 DOMAIN-SUFFIX,twitch.tv
 DOMAIN-SUFFIX,twitchcdn.net
 DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,jtvnw.net
 # > ViuTV
 USER-AGENT,Viu*
 USER-AGENT,ViuTV*
--- 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
@@ -538,7 +539,6 @@ DOMAIN-SUFFIX,ifixit.com
 DOMAIN-SUFFIX,iphone4hongkong.com
 DOMAIN-SUFFIX,iphonetaiwan.org
 DOMAIN-SUFFIX,iptvbin.com
-DOMAIN-SUFFIX,jtvnw.net
 DOMAIN-SUFFIX,linksalpha.com
 DOMAIN-SUFFIX,manyvids.com
 DOMAIN-SUFFIX,myactimes.com
--- 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
@@ -85,30 +92,32 @@ USER-AGENT,encoreTVB*
 DOMAIN-SUFFIX,encoretvb.com
 DOMAIN,edge.api.brightcove.com
 DOMAIN,bcbolt446c5271-a.akamaihd.net
-# > Fox+ & Fox Now
+# > FOX NOW
 USER-AGENT,FOX%20NOW*
-USER-AGENT,FOXPlus*
-DOMAIN-SUFFIX,dashasiafox.akamaized.net
 DOMAIN-SUFFIX,fox.com
 DOMAIN-SUFFIX,foxdcg.com
-DOMAIN-SUFFIX,foxplus.com
-DOMAIN-SUFFIX,staticasiafox.akamaized.net
 DOMAIN-SUFFIX,theplatform.com
 DOMAIN-SUFFIX,uplynk.com
-# > HBO Now & HBO GO
+# > HBO NOW
 USER-AGENT,HBO%20NOW*
-USER-AGENT,HBO%20GO*
-USER-AGENT,HBOAsia*
 DOMAIN-SUFFIX,hbo.com
 DOMAIN-SUFFIX,hbogo.com
-DOMAIN-SUFFIX,hboasia.com
-DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbonow.com
+# > HBO GO HKG
+USER-AGENT,HBO%20GO%20PROD%20HKG*
+DOMAIN-SUFFIX,hbogoasia.com
 DOMAIN-SUFFIX,hbogoasia.hk
-DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
 DOMAIN,bcbolthboa-a.akamaihd.net
-DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
-DOMAIN,manifest.prod.boltdns.net
+DOMAIN,players.brightcove.net
 DOMAIN,s3-ap-southeast-1.amazonaws.com
+DOMAIN,dai3fd1oh325y.cloudfront.net
+DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
+DOMAIN,hboasia1-i.akamaihd.net
+DOMAIN,hboasia2-i.akamaihd.net
+DOMAIN,hboasia3-i.akamaihd.net
+DOMAIN,hboasia4-i.akamaihd.net
+DOMAIN,hboasia5-i.akamaihd.net
+DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
 # > 华文电视
 USER-AGENT,HWTVMobile*
 DOMAIN-SUFFIX,5itv.tv
@@ -156,6 +165,16 @@ DOMAIN-SUFFIX,nflximg.com
 DOMAIN-SUFFIX,nflximg.net
 DOMAIN-SUFFIX,nflxso.net
 DOMAIN-SUFFIX,nflxvideo.net
+DOMAIN-SUFFIX,netflixdnstest0.com
+DOMAIN-SUFFIX,netflixdnstest1.com
+DOMAIN-SUFFIX,netflixdnstest2.com
+DOMAIN-SUFFIX,netflixdnstest3.com
+DOMAIN-SUFFIX,netflixdnstest4.com
+DOMAIN-SUFFIX,netflixdnstest5.com
+DOMAIN-SUFFIX,netflixdnstest6.com
+DOMAIN-SUFFIX,netflixdnstest7.com
+DOMAIN-SUFFIX,netflixdnstest8.com
+DOMAIN-SUFFIX,netflixdnstest9.com
 IP-CIDR,23.246.0.0/18,no-resolve
 IP-CIDR,37.77.184.0/21,no-resolve
 IP-CIDR,45.57.0.0/17,no-resolve
@@ -186,6 +205,7 @@ DOMAIN,hamifans.emome.net
 DOMAIN-SUFFIX,twitch.tv
 DOMAIN-SUFFIX,twitchcdn.net
 DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,jtvnw.net
 # > ViuTV
 USER-AGENT,Viu*
 USER-AGENT,ViuTV*
--- 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
@@ -1,4 +1,4 @@
-# Internet Service Provider Hijacking 运营商劫持
+# Internet Service Providers Hijacking 运营商劫持
 DOMAIN-SUFFIX,17gouwuba.com
 DOMAIN-SUFFIX,186078.com
 DOMAIN-SUFFIX,189zj.cn
@@ -51,6 +51,8 @@ DOMAIN-SUFFIX,ichaosheng.com
 DOMAIN-SUFFIX,ishop789.com
 DOMAIN-SUFFIX,jdkic.com
 DOMAIN-SUFFIX,jiubuhua.com
+DOMAIN-SUFFIX,jsncke.com
+DOMAIN-SUFFIX,junkucm.com
 DOMAIN-SUFFIX,jwg365.cn
 DOMAIN-SUFFIX,kawo77.com
 DOMAIN-SUFFIX,kualianyingxiao.cn
@@ -92,8 +94,11 @@ DOMAIN-SUFFIX,tuia.cn
 DOMAIN-SUFFIX,tuipenguin.com
 DOMAIN-SUFFIX,tuitiger.com
 DOMAIN-SUFFIX,websd8.com
+DOMAIN-SUFFIX,wsgblw.com
 DOMAIN-SUFFIX,wx16999.com
+DOMAIN-SUFFIX,xchmai.com
 DOMAIN-SUFFIX,xiaohuau.xyz
+DOMAIN-SUFFIX,ygyzx.cn
 DOMAIN-SUFFIX,yinmong.com
 DOMAIN-SUFFIX,yitaopt.com
 DOMAIN-SUFFIX,yjqiqi.com
@@ -107,13 +112,15 @@ IP-CIDR,39.107.15.115/32,no-resolve
 IP-CIDR,47.89.59.182/32,no-resolve
 IP-CIDR,103.49.209.27/32,no-resolve
 IP-CIDR,123.56.152.96/32,no-resolve
-# > ChinaNet
+# > ChinaTelecom
 IP-CIDR,61.160.200.223/32,no-resolve
 IP-CIDR,61.160.200.242/32,no-resolve
 IP-CIDR,61.160.200.252/32,no-resolve
 IP-CIDR,61.174.50.214/32,no-resolve
 IP-CIDR,111.175.220.163/32,no-resolve
 IP-CIDR,111.175.220.164/32,no-resolve
+IP-CIDR,122.229.8.47/32,no-resolve
+IP-CIDR,122.229.29.89/32,no-resolve
 IP-CIDR,124.232.160.178/32,no-resolve
 IP-CIDR,175.6.223.15/32,no-resolve
 IP-CIDR,183.59.53.237/32,no-resolve
@@ -134,7 +141,7 @@ IP-CIDR,114.247.28.96/32,no-resolve
 IP-CIDR,221.179.131.72/32,no-resolve
 IP-CIDR,221.179.140.145/32,no-resolve
 # > Dr.Peng
-IP-CIDR,10.72.25.0/24,no-resolve
+# IP-CIDR,10.72.25.0/24,no-resolve
 IP-CIDR,115.182.16.79/32,no-resolve
 IP-CIDR,118.144.88.126/32,no-resolve
 IP-CIDR,118.144.88.215/32,no-resolve
@@ -147,17 +154,25 @@ IP-CIDR,211.161.101.106/32,no-resolve
 IP-CIDR,220.115.251.25/32,no-resolve
 IP-CIDR,222.73.156.235/32,no-resolve

-# Infamous 声名狼藉
+# Malware 恶意网站
+# > 快压
+# https://zhuanlan.zhihu.com/p/39534279
 DOMAIN-SUFFIX,kuaizip.com
+# > MacKeeper
+# https://www.lizhi.io/blog/40002904
 DOMAIN-SUFFIX,mackeeper.com
-# > Adobe 奥多比
+DOMAIN-SUFFIX,zryydi.com
+# > Adobe Flash China Special Edition
+# https://www.zhihu.com/question/281163698/answer/441388130
 DOMAIN-SUFFIX,flash.cn
 DOMAIN,geo2.adobe.com
-# > CJ Marketing 思杰马克丁软件
+# > C&J Marketing 思杰马克丁软件
+# https://www.zhihu.com/question/46746200
 DOMAIN-SUFFIX,4009997658.com
 DOMAIN-SUFFIX,abbyychina.com
 DOMAIN-SUFFIX,bartender.cc
 DOMAIN-SUFFIX,betterzip.net
+DOMAIN-SUFFIX,betterzipcn.com
 DOMAIN-SUFFIX,beyondcompare.cc
 DOMAIN-SUFFIX,bingdianhuanyuan.cn
 DOMAIN-SUFFIX,chemdraw.com.cn
--- 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
@@ -0,0 +1,6 @@
+# > Fox+
+USER-AGENT,FOX%20NOW*
+DOMAIN-SUFFIX,fox.com
+DOMAIN-SUFFIX,foxdcg.com
+DOMAIN-SUFFIX,theplatform.com
+DOMAIN-SUFFIX,uplynk.com
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/HBO.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/HBO.list
@@ -0,0 +1,5 @@
+# > HBO NOW
+USER-AGENT,HBO%20NOW*
+DOMAIN-SUFFIX,hbo.com
+DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbonow.com
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/HBO_GO_HKG.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/HBO_GO_HKG.list
@@ -0,0 +1,15 @@
+# > HBO GO HKG
+USER-AGENT,HBO%20GO%20PROD%20HKG*
+DOMAIN-SUFFIX,hbogoasia.com
+DOMAIN-SUFFIX,hbogoasia.hk
+DOMAIN,bcbolthboa-a.akamaihd.net
+DOMAIN,players.brightcove.net
+DOMAIN,s3-ap-southeast-1.amazonaws.com
+DOMAIN,dai3fd1oh325y.cloudfront.net
+DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
+DOMAIN,hboasia1-i.akamaihd.net
+DOMAIN,hboasia2-i.akamaihd.net
+DOMAIN,hboasia3-i.akamaihd.net
+DOMAIN,hboasia4-i.akamaihd.net
+DOMAIN,hboasia5-i.akamaihd.net
+DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
--- 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
@@ -7,6 +7,16 @@ DOMAIN-SUFFIX,nflximg.com
 DOMAIN-SUFFIX,nflximg.net
 DOMAIN-SUFFIX,nflxso.net
 DOMAIN-SUFFIX,nflxvideo.net
+DOMAIN-SUFFIX,netflixdnstest0.com
+DOMAIN-SUFFIX,netflixdnstest1.com
+DOMAIN-SUFFIX,netflixdnstest2.com
+DOMAIN-SUFFIX,netflixdnstest3.com
+DOMAIN-SUFFIX,netflixdnstest4.com
+DOMAIN-SUFFIX,netflixdnstest5.com
+DOMAIN-SUFFIX,netflixdnstest6.com
+DOMAIN-SUFFIX,netflixdnstest7.com
+DOMAIN-SUFFIX,netflixdnstest8.com
+DOMAIN-SUFFIX,netflixdnstest9.com
 IP-CIDR,23.246.0.0/18,no-resolve
 IP-CIDR,37.77.184.0/21,no-resolve
 IP-CIDR,45.57.0.0/17,no-resolve
--- 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
@@ -1,4 +1,5 @@
 # > Twitch
 DOMAIN-SUFFIX,twitch.tv
 DOMAIN-SUFFIX,twitchcdn.net
-DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,jtvnw.net
--- 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
@@ -0,0 +1,5 @@
+# > PayPal
+USER-AGENT,PayPal*
+DOMAIN-KEYWORD,paypal
+DOMAIN-SUFFIX,paypal.com
+DOMAIN-SUFFIX,paypalobjects.com
--- 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
--- 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.7 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
@@ -8253,7 +8251,6 @@ DOMAIN,imgad0.pcauto.com.cn
 DOMAIN,imgad0.pconline.com.cn
 DOMAIN,ivy.pchouse.com.cn
 DOMAIN,adtrack.ucweb.com
-DOMAIN,applogios.uc.cn
 DOMAIN,track.uc.cn
 DOMAIN,alog.umeng.com
 DOMAIN,alogs.umeng.com
@@ -8398,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
@@ -8406,7 +8402,6 @@ DOMAIN-SUFFIX,pubnative.net
 DOMAIN,suggestqueries.google.com
 DOMAIN,www.googleadservices.com
 DOMAIN,www.google-analytics.com
-DOMAIN-SUFFIX,3g.qq.com
 DOMAIN,fusion.qq.com
 DOMAIN,ios.bugly.qq.com
 DOMAIN,wup.imtt.qq.com
@@ -8490,6 +8485,22 @@ DOMAIN-SUFFIX,zbrushcn.com
 DOMAIN-SUFFIX,zhzzx.com
 DOMAIN-SUFFIX,clotfun.mobi
 DOMAIN-SUFFIX,clotfun.online
+DOMAIN-SUFFIX,inmobicdn.net
+DOMAIN-SUFFIX,meetrics.com
+DOMAIN-SUFFIX,meetrics.net
+DOMAIN-SUFFIX,okjhb.xyz
+DOMAIN-SUFFIX,supersonic.com
+DOMAIN-SUFFIX,supersonicads.com
+DOMAIN-SUFFIX,zu08e.cn
+DOMAIN-SUFFIX,ad.daum.net
+DOMAIN-SUFFIX,track.xiachufang.com
+DOMAIN,toots-a.akamaihd.net
+DOMAIN,optimus-ads.amap.com.w.alikunlun.com
+DOMAIN,gorgon.youdao.com
+DOMAIN,yt-adp.ws.126.net
+DOMAIN,pgdt.ugdtimg.com
+DOMAIN,alog.umeng.co
+DOMAIN,adsebs.ximalaya.com
 DOMAIN,ad.360in.com
 DOMAIN,ad.hpplay.cn
 DOMAIN,adeng.hpplay.cn
--- 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.19 Self-use for testing only, there may be a lot of manslaughter.
+#Update 2019.12.13 Self-use for testing only, there may be a lot of manslaughter.
 DOMAIN-SUFFIX,admaster.com
 DOMAIN-SUFFIX,0z5jn.cn
 DOMAIN-SUFFIX,114so.cn
@@ -1144,7 +1144,6 @@ DOMAIN-SUFFIX,api.joybj.com
 DOMAIN-SUFFIX,api.whizzone.com
 DOMAIN-SUFFIX,app.adjust.com
 DOMAIN-SUFFIX,applogapi.autohome.com.cn
-DOMAIN-SUFFIX,applogios.uc.cn
 DOMAIN-SUFFIX,catch.gift
 DOMAIN-SUFFIX,dfp.suning.com
 DOMAIN-SUFFIX,ggs.myzaker.com
@@ -1266,7 +1265,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
@@ -1292,7 +1290,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/base/rules/lhie1/Surge3/Apple.list
+++ b/base/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/base/rules/lhie1/Surge3/AsianTV.list
+++ b/base/rules/lhie1/Surge3/AsianTV.list
@@ -28,13 +28,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/base/rules/lhie1/Surge3/Domestic.list
+++ b/base/rules/lhie1/Surge3/Domestic.list
@@ -1,6 +1,3 @@
-# > Client
-PROCESS-NAME,ss-local
-
 # > UA
 USER-AGENT,hide*
 USER-AGENT,MicroMessenger*
@@ -129,13 +126,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
@@ -298,4 +295,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/base/rules/lhie1/Surge3/GlobalTV.list
+++ b/base/rules/lhie1/Surge3/GlobalTV.list
--- a/base/rules/lhie1/Surge3/Media/AbemaTV.list
+++ b/base/rules/lhie1/Surge3/Media/AbemaTV.list
--- a/base/rules/lhie1/Surge3/Media/Amazon.list
+++ b/base/rules/lhie1/Surge3/Media/Amazon.list
--- a/base/rules/lhie1/Surge3/Media/AppleNews.list
+++ b/base/rules/lhie1/Surge3/Media/AppleNews.list
--- a/rules/lhie1/Surge3/Media/BBC_iPlayer.list
+++ b/rules/lhie1/Surge3/Media/BBC_iPlayer.list
--- a/base/rules/lhie1/Surge3/Media/BBC_iPlayer.list
+++ b/base/rules/lhie1/Surge3/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/base/rules/lhie1/Surge3/Media/Bahamut.list
+++ b/base/rules/lhie1/Surge3/Media/Bahamut.list
--- a/base/rules/lhie1/Surge3/Media/Bilibili.list
+++ b/base/rules/lhie1/Surge3/Media/Bilibili.list
--- a/base/rules/lhie1/Surge3/Media/DisneyPlus.list
+++ b/base/rules/lhie1/Surge3/Media/DisneyPlus.list
--- a/base/rules/lhie1/Surge3/Media/FoxPlus.list
+++ b/base/rules/lhie1/Surge3/Media/FoxPlus.list
--- a/base/rules/lhie1/Surge3/Media/Fox_Now.list
+++ b/base/rules/lhie1/Surge3/Media/Fox_Now.list
--- a/base/rules/lhie1/Surge3/Media/HBO.list
+++ b/base/rules/lhie1/Surge3/Media/HBO.list
--- a/rules/lhie1/Surge3/Media/Hulu_Japan.list
+++ b/rules/lhie1/Surge3/Media/Hulu_Japan.list
--- a/base/rules/lhie1/Surge3/Media/Hulu.list
+++ b/base/rules/lhie1/Surge3/Media/Hulu.list
--- a/base/rules/lhie1/Surge3/Media/Hulu_Japan.list
+++ b/base/rules/lhie1/Surge3/Media/Hulu_Japan.list
@@ -0,0 +1,3 @@
+# > Hulu(フールー)
+DOMAIN-SUFFIX,happyon.jp
+DOMAIN-SUFFIX,hulu.jp
--- a/base/rules/lhie1/Surge3/Media/JOOX.list
+++ b/base/rules/lhie1/Surge3/Media/JOOX.list
--- a/base/rules/lhie1/Surge3/Media/Japonx.list
+++ b/base/rules/lhie1/Surge3/Media/Japonx.list
--- a/base/rules/lhie1/Surge3/Media/KKBOX.list
+++ b/base/rules/lhie1/Surge3/Media/KKBOX.list
--- a/base/rules/lhie1/Surge3/Media/Line_TV.list
+++ b/base/rules/lhie1/Surge3/Media/Line_TV.list
--- a/base/rules/lhie1/Surge3/Media/Netease
+++ b/base/rules/lhie1/Surge3/Media/Netease
@@ -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/base/rules/lhie1/Surge3/Media/Netease_Music.list
+++ b/base/rules/lhie1/Surge3/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/base/rules/lhie1/Surge3/Media/Netflix.list
+++ b/base/rules/lhie1/Surge3/Media/Netflix.list
--- a/base/rules/lhie1/Surge3/Media/PBS.list
+++ b/base/rules/lhie1/Surge3/Media/PBS.list
--- a/base/rules/lhie1/Surge3/Media/Pandora.list
+++ b/base/rules/lhie1/Surge3/Media/Pandora.list
--- a/base/rules/lhie1/Surge3/Media/Spotify.list
+++ b/base/rules/lhie1/Surge3/Media/Spotify.list
--- a/base/rules/lhie1/Surge3/Media/ViuTV.list
+++ b/base/rules/lhie1/Surge3/Media/ViuTV.list
--- a/base/rules/lhie1/Surge3/Media/YouTube
+++ b/base/rules/lhie1/Surge3/Media/YouTube
@@ -0,0 +1,3 @@
+# > Youtube_Music
+USER-AGENT,*YouTubeMusic*
+USER-AGENT,*com.google.ios.youtubemusic*
--- a/base/rules/lhie1/Surge3/Media/YouTube.list
+++ b/base/rules/lhie1/Surge3/Media/YouTube.list
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
Tindy X	9756258041	Bump version to v0.1.0	2019-12-12 18:04:10 +08:00
Tindy X	5a9e3d6002	Add Surge external proxy provider support for ShadowsocksR	2019-12-12 18:03:41 +08:00
Tindy X	90f449953e	Add missing sort flag controller	2019-12-11 13:27:04 +08:00
Tindy X	4270a5f85d	Bump version to v0.0.7	2019-12-11 01:23:08 +08:00
Tindy X	63899e703f	Fix typo	2019-12-10 00:45:59 +08:00
Tindy X	1039d44259	Bug fixes Fix incorrect URL Enocde process. Fix Emoji switch in URL argument. Remove module detection for importing Surge 2 subscription. Add timestamp in debug info.	2019-12-08 22:22:33 +08:00
RedEnvelopes	923318b13d	Merge pull request #18 from RedEnvelopes/master Update README and Emoji rules	2019-12-07 06:33:31 -06:00
Tindy X	0219fea0ac	Fix compatibility issue for converting Surge rulesets to Clash rules	2019-12-07 20:31:37 +08:00
Tindy X	6a90348a0a	Enhancements Fix incompatible rule in Clash configurations. Add sort by remarks. Optimize codes.	2019-12-07 13:59:31 +08:00
Tindy X	4d633f9fcf	Fix incorrect generation of Quantumult subscriptions	2019-12-06 21:44:48 +08:00
Tindy X	df909bdb60	Fix Shadowsocks Plugin missing when parsing Clash configuration	2019-12-06 10:11:27 +08:00
Tindy X	c404a898c2	Fix program crash when parsing a long URI list	2019-12-04 21:59:10 +08:00
Tindy X	6079487fde	Enhancements Add validation of exclude/include values passed from URI argument. Update pref.ini.	2019-12-03 22:00:00 +08:00
Tindy X	4057d7e216	Bug fixes Fix compile error on MacOS. Speed up generation of Clash configuration.	2019-12-03 21:36:49 +08:00
Tindy X	1052fb3194	Update local rulesets	2019-12-03 20:59:11 +08:00
Tindy X	7804cc4a05	Bug fixes Add custom proxy groups and rulesets with URI arguments. Fix when running Linux version, if a request URI is too long, the program will crash. Optimize codes. Update LAN ruleset.	2019-12-03 20:54:40 +08:00
Tindy X	db0a8e52cf	Update local rulesets	2019-12-01 18:22:56 +08:00
Tindy X	d8908f4dce	Enhancements Fix broken LAN list. Add support for "no-resolve"/"force-remote-dns" in exporting Clash subscriptions. Optimize codes.	2019-12-01 18:13:16 +08:00
Tindy X	cd02165a0c	Merge pull request #13 from LM-Firefly/patch-1 Update LocalAreaNetwork.list	2019-11-30 01:51:13 -06:00
LM-Firefly	7091543768	Update LocalAreaNetwork.list	2019-11-30 13:31:58 +08:00
Tindy X	c175740809	Merge pull request #12 from TTTPOB/master Added ipv6 LAN address to LocalAreaNetwork.list	2019-11-29 22:32:11 -06:00
TPOB	b65f0368f4	Added ipv6 LAN address to LocalAreaNetwork.list	2019-11-30 12:18:36 +08:00
Tindy X	3dc5943e82	Enhancements Add include/exclude options for subscriptions. Clean up useless codes.	2019-11-29 12:58:29 +08:00
Tindy X	cb1f288aee	Update rulesets and default Clash configuration base	2019-11-28 00:45:51 +08:00
Tindy X	5de1e06ebc	Enhancements Add UDP, TCP Fast Open options for exporting Surge and Quantumult X subscriptions. Add UDP option for exporting Clash subscriptions. Add HTTP proxy detection for Clash and Surge subscriptions.	2019-11-27 23:02:31 +08:00
Tindy X	f31508c72c	Fix incorrect generation of Surge 4 VMess configurations.	2019-11-25 23:01:30 +08:00
Tindy X	81dfeac556	Enhancements Fix program crash when broken JSON data (VMess links or configuration files) was passed. Fix a potential subscription parsing error. Add "-cfw" argument. Update build scripts. INIReader: Tweak output indentation.	2019-11-25 18:28:50 +08:00
Tindy X	fefce5ba61	Bug fixes Fix issue [#8](https://github.com/tindy2013/subconverter/issues/8). Update build scripts.	2019-11-24 10:49:11 +08:00