v0.3.43

Issue #91 , Issue #94

README.md

@@ -39,9 +39,9 @@ sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/mai
 Скачать пакеты `podkop_*.ipk` и `luci-app-podkop_*.ipk` из релиза. `opkg install` сначала первый, потом второй.
 
 # Обновление
-Та же самая команда, что для установки. Скрипт обнаружит уже установленный podkop и предложит обновиться.
+Та же самая команда, что для установки. Но с флагом **upgrade** сразу передёт к обновлению.
 ```
-sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/install.sh)
+sh <(wget -qO- https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/install.sh) --upgrade
 ```
 
 # Удаление
@@ -76,11 +76,7 @@ Luci: Services/podkop
 # ToDo
 Этот раздел не означает задачи, которые нужно брать и делать. Это общий список хотелок. Если вы хотите помочь, пожалуйста, спросите сначала в телеграмме.
 
-- [ ] Не грузится диагностика полностью при одной нерабочей комманде. Подумать как это можно дебажить легко. https://t.me/itdogchat/142500/378956
-- [ ] При добавлении github ломается скачивание скрипта установки и любые другие скрипты с github соотвественно. Скорее всего нужно делать опцией добавление в nft самого роутера как src.
-
-Диагностика
-- [x] Используется ли warp. Сравнивать endpoint с префиксами CF
+Основные задачи в issues.
 
 Низкий приоритет
 - [ ] Галочка, которая режет доступ к doh серверам
@@ -103,6 +99,16 @@ Luci: Services/podkop
 ```
 Без этого podkop работать не будет.
 
+Если нужно до определённых доменов ходить через определённый DNS-сервер, то конфиг выглядит так
+```
+	option noresolv '1'
+	option cachesize '0'
+	list server '/itdog.info/1.1.1.1'
+	list server '127.0.0.42'
+```
+
+В этом случае домен и все субдомены ресурса itdog.info будут резолвится через DNS-сервер 1.1.1.1
+
 # Bad WAN
 При использовании опции **Interface monitoring** необходимо рестартовать podkop, чтоб init.d подхватил это
 ```

install.sh

@@ -5,10 +5,17 @@ REPO="https://api.github.com/repos/itdoginfo/podkop/releases/latest"
 IS_SHOULD_RESTART_NETWORK=
 DOWNLOAD_DIR="/tmp/podkop"
 COUNT=3
+UPGRADE=0
 
 rm -rf "$DOWNLOAD_DIR"
 mkdir -p "$DOWNLOAD_DIR"
 
