Mirror/podkop
1
0
Fork 0
mirror of https://github.com/itdoginfo/podkop.git synced 2025-12-06 03:26:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct small points

Browse Source
This commit is contained in:
divocat
2025-12-01 16:38:26 +02:00
parent 622e092317
commit dd3e70153a
8 changed files with 80 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fe-app-podkop/locales/calls.json
View File

@@ -641,7 +641,7 @@
"call": "Invalid HY2 URL: insecure must be 0 or 1", "call": "Invalid HY2 URL: insecure must be 0 or 1",
"key": "Invalid HY2 URL: insecure must be 0 or 1", "key": "Invalid HY2 URL: insecure must be 0 or 1",
"places": [ "places": [
"src/validators/validateHysteriaUrl.ts:73" "src/validators/validateHysteriaUrl.ts:76"
] ]
}, },
{ {
@@ -700,18 +700,32 @@
"src/validators/validateHysteriaUrl.ts:12" "src/validators/validateHysteriaUrl.ts:12"
] ]
}, },
{
"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"
]
},
{ {
"call": "Invalid HY2 URL: parsing failed", "call": "Invalid HY2 URL: parsing failed",
"key": "Invalid HY2 URL: parsing failed", "key": "Invalid HY2 URL: parsing failed",
"places": [ "places": [
"src/validators/validateHysteriaUrl.ts:103" "src/validators/validateHysteriaUrl.ts:113"
]
},
{
"call": "Invalid HY2 URL: sni cannot be empty",
"key": "Invalid HY2 URL: sni cannot be empty",
"places": [
"src/validators/validateHysteriaUrl.ts:106"
] ]
}, },
{ {
"call": "Invalid HY2 URL: unsupported obfs type", "call": "Invalid HY2 URL: unsupported obfs type",
"key": "Invalid HY2 URL: unsupported obfs type", "key": "Invalid HY2 URL: unsupported obfs type",
"places": [ "places": [
"src/validators/validateHysteriaUrl.ts:82" "src/validators/validateHysteriaUrl.ts:88"
] ]
}, },
{ {
@@ -1648,8 +1662,8 @@
] ]
}, },
{ {
"call": "URL must start with vless://, ss://, trojan://, or socks4/5://", "call": "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://",
"key": "URL must start with vless://, ss://, trojan://, or socks4/5://", "key": "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://",
"places": [ "places": [
"src/validators/validateProxyUrl.ts:37" "src/validators/validateProxyUrl.ts:37"
] ]
@@ -1746,7 +1760,7 @@
"src/validators/validateDns.ts:18", "src/validators/validateDns.ts:18",
"src/validators/validateDomain.ts:13", "src/validators/validateDomain.ts:13",
"src/validators/validateDomain.ts:30", "src/validators/validateDomain.ts:30",
"src/validators/validateHysteriaUrl.ts:101", "src/validators/validateHysteriaUrl.ts:111",
"src/validators/validateIp.ts:8", "src/validators/validateIp.ts:8",
"src/validators/validateOutboundJson.ts:7", "src/validators/validateOutboundJson.ts:7",
"src/validators/validatePath.ts:16", "src/validators/validatePath.ts:16",

22
fe-app-podkop/locales/podkop.pot
View File

@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PODKOP\n" "Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-30 16:34+0200\n" "POT-Creation-Date: 2025-12-01 14:30+0200\n"
"PO-Revision-Date: 2025-11-30 16:34+0200\n" "PO-Revision-Date: 2025-12-01 14:30+0200\n"
"Last-Translator: divocat <divocatt@gmail.com>\n" "Last-Translator: divocat <divocatt@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
@@ -390,7 +390,7 @@ msgstr ""
msgid "Invalid format. Use X.X.X.X or X.X.X.X/Y" msgid "Invalid format. Use X.X.X.X or X.X.X.X/Y"
msgstr "" msgstr ""
#: src/validators/validateHysteriaUrl.ts:73 #: src/validators/validateHysteriaUrl.ts:76
msgid "Invalid HY2 URL: insecure must be 0 or 1" msgid "Invalid HY2 URL: insecure must be 0 or 1"
msgstr "" msgstr ""
@@ -426,11 +426,19 @@ msgstr ""
msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://" msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://"
msgstr "" msgstr ""
#: src/validators/validateHysteriaUrl.ts:103 #: src/validators/validateHysteriaUrl.ts:99
msgid "Invalid HY2 URL: obfs-password required when obfs is set"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:113
msgid "Invalid HY2 URL: parsing failed" msgid "Invalid HY2 URL: parsing failed"
msgstr "" msgstr ""
#: src/validators/validateHysteriaUrl.ts:82 #: src/validators/validateHysteriaUrl.ts:106
msgid "Invalid HY2 URL: sni cannot be empty"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:88
msgid "Invalid HY2 URL: unsupported obfs type" msgid "Invalid HY2 URL: unsupported obfs type"
msgstr "" msgstr ""
@@ -978,7 +986,7 @@ msgid "Uplink"
msgstr "" msgstr ""
#: src/validators/validateProxyUrl.ts:37 #: src/validators/validateProxyUrl.ts:37
msgid "URL must start with vless://, ss://, trojan://, or socks4/5://" msgid "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://"
msgstr "" msgstr ""
#: src/validators/validateUrl.ts:17 #: src/validators/validateUrl.ts:17
@@ -1033,7 +1041,7 @@ msgstr ""
#: src/validators/validateDns.ts:18 #: src/validators/validateDns.ts:18
#: src/validators/validateDomain.ts:13 #: src/validators/validateDomain.ts:13
#: src/validators/validateDomain.ts:30 #: src/validators/validateDomain.ts:30
#: src/validators/validateHysteriaUrl.ts:101 #: src/validators/validateHysteriaUrl.ts:111
#: src/validators/validateIp.ts:8 #: src/validators/validateIp.ts:8
#: src/validators/validateOutboundJson.ts:7 #: src/validators/validateOutboundJson.ts:7
#: src/validators/validatePath.ts:16 #: src/validators/validatePath.ts:16

14
fe-app-podkop/locales/podkop.ru.po
View File

@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PODKOP\n" "Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-30 18:34+0200\n" "POT-Creation-Date: 2025-12-01 16:30+0200\n"
"PO-Revision-Date: 2025-11-30 18:34+0200\n" "PO-Revision-Date: 2025-12-01 16:30+0200\n"
"Last-Translator: divocat\n" "Last-Translator: divocat\n"
"Language-Team: none\n" "Language-Team: none\n"
"Language: ru\n" "Language: ru\n"
@@ -308,9 +308,15 @@ msgstr "Неверный URL Hysteria2: не должен содержать п
msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://" msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://"
msgstr "Неверный URL Hysteria2: должен начинаться с hysteria2:// или hy2://" msgstr "Неверный URL Hysteria2: должен начинаться с hysteria2:// или hy2://"
msgid "Invalid HY2 URL: obfs-password required when obfs is set"
msgstr "Неверный URL Hysteria2: требуется obfs-password, когда установлен obfs"
msgid "Invalid HY2 URL: parsing failed" msgid "Invalid HY2 URL: parsing failed"
msgstr "Неверный URL Hysteria2: ошибка разбора" msgstr "Неверный URL Hysteria2: ошибка разбора"
msgid "Invalid HY2 URL: sni cannot be empty"
msgstr "Неверный URL Hysteria2: sni не может быть пустым"
msgid "Invalid HY2 URL: unsupported obfs type" msgid "Invalid HY2 URL: unsupported obfs type"
msgstr "Неверный URL Hysteria2: неподдерживаемый тип obfs" msgstr "Неверный URL Hysteria2: неподдерживаемый тип obfs"
@@ -704,8 +710,8 @@ msgstr "Неизвестная ошибка"
msgid "Uplink" msgid "Uplink"
msgstr "Исходящий" msgstr "Исходящий"
msgid "URL must start with vless://, ss://, trojan://, or socks4/5://" msgid "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://"
msgstr "URL должен начинаться с vless://, ss://, trojan:// или socks4/5://" msgstr "URL должен начинаться с vless://, ss://, trojan://, socks4/5:// или hysteria2:// hy2://"
msgid "URL must use one of the following protocols:" msgid "URL must use one of the following protocols:"
msgstr "URL должен использовать один из следующих протоколов:" msgstr "URL должен использовать один из следующих протоколов:"

6
fe-app-podkop/src/validators/validateHysteriaUrl.ts
View File

@@ -96,14 +96,16 @@ export function validateHysteria2Url(url: string): ValidationResult {
) { ) {
return { return {
valid: false, valid: false,
message: 'Invalid HY2 URL: obfs-password required when obfs is set', message: _(
'Invalid HY2 URL: obfs-password required when obfs is set',
),
}; };
} }
if (paramsKeys.includes('sni') && !params.sni) { if (paramsKeys.includes('sni') && !params.sni) {
return { return {
valid: false, valid: false,
message: 'Invalid HY2 URL: sni cannot be empty', message: _('Invalid HY2 URL: sni cannot be empty'),
}; };
} }
} }

