diff --git a/Brewfile b/Brewfile index ef098e7..579e870 100644 --- a/Brewfile +++ b/Brewfile @@ -12,6 +12,7 @@ brew "nvm" brew "pnpm" brew "ruby" brew "speedtest-cli" +brew "tree" brew "unar" brew "wget" brew "wimlib" @@ -38,6 +39,7 @@ vscode "oouo-diogo-perdigao.docthis" vscode "pkief.material-icon-theme" vscode "russell.any-rule" vscode "sibiraj-s.vscode-scss-formatter" +vscode "sonarsource.sonarlint-vscode" vscode "tamasfe.even-better-toml" vscode "vue.volar" vscode "yzhang.markdown-all-in-one" diff --git a/Proxy/Clash/T-FakeIpFilter.yaml b/Proxy/Clash/T-FakeIpFilter.yaml new file mode 100644 index 0000000..f14c27b --- /dev/null +++ b/Proxy/Clash/T-FakeIpFilter.yaml @@ -0,0 +1,114 @@ +# Updated: CST 2024-08-17 14:14:49 +# Author: Theo-Messi +# GitHub Source: https://github.com/Theo-Messi/dotfiles + +payload: + - '*.lan' + - '*.localdomain' + - '*.example' + - '*.invalid' + - '*.localhost' + - '*.test' + - '*.local' + - '*.home.arpa' + - time.*.com + - time.*.gov + - time.*.edu.cn + - time.*.apple.com + - time-ios.apple.com + - time1.*.com + - time2.*.com + - time3.*.com + - time4.*.com + - time5.*.com + - time6.*.com + - time7.*.com + - ntp.*.com + - ntp1.*.com + - ntp2.*.com + - ntp3.*.com + - ntp4.*.com + - ntp5.*.com + - ntp6.*.com + - ntp7.*.com + - '*.time.edu.cn' + - '*.ntp.org.cn' + - '+.pool.ntp.org' + - time1.cloud.tencent.com + - music.163.com + - '*.music.163.com' + - '*.126.net' + - musicapi.taihe.com + - music.taihe.com + - songsearch.kugou.com + - trackercdn.kugou.com + - '*.kuwo.cn' + - api-jooxtt.sanook.com + - api.joox.com + - joox.com + - y.qq.com + - '*.y.qq.com' + - streamoc.music.tc.qq.com + - mobileoc.music.tc.qq.com + - isure.stream.qqmusic.qq.com + - dl.stream.qqmusic.qq.com + - aqqmusic.tc.qq.com + - amobile.music.tc.qq.com + - '*.xiami.com' + - '*.music.migu.cn' + - music.migu.cn + - '+.msftconnecttest.com' + - '+.msftncsi.com' + - localhost.ptlogin2.qq.com + - localhost.sec.qq.com + - '+.qq.com' + - '+.tencent.com' + - '+.srv.nintendo.net' + - '*.n.n.srv.nintendo.net' + - '+.stun.playstation.net' + - xbox.*.*.microsoft.com + - '*.*.xboxlive.com' + - xbox.*.microsoft.com + - xnotify.xboxlive.com + - '+.battlenet.com.cn' + - '+.wotgame.cn' + - '+.wggames.cn' + - '+.wowsgame.cn' + - '+.wargaming.net' + - proxy.golang.org + - stun.*.* + - stun.*.*.* + - '+.stun.*.*' + - '+.stun.*.*.*' + - '+.stun.*.*.*.*' + - '+.stun.*.*.*.*.*' + - heartbeat.belkin.com + - '*.linksys.com' + - '*.linksyssmartwifi.com' + - '*.router.asus.com' + - mesu.apple.com + - swscan.apple.com + - swquery.apple.com + - swdownload.apple.com + - swcdn.apple.com + - swdist.apple.com + - lens.l.google.com + - stun.l.google.com + - na.b.g-tun.com + - '+.nflxvideo.net' + - '*.square-enix.com' + - '*.finalfantasyxiv.com' + - '*.ffxiv.com' + - '*.ff14.sdo.com' + - ff.dorado.sdo.com + - '*.mcdn.bilivideo.cn' + - '+.media.dssott.com' + - shark007.net + - Mijia Cloud + - '+.cmbchina.com' + - '+.cmbimg.com' + - local.adguard.org + - '+.sandai.net' + - '+.n0808.com' + - controlplane.tailscale.com + - log.tailscale.io diff --git a/Proxy/Clash/T-MetaConfig.yaml b/Proxy/Clash/T-MetaConfig.yaml index a7bb7ee..1e9057e 100644 --- a/Proxy/Clash/T-MetaConfig.yaml +++ b/Proxy/Clash/T-MetaConfig.yaml @@ -42,7 +42,6 @@ proxy-groups: - { name: ๐ŸŽฎ ๆธธๆˆๅนณๅฐ, <<: *o2 } - { name: ๐Ÿ”ฐ ไธ‹่ฝฝๅนณๅฐ, <<: *o2 } - { name: ๐ŸŽฏ ๅ…จ็ƒ็›ด่ฟž, type: select, proxies: [DIRECT, REJECT] } - #- {name: ๐Ÿƒ ๅนฟๅ‘Šๆ‹ฆๆˆช, type: select, proxies: [REJECT,DIRECT]} - { name: ๐ŸŸ ๆผ็ฝ‘ไน‹้ฑผ, <<: *o1 } #ๅœฐๅŒบ็ญ–็•ฅ็ป„ @@ -60,11 +59,6 @@ rules: - DOMAIN-SUFFIX,googleapis.cn,๐Ÿš€ ่Š‚็‚น้€‰ๆ‹ฉ - DOMAIN-SUFFIX,xn--ngstr-lra8j.com,๐Ÿš€ ่Š‚็‚น้€‰ๆ‹ฉ - RULE-SET,LocalAreaNetwork,๐ŸŽฏ ๅ…จ็ƒ็›ด่ฟž - # - RULE-SET,Unban,๐ŸŽฏ ๅ…จ็ƒ็›ด่ฟž - # - RULE-SET,BanEasyListChina,๐Ÿƒ ๅนฟๅ‘Šๆ‹ฆๆˆช - # - RULE-SET,BanAD,๐Ÿƒ ๅนฟๅ‘Šๆ‹ฆๆˆช - # - RULE-SET,BanEasyList,๐Ÿƒ ๅนฟๅ‘Šๆ‹ฆๆˆช - # - RULE-SET,BanEasyPrivacy,๐Ÿƒ ๅนฟๅ‘Šๆ‹ฆๆˆช - RULE-SET,Telegram,๐Ÿ“ฒ ็”ตๆŠฅไฟกๆฏ - RULE-SET,Twitter,๐Ÿ“ฑ Twitter - RULE-SET,OpenAI,โ˜ฃ๏ธ AIๅนณๅฐ @@ -90,7 +84,7 @@ rules: - RULE-SET,Geoip_private,๐ŸŽฏ ๅ…จ็ƒ็›ด่ฟž,no-resolve - RULE-SET,ChinaCompanyIp,๐ŸŽฏ ๅ…จ็ƒ็›ด่ฟž,no-resolve - RULE-SET,ChinaIp,๐ŸŽฏ ๅ…จ็ƒ็›ด่ฟž,no-resolve - - DST-PORT,22,๐Ÿ‡ญ๐Ÿ‡ฐ ้ฆ™ๆธฏ่Š‚็‚น + - DST-PORT,22,๐Ÿ‡ธ๐Ÿ‡ฌ ็‹ฎๅŸŽ่Š‚็‚น - MATCH,๐ŸŸ ๆผ็ฝ‘ไน‹้ฑผ rule-providers: @@ -100,6 +94,9 @@ rule-providers: T-Global: <<: *pc url: 'https://dot.theojs.cn/Proxy/Rules/T-GlobalList.yaml' + T-FakeIpFilter: + <<: *pd + url: 'https://dot.theojs.cn/Proxy/Clash/T-FakeIpFilter.yaml' GitHub: <<: *pd url: 'https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/github.yaml' @@ -109,21 +106,6 @@ rule-providers: LocalAreaNetwork: <<: *pc url: 'https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/LocalAreaNetwork.yaml' - # Unban: - # <<: *pc - # url: "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/UnBan.yaml" - # BanEasyListChina: - # <<: *pc - # url: "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/BanEasyListChina.yaml" - # BanAD: - # <<: *pc - # url: "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/BanAD.yaml" - # BanEasyList: - # <<: *pc - # url: "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/BanEasyList.yaml" - # BanEasyPrivacy: - # <<: *pc - # url: "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/BanEasyPrivacy.yaml" Telegram: <<: *pc url: 'https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Providers/Ruleset/Telegram.yaml' @@ -200,7 +182,7 @@ rule-providers: mixed-port: 7890 allow-lan: true ipv6: true -mode: Rule +mode: rule log-level: debug external-controller: 0.0.0.0:9090 secret: '123456' @@ -225,121 +207,12 @@ dns: proxy-server-nameserver: - https://dns.alidns.com/dns-query - https://dns.pub/dns-query - #nameserver-policy: - # 'rule-set:Bahamut': - # - 'https://dns.google/dns-query#๐Ÿ“ฝ๏ธ ๅทดๅ“ˆๅง†็‰น' - # - 'https://dns.cloudflare.com/dns-query#๐Ÿ“ฝ๏ธ ๅทดๅ“ˆๅง†็‰น' - # 'rule-set:Geolocation-!cn': - # - 'https://dns.google/dns-query#๐Ÿš€ ่Š‚็‚น้€‰ๆ‹ฉ' - # - 'https://dns.cloudflare.com/dns-query#๐Ÿš€ ่Š‚็‚น้€‰ๆ‹ฉ' fake-ip-filter: - - '*.lan' - - '*.localdomain' - - '*.example' - - '*.invalid' - - '*.localhost' - - '*.test' - - '*.local' - - '*.home.arpa' - - time.*.com - - time.*.gov - - time.*.edu.cn - - time.*.apple.com - - time-ios.apple.com - - time1.*.com - - time2.*.com - - time3.*.com - - time4.*.com - - time5.*.com - - time6.*.com - - time7.*.com - - ntp.*.com - - ntp1.*.com - - ntp2.*.com - - ntp3.*.com - - ntp4.*.com - - ntp5.*.com - - ntp6.*.com - - ntp7.*.com - - '*.time.edu.cn' - - '*.ntp.org.cn' - - '+.pool.ntp.org' - - time1.cloud.tencent.com - - music.163.com - - '*.music.163.com' - - '*.126.net' - - musicapi.taihe.com - - music.taihe.com - - songsearch.kugou.com - - trackercdn.kugou.com - - '*.kuwo.cn' - - api-jooxtt.sanook.com - - api.joox.com - - joox.com - - y.qq.com - - '*.y.qq.com' - - streamoc.music.tc.qq.com - - mobileoc.music.tc.qq.com - - isure.stream.qqmusic.qq.com - - dl.stream.qqmusic.qq.com - - aqqmusic.tc.qq.com - - amobile.music.tc.qq.com - - '*.xiami.com' - - '*.music.migu.cn' - - music.migu.cn - - '+.msftconnecttest.com' - - '+.msftncsi.com' - - localhost.ptlogin2.qq.com - - localhost.sec.qq.com - - '+.qq.com' - - '+.tencent.com' - - '+.srv.nintendo.net' - - '*.n.n.srv.nintendo.net' - - '+.stun.playstation.net' - - xbox.*.*.microsoft.com - - '*.*.xboxlive.com' - - xbox.*.microsoft.com - - xnotify.xboxlive.com - - '+.battlenet.com.cn' - - '+.wotgame.cn' - - '+.wggames.cn' - - '+.wowsgame.cn' - - '+.wargaming.net' - - proxy.golang.org - - stun.*.* - - stun.*.*.* - - '+.stun.*.*' - - '+.stun.*.*.*' - - '+.stun.*.*.*.*' - - '+.stun.*.*.*.*.*' - - heartbeat.belkin.com - - '*.linksys.com' - - '*.linksyssmartwifi.com' - - '*.router.asus.com' - - mesu.apple.com - - swscan.apple.com - - swquery.apple.com - - swdownload.apple.com - - swcdn.apple.com - - swdist.apple.com - - lens.l.google.com - - stun.l.google.com - - na.b.g-tun.com - - '+.nflxvideo.net' - - '*.square-enix.com' - - '*.finalfantasyxiv.com' - - '*.ffxiv.com' - - '*.ff14.sdo.com' - - ff.dorado.sdo.com - - '*.mcdn.bilivideo.cn' - - '+.media.dssott.com' - - shark007.net - - Mijia Cloud - - '+.cmbchina.com' - - '+.cmbimg.com' - - local.adguard.org - - '+.sandai.net' - - '+.n0808.com' - - controlplane.tailscale.com - - log.tailscale.io + - RULE-SET,T-FakeIpFilter + - RULE-SET,Geosite_cn + - RULE-SET,Geosite_private + - RULE-SET,Geoip_cn + - RULE-SET,Geoip_private + - RULE-SET,ChinaCompanyIp + - RULE-SET,ChinaIp diff --git a/package.json b/package.json index 2f98f5c..db5e6a1 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,7 @@ "scripts": { "prettier": "prettier --write .", "check": "prettier . --check", - "pull": "git fetch origin && git reset --hard origin/main", - "push": "git add . && git commit -m 'update'", - "soft": "git reset --soft HEAD^ && git add . && git commit -m 'update' && git push -f origin main", - "ps": "pnpm run push && pnpm run soft" + "pull": "git fetch origin && git reset --hard origin/main" }, "devDependencies": { "prettier": "3.3.3" @@ -28,5 +25,5 @@ "prettier --write --ignore-unknown" ] }, - "packageManager": "pnpm@9.7.0" + "packageManager": "pnpm@9.7.1" }