diff --git a/Auto/PROXY.conf b/Auto/PROXY.conf index 62627b1..19a3d06 100644 --- a/Auto/PROXY.conf +++ b/Auto/PROXY.conf @@ -431,7 +431,6 @@ DOMAIN-SUFFIX,kik.com,πŸƒ Proxy DOMAIN-SUFFIX,klip.me,πŸƒ Proxy DOMAIN-SUFFIX,leancloud.com,πŸƒ Proxy DOMAIN-SUFFIX,leetcode.com,πŸƒ Proxy -DOMAIN-SUFFIX,lhie1.com,πŸƒ Proxy DOMAIN-SUFFIX,libsyn.com,πŸƒ Proxy DOMAIN-SUFFIX,licdn.com,πŸƒ Proxy DOMAIN-SUFFIX,lightboxcdn.com,πŸƒ Proxy diff --git a/Clash/Provider/Media/HBO Max.yaml b/Clash/Provider/Media/HBO Max.yaml index 020d2d2..110a535 100644 --- a/Clash/Provider/Media/HBO Max.yaml +++ b/Clash/Provider/Media/HBO Max.yaml @@ -1,13 +1,9 @@ payload: -# > HBO GO Asia - # - USER-AGENT,HBO%20GO%20PROD* - # - DOMAIN-KEYWORD,hboasia - - DOMAIN-KEYWORD,hbogoasia - - DOMAIN-SUFFIX,hboasia.com - - DOMAIN-SUFFIX,hbogoasia.com - - DOMAIN,hbolb.onwardsmg.com - - DOMAIN,hbounify-prod.evergent.com - # - DOMAIN,bcbolthboa-a.akamaihd.net - - DOMAIN,dai3fd1oh325y.cloudfront.net - # - DOMAIN,hboasialive.akamaized.net - # - DOMAIN,hbogoprod-vod.akamaized.net \ No newline at end of file + # > HBO Max + # - USER-AGENT,HBOMAX* + - DOMAIN-SUFFIX,hbo.com + # - DOMAIN-SUFFIX,hbogo.com + - DOMAIN-SUFFIX,hbonow.com + - DOMAIN-SUFFIX,hbomax.com + - DOMAIN-SUFFIX,hbomaxcdn.com + - DOMAIN,execute-api.ap-southeast-1.amazonaws.com \ No newline at end of file diff --git a/Clash/Provider/Proxy.yaml b/Clash/Provider/Proxy.yaml index 4163904..0d0e179 100644 --- a/Clash/Provider/Proxy.yaml +++ b/Clash/Provider/Proxy.yaml @@ -247,6 +247,7 @@ payload: - DOMAIN-SUFFIX,img.ly - DOMAIN-SUFFIX,imgur.com - DOMAIN-SUFFIX,imore.com + - DOMAIN-SUFFIX,imtoken.fans - DOMAIN-SUFFIX,ingress.com - DOMAIN-SUFFIX,inoreader.com - DOMAIN-SUFFIX,insder.co @@ -277,7 +278,6 @@ payload: - DOMAIN-SUFFIX,klip.me - DOMAIN-SUFFIX,leancloud.com - DOMAIN-SUFFIX,leetcode.com - - DOMAIN-SUFFIX,lhie1.com - DOMAIN-SUFFIX,libsyn.com - DOMAIN-SUFFIX,licdn.com - DOMAIN-SUFFIX,lightboxcdn.com diff --git a/Clash/Provider/Special.yaml b/Clash/Provider/Special.yaml index 55a1068..b8cf051 100644 --- a/Clash/Provider/Special.yaml +++ b/Clash/Provider/Special.yaml @@ -43,7 +43,7 @@ payload: # > Steam # - USER-AGENT,Steam* - DOMAIN-SUFFIX,steamcontent.com - - DOMAIN-SUFFIX,steampowered.com + # - DOMAIN,store.steampowered.com - DOMAIN-SUFFIX,steamchina.com diff --git a/Clash/Provider/Speedtest.yaml b/Clash/Provider/Speedtest.yaml index a0d78b1..cc720e5 100644 --- a/Clash/Provider/Speedtest.yaml +++ b/Clash/Provider/Speedtest.yaml @@ -6,6 +6,7 @@ payload: # - USER-AGENT,SpeedTest* - DOMAIN-KEYWORD,speedtest - DOMAIN-SUFFIX,ooklaserver.net + - DOMAIN,speed.dler.io # > Speed Test by Cloudflare - DOMAIN-SUFFIX,speed.cloudflare.com diff --git a/Clash/Provider/Steam.yaml b/Clash/Provider/Steam.yaml index b4ec2dc..e467ecd 100644 --- a/Clash/Provider/Steam.yaml +++ b/Clash/Provider/Steam.yaml @@ -6,7 +6,7 @@ payload: - DOMAIN-SUFFIX,s.team - DOMAIN-SUFFIX,steam-chat.com - DOMAIN-SUFFIX,steamcommunity.com - - DOMAIN-SUFFIX,steamcontent.com + - DOMAIN-SUFFIX,steampowered.com - DOMAIN-SUFFIX,steamgames.com - DOMAIN-SUFFIX,steamstatic.com - DOMAIN-SUFFIX,steamusercontent.com diff --git a/Clash/Rule.yaml b/Clash/Rule.yaml index 0d49322..95d3b9c 100644 --- a/Clash/Rule.yaml +++ b/Clash/Rule.yaml @@ -12,7 +12,6 @@ - RULE-SET,Bilibili,Asian TV - RULE-SET,IQ,Asian TV - RULE-SET,IQIYI,Asian TV -- RULE-SET,HBO Go,Asian TV - RULE-SET,Letv,Asian TV # - RULE-SET,MOO,Asian TV - RULE-SET,Netease Music,Asian TV @@ -32,6 +31,7 @@ - RULE-SET,encoreTVB,Global TV - RULE-SET,Fox Now,Global TV - RULE-SET,Fox+,Global TV +- RULE-SET,HBO Go,Global TV - RULE-SET,HBO Max,Global TV - RULE-SET,Hulu Japan,Global TV - RULE-SET,Hulu,Global TV @@ -80,7 +80,6 @@ script: "Bilibili": "Asian TV", "IQ": "Asian TV", "IQIYI": "Asian TV", - "HBO Go": "Asian TV", "Letv": "Asian TV", "Netease Music": "Asian TV", "Tencent Video": "Asian TV", @@ -98,6 +97,7 @@ script: "encoreTVB": "Global TV", "Fox Now": "Global TV", "Fox+": "Global TV", + "HBO Go": "Global TV", "HBO Max": "Global TV", "Hulu Japan": "Global TV", "Hulu": "Global TV", @@ -211,12 +211,6 @@ rule-providers: url: 'https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/IQIYI.yaml' path: ./Rules/Media/IQYI interval: 86400 - HBO Go: - type: http - behavior: classical - url: 'https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/HBO%20Go.yaml' - path: ./Rules/Media/HBO_Go - interval: 86400 Letv: type: http behavior: classical @@ -331,6 +325,12 @@ rule-providers: url: 'https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/Fox%2B.yaml' path: ./Rules/Media/Fox+ interval: 86400 + HBO Go: + type: http + behavior: classical + url: 'https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/HBO%20Go.yaml' + path: ./Rules/Media/HBO_Go + interval: 86400 HBO Max: type: http behavior: classical diff --git a/Surfboard/Rule.conf b/Surfboard/Rule.conf index e3662f5..b3eaf03 100644 --- a/Surfboard/Rule.conf +++ b/Surfboard/Rule.conf @@ -9193,7 +9193,6 @@ DOMAIN-SUFFIX,kik.com,Proxy DOMAIN-SUFFIX,klip.me,Proxy DOMAIN-SUFFIX,leancloud.com,Proxy DOMAIN-SUFFIX,leetcode.com,Proxy -DOMAIN-SUFFIX,lhie1.com,Proxy DOMAIN-SUFFIX,libsyn.com,Proxy DOMAIN-SUFFIX,licdn.com,Proxy DOMAIN-SUFFIX,lightboxcdn.com,Proxy diff --git a/Surge/Surge 2/Rule.conf b/Surge/Surge 2/Rule.conf index 110cad2..ad548e5 100644 --- a/Surge/Surge 2/Rule.conf +++ b/Surge/Surge 2/Rule.conf @@ -8384,7 +8384,6 @@ PROCESS-NAME,ss-local,DIRECT,DIRECT # > Steam USER-AGENT,Steam*,DIRECT -DOMAIN-SUFFIX,steamcontent.com,DIRECT DOMAIN-SUFFIX,steampowered.com,DIRECT DOMAIN-SUFFIX,steamchina.com,DIRECT @@ -8986,6 +8985,7 @@ DOMAIN-SUFFIX,fast.com,Speedtest USER-AGENT,SpeedTest*,Speedtest DOMAIN-KEYWORD,speedtest,Speedtest DOMAIN-SUFFIX,ooklaserver.net,Speedtest +DOMAIN,speed.dler.io,Speedtest # > Speed Test by Cloudflare DOMAIN-SUFFIX,speed.cloudflare.com,Speedtest @@ -9059,6 +9059,7 @@ DOMAIN-SUFFIX,playartifact.com,Steam DOMAIN-SUFFIX,s.team,Steam DOMAIN-SUFFIX,steam-chat.com,Steam DOMAIN-SUFFIX,steamcommunity.com,Steam +DOMAIN-SUFFIX,steamcontent.com,Steam DOMAIN-SUFFIX,steamgames.com,Steam DOMAIN-SUFFIX,steamstatic.com,Steam DOMAIN-SUFFIX,steamusercontent.com,Steam @@ -9320,7 +9321,6 @@ DOMAIN-SUFFIX,kik.com,Proxy DOMAIN-SUFFIX,klip.me,Proxy DOMAIN-SUFFIX,leancloud.com,Proxy DOMAIN-SUFFIX,leetcode.com,Proxy -DOMAIN-SUFFIX,lhie1.com,Proxy DOMAIN-SUFFIX,libsyn.com,Proxy DOMAIN-SUFFIX,licdn.com,Proxy DOMAIN-SUFFIX,lightboxcdn.com,Proxy diff --git a/Surge/Surge 3/Head.conf b/Surge/Surge 3/Head.conf index 5acee8d..a429322 100644 --- a/Surge/Surge 3/Head.conf +++ b/Surge/Surge 3/Head.conf @@ -17,7 +17,7 @@ wifi-access-socks5-port = 8889 external-controller-access = lhie1@0.0.0.0:6170 internet-test-url = http://wifi.vivo.com.cn/generate_204 -proxy-test-url = http://cp.cloudflare.com/generate_204 +proxy-test-url = http://www.google.com/generate_204 test-timeout = 5 allow-wifi-access = true @@ -31,6 +31,6 @@ use-default-policy-if-wifi-not-primary = false [Replica] hide-apple-request = true -hide-crashlytics-request = true +hide-crash-reporter-request = true hide-udp = false keyword-filter-type = false diff --git a/Surge/Surge 3/Head_v6.conf b/Surge/Surge 3/Head_v6.conf index fd33f6b..5e45d4e 100644 --- a/Surge/Surge 3/Head_v6.conf +++ b/Surge/Surge 3/Head_v6.conf @@ -17,7 +17,7 @@ wifi-access-socks5-port = 8889 external-controller-access = lhie1@0.0.0.0:6170 internet-test-url = http://wifi.vivo.com.cn/generate_204 -proxy-test-url = http://cp.cloudflare.com/generate_204 +proxy-test-url = http://www.google.com/generate_204 test-timeout = 5 allow-wifi-access = true @@ -31,6 +31,6 @@ use-default-policy-if-wifi-not-primary = false [Replica] hide-apple-request = true -hide-crashlytics-request = true +hide-crash-reporter-request = true hide-udp = false keyword-filter-type = false diff --git a/Surge/Surge 3/Module/All_Capture.sgmodule b/Surge/Surge 3/Module/All_Capture.sgmodule index 7c87676..03bfaa2 100644 --- a/Surge/Surge 3/Module/All_Capture.sgmodule +++ b/Surge/Surge 3/Module/All_Capture.sgmodule @@ -1,5 +1,5 @@ -#!name=All Capture -#!desc=Capture the request body and save permanently. +#!name=MitM All Hostnames +#!desc=Perform MitM on all hostnames with port 443, except those to Apple and other common sites which canβ€˜t be inspected. [MITM] -hostname = * \ No newline at end of file +hostname = -*.apple.com, -*.icloud.com, -*.mzstatic.com, -*.crashlytics.com, -*.facebook.com, -*.instagram.com, * \ No newline at end of file diff --git a/Surge/Surge 3/Module/Netflix ratings.sgmodule b/Surge/Surge 3/Module/Netflix_Ratings.sgmodule similarity index 100% rename from Surge/Surge 3/Module/Netflix ratings.sgmodule rename to Surge/Surge 3/Module/Netflix_Ratings.sgmodule diff --git a/Surge/Surge 3/Module/Network_Framework.sgmodule b/Surge/Surge 3/Module/Network_Framework.sgmodule new file mode 100644 index 0000000..dfb3b67 --- /dev/null +++ b/Surge/Surge 3/Module/Network_Framework.sgmodule @@ -0,0 +1,5 @@ +#!name=Network framework +#!desc=Uses Network.framework to utilize userspace network stack, whicl scan improve throughput, reduce latency and enable cutting edge features such as Multipath TCP. (Manual restart is required) Experimental features may be unstable, and may even cause the system to become frozen. + +[General] +network-framework = true diff --git a/Surge/Surge 3/Module/TikTokUnlock.sgmodule b/Surge/Surge 3/Module/TikTok_Unlock.sgmodule similarity index 100% rename from Surge/Surge 3/Module/TikTokUnlock.sgmodule rename to Surge/Surge 3/Module/TikTok_Unlock.sgmodule diff --git a/Surge/Surge 3/Provider/Media/HBO Max.list b/Surge/Surge 3/Provider/Media/HBO Max.list index b5c3725..e3ce76d 100755 --- a/Surge/Surge 3/Provider/Media/HBO Max.list +++ b/Surge/Surge 3/Provider/Media/HBO Max.list @@ -4,4 +4,5 @@ DOMAIN-SUFFIX,hbo.com // DOMAIN-SUFFIX,hbogo.com DOMAIN-SUFFIX,hbonow.com DOMAIN-SUFFIX,hbomax.com -DOMAIN-SUFFIX,hbomaxcdn.com \ No newline at end of file +DOMAIN-SUFFIX,hbomaxcdn.com +DOMAIN,execute-api.ap-southeast-1.amazonaws.com \ No newline at end of file diff --git a/Surge/Surge 3/Provider/Proxy.list b/Surge/Surge 3/Provider/Proxy.list index a33bb2e..7da69c2 100644 --- a/Surge/Surge 3/Provider/Proxy.list +++ b/Surge/Surge 3/Provider/Proxy.list @@ -249,6 +249,7 @@ DOMAIN-SUFFIX,imageshack.us DOMAIN-SUFFIX,img.ly DOMAIN-SUFFIX,imgur.com DOMAIN-SUFFIX,imore.com +DOMAIN-SUFFIX,imtoken.fans DOMAIN-SUFFIX,ingress.com DOMAIN-SUFFIX,inoreader.com DOMAIN-SUFFIX,insder.co @@ -279,7 +280,6 @@ DOMAIN-SUFFIX,kik.com DOMAIN-SUFFIX,klip.me DOMAIN-SUFFIX,leancloud.com DOMAIN-SUFFIX,leetcode.com -DOMAIN-SUFFIX,lhie1.com DOMAIN-SUFFIX,libsyn.com DOMAIN-SUFFIX,licdn.com DOMAIN-SUFFIX,lightboxcdn.com diff --git a/Surge/Surge 3/Provider/Special.list b/Surge/Surge 3/Provider/Special.list index d397eeb..7341a7f 100644 --- a/Surge/Surge 3/Provider/Special.list +++ b/Surge/Surge 3/Provider/Special.list @@ -48,7 +48,7 @@ PROCESS-NAME,ss-local # > Steam USER-AGENT,Steam* DOMAIN-SUFFIX,steamcontent.com -DOMAIN-SUFFIX,steampowered.com +// DOMAIN,store.steampowered.com DOMAIN-SUFFIX,steamchina.com diff --git a/Surge/Surge 3/Provider/Speedtest.list b/Surge/Surge 3/Provider/Speedtest.list index 8931df7..3020295 100644 --- a/Surge/Surge 3/Provider/Speedtest.list +++ b/Surge/Surge 3/Provider/Speedtest.list @@ -5,6 +5,7 @@ DOMAIN-SUFFIX,fast.com USER-AGENT,SpeedTest* DOMAIN-KEYWORD,speedtest DOMAIN-SUFFIX,ooklaserver.net +DOMAIN,speed.dler.io # > Speed Test by Cloudflare DOMAIN-SUFFIX,speed.cloudflare.com \ No newline at end of file diff --git a/Surge/Surge 3/Provider/Steam.list b/Surge/Surge 3/Provider/Steam.list index 2845bb0..2e57888 100644 --- a/Surge/Surge 3/Provider/Steam.list +++ b/Surge/Surge 3/Provider/Steam.list @@ -4,8 +4,9 @@ DOMAIN-SUFFIX,humblebundle.com DOMAIN-SUFFIX,playartifact.com DOMAIN-SUFFIX,s.team DOMAIN-SUFFIX,steam-chat.com -DOMAIN-SUFFIX,steamcommunity.com DOMAIN-SUFFIX,steamgames.com +DOMAIN-SUFFIX,steamcommunity.com +DOMAIN-SUFFIX,steampowered.com DOMAIN-SUFFIX,steamstatic.com DOMAIN-SUFFIX,steamusercontent.com DOMAIN-SUFFIX,underlords.com diff --git a/Surge/Surge 3/Rule.conf b/Surge/Surge 3/Rule.conf index 16fd771..8fb205f 100644 --- a/Surge/Surge 3/Rule.conf +++ b/Surge/Surge 3/Rule.conf @@ -11,7 +11,6 @@ RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Bilibili.list,Asian TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/IQ.list,Asian TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/IQIYI.list,Asian TV -RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/HBO%20Go.list,Asian TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Letv.list,Asian TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/MOO.list,Asian TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Netease%20Music.list,Asian TV @@ -31,6 +30,7 @@ RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/encoreTVB.list,Global TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Fox%20Now.list,Global TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Fox%2B.list,Global TV +RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/HBO%20Go.list,Global TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/HBO%20Max.list,Global TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Hulu%20Japan.list,Global TV RULE-SET,https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Surge/Surge%203/Provider/Media/Hulu.list,Global TV diff --git a/Surge/Surge 4/Head.conf b/Surge/Surge 4/Head.conf new file mode 100644 index 0000000..650bebb --- /dev/null +++ b/Surge/Surge 4/Head.conf @@ -0,0 +1,38 @@ +[General] +loglevel = notify + +dns-server = system, 119.29.29.29, 223.5.5.5, 223.6.6.6 +skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local, *.crashlytics.com, *.edu.cn, *.evernote.com, *.yinxiang.com +tun-excluded-routes = 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12 +tun-included-routes = 192.168.1.12/32 + +always-real-ip = *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com +hijack-dns = 8.8.8.8:53, 8.8.4.4:53 + +http-listen = 0.0.0.0:8888 +socks5-listen = 0.0.0.0:8889 +wifi-access-http-port = 8888 +wifi-access-socks5-port = 8889 + +external-controller-access = lhie1@0.0.0.0:6170 +http-api = lhie1@0.0.0.0:6171 +http-api-web-dashboard = true + +internet-test-url = http://wifi.vivo.com.cn/generate_204 +proxy-test-url = http://www.google.com/generate_204 +test-timeout = 5 + +allow-wifi-access = true +exclude-simple-hostnames = true +ipv6 = false +network-framework = false +show-error-page-for-reject = true +tls-provider = default +use-default-policy-if-wifi-not-primary = false +// wifi-assist = true + +[Replica] +hide-apple-request = true +hide-crash-reporter-request = true +hide-udp = false +keyword-filter-type = false diff --git a/Surge/Surge 4/Head_v6.conf b/Surge/Surge 4/Head_v6.conf new file mode 100644 index 0000000..451a76b --- /dev/null +++ b/Surge/Surge 4/Head_v6.conf @@ -0,0 +1,38 @@ +[General] +loglevel = notify + +dns-server = system, 119.29.29.29, 223.5.5.5, 223.6.6.6 +skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local, *.crashlytics.com, *.edu.cn, *.evernote.com, *.yinxiang.com +tun-excluded-routes = 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12 +tun-included-routes = 192.168.1.12/32 + +always-real-ip = *.srv.nintendo.net, *.stun.playstation.net, xbox.*.microsoft.com, *.xboxlive.com +hijack-dns = 8.8.8.8:53, 8.8.4.4:53 + +http-listen = 0.0.0.0:8888 +socks5-listen = 0.0.0.0:8889 +wifi-access-http-port = 8888 +wifi-access-socks5-port = 8889 + +external-controller-access = lhie1@0.0.0.0:6170 +http-api = lhie1@0.0.0.0:6171 +http-api-web-dashboard = true + +internet-test-url = http://wifi.vivo.com.cn/generate_204 +proxy-test-url = http://www.google.com/generate_204 +test-timeout = 5 + +allow-wifi-access = true +exclude-simple-hostnames = true +ipv6 = true +network-framework = false +show-error-page-for-reject = true +tls-provider = default +use-default-policy-if-wifi-not-primary = false +// wifi-assist = true + +[Replica] +hide-apple-request = true +hide-crash-reporter-request = true +hide-udp = false +keyword-filter-type = false diff --git a/Surge/Surge 3/Script/sub_info_panel.js b/Surge/Surge 4/Script/sub_info_panel.js similarity index 100% rename from Surge/Surge 3/Script/sub_info_panel.js rename to Surge/Surge 4/Script/sub_info_panel.js