+for arg in "$@"; do
+    if [ "$arg" = "--upgrade" ]; then
+        UPGRADE=1
+    fi
+done
+
 main() {
     check_system
     sing_box
@@ -16,11 +23,16 @@ main() {
     opkg update
   
     if [ -f "/etc/init.d/podkop" ]; then
-        printf "\033[32;1mPodkop is already installed. Just upgrade it? (y/n)\033[0m\n"
+        if [ "$UPGRADE" -eq 1 ]; then
+            echo "Upgraded podkop with flag..."
+            break
+        else
+            printf "\033[32;1mPodkop is already installed. Just upgrade it?\033[0m\n"
             printf "\033[32;1my - Only upgrade podkop\033[0m\n"
             printf "\033[32;1mn - Upgrade and install tunnels (WG, AWG, OpenVPN, OC)\033[0m\n"
 
             while true; do
+                printf "\033[32;1mEnter (y/n): \033[0m"
                 read -r -p '' UPDATE
                 case $UPDATE in
                 y)
@@ -38,6 +50,7 @@ main() {
                     ;;
                 esac
             done
+        fi
     else
         echo "Installed podkop..."
         add_tunnel
@@ -433,7 +446,7 @@ check_system() {
                 case $DNSPROXY in
 
                 yes|y|Y|yes)
-                    opkg remove --force-depends luci-app-https-dns-proxy https-dns-proxy
+                    opkg remove --force-depends luci-app-https-dns-proxy https-dns-proxy luci-i18n-https-dns-proxy*
                     break
                     ;;
                 *)

luci-app-podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.3.41
+PKG_VERSION:=0.3.43
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app

luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js

@@ -224,9 +224,9 @@ function createConfigSection(section, map, network) {
 
                 let params = new URLSearchParams(queryString.split('#')[0]);
                 let type = params.get('type');
-                const validTypes = ['tcp', 'raw', 'udp', 'grpc', 'http'];
+                const validTypes = ['tcp', 'raw', 'udp', 'grpc', 'http', 'ws'];
                 if (!type || !validTypes.includes(type)) {
-                    return _('Invalid VLESS URL: type must be one of tcp, raw, udp, grpc, http');
+                    return _('Invalid VLESS URL: type must be one of tcp, raw, udp, grpc, http, ws');
                 }
 
                 let security = params.get('security');
@@ -306,6 +306,7 @@ function createConfigSection(section, map, network) {
     o.value('hdrezka', 'HDRezka');
     o.value('tiktok', 'Tik-Tok');
     o.value('telegram', 'Telegram');
+    o.value('cloudflare', 'Cloudflare');
     o.depends('domain_list_enabled', '1');
     o.rmempty = false;
     o.ucisection = s.section;
@@ -337,13 +338,13 @@ function createConfigSection(section, map, network) {
             }
 
             if (newValues.includes('russia_inside')) {
-                const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram'];
+                const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram', 'cloudflare'];
                 const removedServices = newValues.filter(v => !allowedWithRussiaInside.includes(v));
                 if (removedServices.length > 0) {
                     newValues = newValues.filter(v => allowedWithRussiaInside.includes(v));
                     notifications.push(E('p', { class: 'alert-message warning' }, [
                         E('strong', {}, _('Russia inside restrictions')), E('br'),
-                        _('Warning: Russia inside can only be used with Meta, Twitter, Discord, and Telegram. %s already in Russia inside and have been removed from selection.')
+                        _('Warning: Russia inside can only be used with Meta, Twitter, Discord, Cloudflare and Telegram. %s already in Russia inside and have been removed from selection.')
                             .format(removedServices.join(', '))
                     ]));
                 }
@@ -620,9 +621,61 @@ const createModalContent = (title, content) => {
     ];
 };
 
+// Add IP masking function before showConfigModal
+const maskIP = (ip) => {
+    if (!ip) return '';
+    const parts = ip.split('.');
+    if (parts.length !== 4) return ip;
+    return ['XX', 'XX', 'XX', parts[3]].join('.');
+};
+
 const showConfigModal = async (command, title) => {
     const res = await safeExec('/usr/bin/podkop', [command]);
-    const formattedOutput = formatDiagnosticOutput(res.stdout || _('No output'));
+    let formattedOutput = formatDiagnosticOutput(res.stdout || _('No output'));
+
+    if (command === 'global_check') {
+        try {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), 10000);
+
+            const response = await fetch('https://fakeip.tech-domain.club/check', { signal: controller.signal });
+            const data = await response.json();
+            clearTimeout(timeoutId);
+
+
+            if (data.fakeip === true) {
+                formattedOutput += '\n✅ ' + _('FakeIP is working in browser!') + '\n';
+            } else {
+                formattedOutput += '❌ ' + _('FakeIP is not working in browser') + '\n';
+                formattedOutput += _('Check DNS server on current device (PC, phone)') + '\n';
+                formattedOutput += _('Its must be router!') + '\n';
+            }
+
+            // Bypass check
+            const bypassResponse = await fetch('https://fakeip.tech-domain.club/check', { signal: controller.signal });
+            const bypassData = await bypassResponse.json();
+            const bypassResponse2 = await fetch('https://ip.tech-domain.club/check', { signal: controller.signal });
+            const bypassData2 = await bypassResponse2.json();
+
+            formattedOutput += '━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
+
+            if (bypassData.IP && bypassData2.IP && bypassData.IP !== bypassData2.IP) {
+                formattedOutput += '✅ ' + _('Proxy working correctly') + '\n';
+                formattedOutput += _('Direct IP: ') + maskIP(bypassData.IP) + '\n';
+                formattedOutput += _('Proxy IP: ') + maskIP(bypassData2.IP) + '\n';
+            } else if (bypassData.IP === bypassData2.IP) {
+                formattedOutput += '❌ ' + _('Proxy is not working - same IP for both domains') + '\n';
+                formattedOutput += _('IP: ') + maskIP(bypassData.IP) + '\n';
+            } else {
+                formattedOutput += '❌ ' + _('Proxy check failed') + '\n';
+            }
+
+
+        } catch (error) {
+            formattedOutput += '\n❌ ' + _('Check failed: ') + (error.name === 'AbortError' ? _('timeout') : error.message) + '\n';
+        }
+    }
+
     ui.showModal(_(title), createModalContent(_(title), formattedOutput));
 };
 
@@ -666,16 +719,23 @@ const ButtonFactory = {
 };
 
 // Status Panel Factory
-const createStatusPanel = (title, status, buttons) => {
+const createStatusPanel = (title, status, buttons, extraData = {}) => {
     const headerContent = [
         E('strong', {}, _(title)),
         status && E('br'),
         status && E('span', {
-            'style': `color: ${status.running ? STATUS_COLORS.SUCCESS : STATUS_COLORS.ERROR}`
+            'style': `color: ${title === 'Sing-box Status' ?
+                (status.running && !status.enabled ? STATUS_COLORS.SUCCESS : STATUS_COLORS.ERROR) :
+                title === 'Podkop Status' ?
+                    (status.enabled ? STATUS_COLORS.SUCCESS : STATUS_COLORS.ERROR) :
+                    (status.running ? STATUS_COLORS.SUCCESS : STATUS_COLORS.ERROR)
+                }`
         }, [
-            status.running ? '✔' : '✘',
-            ' ',
-            status.status
+            title === 'Sing-box Status' ?
+                (status.running && !status.enabled ? '✔ running' : '✘ ' + status.status) :
+                title === 'Podkop Status' ?
+                    (status.enabled ? '✔ enabled' : '✘ disabled') :
+                    (status.running ? '✔' : '✘') + ' ' + status.status
         ])
     ].filter(Boolean);
 
@@ -687,7 +747,80 @@ const createStatusPanel = (title, status, buttons) => {
         E('div', {
             'class': 'panel-body',
             'style': 'display: flex; flex-direction: column; gap: 8px;'
-        }, buttons)
+        }, title === 'Podkop Status' ? [
+            ButtonFactory.createActionButton({
+                label: 'Restart Podkop',
+                type: 'apply',
+                action: 'restart',
+                reload: true
+            }),
+            ButtonFactory.createInitActionButton({
+                label: status.enabled ? 'Disable Podkop' : 'Enable Podkop',
+                type: status.enabled ? 'remove' : 'apply',
+                action: status.enabled ? 'disable' : 'enable',
+                reload: true
+            }),
+            ButtonFactory.createModalButton({
+                label: _('Global check'),
+                command: 'global_check',
+                title: _('Click here for all the info')
+            }),
+            ButtonFactory.createModalButton({
+                label: 'View Logs',
+                command: 'check_logs',
+                title: 'Podkop Logs'
+            }),
+            ButtonFactory.createModalButton({
+                label: _('Update Lists'),
+                command: 'list_update',
+                title: _('Lists Update Results')
+            })
+        ] : title === _('FakeIP Status') ? [
+            E('div', { style: 'margin-bottom: 10px;' }, [
+                E('div', { style: 'margin-bottom: 5px;' }, [
+                    E('span', { style: `color: ${extraData.fakeipStatus?.color}` }, [
+                        extraData.fakeipStatus?.state === 'working' ? '✔' : extraData.fakeipStatus?.state === 'not_working' ? '✘' : '!',
+                        ' ',
+                        extraData.fakeipStatus?.state === 'working' ? _('works in browser') : _('not works in browser')
+                    ])
+                ]),
+                E('div', {}, [
+                    E('span', { style: `color: ${extraData.fakeipCLIStatus?.color}` }, [
+                        extraData.fakeipCLIStatus?.state === 'working' ? '✔' : extraData.fakeipCLIStatus?.state === 'not_working' ? '✘' : '!',
+                        ' ',
+                        extraData.fakeipCLIStatus?.state === 'working' ? _('works on router') : _('not works on router')
+                    ])
+                ])
+            ]),
+            E('div', { style: 'margin-bottom: 10px;' }, [
+                E('div', { style: 'margin-bottom: 5px;' }, [
+                    E('strong', {}, _('DNS Status')),
+                    E('br'),
+                    E('span', { style: `color: ${extraData.dnsStatus?.remote?.color}` }, [
+                        extraData.dnsStatus?.remote?.state === 'available' ? '✔' : extraData.dnsStatus?.remote?.state === 'unavailable' ? '✘' : '!',
+                        ' ',
+                        extraData.dnsStatus?.remote?.message
+                    ]),
+                    E('br'),
+                    E('span', { style: `color: ${extraData.dnsStatus?.local?.color}` }, [
+                        extraData.dnsStatus?.local?.state === 'available' ? '✔' : extraData.dnsStatus?.local?.state === 'unavailable' ? '✘' : '!',
+                        ' ',
+                        extraData.dnsStatus?.local?.message
+                    ])
+                ])
+            ]),
+            E('div', { style: 'margin-bottom: 10px;' }, [
+                E('div', { style: 'margin-bottom: 5px;' }, [
+                    E('strong', {}, extraData.configName),
+                    E('br'),
+                    E('span', { style: `color: ${extraData.bypassStatus?.color}` }, [
+                        extraData.bypassStatus?.state === 'working' ? '✔' : extraData.bypassStatus?.state === 'not_working' ? '✘' : '!',
+                        ' ',
+                        extraData.bypassStatus?.message
+                    ])
+                ])
+            ])
+        ] : buttons)
     ]);
 };
 
