Optimize codes

Add double condition for node filtering in group generator.
Optimize codes.

.travis.yml

@@ -11,8 +11,7 @@ matrix:
       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"
@@ -24,7 +23,7 @@ matrix:
     - 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"

CMakeLists.txt

@@ -0,0 +1,80 @@
+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)
+
+IF(MACOS)
+	ADD_DEFINITIONS(-D_MACOS)
+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()

README-cn.md

@@ -112,13 +112,14 @@ url encode后: <br>
 
 #### default_url
 
-> 无url参数时默认链接. 如果有多个链接, 使用 "|" 分隔, 支持`文件`/`url`.
+> 无url参数时默认链接,不需要encode. 如果有多个链接, 使用 "|" 分隔, 支持`文件`/`url`.
 
-这种用法:
+e.g.
 ```ini
 default_url=https://dler.cloud/subscribe/ABCDE?clash=vmess
 ```
 
+此时订阅
 `http://127.0.0.1:25500/clash`
 
 相当于:
@@ -174,6 +175,12 @@ clash_rule_base=https://raw.githubusercontent.com/ConnersHua/Profiles/master/Cla
 
 
 
+#### mellow_rule_base
+
+> 生成的mellow配置文件基础. 用法同上.
+
+
+
 #### rename_node
 
 > 重命名节点, 支持正则.
@@ -194,7 +201,7 @@ rename_node=深圳@深
 
 ### emojis
 
-> 添加识别到的第一个国家国旗在节点名称前, 支持正则.
+> 在匹配到的节点前添加自定义emojis, 支持正则.
 
 e.g.
 ```ini
@@ -205,19 +212,30 @@ rule=(美|美国|United States),🇺🇸
 
 
 ### ruleset
+> 如果你对原本订阅自带的规则不满意可以使用如下配置
 
-> 规则片段.
+> 启用自定义规则集
+`enabled=true`
+> 覆盖原有规则
+`overwrite_original_rules=true`
+> 当其他程序更新订阅时更新规则集
+`update_ruleset_on_request=false`
+
+> 从本地或url获取规则片段.
+> []前缀后的文字将被当作规则而不是链接或路径
 
 e.g.
 <img src="./doc/imgs/Snipaste_2019-11-18_14-11-52.png">
 
 ```ini
-ruleset=🌹 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Media/YouTube.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
+surge_ruleset=🎯 全球直连,rules/NobyDa/Surge/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
 ```
 
 效果图:
 
-<img src="./doc/imgs/Snipaste_2019-11-18_14-15-54.png">
+<img src="./doc/imgs/ruleset.png">
 
 
 
@@ -229,6 +247,8 @@ e.g.
 ```ini
 custom_proxy_group=🇺🇸US`url-test`(美|美国|United States)`http://www.gstatic.com/generate_204`300
 ```
+表示创建一个叫 usUS的url-test策略组,并向其中添加名字包含'美','美国','United States'的节点~每隔300秒测试一次~(目前硬编码固定为300)
+
 
 效果图:
 
@@ -249,11 +269,12 @@ custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
 #### listen
 
 > 绑定到Web服务器的地址, 将地址设为0.0.0.0, 则局域网内设备均可使用.
+`listen=0.0.0.0`
 
 #### port
 
 > 绑定到Web服务器地址的端口.
-
+`port=25500`
 
 ### advanced
 
@@ -265,4 +286,4 @@ custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
 
 > 自动上传gist.
 
-在[gistconf.ini](./gistconf.ini)中添加personal access token, 在链接后加上`upload=true`就会在更新好后自动上传gist.
+在[gistconf.ini](./gistconf.ini)中添加personal access token, 在链接后加上`upload=true`就会在更新好后自动上传gist.

base/pref.ini

@@ -2,6 +2,9 @@
 ;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=
 
@@ -86,6 +89,11 @@ 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
+
 [managed_config]
 ;Append a '#!MANAGED-CONFIG' info to Surge configurations
 write_managed_config=true
@@ -110,7 +118,6 @@ rule=(澳大利亚|悉尼),🇦🇺
 rule=(巴西|圣保罗),🇧🇷
 rule=(加拿大|蒙特利尔|温哥华),🇨🇦
 rule=(瑞士|苏黎世),🇨🇭
-rule=(中国|江苏|北京|上海|广州|深圳|杭州|徐州|青岛|宁波|镇江),🇨🇳
 rule=(德|德国|法兰克福),🇩🇪
 rule=(芬兰|赫尔辛基),🇫🇮
 rule=(法国|巴黎),🇫🇷
@@ -136,6 +143,7 @@ rule=(台|台湾|台北|台中|新北|彰化),🇹🇼
 rule=(美|美国|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|沪美),🇺🇲
 rule=越南,🇻🇳
 rule=南非,🇿🇦
+rule=(中国|江苏|北京|上海|广州|深圳|杭州|徐州|青岛|宁波|镇江),🇨🇳
 
 [ruleset]
 ;Enable generating rules with rulesets
@@ -171,7 +179,7 @@ surge_ruleset=🛑 全球拦截,rules/NobyDa/Surge/AdRule.list
 surge_ruleset=🛑 全球拦截,rules/ConnersHua/Surge/Ruleset/Hijacking.list
 ;surge_ruleset=🎥 NETFLIX,rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
 surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🌏 国内媒体,rules/lhie1/Surge3/Domestic.list
+surge_ruleset=🌏 国内媒体,rules/lhie1/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
@@ -194,6 +202,9 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;custom_proxy_group=g2`select`!!GROUPID=1
 ;custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
 
+;custom_proxy_group=g1hk`select`!!GROUPID=0!!(HGC|HKBN|PCCW|HKT|hk|港)
+;custom_proxy_group=sstw`select`!!GROUP=V2RayProvider!!(深台|彰化|新北|台|tw)
+
 ;for forcerule.yml
 ;custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
 ;custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
@@ -216,7 +227,7 @@ custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/genera
 ;custom_proxy_group=🎥 NETFLIX`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 ;custom_proxy_group=⛔️ 广告拦截`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
 ;custom_proxy_group=🚫 运营劫持`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
