Compare commits

..

44 Commits

Author SHA1 Message Date
Kirill Sobakin
847895598d Merge pull request #382 from itdoginfo/fix/hy2
Fixes
2026-05-29 17:41:50 +03:00
divocatt
4146804e5a feat(extra): hide block & exclusion from download_lists_via_proxy_section 2026-05-29 17:03:44 +03:00
divocatt
daef80b7b8 feat(debug): add debug data for download_lists_via_proxy_section 2026-05-29 17:00:02 +03:00
divocatt
6e7b8a6be2 feat(exclusion): hide section with type exclusion 2026-05-29 16:53:47 +03:00
divocatt
1365febaa4 feat(hy2): add port range support for validator 2026-05-29 16:40:44 +03:00
Andrey Petelin
1543d974cc fix: support multiple server ports for hysteria2 outbounds 2026-05-29 17:45:13 +05:00
Andrey Petelin
4b03c28c41 fix: initialize scheme before checking security and clear fingerprint for hysteria2 (hy2) schemes 2026-05-29 15:58:02 +05:00
Kirill Sobakin
c3281773d5 Merge pull request #380 from itdoginfo/docs/trademark
Docs
2026-05-29 10:13:03 +03:00
Andrey Petelin
c9e0b54f2c docs: remove leading Markdown heading from Russian trademark guide 2026-05-29 12:03:43 +05:00
Andrey Petelin
7f33cfcb98 docs: Rewrite README.md to add project intro, warnings, requirements, install & support; remove outdated notes 2026-05-28 20:41:35 +05:00
Andrey Petelin
177469e212 docs: add trademark guidelines in English and Russian (TRADEMARK.md, TRADEMARK_RU.md) 2026-05-28 20:40:23 +05:00
Kirill Sobakin
1802818044 Merge pull request #369 from itdoginfo/copilot/add-invalid-tag-handling
ci: auto-close issues labeled as `Close as invalid`
2026-05-16 06:50:47 +03:00
copilot-swe-agent[bot]
c62cb2de14 fix: use correct label name 'Close as invalid' in workflow
Agent-Logs-Url: https://github.com/itdoginfo/podkop/sessions/db87c50a-cdfd-441f-bf0c-128adfe11f91

Co-authored-by: itdoginfo <11143109+itdoginfo@users.noreply.github.com>
2026-05-16 03:48:02 +00:00
copilot-swe-agent[bot]
f253e4e36f Add workflow to auto-close issues with invalid label
Agent-Logs-Url: https://github.com/itdoginfo/podkop/sessions/455a9a26-bc0f-4f3e-99ea-eff524519e85

Co-authored-by: itdoginfo <11143109+itdoginfo@users.noreply.github.com>
2026-05-16 03:46:01 +00:00
Kirill Sobakin
41e696c9b2 Merge pull request #366 from itdoginfo/discord
fix: include UDP port range 19000-20000 in Discord nft rule
2026-05-14 10:29:52 +03:00
Andrey Petelin
835b455915 fix: include UDP port range 19000-20000 in Discord nft rule 2026-05-14 12:23:50 +05:00
Slava-Shchipunov
6089ef4c9b Fix/fix version check (#278) 2026-05-12 19:31:43 +03:00
Kirill Sobakin
617e9a93bc Merge pull request #363 from itdoginfo/version
Fix LuCI Version
2026-05-12 10:11:25 +03:00
Kirill Sobakin
6d9aedd236 Merge pull request #364 from itdoginfo/sdk052026
Update SDK version
2026-05-12 10:05:50 +03:00
Kirill Sobakin
fc9cf79221 fix/literal 2026-05-12 10:04:09 +03:00
Kirill Sobakin
2184c0c7d4 update/SDK version 2026-05-12 10:00:03 +03:00
Kirill Sobakin
03736c613b update/SDK version 2026-05-12 09:58:20 +03:00
Kirill Sobakin
c37ea6a4d3 fix/luci version 2026-05-12 09:35:11 +03:00
Kirill Sobakin
a0869da4a5 fix/luci version 2026-05-12 09:34:56 +03:00
Kirill Sobakin
23ac3a8d12 Merge pull request #361 from romanvht/resolve-action
Add func to insert resolve action in route.rules section
2026-05-12 09:25:19 +03:00
romanvht
d8bd87a7da update locale for action resolve 2026-05-09 14:51:34 +10:00
romanvht
b93403c3e3 distribute locales 2026-05-09 13:03:40 +10:00
romanvht
5629425853 add localisation strings to fe-app-podkop, actualize po&pot 2026-05-09 12:55:15 +10:00
romanvht
8b2abc0b28 add func to insert resolve action in route.rules section 2026-05-09 02:49:40 +10:00
Kirill Sobakin
21085f3ac3 Update README.md 2026-03-07 20:12:30 +03:00
Kirill Sobakin
9a015bbde4 Merge pull request #309 from itdoginfo/fix/default-dns
chore: set dns_server to 77.88.8.8
2026-02-16 07:29:48 +03:00
Andrey Petelin
a7b6c36dfb chore: set dns_server to 77.88.8.8 2026-01-29 12:03:25 +05:00
Kirill Sobakin
f39e2d9ca9 Merge pull request #307 from itdoginfo/fix/dns-check
fix: use nslookup_attempts for DNS check loop
2026-01-28 10:49:34 +03:00
Andrey Petelin
00594f23fd fix: use nslookup_attempts for DNS check loop instead of nslookup_timeout 2026-01-28 12:45:35 +05:00
Kirill Sobakin
0379cf5966 Merge pull request #304 from itdoginfo/fix/diagnostic-singbox-config
feat(diagnostic): stringify sb config json
2026-01-24 12:45:33 +03:00
divocatt
cfee6cec9a feat(diagnostic): stringify sb config json 2026-01-23 16:06:54 +02:00
Kirill Sobakin
ad760a78bf Merge pull request #303 from itdoginfo/fix/minor-fixes
Fix/minor fixes
2026-01-23 15:57:24 +03:00
Andrey Petelin
d854caa4cc fix: Disable dnsmasq noresolv when restoring or using default resolvfile; ensure resolvfile is applied 2026-01-23 17:42:05 +05:00
Andrey Petelin
b44274d7f2 fix: mask selector_proxy_links in podkop redaction to hide sensitive proxy selectors 2026-01-23 16:00:34 +05:00
Andrey Petelin
12d8537d90 fix: only print colored timestamp and message when stdout is a terminal 2026-01-23 15:59:26 +05:00
Kirill Sobakin
8e18426a53 Merge pull request #302 from itdoginfo/fix/log_level
fix: set default log_level to "warn" when missing in settings
2026-01-22 19:23:06 +03:00
Andrey Petelin
41a4f67fd0 fix: set default log_level to "warn" when missing in settings 2026-01-22 21:02:15 +05:00
Kirill Sobakin
c30160d8d3 Merge pull request #296 from itdoginfo/firewall-new-mark
New mark and mask
2026-01-22 13:03:36 +03:00
Kirill Sobakin
42f75c3374 fix: new mark 2026-01-22 13:01:36 +03:00
30 changed files with 882 additions and 495 deletions

View File

@@ -0,0 +1,29 @@
name: Close Invalid Issues
on:
issues:
types: [labeled]
jobs:
close-invalid:
if: github.event.label.name == 'Close as invalid'
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Close issue
uses: actions/github-script@v7
with:
script: |
await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body: 'This issue has been marked as invalid and is being closed automatically.'
});
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
state: 'closed'
});

View File

@@ -1,4 +1,4 @@
FROM itdoginfo/openwrt-sdk-apk:09102025
FROM itdoginfo/openwrt-sdk-apk:25.12.3
ARG PODKOP_VERSION
ENV PODKOP_VERSION=${PODKOP_VERSION}
@@ -7,5 +7,5 @@ COPY ./podkop /builder/package/feeds/utilities/podkop
COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop
RUN make defconfig && \
make package/podkop/compile -j1 V=s && \
make package/luci-app-podkop/compile -j1 V=s
make package/podkop/compile -j4 V=s && \
make package/luci-app-podkop/compile -j4 V=s

View File

@@ -1,4 +1,4 @@
FROM itdoginfo/openwrt-sdk-ipk:24.10.3
FROM itdoginfo/openwrt-sdk-ipk:24.10.6
ARG PODKOP_VERSION

View File