@@ -697,12 +830,6 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
         E('div', { 'class': 'table', style: 'display: flex; gap: 20px;' }, [
             // Podkop Status Panel
             createStatusPanel('Podkop Status', podkopStatus, [
-                ButtonFactory.createActionButton({
-                    label: podkopStatus.running ? 'Stop Podkop' : 'Start Podkop',
-                    type: podkopStatus.running ? 'remove' : 'apply',
-                    action: podkopStatus.running ? 'stop' : 'start',
-                    reload: true
-                }),
                 ButtonFactory.createActionButton({
                     label: 'Restart Podkop',
                     type: 'apply',
@@ -716,9 +843,9 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
                     reload: true
                 }),
                 ButtonFactory.createModalButton({
-                    label: 'Show Config',
-                    command: 'show_config',
-                    title: 'Podkop Configuration'
+                    label: _('Global check'),
+                    command: 'global_check',
+                    title: _('Click here for all the info')
                 }),
                 ButtonFactory.createModalButton({
                     label: 'View Logs',
@@ -761,58 +888,14 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
                 })
             ]),
 
-            // FakeIP Status Panel with both browser and router checks
-            createStatusPanel(_('FakeIP Status'), null, [
-                E('div', { style: 'margin-bottom: 10px;' }, [
-                    E('div', { style: 'margin-bottom: 5px;' }, [
-                        E('span', { style: `color: ${fakeipStatus.color}` }, [
-                            fakeipStatus.state === 'working' ? '✔' : fakeipStatus.state === 'not_working' ? '✘' : '!',
-                            ' ',
-                            fakeipStatus.state === 'working' ? _('works in browser') : _('not works in browser')
-                        ])
-                    ]),
-                    E('div', {}, [
-                        E('span', { style: `color: ${fakeipCLIStatus.color}` }, [
-                            fakeipCLIStatus.state === 'working' ? '✔' : fakeipCLIStatus.state === 'not_working' ? '✘' : '!',
-                            ' ',
-                            fakeipCLIStatus.state === 'working' ? _('works on router') : _('not works on router')
-                        ])
-                    ])
-                ]),
-                E('div', { style: 'margin-bottom: 10px;' }, [
-                    E('div', { style: 'margin-bottom: 5px;' }, [
-                        E('strong', {}, _('DNS Status')),
-                        E('br'),
-                        E('span', { style: `color: ${dnsStatus.remote.color}` }, [
-                            dnsStatus.remote.state === 'available' ? '✔' : dnsStatus.remote.state === 'unavailable' ? '✘' : '!',
-                            ' ',
-                            dnsStatus.remote.message
-                        ]),
-                        E('br'),
-                        E('span', { style: `color: ${dnsStatus.local.color}` }, [
-                            dnsStatus.local.state === 'available' ? '✔' : dnsStatus.local.state === 'unavailable' ? '✘' : '!',
-                            ' ',
-                            dnsStatus.local.message
-                        ])
-                    ])
-                ]),
-                E('div', { style: 'margin-bottom: 10px;' }, [
-                    E('div', { style: 'margin-bottom: 5px;' }, [
-                        E('strong', {}, configName),
-                        E('br'),
-                        E('span', { style: `color: ${bypassStatus.color}` }, [
-                            bypassStatus.state === 'working' ? '✔' : bypassStatus.state === 'not_working' ? '✘' : '!',
-                            ' ',
-                            bypassStatus.message
-                        ])
-                    ])
-                ]),
-                ButtonFactory.createModalButton({
-                    label: _('Global check'),
-                    command: 'global_check',
-                    title: _('Click here for all the info')
-                })
-            ]),
+            // FakeIP Status Panel
+            createStatusPanel(_('FakeIP Status'), null, null, {
+                fakeipStatus,
+                fakeipCLIStatus,
+                dnsStatus,
+                bypassStatus,
+                configName
+            }),
 
             // Version Information Panel
             createStatusPanel(_('Version Information'), null, [
@@ -1349,32 +1432,67 @@ return view.extend({
 
         async function updateDiagnostics() {
             try {
-                const [
-                    podkopStatus,
-                    singboxStatus,
-                    podkop,
-                    luci,
-                    singbox,
-                    system,
-                    fakeipStatus,
-                    fakeipCLIStatus,
-                    dnsStatus,
-                    bypassStatus
-                ] = await Promise.all([
-                    safeExec('/usr/bin/podkop', ['get_status']),
-                    safeExec('/usr/bin/podkop', ['get_sing_box_status']),
-                    safeExec('/usr/bin/podkop', ['show_version']),
-                    safeExec('/usr/bin/podkop', ['show_luci_version']),
-                    safeExec('/usr/bin/podkop', ['show_sing_box_version']),
-                    safeExec('/usr/bin/podkop', ['show_system_info']),
-                    checkFakeIP(),
-                    checkFakeIPCLI(),
-                    checkDNSAvailability(),
-                    checkBypass()
-                ]);
+                const results = {
+                    podkopStatus: null,
+                    singboxStatus: null,
+                    podkop: null,
+                    luci: null,
+                    singbox: null,
+                    system: null,
+                    fakeipStatus: null,
+                    fakeipCLIStatus: null,
+                    dnsStatus: null,
+                    bypassStatus: null
+                };
 
-                const parsedPodkopStatus = JSON.parse(podkopStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}');
-                const parsedSingboxStatus = JSON.parse(singboxStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}');
+                // Perform all checks independently of each other
+                const checks = [
+                    safeExec('/usr/bin/podkop', ['get_status'])
+                        .then(result => results.podkopStatus = result)
+                        .catch(() => results.podkopStatus = { stdout: '{"enabled":0,"status":"error"}' }),
+
+                    safeExec('/usr/bin/podkop', ['get_sing_box_status'])
+                        .then(result => results.singboxStatus = result)
+                        .catch(() => results.singboxStatus = { stdout: '{"running":0,"enabled":0,"status":"error"}' }),
+
+                    safeExec('/usr/bin/podkop', ['show_version'])
+                        .then(result => results.podkop = result)
+                        .catch(() => results.podkop = { stdout: 'error' }),
+
+                    safeExec('/usr/bin/podkop', ['show_luci_version'])
+                        .then(result => results.luci = result)
+                        .catch(() => results.luci = { stdout: 'error' }),
+
+                    safeExec('/usr/bin/podkop', ['show_sing_box_version'])
+                        .then(result => results.singbox = result)
+                        .catch(() => results.singbox = { stdout: 'error' }),
+
+                    safeExec('/usr/bin/podkop', ['show_system_info'])
+                        .then(result => results.system = result)
+                        .catch(() => results.system = { stdout: 'error' }),
+
+                    checkFakeIP()
+                        .then(result => results.fakeipStatus = result)
+                        .catch(() => results.fakeipStatus = { state: 'error', message: 'check error', color: STATUS_COLORS.WARNING }),
+
+                    checkFakeIPCLI()
+                        .then(result => results.fakeipCLIStatus = result)
+                        .catch(() => results.fakeipCLIStatus = { state: 'error', message: 'check error', color: STATUS_COLORS.WARNING }),
+
+                    checkDNSAvailability()
+                        .then(result => results.dnsStatus = result)
+                        .catch(() => results.dnsStatus = {
+                            remote: { state: 'error', message: 'check error', color: STATUS_COLORS.WARNING },
+                            local: { state: 'error', message: 'check error', color: STATUS_COLORS.WARNING }
+                        }),
+
+                    checkBypass()
+                        .then(result => results.bypassStatus = result)
+                        .catch(() => results.bypassStatus = { state: 'error', message: 'check error', color: STATUS_COLORS.WARNING })
+                ];
+
+                // Waiting for all the checks to be completed
+                await Promise.allSettled(checks);
 
                 const container = document.getElementById('diagnostics-status');
                 if (!container) return;
@@ -1394,11 +1512,7 @@ return view.extend({
                                 const label = activeConfig.split('#').pop();
                                 if (label && label.trim()) {
                                     configName = _('Config: ') + decodeURIComponent(label);
-                                } else {
-                                    configName = _('Main config');
                                 }
-                            } else {
-                                configName = _('Main config');
                             }
                         }
                     }
@@ -1406,42 +1520,62 @@ return view.extend({
                     console.error('Error getting config name from UCI:', e);
                 }
 
-                // Create a modified statusSection function with the configName
-                const statusSection = createStatusSection(parsedPodkopStatus, parsedSingboxStatus, podkop, luci, singbox, system, fakeipStatus, fakeipCLIStatus, dnsStatus, bypassStatus, configName);
+                const parsedPodkopStatus = JSON.parse(results.podkopStatus.stdout || '{"enabled":0,"status":"error"}');
+                const parsedSingboxStatus = JSON.parse(results.singboxStatus.stdout || '{"running":0,"enabled":0,"status":"error"}');
+
+                const statusSection = createStatusSection(
+                    parsedPodkopStatus,
+                    parsedSingboxStatus,
+                    results.podkop,
+                    results.luci,
+                    results.singbox,
+                    results.system,
+                    results.fakeipStatus,
+                    results.fakeipCLIStatus,
+                    results.dnsStatus,
+                    results.bypassStatus,
+                    configName
+                );
+
                 container.innerHTML = '';
                 container.appendChild(statusSection);
 
-                const fakeipElement = document.getElementById('fakeip-status');
-                if (fakeipElement) {
-                    fakeipElement.innerHTML = E('span', { 'style': `color: ${fakeipStatus.color}` }, [
-                        fakeipStatus.state === 'working' ? '✔ ' : fakeipStatus.state === 'not_working' ? '✘ ' : '! ',
-                        fakeipStatus.message
-                    ]).outerHTML;
+                // Updating individual status items
+                const updateStatusElement = (elementId, status, template) => {
+                    const element = document.getElementById(elementId);
+                    if (element) {
+                        element.innerHTML = template(status);
                     }
+                };
 
-                const fakeipCLIElement = document.getElementById('fakeip-cli-status');
-                if (fakeipCLIElement) {
-                    fakeipCLIElement.innerHTML = E('span', { 'style': `color: ${fakeipCLIStatus.color}` }, [
-                        fakeipCLIStatus.state === 'working' ? '✔ ' : fakeipCLIStatus.state === 'not_working' ? '✘ ' : '! ',
-                        fakeipCLIStatus.message
-                    ]).outerHTML;
-                }
+                updateStatusElement('fakeip-status', results.fakeipStatus,
+                    status => E('span', { 'style': `color: ${status.color}` }, [
+                        status.state === 'working' ? '✔ ' : status.state === 'not_working' ? '✘ ' : '! ',
+                        status.message
+                    ]).outerHTML
+                );
 
-                const dnsRemoteElement = document.getElementById('dns-remote-status');
-                if (dnsRemoteElement) {
-                    dnsRemoteElement.innerHTML = E('span', { 'style': `color: ${dnsStatus.remote.color}` }, [
-                        dnsStatus.remote.state === 'available' ? '✔ ' : dnsStatus.remote.state === 'unavailable' ? '✘ ' : '! ',
-                        dnsStatus.remote.message
-                    ]).outerHTML;
-                }
+                updateStatusElement('fakeip-cli-status', results.fakeipCLIStatus,
+                    status => E('span', { 'style': `color: ${status.color}` }, [
+                        status.state === 'working' ? '✔ ' : status.state === 'not_working' ? '✘ ' : '! ',
+                        status.message
+                    ]).outerHTML
+                );
+
+                updateStatusElement('dns-remote-status', results.dnsStatus.remote,
+                    status => E('span', { 'style': `color: ${status.color}` }, [
+                        status.state === 'available' ? '✔ ' : status.state === 'unavailable' ? '✘ ' : '! ',
+                        status.message
+                    ]).outerHTML
+                );
+
+                updateStatusElement('dns-local-status', results.dnsStatus.local,
+                    status => E('span', { 'style': `color: ${status.color}` }, [
+                        status.state === 'available' ? '✔ ' : status.state === 'unavailable' ? '✘ ' : '! ',
+                        status.message
+                    ]).outerHTML
+                );
 
-                const dnsLocalElement = document.getElementById('dns-local-status');
-                if (dnsLocalElement) {
-                    dnsLocalElement.innerHTML = E('span', { 'style': `color: ${dnsStatus.local.color}` }, [
-                        dnsStatus.local.state === 'available' ? '✔ ' : dnsStatus.local.state === 'unavailable' ? '✘ ' : '! ',
-                        dnsStatus.local.message
-                    ]).outerHTML;
-                }
             } catch (e) {
                 const container = document.getElementById('diagnostics-status');
                 if (container) {

luci-app-podkop/po/ru/podkop.po

@@ -819,3 +819,27 @@ msgstr "недоступен"
 
 msgid "Apply for SS2022"
 msgstr "Применить для SS2022"
+
+msgid "PODKOP CONFIGURATION"
+msgstr "КОНФИГУРАЦИЯ PODKOP"
+
+msgid "FAKEIP ROUTER TEST"
+msgstr "ПРОВЕРКА FAKEIP НА РОУТЕРЕ"
+
+msgid "FAKEIP BROWSER TEST"
+msgstr "ПРОВЕРКА FAKEIP В БРАУЗЕРЕ"
+
+msgid "FakeIP is working correctly on router (198.18.x.x)"
+msgstr "FakeIP работает корректно на роутере (198.18.x.x)"
+
+msgid "Click here for all the info"
+msgstr "Нажмите для просмотра всей информации"
+
+msgid "Check DNS server on current device (PC, phone)"
+msgstr "Проверьте DNS сервер на текущем устройстве (ПК, телефон)"
+
+msgid "Its must be router!"
+msgstr "Это должен быть роутер!"
+
+msgid "Global check"
+msgstr "Глобальная проверка"

luci-app-podkop/po/templates/podkop.pot

@@ -1170,3 +1170,27 @@ msgstr ""
 
 msgid "unavailable"
 msgstr ""
+
+msgid "PODKOP CONFIGURATION"
+msgstr ""
+
+msgid "FAKEIP ROUTER TEST"
+msgstr ""
+
+msgid "FAKEIP BROWSER TEST"
+msgstr ""
+
+msgid "FakeIP is working correctly on router (198.18.x.x)"
+msgstr ""
+
+msgid "Click here for all the info"
+msgstr ""
+
+msgid "Check DNS server on current device (PC, phone)"
+msgstr ""
+
+msgid "Its must be router!"
+msgstr ""
+
+msgid "Global check"
+msgstr ""

podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.3.41
+PKG_VERSION:=0.3.43
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>

podkop/files/usr/bin/podkop

@@ -15,14 +15,16 @@ SUBNETS_TWITTER="${GITHUB_RAW_URL}/Subnets/IPv4/twitter.lst"
 SUBNETS_META="${GITHUB_RAW_URL}/Subnets/IPv4/meta.lst"
 SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst"
 SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.lst"
+SUBNETS_CLOUDFLARE="${GITHUB_RAW_URL}/Subnets/IPv4/cloudflare.lst"
 SING_BOX_CONFIG="/etc/sing-box/config.json"
 FAKEIP="198.18.0.0/15"
-VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram"
+VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare"
 DNS_RESOLVERS="1.1.1.1 1.0.0.1 8.8.8.8 8.8.4.4 9.9.9.9 9.9.9.11 94.140.14.14 94.140.15.15 208.67.220.220 208.67.222.222 77.88.8.1 77.88.8.8"
 TEST_DOMAIN="fakeip.tech-domain.club"
 INTERFACES_LIST=""
 SRC_INTERFACE=""
 RESOLV_CONF="/etc/resolv.conf"
+CLOUDFLARE_OCTETS="103.21 103.22 103.31 104.16 104.17 104.18 104.19 104.20 104.21 104.22 104.23 104.24 104.25 104.26 104.27 104.28 108.162 131.0 141.101 162.158 162.159 172.64 172.65 172.66 172.67 172.68 172.69 172.70 172.71 173.245 188.114 190.93 197.234 198.41"
 
 log() {
     local message="$1"
@@ -62,7 +64,7 @@ start_main() {
     fi
 
     if grep -qE 'doh_backup_noresolv|doh_backup_server|doh_server' /etc/config/dhcp; then
-        log "[critical] Detected https-dns-proxy. Disable or uninstall it for correct functionality."
+        log "[critical] Detected https-dns-proxy in dhcp config. Edit /etc/config/dhcp"
     fi
 
     migration
@@ -1398,6 +1400,9 @@ list_subnets_download() {
         "telegram")
             URL=$SUBNETS_TELERAM
             ;;
+        "cloudflare")
+            URL=$SUBNETS_CLOUDFLARE
+            ;;
         "discord")
             URL=$SUBNETS_DISCORD
             nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }
@@ -1950,8 +1955,6 @@ show_sing_box_config() {
 }
 
 show_config() {    
-    nolog "📄 Current podkop configuration:"
-    
     if [ ! -f /etc/config/podkop ]; then
         nolog "Configuration file not found"
         return 1
@@ -2042,36 +2045,18 @@ get_sing_box_status() {
 }
 
 get_status() {
-    local running=0
     local enabled=0
     local status=""
 
     # Check if service is enabled
     if [ -x /etc/rc.d/S99podkop ]; then
         enabled=1
+        status="enabled"
+    else
+        status="disabled"
     fi
 
-    # Check if service is running
-    if pgrep -f "sing-box" >/dev/null; then
-        running=1
-    fi
-
-    # Format status message
-    if [ $running -eq 1 ]; then
-        if [ $enabled -eq 1 ]; then
-            status="running & enabled"
-        else
-            status="running but disabled"
-        fi
-    else
-        if [ $enabled -eq 1 ]; then
-            status="stopped but enabled"
-        else
-            status="stopped & disabled"
-        fi
-    fi
-
-    echo "{\"running\":$running,\"enabled\":$enabled,\"status\":\"$status\"}"
+    echo "{\"enabled\":$enabled,\"status\":\"$status\"}"
 }
 
 check_dns_available() {
@@ -2167,71 +2152,34 @@ sing_box_add_secure_dns_probe_domain() {
     log "DNS probe domain ${domain} configured with override to port ${override_port}"
 }
 
+print_global() {
+    local message="$1"
+    echo "$message"
+}
+
 global_check() {
-    nolog "📡 Global check run!"
+    print_global "📡 Global check run!"
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "🛠️ System info"
+    print_global "🕳️ Podkop:     $(opkg list-installed podkop | awk '{print $3}')"
+    print_global "🕳️ LuCI App:   $(opkg list-installed luci-app-podkop | awk '{print $3}')"
+    print_global "📦 Sing-box:   $(sing-box version | head -n 1 | awk '{print $3}')"
+    print_global "🛜 OpenWrt:    $(grep OPENWRT_RELEASE /etc/os-release | cut -d'"' -f2)"
+    print_global "🛜 Device:     $(cat /tmp/sysinfo/model)"
 
-    nolog "Podkop $(opkg list-installed podkop | awk '{print $3}')"
-    nolog "LuCi App $(opkg list-installed luci-app-podkop | awk '{print $3}')"
-    nolog "Sing-box $(sing-box version | head -n 1 | awk '{print $3}')"
-    nolog "$(grep OPENWRT_RELEASE /etc/os-release | cut -d'"' -f2)"
-    nolog "Device: $(cat /tmp/sysinfo/model)"
-
-    printf "\n"
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "📄 Podkop config"
     show_config
-    printf "\n"
 
-    nolog "Checking fakeip functionality..."
-        
-    nolog "➡️ DNS resolution: system DNS server"
-    nslookup -timeout=2 $TEST_DOMAIN
-    
-    local working_resolver=$(find_working_resolver)
-    if [ -z "$working_resolver" ]; then
-        nolog "❌ No working resolver found, skipping resolver check"
-    else      
-        nolog "➡️ DNS resolution: external resolver ($working_resolver)"
-        nslookup -timeout=2 $TEST_DOMAIN $working_resolver
-    fi
-    
-    # Main FakeIP check
-    nolog "➡️ DNS resolution: sing-box DNS server (127.0.0.42)"
-    local result=$(nslookup -timeout=2 $TEST_DOMAIN 127.0.0.42 2>&1)
-    echo "$result"
-    
-    if echo "$result" | grep -q "198.18"; then
-        nolog "✅ FakeIP is working correctly! Domain resolved to FakeIP range (198.18.x.x)"
-    else
-        nolog "❌ FakeIP test failed. Domain did not resolve to FakeIP range"
-        nolog "Checking if sing-box is running..."
-        
-        if ! pgrep -f "sing-box" >/dev/null; then
-            nolog "sing-box is not running"
-        else
-            nolog "sing-box is running, but FakeIP might not be configured correctly"
-            nolog "Checking DNS configuration in sing-box..."
-            
-            if [ -f "$SING_BOX_CONFIG" ]; then
-                local fakeip_enabled=$(jq -r '.dns.fakeip.enabled' "$SING_BOX_CONFIG")
-                local fakeip_range=$(jq -r '.dns.fakeip.inet4_range' "$SING_BOX_CONFIG")
-                
-                nolog "FakeIP enabled: $fakeip_enabled"
-                nolog "FakeIP range: $fakeip_range"
-                
-                local dns_rules=$(jq -r '.dns.rules[] | select(.server == "fakeip-server") | .domain' "$SING_BOX_CONFIG")
-                nolog "FakeIP domain: $dns_rules"
-            else
-                nolog "sing-box config file not found"
-            fi
-        fi
-    fi
-    printf "\n"
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "🔧 System check"
 
     if grep -E "^nameserver\s+([0-9]{1,3}\.){3}[0-9]{1,3}" "$RESOLV_CONF" | grep -vqE "127\.0\.0\.1|0\.0\.0\.0"; then
-        nolog "❌ /etc/resolv.conf contains an external nameserver:"
+        print_global "❌ /etc/resolv.conf contains external nameserver:"
         cat /etc/resolv.conf
         echo ""
     else
-        nolog "✅ /etc/resolv.conf OK"
+        print_global "✅ /etc/resolv.conf"
     fi
 
     cachesize="$(uci get dhcp.@dnsmasq[0].cachesize 2>/dev/null)"
@@ -2239,36 +2187,44 @@ global_check() {
     server="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
 
     if [ "$cachesize" != "0" ] || [ "$noresolv" != "1" ] || [ "$server" != "127.0.0.42" ]; then
-        nolog "❌ The configuration differs from the template. 📄 DHCP config:"
+        print_global "❌ DHCP configuration differs from template. 📄 DHCP config:"
         awk '/^config /{p=($2=="dnsmasq")} p' /etc/config/dhcp
     elif [ "$(uci get podkop.main.dont_touch_dhcp 2>/dev/null)" = "1" ]; then
-        nolog "⚠️ Enable dont_touch_dhcp. 📄 DHCP config:"
+        print_global "⚠️ dont_touch_dhcp is enabled. 📄 DHCP config:"
         awk '/^config /{p=($2=="dnsmasq")} p' /etc/config/dhcp
     else
-        nolog "✅ /etc/config/dhcp"
+        print_global "✅ /etc/config/dhcp"
     fi
 
     if ! pgrep -f "sing-box" >/dev/null; then
-        nolog "❌ sing-box is not running"
+        print_global "❌ sing-box is not running"
     else
-        nolog "✅ sing-box is running"
+        print_global "✅ sing-box is running"
     fi
 
-    nolog "📄 NFT Table Podkop"
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "🧱 NFT table"
     if ! nft list table inet PodkopTable >/dev/null 2>&1; then
-        nolog "PodkopTable not found"
+        print_global "❌ PodkopTable not found"
     else
         nft list table inet PodkopTable
     fi
 
-    nolog "📄 WAN config"
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "📄 WAN config"
     if uci show network.wan >/dev/null 2>&1; then
         awk '
             /^config / {
                 p = ($2 == "interface" && $3 == "'\''wan'\''")
+                proto = ""
             }
             p {
-                if ($1 == "option" && ($2 == "username" || $2 == "password")) {
+                if ($1 == "option" && $2 == "proto") {
+                    proto = $3
+                    print
+                } else if (proto == "'\''static'\''" && $1 == "option" && ($2 == "ipaddr" || $2 == "netmask" || $2 == "gateway")) {
+                    print "        option", $2, "'\''******'\''"
+                } else if (proto == "'\''pppoe'\''" && $1 == "option" && ($2 == "username" || $2 == "password")) {
                     print "        option", $2, "'\''******'\''"
                 } else {
                     print
@@ -2276,26 +2232,72 @@ global_check() {
             }
         ' /etc/config/network
     else
-        nolog "WAN not exists"
+        print_global "❌ WAN configuration not found"
     fi
 
-    CLOUDFLARE_OCTETS="103.21 103.22 103.31 104.16 104.17 104.18 104.19 104.20 104.21 104.22 104.23 \
-     104.24 104.25 104.26 104.27 104.28 108.162 131.0 141.101 162.158 162.159 172.64 172.65 172.66 \ 
-     172.67 172.68 172.69 172.70 172.71 173.245 188.114 190.93 197.234 198.41"
-
     if uci show network | grep -q endpoint_host; then
         uci show network | grep endpoint_host | cut -d'=' -f2 | tr -d "'\" " | while read -r host; do
             if [ "$host" = "engage.cloudflareclient.com" ]; then
-                nolog "⚠️ WARP detected ($host)"
+                print_global "⚠️ WARP detected: $host"
                 continue
             fi
 
             ip_prefix=$(echo "$host" | cut -d'.' -f1,2)
             if echo "$CLOUDFLARE_OCTETS" | grep -wq "$ip_prefix"; then
-                nolog "⚠️ WARP detected ($host)"
+                print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+                print_global "⚠️ WARP detected: $host"
             fi
         done
     fi
+
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "➡️ DNS status"
+    dns_info=$(check_dns_available)
+    dns_type=$(echo "$dns_info" | jq -r '.dns_type')
+    dns_server=$(echo "$dns_info" | jq -r '.dns_server')
+    status=$(echo "$dns_info" | jq -r '.status')
+    print_global "$dns_type ($dns_server) is $status"
+
+    print_global "━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    print_global "🔁 FakeIP"
+        
+    print_global "➡️ DNS resolution: system DNS server"
+    nslookup -timeout=2 $TEST_DOMAIN
+    
+    local working_resolver=$(find_working_resolver)
+    if [ -z "$working_resolver" ]; then
+        print_global "❌ No working external resolver found"
+    else      
+        print_global "➡️ DNS resolution: external resolver ($working_resolver)"
+        nslookup -timeout=2 $TEST_DOMAIN $working_resolver
+    fi
+    
+    print_global "➡️ DNS resolution: sing-box DNS server (127.0.0.42)"
+    local result=$(nslookup -timeout=2 $TEST_DOMAIN 127.0.0.42 2>&1)
+    echo "$result"
+    
+    if echo "$result" | grep -q "198.18"; then
+        print_global "✅ FakeIP is working correctly on router (198.18.x.x)"
+    else
+        print_global "❌ FakeIP test failed: Domain did not resolve to FakeIP range"
+        if ! pgrep -f "sing-box" >/dev/null; then
+            print_global " ❌ sing-box is not running"
+        else
+            print_global " 🤔 sing-box is running, checking configuration"
+            
+            if [ -f "$SING_BOX_CONFIG" ]; then
+                local fakeip_enabled=$(jq -r '.dns.fakeip.enabled' "$SING_BOX_CONFIG")
+                local fakeip_range=$(jq -r '.dns.fakeip.inet4_range' "$SING_BOX_CONFIG")
+                local dns_rules=$(jq -r '.dns.rules[] | select(.server == "fakeip-server") | .domain' "$SING_BOX_CONFIG")
+                
+                print_global "    📦 FakeIP enabled: $fakeip_enabled"
+                print_global "    📦 FakeIP range: $fakeip_range"
+                print_global "    📦 FakeIP domain: $dns_rules"
+            else
+                print_global "    ⛔ sing-box config file not found"
+            fi
+        fi
+    fi
 }
 
 case "$1" in