2
fe-app-podkop/src/validators/validateProxyUrl.ts
View File

@@ -35,7 +35,7 @@ export function validateProxyUrl(url: string): ValidationResult {
return { return {
valid: false, valid: false,
message: _( message: _(
'URL must start with vless://, ss://, trojan://, or socks4/5://', 'URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://',
), ),
}; };
} }

8
luci-app-podkop/htdocs/luci-static/resources/view/podkop/main.js
View File

@@ -516,13 +516,15 @@ function validateHysteria2Url(url) {
if (paramsKeys.includes("obfs") && params.obfs !== "none" && !params["obfs-password"]) { if (paramsKeys.includes("obfs") && params.obfs !== "none" && !params["obfs-password"]) {
return { return {
valid: false, valid: false,
message: "Invalid HY2 URL: obfs-password required when obfs is set" message: _(
"Invalid HY2 URL: obfs-password required when obfs is set"
)
}; };
} }
if (paramsKeys.includes("sni") && !params.sni) { if (paramsKeys.includes("sni") && !params.sni) {
return { return {
valid: false, valid: false,
message: "Invalid HY2 URL: sni cannot be empty" message: _("Invalid HY2 URL: sni cannot be empty")
}; };
} }
} }
@@ -553,7 +555,7 @@ function validateProxyUrl(url) {
return { return {
valid: false, valid: false,
message: _( message: _(
"URL must start with vless://, ss://, trojan://, or socks4/5://" "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://"
) )
}; };
} }