-custom_proxy_group=🌍 国外媒体`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🌍 国外媒体`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
 custom_proxy_group=📲 电报信息`select`[]🔰 节点选择`.*`[]🎯 全球直连
 custom_proxy_group=🍎 苹果服务`select`[]🔰 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*

base/rules/ConnersHua/Surge/Ruleset/Advertising.list

@@ -450,7 +450,7 @@ URL-REGEX,^https?:\/\/guide-acs\.m\.taobao\.com\/gw\/mtop\.taobao\.wireless\.hom
 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?:\/\/.+\.mp4\?sid=
 URL-REGEX,^https?:\/\/vali\.cp31\.ott\.cibntv\.net\/youku\/.+\.mp4\?sid=
 # > AcFun
 URL-REGEX,^https?:\/\/aes\.acfun\.cn\/s\?adzones
@@ -551,18 +551,15 @@ 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\/
+# > 凤凰秀
+URL-REGEX,^https?:\/\/dsa-mfp\.fengshows\.cn\/mfp\/mfpMultipleDelivery\.do\?.+adunitid
 
 # G
 # > Google
 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
 # > 国泰君安
@@ -575,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\/
 # > 火猫
@@ -732,6 +730,8 @@ URL-REGEX,^https?:\/\/img01\.10101111cdn\.com\/adpos\/
 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
 # > 腾讯
@@ -751,6 +751,8 @@ URL-REGEX,^https?:\/\/vv\.video\.qq\.com\/getvmind\?
 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)
+# >> 腾讯体育
+URL-REGEX,^https?:\/\/news\.ssp\.qq\.com\/app
 # >> 微信
 URL-REGEX,^https?:\/\/mp\.weixin\.qq\.com\/mp\/(ad_|advertisement|getappmsgad)
 # > 澎湃新闻
@@ -830,7 +832,8 @@ 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\/
 
@@ -853,6 +856,8 @@ 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
 # > 直播吧
@@ -876,7 +881,7 @@ URL-REGEX,^https?:\/\/www\.zybang\.com\/adx\/
 URL-REGEX,^https?:\/\/api\.izuiyou\.com\/ad\/
 # > 字节跳动
 URL-REGEX,^https?:\/\/.+\.pstatp\.com\/img\/ad
-URL-REGEX,^https?:\/\/.+\.(musical|snssdk|tiktokv)\.(com|ly)\/(api|motor)\/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\/
@@ -897,6 +902,8 @@ 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\/

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

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

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

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

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

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

