Merge pull request #205 from itdoginfo/hotfix

Hotfix

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,74 @@
+---
+name: 🐛 Сообщение об ошибке
+description: Создавайте только, если проблема точно не на вашей стороне.
+title: "[BUG] "
+labels: ["bug"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Спасибо за создание отчета об ошибке!
+        
+        Перед отправкой, пожалуйста:
+        - Проверьте [существующие issues](https://github.com/itdoginfo/podkop/issues)
+        - Просмотрите [документацию](https://podkop.net)
+
+  - type: textarea
+    id: description
+    attributes:
+      label: 📝 Описание проблемы
+      description: Четкое и краткое описание того, что не работает
+      placeholder: Опишите проблему
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Шаги для воспроизведения
+      description: Шаги для воспроизведения проблемы. Если вы настраваете что-то по мануалу, приложите ссылку на него.
+      placeholder: |
+        1. 
+        2. 
+        3. 
+        4. 
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: ✅ Ожидаемое поведение
+      description: Четкое и краткое описание того, что должно было произойти
+      placeholder: Опишите ожидаемое поведение
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: 🖥️ Информация о системе
+      description: |
+        Информация о вашей системе (заполните всё применимое)
+      value: |
+        - **OpenWrt версия**: 
+        - **Podkop версия**: 
+        - **Роутер модель**: 
+        - **Sing-box версия**: 
+      render: markdown
+    validations:
+      required: true
+
+  - type: textarea
+    id: config
+    attributes:
+      label: ⚙️ Конфигурация
+      description: |
+        Релевантные части конфигурации (удалите чувствительную информацию!)
+      placeholder: |
+        Например:
+        - Содержимое /etc/config/podkop
+        - Конфигурация sing-box (если релевантно)
+        - Дополнительные конфиги, которые потребуются wireless/network/dhcp и т.д.
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 Если у вас что-то не работает, прежде всего прочитайте README проекта
+    url: https://github.com/itdoginfo/podkop
+    about: README проекта
+  - name: 📚 Если вы не нашли в README документацию, то вот ссылка на неё
+    url: https://podkop.net
+    about: Официальная документация PodKop

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,68 @@
+---
+name: ✨ Запрос новой функции
+description: Предложите новую функцию или улучшение для Podkop
+title: "[FEATURE] "
+labels: ["enhancement", "needs-discussion"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Спасибо за предложение новой функции!
+        
+        Перед отправкой, пожалуйста:
+        - Проверьте [существующие запросы](https://github.com/itdoginfo/podkop/issues?q=is%3Aissue+label%3Aenhancement)
+        - Убедитесь, что функции не существует в [документации](https://podkop.net)
+
+  - type: textarea
+    id: summary
+    attributes:
+      label: Краткое описание
+      description: Краткое описание предлагаемой функции
+      placeholder: В одном предложении опишите, что вы хотите добавить...
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Проблема, которую решает
+      description: |
+        Описание проблемы или неудобства, которое решит эта функция
+      placeholder: |
+        Сейчас нет возможности [...]
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: 💡 Предлагаемое решение
+      description: Четкое и краткое описание того, что вы хотите реализовать
+      placeholder: |
+        Я хочу, чтобы Podkop мог [...]
+        Предлагаю добавить функцию, которая [...]
+        Можно было бы улучшить [...] путем [...]
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Workaround
+      description: |
+        Опишите альтернативные решения или функции, которые вы рассматривали
+        Есть ли обходные пути, которые вы используете сейчас?
+      placeholder: |
+        Сейчас я решаю это проблему путем [...]
+        Альтернативой могло бы быть [...]
+        Пробовал использовать [...], но это не подходит потому что [...]
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Идеи реализации (опционально)
+      description: |
+        Если у вас есть идеи о том, как это можно реализовать, поделитесь ими. Помните про ограничения LuCI.
+      placeholder: |
+        Это можно реализовать с помощью [...]

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+# Описание изменений
+
+Краткое описание ваших изменений и их цель.
+
+## Что изменено
+
+Детальное описание изменений:
+- 
+- 
+- 
+
+(Этим вы экономите время ревьювера)

.github/workflows/build.yml

@@ -10,28 +10,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.2.1
+        with:
+          fetch-depth: 0
 
-      - name: Check version match
+      - name: Extract version
+        id: version
         run: |
-          PODKOP_VERSION=$(grep '^PKG_VERSION:=' podkop/Makefile | cut -d '=' -f 2)
+          VERSION=$(git describe --tags --exact-match 2>/dev/null || echo "dev_$(date +%d%m%Y)")
-          LUCI_APP_PODKOP_VERSION=$(grep '^PKG_VERSION:=' luci-app-podkop/Makefile | cut -d '=' -f 2)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-          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:
           context: .
           tags: podkop:ci
+          build-args: |
+            PKG_VERSION=${{ steps.version.outputs.version }}
 
       - name: Create Docker container
         run: docker create --name podkop podkop:ci

.github/workflows/frontend-ci.yml

@@ -0,0 +1,78 @@
+name: Frontend CI
+
+on:
+  pull_request:
+    paths:
+      - 'fe-app-podkop/**'
+      - '.github/workflows/frontend-ci.yml'
+
+jobs:
+  frontend-checks:
+    name: Frontend Quality Checks
+    runs-on: ubuntu-24.04
+    defaults:
+      run:
+        working-directory: fe-app-podkop
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5.0.0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v5.0.0
+        with:
+          node-version: '22'
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        working-directory: fe-app-podkop
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: Cache yarn dependencies
+        uses: actions/cache@v4.3.0
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('fe-app-podkop/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Check formatting
+        id: format
+        run: |
+          yarn format
+          if ! git diff --exit-code; then
+            echo "::error::Code is not formatted. Run 'yarn format' locally."
+            exit 1
+          fi
+
+      - name: Run linter
+        run: yarn lint --max-warnings=0
+
+      - name: Run tests
+        run: yarn test --run
+
+      - name: Build project
+        id: build
+        run: |
+          yarn build
+          if ! git diff --exit-code; then
+            echo "::error::Build generated changes. Check build output."
+            exit 1
+          fi
+
+      - name: Summary
+        if: always()
+        run: |
+          echo "## Frontend CI Results" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- ✅ Format check: ${{ steps.format.outcome }}" >> $GITHUB_STEP_SUMMARY
+          echo "- ✅ Lint check: ${{ job.status }}" >> $GITHUB_STEP_SUMMARY
+          echo "- ✅ Tests: ${{ job.status }}" >> $GITHUB_STEP_SUMMARY
+          echo "- ✅ Build: ${{ steps.build.outcome }}" >> $GITHUB_STEP_SUMMARY
+          echo "![Success](https://cdn2.combot.org/boratbrat/webp/6xf09f988f.webp)" >> $GITHUB_STEP_SUMMARY

.gitignore

@@ -0,0 +1,3 @@
+.idea
+fe-app-podkop/node_modules
+fe-app-podkop/.env

Dockerfile

@@ -1,5 +1,8 @@
 FROM itdoginfo/openwrt-sdk:24.10.1
 
+ARG PKG_VERSION
+ENV PKG_VERSION=${PKG_VERSION}
+
 COPY ./podkop /builder/package/feeds/utilites/podkop
 COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop
 

README.md

@@ -2,14 +2,15 @@
 
 - Это бета-версия, которая находится в активной разработке. Из версии в версию что-то может меняться.
 - При возникновении проблем, нужен технически грамотный фидбэк в чат.
-- При обновлении **обязательно** [сбрасывайте кэш LuCI](https://podkop.net/docs/clearbrowsercache/).
+- При обновлении **обязательно** [сбрасывайте кэш LuCI](https://podkop.net/docs/clear-browser-cache/).
 - Также при обновлении всегда заходите в конфигурацию и проверяйте свои настройки. Конфигурация может измениться.
-- Необходимо минимум 15МБ свободного места на роутере. Роутеры с флешками на 16МБ сразу мимо.
+- Необходимо минимум 25МБ свободного места на роутере. Роутеры с флешками на 16МБ сразу мимо.
 - При старте программы редактируется конфиг Dnsmasq.
 - Podkop редактирует конфиг sing-box. Обязательно сохраните ваш конфиг sing-box перед установкой, если он вам нужен.
 - Информация здесь может быть устаревшей. Все изменения фиксируются в [телеграм-чате](https://t.me/itdogchat/81758/420321).
 - [Если у вас не что-то не работает.](https://podkop.net/docs/diagnostics/)
 - Если у вас установлен Getdomains, [его следует удалить](https://github.com/itdoginfo/domain-routing-openwrt?tab=readme-ov-file#%D1%81%D0%BA%D1%80%D0%B8%D0%BF%D1%82-%D0%B4%D0%BB%D1%8F-%D1%83%D0%B4%D0%B0%D0%BB%D0%B5%D0%BD%D0%B8%D1%8F).
+- Требуется версия OpenWrt 24.10.
 
 # Документация
 https://podkop.net/
@@ -17,43 +18,38 @@ https://podkop.net/
 # Установка Podkop
 Полная информация в [документации](https://podkop.net/docs/install/)
 
-Вкратце, достаточно одного скрипта для установки:
+Вкратце, достаточно одного скрипта для установки и обновления:
 ```
 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
-```
-
 # ToDo
 Этот раздел не означает задачи, которые нужно брать и делать. Это общий список хотелок. Если вы хотите помочь, пожалуйста, спросите сначала в телеграмме.
 
 Основные задачи в issues.
 
 ## Рефактор
-- [ ] Очевидные повторения в `/usr/bin/podkop` загнать в переменые
+- [x] Очевидные повторения в `/usr/bin/podkop` загнать в переменые
-- [ ] Возможно поменять структуру
+- [x] Возможно поменять структуру
 
 ## Списки
-- [ ] Speedtest
+- [x] CloudFront
-- [x] Google AI
+- [x] DO 
-- [x] Google PlayMarket. Здесь уточнить, что точно не работает через корректную настройку FakeIP, а не dnsmasq+nft.
+- [x] HODCA
-- [x] Hetzner ASN (AS24940)
-- [x] OVH ASN (AS16276)
 
 ## Будущее
-- [ ] После наполнения вики про туннели, убрать всё что связано с их установкой из скрипта. Только с AWG что-то решить, лучше чтоб был скрипт в сторонем репозитории. 
+- [ ] [Подписка](https://github.com/itdoginfo/podkop/issues/118). Здесь нужна реализация, чтоб для каждой секции помимо ручного выбора, был выбор фильтрации по тегу. Например, для main выбираем ключевые слова NL, DE, FI. А для extra секции фильтруем по RU. И создаётся outbound c urltest в которых перечислены outbound из фильтров.
-- [ ] Подписка. Здесь нужна реализация, чтоб для каждой секции помимо ручного выбора, был выбор фильтрации по тегу. Например, для main выбираем ключевые слова NL, DE, FI. А для extra секции фильтруем по RU. И создаётся outbound c urltest в которых перечислены outbound из фильтров.
+- [x] Опция, когда все запросы (с роутера в первую очередь), а не только br-lan идут в прокси. С этим связана #95. Требуется много переделать для nftables.
-- [ ] Опция, когда все запросы (с роутера в первую очередь), а не только br-lan идут в прокси. С этим связана #95. Требуется много переделать для nftables.
 - [ ] Весь трафик в Proxy\VPN. Вопрос, что делать с экстрасекциями в этом случае. FakeIP здесь скорее не нужен, а значит только main секция остаётся. Всё что касается fakeip проверок, придётся выключать в этом режиме.
-- [ ] Поддержка Source format. Нужна расшифровка в json и если присуствуют подсети, заносить их в custom subnet nftset.
+- [x] Поддержка Source format. Нужна расшифровка в json и если присуствуют подсети, заносить их в custom subnet nftset.
-- [ ] Переделывание функции формирования кастомных списков в JSON. Обрабатывать сразу скопом, а не по одному.
+- [x] Переделывание функции формирования кастомных списков в JSON. Обрабатывать сразу скопом, а не по одному.
-- [ ] При успешном запуске переходит в фоновый режим и следит за состоянием sing-box. Если вдруг идёт exit 1, выполняется dnsmasq restore и снова следит за состоянием. Вопрос в том, как это искусcтвенно провернуть. Попробовать положить прокси и посмотреть, останется ли работать DNS в этом случае. И здесь, вероятно, можно обойтись триггером в init.d.
+- [ ] При успешном запуске переходит в фоновый режим и следит за состоянием sing-box. Если вдруг идёт exit 1, выполняется dnsmasq restore и снова следит за состоянием. Вопрос в том, как это искусcтвенно провернуть. Попробовать положить прокси и посмотреть, останется ли работать DNS в этом случае. И здесь, вероятно, можно обойтись триггером в init.d. [Issue](https://github.com/itdoginfo/podkop/issues/111)
+- [x] Формирование конфига sing-box в /tmp
 - [ ] Галочка, которая режет доступ к doh серверам.
 - [ ] IPv6. Только после наполнения Wiki.
 
 ## Тесты
 - [ ] Unit тесты (BATS)
-- [ ] Интеграционые тесты бекенда (OpenWrt rootfs + BATS)
+- [ ] Интеграционые тесты бекенда (OpenWrt rootfs + BATS)
+
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/itdoginfo/podkop)

String-example.md

@@ -1,63 +1,76 @@
-# Shadowsocks
+## Shadowsocks
-Тут всё просто
-
-## Shadowsocks-old
 ```
-ss://YWVzLTI1Ni1nY206RmJwUDJnSStPczJKK1kzdkVhTnVuOUZ2ZjJZYUhNUlN1L1BBdEVqMks1VT0@example.com:80?type=tcp#example-ss-old
+ss://MjAyMi1ibGFrZTMtYWVzLTI1Ni1nY206ZG1DbHkvWmgxNVd3OStzK0dGWGlGVElrcHc3Yy9xQ0lTYUJyYWk3V2hoWT0@127.0.0.1:25144?type=tcp#shadowsocks-no-client
+ss://MjAyMi1ibGFrZTMtYWVzLTI1Ni1nY206S3FiWXZiNkhwb1RmTUt0N2VGcUZQSmJNNXBXaHlFU0ZKTXY2dEp1Ym1Fdz06dzRNMEx5RU9OTGQ5SWlkSGc0endTbzN2R3h4NS9aQ3hId0FpaWlxck5hcz0@127.0.0.1:26627?type=tcp#shadowsocks-client
+ss://2022-blake3-aes-256-gcm:dmCly/Zh15Ww9+s+GFXiFTIkpw7c/qCISaBrai7WhhY=@127.0.0.1:27214?type=tcp#shadowsocks-plain-user
 ```
 
-## Shadowsocks-2022
+## VLESS
 ```
-ss://2022-blake3-aes-128-gcm:5NgF%2B9eM8h4OnrTbHp%2B8UA%3D%3D%3Am8tbs5aKLYG7dN9f3xsiKA%3D%3D@example.com:80#example-ss2022
+# tcp
+vless://94792286-7bbe-4f33-8b36-18d1bbf70723@127.0.0.1:34520?type=tcp&encryption=none&security=none#vless-tcp-none
+vless://e95163dc-905e-480a-afe5-20b146288679@127.0.0.1:16399?type=tcp&encryption=none&security=reality&pbk=tqhSkeDR6jsqC-BYCnZWBrdL33g705ba8tV5-ZboWTM&fp=chrome&sni=google.com&sid=f6&spx=%2F#vless-tcp-reality
+vless://2e9e8288-060e-4da2-8b9f-a1c81826feb7@127.0.0.1:19316?type=tcp&encryption=none&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#vless-tcp-tls
+vless://0235c833-dc29-4202-8a7b-1bbba5b516a2@127.0.0.1:22993?type=tcp&encryption=none&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#vless-tcp-tls-insecure
+vless://17776137-e747-4268-a84d-99fd798accac@127.0.0.1:48076?type=tcp&encryption=none&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com&ech=AFP%2BDQBPAAAgACDJXiKG5eoCHfd1MbMxgccxgrbGisBPPe3bz1KVIETUXQAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAAAAAA%3D%3D#vless-tcp-tls-ech
+
+# mKCP
+vless://72e201d7-7841-4a32-b266-4aa3eb776d51@127.0.0.1:17270?type=kcp&encryption=none&headerType=none&seed=AirziWi4ng&security=none#vless-mKCP
+
+# WebSocket
+vless://d86daef7-565b-4ecd-a9ee-bac847ad38e6@127.0.0.1:12928?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=none#vless-websocket-none
+vless://fe0f0941-09a9-4e46-bc69-e00190d7bb9c@127.0.0.1:10156?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#vless-websocket-tls
+vless://599e8659-e2ef-47d9-bf72-2f9b4b673474@127.0.0.1:36567?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#vless-websocket-tls-insecure
+vless://4d21ce62-8723-4c4d-93e3-d586b107aa40@127.0.0.1:51394?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com&ech=AF3%2BDQBZAAAgACD7fjrtDMlcigKXFBKoLn6UDB9%2BWR6HBZpY96DlBiD%2BIwAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D#vless-websocket-tls-ech
+
+# gRPC
+vless://974b39e3-f7bf-42b9-933c-16699c635e77@127.0.0.1:15633?type=grpc&encryption=none&serviceName=TunService&authority=&security=none#vless-gRPC-none
+vless://651e7eca-5152-46f1-baf2-d502e0af7b27@127.0.0.1:28535?type=grpc&encryption=none&serviceName=TunService&authority=authority&security=reality&pbk=nhZ7NiKfcqESa5ZeBFfsq9o18W-OWOAHLln9UmuVXSk&fp=chrome&sni=google.com&sid=11cbaeaa&spx=%2F#vless-gRPC-reality
+vless://af1f8b5f-26c9-4fe8-8ce7-6d6366c5c9ce@127.0.0.1:47904?type=grpc&encryption=none&serviceName=TunService&authority=authority&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#vless-gRPC-tls
+vless://95f2c4bb-abcb-47ba-bfad-e181c03e4659@127.0.0.1:34530?type=grpc&encryption=none&serviceName=TunService&authority=authority&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#vless-gRPC-tls-insecure
+vless://bd39490f-9a4f-49b2-96b6-824190cf89e9@127.0.0.1:27779?type=grpc&encryption=none&serviceName=TunService&authority=authority&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com&ech=AF3%2BDQBZAAAgACBc%2FiNdo4QkTt9eQCQgkOiJVSfA9G6UWAyipaBFtBD%2FVQAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D#vless-gRPC-tls-ech
+
+# HTTPUpgrade
+vless://2b98f144-847f-42f7-8798-e1a32d27bdc7@127.0.0.1:47154?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=none#vless-httpupgrade-none
+vless://76dbd0ff-1a35-4f0c-a9ba-3c5890b7dea6@127.0.0.1:50639?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#vless-httpupgrade-tls
+vless://6d229881-50ed-4f3f-995d-bd3e725fdbff@127.0.0.1:57616?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#vless-httpupgrade-tls-insecure
+vless://1897e9e4-6f5d-4a85-9512-9192e76c3f04@127.0.0.1:38658?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com&ech=AF3%2BDQBZAAAgACCmXTMzlrdcCk2FyINAWKZ4DBxq4%2BCgmJ69v%2BmH4EMlEQAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D#vless-httpupgrade-tls-ech
+
+# XHTTP
+vless://c2841505-ec32-4b8d-b6dd-3e19d648c321@127.0.0.1:45507?type=xhttp&encryption=none&path=%2Fxhttppath&host=xhttp&mode=auto&security=none#vless-xhttp
 ```
 
+## Trojan
 ```
-ss://MjAyMi1ibGFrZTMtYWVzLTEyOC1nY206Y21lZklCdDhwMTJaZm1QWUplMnNCNThRd3R3NXNKeVpUV0Z6ZENKV2taOD06eEJHZUxiMWNPTjFIeE9CenF6UlN0VFdhUUh6YWM2cFhRVFNZd2dVV2R1RT0@example.com:81?type=tcp#example-ss2022
+# tcp
-```
+trojan://04agAQapcl@127.0.0.1:33641?type=tcp&security=none#trojan-tcp-none
-Может быть без `?type=tcp`
+trojan://cME3ZlUrYF@127.0.0.1:43772?type=tcp&security=reality&pbk=DckTwU6p6pTX9QxFXOi6vH4Vzt_RCE1vMCnj2c6hvjw&fp=chrome&sni=google.com&sid=221a80cf94&spx=%2F#trojan-tcp-reality
+trojan://EJjpAj02lg@127.0.0.1:11381?type=tcp&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#trojan-tcp-tls
+trojan://ZP2Ik5sxN3@127.0.0.1:16247?type=tcp&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#trojan-tcp-tls-insecure
+trojan://90caP481ay@127.0.0.1:59708?type=tcp&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&ech=AF3%2BDQBZAAAgACC2y%2BAe4dqthLNpfvmtE6g%2BnaJ%2FciK6P%2BREbRLkR%2Fg%2FEgAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D&sni=google.com#trojan-tcp-tls-ech
 
-# VLESS
+# mKCP
+trojan://N5v7iIOe9G@127.0.0.1:36319?type=kcp&headerType=none&seed=P91wFIfjzZ&security=none#trojan-mKCP
 
-## Reality
+# WebSocket
-```
+trojan://G3cE9phv1g@127.0.0.1:57370?type=ws&path=%2Fwspath&host=google.com&security=none#trojan-websocket-none
-vless://eb445f4b-ddb4-4c79-86d5-0833fc674379@example.com:443?type=tcp&security=reality&pbk=ARQzddtXPJZHinwkPbgVpah9uwPTuzdjU9GpbUkQJkc&fp=chrome&sni=yahoo.com&sid=6cabf01472a3&spx=%2F&flow=xtls-rprx-vision#vless-reality
+trojan://FBok41WczO@127.0.0.1:59919?type=ws&path=%2Fwspath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#trojan-websocket-tls
-```
+trojan://bhwvndUBPA@127.0.0.1:22969?type=ws&path=%2Fwspath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#trojan-websocket-tls-insecur
+trojan://pwiduqFUWO@127.0.0.1:46765?type=ws&path=%2Fwspath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&ech=AF3%2BDQBZAAAgACCFcQYEtwrFOidJJLYHvSiN%2BljRgaAIrNHoVnio3uXAOwAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D&sni=google.com#trojan-websocket-tls-ech
 
-```
+# gRPC
-vless://UUID@IP:2082?security=reality&sni=dash.cloudflare.com&alpn=h2,http/1.1&allowInsecure=1&fp=chrome&pbk=pukkey&sid=id&type=grpc&encryption=none#vless-reality-strange
+trojan://WMR7qkKhsV@127.0.0.1:27897?type=grpc&serviceName=TunService&authority=authority&security=none#trojan-gRPC-none
-```
+trojan://KVuRNsu6KG@127.0.0.1:46077?type=grpc&serviceName=TunService&authority=authority&security=reality&pbk=Xn59i4gum3ppCICS6-_NuywrhHIVVAH54b2mjd5CFkE&fp=chrome&sni=google.com&sid=e5be&spx=%2F#trojan-gRPC-reality
+trojan://7BJtbywy8h@127.0.0.1:10627?type=grpc&serviceName=TunService&authority=authority&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#trojan-gRPC-tls
+trojan://TI3PakvtP4@127.0.0.1:10435?type=grpc&serviceName=TunService&authority=authority&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#trojan-gRPC-tls-insecure
+trojan://mbzoVKL27h@127.0.0.1:38681?type=grpc&serviceName=TunService&authority=authority&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&ech=AF3%2BDQBZAAAgACCq72Ru3VbFlDpKttl3LccmInu8R2oAsCr8wzyxB0vZZQAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D&sni=google.com#trojan-gRPC-tls-ech
 
-## TLS
+# HTTPUpgrade
-1. 
+trojan://uc44gBwOKQ@127.0.0.1:29085?type=httpupgrade&path=%2Fhttpupgradepath&host=google.com&security=none#trojan-httpupgrade-none
-```
+trojan://MhNxbcVB14@127.0.0.1:32700?type=httpupgrade&path=%2Fhttpupgradepath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#trojan-httpupgrade-tls
-vless://8100b6eb-3fd1-4e73-8ccf-b4ac961232d6@example.com:443?type=tcp&security=tls&fp=&alpn=h3%2Ch2%2Chttp%2F1.1#vless-tls
+trojan://7SOQFUpLob@127.0.0.1:28474?type=httpupgrade&path=%2Fhttpupgradepath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&allowInsecure=1&sni=google.com#trojan-httpupgrade-tls-insecure
-```
+trojan://ou8pLSyx9N@127.0.0.1:17737?type=httpupgrade&path=%2Fhttpupgradepath&host=google.com&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&ech=AF3%2BDQBZAAAgACB%2FlkIkit%2BblFzE7PtbYDVF3NXK8olXJ5a7YwY%2Biy9QQwAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D&sni=google.com#trojan-httpupgrade-tls-ech
 
-2.
+# XHTTP
-```
+trojan://VEetltxLtw@127.0.0.1:59072?type=xhttp&path=%2Fxhttppath&host=google.com&mode=auto&security=none#trojan-xhttp
-vless://8b60389a-7a01-4365-9244-c87f12bb98cf@example.com:443?security=tls&sni=SITE&fp=chrome&type=tcp&flow=xtls-rprx-vision&encryption=none#vless-tls-withot-alpn
-```
-3. 
-```
-vless://8b60389a-7a01-4365-9244-c87f12bb98cf@example.com:443/?type=ws&encryption=none&path=%2Fwebsocket&security=tls&sni=sni.server.com&fp=chrome#vless-tls-ws
-```
-
-4.
-```
-vless://[someid]@[someserver]?security=tls&sni=[somesni]&type=ws&path=/?ed%3D2560&host=[somesni]&encryption=none#vless-tls-ws-2
-```
-
-5.
-```
-vless://uuid@server:443?security=tls&sni=server&fp=chrome&type=ws&path=/websocket&encryption=none#vless-tls-ws-3
-```
-
-6.
-```
-vless://33333@example.com:443/?type=ws&encryption=none&path=%2Fwebsocket&security=tls&sni=example.com&fp=chrome#vless-tls-ws-4
-```
-
-## No security
-```
-vless://8b60389a-7a01-4365-9244-c87f12bb98cf@example.com:443?type=tcp&security=none#vless-tls-no-encrypt
 ```

fe-app-podkop/.prettierrc

@@ -0,0 +1,8 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true
+}

fe-app-podkop/eslint.config.js

@@ -0,0 +1,27 @@
+// eslint.config.js
+import js from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import prettier from 'eslint-config-prettier';
+
+export default [
+    js.configs.recommended,
+    ...tseslint.configs.recommended,
+    {
+        ignores: ['node_modules', 'watch-upload.js'],
+    },
+    {
+        rules: {
+            'no-console': 'off',
+            'no-unused-vars': 'off',
+            '@typescript-eslint/no-unused-vars': [
+                'warn',
+                {
+                    argsIgnorePattern: '^_',
+                    varsIgnorePattern: '^_',
+                    caughtErrorsIgnorePattern: '^_',
+                },
+            ],
+        },
+    },
+    prettier,
+];

fe-app-podkop/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "fe-app-podkop",
+  "version": "1.0.0",
+  "license": "MIT",
+  "type": "module",
+  "scripts": {
+    "format": "prettier --write src",
+    "lint": "eslint src --ext .ts,.tsx",
+    "lint:fix": "eslint src --ext .ts,.tsx --fix",
+    "build": "tsup src/main.ts",
+    "dev": "tsup src/main.ts --watch",
+    "test": "vitest",
+    "ci": "yarn format && yarn lint --max-warnings=0 && yarn test --run && yarn build",
+    "watch:sftp": "node watch-upload.js"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "8.45.0",
+    "@typescript-eslint/parser": "8.45.0",
+    "chokidar": "4.0.3",
+    "dotenv": "17.2.3",
+    "eslint": "9.36.0",
+    "eslint-config-prettier": "10.1.8",
+    "glob": "11.0.3",
+    "prettier": "3.6.2",
+    "ssh2-sftp-client": "12.0.1",
+    "tsup": "8.5.0",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.45.0",
+    "vitest": "3.2.4"
+  }
+}

fe-app-podkop/src/clash/index.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './methods';

fe-app-podkop/src/clash/methods/createBaseApiRequest.ts

@@ -0,0 +1,28 @@
+import { IBaseApiResponse } from '../types';
+
+export async function createBaseApiRequest<T>(
+  fetchFn: () => Promise<Response>,
+): Promise<IBaseApiResponse<T>> {
+  try {
+    const response = await fetchFn();
+
+    if (!response.ok) {
+      return {
+        success: false as const,
+        message: `${_('HTTP error')} ${response.status}: ${response.statusText}`,
+      };
+    }
+
+    const data: T = await response.json();
+
+    return {
+      success: true as const,
+      data,
+    };
+  } catch (e) {
+    return {
+      success: false as const,
+      message: e instanceof Error ? e.message : _('Unknown error'),
+    };
+  }
+}

fe-app-podkop/src/clash/methods/getConfig.ts

@@ -0,0 +1,14 @@
+import { ClashAPI, IBaseApiResponse } from '../types';
+import { createBaseApiRequest } from './createBaseApiRequest';
+import { getClashApiUrl } from '../../helpers';
+
+export async function getClashConfig(): Promise<
+  IBaseApiResponse<ClashAPI.Config>
+> {
+  return createBaseApiRequest<ClashAPI.Config>(() =>
+    fetch(`${getClashApiUrl()}/configs`, {
+      method: 'GET',
+      headers: { 'Content-Type': 'application/json' },
+    }),
+  );
+}

fe-app-podkop/src/clash/methods/getGroupDelay.ts

@@ -0,0 +1,20 @@
+import { ClashAPI, IBaseApiResponse } from '../types';
+import { createBaseApiRequest } from './createBaseApiRequest';
+import { getClashApiUrl } from '../../helpers';
+
+export async function getClashGroupDelay(
+  group: string,
+  url = 'https://www.gstatic.com/generate_204',
+  timeout = 2000,
+): Promise<IBaseApiResponse<ClashAPI.Delays>> {
+  const endpoint = `${getClashApiUrl()}/group/${group}/delay?url=${encodeURIComponent(
+    url,
+  )}&timeout=${timeout}`;
+
+  return createBaseApiRequest<ClashAPI.Delays>(() =>
+    fetch(endpoint, {
+      method: 'GET',
+      headers: { 'Content-Type': 'application/json' },
+    }),
+  );
+}

fe-app-podkop/src/clash/methods/getProxies.ts

@@ -0,0 +1,14 @@
+import { ClashAPI, IBaseApiResponse } from '../types';
+import { createBaseApiRequest } from './createBaseApiRequest';
+import { getClashApiUrl } from '../../helpers';
+
+export async function getClashProxies(): Promise<
+  IBaseApiResponse<ClashAPI.Proxies>
+> {
+  return createBaseApiRequest<ClashAPI.Proxies>(() =>
+    fetch(`${getClashApiUrl()}/proxies`, {
+      method: 'GET',
+      headers: { 'Content-Type': 'application/json' },
+    }),
+  );
+}

fe-app-podkop/src/clash/methods/getVersion.ts

@@ -0,0 +1,14 @@
+import { ClashAPI, IBaseApiResponse } from '../types';
+import { createBaseApiRequest } from './createBaseApiRequest';
+import { getClashApiUrl } from '../../helpers';
+
+export async function getClashVersion(): Promise<
+  IBaseApiResponse<ClashAPI.Version>
+> {
+  return createBaseApiRequest<ClashAPI.Version>(() =>
+    fetch(`${getClashApiUrl()}/version`, {
+      method: 'GET',
+      headers: { 'Content-Type': 'application/json' },
+    }),
+  );
+}

fe-app-podkop/src/clash/methods/index.ts

@@ -0,0 +1,7 @@
+export * from './createBaseApiRequest';
+export * from './getConfig';
+export * from './getGroupDelay';
+export * from './getProxies';
+export * from './getVersion';
+export * from './triggerProxySelector';
+export * from './triggerLatencyTest';

fe-app-podkop/src/clash/methods/triggerLatencyTest.ts

@@ -0,0 +1,35 @@
+import { IBaseApiResponse } from '../types';
+import { createBaseApiRequest } from './createBaseApiRequest';
+import { getClashApiUrl } from '../../helpers';
+
+export async function triggerLatencyGroupTest(
+  tag: string,
+  timeout: number = 5000,
+  url: string = 'https://www.gstatic.com/generate_204',
+): Promise<IBaseApiResponse<void>> {
+  return createBaseApiRequest<void>(() =>
+    fetch(
+      `${getClashApiUrl()}/group/${tag}/delay?url=${encodeURIComponent(url)}&timeout=${timeout}`,
+      {
+        method: 'GET',
+        headers: { 'Content-Type': 'application/json' },
+      },
+    ),
+  );
+}
+
+export async function triggerLatencyProxyTest(
+  tag: string,
+  timeout: number = 2000,
+  url: string = 'https://www.gstatic.com/generate_204',
+): Promise<IBaseApiResponse<void>> {
+  return createBaseApiRequest<void>(() =>
+    fetch(
+      `${getClashApiUrl()}/proxies/${tag}/delay?url=${encodeURIComponent(url)}&timeout=${timeout}`,
+      {
+        method: 'GET',
+        headers: { 'Content-Type': 'application/json' },
+      },
+    ),
+  );
+}

fe-app-podkop/src/clash/methods/triggerProxySelector.ts

@@ -0,0 +1,16 @@
+import { IBaseApiResponse } from '../types';
+import { createBaseApiRequest } from './createBaseApiRequest';
+import { getClashApiUrl } from '../../helpers';
+
+export async function triggerProxySelector(
+  selector: string,
+  outbound: string,
+): Promise<IBaseApiResponse<void>> {
+  return createBaseApiRequest<void>(() =>
+    fetch(`${getClashApiUrl()}/proxies/${selector}`, {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ name: outbound }),
+    }),
+  );
+}

fe-app-podkop/src/clash/types.ts

@@ -0,0 +1,53 @@
+export type IBaseApiResponse<T> =
+  | {
+      success: true;
+      data: T;
+    }
+  | {
+      success: false;
+      message: string;
+    };
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace ClashAPI {
+  export interface Version {
+    meta: boolean;
+    premium: boolean;
+    version: string;
+  }
+
+  export interface Config {
+    port: number;
+    'socks-port': number;
+    'redir-port': number;
+    'tproxy-port': number;
+    'mixed-port': number;
+    'allow-lan': boolean;
+    'bind-address': string;
+    mode: 'Rule' | 'Global' | 'Direct';
+    'mode-list': string[];
+    'log-level': 'debug' | 'info' | 'warn' | 'error';
+    ipv6: boolean;
+    tun: null | Record<string, unknown>;
+  }
+
+  export interface ProxyHistoryEntry {
+    time: string;
+    delay: number;
+  }
+
+  export interface ProxyBase {
+    type: string;
+    name: string;
+    udp: boolean;
+    history: ProxyHistoryEntry[];
+    now?: string;
+    all?: string[];
+  }
+
+  export interface Proxies {
+    proxies: Record<string, ProxyBase>;
+  }
+
+  export type Delays = Record<string, number>;
+}

fe-app-podkop/src/constants.ts

@@ -0,0 +1,107 @@
+export const STATUS_COLORS = {
+  SUCCESS: '#4caf50',
+  ERROR: '#f44336',
+  WARNING: '#ff9800',
+};
+
+export const FAKEIP_CHECK_DOMAIN = 'fakeip.podkop.fyi';
+export const IP_CHECK_DOMAIN = 'ip.podkop.fyi';
+
+export const REGIONAL_OPTIONS = [
+  'russia_inside',
+  'russia_outside',
+  'ukraine_inside',
+];
+
+export const ALLOWED_WITH_RUSSIA_INSIDE = [
+  'russia_inside',
+  'meta',
+  'twitter',
+  'discord',
+  'telegram',
+  'cloudflare',
+  'google_ai',
+  'google_play',
+  'hetzner',
+  'ovh',
+  'hodca',
+  'digitalocean',
+  'cloudfront',
+];
+
+export const DOMAIN_LIST_OPTIONS = {
+  russia_inside: 'Russia inside',
+  russia_outside: 'Russia outside',
+  ukraine_inside: 'Ukraine',
+  geoblock: 'Geo Block',
+  block: 'Block',
+  porn: 'Porn',
+  news: 'News',
+  anime: 'Anime',
+  youtube: 'Youtube',
+  discord: 'Discord',
+  meta: 'Meta',
+  twitter: 'Twitter (X)',
+  hdrezka: 'HDRezka',
+  tiktok: 'Tik-Tok',
+  telegram: 'Telegram',
+  cloudflare: 'Cloudflare',
+  google_ai: 'Google AI',
+  google_play: 'Google Play',
+  hodca: 'H.O.D.C.A',
+  hetzner: 'Hetzner ASN',
+  ovh: 'OVH ASN',
+  digitalocean: 'Digital Ocean ASN',
+  cloudfront: 'CloudFront ASN',
+};
+
+export const UPDATE_INTERVAL_OPTIONS = {
+  '1h': 'Every hour',
+  '3h': 'Every 3 hours',
+  '12h': 'Every 12 hours',
+  '1d': 'Every day',
+  '3d': 'Every 3 days',
+};
+
+export const DNS_SERVER_OPTIONS = {
+  '1.1.1.1': '1.1.1.1 (Cloudflare)',
+  '8.8.8.8': '8.8.8.8 (Google)',
+  '9.9.9.9': '9.9.9.9 (Quad9)',
+  'dns.adguard-dns.com': 'dns.adguard-dns.com (AdGuard Default)',
+  'unfiltered.adguard-dns.com':
+    'unfiltered.adguard-dns.com (AdGuard Unfiltered)',
+  'family.adguard-dns.com': 'family.adguard-dns.com (AdGuard Family)',
+};
+export const BOOTSTRAP_DNS_SERVER_OPTIONS = {
+  '77.88.8.8': '77.88.8.8 (Yandex DNS)',
+  '77.88.8.1': '77.88.8.1 (Yandex DNS)',
+  '1.1.1.1': '1.1.1.1 (Cloudflare DNS)',
+  '1.0.0.1': '1.0.0.1 (Cloudflare DNS)',
+  '8.8.8.8': '8.8.8.8 (Google DNS)',
+  '8.8.4.4': '8.8.4.4 (Google DNS)',
+  '9.9.9.9': '9.9.9.9 (Quad9 DNS)',
+  '9.9.9.11': '9.9.9.11 (Quad9 DNS)',
+};
+
+export const DIAGNOSTICS_UPDATE_INTERVAL = 10000; // 10 seconds
+export const CACHE_TIMEOUT = DIAGNOSTICS_UPDATE_INTERVAL - 1000; // 9 seconds
+export const ERROR_POLL_INTERVAL = 10000; // 10 seconds
+export const COMMAND_TIMEOUT = 10000; // 10 seconds
+export const FETCH_TIMEOUT = 10000; // 10 seconds
+export const BUTTON_FEEDBACK_TIMEOUT = 1000; // 1 second
+export const DIAGNOSTICS_INITIAL_DELAY = 100; // 100 milliseconds
+
+// Command scheduling intervals in diagnostics (in milliseconds)
+export const COMMAND_SCHEDULING = {
+  P0_PRIORITY: 0, // Highest priority (no delay)
+  P1_PRIORITY: 100, // Very high priority
+  P2_PRIORITY: 300, // High priority
+  P3_PRIORITY: 500, // Above average
+  P4_PRIORITY: 700, // Standard priority
+  P5_PRIORITY: 900, // Below average
+  P6_PRIORITY: 1100, // Low priority
+  P7_PRIORITY: 1300, // Very low priority
+  P8_PRIORITY: 1500, // Background execution
+  P9_PRIORITY: 1700, // Idle mode execution
+  P10_PRIORITY: 1900, // Lowest priority
+} as const;

fe-app-podkop/src/helpers/executeShellCommand.ts

@@ -0,0 +1,32 @@
+import { COMMAND_TIMEOUT } from '../constants';
+import { withTimeout } from './withTimeout';
+
+interface ExecuteShellCommandParams {
+  command: string;
+  args: string[];
+  timeout?: number;
+}
+
+interface ExecuteShellCommandResponse {
+  stdout: string;
+  stderr: string;
+  code?: number;
+}
+
+export async function executeShellCommand({
+  command,
+  args,
+  timeout = COMMAND_TIMEOUT,
+}: ExecuteShellCommandParams): Promise<ExecuteShellCommandResponse> {
+  try {
+    return withTimeout(
+      fs.exec(command, args),
+      timeout,
+      [command, ...args].join(' '),
+    );
+  } catch (err) {
+    const error = err as Error;
+
+    return { stdout: '', stderr: error?.message, code: 0 };
+  }
+}

fe-app-podkop/src/helpers/getBaseUrl.ts

@@ -0,0 +1,4 @@
+export function getBaseUrl(): string {
+  const { protocol, hostname } = window.location;
+  return `${protocol}//${hostname}`;
+}

fe-app-podkop/src/helpers/getClashApiUrl.ts

@@ -0,0 +1,11 @@
+export function getClashApiUrl(): string {
+  const { protocol, hostname } = window.location;
+
+  return `${protocol}//${hostname}:9090`;
+}
+
+export function getClashWsUrl(): string {
+  const { hostname } = window.location;
+
+  return `ws://${hostname}:9090`;
+}

fe-app-podkop/src/helpers/getProxyUrlName.ts

@@ -0,0 +1,13 @@
+export function getProxyUrlName(url: string) {
+  try {
+    const [_link, hash] = url.split('#');
+
+    if (!hash) {
+      return '';
+    }
+
+    return decodeURIComponent(hash);
+  } catch {
+    return '';
+  }
+}

fe-app-podkop/src/helpers/index.ts

@@ -0,0 +1,10 @@
+export * from './getBaseUrl';
+export * from './parseValueList';
+export * from './injectGlobalStyles';
+export * from './withTimeout';
+export * from './executeShellCommand';
+export * from './maskIP';
+export * from './getProxyUrlName';
+export * from './onMount';
+export * from './getClashApiUrl';
+export * from './splitProxyString';

fe-app-podkop/src/helpers/injectGlobalStyles.ts

@@ -0,0 +1,12 @@
+import { GlobalStyles } from '../styles';
+
+export function injectGlobalStyles() {
+  document.head.insertAdjacentHTML(
+    'beforeend',
+    `
+        <style>
+          ${GlobalStyles}
+        </style>
+    `,
+  );
+}

fe-app-podkop/src/helpers/maskIP.ts

@@ -0,0 +1,5 @@
+export function maskIP(ip: string = ''): string {
+  const ipv4Regex = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;
+
+  return ip.replace(ipv4Regex, (_match, _p1, _p2, _p3, p4) => `XX.XX.XX.${p4}`);
+}

fe-app-podkop/src/helpers/onMount.ts

@@ -0,0 +1,30 @@
+export async function onMount(id: string): Promise<HTMLElement> {
+  return new Promise((resolve) => {
+    const el = document.getElementById(id);
+
+    if (el && el.offsetParent !== null) {
+      return resolve(el);
+    }
+
+    const observer = new MutationObserver(() => {
+      const target = document.getElementById(id);
+      if (target) {
+        const io = new IntersectionObserver((entries) => {
+          const visible = entries.some((e) => e.isIntersecting);
+          if (visible) {
+            observer.disconnect();
+            io.disconnect();
+            resolve(target);
+          }
+        });
+
+        io.observe(target);
+      }
+    });
+
+    observer.observe(document.body, {
+      childList: true,
+      subtree: true,
+    });
+  });
+}

fe-app-podkop/src/helpers/parseValueList.ts

@@ -0,0 +1,9 @@
+export function parseValueList(value: string): string[] {
+  return value
+    .split(/\n/) // Split to array by newline separator
+    .map((line) => line.split('//')[0]) // Remove comments
+    .join(' ') // Build clean string
+    .split(/[,\s]+/) // Split to array by comma and space
+    .map((s) => s.trim()) // Remove extra spaces
+    .filter(Boolean); // Leave nonempty items
+}

fe-app-podkop/src/helpers/prettyBytes.ts

@@ -0,0 +1,12 @@
+// steal from https://github.com/sindresorhus/pretty-bytes/blob/master/index.js
+export function prettyBytes(n: number) {
+  const UNITS = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+
+  if (n < 1000) {
+    return n + ' B';
+  }
+  const exponent = Math.min(Math.floor(Math.log10(n) / 3), UNITS.length - 1);
+  n = Number((n / Math.pow(1000, exponent)).toPrecision(3));
+  const unit = UNITS[exponent];
+  return n + ' ' + unit;
+}

fe-app-podkop/src/helpers/splitProxyString.ts

@@ -0,0 +1,7 @@
+export function splitProxyString(str: string) {
+  return str
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => !line.startsWith('//'))
+    .filter(Boolean);
+}

fe-app-podkop/src/helpers/tests/maskIp.test.js

@@ -0,0 +1,42 @@
+import { describe, expect, it } from 'vitest';
+import { maskIP } from '../maskIP';
+
+export const validIPs = [
+  ['Standard private IP', '192.168.0.1', 'XX.XX.XX.1'],
+  ['Public IP', '8.8.8.8', 'XX.XX.XX.8'],
+  ['Mixed digits', '10.0.255.99', 'XX.XX.XX.99'],
+  ['Edge values', '255.255.255.255', 'XX.XX.XX.255'],
+  ['Zeros', '0.0.0.0', 'XX.XX.XX.0'],
+];
+
+export const invalidIPs = [
+  ['Empty string', '', ''],
+  ['Missing octets', '192.168.1', '192.168.1'],
+  ['Extra octets', '1.2.3.4.5', '1.2.3.4.5'],
+  ['Letters inside', 'abc.def.ghi.jkl', 'abc.def.ghi.jkl'],
+  ['Spaces inside', '1. 2.3.4', '1. 2.3.4'],
+  ['Just dots', '...', '...'],
+  ['IP with port', '127.0.0.1:8080', '127.0.0.1:8080'],
+  ['IP with text', 'ip=192.168.0.1', 'ip=192.168.0.1'],
+];
+
+describe('maskIP', () => {
+  describe.each(validIPs)('Valid IPv4: %s', (_desc, ip, expected) => {
+    it(`masks "${ip}" → "${expected}"`, () => {
+      expect(maskIP(ip)).toBe(expected);
+    });
+  });
+
+  describe.each(invalidIPs)(
+    'Invalid or malformed IP: %s',
+    (_desc, ip, expected) => {
+      it(`returns original string for "${ip}"`, () => {
+        expect(maskIP(ip)).toBe(expected);
+      });
+    },
+  );
+
+  it('defaults to empty string if no param passed', () => {
+    expect(maskIP()).toBe('');
+  });
+});

fe-app-podkop/src/helpers/withTimeout.ts

@@ -0,0 +1,21 @@
+export async function withTimeout<T>(
+  promise: Promise<T>,
+  timeoutMs: number,
+  operationName: string,
+  timeoutMessage = _('Operation timed out'),
+): Promise<T> {
+  let timeoutId;
+  const start = performance.now();
+
+  const timeoutPromise = new Promise<never>((_, reject) => {
+    timeoutId = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
+  });
+
+  try {
+    return await Promise.race([promise, timeoutPromise]);
+  } finally {
+    clearTimeout(timeoutId);
+    const elapsed = performance.now() - start;
+    console.log(`[${operationName}] Execution time: ${elapsed.toFixed(2)} ms`);
+  }
+}

fe-app-podkop/src/luci.d.ts

@@ -0,0 +1,40 @@
+type HtmlTag = keyof HTMLElementTagNameMap;
+
+type HtmlElement<T extends HtmlTag> = HTMLElementTagNameMap[T];
+
+type HtmlAttributes<T extends HtmlTag = 'div'> = Partial<
+  Omit<HtmlElement<T>, 'style' | 'children'> & {
+    style?: string | Partial<CSSStyleDeclaration>;
+    class?: string;
+    onclick?: (event: MouseEvent) => void;
+  }
+>;
+
+declare global {
+  const fs: {
+    exec(
+      command: string,
+      args?: string[],
+      env?: Record<string, string>,
+    ): Promise<{
+      stdout: string;
+      stderr: string;
+      code?: number;
+    }>;
+  };
+
+  const E: <T extends HtmlTag>(
+    type: T,
+    attr?: HtmlAttributes<T> | null,
+    children?: (Node | string)[] | Node | string,
+  ) => HTMLElementTagNameMap[T];
+
+  const uci: {
+    load: (packages: string | string[]) => Promise<string>;
+    sections: (conf: string, type?: string, cb?: () => void) => Promise<T>;
+  };
+
+  const _ = (_key: string) => string;
+}
+
+export {};

fe-app-podkop/src/main.ts

@@ -0,0 +1,10 @@
+'use strict';
+'require baseclass';
+'require fs';
+'require uci';
+
+export * from './validators';
+export * from './helpers';
+export * from './clash';
+export * from './podkop';
+export * from './constants';

fe-app-podkop/src/podkop/index.ts

@@ -0,0 +1,3 @@
+export * from './methods';
+export * from './services';
+export * from './tabs';

fe-app-podkop/src/podkop/methods/getConfigSections.ts

@@ -0,0 +1,5 @@
+import { Podkop } from '../types';
+
+export async function getConfigSections(): Promise<Podkop.ConfigSection[]> {
+  return uci.load('podkop').then(() => uci.sections('podkop'));
+}

fe-app-podkop/src/podkop/methods/getDashboardSections.ts

@@ -0,0 +1,155 @@
+import { Podkop } from '../types';
+import { getConfigSections } from './getConfigSections';
+import { getClashProxies } from '../../clash';
+import { getProxyUrlName, splitProxyString } from '../../helpers';
+
+interface IGetDashboardSectionsResponse {
+  success: boolean;
+  data: Podkop.OutboundGroup[];
+}
+
+export async function getDashboardSections(): Promise<IGetDashboardSectionsResponse> {
+  const configSections = await getConfigSections();
+  const clashProxies = await getClashProxies();
+
+  if (!clashProxies.success) {
+    return {
+      success: false,
+      data: [],
+    };
+  }
+
+  const proxies = Object.entries(clashProxies.data.proxies).map(
+    ([key, value]) => ({
+      code: key,
+      value,
+    }),
+  );
+
+  const data = configSections
+    .filter((section) => section.mode !== 'block')
+    .map((section) => {
+      if (section.mode === 'proxy') {
+        if (section.proxy_config_type === 'url') {
+          const outbound = proxies.find(
+            (proxy) => proxy.code === `${section['.name']}-out`,
+          );
+
+          const activeConfigs = splitProxyString(section.proxy_string);
+
+          const proxyDisplayName =
+            getProxyUrlName(activeConfigs?.[0]) || outbound?.value?.name || '';
+
+          return {
+            withTagSelect: false,
+            code: outbound?.code || section['.name'],
+            displayName: section['.name'],
+            outbounds: [
+              {
+                code: outbound?.code || section['.name'],
+                displayName: proxyDisplayName,
+                latency: outbound?.value?.history?.[0]?.delay || 0,
+                type: outbound?.value?.type || '',
+                selected: true,
+              },
+            ],
+          };
+        }
+
+        if (section.proxy_config_type === 'outbound') {
+          const outbound = proxies.find(
+            (proxy) => proxy.code === `${section['.name']}-out`,
+          );
+
+          return {
+            withTagSelect: false,
+            code: outbound?.code || section['.name'],
+            displayName: section['.name'],
+            outbounds: [
+              {
+                code: outbound?.code || section['.name'],
+                displayName:
+                  decodeURIComponent(JSON.parse(section.outbound_json)?.tag) ||
+                  outbound?.value?.name ||
+                  '',
+                latency: outbound?.value?.history?.[0]?.delay || 0,
+                type: outbound?.value?.type || '',
+                selected: true,
+              },
+            ],
+          };
+        }
+
+        if (section.proxy_config_type === 'urltest') {
+          const selector = proxies.find(
+            (proxy) => proxy.code === `${section['.name']}-out`,
+          );
+          const outbound = proxies.find(
+            (proxy) => proxy.code === `${section['.name']}-urltest-out`,
+          );
+
+          const outbounds = (outbound?.value?.all ?? [])
+            .map((code) => proxies.find((item) => item.code === code))
+            .map((item, index) => ({
+              code: item?.code || '',
+              displayName:
+                getProxyUrlName(section.urltest_proxy_links?.[index]) ||
+                item?.value?.name ||
+                '',
+              latency: item?.value?.history?.[0]?.delay || 0,
+              type: item?.value?.type || '',
+              selected: selector?.value?.now === item?.code,
+            }));
+
+          return {
+            withTagSelect: true,
+            code: selector?.code || section['.name'],
+            displayName: section['.name'],
+            outbounds: [
+              {
+                code: outbound?.code || '',
+                displayName: _('Fastest'),
+                latency: outbound?.value?.history?.[0]?.delay || 0,
+                type: outbound?.value?.type || '',
+                selected: selector?.value?.now === outbound?.code,
+              },
+              ...outbounds,
+            ],
+          };
+        }
+      }
+
+      if (section.mode === 'vpn') {
+        const outbound = proxies.find(
+          (proxy) => proxy.code === `${section['.name']}-out`,
+        );
+
+        return {
+          withTagSelect: false,
+          code: outbound?.code || section['.name'],
+          displayName: section['.name'],
+          outbounds: [
+            {
+              code: outbound?.code || section['.name'],
+              displayName: section.interface || outbound?.value?.name || '',
+              latency: outbound?.value?.history?.[0]?.delay || 0,
+              type: outbound?.value?.type || '',
+              selected: true,
+            },
+          ],
+        };
+      }
+
+      return {
+        withTagSelect: false,
+        code: section['.name'],
+        displayName: section['.name'],
+        outbounds: [],
+      };
+    });
+
+  return {
+    success: true,
+    data,
+  };
+}

fe-app-podkop/src/podkop/methods/getPodkopStatus.ts

@@ -0,0 +1,21 @@
+import { executeShellCommand } from '../../helpers';
+
+export async function getPodkopStatus(): Promise<{
+  enabled: number;
+  status: string;
+}> {
+  const response = await executeShellCommand({
+    command: '/usr/bin/podkop',
+    args: ['get_status'],
+    timeout: 1000,
+  });
+
+  if (response.stdout) {
+    return JSON.parse(response.stdout.replace(/\n/g, '')) as {
+      enabled: number;
+      status: string;
+    };
+  }
+
+  return { enabled: 0, status: 'unknown' };
+}

fe-app-podkop/src/podkop/methods/getSingboxStatus.ts

@@ -0,0 +1,23 @@
+import { executeShellCommand } from '../../helpers';
+
+export async function getSingboxStatus(): Promise<{
+  running: number;
+  enabled: number;
+  status: string;
+}> {
+  const response = await executeShellCommand({
+    command: '/usr/bin/podkop',
+    args: ['get_sing_box_status'],
+    timeout: 1000,
+  });
+
+  if (response.stdout) {
+    return JSON.parse(response.stdout.replace(/\n/g, '')) as {
+      running: number;
+      enabled: number;
+      status: string;
+    };
+  }
+
+  return { running: 0, enabled: 0, status: 'unknown' };
+}

fe-app-podkop/src/podkop/methods/index.ts

@@ -0,0 +1,4 @@
+export * from './getConfigSections';
+export * from './getDashboardSections';
+export * from './getPodkopStatus';
+export * from './getSingboxStatus';

fe-app-podkop/src/podkop/services/core.service.ts

@@ -0,0 +1,13 @@
+import { TabServiceInstance } from './tab.service';
+import { store } from '../../store';
+
+export function coreService() {
+  TabServiceInstance.onChange((activeId, tabs) => {
+    store.set({
+      tabService: {
+        current: activeId || '',
+        all: tabs.map((tab) => tab.id),
+      },
+    });
+  });
+}

fe-app-podkop/src/podkop/services/index.ts

@@ -0,0 +1,2 @@
+export * from './tab.service';
+export * from './core.service';

fe-app-podkop/src/podkop/services/tab.service.ts

@@ -0,0 +1,92 @@
+type TabInfo = {
+  el: HTMLElement;
+  id: string;
+  active: boolean;
+};
+
+type TabChangeCallback = (activeId: string | null, allTabs: TabInfo[]) => void;
+
+export class TabService {
+  private static instance: TabService;
+  private observer: MutationObserver | null = null;
+  private callback?: TabChangeCallback;
+  private lastActiveId: string | null = null;
+
+  private constructor() {
+    this.init();
+  }
+
+  public static getInstance(): TabService {
+    if (!TabService.instance) {
+      TabService.instance = new TabService();
+    }
+    return TabService.instance;
+  }
+
+  private init() {
+    this.observer = new MutationObserver(() => this.handleMutations());
+    this.observer.observe(document.body, {
+      subtree: true,
+      childList: true,
+      attributes: true,
+      attributeFilter: ['class'],
+    });
+
+    // initial check
+    this.notify();
+  }
+
+  private handleMutations() {
+    this.notify();
+  }
+
+  private getTabsInfo(): TabInfo[] {
+    const tabs = Array.from(
+      document.querySelectorAll<HTMLElement>('.cbi-tab, .cbi-tab-disabled'),
+    );
+    return tabs.map((el) => ({
+      el,
+      id: el.dataset.tab || '',
+      active:
+        el.classList.contains('cbi-tab') &&
+        !el.classList.contains('cbi-tab-disabled'),
+    }));
+  }
+
+  private getActiveTabId(): string | null {
+    const active = document.querySelector<HTMLElement>(
+      '.cbi-tab:not(.cbi-tab-disabled)',
+    );
+    return active?.dataset.tab || null;
+  }
+
+  private notify() {
+    const tabs = this.getTabsInfo();
+    const activeId = this.getActiveTabId();
+
+    if (activeId !== this.lastActiveId) {
+      this.lastActiveId = activeId;
+      this.callback?.(activeId, tabs);
+    }
+  }
+
+  public onChange(callback: TabChangeCallback) {
+    this.callback = callback;
+    this.notify();
+  }
+
+  public getAllTabs(): TabInfo[] {
+    return this.getTabsInfo();
+  }
+
+  public getActiveTab(): string | null {
+    return this.getActiveTabId();
+  }
+
+  public disconnect() {
+    this.observer?.disconnect();
+    this.observer = null;
+  }
+}
+
+export const TabServiceInstance = TabService.getInstance();

fe-app-podkop/src/podkop/tabs/dashboard/index.ts

@@ -0,0 +1,2 @@
+export * from './renderDashboard';
+export * from './initDashboardController';

fe-app-podkop/src/podkop/tabs/dashboard/initDashboardController.ts

@@ -0,0 +1,393 @@
+import {
+  getDashboardSections,
+  getPodkopStatus,
+  getSingboxStatus,
+} from '../../methods';
+import { getClashWsUrl, onMount } from '../../../helpers';
+import {
+  triggerLatencyGroupTest,
+  triggerLatencyProxyTest,
+  triggerProxySelector,
+} from '../../../clash';
+import { store, StoreType } from '../../../store';
+import { socket } from '../../../socket';
+import { prettyBytes } from '../../../helpers/prettyBytes';
+import { renderSections } from './renderSections';
+import { renderWidget } from './renderWidget';
+
+// Fetchers
+
+async function fetchDashboardSections() {
+  const prev = store.get().sectionsWidget;
+
+  store.set({
+    sectionsWidget: {
+      ...prev,
+      failed: false,
+    },
+  });
+
+  const { data, success } = await getDashboardSections();
+
+  store.set({
+    sectionsWidget: {
+      loading: false,
+      failed: !success,
+      data,
+    },
+  });
+}
+
+async function fetchServicesInfo() {
+  const [podkop, singbox] = await Promise.all([
+    getPodkopStatus(),
+    getSingboxStatus(),
+  ]);
+
+  store.set({
+    servicesInfoWidget: {
+      loading: false,
+      failed: false,
+      data: { singbox: singbox.running, podkop: podkop.enabled },
+    },
+  });
+}
+
+async function connectToClashSockets() {
+  socket.subscribe(
+    `${getClashWsUrl()}/traffic?token=`,
+    (msg) => {
+      const parsedMsg = JSON.parse(msg);
+
+      store.set({
+        bandwidthWidget: {
+          loading: false,
+          failed: false,
+          data: { up: parsedMsg.up, down: parsedMsg.down },
+        },
+      });
+    },
+    (_err) => {
+      store.set({
+        bandwidthWidget: {
+          loading: false,
+          failed: true,
+          data: { up: 0, down: 0 },
+        },
+      });
+    },
+  );
+
+  socket.subscribe(
+    `${getClashWsUrl()}/connections?token=`,
+    (msg) => {
+      const parsedMsg = JSON.parse(msg);
+
+      store.set({
+        trafficTotalWidget: {
+          loading: false,
+          failed: false,
+          data: {
+            downloadTotal: parsedMsg.downloadTotal,
+            uploadTotal: parsedMsg.uploadTotal,
+          },
+        },
+        systemInfoWidget: {
+          loading: false,
+          failed: false,
+          data: {
+            connections: parsedMsg.connections?.length,
+            memory: parsedMsg.memory,
+          },
+        },
+      });
+    },
+    (_err) => {
+      store.set({
+        trafficTotalWidget: {
+          loading: false,
+          failed: true,
+          data: { downloadTotal: 0, uploadTotal: 0 },
+        },
+        systemInfoWidget: {
+          loading: false,
+          failed: true,
+          data: {
+            connections: 0,
+            memory: 0,
+          },
+        },
+      });
+    },
+  );
+}
+
+// Handlers
+
+async function handleChooseOutbound(selector: string, tag: string) {
+  await triggerProxySelector(selector, tag);
+  await fetchDashboardSections();
+}
+
+async function handleTestGroupLatency(tag: string) {
+  await triggerLatencyGroupTest(tag);
+  await fetchDashboardSections();
+}
+
+async function handleTestProxyLatency(tag: string) {
+  await triggerLatencyProxyTest(tag);
+  await fetchDashboardSections();
+}
+
+function replaceTestLatencyButtonsWithSkeleton() {
+  document
+    .querySelectorAll('.dashboard-sections-grid-item-test-latency')
+    .forEach((el) => {
+      const newDiv = document.createElement('div');
+      newDiv.className = 'skeleton';
+      newDiv.style.width = '99px';
+      newDiv.style.height = '28px';
+      el.replaceWith(newDiv);
+    });
+}
+
+// Renderer
+
+async function renderSectionsWidget() {
+  console.log('renderSectionsWidget');
+  const sectionsWidget = store.get().sectionsWidget;
+  const container = document.getElementById('dashboard-sections-grid');
+
+  if (sectionsWidget.loading || sectionsWidget.failed) {
+    const renderedWidget = renderSections({
+      loading: sectionsWidget.loading,
+      failed: sectionsWidget.failed,
+      section: {
+        code: '',
+        displayName: '',
+        outbounds: [],
+        withTagSelect: false,
+      },
+      onTestLatency: () => {},
+      onChooseOutbound: () => {},
+    });
+    return container!.replaceChildren(renderedWidget);
+  }
+
+  const renderedWidgets = sectionsWidget.data.map((section) =>
+    renderSections({
+      loading: sectionsWidget.loading,
+      failed: sectionsWidget.failed,
+      section,
+      onTestLatency: (tag) => {
+        replaceTestLatencyButtonsWithSkeleton();
+
+        if (section.withTagSelect) {
+          return handleTestGroupLatency(tag);
+        }
+
+        return handleTestProxyLatency(tag);
+      },
+      onChooseOutbound: (selector, tag) => {
+        handleChooseOutbound(selector, tag);
+      },
+    }),
+  );
+
+  return container!.replaceChildren(...renderedWidgets);
+}
+
+async function renderBandwidthWidget() {
+  console.log('renderBandwidthWidget');
+  const traffic = store.get().bandwidthWidget;
+
+  const container = document.getElementById('dashboard-widget-traffic');
+
+  if (traffic.loading || traffic.failed) {
+    const renderedWidget = renderWidget({
+      loading: traffic.loading,
+      failed: traffic.failed,
+      title: '',
+      items: [],
+    });
+
+    return container!.replaceChildren(renderedWidget);
+  }
+
+  const renderedWidget = renderWidget({
+    loading: traffic.loading,
+    failed: traffic.failed,
+    title: _('Traffic'),
+    items: [
+      { key: _('Uplink'), value: `${prettyBytes(traffic.data.up)}/s` },
+      { key: _('Downlink'), value: `${prettyBytes(traffic.data.down)}/s` },
+    ],
+  });
+
+  container!.replaceChildren(renderedWidget);
+}
+
+async function renderTrafficTotalWidget() {
+  console.log('renderTrafficTotalWidget');
+  const trafficTotalWidget = store.get().trafficTotalWidget;
+
+  const container = document.getElementById('dashboard-widget-traffic-total');
+
+  if (trafficTotalWidget.loading || trafficTotalWidget.failed) {
+    const renderedWidget = renderWidget({
+      loading: trafficTotalWidget.loading,
+      failed: trafficTotalWidget.failed,
+      title: '',
+      items: [],
+    });
+
+    return container!.replaceChildren(renderedWidget);
+  }
+
+  const renderedWidget = renderWidget({
+    loading: trafficTotalWidget.loading,
+    failed: trafficTotalWidget.failed,
+    title: _('Traffic Total'),
+    items: [
+      {
+        key: _('Uplink'),
+        value: String(prettyBytes(trafficTotalWidget.data.uploadTotal)),
+      },
+      {
+        key: _('Downlink'),
+        value: String(prettyBytes(trafficTotalWidget.data.downloadTotal)),
+      },
+    ],
+  });
+
+  container!.replaceChildren(renderedWidget);
+}
+
+async function renderSystemInfoWidget() {
+  console.log('renderSystemInfoWidget');
+  const systemInfoWidget = store.get().systemInfoWidget;
+
+  const container = document.getElementById('dashboard-widget-system-info');
+
+  if (systemInfoWidget.loading || systemInfoWidget.failed) {
+    const renderedWidget = renderWidget({
+      loading: systemInfoWidget.loading,
+      failed: systemInfoWidget.failed,
+      title: '',
+      items: [],
+    });
+
+    return container!.replaceChildren(renderedWidget);
+  }
+
+  const renderedWidget = renderWidget({
+    loading: systemInfoWidget.loading,
+    failed: systemInfoWidget.failed,
+    title: _('System info'),
+    items: [
+      {
+        key: _('Active Connections'),
+        value: String(systemInfoWidget.data.connections),
+      },
+      {
+        key: _('Memory Usage'),
+        value: String(prettyBytes(systemInfoWidget.data.memory)),
+      },
+    ],
+  });
+
+  container!.replaceChildren(renderedWidget);
+}
+
+async function renderServicesInfoWidget() {
+  console.log('renderServicesInfoWidget');
+  const servicesInfoWidget = store.get().servicesInfoWidget;
+
+  const container = document.getElementById('dashboard-widget-service-info');
+
+  if (servicesInfoWidget.loading || servicesInfoWidget.failed) {
+    const renderedWidget = renderWidget({
+      loading: servicesInfoWidget.loading,
+      failed: servicesInfoWidget.failed,
+      title: '',
+      items: [],
+    });
+
+    return container!.replaceChildren(renderedWidget);
+  }
+
+  const renderedWidget = renderWidget({
+    loading: servicesInfoWidget.loading,
+    failed: servicesInfoWidget.failed,
+    title: _('Services info'),
+    items: [
+      {
+        key: _('Podkop'),
+        value: servicesInfoWidget.data.podkop
+          ? _('✔ Enabled')
+          : _('✘ Disabled'),
+        attributes: {
+          class: servicesInfoWidget.data.podkop
+            ? 'pdk_dashboard-page__widgets-section__item__row--success'
+            : 'pdk_dashboard-page__widgets-section__item__row--error',
+        },
+      },
+      {
+        key: _('Sing-box'),
+        value: servicesInfoWidget.data.singbox
+          ? _('✔ Running')
+          : _('✘ Stopped'),
+        attributes: {
+          class: servicesInfoWidget.data.singbox
+            ? 'pdk_dashboard-page__widgets-section__item__row--success'
+            : 'pdk_dashboard-page__widgets-section__item__row--error',
+        },
+      },
+    ],
+  });
+
+  container!.replaceChildren(renderedWidget);
+}
+
+async function onStoreUpdate(
+  next: StoreType,
+  prev: StoreType,
+  diff: Partial<StoreType>,
+) {
+  if (diff.sectionsWidget) {
+    renderSectionsWidget();
+  }
+
+  if (diff.bandwidthWidget) {
+    renderBandwidthWidget();
+  }
+
+  if (diff.trafficTotalWidget) {
+    renderTrafficTotalWidget();
+  }
+
+  if (diff.systemInfoWidget) {
+    renderSystemInfoWidget();
+  }
+
+  if (diff.servicesInfoWidget) {
+    renderServicesInfoWidget();
+  }
+}
+
+export async function initDashboardController(): Promise<void> {
+  onMount('dashboard-status').then(() => {
+    // Remove old listener
+    store.unsubscribe(onStoreUpdate);
+    // Clear store
+    store.reset();
+
+    // Add new listener
+    store.subscribe(onStoreUpdate);
+
+    // Initial sections fetch
+    fetchDashboardSections();
+    fetchServicesInfo();
+    connectToClashSockets();
+  });
+}

fe-app-podkop/src/podkop/tabs/dashboard/renderDashboard.ts

@@ -0,0 +1,54 @@
+import { renderSections } from './renderSections';
+import { renderWidget } from './renderWidget';
+
+export function renderDashboard() {
+  return E(
+    'div',
+    {
+      id: 'dashboard-status',
+      class: 'pdk_dashboard-page',
+    },
+    [
+      // Widgets section
+      E('div', { class: 'pdk_dashboard-page__widgets-section' }, [
+        E(
+          'div',
+          { id: 'dashboard-widget-traffic' },
+          renderWidget({ loading: true, failed: false, title: '', items: [] }),
+        ),
+        E(
+          'div',
+          { id: 'dashboard-widget-traffic-total' },
+          renderWidget({ loading: true, failed: false, title: '', items: [] }),
+        ),
+        E(
+          'div',
+          { id: 'dashboard-widget-system-info' },
+          renderWidget({ loading: true, failed: false, title: '', items: [] }),
+        ),
+        E(
+          'div',
+          { id: 'dashboard-widget-service-info' },
+          renderWidget({ loading: true, failed: false, title: '', items: [] }),
+        ),
+      ]),
+      // All outbounds
+      E(
+        'div',
+        { id: 'dashboard-sections-grid' },
+        renderSections({
+          loading: true,
+          failed: false,
+          section: {
+            code: '',
+            displayName: '',
+            outbounds: [],
+            withTagSelect: false,
+          },
+          onTestLatency: () => {},
+          onChooseOutbound: () => {},
+        }),
+      ),
+    ],
+  );
+}

fe-app-podkop/src/podkop/tabs/dashboard/renderSections.ts

@@ -0,0 +1,125 @@
+import { Podkop } from '../../types';
+
+interface IRenderSectionsProps {
+  loading: boolean;
+  failed: boolean;
+  section: Podkop.OutboundGroup;
+  onTestLatency: (tag: string) => void;
+  onChooseOutbound: (selector: string, tag: string) => void;
+}
+
+function renderFailedState() {
+  return E(
+    'div',
+    {
+      class: 'pdk_dashboard-page__outbound-section centered',
+      style: 'height: 127px',
+    },
+    E('span', {}, _('Dashboard currently unavailable')),
+  );
+}
+
+function renderLoadingState() {
+  return E('div', {
+    id: 'dashboard-sections-grid-skeleton',
+    class: 'pdk_dashboard-page__outbound-section skeleton',
+    style: 'height: 127px',
+  });
+}
+
+export function renderDefaultState({
+  section,
+  onChooseOutbound,
+  onTestLatency,
+}: IRenderSectionsProps) {
+  function testLatency() {
+    if (section.withTagSelect) {
+      return onTestLatency(section.code);
+    }
+
+    if (section.outbounds.length) {
+      return onTestLatency(section.outbounds[0].code);
+    }
+  }
+
+  function renderOutbound(outbound: Podkop.Outbound) {
+    function getLatencyClass() {
+      if (!outbound.latency) {
+        return 'pdk_dashboard-page__outbound-grid__item__latency--empty';
+      }
+
+      if (outbound.latency < 200) {
+        return 'pdk_dashboard-page__outbound-grid__item__latency--green';
+      }
+
+      if (outbound.latency < 400) {
+        return 'pdk_dashboard-page__outbound-grid__item__latency--yellow';
+      }
+
+      return 'pdk_dashboard-page__outbound-grid__item__latency--red';
+    }
+
+    return E(
+      'div',
+      {
+        class: `pdk_dashboard-page__outbound-grid__item ${outbound.selected ? 'pdk_dashboard-page__outbound-grid__item--active' : ''} ${section.withTagSelect ? 'pdk_dashboard-page__outbound-grid__item--selectable' : ''}`,
+        click: () =>
+          section.withTagSelect &&
+          onChooseOutbound(section.code, outbound.code),
+      },
+      [
+        E('b', {}, outbound.displayName),
+        E('div', { class: 'pdk_dashboard-page__outbound-grid__item__footer' }, [
+          E(
+            'div',
+            { class: 'pdk_dashboard-page__outbound-grid__item__type' },
+            outbound.type,
+          ),
+          E(
+            'div',
+            { class: getLatencyClass() },
+            outbound.latency ? `${outbound.latency}ms` : 'N/A',
+          ),
+        ]),
+      ],
+    );
+  }
+
+  return E('div', { class: 'pdk_dashboard-page__outbound-section' }, [
+    // Title with test latency
+    E('div', { class: 'pdk_dashboard-page__outbound-section__title-section' }, [
+      E(
+        'div',
+        {
+          class: 'pdk_dashboard-page__outbound-section__title-section__title',
+        },
+        section.displayName,
+      ),
+      E(
+        'button',
+        {
+          class: 'btn dashboard-sections-grid-item-test-latency',
+          click: () => testLatency(),
+        },
+        _('Test latency'),
+      ),
+    ]),
+    E(
+      'div',
+      { class: 'pdk_dashboard-page__outbound-grid' },
+      section.outbounds.map((outbound) => renderOutbound(outbound)),
+    ),
+  ]);
+}
+
+export function renderSections(props: IRenderSectionsProps) {
+  if (props.failed) {
+    return renderFailedState();
+  }
+
+  if (props.loading) {
+    return renderLoadingState();
+  }
+
+  return renderDefaultState(props);
+}

fe-app-podkop/src/podkop/tabs/dashboard/renderWidget.ts

@@ -0,0 +1,78 @@
+interface IRenderWidgetProps {
+  loading: boolean;
+  failed: boolean;
+  title: string;
+  items: Array<{
+    key: string;
+    value: string;
+    attributes?: {
+      class?: string;
+    };
+  }>;
+}
+
+function renderFailedState() {
+  return E(
+    'div',
+    {
+      id: '',
+      style: 'height: 78px',
+      class: 'pdk_dashboard-page__widgets-section__item centered',
+    },
+    _('Currently unavailable'),
+  );
+}
+
+function renderLoadingState() {
+  return E(
+    'div',
+    {
+      id: '',
+      style: 'height: 78px',
+      class: 'pdk_dashboard-page__widgets-section__item skeleton',
+    },
+    '',
+  );
+}
+
+function renderDefaultState({ title, items }: IRenderWidgetProps) {
+  return E('div', { class: 'pdk_dashboard-page__widgets-section__item' }, [
+    E(
+      'b',
+      { class: 'pdk_dashboard-page__widgets-section__item__title' },
+      title,
+    ),
+    ...items.map((item) =>
+      E(
+        'div',
+        {
+          class: `pdk_dashboard-page__widgets-section__item__row ${item?.attributes?.class || ''}`,
+        },
+        [
+          E(
+            'span',
+            { class: 'pdk_dashboard-page__widgets-section__item__row__key' },
+            `${item.key}: `,
+          ),
+          E(
+            'span',
+            { class: 'pdk_dashboard-page__widgets-section__item__row__value' },
+            item.value,
+          ),
+        ],
+      ),
+    ),
+  ]);
+}
+
+export function renderWidget(props: IRenderWidgetProps) {
+  if (props.loading) {
+    return renderLoadingState();
+  }
+
+  if (props.failed) {
+    return renderFailedState();
+  }
+
+  return renderDefaultState(props);
+}

fe-app-podkop/src/podkop/tabs/index.ts

@@ -0,0 +1 @@
+export * from './dashboard';

fe-app-podkop/src/podkop/types.ts

@@ -0,0 +1,56 @@
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace Podkop {
+  export interface Outbound {
+    code: string;
+    displayName: string;
+    latency: number;
+    type: string;
+    selected: boolean;
+  }
+
+  export interface OutboundGroup {
+    withTagSelect: boolean;
+    code: string;
+    displayName: string;
+    outbounds: Outbound[];
+  }
+
+  export interface ConfigProxyUrlTestSection {
+    mode: 'proxy';
+    proxy_config_type: 'urltest';
+    urltest_proxy_links: string[];
+  }
+
+  export interface ConfigProxyUrlSection {
+    mode: 'proxy';
+    proxy_config_type: 'url';
+    proxy_string: string;
+  }
+
+  export interface ConfigProxyOutboundSection {
+    mode: 'proxy';
+    proxy_config_type: 'outbound';
+    outbound_json: string;
+  }
+
+  export interface ConfigVpnSection {
+    mode: 'vpn';
+    interface: string;
+  }
+
+  export interface ConfigBlockSection {
+    mode: 'block';
+  }
+
+  export type ConfigBaseSection =
+    | ConfigProxyUrlTestSection
+    | ConfigProxyUrlSection
+    | ConfigProxyOutboundSection
+    | ConfigVpnSection
+    | ConfigBlockSection;
+
+  export type ConfigSection = ConfigBaseSection & {
+    '.name': string;
+    '.type': 'main' | 'extra';
+  };
+}

fe-app-podkop/src/socket.ts

@@ -0,0 +1,121 @@
+// eslint-disable-next-line
+type Listener = (data: any) => void;
+type ErrorListener = (error: Event | string) => void;
+
+class SocketManager {
+  private static instance: SocketManager;
+  private sockets = new Map<string, WebSocket>();
+  private listeners = new Map<string, Set<Listener>>();
+  private connected = new Map<string, boolean>();
+  private errorListeners = new Map<string, Set<ErrorListener>>();
+
+  private constructor() {}
+
+  static getInstance(): SocketManager {
+    if (!SocketManager.instance) {
+      SocketManager.instance = new SocketManager();
+    }
+    return SocketManager.instance;
+  }
+
+  connect(url: string): void {
+    if (this.sockets.has(url)) return;
+
+    const ws = new WebSocket(url);
+    this.sockets.set(url, ws);
+    this.connected.set(url, false);
+    this.listeners.set(url, new Set());
+    this.errorListeners.set(url, new Set());
+
+    ws.addEventListener('open', () => {
+      this.connected.set(url, true);
+      console.info(`Connected: ${url}`);
+    });
+
+    ws.addEventListener('message', (event) => {
+      const handlers = this.listeners.get(url);
+      if (handlers) {
+        for (const handler of handlers) {
+          try {
+            handler(event.data);
+          } catch (err) {
+            console.error(`Handler error for ${url}:`, err);
+          }
+        }
+      }
+    });
+
+    ws.addEventListener('close', () => {
+      this.connected.set(url, false);
+      console.warn(`Disconnected: ${url}`);
+      this.triggerError(url, 'Connection closed');
+    });
+
+    ws.addEventListener('error', (err) => {
+      console.error(`Socket error for ${url}:`, err);
+      this.triggerError(url, err);
+    });
+  }
+
+  subscribe(url: string, listener: Listener, onError?: ErrorListener): void {
+    if (!this.sockets.has(url)) {
+      this.connect(url);
+    }
+
+    this.listeners.get(url)?.add(listener);
+
+    if (onError) {
+      this.errorListeners.get(url)?.add(onError);
+    }
+  }
+
+  unsubscribe(url: string, listener: Listener, onError?: ErrorListener): void {
+    this.listeners.get(url)?.delete(listener);
+    if (onError) {
+      this.errorListeners.get(url)?.delete(onError);
+    }
+  }
+
+  // eslint-disable-next-line
+  send(url: string, data: any): void {
+    const ws = this.sockets.get(url);
+    if (ws && this.connected.get(url)) {
+      ws.send(typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      console.warn(`Cannot send: not connected to ${url}`);
+      this.triggerError(url, 'Not connected');
+    }
+  }
+
+  disconnect(url: string): void {
+    const ws = this.sockets.get(url);
+    if (ws) {
+      ws.close();
+      this.sockets.delete(url);
+      this.listeners.delete(url);
+      this.errorListeners.delete(url);
+      this.connected.delete(url);
+    }
+  }
+
+  disconnectAll(): void {
+    for (const url of this.sockets.keys()) {
+      this.disconnect(url);
+    }
+  }
+
+  private triggerError(url: string, err: Event | string): void {
+    const handlers = this.errorListeners.get(url);
+    if (handlers) {
+      for (const cb of handlers) {
+        try {
+          cb(err);
+        } catch (e) {
+          console.error(`Error handler threw for ${url}:`, e);
+        }
+      }
+    }
+  }
+}
+
+export const socket = SocketManager.getInstance();

fe-app-podkop/src/store.ts

@@ -0,0 +1,179 @@
+import { Podkop } from './podkop/types';
+
+function jsonStableStringify<T, V>(obj: T): string {
+  return JSON.stringify(obj, (_, value) => {
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+      return Object.keys(value)
+        .sort()
+        .reduce(
+          (acc, key) => {
+            acc[key] = value[key];
+            return acc;
+          },
+          {} as Record<string, V>,
+        );
+    }
+    return value;
+  });
+}
+
+function jsonEqual<A, B>(a: A, b: B): boolean {
+  try {
+    return jsonStableStringify(a) === jsonStableStringify(b);
+  } catch {
+    return false;
+  }
+}
+
+type Listener<T> = (next: T, prev: T, diff: Partial<T>) => void;
+
+// eslint-disable-next-line
+class Store<T extends Record<string, any>> {
+  private value: T;
+  private readonly initial: T;
+  private listeners = new Set<Listener<T>>();
+  private lastHash = '';
+
+  constructor(initial: T) {
+    this.value = initial;
+    this.initial = structuredClone(initial);
+    this.lastHash = jsonStableStringify(initial);
+  }
+
+  get(): T {
+    return this.value;
+  }
+
+  set(next: Partial<T>): void {
+    const prev = this.value;
+    const merged = { ...prev, ...next };
+
+    if (jsonEqual(prev, merged)) return;
+
+    this.value = merged;
+    this.lastHash = jsonStableStringify(merged);
+
+    const diff: Partial<T> = {};
+    for (const key in merged) {
+      if (!jsonEqual(merged[key], prev[key])) diff[key] = merged[key];
+    }
+
+    this.listeners.forEach((cb) => cb(this.value, prev, diff));
+  }
+
+  reset(): void {
+    const prev = this.value;
+    const next = structuredClone(this.initial);
+
+    if (jsonEqual(prev, next)) return;
+
+    this.value = next;
+    this.lastHash = jsonStableStringify(next);
+
+    const diff: Partial<T> = {};
+    for (const key in next) {
+      if (!jsonEqual(next[key], prev[key])) diff[key] = next[key];
+    }
+
+    this.listeners.forEach((cb) => cb(this.value, prev, diff));
+  }
+
+  subscribe(cb: Listener<T>): () => void {
+    this.listeners.add(cb);
+    cb(this.value, this.value, {});
+    return () => this.listeners.delete(cb);
+  }
+
+  unsubscribe(cb: Listener<T>): void {
+    this.listeners.delete(cb);
+  }
+
+  patch<K extends keyof T>(key: K, value: T[K]): void {
+    this.set({ [key]: value } as unknown as Partial<T>);
+  }
+
+  getKey<K extends keyof T>(key: K): T[K] {
+    return this.value[key];
+  }
+
+  subscribeKey<K extends keyof T>(
+    key: K,
+    cb: (value: T[K]) => void,
+  ): () => void {
+    let prev = this.value[key];
+    const wrapper: Listener<T> = (val) => {
+      if (!jsonEqual(val[key], prev)) {
+        prev = val[key];
+        cb(val[key]);
+      }
+    };
+    this.listeners.add(wrapper);
+    return () => this.listeners.delete(wrapper);
+  }
+}
+
+export interface StoreType {
+  tabService: {
+    current: string;
+    all: string[];
+  };
+  bandwidthWidget: {
+    loading: boolean;
+    failed: boolean;
+    data: { up: number; down: number };
+  };
+  trafficTotalWidget: {
+    loading: boolean;
+    failed: boolean;
+    data: { downloadTotal: number; uploadTotal: number };
+  };
+  systemInfoWidget: {
+    loading: boolean;
+    failed: boolean;
+    data: { connections: number; memory: number };
+  };
+  servicesInfoWidget: {
+    loading: boolean;
+    failed: boolean;
+    data: { singbox: number; podkop: number };
+  };
+  sectionsWidget: {
+    loading: boolean;
+    failed: boolean;
+    data: Podkop.OutboundGroup[];
+  };
+}
+
+const initialStore: StoreType = {
+  tabService: {
+    current: '',
+    all: [],
+  },
+  bandwidthWidget: {
+    loading: true,
+    failed: false,
+    data: { up: 0, down: 0 },
+  },
+  trafficTotalWidget: {
+    loading: true,
+    failed: false,
+    data: { downloadTotal: 0, uploadTotal: 0 },
+  },
+  systemInfoWidget: {
+    loading: true,
+    failed: false,
+    data: { connections: 0, memory: 0 },
+  },
+  servicesInfoWidget: {
+    loading: true,
+    failed: false,
+    data: { singbox: 0, podkop: 0 },
+  },
+  sectionsWidget: {
+    loading: true,
+    failed: false,
+    data: [],
+  },
+};
+
+export const store = new Store<StoreType>(initialStore);

fe-app-podkop/src/styles.ts

@@ -0,0 +1,177 @@
+// language=CSS
+export const GlobalStyles = `
+.cbi-value {
+    margin-bottom: 10px !important;
+}
+
+#diagnostics-status .table > div {
+    background: var(--background-color-primary);
+    border: 1px solid var(--border-color-medium);
+    border-radius: var(--border-radius);
+}
+
+#diagnostics-status .table > div pre,
+#diagnostics-status .table > div div[style*="monospace"] {
+    color: var(--color-text-primary);
+}
+
+#diagnostics-status .alert-message {
+    background: var(--background-color-primary);
+    border-color: var(--border-color-medium);
+}
+
+#cbi-podkop:has(.cbi-tab-disabled[data-tab="basic"]) #cbi-podkop-extra {
+    display: none;
+}
+
+#cbi-podkop-main-_status > div {
+    width: 100%;
+}
+
+/* Dashboard styles */
+
+.pdk_dashboard-page {
+    width: 100%;
+    --dashboard-grid-columns: 4;
+}
+
+@media (max-width: 900px) {
+    .pdk_dashboard-page {
+        --dashboard-grid-columns: 2;
+    }
+}
+
+.pdk_dashboard-page__widgets-section {
+    margin-top: 10px;
+    display: grid;
+    grid-template-columns: repeat(var(--dashboard-grid-columns), 1fr);
+    grid-gap: 10px;
+}
+
+.pdk_dashboard-page__widgets-section__item {
+    border: 2px var(--background-color-low, lightgray) solid;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.pdk_dashboard-page__widgets-section__item__title {}
+
+.pdk_dashboard-page__widgets-section__item__row {}
+
+.pdk_dashboard-page__widgets-section__item__row--success .pdk_dashboard-page__widgets-section__item__row__value {
+    color: var(--success-color-medium, green);
+}
+
+.pdk_dashboard-page__widgets-section__item__row--error .pdk_dashboard-page__widgets-section__item__row__value {
+    color: var(--error-color-medium, red);
+}
+
+.pdk_dashboard-page__widgets-section__item__row__key {}
+
+.pdk_dashboard-page__widgets-section__item__row__value {}
+
+.pdk_dashboard-page__outbound-section {
+    margin-top: 10px;
+    border: 2px var(--background-color-low, lightgray) solid;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.pdk_dashboard-page__outbound-section__title-section {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.pdk_dashboard-page__outbound-section__title-section__title {
+    color: var(--text-color-high);
+    font-weight: 700;
+}
+
+.pdk_dashboard-page__outbound-grid {
+    margin-top: 5px;
+    display: grid;
+    grid-template-columns: repeat(var(--dashboard-grid-columns), 1fr);
+    grid-gap: 10px;
+}
+
+.pdk_dashboard-page__outbound-grid__item {
+    border: 2px var(--background-color-low, lightgray) solid;
+    border-radius: 4px;
+    padding: 10px;
+    transition: border 0.2s ease;
+}
+
+.pdk_dashboard-page__outbound-grid__item--selectable {
+    cursor: pointer;
+}
+
+.pdk_dashboard-page__outbound-grid__item--selectable:hover {
+    border-color: var(--primary-color-high, dodgerblue);
+}
+
+.pdk_dashboard-page__outbound-grid__item--active {
+    border-color: var(--success-color-medium, green);
+}
+
+.pdk_dashboard-page__outbound-grid__item__footer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 10px;
+}
+
+.pdk_dashboard-page__outbound-grid__item__type {}
+
+.pdk_dashboard-page__outbound-grid__item__latency--empty {
+    color: var(--primary-color-low, lightgray);
+}
+
+.pdk_dashboard-page__outbound-grid__item__latency--green {
+    color: var(--success-color-medium, green);
+}
+
+.pdk_dashboard-page__outbound-grid__item__latency--yellow {
+    color: var(--warn-color-medium, orange);
+}
+
+.pdk_dashboard-page__outbound-grid__item__latency--red {
+    color: var(--error-color-medium, red);
+}
+
+.centered {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* Skeleton styles*/
+.skeleton {
+    background-color: var(--background-color-low, #e0e0e0);
+    border-radius: 4px;
+    position: relative;
+    overflow: hidden;
+}
+
+.skeleton::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -150%;
+    width: 150%;
+    height: 100%;
+    background: linear-gradient(
+            90deg,
+            transparent,
+            rgba(255, 255, 255, 0.4),
+            transparent
+    );
+    animation: skeleton-shimmer 1.6s infinite;
+}
+
+@keyframes skeleton-shimmer {
+    100% {
+        left: 150%;
+    }
+}
+`;

fe-app-podkop/src/validators/bulkValidate.ts

@@ -0,0 +1,13 @@
+import { BulkValidationResult, ValidationResult } from './types';
+
+export function bulkValidate<T>(
+  values: T[],
+  validate: (value: T) => ValidationResult,
+): BulkValidationResult<T> {
+  const results = values.map((value) => ({ ...validate(value), value }));
+
+  return {
+    valid: results.every((r) => r.valid),
+    results,
+  };
+}

fe-app-podkop/src/validators/index.ts

@@ -0,0 +1,12 @@
+export * from './validateIp';
+export * from './validateDomain';
+export * from './validateDns';
+export * from './validateUrl';
+export * from './validatePath';
+export * from './validateSubnet';
+export * from './bulkValidate';
+export * from './validateShadowsocksUrl';
+export * from './validateVlessUrl';
+export * from './validateOutboundJson';
+export * from './validateTrojanUrl';
+export * from './validateProxyUrl';

fe-app-podkop/src/validators/tests/validateDns.test.js

@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest';
+import { validateDNS } from '../validateDns.js';
+import { invalidIPs, validIPs } from './validateIp.test';
+import { invalidDomains, validDomains } from './validateDomain.test';
+
+const validDns = [...validIPs, ...validDomains];
+
+const invalidDns = [...invalidIPs, ...invalidDomains];
+
+describe('validateDns', () => {
+  describe.each(validDns)('Valid dns: %s', (_desc, domain) => {
+    it(`returns valid=true for "${domain}"`, () => {
+      const res = validateDNS(domain);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidDns)('Invalid dns: %s', (_desc, domain) => {
+    it(`returns valid=false for "${domain}"`, () => {
+      const res = validateDNS(domain);
+      expect(res.valid).toBe(false);
+    });
+  });
+});

fe-app-podkop/src/validators/tests/validateDomain.test.js

@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest';
+import { validateDomain } from '../validateDomain';
+
+export const validDomains = [
+  ['Simple domain', 'example.com'],
+  ['Subdomain', 'sub.example.com'],
+  ['With dash', 'my-site.org'],
+  ['With numbers', 'site123.net'],
+  ['Deep subdomain', 'a.b.c.example.co.uk'],
+  ['With path', 'example.com/path/to/resource'],
+  ['Punycode RU', 'xn--d1acufc.xn--p1ai'],
+  ['Adguard dns', 'dns.adguard-dns.com'],
+  ['Nextdns dns', 'dns.nextdns.io/xxxxxxx'],
+  ['Long domain (63 chars in label)', 'a'.repeat(63) + '.com'],
+];
+
+export const invalidDomains = [
+  ['No TLD', 'localhost'],
+  ['Only TLD', '.com'],
+  ['Double dot', 'example..com'],
+  ['Illegal chars', 'exa!mple.com'],
+  ['Space inside', 'exa mple.com'],
+  ['Ending with dash', 'example-.com'],
+  ['Starting with dash', '-example.com'],
+  ['Trailing dot', 'example.com.'],
+  ['Too short TLD', 'example.c'],
+  ['With protocol (not allowed)', 'http://example.com'],
+  ['Too long label (>63 chars)', 'a'.repeat(64) + '.com'],
+  ['Too long domain (>253 chars)', Array(40).fill('abcdef').join('.') + '.com'],
+];
+
+export const dotTLDTests = [
+  ['Dot TLD allowed (.net)', '.net', true, true],
+  ['Dot TLD not allowed (.net)', '.net', false, false],
+  ['Invalid with double dot', '..net', true, false],
+  ['Invalid single word TLD (net)', 'net', true, false],
+];
+
+describe('validateDomain', () => {
+  describe.each(validDomains)('Valid domain: %s', (_desc, domain) => {
+    it(`returns valid=true for "${domain}"`, () => {
+      const res = validateDomain(domain);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidDomains)('Invalid domain: %s', (_desc, domain) => {
+    it(`returns valid=false for "${domain}"`, () => {
+      const res = validateDomain(domain);
+      expect(res.valid).toBe(false);
+    });
+  });
+
+  describe.each(dotTLDTests)(
+    'Dot TLD toggle: %s',
+    (_desc, domain, allowDotTLD, expected) => {
+      it(`"${domain}" with allowDotTLD=${allowDotTLD} → valid=${expected}`, () => {
+        const res = validateDomain(domain, allowDotTLD);
+        expect(res.valid).toBe(expected);
+      });
+    },
+  );
+});

fe-app-podkop/src/validators/tests/validateIp.test.js

@@ -0,0 +1,38 @@
+import { describe, it, expect } from 'vitest';
+import { validateIPV4 } from '../validateIp';
+
+export const validIPs = [
+  ['Private LAN', '192.168.1.1'],
+  ['All zeros', '0.0.0.0'],
+  ['Broadcast', '255.255.255.255'],
+  ['Simple', '1.2.3.4'],
+  ['Loopback', '127.0.0.1'],
+];
+
+export const invalidIPs = [
+  ['Octet too large', '256.0.0.1'],
+  ['Too few octets', '192.168.1'],
+  ['Too many octets', '1.2.3.4.5'],
+  ['Leading zero (1st octet)', '01.2.3.4'],
+  ['Leading zero (2nd octet)', '1.02.3.4'],
+  ['Leading zero (3rd octet)', '1.2.003.4'],
+  ['Leading zero (4th octet)', '1.2.3.004'],
+  ['Four digits in octet', '1.2.3.0004'],
+  ['Trailing dot', '1.2.3.'],
+];
+
+describe('validateIPV4', () => {
+  describe.each(validIPs)('Valid IP: %s', (_desc, ip) => {
+    it(`returns {valid:true} for "${ip}"`, () => {
+      const res = validateIPV4(ip);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidIPs)('Invalid IP: %s', (_desc, ip) => {
+    it(`returns {valid:false} for "${ip}"`, () => {
+      const res = validateIPV4(ip);
+      expect(res.valid).toBe(false);
+    });
+  });
+});

fe-app-podkop/src/validators/tests/validatePath.test.js

@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+import { validatePath } from '../validatePath';
+
+export const validPaths = [
+  ['Single level', '/etc'],
+  ['Nested path', '/usr/local/bin'],
+  ['With dash', '/var/log/nginx-access'],
+  ['With underscore', '/opt/my_app/config'],
+  ['With numbers', '/data123/files'],
+  ['With dots', '/home/user/.config'],
+  ['Deep nested', '/a/b/c/d/e/f/g'],
+];
+
+export const invalidPaths = [
+  ['Empty string', ''],
+  ['Missing starting slash', 'usr/local'],
+  ['Only dot', '.'],
+  ['Space inside', '/path with space'],
+  ['Illegal char', '/path$'],
+  ['Backslash not allowed', '\\windows\\path'],
+  ['Relative path ./', './relative'],
+  ['Relative path ../', '../parent'],
+];
+
+describe('validatePath', () => {
+  describe.each(validPaths)('Valid path: %s', (_desc, path) => {
+    it(`returns valid=true for "${path}"`, () => {
+      const res = validatePath(path);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidPaths)('Invalid path: %s', (_desc, path) => {
+    it(`returns valid=false for "${path}"`, () => {
+      const res = validatePath(path);
+      expect(res.valid).toBe(false);
+    });
+  });
+});

fe-app-podkop/src/validators/tests/validateSubnet.test.js

@@ -0,0 +1,41 @@
+import { describe, it, expect } from 'vitest';
+import { validateSubnet } from '../validateSubnet';
+
+export const validSubnets = [
+  ['Simple IP', '192.168.1.1'],
+  ['With CIDR /24', '192.168.1.1/24'],
+  ['CIDR /0', '10.0.0.1/0'],
+  ['CIDR /32', '172.16.0.1/32'],
+  ['Loopback', '127.0.0.1'],
+  ['Broadcast with mask', '255.255.255.255/32'],
+];
+
+export const invalidSubnets = [
+  ['Empty string', ''],
+  ['Bad format letters', 'abc.def.ghi.jkl'],
+  ['Octet too large', '300.1.1.1'],
+  ['Negative octet', '-1.2.3.4'],
+  ['Too many octets', '1.2.3.4.5'],
+  ['Not enough octets', '192.168.1'],
+  ['Leading zero octet', '01.2.3.4'],
+  ['Invalid CIDR (too high)', '192.168.1.1/33'],
+  ['Invalid CIDR (negative)', '192.168.1.1/-1'],
+  ['CIDR not number', '192.168.1.1/abc'],
+  ['Forbidden 0.0.0.0', '0.0.0.0'],
+];
+
+describe('validateSubnet', () => {
+  describe.each(validSubnets)('Valid subnet: %s', (_desc, subnet) => {
+    it(`returns {valid:true} for "${subnet}"`, () => {
+      const res = validateSubnet(subnet);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidSubnets)('Invalid subnet: %s', (_desc, subnet) => {
+    it(`returns {valid:false} for "${subnet}"`, () => {
+      const res = validateSubnet(subnet);
+      expect(res.valid).toBe(false);
+    });
+  });
+});

fe-app-podkop/src/validators/tests/validateUrl.test.js

@@ -0,0 +1,40 @@
+import { describe, it, expect } from 'vitest';
+import { validateUrl } from '../validateUrl';
+
+const validUrls = [
+  ['Simple HTTP', 'http://example.com'],
+  ['Simple HTTPS', 'https://example.com'],
+  ['With path', 'https://example.com/path/to/page'],
+  ['With query', 'https://example.com/?q=test'],
+  ['With port', 'http://example.com:8080'],
+  ['With subdomain', 'https://sub.example.com'],
+];
+
+const invalidUrls = [
+  ['Invalid format', 'not a url'],
+  ['Missing protocol', 'example.com'],
+  ['Unsupported protocol (ftp)', 'ftp://example.com'],
+  ['Unsupported protocol (ws)', 'ws://example.com'],
+  ['Empty string', ''],
+];
+
+describe('validateUrl', () => {
+  describe.each(validUrls)('Valid URL: %s', (_desc, url) => {
+    it(`returns valid=true for "${url}"`, () => {
+      const res = validateUrl(url);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidUrls)('Invalid URL: %s', (_desc, url) => {
+    it(`returns valid=false for "${url}"`, () => {
+      const res = validateUrl(url);
+      expect(res.valid).toBe(false);
+    });
+  });
+
+  it('allows custom protocol list (ftp)', () => {
+    const res = validateUrl('ftp://example.com', ['ftp:']);
+    expect(res.valid).toBe(true);
+  });
+});

fe-app-podkop/src/validators/tests/validateVlessUrl.test.js

@@ -0,0 +1,100 @@
+import { describe, it, expect } from 'vitest';
+import { validateVlessUrl } from '../validateVlessUrl';
+
+const validUrls = [
+  // TCP
+  [
+    'tcp + none',
+    'vless://94792286-7bbe-4f33-8b36-18d1bbf70723@127.0.0.1:34520?type=tcp&encryption=none&security=none#vless-tcp-none',
+  ],
+  [
+    'tcp + reality',
+    'vless://e95163dc-905e-480a-afe5-20b146288679@127.0.0.1:16399?type=tcp&encryption=none&security=reality&pbk=tqhSkeDR6jsqC-BYCnZWBrdL33g705ba8tV5-ZboWTM&fp=chrome&sni=google.com&sid=f6&spx=%2F#vless-tcp-reality',
+  ],
+  [
+    'tcp + tls',
+    'vless://2e9e8288-060e-4da2-8b9f-a1c81826feb7@127.0.0.1:19316?type=tcp&encryption=none&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&sni=google.com#vless-tcp-tls',
+  ],
+  // mKCP
+  [
+    'mKCP + none',
+    'vless://72e201d7-7841-4a32-b266-4aa3eb776d51@127.0.0.1:17270?type=kcp&encryption=none&headerType=none&seed=AirziWi4ng&security=none#vless-mKCP',
+  ],
+  // WebSocket
+  [
+    'ws + none',
+    'vless://d86daef7-565b-4ecd-a9ee-bac847ad38e6@127.0.0.1:12928?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=none#vless-websocket-none',
+  ],
+  [
+    'ws + tls',
+    'vless://fe0f0941-09a9-4e46-bc69-e00190d7bb9c@127.0.0.1:10156?type=ws&encryption=none&path=%2Fwspath&host=google.com&security=tls&fp=chrome&sni=google.com#vless-websocket-tls',
+  ],
+  // gRPC
+  [
+    'grpc + none',
+    'vless://974b39e3-f7bf-42b9-933c-16699c635e77@127.0.0.1:15633?type=grpc&encryption=none&serviceName=TunService&security=none#vless-gRPC-none',
+  ],
+  [
+    'grpc + reality',
+    'vless://651e7eca-5152-46f1-baf2-d502e0af7b27@127.0.0.1:28535?type=grpc&encryption=none&serviceName=TunService&security=reality&pbk=nhZ7NiKfcqESa5ZeBFfsq9o18W-OWOAHLln9UmuVXSk&fp=chrome&sni=google.com&sid=11cbaeaa&spx=%2F#vless-gRPC-reality',
+  ],
+  // HTTPUpgrade
+  [
+    'httpupgrade + none',
+    'vless://2b98f144-847f-42f7-8798-e1a32d27bdc7@127.0.0.1:47154?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=none#vless-httpupgrade-none',
+  ],
+  [
+    'httpupgrade + tls',
+    'vless://76dbd0ff-1a35-4f0c-a9ba-3c5890b7dea6@127.0.0.1:50639?type=httpupgrade&encryption=none&path=%2Fhttpupgradepath&host=google.com&security=tls&sni=google.com#vless-httpupgrade-tls',
+  ],
+  // XHTTP
+  [
+    'xhttp + none',
+    'vless://c2841505-ec32-4b8d-b6dd-3e19d648c321@127.0.0.1:45507?type=xhttp&encryption=none&path=%2Fxhttppath&host=xhttp&mode=auto&security=none#vless-xhttp',
+  ],
+];
+
+const invalidUrls = [
+  ['No prefix', 'uuid@host:443?type=tcp&security=tls'],
+  ['No uuid', 'vless://@127.0.0.1:443?type=tcp&security=tls'],
+  ['No host', 'vless://uuid@:443?type=tcp&security=tls'],
+  ['No port', 'vless://uuid@127.0.0.1?type=tcp&security=tls'],
+  ['Invalid port', 'vless://uuid@127.0.0.1:abc?type=tcp&security=tls'],
+  ['Missing type', 'vless://uuid@127.0.0.1:443?security=tls'],
+  ['Missing security', 'vless://uuid@127.0.0.1:443?type=tcp'],
+  [
+    'reality without pbk',
+    'vless://uuid@127.0.0.1:443?type=tcp&security=reality&fp=chrome',
+  ],
+  [
+    'reality without fp',
+    'vless://uuid@127.0.0.1:443?type=tcp&security=reality&pbk=abc',
+  ],
+  [
+    'tcp + reality + unexpected spaces',
+    'vless://e95163dc-905e-480a-afe5-20b146288679@127.0.0.1:16399?type=tcp&encryption=none&security=reality&pbk=tqhSkeDR6jsqC-BYCnZWBrdL33g705ba8tV5-ZboWTM&fp=chrome&sni= google.com&sid=f6&spx=%2F#vless-tcp-reality',
+  ],
+];
+
+describe('validateVlessUrl', () => {
+  describe.each(validUrls)('Valid URL: %s', (_desc, url) => {
+    it(`returns valid=true for "${url}"`, () => {
+      const res = validateVlessUrl(url);
+      expect(res.valid).toBe(true);
+    });
+  });
+
+  describe.each(invalidUrls)('Invalid URL: %s', (_desc, url) => {
+    it(`returns valid=false for "${url}"`, () => {
+      const res = validateVlessUrl(url);
+      expect(res.valid).toBe(false);
+    });
+  });
+
+  it('detects invalid port range', () => {
+    const res = validateVlessUrl(
+      'vless://uuid@127.0.0.1:99999?type=tcp&security=tls',
+    );
+    expect(res.valid).toBe(false);
+  });
+});

fe-app-podkop/src/validators/types.ts

@@ -0,0 +1,13 @@
+export interface ValidationResult {
+  valid: boolean;
+  message: string;
+}
+
+export interface BulkValidationResultItem<T> extends ValidationResult {
+  value: T;
+}
+
+export interface BulkValidationResult<T> {
+  valid: boolean;
+  results: BulkValidationResultItem<T>[];
+}

fe-app-podkop/src/validators/validateDns.ts

@@ -0,0 +1,24 @@
+import { validateDomain } from './validateDomain';
+import { validateIPV4 } from './validateIp';
+import { ValidationResult } from './types';
+
+export function validateDNS(value: string): ValidationResult {
+  if (!value) {
+    return { valid: false, message: _('DNS server address cannot be empty') };
+  }
+
+  if (validateIPV4(value).valid) {
+    return { valid: true, message: _('Valid') };
+  }
+
+  if (validateDomain(value).valid) {
+    return { valid: true, message: _('Valid') };
+  }
+
+  return {
+    valid: false,
+    message: _(
+      'Invalid DNS server format. Examples: 8.8.8.8 or dns.example.com or dns.example.com/nicedns for DoH',
+    ),
+  };
+}

fe-app-podkop/src/validators/validateDomain.ts

@@ -0,0 +1,31 @@
+import { ValidationResult } from './types';
+
+export function validateDomain(
+  domain: string,
+  allowDotTLD = false,
+): ValidationResult {
+  const domainRegex =
+    /^(?=.{1,253}(?:\/|$))(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+(?:[a-zA-Z]{2,}|xn--[a-zA-Z0-9-]{1,59}[a-zA-Z0-9])(?:\/[^\s]*)?$/;
+
+  if (allowDotTLD) {
+    const dotTLD = /^\.[a-zA-Z]{2,}$/;
+    if (dotTLD.test(domain)) {
+      return { valid: true, message: _('Valid') };
+    }
+  }
+
+  if (!domainRegex.test(domain)) {
+    return { valid: false, message: _('Invalid domain address') };
+  }
+
+  const hostname = domain.split('/')[0];
+  const parts = hostname.split('.');
+
+  const atLeastOneInvalidPart = parts.some((part) => part.length > 63);
+
+  if (atLeastOneInvalidPart) {
+    return { valid: false, message: _('Invalid domain address') };
+  }
+
+  return { valid: true, message: _('Valid') };
+}

fe-app-podkop/src/validators/validateIp.ts

@@ -0,0 +1,12 @@
+import { ValidationResult } from './types';
+
+export function validateIPV4(ip: string): ValidationResult {
+  const ipRegex =
+    /^(?:(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$/;
+
+  if (ipRegex.test(ip)) {
+    return { valid: true, message: _('Valid') };
+  }
+
+  return { valid: false, message: _('Invalid IP address') };
+}

fe-app-podkop/src/validators/validateOutboundJson.ts

@@ -0,0 +1,21 @@
+import { ValidationResult } from './types';
+
+// TODO refactor current validation and add tests
+export function validateOutboundJson(value: string): ValidationResult {
+  try {
+    const parsed = JSON.parse(value);
+
+    if (!parsed.type || !parsed.server || !parsed.server_port) {
+      return {
+        valid: false,
+        message: _(
+          'Outbound JSON must contain at least "type", "server" and "server_port" fields',
+        ),
+      };
+    }
+
+    return { valid: true, message: _('Valid') };
+  } catch {
+    return { valid: false, message: _('Invalid JSON format') };
+  }
+}

fe-app-podkop/src/validators/validatePath.ts

@@ -0,0 +1,26 @@
+import { ValidationResult } from './types';
+
+export function validatePath(value: string): ValidationResult {
+  if (!value) {
+    return {
+      valid: false,
+      message: _('Path cannot be empty'),
+    };
+  }
+
+  const pathRegex = /^\/[a-zA-Z0-9_\-/.]+$/;
+
+  if (pathRegex.test(value)) {
+    return {
+      valid: true,
+      message: _('Valid'),
+    };
+  }
+
+  return {
+    valid: false,
+    message: _(
+      'Invalid path format. Path must start with "/" and contain valid characters',
+    ),
+  };
+}

fe-app-podkop/src/validators/validateProxyUrl.ts

@@ -0,0 +1,24 @@
+import { ValidationResult } from './types';
+import { validateShadowsocksUrl } from './validateShadowsocksUrl';
+import { validateVlessUrl } from './validateVlessUrl';
+import { validateTrojanUrl } from './validateTrojanUrl';
+
+// TODO refactor current validation and add tests
+export function validateProxyUrl(url: string): ValidationResult {
+  if (url.startsWith('ss://')) {
+    return validateShadowsocksUrl(url);
+  }
+
+  if (url.startsWith('vless://')) {
+    return validateVlessUrl(url);
+  }
+
+  if (url.startsWith('trojan://')) {
+    return validateTrojanUrl(url);
+  }
+
+  return {
+    valid: false,
+    message: _('URL must start with vless:// or ss:// or trojan://'),
+  };
+}

fe-app-podkop/src/validators/validateShadowsocksUrl.ts

@@ -0,0 +1,96 @@
+import { ValidationResult } from './types';
+
+// TODO refactor current validation and add tests
+export function validateShadowsocksUrl(url: string): ValidationResult {
+  if (!url.startsWith('ss://')) {
+    return {
+      valid: false,
+      message: _('Invalid Shadowsocks URL: must start with ss://'),
+    };
+  }
+
+  try {
+    if (!url || /\s/.test(url)) {
+      return {
+        valid: false,
+        message: _('Invalid Shadowsocks URL: must not contain spaces'),
+      };
+    }
+
+    const mainPart = url.includes('?') ? url.split('?')[0] : url.split('#')[0];
+
+    const encryptedPart = mainPart.split('/')[2]?.split('@')[0];
+
+    if (!encryptedPart) {
+      return {
+        valid: false,
+        message: _('Invalid Shadowsocks URL: missing credentials'),
+      };
+    }
+
+    try {
+      const decoded = atob(encryptedPart);
+
+      if (!decoded.includes(':')) {
+        return {
+          valid: false,
+          message: _(
+            'Invalid Shadowsocks URL: decoded credentials must contain method:password',
+          ),
+        };
+      }
+    } catch (_e) {
+      if (!encryptedPart.includes(':') && !encryptedPart.includes('-')) {
+        return {
+          valid: false,
+          message: _(
+            'Invalid Shadowsocks URL: missing method and password separator ":"',
+          ),
+        };
+      }
+    }
+
+    const serverPart = url.split('@')[1];
+
+    if (!serverPart) {
+      return {
+        valid: false,
+        message: _('Invalid Shadowsocks URL: missing server address'),
+      };
+    }
+
+    const [server, portAndRest] = serverPart.split(':');
+
+    if (!server) {
+      return {
+        valid: false,
+        message: _('Invalid Shadowsocks URL: missing server'),
+      };
+    }
+
+    const port = portAndRest ? portAndRest.split(/[?#]/)[0] : null;
+
+    if (!port) {
+      return {
+        valid: false,
+        message: _('Invalid Shadowsocks URL: missing port'),
+      };
+    }
+
+    const portNum = parseInt(port, 10);
+
+    if (isNaN(portNum) || portNum < 1 || portNum > 65535) {
+      return {
+        valid: false,
+        message: _('Invalid port number. Must be between 1 and 65535'),
+      };
+    }
+  } catch (_e) {
+    return {
+      valid: false,
+      message: _('Invalid Shadowsocks URL: parsing failed'),
+    };
+  }
+
+  return { valid: true, message: _('Valid') };
+}

fe-app-podkop/src/validators/validateSubnet.ts

@@ -0,0 +1,39 @@
+import { ValidationResult } from './types';
+import { validateIPV4 } from './validateIp';
+
+export function validateSubnet(value: string): ValidationResult {
+  // Must be in form X.X.X.X or X.X.X.X/Y
+  const subnetRegex = /^(\d{1,3}\.){3}\d{1,3}(?:\/\d{1,2})?$/;
+
+  if (!subnetRegex.test(value)) {
+    return {
+      valid: false,
+      message: _('Invalid format. Use X.X.X.X or X.X.X.X/Y'),
+    };
+  }
+
+  const [ip, cidr] = value.split('/');
+
+  if (ip === '0.0.0.0') {
+    return { valid: false, message: _('IP address 0.0.0.0 is not allowed') };
+  }
+
+  const ipCheck = validateIPV4(ip);
+  if (!ipCheck.valid) {
+    return ipCheck;
+  }
+
+  // Validate CIDR if present
+  if (cidr) {
+    const cidrNum = parseInt(cidr, 10);
+
+    if (cidrNum < 0 || cidrNum > 32) {
+      return {
+        valid: false,
+        message: _('CIDR must be between 0 and 32'),
+      };
+    }
+  }
+
+  return { valid: true, message: _('Valid') };
+}

fe-app-podkop/src/validators/validateTrojanUrl.ts

@@ -0,0 +1,35 @@
+import { ValidationResult } from './types';
+
+// TODO refactor current validation and add tests
+export function validateTrojanUrl(url: string): ValidationResult {
+  if (!url.startsWith('trojan://')) {
+    return {
+      valid: false,
+      message: _('Invalid Trojan URL: must start with trojan://'),
+    };
+  }
+
+  if (!url || /\s/.test(url)) {
+    return {
+      valid: false,
+      message: _('Invalid Trojan URL: must not contain spaces'),
+    };
+  }
+
+  try {
+    const parsedUrl = new URL(url);
+
+    if (!parsedUrl.username || !parsedUrl.hostname || !parsedUrl.port) {
+      return {
+        valid: false,
+        message: _(
+          'Invalid Trojan URL: must contain username, hostname and port',
+        ),
+      };
+    }
+  } catch (_e) {
+    return { valid: false, message: _('Invalid Trojan URL: parsing failed') };
+  }
+
+  return { valid: true, message: _('Valid') };
+}

fe-app-podkop/src/validators/validateUrl.ts

@@ -0,0 +1,20 @@
+import { ValidationResult } from './types';
+
+export function validateUrl(
+  url: string,
+  protocols: string[] = ['http:', 'https:'],
+): ValidationResult {
+  try {
+    const parsedUrl = new URL(url);
+
+    if (!protocols.includes(parsedUrl.protocol)) {
+      return {
+        valid: false,
+        message: `${_('URL must use one of the following protocols:')} ${protocols.join(', ')}`,
+      };
+    }
+    return { valid: true, message: _('Valid') };
+  } catch (_e) {
+    return { valid: false, message: _('Invalid URL format') };
+  }
+}

fe-app-podkop/src/validators/validateVlessUrl.ts

@@ -0,0 +1,112 @@
+import { ValidationResult } from './types';
+
+export function validateVlessUrl(url: string): ValidationResult {
+  try {
+    const parsedUrl = new URL(url);
+
+    if (!url || /\s/.test(url)) {
+      return {
+        valid: false,
+        message: _('Invalid VLESS URL: must not contain spaces'),
+      };
+    }
+
+    if (parsedUrl.protocol !== 'vless:') {
+      return {
+        valid: false,
+        message: _('Invalid VLESS URL: must start with vless://'),
+      };
+    }
+
+    if (!parsedUrl.username) {
+      return { valid: false, message: _('Invalid VLESS URL: missing UUID') };
+    }
+
+    if (!parsedUrl.hostname) {
+      return { valid: false, message: _('Invalid VLESS URL: missing server') };
+    }
+
+    if (!parsedUrl.port) {
+      return { valid: false, message: _('Invalid VLESS URL: missing port') };
+    }
+
+    if (
+      isNaN(+parsedUrl.port) ||
+      +parsedUrl.port < 1 ||
+      +parsedUrl.port > 65535
+    ) {
+      return {
+        valid: false,
+        message: _(
+          'Invalid VLESS URL: invalid port number. Must be between 1 and 65535',
+        ),
+      };
+    }
+
+    if (!parsedUrl.search) {
+      return {
+        valid: false,
+        message: _('Invalid VLESS URL: missing query parameters'),
+      };
+    }
+
+    const params = new URLSearchParams(parsedUrl.search);
+
+    const type = params.get('type');
+    const validTypes = [
+      'tcp',
+      'raw',
+      'udp',
+      'grpc',
+      'http',
+      'httpupgrade',
+      'xhttp',
+      'ws',
+      'kcp',
+    ];
+
+    if (!type || !validTypes.includes(type)) {
+      return {
+        valid: false,
+        message: _(
+          'Invalid VLESS URL: type must be one of tcp, raw, udp, grpc, http, ws',
+        ),
+      };
+    }
+
+    const security = params.get('security');
+    const validSecurities = ['tls', 'reality', 'none'];
+
+    if (!security || !validSecurities.includes(security)) {
+      return {
+        valid: false,
+        message: _(
+          'Invalid VLESS URL: security must be one of tls, reality, none',
+        ),
+      };
+    }
+
+    if (security === 'reality') {
+      if (!params.get('pbk')) {
+        return {
+          valid: false,
+          message: _(
+            'Invalid VLESS URL: missing pbk parameter for reality security',
+          ),
+        };
+      }
+      if (!params.get('fp')) {
+        return {
+          valid: false,
+          message: _(
+            'Invalid VLESS URL: missing fp parameter for reality security',
+          ),
+        };
+      }
+    }
+
+    return { valid: true, message: _('Valid') };
+  } catch (_e) {
+    return { valid: false, message: _('Invalid VLESS URL: parsing failed') };
+  }
+}

fe-app-podkop/tests/setup/global-mocks.ts

@@ -0,0 +1,2 @@
+// tests/setup/global-mocks.ts
+globalThis._ = (key: string) => key;

fe-app-podkop/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "strict": true,
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "dist"
+  },
+  "include": ["src"]
+}

fe-app-podkop/tsup.config.ts

@@ -0,0 +1,35 @@
+import { defineConfig } from 'tsup';
+import fs from 'fs';
+import path from 'path';
+
+export default defineConfig({
+    entry: ['src/main.ts'],
+    format: ['esm'], // пусть tsup генерит export {...}
+    outDir: '../luci-app-podkop/htdocs/luci-static/resources/view/podkop',
+    outExtension: () => ({ js: '.js' }),
+    dts: false,
+    clean: false,
+    sourcemap: false,
+    banner: {
+        js: `// This file is autogenerated, please don't change manually \n"use strict";`,
+    },
+    esbuildOptions(options) {
+        options.legalComments = 'none';
+    },
+    onSuccess: () => {
+        const outDir =
+            '../luci-app-podkop/htdocs/luci-static/resources/view/podkop';
+        const file = path.join(outDir, 'main.js');
+        let code = fs.readFileSync(file, 'utf8');
+
+        code = code.replace(
+            /export\s*{([\s\S]*?)}/,
+            (match, group) => {
+                return `return baseclass.extend({${group}})`;
+            }
+        );
+
+        fs.writeFileSync(file, code, 'utf8');
+        console.log(`✅ Patched LuCI build: ${file}`);
+    },
+});

fe-app-podkop/vitest.config.js

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+    test: {
+        globals: true,
+        environment: 'node',
+        setupFiles: ['./tests/setup/global-mocks.ts'],
+    },
+});

fe-app-podkop/watch-upload.js

@@ -0,0 +1,82 @@
+import 'dotenv/config';
+import chokidar from 'chokidar';
+import SFTPClient from 'ssh2-sftp-client';
+import path from 'path';
+import fs from 'fs';
+import { glob } from 'glob';
+
+const sftp = new SFTPClient();
+
+const config = {
+  host: process.env.SFTP_HOST,
+  port: Number(process.env.SFTP_PORT || 22),
+  username: process.env.SFTP_USER,
+  ...(process.env.SFTP_PRIVATE_KEY
+      ? { privateKey: fs.readFileSync(process.env.SFTP_PRIVATE_KEY) }
+      : { password: process.env.SFTP_PASS }),
+};
+
+const localDir = path.resolve(process.env.LOCAL_DIR || './dist');
+const remoteDir = process.env.REMOTE_DIR || '/www/luci-static/mypkg';
+
+async function uploadFile(filePath) {
+  const relativePath = path.relative(localDir, filePath);
+  const remotePath = path.posix.join(remoteDir, relativePath);
+
+  console.log(`Uploading: ${relativePath} -> ${remotePath}`);
+  try {
+    await sftp.fastPut(filePath, remotePath);
+    console.log(`Uploaded: ${relativePath}`);
+  } catch (err) {
+    console.error(`Failed: ${relativePath}: ${err.message}`);
+  }
+}
+
+async function deleteFile(filePath) {
+  const relativePath = path.relative(localDir, filePath);
+  const remotePath = path.posix.join(remoteDir, relativePath);
+
+  console.log(`Removing: ${relativePath}`);
+  try {
+    await sftp.delete(remotePath);
+    console.log(`Removed: ${relativePath}`);
+  } catch (err) {
+    console.warn(`Could not delete ${relativePath}: ${err.message}`);
+  }
+}
+
+async function uploadAllFiles() {
+  console.log('Uploading all files from', localDir);
+
+  const files = await glob(`${localDir}/**/*`, { nodir: true });
+  for (const file of files) {
+    await uploadFile(file);
+  }
+
+  console.log('Initial upload complete!');
+}
+
+async function main() {
+  await sftp.connect(config);
+  console.log(`Connected to ${config.host}`);
+
+  await uploadAllFiles();
+
+  chokidar
+      .watch(localDir, { ignoreInitial: true })
+      .on('all', async (event, filePath) => {
+        if (event === 'add' || event === 'change') {
+          await uploadFile(filePath);
+        } else if (event === 'unlink') {
+          await deleteFile(filePath);
+        }
+      });
+
+  process.on('SIGINT', async () => {
+    console.log('Disconnecting...');
+    await sftp.end();
+    process.exit();
+  });
+}
+
+main().catch(console.error);

install.sh

@@ -1,66 +1,35 @@
 #!/bin/sh
 
 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
+msg() {
-    if [ "$arg" = "--upgrade" ]; then
+    printf "\033[32;1m%s\033[0m\n" "$1"
-        UPGRADE=1
+}
-    fi
-done
 
 main() {
     check_system
     sing_box
-    
+
-    opkg update
+    /usr/sbin/ntpd -q -p 194.190.168.1 -p 216.239.35.0 -p 216.239.35.4 -p 162.159.200.1 -p 162.159.200.123
+
+    opkg update || { echo "opkg update failed"; exit 1; }
   
     if [ -f "/etc/init.d/podkop" ]; then
-        if [ "$UPGRADE" -eq 1 ]; then
+        msg "Podkop is already installed. Upgraded..."
-            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)
-                    echo "Upgraded podkop..."
-                    break
-                    ;;
-
-                n)
-                    add_tunnel
-                    break
-                    ;;
-
-                *)
-                    echo "Please enter y or n"
-                    ;;
-                esac
-            done
-        fi
     else
-        echo "Installed podkop..."
+        msg "Installed podkop..."
-        add_tunnel
     fi
     
     if command -v curl &> /dev/null; then
         check_response=$(curl -s "https://api.github.com/repos/itdoginfo/podkop/releases/latest")
 
         if echo "$check_response" | grep -q 'API rate limit '; then
-            echo "You've reached rate limit from GitHub. Repeat in five minutes."
+            msg "You've reached rate limit from GitHub. Repeat in five minutes."
             exit 1
         fi
     fi
@@ -72,33 +41,33 @@ main() {
                
         attempt=0
         while [ $attempt -lt $COUNT ]; do
-            echo "Download $filename (count $((attempt+1)))..."
+            msg "Download $filename (count $((attempt+1)))..."
             if wget -q -O "$filepath" "$url"; then
                 if [ -s "$filepath" ]; then
-                    echo "$filename successfully downloaded"
+                    msg "$filename successfully downloaded"
                     download_success=1
                     break
                 fi
             fi
-            echo "Download error $filename. Retry..."
+            msg "Download error $filename. Retry..."
             rm -f "$filepath"
             attempt=$((attempt+1))
         done
         
         if [ $attempt -eq $COUNT ]; then
-            echo "Failed to download $filename after $COUNT attempts"
+            msg "Failed to download $filename after $COUNT attempts"
         fi
     done < <(wget -qO- "$REPO" | grep -o 'https://[^"[:space:]]*\.ipk')
     
     if [ $download_success -eq 0 ]; then
-        echo "No packages were downloaded successfully"
+        msg "No packages were downloaded successfully"
         exit 1
     fi
     
     for pkg in podkop luci-app-podkop; do
         file=$(ls "$DOWNLOAD_DIR" | grep "^$pkg" | head -n 1)
         if [ -n "$file" ]; then
-            echo "Installing $file"
+            msg "Installing $file"
             opkg install "$DOWNLOAD_DIR/$file"
             sleep 3
         fi
@@ -106,341 +75,66 @@ main() {
 
     ru=$(ls "$DOWNLOAD_DIR" | grep "luci-i18n-podkop-ru" | head -n 1)
     if [ -n "$ru" ]; then
-        printf "\033[32;1mРусский язык интерфейса ставим? y/n (Need a Russian translation?)\033[0m "
+        if opkg list-installed | grep -q luci-i18n-podkop-ru; then
-        while true; do
+                msg "Upgraded ru translation..."
-            read -r -p '' RUS
-            case $RUS in
-            y)
                 opkg remove luci-i18n-podkop*
                 opkg install "$DOWNLOAD_DIR/$ru"
-                break
+        else
-                ;;
+            msg "Русский язык интерфейса ставим? y/n (Need a Russian translation?)"
-            n)
+            while true; do
-                break
+                read -r -p '' RUS
-                ;;
+                case $RUS in
-            *)
+                y)
-                echo "Введите y или n"
+                    opkg remove luci-i18n-podkop*
-                ;;
+                    opkg install "$DOWNLOAD_DIR/$ru"
-            esac
+                    break
-        done
+                    ;;
+                n)
+                    break
+                    ;;
+                *)
+                    echo "Введите y или n"
+                    ;;
+                esac
+            done
+        fi
     fi
 
     find "$DOWNLOAD_DIR" -type f -name '*podkop*' -exec rm {} \;
-
-    if [ "$IS_SHOULD_RESTART_NETWORK" ]; then
-        printf "\033[32;1mRestart network\033[0m\n"
-        /etc/init.d/network restart
-    fi
-}
-
-add_tunnel() {
-    printf "\033[32;1mWill you be using Wireguard, AmneziaWG, OpenVPN, OpenConnect? If yes, select a number and they will be automatically installed\033[0m\n"
-    echo "1) Wireguard"
-    echo "2) AmneziaWG"
-    echo "3) OpenVPN"
-    echo "4) OpenConnect"
-    echo "5) I use VLESS/SS. Skip this step"
-
-    while true; do
-        read -r -p '' TUNNEL
-        case $TUNNEL in
-
-        1)
-            opkg install wireguard-tools luci-proto-wireguard luci-app-wireguard
-
-            printf "\033[32;1mDo you want to configure the wireguard interface? (y/n): \033[0m\n"
-            read IS_SHOULD_CONFIGURE_WG_INTERFACE
-
-            if [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "y" ] || [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "Y" ]; then
-                wg_awg_setup Wireguard
-            else
-            printf "\e[1;32mUse these instructions to manual configure https://itdog.info/nastrojka-klienta-wireguard-na-openwrt/\e[0m\n"
-            fi
-
-            break
-            ;;
-
-        2)
-            install_awg_packages
-
-            printf "\033[32;1mThere are no instructions for manual configure yet. Do you want to configure the amneziawg interface? (y/n): \033[0m\n"
-            read IS_SHOULD_CONFIGURE_WG_INTERFACE
-
-            if [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "y" ] || [ "$IS_SHOULD_CONFIGURE_WG_INTERFACE" = "Y" ]; then
-                wg_awg_setup AmneziaWG
-            fi
-
-            break
-            ;;
-
-        3)
-            opkg install openvpn-openssl luci-app-openvpn
-            printf "\e[1;32mUse these instructions to configure https://itdog.info/nastrojka-klienta-openvpn-na-openwrt/\e[0m\n"
-            break
-            ;;
-
-        4)
-            opkg install openconnect luci-proto-openconnect
-            printf "\e[1;32mUse these instructions to configure https://itdog.info/nastrojka-klienta-openconnect-na-openwrt/\e[0m\n"
-            break
-            ;;
-
-        5)
-            echo "Installation without additional dependencies."
-            break
-            ;;
-
-        *)
-            echo "Choose from the following options"
-            ;;
-        esac
-    done
-}
-
-handler_network_restart() {
-    IS_SHOULD_RESTART_NETWORK=true
-}
-
-install_awg_packages() {
-    # Получение pkgarch с наибольшим приоритетом
-    PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}')
-
-    TARGET=$(ubus call system board | jsonfilter -e '@.release.target' | cut -d '/' -f 1)
-    SUBTARGET=$(ubus call system board | jsonfilter -e '@.release.target' | cut -d '/' -f 2)
-    VERSION=$(ubus call system board | jsonfilter -e '@.release.version')
-    PKGPOSTFIX="_v${VERSION}_${PKGARCH}_${TARGET}_${SUBTARGET}.ipk"
-    BASE_URL="https://github.com/Slava-Shchipunov/awg-openwrt/releases/download/"
-
-    AWG_DIR="/tmp/amneziawg"
-    mkdir -p "$AWG_DIR"
-    
-    if opkg list-installed | grep -q kmod-amneziawg; then
-        echo "kmod-amneziawg already installed"
-    else
-        KMOD_AMNEZIAWG_FILENAME="kmod-amneziawg${PKGPOSTFIX}"
-        DOWNLOAD_URL="${BASE_URL}v${VERSION}/${KMOD_AMNEZIAWG_FILENAME}"
-        wget -O "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL"
-
-        if [ $? -eq 0 ]; then
-            echo "kmod-amneziawg file downloaded successfully"
-        else
-            echo "Error downloading kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again"
-            exit 1
-        fi
-        
-        opkg install "$AWG_DIR/$KMOD_AMNEZIAWG_FILENAME"
-
-        if [ $? -eq 0 ]; then
-            echo "kmod-amneziawg file downloaded successfully"
-        else
-            echo "Error installing kmod-amneziawg. Please, install kmod-amneziawg manually and run the script again"
-            exit 1
-        fi
-    fi
-
-    if opkg list-installed | grep -q amneziawg-tools; then
-        echo "amneziawg-tools already installed"
-    else
-        AMNEZIAWG_TOOLS_FILENAME="amneziawg-tools${PKGPOSTFIX}"
-        DOWNLOAD_URL="${BASE_URL}v${VERSION}/${AMNEZIAWG_TOOLS_FILENAME}"
-        wget -O "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME" "$DOWNLOAD_URL"
-
-        if [ $? -eq 0 ]; then
-            echo "amneziawg-tools file downloaded successfully"
-        else
-            echo "Error downloading amneziawg-tools. Please, install amneziawg-tools manually and run the script again"
-            exit 1
-        fi
-
-        opkg install "$AWG_DIR/$AMNEZIAWG_TOOLS_FILENAME"
-
-        if [ $? -eq 0 ]; then
-            echo "amneziawg-tools file downloaded successfully"
-        else
-            echo "Error installing amneziawg-tools. Please, install amneziawg-tools manually and run the script again"
-            exit 1
-        fi
-    fi
-    
-    if opkg list-installed | grep -qE 'luci-app-amneziawg|luci-proto-amneziawg'; then
-        echo "luci-app-amneziawg or luci-proto-amneziawg already installed"
-    else
-        LUCI_APP_AMNEZIAWG_FILENAME="luci-app-amneziawg${PKGPOSTFIX}"
-        DOWNLOAD_URL="${BASE_URL}v${VERSION}/${LUCI_APP_AMNEZIAWG_FILENAME}"
-        wget -O "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME" "$DOWNLOAD_URL"
-
-        if [ $? -eq 0 ]; then
-            echo "luci-app-amneziawg file downloaded successfully"
-        else
-            echo "Error downloading luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again"
-            exit 1
-        fi
-
-        opkg install "$AWG_DIR/$LUCI_APP_AMNEZIAWG_FILENAME"
-
-        if [ $? -eq 0 ]; then
-            echo "luci-app-amneziawg file downloaded successfully"
-        else
-            echo "Error installing luci-app-amneziawg. Please, install luci-app-amneziawg manually and run the script again"
-            exit 1
-        fi
-    fi
-
-    rm -rf "$AWG_DIR"
-}
-
-wg_awg_setup() {
-    PROTOCOL_NAME=$1
-    printf "\033[32;1mConfigure ${PROTOCOL_NAME}\033[0m\n"
-    if [ "$PROTOCOL_NAME" = 'Wireguard' ]; then
-        INTERFACE_NAME="wg0"
-        CONFIG_NAME="wireguard_wg0"
-        PROTO="wireguard"
-        ZONE_NAME="wg"
-    fi
-
-    if [ "$PROTOCOL_NAME" = 'AmneziaWG' ]; then
-        INTERFACE_NAME="awg0"
-        CONFIG_NAME="amneziawg_awg0"
-        PROTO="amneziawg"
-        ZONE_NAME="awg"
-        
-        echo "Do you want to use AmneziaWG config or basic Wireguard config + automatic obfuscation?"
-        echo "1) AmneziaWG"
-        echo "2) Wireguard + automatic obfuscation"
-        read CONFIG_TYPE
-    fi
-
-    read -r -p "Enter the private key (from [Interface]):"$'\n' WG_PRIVATE_KEY_INT
-
-    while true; do
-        read -r -p "Enter internal IP address with subnet, example 192.168.100.5/24 (from [Interface]):"$'\n' WG_IP
-        if echo "$WG_IP" | egrep -oq '^([0-9]{1,3}\.){3}[0-9]{1,3}/[0-9]+$'; then
-            break
-        else
-            echo "This IP is not valid. Please repeat"
-        fi
-    done
-
-    read -r -p "Enter the public key (from [Peer]):"$'\n' WG_PUBLIC_KEY_INT
-    read -r -p "If use PresharedKey, Enter this (from [Peer]). If your don't use leave blank:"$'\n' WG_PRESHARED_KEY_INT
-    read -r -p "Enter Endpoint host without port (Domain or IP) (from [Peer]):"$'\n' WG_ENDPOINT_INT
-
-    read -r -p "Enter Endpoint host port (from [Peer]) [51820]:"$'\n' WG_ENDPOINT_PORT_INT
-    WG_ENDPOINT_PORT_INT=${WG_ENDPOINT_PORT_INT:-51820}
-    if [ "$WG_ENDPOINT_PORT_INT" = '51820' ]; then
-        echo $WG_ENDPOINT_PORT_INT
-    fi
-
-    if [ "$PROTOCOL_NAME" = 'AmneziaWG' ]; then
-        if [ "$CONFIG_TYPE" = '1' ]; then
-            read -r -p "Enter Jc value (from [Interface]):"$'\n' AWG_JC
-            read -r -p "Enter Jmin value (from [Interface]):"$'\n' AWG_JMIN
-            read -r -p "Enter Jmax value (from [Interface]):"$'\n' AWG_JMAX
-            read -r -p "Enter S1 value (from [Interface]):"$'\n' AWG_S1
-            read -r -p "Enter S2 value (from [Interface]):"$'\n' AWG_S2
-            read -r -p "Enter H1 value (from [Interface]):"$'\n' AWG_H1
-            read -r -p "Enter H2 value (from [Interface]):"$'\n' AWG_H2
-            read -r -p "Enter H3 value (from [Interface]):"$'\n' AWG_H3
-            read -r -p "Enter H4 value (from [Interface]):"$'\n' AWG_H4
-        elif [ "$CONFIG_TYPE" = '2' ]; then
-            #Default values to wg automatic obfuscation
-            AWG_JC=4
-            AWG_JMIN=40
-            AWG_JMAX=70
-            AWG_S1=0
-            AWG_S2=0
-            AWG_H1=1
-            AWG_H2=2
-            AWG_H3=3
-            AWG_H4=4
-        fi
-    fi
-    
-    uci set network.${INTERFACE_NAME}=interface
-    uci set network.${INTERFACE_NAME}.proto=$PROTO
-    uci set network.${INTERFACE_NAME}.private_key=$WG_PRIVATE_KEY_INT
-    uci set network.${INTERFACE_NAME}.listen_port='51821'
-    uci set network.${INTERFACE_NAME}.addresses=$WG_IP
-
-    if [ "$PROTOCOL_NAME" = 'AmneziaWG' ]; then
-        uci set network.${INTERFACE_NAME}.awg_jc=$AWG_JC
-        uci set network.${INTERFACE_NAME}.awg_jmin=$AWG_JMIN
-        uci set network.${INTERFACE_NAME}.awg_jmax=$AWG_JMAX
-        uci set network.${INTERFACE_NAME}.awg_s1=$AWG_S1
-        uci set network.${INTERFACE_NAME}.awg_s2=$AWG_S2
-        uci set network.${INTERFACE_NAME}.awg_h1=$AWG_H1
-        uci set network.${INTERFACE_NAME}.awg_h2=$AWG_H2
-        uci set network.${INTERFACE_NAME}.awg_h3=$AWG_H3
-        uci set network.${INTERFACE_NAME}.awg_h4=$AWG_H4
-    fi
-
-    if ! uci show network | grep -q ${CONFIG_NAME}; then
-        uci add network ${CONFIG_NAME}
-    fi
-
-    uci set network.@${CONFIG_NAME}[0]=$CONFIG_NAME
-    uci set network.@${CONFIG_NAME}[0].name="${INTERFACE_NAME}_client"
-    uci set network.@${CONFIG_NAME}[0].public_key=$WG_PUBLIC_KEY_INT
-    uci set network.@${CONFIG_NAME}[0].preshared_key=$WG_PRESHARED_KEY_INT
-    uci set network.@${CONFIG_NAME}[0].route_allowed_ips='0'
-    uci set network.@${CONFIG_NAME}[0].persistent_keepalive='25'
-    uci set network.@${CONFIG_NAME}[0].endpoint_host=$WG_ENDPOINT_INT
-    uci set network.@${CONFIG_NAME}[0].allowed_ips='0.0.0.0/0'
-    uci set network.@${CONFIG_NAME}[0].endpoint_port=$WG_ENDPOINT_PORT_INT
-    uci commit network
-
-    if ! uci show firewall | grep -q "@zone.*name='${ZONE_NAME}'"; then
-        printf "\033[32;1mZone Create\033[0m\n"
-        uci add firewall zone
-        uci set firewall.@zone[-1].name=$ZONE_NAME
-        uci set firewall.@zone[-1].network=$INTERFACE_NAME
-        uci set firewall.@zone[-1].forward='REJECT'
-        uci set firewall.@zone[-1].output='ACCEPT'
-        uci set firewall.@zone[-1].input='REJECT'
-        uci set firewall.@zone[-1].masq='1'
-        uci set firewall.@zone[-1].mtu_fix='1'
-        uci set firewall.@zone[-1].family='ipv4'
-        uci commit firewall
-    fi
-
-    if ! uci show firewall | grep -q "@forwarding.*name='${ZONE_NAME}'"; then
-        printf "\033[32;1mConfigured forwarding\033[0m\n"
-        uci add firewall forwarding
-        uci set firewall.@forwarding[-1]=forwarding
-        uci set firewall.@forwarding[-1].name="${ZONE_NAME}-lan"
-        uci set firewall.@forwarding[-1].dest=${ZONE_NAME}
-        uci set firewall.@forwarding[-1].src='lan'
-        uci set firewall.@forwarding[-1].family='ipv4'
-        uci commit firewall
-    fi
-
-    handler_network_restart
 }
 
 check_system() {
     # Get router model
     MODEL=$(cat /tmp/sysinfo/model)
-    echo "Router model: $MODEL"
+    msg "Router model: $MODEL"
+
+    # Check OpenWrt version
+    openwrt_version=$(cat /etc/openwrt_release | grep DISTRIB_RELEASE | cut -d"'" -f2 | cut -d'.' -f1)
+    if [ "$openwrt_version" = "23" ]; then
+        msg "OpenWrt 23.05 не поддерживается начиная с podkop 0.5.0"
+        msg "Для OpenWrt 23.05 используйте podkop версии 0.4.11 или устанавливайте зависимости и podkop вручную"
+        msg "Подробности: https://podkop.net/docs/install/#%d1%83%d1%81%d1%82%d0%b0%d0%bd%d0%be%d0%b2%d0%ba%d0%b0-%d0%bd%d0%b0-2305"
+        exit 1
+    fi
 
     # Check available space
     AVAILABLE_SPACE=$(df /overlay | awk 'NR==2 {print $4}')
     REQUIRED_SPACE=15360 # 15MB in KB
 
     if [ "$AVAILABLE_SPACE" -lt "$REQUIRED_SPACE" ]; then
-        printf "\033[31;1mError: Insufficient space in flash\033[0m\n"
+        msg "Error: Insufficient space in flash"
-        echo "Available: $((AVAILABLE_SPACE/1024))MB"
+        msg "Available: $((AVAILABLE_SPACE/1024))MB"
-        echo "Required: $((REQUIRED_SPACE/1024))MB"
+        msg "Required: $((REQUIRED_SPACE/1024))MB"
         exit 1
     fi
 
     if ! nslookup google.com >/dev/null 2>&1; then
-        printf "\033[31;1mDNS not working\033[0m\n"
+        msg "DNS not working"
         exit 1
     fi
 
     if opkg list-installed | grep -q https-dns-proxy; then
-        printf "\033[31;1mСonflicting package detected: https-dns-proxy. Remove? yes/no\033[0m\n"
+        msg "Сonflicting package detected: https-dns-proxy. Remove?"
 
         while true; do
                 read -r -p '' DNSPROXY
@@ -451,16 +145,12 @@ check_system() {
                     break
                     ;;
                 *)
-                    echo "Exit"
+                    msg "Exit"
                     exit 1
                     ;;
         esac
     done
     fi
-
-    if opkg list-installed | grep -q "iptables-mod-extra"; then
-        printf "\033[31;1mFound incompatible iptables packages. If you're using FriendlyWrt: https://t.me/itdogchat/44512/181082\033[0m\n"
-    fi
 }
 
 sing_box() {
@@ -469,10 +159,13 @@ sing_box() {
     fi
 
     sing_box_version=$(sing-box version | head -n 1 | awk '{print $3}')
-    required_version="1.11.1"
+    required_version="1.12.4"
 
     if [ "$(echo -e "$sing_box_version\n$required_version" | sort -V | head -n 1)" != "$required_version" ]; then
-        opkg remove sing-box
+        msg "sing-box version $sing_box_version is older than required $required_version"
+        msg "Removing old version..."
+        service podkop stop
+        opkg remove sing-box --force-depends
     fi
 }
 

luci-app-podkop/Makefile

@@ -1,7 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.4.3
+
+PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),dev_$(shell date +%d%m%Y))
+
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app

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

@@ -1,195 +1,362 @@
 'use strict';
 'require form';
 'require baseclass';
-'require view.podkop.constants as constants';
 'require tools.widgets as widgets';
+'require view.podkop.main as main';
 
-function createAdditionalSection(mainSection, network) {
+function createAdditionalSection(mainSection) {
-    let o = mainSection.tab('additional', _('Additional Settings'));
+  let o = mainSection.tab('additional', _('Additional Settings'));
 
-    o = mainSection.taboption('additional', form.Flag, 'yacd', _('Yacd enable'), _('<a href="http://openwrt.lan:9090/ui" target="_blank">openwrt.lan:9090/ui</a>'));
+  o = mainSection.taboption(
-    o.default = '0';
+    'additional',
-    o.rmempty = false;
+    form.Flag,
-    o.ucisection = 'main';
+    'yacd',
+    _('Yacd enable'),
+    `<a href="${main.getBaseUrl()}:9090/ui" target="_blank">${main.getBaseUrl()}:9090/ui</a>`,
+  );
+  o.default = '0';
+  o.rmempty = false;
+  o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', form.Flag, 'exclude_ntp', _('Exclude NTP'), _('For issues with open connections sing-box'));
+  o = mainSection.taboption(
-    o.default = '0';
+    'additional',
-    o.rmempty = false;
+    form.Flag,
-    o.ucisection = 'main';
+    'exclude_ntp',
+    _('Exclude NTP'),
+    _('Allows you to exclude NTP protocol traffic from the tunnel'),
+  );
+  o.default = '0';
+  o.rmempty = false;
+  o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', form.Flag, 'quic_disable', _('QUIC disable'), _('For issues with the video stream'));
+  o = mainSection.taboption(
-    o.default = '0';
+    'additional',
-    o.rmempty = false;
+    form.Flag,
-    o.ucisection = 'main';
+    'quic_disable',
+    _('QUIC disable'),
+    _('For issues with the video stream'),
+  );
+  o.default = '0';
+  o.rmempty = false;
+  o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', form.ListValue, 'update_interval', _('List Update Frequency'), _('Select how often the lists will be updated'));
+  o = mainSection.taboption(
-    Object.entries(constants.UPDATE_INTERVAL_OPTIONS).forEach(([key, label]) => {
+    'additional',
-        o.value(key, _(label));
+    form.ListValue,
-    });
+    'update_interval',
-    o.default = '1d';
+    _('List Update Frequency'),
-    o.rmempty = false;
+    _('Select how often the lists will be updated'),
-    o.ucisection = 'main';
+  );
+  Object.entries(main.UPDATE_INTERVAL_OPTIONS).forEach(([key, label]) => {
+    o.value(key, _(label));
+  });
+  o.default = '1d';
+  o.rmempty = false;
+  o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', form.ListValue, 'dns_type', _('DNS Protocol Type'), _('Select DNS protocol to use'));
+  o = mainSection.taboption(
-    o.value('doh', _('DNS over HTTPS (DoH)'));
+    'additional',
-    o.value('dot', _('DNS over TLS (DoT)'));
+    form.ListValue,
-    o.value('udp', _('UDP (Unprotected DNS)'));
+    'dns_type',
-    o.default = 'doh';
+    _('DNS Protocol Type'),
-    o.rmempty = false;
+    _('Select DNS protocol to use'),
-    o.ucisection = 'main';
+  );
+  o.value('doh', _('DNS over HTTPS (DoH)'));
+  o.value('dot', _('DNS over TLS (DoT)'));
+  o.value('udp', _('UDP (Unprotected DNS)'));
+  o.default = 'udp';
+  o.rmempty = false;
+  o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', form.Value, 'dns_server', _('DNS Server'), _('Select or enter DNS server address'));
+  o = mainSection.taboption(
-    Object.entries(constants.DNS_SERVER_OPTIONS).forEach(([key, label]) => {
+    'additional',
-        o.value(key, _(label));
+    form.Value,
-    });
+    'dns_server',
-    o.default = '8.8.8.8';
+    _('DNS Server'),
-    o.rmempty = false;
+    _('Select or enter DNS server address'),
-    o.ucisection = 'main';
+  );
-    o.validate = function (section_id, value) {
+  Object.entries(main.DNS_SERVER_OPTIONS).forEach(([key, label]) => {
-        if (!value) {
+    o.value(key, _(label));
-            return _('DNS server address cannot be empty');
+  });
-        }
+  o.default = '8.8.8.8';
+  o.rmempty = false;
+  o.ucisection = 'main';
+  o.validate = function (section_id, value) {
+    const validation = main.validateDNS(value);
 
-        const ipRegex = /^(\d{1,3}\.){3}\d{1,3}$/;
+    if (validation.valid) {
-        if (ipRegex.test(value)) {
+      return true;
-            const parts = value.split('.');
+    }
-            for (const part of parts) {
-                const num = parseInt(part);
-                if (num < 0 || num > 255) {
-                    return _('IP address parts must be between 0 and 255');
-                }
-            }
-            return true;
-        }
 
-        const domainRegex = /^([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(\/[^\s]*)?$/;
+    return validation.message;
-        if (!domainRegex.test(value)) {
+  };
-            return _('Invalid DNS server format. Examples: 8.8.8.8 or dns.example.com or dns.example.com/nicedns for DoH');
-        }
 
-        return true;
+  o = mainSection.taboption(
-    };
+    'additional',
+    form.Value,
+    'bootstrap_dns_server',
+    _('Bootstrap DNS server'),
+    _(
+      'The DNS server used to look up the IP address of an upstream DNS server',
+    ),
+  );
+  Object.entries(main.BOOTSTRAP_DNS_SERVER_OPTIONS).forEach(([key, label]) => {
+    o.value(key, _(label));
+  });
+  o.default = '77.88.8.8';
+  o.rmempty = false;
+  o.ucisection = 'main';
+  o.validate = function (section_id, value) {
+    const validation = main.validateDNS(value);
 
-    o = mainSection.taboption('additional', form.Value, 'dns_rewrite_ttl', _('DNS Rewrite TTL'), _('Time in seconds for DNS record caching (default: 60)'));
+    if (validation.valid) {
-    o.default = '60';
+      return true;
-    o.rmempty = false;
+    }
-    o.ucisection = 'main';
-    o.validate = function (section_id, value) {
-        if (!value) {
-            return _('TTL value cannot be empty');
-        }
 
-        const ttl = parseInt(value);
+    return validation.message;
-        if (isNaN(ttl) || ttl < 0) {
+  };
-            return _('TTL must be a positive number');
-        }
 
-        return true;
+  o = mainSection.taboption(
-    };
+    'additional',
+    form.Value,
+    'dns_rewrite_ttl',
+    _('DNS Rewrite TTL'),
+    _('Time in seconds for DNS record caching (default: 60)'),
+  );
+  o.default = '60';
+  o.rmempty = false;
+  o.ucisection = 'main';
+  o.validate = function (section_id, value) {
+    if (!value) {
+      return _('TTL value cannot be empty');
+    }
 
-    o = mainSection.taboption('additional', form.Value, 'cache_file', _('Cache File Path'), _('Select or enter path for sing-box cache file. Change this ONLY if you know what you are doing'));
+    const ttl = parseInt(value);
-    o.value('/tmp/cache.db', 'RAM (/tmp/cache.db)');
+    if (isNaN(ttl) || ttl < 0) {
-    o.value('/usr/share/sing-box/cache.db', 'Flash (/usr/share/sing-box/cache.db)');
+      return _('TTL must be a positive number');
-    o.default = '/tmp/cache.db';
+    }
-    o.rmempty = false;
-    o.ucisection = 'main';
-    o.validate = function (section_id, value) {
-        if (!value) {
-            return _('Cache file path cannot be empty');
-        }
 
-        if (!value.startsWith('/')) {
+    return true;
-            return _('Path must be absolute (start with /)');
+  };
-        }
 
-        if (!value.endsWith('cache.db')) {
+  o = mainSection.taboption(
-            return _('Path must end with cache.db');
+    'additional',
-        }
+    form.ListValue,
+    'config_path',
+    _('Config File Path'),
+    _(
+      'Select path for sing-box config file. Change this ONLY if you know what you are doing',
+    ),
+  );
+  o.value('/etc/sing-box/config.json', 'Flash (/etc/sing-box/config.json)');
+  o.value('/tmp/sing-box/config.json', 'RAM (/tmp/sing-box/config.json)');
+  o.default = '/etc/sing-box/config.json';
+  o.rmempty = false;
+  o.ucisection = 'main';
 
-        const parts = value.split('/').filter(Boolean);
+  o = mainSection.taboption(
-        if (parts.length < 2) {
+    'additional',
-            return _('Path must contain at least one directory (like /tmp/cache.db)');
+    form.Value,
-        }
+    'cache_path',
+    _('Cache File Path'),
+    _(
+      'Select or enter path for sing-box cache file. Change this ONLY if you know what you are doing',
+    ),
+  );
+  o.value('/tmp/sing-box/cache.db', 'RAM (/tmp/sing-box/cache.db)');
+  o.value(
+    '/usr/share/sing-box/cache.db',
+    'Flash (/usr/share/sing-box/cache.db)',
+  );
+  o.default = '/tmp/sing-box/cache.db';
+  o.rmempty = false;
+  o.ucisection = 'main';
+  o.validate = function (section_id, value) {
+    if (!value) {
+      return _('Cache file path cannot be empty');
+    }
 
-        return true;
+    if (!value.startsWith('/')) {
-    };
+      return _('Path must be absolute (start with /)');
+    }
 
-    o = mainSection.taboption('additional', widgets.DeviceSelect, 'iface', _('Source Network Interface'), _('Select the network interface from which the traffic will originate'));
+    if (!value.endsWith('cache.db')) {
-    o.ucisection = 'main';
+      return _('Path must end with cache.db');
-    o.default = 'br-lan';
+    }
-    o.noaliases = true;
-    o.nobridges = false;
-    o.noinactive = false;
-    o.multiple = true;
-    o.filter = function (section_id, value) {
-        if (['wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan'].indexOf(value) !== -1) {
-            return false;
-        }
 
-        var device = this.devices.filter(function (dev) {
+    const parts = value.split('/').filter(Boolean);
-            return dev.getName() === value;
+    if (parts.length < 2) {
-        })[0];
+      return _('Path must contain at least one directory (like /tmp/cache.db)');
+    }
 
-        if (device) {
+    return true;
-            var type = device.getType();
+  };
-            return type !== 'wifi' && type !== 'wireless' && !type.includes('wlan');
-        }
 
-        return true;
+  o = mainSection.taboption(
-    };
+    'additional',
+    widgets.DeviceSelect,
+    'iface',
+    _('Source Network Interface'),
+    _('Select the network interface from which the traffic will originate'),
+  );
+  o.ucisection = 'main';
+  o.default = 'br-lan';
+  o.noaliases = true;
+  o.nobridges = false;
+  o.noinactive = false;
+  o.multiple = true;
+  o.filter = function (section_id, value) {
+    // Block specific interface names from being selectable
+    const blocked = ['wan', 'phy0-ap0', 'phy1-ap0', 'pppoe-wan'];
+    if (blocked.includes(value)) {
+      return false;
+    }
 
-    o = mainSection.taboption('additional', form.Flag, 'mon_restart_ifaces', _('Interface monitoring'), _('Interface monitoring for bad WAN'));
+    // Try to find the device object by its name
-    o.default = '0';
+    const device = this.devices.find((dev) => dev.getName() === value);
-    o.rmempty = false;
-    o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', widgets.NetworkSelect, 'restart_ifaces', _('Interface for monitoring'), _('Select the WAN interfaces to be monitored'));
+    // If no device is found, allow the value
-    o.ucisection = 'main';
+    if (!device) {
-    o.depends('mon_restart_ifaces', '1');
+      return true;
-    o.multiple = true;
+    }
-    o.filter = function (section_id, value) {
-        return ['lan', 'loopback'].indexOf(value) === -1 && !value.startsWith('@');
-    };
 
-    o = mainSection.taboption('additional', form.Flag, 'dont_touch_dhcp', _('Dont touch my DHCP!'), _('Podkop will not change the DHCP config'));
+    // Check the type of the device
-    o.default = '0';
+    const type = device.getType();
-    o.rmempty = false;
-    o.ucisection = 'main';
 
-    o = mainSection.taboption('additional', form.Flag, 'detour', _('Proxy download of lists'), _('Downloading all lists via main Proxy/VPN'));
+    // Consider any Wi-Fi / wireless / wlan device as invalid
-    o.default = '0';
+    const isWireless =
-    o.rmempty = false;
+      type === 'wifi' || type === 'wireless' || type.includes('wlan');
-    o.ucisection = 'main';
 
-    // Extra IPs and exclusions (main section)
+    // Allow only non-wireless devices
-    o = mainSection.taboption('basic', form.Flag, 'exclude_from_ip_enabled', _('IP for exclusion'), _('Specify local IP addresses that will never use the configured route'));
+    return !isWireless;
-    o.default = '0';
+  };
-    o.rmempty = false;
-    o.ucisection = 'main';
 
-    o = mainSection.taboption('basic', form.DynamicList, 'exclude_traffic_ip', _('Local IPs'), _('Enter valid IPv4 addresses'));
+  o = mainSection.taboption(
-    o.placeholder = 'IP';
+    'additional',
-    o.depends('exclude_from_ip_enabled', '1');
+    form.Flag,
-    o.rmempty = false;
+    'mon_restart_ifaces',
-    o.ucisection = 'main';
+    _('Interface monitoring'),
-    o.validate = function (section_id, value) {
+    _('Interface monitoring for bad WAN'),
-        if (!value || value.length === 0) return true;
+  );
-        const ipRegex = /^(\d{1,3}\.){3}\d{1,3}$/;
+  o.default = '0';
-        if (!ipRegex.test(value)) return _('Invalid IP format. Use format: X.X.X.X (like 192.168.1.1)');
+  o.rmempty = false;
-        const ipParts = value.split('.');
+  o.ucisection = 'main';
-        for (const part of ipParts) {
-            const num = parseInt(part);
-            if (num < 0 || num > 255) return _('IP address parts must be between 0 and 255');
-        }
-        return true;
-    };
 
-    o = mainSection.taboption('basic', form.Flag, 'socks5', _('Mixed enable'), _('Browser port: 2080'));
+  o = mainSection.taboption(
-    o.default = '0';
+    'additional',
-    o.rmempty = false;
+    widgets.NetworkSelect,
-    o.ucisection = 'main';
+    'restart_ifaces',
+    _('Interface for monitoring'),
+    _('Select the WAN interfaces to be monitored'),
+  );
+  o.ucisection = 'main';
+  o.depends('mon_restart_ifaces', '1');
+  o.multiple = true;
+  o.filter = function (section_id, value) {
+    // Reject if the value is in the blocked list ['lan', 'loopback']
+    if (['lan', 'loopback'].includes(value)) {
+      return false;
+    }
+
+    // Reject if the value starts with '@' (means it's an alias/reference)
+    if (value.startsWith('@')) {
+      return false;
+    }
+
+    // Otherwise allow it
+    return true;
+  };
+
+  o = mainSection.taboption(
+    'additional',
+    form.Value,
+    'procd_reload_delay',
+    _('Interface Monitoring Delay'),
+    _('Delay in milliseconds before reloading podkop after interface UP'),
+  );
+  o.ucisection = 'main';
+  o.depends('mon_restart_ifaces', '1');
+  o.default = '2000';
+  o.rmempty = false;
+  o.validate = function (section_id, value) {
+    if (!value) {
+      return _('Delay value cannot be empty');
+    }
+    return true;
+  };
+
+  o = mainSection.taboption(
+    'additional',
+    form.Flag,
+    'dont_touch_dhcp',
+    _('Dont touch my DHCP!'),
+    _('Podkop will not change the DHCP config'),
+  );
+  o.default = '0';
+  o.rmempty = false;
+  o.ucisection = 'main';
+
+  o = mainSection.taboption(
+    'additional',
+    form.Flag,
+    'detour',
+    _('Proxy download of lists'),
+    _('Downloading all lists via main Proxy/VPN'),
+  );
+  o.default = '0';
+  o.rmempty = false;
+  o.ucisection = 'main';
+
+  // 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';
+  o.rmempty = false;
+  o.ucisection = 'main';
+
+  o = mainSection.taboption(
+    'basic',
+    form.DynamicList,
+    'exclude_traffic_ip',
+    _('Local IPs'),
+    _('Enter valid IPv4 addresses'),
+  );
+  o.placeholder = 'IP';
+  o.depends('exclude_from_ip_enabled', '1');
+  o.rmempty = false;
+  o.ucisection = 'main';
+  o.validate = function (section_id, value) {
+    // Optional
+    if (!value || value.length === 0) {
+      return true;
+    }
+
+    const validation = main.validateIPV4(value);
+
+    if (validation.valid) {
+      return true;
+    }
+
+    return validation.message;
+  };
+
+  o = mainSection.taboption(
+    'basic',
+    form.Flag,
+    'socks5',
+    _('Mixed enable'),
+    _('Browser port: 2080'),
+  );
+  o.default = '0';
+  o.rmempty = false;
+  o.ucisection = 'main';
 }
 
 return baseclass.extend({
-    createAdditionalSection
+  createAdditionalSection,
-}); 
+});

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

@@ -1,107 +0,0 @@
-'use strict';
-'require baseclass';
-
-const STATUS_COLORS = {
-    SUCCESS: '#4caf50',
-    ERROR: '#f44336',
-    WARNING: '#ff9800'
-};
-
-const FAKEIP_CHECK_DOMAIN = 'fakeip.podkop.fyi';
-const IP_CHECK_DOMAIN = 'ip.podkop.fyi';
-
-const REGIONAL_OPTIONS = ['russia_inside', 'russia_outside', 'ukraine_inside'];
-const ALLOWED_WITH_RUSSIA_INSIDE = [
-    'russia_inside',
-    'meta',
-    'twitter',
-    'discord',
-    'telegram',
-    'cloudflare',
-    'google_ai',
-    'google_play',
-    'hetzner',
-    'ovh'
-];
-
-const DOMAIN_LIST_OPTIONS = {
-    russia_inside: 'Russia inside',
-    russia_outside: 'Russia outside',
-    ukraine_inside: 'Ukraine',
-    geoblock: 'Geo Block',
-    block: 'Block',
-    porn: 'Porn',
-    news: 'News',
-    anime: 'Anime',
-    youtube: 'Youtube',
-    discord: 'Discord',
-    meta: 'Meta',
-    twitter: 'Twitter (X)',
-    hdrezka: 'HDRezka',
-    tiktok: 'Tik-Tok',
-    telegram: 'Telegram',
-    cloudflare: 'Cloudflare',
-    google_ai: 'Google AI',
-    google_play: 'Google Play',
-    hetzner: 'Hetzner ASN',
-    ovh: 'OVH ASN'
-};
-
-const UPDATE_INTERVAL_OPTIONS = {
-    '1h': 'Every hour',
-    '3h': 'Every 3 hours',
-    '12h': 'Every 12 hours',
-    '1d': 'Every day',
-    '3d': 'Every 3 days'
-};
-
-const DNS_SERVER_OPTIONS = {
-    '1.1.1.1': 'Cloudflare (1.1.1.1)',
-    '8.8.8.8': 'Google (8.8.8.8)',
-    '9.9.9.9': 'Quad9 (9.9.9.9)',
-    'dns.adguard-dns.com': 'AdGuard Default (dns.adguard-dns.com)',
-    'unfiltered.adguard-dns.com': 'AdGuard Unfiltered (unfiltered.adguard-dns.com)',
-    'family.adguard-dns.com': 'AdGuard Family (family.adguard-dns.com)'
-};
-
-const DIAGNOSTICS_UPDATE_INTERVAL = 10000; // 10 seconds
-const CACHE_TIMEOUT = DIAGNOSTICS_UPDATE_INTERVAL - 1000; // 9 seconds
-const ERROR_POLL_INTERVAL = 10000; // 10 seconds
-const COMMAND_TIMEOUT = 10000; // 10 seconds
-const FETCH_TIMEOUT = 10000; // 10 seconds
-const BUTTON_FEEDBACK_TIMEOUT = 1000; // 1 second
-const DIAGNOSTICS_INITIAL_DELAY = 100; // 100 milliseconds
-
-// Интервалы планирования команд в диагностике (в миллисекундах)
-const COMMAND_SCHEDULING = {
-    P0_PRIORITY: 0,      // Наивысший приоритет (без задержки)
-    P1_PRIORITY: 100,    // Очень высокий приоритет
-    P2_PRIORITY: 300,    // Высокий приоритет
-    P3_PRIORITY: 500,    // Выше среднего
-    P4_PRIORITY: 700,    // Стандартный приоритет
-    P5_PRIORITY: 900,    // Ниже среднего
-    P6_PRIORITY: 1100,   // Низкий приоритет
-    P7_PRIORITY: 1300,   // Очень низкий приоритет
-    P8_PRIORITY: 1500,   // Фоновое выполнение
-    P9_PRIORITY: 1700,   // Выполнение в режиме простоя
-    P10_PRIORITY: 1900   // Наименьший приоритет
-};
-
-return baseclass.extend({
-    STATUS_COLORS,
-    FAKEIP_CHECK_DOMAIN,
-    IP_CHECK_DOMAIN,
-    REGIONAL_OPTIONS,
-    ALLOWED_WITH_RUSSIA_INSIDE,
-    DOMAIN_LIST_OPTIONS,
-    UPDATE_INTERVAL_OPTIONS,
-    DNS_SERVER_OPTIONS,
-    DIAGNOSTICS_UPDATE_INTERVAL,
-    ERROR_POLL_INTERVAL,
-    COMMAND_TIMEOUT,
-    FETCH_TIMEOUT,
-    BUTTON_FEEDBACK_TIMEOUT,
-    DIAGNOSTICS_INITIAL_DELAY,
-    COMMAND_SCHEDULING,
-    CACHE_TIMEOUT
-});

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

@@ -0,0 +1,26 @@
+'use strict';
+'require baseclass';
+'require form';
+'require ui';
+'require uci';
+'require fs';
+'require view.podkop.utils as utils';
+'require view.podkop.main as main';
+
+function createDashboardSection(mainSection) {
+  let o = mainSection.tab('dashboard', _('Dashboard'));
+
+  o = mainSection.taboption('dashboard', form.DummyValue, '_status');
+  o.rawhtml = true;
+  o.cfgvalue = () => {
+    main.initDashboardController();
+
+    return main.renderDashboard();
+  };
+}
+
+const EntryPoint = {
+  createDashboardSection,
+};
+
+return baseclass.extend(EntryPoint);

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

@@ -5,85 +5,78 @@
 'require view.podkop.configSection as configSection';
 'require view.podkop.diagnosticTab as diagnosticTab';
 'require view.podkop.additionalTab as additionalTab';
+'require view.podkop.dashboardTab as dashboardTab';
 'require view.podkop.utils as utils';
+'require view.podkop.main as main';
 
-return view.extend({
+const EntryNode = {
-    async render() {
+  async render() {
-        document.head.insertAdjacentHTML('beforeend', `
+    main.injectGlobalStyles();
-            <style>
-                .cbi-value {
-                    margin-bottom: 10px !important;
-                }
 
-                #diagnostics-status .table > div {
+    const podkopFormMap = new form.Map('podkop', '', null, ['main', 'extra']);
-                    background: var(--background-color-primary);
-                    border: 1px solid var(--border-color-medium);
-                    border-radius: var(--border-radius);
-                }
 
-                #diagnostics-status .table > div pre,
+    // Main Section
-                #diagnostics-status .table > div div[style*="monospace"] {
+    const mainSection = podkopFormMap.section(form.TypedSection, 'main');
-                    color: var(--color-text-primary);
+    mainSection.anonymous = true;
-                }
 
-                #diagnostics-status .alert-message {
+    configSection.createConfigSection(mainSection);
-                    background: var(--background-color-primary);
-                    border-color: var(--border-color-medium);
-                }
-            </style>
-        `);
 
-        const m = new form.Map('podkop', _(''), null, ['main', 'extra']);
+    // Additional Settings Tab (main section)
+    additionalTab.createAdditionalSection(mainSection);
 
-        // Main Section
+    // Diagnostics Tab (main section)
-        const mainSection = m.section(form.TypedSection, 'main');
+    diagnosticTab.createDiagnosticsSection(mainSection);
-        mainSection.anonymous = true;
+    const podkopFormMapPromise = podkopFormMap.render().then((node) => {
-        configSection.createConfigSection(mainSection, m, network);
+      // Set up diagnostics event handlers
+      diagnosticTab.setupDiagnosticsEventHandlers(node);
 
-        // Additional Settings Tab (main section)
+      // Start critical error polling for all tabs
-        additionalTab.createAdditionalSection(mainSection, network);
+      utils.startErrorPolling();
 
-        // Diagnostics Tab (main section)
+      // Add event listener to keep error polling active when switching tabs
-        diagnosticTab.createDiagnosticsSection(mainSection);
+      const tabs = node.querySelectorAll('.cbi-tabmenu');
-        const map_promise = m.render().then(node => {
+      if (tabs.length > 0) {
-            // Set up diagnostics event handlers
+        tabs[0].addEventListener('click', function (e) {
-            diagnosticTab.setupDiagnosticsEventHandlers(node);
+          const tab = e.target.closest('.cbi-tab');
-
+          if (tab) {
-            // Start critical error polling for all tabs
+            // Ensure error polling continues when switching tabs
             utils.startErrorPolling();
-
+          }
-            // Add event listener to keep error polling active when switching tabs
-            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) {
-                        // Ensure error polling continues when switching tabs
-                        utils.startErrorPolling();
-                    }
-                });
-            }
-
-            // Add visibility change handler to manage error polling
-            document.addEventListener('visibilitychange', function () {
-                if (document.hidden) {
-                    utils.stopErrorPolling();
-                } else {
-                    utils.startErrorPolling();
-                }
-            });
-
-            return node;
         });
+      }
 
-        // Extra Section
+      // Add visibility change handler to manage error polling
-        const extraSection = m.section(form.TypedSection, 'extra', _('Extra configurations'));
+      document.addEventListener('visibilitychange', function () {
-        extraSection.anonymous = false;
+        if (document.hidden) {
-        extraSection.addremove = true;
+          utils.stopErrorPolling();
-        extraSection.addbtntitle = _('Add Section');
+        } else {
-        extraSection.multiple = true;
+          utils.startErrorPolling();
-        configSection.createConfigSection(extraSection, m, network);
+        }
+      });
 
-        return map_promise;
+      return node;
-    }
+    });
-});
+
+    // Extra Section
+    const extraSection = podkopFormMap.section(
+      form.TypedSection,
+      'extra',
+      _('Extra configurations'),
+    );
+    extraSection.anonymous = false;
+    extraSection.addremove = true;
+    extraSection.addbtntitle = _('Add Section');
+    extraSection.multiple = true;
+    configSection.createConfigSection(extraSection);
+
+    // Initial dashboard render
+    dashboardTab.createDashboardSection(mainSection);
+
+    // Inject core service
+    main.coreService();
+
+    return podkopFormMapPromise;
+  },
+};
+
+return view.extend(EntryNode);

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

@@ -2,7 +2,7 @@
 'require baseclass';
 'require ui';
 'require fs';
-'require view.podkop.constants as constants';
+'require view.podkop.main as main';
 
 // Flag to track if this is the first error check
 let isInitialCheck = true;
@@ -15,138 +15,149 @@ let errorPollTimer = null;
 
 // Helper function to fetch errors from the podkop command
 async function getPodkopErrors() {
-    return new Promise(resolve => {
+  return new Promise((resolve) => {
-        safeExec('/usr/bin/podkop', ['check_logs'], 'P0_PRIORITY', result => {
+    safeExec('/usr/bin/podkop', ['check_logs'], 'P0_PRIORITY', (result) => {
-            if (!result || !result.stdout) return resolve([]);
+      if (!result || !result.stdout) return resolve([]);
 
-            const logs = result.stdout.split('\n');
+      const logs = result.stdout.split('\n');
-            const errors = logs.filter(log =>
+      const errors = logs.filter((log) => log.includes('[critical]'));
-                log.includes('[critical]')
-            );
 
-            resolve(errors);
+      resolve(errors);
-        });
     });
+  });
 }
 
 // Show error notification to the user
 function showErrorNotification(error, isMultiple = false) {
-    const notificationContent = E('div', { 'class': 'alert-message error' }, [
+  const notificationContent = E('div', { class: 'alert-message error' }, [
-        E('pre', { 'class': 'error-log' }, error)
+    E('pre', { class: 'error-log' }, error),
-    ]);
+  ]);
 
-    ui.addNotification(null, notificationContent);
+  ui.addNotification(null, notificationContent);
 }
 
 // Helper function for command execution with prioritization
-function safeExec(command, args, priority, callback, timeout = constants.COMMAND_TIMEOUT) {
+function safeExec(
-    // Default to highest priority execution if priority is not provided or invalid
+  command,
-    let schedulingDelay = constants.COMMAND_SCHEDULING.P0_PRIORITY;
+  args,
+  priority,
+  callback,
+  timeout = main.COMMAND_TIMEOUT,
+) {
+  // Default to highest priority execution if priority is not provided or invalid
+  let schedulingDelay = main.COMMAND_SCHEDULING.P0_PRIORITY;
 
-    // If priority is a string, try to get the corresponding delay value
+  // If priority is a string, try to get the corresponding delay value
-    if (typeof priority === 'string' && constants.COMMAND_SCHEDULING[priority] !== undefined) {
+  if (
-        schedulingDelay = constants.COMMAND_SCHEDULING[priority];
+    typeof priority === 'string' &&
+    main.COMMAND_SCHEDULING[priority] !== undefined
+  ) {
+    schedulingDelay = main.COMMAND_SCHEDULING[priority];
+  }
+
+  const executeCommand = async () => {
+    try {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), timeout);
+
+      const result = await Promise.race([
+        fs.exec(command, args),
+        new Promise((_, reject) => {
+          controller.signal.addEventListener('abort', () => {
+            reject(new Error('Command execution timed out'));
+          });
+        }),
+      ]);
+
+      clearTimeout(timeoutId);
+
+      if (callback && typeof callback === 'function') {
+        callback(result);
+      }
+
+      return result;
+    } catch (error) {
+      console.warn(
+        `Command execution failed or timed out: ${command} ${args.join(' ')}`,
+      );
+      const errorResult = { stdout: '', stderr: error.message, error: error };
+
+      if (callback && typeof callback === 'function') {
+        callback(errorResult);
+      }
+
+      return errorResult;
     }
+  };
 
-    const executeCommand = async () => {
+  if (callback && typeof callback === 'function') {
-        try {
+    setTimeout(executeCommand, schedulingDelay);
-            const controller = new AbortController();
+    return;
-            const timeoutId = setTimeout(() => controller.abort(), timeout);
+  } else {
-
+    return executeCommand();
-            const result = await Promise.race([
+  }
-                fs.exec(command, args),
-                new Promise((_, reject) => {
-                    controller.signal.addEventListener('abort', () => {
-                        reject(new Error('Command execution timed out'));
-                    });
-                })
-            ]);
-
-            clearTimeout(timeoutId);
-
-            if (callback && typeof callback === 'function') {
-                callback(result);
-            }
-
-            return result;
-        } catch (error) {
-            console.warn(`Command execution failed or timed out: ${command} ${args.join(' ')}`);
-            const errorResult = { stdout: '', stderr: error.message, error: error };
-
-            if (callback && typeof callback === 'function') {
-                callback(errorResult);
-            }
-
-            return errorResult;
-        }
-    };
-
-    if (callback && typeof callback === 'function') {
-        setTimeout(executeCommand, schedulingDelay);
-        return;
-    }
-    else {
-        return executeCommand();
-    }
 }
 
 // Check for critical errors and show notifications
 async function checkForCriticalErrors() {
-    try {
+  try {
-        const errors = await getPodkopErrors();
+    const errors = await getPodkopErrors();
 
-        if (errors && errors.length > 0) {
+    if (errors && errors.length > 0) {
-            // Filter out errors we've already seen
+      // Filter out errors we've already seen
-            const newErrors = errors.filter(error => !lastErrorsSet.has(error));
+      const newErrors = errors.filter((error) => !lastErrorsSet.has(error));
 
-            if (newErrors.length > 0) {
+      if (newErrors.length > 0) {
-                // On initial check, just store errors without showing notifications
+        // On initial check, just store errors without showing notifications
-                if (!isInitialCheck) {
+        if (!isInitialCheck) {
-                    // Show each new error as a notification
+          // Show each new error as a notification
-                    newErrors.forEach(error => {
+          newErrors.forEach((error) => {
-                        showErrorNotification(error, newErrors.length > 1);
+            showErrorNotification(error, newErrors.length > 1);
-                    });
+          });
-                }
-
-                // Add new errors to our set of seen errors
-                newErrors.forEach(error => lastErrorsSet.add(error));
-            }
         }
 
-        // After first check, mark as no longer initial
+        // Add new errors to our set of seen errors
-        isInitialCheck = false;
+        newErrors.forEach((error) => lastErrorsSet.add(error));
-    } catch (error) {
+      }
-        console.error('Error checking for critical messages:', error);
     }
+
+    // After first check, mark as no longer initial
+    isInitialCheck = false;
+  } catch (error) {
+    console.error('Error checking for critical messages:', error);
+  }
 }
 
 // Start polling for errors at regular intervals
 function startErrorPolling() {
-    if (errorPollTimer) {
+  if (errorPollTimer) {
-        clearInterval(errorPollTimer);
+    clearInterval(errorPollTimer);
-    }
+  }
 
-    // Reset initial check flag to make sure we show errors
+  // Reset initial check flag to make sure we show errors
-    isInitialCheck = false;
+  isInitialCheck = false;
 
-    // Immediately check for errors on start
+  // Immediately check for errors on start
-    checkForCriticalErrors();
+  checkForCriticalErrors();
 
-    // Then set up periodic checks
+  // Then set up periodic checks
-    errorPollTimer = setInterval(checkForCriticalErrors, constants.ERROR_POLL_INTERVAL);
+  errorPollTimer = setInterval(
+    checkForCriticalErrors,
+    main.ERROR_POLL_INTERVAL,
+  );
 }
 
 // Stop polling for errors
 function stopErrorPolling() {
-    if (errorPollTimer) {
+  if (errorPollTimer) {
-        clearInterval(errorPollTimer);
+    clearInterval(errorPollTimer);
-        errorPollTimer = null;
+    errorPollTimer = null;
-    }
+  }
 }
 
 return baseclass.extend({
-    startErrorPolling,
+  startErrorPolling,
-    stopErrorPolling,
+  stopErrorPolling,
-    checkForCriticalErrors,
+  checkForCriticalErrors,
-    safeExec
+  safeExec,
-}); 
+});

luci-app-podkop/msgmerge.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PODIR="po"
+POTFILE="$PODIR/templates/podkop.pot"
+WIDTH=120
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <language_code> (e.g., ru, de, fr)"
+    exit 1
+fi
+
+LANG="$1"
+POFILE="$PODIR/$LANG/podkop.po"
+
+if [ ! -f "$POTFILE" ]; then
+    echo "Template $POTFILE not found. Run xgettext first."
+    exit 1
+fi
+
+if [ -f "$POFILE" ]; then
+    echo "Updating $POFILE"
+    msgmerge --update --width="$WIDTH" --no-location "$POFILE" "$POTFILE"
+else
+    echo "Creating new $POFILE using msginit"
+    mkdir -p "$PODIR/$LANG"
+    msginit --no-translator --no-location --locale="$LANG" --width="$WIDTH" --input="$POTFILE" --output-file="$POFILE"
+fi
+
+echo "Translation file for $LANG updated."

luci-app-podkop/xgettext.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SRC_DIR="htdocs/luci-static/resources/view/podkop"
+OUT_POT="po/templates/podkop.pot"
+ENCODING="UTF-8"
+WIDTH=120
+
+mapfile -t FILES < <(find "$SRC_DIR" -type f -name "*.js")
+if [ ${#FILES[@]} -eq 0 ]; then
+    echo "No JS files found in $SRC_DIR"
+    exit 1
+fi
+
+mapfile -t FILES < <(printf '%s\n' "${FILES[@]}" | sort)
+mkdir -p "$(dirname "$OUT_POT")"
+
+echo "Generating POT template from JS files in $SRC_DIR"
+xgettext --language=JavaScript \
+         --keyword=_ \
+         --from-code="$ENCODING" \
+         --output="$OUT_POT" \
+         --width="$WIDTH" \
+         --package-name="PODKOP" \
+         "${FILES[@]}"
+
+echo "POT template generated: $OUT_POT"

podkop/Makefile

@@ -1,7 +1,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.4.3
+
+PKG_VERSION := $(if $(PKG_VERSION),$(PKG_VERSION),dev_$(shell date +%d%m%Y))
+
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>
@@ -13,7 +15,7 @@ define Package/podkop
 	SECTION:=net
 	CATEGORY:=Network
 	DEPENDS:=+sing-box +curl +jq +kmod-nft-tproxy +coreutils-base64
-	CONFLICTS:=https-dns-proxy
+	CONFLICTS:=https-dns-proxy nextdns luci-app-passwall luci-app-passwall2
 	TITLE:=Domain routing app
 	URL:=https://podkop.net
 	PKGARCH:=all
@@ -53,6 +55,9 @@ define Package/podkop/install
 
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) ./files/usr/bin/podkop $(1)/usr/bin/podkop
+
+	$(INSTALL_DIR) $(1)/usr/lib/podkop
+	$(CP) ./files/usr/lib/* $(1)/usr/lib/podkop/
 endef
 
 $(eval $(call BuildPackage,podkop))