@@ -1,61 +1,54 @@
# Вещи, которые вам нужно знать перед установкой
# Podkop
Маршрутизация трафика для OpenWrt.
Направляйте нужные ресурсы в туннель, а остальное — напрямую. Открытое программное обеспечение на базе [sing-box](https://github.com/SagerNet/sing-box).
> [!WARNING]
> Проект находится в стадии бета-версии. Возможны ошибки, нестабильная работа и существенные изменения функциональности.
# Вещи, которые необходимо знать перед установкой
### Обновления и конфигурация
- При обновлении **обязательно** [очищайте кэш LuCI](https://podkop.net/docs/clear-browser-cache/).
- После обновления проверяйте конфигурацию — она может изменяться между версиями.
- При старте Podkop модифицируется конфигурация Dnsmasq.
- Podkop изменяет конфигурацию sing-box. Если вы используете собственную конфигурацию, заранее сохраните её.
### Системные требования
- Требуется OpenWrt 24.10 или выше.
- Необходимо минимум 25 МБ свободного места на устройстве. Устройства с флеш-памятью 16 МБ не поддерживаются.
### Важные ограничения и особенности
- Если установлен Getdomains, его [необходимо удалить](https://github.com/itdoginfo/domain-routing-openwrt?tab=readme-ov-file#скрипт-для-удаления)
- Dashboard доступен только при подключении по HTTP (из-за особенностей Clash API). При использовании HTTPS или домена работа может быть недоступна.
### Поддержка и диагностика
- [Руководство по диагностике](https://podkop.net/docs/diagnostics/)
- Актуальные изменения публикуются в [Telegram-чате](https://t.me/itdogchat/81758/420321). Пожалуйста, ознакомьтесь с закрепленными сообщениями.
- При возникновении проблем оставляйте технически грамотный фидбэк в GitHub Issues и Telegram-чате.
- Это бета-версия, которая находится в активной разработке. Из версии в версию что-то может меняться.
- При возникновении проблем, нужен технически грамотный фидбэк в чат. Ознакомьтесь с закрепом в топике.
- При обновлении **обязательно** [сбрасывайте кэш LuCI](https://podkop.net/docs/clear-browser-cache/).
- Также при обновлении всегда заходите в конфигурацию и проверяйте свои настройки. Конфигурация может измениться.
- Необходимо минимум 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.
- Dashboard доступен, если вы заходите по http (из-за особенностей clash api). И не будет работать, если вы заходите по https и/или домену.
# Документация
https://podkop.net/
# Установка Podkop
Полная информация в [документации](https://podkop.net/docs/install/)
Полное руководство доступно в [документации](https://podkop.net/docs/install/)
Вкратце, достаточно одного скрипта для установки и обновления:
Для установки и обновления достаточно выполнить один скрипт:
```
sh <(wget -O - https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/install.sh)
```
## Изменения 0.7.0
Начиная с версии 0.7.0 изменена структура конфига `/etc/config/podkop`. Старые значения несовместимы с новыми. Нужно заново настроить Podkop.
Скрипт установки обнаружит старую версию и предупредит вас об этом. Если вы согласитесь, то он сделает автоматически написанное ниже.
При обновлении вручную нужно:
0. Не ныть в issue и чатик.
1. Забэкапить старый конфиг:
```
mv /etc/config/podkop /etc/config/podkop-070
```
2. Стянуть новый дефолтный конфиг:
```
wget -O /etc/config/podkop https://raw.githubusercontent.com/itdoginfo/podkop/refs/heads/main/podkop/files/etc/config/podkop
```
3. Настроить заново ваш Podkop через Luci или UCI.
# ToDo
## Будущее
Планы развития проекта в настоящее время не публикуются в виде открытого roadmap. Обсуждение направлений и задач разработки ведётся авторами и контрибьюторами.
> [!IMPORTANT]
> PR принимаются только по issues, у которых стоит label "enhancement". Либо по согласованию с авторами в ТГ-чате. Остальные PR на данный момент не рассматриваются.
> Pull Request принимаются только после согласования с авторами в Telegram-чате. На данный момент PR без предварительного обсуждения не рассматриваются.
## Будущее
- [ ] [Подписка](https://github.com/itdoginfo/podkop/issues/118). Здесь нужна реализация, чтоб для каждой секции помимо ручного выбора, был выбор фильтрации по тегу. Например, для main выбираем ключевые слова NL, DE, FI. А для extra секции фильтруем по RU. И создаётся outbound c urltest в которых перечислены outbound из фильтров.
- [ ] Весь трафик в sing-box и маршрутизация полностью на его уровне.
- [ ] При успешном запуске переходит в фоновый режим и следит за состоянием sing-box. Если вдруг идёт exit 1, выполняется dnsmasq restore и снова следит за состоянием. Вопрос в том, как это искусственно провернуть. Попробовать положить прокси и посмотреть, останется ли работать DNS в этом случае. И здесь, вероятно, можно обойтись триггером в init.d. [Issue](https://github.com/itdoginfo/podkop/issues/111)
- [ ] Галочка, которая режет доступ к doh серверам.
- [ ] IPv6. Только после наполнения Wiki.
## Тесты
- [ ] Unit тесты (BATS)
- [ ] Интеграционные тесты бекенда (OpenWrt rootfs + BATS)
> [!WARNING]
> Данное программное обеспечение предоставляется «как есть», без каких-либо явных или подразумеваемых гарантий, включая гарантии коммерческой пригодности и соответствия определённой цели.
>
> Правообладатели и участники проекта не несут ответственности за любые прямые, косвенные, случайные, специальные или иные убытки, возникшие в результате использования программного обеспечения, включая потерю данных, прибыли или прерывание деятельности, даже если они были предупреждены о возможности таких последствий.
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/itdoginfo/podkop)

63
TRADEMARK.md Normal file
View File

@@ -0,0 +1,63 @@
Trademark Guidelines
Version 1.0 dated May 28, 2026
This trademark policy was prepared to help you understand how to use the Podkop trademarks, service marks, and logos in connection with the Podkop open source project and related software.
While the Podkop software is available under an open source license, that license does not grant permission to use the Podkop trademarks, service marks, or logos. This policy explains acceptable use of the Podkop brand and related marks.
This Policy covers:
1. Our word trademarks and service marks: Podkop
2. Our logos, icons, and other Podkop brand assets
This policy encompasses all trademarks and service marks, whether they are registered or not.
## 1. General Guidelines
Whenever you use one of our marks, you must always do so in a way that does not mislead anyone about what they are getting and from whom. For example, you cannot say you are distributing Podkop software when you are distributing a modified version of it, because recipients may not understand the differences between your modified versions and our own.
You also cannot use our logo on your website in a way that suggests that your website is an official website or that we endorse your website.
You can, however, say that you like the Podkop project, that you participate in the Podkop community, or that you are providing an unmodified version of the Podkop software.
You may not use or register our marks, or variations of them as part of your own trademark, service mark, domain name, company name, trade name, product name or service name.
Trademark law does not allow your use of names or trademarks that are too similar to ours. You therefore may not use an obvious variation of any of our marks or any phonetic equivalent, foreign language equivalent, takeoff, or abbreviation for a similar or compatible product or service. For example, we would consider the following too similar to one of our Marks:
- MyPodkop
- Open-Podkop
- PodkopX
- Podkop Lite
- Podkop Pro
## 2. Acceptable Uses
### Unmodified Code
When you redistribute an unmodified copy of Podkop software, you must not remove any Podkop trademarks, notices, or branding included in the original distribution.
### Modified Code
If you distribute a modified version of Podkop software, you may not use the Podkop name, trademarks, or logos in connection with your modified version, except to accurately describe the origin of the software in factual statements.
You must replace any Podkop branding, including names displayed in user interfaces, logs, documentation, and other user-facing elements, with your own distinct name and branding, so that your modified version is clearly distinguishable from the original Podkop software.
You must remove all Podkop logos and any other brand assets from the modified version.
You may not present your modified version as Podkop or as an official Podkop release, nor may you use the Podkop name in a way that suggests endorsement, affiliation, or official status.
You may only refer to Podkop in a factual and descriptive manner, for example: “This software is derived from Podkop open-source software.”
### Statements about Compatibility
You may use the word marks, exclusively for descriptive and factual purposes, to truthfully and accurately describe the relationship between your software and ours, including compatibility or origin. Any other use may imply that we have certified or approved your software.
### No Domain Names
You must not register any domain that includes our word marks or any variant or combination of them.
## 3. How to Display our Marks
### Use of Trademarks in Text
Always use trademarks in their exact form with correct spelling. They must not be abbreviated, modified, hyphenated, or combined with other words in a way that creates a new product or service name.
Unacceptable: Podcop

65
TRADEMARK_RU.md Normal file
View File

@@ -0,0 +1,65 @@
Руководство по использованию товарных знаков
Версия 1.0 от 28 мая 2026 года
Настоящая политика в отношении товарных знаков подготовлена для того, чтобы помочь вам понять, как использовать товарные знаки, знаки обслуживания и логотипы Podkop в связи с открытым исходным кодом проекта Podkop и связанным программным обеспечением.
Хотя программное обеспечение Podkop распространяется под лицензией с открытым исходным кодом, эта лицензия не предоставляет разрешения на использование товарных знаков Podkop, знаков обслуживания или логотипов. Данная политика объясняет допустимое использование бренда Podkop и связанных обозначений.
Настоящая Политика охватывает:
1. Наши словесные товарные знаки и знаки обслуживания: Podkop
2. Наши логотипы, иконки и другие бренд-активы Podkop
Данная политика распространяется на все товарные знаки и знаки обслуживания, независимо от того, зарегистрированы они или нет.
## 1. Общие рекомендации
При использовании любого из наших знаков вы всегда должны делать это таким образом, чтобы никого не вводить в заблуждение относительно того, что именно они получают и от кого. Например, вы не можете утверждать, что распространяете программное обеспечение Podkop, если вы распространяете его модифицированную версию, поскольку получатели могут не понимать различий между вашей модифицированной версией и нашей оригинальной.
Вы также не можете использовать наш логотип на своём сайте таким образом, чтобы это создавало впечатление, что ваш сайт является официальным сайтом или что мы одобряем ваш сайт.
Однако вы можете указывать, что вам нравится проект Podkop, что вы участвуете в сообществе Podkop или что вы распространяете немодифицированную версию программного обеспечения Podkop.
Вы не имеете права использовать или регистрировать наши знаки, а также их вариации, как часть вашего собственного товарного знака, знака обслуживания, доменного имени, названия компании, коммерческого наименования, названия продукта или услуги.
Закон о товарных знаках не допускает использование названий или знаков, которые слишком похожи на наши. Поэтому вы не можете использовать очевидные вариации наших знаков или любые фонетически, иностранно-языковые эквиваленты, производные, аббревиатуры для похожего или совместимого продукта или услуги. Например, мы считаем слишком похожими на наши знаки следующие варианты:
- MyPodkop
- Open-Podkop
- PodkopX
- Podkop Lite
- Podkop Pro
## 2. Допустимое использование
### Немодифицированный код
При распространении немодифицированной копии программного обеспечения Podkop вы не должны удалять товарные знаки, уведомления или брендинг Podkop, включённые в исходное распространение.
### Модифицированный код
Если вы распространяете модифицированную версию программного обеспечения Podkop, вы не можете использовать название Podkop, товарные знаки или логотипы в связи с вашей модифицированной версией, за исключением точного описания происхождения программного обеспечения в фактических утверждениях.
Вы обязаны заменить все элементы брендинга Podkop, включая названия, отображаемые в пользовательском интерфейсе, логах, документации и других пользовательских элементах, на собственное отличительное название и брендинг, чтобы ваша модифицированная версия была явно отличима от оригинального программного обеспечения Podkop.
Вы должны удалить все логотипы Podkop и любые другие бренд-материалы из модифицированной версии.
Вы не можете представлять вашу модифицированную версию как Podkop или как официальную версию Podkop, а также использовать название Podkop таким образом, чтобы это подразумевало одобрение, аффилированность или официальный статус.
Вы можете ссылаться на Podkop только в фактическом и описательном контексте, например: «Это программное обеспечение основано на программном обеспечении Podkop с открытым исходным кодом».
### Упоминания о совместимости
Вы можете использовать словесные знаки исключительно в описательных и фактических целях для правдивого и точного описания связи вашего программного обеспечения с нашим, включая совместимость или происхождение. Любое другое использование может создавать впечатление, что мы сертифицировали или одобрили ваше программное обеспечение.
### Запрет на доменные имена
Вы не должны регистрировать доменные имена, содержащие наши словесные знаки или любые их варианты или комбинации.
## 3. Как отображать наши знаки
### Использование товарных знаков в тексте
Всегда используйте товарные знаки в их точной форме с корректным написанием. Их нельзя сокращать, изменять, соединять дефисами или объединять с другими словами таким образом, чтобы это создавало новое название продукта или услуги.
Недопустимо: Podcop

View File

@@ -52,21 +52,21 @@
"call": "Applicable for SOCKS and Shadowsocks proxy",
"key": "Applicable for SOCKS and Shadowsocks proxy",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:198"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:199"
]
},
{
"call": "At least one valid domain must be specified. Comments-only content is not allowed.",
"key": "At least one valid domain must be specified. Comments-only content is not allowed.",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:443"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:444"
]
},
{
"call": "At least one valid subnet or IP must be specified. Comments-only content is not allowed.",
"key": "At least one valid subnet or IP must be specified. Comments-only content is not allowed.",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:524"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:525"
]
},
{
@@ -178,7 +178,7 @@
"call": "Community Lists",
"key": "Community Lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:298"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:299"
]
},
{
@@ -199,7 +199,7 @@
"call": "Configuration Type",
"key": "Configuration Type",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:22"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:23"
]
},
{
@@ -213,7 +213,7 @@
"call": "Connection URL",
"key": "Connection URL",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:25"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:26"
]
},
{
@@ -297,8 +297,8 @@
"call": "Disabled",
"key": "Disabled",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:389",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:469"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:390",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:470"
]
},
{
@@ -312,7 +312,7 @@
"call": "DNS over HTTPS (DoH)",
"key": "DNS over HTTPS (DoH)",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:266",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:267",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:15"
]
},
@@ -320,7 +320,7 @@
"call": "DNS over TLS (DoT)",
"key": "DNS over TLS (DoT)",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:267",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:268",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:16"
]
},
@@ -328,7 +328,7 @@
"call": "DNS Protocol Type",
"key": "DNS Protocol Type",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:263",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:264",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:12"
]
},
@@ -343,7 +343,7 @@
"call": "DNS Server",
"key": "DNS Server",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:276",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:277",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:24"
]
},
@@ -365,7 +365,7 @@
"call": "Domain Resolver",
"key": "Domain Resolver",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:253"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:254"
]
},
{
@@ -416,8 +416,8 @@
"call": "Dynamic List",
"key": "Dynamic List",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:390",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:470"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:391",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:471"
]
},
{
@@ -431,14 +431,21 @@
"call": "Enable built-in DNS resolver for domains handled by this section",
"key": "Enable built-in DNS resolver for domains handled by this section",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:254"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:255"
]
},
{
"call": "Enable DNS resolve to get real IP when routing",
"key": "Enable DNS resolve to get real IP when routing",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:691"
]
},
{
"call": "Enable Mixed Proxy",
"key": "Enable Mixed Proxy",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:662"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:665"
]
},
{
@@ -452,7 +459,7 @@
"call": "Enable the mixed proxy, allowing this section to route traffic through both HTTP and SOCKS proxies",
"key": "Enable the mixed proxy, allowing this section to route traffic through both HTTP and SOCKS proxies",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:663"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:666"
]
},
{
@@ -473,56 +480,56 @@
"call": "Enter complete outbound configuration in JSON format",
"key": "Enter complete outbound configuration in JSON format",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:65"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:66"
]
},
{
"call": "Enter domain names separated by commas, spaces, or newlines. You can add comments using //",
"key": "Enter domain names separated by commas, spaces, or newlines. You can add comments using //",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:425"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:426"
]
},
{
"call": "Enter domain names without protocols, e.g. example.com or sub.example.com",
"key": "Enter domain names without protocols, e.g. example.com or sub.example.com",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:399"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:400"
]
},
{
"call": "Enter subnets in CIDR notation (e.g. 103.21.244.0/22) or single IP addresses",
"key": "Enter subnets in CIDR notation (e.g. 103.21.244.0/22) or single IP addresses",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:479"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:480"
]
},
{
"call": "Every 1 minute",
"key": "Every 1 minute",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:137"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:138"
]
},
{
"call": "Every 3 minutes",
"key": "Every 3 minutes",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:138"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:139"
]
},
{
"call": "Every 30 seconds",
"key": "Every 30 seconds",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:136"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:137"
]
},
{
"call": "Every 5 minutes",
"key": "Every 5 minutes",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:139"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:140"
]
},
{
@@ -554,15 +561,15 @@
"src/podkop/tabs/diagnostic/initController.ts:231",
"src/podkop/tabs/diagnostic/initController.ts:261",
"src/podkop/tabs/diagnostic/initController.ts:265",
"src/podkop/tabs/diagnostic/initController.ts:299",
"src/podkop/tabs/diagnostic/initController.ts:303"
"src/podkop/tabs/diagnostic/initController.ts:302",
"src/podkop/tabs/diagnostic/initController.ts:306"
]
},
{
"call": "Fastest",
"key": "Fastest",
"places": [
"src/podkop/methods/custom/getDashboardSections.ts:117",
"src/podkop/methods/custom/getDashboardSections.ts:148",
"src/podkop/tabs/diagnostic/checks/runSectionsCheck.ts:59"
]
},
@@ -570,7 +577,7 @@
"call": "Fully Routed IPs",
"key": "Fully Routed IPs",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:637"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:638"
]
},
{
@@ -641,56 +648,56 @@
"call": "Invalid HY2 URL: insecure must be 0 or 1",
"key": "Invalid HY2 URL: insecure must be 0 or 1",
"places": [
"src/validators/validateHysteriaUrl.ts:76"
"src/validators/validateHysteriaUrl.ts:90"
]
},
{
"call": "Invalid HY2 URL: invalid port number",
"key": "Invalid HY2 URL: invalid port number",
"places": [
"src/validators/validateHysteriaUrl.ts:62"
"src/validators/validateHysteriaUrl.ts:77"
]
},
{
"call": "Invalid HY2 URL: missing credentials/server",
"key": "Invalid HY2 URL: missing credentials/server",
"places": [
"src/validators/validateHysteriaUrl.ts:32"
"src/validators/validateHysteriaUrl.ts:30"
]
},
{
"call": "Invalid HY2 URL: missing host",
"key": "Invalid HY2 URL: missing host",
"places": [
"src/validators/validateHysteriaUrl.ts:49"
"src/validators/validateHysteriaUrl.ts:47"
]
},
{
"call": "Invalid HY2 URL: missing host & port",
"key": "Invalid HY2 URL: missing host & port",
"places": [
"src/validators/validateHysteriaUrl.ts:43"
"src/validators/validateHysteriaUrl.ts:41"
]
},
{
"call": "Invalid HY2 URL: missing password",
"key": "Invalid HY2 URL: missing password",
"places": [
"src/validators/validateHysteriaUrl.ts:38"
"src/validators/validateHysteriaUrl.ts:36"
]
},
{
"call": "Invalid HY2 URL: missing port",
"key": "Invalid HY2 URL: missing port",
"places": [
"src/validators/validateHysteriaUrl.ts:53"
"src/validators/validateHysteriaUrl.ts:50"
]
},
{
"call": "Invalid HY2 URL: must not contain spaces",
"key": "Invalid HY2 URL: must not contain spaces",
"places": [
"src/validators/validateHysteriaUrl.ts:19"
"src/validators/validateHysteriaUrl.ts:18"
]
},
{
@@ -704,28 +711,28 @@
"call": "Invalid HY2 URL: obfs-password required when obfs is set",
"key": "Invalid HY2 URL: obfs-password required when obfs is set",
"places": [
"src/validators/validateHysteriaUrl.ts:99"
"src/validators/validateHysteriaUrl.ts:108"
]
},
{
"call": "Invalid HY2 URL: parsing failed",
"key": "Invalid HY2 URL: parsing failed",
"places": [
"src/validators/validateHysteriaUrl.ts:115"
"src/validators/validateHysteriaUrl.ts:122"
]
},
{
"call": "Invalid HY2 URL: sni cannot be empty",
"key": "Invalid HY2 URL: sni cannot be empty",
"places": [
"src/validators/validateHysteriaUrl.ts:108"
"src/validators/validateHysteriaUrl.ts:116"
]
},
{
"call": "Invalid HY2 URL: unsupported obfs type",
"key": "Invalid HY2 URL: unsupported obfs type",
"places": [
"src/validators/validateHysteriaUrl.ts:88"
"src/validators/validateHysteriaUrl.ts:98"
]
},
{
@@ -936,7 +943,7 @@
"call": "Latest",
"key": "Latest",
"places": [
"src/podkop/tabs/diagnostic/initController.ts:453"
"src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:48"
]
},
{
@@ -950,14 +957,14 @@
"call": "Local Domain Lists",
"key": "Local Domain Lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:545"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:546"
]
},
{
"call": "Local Subnet Lists",
"key": "Local Subnet Lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:568"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:569"
]
},
{
@@ -985,7 +992,7 @@
"call": "Mixed Proxy Port",
"key": "Mixed Proxy Port",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:673"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:678"
]
},
{
@@ -999,14 +1006,14 @@
"call": "Must be a number in the range of 50 - 1000",
"key": "Must be a number in the range of 50 - 1000",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:163"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:164"
]
},
{
"call": "Network Interface",
"key": "Network Interface",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:207"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:208"
]
},
{
@@ -1054,21 +1061,21 @@
"call": "Outbound Config",
"key": "Outbound Config",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:28"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:29"
]
},
{
"call": "Outbound Configuration",
"key": "Outbound Configuration",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:64"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:65"
]
},
{
"call": "Outdated",
"key": "Outdated",
"places": [
"src/podkop/tabs/diagnostic/initController.ts:443"
"src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:38"
]
},
{
@@ -1142,7 +1149,7 @@
"call": "Proxy Configuration URL",
"key": "Proxy Configuration URL",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:35"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36"
]
},
{
@@ -1163,21 +1170,28 @@
"call": "Regional options cannot be used together",
"key": "Regional options cannot be used together",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:332"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:333"
]
},
{
"call": "Remote Domain Lists",
"key": "Remote Domain Lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:591"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:592"
]
},
{
"call": "Remote Subnet Lists",
"key": "Remote Subnet Lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:614"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:615"
]
},
{
"call": "Resolve real IP for routing",
"key": "Resolve real IP for routing",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:690"
]
},
{
@@ -1261,7 +1275,7 @@
"call": "Russia inside restrictions",
"key": "Russia inside restrictions",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:351"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:352"
]
},
{
@@ -1282,7 +1296,7 @@
"call": "Select a predefined list for routing",
"key": "Select a predefined list for routing",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:299"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:300"
]
},
{
@@ -1310,21 +1324,21 @@
"call": "Select how to configure the proxy",
"key": "Select how to configure the proxy",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:23"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:24"
]
},
{
"call": "Select network interface for VPN connection",
"key": "Select network interface for VPN connection",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:208"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:209"
]
},
{
"call": "Select or enter DNS server address",
"key": "Select or enter DNS server address",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:277",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:278",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:25"
]
},
@@ -1346,21 +1360,21 @@
"call": "Select the DNS protocol type for the domain resolver",
"key": "Select the DNS protocol type for the domain resolver",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:264"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:265"
]
},
{
"call": "Select the list type for adding custom domains",
"key": "Select the list type for adding custom domains",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:387"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:388"
]
},
{
"call": "Select the list type for adding custom subnets",
"key": "Select the list type for adding custom subnets",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:467"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:468"
]
},
{
@@ -1395,14 +1409,14 @@
"call": "Selector",
"key": "Selector",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:26"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:27"
]
},
{
"call": "Selector Proxy Links",
"key": "Selector Proxy Links",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:87"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88"
]
},
{
@@ -1494,29 +1508,29 @@
"call": "Specify local IP addresses or subnets whose traffic will always be routed through the configured route",
"key": "Specify local IP addresses or subnets whose traffic will always be routed through the configured route",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:638"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:639"
]
},
{
"call": "Specify remote URLs to download and use domain lists",
"key": "Specify remote URLs to download and use domain lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:592"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:593"
]
},
{
"call": "Specify remote URLs to download and use subnet lists",
"key": "Specify remote URLs to download and use subnet lists",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:615"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:616"
]
},
{
"call": "Specify the path to the list file located on the router filesystem",
"key": "Specify the path to the list file located on the router filesystem",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:546",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:569"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:547",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:570"
]
},
{
@@ -1572,8 +1586,8 @@
"call": "Text List",
"key": "Text List",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:391",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:471"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:392",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:472"
]
},
{
@@ -1587,21 +1601,21 @@
"call": "The interval between connectivity tests",
"key": "The interval between connectivity tests",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:134"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:135"
]
},
{
"call": "The maximum difference in response times (ms) allowed when comparing servers",
"key": "The maximum difference in response times (ms) allowed when comparing servers",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:147"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:148"
]
},
{
"call": "The URL used to test server connectivity",
"key": "The URL used to test server connectivity",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:170"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:171"
]
},
{
@@ -1650,7 +1664,7 @@
"call": "UDP (Unprotected DNS)",
"key": "UDP (Unprotected DNS)",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:268",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:269",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:17"
]
},
@@ -1658,7 +1672,7 @@
"call": "UDP over TCP",
"key": "UDP over TCP",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:197"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:198"
]
},
{
@@ -1671,7 +1685,7 @@
"src/podkop/tabs/diagnostic/initController.ts:41",
"src/podkop/tabs/diagnostic/initController.ts:42",
"src/podkop/tabs/diagnostic/initController.ts:43",
"src/podkop/tabs/diagnostic/initController.ts:417"
"src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:7"
]
},
{
@@ -1707,77 +1721,77 @@
"call": "URLTest",
"key": "URLTest",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:27"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:28"
]
},
{
"call": "URLTest Check Interval",
"key": "URLTest Check Interval",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:133"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:134"
]
},
{
"call": "URLTest Proxy Links",
"key": "URLTest Proxy Links",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:110"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111"
]
},
{
"call": "URLTest Testing URL",
"key": "URLTest Testing URL",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:169"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:170"
]
},
{
"call": "URLTest Tolerance",
"key": "URLTest Tolerance",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:146"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:147"
]
},
{
"call": "User Domain List Type",
"key": "User Domain List Type",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:386"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:387"
]
},
{
"call": "User Domains",
"key": "User Domains",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:398"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:399"
]
},
{
"call": "User Domains List",
"key": "User Domains List",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:424"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:425"
]
},
{
"call": "User Subnet List Type",
"key": "User Subnet List Type",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:466"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:467"
]
},
{
"call": "User Subnets",
"key": "User Subnets",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:478"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:479"
]
},
{
"call": "User Subnets List",
"key": "User Subnets List",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:504"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:505"
]
},
{
@@ -1788,7 +1802,7 @@
"src/validators/validateDns.ts:18",
"src/validators/validateDomain.ts:13",
"src/validators/validateDomain.ts:30",
"src/validators/validateHysteriaUrl.ts:113",
"src/validators/validateHysteriaUrl.ts:120",
"src/validators/validateIp.ts:8",
"src/validators/validateOutboundJson.ts:7",
"src/validators/validatePath.ts:16",
@@ -1804,8 +1818,8 @@
"call": "Validation errors:",
"key": "Validation errors:",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:457",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:536"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:458",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:537"
]
},
{
@@ -1827,23 +1841,23 @@
"call": "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links",
"key": "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:37",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:89",
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:112"
]
},
{
"call": "Warning: %s cannot be used together with %s. Previous selections have been removed.",
"key": "Warning: %s cannot be used together with %s. Previous selections have been removed.",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:334"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:335"
]
},
{
"call": "Warning: Russia inside can only be used with %s. %s already in Russia inside and have been removed from selection.",
"key": "Warning: Russia inside can only be used with %s. %s already in Russia inside and have been removed from selection.",
"places": [
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:353"
"../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:354"
]
},
{

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-01-14 18:21+0200\n"
"PO-Revision-Date: 2026-01-14 18:21+0200\n"
"POT-Creation-Date: 2026-05-29 13:40+0300\n"
"PO-Revision-Date: 2026-05-29 13:40+0300\n"
"Last-Translator: divocatt <210179590+divocatt@users.noreply.github.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -44,15 +44,15 @@ msgstr ""
msgid "Allows access to YACD from the WAN. Make sure to open the appropriate port in your firewall."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:198
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:199
msgid "Applicable for SOCKS and Shadowsocks proxy"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:443
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:444
msgid "At least one valid domain must be specified. Comments-only content is not allowed."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:524
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:525
msgid "At least one valid subnet or IP must be specified. Comments-only content is not allowed."
msgstr ""
@@ -119,7 +119,7 @@ msgstr ""
msgid "Close"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:298
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:299
msgid "Community Lists"
msgstr ""
@@ -131,7 +131,7 @@ msgstr ""
msgid "Configuration for Podkop service"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:22
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:23
msgid "Configuration Type"
msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
msgid "Connection Type"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:25
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:26
msgid "Connection URL"
msgstr ""
@@ -187,8 +187,8 @@ msgstr ""
msgid "Disable the QUIC protocol to improve compatibility or fix issues with video streaming"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:389
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:469
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:390
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:470
msgid "Disabled"
msgstr ""
@@ -196,17 +196,17 @@ msgstr ""
msgid "DNS on router"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:266
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:267
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:15
msgid "DNS over HTTPS (DoH)"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:267
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:268
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:16
msgid "DNS over TLS (DoT)"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:263
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:264
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:12
msgid "DNS Protocol Type"
msgstr ""
@@ -215,7 +215,7 @@ msgstr ""
msgid "DNS Rewrite TTL"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:276
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:277
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:24
msgid "DNS Server"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "Do not panic, everything can be fixed, just..."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:253
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:254
msgid "Domain Resolver"
msgstr ""
@@ -258,8 +258,8 @@ msgstr ""
msgid "Downloading all lists via specific Proxy/VPN"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:390
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:470
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:391
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:471
msgid "Dynamic List"
msgstr ""
@@ -267,11 +267,15 @@ msgstr ""
msgid "Enable autostart"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:254
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:255
msgid "Enable built-in DNS resolver for domains handled by this section"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:662
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:691
msgid "Enable DNS resolve to get real IP when routing"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:665
msgid "Enable Mixed Proxy"
msgstr ""
@@ -279,7 +283,7 @@ msgstr ""
msgid "Enable Output Network Interface"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:663
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:666
msgid "Enable the mixed proxy, allowing this section to route traffic through both HTTP and SOCKS proxies"
msgstr ""
@@ -291,35 +295,35 @@ msgstr ""
msgid "Enable YACD WAN Access"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:65
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:66
msgid "Enter complete outbound configuration in JSON format"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:425
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:426
msgid "Enter domain names separated by commas, spaces, or newlines. You can add comments using //"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:399
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:400
msgid "Enter domain names without protocols, e.g. example.com or sub.example.com"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:479
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:480
msgid "Enter subnets in CIDR notation (e.g. 103.21.244.0/22) or single IP addresses"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:137
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:138
msgid "Every 1 minute"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:138
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:139
msgid "Every 3 minutes"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:136
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:137
msgid "Every 30 seconds"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:139
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:140
msgid "Every 5 minutes"
msgstr ""
@@ -339,17 +343,17 @@ msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:231
#: src/podkop/tabs/diagnostic/initController.ts:261
#: src/podkop/tabs/diagnostic/initController.ts:265
#: src/podkop/tabs/diagnostic/initController.ts:299
#: src/podkop/tabs/diagnostic/initController.ts:303
#: src/podkop/tabs/diagnostic/initController.ts:302
#: src/podkop/tabs/diagnostic/initController.ts:306
msgid "Failed to execute!"
msgstr ""
#: src/podkop/methods/custom/getDashboardSections.ts:117
#: src/podkop/methods/custom/getDashboardSections.ts:148
#: src/podkop/tabs/diagnostic/checks/runSectionsCheck.ts:59
msgid "Fastest"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:637
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:638
msgid "Fully Routed IPs"
msgstr ""
@@ -390,35 +394,35 @@ msgstr ""
msgid "Invalid format. Use X.X.X.X or X.X.X.X/Y"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:76
#: src/validators/validateHysteriaUrl.ts:90
msgid "Invalid HY2 URL: insecure must be 0 or 1"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:62
#: src/validators/validateHysteriaUrl.ts:77
msgid "Invalid HY2 URL: invalid port number"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:32
#: src/validators/validateHysteriaUrl.ts:30
msgid "Invalid HY2 URL: missing credentials/server"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:49
#: src/validators/validateHysteriaUrl.ts:47
msgid "Invalid HY2 URL: missing host"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:43
#: src/validators/validateHysteriaUrl.ts:41
msgid "Invalid HY2 URL: missing host & port"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:38
#: src/validators/validateHysteriaUrl.ts:36
msgid "Invalid HY2 URL: missing password"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:53
#: src/validators/validateHysteriaUrl.ts:50
msgid "Invalid HY2 URL: missing port"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:19
#: src/validators/validateHysteriaUrl.ts:18
msgid "Invalid HY2 URL: must not contain spaces"
msgstr ""
@@ -426,19 +430,19 @@ msgstr ""
msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:99
#: src/validators/validateHysteriaUrl.ts:108
msgid "Invalid HY2 URL: obfs-password required when obfs is set"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:115
#: src/validators/validateHysteriaUrl.ts:122
msgid "Invalid HY2 URL: parsing failed"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:108
#: src/validators/validateHysteriaUrl.ts:116
msgid "Invalid HY2 URL: sni cannot be empty"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:88
#: src/validators/validateHysteriaUrl.ts:98
msgid "Invalid HY2 URL: unsupported obfs type"
msgstr ""
@@ -559,7 +563,7 @@ msgstr ""
msgid "Issues detected"
msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:453
#: src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:48
msgid "Latest"
msgstr ""
@@ -567,11 +571,11 @@ msgstr ""
msgid "List Update Frequency"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:545
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:546
msgid "Local Domain Lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:568
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:569
msgid "Local Subnet Lists"
msgstr ""
@@ -587,7 +591,7 @@ msgstr ""
msgid "Memory Usage"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:673
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:678
msgid "Mixed Proxy Port"
msgstr ""
@@ -595,11 +599,11 @@ msgstr ""
msgid "Monitored Interfaces"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:163
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:164
msgid "Must be a number in the range of 50 - 1000"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:207
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:208
msgid "Network Interface"
msgstr ""
@@ -629,15 +633,15 @@ msgstr ""
msgid "Operation timed out"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:28
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:29
msgid "Outbound Config"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:64
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:65
msgid "Outbound Configuration"
msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:443
#: src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:38
msgid "Outdated"
msgstr ""
@@ -681,7 +685,7 @@ msgstr ""
msgid "Podkop will not modify your DHCP configuration"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:35
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36
msgid "Proxy Configuration URL"
msgstr ""
@@ -693,18 +697,22 @@ msgstr ""
msgid "Proxy traffic is routed via FakeIP"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:332
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:333
msgid "Regional options cannot be used together"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:591
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:592
msgid "Remote Domain Lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:614
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:615
msgid "Remote Subnet Lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:690
msgid "Resolve real IP for routing"
msgstr ""
#: src/podkop/tabs/diagnostic/partials/renderAvailableActions.ts:49
msgid "Restart podkop"
msgstr ""
@@ -749,7 +757,7 @@ msgstr ""
msgid "Run Diagnostic"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:351
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:352
msgid "Russia inside restrictions"
msgstr ""
@@ -761,7 +769,7 @@ msgstr ""
msgid "Sections"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:299
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:300
msgid "Select a predefined list for routing"
msgstr ""
@@ -777,15 +785,15 @@ msgstr ""
msgid "Select how often the domain or subnet lists are updated automatically"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:23
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:24
msgid "Select how to configure the proxy"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:208
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:209
msgid "Select network interface for VPN connection"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:277
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:278
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:25
msgid "Select or enter DNS server address"
msgstr ""
@@ -798,15 +806,15 @@ msgstr ""
msgid "Select path for sing-box config file. Change this ONLY if you know what you are doing"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:264
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:265
msgid "Select the DNS protocol type for the domain resolver"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:387
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:388
msgid "Select the list type for adding custom domains"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:467
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:468
msgid "Select the list type for adding custom subnets"
msgstr ""
@@ -826,11 +834,11 @@ msgstr ""
msgid "Select the WAN interfaces to be monitored"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:26
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:27
msgid "Selector"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:87
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88
msgid "Selector Proxy Links"
msgstr ""
@@ -883,20 +891,20 @@ msgstr ""
msgid "Specify a local IP address to be excluded from routing"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:638
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:639
msgid "Specify local IP addresses or subnets whose traffic will always be routed through the configured route"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:592
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:593
msgid "Specify remote URLs to download and use domain lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:615
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:616
msgid "Specify remote URLs to download and use subnet lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:546
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:569
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:547
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:570
msgid "Specify the path to the list file located on the router filesystem"
msgstr ""
@@ -928,8 +936,8 @@ msgstr ""
msgid "Test latency"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:391
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:471
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:392
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:472
msgid "Text List"
msgstr ""
@@ -937,15 +945,15 @@ msgstr ""
msgid "The DNS server used to look up the IP address of an upstream DNS server"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:134
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:135
msgid "The interval between connectivity tests"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:147
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:148
msgid "The maximum difference in response times (ms) allowed when comparing servers"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:170
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:171
msgid "The URL used to test server connectivity"
msgstr ""
@@ -973,12 +981,12 @@ msgstr ""
msgid "TTL value cannot be empty"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:268
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:269
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:17
msgid "UDP (Unprotected DNS)"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:197
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:198
msgid "UDP over TCP"
msgstr ""
@@ -988,7 +996,7 @@ msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:41
#: src/podkop/tabs/diagnostic/initController.ts:42
#: src/podkop/tabs/diagnostic/initController.ts:43
#: src/podkop/tabs/diagnostic/initController.ts:417
#: src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:7
msgid "unknown"
msgstr ""
@@ -1009,47 +1017,47 @@ msgstr ""
msgid "URL must use one of the following protocols:"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:27
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:28
msgid "URLTest"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:133
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:134
msgid "URLTest Check Interval"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:110
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111
msgid "URLTest Proxy Links"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:169
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:170
msgid "URLTest Testing URL"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:146
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:147
msgid "URLTest Tolerance"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:386
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:387
msgid "User Domain List Type"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:398
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:399
msgid "User Domains"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:424
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:425
msgid "User Domains List"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:466
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:467
msgid "User Subnet List Type"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:478
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:479
msgid "User Subnets"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:504
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:505
msgid "User Subnets List"
msgstr ""
@@ -1057,7 +1065,7 @@ msgstr ""
#: src/validators/validateDns.ts:18
#: src/validators/validateDomain.ts:13
#: src/validators/validateDomain.ts:30
#: src/validators/validateHysteriaUrl.ts:113
#: src/validators/validateHysteriaUrl.ts:120
#: src/validators/validateIp.ts:8
#: src/validators/validateOutboundJson.ts:7
#: src/validators/validatePath.ts:16
@@ -1070,8 +1078,8 @@ msgstr ""
msgid "Valid"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:457
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:536
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:458
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:537
msgid "Validation errors:"
msgstr ""
@@ -1084,17 +1092,17 @@ msgstr ""
msgid "Visit Wiki"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:37
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:89
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:112
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:334
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:335
msgid "Warning: %s cannot be used together with %s. Previous selections have been removed."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:353
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:354
msgid "Warning: Russia inside can only be used with %s. %s already in Russia inside and have been removed from selection."
msgstr ""

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-01-14 20:21+0200\n"
"PO-Revision-Date: 2026-01-14 20:21+0200\n"
"POT-Creation-Date: 2026-05-29 16:40+0300\n"
"PO-Revision-Date: 2026-05-29 16:40+0300\n"
"Last-Translator: divocatt\n"
"Language-Team: none\n"
"Language: ru\n"
@@ -197,6 +197,9 @@ msgstr "Включить автостарт"
msgid "Enable built-in DNS resolver for domains handled by this section"
msgstr "Включить встроенный DNS-резолвер для доменов, обрабатываемых в этом разделе"
msgid "Enable DNS resolve to get real IP when routing"
msgstr "Разрешать домены в реальные IP-адреса перед маршрутизацией в outbound"
msgid "Enable Mixed Proxy"
msgstr "Включить смешанный прокси"
@@ -509,6 +512,9 @@ msgstr "Внешние списки доменов"
msgid "Remote Subnet Lists"
msgstr "Внешние списки подсетей"
msgid "Resolve real IP for routing"
msgstr "Разрешение реальных IP-адресов"
msgid "Restart podkop"
msgstr "Перезапустить Podkop"

View File

@@ -0,0 +1,3 @@
export function removeVersionPrefix(version: string) {
return version.replace(/^v/, '');
}

View File

@@ -29,7 +29,9 @@ export async function getDashboardSections(): Promise<IGetDashboardSectionsRespo
const data = configSections
.filter(
(section) =>
section.connection_type !== 'block' && section['.type'] !== 'settings',
section.connection_type !== 'block' &&
section.connection_type !== 'exclusion' &&
section['.type'] !== 'settings',
)
.map((section) => {
if (section.connection_type === 'proxy') {

View File

@@ -0,0 +1,52 @@
import { normalizeCompiledVersion } from '../../../../helpers/normalizeCompiledVersion';
import { removeVersionPrefix } from '../../../../helpers/removeVersionPrefix';
import type { StoreType } from '../../../services/store.service';
import type { IRenderSystemInfoRow } from '../partials';
function isUnknownVersion(version?: string | null): boolean {
return version === 'unknown' || version === _('unknown');
}
export function getPodkopVersionRow(
diagnosticsSystemInfo: StoreType['diagnosticsSystemInfo'],
): IRenderSystemInfoRow {
const loading = diagnosticsSystemInfo.loading;
const unknown = isUnknownVersion(diagnosticsSystemInfo.podkop_version);
const hasActualVersion =
Boolean(diagnosticsSystemInfo.podkop_latest_version) &&
!isUnknownVersion(diagnosticsSystemInfo.podkop_latest_version);
const version = normalizeCompiledVersion(
diagnosticsSystemInfo.podkop_version,
);
const isDevVersion = version === 'dev';
if (loading || unknown || !hasActualVersion || isDevVersion) {
return {
key: 'Podkop',
value: version,
};
}
if (
removeVersionPrefix(version) !==
removeVersionPrefix(diagnosticsSystemInfo.podkop_latest_version)
) {
return {
key: 'Podkop',
value: version,
tag: {
label: _('Outdated'),
kind: 'warning',
},
};
}
return {
key: 'Podkop',
value: version,
tag: {
label: _('Latest'),
kind: 'success',
},
};
}

View File

@@ -6,7 +6,6 @@ import { runFakeIPCheck } from './checks/runFakeIPCheck';
import { loadingDiagnosticsChecksStore } from './diagnostic.store';
import { logger, store, StoreType } from '../../services';
import {
IRenderSystemInfoRow,
renderAvailableActions,
renderCheckSection,
renderRunAction,
@@ -20,6 +19,7 @@ import { PODKOP_LUCI_APP_VERSION } from '../../../constants';
import { showToast } from '../../../helpers/showToast';
import { renderWikiDisclaimer } from './partials/renderWikiDisclaimer';
import { runSectionsCheck } from './checks/runSectionsCheck';
import { getPodkopVersionRow } from './helpers/getPodkopVersionRow';
async function fetchSystemInfo() {
const systemInfo = await PodkopShellMethods.getSystemInfo();
@@ -288,7 +288,10 @@ async function handleShowSingBoxConfig() {
if (showSingBoxConfig.success) {
ui.showModal(
_('Show sing-box config'),
renderModal(showSingBoxConfig.data as string, 'show_sing_box_config'),
renderModal(
JSON.stringify(showSingBoxConfig.data, null, 2),
'show_sing_box_config',
),
);
} else {
logger.error(
@@ -412,53 +415,9 @@ function renderDiagnosticSystemInfoWidget() {
const container = document.getElementById('pdk_diagnostic-page-system-info');
function getPodkopVersionRow(): IRenderSystemInfoRow {
const loading = diagnosticsSystemInfo.loading;
const unknown = diagnosticsSystemInfo.podkop_version === _('unknown');
const hasActualVersion =
Boolean(diagnosticsSystemInfo.podkop_latest_version) &&
diagnosticsSystemInfo.podkop_latest_version !== 'unknown';
const version = normalizeCompiledVersion(
diagnosticsSystemInfo.podkop_version,
);
const isDevVersion = version === 'dev';
if (loading || unknown || !hasActualVersion || isDevVersion) {
return {
key: 'Podkop',
value: version,
};
}
if (version !== `v${diagnosticsSystemInfo.podkop_latest_version}`) {
logger.debug(
'[DIAGNOSTIC]',
'diagnosticsSystemInfo',
diagnosticsSystemInfo,
);
return {
key: 'Podkop',
value: version,
tag: {
label: _('Outdated'),
kind: 'warning',
},
};
}
return {
key: 'Podkop',
value: version,
tag: {
label: _('Latest'),
kind: 'success',
},
};
}
const renderedSystemInfo = renderSystemInfo({
items: [
getPodkopVersionRow(),
getPodkopVersionRow(diagnosticsSystemInfo),
{
key: 'Luci App',
value: normalizeCompiledVersion(PODKOP_LUCI_APP_VERSION),

View File

@@ -0,0 +1,69 @@
import { describe, expect, it } from 'vitest';
import { getPodkopVersionRow } from '../helpers/getPodkopVersionRow';
import type { StoreType } from '../../../services/store.service';
function makeDiagnosticsSystemInfo(
patch: Partial<StoreType['diagnosticsSystemInfo']> = {},
): StoreType['diagnosticsSystemInfo'] {
return {
loading: false,
podkop_version: '1.2.3',
podkop_latest_version: '1.2.3',
luci_app_version: '1.0.0',
sing_box_version: '1.11.0',
openwrt_version: 'OpenWrt 25.12',
device_model: 'Test Router',
...patch,
};
}
describe('getPodkopVersionRow', () => {
it('returns Latest when versions differ only by leading v', () => {
const row = getPodkopVersionRow(
makeDiagnosticsSystemInfo({
podkop_version: 'v1.2.3',
podkop_latest_version: '1.2.3',
}),
);
expect(row).toEqual({
key: 'Podkop',
value: 'v1.2.3',
tag: {
label: 'Latest',
kind: 'success',
},
});
});
it('returns Outdated when versions differ', () => {
const row = getPodkopVersionRow(
makeDiagnosticsSystemInfo({
podkop_version: '1.2.2',
podkop_latest_version: '1.2.3',
}),
);
expect(row).toEqual({
key: 'Podkop',
value: '1.2.2',
tag: {
label: 'Outdated',
kind: 'warning',
},
});
});
it('returns plain row without tag for dev build', () => {
const row = getPodkopVersionRow(
makeDiagnosticsSystemInfo({
podkop_version: 'COMPILED_VERSION',
}),
);
expect(row).toEqual({
key: 'Podkop',
value: 'dev',
});
});
});

View File

@@ -122,13 +122,18 @@ export namespace Podkop {
connection_type: 'block';
}
export interface ConfigExclusionSection {
connection_type: 'exclusion';
}
export type ConfigBaseSection =
| ConfigProxyUrlTestSection
| ConfigProxySelectorSection
| ConfigProxyUrlSection
| ConfigProxyOutboundSection
| ConfigVpnSection
| ConfigBlockSection;
| ConfigBlockSection
| ConfigExclusionSection;
export type ConfigSection = ConfigBaseSection & {
'.name': string;

View File

@@ -28,6 +28,11 @@ const validUrls = [
// Explicit obfs=none (valid)
['obfs none = ok', 'hysteria2://pw@example.com:443/?obfs=none#hy2-none'],
[
'port range 5000-6000',
'hysteria2://letmein@example.com:123,5000-6000/?insecure=1&obfs=salamander&obfs-password=gawrgura&pinSHA256=deadbeef&sni=real.example.com',
],
];
const invalidUrls = [

View File

@@ -6,19 +6,17 @@ export function validateHysteria2Url(url: string): ValidationResult {
const isHY2 = url.startsWith('hysteria2://');
const isHY2Short = url.startsWith('hy2://');
if (!isHY2 && !isHY2Short) {
if (!isHY2 && !isHY2Short)
return {
valid: false,
message: _('Invalid HY2 URL: must start with hysteria2:// or hy2://'),
};
}
if (/\s/.test(url)) {
if (/\s/.test(url))
return {
valid: false,
message: _('Invalid HY2 URL: must not contain spaces'),
};
}
const prefix = isHY2 ? 'hysteria2://' : 'hy2://';
const body = url.slice(prefix.length);
@@ -45,23 +43,39 @@ export function validateHysteria2Url(url: string): ValidationResult {
const [host, port] = hostPortPart.split(':');
if (!host) {
if (!host)
return { valid: false, message: _('Invalid HY2 URL: missing host') };
}
if (!port) {
if (!port)
return { valid: false, message: _('Invalid HY2 URL: missing port') };
}
const cleanedPort = port.replace('/', '');
const portNum = Number(cleanedPort);
const portEntries = cleanedPort.split(',');
if (!Number.isInteger(portNum) || portNum < 1 || portNum > 65535) {
const isValidPortNumber = (value: string) => {
if (!/^\d+$/.test(value)) return false;
const num = Number(value);
return num >= 1 && num <= 65535;
};
const isValidPortEntry = (entry: string) => {
if (!entry) return false;
if (!entry.includes('-')) return isValidPortNumber(entry);
const rangeParts = entry.split('-');
if (rangeParts.length !== 2) return false;
const [start, end] = rangeParts;
if (!isValidPortNumber(start) || !isValidPortNumber(end)) return false;
return Number(start) <= Number(end);
};
if (!portEntries.every(isValidPortEntry))
return {
valid: false,
message: _('Invalid HY2 URL: invalid port number'),
};
}
if (queryString) {
const params = parseQueryString(queryString);
@@ -70,44 +84,37 @@ export function validateHysteria2Url(url: string): ValidationResult {
if (
paramsKeys.includes('insecure') &&
!['0', '1'].includes(params.insecure)
) {
)
return {
valid: false,
message: _('Invalid HY2 URL: insecure must be 0 or 1'),
};
}
const validObfsTypes = ['none', 'salamander'];
if (
paramsKeys.includes('obfs') &&
!validObfsTypes.includes(params.obfs)
) {
if (paramsKeys.includes('obfs') && !validObfsTypes.includes(params.obfs))
return {
valid: false,
message: _('Invalid HY2 URL: unsupported obfs type'),
};
}
if (
paramsKeys.includes('obfs') &&
params.obfs !== 'none' &&
!params['obfs-password']
) {
)
return {
valid: false,
message: _(
'Invalid HY2 URL: obfs-password required when obfs is set',
),
};
}
if (paramsKeys.includes('sni') && !params.sni) {
if (paramsKeys.includes('sni') && !params.sni)
return {
valid: false,
message: _('Invalid HY2 URL: sni cannot be empty'),
};
}
}
return { valid: true, message: _('Valid') };

View File

@@ -453,18 +453,16 @@ function validateHysteria2Url(url) {
try {
const isHY2 = url.startsWith("hysteria2://");
const isHY2Short = url.startsWith("hy2://");
if (!isHY2 && !isHY2Short) {
if (!isHY2 && !isHY2Short)
return {
valid: false,
message: _("Invalid HY2 URL: must start with hysteria2:// or hy2://")
};
}
if (/\s/.test(url)) {
if (/\s/.test(url))
return {
valid: false,
message: _("Invalid HY2 URL: must not contain spaces")
};
}
const prefix = isHY2 ? "hysteria2://" : "hy2://";
const body = url.slice(prefix.length);
const [mainPart] = body.split("#");
@@ -483,50 +481,57 @@ function validateHysteria2Url(url) {
message: _("Invalid HY2 URL: missing host & port")
};
const [host, port] = hostPortPart.split(":");
if (!host) {
if (!host)
return { valid: false, message: _("Invalid HY2 URL: missing host") };
}
if (!port) {
if (!port)
return { valid: false, message: _("Invalid HY2 URL: missing port") };
}
const cleanedPort = port.replace("/", "");
const portNum = Number(cleanedPort);
if (!Number.isInteger(portNum) || portNum < 1 || portNum > 65535) {
const portEntries = cleanedPort.split(",");
const isValidPortNumber = (value) => {
if (!/^\d+$/.test(value)) return false;
const num = Number(value);
return num >= 1 && num <= 65535;
};
const isValidPortEntry = (entry) => {
if (!entry) return false;
if (!entry.includes("-")) return isValidPortNumber(entry);
const rangeParts = entry.split("-");
if (rangeParts.length !== 2) return false;
const [start, end] = rangeParts;
if (!isValidPortNumber(start) || !isValidPortNumber(end)) return false;
return Number(start) <= Number(end);
};
if (!portEntries.every(isValidPortEntry))
return {
valid: false,
message: _("Invalid HY2 URL: invalid port number")
};
}
if (queryString) {
const params = parseQueryString(queryString);
const paramsKeys = Object.keys(params);
if (paramsKeys.includes("insecure") && !["0", "1"].includes(params.insecure)) {
if (paramsKeys.includes("insecure") && !["0", "1"].includes(params.insecure))
return {
valid: false,
message: _("Invalid HY2 URL: insecure must be 0 or 1")
};
}
const validObfsTypes = ["none", "salamander"];
if (paramsKeys.includes("obfs") && !validObfsTypes.includes(params.obfs)) {
if (paramsKeys.includes("obfs") && !validObfsTypes.includes(params.obfs))
return {
valid: false,
message: _("Invalid HY2 URL: unsupported obfs type")
};
}
if (paramsKeys.includes("obfs") && params.obfs !== "none" && !params["obfs-password"]) {
if (paramsKeys.includes("obfs") && params.obfs !== "none" && !params["obfs-password"])
return {
valid: false,
message: _(
"Invalid HY2 URL: obfs-password required when obfs is set"
)
};
}
if (paramsKeys.includes("sni") && !params.sni) {
if (paramsKeys.includes("sni") && !params.sni)
return {
valid: false,
message: _("Invalid HY2 URL: sni cannot be empty")
};
}
}
return { valid: true, message: _("Valid") };
} catch (_e) {
@@ -711,7 +716,7 @@ async function getDashboardSections() {
})
);
const data = configSections.filter(
(section) => section.connection_type !== "block" && section[".type"] !== "settings"
(section) => section.connection_type !== "block" && section.connection_type !== "exclusion" && section[".type"] !== "settings"
).map((section) => {
if (section.connection_type === "proxy") {
if (section.proxy_config_type === "url") {
@@ -3925,6 +3930,49 @@ async function runSectionsCheck() {
}
}
// src/helpers/removeVersionPrefix.ts
function removeVersionPrefix(version) {
return version.replace(/^v/, "");
}
// src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts
function isUnknownVersion(version) {
return version === "unknown" || version === _("unknown");
}
function getPodkopVersionRow(diagnosticsSystemInfo) {
const loading = diagnosticsSystemInfo.loading;
const unknown = isUnknownVersion(diagnosticsSystemInfo.podkop_version);
const hasActualVersion = Boolean(diagnosticsSystemInfo.podkop_latest_version) && !isUnknownVersion(diagnosticsSystemInfo.podkop_latest_version);
const version = normalizeCompiledVersion(
diagnosticsSystemInfo.podkop_version
);
const isDevVersion = version === "dev";
if (loading || unknown || !hasActualVersion || isDevVersion) {
return {
key: "Podkop",
value: version
};
}
if (removeVersionPrefix(version) !== removeVersionPrefix(diagnosticsSystemInfo.podkop_latest_version)) {
return {
key: "Podkop",
value: version,
tag: {
label: _("Outdated"),
kind: "warning"
}
};
}
return {
key: "Podkop",
value: version,
tag: {
label: _("Latest"),
kind: "success"
}
};
}
// src/podkop/tabs/diagnostic/initController.ts
async function fetchSystemInfo() {
const systemInfo = await PodkopShellMethods.getSystemInfo();
@@ -4164,7 +4212,10 @@ async function handleShowSingBoxConfig() {
if (showSingBoxConfig.success) {
ui.showModal(
_("Show sing-box config"),
renderModal(showSingBoxConfig.data, "show_sing_box_config")
renderModal(
JSON.stringify(showSingBoxConfig.data, null, 2),
"show_sing_box_config"
)
);
} else {
logger.error(
@@ -4269,47 +4320,9 @@ function renderDiagnosticSystemInfoWidget() {
logger.debug("[DIAGNOSTIC]", "renderDiagnosticSystemInfoWidget");
const diagnosticsSystemInfo = store.get().diagnosticsSystemInfo;
const container = document.getElementById("pdk_diagnostic-page-system-info");
function getPodkopVersionRow() {
const loading = diagnosticsSystemInfo.loading;
const unknown = diagnosticsSystemInfo.podkop_version === _("unknown");
const hasActualVersion = Boolean(diagnosticsSystemInfo.podkop_latest_version) && diagnosticsSystemInfo.podkop_latest_version !== "unknown";
const version = normalizeCompiledVersion(
diagnosticsSystemInfo.podkop_version
);
const isDevVersion = version === "dev";
if (loading || unknown || !hasActualVersion || isDevVersion) {
return {
key: "Podkop",
value: version
};
}
if (version !== `v${diagnosticsSystemInfo.podkop_latest_version}`) {
logger.debug(
"[DIAGNOSTIC]",
"diagnosticsSystemInfo",
diagnosticsSystemInfo
);
return {
key: "Podkop",
value: version,
tag: {
label: _("Outdated"),
kind: "warning"
}
};
}
return {
key: "Podkop",
value: version,
tag: {
label: _("Latest"),
kind: "success"
}
};
}
const renderedSystemInfo = renderSystemInfo({
items: [
getPodkopVersionRow(),
getPodkopVersionRow(diagnosticsSystemInfo),
{
key: "Luci App",
value: normalizeCompiledVersion(PODKOP_LUCI_APP_VERSION)

View File

@@ -683,6 +683,17 @@ function createSectionContent(section) {
);
o.rmempty = false;
o.depends("mixed_proxy_enabled", "1");
o = section.option(
form.Flag,
"resolve_real_ip_for_routing",
_("Resolve real IP for routing"),
_("Enable DNS resolve to get real IP when routing"),
);
o.default = "0";
o.rmempty = false;
o.depends("connection_type", "proxy");
o.depends("connection_type", "vpn");
}
const EntryPoint = {

View File

@@ -311,7 +311,7 @@ function createSettingsContent(section) {
for (const secName in sections) {
const sec = sections[secName];
if (sec[".type"] === "section") {
if (sec[".type"] === "section" && sec['connection_type'] !== 'block' && sec['connection_type'] !== 'exclusion') {
this.keylist.push(secName);
this.vallist.push(secName);
}

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-01-14 20:21+0200\n"
"PO-Revision-Date: 2026-01-14 20:21+0200\n"
"POT-Creation-Date: 2026-05-29 16:40+0300\n"
"PO-Revision-Date: 2026-05-29 16:40+0300\n"
"Last-Translator: divocatt\n"
"Language-Team: none\n"
"Language: ru\n"
@@ -197,6 +197,9 @@ msgstr "Включить автостарт"
msgid "Enable built-in DNS resolver for domains handled by this section"
msgstr "Включить встроенный DNS-резолвер для доменов, обрабатываемых в этом разделе"
msgid "Enable DNS resolve to get real IP when routing"
msgstr "Разрешать домены в реальные IP-адреса перед маршрутизацией в outbound"
msgid "Enable Mixed Proxy"
msgstr "Включить смешанный прокси"
@@ -509,6 +512,9 @@ msgstr "Внешние списки доменов"
msgid "Remote Subnet Lists"
msgstr "Внешние списки подсетей"
msgid "Resolve real IP for routing"
msgstr "Разрешение реальных IP-адресов"
msgid "Restart podkop"
msgstr "Перезапустить Podkop"

View File

@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-01-14 18:21+0200\n"
"PO-Revision-Date: 2026-01-14 18:21+0200\n"
"POT-Creation-Date: 2026-05-29 13:40+0300\n"
"PO-Revision-Date: 2026-05-29 13:40+0300\n"
"Last-Translator: divocatt <210179590+divocatt@users.noreply.github.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -44,15 +44,15 @@ msgstr ""
msgid "Allows access to YACD from the WAN. Make sure to open the appropriate port in your firewall."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:198
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:199
msgid "Applicable for SOCKS and Shadowsocks proxy"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:443
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:444
msgid "At least one valid domain must be specified. Comments-only content is not allowed."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:524
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:525
msgid "At least one valid subnet or IP must be specified. Comments-only content is not allowed."
msgstr ""
@@ -119,7 +119,7 @@ msgstr ""
msgid "Close"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:298
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:299
msgid "Community Lists"
msgstr ""
@@ -131,7 +131,7 @@ msgstr ""
msgid "Configuration for Podkop service"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:22
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:23
msgid "Configuration Type"
msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
msgid "Connection Type"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:25
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:26
msgid "Connection URL"
msgstr ""
@@ -187,8 +187,8 @@ msgstr ""
msgid "Disable the QUIC protocol to improve compatibility or fix issues with video streaming"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:389
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:469
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:390
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:470
msgid "Disabled"
msgstr ""
@@ -196,17 +196,17 @@ msgstr ""
msgid "DNS on router"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:266
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:267
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:15
msgid "DNS over HTTPS (DoH)"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:267
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:268
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:16
msgid "DNS over TLS (DoT)"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:263
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:264
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:12
msgid "DNS Protocol Type"
msgstr ""
@@ -215,7 +215,7 @@ msgstr ""
msgid "DNS Rewrite TTL"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:276
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:277
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:24
msgid "DNS Server"
msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
msgid "Do not panic, everything can be fixed, just..."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:253
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:254
msgid "Domain Resolver"
msgstr ""
@@ -258,8 +258,8 @@ msgstr ""
msgid "Downloading all lists via specific Proxy/VPN"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:390
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:470
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:391
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:471
msgid "Dynamic List"
msgstr ""
@@ -267,11 +267,15 @@ msgstr ""
msgid "Enable autostart"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:254
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:255
msgid "Enable built-in DNS resolver for domains handled by this section"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:662
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:691
msgid "Enable DNS resolve to get real IP when routing"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:665
msgid "Enable Mixed Proxy"
msgstr ""
@@ -279,7 +283,7 @@ msgstr ""
msgid "Enable Output Network Interface"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:663
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:666
msgid "Enable the mixed proxy, allowing this section to route traffic through both HTTP and SOCKS proxies"
msgstr ""
@@ -291,35 +295,35 @@ msgstr ""
msgid "Enable YACD WAN Access"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:65
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:66
msgid "Enter complete outbound configuration in JSON format"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:425
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:426
msgid "Enter domain names separated by commas, spaces, or newlines. You can add comments using //"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:399
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:400
msgid "Enter domain names without protocols, e.g. example.com or sub.example.com"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:479
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:480
msgid "Enter subnets in CIDR notation (e.g. 103.21.244.0/22) or single IP addresses"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:137
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:138
msgid "Every 1 minute"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:138
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:139
msgid "Every 3 minutes"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:136
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:137
msgid "Every 30 seconds"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:139
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:140
msgid "Every 5 minutes"
msgstr ""
@@ -339,17 +343,17 @@ msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:231
#: src/podkop/tabs/diagnostic/initController.ts:261
#: src/podkop/tabs/diagnostic/initController.ts:265
#: src/podkop/tabs/diagnostic/initController.ts:299
#: src/podkop/tabs/diagnostic/initController.ts:303
#: src/podkop/tabs/diagnostic/initController.ts:302
#: src/podkop/tabs/diagnostic/initController.ts:306
msgid "Failed to execute!"
msgstr ""
#: src/podkop/methods/custom/getDashboardSections.ts:117
#: src/podkop/methods/custom/getDashboardSections.ts:148
#: src/podkop/tabs/diagnostic/checks/runSectionsCheck.ts:59
msgid "Fastest"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:637
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:638
msgid "Fully Routed IPs"
msgstr ""
@@ -390,35 +394,35 @@ msgstr ""
msgid "Invalid format. Use X.X.X.X or X.X.X.X/Y"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:76
#: src/validators/validateHysteriaUrl.ts:90
msgid "Invalid HY2 URL: insecure must be 0 or 1"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:62
#: src/validators/validateHysteriaUrl.ts:77
msgid "Invalid HY2 URL: invalid port number"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:32
#: src/validators/validateHysteriaUrl.ts:30
msgid "Invalid HY2 URL: missing credentials/server"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:49
#: src/validators/validateHysteriaUrl.ts:47
msgid "Invalid HY2 URL: missing host"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:43
#: src/validators/validateHysteriaUrl.ts:41
msgid "Invalid HY2 URL: missing host & port"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:38
#: src/validators/validateHysteriaUrl.ts:36
msgid "Invalid HY2 URL: missing password"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:53
#: src/validators/validateHysteriaUrl.ts:50
msgid "Invalid HY2 URL: missing port"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:19
#: src/validators/validateHysteriaUrl.ts:18
msgid "Invalid HY2 URL: must not contain spaces"
msgstr ""
@@ -426,19 +430,19 @@ msgstr ""
msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:99
#: src/validators/validateHysteriaUrl.ts:108
msgid "Invalid HY2 URL: obfs-password required when obfs is set"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:115
#: src/validators/validateHysteriaUrl.ts:122
msgid "Invalid HY2 URL: parsing failed"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:108
#: src/validators/validateHysteriaUrl.ts:116
msgid "Invalid HY2 URL: sni cannot be empty"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:88
#: src/validators/validateHysteriaUrl.ts:98
msgid "Invalid HY2 URL: unsupported obfs type"
msgstr ""
@@ -559,7 +563,7 @@ msgstr ""
msgid "Issues detected"
msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:453
#: src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:48
msgid "Latest"
msgstr ""
@@ -567,11 +571,11 @@ msgstr ""
msgid "List Update Frequency"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:545
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:546
msgid "Local Domain Lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:568
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:569
msgid "Local Subnet Lists"
msgstr ""
@@ -587,7 +591,7 @@ msgstr ""
msgid "Memory Usage"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:673
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:678
msgid "Mixed Proxy Port"
msgstr ""
@@ -595,11 +599,11 @@ msgstr ""
msgid "Monitored Interfaces"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:163
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:164
msgid "Must be a number in the range of 50 - 1000"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:207
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:208
msgid "Network Interface"
msgstr ""
@@ -629,15 +633,15 @@ msgstr ""
msgid "Operation timed out"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:28
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:29
msgid "Outbound Config"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:64
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:65
msgid "Outbound Configuration"
msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:443
#: src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:38
msgid "Outdated"
msgstr ""
@@ -681,7 +685,7 @@ msgstr ""
msgid "Podkop will not modify your DHCP configuration"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:35
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36
msgid "Proxy Configuration URL"
msgstr ""
@@ -693,18 +697,22 @@ msgstr ""
msgid "Proxy traffic is routed via FakeIP"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:332
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:333
msgid "Regional options cannot be used together"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:591
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:592
msgid "Remote Domain Lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:614
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:615
msgid "Remote Subnet Lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:690
msgid "Resolve real IP for routing"
msgstr ""
#: src/podkop/tabs/diagnostic/partials/renderAvailableActions.ts:49
msgid "Restart podkop"
msgstr ""
@@ -749,7 +757,7 @@ msgstr ""
msgid "Run Diagnostic"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:351
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:352
msgid "Russia inside restrictions"
msgstr ""
@@ -761,7 +769,7 @@ msgstr ""
msgid "Sections"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:299
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:300
msgid "Select a predefined list for routing"
msgstr ""
@@ -777,15 +785,15 @@ msgstr ""
msgid "Select how often the domain or subnet lists are updated automatically"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:23
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:24
msgid "Select how to configure the proxy"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:208
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:209
msgid "Select network interface for VPN connection"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:277
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:278
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:25
msgid "Select or enter DNS server address"
msgstr ""
@@ -798,15 +806,15 @@ msgstr ""
msgid "Select path for sing-box config file. Change this ONLY if you know what you are doing"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:264
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:265
msgid "Select the DNS protocol type for the domain resolver"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:387
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:388
msgid "Select the list type for adding custom domains"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:467
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:468
msgid "Select the list type for adding custom subnets"
msgstr ""
@@ -826,11 +834,11 @@ msgstr ""
msgid "Select the WAN interfaces to be monitored"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:26
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:27
msgid "Selector"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:87
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88
msgid "Selector Proxy Links"
msgstr ""
@@ -883,20 +891,20 @@ msgstr ""
msgid "Specify a local IP address to be excluded from routing"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:638
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:639
msgid "Specify local IP addresses or subnets whose traffic will always be routed through the configured route"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:592
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:593
msgid "Specify remote URLs to download and use domain lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:615
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:616
msgid "Specify remote URLs to download and use subnet lists"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:546
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:569
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:547
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:570
msgid "Specify the path to the list file located on the router filesystem"
msgstr ""
@@ -928,8 +936,8 @@ msgstr ""
msgid "Test latency"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:391
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:471
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:392
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:472
msgid "Text List"
msgstr ""
@@ -937,15 +945,15 @@ msgstr ""
msgid "The DNS server used to look up the IP address of an upstream DNS server"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:134
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:135
msgid "The interval between connectivity tests"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:147
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:148
msgid "The maximum difference in response times (ms) allowed when comparing servers"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:170
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:171
msgid "The URL used to test server connectivity"
msgstr ""
@@ -973,12 +981,12 @@ msgstr ""
msgid "TTL value cannot be empty"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:268
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:269
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js:17
msgid "UDP (Unprotected DNS)"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:197
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:198
msgid "UDP over TCP"
msgstr ""
@@ -988,7 +996,7 @@ msgstr ""
#: src/podkop/tabs/diagnostic/initController.ts:41
#: src/podkop/tabs/diagnostic/initController.ts:42
#: src/podkop/tabs/diagnostic/initController.ts:43
#: src/podkop/tabs/diagnostic/initController.ts:417
#: src/podkop/tabs/diagnostic/helpers/getPodkopVersionRow.ts:7
msgid "unknown"
msgstr ""
@@ -1009,47 +1017,47 @@ msgstr ""
msgid "URL must use one of the following protocols:"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:27
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:28
msgid "URLTest"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:133
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:134
msgid "URLTest Check Interval"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:110
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111
msgid "URLTest Proxy Links"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:169
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:170
msgid "URLTest Testing URL"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:146
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:147
msgid "URLTest Tolerance"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:386
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:387
msgid "User Domain List Type"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:398
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:399
msgid "User Domains"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:424
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:425
msgid "User Domains List"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:466
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:467
msgid "User Subnet List Type"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:478
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:479
msgid "User Subnets"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:504
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:505
msgid "User Subnets List"
msgstr ""
@@ -1057,7 +1065,7 @@ msgstr ""
#: src/validators/validateDns.ts:18
#: src/validators/validateDomain.ts:13
#: src/validators/validateDomain.ts:30
#: src/validators/validateHysteriaUrl.ts:113
#: src/validators/validateHysteriaUrl.ts:120
#: src/validators/validateIp.ts:8
#: src/validators/validateOutboundJson.ts:7
#: src/validators/validatePath.ts:16
@@ -1070,8 +1078,8 @@ msgstr ""
msgid "Valid"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:457
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:536
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:458
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:537
msgid "Validation errors:"
msgstr ""
@@ -1084,17 +1092,17 @@ msgstr ""
msgid "Visit Wiki"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:36
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:88
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:111
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:37
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:89
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:112
msgid "vless://, ss://, trojan://, socks4/5://, hy2/hysteria2:// links"
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:334
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:335
msgid "Warning: %s cannot be used together with %s. Previous selections have been removed."
msgstr ""
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:353
#: ../luci-app-podkop/htdocs/luci-static/resources/view/podkop/section.js:354
msgid "Warning: Russia inside can only be used with %s. %s already in Russia inside and have been removed from selection."
msgstr ""

View File

@@ -1,6 +1,6 @@
config settings 'settings'
option dns_type 'udp'
option dns_server '8.8.8.8'
option dns_server '77.88.8.8'
option bootstrap_dns_server '77.88.8.8'
option dns_rewrite_ttl '60'
list source_network_interfaces 'br-lan'

View File

@@ -253,7 +253,7 @@ br_netfilter_disable() {
route_table_rule_mark() {
grep -q "105 $RT_TABLE_NAME" /etc/iproute2/rt_tables || echo "105 $RT_TABLE_NAME" >> /etc/iproute2/rt_tables
if ! ip route list table "$RT_TABLE_NAME" 2>/dev/null | grep -q "local default dev lo scope host"; then
if ! ip route list table "$RT_TABLE_NAME" 2> /dev/null | grep -q "local default dev lo scope host"; then
log "Added route for tproxy" "debug"
ip route add local 0.0.0.0/0 dev lo table "$RT_TABLE_NAME"
else
@@ -400,7 +400,6 @@ dnsmasq_restore() {
log "Restoring noresolv" "debug"
noresolv="$(uci_get "dhcp" "@dnsmasq[0]" "podkop_noresolv")"
if [ -z "$noresolv" ]; then
uci_remove "dhcp" "@dnsmasq[0]" "noresolv"
uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
else
uci_set "dhcp" "@dnsmasq[0]" "noresolv" "$noresolv"
@@ -419,6 +418,10 @@ dnsmasq_restore() {
elif file_exists "$resolvfile"; then
log "Backup DNS servers not found, using default resolvfile" "debug"
uci_set "dhcp" "@dnsmasq[0]" "resolvfile" "$resolvfile"
if [ -n "$noresolv" ] && [ "$noresolv" -eq 1 ]; then
log "Disabling noresolv option to use system resolvfile" "debug"
uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
fi
else
log "Backup DNS servers and default resolvfile not found, possible resolving issues" "warn"
fi
@@ -487,7 +490,7 @@ list_update() {
local i
# DNS Check
for i in $(seq 1 $nslookup_timeout); do
for i in $(seq 1 $nslookup_attempts); do
if nslookup -timeout=$nslookup_timeout openwrt.org > /dev/null 2>&1; then
echolog "✅ DNS check passed"
break
@@ -591,7 +594,7 @@ sing_box_configure_log() {
log "Configure the log section of a sing-box JSON configuration"
local log_level
config_get log_level "settings" "log_level"
config_get log_level "settings" "log_level" "warn"
config=$(sing_box_cm_configure_log "$config" false "$log_level" false)
}
@@ -915,7 +918,7 @@ configure_routing_for_section_lists() {
fi
local community_lists user_domain_list_type user_subnet_list_type local_domain_lists local_subnet_lists \
remote_domain_lists remote_subnet_lists section_connection_type route_rule_tag
remote_domain_lists remote_subnet_lists section_connection_type route_rule_tag resolve_real_ip_for_routing
config_get community_lists "$section" "community_lists"
config_get user_domain_list_type "$section" "user_domain_list_type" "disabled"
config_get user_subnet_list_type "$section" "user_subnet_list_type" "disabled"
@@ -924,6 +927,7 @@ configure_routing_for_section_lists() {
config_get remote_domain_lists "$section" "remote_domain_lists"
config_get remote_subnet_lists "$section" "remote_subnet_lists"
config_get section_connection_type "$section" "connection_type"
config_get_bool resolve_real_ip_for_routing "$section" "resolve_real_ip_for_routing" 0
case "$section_connection_type" in
proxy | vpn)
@@ -979,6 +983,11 @@ configure_routing_for_section_lists() {
config_list_foreach "$section" "remote_subnet_lists" configure_remote_domain_or_subnet_list_handler \
"subnets" "$section" "$route_rule_tag"
fi
if [ "$resolve_real_ip_for_routing" -eq 1 ]; then
config=$(sing_box_cm_add_resolve_rule "$config" "$route_rule_tag" "$(gen_id)" "$SB_DNS_SERVER_TAG")
log "Added resolve rule for '$section' section" "debug"
fi
}
configure_community_list_handler() {
@@ -1307,7 +1316,7 @@ import_community_service_subnet_list_handler() {
URL=$SUBNETS_DISCORD
nft_create_ipv4_set "$NFT_TABLE_NAME" "$NFT_DISCORD_SET_NAME"
nft add rule inet "$NFT_TABLE_NAME" mangle iifname "@$NFT_INTERFACE_SET_NAME" ip daddr \
"@$NFT_DISCORD_SET_NAME" udp dport '{ 50000-65535 }' meta mark set "$NFT_FAKEIP_MARK" counter
"@$NFT_DISCORD_SET_NAME" udp dport '{ 19000-20000, 50000-65535 }' meta mark set "$NFT_FAKEIP_MARK" counter
;;
"roblox")
URL=$SUBNETS_ROBLOX
@@ -1831,6 +1840,7 @@ show_config() {
sed -e 's/\(option proxy_string\).*/\1 '\''MASKED'\''/g' \
-e '/option outbound_json/,/^}/c\ option outbound_json '\''MASKED'\''' \
-e 's/\(list urltest_proxy_links\).*/\1 '\''MASKED'\''/g' \
-e 's/\(list selector_proxy_links\).*/\1 '\''MASKED'\''/g' \
-e "s@\\(option dns_server '[^/]*\\)/[^']*'@\\1/MASKED'@g" \
-e "s@\\(option domain_resolver_dns_server '[^/]*\\)/[^']*'@\\1/MASKED'@g" \
-e 's/\(option yacd_secret_key\).*/\1 '\''MASKED'\''/g' \

View File

@@ -20,8 +20,8 @@ NFT_LOCALV4_SET_NAME="localv4"
NFT_COMMON_SET_NAME="podkop_subnets"
NFT_DISCORD_SET_NAME="podkop_discord_subnets"
NFT_INTERFACE_SET_NAME="interfaces"
NFT_FAKEIP_MARK="0x80000"
NFT_OUTBOUND_MARK="0x90000"
NFT_FAKEIP_MARK="0x00100000"
NFT_OUTBOUND_MARK="0x00200000"
## sing-box
SB_REQUIRED_VERSION="1.12.0"

View File

@@ -18,7 +18,9 @@ nolog() {
local timestamp
timestamp=$(date +"%Y-%m-%d %H:%M:%S")
echo -e "${COLOR_CYAN}[$timestamp]${COLOR_RESET} ${COLOR_GREEN}$message${COLOR_RESET}"
if [ -t 1 ]; then
echo -e "${COLOR_CYAN}[$timestamp]${COLOR_RESET} ${COLOR_GREEN}$message${COLOR_RESET}"
fi
}
echolog() {

View File

@@ -178,8 +178,9 @@ _add_outbound_security() {
local security scheme
security=$(url_get_query_param "$url" "security")
scheme="$(url_get_scheme "$url")"
if [ -z "$security" ]; then
scheme="$(url_get_scheme "$url")"
if [ "$scheme" = "hysteria2" ] || [ "$scheme" = "hy2" ]; then
security="tls"
fi
@@ -195,6 +196,10 @@ _add_outbound_security() {
public_key=$(url_get_query_param "$url" "pbk")
short_id=$(url_get_query_param "$url" "sid")
if [ "$scheme" = "hysteria2" ] || [ "$scheme" = "hy2" ]; then
fingerprint=""
fi
config=$(
sing_box_cm_set_tls_for_outbound \
"$config" \

View File

@@ -692,6 +692,11 @@ sing_box_cm_add_hysteria2_outbound() {
local download_mbps="$9"
local network="${10}"
local is_multi_port="false"
case "$server_port" in
*","*|*"-"*) is_multi_port="true" ;;
esac
echo "$config" | jq \
--arg tag "$tag" \
--arg server_address "$server_address" \
@@ -702,14 +707,25 @@ sing_box_cm_add_hysteria2_outbound() {
--arg upload_mbps "$upload_mbps" \
--arg download_mbps "$download_mbps" \
--arg network "$network" \
'.outbounds += [(
--argjson is_multi_port "$is_multi_port" \
'
def parse_port_entry:
if index("-") then split("-") | join(":")
else . + ":" + .
end;
.outbounds += [(
{
type: "hysteria2",
tag: $tag,
server: $server_address,
server_port: ($server_port | tonumber),
password: $password
}
+ (if $is_multi_port then {
server_ports: ($server_port | split(",") | map(ltrimstr(" ") | rtrimstr(" ") | parse_port_entry))
} else {
server_port: ($server_port | tonumber)
} end)
+ (if $obfuscator_type != "" and $obfuscator_password != "" then {
obfs: {
type: $obfuscator_type,
@@ -1090,6 +1106,42 @@ sing_box_cm_add_route_rule() {
}]'
}
#######################################
# Insert a resolve rule immediately before a route rule.
# Copies rule_set from the target route rule.
# Arguments:
# config: string (JSON), sing-box configuration to modify
# route_rule_tag: string, tag of the route rule to precede
# resolve_rule_tag: string, tag for the new resolve rule
# server: string, DNS server tag (optional, default: "dns-server")
# Outputs:
# Updated JSON config to stdout
#######################################
sing_box_cm_add_resolve_rule() {
local config="$1"
local route_rule_tag="$2"
local resolve_rule_tag="$3"
local server="${4:-dns-server}"
echo "$config" | jq \
--arg service_tag "$SERVICE_TAG" \
--arg route_tag "$route_rule_tag" \
--arg resolve_tag "$resolve_rule_tag" \
--arg server "$server" \
'.route.rules |= [
.[] |
if .[$service_tag] == $route_tag then
{
action: "resolve",
rule_set: (.rule_set // []),
server: $server,
($service_tag): $resolve_tag
}, .
else .
end
]'
}
#######################################
# Patch a routing rule in the route section of a sing-box JSON configuration.
# Arguments:

View File

@@ -1,4 +1,4 @@
FROM openwrt/sdk:x86-64-SNAPSHOT
FROM openwrt/sdk:x86_64-v25.12.3
WORKDIR /builder
RUN ./setup.sh \
&& ./scripts/feeds update -a \

View File

@@ -1,4 +1,4 @@
FROM openwrt/sdk:x86_64-v24.10.3
FROM openwrt/sdk:x86_64-v24.10.6
WORKDIR /builder
RUN ./scripts/feeds update -a \
&& ./scripts/feeds install luci-base \