From b946f7a1d441b53d2680b9cfbf0747ac6e563fcf Mon Sep 17 00:00:00 2001 From: Alireza Ahmadi Date: Sun, 10 Dec 2023 16:01:13 +0100 Subject: [PATCH] new geofile strategy --- .github/workflows/release.yml | 15 +++++++++------ DockerInitFiles.sh | 5 +++-- README.md | 34 +++++++++++++++++----------------- web/html/xui/xray.html | 9 ++++----- web/service/server.go | 8 -------- 5 files changed, 33 insertions(+), 38 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 948f748b..ba0faa37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,10 +28,11 @@ jobs: cd bin wget https://github.com/XTLS/Xray-core/releases/download/v1.8.6/Xray-linux-64.zip unzip Xray-linux-64.zip - rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat + rm -f Xray-linux-64.zip geoip.dat geosite.dat LICENSE README.md wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - wget https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat + wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat mv xray xray-linux-amd64 cd .. cd .. @@ -69,10 +70,11 @@ jobs: cd bin wget https://github.com/xtls/xray-core/releases/download/v1.8.6/Xray-linux-arm64-v8a.zip unzip Xray-linux-arm64-v8a.zip - rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat + rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat LICENSE README.md wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - wget https://github.com/Masterkia/iran-hosted-domains/releases/latest/download/iran.dat + wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat mv xray xray-linux-arm64 cd .. cd .. @@ -110,10 +112,11 @@ jobs: cd bin wget https://github.com/xtls/xray-core/releases/download/v1.8.6/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip - rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat + rm -f Xray-linux-s390x.zip geoip.dat geosite.dat LICENSE README.md wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - wget https://github.com/Masterkia/iran-hosted-domains/releases/latest/download/iran.dat + wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat mv xray xray-linux-s390x cd .. cd .. diff --git a/DockerInitFiles.sh b/DockerInitFiles.sh index c01714b3..85afb812 100755 --- a/DockerInitFiles.sh +++ b/DockerInitFiles.sh @@ -13,9 +13,10 @@ mkdir -p build/bin cd build/bin wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.6/Xray-linux-${ARCH}.zip" unzip "Xray-linux-${ARCH}.zip" -rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.dat +rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat LICENSE README.md mv xray "xray-linux-${FNAME}" wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" -wget "https://github.com/Masterkia/iran-hosted-domains/releases/latest/download/iran.dat" +wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat +wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat cd ../../ diff --git a/README.md b/README.md index d21c156b..653f1058 100644 --- a/README.md +++ b/README.md @@ -20,21 +20,21 @@ ## Quick Look -| Features | Enable? | -| ------------------------------------ | :----------------: | -| Multi-Protocol | :heavy_check_mark: | -| Multi-Language | :heavy_check_mark: | -| Multi-User Inbounds |:heavy_check_mark: | -|Advanced Traffic Routing | :heavy_check_mark: | -| REST API | :heavy_check_mark: | -|Show Online Users | :heavy_check_mark: | -| Manage Users Traffic Data & Expiry Date | :heavy_check_mark: | -| Apply Expiry Date based on First Usage | :heavy_check_mark: | -| Telegram Bot (admin + clients) | :heavy_check_mark: | -| Database Backup using Telegram Bot | :heavy_check_mark: | -| Subscription Link + UserInfo | :heavy_check_mark: | -| Search in Deep | :heavy_check_mark: | -| Dark/Light Theme | :heavy_check_mark: | +| Features | Enable? | +| -------------------------------------- | :----------------: | +| Multi-Protocol | :heavy_check_mark: | +| Multi-Language | :heavy_check_mark: | +| Multi-User Inbounds | :heavy_check_mark: | +| Advanced Traffic Routing | :heavy_check_mark: | +| REST API | :heavy_check_mark: | +|Show Online Users | :heavy_check_mark: | +| Manage Users Traffic Data & Expiry Date| :heavy_check_mark: | +| Apply Expiry Date based on First Usage | :heavy_check_mark: | +| Telegram Bot (admin + clients) | :heavy_check_mark: | +| Database Backup using Telegram Bot | :heavy_check_mark: | +| Subscription Link + UserInfo | :heavy_check_mark: | +| Search in Deep | :heavy_check_mark: | +| Dark/Light Theme | :heavy_check_mark: | ## Install & Upgrade to Latest Version @@ -311,8 +311,8 @@ Please be aware if you upgrade from an old X-UI version or other forks, by defau ## Acknowledgment -- [Iran Hosted Domains](https://github.com/bootmortis/iran-hosted-domains) (License: **MIT**): _A comprehensive list of Iranian domains and services that are hosted within the country._ -- [PersianBlocker](https://github.com/MasterKia/PersianBlocker) (License: **AGPLv3**): _An optimal and extensive list to block ads and trackers on Persian websites._ +- [Loyalsoldier](https://github.com/Loyalsoldier/v2ray-rules-dat) (License: **GPL-3.0**): _The enhanced version of V2Ray routing rule._ +- [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-rules) (License: **GPL-3.0**): _Enhanced v2ray/xray and v2ray/xray-clients routing rules with built-in Iranian domains and a focus on security and adblocking._ ## Stargazers over Time diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html index 371456ac..6f5605c6 100644 --- a/web/html/xui/xray.html +++ b/web/html/xui/xray.html @@ -512,13 +512,13 @@ ips: { local: ["geoip:private"], cn: ["geoip:cn"], - ir: ["geoip:ir"], + ir: ["ext:geoip_IR.dat:ir","ext:geoip_IR.dat:arvancloud","ext:geoip_IR.dat:derakcloud","ext:geoip_IR.dat:iranserver"], ru: ["geoip:ru"], }, domains: { ads: [ "geosite:category-ads-all", - "ext:iran.dat:ads" + "ext:geosite_IR.dat:category-ads-all" ], google: ["geosite:google"], netflix: ["geosite:netflix"], @@ -532,9 +532,8 @@ ], ir: [ "regexp:.*\\.ir$", - "ext:iran.dat:ir", - "ext:iran.dat:other", - "geosite:category-ir" + "regexp:.*\\.xn--mgba3a4f16a$", // .ایران + "ext:geosite_IR.dat:ir" // have rules to bypass all .ir domains. ] }, familyProtectDNS: { diff --git a/web/service/server.go b/web/service/server.go index e90ced6b..2404edb6 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -363,14 +363,6 @@ func (s *ServerService) UpdateXray(version string) error { if err != nil { return err } - err = copyZipFile("geosite.dat", xray.GetGeositePath()) - if err != nil { - return err - } - err = copyZipFile("geoip.dat", xray.GetGeoipPath()) - if err != nil { - return err - } return nil