v0.3.29

feat: add diagnostics functionality only in tab

.github/workflows/build.yml

@@ -11,6 +11,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4.2.1
 
+      - name: Check version match
+        run: |
+          PODKOP_VERSION=$(grep '^PKG_VERSION:=' podkop/Makefile | cut -d '=' -f 2)
+          LUCI_APP_PODKOP_VERSION=$(grep '^PKG_VERSION:=' luci-app-podkop/Makefile | cut -d '=' -f 2)
+
+          TAG_VERSION=${GITHUB_REF#refs/tags/v}
+
+          echo "Podkop version: $PODKOP_VERSION"
+          echo "Luci-app-podkop version: $LUCI_APP_PODKOP_VERSION"
+          echo "Tag version: $TAG_VERSION"
+
+          if [ "$PODKOP_VERSION" != "$TAG_VERSION" ] || [ "$LUCI_APP_PODKOP_VERSION" != "$TAG_VERSION" ]; then
+            echo "Error: Version mismatch"
+            exit 1
+          fi
+
       - name: Build and push
         uses: docker/build-push-action@v6.9.0
         with:

README.md

@@ -2,7 +2,7 @@
 
 - Это альфа версия, которая находится в активной разработке. Из версии в версию что-то может меняться.
 - Основной функционал работает, но побочные штуки сейчас могут сбоить.
-- При обновлении **обязатально** сбрасывайте кэш LuCI.
+- При обновлении **обязательно** сбрасывайте кэш LuCI.
 - Также при обновлении всегда заходите в конфигурацию и проверяйте свои настройки. Конфигурация может измениться.
 - Необходимо минимум 15МБ свободного места на роутере. Роутерами с флешками на 16МБ сразу мимо.
 - При старте программы редактируется конфиг Dnsmasq.
@@ -49,11 +49,6 @@ sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/mai
 opkg remove luci-i18n-podkop-ru luci-app-podkop podkop
 ```
 
-Если был установлен русский язык
-```
-opkg remove luci-i18n-podkop-ru
-```
-
 # Использование
 Конфиг: /etc/config/podkop
 
@@ -74,33 +69,32 @@ Luci: Services/podkop
 ## Настройка доменов и подсетей
 **Community Lists** - Включить списки комьюнити
 
-**Subnets list enable** - Включить подсети из общего списка, выбрать из предложенных.
-
 **Custom domains enable** - Добавить свои домены
 
 **Custom subnets enable** - Добавить подсети или IP-адреса. Для подсетей задать маску.
 
 # Известные баги
-- [ ] Не отрабатывает service podkop stop, если podkop запущен и не может, к пример, зарезолвить домен с сломанным DNS
-- [ ] Update list из remote url domain не удаляет старые домены. А добавляет новые. Для подсетей тоже самое скорее всего. Пересоздавать ruleset?
+- [x] Не отрабатывает service podkop stop, если podkop запущен и не может, к пример, зарезолвить домен с сломанным DNS
+- [x] Update list из remote url domain не удаляет старые домены. А добавляет новые. Для подсетей тоже самое скорее всего. Пересоздавать ruleset?
 
 # ToDo
 Этот раздел не означает задачи, которые нужно брать и делать. Это общий список хотелок. Если вы хотите помочь, пожалуйста, спросите сначала в телеграмме.
 
-- [ ] Проверка, что версия в makefile совпадает с тегом
-- [ ] Диагностика: Proxy check completed successfully предположительно не показывает IP, если вернулся это IPv6.
+- [x] Проверка, что версия в makefile совпадает с тегом
 - [ ] Сделать галку запрещающую подкопу редачить dhcp. Допилить в исключение вместе с пустыми полями proxy и vpn
-- [ ] Обработка ошибки `sing-box[9345]: FATAL[0000] start service: initialize DNS rule[2]: rule-set not found: main`. Когда не задана строка\интерфейс
+- [x] Обработка ошибки `sing-box[9345]: FATAL[0000] start service: initialize DNS rule[2]: rule-set not found: main`. Когда не задана строка\интерфейс
+- [x] Проверка `/etc/resolv.conf` на наличие DNS-серверов
+- [x] Отслеживание интерфейса wan в sing-box
+- [ ] Рестарт сервиса без рестарта dnsmasq
+- [ ] `ash: can't kill pid 9848: No such process` при обновлении
 
 Низкий приоритет
 - [ ] Галочка, которая режет доступ к doh серверам
-- [ ] Свой конфиг sing-box
 - [ ] IPv6. Только после наполнения Wiki
 
 Рефактор
 - [ ] Handle для sing-box
 - [ ] Handle для dnsmasq
-- [ ] Формирование json для sing-box на уровне jq, а не шаблонов
 - [ ] Unit тесты (BATS)
 - [ ] Интеграционые тесты бекенда (OpenWrt rootfs + BATS)
 
@@ -152,7 +146,7 @@ make package/luci-app-podkop/{clean,compile} V=s
 
 .ipk лежат в `bin/packages/x86_64/base/`
 
-## Примеры строкs
+## Примеры строк
 https://github.com/itdoginfo/podkop/blob/main/String-example.md
 
 ## Ошибки

luci-app-podkop/Makefile

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

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

@@ -11,7 +11,7 @@ const STATUS_COLORS = {
     WARNING: '#ff9800'
 };
 
-async function safeExec(command, args = [], timeout = 3000) {
+async function safeExec(command, args = [], timeout = 7000) {
     try {
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), timeout);
@@ -41,18 +41,15 @@ function formatDiagnosticOutput(output) {
         .replace(/\r/g, '\n');
 }
 
-function getNetworkInterfaces(o, section_id) {
-    const excludeInterfaces = ['br-lan', 'eth0', 'eth1', 'wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan'];
-
+function getNetworkInterfaces(o, section_id, excludeInterfaces = []) {
     return network.getDevices().then(devices => {
-        // Reset the options by creating a new keylist
         o.keylist = [];
         o.vallist = [];
 
         devices.forEach(device => {
             if (device.dev && device.dev.name) {
                 const deviceName = device.dev.name;
-                if (!excludeInterfaces.includes(deviceName) && !/^lan\d+$/.test(deviceName)) {
+                if (!excludeInterfaces.includes(deviceName)) {
                     o.value(deviceName, deviceName);
                 }
             }
@@ -79,11 +76,12 @@ function createConfigSection(section, map, network) {
     o.depends('mode', 'proxy');
     o.ucisection = s.section;
 
-    o = s.taboption('basic', form.TextValue, 'proxy_string', _('Proxy Configuration URL'), '');
+    o = s.taboption('basic', form.TextValue, 'proxy_string', _('Proxy Configuration URL'), _(''));
     o.depends('proxy_config_type', 'url');
     o.rows = 5;
     o.ucisection = s.section;
     o.sectionDescriptions = new Map();
+    o.placeholder = 'vless://uuid@server:port?type=tcp&security=tls#main\n// backup ss://method:pass@server:port\n// backup2 vless://uuid@server:port?type=grpc&security=reality#alt';
 
     o.renderWidget = function (section_id, option_index, cfgvalue) {
         const original = form.TextValue.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]);
@@ -92,10 +90,17 @@ function createConfigSection(section, map, network) {
 
         if (cfgvalue) {
             try {
-                const label = cfgvalue.split('#').pop() || 'unnamed';
-                const decodedLabel = decodeURIComponent(label);
-                const descDiv = E('div', { 'class': 'cbi-value-description' }, _('Current config: ') + decodedLabel);
-                container.appendChild(descDiv);
+                // Extract only the active configuration (first non-comment line)
+                const activeConfig = cfgvalue.split('\n')
+                    .map(line => line.trim())
+                    .find(line => line && !line.startsWith('//'));
+
+                if (activeConfig) {
+                    const label = activeConfig.split('#').pop() || 'unnamed';
+                    const decodedLabel = decodeURIComponent(label);
+                    const descDiv = E('div', { 'class': 'cbi-value-description' }, _('Current config: ') + decodedLabel);
+                    container.appendChild(descDiv);
+                }
             } catch (e) {
                 console.error('Error parsing config label:', e);
                 const descDiv = E('div', { 'class': 'cbi-value-description' }, _('Current config: ') + (cfgvalue.split('#').pop() || 'unnamed'));
@@ -103,7 +108,7 @@ function createConfigSection(section, map, network) {
             }
         } else {
             const defaultDesc = E('div', { 'class': 'cbi-value-description' },
-                _('Enter connection string starting with vless:// or ss:// for proxy configuration'));
+                _('Enter connection string starting with vless:// or ss:// for proxy configuration. Add comments with // for backup configs'));
             container.appendChild(defaultDesc);
         }
 
@@ -116,14 +121,23 @@ function createConfigSection(section, map, network) {
         }
 
         try {
-            if (!value.startsWith('vless://') && !value.startsWith('ss://')) {
+            // Get the first non-comment line as the active configuration
+            const activeConfig = value.split('\n')
+                .map(line => line.trim())
+                .find(line => line && !line.startsWith('//'));
+
+            if (!activeConfig) {
+                return _('No active configuration found. At least one non-commented line is required.');
+            }
+
+            if (!activeConfig.startsWith('vless://') && !activeConfig.startsWith('ss://')) {
                 return _('URL must start with vless:// or ss://');
             }
 
-            if (value.startsWith('ss://')) {
+            if (activeConfig.startsWith('ss://')) {
                 let encrypted_part;
                 try {
-                    let mainPart = value.includes('?') ? value.split('?')[0] : value.split('#')[0];
+                    let mainPart = activeConfig.includes('?') ? activeConfig.split('?')[0] : activeConfig.split('#')[0];
                     encrypted_part = mainPart.split('/')[2].split('@')[0];
                     try {
                         let decoded = atob(encrypted_part);
@@ -142,7 +156,7 @@ function createConfigSection(section, map, network) {
                 }
 
                 try {
-                    let serverPart = value.split('@')[1];
+                    let serverPart = activeConfig.split('@')[1];
                     if (!serverPart) return _('Invalid Shadowsocks URL: missing server address');
                     let [server, portAndRest] = serverPart.split(':');
                     if (!server) return _('Invalid Shadowsocks URL: missing server');
@@ -157,12 +171,12 @@ function createConfigSection(section, map, network) {
                 }
             }
 
-            if (value.startsWith('vless://')) {
-                let uuid = value.split('/')[2].split('@')[0];
+            if (activeConfig.startsWith('vless://')) {
+                let uuid = activeConfig.split('/')[2].split('@')[0];
                 if (!uuid || uuid.length === 0) return _('Invalid VLESS URL: missing UUID');
 
                 try {
-                    let serverPart = value.split('@')[1];
+                    let serverPart = activeConfig.split('@')[1];
                     if (!serverPart) return _('Invalid VLESS URL: missing server address');
                     let [server, portAndRest] = serverPart.split(':');
                     if (!server) return _('Invalid VLESS URL: missing server');
@@ -176,7 +190,7 @@ function createConfigSection(section, map, network) {
                     return _('Invalid VLESS URL: missing or invalid server/port format');
                 }
 
-                let queryString = value.split('?')[1];
+                let queryString = activeConfig.split('?')[1];
                 if (!queryString) return _('Invalid VLESS URL: missing query parameters');
 
                 let params = new URLSearchParams(queryString.split('#')[0]);
@@ -226,11 +240,17 @@ function createConfigSection(section, map, network) {
         }
     };
 
+    o = s.taboption('basic', form.Flag, 'ss_uot', _('Shadowsocks UDP over TCP'), _('Apply for SS2022'));
+    o.default = '0';
+    o.depends('mode', 'proxy');
+    o.rmempty = false;
+    o.ucisection = 'main';
+
     o = s.taboption('basic', form.ListValue, 'interface', _('Network Interface'), _('Select network interface for VPN connection'));
     o.depends('mode', 'vpn');
     o.ucisection = s.section;
     o.load = function (section_id) {
-        return getNetworkInterfaces(this, section_id).then(() => {
+        return getNetworkInterfaces(this, section_id, ['br-lan', 'eth0', 'eth1', 'wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan']).then(() => {
             return this.super('load', section_id);
         });
     };
@@ -335,18 +355,33 @@ function createConfigSection(section, map, network) {
         return true;
     };
 
-    o = s.taboption('basic', form.TextValue, 'custom_domains_text', _('User Domains List'), _('Enter domain names separated by comma, space or newline'));
-    o.placeholder = 'example.com, sub.example.com\ndomain.com test.com';
+    o = s.taboption('basic', form.TextValue, 'custom_domains_text', _('User Domains List'), _('Enter domain names separated by comma, space or newline. You can add comments after //'));
+    o.placeholder = 'example.com, sub.example.com\n// Social networks\ndomain.com test.com // personal domains';
     o.depends('custom_domains_list_type', 'text');
     o.rows = 8;
     o.rmempty = false;
     o.ucisection = s.section;
     o.validate = function (section_id, value) {
         if (!value || value.length === 0) return true;
-        const domains = value.split(/[,\s\n]/).map(d => d.trim()).filter(d => d.length > 0);
+
         const domainRegex = /^(?!-)[A-Za-z0-9-]+([-.][A-Za-z0-9-]+)*(\.[A-Za-z]{2,})?$/;
-        for (const domain of domains) {
-            if (!domainRegex.test(domain)) return _('Invalid domain format: %s. Enter domain without protocol').format(domain);
+        const lines = value.split(/\n/).map(line => line.trim());
+
+        for (const line of lines) {
+            // Skip empty lines or lines that start with //
+            if (!line || line.startsWith('//')) continue;
+
+            // Extract domain part (before any //)
+            const domainPart = line.split('//')[0].trim();
+
+            // Process each domain in the line (separated by comma or space)
+            const domains = domainPart.split(/[,\s]+/).map(d => d.trim()).filter(d => d.length > 0);
+
+            for (const domain of domains) {
+                if (!domainRegex.test(domain)) {
+                    return _('Invalid domain format: %s. Enter domain without protocol').format(domain);
+                }
+            }
         }
         return true;
     };
@@ -415,27 +450,48 @@ function createConfigSection(section, map, network) {
         return true;
     };
 
-    o = s.taboption('basic', form.TextValue, 'custom_subnets_text', _('User Subnets List'), _('Enter subnets in CIDR notation or single IP addresses, separated by comma, space or newline'));
-    o.placeholder = '103.21.244.0/22\n8.8.8.8\n1.1.1.1/32, 9.9.9.9';
+    o = s.taboption('basic', form.TextValue, 'custom_subnets_text', _('User Subnets List'), _('Enter subnets in CIDR notation or single IP addresses, separated by comma, space or newline. You can add comments after //'));
+    o.placeholder = '103.21.244.0/22\n// Google DNS\n8.8.8.8\n1.1.1.1/32, 9.9.9.9 // Cloudflare and Quad9';
     o.depends('custom_subnets_list_enabled', 'text');
     o.rows = 10;
     o.rmempty = false;
     o.ucisection = s.section;
     o.validate = function (section_id, value) {
         if (!value || value.length === 0) return true;
-        const subnets = value.split(/[,\s\n]/).map(s => s.trim()).filter(s => s.length > 0);
+
         const subnetRegex = /^(\d{1,3}\.){3}\d{1,3}(\/\d{1,2})?$/;
-        for (const subnet of subnets) {
-            if (!subnetRegex.test(subnet)) return _('Invalid format: %s. Use format: X.X.X.X or X.X.X.X/Y').format(subnet);
-            const [ip, cidr] = subnet.split('/');
-            const ipParts = ip.split('.');
-            for (const part of ipParts) {
-                const num = parseInt(part);
-                if (num < 0 || num > 255) return _('IP parts must be between 0 and 255 in: %s').format(subnet);
-            }
-            if (cidr !== undefined) {
-                const cidrNum = parseInt(cidr);
-                if (cidrNum < 0 || cidrNum > 32) return _('CIDR must be between 0 and 32 in: %s').format(subnet);
+        const lines = value.split(/\n/).map(line => line.trim());
+
+        for (const line of lines) {
+            // Skip empty lines or lines that start with //
+            if (!line || line.startsWith('//')) continue;
+
+            // Extract subnet part (before any //)
+            const subnetPart = line.split('//')[0].trim();
+
+            // Process each subnet in the line (separated by comma or space)
+            const subnets = subnetPart.split(/[,\s]+/).map(s => s.trim()).filter(s => s.length > 0);
+
+            for (const subnet of subnets) {
+                if (!subnetRegex.test(subnet)) {
+                    return _('Invalid format: %s. Use format: X.X.X.X or X.X.X.X/Y').format(subnet);
+                }
+
+                const [ip, cidr] = subnet.split('/');
+                const ipParts = ip.split('.');
+                for (const part of ipParts) {
+                    const num = parseInt(part);
+                    if (num < 0 || num > 255) {
+                        return _('IP parts must be between 0 and 255 in: %s').format(subnet);
+                    }
+                }
+
+                if (cidr !== undefined) {
+                    const cidrNum = parseInt(cidr);
+                    if (cidrNum < 0 || cidrNum > 32) {
+                        return _('CIDR must be between 0 and 32 in: %s').format(subnet);
+                    }
+                }
             }
         }
         return true;
@@ -536,9 +592,9 @@ const createModalContent = (title, content) => {
 };
 
 const showConfigModal = async (command, title) => {
-    const res = await safeExec('/etc/init.d/podkop', [command]);
+    const res = await safeExec('/usr/bin/podkop', [command]);
     const formattedOutput = formatDiagnosticOutput(res.stdout || _('No output'));
-    ui.showModal(_(title), createModalContent(title, formattedOutput));
+    ui.showModal(_(title), createModalContent(_(title), formattedOutput));
 };
 
 // Button Factory
@@ -552,6 +608,16 @@ const ButtonFactory = {
     },
 
     createActionButton: function (config) {
+        return this.createButton({
+            label: config.label,
+            additionalClass: `cbi-button-${config.type || ''}`,
+            onClick: () => safeExec('/usr/bin/podkop', [config.action])
+                .then(() => config.reload && location.reload()),
+            style: config.style
+        });
+    },
+
+    createInitActionButton: function (config) {
         return this.createButton({
             label: config.label,
             additionalClass: `cbi-button-${config.type || ''}`,
@@ -597,32 +663,25 @@ const createStatusPanel = (title, status, buttons) => {
 };
 
 // Update the status section creation
-let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, singbox, system, fakeipStatus) {
+let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, singbox, system, fakeipStatus, fakeipCLIStatus) {
     return E('div', { 'class': 'cbi-section' }, [
         E('h3', {}, _('Service Status')),
         E('div', { 'class': 'table', style: 'display: flex; gap: 20px;' }, [
             // Podkop Status Panel
             createStatusPanel('Podkop Status', podkopStatus, [
-                podkopStatus.running ?
-                    ButtonFactory.createActionButton({
-                        label: 'Stop Podkop',
-                        type: 'remove',
-                        action: 'stop',
-                        reload: true
-                    }) :
-                    ButtonFactory.createActionButton({
-                        label: 'Start Podkop',
-                        type: 'apply',
-                        action: 'start',
-                        reload: true
-                    }),
+                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',
                     action: 'restart',
                     reload: true
                 }),
-                ButtonFactory.createActionButton({
+                ButtonFactory.createInitActionButton({
                     label: podkopStatus.enabled ? 'Disable Podkop' : 'Enable Podkop',
                     type: podkopStatus.enabled ? 'remove' : 'apply',
                     action: podkopStatus.enabled ? 'disable' : 'enable',
@@ -659,36 +718,54 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
                 })
             ]),
 
-            // FakeIP Status Panel with dynamic status
-            createStatusPanel('FakeIP Status', {
-                running: fakeipStatus.state === 'working',
-                status: fakeipStatus.message
-            }, [
+            // 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')
+                        ])
+                    ])
+                ]),
                 ButtonFactory.createModalButton({
-                    label: 'Check NFT Rules',
+                    label: _('Check NFT Rules'),
                     command: 'check_nft',
-                    title: 'NFT Rules'
+                    title: _('NFT Rules')
                 }),
                 ButtonFactory.createModalButton({
-                    label: 'Check DNSMasq',
+                    label: _('Check DNSMasq'),
                     command: 'check_dnsmasq',
-                    title: 'DNSMasq Configuration'
+                    title: _('DNSMasq Configuration')
                 }),
                 ButtonFactory.createModalButton({
-                    label: 'Update Lists',
+                    label: _('Update Lists'),
                     command: 'list_update',
-                    title: 'Lists Update Results'
+                    title: _('Lists Update Results')
+                }),
+                ButtonFactory.createModalButton({
+                    label: _('Check Router FakeIP'),
+                    command: 'check_fakeip',
+                    title: _('FakeIP Router Check')
                 })
             ]),
 
             // Version Information Panel
-            createStatusPanel('Version Information', null, [
+            createStatusPanel(_('Version Information'), null, [
                 E('div', { 'style': 'margin-top: 10px; font-family: monospace; white-space: pre-wrap;' }, [
-                    E('strong', {}, 'Podkop: '), podkop.stdout ? podkop.stdout.trim() : _('Unknown'), '\n',
-                    E('strong', {}, 'LuCI App: '), luci.stdout ? luci.stdout.trim() : _('Unknown'), '\n',
-                    E('strong', {}, 'Sing-box: '), singbox.stdout ? singbox.stdout.trim() : _('Unknown'), '\n',
-                    E('strong', {}, 'OpenWrt Version: '), system.stdout ? system.stdout.split('\n')[1].trim() : _('Unknown'), '\n',
-                    E('strong', {}, 'Device Model: '), system.stdout ? system.stdout.split('\n')[4].trim() : _('Unknown')
+                    E('strong', {}, _('Podkop: ')), podkop.stdout ? podkop.stdout.trim() : _('Unknown'), '\n',
+                    E('strong', {}, _('LuCI App: ')), luci.stdout ? luci.stdout.trim() : _('Unknown'), '\n',
+                    E('strong', {}, _('Sing-box: ')), singbox.stdout ? singbox.stdout.trim() : _('Unknown'), '\n',
+                    E('strong', {}, _('OpenWrt Version: ')), system.stdout ? system.stdout.split('\n')[1].trim() : _('Unknown'), '\n',
+                    E('strong', {}, _('Device Model: ')), system.stdout ? system.stdout.split('\n')[4].trim() : _('Unknown')
                 ])
             ])
         ])
@@ -698,9 +775,6 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
 return view.extend({
     async render() {
         document.head.insertAdjacentHTML('beforeend', `
-            <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
-            <meta http-equiv="Pragma" content="no-cache">
-            <meta http-equiv="Expires" content="0">
             <style>
                 .cbi-value {
                     margin-bottom: 10px !important;
@@ -734,7 +808,7 @@ return view.extend({
         // Additional Settings Tab (main section)
         let o = mainSection.tab('additional', _('Additional Settings'));
 
-        o = mainSection.taboption('additional', form.Flag, 'yacd', _('Yacd enable'), _('http://openwrt.lan:9090/ui'));
+        o = mainSection.taboption('additional', form.Flag, 'yacd', _('Yacd enable'), _('<a href="http://openwrt.lan:9090/ui" target="_blank">openwrt.lan:9090/ui</a>'));
         o.default = '0';
         o.rmempty = false;
         o.ucisection = 'main';
@@ -774,7 +848,7 @@ return view.extend({
         o.value('dns.adguard-dns.com', 'AdGuard Default (dns.adguard-dns.com)');
         o.value('unfiltered.adguard-dns.com', 'AdGuard Unfiltered (unfiltered.adguard-dns.com)');
         o.value('family.adguard-dns.com', 'AdGuard Family (family.adguard-dns.com)');
-        o.default = '1.1.1.1';
+        o.default = '8.8.8.8';
         o.rmempty = false;
         o.ucisection = 'main';
         o.validate = function (section_id, value) {
@@ -803,7 +877,7 @@ return view.extend({
         };
 
         o = mainSection.taboption('additional', form.Value, 'dns_rewrite_ttl', _('DNS Rewrite TTL'), _('Time in seconds for DNS record caching (default: 600)'));
-        o.default = '600';
+        o.default = '60';
         o.rmempty = false;
         o.ucisection = 'main';
         o.validate = function (section_id, value) {
@@ -846,6 +920,15 @@ return view.extend({
             return true;
         };
 
+        o = mainSection.taboption('additional', form.MultiValue, 'iface', _('Source Network Interface'), _('Select the network interface from which the traffic will originate'));
+        o.ucisection = 'main';
+        o.default = 'br-lan';
+        o.load = function (section_id) {
+            return getNetworkInterfaces(this, section_id, ['wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan']).then(() => {
+                return this.super('load', section_id);
+            });
+        };
+
         // Extra IPs and exclusions (main section)
         o = mainSection.taboption('basic', form.Flag, 'exclude_from_ip_enabled', _('IP for exclusion'), _('Specify local IP addresses that will never use the configured route'));
         o.default = '0';
@@ -879,7 +962,39 @@ return view.extend({
 
         o = mainSection.taboption('diagnostics', form.DummyValue, '_status');
         o.rawhtml = true;
-        o.cfgvalue = () => E('div', { id: 'diagnostics-status' }, _('Loading diagnostics...'));
+        o.cfgvalue = () => E('div', {
+            id: 'diagnostics-status',
+            'style': 'cursor: pointer;'
+        }, _('Click to load diagnostics...'));
+
+        let diagnosticsUpdateTimer = null;
+
+        function startDiagnosticsUpdates() {
+            if (diagnosticsUpdateTimer) {
+                clearInterval(diagnosticsUpdateTimer);
+            }
+
+            const container = document.getElementById('diagnostics-status');
+            if (container) {
+                container.innerHTML = _('Loading diagnostics...');
+            }
+
+            updateDiagnostics();
+            diagnosticsUpdateTimer = setInterval(updateDiagnostics, 10000);
+        }
+
+        function stopDiagnosticsUpdates() {
+            if (diagnosticsUpdateTimer) {
+                clearInterval(diagnosticsUpdateTimer);
+                diagnosticsUpdateTimer = null;
+            }
+
+            // Reset the loading state when stopping updates
+            const container = document.getElementById('diagnostics-status');
+            if (container) {
+                container.removeAttribute('data-loading');
+            }
+        }
 
         function checkFakeIP() {
             const createStatus = (state, message, color) => ({
@@ -890,7 +1005,7 @@ return view.extend({
 
             return new Promise(async (resolve) => {
                 try {
-                    const singboxStatusResult = await safeExec('/etc/init.d/podkop', ['get_sing_box_status']);
+                    const singboxStatusResult = await safeExec('/usr/bin/podkop', ['get_sing_box_status']);
                     const singboxStatus = JSON.parse(singboxStatusResult.stdout || '{"running":0,"dns_configured":0}');
 
                     if (!singboxStatus.running) {
@@ -904,29 +1019,58 @@ return view.extend({
                     const timeoutId = setTimeout(() => controller.abort(), 10000);
 
                     try {
-                        const response = await fetch('http://httpbin.org/ip', { signal: controller.signal });
-                        const text = await response.text();
+                        const response = await fetch('https://fakeip.tech-domain.club/check', { signal: controller.signal });
+                        const data = await response.json();
                         clearTimeout(timeoutId);
 
-                        if (text.includes('Cannot GET /ip')) {
+                        if (data.fakeip === true) {
                             return resolve(createStatus('working', 'working', 'SUCCESS'));
-                        }
-                        if (text.includes('"origin":')) {
+                        } else {
                             return resolve(createStatus('not_working', 'not working', 'ERROR'));
                         }
-                        return resolve(createStatus('error', 'check error', 'WARNING'));
                     } catch (fetchError) {
                         clearTimeout(timeoutId);
                         const message = fetchError.name === 'AbortError' ? 'timeout' : 'check error';
                         return resolve(createStatus('error', message, 'WARNING'));
                     }
                 } catch (error) {
-                    console.error('Error in checkFakeIP:', error);
                     return resolve(createStatus('error', 'check error', 'WARNING'));
                 }
             });
         }
 
+        function checkFakeIPCLI() {
+            const createStatus = (state, message, color) => ({
+                state,
+                message: _(message),
+                color: STATUS_COLORS[color]
+            });
+
+            return new Promise(async (resolve) => {
+                try {
+                    const singboxStatusResult = await safeExec('/usr/bin/podkop', ['get_sing_box_status']);
+                    const singboxStatus = JSON.parse(singboxStatusResult.stdout || '{"running":0,"dns_configured":0}');
+
+                    if (!singboxStatus.running) {
+                        return resolve(createStatus('not_working', 'sing-box not running', 'ERROR'));
+                    }
+                    if (!singboxStatus.dns_configured) {
+                        return resolve(createStatus('not_working', 'DNS not configured', 'ERROR'));
+                    }
+
+                    const result = await safeExec('nslookup', ['-timeout=2', 'fakeip.tech-domain.club', '127.0.0.42']);
+
+                    if (result.stdout && result.stdout.includes('198.18')) {
+                        return resolve(createStatus('working', 'working on router', 'SUCCESS'));
+                    } else {
+                        return resolve(createStatus('not_working', 'not working on router', 'ERROR'));
+                    }
+                } catch (error) {
+                    return resolve(createStatus('error', 'CLI check error', 'WARNING'));
+                }
+            });
+        }
+
         async function updateDiagnostics() {
             try {
                 const [
@@ -936,15 +1080,17 @@ return view.extend({
                     luci,
                     singbox,
                     system,
-                    fakeipStatus
+                    fakeipStatus,
+                    fakeipCLIStatus
                 ] = await Promise.all([
-                    safeExec('/etc/init.d/podkop', ['get_status']),
-                    safeExec('/etc/init.d/podkop', ['get_sing_box_status']),
-                    safeExec('/etc/init.d/podkop', ['show_version']),
-                    safeExec('/etc/init.d/podkop', ['show_luci_version']),
-                    safeExec('/etc/init.d/podkop', ['show_sing_box_version']),
-                    safeExec('/etc/init.d/podkop', ['show_system_info']),
-                    checkFakeIP()
+                    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()
                 ]);
 
                 const parsedPodkopStatus = JSON.parse(podkopStatus.stdout || '{"running":0,"enabled":0,"status":"unknown"}');
@@ -953,7 +1099,7 @@ return view.extend({
                 const container = document.getElementById('diagnostics-status');
                 if (!container) return;
 
-                const statusSection = createStatusSection(parsedPodkopStatus, parsedSingboxStatus, podkop, luci, singbox, system, fakeipStatus);
+                const statusSection = createStatusSection(parsedPodkopStatus, parsedSingboxStatus, podkop, luci, singbox, system, fakeipStatus, fakeipCLIStatus);
                 container.innerHTML = '';
                 container.appendChild(statusSection);
 
@@ -964,8 +1110,15 @@ return view.extend({
                         fakeipStatus.message
                     ]).outerHTML;
                 }
+
+                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;
+                }
             } catch (e) {
-                console.error('Error updating diagnostics:', e);
                 const container = document.getElementById('diagnostics-status');
                 if (container) {
                     container.innerHTML = E('div', { 'class': 'alert-message warning' }, [
@@ -977,61 +1130,6 @@ return view.extend({
             }
         }
 
-        function startPeriodicUpdates(titleDiv) {
-            let updateTimer = null;
-            let isVisible = !document.hidden;
-            let versionText = _('Podkop');
-            let versionReceived = false;
-
-            const updateStatus = async () => {
-                try {
-                    if (!versionReceived) {
-                        const version = await safeExec('/etc/init.d/podkop', ['show_version'], 2000);
-                        if (version.stdout) {
-                            versionText = _('Podkop') + ' v' + version.stdout.trim();
-                            versionReceived = true;
-                        }
-                    }
-
-                    const singboxStatusResult = await safeExec('/etc/init.d/podkop', ['get_sing_box_status']);
-                    const singboxStatus = JSON.parse(singboxStatusResult.stdout || '{"running":0,"dns_configured":0}');
-                    const fakeipStatus = await checkFakeIP();
-
-                    titleDiv.textContent = versionText + (!singboxStatus.running || !singboxStatus.dns_configured === 'not_working' ? ' (not working)' : '');
-
-                    await updateDiagnostics();
-                } catch (error) {
-                    console.warn('Failed to update status:', error);
-                    titleDiv.textContent = versionText + ' (not working)';
-                }
-            };
-
-            const toggleUpdates = (visible) => {
-                if (visible) {
-                    updateStatus();
-                    if (!updateTimer) {
-                        updateTimer = setInterval(updateStatus, 10000);
-                    }
-                } else if (updateTimer) {
-                    clearInterval(updateTimer);
-                    updateTimer = null;
-                }
-            };
-
-            document.addEventListener('visibilitychange', () => {
-                isVisible = !document.hidden;
-                toggleUpdates(isVisible);
-            });
-
-            toggleUpdates(isVisible);
-
-            window.addEventListener('unload', () => {
-                if (updateTimer) {
-                    clearInterval(updateTimer);
-                }
-            });
-        }
-
         // Extra Section
         const extraSection = m.section(form.TypedSection, 'extra', _('Extra configurations'));
         extraSection.anonymous = false;
@@ -1044,8 +1142,47 @@ return view.extend({
             const titleDiv = E('h2', { 'class': 'cbi-map-title' }, _('Podkop'));
             node.insertBefore(titleDiv, node.firstChild);
 
+            setTimeout(() => {
+                const diagnosticsContainer = document.getElementById('diagnostics-status');
+                if (diagnosticsContainer) {
+                    diagnosticsContainer.addEventListener('click', function () {
+                        if (!this.hasAttribute('data-loading')) {
+                            this.setAttribute('data-loading', 'true');
+                            startDiagnosticsUpdates();
+                        }
+                    });
+                }
+
+                const tabs = node.querySelectorAll('.cbi-tabmenu');
+                if (tabs.length > 0) {
+                    tabs[0].addEventListener('click', function (e) {
+                        const tab = e.target.closest('.cbi-tab');
+                        if (tab) {
+                            const tabName = tab.getAttribute('data-tab');
+                            if (tabName === 'diagnostics') {
+                                const container = document.getElementById('diagnostics-status');
+                                if (container && !container.hasAttribute('data-loading')) {
+                                    container.setAttribute('data-loading', 'true');
+                                    startDiagnosticsUpdates();
+                                }
+                            } else {
+                                stopDiagnosticsUpdates();
+                            }
+                        }
+                    });
+
+                    const activeTab = tabs[0].querySelector('.cbi-tab[data-tab="diagnostics"]');
+                    if (activeTab) {
+                        const container = document.getElementById('diagnostics-status');
+                        if (container && !container.hasAttribute('data-loading')) {
+                            container.setAttribute('data-loading', 'true');
+                            startDiagnosticsUpdates();
+                        }
+                    }
+                }
+            }, 100);
+
             node.classList.add('fade-in');
-            startPeriodicUpdates(titleDiv);
             return node;
         });
 

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

@@ -722,4 +722,31 @@ msgid "stopped but enabled"
 msgstr "остановлен, но активирован"
 
 msgid "stopped & disabled"
-msgstr "остановлен и деактивирован"
+msgstr "остановлен и деактивирован"
+
+msgid "works in browser"
+msgstr "работает в браузере"
+
+msgid "works on router"
+msgstr "работает на роутере"
+
+msgid "Check Router FakeIP"
+msgstr "Проверить FakeIP на роутере"
+
+msgid "FakeIP Router Check"
+msgstr "Проверка FakeIP на роутере"
+
+msgid "FakeIP CLI Check"
+msgstr "Проверка FakeIP через CLI"
+
+msgid "FakeIP CLI Check Results"
+msgstr "Результаты проверки FakeIP через CLI"
+
+msgid "not works in browser"
+msgstr "не работает в браузере"
+
+msgid "not works on router"
+msgstr "не работает на роутере"
+
+msgid "Diagnostics"
+msgstr "Диагностика"

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

@@ -1076,4 +1076,31 @@ msgid "stopped but enabled"
 msgstr ""
 
 msgid "stopped & disabled"
+msgstr ""
+
+msgid "works in browser"
+msgstr ""
+
+msgid "works on router"
+msgstr ""
+
+msgid "Check Router FakeIP"
+msgstr ""
+
+msgid "FakeIP Router Check"
+msgstr ""
+
+msgid "FakeIP CLI Check"
+msgstr ""
+
+msgid "FakeIP CLI Check Results"
+msgstr ""
+
+msgid "not works in browser"
+msgstr ""
+
+msgid "not works on router"
+msgstr ""
+
+msgid "Diagnostics"
 msgstr ""

luci-app-podkop/root/usr/share/rpcd/acl.d/luci-app-podkop.json

@@ -5,6 +5,9 @@
       "file": {
         "/etc/init.d/podkop": [
           "exec"
+        ],
+        "/usr/bin/podkop": [
+          "exec"
         ]
       },
       "ubus": {

podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.3.18
+PKG_VERSION:=0.3.29
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>
@@ -49,6 +49,9 @@ define Package/podkop/install
 
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/etc/config/podkop $(1)/etc/config/podkop
+
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) ./files/usr/bin/podkop $(1)/usr/bin/podkop
 endef
 
 $(eval $(call BuildPackage,podkop))

podkop/files/etc/config/podkop

@@ -1,13 +1,13 @@
 config main 'main'
 	option mode 'proxy'
 	#option interface ''
-	option proxy_config_type ''
+	option proxy_config_type 'url'
 	#option outbound_json ''
 	option proxy_string ''
 	option domain_list_enabled '1'
-	option domain_list 'russia_inside'
+	list domain_list 'russia_inside'
 	option subnets_list_enabled '0'
-	option custom_domains_list_type 'disable'
+	option custom_domains_list_type 'disabled'
 	#list custom_domains ''
 	#option custom_domains_text ''
 	option custom_local_domains_list_enabled '0'
@@ -32,6 +32,8 @@ config main 'main'
 	option dont_touch_dhcp '0'
 	option update_interval '1d'
 	option dns_type 'doh'
-	option dns_server '1.1.1.1'
-	option dns_rewrite_ttl '600'
-	option cache_file '/tmp/cache.db'
+	option dns_server '8.8.8.8'
+	option dns_rewrite_ttl '60'
+	option cache_file '/tmp/cache.db'
+	list iface 'br-lan'
+	option ss_uot '0'