14
luci-app-podkop/po/ru/podkop.po
View File

@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PODKOP\n" "Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-30 18:34+0200\n" "POT-Creation-Date: 2025-12-01 16:30+0200\n"
"PO-Revision-Date: 2025-11-30 18:34+0200\n" "PO-Revision-Date: 2025-12-01 16:30+0200\n"
"Last-Translator: divocat\n" "Last-Translator: divocat\n"
"Language-Team: none\n" "Language-Team: none\n"
"Language: ru\n" "Language: ru\n"
@@ -308,9 +308,15 @@ msgstr "Неверный URL Hysteria2: не должен содержать п
msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://" msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://"
msgstr "Неверный URL Hysteria2: должен начинаться с hysteria2:// или hy2://" msgstr "Неверный URL Hysteria2: должен начинаться с hysteria2:// или hy2://"
msgid "Invalid HY2 URL: obfs-password required when obfs is set"
msgstr "Неверный URL Hysteria2: требуется obfs-password, когда установлен obfs"
msgid "Invalid HY2 URL: parsing failed" msgid "Invalid HY2 URL: parsing failed"
msgstr "Неверный URL Hysteria2: ошибка разбора" msgstr "Неверный URL Hysteria2: ошибка разбора"
msgid "Invalid HY2 URL: sni cannot be empty"
msgstr "Неверный URL Hysteria2: sni не может быть пустым"
msgid "Invalid HY2 URL: unsupported obfs type" msgid "Invalid HY2 URL: unsupported obfs type"
msgstr "Неверный URL Hysteria2: неподдерживаемый тип obfs" msgstr "Неверный URL Hysteria2: неподдерживаемый тип obfs"
@@ -704,8 +710,8 @@ msgstr "Неизвестная ошибка"
msgid "Uplink" msgid "Uplink"
msgstr "Исходящий" msgstr "Исходящий"
msgid "URL must start with vless://, ss://, trojan://, or socks4/5://" msgid "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://"
msgstr "URL должен начинаться с vless://, ss://, trojan:// или socks4/5://" msgstr "URL должен начинаться с vless://, ss://, trojan://, socks4/5:// или hysteria2:// hy2://"
msgid "URL must use one of the following protocols:" msgid "URL must use one of the following protocols:"
msgstr "URL должен использовать один из следующих протоколов:" msgstr "URL должен использовать один из следующих протоколов:"