base/rules/NobyDa/Surge/AdRule.list

@@ -1,4 +1,4 @@
-# Update > 2019.11.25 Go advertising rule Integration lhie1 and shenji
+# Update > 2019.12.13 Go advertising rule Integration lhie1 and shenji
 DOMAIN-SUFFIX,idealads.net
 DOMAIN-SUFFIX,ironsrc.com
 DOMAIN-SUFFIX,apoll.m.taobao.com
@@ -7977,7 +7977,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

base/rules/NobyDa/Surge/AdRuleTest.list

@@ -1,4 +1,4 @@
-#Update 2019.11.21 Self-use for testing only, there may be a lot of manslaughter.
+#Update 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
@@ -1265,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

base/rules/lhie1/Surge3/Domestic.list

@@ -136,6 +136,7 @@ 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 +299,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

base/rules/lhie1/Surge3/Proxy.list

@@ -50,6 +50,9 @@ DOMAIN-SUFFIX,steamcommunity.com
 DOMAIN-SUFFIX,steampowered.com
 DOMAIN-SUFFIX,steamstatic.com
 
+# > Zooba
+USER-AGENT,battleroyale*
+
 # > Top blocked sites
 DOMAIN-SUFFIX,2o7.net
 DOMAIN-SUFFIX,4everProxy.com
@@ -157,8 +160,8 @@ DOMAIN-SUFFIX,cnn.com
 DOMAIN-SUFFIX,cocoapods.org
 DOMAIN-SUFFIX,comodoca.com
 DOMAIN-SUFFIX,content.office.net
-DOMAIN-SUFFIX,culturedcode.com 
-DOMAIN-SUFFIX,cygames.jp 
+DOMAIN-SUFFIX,culturedcode.com
+DOMAIN-SUFFIX,cygames.jp
 DOMAIN-SUFFIX,d.pr
 DOMAIN-SUFFIX,danilo.to
 DOMAIN-SUFFIX,daolan.net
@@ -264,7 +267,7 @@ DOMAIN-SUFFIX,imageshack.us
 DOMAIN-SUFFIX,img.ly
 DOMAIN-SUFFIX,imgur.com
 DOMAIN-SUFFIX,imore.com
-DOMAIN-SUFFIX,ingress.com 
+DOMAIN-SUFFIX,ingress.com
 DOMAIN-SUFFIX,insder.co
 DOMAIN-SUFFIX,instapaper.com
 DOMAIN-SUFFIX,instructables.com
@@ -690,7 +693,6 @@ DOMAIN-SUFFIX,webrtc.org
 DOMAIN-SUFFIX,v2ex.com
 
 DOMAIN-KEYWORD,dlercloud
-DOMAIN-SUFFIX,dler.cloud
 
 # > Amazon
 IP-CIDR,13.32.0.0/16,no-resolve
@@ -771,4 +773,4 @@ IP-CIDR,91.108.4.0/22,no-resolve
 IP-CIDR,91.108.8.0/22,no-resolve
 IP-CIDR,91.108.56.0/22,no-resolve
 IP-CIDR,149.154.160.0/20,no-resolve
-IP-CIDR,149.154.164.0/22,no-resolve
+IP-CIDR,149.154.164.0/22,no-resolve

base/rules/lhie1/Surge3/Reject.list

@@ -292,7 +292,6 @@ DOMAIN-KEYWORD,googleads
 DOMAIN-KEYWORD,guanggao
 DOMAIN-KEYWORD,inmobi
 DOMAIN-KEYWORD,lianmeng
-DOMAIN-KEYWORD,logger
 DOMAIN-KEYWORD,mobaders
 DOMAIN-KEYWORD,omgmta
 DOMAIN-KEYWORD,omniture
@@ -8312,7 +8311,6 @@ URL-REGEX,https?://\w+.beacon.qq.com
 URL-REGEX,https?://\w+.cloudfront.net/banner
 URL-REGEX,https?://\w+.gdt.qq.com
 URL-REGEX,https?://\w+.kingsoft-office-service.com
-URL-REGEX,https?://\w+.l.qq.com
 URL-REGEX,https?://9377\w{2}.com
 URL-REGEX,https?://a0b\w{2}.com
 URL-REGEX,https?://(a?d|sax)\d.sina.com