mirror of
https://github.com/egor-white/zaprett.git
synced 2025-12-10 21:40:12 +05:00
Compare commits
54 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7271b2825 | ||
|
|
71e918bd13 | ||
|
|
d3dbf4ddc5 | ||
|
|
0213c239fc | ||
|
|
2d90aea5ca | ||
|
|
e62336e253 | ||
|
|
dd78b59a68 | ||
|
|
0a0c3fd80b | ||
|
|
3a7c40f167 | ||
|
|
9ef7c70f78 | ||
|
|
534f3a733a | ||
|
|
ccaac37b52 | ||
|
|
c2db7fbdac | ||
|
|
ea92b6cf6f | ||
|
|
0fbcd24088 | ||
|
|
45017d35b2 | ||
|
|
718ed43ef8 | ||
|
|
6318977857 | ||
|
|
e3effc3292 | ||
|
|
c92b3a1b19 | ||
|
|
afed7b1122 | ||
|
|
1fa0e306ac | ||
|
|
fece7149e3 | ||
|
|
751788feb8 | ||
|
|
cc3500635f | ||
|
|
b01c5dc95f | ||
|
|
bf69249e12 | ||
|
|
63c45d8a2a | ||
|
|
26325b79f1 | ||
|
|
2cee0712c3 | ||
|
|
79b63ec5e9 | ||
|
|
c230f4876c | ||
|
|
531c403ce2 | ||
|
|
70d3b3e28d | ||
|
|
cf507f059b | ||
|
|
bf81100acb | ||
|
|
5ac9234ca2 | ||
|
|
156cedb080 | ||
|
|
f59ec45e9f | ||
|
|
45b25dd1ee | ||
|
|
e967dc12d7 | ||
|
|
6e1b3f12d9 | ||
|
|
6f395b1df9 | ||
|
|
638c45b243 | ||
|
|
78af1977fd | ||
|
|
97f495a56a | ||
|
|
63b279114e | ||
|
|
f1d3ec0b5e | ||
|
|
ffb296744b | ||
|
|
7966bbaebf | ||
|
|
f162004b56 | ||
|
|
71a5df5356 | ||
|
|
bcf0aa2b50 | ||
|
|
8248d43f67 |
46
.github/workflows/workflow.yml
vendored
46
.github/workflows/workflow.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Make build dirs
|
- name: Make build dirs
|
||||||
run: mkdir -p zaprett/system/bin zaprett-extended/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-extended/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists
|
run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists
|
||||||
|
|
||||||
- name: Download latest zapret binaries
|
- name: Download latest zapret binaries
|
||||||
run: |
|
run: |
|
||||||
@@ -60,27 +60,25 @@ jobs:
|
|||||||
cp zapret-latest/binaries/android-x86_64/nfqws zaprett/system/bin/nfqws_x86_64
|
cp zapret-latest/binaries/android-x86_64/nfqws zaprett/system/bin/nfqws_x86_64
|
||||||
cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips
|
cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips
|
||||||
cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel
|
cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel
|
||||||
#cp src/bin/zaprett zaprett/system/bin/
|
|
||||||
|
|
||||||
cp -a src/* zaprett/
|
cp -a src/* zaprett/
|
||||||
|
|
||||||
#copy all files to another distributions
|
#copy all files to another distributions
|
||||||
cp -r zaprett/* zaprett-extended/
|
cp -r zaprett/* zaprett-hosts/
|
||||||
cp -r zaprett/* zaprett-tv/
|
cp -r zaprett/* zaprett-tv/
|
||||||
- name: Download and copy actual lists
|
- name: Download and copy actual lists
|
||||||
run: |
|
run: |
|
||||||
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-youtube.txt -O lists/list-youtube.txt
|
wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-youtube.txt -O lists/list-youtube.txt
|
||||||
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-discord.txt -O lists/list-discord.txt
|
wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-discord.txt -O lists/list-discord.txt
|
||||||
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-extended.txt -O lists/list-extended.txt
|
|
||||||
|
|
||||||
cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
|
cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
|
||||||
cp lists/list-youtube.txt zaprett-extended/system/etc/zaprett/lists/
|
cp lists/list-youtube.txt zaprett-hosts/system/etc/zaprett/lists/
|
||||||
cp lists/list-youtube.txt zaprett-tv/system/etc/zaprett/lists/
|
cp lists/list-youtube.txt zaprett-tv/system/etc/zaprett/lists/
|
||||||
|
|
||||||
cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/
|
cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/
|
||||||
cp lists/list-discord.txt zaprett-extended/system/etc/zaprett/lists/
|
cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/
|
||||||
|
|
||||||
cp lists/list-extended.txt zaprett-extended/system/etc/zaprett/lists/
|
cp hosts/hosts zaprett-hosts/system/etc
|
||||||
|
|
||||||
- name: Create module.prop
|
- name: Create module.prop
|
||||||
run: |
|
run: |
|
||||||
@@ -89,19 +87,19 @@ jobs:
|
|||||||
name=zaprett
|
name=zaprett
|
||||||
version=${{ inputs.version }}
|
version=${{ inputs.version }}
|
||||||
versionCode=${{ inputs.version_code }}
|
versionCode=${{ inputs.version_code }}
|
||||||
author=egor-white, Huananzhi X99, Cherret
|
author=egor-white, Cherret
|
||||||
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
||||||
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
|
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > zaprett-extended/module.prop <<EOF
|
cat > zaprett-hosts/module.prop <<EOF
|
||||||
id=zaprett
|
id=zaprett
|
||||||
name=zaprett-extended
|
name=zaprett-hosts
|
||||||
version=${{ inputs.version }}
|
version=${{ inputs.version }}
|
||||||
versionCode=${{ inputs.version_code }}
|
versionCode=${{ inputs.version_code }}
|
||||||
author=egor-white, Huananzhi X99, Cherret
|
author=egor-white, Cherret
|
||||||
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
||||||
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-extended.json
|
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-hosts.json
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > zaprett-tv/module.prop <<EOF
|
cat > zaprett-tv/module.prop <<EOF
|
||||||
@@ -109,22 +107,22 @@ jobs:
|
|||||||
name=zaprett-tv
|
name=zaprett-tv
|
||||||
version=${{ inputs.version }}
|
version=${{ inputs.version }}
|
||||||
versionCode=${{ inputs.version_code }}
|
versionCode=${{ inputs.version_code }}
|
||||||
author=egor-white, Huananzhi X99, Cherret
|
author=egor-white, Cherret
|
||||||
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
||||||
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-tv.json
|
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-tv.json
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
- name: Tree files
|
- name: Tree files
|
||||||
run: |
|
run: |
|
||||||
tree zaprett/ zaprett-extended/ zaprett-tv/
|
tree zaprett/ zaprett-hosts/ zaprett-tv/
|
||||||
- name: Create archives
|
- name: Create archives
|
||||||
run: |
|
run: |
|
||||||
cd zaprett && zip -r ../zaprett.zip ./* && cd ..
|
cd zaprett && zip -r ../zaprett.zip ./* && cd ..
|
||||||
cd zaprett-extended && zip -r ../zaprett-extended.zip ./* && cd ..
|
cd zaprett-hosts && zip -r ../zaprett-hosts.zip ./* && cd ..
|
||||||
cd zaprett-tv && zip -r ../zaprett-tv.zip ./* && cd ..
|
cd zaprett-tv && zip -r ../zaprett-tv.zip ./* && cd ..
|
||||||
|
|
||||||
mv zaprett.zip out/
|
mv zaprett.zip out/
|
||||||
mv zaprett-extended.zip out/
|
mv zaprett-hosts.zip out/
|
||||||
mv zaprett-tv.zip out/
|
mv zaprett-tv.zip out/
|
||||||
|
|
||||||
- name: Create release
|
- name: Create release
|
||||||
@@ -145,15 +143,15 @@ jobs:
|
|||||||
{
|
{
|
||||||
"version": "${{ inputs.version }}",
|
"version": "${{ inputs.version }}",
|
||||||
"versionCode": ${{ inputs.version_code }},
|
"versionCode": ${{ inputs.version_code }},
|
||||||
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.release_tag }}zaprett.zip",
|
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
cat > update_extended.json <<EOF
|
cat > update_hosts.json <<EOF
|
||||||
{
|
{
|
||||||
"version": "${{ inputs.version }}",
|
"version": "${{ inputs.version }}",
|
||||||
"versionCode": ${{ inputs.version_code }},
|
"versionCode": ${{ inputs.version_code }},
|
||||||
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.release_tag }}zaprett-extended.zip",
|
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett-hosts.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
@@ -161,7 +159,7 @@ jobs:
|
|||||||
{
|
{
|
||||||
"version": "${{ inputs.version }}",
|
"version": "${{ inputs.version }}",
|
||||||
"versionCode": ${{ inputs.version_code }},
|
"versionCode": ${{ inputs.version_code }},
|
||||||
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.release_tag }}zaprett-tv.zip",
|
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett-tv.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
@@ -169,7 +167,7 @@ jobs:
|
|||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
with:
|
with:
|
||||||
commit_message: "Update update's.json and changelog"
|
commit_message: "Update update's.json and changelog"
|
||||||
file_pattern: 'update.json update_extended.json update_tv.json changelog.md'
|
file_pattern: 'update.json update_hosts.json update_tv.json changelog.md'
|
||||||
|
|
||||||
- name: Send bot post
|
- name: Send bot post
|
||||||
env:
|
env:
|
||||||
@@ -180,7 +178,7 @@ jobs:
|
|||||||
|
|
||||||
⬇️ <a href='https://github.com/egor-white/zaprett/releases/tag/${{ inputs.tag }}'>Скачать</a>
|
⬇️ <a href='https://github.com/egor-white/zaprett/releases/tag/${{ inputs.tag }}'>Скачать</a>
|
||||||
|
|
||||||
ℹ️ @zaprett_module
|
ℹ️ @zaprett_module <a href='mailru.pro'>[web]</a>
|
||||||
run: |
|
run: |
|
||||||
curl -X POST "https://api.telegram.org/bot${{ secrets.BOT_TOKEN }}/sendMessage" \
|
curl -X POST "https://api.telegram.org/bot${{ secrets.BOT_TOKEN }}/sendMessage" \
|
||||||
-d chat_id=-1002531270265 \
|
-d chat_id=-1002531270265 \
|
||||||
|
|||||||
35
.github/workflows/workflow_without_post.yml
vendored
35
.github/workflows/workflow_without_post.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Make build dirs
|
- name: Make build dirs
|
||||||
run: mkdir -p zaprett/system/bin zaprett-extended/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-extended/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists
|
run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-hosts/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists
|
||||||
|
|
||||||
- name: Download latest zapret binaries
|
- name: Download latest zapret binaries
|
||||||
run: |
|
run: |
|
||||||
@@ -60,27 +60,25 @@ jobs:
|
|||||||
cp zapret-latest/binaries/android-x86_64/nfqws zaprett/system/bin/nfqws_x86_64
|
cp zapret-latest/binaries/android-x86_64/nfqws zaprett/system/bin/nfqws_x86_64
|
||||||
cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips
|
cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips
|
||||||
cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel
|
cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel
|
||||||
#cp src/bin/zaprett zaprett/system/bin/
|
|
||||||
|
|
||||||
cp -a src/* zaprett/
|
cp -a src/* zaprett/
|
||||||
|
|
||||||
#copy all files to another distributions
|
#copy all files to another distributions
|
||||||
cp -r zaprett/* zaprett-extended/
|
cp -r zaprett/* zaprett-hosts/
|
||||||
cp -r zaprett/* zaprett-tv/
|
cp -r zaprett/* zaprett-tv/
|
||||||
- name: Download and copy actual lists
|
- name: Download and copy actual lists
|
||||||
run: |
|
run: |
|
||||||
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-youtube.txt -O lists/list-youtube.txt
|
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-youtube.txt -O lists/list-youtube.txt
|
||||||
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-discord.txt -O lists/list-discord.txt
|
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-discord.txt -O lists/list-discord.txt
|
||||||
wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-extended.txt -O lists/list-extended.txt
|
|
||||||
|
|
||||||
cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
|
cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
|
||||||
cp lists/list-youtube.txt zaprett-extended/system/etc/zaprett/lists/
|
cp lists/list-youtube.txt zaprett-hosts/system/etc/zaprett/lists/
|
||||||
cp lists/list-youtube.txt zaprett-tv/system/etc/zaprett/lists/
|
cp lists/list-youtube.txt zaprett-tv/system/etc/zaprett/lists/
|
||||||
|
|
||||||
cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/
|
cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/
|
||||||
cp lists/list-discord.txt zaprett-extended/system/etc/zaprett/lists/
|
cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/
|
||||||
|
|
||||||
cp lists/list-extended.txt zaprett-extended/system/etc/zaprett/lists/
|
cp hosts/hosts zaprett-hosts/system/etc
|
||||||
|
|
||||||
- name: Create module.prop
|
- name: Create module.prop
|
||||||
run: |
|
run: |
|
||||||
@@ -94,14 +92,14 @@ jobs:
|
|||||||
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
|
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > zaprett-extended/module.prop <<EOF
|
cat > zaprett-hosts/module.prop <<EOF
|
||||||
id=zaprett
|
id=zaprett
|
||||||
name=zaprett-extended
|
name=zaprett-hosts
|
||||||
version=${{ inputs.version }}
|
version=${{ inputs.version }}
|
||||||
versionCode=${{ inputs.version_code }}
|
versionCode=${{ inputs.version_code }}
|
||||||
author=egor-white, Huananzhi X99, Cherret
|
author=egor-white, Huananzhi X99, Cherret
|
||||||
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
|
||||||
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-extended.json
|
updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-hosts.json
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > zaprett-tv/module.prop <<EOF
|
cat > zaprett-tv/module.prop <<EOF
|
||||||
@@ -116,15 +114,15 @@ jobs:
|
|||||||
|
|
||||||
- name: Tree files
|
- name: Tree files
|
||||||
run: |
|
run: |
|
||||||
tree zaprett/ zaprett-extended/ zaprett-tv/
|
tree zaprett/ zaprett-hosts/ zaprett-tv/
|
||||||
- name: Create archives
|
- name: Create archives
|
||||||
run: |
|
run: |
|
||||||
cd zaprett && zip -r ../zaprett.zip ./* && cd ..
|
cd zaprett && zip -r ../zaprett.zip ./* && cd ..
|
||||||
cd zaprett-extended && zip -r ../zaprett-extended.zip ./* && cd ..
|
cd zaprett-hosts && zip -r ../zaprett-hosts.zip ./* && cd ..
|
||||||
cd zaprett-tv && zip -r ../zaprett-tv.zip ./* && cd ..
|
cd zaprett-tv && zip -r ../zaprett-tv.zip ./* && cd ..
|
||||||
|
|
||||||
mv zaprett.zip out/
|
mv zaprett.zip out/
|
||||||
mv zaprett-extended.zip out/
|
mv zaprett-hosts.zip out/
|
||||||
mv zaprett-tv.zip out/
|
mv zaprett-tv.zip out/
|
||||||
|
|
||||||
- name: Create release
|
- name: Create release
|
||||||
@@ -145,15 +143,15 @@ jobs:
|
|||||||
{
|
{
|
||||||
"version": "${{ inputs.version }}",
|
"version": "${{ inputs.version }}",
|
||||||
"versionCode": ${{ inputs.version_code }},
|
"versionCode": ${{ inputs.version_code }},
|
||||||
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.release_tag }}zaprett.zip",
|
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
cat > update_extended.json <<EOF
|
cat > update_hosts.json <<EOF
|
||||||
{
|
{
|
||||||
"version": "${{ inputs.version }}",
|
"version": "${{ inputs.version }}",
|
||||||
"versionCode": ${{ inputs.version_code }},
|
"versionCode": ${{ inputs.version_code }},
|
||||||
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.release_tag }}zaprett-extended.zip",
|
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett-hosts.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
@@ -161,7 +159,7 @@ jobs:
|
|||||||
{
|
{
|
||||||
"version": "${{ inputs.version }}",
|
"version": "${{ inputs.version }}",
|
||||||
"versionCode": ${{ inputs.version_code }},
|
"versionCode": ${{ inputs.version_code }},
|
||||||
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.release_tag }}zaprett-tv.zip",
|
"zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett-tv.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
@@ -169,5 +167,4 @@ jobs:
|
|||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
with:
|
with:
|
||||||
commit_message: "Update update's.json and changelog"
|
commit_message: "Update update's.json and changelog"
|
||||||
file_pattern: 'update.json update_extended.json update_tv.json changelog.md'
|
file_pattern: 'update.json update_hosts.json update_tv.json changelog.md'
|
||||||
|
|
||||||
|
|||||||
26
README.md
26
README.md
@@ -7,11 +7,33 @@
|
|||||||
Требования:
|
Требования:
|
||||||
* Magisk 24.1+
|
* Magisk 24.1+
|
||||||
* Прямые руки
|
* Прямые руки
|
||||||
* Termux или другой эмулятор терминала **И/ИЛИ** [приложение zaprett](https://github.com/egor-white/zaprett-app) **ИЛИ** [ремейк приложения zaprett от cherret](https://github.com/CherretGit/zaprett-app)
|
* Termux или другой эмулятор терминала **И/ИЛИ** [приложение zaprett](https://github.com/egor-white/zaprett-app) (не обновляется) **ИЛИ** [ремейк приложения zaprett от cherret](https://github.com/CherretGit/zaprett-app)
|
||||||
|
|
||||||
На данный момент модуль умеет:
|
На данный момент модуль умеет:
|
||||||
+ Включать, выключать и перезапускать nfqws
|
+ Включать, выключать и перезапускать nfqws
|
||||||
|
+ Работать с листами и стратегиями
|
||||||
|
+ Предлагать обновления через Magisk/KSU/KSU Next/APatch
|
||||||
|
|
||||||
|
## Какую версию модуля выбрать?
|
||||||
|
|
||||||
|
В актуальных релизах есть 3 версии модуля, а именно:
|
||||||
|
- zaprett.zip
|
||||||
|
- zaprett-hosts.zip
|
||||||
|
- zaprett-tv.zip
|
||||||
|
|
||||||
|
Основные их отличия представленны в таблице ниже.
|
||||||
|
Для устройств на Android TV **рекомендуется использовать именно TV версию** из-за некоторых особенностей работы этой ОС.
|
||||||
|
|Версия|Списки|/etc/hosts|
|
||||||
|
|------|------|----------|
|
||||||
|
|zaprett|list-youtube.txt, list-discord.txt|:x: Нет|
|
||||||
|
|zaprett-tv|list-youtube.txt|:x: Нет|
|
||||||
|
|zaprett-hosts|list-youtube.txt,list-discord.txt|:white_check_mark: Есть|
|
||||||
|
|
||||||
|
## Что такое /etc/hosts?
|
||||||
|
Говоря грубо, это файл, который влияет на работу нейросетей и других недоступных сервисов, перенаправляя ваш траффик на сторонние сервера.
|
||||||
|
|
||||||
|
Если вы используете модули, которые подменяют этот файл (например, всевозможные блокировщики рекламы и разблокировщики нейросетей), выбирайте версию <big>**без hosts**</big>, иначе модули будут конфликтовать друг с другом.
|
||||||
|
::: warning
|
||||||
|
Сервера, используемые в качестве прокси и указанные в файле hosts нам неподконтрольны, мы не несём за них отвественность, используйте с осторожностью
|
||||||
|
:::
|
||||||
|
|
||||||
Создано - [egor-white](https://t.me/cheesedroid), [Cherret](https://t.me/Cherret), [MT6833](https://t.me/MT6833).
|
|
||||||
@@ -1 +1 @@
|
|||||||
Добавлены команды (zaprett) help, module-ver, bin-ver
|
Список изменений: ● Обновление бинарников zapret до версии 72.1 ● Добавлена поддержка ipset ● Исправление автозапуска
|
||||||
|
|||||||
246
hosts/hosts
Normal file
246
hosts/hosts
Normal file
@@ -0,0 +1,246 @@
|
|||||||
|
### dns.malw.link: hosts file
|
||||||
|
# Последнее обновление: 17 октября 2025
|
||||||
|
# Дополнение к zapret:
|
||||||
|
157.240.245.174 instagram.com
|
||||||
|
157.240.245.174 www.instagram.com
|
||||||
|
157.240.245.174 b.i.instagram.com
|
||||||
|
157.240.245.174 z-p42-chat-e2ee-ig.facebook.com
|
||||||
|
157.240.245.174 help.instagram.com
|
||||||
|
3.66.189.153 protonmail.com
|
||||||
|
3.66.189.153 mail.proton.me
|
||||||
|
64.233.164.198 yt3.ggpht.com
|
||||||
|
64.233.164.132 yt4.ggpht.com
|
||||||
|
52.223.13.41 tracker.openbittorrent.com
|
||||||
|
130.255.77.28 ntc.party
|
||||||
|
172.64.33.155 rutor.info
|
||||||
|
173.245.59.155 rutor.is
|
||||||
|
185.87.51.182 controlplane.tailscale.com
|
||||||
|
|
||||||
|
# ChatGPT, OpenAI:
|
||||||
|
185.246.223.127 chatgpt.com
|
||||||
|
185.246.223.127 ab.chatgpt.com
|
||||||
|
185.246.223.127 auth.openai.com
|
||||||
|
185.246.223.127 auth0.openai.com
|
||||||
|
185.246.223.127 platform.openai.com
|
||||||
|
185.246.223.127 cdn.oaistatic.com
|
||||||
|
185.246.223.127 files.oaiusercontent.com
|
||||||
|
185.246.223.127 cdn.auth0.com
|
||||||
|
185.246.223.127 tcr9i.chat.openai.com
|
||||||
|
185.246.223.127 webrtc.chatgpt.com
|
||||||
|
185.246.223.127 android.chat.openai.com
|
||||||
|
185.246.223.127 api.openai.com
|
||||||
|
45.95.233.23 operator.chatgpt.com
|
||||||
|
185.246.223.127 sora.chatgpt.com
|
||||||
|
185.246.223.127 sora.com
|
||||||
|
185.246.223.127 videos.openai.com
|
||||||
|
|
||||||
|
# Сервисы Google:
|
||||||
|
185.246.223.127 gemini.google.com
|
||||||
|
134.0.118.88 aistudio.google.com
|
||||||
|
134.0.118.88 generativelanguage.googleapis.com
|
||||||
|
185.246.223.127 aitestkitchen.withgoogle.com
|
||||||
|
134.0.118.88 aisandbox-pa.googleapis.com
|
||||||
|
134.0.118.88 webchannel-alkalimakersuite-pa.clients6.google.com
|
||||||
|
134.0.118.88 alkalimakersuite-pa.clients6.google.com
|
||||||
|
134.0.118.88 assistant-s3-pa.googleapis.com
|
||||||
|
134.0.118.88 proactivebackend-pa.googleapis.com
|
||||||
|
185.246.223.127 o.pki.goog
|
||||||
|
185.246.223.127 labs.google
|
||||||
|
185.246.223.127 notebooklm.google
|
||||||
|
185.246.223.127 notebooklm.google.com
|
||||||
|
185.246.223.127 jules.google.com
|
||||||
|
185.246.223.127 stitch.withgoogle.com
|
||||||
|
|
||||||
|
# Microsoft Copilot, Microsoft Rewards, Xbox, Xbox Cloud Gaming:
|
||||||
|
185.246.223.127 copilot.microsoft.com
|
||||||
|
185.246.223.127 sydney.bing.com
|
||||||
|
185.246.223.127 edgeservices.bing.com
|
||||||
|
45.95.233.23 rewards.bing.com
|
||||||
|
185.246.223.127 xsts.auth.xboxlive.com
|
||||||
|
185.246.223.127 xgpuwebf2p.gssv-play-prod.xboxlive.com
|
||||||
|
185.246.223.127 xgpuweb.gssv-play-prod.xboxlive.com
|
||||||
|
|
||||||
|
# Spotify:
|
||||||
|
185.246.223.127 api.spotify.com
|
||||||
|
185.246.223.127 xpui.app.spotify.com
|
||||||
|
185.246.223.127 appresolve.spotify.com
|
||||||
|
185.246.223.127 login5.spotify.com
|
||||||
|
185.246.223.127 login.app.spotify.com
|
||||||
|
185.246.223.127 encore.scdn.co
|
||||||
|
185.246.223.127 ap-gew1.spotify.com
|
||||||
|
185.246.223.127 gew1-spclient.spotify.com
|
||||||
|
185.246.223.127 spclient.wg.spotify.com
|
||||||
|
185.246.223.127 api-partner.spotify.com
|
||||||
|
185.246.223.127 aet.spotify.com
|
||||||
|
185.246.223.127 www.spotify.com
|
||||||
|
185.246.223.127 accounts.spotify.com
|
||||||
|
45.95.233.23 open.spotify.com
|
||||||
|
|
||||||
|
# GitHub Copilot:
|
||||||
|
50.7.87.84 api.github.com
|
||||||
|
185.246.223.127 api.individual.githubcopilot.com
|
||||||
|
185.246.223.127 proxy.individual.githubcopilot.com
|
||||||
|
|
||||||
|
# JetBrains:
|
||||||
|
50.7.85.221 datalore.jetbrains.com
|
||||||
|
107.150.34.100 plugins.jetbrains.com
|
||||||
|
185.246.223.127 download.jetbrains.com
|
||||||
|
185.246.223.127 api.jetbrains.ai
|
||||||
|
185.246.223.127 account.jetbrains.com
|
||||||
|
|
||||||
|
# ElevenLabs:
|
||||||
|
185.246.223.127 elevenlabs.io
|
||||||
|
185.246.223.127 api.us.elevenlabs.io
|
||||||
|
185.246.223.127 elevenreader.io
|
||||||
|
185.246.223.127 api.elevenlabs.io
|
||||||
|
185.246.223.127 help.elevenlabs.io
|
||||||
|
|
||||||
|
# Truth Social
|
||||||
|
204.12.192.219 truthsocial.com
|
||||||
|
204.12.192.219 static-assets-1.truthsocial.com
|
||||||
|
|
||||||
|
# Grok
|
||||||
|
185.246.223.127 grok.com
|
||||||
|
185.246.223.127 accounts.x.ai
|
||||||
|
185.246.223.127 assets.grok.com
|
||||||
|
|
||||||
|
# Tidal
|
||||||
|
185.246.223.127 api.tidal.com
|
||||||
|
185.246.223.127 listen.tidal.com
|
||||||
|
185.246.223.127 login.tidal.com
|
||||||
|
185.246.223.127 auth.tidal.com
|
||||||
|
185.246.223.127 link.tidal.com
|
||||||
|
185.246.223.127 dd.tidal.com
|
||||||
|
185.246.223.127 resources.tidal.com
|
||||||
|
45.95.233.23 images.tidal.com
|
||||||
|
185.246.223.127 fsu.fa.tidal.com
|
||||||
|
185.246.223.127 geolocation.onetrust.com
|
||||||
|
185.246.223.127 api.squareup.com
|
||||||
|
185.246.223.127 api-global.squareup.com
|
||||||
|
|
||||||
|
# Supercell
|
||||||
|
185.246.223.127 cdn.id.supercell.com
|
||||||
|
185.246.223.127 security.id.supercell.com
|
||||||
|
45.95.233.23 accounts.supercell.com
|
||||||
|
185.246.223.127 game-assets.clashroyaleapp.com
|
||||||
|
185.246.223.127 game-assets.clashofclans.com
|
||||||
|
185.246.223.127 clashofclans.inbox.supercell.com
|
||||||
|
185.246.223.127 game-assets.brawlstarsgame.com
|
||||||
|
185.246.223.127 store.supercell.com
|
||||||
|
45.95.233.23 game.clashroyaleapp.com
|
||||||
|
64.188.98.242 gamea.clashofclans.com
|
||||||
|
185.246.223.127 game.brawlstarsgame.com
|
||||||
|
108.61.167.26 game.squadbustersgame.com
|
||||||
|
45.95.233.23 game.mocogame.com
|
||||||
|
|
||||||
|
# DeepL
|
||||||
|
185.246.223.127 deepl.com
|
||||||
|
185.246.223.127 www.deepl.com
|
||||||
|
185.246.223.127 www2.deepl.com
|
||||||
|
185.246.223.127 login-wall.deepl.com
|
||||||
|
185.246.223.127 w.deepl.com
|
||||||
|
185.246.223.127 s.deepl.com
|
||||||
|
185.246.223.127 dict.deepl.com
|
||||||
|
185.246.223.127 ita-free.www.deepl.com
|
||||||
|
185.246.223.127 write-free.www.deepl.com
|
||||||
|
185.246.223.127 experimentation.deepl.com
|
||||||
|
185.246.223.127 experimentation-grpc.deepl.com
|
||||||
|
185.246.223.127 ita-free.app.deepl.com
|
||||||
|
185.246.223.127 shield.deepl.com
|
||||||
|
185.246.223.127 ott.deepl.com
|
||||||
|
185.246.223.127 api-free.deepl.com
|
||||||
|
185.246.223.127 backend.deepl.com
|
||||||
|
185.246.223.127 clearance.deepl.com
|
||||||
|
185.246.223.127 errortracking.deepl.com
|
||||||
|
185.246.223.127 auth.deepl.com
|
||||||
|
185.246.223.127 oneshot-free.www.deepl.com
|
||||||
|
|
||||||
|
# Deezer
|
||||||
|
185.246.223.127 deezer.com
|
||||||
|
185.246.223.127 www.deezer.com
|
||||||
|
185.246.223.127 dzcdn.net
|
||||||
|
185.246.223.127 payment.deezer.com
|
||||||
|
|
||||||
|
# Weather.com
|
||||||
|
185.246.223.127 weather.com
|
||||||
|
185.246.223.127 upsx.weather.com
|
||||||
|
|
||||||
|
# Guilded
|
||||||
|
204.12.192.219 guilded.gg
|
||||||
|
204.12.192.219 www.guilded.gg
|
||||||
|
|
||||||
|
# Fitbit
|
||||||
|
185.246.223.127 api.fitbit.com
|
||||||
|
185.246.223.127 fitbit-pa.googleapis.com
|
||||||
|
185.246.223.127 fitbitvestibuleshim-pa.googleapis.com
|
||||||
|
185.246.223.127 fitbit.google.com
|
||||||
|
|
||||||
|
# Claude
|
||||||
|
185.246.223.127 claude.ai
|
||||||
|
185.246.223.127 console.anthropic.com
|
||||||
|
185.246.223.127 auth.anthropic.com
|
||||||
|
185.246.223.127 api.anthropic.com
|
||||||
|
|
||||||
|
#4PDA
|
||||||
|
185.246.223.127 4pda.to
|
||||||
|
185.246.223.127 app.4pda.to
|
||||||
|
185.246.223.127 s.4pda.to
|
||||||
|
185.246.223.127 appbk.4pda.to
|
||||||
|
|
||||||
|
# Trae.ai
|
||||||
|
185.246.223.127 trae-api-sg.mchost.guru
|
||||||
|
185.246.223.127 api.trae.ai
|
||||||
|
185.246.223.127 api-sg-central.trae.ai
|
||||||
|
185.246.223.127 api16-normal-alisg.mchost.guru
|
||||||
|
|
||||||
|
# Другое:
|
||||||
|
185.246.223.127 www.notion.so
|
||||||
|
50.7.85.222 www.canva.com
|
||||||
|
185.246.223.127 www.intel.com
|
||||||
|
185.246.223.127 www.dell.com
|
||||||
|
50.7.85.219 www.tiktok.com # Только на сайте. Приложение определяет регион по оператору, а не по IP. Поэтому есть моды.
|
||||||
|
142.54.189.106 web.archive.org # Блокирует от российских IP некоторые сайты
|
||||||
|
185.246.223.127 developer.nvidia.com
|
||||||
|
107.150.34.99 builds.parsec.app
|
||||||
|
185.246.223.127 tria.ge
|
||||||
|
185.246.223.127 api.imgur.com
|
||||||
|
45.95.233.23 www.dyson.com
|
||||||
|
45.95.233.23 www.dyson.fr
|
||||||
|
45.95.233.23 usher.ttvnw.net
|
||||||
|
64.188.98.242 api.manus.im
|
||||||
|
185.246.223.127 profile.broadcom.com
|
||||||
|
45.95.233.23 test.dns.malw.link
|
||||||
|
45.95.233.23 eu.posthog.com
|
||||||
|
185.246.223.127 www.qwant.com
|
||||||
|
185.246.223.127 guidedhacking.com
|
||||||
|
|
||||||
|
# Блокировка реально плохих сайтов
|
||||||
|
# Скримеры:
|
||||||
|
0.0.0.0 only-fans.uk
|
||||||
|
0.0.0.0 only-fans.me
|
||||||
|
0.0.0.0 onlyfans.wtf
|
||||||
|
# IP Logger'ы:
|
||||||
|
0.0.0.0 iplogger.org
|
||||||
|
0.0.0.0 wl.gl
|
||||||
|
0.0.0.0 ed.tc
|
||||||
|
0.0.0.0 bc.ax
|
||||||
|
0.0.0.0 maper.info
|
||||||
|
0.0.0.0 2no.co
|
||||||
|
0.0.0.0 yip.su
|
||||||
|
0.0.0.0 iplis.ru
|
||||||
|
0.0.0.0 ezstat.ru
|
||||||
|
0.0.0.0 iplog.co
|
||||||
|
0.0.0.0 grabify.org
|
||||||
|
# Мусор/реклама:
|
||||||
|
0.0.0.0 log16-platform-ycru.tiktokv.com
|
||||||
|
0.0.0.0 adfox.yandex.ru
|
||||||
|
0.0.0.0 adfstat.yandex.ru
|
||||||
|
0.0.0.0 ads-api.tiktok.com
|
||||||
|
0.0.0.0 ads-api.twitter.com
|
||||||
|
0.0.0.0 ads-dev.pinterest.com
|
||||||
|
0.0.0.0 ads-sg.tiktok.com
|
||||||
|
0.0.0.0 an.yandex.ru
|
||||||
|
0.0.0.0 appmetrica.yandex.ru
|
||||||
|
0.0.0.0 mc.yandex.ru
|
||||||
|
0.0.0.0 amc.yandex.ru
|
||||||
|
### dns.malw.link: end hosts file
|
||||||
@@ -6,19 +6,25 @@ ui_print " / / (_| | |_) | | | __/ |_| |_ "
|
|||||||
ui_print " /___\__,_| .__/|_| \\___|\__|\__|"
|
ui_print " /___\__,_| .__/|_| \\___|\__|\__|"
|
||||||
ui_print " | | "
|
ui_print " | | "
|
||||||
ui_print " |_| "
|
ui_print " |_| "
|
||||||
ui_print "(!) To download app, use Telegram chat"
|
ui_print "(!) To download app, use Telegram channel"
|
||||||
ui_print "Module by: egorwhite, Cherret, Huananzhi X99"
|
ui_print "Module by: egor-white, Cherret, Huananzhi X99"
|
||||||
ui_print "Apps by: egorwhite, Cherret"
|
ui_print "App by: egor-white, Cherret"
|
||||||
ui_print "####################"
|
ui_print "####################"
|
||||||
|
|
||||||
ui_print "Unpacking archive..."
|
ui_print "Unpacking archive..."
|
||||||
unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2
|
unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2
|
||||||
|
|
||||||
ui_print "Creating zaprett directory..."
|
ui_print "Creating zaprett directory..."
|
||||||
mkdir /sdcard/zaprett; mkdir /sdcard/zaprett/lists; mkdir /sdcard/zaprett/bin; mkdir /sdcard/zaprett/strategies; touch /sdcard/zaprett/config
|
mkdir /sdcard/zaprett; mkdir /sdcard/zaprett/lists; mkdir /sdcard/zaprett/bin; mkdir /sdcard/zaprett/strategies;
|
||||||
|
|
||||||
ui_print "Filling configuration file..."
|
ui_print "Filling configuration file if not exist..."
|
||||||
echo autorestart=true > /sdcard/zaprett/config; echo activelists=/storage/emulated/0/zaprett/lists/list-youtube.txt >> /sdcard/zaprett/config; echo zaprettdir=/sdcard/zaprett >> /sdcard/zaprett/config; echo strategy="" >> /sdcard/zaprett/config
|
if [ ! -f "/sdcard/zaprett/config" ]; then
|
||||||
|
echo active_lists=/storage/emulated/0/zaprett/lists/list-youtube.txt >> /sdcard/zaprett/config
|
||||||
|
echo active_exclude_lists= >> /sdcard/zaprett/config
|
||||||
|
echo list_type=whitelist
|
||||||
|
echo zaprettdir=/sdcard/zaprett >> /sdcard/zaprett/config
|
||||||
|
echo strategy="" >> /sdcard/zaprett/config
|
||||||
|
fi
|
||||||
|
|
||||||
ui_print "Copying lists and binaries to /sdcard/zaprett..."
|
ui_print "Copying lists and binaries to /sdcard/zaprett..."
|
||||||
cp -r $MODPATH/system/etc/zaprett/. /sdcard/zaprett/
|
cp -r $MODPATH/system/etc/zaprett/. /sdcard/zaprett/
|
||||||
@@ -50,7 +56,7 @@ case "$arch" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
mv $MODPATH/system/bin/$nfqws $MODPATH/system/bin/nfqws
|
mv $MODPATH/system/bin/$nfqws $MODPATH/system/bin/nfqws
|
||||||
rm nfqws_*
|
rm $MODPATH/system/bin/nfqws_*
|
||||||
mkdir $MODPATH/tmp
|
mkdir $MODPATH/tmp
|
||||||
|
|
||||||
ui_print "Setting permissions..."
|
ui_print "Setting permissions..."
|
||||||
@@ -59,4 +65,4 @@ chmod 777 /sdcard/zaprett; chmod 777 $MODPATH/service.sh
|
|||||||
ui_print "Cleaning temp files..."
|
ui_print "Cleaning temp files..."
|
||||||
rm -rf $MODPATH/system/etc/zaprett
|
rm -rf $MODPATH/system/etc/zaprett
|
||||||
|
|
||||||
ui_print "Installation done. Telegram chat: https://t.me/zaprett_module"
|
ui_print "Installation done. Telegram channel: https://t.me/zaprett_module"
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
#!/system/bin/sh
|
#!/system/bin/sh
|
||||||
while [ -z "$(getprop sys.boot_completed)" ]; do sleep 2; done
|
while [ -z "$(getprop sys.boot_completed)" ]; do sleep 2; done
|
||||||
sleep 10
|
if [ -f "/data/adb/modules/zaprett/autostart" ]; then
|
||||||
source /storage/emulated/0/zaprett/config
|
|
||||||
if [ "$autorestart" = "true" ]; then
|
|
||||||
su -c "zaprett start"
|
su -c "zaprett start"
|
||||||
while true; do
|
while true; do
|
||||||
sleep 3600
|
sleep 3600
|
||||||
su -c "zaprett restart"
|
su -c "zaprett restart"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -7,87 +7,76 @@ clear_iptables_rules() {
|
|||||||
iptables -t filter -D FORWARD -j NFQUEUE --queue-num 200 --queue-bypass 2>/dev/null
|
iptables -t filter -D FORWARD -j NFQUEUE --queue-num 200 --queue-bypass 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "$1" == "start" ]; then
|
start_service() {
|
||||||
rm -f /data/adb/modules/zaprett/tmp/*
|
|
||||||
echo "Starting zaprett...";
|
|
||||||
hostlist=""
|
|
||||||
for itm in $(echo "$activelists" | tr ',' ' ' | sort -u); do
|
|
||||||
if [ -f "$itm" ]; then
|
|
||||||
dst="/data/adb/modules/zaprett/tmp/$(basename "$itm")"
|
|
||||||
cp "$itm" "$dst"
|
|
||||||
case "$hostlist" in
|
|
||||||
*"--hostlist=$dst"*) ;;
|
|
||||||
*) hostlist="$hostlist --hostlist=$dst" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
config=""
|
|
||||||
if [[ -n "$strategy" && -f "$strategy" ]]; then
|
|
||||||
config="$(eval "echo \"$(<"$strategy")\"")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z "$config" ]]; then
|
|
||||||
config="--filter-tcp=80 --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new"
|
|
||||||
config="$config --filter-tcp=443 $hostlist --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-tls=${zaprettdir}/bin/tls_clienthello_www_google_com.bin --new"
|
|
||||||
config="$config --filter-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-repeats=6 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new"
|
|
||||||
config="$config --filter-udp=50000-50100 --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-fake-quic=0xC30000000108 --new"
|
|
||||||
config="$config --filter-udp=443 $hostlist --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic=${zaprettdir}/bin/quic_initial_www_google_com.bin --new"
|
|
||||||
config="$config --filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6 $hostlist"
|
|
||||||
|
|
||||||
fi
|
|
||||||
sysctl net.netfilter.nf_conntrack_tcp_be_liberal=1 > /dev/null
|
|
||||||
|
|
||||||
iptables -t mangle -I POSTROUTING -j NFQUEUE --queue-num 200 --queue-bypass
|
|
||||||
iptables -t mangle -I PREROUTING -j NFQUEUE --queue-num 200 --queue-bypass
|
|
||||||
iptables -t filter -A FORWARD -j NFQUEUE --queue-num 200 --queue-bypass
|
|
||||||
|
|
||||||
nfqws --uid=0:0 --qnum=200 $config > /dev/null &
|
|
||||||
echo "zaprett service started!"; return 0;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$1" == "stop" ]; then
|
|
||||||
clear_iptables_rules
|
|
||||||
kill $(pidof nfqws);
|
|
||||||
rm -f /data/adb/modules/zaprett/tmp/*
|
|
||||||
echo "zaprett service stopped!"; return 0; fi;
|
|
||||||
|
|
||||||
if [ "$1" == "status" ]; then
|
|
||||||
pidof "nfqws" > /dev/null && echo "zaprett is working" || echo "zaprett is stopped"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$1" == "restart" ]; then
|
|
||||||
echo "Stopping zaprett..."
|
|
||||||
clear_iptables_rules
|
|
||||||
kill "$(pidof nfqws)" 2>/dev/null
|
|
||||||
rm -f /data/adb/modules/zaprett/tmp/*
|
rm -f /data/adb/modules/zaprett/tmp/*
|
||||||
echo "Starting zaprett..."
|
echo "Starting zaprett..."
|
||||||
hostlist=""
|
|
||||||
for itm in $(echo "$activelists" | tr ',' ' ' | sort -u); do
|
hostlist=""
|
||||||
if [ -f "$itm" ]; then
|
ipset=""
|
||||||
dst="/data/adb/modules/zaprett/tmp/$(basename "$itm")"
|
|
||||||
cp "$itm" "$dst"
|
case "$list_type" in
|
||||||
case "$hostlist" in
|
whitelist)
|
||||||
*"--hostlist=$dst"*) ;;
|
lists="$active_lists"
|
||||||
*) hostlist="$hostlist --hostlist=$dst" ;;
|
ipsets="$active_ipsets"
|
||||||
esac
|
opt="--hostlist"
|
||||||
|
ipopt="--ipset"
|
||||||
|
;;
|
||||||
|
blacklist)
|
||||||
|
lists="$active_exclude_lists"
|
||||||
|
ipsets="$active_exclude_ipsets"
|
||||||
|
opt="--hostlist-exclude"
|
||||||
|
ipopt="--ipset-exclude"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown list-type: $list_type" >&2
|
||||||
|
lists=""
|
||||||
|
ipsets=""
|
||||||
|
opt=""
|
||||||
|
ipopt=""
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
if [ -n "$lists" ] && [ -n "$opt" ]; then
|
||||||
|
for itm in $(echo "$lists" | tr ',' ' ' | sort -u); do
|
||||||
|
if [ -f "$itm" ]; then
|
||||||
|
dst="/data/adb/modules/zaprett/tmp/$(basename "$itm")"
|
||||||
|
cp "$itm" "$dst"
|
||||||
|
case "$hostlist" in
|
||||||
|
*"$opt=$dst"*) ;;
|
||||||
|
*) hostlist="$hostlist $opt=$dst" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
|
|
||||||
config=""
|
if [ -n "$ipsets" ] && [ -n "$ipopt" ]; then
|
||||||
if [[ -n "$strategy" && -f "$strategy" ]]; then
|
for ipt in $(echo "$ipsets" | tr ',' ' ' | sort -u); do
|
||||||
config="$(eval "echo \"$(<"$strategy")\"")"
|
if [ -f "$ipt" ]; then
|
||||||
fi
|
dst="/data/adb/modules/zaprett/tmp/$(basename "$ipt")"
|
||||||
|
cp "$ipt" "$dst"
|
||||||
|
case "$ipset" in
|
||||||
|
*"$ipopt=$dst"*) ;;
|
||||||
|
*) ipset="$ipset $ipopt=$dst" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z "$config" ]]; then
|
config=""
|
||||||
config="--filter-tcp=80 --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new"
|
if [[ -n "$strategy" && -f "$strategy" ]]; then
|
||||||
config="$config --filter-tcp=443 $hostlist --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-tls=${zaprettdir}/bin/tls_clienthello_www_google_com.bin --new"
|
config="$(eval "echo \"$(<"$strategy")\"")"
|
||||||
config="$config --filter-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-repeats=6 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new"
|
fi
|
||||||
config="$config --filter-udp=50000-50100 --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-fake-quic=0xC30000000108 --new"
|
|
||||||
config="$config --filter-udp=443 $hostlist --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic=${zaprettdir}/bin/quic_initial_www_google_com.bin --new"
|
if [[ -z "$config" ]]; then
|
||||||
config="$config --filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6 $hostlist"
|
config="--filter-tcp=80 --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new"
|
||||||
|
config="$config --filter-tcp=443 $hostlist --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig,badsum --dpi-desync-fake-tls=${zaprettdir}/bin/tls_clienthello_www_google_com.bin --new"
|
||||||
|
config="$config --filter-tcp=80,443 --dpi-desync=fake,disorder2 --dpi-desync-repeats=6 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig,badsum $hostlist --new"
|
||||||
|
config="$config --filter-udp=50000-50100 --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-fake-quic=0xC30000000108 --new"
|
||||||
|
config="$config --filter-udp=443 $hostlist --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic=${zaprettdir}/bin/quic_initial_www_google_com.bin --new"
|
||||||
|
config="$config --filter-udp=443 --dpi-desync=fake --dpi-desync-repeats=6 $hostlist"
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
|
||||||
sysctl net.netfilter.nf_conntrack_tcp_be_liberal=1 > /dev/null
|
sysctl net.netfilter.nf_conntrack_tcp_be_liberal=1 > /dev/null
|
||||||
|
|
||||||
iptables -t mangle -I POSTROUTING -j NFQUEUE --queue-num 200 --queue-bypass
|
iptables -t mangle -I POSTROUTING -j NFQUEUE --queue-num 200 --queue-bypass
|
||||||
@@ -95,11 +84,37 @@ fi
|
|||||||
iptables -t filter -A FORWARD -j NFQUEUE --queue-num 200 --queue-bypass
|
iptables -t filter -A FORWARD -j NFQUEUE --queue-num 200 --queue-bypass
|
||||||
|
|
||||||
nfqws --uid=0:0 --qnum=200 $config > /dev/null &
|
nfqws --uid=0:0 --qnum=200 $config > /dev/null &
|
||||||
|
echo "zaprett service started!"
|
||||||
|
}
|
||||||
|
|
||||||
|
stop_service() {
|
||||||
|
echo "Stopping zaprett..."
|
||||||
|
clear_iptables_rules
|
||||||
|
kill "$(pidof nfqws)" 2>/dev/null
|
||||||
|
rm -f /data/adb/modules/zaprett/tmp/*
|
||||||
|
echo "zaprett service stopped!"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ "$1" == "start" ]; then
|
||||||
|
start_service
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == "stop" ]; then
|
||||||
|
stop_service
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == "status" ]; then
|
||||||
|
pidof "nfqws" > /dev/null && echo "zaprett is working" || echo "zaprett is stopped"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == "restart" ]; then
|
||||||
|
stop_service
|
||||||
|
start_service
|
||||||
echo "zaprett service restarted!"
|
echo "zaprett service restarted!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" == "help" ]; then
|
if [ "$1" == "help" ]; then
|
||||||
echo -e "Помощь по модулю zaprett:\nzaprett start - запуск сервиса\nzaprett stop - остановка сервиса\nzaprett restart - перезапуск сервиса\nzaprett module-ver - версия модуля\nzaprett bin-ver - версия бинарных файлов"
|
echo -e "Помощь по модулю zaprett:\nzaprett start - запуск сервиса\nzaprett stop - остановка сервиса\nzaprett restart - перезапуск сервиса\nzaprett status - статус сервиса\nzaprett module-ver - версия модуля\nzaprett bin-ver - версия бинарных файлов\nzaprett autostart - переключение автозапуска модуля\nzaprett get-autostart - получить активен ли автозапуск"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" == "module-ver" ]; then
|
if [ "$1" == "module-ver" ]; then
|
||||||
@@ -107,7 +122,27 @@ if [ "$1" == "module-ver" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$1" == "bin-ver" ]; then
|
if [ "$1" == "bin-ver" ]; then
|
||||||
nfqws --version | grep -o 'version v[0-9]\+' | sed 's/version v//'
|
nfqws --version | grep -o 'version v[0-9.]*' | head -n1 | cut -d' ' -f2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == "autostart" ]; then
|
||||||
|
FILE="/data/adb/modules/zaprett/autostart"
|
||||||
|
if [ -f "$FILE" ]; then
|
||||||
|
rm "$FILE"
|
||||||
|
echo "false"
|
||||||
|
else
|
||||||
|
touch "$FILE"
|
||||||
|
echo "true"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == "get-autostart" ]; then
|
||||||
|
FILE="/data/adb/modules/zaprett/autostart"
|
||||||
|
if [ -f "$FILE" ]; then
|
||||||
|
echo "true"
|
||||||
|
else
|
||||||
|
echo "false"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z $1 ]]; then
|
if [[ -z $1 ]]; then
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
127.0.0.1 localhost
|
|
||||||
::1 ip6-localhost
|
|
||||||
89.108.98.20 chatgpt.com
|
|
||||||
134.0.118.88 ab.chatgpt.com
|
|
||||||
89.108.98.20 auth.openai.com
|
|
||||||
89.108.98.20 auth0.openai.com
|
|
||||||
89.108.98.20 platform.openai.com
|
|
||||||
89.108.98.20 cdn.oaistatic.com
|
|
||||||
89.108.98.20 files.oaiusercontent.com
|
|
||||||
89.108.98.20 cdn.auth0.com
|
|
||||||
89.108.98.20 tcr9i.chat.openai.com
|
|
||||||
89.108.98.20 webrtc.chatgpt.com
|
|
||||||
89.108.98.20 android.chat.openai.com
|
|
||||||
89.108.98.20 gemini.google.com
|
|
||||||
89.108.98.20 aistudio.google.com
|
|
||||||
89.108.98.20 ai.google
|
|
||||||
89.108.98.20 assistant-s3-pa.googleapis.com
|
|
||||||
89.108.98.20 generativelanguage.googleapis.com
|
|
||||||
89.108.98.20 alkalimakersuite-pa.clients6.google.com
|
|
||||||
64.233.162.188 mtalk.google.com
|
|
||||||
89.108.98.20 copilot.microsoft.com
|
|
||||||
89.108.98.20 sydney.bing.com
|
|
||||||
89.108.98.20 edgeservices.bing.com
|
|
||||||
89.108.98.20 claude.ai
|
|
||||||
89.108.98.20 aitestkitchen.withgoogle.com
|
|
||||||
89.108.98.20 aisandbox-pa.googleapis.com
|
|
||||||
89.108.98.20 o.pki.goog
|
|
||||||
89.108.98.20 labs.google
|
|
||||||
89.108.98.20 notebooklm.google
|
|
||||||
89.108.98.20 notebooklm.google.com
|
|
||||||
89.108.98.20 www.notion.so
|
|
||||||
89.108.98.20 www.googleapis.com
|
|
||||||
89.108.98.20 proactivebackend-pa.googleapis.com
|
|
||||||
89.108.98.20 grok.com
|
|
||||||
89.108.98.20 assets.grok.com
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"version": "4.5",
|
"version": "5.1",
|
||||||
"versionCode": 45,
|
"versionCode": 51,
|
||||||
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/zaprett.zip",
|
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/5.1.0/zaprett.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"version": "4.5",
|
"version": "100",
|
||||||
"versionCode": 45,
|
"versionCode": 100,
|
||||||
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/zaprett-extended.zip",
|
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/4.7.0/zaprett-hosts.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
|
|||||||
6
update_hosts.json
Normal file
6
update_hosts.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"version": "5.1",
|
||||||
|
"versionCode": 51,
|
||||||
|
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/5.1.0/zaprett-hosts.zip",
|
||||||
|
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"version": "4.5",
|
"version": "5.1",
|
||||||
"versionCode": 45,
|
"versionCode": 51,
|
||||||
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/zaprett-tv.zip",
|
"zipUrl": "https://github.com/egor-white/zaprett/releases/download/5.1.0/zaprett-tv.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user