22
luci-app-podkop/po/templates/podkop.pot
View File

@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PODKOP\n" "Project-Id-Version: PODKOP\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-30 16:34+0200\n" "POT-Creation-Date: 2025-12-01 14:30+0200\n"
"PO-Revision-Date: 2025-11-30 16:34+0200\n" "PO-Revision-Date: 2025-12-01 14:30+0200\n"
"Last-Translator: divocat <divocatt@gmail.com>\n" "Last-Translator: divocat <divocatt@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
@@ -390,7 +390,7 @@ msgstr ""
msgid "Invalid format. Use X.X.X.X or X.X.X.X/Y" msgid "Invalid format. Use X.X.X.X or X.X.X.X/Y"
msgstr "" msgstr ""
#: src/validators/validateHysteriaUrl.ts:73 #: src/validators/validateHysteriaUrl.ts:76
msgid "Invalid HY2 URL: insecure must be 0 or 1" msgid "Invalid HY2 URL: insecure must be 0 or 1"
msgstr "" msgstr ""
@@ -426,11 +426,19 @@ msgstr ""
msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://" msgid "Invalid HY2 URL: must start with hysteria2:// or hy2://"
msgstr "" msgstr ""
#: src/validators/validateHysteriaUrl.ts:103 #: src/validators/validateHysteriaUrl.ts:99
msgid "Invalid HY2 URL: obfs-password required when obfs is set"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:113
msgid "Invalid HY2 URL: parsing failed" msgid "Invalid HY2 URL: parsing failed"
msgstr "" msgstr ""
#: src/validators/validateHysteriaUrl.ts:82 #: src/validators/validateHysteriaUrl.ts:106
msgid "Invalid HY2 URL: sni cannot be empty"
msgstr ""
#: src/validators/validateHysteriaUrl.ts:88
msgid "Invalid HY2 URL: unsupported obfs type" msgid "Invalid HY2 URL: unsupported obfs type"
msgstr "" msgstr ""
@@ -978,7 +986,7 @@ msgid "Uplink"
msgstr "" msgstr ""
#: src/validators/validateProxyUrl.ts:37 #: src/validators/validateProxyUrl.ts:37
msgid "URL must start with vless://, ss://, trojan://, or socks4/5://" msgid "URL must start with vless://, ss://, trojan://, socks4/5://, or hysteria2://hy2://"
msgstr "" msgstr ""
#: src/validators/validateUrl.ts:17 #: src/validators/validateUrl.ts:17
@@ -1033,7 +1041,7 @@ msgstr ""
#: src/validators/validateDns.ts:18 #: src/validators/validateDns.ts:18
#: src/validators/validateDomain.ts:13 #: src/validators/validateDomain.ts:13
#: src/validators/validateDomain.ts:30 #: src/validators/validateDomain.ts:30
#: src/validators/validateHysteriaUrl.ts:101 #: src/validators/validateHysteriaUrl.ts:111
#: src/validators/validateIp.ts:8 #: src/validators/validateIp.ts:8
#: src/validators/validateOutboundJson.ts:7 #: src/validators/validateOutboundJson.ts:7
#: src/validators/validatePath.ts:16 #: src/validators/validatePath.ts:16