diff --git a/luci-app-homeproxy-pro-pro/po/templates/homeproxy-pro-pro.pot b/luci-app-homeproxy-pro-pro/po/templates/homeproxy-pro-pro.pot
deleted file mode 100644
index 0690dbc81..000000000
--- a/luci-app-homeproxy-pro-pro/po/templates/homeproxy-pro-pro.pot
+++ /dev/null
@@ -1,3392 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:222
-msgid "%s log"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:913
-msgid "%s nodes removed"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:858
-msgid "(empty)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:110
-msgid "(last updated %s)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:111
-msgid "(never updated on this device)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1098
-msgid "/etc/homeproxy/certs/..., /etc/acme/..., /etc/ssl/..."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:221
-msgid ""
-"1 matches the latest untagged evaluate result; other values match an "
-"evaluate tag (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:81
-msgid "4 or 6. Not limited if empty."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:288
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:436
-msgid ""
-"<code>%s</code> will be temporarily overwritten to <code>%s</code> after 50 "
-"triggers in 30s if not enabled."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:434
-#: htdocs/luci-static/resources/view/homeproxy/node.js:458
-#: htdocs/luci-static/resources/view/homeproxy/server.js:523
-#: htdocs/luci-static/resources/view/homeproxy/server.js:542
-msgid "<strong>Save your configuration before uploading files!</strong>"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:375
-msgid "ACME account key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:359
-msgid "ACME key type"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:369
-msgid "ACME profile"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:370
-msgid "ACME profile for certificate issuance (1.14). Example: shortlived."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:419
-msgid "API token"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:227
-msgid "Accept any if empty."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:25
-msgid "Access Control"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:402
-msgid "Access key ID"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:408
-msgid "Access key secret"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:164
-msgid "Action"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:35
-msgid "Add a DNS rule"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:221
-msgid "Add a DNS server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:25
-msgid "Add a node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:32
-msgid "Add a routing node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:35
-msgid "Add a routing rule"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:31
-msgid "Add a rule set"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:176
-msgid "Add a server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:267
-msgid "Additional headers to be sent to the DNS server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:249
-#: htdocs/luci-static/resources/view/homeproxy/node.js:58
-msgid "Address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:29
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:40
-msgid "Address and port dependent"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:28
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:39
-msgid "Address dependent"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:280
-msgid "Address resolver"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:312
-msgid "Address strategy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:166
-msgid "Aggressive"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:395
-msgid "Alibaba Cloud DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:131
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:165
-msgid "Aliyun Public DNS (223.5.5.5)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:104
-msgid "All ports"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:196
-msgid "Allow access from the Internet."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:683
-#: htdocs/luci-static/resources/view/homeproxy/node.js:753
-msgid "Allow insecure"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:684
-msgid "Allow insecure connection at TLS client."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:754
-msgid "Allow insecure connection by default when add nodes from subscriptions."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:615
-msgid "Allowed payload size is in the request."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:129
-msgid "Already at the latest version."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:126
-msgid "Already in updating."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:257
-#: htdocs/luci-static/resources/view/homeproxy/server.js:304
-msgid "Alter ID"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:433
-msgid "Alternative HTTP port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:439
-msgid "Alternative TLS port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:305
-msgid "Answer"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:131
-msgid "AnyTLS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:232
-msgid "AnyTLS padding scheme in array."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:213
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:460
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:89
-msgid ""
-"Append a <code>edns0-subnet</code> OPT extra record with the specified IP "
-"prefix to every query by default.<br/>If value is an IP address instead of "
-"prefix, <code>/32</code> or <code>/128</code> will be appended automatically."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:420
-msgid "Append self-signed certificate"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:36
-msgid "Applied"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:29
-#: htdocs/luci-static/resources/view/homeproxy/node.js:39
-msgid "Apply"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:16
-msgid "Are you sure to allow insecure?"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:346
-msgid "Auth timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:281
-msgid "Authenticated length"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:263
-msgid "Authentication payload"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:256
-msgid "Authentication type"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:706
-msgid "Auto update"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:707
-msgid "Auto update subscriptions and geodata."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:325
-msgid "BBR"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:163
-msgid "BBR congestion control algorithm profile. Hysteria2 only."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:162
-msgid "BBR profile (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:252
-msgid "BaiDu"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:258
-msgid "Base64"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:170
-msgid "Based on google/gvisor."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:56
-msgid "Binary file"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:38
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:84
-#: htdocs/luci-static/resources/view/homeproxy/server.js:629
-msgid "Bind interface"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:39
-msgid ""
-"Bind outbound traffic to specific interface. Leave empty to auto detect."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:90
-msgid "BitTorrent"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:740
-msgid "Blacklist mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:211
-msgid "Block"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:84
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:108
-#: htdocs/luci-static/resources/view/homeproxy/server.js:624
-msgid "Both"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:190
-msgid "Bypass CN traffic"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:84
-msgid "Bypass mainland China"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:191
-msgid "Bypass mainland China traffic via firewall rules by default."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:382
-msgid "CA provider"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:196
-msgid "CN-IP DNS fallback (sing-box 1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:166
-msgid "CNNIC Public DNS (210.2.4.8)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:323
-msgid "CUBIC"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:596
-msgid "Cancel"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:425
-#: htdocs/luci-static/resources/view/homeproxy/server.js:511
-msgid "Certificate path"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:95
-msgid "Check"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:139
-msgid "Check update"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:162
-msgid "China DNS server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:261
-msgid "China IPv4 list version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:265
-msgid "China IPv6 list version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:269
-msgid "China list version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:125
-msgid "Chromium / Cronet"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:708
-msgid "Cipher suites"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:128
-msgid "Cisco Public DNS (208.67.222.222)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:231
-msgid "Clean log"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:123
-msgid "Client"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:14
-msgid "Client Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:221
-msgid "Client version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:127
-msgid "CloudFlare Public DNS (1.1.1.1)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:396
-msgid "Cloudflare"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client.js:130
-#: htdocs/luci-static/resources/view/homeproxy/server.js:146
-#: htdocs/luci-static/resources/view/homeproxy/status.js:212
-msgid "Collecting data..."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:105
-msgid "Common ports only (bypass P2P traffic)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:321
-msgid "Congestion control algorithm"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:249
-msgid "Connection check"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:394
-msgid "Connection reuse"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:165
-msgid "Conservative"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:809
-msgid "Could not start subscription update: %s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:86
-msgid "Custom routing"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:92
-msgid "DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:25
-msgid "DNS Rules"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:212
-msgid "DNS Servers"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:56
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:122
-msgid "DNS Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:394
-msgid "DNS provider"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:39
-msgid "DNS query timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:34
-msgid "DNS rule"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:410
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:124
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:221
-msgid "DNS server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:390
-msgid "DNS01 challenge"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:93
-msgid "DTLS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:179
-msgid "Debug"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:62
-#: htdocs/luci-static/resources/homeproxy.js:334
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:73
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:416
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:64
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:99
-msgid "Default"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:185
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:417
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:71
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:65
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:287
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:228
-msgid "Default DNS (issued by WAN)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:66
-msgid "Default DNS server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:223
-msgid "Default DNS server for resolving domain name in the server address."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:61
-msgid "Default DNS strategy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:203
-msgid "Default outbound"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:222
-msgid "Default outbound DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:204
-msgid "Default outbound for connections not matched by any routing rules."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:760
-msgid "Default packet encoding"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:338
-msgid "Default server name"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:40
-msgid "Default timeout per DNS query in seconds (sing-box default: 10)."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:130
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:326
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:97
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:325
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:210
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:100
-msgid "Direct"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:165
-msgid "Direct Domain List"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:54
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:99
-msgid "Direct IPv4 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:57
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:102
-msgid "Direct IPv6 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:60
-msgid "Direct MAC-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:257
-#: htdocs/luci-static/resources/homeproxy.js:270
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:48
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:26
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:54
-#: htdocs/luci-static/resources/view/homeproxy/node.js:93
-#: htdocs/luci-static/resources/view/homeproxy/node.js:468
-#: htdocs/luci-static/resources/view/homeproxy/node.js:739
-msgid "Disable"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:209
-msgid "Disable (the service)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:170
-msgid "Disable Chrome QUIC fingerprint (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:171
-msgid ""
-"Disable Chrome QUIC handshake parroting, which is enabled by default since "
-"sing-box 1.14. Turn this on only when the server uses an Ed25519 certificate "
-"or the handshake otherwise fails."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:448
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:83
-msgid "Disable DNS cache"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:449
-msgid "Disable DNS cache in this query."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:425
-msgid "Disable HTTP challenge"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:429
-msgid "Disable TLS ALPN challenge"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:352
-msgid "Disable UDP domain unmapping"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:200
-msgid "Disable cache and save cache in this query."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:85
-msgid "Disable cache expire"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:199
-msgid "Disable dns cache"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:242
-msgid "Disable optimistic DNS caching for this query."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:467
-msgid "Disable optimistic DNS caching in this lookup (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:241
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:466
-msgid "Disable optimistic cache"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:31
-msgid "Disabled"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:487
-msgid "Domain keyword"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:478
-msgid "Domain name"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:491
-msgid "Domain regex"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:58
-msgid "Domain resolver"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:77
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:198
-msgid "Domain strategy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:442
-msgid "Domain strategy for resolving the domain names."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:483
-msgid "Domain suffix"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:332
-msgid "Domains"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:435
-msgid "Don't drop packets"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:287
-msgid "Don't drop requests"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:178
-msgid "Download bandwidth"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:179
-msgid "Download bandwidth in Mbps."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:431
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:437
-msgid "Drop packets"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:282
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:289
-msgid "Drop requests"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:746
-msgid ""
-"Drop/keep nodes that contain the specific keywords. <a target=\"_blank\" "
-"href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/"
-"Regular_Expressions\">Regex</a> is supported."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:738
-msgid "Drop/keep specific nodes from subscriptions."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:446
-msgid ""
-"EAB (External Account Binding) contains information necessary to bind or map "
-"an ACME account to some other account known by the CA.<br/>External account "
-"bindings are \"used to associate an ACME account with an existing account in "
-"a non-ACME system, such as a CA customer database."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:442
-msgid ""
-"ECH (Encrypted Client Hello) is a TLS extension that allows a client to "
-"encrypt the first part of its ClientHello message."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:462
-#: htdocs/luci-static/resources/view/homeproxy/server.js:590
-msgid "ECH config"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:446
-msgid "ECH config path"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:549
-msgid "ECH key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:212
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:459
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:88
-msgid "EDNS Client subnet"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:614
-msgid "Early data"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:621
-msgid "Early data header name"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:622
-msgid "Early data is sent in path instead of header by default."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:568
-msgid "Edit nodes"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:344
-msgid "Email"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:53
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:45
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:234
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:44
-#: htdocs/luci-static/resources/view/homeproxy/server.js:168
-#: htdocs/luci-static/resources/view/homeproxy/server.js:190
-msgid "Enable"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:355
-msgid ""
-"Enable 0-RTT QUIC connection handshake on the client side. This is not "
-"impacting much on the performance, as the protocol is fully multiplexed.<br/"
-">Disabling this is highly recommended, as it is vulnerable to replay attacks."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:354
-msgid "Enable 0-RTT handshake"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:327
-msgid "Enable ACME"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:441
-msgid "Enable ECH"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:173
-msgid "Enable TCP Brutal"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:174
-msgid "Enable TCP Brutal congestion control algorithm"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:521
-#: htdocs/luci-static/resources/view/homeproxy/server.js:610
-msgid "Enable UDP fragmentation."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:395
-msgid "Enable connection reuse (the Snell v2 CONNECT command)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:175
-msgid "Enable endpoint-independent NAT"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:195
-msgid ""
-"Enable neighbor resolution so rules can match LAN devices by hostname (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:166
-msgid "Enable padding"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:601
-msgid "Enable tcp fast open for listener."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:525
-msgid ""
-"Enable the SUoT protocol, requires server support. Conflict with multiplex."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:177
-#: htdocs/luci-static/resources/view/homeproxy/node.js:263
-#: htdocs/luci-static/resources/view/homeproxy/server.js:284
-msgid "Encrypt method"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:27
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:38
-msgid "Endpoint independent"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:182
-msgid "Error"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:170
-msgid "Evaluate (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:225
-msgid "Evaluate tag"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:220
-#: htdocs/luci-static/resources/homeproxy.js:1035
-#: htdocs/luci-static/resources/homeproxy.js:1085
-#: htdocs/luci-static/resources/homeproxy.js:1098
-#: htdocs/luci-static/resources/homeproxy.js:1117
-#: htdocs/luci-static/resources/homeproxy.js:1126
-#: htdocs/luci-static/resources/homeproxy.js:1137
-#: htdocs/luci-static/resources/homeproxy.js:1146
-#: htdocs/luci-static/resources/homeproxy.js:1148
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:203
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:140
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:152
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:156
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:175
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:186
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:190
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:141
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:155
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:112
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:72
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:75
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:80
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:83
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:123
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:126
-#: htdocs/luci-static/resources/view/homeproxy/node.js:484
-#: htdocs/luci-static/resources/view/homeproxy/node.js:727
-#: htdocs/luci-static/resources/view/homeproxy/node.js:730
-#: htdocs/luci-static/resources/view/homeproxy/server.js:350
-#: htdocs/luci-static/resources/view/homeproxy/server.js:352
-msgid "Expecting: %s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:445
-msgid "External Account Binding"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:457
-msgid "External account MAC key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:451
-msgid "External account key ID"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:315
-msgid "Extra records"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:117
-msgid ""
-"Extra rule-set tags sharing these options. Requires {tag} in path/url (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:116
-msgid "Extra tags"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:657
-msgid "Failed to close the import dialog: %s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:93
-msgid "Failed to generate %s, error: %s."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:124
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:177
-msgid "Failed to read domain list: %s."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1075
-msgid "Failed to upload %s, error: %s."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:183
-msgid "Fatal"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:745
-msgid "Filter keywords"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:737
-msgid "Filter nodes"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:194
-msgid "Find neighbor hosts"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:126
-msgid "Firefox / uquic firefox"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:195
-msgid "Firewall"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:251
-#: htdocs/luci-static/resources/view/homeproxy/server.js:298
-msgid "Flow"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:59
-msgid "For resolving domain name in the server address."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:55
-msgid "Format"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:372
-msgid "Fragment TLS handshake into multiple TLS records."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:378
-msgid ""
-"Fragment TLS handshakes. Due to poor performance, try <code>%s</code> first."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:384
-msgid "Fragment fallback delay"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:583
-msgid "GET"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:273
-msgid "GFW list version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:83
-msgid "GFWList"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:72
-msgid "Gaming mode IPv4 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:74
-msgid "Gaming mode IPv6 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:77
-msgid "Gaming mode MAC-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:272
-msgid "Gecko (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:37
-#: htdocs/luci-static/resources/view/homeproxy/server.js:39
-#: htdocs/luci-static/resources/view/homeproxy/server.js:582
-msgid "Generate"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:277
-msgid "GitHub token"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:87
-msgid "Global"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:274
-msgid "Global padding"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:79
-msgid "Global proxy IPv4 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:82
-msgid "Global proxy IPv6 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:85
-msgid "Global proxy MAC-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:166
-msgid "Global settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:255
-msgid "Google"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:129
-msgid "Google Public DNS (8.8.8.8)"
-msgstr ""
-
-#: root/usr/share/rpcd/acl.d/luci-app-homeproxy.json:3
-msgid "Grant access to homeproxy configuration"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:132
-#: htdocs/luci-static/resources/homeproxy.js:520
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:94
-msgid "HTTP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:407
-msgid ""
-"HTTP Host header sent when obfuscation mode is http. bing.com is used by "
-"default."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:400
-msgid "HTTP obfuscation. v4 only."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:276
-msgid "HTTP obfuscation. v5 only."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:244
-msgid "HTTP/3"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:257
-msgid ""
-"HTTP3 server behavior when authentication fails.<br/>A 404 page will be "
-"returned if empty."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:243
-msgid "HTTPS"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:521
-msgid "HTTPUpgrade"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:499
-msgid "Handshake server address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:505
-msgid "Handshake server port"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:717
-msgid "Handshake timeout (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:266
-msgid "Headers"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:360
-msgid "Heartbeat interval"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:33
-msgid "Hijack"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client.js:70
-#: htdocs/luci-static/resources/view/homeproxy/client.js:119
-#: htdocs/luci-static/resources/view/homeproxy/status.js:299
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:3
-msgid "HomeProxy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:75
-#: htdocs/luci-static/resources/view/homeproxy/server.js:136
-msgid "HomeProxy Server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:129
-msgid "Hop interval"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:123
-msgid "Hopping port"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:566
-#: htdocs/luci-static/resources/homeproxy.js:571
-#: htdocs/luci-static/resources/homeproxy.js:606
-msgid "Host"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:226
-msgid "Host key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:231
-msgid "Host key algorithms"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:44
-msgid "Host/IP fields"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:347
-msgid ""
-"How long the server should wait for the client to send the authentication "
-"command (in seconds)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:399
-msgid "How the forged segment is rejected by the real server."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:133
-msgid "Hysteria"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:134
-msgid "Hysteria2"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:503
-msgid "IP CIDR"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:80
-msgid "IP version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:82
-msgid "IPv4"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:65
-msgid "IPv4 only"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:83
-msgid "IPv6"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:66
-msgid "IPv6 only"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:135
-msgid "IPv6 support"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:100
-msgid "Idle session check interval"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:107
-msgid "Idle session check timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:589
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:190
-msgid "Idle timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:359
-msgid ""
-"If enabled, attempts to connect UDP connection to the destination instead of "
-"listen."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:353
-msgid ""
-"If enabled, for UDP proxy requests addressed to a domain, the original "
-"packet address will be sent in the response instead of the mapped domain."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:561
-msgid ""
-"If enabled, the client transport sends keepalive pings even with no active "
-"connections."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:199
-msgid ""
-"If set, the requested domain name will be resolved to IP before routing."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:24
-msgid ""
-"If the transport doesn't see any activity after a duration of this time (in "
-"seconds), it pings the client to check if the connection is still active."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:421
-msgid ""
-"If you have the root certificate, use this option instead of allowing "
-"insecure."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:251
-msgid "Ignore client bandwidth"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:662
-msgid "Import"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:589
-#: htdocs/luci-static/resources/view/homeproxy/node.js:682
-#: htdocs/luci-static/resources/view/homeproxy/node.js:684
-msgid "Import share links"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:658
-msgid ""
-"Imported the nodes, but the dialog did not close automatically. Close it "
-"manually."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:183
-#: htdocs/luci-static/resources/view/homeproxy/server.js:615
-msgid "In seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:333
-msgid "In seconds. Disabled by default."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:115
-msgid ""
-"In the check, at least the first <code>n</code> idle sessions are kept open."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:108
-msgid ""
-"In the check, close sessions that have been idle for longer than this, in "
-"seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:180
-msgid "Info"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:110
-msgid "Initial path"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:392
-msgid ""
-"Inject a forged TLS ClientHello carrying this SNI before the real one to "
-"fool SNI-filtering middleboxes. Requires elevated privileges."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:31
-msgid "Interface Control"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:197
-msgid "Interrupt existing connections"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:198
-msgid "Interrupt existing connections when the selected outbound has changed."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:101
-msgid "Interval checking for idle sessions, in seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:361
-msgid ""
-"Interval for sending heartbeat packets for keeping the connection alive (in "
-"seconds)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:160
-msgid "Invert"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:161
-msgid "Invert match result."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:231
-msgid ""
-"Judge this response-dependent rule in parallel; first match wins (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:530
-msgid "Key path"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:45
-msgid "LAN IP Policy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:48
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:40
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:229
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:39
-#: htdocs/luci-static/resources/view/homeproxy/node.js:51
-#: htdocs/luci-static/resources/view/homeproxy/server.js:184
-msgid "Label"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:258
-#: htdocs/luci-static/resources/view/homeproxy/server.js:305
-msgid ""
-"Legacy protocol support (VMess MD5 Authentication) is provided for "
-"compatibility purposes only, use of alterId > 1 is not recommended."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:172
-msgid "Less compatibility and sometimes better performance."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:384
-msgid "Let's Encrypt"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:293
-msgid ""
-"List of IP (v4 or v6) addresses prefixes to be assigned to the interface."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:128
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:35
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:64
-msgid "List of nodes to test."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:678
-msgid "List of supported application level protocols, in order of preference."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:306
-msgid "List of text DNS record to respond as answers."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:316
-msgid "List of text DNS record to respond as extra records."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:311
-msgid "List of text DNS record to respond as name servers."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:201
-msgid "Listen address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:33
-msgid "Listen interfaces"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:206
-msgid "Listen port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:210
-msgid "Loading"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:50
-msgid "Local"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:292
-msgid "Local address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:111
-msgid ""
-"Local file with initial rule-set content; avoids blocking startup on first "
-"download (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:59
-msgid "Log file does not exist."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:55
-msgid "Log is empty."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:326
-msgid "MTU"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:53
-msgid "Main UDP node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:25
-msgid "Main node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:157
-msgid "Make IP CIDR in rule set used to match the source IP."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:157
-msgid "Make IP CIDR in rule sets match the source IP."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:256
-msgid "Masquerade"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:528
-msgid "Match DNSSEC OK"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:504
-msgid ""
-"Match IP CIDR with the evaluated response (needs match_response; old rules "
-"are auto-wrapped in 1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:505
-msgid "Match IP CIDR."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:514
-msgid "Match LAN device by MAC address."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:519
-msgid ""
-"Match LAN device hostname via neighbor resolution; enable find_neighbor."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:484
-msgid "Match domain suffix."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:488
-msgid "Match domain using keyword."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:492
-msgid "Match domain using regular expression."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:479
-msgid "Match full domain."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:549
-msgid "Match port range. Format as START:/:END/START:END."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:544
-msgid "Match port."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:509
-msgid "Match private IP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:510
-msgid "Match private IP with the evaluated response (needs match_response)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:500
-msgid "Match private source IP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:554
-msgid "Match process name."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:562
-msgid "Match process path using regular expression."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:558
-msgid "Match process path."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:529
-msgid "Match queries with the DNSSEC OK bit set (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:115
-msgid "Match query type."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:220
-msgid "Match response"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:141
-msgid ""
-"Match rule set. DNS: rules referencing rule-sets that contain query_type are "
-"incompatible with legacy address filters (ip_cidr / ip_is_private) — use "
-"match_response instead (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:142
-msgid ""
-"Match rule set. Since 1.14: a rule-set holding a single default rule is "
-"merged into this rule; any other rule-set matches as an OR collection."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:496
-msgid "Match source IP CIDR."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:539
-msgid "Match source port range. Format as START:/:END/START:END."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:534
-msgid "Match source port."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:524
-msgid "Match the EDNS Client Subnet in the query (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:261
-msgid "Match the evaluated response code (requires match_response)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:137
-msgid "Match user name."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:234
-msgid "Max download speed"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:235
-msgid "Max download speed in Mbps."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:137
-msgid "Max hop interval (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:289
-msgid "Max obfs packet size (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:37
-msgid "Max time an expired entry may be served. Examples: 3d, 1h."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:494
-msgid "Max time difference"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:241
-msgid "Max upload speed"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:242
-msgid "Max upload speed in Mbps."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:700
-msgid "Maximum TLS version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:354
-#: htdocs/luci-static/resources/view/homeproxy/node.js:368
-msgid "Maximum connections"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:366
-msgid ""
-"Maximum multiplexed streams in a connection before opening a new connection."
-"<br/>Conflict with <code>%s</code> and <code>%s</code>."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:290
-msgid "Maximum on-wire packet size in bytes. Gecko only."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:138
-msgid ""
-"Maximum port hopping interval in seconds; the actual interval is randomized "
-"between the two values. Hysteria2 only."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:365
-msgid "Maximum streams"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:581
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:280
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:289
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:429
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:437
-msgid "Method"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:282
-msgid "Min obfs packet size (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:692
-msgid "Minimum TLS version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:114
-msgid "Minimum idle sessions"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:360
-msgid ""
-"Minimum multiplexed streams in a connection before opening a new connection."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:283
-msgid "Minimum on-wire packet size in bytes. Gecko only."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:359
-#: htdocs/luci-static/resources/view/homeproxy/node.js:368
-msgid "Minimum streams"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:136
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:157
-msgid "Mixed"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:168
-msgid "Mixed <code>system</code> TCP stack and <code>gVisor</code> UDP stack."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:58
-msgid "Mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:517
-#: htdocs/luci-static/resources/view/homeproxy/server.js:605
-msgid "MultiPath TCP"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:159
-msgid "Multiplex"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:345
-msgid "Multiplex protocol."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:419
-msgid "NOT RUNNING"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:766
-msgid "NOTE: Save current settings before updating subscriptions."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:310
-msgid "NS"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:335
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:32
-msgid "Native"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:135
-msgid "NaïveProxy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:105
-#: htdocs/luci-static/resources/view/homeproxy/server.js:621
-msgid "Network"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:324
-msgid "New Reno"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:17
-msgid "No TCP transport, plain HTTP is merged into the HTTP transport."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:19
-msgid "No additional encryption support: It's basically duplicate encryption."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:783
-msgid "No subscription available"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:894
-msgid "No subscription node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:637
-msgid "No valid share link found."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:50
-#: htdocs/luci-static/resources/view/homeproxy/node.js:25
-msgid "Node"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:22
-msgid "Node Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:574
-msgid "Nodes"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:518
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:286
-#: htdocs/luci-static/resources/view/homeproxy/node.js:252
-#: htdocs/luci-static/resources/view/homeproxy/server.js:299
-msgid "None"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:276
-msgid "Obfuscate password"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:269
-msgid "Obfuscate type"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:406
-msgid "Obfuscation host"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:399
-#: htdocs/luci-static/resources/view/homeproxy/server.js:275
-msgid "Obfuscation mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:114
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:171
-msgid ""
-"One domain per line. No spaces, no comments, no wildcards; the backend "
-"rejects invalid characters and tells you which line."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:34
-msgid "Only process traffic from specific interfaces. Leave empty for all."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:85
-msgid "Only proxy mainland China"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:30
-msgid "Optimistic DNS cache"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:36
-msgid "Optimistic cache timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:226
-msgid "Optional tag for this evaluate result."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:390
-msgid "Optional; only required when connecting to a multi-user Snell server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:43
-msgid "Other fields"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:320
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:91
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:319
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:93
-msgid "Outbound"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:51
-msgid "Outbound node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:94
-msgid ""
-"Outbound used to download this rule-set (via sing-box 1.14 http_clients)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:338
-msgid "Override address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:472
-msgid "Override dns.timeout for this lookup, in seconds (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:248
-msgid "Override dns.timeout for this query, in seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:345
-msgid "Override port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:339
-msgid "Override the connection destination address."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:346
-msgid "Override the connection destination port."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:376
-msgid "PEM-encoded private key of an existing ACME account (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:584
-msgid "PUT"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:630
-msgid "Packet encoding"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:231
-msgid "Padding scheme"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:184
-msgid "Panic"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:74
-#: htdocs/luci-static/resources/view/homeproxy/server.js:218
-msgid "Password"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:576
-#: htdocs/luci-static/resources/homeproxy.js:610
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:259
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:61
-msgid "Path"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:307
-msgid "Peer pubkic key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:176
-msgid ""
-"Performance may degrade slightly, so it is not recommended to enable on when "
-"it is not needed."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:44
-msgid "Persist DNS cache across restarts (sing-box 1.14, replaces Store RDRC)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:332
-msgid "Persistent keepalive interval"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:597
-msgid "Ping timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:187
-msgid "Plugin"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:194
-msgid "Plugin opts"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:543
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:254
-#: htdocs/luci-static/resources/view/homeproxy/node.js:63
-msgid "Port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:114
-msgid "Port %s alrealy exists!"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:45
-msgid "Port fields"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:130
-msgid "Port hopping interval in seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:548
-msgid "Port range"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:314
-msgid "Pre-shared key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:169
-msgid "Predefined"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:63
-msgid "Prefer IPv4"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:64
-msgid "Prefer IPv6"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:235
-#: htdocs/luci-static/resources/view/homeproxy/node.js:299
-msgid "Private key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:240
-msgid "Private key passphrase"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:360
-msgid "Private key type for new certificates (1.14). Empty uses the default."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:46
-msgid "Process fields"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:553
-msgid "Process name"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:557
-msgid "Process path"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:561
-msgid "Process path (regex)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:88
-#: htdocs/luci-static/resources/view/homeproxy/node.js:144
-#: htdocs/luci-static/resources/view/homeproxy/node.js:344
-#: htdocs/luci-static/resources/view/homeproxy/server.js:237
-msgid "Protocol"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:282
-msgid "Protocol parameter. Enable length block encryption."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:275
-msgid ""
-"Protocol parameter. Will waste traffic randomly if enabled (enabled by "
-"default in v2ray and cannot be disabled)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:108
-msgid "Proxy Domain List"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:63
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:92
-msgid "Proxy IPv4 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:66
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:95
-msgid "Proxy IPv6 IP-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:69
-msgid "Proxy MAC-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:50
-msgid "Proxy all except listed"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:47
-msgid "Proxy filter mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:49
-msgid "Proxy listed only"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:122
-msgid "Proxy mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:91
-msgid "Proxy protocol"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:336
-#: htdocs/luci-static/resources/homeproxy.js:522
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:95
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:245
-msgid "QUIC"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:322
-msgid "QUIC congestion control algorithm."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:523
-msgid "Query EDNS client subnet"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:247
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:471
-msgid "Query timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:114
-msgid "Query type"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:293
-msgid "RCode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:96
-msgid "RDP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:495
-#: htdocs/luci-static/resources/view/homeproxy/server.js:464
-msgid "REALITY"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:469
-msgid "REALITY private key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:500
-#: htdocs/luci-static/resources/view/homeproxy/server.js:485
-msgid "REALITY public key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:506
-#: htdocs/luci-static/resources/view/homeproxy/server.js:489
-msgid "REALITY short ID"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:417
-msgid "RUNNING"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:230
-msgid "Race"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:222
-msgid "Random version will be used if empty."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:119
-msgid "Recursive outbound detected!"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:305
-msgid "Recursive resolver detected!"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:123
-msgid "Redirect TCP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:125
-msgid "Redirect TCP + TProxy UDP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:127
-msgid "Redirect TCP + Tun UDP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:236
-msgid "Refresh every %s seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:414
-msgid "Region ID"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:167
-msgid "Reject"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:51
-msgid "Remote"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:891
-msgid "Remove %s nodes"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:254
-msgid "Remove EDNS client subnet"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:881
-msgid "Remove all nodes from subscriptions"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:255
-msgid "Remove the edns0-subnet record from the query (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:281
-msgid "Reply with REFUSED"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:430
-msgid "Reply with TCP RST / ICMP port unreachable"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:321
-msgid "Reserved field bytes"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:172
-msgid "Resolve"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:441
-msgid "Resolve strategy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:258
-msgid "Resources management"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:272
-msgid "Response NS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:260
-msgid "Response RCode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:267
-msgid "Response answer"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:276
-msgid "Response extra"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:31
-msgid ""
-"Return expired cache immediately and refresh in background (sing-box 1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:635
-msgid "Reuse address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:636
-msgid "Reuse listener address."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:205
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:453
-msgid "Rewrite TTL"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:206
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:454
-msgid "Rewrite TTL in DNS responses."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:165
-msgid "Route"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:166
-msgid "Route options"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:23
-msgid "Routing Nodes"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:25
-msgid "Routing Rules"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:23
-msgid "Routing Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:82
-msgid "Routing mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:32
-msgid "Routing node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:102
-msgid "Routing ports"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:34
-msgid "Routing rule"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:22
-msgid "Rule Set"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:140
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:31
-msgid "Rule set"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:156
-msgid "Rule set IP CIDR as source IP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:68
-msgid "Rule set URL"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:141
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:97
-msgid "SSH"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:421
-msgid "STATUS UNKNOWN"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:98
-msgid "STUN"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:530
-msgid "SUoT version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:128
-msgid "Safari / Apple Network API"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:271
-msgid "Salamander"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:55
-msgid "Same as main node"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:284
-#: htdocs/luci-static/resources/view/homeproxy/status.js:290
-msgid "Save"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:768
-msgid "Save current settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:765
-msgid "Save subscriptions settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:236
-msgid "Send the query before pending race rules are judged (1.14)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:179
-#: htdocs/luci-static/resources/view/homeproxy/server.js:176
-msgid "Server"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:30
-msgid "Server Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:339
-msgid ""
-"Server name to use when choosing a certificate if the ClientHello's "
-"ServerName field is empty."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:171
-msgid "Server settings"
-msgstr ""
-
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:38
-msgid "Service Status"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:138
-msgid "ShadowTLS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:201
-msgid "ShadowTLS version"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:137
-msgid "Shadowsocks"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:29
-msgid ""
-"Since sing-box 1.14 the default (Unset) behaves as hijack: sing-box sets the "
-"platform interface DNS and hijacks port 53. On OpenWrt this overlaps with "
-"the own dnsmasq/nftables DNS hijack of this plugin, so keep Disabled on a "
-"gateway unless you need sing-box to own TUN DNS."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:139
-msgid "Snell (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:376
-#: htdocs/luci-static/resources/view/homeproxy/server.js:263
-msgid "Snell version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:124
-msgid "Sniffed client type (QUIC client type or SSH client name)."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:89
-msgid ""
-"Sniffed protocol, see <a target=\"_blank\" href=\"https://sing-"
-"box.sagernet.org/configuration/route/sniff/\">Sniff</a> for details."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:143
-msgid "Sniffer: advanced mode (100ms, universal list)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:140
-msgid "Socks"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:211
-msgid "Socks version"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:212
-msgid "Socks4"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:213
-msgid "Socks4A"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:214
-msgid "Socks5"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:495
-msgid "Source IP CIDR"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:513
-msgid "Source MAC address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:57
-msgid "Source file"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:518
-msgid "Source hostname"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:533
-msgid "Source port"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:538
-msgid "Source port range"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:411
-msgid ""
-"Specifies DNS server tag to use instead of selecting through DNS routing."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:21
-msgid ""
-"Specifies the period of time (in seconds) after which a health check will be "
-"performed using a ping frame if no frames have been received on the "
-"connection.<br/>Please note that a ping response is considered a received "
-"frame, so if there is no other traffic on the connection, the health check "
-"will be executed every interval."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:23
-msgid ""
-"Specifies the time (in seconds) until idle clients should be closed with a "
-"GOAWAY frame. PING frames are not considered as activity."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:26
-msgid ""
-"Specifies the timeout duration (in seconds) after sending a PING frame, "
-"within which a response must be received.<br/>If a response to the PING "
-"frame is not received within the specified timeout duration, the connection "
-"will be closed."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:103
-msgid ""
-"Specify target ports to be proxied. Multiple ports must be separated by "
-"commas."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:235
-msgid "Speculative"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:164
-msgid "Standard (default)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:43
-msgid "Store DNS cache"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:259
-msgid "String"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:693
-msgid "Sub (%s)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:720
-msgid "Subscription URL-s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:857
-msgid "Subscription update did not complete cleanly. Last log:"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:805
-msgid ""
-"Subscription update is already running. This page will reload when the "
-"previous run finishes."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:867
-msgid ""
-"Subscription update is taking longer than 90 seconds. Check the log and "
-"reload manually."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:704
-msgid "Subscriptions"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:639
-msgid "Successfully imported %s nodes of total %s."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:120
-msgid "Successfully updated."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:590
-#: htdocs/luci-static/resources/view/homeproxy/node.js:721
-msgid ""
-"Support Hysteria, Shadowsocks, Trojan, v2rayN (VMess), and XTLS (VLESS) "
-"online configuration delivery standard."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:125
-msgid ""
-"Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:160
-msgid "System"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:186
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:418
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:72
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:66
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:288
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:229
-msgid "System DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:106
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:241
-#: htdocs/luci-static/resources/view/homeproxy/server.js:622
-msgid "TCP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:514
-#: htdocs/luci-static/resources/view/homeproxy/server.js:600
-msgid "TCP fast open"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:154
-msgid "TCP/IP stack"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:155
-msgid "TCP/IP stack."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:650
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:99
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:242
-msgid "TLS"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:677
-msgid "TLS ALPN"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:672
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:272
-msgid "TLS SNI"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:377
-msgid "TLS fragment"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:718
-msgid "TLS handshake timeout in seconds. 15s is used by default."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:18
-msgid "TLS is not enforced. If TLS is not configured, plain HTTP 1.1 is used."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:371
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:379
-msgid "TLS record fragment"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:391
-msgid "TLS spoof SNI (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:398
-msgid "TLS spoof method (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:26
-msgid "TUN DNS"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:39
-msgid "TUN DNS addresses (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:28
-msgid "TUN DNS mode (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:281
-msgid ""
-"Tag of a another server to resolve the domain name in the address. Required "
-"if address contains domain."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:320
-msgid "Tag of an outbound for connecting to the dns server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:180
-msgid "Tag of the target dns server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:321
-msgid "Tag of the target outbound."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:252
-msgid ""
-"Tell the client to use the BBR flow control algorithm instead of Hysteria CC."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:132
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:167
-msgid "Tencent Public DNS (119.29.29.29)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:147
-msgid "Test URL"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:167
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:41
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:70
-msgid "Test interval"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:175
-msgid "Test interval must be less or equal than idle timeout."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:183
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:47
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:76
-msgid "Test tolerance"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:268
-msgid "Text DNS records to match in the evaluated answer."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:383
-msgid "The ACME CA provider to use."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:62
-msgid "The DNS strategy for resolving the domain name in the address."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:148
-msgid "The URL to test."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:250
-msgid "The address of the dns server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:434
-msgid ""
-"The alternate port to use for the ACME HTTP challenge; if non-empty, this "
-"port will be used instead of 80 to spin up a listener for the HTTP challenge."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:440
-msgid ""
-"The alternate port to use for the ACME TLS-ALPN challenge; the system must "
-"forward 443 to this port for challenge to succeed."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:66
-msgid ""
-"The default rule uses the following matching logic:<br/><code>(domain || "
-"domain_suffix || domain_keyword || domain_regex || ip_cidr || "
-"ip_is_private)</code> &&<br/><code>(port || port_range)</code> &&<br/"
-"><code>(source_ip_cidr || source_ip_is_private)</code> &&<br/"
-"><code>(source_port || source_port_range)</code> &&<br/><code>other fields</"
-"code>.<br/>Additionally, included rule sets can be considered merged rather "
-"than as a single rule sub-item."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:59
-msgid ""
-"The default rule uses the following matching logic:<br/><code>(domain || "
-"domain_suffix || domain_keyword || domain_regex)</code> &&<br/><code>(port "
-"|| port_range)</code> &&<br/><code>(source_ip_cidr || source_ip_is_private)</"
-"code> &&<br/><code>(source_port || source_port_range)</code> &&<br/"
-"><code>other fields</code>.<br/>Additionally, included rule sets can be "
-"considered merged rather than as a single rule sub-item."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:163
-msgid ""
-"The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:78
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:313
-msgid "The domain strategy for resolving the domain name in the address."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:709
-msgid ""
-"The elliptic curves that will be used in an ECDHE handshake, in preference "
-"order. If empty, the default will be used."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:345
-msgid ""
-"The email address to use when creating or selecting an existing ACME server "
-"account."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:385
-msgid ""
-"The fallback value in milliseconds used when TLS segmentation cannot "
-"automatically determine the wait time."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:191
-msgid "The idle timeout in seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:701
-msgid "The maximum TLS version that is acceptable."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:495
-msgid "The maximum time difference between the server and the client."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:693
-msgid "The minimum TLS version that is acceptable."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client.js:120
-#: htdocs/luci-static/resources/view/homeproxy/server.js:137
-msgid "The modern ImmortalWrt proxy platform for ARM64/AMD64."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:85
-#: htdocs/luci-static/resources/view/homeproxy/server.js:630
-msgid "The network interface to bind to."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:260
-msgid "The path of the DNS server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:447
-msgid ""
-"The path to the ECH config, in PEM format. If empty, load from DNS will be "
-"attempted."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:426
-msgid "The path to the server certificate, in PEM format."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:207
-msgid "The port must be unique."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:255
-msgid "The port of the DNS server."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:264
-msgid "The pre-shared key (password) above must be 12-255 bytes for v6."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:850
-msgid "The request %s failed: %s."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:294
-msgid "The response code."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:531
-msgid "The server private key, in PEM format."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:512
-msgid "The server public key, in PEM format."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:92
-msgid ""
-"The tag of the upstream outbound.<br/>Other dial fields will be ignored when "
-"enabled."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:168
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:42
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:71
-msgid "The test interval in seconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:184
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:48
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:77
-msgid "The test tolerance in milliseconds."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:28
-msgid ""
-"The timeout (in seconds) that after performing a keepalive check, the client "
-"will wait for activity. If no activity is detected, the connection will be "
-"closed."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:686
-#: htdocs/luci-static/resources/view/homeproxy/node.js:756
-msgid ""
-"This is <strong>DANGEROUS</strong>, your traffic is almost like "
-"<strong>PLAIN TEXT</strong>! Use at your own risk!"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:341
-msgid ""
-"This is the TUIC port of the UDP over TCP protocol, designed to provide a "
-"QUIC stream based UDP relay mode that TUIC does not provide."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:133
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:168
-msgid "ThreatBook Public DNS (117.50.10.10)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:365
-msgid ""
-"Timeout for UDP connections.<br/>Setting a larger value than the UDP timeout "
-"in inbounds will have no effect."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:624
-msgid ""
-"To be compatible with Xray-core, set this to <code>Sec-WebSocket-Protocol</"
-"code>."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:130
-msgid ""
-"To enable Tun support, you need to install <code>ip-full</code> and "
-"<code>kmod-tun</code>"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:178
-msgid "Trace"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:517
-msgid "Transport"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:142
-msgid "Trojan"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:143
-msgid "Tuic"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:128
-msgid "Tun TCP/UDP"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:461
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:239
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:49
-msgid "Type"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:107
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:240
-#: htdocs/luci-static/resources/view/homeproxy/server.js:623
-msgid "UDP"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:520
-#: htdocs/luci-static/resources/view/homeproxy/server.js:609
-msgid "UDP Fragment"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:24
-msgid "UDP NAT Settings"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:182
-#: htdocs/luci-static/resources/view/homeproxy/server.js:614
-msgid "UDP NAT expiration time"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:37
-msgid "UDP NAT filtering (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:26
-msgid "UDP NAT mapping (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:48
-msgid "UDP NAT sessions max (1.14)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:524
-msgid "UDP over TCP"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:340
-msgid "UDP over stream"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:333
-msgid "UDP packet relay mode."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:332
-msgid "UDP relay mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:364
-msgid "UDP timeout"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:52
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:27
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:56
-msgid "URLTest"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:127
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:34
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:63
-msgid "URLTest nodes"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:309
-msgid "UUID"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:132
-msgid "Unknown error."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:61
-msgid "Unknown error: %s"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:30
-msgid "Unset (default)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:488
-msgid "Unsupported fingerprint!"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:780
-msgid "Update %s subscriptions"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:123
-msgid "Update failed."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:132
-msgid "Update interval"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:133
-msgid "Update interval of rule set."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:775
-msgid "Update nodes from subscriptions"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:717
-msgid "Update subscriptions via proxy."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:710
-msgid "Update time"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:716
-msgid "Update via proxy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:813
-#: htdocs/luci-static/resources/view/homeproxy/node.js:825
-msgid "Updating subscriptions…"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:457
-msgid "Upload ECH config"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:184
-msgid "Upload bandwidth"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:185
-msgid "Upload bandwidth in Mbps."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:433
-#: htdocs/luci-static/resources/view/homeproxy/server.js:522
-msgid "Upload certificate"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:541
-msgid "Upload key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:436
-#: htdocs/luci-static/resources/view/homeproxy/node.js:460
-#: htdocs/luci-static/resources/view/homeproxy/server.js:525
-#: htdocs/luci-static/resources/view/homeproxy/server.js:544
-msgid "Upload..."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:328
-msgid "Use ACME TLS certificate issuer."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:144
-msgid ""
-"Use the tutorial-recommended sniffer profile (100ms timeout, http/tls/stun/"
-"quic/dns). Default keeps the 300ms / unconstrained-list behaviour."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:673
-msgid ""
-"Used to verify the hostname on the returned certificates unless insecure is "
-"given."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:273
-msgid "Used to verify the hostname on the returned certificates."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:136
-msgid "User"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:389
-msgid "User key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:750
-msgid "User-Agent"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:68
-#: htdocs/luci-static/resources/view/homeproxy/server.js:211
-msgid "Username"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:145
-msgid "VLESS"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:146
-msgid "VMess"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:126
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:164
-msgid "WAN DNS (read from interface)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:90
-msgid "WAN IP Policy"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:181
-msgid "Warn"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:523
-msgid "WebSocket"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:197
-msgid ""
-"When the main DNS returns a mainland China IP, re-resolve via China DNS "
-"using evaluate/match_response."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:741
-msgid "Whitelist mode"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:144
-msgid "WireGuard"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:308
-msgid "WireGuard peer public key."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:315
-msgid "WireGuard pre-shared key."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:300
-msgid "WireGuard requires base64-encoded private keys."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:92
-msgid "Write proxy protocol in the connection header."
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:633
-#: htdocs/luci-static/resources/view/homeproxy/node.js:763
-msgid "Xudp (Xray-core)"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1073
-msgid "Your %s was successfully uploaded. Size: %sB."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:385
-msgid "ZeroSSL"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:438
-#: htdocs/luci-static/resources/view/homeproxy/server.js:527
-msgid "certificate"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:358
-msgid "connect UDP connections"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:694
-#: htdocs/luci-static/resources/homeproxy.js:702
-msgid "default"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:91
-msgid "failed"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:519
-msgid "gRPC"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:560
-msgid "gRPC permit without stream"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:555
-msgid "gRPC service name"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:158
-msgid "gVisor"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:402
-#: htdocs/luci-static/resources/view/homeproxy/server.js:278
-msgid "http"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:220
-#: htdocs/luci-static/resources/homeproxy.js:1126
-#: htdocs/luci-static/resources/homeproxy.js:1146
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:140
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:175
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:141
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:72
-#: htdocs/luci-static/resources/view/homeproxy/node.js:484
-msgid "non-empty value"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:631
-#: htdocs/luci-static/resources/view/homeproxy/node.js:188
-#: htdocs/luci-static/resources/view/homeproxy/node.js:401
-#: htdocs/luci-static/resources/view/homeproxy/node.js:761
-#: htdocs/luci-static/resources/view/homeproxy/server.js:277
-msgid "none"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:632
-#: htdocs/luci-static/resources/view/homeproxy/node.js:762
-msgid "packet addr (v2ray-core v5+)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:88
-msgid "passed"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:546
-msgid "private key"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:127
-msgid "quic-go / uquic chrome"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:302
-msgid "sing-box client"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:41
-msgid ""
-"sing-box default; recommended for home use (accepts replies from any remote "
-"after mapping). Choose stricter only for specific UDP issues."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:30
-msgid ""
-"sing-box default; recommended for home use (small NAT table, QUIC/game "
-"friendly). Choose stricter only for specific UDP issues."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:377
-msgid ""
-"sing-box implements Snell v4/v5 wire as v4 and v6. The pre-shared key "
-"(Password above) must be 12-255 bytes for v6."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:305
-msgid "sing-box server"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:466
-msgid "uTLS fingerprint"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:467
-msgid ""
-"uTLS is a fork of \"crypto/tls\", which provides ClientHello fingerprinting "
-"resistance."
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/status.js:97
-msgid "unchecked"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1035
-msgid "unique UCI identifier"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1137
-msgid "unique value"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:809
-msgid "unknown error"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:94
-#: htdocs/luci-static/resources/view/homeproxy/node.js:202
-#: htdocs/luci-static/resources/view/homeproxy/node.js:531
-msgid "v1"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:95
-#: htdocs/luci-static/resources/view/homeproxy/node.js:203
-#: htdocs/luci-static/resources/view/homeproxy/node.js:532
-msgid "v2"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:204
-msgid "v3"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:383
-msgid "v4"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/server.js:269
-msgid "v5"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/node.js:384
-#: htdocs/luci-static/resources/view/homeproxy/server.js:270
-msgid "v6"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:152
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:156
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:186
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:190
-msgid "valid DNS server address"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:155
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:80
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:83
-#: htdocs/luci-static/resources/view/homeproxy/node.js:727
-#: htdocs/luci-static/resources/view/homeproxy/node.js:730
-msgid "valid URL"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1085
-msgid "valid base64 key with %d characters"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:203
-msgid "valid hostname"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1117
-msgid "valid port range (port1:port2)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:112
-msgid "valid port value"
-msgstr ""
-
-#: htdocs/luci-static/resources/homeproxy.js:1148
-msgid "valid uuid"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:402
-msgid "wrong-ack"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:401
-msgid "wrong-checksum"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:403
-msgid "wrong-md5"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:400
-msgid "wrong-sequence (default)"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:404
-msgid "wrong-timestamp"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:75
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:123
-msgid "{tag} in URL when extra tags are used"
-msgstr ""
-
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:126
-msgid "{tag} in initial path when extra tags are used"
-msgstr ""
diff --git a/luci-app-homeproxy-pro-pro/root/etc/uci-defaults/luci-homeproxy-pro-migration b/luci-app-homeproxy-pro-pro/root/etc/uci-defaults/luci-homeproxy-pro-migration
deleted file mode 100644
index a2082d0c2..000000000
--- a/luci-app-homeproxy-pro-pro/root/etc/uci-defaults/luci-homeproxy-pro-migration
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-ucode "/etc/homeproxy/scripts/migrate_config.uc"
-
-exit 0
diff --git a/luci-app-homeproxy-pro-pro/root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json b/luci-app-homeproxy-pro-pro/root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json
deleted file mode 100644
index 9892a9b97..000000000
--- a/luci-app-homeproxy-pro-pro/root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"admin/services/homeproxy": {
-		"title": "HomeProxy",
-		"order": 10,
-		"action": {
-			"type": "firstchild"
-		},
-		"depends": {
-			"acl": [ "luci-app-homeproxy" ],
-			"uci": { "homeproxy": true }
-		}
-	},
-	"admin/services/homeproxy/client": {
-		"title": "Client Settings",
-		"order": 10,
-		"action": {
-			"type": "view",
-			"path": "homeproxy/client"
-		}
-	},
-	"admin/services/homeproxy/node": {
-		"title": "Node Settings",
-		"order": 15,
-		"action": {
-			"type": "view",
-			"path": "homeproxy/node"
-		}
-	},
-	"admin/services/homeproxy/server": {
-		"title": "Server Settings",
-		"order": 20,
-		"action": {
-			"type": "view",
-			"path": "homeproxy/server"
-		}
-	},
-	"admin/services/homeproxy/status": {
-		"title": "Service Status",
-		"order": 30,
-		"action": {
-			"type": "view",
-			"path": "homeproxy/status"
-		}
-	}
-}
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_migrate_config.uc b/luci-app-homeproxy-pro-pro/tests/ucode/test_migrate_config.uc
deleted file mode 100644
index 1ef7dc628..000000000
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_migrate_config.uc
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/ucode
-/*
- * SPDX-License-Identifier: GPL-2.0-only
- *
- * Driver for tests/ucode/test_migrate_config.sh.
- *
- * migrate_config.uc has no exports: the migration executes at import
- * time and writes through a UCI cursor. The staged copy of
- * migrate_config.uc has been rewritten by the runner so its cursor
- * reads ARGV[0] (the sandbox dir) instead of /etc/config - so this
- * driver just imports it and lets the side effect run.
- *
- * The assertions below then re-read the sandbox and check the
- * post-state step by step, so a failure names the migration step
- * that regressed rather than "migrate broke something".
- */
-
-'use strict';
-
-import { cursor } from 'uci';
-
-import 'migrate_config';
-
-const uci = cursor(ARGV[0]);
-uci.load('homeproxy');
-
-let failures = 0,
-    checks = 0;
-
-function expect(name, actual, want) {
-	checks++;
-	if (sprintf('%J', actual) !== sprintf('%J', want)) {
-		printf('FAIL %s: expected %J, got %J\n', name, want, actual);
-		failures++;
-	}
-}
-
-/* --- infra section ---------------------------------------------------- */
-
-/* chinadns-ng removed: china_dns_port deleted. */
-expect('infra.china_dns_port deleted', uci.get('homeproxy', 'infra', 'china_dns_port'), null);
-
-/* github_token moved from infra to config. */
-expect('config.github_token set', uci.get('homeproxy', 'config', 'github_token'), 'secret');
-expect('infra.github_token deleted', uci.get('homeproxy', 'infra', 'github_token'), null);
-
-/* ntp_server introduced, defaults to the 'nil' sentinel. */
-expect('infra.ntp_server default', uci.get('homeproxy', 'infra', 'ntp_server'), 'nil');
-
-/* tun_gso deprecated in sing-box 1.11: absent here, so nothing to do -
- * assert it stays absent rather than flapping to a default. */
-expect('infra.tun_gso stays absent', uci.get('homeproxy', 'infra', 'tun_gso'), null);
-
-/* --- config section --------------------------------------------------- */
-
-/* single-value chinadns server: legacy 'wan_114' maps to 114.114.114.114. */
-expect('config.china_dns_server→114', uci.get('homeproxy', 'config', 'china_dns_server'), '114.114.114.114');
-
-/* log_level introduced, defaults to 'warn'. */
-expect('config.log_level default', uci.get('homeproxy', 'config', 'log_level'), 'warn');
-
-/* routing_port='all' means "every port" = no option at all. */
-expect('config.routing_port deleted', uci.get('homeproxy', 'config', 'routing_port'), null);
-
-/* --- dns section ------------------------------------------------------ */
-
-/* default_server='block-dns' becomes 'default-dns' plus an appended
- * reject rule that reproduces the old "block everything" behaviour. */
-expect('dns.default_server→default-dns', uci.get('homeproxy', 'dns', 'default_server'), 'default-dns');
-expect('dns final-block action', uci.get('homeproxy', '_migration_dns_final_block', 'action'), 'reject');
-expect('dns final-block enabled', uci.get('homeproxy', '_migration_dns_final_block', 'enabled'), '1');
-
-/* sing-box 1.14 deprecated DNS semantics. */
-expect('dns.independent_cache deleted', uci.get('homeproxy', 'dns', 'independent_cache'), null);
-expect('dns.store_rdrc→store_dns', uci.get('homeproxy', 'dns', 'cache_file_store_dns'), '1');
-expect('dns.store_rdrc deleted', uci.get('homeproxy', 'dns', 'cache_file_store_rdrc'), null);
-expect('dns.rdrc_timeout deleted', uci.get('homeproxy', 'dns', 'cache_file_rdrc_timeout'), null);
-
-/* --- dns_server: legacy address form ---------------------------------- */
-
-/* 'tls://1.1.1.1:853' splits into type/server/server_port, and the
- * legacy address key is dropped so the generator stops reading it. */
-expect('ds_default.type', uci.get('homeproxy', 'ds_default', 'type'), 'tls');
-expect('ds_default.server', uci.get('homeproxy', 'ds_default', 'server'), '1.1.1.1');
-expect('ds_default.server_port', uci.get('homeproxy', 'ds_default', 'server_port'), '853');
-expect('ds_default.address deleted', uci.get('homeproxy', 'ds_default', 'address'), null);
-
-/* strategy / client_subnet moved out of the dns_server and into the
- * dns_rule that referenced it. */
-expect('ds_default.strategy deleted', uci.get('homeproxy', 'ds_default', 'strategy'), null);
-expect('ds_default.client_subnet deleted', uci.get('homeproxy', 'ds_default', 'client_subnet'), null);
-expect('dr_uses_default.strategy', uci.get('homeproxy', 'dr_uses_default', 'strategy'), 'prefer_ipv4');
-expect('dr_uses_default.client_subnet', uci.get('homeproxy', 'dr_uses_default', 'client_subnet'), '1.2.3.0/24');
-
-/* RCode-as-address migrated into the predefined-rcode rule form; the
- * dns_server section itself is removed. */
-expect('ds_rcode section deleted', uci.get_all('homeproxy', 'ds_rcode'), null);
-
-/* --- dns_rule --------------------------------------------------------- */
-
-/* server='block-dns' moved into action='reject'. */
-expect('dr_block.action=reject', uci.get('homeproxy', 'dr_block', 'action'), 'reject');
-expect('dr_block.server deleted', uci.get('homeproxy', 'dr_block', 'server'), null);
-
-/* rule_set_ipcidr_match_source renamed to rule_set_ip_cidr_match_source. */
-expect('dr_stale.old key deleted', uci.get('homeproxy', 'dr_stale', 'rule_set_ipcidr_match_source'), null);
-expect('dr_stale.new key set', uci.get('homeproxy', 'dr_stale', 'rule_set_ip_cidr_match_source'), '1');
-
-/* a rule with no action gets the 'route' default. */
-expect('dr_uses_default.action=route', uci.get('homeproxy', 'dr_uses_default', 'action'), 'route');
-
-/* --- routing_rule ----------------------------------------------------- */
-
-/* outbound='block-out' moved into action='reject'. */
-expect('rr_block.action=reject', uci.get('homeproxy', 'rr_block', 'action'), 'reject');
-expect('rr_block.outbound deleted', uci.get('homeproxy', 'rr_block', 'outbound'), null);
-
-/* --- server ----------------------------------------------------------- */
-
-/* auto_firewall was a single global flag; it is redistributed onto
- * each server section as firewall='1'. */
-expect('srv_one.firewall set', uci.get('homeproxy', 'srv_one', 'firewall'), '1');
-expect('server.auto_firewall deleted', uci.get('homeproxy', 'server', 'auto_firewall'), null);
-
-/* sniff_override deprecated in sing-box 1.11. */
-expect('srv_one.sniff_override deleted', uci.get('homeproxy', 'srv_one', 'sniff_override'), null);
-
-/* server log_level introduced, defaults to 'warn'. */
-expect('server.log_level default', uci.get('homeproxy', 'server', 'log_level'), 'warn');
-
-/* --- migration bookkeeping -------------------------------------------- */
-
-/* the migration marker section must survive so the crontab cleanup
- * does not run twice. */
-expect('migration.crontab marker', uci.get('homeproxy', 'migration', 'crontab'), '1');
-
-/* --- summary ---------------------------------------------------------- */
-
-if (failures > 0)
-	printf('FAIL: %d/%d checks failed\n', failures, checks);
-else
-	printf('PASS: %d checks\n', checks);
-
-exit(failures > 0 ? 1 : 0);
diff --git a/luci-app-homeproxy-pro-pro/.gitignore b/luci-app-homeproxy-pro/.gitignore
similarity index 53%
rename from luci-app-homeproxy-pro-pro/.gitignore
rename to luci-app-homeproxy-pro/.gitignore
index 8c9d5901a..1634f28a2 100644
--- a/luci-app-homeproxy-pro-pro/.gitignore
+++ b/luci-app-homeproxy-pro/.gitignore
@@ -1,3 +1,3 @@
 .DS_Store
-/homeproxy
+/homeproxy-pro
 /docs/
diff --git a/luci-app-homeproxy-pro-pro/LICENSE b/luci-app-homeproxy-pro/LICENSE
similarity index 100%
rename from luci-app-homeproxy-pro-pro/LICENSE
rename to luci-app-homeproxy-pro/LICENSE
diff --git a/luci-app-homeproxy-pro-pro/Makefile b/luci-app-homeproxy-pro/Makefile
similarity index 74%
rename from luci-app-homeproxy-pro-pro/Makefile
rename to luci-app-homeproxy-pro/Makefile
index 880c463b1..54de3d01f 100644
--- a/luci-app-homeproxy-pro-pro/Makefile
+++ b/luci-app-homeproxy-pro/Makefile
@@ -21,9 +21,9 @@ LUCI_DEPENDS:= \
     +kmod-tun \
 	+ucode-mod-digest
 
-PKG_NAME:=luci-app-homeproxy
+PKG_NAME:=luci-app-homeproxy-pro
 PKG_VERSION:=28.9.1.14
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 # Only files the package actually ships belong here.  The previous list named
 # four paths that exist nowhere in the tree - certs/ and ruleset/ are created at
@@ -31,16 +31,16 @@ PKG_RELEASE:=2
 # those declarations did nothing.  What is listed instead is the resource data
 # the router updates by itself: on a running device those files are newer than
 # the ones in the package, and without this an upgrade would overwrite them.
-define Package/luci-app-homeproxy/conffiles
-/etc/config/homeproxy
-/etc/homeproxy/resources/china_ip4.txt
-/etc/homeproxy/resources/china_ip6.txt
-/etc/homeproxy/resources/china_list.txt
-/etc/homeproxy/resources/gfw_list.txt
-/etc/homeproxy/resources/china_ip4.ver
-/etc/homeproxy/resources/china_ip6.ver
-/etc/homeproxy/resources/china_list.ver
-/etc/homeproxy/resources/gfw_list.ver
+define Package/luci-app-homeproxy-pro/conffiles
+/etc/config/homeproxy-pro
+/etc/homeproxy-pro/resources/china_ip4.txt
+/etc/homeproxy-pro/resources/china_ip6.txt
+/etc/homeproxy-pro/resources/china_list.txt
+/etc/homeproxy-pro/resources/gfw_list.txt
+/etc/homeproxy-pro/resources/china_ip4.ver
+/etc/homeproxy-pro/resources/china_ip6.ver
+/etc/homeproxy-pro/resources/china_list.ver
+/etc/homeproxy-pro/resources/gfw_list.ver
 endef
 
 include $(TOPDIR)/feeds/luci/luci.mk
diff --git a/luci-app-homeproxy-pro-pro/README.md b/luci-app-homeproxy-pro/README.md
similarity index 82%
rename from luci-app-homeproxy-pro-pro/README.md
rename to luci-app-homeproxy-pro/README.md
index 79afe11de..7c64b2ee3 100644
--- a/luci-app-homeproxy-pro-pro/README.md
+++ b/luci-app-homeproxy-pro/README.md
@@ -10,7 +10,7 @@
 
 ## 项目定位
 
-本项目是试验性产品，对 [homeproxy](https://github.com/szwjp/luci-app-homeproxy) 架构重构版：以 sing-box **1.14** 内核为唯一目标，
+本项目是试验性产品，对 [homeproxy-pro](https://github.com/szwjp/luci-app-homeproxy-pro) 架构重构版：以 sing-box **1.14** 内核为唯一目标，
 充分利用 1.14 引入的新特性，不再兼容 1.13 及更早内核。
 
 ## 运行要求
@@ -23,16 +23,16 @@
 
 | 维度 | upstream 形态 | pro 形态 | 证据 |
 |---|---|---|---|
-| 后端架构 | 单文件巨型（`generate_client.uc` 1217 行 / 40 KB；`parse_uri.uc` ~400 行 / 15 KB） | orchestrator + 5 子层（`parser` / `config` / `generator` / `subscription` / `runtime`）+ 公共库（`homeproxy.uc` / `firewall_utils.uc`）+ table-driven adapters | `root/etc/homeproxy/scripts/{config,parser,generator,subscription,runtime}/` |
-| 前端架构 | 单一 66 KB `client.js` | `client.js` thin 入口 + 8 个 Tab 模块（`access` / `common` / `dns` / `nodes` / `routing` / `subscription` / `tun_dns` / `udp_nat`）+ 共享 helpers + 集中 `RPC.declare` | `htdocs/luci-static/resources/view/homeproxy/client/` |
-| 协议建模 | 单 `parse_uri.uc` 内 13 个 scheme 分支 | `parser/{uri,flatten,normalize,mapping,protocols,validator}.uc` 6 个文件 + canonical Node 模型 + adapter table | `root/etc/homeproxy/scripts/parser/` + `config/{model,adapter}.uc` |
-| Tab 模块化 | 1 个 `client.js` 含 12 个 Tab 渲染 | `homeproxy.js` (1153 行 helpers) + 4 顶层 view + 8 个 `client/*.js`；helpers 集中 RPC / MD5 / validators / statusPoller / renderSectionAdd / uploadCertificate | `view/homeproxy/client/{routing,nodes,dns,access,subscription,udp_nat,tun_dns,common}.js` |
+| 后端架构 | 单文件巨型（`generate_client.uc` 1217 行 / 40 KB；`parse_uri.uc` ~400 行 / 15 KB） | orchestrator + 5 子层（`parser` / `config` / `generator` / `subscription` / `runtime`）+ 公共库（`homeproxy-pro.uc` / `firewall_utils.uc`）+ table-driven adapters | `root/etc/homeproxy-pro/scripts/{config,parser,generator,subscription,runtime}/` |
+| 前端架构 | 单一 66 KB `client.js` | `client.js` thin 入口 + 8 个 Tab 模块（`access` / `common` / `dns` / `nodes` / `routing` / `subscription` / `tun_dns` / `udp_nat`）+ 共享 helpers + 集中 `RPC.declare` | `htdocs/luci-static/resources/view/homeproxy-pro/client/` |
+| 协议建模 | 单 `parse_uri.uc` 内 13 个 scheme 分支 | `parser/{uri,flatten,normalize,mapping,protocols,validator}.uc` 6 个文件 + canonical Node 模型 + adapter table | `root/etc/homeproxy-pro/scripts/parser/` + `config/{model,adapter}.uc` |
+| Tab 模块化 | 1 个 `client.js` 含 12 个 Tab 渲染 | `homeproxy-pro.js` (1153 行 helpers) + 4 顶层 view + 8 个 `client/*.js`；helpers 集中 RPC / MD5 / validators / statusPoller / renderSectionAdd / uploadCertificate | `view/homeproxy-pro/client/{routing,nodes,dns,access,subscription,udp_nat,tun_dns,common}.js` |
 
 ### 稳定性
 
 | 维度 | upstream 形态 | pro 形态 | 证据 |
 |---|---|---|---|
-| reload 事务 | 写完直接 restart | 生成 → `sing-box check` → 新实例 probe → 健康门（连续采样）→ 提为 known-good；不健康自动回滚 | `root/etc/init.d/homeproxy` + `runtime/{config,health}.sh` |
+| reload 事务 | 写完直接 restart | 生成 → `sing-box check` → 新实例 probe → 健康门（连续采样）→ 提为 known-good；不健康自动回滚 | `root/etc/init.d/homeproxy-pro` + `runtime/{config,health}.sh` |
 | 健康门 | `ubus` + `pgrep` 简单轮询 | `hp_wait_service` 连续 N 次采样（默认 3/30s）+ `netstat -p` 端口归属校验；不健康自动 rollback | `runtime/health.sh:hp_wait_service` |
 | UCI 1.14 迁移 | r10/r11 自述较弱 | `migrate_config.uc` 36 checks 覆盖 1.14 DNS renames / `dns_server.address` 拆分 / `rcode://` → predefined rule / `rule_set_ipcidr_match_source` rename / `block-out`/`block-dns` → `action='reject'` / `auto_firewall` 重分发 / `block-dns` default-server | `scripts/migrate_config.uc` + `tests/ucode/test_migrate_config.sh` |
 | sing-box 版本门 | 无 | `hp_require_singbox()` 在 start 时显式拒绝 `<1.14`，启动失败记录明确日志 | `runtime/service.sh:hp_require_singbox` |
@@ -41,12 +41,12 @@
 
 | 维度 | upstream 形态 | pro 形态 | 证据 |
 |---|---|---|---|
-| capabilities | `CAP_SYS_PTRACE` + `CAP_NET_RAW` + `CAP_NET_ADMIN` + `CAP_NET_BIND_SERVICE`（4 个） | 仅 `CAP_NET_ADMIN` + `CAP_NET_BIND_SERVICE`（2 个） | `root/etc/capabilities/homeproxy.json` + arch-guard guard 12 |
-| 路径白名单（cert / rule） | 仅前端 UI 校验 | `validateHomeProxyPath()` 拒 traversal + relative，限 `/etc/homeproxy/` 与 `/tmp/homeproxy_*`；`validateCertificatePath()` 限 `/etc/homeproxy/certs/` `/etc/acme/` `/etc/ssl/`；前后端列表 arch-guard 29 锁同步 | `homeproxy.uc:56 / :104` + `homeproxy.js:HP_CERT_PATH_ROOTS` |
-| 订阅 token 脱敏 | 调用点各自脱敏 | `wGETVerbose()` 内部脱敏（scheme/host/port 保留，userinfo / path / query 全脱；mock 与生产 `redactUrl` 由 arch-guard 35 锁一致） | `homeproxy.uc:226 (redactUrl)` + arch-guard 14 / 35 |
+| capabilities | `CAP_SYS_PTRACE` + `CAP_NET_RAW` + `CAP_NET_ADMIN` + `CAP_NET_BIND_SERVICE`（4 个） | 仅 `CAP_NET_ADMIN` + `CAP_NET_BIND_SERVICE`（2 个） | `root/etc/capabilities/homeproxy-pro.json` + arch-guard guard 12 |
+| 路径白名单（cert / rule） | 仅前端 UI 校验 | `validateHomeProxyPath()` 拒 traversal + relative，限 `/etc/homeproxy-pro/` 与 `/tmp/homeproxy_*`；`validateCertificatePath()` 限 `/etc/homeproxy-pro/certs/` `/etc/acme/` `/etc/ssl/`；前后端列表 arch-guard 29 锁同步 | `homeproxy-pro.uc:56 / :104` + `homeproxy-pro.js:HP_CERT_PATH_ROOTS` |
+| 订阅 token 脱敏 | 调用点各自脱敏 | `wGETVerbose()` 内部脱敏（scheme/host/port 保留，userinfo / path / query 全脱；mock 与生产 `redactUrl` 由 arch-guard 35 锁一致） | `homeproxy-pro.uc:226 (redactUrl)` + arch-guard 14 / 35 |
 | crontab 权限 | `sed -i`（GNU-only）+ mv 后留给 0644 | `sed + mv` 跨 busybox / GNU / BSD + `chmod 600` 修 root crontab 0644 → 0600 | `runtime/service.sh:hp_crontab_drop` |
 | procd jail mount | 默认未对所有模式 mount | tun/wireguard 自动 unjail（要 host netns），其他模式 mount HP_DIR + /etc/acme + /etc/ssl + /tmp/dhcp.leases + /etc/localtime + /etc/TZ | `runtime/service.sh:hp_procd_client_instance` |
-| cert upload 并发 | 4 个按钮共用 `/tmp/homeproxy_certificate.tmp` | 4 个按钮各自 `/tmp/homeproxy_cert_<name>.tmp`，ACL 显式列 4 个写路径 | `homeproxy.js:uploadCertificate` + `acl.d/luci-app-homeproxy.json` |
+| cert upload 并发 | 4 个按钮共用 `/tmp/homeproxy_certificate.tmp` | 4 个按钮各自 `/tmp/homeproxy_cert_<name>.tmp`，ACL 显式列 4 个写路径 | `homeproxy-pro.js:uploadCertificate` + `acl.d/luci-app-homeproxy-pro.json` |
 | firewall 字段白名单 | 部分值校验 | `firewall_pre.uc` `tun_name` 严格 `^[A-Za-z0-9_.-]{1,15}$` 防 nft 注入；`firewall_post.ut` 每个 UCI 派生值走 `*_to_nftarr()` 校验器（guard 11 锁模板全覆盖） | `firewall_pre.uc:32` + `firewall_utils.uc` |
 
 ### 测试 / CI
@@ -57,20 +57,20 @@
 | 测试规模 | 7 个脚本 / 约 27 个 check | `tests/` 下 80 个文件：ucode 套件 + 8 个 frontend 验证器 + golden snapshot + mocks + 离线 runtime 测试；arch-guard 单跑 135 个 check | `tests/print-stats.sh` 实测 |
 | CI | `build` + `i18n` 两条平行 workflow | `build` 用 `workflow_call` 依赖 `arch-test`；`arch-test` 8 步（翻译 fast gate → toolchain cache → toolchain 校验 → `tests/run.sh` 唯一套件入口 → 模板检查）；`on-target` 手动 ssh + 不安装 | `.github/workflows/{arch-test,build,on-target}.yml` |
 | uCode dialect pin | 跟随 upstream HEAD（已放宽） | pin `UCODE_REV=85922056ef7abeace3cca3ab28bc1ac2d88e31b1`（完整 40 位 commit）+ `test_ucode_grammar.sh` canary 锁 strict 语法（拒 `export function … }` 无 `;`、对象/数组解构） | `tests/toolchain/build-ucode-linux.sh:UCODE_REV` + `tests/ucode/test_ucode_grammar.sh` |
-| MD5 实现 | 388 行 minified snippet；vmess 分支漏 `vmess_global_padding` | RFC 1321 完整实现 + `tests/frontend-md5.js` 锁 RFC 向量 + 与 Node `crypto.createHash('md5')` 双向 cross-check（44 / 44 PASS） | `homeproxy.js:calcStringMD5` + `tests/frontend-md5.js` |
+| MD5 实现 | 388 行 minified snippet；vmess 分支漏 `vmess_global_padding` | RFC 1321 完整实现 + `tests/frontend-md5.js` 锁 RFC 向量 + 与 Node `crypto.createHash('md5')` 双向 cross-check（44 / 44 PASS） | `homeproxy-pro.js:calcStringMD5` + `tests/frontend-md5.js` |
 
 ### UX / Ops
 
 | 维度 | upstream 形态 | pro 形态 | 证据 |
 |---|---|---|---|
-| Status 语义 | 2 态（RUNNING / NOT RUNNING） | 3 态（+ **STATUS UNKNOWN** 黄），区分 "rpc 没回" vs "service 死了" | `homeproxy.js:statusLabel` + `client.js:renderStatus` |
-| 前端特异性 bug 修复 | `stubValidator` 缺 `factory` 致 ip6addr TypeError；`L.bind(hp.renderSectionAdd, …)` 把 factory 塞 `extra_class` 槽致 `InvalidCharacterError` | 已修：`stubValidator` 持 `factory: validation`；`renderSectionAdd` 改薄 wrap（arch-guard 22 / 23 锁 binding 形态） | `view/homeproxy/client.js:73` + `homeproxy.js:1018-1026` |
+| Status 语义 | 2 态（RUNNING / NOT RUNNING） | 3 态（+ **STATUS UNKNOWN** 黄），区分 "rpc 没回" vs "service 死了" | `homeproxy-pro.js:statusLabel` + `client.js:renderStatus` |
+| 前端特异性 bug 修复 | `stubValidator` 缺 `factory` 致 ip6addr TypeError；`L.bind(hp.renderSectionAdd, …)` 把 factory 塞 `extra_class` 槽致 `InvalidCharacterError` | 已修：`stubValidator` 持 `factory: validation`；`renderSectionAdd` 改薄 wrap（arch-guard 22 / 23 锁 binding 形态） | `view/homeproxy-pro/client.js:73` + `homeproxy-pro.js:1018-1026` |
 | 协议增改成本 | 改 110 行 ternary（README 旧行） | 改 5 个表行：`model.uc CREDENTIALS` + `loader.uc PROTOCOL_OPTIONS` + `adapter.uc OPTION_FIELDS` + `fixtures/` + golden snapshot；arch-guard 5 强制 fixtures 同步 | `config/{model,loader,adapter}.uc` + `tests/fixtures/generators/` |
 | 资源更新 | jsdelivr 单一镜像 | 4 镜像 fallback（`fastly.jsdelivr.net` / `gcore.jsdelivr.net` / `cdn.jsdelivr.net` / `raw.githubusercontent.com`）+ UI「上次成功时间」（arch-guard 17 / 18 锁） | `runtime/dns.sh` + arch-guard 17 / 18 |
-| ECH 上传 | 后端 case 缺失 | 补齐 `client_ech_conf` 标签 + `isValidECHConfig()` PEM 校验；ACL 显式列 4 个 tmp 路径 | `homeproxy.uc:isValidECHConfig` + `luci.homeproxy:certificate_write` |
+| ECH 上传 | 后端 case 缺失 | 补齐 `client_ech_conf` 标签 + `isValidECHConfig()` PEM 校验；ACL 显式列 4 个 tmp 路径 | `homeproxy-pro.uc:isValidECHConfig` + `luci.homeproxy-pro:certificate_write` |
 | 默认测试主机 | 硬编码作者内网 IP | `HP_TEST_HOST` 注入，未设时 fail-fast；`on-target.yml` ；ssh 前 `ssh -o ConnectTimeout=10` 先确认可达（不要从记忆里写地址） | `tests/run.sh` + `.github/workflows/on-target.yml` |
 | 文档 | 标准（README + CONTRIBUTING + SECURITY） | 精简（README only），`docs/` 自 2026-09-16 起只留本地（untrack + `.gitignore`），远端公开仓库不再发布 | `README.md` + `docs/`（本地） |
-| 路由 ops | — | 替换文件只动 JS / menu / acl / rpcd ucode（reload 不影响网络）；更深层改动前 `cp /etc/config/homeproxy /tmp/hp-r<NN>-preflight-<DATE>/`，保留上一发版 .apk 24h；`killall -HUP rpcd` 由 apk scripts 自动做 | `runtime/{config,service}.sh` |
+| 路由 ops | — | 替换文件只动 JS / menu / acl / rpcd ucode（reload 不影响网络）；更深层改动前 `cp /etc/config/homeproxy-pro /tmp/hp-r<NN>-preflight-<DATE>/`，保留上一发版 .apk 24h；`killall -HUP rpcd` 由 apk scripts 自动做 | `runtime/{config,service}.sh` |
 
 **一句话总结**：pro 的核心价值是**把"单文件能跑"变成"orchestrator + table-driven adapter + 可独立测试的模块"**，并把约束、质量、回滚三件事从靠人盯变成靠代码执行（arch-guard 135 checks 静态锁住跨文件不变量）。
 
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/homeproxy-pro.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/homeproxy-pro.js
similarity index 97%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/homeproxy-pro.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/homeproxy-pro.js
index 9f30fb0d1..8949aedb8 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/homeproxy-pro.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/homeproxy-pro.js
@@ -28,11 +28,11 @@ const HTTP_PING_HEALTH_CHECK_HINT = _('Specifies the timeout duration (in second
 const HTTP_PING_KEEPALIVE_HINT = _('The timeout (in seconds) that after performing a keepalive check, the client will wait for activity. If no activity is detected, the connection will be closed.');
 
 /* Certificates the backend lets sing-box read. This list mirrors
-   CERT_PATH_ROOTS in /etc/homeproxy/scripts/homeproxy.uc, and
+   CERT_PATH_ROOTS in /etc/homeproxy-pro/scripts/homeproxy-pro.uc, and
    tests/arch-guard.sh guard 29 fails when the two drift apart: a path the UI
    accepted but the backend dropped made certificate_path null silently, so the
    TLS listener failed with nothing pointing at the path. */
-const HP_CERT_PATH_ROOTS = [ '/etc/homeproxy/certs/', '/etc/acme/', '/etc/ssl/' ];
+const HP_CERT_PATH_ROOTS = [ '/etc/homeproxy-pro/certs/', '/etc/acme/', '/etc/ssl/' ];
 
 /* Methods whose failure has already been reported, so that a polled call
    cannot repeat the same notification every few seconds. */
@@ -525,7 +525,7 @@ return baseclass.extend({
 		o.depends('type', 'vless');
 		o.depends('type', 'vmess');
 		o.onchange = function(ev, section_id, value) {
-			let desc = this.map.findElement('id', 'cbid.homeproxy.%s.transport'.format(section_id)).nextElementSibling;
+			let desc = this.map.findElement('id', 'cbid.homeproxy-pro.%s.transport'.format(section_id)).nextElementSibling;
 			if (value === 'http')
 				desc.innerHTML = TRANSPORT_HTTP_HINT;
 			else if (value === 'quic')
@@ -533,20 +533,20 @@ return baseclass.extend({
 			else
 				desc.innerHTML = TRANSPORT_NONE_HINT;
 
-			let tls = this.map.findElement('id', 'cbid.homeproxy.%s.tls'.format(section_id)).firstElementChild;
+			let tls = this.map.findElement('id', 'cbid.homeproxy-pro.%s.tls'.format(section_id)).firstElementChild;
 			if ((value === 'http' && tls.checked) || (value === 'grpc' && !features.with_grpc)) {
-				this.map.findElement('id', 'cbid.homeproxy.%s.http_idle_timeout'.format(section_id)).nextElementSibling.innerHTML =
+				this.map.findElement('id', 'cbid.homeproxy-pro.%s.http_idle_timeout'.format(section_id)).nextElementSibling.innerHTML =
 					(side === 'server') ? HTTP_IDLE_GOAWAY_HINT : HTTP_IDLE_HEALTH_CHECK_HINT;
 
 				if (side !== 'server')
-					this.map.findElement('id', 'cbid.homeproxy.%s.http_ping_timeout'.format(section_id)).nextElementSibling.innerHTML =
+					this.map.findElement('id', 'cbid.homeproxy-pro.%s.http_ping_timeout'.format(section_id)).nextElementSibling.innerHTML =
 						HTTP_PING_HEALTH_CHECK_HINT;
 			} else if (value === 'grpc' && features.with_grpc) {
-				this.map.findElement('id', 'cbid.homeproxy.%s.http_idle_timeout'.format(section_id)).nextElementSibling.innerHTML =
+				this.map.findElement('id', 'cbid.homeproxy-pro.%s.http_idle_timeout'.format(section_id)).nextElementSibling.innerHTML =
 					HTTP_IDLE_KEEPALIVE_HINT;
 
 				if (side !== 'server')
-					this.map.findElement('id', 'cbid.homeproxy.%s.http_ping_timeout'.format(section_id)).nextElementSibling.innerHTML =
+					this.map.findElement('id', 'cbid.homeproxy-pro.%s.http_ping_timeout'.format(section_id)).nextElementSibling.innerHTML =
 						HTTP_PING_KEEPALIVE_HINT;
 			}
 		}
@@ -655,7 +655,7 @@ return baseclass.extend({
 		o.validate = function(section_id, _value) {
 			if (section_id) {
 				let type = this.map.lookupOption('type', section_id)[0].formvalue(section_id);
-				let tls = this.map.findElement('id', 'cbid.homeproxy.%s.tls'.format(section_id)).firstElementChild;
+				let tls = this.map.findElement('id', 'cbid.homeproxy-pro.%s.tls'.format(section_id)).firstElementChild;
 
 				if ((options.tls_forced_types || []).includes(type)) {
 					tls.checked = true;
@@ -833,7 +833,7 @@ return baseclass.extend({
 	 * this only covers "the call did not come back". */
 	rpcCall(method, args, options) {
 		options = options || {};
-		const object = options.object || 'luci.homeproxy';
+		const object = options.object || 'luci.homeproxy-pro';
 
 		const call = rpc.declare({
 			object: object,
@@ -868,7 +868,7 @@ return baseclass.extend({
 	 * that had already drifted (its vmess branch lost vmess_global_padding)
 	 * and that validated nothing before writing the node into UCI. */
 	parseShareLink(uri) {
-		/* Backend (luci.homeproxy node_parse) returns one of
+		/* Backend (luci.homeproxy-pro node_parse) returns one of
 		 *   { config: {...the-node-fields}, error: '' }      on success
 		 *   { config: null,               error: '...' }   on failure
 		 * (rpcParse's `expect` would unpack-and-type-check, which the
@@ -1061,7 +1061,7 @@ return baseclass.extend({
 		 * land in the certs/ directory. The filename argument is the
 		 * UCI option name (e.g. server_publickey), which we map onto
 		 * a stable per-button path. The ACL write list in
-		 * acl.d/luci-app-homeproxy.json enumerates all four paths.
+		 * acl.d/luci-app-homeproxy-pro.json enumerates all four paths.
 		 *
 		 * The signature is (type, filename, ev) on purpose: L.bind()
 		 * binds arguments *in front of* the event the Button hands in
@@ -1103,7 +1103,7 @@ return baseclass.extend({
 			   /etc/ssl/../shadow, and sing-box reads these paths as root. */
 			if (value.match(/(^|\/)\.\.(\/|$)/) ||
 			    !HP_CERT_PATH_ROOTS.some((root) => value.indexOf(root) === 0 && value.length > root.length))
-				return _('Expecting: %s').format(_('/etc/homeproxy/certs/..., /etc/acme/..., /etc/ssl/...'));
+				return _('Expecting: %s').format(_('/etc/homeproxy-pro/certs/..., /etc/acme/..., /etc/ssl/...'));
 
 		return true;
 	},
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client.js
similarity index 87%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client.js
index 56019dfc1..be5e03ae9 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client.js
@@ -13,15 +13,15 @@
 'require validation';
 'require view';
 
-'require homeproxy as hp';
-'require view.homeproxy.client.common as common';
-'require view.homeproxy.client.routing as routing';
-'require view.homeproxy.client.nodes as nodes';
-'require view.homeproxy.client.dns as dns';
-'require view.homeproxy.client.access as access';
-'require view.homeproxy.client.subscription as subscription';
-'require view.homeproxy.client.udp_nat as udp_nat';
-'require view.homeproxy.client.tun_dns as tun_dns';
+'require homeproxy-pro as hp';
+'require view.homeproxy-pro.client.common as common';
+'require view.homeproxy-pro.client.routing as routing';
+'require view.homeproxy-pro.client.nodes as nodes';
+'require view.homeproxy-pro.client.dns as dns';
+'require view.homeproxy-pro.client.access as access';
+'require view.homeproxy-pro.client.subscription as subscription';
+'require view.homeproxy-pro.client.udp_nat as udp_nat';
+'require view.homeproxy-pro.client.tun_dns as tun_dns';
 
 /* Module-scoped guard: register the view-level status poll exactly
  * once, regardless of how many times the view's render() runs (LuCI
@@ -39,13 +39,13 @@ function getServiceStatus() {
 	 * "the status query did not answer" from "the service is not running".
 	 * With the default `{}` the try/catch below swallowed the difference and
 	 * reported a failed query as NOT RUNNING. */
-	return hp.rpcCall('list', ['homeproxy'],
+	return hp.rpcCall('list', ['homeproxy-pro'],
 			{ object: 'service', params: ['name'], expect: { '': {} }, fallback: null }).then((res) => {
 		if (res === null)
 			return null;
 
 		try {
-			return res['homeproxy']['instances']['sing-box-c']['running'] === true;
+			return res['homeproxy-pro']['instances']['sing-box-c']['running'] === true;
 		} catch (e) {
 			/* It answered, and there is no such instance. */
 			return false;
@@ -93,7 +93,7 @@ let stubValidator = {
 return view.extend({
 	load() {
 		return Promise.all([
-			uci.load('homeproxy'),
+			uci.load('homeproxy-pro'),
 			hp.getBuiltinFeatures(),
 			network.getHostHints()
 		]);
@@ -107,7 +107,7 @@ return view.extend({
 
 		/* Cache all configured proxy nodes, they will be called multiple times */
 		let proxy_nodes = {};
-		uci.sections('homeproxy', 'node', (res) => {
+		uci.sections('homeproxy-pro', 'node', (res) => {
 			let nodeaddr = ((res.type === 'direct') ? res.override_address : res.address) || '',
 			    nodeport = ((res.type === 'direct') ? res.override_port : res.port) || '';
 
@@ -116,7 +116,7 @@ return view.extend({
 					String.format('[%s]', nodeaddr) : nodeaddr) + ':' + nodeport));
 		});
 
-		m = new form.Map('homeproxy', _('HomeProxy'),
+		m = new form.Map('homeproxy-pro', _('HomeProxy'),
 			_('The modern ImmortalWrt proxy platform for ARM64/AMD64.'));
 
 		s = m.section(form.TypedSection);
@@ -148,7 +148,7 @@ return view.extend({
 
 		ensureStatusPoll();
 
-		s = m.section(form.NamedSection, 'config', 'homeproxy');
+		s = m.section(form.NamedSection, 'config', 'homeproxy-pro');
 
 		/* ctx bundles the values each tab needs so the tab modules don't
 		 * have to recompute them. The destructuring keys are intentionally
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js
similarity index 88%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js
index 633eb3ae4..ea2a2f09d 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js
@@ -10,7 +10,7 @@
 'require form';
 'require uci';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 'require tools.firewall as fwtool';
 'require tools.widgets as widgets';
 
@@ -24,7 +24,7 @@ function render(ctx) {
 
 	s.tab('control', _('Access Control'));
 
-	o = s.taboption('control', form.SectionValue, '_control', form.NamedSection, 'control', 'homeproxy');
+	o = s.taboption('control', form.SectionValue, '_control', form.NamedSection, 'control', 'homeproxy-pro');
 	ss = o.subsection;
 
 	/* Interface control start */
@@ -55,7 +55,7 @@ function render(ctx) {
 	so.depends('lan_proxy_mode', 'except_listed');
 
 	so = fwtool.addIPOption(ss, 'lan_ip_policy', 'lan_direct_ipv6_ips', _('Direct IPv6 IP-s'), null, 'ipv6', hosts, true);
-	so.depends({'lan_proxy_mode': 'except_listed', 'homeproxy.config.ipv6_support': '1'});
+	so.depends({'lan_proxy_mode': 'except_listed', 'homeproxy-pro.config.ipv6_support': '1'});
 
 	so = fwtool.addMACOption(ss, 'lan_ip_policy', 'lan_direct_mac_addrs', _('Direct MAC-s'), null, hosts);
 	so.depends('lan_proxy_mode', 'except_listed');
@@ -64,7 +64,7 @@ function render(ctx) {
 	so.depends('lan_proxy_mode', 'listed_only');
 
 	so = fwtool.addIPOption(ss, 'lan_ip_policy', 'lan_proxy_ipv6_ips', _('Proxy IPv6 IP-s'), null, 'ipv6', hosts, true);
-	so.depends({'lan_proxy_mode': 'listed_only', 'homeproxy.config.ipv6_support': '1'});
+	so.depends({'lan_proxy_mode': 'listed_only', 'homeproxy-pro.config.ipv6_support': '1'});
 
 	so = fwtool.addMACOption(ss, 'lan_ip_policy', 'lan_proxy_mac_addrs', _('Proxy MAC-s'), null, hosts);
 	so.depends('lan_proxy_mode', 'listed_only');
@@ -72,18 +72,18 @@ function render(ctx) {
 	so = fwtool.addIPOption(ss, 'lan_ip_policy', 'lan_gaming_mode_ipv4_ips', _('Gaming mode IPv4 IP-s'), null, 'ipv4', hosts, true);
 
 	so = fwtool.addIPOption(ss, 'lan_ip_policy', 'lan_gaming_mode_ipv6_ips', _('Gaming mode IPv6 IP-s'), null, 'ipv6', hosts, true);
-	so.depends('homeproxy.config.ipv6_support', '1');
+	so.depends('homeproxy-pro.config.ipv6_support', '1');
 
 	so = fwtool.addMACOption(ss, 'lan_ip_policy', 'lan_gaming_mode_mac_addrs', _('Gaming mode MAC-s'), null, hosts);
 
 	so = fwtool.addIPOption(ss, 'lan_ip_policy', 'lan_global_proxy_ipv4_ips', _('Global proxy IPv4 IP-s'), null, 'ipv4', hosts, true);
-	so.depends({'homeproxy.config.routing_mode': 'custom', '!reverse': true});
+	so.depends({'homeproxy-pro.config.routing_mode': 'custom', '!reverse': true});
 
 	so = fwtool.addIPOption(ss, 'lan_ip_policy', 'lan_global_proxy_ipv6_ips', _('Global proxy IPv6 IP-s'), null, 'ipv6', hosts, true);
-	so.depends({'homeproxy.config.routing_mode': /^((?!custom).)+$/, 'homeproxy.config.ipv6_support': '1'});
+	so.depends({'homeproxy-pro.config.routing_mode': /^((?!custom).)+$/, 'homeproxy-pro.config.ipv6_support': '1'});
 
 	so = fwtool.addMACOption(ss, 'lan_ip_policy', 'lan_global_proxy_mac_addrs', _('Global proxy MAC-s'), null, hosts);
-	so.depends({'homeproxy.config.routing_mode': 'custom', '!reverse': true});
+	so.depends({'homeproxy-pro.config.routing_mode': 'custom', '!reverse': true});
 	/* LAN IP policy end */
 
 	/* WAN IP policy start */
@@ -94,14 +94,14 @@ function render(ctx) {
 
 	so = ss.taboption('wan_ip_policy', form.DynamicList, 'wan_proxy_ipv6_ips', _('Proxy IPv6 IP-s'));
 	so.datatype = 'or(ip6addr, cidr6)';
-	so.depends('homeproxy.config.ipv6_support', '1');
+	so.depends('homeproxy-pro.config.ipv6_support', '1');
 
 	so = ss.taboption('wan_ip_policy', form.DynamicList, 'wan_direct_ipv4_ips', _('Direct IPv4 IP-s'));
 	so.datatype = 'or(ip4addr, cidr4)';
 
 	so = ss.taboption('wan_ip_policy', form.DynamicList, 'wan_direct_ipv6_ips', _('Direct IPv6 IP-s'));
 	so.datatype = 'or(ip6addr, cidr6)';
-	so.depends('homeproxy.config.ipv6_support', '1');
+	so.depends('homeproxy-pro.config.ipv6_support', '1');
 	/* WAN IP policy end */
 
 	/* Proxy domain list start */
@@ -112,7 +112,7 @@ function render(ctx) {
 	so.monospace = true;
 	so.datatype = 'hostname';
 	so.description = _('One domain per line. No spaces, no comments, no wildcards; the backend rejects invalid characters and tells you which line.');
-	so.depends({'homeproxy.config.routing_mode': 'custom', '!reverse': true});
+	so.depends({'homeproxy-pro.config.routing_mode': 'custom', '!reverse': true});
 	so.load = function(/* ... */) {
 		return hp.rpcCall('acllist_read', ['proxy_list'],
 				{ params: ['type'], expect: { '': {} } }).then((res) => {
@@ -142,7 +142,7 @@ function render(ctx) {
 		 * so the test below was always true and a reset wiped the file even
 		 * in custom mode, where the list is in use. Read the saved UCI value
 		 * the backend will act on. */
-		let routing_mode = uci.get('homeproxy', 'config', 'routing_mode');
+		let routing_mode = uci.get('homeproxy-pro', 'config', 'routing_mode');
 		if (routing_mode !== 'custom')
 			return hp.rpcCall('acllist_write', ['proxy_list', ''], { params: ['type', 'content'], expect: { '': {} } }).then((ret) => {
 				if (ret && ret.result === false)
@@ -169,7 +169,7 @@ function render(ctx) {
 	so.monospace = true;
 	so.datatype = 'hostname';
 	so.description = _('One domain per line. No spaces, no comments, no wildcards; the backend rejects invalid characters and tells you which line.');
-	so.depends({'homeproxy.config.routing_mode': 'custom', '!reverse': true});
+	so.depends({'homeproxy-pro.config.routing_mode': 'custom', '!reverse': true});
 	so.load = function(/* ... */) {
 		return hp.rpcCall('acllist_read', ['direct_list'],
 				{ params: ['type'], expect: { '': {} } }).then((res) => {
@@ -187,7 +187,7 @@ function render(ctx) {
 	}
 	so.remove = function(/* ... */) {
 		/* Same `this.section` mistake as the proxy list above. */
-		let routing_mode = uci.get('homeproxy', 'config', 'routing_mode');
+		let routing_mode = uci.get('homeproxy-pro', 'config', 'routing_mode');
 		if (routing_mode !== 'custom')
 			return hp.rpcCall('acllist_write', ['direct_list', ''], { params: ['type', 'content'], expect: { '': {} } }).then((ret) => {
 				if (ret && ret.result === false)
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/common.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/common.js
similarity index 97%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/common.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/common.js
index 3621001fd..e57ff0666 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/common.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/common.js
@@ -10,7 +10,7 @@
 'require form';
 'require uci';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 
 /* Build the shared body of a routing/dns rule section.  The two sections
  * differ in their tab/option names, the sniffed-protocol value list, the
@@ -32,8 +32,8 @@ function renderRuleSection(s, kind, self) {
 	ss.sortable = true;
 	ss.nodescriptions = true;
 	ss.modaltitle = L.bind(hp.loadModalTitle, hp, is_dns ? _('DNS rule') : _('Routing rule'),
-		is_dns ? _('Add a DNS rule') : _('Add a routing rule'), 'homeproxy');
-	ss.sectiontitle = L.bind(hp.loadDefaultLabel, self, 'homeproxy');
+		is_dns ? _('Add a DNS rule') : _('Add a routing rule'), 'homeproxy-pro');
+	ss.sectiontitle = L.bind(hp.loadDefaultLabel, self, 'homeproxy-pro');
 	/* Plain wrapper, not L.bind(): see hp.renderSectionAdd() for why the bound
 	 * form hands a call site's button factory to the wrong argument. */
 	ss.renderSectionAdd = function(extra_class) {
@@ -46,8 +46,8 @@ function renderRuleSection(s, kind, self) {
 	ss.tab('fields_process', _('Process fields'));
 
 	so = ss.taboption('field_other', form.Value, 'label', _('Label'));
-	so.load = L.bind(hp.loadDefaultLabel, self, 'homeproxy');
-	so.validate = L.bind(hp.validateUniqueValue, self, 'homeproxy', uci_type, 'label');
+	so.load = L.bind(hp.loadDefaultLabel, self, 'homeproxy-pro');
+	so.validate = L.bind(hp.validateUniqueValue, self, 'homeproxy-pro', uci_type, 'label');
 	so.modalonly = true;
 
 	so = ss.taboption('field_other', form.Flag, 'enabled', _('Enable'));
@@ -144,7 +144,7 @@ function renderRuleSection(s, kind, self) {
 		delete this.keylist;
 		delete this.vallist;
 
-		uci.sections('homeproxy', 'ruleset', (res) => {
+		uci.sections('homeproxy-pro', 'ruleset', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
@@ -196,7 +196,7 @@ function renderRuleSection(s, kind, self) {
 
 				this.value('default-dns', _('Default DNS (issued by WAN)'));
 				this.value('system-dns', _('System DNS'));
-				uci.sections('homeproxy', 'dns_server', (res) => {
+				uci.sections('homeproxy-pro', 'dns_server', (res) => {
 					if (res.enabled === '1')
 						this.value(res['.name'], res.label);
 				});
@@ -333,7 +333,7 @@ function renderRuleSection(s, kind, self) {
 				delete this.vallist;
 
 				this.value('direct-out', _('Direct'));
-				uci.sections('homeproxy', 'routing_node', (res) => {
+				uci.sections('homeproxy-pro', 'routing_node', (res) => {
 					if (res.enabled === '1')
 						this.value(res['.name'], res.label);
 				});
@@ -416,7 +416,7 @@ function renderRuleSection(s, kind, self) {
 				this.value('', _('Default'));
 				this.value('default-dns', _('Default DNS (issued by WAN)'));
 				this.value('system-dns', _('System DNS'));
-				uci.sections('homeproxy', 'dns_server', (res) => {
+				uci.sections('homeproxy-pro', 'dns_server', (res) => {
 					if (res.enabled === '1')
 						this.value(res['.name'], res.label);
 				});
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js
similarity index 97%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js
index d0c9062c6..baa3392a7 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js
@@ -10,8 +10,8 @@
 'require form';
 'require uci';
 
-'require homeproxy as hp';
-'require view.homeproxy.client.common as common';
+'require homeproxy-pro as hp';
+'require view.homeproxy-pro.client.common as common';
 
 /* The four cache options exist on the 'dns' NamedSection in both the custom
  * mode tab (renderDnsSettings) and the preset mode tab (renderDnsCache).
@@ -54,7 +54,7 @@ function renderDnsSettings(ctx) {
 	let o, ss, so;
 
 	s.tab('dns', _('DNS Settings'));
-	o = s.taboption('dns', form.SectionValue, '_dns', form.NamedSection, 'dns', 'homeproxy');
+	o = s.taboption('dns', form.SectionValue, '_dns', form.NamedSection, 'dns', 'homeproxy-pro');
 	o.depends('routing_mode', 'custom');
 
 	ss = o.subsection;
@@ -70,7 +70,7 @@ function renderDnsSettings(ctx) {
 
 		this.value('default-dns', _('Default DNS (issued by WAN)'));
 		this.value('system-dns', _('System DNS'));
-		uci.sections('homeproxy', 'dns_server', (res) => {
+		uci.sections('homeproxy-pro', 'dns_server', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
@@ -198,7 +198,7 @@ function renderDnsCache(ctx) {
 	o.depends('routing_mode', 'bypass_mainland_china');
 	o.rmempty = false;
 
-	o = s.taboption('dns_cache', form.SectionValue, '_dns_cache', form.NamedSection, 'dns', 'homeproxy');
+	o = s.taboption('dns_cache', form.SectionValue, '_dns_cache', form.NamedSection, 'dns', 'homeproxy-pro');
 	o.depends({'routing_mode': 'custom', '!reverse': true});
 	ss = o.subsection;
 
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js
similarity index 90%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js
index 57b118ad3..3039a1668 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js
@@ -10,7 +10,7 @@
 'require form';
 'require uci';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 'require tools.widgets as widgets';
 
 /* Routing nodes sub-grid (the per-outbound entries that routing_rule
@@ -29,8 +29,8 @@ function renderRoutingNodes(ctx) {
 	ss.rowcolors = true;
 	ss.sortable = true;
 	ss.nodescriptions = true;
-	ss.modaltitle = L.bind(hp.loadModalTitle, hp, _('Routing node'), _('Add a routing node'), 'homeproxy');
-	ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
+	ss.modaltitle = L.bind(hp.loadModalTitle, hp, _('Routing node'), _('Add a routing node'), 'homeproxy-pro');
+	ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
 	/* Plain wrapper, not L.bind(): see hp.renderSectionAdd() for why the bound
 	 * form hands a call site's button factory to the wrong argument. */
 	ss.renderSectionAdd = function(extra_class) {
@@ -38,8 +38,8 @@ function renderRoutingNodes(ctx) {
 	};
 
 	so = ss.option(form.Value, 'label', _('Label'));
-	so.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
-	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'routing_node', 'label');
+	so.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
+	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'routing_node', 'label');
 	so.modalonly = true;
 
 	so = ss.option(form.Flag, 'enabled', _('Enable'));
@@ -52,7 +52,7 @@ function renderRoutingNodes(ctx) {
 	so.value('urltest', _('URLTest'));
 	for (let i in proxy_nodes)
 		so.value(i, proxy_nodes[i]);
-	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'routing_node', 'node');
+	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'routing_node', 'node');
 	so.editable = true;
 
 	so = ss.option(form.ListValue, 'domain_resolver', _('Domain resolver'),
@@ -64,7 +64,7 @@ function renderRoutingNodes(ctx) {
 		this.value('', _('Default'));
 		this.value('default-dns', _('Default DNS (issued by WAN)'));
 		this.value('system-dns', _('System DNS'));
-		uci.sections('homeproxy', 'dns_server', (res) => {
+		uci.sections('homeproxy-pro', 'dns_server', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
@@ -95,7 +95,7 @@ function renderRoutingNodes(ctx) {
 		delete this.vallist;
 
 		this.value('', _('Direct'));
-		uci.sections('homeproxy', 'routing_node', (res) => {
+		uci.sections('homeproxy-pro', 'routing_node', (res) => {
 			if (res['.name'] !== section_id && res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
@@ -107,7 +107,7 @@ function renderRoutingNodes(ctx) {
 			let node = this.section.formvalue(section_id, 'node');
 
 			let conflict = false;
-			uci.sections('homeproxy', 'routing_node', (res) => {
+			uci.sections('homeproxy-pro', 'routing_node', (res) => {
 				if (res['.name'] !== section_id) {
 					if (res.outbound === section_id && res['.name'] == value)
 						conflict = true;
@@ -218,8 +218,8 @@ function renderDnsServers(ctx) {
 	ss.rowcolors = true;
 	ss.sortable = true;
 	ss.nodescriptions = true;
-	ss.modaltitle = L.bind(hp.loadModalTitle, hp, _('DNS server'), _('Add a DNS server'), 'homeproxy');
-	ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
+	ss.modaltitle = L.bind(hp.loadModalTitle, hp, _('DNS server'), _('Add a DNS server'), 'homeproxy-pro');
+	ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
 	/* Plain wrapper, not L.bind(): see hp.renderSectionAdd() for why the bound
 	 * form hands a call site's button factory to the wrong argument. */
 	ss.renderSectionAdd = function(extra_class) {
@@ -227,8 +227,8 @@ function renderDnsServers(ctx) {
 	};
 
 	so = ss.option(form.Value, 'label', _('Label'));
-	so.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
-	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'dns_server', 'label');
+	so.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
+	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'dns_server', 'label');
 	so.modalonly = true;
 
 	so = ss.option(form.Flag, 'enabled', _('Enable'));
@@ -286,7 +286,7 @@ function renderDnsServers(ctx) {
 		this.value('', _('None'));
 		this.value('default-dns', _('Default DNS (issued by WAN)'));
 		this.value('system-dns', _('System DNS'));
-		uci.sections('homeproxy', 'dns_server', (res) => {
+		uci.sections('homeproxy-pro', 'dns_server', (res) => {
 			if (res['.name'] !== section_id && res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
@@ -296,7 +296,7 @@ function renderDnsServers(ctx) {
 	so.validate = function(section_id, value) {
 		if (section_id && value) {
 			let conflict = false;
-			uci.sections('homeproxy', 'dns_server', (res) => {
+			uci.sections('homeproxy-pro', 'dns_server', (res) => {
 				if (res['.name'] !== section_id)
 					if (res.address_resolver === section_id && res['.name'] == value)
 						conflict = true;
@@ -323,7 +323,7 @@ function renderDnsServers(ctx) {
 		delete this.vallist;
 
 		this.value('direct-out', _('Direct'));
-		uci.sections('homeproxy', 'routing_node', (res) => {
+		uci.sections('homeproxy-pro', 'routing_node', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js
similarity index 94%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js
index 18b105475..842f8cf64 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js
@@ -10,8 +10,8 @@
 'require form';
 'require uci';
 
-'require homeproxy as hp';
-'require view.homeproxy.client.common as common';
+'require homeproxy-pro as hp';
+'require view.homeproxy-pro.client.common as common';
 
 /* Routing tab and the wrapping custom-routing NamedSection. The
  * routing_node tab lives in nodes.js; the routing_rule sub-section is
@@ -147,7 +147,7 @@ function render(ctx) {
 
 	/* Custom routing settings start */
 	/* Routing settings start */
-	o = s.taboption('routing', form.SectionValue, '_routing', form.NamedSection, 'routing', 'homeproxy');
+	o = s.taboption('routing', form.SectionValue, '_routing', form.NamedSection, 'routing', 'homeproxy-pro');
 	o.depends('routing_mode', 'custom');
 
 	ss = o.subsection;
@@ -159,8 +159,8 @@ function render(ctx) {
 	}
 	so.value('system', _('System'));
 	so.default = 'system';
-	so.depends('homeproxy.config.proxy_mode', 'redirect_tun');
-	so.depends('homeproxy.config.proxy_mode', 'tun');
+	so.depends('homeproxy-pro.config.proxy_mode', 'redirect_tun');
+	so.depends('homeproxy-pro.config.proxy_mode', 'tun');
 	so.rmempty = false;
 	so.onchange = function(ev, section_id, value) {
 		let desc = ev.target.nextElementSibling;
@@ -183,9 +183,9 @@ function render(ctx) {
 		_('In seconds.'));
 	so.datatype = 'uinteger';
 	so.placeholder = '300';
-	so.depends('homeproxy.config.proxy_mode', 'redirect_tproxy');
-	so.depends('homeproxy.config.proxy_mode', 'redirect_tun');
-	so.depends('homeproxy.config.proxy_mode', 'tun');
+	so.depends('homeproxy-pro.config.proxy_mode', 'redirect_tproxy');
+	so.depends('homeproxy-pro.config.proxy_mode', 'redirect_tun');
+	so.depends('homeproxy-pro.config.proxy_mode', 'tun');
 
 	so = ss.option(form.Flag, 'bypass_cn_traffic', _('Bypass CN traffic'),
 		_('Bypass mainland China traffic via firewall rules by default.'));
@@ -209,7 +209,7 @@ function render(ctx) {
 		this.value('nil', _('Disable (the service)'));
 		this.value('direct-out', _('Direct'));
 		this.value('block-out', _('Block'));
-		uci.sections('homeproxy', 'routing_node', (res) => {
+		uci.sections('homeproxy-pro', 'routing_node', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
@@ -227,7 +227,7 @@ function render(ctx) {
 
 		this.value('default-dns', _('Default DNS (issued by WAN)'));
 		this.value('system-dns', _('System DNS'));
-		uci.sections('homeproxy', 'dns_server', (res) => {
+		uci.sections('homeproxy-pro', 'dns_server', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js
similarity index 90%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js
index ff1e45b76..aed378dcf 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js
@@ -10,7 +10,7 @@
 'require form';
 'require uci';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 
 /* Rule set sub-grid (per-rule-set entries: local file or remote URL with
  * download metadata). Called after dns.renderDnsRules() so the
@@ -28,8 +28,8 @@ function render(ctx) {
 	ss.rowcolors = true;
 	ss.sortable = true;
 	ss.nodescriptions = true;
-	ss.modaltitle = L.bind(hp.loadModalTitle, hp, _('Rule set'), _('Add a rule set'), 'homeproxy');
-	ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
+	ss.modaltitle = L.bind(hp.loadModalTitle, hp, _('Rule set'), _('Add a rule set'), 'homeproxy-pro');
+	ss.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
 	/* Plain wrapper, not L.bind(): see hp.renderSectionAdd() for why the bound
 	 * form hands a call site's button factory to the wrong argument. */
 	ss.renderSectionAdd = function(extra_class) {
@@ -37,8 +37,8 @@ function render(ctx) {
 	};
 
 	so = ss.option(form.Value, 'label', _('Label'));
-	so.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
-	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'ruleset', 'label');
+	so.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
+	so.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'ruleset', 'label');
 	so.modalonly = true;
 
 	so = ss.option(form.Flag, 'enabled', _('Enable'));
@@ -60,7 +60,7 @@ function render(ctx) {
 
 	so = ss.option(form.Value, 'path', _('Path'));
 	so.datatype = 'file';
-	so.placeholder = '/etc/homeproxy/ruleset/example.json';
+	so.placeholder = '/etc/homeproxy-pro/ruleset/example.json';
 	so.rmempty = false;
 	so.depends('type', 'local');
 	so.modalonly = true;
@@ -98,7 +98,7 @@ function render(ctx) {
 
 		this.value('', _('Default'));
 		this.value('direct-out', _('Direct'));
-		uci.sections('homeproxy', 'routing_node', (res) => {
+		uci.sections('homeproxy-pro', 'routing_node', (res) => {
 			if (res.enabled === '1')
 				this.value(res['.name'], res.label);
 		});
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js
similarity index 100%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js
similarity index 100%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/node.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/node.js
similarity index 93%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/node.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/node.js
index e49623e3e..fce346d54 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/node.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/node.js
@@ -10,7 +10,7 @@
 'require ui';
 'require view';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 
 function allowInsecureConfirm(ev, _section_id, value) {
 	if (value === '1' && !confirm(_('Are you sure to allow insecure?')))
@@ -22,8 +22,8 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 	s.rowcolors = true;
 	s.sortable = true;
 	s.nodescriptions = true;
-	s.modaltitle = L.bind(hp.loadModalTitle, hp, _('Node'), _('Add a node'), 'homeproxy');
-	s.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
+	s.modaltitle = L.bind(hp.loadModalTitle, hp, _('Node'), _('Add a node'), 'homeproxy-pro');
+	s.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
 
 	if (routing_mode !== 'custom') {
 		o = s.option(form.Button, '_apply', _('Apply'));
@@ -40,7 +40,7 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 			}
 		}
 		o.onclick = function(ev, section_id) {
-			uci.set('homeproxy', 'config', 'main_node', section_id);
+			uci.set('homeproxy-pro', 'config', 'main_node', section_id);
 
 			return this.map.save(null, true).then(() => {
 				ui.changes.apply(true);
@@ -49,8 +49,8 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 	}
 
 	o = s.option(form.Value, 'label', _('Label'));
-	o.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
-	o.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'node', 'label');
+	o.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
+	o.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'node', 'label');
 	o.modalonly = true;
 
 	o = hp.renderProtocolOptions(s, { features: features, side: 'client' });
@@ -424,7 +424,7 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 
 	o = s.option(form.Value, 'tls_cert_path', _('Certificate path'),
 		_('The path to the server certificate, in PEM format.'));
-	o.value('/etc/homeproxy/certs/client_ca.pem');
+	o.value('/etc/homeproxy-pro/certs/client_ca.pem');
 	o.depends('tls_self_sign', '1');
 	o.validate = hp.validateCertificatePath;
 	o.rmempty = false;
@@ -434,7 +434,7 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 		_('<strong>Save your configuration before uploading files!</strong>'));
 	o.inputstyle = 'action';
 	o.inputtitle = _('Upload...');
-	o.depends({'tls_self_sign': '1', 'tls_cert_path': '/etc/homeproxy/certs/client_ca.pem'});
+	o.depends({'tls_self_sign': '1', 'tls_cert_path': '/etc/homeproxy-pro/certs/client_ca.pem'});
 	o.onclick = L.bind(hp.uploadCertificate, hp, _('certificate'), 'client_ca');
 	o.modalonly = true;
 
@@ -445,10 +445,10 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 
 	o = s.option(form.Value, 'tls_ech_config_path', _('ECH config path'),
 		_('The path to the ECH config, in PEM format. If empty, load from DNS will be attempted.'));
-	o.value('/etc/homeproxy/certs/client_ech_conf.pem');
+	o.value('/etc/homeproxy-pro/certs/client_ech_conf.pem');
 	/* Same policy as cert_path / key_path: sing-box reads this file as root and
 	   the backend drops any path outside CERT_PATH_ROOTS (validateCertificatePath
-	   in homeproxy.uc). Without it the UI accepted a path the generator then
+	   in homeproxy-pro.uc). Without it the UI accepted a path the generator then
 	   silently discarded. */
 	o.validate = hp.validateCertificatePath;
 	o.depends('tls_ech', '1');
@@ -458,7 +458,7 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 		_('<strong>Save your configuration before uploading files!</strong>'));
 	o.inputstyle = 'action';
 	o.inputtitle = _('Upload...');
-	o.depends({'tls_ech': '1', 'tls_ech_config_path': '/etc/homeproxy/certs/client_ech_conf.pem'});
+	o.depends({'tls_ech': '1', 'tls_ech_config_path': '/etc/homeproxy-pro/certs/client_ech_conf.pem'});
 	o.onclick = L.bind(hp.uploadCertificate, hp, _('ECH config'), 'client_ech_conf');
 	o.modalonly = true;
 
@@ -479,7 +479,7 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 		o.depends({'tls': '1', 'type': /^((?!hysteria2?|tuic$).)+$/});
 		o.validate = function(section_id, value) {
 			if (section_id) {
-				let tls_reality = this.map.findElement('id', 'cbid.homeproxy.%s.tls_reality'.format(section_id)).firstElementChild;
+				let tls_reality = this.map.findElement('id', 'cbid.homeproxy-pro.%s.tls_reality'.format(section_id)).firstElementChild;
 				if (tls_reality.checked && !value)
 					return _('Expecting: %s').format(_('non-empty value'));
 
@@ -541,15 +541,15 @@ function renderNodeSettings(section, data, features, main_node, routing_mode) {
 return view.extend({
 	load() {
 		return Promise.all([
-			uci.load('homeproxy'),
+			uci.load('homeproxy-pro'),
 			hp.getBuiltinFeatures()
 		]);
 	},
 
 	render(data) {
 		let m, s, o, ss, so;
-		let main_node = uci.get('homeproxy', 'config', 'main_node');
-		let routing_mode = uci.get('homeproxy', 'config', 'routing_mode');
+		let main_node = uci.get('homeproxy-pro', 'config', 'main_node');
+		let routing_mode = uci.get('homeproxy-pro', 'config', 'routing_mode');
 		let features = data[1];
 
 		/* Cache subscription information, it will be called multiple times.
@@ -569,7 +569,7 @@ return view.extend({
 		 * first-seen entry is the one both sides agree on. */
 		let subinfo = [];
 		const seen_hashes = {};
-		for (let suburl of (uci.get('homeproxy', 'subscription', 'subscription_url') || [])) {
+		for (let suburl of (uci.get('homeproxy-pro', 'subscription', 'subscription_url') || [])) {
 			const info = hp.subscriptionInfo(suburl);
 			if (!info)
 				continue;
@@ -579,9 +579,9 @@ return view.extend({
 			subinfo.push(info);
 		}
 
-		m = new form.Map('homeproxy', _('Edit nodes'));
+		m = new form.Map('homeproxy-pro', _('Edit nodes'));
 
-		s = m.section(form.NamedSection, 'subscription', 'homeproxy');
+		s = m.section(form.NamedSection, 'subscription', 'homeproxy-pro');
 
 		/* Node settings start */
 		/* User nodes start */
@@ -591,7 +591,7 @@ return view.extend({
 		ss.addremove = true;
 		ss.filter = function(section_id) {
 			for (let info of subinfo)
-				if (info.hash === uci.get('homeproxy', section_id, 'grouphash'))
+				if (info.hash === uci.get('homeproxy-pro', section_id, 'grouphash'))
 					return false;
 
 			return true;
@@ -620,8 +620,8 @@ return view.extend({
 							input_links = input_links.reduce((pre, cur) =>
 								(!pre.includes(cur) && pre.push(cur), pre), []);
 
-							let allow_insecure = uci.get('homeproxy', 'subscription', 'allow_insecure');
-							let packet_encoding = uci.get('homeproxy', 'subscription', 'packet_encoding');
+							let allow_insecure = uci.get('homeproxy-pro', 'subscription', 'allow_insecure');
+							let packet_encoding = uci.get('homeproxy-pro', 'subscription', 'packet_encoding');
 
 							/* Every link is parsed - and rejected - by the
 							 * backend parser (parser/uri.uc), so importing a
@@ -640,9 +640,9 @@ return view.extend({
 											config.packet_encoding = packet_encoding;
 
 										let nameHash = hp.calcStringMD5(config.label);
-										let sid = uci.add('homeproxy', 'node', nameHash);
+										let sid = uci.add('homeproxy-pro', 'node', nameHash);
 										Object.keys(config).forEach((k) => {
-											uci.set('homeproxy', sid, k, config[k]);
+											uci.set('homeproxy-pro', sid, k, config[k]);
 										});
 										imported_node++;
 									});
@@ -677,7 +677,7 @@ return view.extend({
 				])
 			])
 		}
-		/* The shared renderer (homeproxy.js) appends the extra button this
+		/* The shared renderer (homeproxy-pro.js) appends the extra button this
 		 * page needs; it used to carry a verbatim copy of the whole method.
 		 * The factory gets the section back so the handler binds to it, the
 		 * same receiver the copy's `this` had.
@@ -708,7 +708,7 @@ return view.extend({
 			o = s.taboption('sub_' + info.hash, form.SectionValue, '_sub_' + info.hash, form.GridSection, 'node');
 			ss = renderNodeSettings(o.subsection, data, features, main_node, routing_mode);
 			ss.filter = function(section_id) {
-				return (uci.get('homeproxy', section_id, 'grouphash') === info.hash);
+				return (uci.get('homeproxy-pro', section_id, 'grouphash') === info.hash);
 			}
 		}
 		/* Subscription nodes end */
@@ -789,7 +789,7 @@ return view.extend({
 		o = s.taboption('subscription', form.Button, '_update_subscriptions', _('Update nodes from subscriptions'));
 		o.inputstyle = 'apply';
 		o.inputtitle = function(section_id) {
-			let sublist = uci.get('homeproxy', section_id, 'subscription_url') || [];
+			let sublist = uci.get('homeproxy-pro', section_id, 'subscription_url') || [];
 			if (sublist.length > 0) {
 				return _('Update %s subscriptions').format(sublist.length);
 			} else {
@@ -799,7 +799,7 @@ return view.extend({
 		}
 		o.onclick = function() {
 			/* The updater pipeline (wget through a CN -> overseas link,
-			   UCI commit, /etc/init.d/homeproxy reload, the 30 s sing-box
+			   UCI commit, /etc/init.d/homeproxy-pro reload, the 30 s sing-box
 			   health gate) takes 5-15 s on a real device, which exceeds
 			   the browser XHR timeout. The old synchronous RPC waited
 			   for the whole thing inside one XHR; the browser saw
@@ -896,7 +896,7 @@ return view.extend({
 		o.inputstyle = 'reset';
 		o.inputtitle = function() {
 			let subnodes = [];
-			uci.sections('homeproxy', 'node', (res) => {
+			uci.sections('homeproxy-pro', 'node', (res) => {
 				if (res.grouphash)
 					subnodes = subnodes.concat(res['.name'])
 			});
@@ -910,19 +910,19 @@ return view.extend({
 		}
 		o.onclick = function() {
 			let subnodes = [];
-			uci.sections('homeproxy', 'node', (res) => {
+			uci.sections('homeproxy-pro', 'node', (res) => {
 				if (res.grouphash)
 					subnodes = subnodes.concat(res['.name'])
 			});
 
 			for (let i in subnodes)
-				uci.remove('homeproxy', subnodes[i]);
+				uci.remove('homeproxy-pro', subnodes[i]);
 
-			if (subnodes.includes(uci.get('homeproxy', 'config', 'main_node')))
-				uci.set('homeproxy', 'config', 'main_node', 'nil');
+			if (subnodes.includes(uci.get('homeproxy-pro', 'config', 'main_node')))
+				uci.set('homeproxy-pro', 'config', 'main_node', 'nil');
 
-			if (subnodes.includes(uci.get('homeproxy', 'config', 'main_udp_node')))
-				uci.set('homeproxy', 'config', 'main_udp_node', 'nil');
+			if (subnodes.includes(uci.get('homeproxy-pro', 'config', 'main_udp_node')))
+				uci.set('homeproxy-pro', 'config', 'main_udp_node', 'nil');
 
 			this.inputtitle = _('%s nodes removed').format(subnodes.length);
 			this.readonly = true;
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/server.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/server.js
similarity index 95%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/server.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/server.js
index e42d3bca1..c7feccf7a 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/server.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/server.js
@@ -11,7 +11,7 @@
 'require ui';
 'require view';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 'require tools.widgets as widgets';
 
 /* Module-scoped guard for the view-level status poll: see the comment
@@ -47,13 +47,13 @@ function getServiceStatus() {
 	 * "the status query did not answer" from "the service is not running".
 	 * With the default `{}` the try/catch below swallowed the difference and
 	 * reported a failed query as NOT RUNNING. */
-	return hp.rpcCall('list', ['homeproxy'],
+	return hp.rpcCall('list', ['homeproxy-pro'],
 			{ object: 'service', params: ['name'], expect: { '': {} }, fallback: null }).then((res) => {
 		if (res === null)
 			return null;
 
 		try {
-			return res['homeproxy']['instances']['sing-box-s']['running'] === true;
+			return res['homeproxy-pro']['instances']['sing-box-s']['running'] === true;
 		} catch (e) {
 			/* It answered, and there is no such instance. */
 			return false;
@@ -124,7 +124,7 @@ function handleGenKey(option) {
 return view.extend({
 	load() {
 		return Promise.all([
-			uci.load('homeproxy'),
+			uci.load('homeproxy-pro'),
 			hp.getBuiltinFeatures()
 		]);
 	},
@@ -133,7 +133,7 @@ return view.extend({
 		let m, s, o;
 		let features = data[1];
 
-		m = new form.Map('homeproxy', _('HomeProxy Server'),
+		m = new form.Map('homeproxy-pro', _('HomeProxy Server'),
 			_('The modern ImmortalWrt proxy platform for ARM64/AMD64.'));
 
 		s = m.section(form.TypedSection);
@@ -163,7 +163,7 @@ return view.extend({
 
 		ensureStatusPoll();
 
-		s = m.section(form.NamedSection, 'server', 'homeproxy', _('Global settings'));
+		s = m.section(form.NamedSection, 'server', 'homeproxy-pro', _('Global settings'));
 
 		o = s.option(form.Flag, 'enabled', _('Enable'));
 		o.rmempty = false;
@@ -173,8 +173,8 @@ return view.extend({
 		s.rowcolors = true;
 		s.sortable = true;
 		s.nodescriptions = true;
-		s.modaltitle = L.bind(hp.loadModalTitle, hp, _('Server'), _('Add a server'), 'homeproxy');
-		s.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
+		s.modaltitle = L.bind(hp.loadModalTitle, hp, _('Server'), _('Add a server'), 'homeproxy-pro');
+		s.sectiontitle = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
 		/* Plain wrapper, not L.bind(): see hp.renderSectionAdd() for why the
 		 * bound form hands a call site's button factory to the wrong argument. */
 		s.renderSectionAdd = function(extra_class) {
@@ -182,8 +182,8 @@ return view.extend({
 		};
 
 		o = s.option(form.Value, 'label', _('Label'));
-		o.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy');
-		o.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'server', 'label');
+		o.load = L.bind(hp.loadDefaultLabel, this, 'homeproxy-pro');
+		o.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'server', 'label');
 		o.rmempty = false;
 		o.modalonly = true;
 
@@ -206,7 +206,7 @@ return view.extend({
 		o = s.option(form.Value, 'port', _('Listen port'),
 			_('The port must be unique.'));
 		o.datatype = 'port';
-		o.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy', 'server', 'port');
+		o.validate = L.bind(hp.validateUniqueValue, this, 'homeproxy-pro', 'server', 'port');
 
 		o = s.option(form.Value, 'username', _('Username'));
 		o.depends('type', 'http');
@@ -284,7 +284,7 @@ return view.extend({
 		o = s.option(form.ListValue, 'shadowsocks_encrypt_method', _('Encrypt method'));
 		for (let i of hp.shadowsocks_encrypt_methods)
 			o.value(i);
-		/* The legacy stream ciphers are client-only; see homeproxy.js's
+		/* The legacy stream ciphers are client-only; see homeproxy-pro.js's
 		   shadowsocks_stream_methods for why, and the plan's 2.11. */
 		o.default = 'aes-128-gcm';
 		o.depends('type', 'shadowsocks');
@@ -510,7 +510,7 @@ return view.extend({
 
 		o = s.option(form.Value, 'tls_cert_path', _('Certificate path'),
 			_('The server public key, in PEM format.'));
-		o.value('/etc/homeproxy/certs/server_publickey.pem');
+		o.value('/etc/homeproxy-pro/certs/server_publickey.pem');
 		o.depends({'tls': '1', 'tls_acme': '0', 'tls_reality': null});
 		o.depends({'tls': '1', 'tls_acme': '0', 'tls_reality': '0'});
 		o.depends({'tls': '1', 'tls_acme': null, 'tls_reality': '0'});
@@ -523,13 +523,13 @@ return view.extend({
 			_('<strong>Save your configuration before uploading files!</strong>'));
 		o.inputstyle = 'action';
 		o.inputtitle = _('Upload...');
-		o.depends({'tls': '1', 'tls_cert_path': '/etc/homeproxy/certs/server_publickey.pem'});
+		o.depends({'tls': '1', 'tls_cert_path': '/etc/homeproxy-pro/certs/server_publickey.pem'});
 		o.onclick = L.bind(hp.uploadCertificate, hp, _('certificate'), 'server_publickey');
 		o.modalonly = true;
 
 		o = s.option(form.Value, 'tls_key_path', _('Key path'),
 			_('The server private key, in PEM format.'));
-		o.value('/etc/homeproxy/certs/server_privatekey.pem');
+		o.value('/etc/homeproxy-pro/certs/server_privatekey.pem');
 		o.depends({'tls': '1', 'tls_acme': '0', 'tls_reality': '0'});
 		o.depends({'tls': '1', 'tls_acme': '0', 'tls_reality': null});
 		o.depends({'tls': '1', 'tls_acme': null, 'tls_reality': '0'});
@@ -542,7 +542,7 @@ return view.extend({
 			_('<strong>Save your configuration before uploading files!</strong>'));
 		o.inputstyle = 'action';
 		o.inputtitle = _('Upload...');
-		o.depends({'tls': '1', 'tls_key_path': '/etc/homeproxy/certs/server_privatekey.pem'});
+		o.depends({'tls': '1', 'tls_key_path': '/etc/homeproxy-pro/certs/server_privatekey.pem'});
 		o.onclick = L.bind(hp.uploadCertificate, hp, _('private key'), 'server_privatekey');
 		o.modalonly = true;
 
diff --git a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/status.js b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/status.js
similarity index 94%
rename from luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/status.js
rename to luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/status.js
index e99ecde1f..e30b3793d 100644
--- a/luci-app-homeproxy-pro-pro/htdocs/luci-static/resources/view/homeproxy-pro/status.js
+++ b/luci-app-homeproxy-pro/htdocs/luci-static/resources/view/homeproxy-pro/status.js
@@ -13,7 +13,7 @@
 'require ui';
 'require view';
 
-'require homeproxy as hp';
+'require homeproxy-pro as hp';
 
 /* Thanks to luci-app-aria2 */
 const css = '				\
@@ -27,7 +27,7 @@ const css = '				\
 	margin: 0;			\
 }';
 
-const hp_dir = '/var/run/homeproxy';
+const hp_dir = '/var/run/homeproxy-pro';
 
 /* One view-level poll for all three log views.
  *
@@ -161,7 +161,7 @@ function getResVersion(o, type) {
 function getRuntimeLog(o, name, filename, _option_index, section_id, _in_table) {
 	let section, log_level_el;
 	switch (filename) {
-	case 'homeproxy':
+	case 'homeproxy-pro':
 		section = null;
 		break;
 	case 'sing-box-c':
@@ -173,7 +173,7 @@ function getRuntimeLog(o, name, filename, _option_index, section_id, _in_table)
 	}
 
 	if (section) {
-		const selected = uci.get('homeproxy', section, 'log_level') || 'warn';
+		const selected = uci.get('homeproxy-pro', section, 'log_level') || 'warn';
 		const choices = {
 			trace: _('Trace'),
 			debug: _('Debug'),
@@ -189,7 +189,7 @@ function getRuntimeLog(o, name, filename, _option_index, section_id, _in_table)
 			'class': 'cbi-input-select',
 			'style': 'margin-left: 4px; width: 6em;',
 			'change': ui.createHandlerFn(this, (ev) => {
-				uci.set('homeproxy', section, 'log_level', ev.target.value);
+				uci.set('homeproxy-pro', section, 'log_level', ev.target.value);
 				return o.map.save(null, true).then(() => {
 					ui.changes.apply(true);
 				});
@@ -244,9 +244,9 @@ return view.extend({
 	render() {
 		let m, s, o;
 
-		m = new form.Map('homeproxy');
+		m = new form.Map('homeproxy-pro');
 
-		s = m.section(form.NamedSection, 'config', 'homeproxy', _('Connection check'));
+		s = m.section(form.NamedSection, 'config', 'homeproxy-pro', _('Connection check'));
 		s.anonymous = true;
 
 		o = s.option(form.DummyValue, '_check_baidu', _('BaiDu'));
@@ -255,7 +255,7 @@ return view.extend({
 		o = s.option(form.DummyValue, '_check_google', _('Google'));
 		o.cfgvalue = L.bind(getConnStat, this, o, 'google');
 
-		s = m.section(form.NamedSection, 'config', 'homeproxy', _('Resources management'));
+		s = m.section(form.NamedSection, 'config', 'homeproxy-pro', _('Resources management'));
 		s.anonymous = true;
 
 		o = s.option(form.DummyValue, '_china_ip4_version', _('China IPv4 list version'));
@@ -292,11 +292,11 @@ return view.extend({
 			return node;
 		}
 
-		s = m.section(form.NamedSection, 'config', 'homeproxy');
+		s = m.section(form.NamedSection, 'config', 'homeproxy-pro');
 		s.anonymous = true;
 
 		o = s.option(form.DummyValue, '_homeproxy_logview');
-		o.render = L.bind(getRuntimeLog, this, o, _('HomeProxy'), 'homeproxy');
+		o.render = L.bind(getRuntimeLog, this, o, _('HomeProxy'), 'homeproxy-pro');
 
 		o = s.option(form.DummyValue, '_sing-box-c_logview');
 		o.render = L.bind(getRuntimeLog, this, o, _('sing-box client'), 'sing-box-c');
diff --git a/luci-app-homeproxy-pro/po/templates/homeproxy-pro.pot b/luci-app-homeproxy-pro/po/templates/homeproxy-pro.pot
new file mode 100644
index 000000000..aa5c4df31
--- /dev/null
+++ b/luci-app-homeproxy-pro/po/templates/homeproxy-pro.pot
@@ -0,0 +1,3392 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:222
+msgid "%s log"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:913
+msgid "%s nodes removed"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:858
+msgid "(empty)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:110
+msgid "(last updated %s)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:111
+msgid "(never updated on this device)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1098
+msgid "/etc/homeproxy-pro/certs/..., /etc/acme/..., /etc/ssl/..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:221
+msgid ""
+"1 matches the latest untagged evaluate result; other values match an "
+"evaluate tag (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:81
+msgid "4 or 6. Not limited if empty."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:288
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:436
+msgid ""
+"<code>%s</code> will be temporarily overwritten to <code>%s</code> after 50 "
+"triggers in 30s if not enabled."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:434
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:458
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:523
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:542
+msgid "<strong>Save your configuration before uploading files!</strong>"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:375
+msgid "ACME account key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:359
+msgid "ACME key type"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:369
+msgid "ACME profile"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:370
+msgid "ACME profile for certificate issuance (1.14). Example: shortlived."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:419
+msgid "API token"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:227
+msgid "Accept any if empty."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:25
+msgid "Access Control"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:402
+msgid "Access key ID"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:408
+msgid "Access key secret"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:164
+msgid "Action"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:35
+msgid "Add a DNS rule"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:221
+msgid "Add a DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:25
+msgid "Add a node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:32
+msgid "Add a routing node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:35
+msgid "Add a routing rule"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:31
+msgid "Add a rule set"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:176
+msgid "Add a server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:267
+msgid "Additional headers to be sent to the DNS server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:249
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:58
+msgid "Address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:29
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:40
+msgid "Address and port dependent"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:28
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:39
+msgid "Address dependent"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:280
+msgid "Address resolver"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:312
+msgid "Address strategy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:166
+msgid "Aggressive"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:395
+msgid "Alibaba Cloud DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:131
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:165
+msgid "Aliyun Public DNS (223.5.5.5)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:104
+msgid "All ports"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:196
+msgid "Allow access from the Internet."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:683
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:753
+msgid "Allow insecure"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:684
+msgid "Allow insecure connection at TLS client."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:754
+msgid "Allow insecure connection by default when add nodes from subscriptions."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:615
+msgid "Allowed payload size is in the request."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:129
+msgid "Already at the latest version."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:126
+msgid "Already in updating."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:257
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:304
+msgid "Alter ID"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:433
+msgid "Alternative HTTP port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:439
+msgid "Alternative TLS port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:305
+msgid "Answer"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:131
+msgid "AnyTLS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:232
+msgid "AnyTLS padding scheme in array."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:213
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:460
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:89
+msgid ""
+"Append a <code>edns0-subnet</code> OPT extra record with the specified IP "
+"prefix to every query by default.<br/>If value is an IP address instead of "
+"prefix, <code>/32</code> or <code>/128</code> will be appended automatically."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:420
+msgid "Append self-signed certificate"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:36
+msgid "Applied"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:29
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:39
+msgid "Apply"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:16
+msgid "Are you sure to allow insecure?"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:346
+msgid "Auth timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:281
+msgid "Authenticated length"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:263
+msgid "Authentication payload"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:256
+msgid "Authentication type"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:706
+msgid "Auto update"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:707
+msgid "Auto update subscriptions and geodata."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:325
+msgid "BBR"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:163
+msgid "BBR congestion control algorithm profile. Hysteria2 only."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:162
+msgid "BBR profile (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:252
+msgid "BaiDu"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:258
+msgid "Base64"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:170
+msgid "Based on google/gvisor."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:56
+msgid "Binary file"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:38
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:84
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:629
+msgid "Bind interface"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:39
+msgid ""
+"Bind outbound traffic to specific interface. Leave empty to auto detect."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:90
+msgid "BitTorrent"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:740
+msgid "Blacklist mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:211
+msgid "Block"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:84
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:108
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:624
+msgid "Both"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:190
+msgid "Bypass CN traffic"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:84
+msgid "Bypass mainland China"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:191
+msgid "Bypass mainland China traffic via firewall rules by default."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:382
+msgid "CA provider"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:196
+msgid "CN-IP DNS fallback (sing-box 1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:166
+msgid "CNNIC Public DNS (210.2.4.8)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:323
+msgid "CUBIC"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:596
+msgid "Cancel"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:425
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:511
+msgid "Certificate path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:95
+msgid "Check"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:139
+msgid "Check update"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:162
+msgid "China DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:261
+msgid "China IPv4 list version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:265
+msgid "China IPv6 list version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:269
+msgid "China list version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:125
+msgid "Chromium / Cronet"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:708
+msgid "Cipher suites"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:128
+msgid "Cisco Public DNS (208.67.222.222)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:231
+msgid "Clean log"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:123
+msgid "Client"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:14
+msgid "Client Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:221
+msgid "Client version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:127
+msgid "CloudFlare Public DNS (1.1.1.1)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:396
+msgid "Cloudflare"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:130
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:146
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:212
+msgid "Collecting data..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:105
+msgid "Common ports only (bypass P2P traffic)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:321
+msgid "Congestion control algorithm"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:249
+msgid "Connection check"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:394
+msgid "Connection reuse"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:165
+msgid "Conservative"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:809
+msgid "Could not start subscription update: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:86
+msgid "Custom routing"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:92
+msgid "DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:25
+msgid "DNS Rules"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:212
+msgid "DNS Servers"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:56
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:122
+msgid "DNS Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:394
+msgid "DNS provider"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:39
+msgid "DNS query timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:34
+msgid "DNS rule"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:410
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:124
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:221
+msgid "DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:390
+msgid "DNS01 challenge"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:93
+msgid "DTLS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:179
+msgid "Debug"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:62
+#: htdocs/luci-static/resources/homeproxy-pro.js:334
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:73
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:416
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:64
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:99
+msgid "Default"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:185
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:417
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:71
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:65
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:287
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:228
+msgid "Default DNS (issued by WAN)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:66
+msgid "Default DNS server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:223
+msgid "Default DNS server for resolving domain name in the server address."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:61
+msgid "Default DNS strategy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:203
+msgid "Default outbound"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:222
+msgid "Default outbound DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:204
+msgid "Default outbound for connections not matched by any routing rules."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:760
+msgid "Default packet encoding"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:338
+msgid "Default server name"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:40
+msgid "Default timeout per DNS query in seconds (sing-box default: 10)."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:130
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:326
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:97
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:325
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:210
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:100
+msgid "Direct"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:165
+msgid "Direct Domain List"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:54
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:99
+msgid "Direct IPv4 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:57
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:102
+msgid "Direct IPv6 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:60
+msgid "Direct MAC-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:257
+#: htdocs/luci-static/resources/homeproxy-pro.js:270
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:26
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:54
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:93
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:468
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:739
+msgid "Disable"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:209
+msgid "Disable (the service)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:170
+msgid "Disable Chrome QUIC fingerprint (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:171
+msgid ""
+"Disable Chrome QUIC handshake parroting, which is enabled by default since "
+"sing-box 1.14. Turn this on only when the server uses an Ed25519 certificate "
+"or the handshake otherwise fails."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:448
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:83
+msgid "Disable DNS cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:449
+msgid "Disable DNS cache in this query."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:425
+msgid "Disable HTTP challenge"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:429
+msgid "Disable TLS ALPN challenge"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:352
+msgid "Disable UDP domain unmapping"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:200
+msgid "Disable cache and save cache in this query."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:85
+msgid "Disable cache expire"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:199
+msgid "Disable dns cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:242
+msgid "Disable optimistic DNS caching for this query."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:467
+msgid "Disable optimistic DNS caching in this lookup (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:241
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:466
+msgid "Disable optimistic cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:31
+msgid "Disabled"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:487
+msgid "Domain keyword"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:478
+msgid "Domain name"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:491
+msgid "Domain regex"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:58
+msgid "Domain resolver"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:77
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:198
+msgid "Domain strategy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:442
+msgid "Domain strategy for resolving the domain names."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:483
+msgid "Domain suffix"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:332
+msgid "Domains"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:435
+msgid "Don't drop packets"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:287
+msgid "Don't drop requests"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:178
+msgid "Download bandwidth"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:179
+msgid "Download bandwidth in Mbps."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:431
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:437
+msgid "Drop packets"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:282
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:289
+msgid "Drop requests"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:746
+msgid ""
+"Drop/keep nodes that contain the specific keywords. <a target=\"_blank\" "
+"href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/"
+"Regular_Expressions\">Regex</a> is supported."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:738
+msgid "Drop/keep specific nodes from subscriptions."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:446
+msgid ""
+"EAB (External Account Binding) contains information necessary to bind or map "
+"an ACME account to some other account known by the CA.<br/>External account "
+"bindings are \"used to associate an ACME account with an existing account in "
+"a non-ACME system, such as a CA customer database."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:442
+msgid ""
+"ECH (Encrypted Client Hello) is a TLS extension that allows a client to "
+"encrypt the first part of its ClientHello message."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:462
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:590
+msgid "ECH config"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:446
+msgid "ECH config path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:549
+msgid "ECH key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:212
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:459
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:88
+msgid "EDNS Client subnet"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:614
+msgid "Early data"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:621
+msgid "Early data header name"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:622
+msgid "Early data is sent in path instead of header by default."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:568
+msgid "Edit nodes"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:344
+msgid "Email"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:53
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:45
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:234
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:44
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:168
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:190
+msgid "Enable"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:355
+msgid ""
+"Enable 0-RTT QUIC connection handshake on the client side. This is not "
+"impacting much on the performance, as the protocol is fully multiplexed.<br/"
+">Disabling this is highly recommended, as it is vulnerable to replay attacks."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:354
+msgid "Enable 0-RTT handshake"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:327
+msgid "Enable ACME"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:441
+msgid "Enable ECH"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:173
+msgid "Enable TCP Brutal"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:174
+msgid "Enable TCP Brutal congestion control algorithm"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:521
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:610
+msgid "Enable UDP fragmentation."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:395
+msgid "Enable connection reuse (the Snell v2 CONNECT command)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:175
+msgid "Enable endpoint-independent NAT"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:195
+msgid ""
+"Enable neighbor resolution so rules can match LAN devices by hostname (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:166
+msgid "Enable padding"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:601
+msgid "Enable tcp fast open for listener."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:525
+msgid ""
+"Enable the SUoT protocol, requires server support. Conflict with multiplex."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:177
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:263
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:284
+msgid "Encrypt method"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:27
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:38
+msgid "Endpoint independent"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:182
+msgid "Error"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:170
+msgid "Evaluate (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:225
+msgid "Evaluate tag"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:220
+#: htdocs/luci-static/resources/homeproxy-pro.js:1035
+#: htdocs/luci-static/resources/homeproxy-pro.js:1085
+#: htdocs/luci-static/resources/homeproxy-pro.js:1098
+#: htdocs/luci-static/resources/homeproxy-pro.js:1117
+#: htdocs/luci-static/resources/homeproxy-pro.js:1126
+#: htdocs/luci-static/resources/homeproxy-pro.js:1137
+#: htdocs/luci-static/resources/homeproxy-pro.js:1146
+#: htdocs/luci-static/resources/homeproxy-pro.js:1148
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:203
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:140
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:152
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:156
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:175
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:186
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:190
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:155
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:112
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:75
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:80
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:484
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:727
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:730
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:350
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:352
+msgid "Expecting: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:445
+msgid "External Account Binding"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:457
+msgid "External account MAC key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:451
+msgid "External account key ID"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:315
+msgid "Extra records"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:117
+msgid ""
+"Extra rule-set tags sharing these options. Requires {tag} in path/url (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:116
+msgid "Extra tags"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:657
+msgid "Failed to close the import dialog: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:93
+msgid "Failed to generate %s, error: %s."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:124
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:177
+msgid "Failed to read domain list: %s."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1075
+msgid "Failed to upload %s, error: %s."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:183
+msgid "Fatal"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:745
+msgid "Filter keywords"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:737
+msgid "Filter nodes"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:194
+msgid "Find neighbor hosts"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:126
+msgid "Firefox / uquic firefox"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:195
+msgid "Firewall"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:251
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:298
+msgid "Flow"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:59
+msgid "For resolving domain name in the server address."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:55
+msgid "Format"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:372
+msgid "Fragment TLS handshake into multiple TLS records."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:378
+msgid ""
+"Fragment TLS handshakes. Due to poor performance, try <code>%s</code> first."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:384
+msgid "Fragment fallback delay"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:583
+msgid "GET"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:273
+msgid "GFW list version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:83
+msgid "GFWList"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:72
+msgid "Gaming mode IPv4 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:74
+msgid "Gaming mode IPv6 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:77
+msgid "Gaming mode MAC-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:272
+msgid "Gecko (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:37
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:582
+msgid "Generate"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:277
+msgid "GitHub token"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:87
+msgid "Global"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:274
+msgid "Global padding"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:79
+msgid "Global proxy IPv4 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:82
+msgid "Global proxy IPv6 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:85
+msgid "Global proxy MAC-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:166
+msgid "Global settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:255
+msgid "Google"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:129
+msgid "Google Public DNS (8.8.8.8)"
+msgstr ""
+
+#: root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json:3
+msgid "Grant access to homeproxy-pro configuration"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:132
+#: htdocs/luci-static/resources/homeproxy-pro.js:520
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:94
+msgid "HTTP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:407
+msgid ""
+"HTTP Host header sent when obfuscation mode is http. bing.com is used by "
+"default."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:400
+msgid "HTTP obfuscation. v4 only."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:276
+msgid "HTTP obfuscation. v5 only."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:244
+msgid "HTTP/3"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:257
+msgid ""
+"HTTP3 server behavior when authentication fails.<br/>A 404 page will be "
+"returned if empty."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:243
+msgid "HTTPS"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:521
+msgid "HTTPUpgrade"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:499
+msgid "Handshake server address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:505
+msgid "Handshake server port"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:717
+msgid "Handshake timeout (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:266
+msgid "Headers"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:360
+msgid "Heartbeat interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:33
+msgid "Hijack"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:70
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:119
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:299
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:3
+msgid "HomeProxy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:75
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:136
+msgid "HomeProxy Server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:129
+msgid "Hop interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:123
+msgid "Hopping port"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:566
+#: htdocs/luci-static/resources/homeproxy-pro.js:571
+#: htdocs/luci-static/resources/homeproxy-pro.js:606
+msgid "Host"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:226
+msgid "Host key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:231
+msgid "Host key algorithms"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:44
+msgid "Host/IP fields"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:347
+msgid ""
+"How long the server should wait for the client to send the authentication "
+"command (in seconds)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:399
+msgid "How the forged segment is rejected by the real server."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:133
+msgid "Hysteria"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:134
+msgid "Hysteria2"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:503
+msgid "IP CIDR"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:80
+msgid "IP version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:82
+msgid "IPv4"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:65
+msgid "IPv4 only"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:83
+msgid "IPv6"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:66
+msgid "IPv6 only"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:135
+msgid "IPv6 support"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:100
+msgid "Idle session check interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:107
+msgid "Idle session check timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:589
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:190
+msgid "Idle timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:359
+msgid ""
+"If enabled, attempts to connect UDP connection to the destination instead of "
+"listen."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:353
+msgid ""
+"If enabled, for UDP proxy requests addressed to a domain, the original "
+"packet address will be sent in the response instead of the mapped domain."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:561
+msgid ""
+"If enabled, the client transport sends keepalive pings even with no active "
+"connections."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:199
+msgid ""
+"If set, the requested domain name will be resolved to IP before routing."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:24
+msgid ""
+"If the transport doesn't see any activity after a duration of this time (in "
+"seconds), it pings the client to check if the connection is still active."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:421
+msgid ""
+"If you have the root certificate, use this option instead of allowing "
+"insecure."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:251
+msgid "Ignore client bandwidth"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:662
+msgid "Import"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:589
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:682
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:684
+msgid "Import share links"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:658
+msgid ""
+"Imported the nodes, but the dialog did not close automatically. Close it "
+"manually."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:183
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:615
+msgid "In seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:333
+msgid "In seconds. Disabled by default."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:115
+msgid ""
+"In the check, at least the first <code>n</code> idle sessions are kept open."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:108
+msgid ""
+"In the check, close sessions that have been idle for longer than this, in "
+"seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:180
+msgid "Info"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:110
+msgid "Initial path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:392
+msgid ""
+"Inject a forged TLS ClientHello carrying this SNI before the real one to "
+"fool SNI-filtering middleboxes. Requires elevated privileges."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:31
+msgid "Interface Control"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:197
+msgid "Interrupt existing connections"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:198
+msgid "Interrupt existing connections when the selected outbound has changed."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:101
+msgid "Interval checking for idle sessions, in seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:361
+msgid ""
+"Interval for sending heartbeat packets for keeping the connection alive (in "
+"seconds)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:160
+msgid "Invert"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:161
+msgid "Invert match result."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:231
+msgid ""
+"Judge this response-dependent rule in parallel; first match wins (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:530
+msgid "Key path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:45
+msgid "LAN IP Policy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:40
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:229
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:51
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:184
+msgid "Label"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:258
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:305
+msgid ""
+"Legacy protocol support (VMess MD5 Authentication) is provided for "
+"compatibility purposes only, use of alterId > 1 is not recommended."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:172
+msgid "Less compatibility and sometimes better performance."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:384
+msgid "Let's Encrypt"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:293
+msgid ""
+"List of IP (v4 or v6) addresses prefixes to be assigned to the interface."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:128
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:35
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:64
+msgid "List of nodes to test."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:678
+msgid "List of supported application level protocols, in order of preference."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:306
+msgid "List of text DNS record to respond as answers."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:316
+msgid "List of text DNS record to respond as extra records."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:311
+msgid "List of text DNS record to respond as name servers."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:201
+msgid "Listen address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:33
+msgid "Listen interfaces"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:206
+msgid "Listen port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:210
+msgid "Loading"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:50
+msgid "Local"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:292
+msgid "Local address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:111
+msgid ""
+"Local file with initial rule-set content; avoids blocking startup on first "
+"download (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:59
+msgid "Log file does not exist."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:55
+msgid "Log is empty."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:326
+msgid "MTU"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:53
+msgid "Main UDP node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:25
+msgid "Main node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:157
+msgid "Make IP CIDR in rule set used to match the source IP."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:157
+msgid "Make IP CIDR in rule sets match the source IP."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:256
+msgid "Masquerade"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:528
+msgid "Match DNSSEC OK"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:504
+msgid ""
+"Match IP CIDR with the evaluated response (needs match_response; old rules "
+"are auto-wrapped in 1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:505
+msgid "Match IP CIDR."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:514
+msgid "Match LAN device by MAC address."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:519
+msgid ""
+"Match LAN device hostname via neighbor resolution; enable find_neighbor."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:484
+msgid "Match domain suffix."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:488
+msgid "Match domain using keyword."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:492
+msgid "Match domain using regular expression."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:479
+msgid "Match full domain."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:549
+msgid "Match port range. Format as START:/:END/START:END."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:544
+msgid "Match port."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:509
+msgid "Match private IP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:510
+msgid "Match private IP with the evaluated response (needs match_response)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:500
+msgid "Match private source IP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:554
+msgid "Match process name."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:562
+msgid "Match process path using regular expression."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:558
+msgid "Match process path."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:529
+msgid "Match queries with the DNSSEC OK bit set (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:115
+msgid "Match query type."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:220
+msgid "Match response"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:141
+msgid ""
+"Match rule set. DNS: rules referencing rule-sets that contain query_type are "
+"incompatible with legacy address filters (ip_cidr / ip_is_private) — use "
+"match_response instead (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:142
+msgid ""
+"Match rule set. Since 1.14: a rule-set holding a single default rule is "
+"merged into this rule; any other rule-set matches as an OR collection."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:496
+msgid "Match source IP CIDR."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:539
+msgid "Match source port range. Format as START:/:END/START:END."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:534
+msgid "Match source port."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:524
+msgid "Match the EDNS Client Subnet in the query (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:261
+msgid "Match the evaluated response code (requires match_response)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:137
+msgid "Match user name."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:234
+msgid "Max download speed"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:235
+msgid "Max download speed in Mbps."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:137
+msgid "Max hop interval (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:289
+msgid "Max obfs packet size (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:37
+msgid "Max time an expired entry may be served. Examples: 3d, 1h."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:494
+msgid "Max time difference"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:241
+msgid "Max upload speed"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:242
+msgid "Max upload speed in Mbps."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:700
+msgid "Maximum TLS version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:354
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:368
+msgid "Maximum connections"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:366
+msgid ""
+"Maximum multiplexed streams in a connection before opening a new connection."
+"<br/>Conflict with <code>%s</code> and <code>%s</code>."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:290
+msgid "Maximum on-wire packet size in bytes. Gecko only."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:138
+msgid ""
+"Maximum port hopping interval in seconds; the actual interval is randomized "
+"between the two values. Hysteria2 only."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:365
+msgid "Maximum streams"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:581
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:280
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:289
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:429
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:437
+msgid "Method"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:282
+msgid "Min obfs packet size (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:692
+msgid "Minimum TLS version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:114
+msgid "Minimum idle sessions"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:360
+msgid ""
+"Minimum multiplexed streams in a connection before opening a new connection."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:283
+msgid "Minimum on-wire packet size in bytes. Gecko only."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:359
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:368
+msgid "Minimum streams"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:136
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:157
+msgid "Mixed"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:168
+msgid "Mixed <code>system</code> TCP stack and <code>gVisor</code> UDP stack."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:58
+msgid "Mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:517
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:605
+msgid "MultiPath TCP"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:159
+msgid "Multiplex"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:345
+msgid "Multiplex protocol."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:419
+msgid "NOT RUNNING"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:766
+msgid "NOTE: Save current settings before updating subscriptions."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:310
+msgid "NS"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:335
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:32
+msgid "Native"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:135
+msgid "NaïveProxy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:105
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:621
+msgid "Network"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:324
+msgid "New Reno"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:17
+msgid "No TCP transport, plain HTTP is merged into the HTTP transport."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:19
+msgid "No additional encryption support: It's basically duplicate encryption."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:783
+msgid "No subscription available"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:894
+msgid "No subscription node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:637
+msgid "No valid share link found."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:50
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:25
+msgid "Node"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:22
+msgid "Node Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:574
+msgid "Nodes"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:518
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:286
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:252
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:299
+msgid "None"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:276
+msgid "Obfuscate password"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:269
+msgid "Obfuscate type"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:406
+msgid "Obfuscation host"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:399
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:275
+msgid "Obfuscation mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:114
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:171
+msgid ""
+"One domain per line. No spaces, no comments, no wildcards; the backend "
+"rejects invalid characters and tells you which line."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:34
+msgid "Only process traffic from specific interfaces. Leave empty for all."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:85
+msgid "Only proxy mainland China"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:30
+msgid "Optimistic DNS cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:36
+msgid "Optimistic cache timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:226
+msgid "Optional tag for this evaluate result."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:390
+msgid "Optional; only required when connecting to a multi-user Snell server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:43
+msgid "Other fields"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:320
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:91
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:319
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:93
+msgid "Outbound"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:51
+msgid "Outbound node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:94
+msgid ""
+"Outbound used to download this rule-set (via sing-box 1.14 http_clients)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:338
+msgid "Override address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:472
+msgid "Override dns.timeout for this lookup, in seconds (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:248
+msgid "Override dns.timeout for this query, in seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:345
+msgid "Override port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:339
+msgid "Override the connection destination address."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:346
+msgid "Override the connection destination port."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:376
+msgid "PEM-encoded private key of an existing ACME account (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:584
+msgid "PUT"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:630
+msgid "Packet encoding"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:231
+msgid "Padding scheme"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:184
+msgid "Panic"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:74
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:218
+msgid "Password"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:576
+#: htdocs/luci-static/resources/homeproxy-pro.js:610
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:259
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:61
+msgid "Path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:307
+msgid "Peer pubkic key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:176
+msgid ""
+"Performance may degrade slightly, so it is not recommended to enable on when "
+"it is not needed."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:44
+msgid "Persist DNS cache across restarts (sing-box 1.14, replaces Store RDRC)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:332
+msgid "Persistent keepalive interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:597
+msgid "Ping timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:187
+msgid "Plugin"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:194
+msgid "Plugin opts"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:543
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:254
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:63
+msgid "Port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:114
+msgid "Port %s alrealy exists!"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:45
+msgid "Port fields"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:130
+msgid "Port hopping interval in seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:548
+msgid "Port range"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:314
+msgid "Pre-shared key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:169
+msgid "Predefined"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:63
+msgid "Prefer IPv4"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:64
+msgid "Prefer IPv6"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:235
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:299
+msgid "Private key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:240
+msgid "Private key passphrase"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:360
+msgid "Private key type for new certificates (1.14). Empty uses the default."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:46
+msgid "Process fields"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:553
+msgid "Process name"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:557
+msgid "Process path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:561
+msgid "Process path (regex)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:88
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:144
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:344
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:237
+msgid "Protocol"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:282
+msgid "Protocol parameter. Enable length block encryption."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:275
+msgid ""
+"Protocol parameter. Will waste traffic randomly if enabled (enabled by "
+"default in v2ray and cannot be disabled)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:108
+msgid "Proxy Domain List"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:63
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:92
+msgid "Proxy IPv4 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:66
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:95
+msgid "Proxy IPv6 IP-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:69
+msgid "Proxy MAC-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:50
+msgid "Proxy all except listed"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:47
+msgid "Proxy filter mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:49
+msgid "Proxy listed only"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:122
+msgid "Proxy mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:91
+msgid "Proxy protocol"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:336
+#: htdocs/luci-static/resources/homeproxy-pro.js:522
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:95
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:245
+msgid "QUIC"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:322
+msgid "QUIC congestion control algorithm."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:523
+msgid "Query EDNS client subnet"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:247
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:471
+msgid "Query timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:114
+msgid "Query type"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:293
+msgid "RCode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:96
+msgid "RDP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:495
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:464
+msgid "REALITY"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:469
+msgid "REALITY private key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:500
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:485
+msgid "REALITY public key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:506
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:489
+msgid "REALITY short ID"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:417
+msgid "RUNNING"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:230
+msgid "Race"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:222
+msgid "Random version will be used if empty."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:119
+msgid "Recursive outbound detected!"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:305
+msgid "Recursive resolver detected!"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:123
+msgid "Redirect TCP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:125
+msgid "Redirect TCP + TProxy UDP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:127
+msgid "Redirect TCP + Tun UDP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:236
+msgid "Refresh every %s seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:414
+msgid "Region ID"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:167
+msgid "Reject"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:51
+msgid "Remote"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:891
+msgid "Remove %s nodes"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:254
+msgid "Remove EDNS client subnet"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:881
+msgid "Remove all nodes from subscriptions"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:255
+msgid "Remove the edns0-subnet record from the query (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:281
+msgid "Reply with REFUSED"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:430
+msgid "Reply with TCP RST / ICMP port unreachable"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:321
+msgid "Reserved field bytes"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:172
+msgid "Resolve"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:441
+msgid "Resolve strategy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:258
+msgid "Resources management"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:272
+msgid "Response NS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:260
+msgid "Response RCode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:267
+msgid "Response answer"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:276
+msgid "Response extra"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:31
+msgid ""
+"Return expired cache immediately and refresh in background (sing-box 1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:635
+msgid "Reuse address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:636
+msgid "Reuse listener address."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:205
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:453
+msgid "Rewrite TTL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:206
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:454
+msgid "Rewrite TTL in DNS responses."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:165
+msgid "Route"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:166
+msgid "Route options"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:23
+msgid "Routing Nodes"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:25
+msgid "Routing Rules"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:23
+msgid "Routing Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:82
+msgid "Routing mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:32
+msgid "Routing node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:102
+msgid "Routing ports"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:34
+msgid "Routing rule"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:22
+msgid "Rule Set"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:140
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:31
+msgid "Rule set"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:156
+msgid "Rule set IP CIDR as source IP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:68
+msgid "Rule set URL"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:97
+msgid "SSH"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:421
+msgid "STATUS UNKNOWN"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:98
+msgid "STUN"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:530
+msgid "SUoT version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:128
+msgid "Safari / Apple Network API"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:271
+msgid "Salamander"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:55
+msgid "Same as main node"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:284
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:290
+msgid "Save"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:768
+msgid "Save current settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:765
+msgid "Save subscriptions settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:236
+msgid "Send the query before pending race rules are judged (1.14)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:179
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:176
+msgid "Server"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:30
+msgid "Server Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:339
+msgid ""
+"Server name to use when choosing a certificate if the ClientHello's "
+"ServerName field is empty."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:171
+msgid "Server settings"
+msgstr ""
+
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:38
+msgid "Service Status"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:138
+msgid "ShadowTLS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:201
+msgid "ShadowTLS version"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:137
+msgid "Shadowsocks"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:29
+msgid ""
+"Since sing-box 1.14 the default (Unset) behaves as hijack: sing-box sets the "
+"platform interface DNS and hijacks port 53. On OpenWrt this overlaps with "
+"the own dnsmasq/nftables DNS hijack of this plugin, so keep Disabled on a "
+"gateway unless you need sing-box to own TUN DNS."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:139
+msgid "Snell (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:376
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:263
+msgid "Snell version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:124
+msgid "Sniffed client type (QUIC client type or SSH client name)."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:89
+msgid ""
+"Sniffed protocol, see <a target=\"_blank\" href=\"https://sing-"
+"box.sagernet.org/configuration/route/sniff/\">Sniff</a> for details."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:143
+msgid "Sniffer: advanced mode (100ms, universal list)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:140
+msgid "Socks"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:211
+msgid "Socks version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:212
+msgid "Socks4"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:213
+msgid "Socks4A"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:214
+msgid "Socks5"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:495
+msgid "Source IP CIDR"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:513
+msgid "Source MAC address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:57
+msgid "Source file"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:518
+msgid "Source hostname"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:533
+msgid "Source port"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:538
+msgid "Source port range"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:411
+msgid ""
+"Specifies DNS server tag to use instead of selecting through DNS routing."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:21
+msgid ""
+"Specifies the period of time (in seconds) after which a health check will be "
+"performed using a ping frame if no frames have been received on the "
+"connection.<br/>Please note that a ping response is considered a received "
+"frame, so if there is no other traffic on the connection, the health check "
+"will be executed every interval."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:23
+msgid ""
+"Specifies the time (in seconds) until idle clients should be closed with a "
+"GOAWAY frame. PING frames are not considered as activity."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:26
+msgid ""
+"Specifies the timeout duration (in seconds) after sending a PING frame, "
+"within which a response must be received.<br/>If a response to the PING "
+"frame is not received within the specified timeout duration, the connection "
+"will be closed."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:103
+msgid ""
+"Specify target ports to be proxied. Multiple ports must be separated by "
+"commas."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:235
+msgid "Speculative"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:164
+msgid "Standard (default)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:43
+msgid "Store DNS cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:259
+msgid "String"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:693
+msgid "Sub (%s)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:720
+msgid "Subscription URL-s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:857
+msgid "Subscription update did not complete cleanly. Last log:"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:805
+msgid ""
+"Subscription update is already running. This page will reload when the "
+"previous run finishes."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:867
+msgid ""
+"Subscription update is taking longer than 90 seconds. Check the log and "
+"reload manually."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:704
+msgid "Subscriptions"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:639
+msgid "Successfully imported %s nodes of total %s."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:120
+msgid "Successfully updated."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:590
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:721
+msgid ""
+"Support Hysteria, Shadowsocks, Trojan, v2rayN (VMess), and XTLS (VLESS) "
+"online configuration delivery standard."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:125
+msgid ""
+"Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:160
+msgid "System"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:186
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:418
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:66
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:288
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:229
+msgid "System DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:106
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:241
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:622
+msgid "TCP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:514
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:600
+msgid "TCP fast open"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:154
+msgid "TCP/IP stack"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:155
+msgid "TCP/IP stack."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:650
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:99
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:242
+msgid "TLS"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:677
+msgid "TLS ALPN"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:672
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:272
+msgid "TLS SNI"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:377
+msgid "TLS fragment"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:718
+msgid "TLS handshake timeout in seconds. 15s is used by default."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:18
+msgid "TLS is not enforced. If TLS is not configured, plain HTTP 1.1 is used."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:371
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:379
+msgid "TLS record fragment"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:391
+msgid "TLS spoof SNI (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:398
+msgid "TLS spoof method (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:26
+msgid "TUN DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:39
+msgid "TUN DNS addresses (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:28
+msgid "TUN DNS mode (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:281
+msgid ""
+"Tag of a another server to resolve the domain name in the address. Required "
+"if address contains domain."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:320
+msgid "Tag of an outbound for connecting to the dns server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:180
+msgid "Tag of the target dns server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:321
+msgid "Tag of the target outbound."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:252
+msgid ""
+"Tell the client to use the BBR flow control algorithm instead of Hysteria CC."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:132
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:167
+msgid "Tencent Public DNS (119.29.29.29)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:147
+msgid "Test URL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:167
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:41
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:70
+msgid "Test interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:175
+msgid "Test interval must be less or equal than idle timeout."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:183
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:47
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:76
+msgid "Test tolerance"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:268
+msgid "Text DNS records to match in the evaluated answer."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:383
+msgid "The ACME CA provider to use."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:62
+msgid "The DNS strategy for resolving the domain name in the address."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:148
+msgid "The URL to test."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:250
+msgid "The address of the dns server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:434
+msgid ""
+"The alternate port to use for the ACME HTTP challenge; if non-empty, this "
+"port will be used instead of 80 to spin up a listener for the HTTP challenge."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:440
+msgid ""
+"The alternate port to use for the ACME TLS-ALPN challenge; the system must "
+"forward 443 to this port for challenge to succeed."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:66
+msgid ""
+"The default rule uses the following matching logic:<br/><code>(domain || "
+"domain_suffix || domain_keyword || domain_regex || ip_cidr || "
+"ip_is_private)</code> &&<br/><code>(port || port_range)</code> &&<br/"
+"><code>(source_ip_cidr || source_ip_is_private)</code> &&<br/"
+"><code>(source_port || source_port_range)</code> &&<br/><code>other fields</"
+"code>.<br/>Additionally, included rule sets can be considered merged rather "
+"than as a single rule sub-item."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:59
+msgid ""
+"The default rule uses the following matching logic:<br/><code>(domain || "
+"domain_suffix || domain_keyword || domain_regex)</code> &&<br/><code>(port "
+"|| port_range)</code> &&<br/><code>(source_ip_cidr || source_ip_is_private)</"
+"code> &&<br/><code>(source_port || source_port_range)</code> &&<br/"
+"><code>other fields</code>.<br/>Additionally, included rule sets can be "
+"considered merged rather than as a single rule sub-item."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:163
+msgid ""
+"The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:78
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:313
+msgid "The domain strategy for resolving the domain name in the address."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:709
+msgid ""
+"The elliptic curves that will be used in an ECDHE handshake, in preference "
+"order. If empty, the default will be used."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:345
+msgid ""
+"The email address to use when creating or selecting an existing ACME server "
+"account."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:385
+msgid ""
+"The fallback value in milliseconds used when TLS segmentation cannot "
+"automatically determine the wait time."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:191
+msgid "The idle timeout in seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:701
+msgid "The maximum TLS version that is acceptable."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:495
+msgid "The maximum time difference between the server and the client."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:693
+msgid "The minimum TLS version that is acceptable."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:120
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:137
+msgid "The modern ImmortalWrt proxy platform for ARM64/AMD64."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:85
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:630
+msgid "The network interface to bind to."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:260
+msgid "The path of the DNS server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:447
+msgid ""
+"The path to the ECH config, in PEM format. If empty, load from DNS will be "
+"attempted."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:426
+msgid "The path to the server certificate, in PEM format."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:207
+msgid "The port must be unique."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:255
+msgid "The port of the DNS server."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:264
+msgid "The pre-shared key (password) above must be 12-255 bytes for v6."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:850
+msgid "The request %s failed: %s."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:294
+msgid "The response code."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:531
+msgid "The server private key, in PEM format."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:512
+msgid "The server public key, in PEM format."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:92
+msgid ""
+"The tag of the upstream outbound.<br/>Other dial fields will be ignored when "
+"enabled."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:168
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:42
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:71
+msgid "The test interval in seconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:184
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:77
+msgid "The test tolerance in milliseconds."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:28
+msgid ""
+"The timeout (in seconds) that after performing a keepalive check, the client "
+"will wait for activity. If no activity is detected, the connection will be "
+"closed."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:686
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:756
+msgid ""
+"This is <strong>DANGEROUS</strong>, your traffic is almost like "
+"<strong>PLAIN TEXT</strong>! Use at your own risk!"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:341
+msgid ""
+"This is the TUIC port of the UDP over TCP protocol, designed to provide a "
+"QUIC stream based UDP relay mode that TUIC does not provide."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:133
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:168
+msgid "ThreatBook Public DNS (117.50.10.10)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:365
+msgid ""
+"Timeout for UDP connections.<br/>Setting a larger value than the UDP timeout "
+"in inbounds will have no effect."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:624
+msgid ""
+"To be compatible with Xray-core, set this to <code>Sec-WebSocket-Protocol</"
+"code>."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:130
+msgid ""
+"To enable Tun support, you need to install <code>ip-full</code> and "
+"<code>kmod-tun</code>"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:178
+msgid "Trace"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:517
+msgid "Transport"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:142
+msgid "Trojan"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:143
+msgid "Tuic"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:128
+msgid "Tun TCP/UDP"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:461
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:239
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:49
+msgid "Type"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:107
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:240
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:623
+msgid "UDP"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:520
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:609
+msgid "UDP Fragment"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:24
+msgid "UDP NAT Settings"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:182
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:614
+msgid "UDP NAT expiration time"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:37
+msgid "UDP NAT filtering (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:26
+msgid "UDP NAT mapping (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:48
+msgid "UDP NAT sessions max (1.14)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:524
+msgid "UDP over TCP"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:340
+msgid "UDP over stream"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:333
+msgid "UDP packet relay mode."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:332
+msgid "UDP relay mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:364
+msgid "UDP timeout"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:52
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:27
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:56
+msgid "URLTest"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:127
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:34
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:63
+msgid "URLTest nodes"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:309
+msgid "UUID"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:132
+msgid "Unknown error."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:61
+msgid "Unknown error: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:30
+msgid "Unset (default)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:488
+msgid "Unsupported fingerprint!"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:780
+msgid "Update %s subscriptions"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:123
+msgid "Update failed."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:132
+msgid "Update interval"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:133
+msgid "Update interval of rule set."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:775
+msgid "Update nodes from subscriptions"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:717
+msgid "Update subscriptions via proxy."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:710
+msgid "Update time"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:716
+msgid "Update via proxy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:813
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:825
+msgid "Updating subscriptions…"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:457
+msgid "Upload ECH config"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:184
+msgid "Upload bandwidth"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:185
+msgid "Upload bandwidth in Mbps."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:433
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:522
+msgid "Upload certificate"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:541
+msgid "Upload key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:436
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:460
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:525
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:544
+msgid "Upload..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:328
+msgid "Use ACME TLS certificate issuer."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:144
+msgid ""
+"Use the tutorial-recommended sniffer profile (100ms timeout, http/tls/stun/"
+"quic/dns). Default keeps the 300ms / unconstrained-list behaviour."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:673
+msgid ""
+"Used to verify the hostname on the returned certificates unless insecure is "
+"given."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:273
+msgid "Used to verify the hostname on the returned certificates."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:136
+msgid "User"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:389
+msgid "User key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:750
+msgid "User-Agent"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:68
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:211
+msgid "Username"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:145
+msgid "VLESS"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:146
+msgid "VMess"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:164
+msgid "WAN DNS (read from interface)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:90
+msgid "WAN IP Policy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:181
+msgid "Warn"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:523
+msgid "WebSocket"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:197
+msgid ""
+"When the main DNS returns a mainland China IP, re-resolve via China DNS "
+"using evaluate/match_response."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:741
+msgid "Whitelist mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:144
+msgid "WireGuard"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:308
+msgid "WireGuard peer public key."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:315
+msgid "WireGuard pre-shared key."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:300
+msgid "WireGuard requires base64-encoded private keys."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:92
+msgid "Write proxy protocol in the connection header."
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:633
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:763
+msgid "Xudp (Xray-core)"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1073
+msgid "Your %s was successfully uploaded. Size: %sB."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:385
+msgid "ZeroSSL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:438
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:527
+msgid "certificate"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:358
+msgid "connect UDP connections"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:694
+#: htdocs/luci-static/resources/homeproxy-pro.js:702
+msgid "default"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:91
+msgid "failed"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:519
+msgid "gRPC"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:560
+msgid "gRPC permit without stream"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:555
+msgid "gRPC service name"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:158
+msgid "gVisor"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:402
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:278
+msgid "http"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:220
+#: htdocs/luci-static/resources/homeproxy-pro.js:1126
+#: htdocs/luci-static/resources/homeproxy-pro.js:1146
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:140
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:175
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:484
+msgid "non-empty value"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:631
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:188
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:401
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:761
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:277
+msgid "none"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:632
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:762
+msgid "packet addr (v2ray-core v5+)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:88
+msgid "passed"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:546
+msgid "private key"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:127
+msgid "quic-go / uquic chrome"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:302
+msgid "sing-box client"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:41
+msgid ""
+"sing-box default; recommended for home use (accepts replies from any remote "
+"after mapping). Choose stricter only for specific UDP issues."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:30
+msgid ""
+"sing-box default; recommended for home use (small NAT table, QUIC/game "
+"friendly). Choose stricter only for specific UDP issues."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:377
+msgid ""
+"sing-box implements Snell v4/v5 wire as v4 and v6. The pre-shared key "
+"(Password above) must be 12-255 bytes for v6."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:305
+msgid "sing-box server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:466
+msgid "uTLS fingerprint"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:467
+msgid ""
+"uTLS is a fork of \"crypto/tls\", which provides ClientHello fingerprinting "
+"resistance."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:97
+msgid "unchecked"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1035
+msgid "unique UCI identifier"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1137
+msgid "unique value"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:809
+msgid "unknown error"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:94
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:202
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:531
+msgid "v1"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:95
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:203
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:532
+msgid "v2"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:204
+msgid "v3"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:383
+msgid "v4"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:269
+msgid "v5"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:384
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:270
+msgid "v6"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:152
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:156
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:186
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:190
+msgid "valid DNS server address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:155
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:80
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:727
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:730
+msgid "valid URL"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1085
+msgid "valid base64 key with %d characters"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:203
+msgid "valid hostname"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1117
+msgid "valid port range (port1:port2)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:112
+msgid "valid port value"
+msgstr ""
+
+#: htdocs/luci-static/resources/homeproxy-pro.js:1148
+msgid "valid uuid"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:402
+msgid "wrong-ack"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:401
+msgid "wrong-checksum"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:403
+msgid "wrong-md5"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:400
+msgid "wrong-sequence (default)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:404
+msgid "wrong-timestamp"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:75
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:123
+msgid "{tag} in URL when extra tags are used"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:126
+msgid "{tag} in initial path when extra tags are used"
+msgstr ""
diff --git a/luci-app-homeproxy-pro-pro/po/zh-cn b/luci-app-homeproxy-pro/po/zh-cn
similarity index 100%
rename from luci-app-homeproxy-pro-pro/po/zh-cn
rename to luci-app-homeproxy-pro/po/zh-cn
diff --git a/luci-app-homeproxy-pro-pro/po/zh_Hans/homeproxy-pro-pro.po b/luci-app-homeproxy-pro/po/zh_Hans/homeproxy-pro.po
similarity index 50%
rename from luci-app-homeproxy-pro-pro/po/zh_Hans/homeproxy-pro-pro.po
rename to luci-app-homeproxy-pro/po/zh_Hans/homeproxy-pro.po
index 25e6989d2..d6b0b1d0e 100644
--- a/luci-app-homeproxy-pro-pro/po/zh_Hans/homeproxy-pro-pro.po
+++ b/luci-app-homeproxy-pro/po/zh_Hans/homeproxy-pro.po
@@ -8,31 +8,31 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:222
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:222
 msgid "%s log"
 msgstr "%s 日志"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:913
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:913
 msgid "%s nodes removed"
 msgstr "移除了 %s 个节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:858
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:858
 msgid "(empty)"
 msgstr "(空)"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:110
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:110
 msgid "(last updated %s)"
 msgstr "（最后更新 %s）"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:111
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:111
 msgid "(never updated on this device)"
 msgstr "（本设备从未更新）"
 
-#: htdocs/luci-static/resources/homeproxy.js:1098
-msgid "/etc/homeproxy/certs/..., /etc/acme/..., /etc/ssl/..."
-msgstr "/etc/homeproxy/certs/...，/etc/acme/...，/etc/ssl/..."
+#: htdocs/luci-static/resources/homeproxy-pro.js:1098
+msgid "/etc/homeproxy-pro/certs/..., /etc/acme/..., /etc/ssl/..."
+msgstr "/etc/homeproxy-pro/certs/...，/etc/acme/...，/etc/ssl/..."
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:221
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:221
 msgid ""
 "1 matches the latest untagged evaluate result; other values match an "
 "evaluate tag (1.14)."
@@ -40,194 +40,194 @@ msgstr ""
 "1 匹配最近一次无 tag 的 evaluate 结果；其它值匹配对应的 evaluate tag"
 "（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:81
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:81
 msgid "4 or 6. Not limited if empty."
 msgstr "4 或 6。留空不限制。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:288
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:436
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:288
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:436
 msgid ""
 "<code>%s</code> will be temporarily overwritten to <code>%s</code> after 50 "
 "triggers in 30s if not enabled."
 msgstr ""
 "若未启用，30 秒内触发 50 次后，<code>%s</code> 将临时改为 <code>%s</code>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:434
-#: htdocs/luci-static/resources/view/homeproxy/node.js:458
-#: htdocs/luci-static/resources/view/homeproxy/server.js:523
-#: htdocs/luci-static/resources/view/homeproxy/server.js:542
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:434
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:458
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:523
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:542
 msgid "<strong>Save your configuration before uploading files!</strong>"
 msgstr "<strong>上传文件前请先保存配置！</strong>"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:375
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:375
 msgid "ACME account key"
 msgstr "ACME 账户密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:359
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:359
 msgid "ACME key type"
 msgstr "ACME 密钥类型"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:369
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:369
 msgid "ACME profile"
 msgstr "ACME 配置档"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:370
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:370
 msgid "ACME profile for certificate issuance (1.14). Example: shortlived."
 msgstr "证书签发使用的 ACME profile（1.14）。示例：shortlived。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:419
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:419
 msgid "API token"
 msgstr "API 令牌"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:227
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:227
 msgid "Accept any if empty."
 msgstr "留空则不校验。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:25
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:25
 msgid "Access Control"
 msgstr "访问控制"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:402
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:402
 msgid "Access key ID"
 msgstr "访问密钥 ID"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:408
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:408
 msgid "Access key secret"
 msgstr "访问密钥 Secret"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:164
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:164
 msgid "Action"
 msgstr "操作"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:35
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:35
 msgid "Add a DNS rule"
 msgstr "新增 DNS 规则"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:221
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:221
 msgid "Add a DNS server"
 msgstr "新增 DNS 服务器"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:25
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:25
 msgid "Add a node"
 msgstr "新增节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:32
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:32
 msgid "Add a routing node"
 msgstr "新增路由节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:35
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:35
 msgid "Add a routing rule"
 msgstr "新增路由规则"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:31
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:31
 msgid "Add a rule set"
 msgstr "新增规则集"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:176
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:176
 msgid "Add a server"
 msgstr "新增服务器"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:267
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:267
 msgid "Additional headers to be sent to the DNS server."
 msgstr "发送到 DNS 服务器的附加标头。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:249
-#: htdocs/luci-static/resources/view/homeproxy/node.js:58
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:249
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:58
 msgid "Address"
 msgstr "地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:29
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:40
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:29
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:40
 msgid "Address and port dependent"
 msgstr "地址与端口相关"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:28
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:28
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:39
 msgid "Address dependent"
 msgstr "地址相关"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:280
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:280
 msgid "Address resolver"
 msgstr "地址解析器"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:312
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:312
 msgid "Address strategy"
 msgstr "地址解析策略"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:166
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:166
 msgid "Aggressive"
 msgstr "激进"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:395
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:395
 msgid "Alibaba Cloud DNS"
 msgstr "阿里云 DNS"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:131
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:165
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:131
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:165
 msgid "Aliyun Public DNS (223.5.5.5)"
 msgstr "阿里云公共 DNS（223.5.5.5）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:104
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:104
 msgid "All ports"
 msgstr "所有端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:196
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:196
 msgid "Allow access from the Internet."
 msgstr "允许来自互联网的访问。"
 
-#: htdocs/luci-static/resources/homeproxy.js:683
-#: htdocs/luci-static/resources/view/homeproxy/node.js:753
+#: htdocs/luci-static/resources/homeproxy-pro.js:683
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:753
 msgid "Allow insecure"
 msgstr "允许不安全连接"
 
-#: htdocs/luci-static/resources/homeproxy.js:684
+#: htdocs/luci-static/resources/homeproxy-pro.js:684
 msgid "Allow insecure connection at TLS client."
 msgstr "允许 TLS 客户端侧的不安全连接。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:754
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:754
 msgid "Allow insecure connection by default when add nodes from subscriptions."
 msgstr "从订阅获取节点时，默认允许不安全连接。"
 
-#: htdocs/luci-static/resources/homeproxy.js:615
+#: htdocs/luci-static/resources/homeproxy-pro.js:615
 msgid "Allowed payload size is in the request."
 msgstr "请求中允许的载荷大小。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:129
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:129
 msgid "Already at the latest version."
 msgstr "已是最新版本。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:126
 msgid "Already in updating."
 msgstr "已在更新中。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:257
-#: htdocs/luci-static/resources/view/homeproxy/server.js:304
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:257
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:304
 msgid "Alter ID"
 msgstr "额外 ID"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:433
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:433
 msgid "Alternative HTTP port"
 msgstr "替代 HTTP 端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:439
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:439
 msgid "Alternative TLS port"
 msgstr "替代 HTTPS 端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:305
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:305
 msgid "Answer"
 msgstr "回答"
 
-#: htdocs/luci-static/resources/homeproxy.js:131
+#: htdocs/luci-static/resources/homeproxy-pro.js:131
 msgid "AnyTLS"
 msgstr "AnyTLS"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:232
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:232
 msgid "AnyTLS padding scheme in array."
 msgstr "AnyTLS 填充方案。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:213
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:460
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:89
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:213
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:460
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:89
 msgid ""
 "Append a <code>edns0-subnet</code> OPT extra record with the specified IP "
 "prefix to every query by default.<br/>If value is an IP address instead of "
@@ -237,383 +237,383 @@ msgstr ""
 "OPT 附加记录。<br/>如果值是 IP 地址而非前缀，将自动附加 <code>/32</code> 或 "
 "<code>/128</code>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:420
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:420
 msgid "Append self-signed certificate"
 msgstr "追加自签名证书"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:36
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:36
 msgid "Applied"
 msgstr "已应用"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:29
-#: htdocs/luci-static/resources/view/homeproxy/node.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:29
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:39
 msgid "Apply"
 msgstr "应用"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:16
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:16
 msgid "Are you sure to allow insecure?"
 msgstr "确定要允许不安全连接吗？"
 
-#: htdocs/luci-static/resources/homeproxy.js:346
+#: htdocs/luci-static/resources/homeproxy-pro.js:346
 msgid "Auth timeout"
 msgstr "认证超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:281
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:281
 msgid "Authenticated length"
 msgstr "认证长度"
 
-#: htdocs/luci-static/resources/homeproxy.js:263
+#: htdocs/luci-static/resources/homeproxy-pro.js:263
 msgid "Authentication payload"
 msgstr "认证载荷"
 
-#: htdocs/luci-static/resources/homeproxy.js:256
+#: htdocs/luci-static/resources/homeproxy-pro.js:256
 msgid "Authentication type"
 msgstr "认证类型"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:706
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:706
 msgid "Auto update"
 msgstr "自动更新"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:707
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:707
 msgid "Auto update subscriptions and geodata."
 msgstr "自动更新订阅和地理数据。"
 
-#: htdocs/luci-static/resources/homeproxy.js:325
+#: htdocs/luci-static/resources/homeproxy-pro.js:325
 msgid "BBR"
 msgstr "BBR"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:163
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:163
 msgid "BBR congestion control algorithm profile. Hysteria2 only."
 msgstr "BBR 拥塞控制算法档位。仅 Hysteria2。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:162
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:162
 msgid "BBR profile (1.14)"
 msgstr "BBR 档位（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:252
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:252
 msgid "BaiDu"
 msgstr "百度"
 
-#: htdocs/luci-static/resources/homeproxy.js:258
+#: htdocs/luci-static/resources/homeproxy-pro.js:258
 msgid "Base64"
 msgstr "Base64"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:170
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:170
 msgid "Based on google/gvisor."
 msgstr "基于 google/gvisor。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:56
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:56
 msgid "Binary file"
 msgstr "二进制文件"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:38
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:84
-#: htdocs/luci-static/resources/view/homeproxy/server.js:629
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:38
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:84
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:629
 msgid "Bind interface"
 msgstr "绑定接口"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:39
 msgid ""
 "Bind outbound traffic to specific interface. Leave empty to auto detect."
 msgstr "绑定出站流量至指定端口。留空自动检测。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:90
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:90
 msgid "BitTorrent"
 msgstr "BitTorrent"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:740
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:740
 msgid "Blacklist mode"
 msgstr "黑名单模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:211
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:211
 msgid "Block"
 msgstr "封锁"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:84
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:108
-#: htdocs/luci-static/resources/view/homeproxy/server.js:624
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:84
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:108
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:624
 msgid "Both"
 msgstr "全部"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:190
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:190
 msgid "Bypass CN traffic"
 msgstr "绕过中国流量"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:84
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:84
 msgid "Bypass mainland China"
 msgstr "大陆白名单"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:191
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:191
 msgid "Bypass mainland China traffic via firewall rules by default."
 msgstr "默认使用防火墙规则绕过中国大陆流量。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:382
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:382
 msgid "CA provider"
 msgstr "CA 颁发机构"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:196
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:196
 msgid "CN-IP DNS fallback (sing-box 1.14)"
 msgstr "大陆 IP DNS 兜底（sing-box 1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:166
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:166
 msgid "CNNIC Public DNS (210.2.4.8)"
 msgstr "CNNIC 公共 DNS（210.2.4.8）"
 
-#: htdocs/luci-static/resources/homeproxy.js:323
+#: htdocs/luci-static/resources/homeproxy-pro.js:323
 msgid "CUBIC"
 msgstr "CUBIC"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:596
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:596
 msgid "Cancel"
 msgstr "取消"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:425
-#: htdocs/luci-static/resources/view/homeproxy/server.js:511
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:425
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:511
 msgid "Certificate path"
 msgstr "证书路径"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:95
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:95
 msgid "Check"
 msgstr "检查"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:139
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:139
 msgid "Check update"
 msgstr "检查更新"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:162
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:162
 msgid "China DNS server"
 msgstr "国内 DNS 服务器"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:261
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:261
 msgid "China IPv4 list version"
 msgstr "国内 IPv4 库版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:265
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:265
 msgid "China IPv6 list version"
 msgstr "国内 IPv6 库版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:269
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:269
 msgid "China list version"
 msgstr "国内域名列表版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:125
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:125
 msgid "Chromium / Cronet"
 msgstr "Chromium / Cronet"
 
-#: htdocs/luci-static/resources/homeproxy.js:708
+#: htdocs/luci-static/resources/homeproxy-pro.js:708
 msgid "Cipher suites"
 msgstr "密码套件"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:128
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:128
 msgid "Cisco Public DNS (208.67.222.222)"
 msgstr "思科公共 DNS（208.67.222.222）"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:231
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:231
 msgid "Clean log"
 msgstr "清空日志"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:123
 msgid "Client"
 msgstr "客户端"
 
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:14
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:14
 msgid "Client Settings"
 msgstr "客户端设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:221
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:221
 msgid "Client version"
 msgstr "客户端版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:127
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:127
 msgid "CloudFlare Public DNS (1.1.1.1)"
 msgstr "CloudFlare 公共 DNS（1.1.1.1）"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:396
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:396
 msgid "Cloudflare"
 msgstr "Cloudflare"
 
-#: htdocs/luci-static/resources/view/homeproxy/client.js:130
-#: htdocs/luci-static/resources/view/homeproxy/server.js:146
-#: htdocs/luci-static/resources/view/homeproxy/status.js:212
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:130
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:146
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:212
 msgid "Collecting data..."
 msgstr "正在收集数据中..."
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:105
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:105
 msgid "Common ports only (bypass P2P traffic)"
 msgstr "仅常用端口（绕过 P2P 流量）"
 
-#: htdocs/luci-static/resources/homeproxy.js:321
+#: htdocs/luci-static/resources/homeproxy-pro.js:321
 msgid "Congestion control algorithm"
 msgstr "拥塞控制算法"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:249
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:249
 msgid "Connection check"
 msgstr "连接检查"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:394
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:394
 msgid "Connection reuse"
 msgstr "连接复用"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:165
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:165
 msgid "Conservative"
 msgstr "保守"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:809
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:809
 msgid "Could not start subscription update: %s"
 msgstr "无法启动订阅更新：%s"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:86
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:86
 msgid "Custom routing"
 msgstr "自定义路由"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:92
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:92
 msgid "DNS"
 msgstr "DNS"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:25
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:25
 msgid "DNS Rules"
 msgstr "DNS 规则"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:212
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:212
 msgid "DNS Servers"
 msgstr "DNS 服务器"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:56
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:122
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:56
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:122
 msgid "DNS Settings"
 msgstr "DNS 设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:394
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:394
 msgid "DNS provider"
 msgstr "DNS 提供商"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:39
 msgid "DNS query timeout"
 msgstr "DNS 查询超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:34
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:34
 msgid "DNS rule"
 msgstr "DNS 规则"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:410
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:124
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:221
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:410
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:124
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:221
 msgid "DNS server"
 msgstr "DNS 服务器"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:390
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:390
 msgid "DNS01 challenge"
 msgstr "DNS01 验证"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:93
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:93
 msgid "DTLS"
 msgstr "DTLS"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:179
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:179
 msgid "Debug"
 msgstr "调试"
 
-#: htdocs/luci-static/resources/homeproxy.js:62
-#: htdocs/luci-static/resources/homeproxy.js:334
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:73
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:416
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:64
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:99
+#: htdocs/luci-static/resources/homeproxy-pro.js:62
+#: htdocs/luci-static/resources/homeproxy-pro.js:334
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:73
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:416
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:64
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:99
 msgid "Default"
 msgstr "默认"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:185
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:417
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:71
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:65
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:287
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:228
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:185
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:417
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:71
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:65
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:287
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:228
 msgid "Default DNS (issued by WAN)"
 msgstr "默认 DNS（由 WAN 下发）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:66
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:66
 msgid "Default DNS server"
 msgstr "默认 DNS 服务器"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:223
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:223
 msgid "Default DNS server for resolving domain name in the server address."
 msgstr "用于解析服务器地址中的域名的默认 DNS 服务器。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:61
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:61
 msgid "Default DNS strategy"
 msgstr "默认 DNS 解析策略"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:203
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:203
 msgid "Default outbound"
 msgstr "默认出站"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:222
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:222
 msgid "Default outbound DNS"
 msgstr "默认出站 DNS"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:204
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:204
 msgid "Default outbound for connections not matched by any routing rules."
 msgstr "用于未被任何路由规则匹配的连接的默认出站。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:760
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:760
 msgid "Default packet encoding"
 msgstr "默认包封装格式"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:338
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:338
 msgid "Default server name"
 msgstr "默认服务器名称"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:40
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:40
 msgid "Default timeout per DNS query in seconds (sing-box default: 10)."
 msgstr "每次 DNS 查询的默认超时时间（秒，sing-box 默认为 10）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:130
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:326
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:97
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:325
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:210
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:100
+#: htdocs/luci-static/resources/homeproxy-pro.js:130
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:326
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:97
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:325
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:210
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:100
 msgid "Direct"
 msgstr "直连"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:165
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:165
 msgid "Direct Domain List"
 msgstr "直连域名列表"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:54
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:99
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:54
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:99
 msgid "Direct IPv4 IP-s"
 msgstr "直连 IPv4 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:57
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:102
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:57
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:102
 msgid "Direct IPv6 IP-s"
 msgstr "直连 IPv6 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:60
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:60
 msgid "Direct MAC-s"
 msgstr "直连 MAC 地址"
 
-#: htdocs/luci-static/resources/homeproxy.js:257
-#: htdocs/luci-static/resources/homeproxy.js:270
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:48
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:26
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:54
-#: htdocs/luci-static/resources/view/homeproxy/node.js:93
-#: htdocs/luci-static/resources/view/homeproxy/node.js:468
-#: htdocs/luci-static/resources/view/homeproxy/node.js:739
+#: htdocs/luci-static/resources/homeproxy-pro.js:257
+#: htdocs/luci-static/resources/homeproxy-pro.js:270
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:26
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:54
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:93
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:468
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:739
 msgid "Disable"
 msgstr "禁用"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:209
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:209
 msgid "Disable (the service)"
 msgstr "禁用（服务）"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:170
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:170
 msgid "Disable Chrome QUIC fingerprint (1.14)"
 msgstr "禁用 Chrome QUIC 指纹（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:171
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:171
 msgid ""
 "Disable Chrome QUIC handshake parroting, which is enabled by default since "
 "sing-box 1.14. Turn this on only when the server uses an Ed25519 certificate "
@@ -622,116 +622,116 @@ msgstr ""
 "禁用自 sing-box 1.14 起默认开启的 Chrome QUIC 握手伪装。仅在服务器证书为 "
 "Ed25519 或握手失败时才需要开启。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:448
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:448
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:83
 msgid "Disable DNS cache"
 msgstr "禁用 DNS 缓存"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:449
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:449
 msgid "Disable DNS cache in this query."
 msgstr "在本次查询中禁用 DNS 缓存。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:425
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:425
 msgid "Disable HTTP challenge"
 msgstr "禁用 HTTP 验证"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:429
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:429
 msgid "Disable TLS ALPN challenge"
 msgstr "禁用 TLS ALPN 认证"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:352
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:352
 msgid "Disable UDP domain unmapping"
 msgstr "禁用 UDP 域名映射"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:200
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:200
 msgid "Disable cache and save cache in this query."
 msgstr "在本次查询中禁用缓存。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:85
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:85
 msgid "Disable cache expire"
 msgstr "缓存永不过期"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:199
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:199
 msgid "Disable dns cache"
 msgstr "禁用 DNS 缓存"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:242
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:242
 msgid "Disable optimistic DNS caching for this query."
 msgstr "对此查询禁用乐观 DNS 缓存。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:467
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:467
 msgid "Disable optimistic DNS caching in this lookup (1.14)."
 msgstr "关闭本次查询解析的乐观 DNS 缓存（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:241
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:466
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:241
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:466
 msgid "Disable optimistic cache"
 msgstr "禁用乐观缓存"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:31
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:31
 msgid "Disabled"
 msgstr "禁用"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:487
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:487
 msgid "Domain keyword"
 msgstr "域名关键词"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:478
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:478
 msgid "Domain name"
 msgstr "域名"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:491
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:491
 msgid "Domain regex"
 msgstr "域名正则表达式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:58
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:58
 msgid "Domain resolver"
 msgstr "域名解析器"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:77
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:198
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:77
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:198
 msgid "Domain strategy"
 msgstr "域名解析策略"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:442
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:442
 msgid "Domain strategy for resolving the domain names."
 msgstr "目标域名的解析策略。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:483
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:483
 msgid "Domain suffix"
 msgstr "域名后缀"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:332
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:332
 msgid "Domains"
 msgstr "域名"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:435
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:435
 msgid "Don't drop packets"
 msgstr "不丢弃数据包"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:287
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:287
 msgid "Don't drop requests"
 msgstr "不丢弃请求"
 
-#: htdocs/luci-static/resources/homeproxy.js:178
+#: htdocs/luci-static/resources/homeproxy-pro.js:178
 msgid "Download bandwidth"
 msgstr "下载带宽"
 
-#: htdocs/luci-static/resources/homeproxy.js:179
+#: htdocs/luci-static/resources/homeproxy-pro.js:179
 msgid "Download bandwidth in Mbps."
 msgstr "下载带宽（单位：Mbps）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:431
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:437
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:431
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:437
 msgid "Drop packets"
 msgstr "丢弃数据包"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:282
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:289
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:282
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:289
 msgid "Drop requests"
 msgstr "丢弃请求"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:746
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:746
 msgid ""
 "Drop/keep nodes that contain the specific keywords. <a target=\"_blank\" "
 "href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/"
@@ -741,11 +741,11 @@ msgstr ""
 "developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions'>支"
 "持正则表达式</a>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:738
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:738
 msgid "Drop/keep specific nodes from subscriptions."
 msgstr "从订阅中 丢弃/保留 指定节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:446
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:446
 msgid ""
 "EAB (External Account Binding) contains information necessary to bind or map "
 "an ACME account to some other account known by the CA.<br/>External account "
@@ -758,7 +758,7 @@ msgstr ""
 "其他帐户所需的信息。<br/>外部帐户绑定“用于将 ACME 帐户与非 ACME 系统中的现有"
 "帐户相关联，例如 CA 客户数据库。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:442
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:442
 msgid ""
 "ECH (Encrypted Client Hello) is a TLS extension that allows a client to "
 "encrypt the first part of its ClientHello message."
@@ -767,55 +767,55 @@ msgstr ""
 "分。ECH（Encrypted Client Hello）是一个 TLS 扩展，它允许客户端加密其 "
 "ClientHello 信息的第一部分。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:462
-#: htdocs/luci-static/resources/view/homeproxy/server.js:590
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:462
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:590
 msgid "ECH config"
 msgstr "ECH 配置"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:446
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:446
 msgid "ECH config path"
 msgstr "ECH 配置路径"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:549
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:549
 msgid "ECH key"
 msgstr "ECH 密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:212
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:459
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:88
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:212
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:459
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:88
 msgid "EDNS Client subnet"
 msgstr "EDNS 客户端子网"
 
-#: htdocs/luci-static/resources/homeproxy.js:614
+#: htdocs/luci-static/resources/homeproxy-pro.js:614
 msgid "Early data"
 msgstr "前置数据"
 
-#: htdocs/luci-static/resources/homeproxy.js:621
+#: htdocs/luci-static/resources/homeproxy-pro.js:621
 msgid "Early data header name"
 msgstr "前置数据标头"
 
-#: htdocs/luci-static/resources/homeproxy.js:622
+#: htdocs/luci-static/resources/homeproxy-pro.js:622
 msgid "Early data is sent in path instead of header by default."
 msgstr "前置数据默认发送在路径而不是标头中。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:568
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:568
 msgid "Edit nodes"
 msgstr "修改节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:344
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:344
 msgid "Email"
 msgstr "Email"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:53
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:45
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:234
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:44
-#: htdocs/luci-static/resources/view/homeproxy/server.js:168
-#: htdocs/luci-static/resources/view/homeproxy/server.js:190
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:53
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:45
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:234
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:44
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:168
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:190
 msgid "Enable"
 msgstr "启用"
 
-#: htdocs/luci-static/resources/homeproxy.js:355
+#: htdocs/luci-static/resources/homeproxy-pro.js:355
 msgid ""
 "Enable 0-RTT QUIC connection handshake on the client side. This is not "
 "impacting much on the performance, as the protocol is fully multiplexed.<br/"
@@ -824,448 +824,448 @@ msgstr ""
 "在客户端启用 0-RTT QUIC 连接握手。由于协议完全多路复用，这对性能影响不大。"
 "<br/>强烈建议禁用，因为它容易受到重放攻击。"
 
-#: htdocs/luci-static/resources/homeproxy.js:354
+#: htdocs/luci-static/resources/homeproxy-pro.js:354
 msgid "Enable 0-RTT handshake"
 msgstr "启用 0-RTT 握手"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:327
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:327
 msgid "Enable ACME"
 msgstr "启用 ACME"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:441
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:441
 msgid "Enable ECH"
 msgstr "启用 ECH"
 
-#: htdocs/luci-static/resources/homeproxy.js:173
+#: htdocs/luci-static/resources/homeproxy-pro.js:173
 msgid "Enable TCP Brutal"
 msgstr "启用 TCP Brutal"
 
-#: htdocs/luci-static/resources/homeproxy.js:174
+#: htdocs/luci-static/resources/homeproxy-pro.js:174
 msgid "Enable TCP Brutal congestion control algorithm"
 msgstr "启用 TCP Brutal 拥塞控制算法。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:521
-#: htdocs/luci-static/resources/view/homeproxy/server.js:610
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:521
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:610
 msgid "Enable UDP fragmentation."
 msgstr "启用 UDP 分片。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:395
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:395
 msgid "Enable connection reuse (the Snell v2 CONNECT command)."
 msgstr "启用连接复用（Snell v2 CONNECT 指令）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:175
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:175
 msgid "Enable endpoint-independent NAT"
 msgstr "启用端点独立 NAT"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:195
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:195
 msgid ""
 "Enable neighbor resolution so rules can match LAN devices by hostname (1.14)."
 msgstr "启用邻居解析，使规则可按主机名匹配局域网设备（1.14）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:166
+#: htdocs/luci-static/resources/homeproxy-pro.js:166
 msgid "Enable padding"
 msgstr "启用填充"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:601
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:601
 msgid "Enable tcp fast open for listener."
 msgstr "为监听器启用 TCP 快速打开。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:525
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:525
 msgid ""
 "Enable the SUoT protocol, requires server support. Conflict with multiplex."
 msgstr "启用 SUoT 协议，需要服务端支持。与多路复用冲突。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:177
-#: htdocs/luci-static/resources/view/homeproxy/node.js:263
-#: htdocs/luci-static/resources/view/homeproxy/server.js:284
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:177
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:263
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:284
 msgid "Encrypt method"
 msgstr "加密方式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:27
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:38
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:27
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:38
 msgid "Endpoint independent"
 msgstr "端点无关"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:182
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:182
 msgid "Error"
 msgstr "错误"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:170
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:170
 msgid "Evaluate (1.14)"
 msgstr "Evaluate（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:225
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:225
 msgid "Evaluate tag"
 msgstr "Evaluate 标签"
 
-#: htdocs/luci-static/resources/homeproxy.js:220
-#: htdocs/luci-static/resources/homeproxy.js:1035
-#: htdocs/luci-static/resources/homeproxy.js:1085
-#: htdocs/luci-static/resources/homeproxy.js:1098
-#: htdocs/luci-static/resources/homeproxy.js:1117
-#: htdocs/luci-static/resources/homeproxy.js:1126
-#: htdocs/luci-static/resources/homeproxy.js:1137
-#: htdocs/luci-static/resources/homeproxy.js:1146
-#: htdocs/luci-static/resources/homeproxy.js:1148
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:203
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:140
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:152
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:156
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:175
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:186
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:190
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:141
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:155
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:112
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:72
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:75
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:80
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:83
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:123
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:126
-#: htdocs/luci-static/resources/view/homeproxy/node.js:484
-#: htdocs/luci-static/resources/view/homeproxy/node.js:727
-#: htdocs/luci-static/resources/view/homeproxy/node.js:730
-#: htdocs/luci-static/resources/view/homeproxy/server.js:350
-#: htdocs/luci-static/resources/view/homeproxy/server.js:352
+#: htdocs/luci-static/resources/homeproxy-pro.js:220
+#: htdocs/luci-static/resources/homeproxy-pro.js:1035
+#: htdocs/luci-static/resources/homeproxy-pro.js:1085
+#: htdocs/luci-static/resources/homeproxy-pro.js:1098
+#: htdocs/luci-static/resources/homeproxy-pro.js:1117
+#: htdocs/luci-static/resources/homeproxy-pro.js:1126
+#: htdocs/luci-static/resources/homeproxy-pro.js:1137
+#: htdocs/luci-static/resources/homeproxy-pro.js:1146
+#: htdocs/luci-static/resources/homeproxy-pro.js:1148
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:203
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:140
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:152
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:156
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:175
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:186
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:190
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:155
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:112
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:75
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:80
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:484
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:727
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:730
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:350
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:352
 msgid "Expecting: %s"
 msgstr "请输入：%s"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:445
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:445
 msgid "External Account Binding"
 msgstr "外部账户绑定"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:457
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:457
 msgid "External account MAC key"
 msgstr "外部账户 MAC 密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:451
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:451
 msgid "External account key ID"
 msgstr "外部账户密钥标识符"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:315
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:315
 msgid "Extra records"
 msgstr "附加记录"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:117
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:117
 msgid ""
 "Extra rule-set tags sharing these options. Requires {tag} in path/url (1.14)."
 msgstr ""
 "共享这些选项的额外规则集标签。使用多标签时 path/url 需包含 {tag}（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:116
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:116
 msgid "Extra tags"
 msgstr "额外标签"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:657
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:657
 msgid "Failed to close the import dialog: %s"
 msgstr "关闭导入对话框失败：%s"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:93
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:93
 msgid "Failed to generate %s, error: %s."
 msgstr "生成 %s 失败，错误：%s。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:124
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:177
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:124
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:177
 msgid "Failed to read domain list: %s."
 msgstr "读取域名列表失败：%s。"
 
-#: htdocs/luci-static/resources/homeproxy.js:1075
+#: htdocs/luci-static/resources/homeproxy-pro.js:1075
 msgid "Failed to upload %s, error: %s."
 msgstr "上传 %s 失败，错误：%s。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:183
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:183
 msgid "Fatal"
 msgstr "致命"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:745
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:745
 msgid "Filter keywords"
 msgstr "过滤关键词"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:737
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:737
 msgid "Filter nodes"
 msgstr "过滤节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:194
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:194
 msgid "Find neighbor hosts"
 msgstr "发现邻居主机"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:126
 msgid "Firefox / uquic firefox"
 msgstr "Firefox / uquic firefox"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:195
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:195
 msgid "Firewall"
 msgstr "防火墙"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:251
-#: htdocs/luci-static/resources/view/homeproxy/server.js:298
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:251
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:298
 msgid "Flow"
 msgstr "流控"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:59
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:59
 msgid "For resolving domain name in the server address."
 msgstr "用于解析服务器地址中的域名。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:55
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:55
 msgid "Format"
 msgstr "格式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:372
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:372
 msgid "Fragment TLS handshake into multiple TLS records."
 msgstr "将 TLS 握手分片为多个 TLS 记录"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:378
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:378
 msgid ""
 "Fragment TLS handshakes. Due to poor performance, try <code>%s</code> first."
 msgstr "分片 TLS 握手。由于性能较差，请先尝试 <code>%s</code>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:384
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:384
 msgid "Fragment fallback delay"
 msgstr "分片回退延迟"
 
-#: htdocs/luci-static/resources/homeproxy.js:583
+#: htdocs/luci-static/resources/homeproxy-pro.js:583
 msgid "GET"
 msgstr "GET"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:273
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:273
 msgid "GFW list version"
 msgstr "GFW 域名列表版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:83
 msgid "GFWList"
 msgstr "GFWList"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:72
 msgid "Gaming mode IPv4 IP-s"
 msgstr "游戏模式 IPv4 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:74
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:74
 msgid "Gaming mode IPv6 IP-s"
 msgstr "游戏模式 IPv6 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:77
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:77
 msgid "Gaming mode MAC-s"
 msgstr "游戏模式 MAC 地址"
 
-#: htdocs/luci-static/resources/homeproxy.js:272
+#: htdocs/luci-static/resources/homeproxy-pro.js:272
 msgid "Gecko (1.14)"
 msgstr "Gecko（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:37
-#: htdocs/luci-static/resources/view/homeproxy/server.js:39
-#: htdocs/luci-static/resources/view/homeproxy/server.js:582
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:37
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:582
 msgid "Generate"
 msgstr "生成"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:277
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:277
 msgid "GitHub token"
 msgstr "GitHub 令牌"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:87
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:87
 msgid "Global"
 msgstr "全局"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:274
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:274
 msgid "Global padding"
 msgstr "全局填充"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:79
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:79
 msgid "Global proxy IPv4 IP-s"
 msgstr "全局代理 IPv4 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:82
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:82
 msgid "Global proxy IPv6 IP-s"
 msgstr "全局代理 IPv6 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:85
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:85
 msgid "Global proxy MAC-s"
 msgstr "全局代理 MAC 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:166
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:166
 msgid "Global settings"
 msgstr "全局设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:255
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:255
 msgid "Google"
 msgstr "谷歌"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:129
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:129
 msgid "Google Public DNS (8.8.8.8)"
 msgstr "谷歌公共 DNS（8.8.8.8）"
 
-#: root/usr/share/rpcd/acl.d/luci-app-homeproxy.json:3
-msgid "Grant access to homeproxy configuration"
-msgstr "授予 homeproxy 访问 UCI 配置的权限"
+#: root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json:3
+msgid "Grant access to homeproxy-pro configuration"
+msgstr "授予 homeproxy-pro 访问 UCI 配置的权限"
 
-#: htdocs/luci-static/resources/homeproxy.js:132
-#: htdocs/luci-static/resources/homeproxy.js:520
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:94
+#: htdocs/luci-static/resources/homeproxy-pro.js:132
+#: htdocs/luci-static/resources/homeproxy-pro.js:520
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:94
 msgid "HTTP"
 msgstr "HTTP"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:407
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:407
 msgid ""
 "HTTP Host header sent when obfuscation mode is http. bing.com is used by "
 "default."
 msgstr "混淆模式为 http 时发送的 HTTP Host 头；默认 bing.com。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:400
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:400
 msgid "HTTP obfuscation. v4 only."
 msgstr "HTTP 混淆。仅 v4。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:276
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:276
 msgid "HTTP obfuscation. v5 only."
 msgstr "HTTP 混淆。仅 v5。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:244
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:244
 msgid "HTTP/3"
 msgstr "HTTP/3"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:257
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:257
 msgid ""
 "HTTP3 server behavior when authentication fails.<br/>A 404 page will be "
 "returned if empty."
 msgstr "身份验证失败时的 HTTP3 服务器响应。默认返回 404 页面。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:243
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:243
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: htdocs/luci-static/resources/homeproxy.js:521
+#: htdocs/luci-static/resources/homeproxy-pro.js:521
 msgid "HTTPUpgrade"
 msgstr "HTTPUpgrade"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:499
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:499
 msgid "Handshake server address"
 msgstr "握手服务器地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:505
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:505
 msgid "Handshake server port"
 msgstr "握手服务器端口"
 
-#: htdocs/luci-static/resources/homeproxy.js:717
+#: htdocs/luci-static/resources/homeproxy-pro.js:717
 msgid "Handshake timeout (1.14)"
 msgstr "握手超时（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:266
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:266
 msgid "Headers"
 msgstr "标头"
 
-#: htdocs/luci-static/resources/homeproxy.js:360
+#: htdocs/luci-static/resources/homeproxy-pro.js:360
 msgid "Heartbeat interval"
 msgstr "心跳间隔"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:33
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:33
 msgid "Hijack"
 msgstr "劫持"
 
-#: htdocs/luci-static/resources/view/homeproxy/client.js:70
-#: htdocs/luci-static/resources/view/homeproxy/client.js:119
-#: htdocs/luci-static/resources/view/homeproxy/status.js:299
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:3
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:70
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:119
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:299
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:3
 msgid "HomeProxy"
 msgstr "HomeProxy"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:75
-#: htdocs/luci-static/resources/view/homeproxy/server.js:136
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:75
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:136
 msgid "HomeProxy Server"
 msgstr "HomeProxy 服务端"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:129
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:129
 msgid "Hop interval"
 msgstr "跳跃间隔"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:123
 msgid "Hopping port"
 msgstr "跳跃端口"
 
-#: htdocs/luci-static/resources/homeproxy.js:566
-#: htdocs/luci-static/resources/homeproxy.js:571
-#: htdocs/luci-static/resources/homeproxy.js:606
+#: htdocs/luci-static/resources/homeproxy-pro.js:566
+#: htdocs/luci-static/resources/homeproxy-pro.js:571
+#: htdocs/luci-static/resources/homeproxy-pro.js:606
 msgid "Host"
 msgstr "主机名"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:226
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:226
 msgid "Host key"
 msgstr "主机密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:231
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:231
 msgid "Host key algorithms"
 msgstr "主机密钥算法"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:44
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:44
 msgid "Host/IP fields"
 msgstr "主机/IP 字段"
 
-#: htdocs/luci-static/resources/homeproxy.js:347
+#: htdocs/luci-static/resources/homeproxy-pro.js:347
 msgid ""
 "How long the server should wait for the client to send the authentication "
 "command (in seconds)."
 msgstr "服务器等待客户端发送认证命令的时间（单位：秒）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:399
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:399
 msgid "How the forged segment is rejected by the real server."
 msgstr "伪造段被真实服务器拒绝的方式。"
 
-#: htdocs/luci-static/resources/homeproxy.js:133
+#: htdocs/luci-static/resources/homeproxy-pro.js:133
 msgid "Hysteria"
 msgstr "Hysteria"
 
-#: htdocs/luci-static/resources/homeproxy.js:134
+#: htdocs/luci-static/resources/homeproxy-pro.js:134
 msgid "Hysteria2"
 msgstr "Hysteria2"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:503
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:503
 msgid "IP CIDR"
 msgstr "IP CIDR"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:80
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:80
 msgid "IP version"
 msgstr "IP 版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:82
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:82
 msgid "IPv4"
 msgstr "IPv4"
 
-#: htdocs/luci-static/resources/homeproxy.js:65
+#: htdocs/luci-static/resources/homeproxy-pro.js:65
 msgid "IPv4 only"
 msgstr "仅 IPv4"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:83
 msgid "IPv6"
 msgstr "IPv6"
 
-#: htdocs/luci-static/resources/homeproxy.js:66
+#: htdocs/luci-static/resources/homeproxy-pro.js:66
 msgid "IPv6 only"
 msgstr "仅 IPv6"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:135
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:135
 msgid "IPv6 support"
 msgstr "IPv6 支持"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:100
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:100
 msgid "Idle session check interval"
 msgstr "空闲会话检查间隔"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:107
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:107
 msgid "Idle session check timeout"
 msgstr "空闲会话检查超时"
 
-#: htdocs/luci-static/resources/homeproxy.js:589
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:190
+#: htdocs/luci-static/resources/homeproxy-pro.js:589
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:190
 msgid "Idle timeout"
 msgstr "空闲超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:359
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:359
 msgid ""
 "If enabled, attempts to connect UDP connection to the destination instead of "
 "listen."
 msgstr "如果启用，尝试主动连接到目标的 UDP 而不是监听。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:353
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:353
 msgid ""
 "If enabled, for UDP proxy requests addressed to a domain, the original "
 "packet address will be sent in the response instead of the mapped domain."
@@ -1273,18 +1273,18 @@ msgstr ""
 "如启用，对于发往域名的 UDP 代理请求，响应中将发送原始数据包地址，而不是映射后"
 "的域名。"
 
-#: htdocs/luci-static/resources/homeproxy.js:561
+#: htdocs/luci-static/resources/homeproxy-pro.js:561
 msgid ""
 "If enabled, the client transport sends keepalive pings even with no active "
 "connections."
 msgstr "如果启用，客户端传输即使没有活动连接也会发送 keepalive ping。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:199
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:199
 msgid ""
 "If set, the requested domain name will be resolved to IP before routing."
 msgstr "如果设置，请求的域名将在路由前被解析为 IP 地址。"
 
-#: htdocs/luci-static/resources/homeproxy.js:24
+#: htdocs/luci-static/resources/homeproxy-pro.js:24
 msgid ""
 "If the transport doesn't see any activity after a duration of this time (in "
 "seconds), it pings the client to check if the connection is still active."
@@ -1293,61 +1293,61 @@ msgstr ""
 "是否仍处于活动状态。如果传输在此时间段（单位：秒）后没有看到任何活动，它会向"
 "客户端发送 ping 请求以检查连接是否仍然活动。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:421
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:421
 msgid ""
 "If you have the root certificate, use this option instead of allowing "
 "insecure."
 msgstr "如果你拥有根证书，使用此选项而不是允许不安全连接。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:251
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:251
 msgid "Ignore client bandwidth"
 msgstr "忽略客户端带宽"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:662
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:662
 msgid "Import"
 msgstr "导入"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:589
-#: htdocs/luci-static/resources/view/homeproxy/node.js:682
-#: htdocs/luci-static/resources/view/homeproxy/node.js:684
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:589
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:682
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:684
 msgid "Import share links"
 msgstr "导入分享链接"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:658
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:658
 msgid ""
 "Imported the nodes, but the dialog did not close automatically. Close it "
 "manually."
 msgstr "节点已导入，但对话框未能自动关闭。请手动关闭。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:183
-#: htdocs/luci-static/resources/view/homeproxy/server.js:615
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:183
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:615
 msgid "In seconds."
 msgstr "单位：秒。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:333
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:333
 msgid "In seconds. Disabled by default."
 msgstr "单位：秒。默认禁用。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:115
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:115
 msgid ""
 "In the check, at least the first <code>n</code> idle sessions are kept open."
 msgstr "在检查中，至少保持前 <code>n</code> 个空闲会话处于打开状态。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:108
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:108
 msgid ""
 "In the check, close sessions that have been idle for longer than this, in "
 "seconds."
 msgstr "在检查中，关闭空闲时间超过此值的会话（单位：秒）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:180
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:180
 msgid "Info"
 msgstr "信息"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:110
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:110
 msgid "Initial path"
 msgstr "初始路径"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:392
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:392
 msgid ""
 "Inject a forged TLS ClientHello carrying this SNI before the real one to "
 "fool SNI-filtering middleboxes. Requires elevated privileges."
@@ -1355,60 +1355,60 @@ msgstr ""
 "在真实握手前注入携带该 SNI 的伪造 TLS ClientHello，以欺骗按 SNI 过滤的中间"
 "盒；需要特权。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:31
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:31
 msgid "Interface Control"
 msgstr "接口控制"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:197
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:197
 msgid "Interrupt existing connections"
 msgstr "中断现有连接"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:198
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:198
 msgid "Interrupt existing connections when the selected outbound has changed."
 msgstr "当选择的出站发生变化时中断现有连接。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:101
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:101
 msgid "Interval checking for idle sessions, in seconds."
 msgstr "空闲会话检查间隔（单位：秒）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:361
+#: htdocs/luci-static/resources/homeproxy-pro.js:361
 msgid ""
 "Interval for sending heartbeat packets for keeping the connection alive (in "
 "seconds)."
 msgstr "发送心跳包以保持连接存活的时间间隔（单位：秒）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:160
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:160
 msgid "Invert"
 msgstr "反转"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:161
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:161
 msgid "Invert match result."
 msgstr "反转匹配结果"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:231
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:231
 msgid ""
 "Judge this response-dependent rule in parallel; first match wins (1.14)."
 msgstr "并行判定此响应依赖规则，首个命中即生效（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:530
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:530
 msgid "Key path"
 msgstr "证书路径"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:45
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:45
 msgid "LAN IP Policy"
 msgstr "LAN IP 策略"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:48
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:40
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:229
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:39
-#: htdocs/luci-static/resources/view/homeproxy/node.js:51
-#: htdocs/luci-static/resources/view/homeproxy/server.js:184
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:40
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:229
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:51
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:184
 msgid "Label"
 msgstr "标签"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:258
-#: htdocs/luci-static/resources/view/homeproxy/server.js:305
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:258
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:305
 msgid ""
 "Legacy protocol support (VMess MD5 Authentication) is provided for "
 "compatibility purposes only, use of alterId > 1 is not recommended."
@@ -1416,188 +1416,188 @@ msgstr ""
 "仅为兼容目的提供旧协议（VMess MD5 认证）支持，不建议使用大于 1 的 alterId。提"
 "供旧协议支持（VMess MD5 身份验证）仅出于兼容性目的，不建议使用 alterId > 1。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:172
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:172
 msgid "Less compatibility and sometimes better performance."
 msgstr "有时性能更好。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:384
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:384
 msgid "Let's Encrypt"
 msgstr "Let's Encrypt"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:293
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:293
 msgid ""
 "List of IP (v4 or v6) addresses prefixes to be assigned to the interface."
 msgstr "分配给接口的 IP（v4 或 v6）地址前缀列表。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:128
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:35
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:64
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:128
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:35
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:64
 msgid "List of nodes to test."
 msgstr "要测试的节点列表。"
 
-#: htdocs/luci-static/resources/homeproxy.js:678
+#: htdocs/luci-static/resources/homeproxy-pro.js:678
 msgid "List of supported application level protocols, in order of preference."
 msgstr "支持的应用层协议协商列表，按顺序排列。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:306
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:306
 msgid "List of text DNS record to respond as answers."
 msgstr "要响应的 DNS 记录列表。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:316
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:316
 msgid "List of text DNS record to respond as extra records."
 msgstr "要响应的附加 DNS 记录列表。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:311
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:311
 msgid "List of text DNS record to respond as name servers."
 msgstr "要响应的域名服务器（NS） DNS 记录列表。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:201
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:201
 msgid "Listen address"
 msgstr "监听地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:33
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:33
 msgid "Listen interfaces"
 msgstr "监听接口"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:206
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:206
 msgid "Listen port"
 msgstr "监听端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:210
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:210
 msgid "Loading"
 msgstr "加载中"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:50
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:50
 msgid "Local"
 msgstr "本地"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:292
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:292
 msgid "Local address"
 msgstr "本地地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:111
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:111
 msgid ""
 "Local file with initial rule-set content; avoids blocking startup on first "
 "download (1.14)."
 msgstr "远程规则集的本地初始内容文件，避免首次下载阻塞启动（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:59
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:59
 msgid "Log file does not exist."
 msgstr "日志文件不存在。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:55
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:55
 msgid "Log is empty."
 msgstr "日志为空。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:326
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:326
 msgid "MTU"
 msgstr "MTU"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:53
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:53
 msgid "Main UDP node"
 msgstr "主 UDP 节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:25
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:25
 msgid "Main node"
 msgstr "主节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:157
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:157
 msgid "Make IP CIDR in rule set used to match the source IP."
 msgstr "使规则集中的 IP CIDR 用于匹配源 IP。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:157
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:157
 msgid "Make IP CIDR in rule sets match the source IP."
 msgstr "使规则集中的 IP CIDR 匹配源 IP。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:256
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:256
 msgid "Masquerade"
 msgstr "伪装"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:528
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:528
 msgid "Match DNSSEC OK"
 msgstr "匹配 DNSSEC OK"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:504
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:504
 msgid ""
 "Match IP CIDR with the evaluated response (needs match_response; old rules "
 "are auto-wrapped in 1.14)."
 msgstr ""
 "以已评估的响应匹配 IP CIDR（需要 match_response；旧规则在 1.14 自动包装）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:505
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:505
 msgid "Match IP CIDR."
 msgstr "匹配 IP CIDR。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:514
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:514
 msgid "Match LAN device by MAC address."
 msgstr "按 MAC 地址匹配局域网设备。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:519
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:519
 msgid ""
 "Match LAN device hostname via neighbor resolution; enable find_neighbor."
 msgstr "通过邻居解析按主机名匹配局域网设备；需启用 find_neighbor。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:484
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:484
 msgid "Match domain suffix."
 msgstr "匹配域名后缀。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:488
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:488
 msgid "Match domain using keyword."
 msgstr "使用关键词匹配域名。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:492
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:492
 msgid "Match domain using regular expression."
 msgstr "使用正则表达式匹配域名。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:479
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:479
 msgid "Match full domain."
 msgstr "匹配完整域名。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:549
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:549
 msgid "Match port range. Format as START:/:END/START:END."
 msgstr "匹配端口范围。格式为 START:/:END/START:END。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:544
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:544
 msgid "Match port."
 msgstr "匹配端口。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:509
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:509
 msgid "Match private IP"
 msgstr "匹配私有 IP"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:510
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:510
 msgid "Match private IP with the evaluated response (needs match_response)."
 msgstr "以已评估的响应匹配私网 IP（需要 match_response）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:500
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:500
 msgid "Match private source IP"
 msgstr "匹配私有源 IP"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:554
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:554
 msgid "Match process name."
 msgstr "匹配进程名。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:562
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:562
 msgid "Match process path using regular expression."
 msgstr "使用正则表达式匹配进程路径。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:558
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:558
 msgid "Match process path."
 msgstr "匹配进程路径。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:529
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:529
 msgid "Match queries with the DNSSEC OK bit set (1.14)."
 msgstr "匹配设置了 DNSSEC OK 位的查询（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:115
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:115
 msgid "Match query type."
 msgstr "匹配请求类型。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:220
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:220
 msgid "Match response"
 msgstr "匹配响应"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:141
 msgid ""
 "Match rule set. DNS: rules referencing rule-sets that contain query_type are "
 "incompatible with legacy address filters (ip_cidr / ip_is_private) — use "
@@ -1606,7 +1606,7 @@ msgstr ""
 "匹配规则集。DNS：引用含 query_type 规则集的规则与 legacy 地址过滤（ip_cidr / "
 "ip_is_private）不兼容——请改用 match_response（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:142
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:142
 msgid ""
 "Match rule set. Since 1.14: a rule-set holding a single default rule is "
 "merged into this rule; any other rule-set matches as an OR collection."
@@ -1614,72 +1614,72 @@ msgstr ""
 "匹配规则集。自 1.14：仅含单条 default 规则的规则集字段会合并进本条规则；其余"
 "规则集整体按 OR 集合匹配。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:496
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:496
 msgid "Match source IP CIDR."
 msgstr "匹配源 IP CIDR。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:539
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:539
 msgid "Match source port range. Format as START:/:END/START:END."
 msgstr "匹配源端口范围。格式为 START:/:END/START:END。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:534
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:534
 msgid "Match source port."
 msgstr "匹配源端口。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:524
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:524
 msgid "Match the EDNS Client Subnet in the query (1.14)."
 msgstr "匹配查询中的 EDNS Client Subnet（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:261
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:261
 msgid "Match the evaluated response code (requires match_response)."
 msgstr "匹配已评估响应的响应码（需 match_response）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:137
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:137
 msgid "Match user name."
 msgstr "匹配用户名。"
 
-#: htdocs/luci-static/resources/homeproxy.js:234
+#: htdocs/luci-static/resources/homeproxy-pro.js:234
 msgid "Max download speed"
 msgstr "最大下载速度"
 
-#: htdocs/luci-static/resources/homeproxy.js:235
+#: htdocs/luci-static/resources/homeproxy-pro.js:235
 msgid "Max download speed in Mbps."
 msgstr "最大下载速度（Mbps）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:137
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:137
 msgid "Max hop interval (1.14)"
 msgstr "最大跳变间隔（1.14）"
 
-#: htdocs/luci-static/resources/homeproxy.js:289
+#: htdocs/luci-static/resources/homeproxy-pro.js:289
 msgid "Max obfs packet size (1.14)"
 msgstr "最大混淆包长（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:37
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:37
 msgid "Max time an expired entry may be served. Examples: 3d, 1h."
 msgstr "过期缓存项可被乐观返回的最长时间。示例：3d、1h。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:494
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:494
 msgid "Max time difference"
 msgstr "最大时间差"
 
-#: htdocs/luci-static/resources/homeproxy.js:241
+#: htdocs/luci-static/resources/homeproxy-pro.js:241
 msgid "Max upload speed"
 msgstr "最大上传速度"
 
-#: htdocs/luci-static/resources/homeproxy.js:242
+#: htdocs/luci-static/resources/homeproxy-pro.js:242
 msgid "Max upload speed in Mbps."
 msgstr "最大上传速度（Mbps）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:700
+#: htdocs/luci-static/resources/homeproxy-pro.js:700
 msgid "Maximum TLS version"
 msgstr "最大 TLS 版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:354
-#: htdocs/luci-static/resources/view/homeproxy/node.js:368
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:354
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:368
 msgid "Maximum connections"
 msgstr "最大连接数"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:366
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:366
 msgid ""
 "Maximum multiplexed streams in a connection before opening a new connection."
 "<br/>Conflict with <code>%s</code> and <code>%s</code>."
@@ -1687,739 +1687,739 @@ msgstr ""
 "在打开新连接之前，一个连接内允许的最大多路复用流数量。<br/>与 <code>%s</"
 "code> 和 <code>%s</code> 冲突。"
 
-#: htdocs/luci-static/resources/homeproxy.js:290
+#: htdocs/luci-static/resources/homeproxy-pro.js:290
 msgid "Maximum on-wire packet size in bytes. Gecko only."
 msgstr "线上的最大包长（字节）。仅 Gecko 生效。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:138
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:138
 msgid ""
 "Maximum port hopping interval in seconds; the actual interval is randomized "
 "between the two values. Hysteria2 only."
 msgstr "最大端口跳变间隔（秒）；实际间隔在两者之间随机。仅 Hysteria2。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:365
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:365
 msgid "Maximum streams"
 msgstr "最大流数量"
 
-#: htdocs/luci-static/resources/homeproxy.js:581
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:280
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:289
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:429
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:437
+#: htdocs/luci-static/resources/homeproxy-pro.js:581
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:280
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:289
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:429
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:437
 msgid "Method"
 msgstr "方式"
 
-#: htdocs/luci-static/resources/homeproxy.js:282
+#: htdocs/luci-static/resources/homeproxy-pro.js:282
 msgid "Min obfs packet size (1.14)"
 msgstr "最小混淆包长（1.14）"
 
-#: htdocs/luci-static/resources/homeproxy.js:692
+#: htdocs/luci-static/resources/homeproxy-pro.js:692
 msgid "Minimum TLS version"
 msgstr "最低 TLS 版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:114
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:114
 msgid "Minimum idle sessions"
 msgstr "最小空闲会话数"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:360
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:360
 msgid ""
 "Minimum multiplexed streams in a connection before opening a new connection."
 msgstr "在打开新连接之前，连接中的最小多路复用流数量。"
 
-#: htdocs/luci-static/resources/homeproxy.js:283
+#: htdocs/luci-static/resources/homeproxy-pro.js:283
 msgid "Minimum on-wire packet size in bytes. Gecko only."
 msgstr "线上的最小包长（字节）。仅 Gecko 生效。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:359
-#: htdocs/luci-static/resources/view/homeproxy/node.js:368
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:359
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:368
 msgid "Minimum streams"
 msgstr "最小流数量"
 
-#: htdocs/luci-static/resources/homeproxy.js:136
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:157
+#: htdocs/luci-static/resources/homeproxy-pro.js:136
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:157
 msgid "Mixed"
 msgstr "混合"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:168
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:168
 msgid "Mixed <code>system</code> TCP stack and <code>gVisor</code> UDP stack."
 msgstr "混合<code>系统</code> TCP 栈和 <code>gVisor</code> UDP 栈。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:58
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:58
 msgid "Mode"
 msgstr "模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:517
-#: htdocs/luci-static/resources/view/homeproxy/server.js:605
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:517
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:605
 msgid "MultiPath TCP"
 msgstr "多路径 TCP（MPTCP）"
 
-#: htdocs/luci-static/resources/homeproxy.js:159
+#: htdocs/luci-static/resources/homeproxy-pro.js:159
 msgid "Multiplex"
 msgstr "多路复用"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:345
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:345
 msgid "Multiplex protocol."
 msgstr "多路复用协议。"
 
-#: htdocs/luci-static/resources/homeproxy.js:419
+#: htdocs/luci-static/resources/homeproxy-pro.js:419
 msgid "NOT RUNNING"
 msgstr "未运行"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:766
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:766
 msgid "NOTE: Save current settings before updating subscriptions."
 msgstr "注意：更新订阅前先保存当前配置。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:310
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:310
 msgid "NS"
 msgstr "NS"
 
-#: htdocs/luci-static/resources/homeproxy.js:335
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:32
+#: htdocs/luci-static/resources/homeproxy-pro.js:335
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:32
 msgid "Native"
 msgstr "原生"
 
-#: htdocs/luci-static/resources/homeproxy.js:135
+#: htdocs/luci-static/resources/homeproxy-pro.js:135
 msgid "NaïveProxy"
 msgstr "NaïveProxy"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:105
-#: htdocs/luci-static/resources/view/homeproxy/server.js:621
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:105
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:621
 msgid "Network"
 msgstr "网络"
 
-#: htdocs/luci-static/resources/homeproxy.js:324
+#: htdocs/luci-static/resources/homeproxy-pro.js:324
 msgid "New Reno"
 msgstr "New Reno"
 
-#: htdocs/luci-static/resources/homeproxy.js:17
+#: htdocs/luci-static/resources/homeproxy-pro.js:17
 msgid "No TCP transport, plain HTTP is merged into the HTTP transport."
 msgstr "无 TCP 传输层, 纯 HTTP 已合并到 HTTP 传输层。"
 
-#: htdocs/luci-static/resources/homeproxy.js:19
+#: htdocs/luci-static/resources/homeproxy-pro.js:19
 msgid "No additional encryption support: It's basically duplicate encryption."
 msgstr "无额外加密支持：它基本上是重复加密。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:783
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:783
 msgid "No subscription available"
 msgstr "无可用订阅"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:894
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:894
 msgid "No subscription node"
 msgstr "无订阅节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:637
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:637
 msgid "No valid share link found."
 msgstr "找不到有效分享链接。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:50
-#: htdocs/luci-static/resources/view/homeproxy/node.js:25
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:50
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:25
 msgid "Node"
 msgstr "节点"
 
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:22
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:22
 msgid "Node Settings"
 msgstr "节点设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:574
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:574
 msgid "Nodes"
 msgstr "节点"
 
-#: htdocs/luci-static/resources/homeproxy.js:518
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:286
-#: htdocs/luci-static/resources/view/homeproxy/node.js:252
-#: htdocs/luci-static/resources/view/homeproxy/server.js:299
+#: htdocs/luci-static/resources/homeproxy-pro.js:518
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:286
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:252
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:299
 msgid "None"
 msgstr "无"
 
-#: htdocs/luci-static/resources/homeproxy.js:276
+#: htdocs/luci-static/resources/homeproxy-pro.js:276
 msgid "Obfuscate password"
 msgstr "混淆密码"
 
-#: htdocs/luci-static/resources/homeproxy.js:269
+#: htdocs/luci-static/resources/homeproxy-pro.js:269
 msgid "Obfuscate type"
 msgstr "混淆类型"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:406
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:406
 msgid "Obfuscation host"
 msgstr "混淆主机"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:399
-#: htdocs/luci-static/resources/view/homeproxy/server.js:275
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:399
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:275
 msgid "Obfuscation mode"
 msgstr "混淆模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:114
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:171
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:114
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:171
 msgid ""
 "One domain per line. No spaces, no comments, no wildcards; the backend "
 "rejects invalid characters and tells you which line."
 msgstr "每行一个域名。不含空格、注释和通配符；后端会拒绝非法字符并指出所在行。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:34
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:34
 msgid "Only process traffic from specific interfaces. Leave empty for all."
 msgstr "只处理来自指定接口的流量。留空表示全部。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:85
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:85
 msgid "Only proxy mainland China"
 msgstr "仅代理中国大陆"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:30
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:30
 msgid "Optimistic DNS cache"
 msgstr "乐观 DNS 缓存"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:36
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:36
 msgid "Optimistic cache timeout"
 msgstr "乐观缓存超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:226
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:226
 msgid "Optional tag for this evaluate result."
 msgstr "此 evaluate 结果的可选标签。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:390
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:390
 msgid "Optional; only required when connecting to a multi-user Snell server."
 msgstr "可选；仅在连接多用户 Snell 服务器时需要。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:43
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:43
 msgid "Other fields"
 msgstr "其他字段"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:320
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:91
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:319
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:93
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:320
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:91
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:319
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:93
 msgid "Outbound"
 msgstr "出站"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:51
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:51
 msgid "Outbound node"
 msgstr "出站节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:94
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:94
 msgid ""
 "Outbound used to download this rule-set (via sing-box 1.14 http_clients)."
 msgstr "下载此规则集所使用的出站（经 sing-box 1.14 http_clients 生效）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:338
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:338
 msgid "Override address"
 msgstr "覆盖地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:472
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:472
 msgid "Override dns.timeout for this lookup, in seconds (1.14)."
 msgstr "覆盖本次查询解析的 dns.timeout（秒）（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:248
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:248
 msgid "Override dns.timeout for this query, in seconds."
 msgstr "覆盖本次查询的 dns.timeout，单位秒。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:345
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:345
 msgid "Override port"
 msgstr "覆盖端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:339
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:339
 msgid "Override the connection destination address."
 msgstr "覆盖目标连接地址。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:346
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:346
 msgid "Override the connection destination port."
 msgstr "覆盖目标连接端口。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:376
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:376
 msgid "PEM-encoded private key of an existing ACME account (1.14)."
 msgstr "已有 ACME 账户的 PEM 编码私钥（1.14）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:584
+#: htdocs/luci-static/resources/homeproxy-pro.js:584
 msgid "PUT"
 msgstr "PUT"
 
-#: htdocs/luci-static/resources/homeproxy.js:630
+#: htdocs/luci-static/resources/homeproxy-pro.js:630
 msgid "Packet encoding"
 msgstr "数据包编码"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:231
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:231
 msgid "Padding scheme"
 msgstr "填充方案"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:184
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:184
 msgid "Panic"
 msgstr "崩溃"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:74
-#: htdocs/luci-static/resources/view/homeproxy/server.js:218
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:74
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:218
 msgid "Password"
 msgstr "密码"
 
-#: htdocs/luci-static/resources/homeproxy.js:576
-#: htdocs/luci-static/resources/homeproxy.js:610
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:259
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:61
+#: htdocs/luci-static/resources/homeproxy-pro.js:576
+#: htdocs/luci-static/resources/homeproxy-pro.js:610
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:259
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:61
 msgid "Path"
 msgstr "路径"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:307
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:307
 msgid "Peer pubkic key"
 msgstr "对端公钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:176
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:176
 msgid ""
 "Performance may degrade slightly, so it is not recommended to enable on when "
 "it is not needed."
 msgstr "性能可能会略有下降，建议仅在需要时开启。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:44
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:44
 msgid "Persist DNS cache across restarts (sing-box 1.14, replaces Store RDRC)."
 msgstr "重启后持久化 DNS 缓存（sing-box 1.14，替代 Store RDRC）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:332
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:332
 msgid "Persistent keepalive interval"
 msgstr "持久 keepalive 间隔"
 
-#: htdocs/luci-static/resources/homeproxy.js:597
+#: htdocs/luci-static/resources/homeproxy-pro.js:597
 msgid "Ping timeout"
 msgstr "Ping 超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:187
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:187
 msgid "Plugin"
 msgstr "插件"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:194
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:194
 msgid "Plugin opts"
 msgstr "插件参数"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:543
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:254
-#: htdocs/luci-static/resources/view/homeproxy/node.js:63
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:543
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:254
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:63
 msgid "Port"
 msgstr "端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:114
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:114
 msgid "Port %s alrealy exists!"
 msgstr "端口 %s 已存在！"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:45
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:45
 msgid "Port fields"
 msgstr "端口字段"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:130
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:130
 msgid "Port hopping interval in seconds."
 msgstr "端口跳跃间隔（单位：秒）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:548
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:548
 msgid "Port range"
 msgstr "端口范围"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:314
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:314
 msgid "Pre-shared key"
 msgstr "预共享密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:169
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:169
 msgid "Predefined"
 msgstr "预定义"
 
-#: htdocs/luci-static/resources/homeproxy.js:63
+#: htdocs/luci-static/resources/homeproxy-pro.js:63
 msgid "Prefer IPv4"
 msgstr "优先 IPv4"
 
-#: htdocs/luci-static/resources/homeproxy.js:64
+#: htdocs/luci-static/resources/homeproxy-pro.js:64
 msgid "Prefer IPv6"
 msgstr "优先 IPv6"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:235
-#: htdocs/luci-static/resources/view/homeproxy/node.js:299
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:235
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:299
 msgid "Private key"
 msgstr "私钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:240
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:240
 msgid "Private key passphrase"
 msgstr "私钥指纹"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:360
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:360
 msgid "Private key type for new certificates (1.14). Empty uses the default."
 msgstr "新证书的私钥类型（1.14）。留空使用默认值。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:46
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:46
 msgid "Process fields"
 msgstr "进程字段"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:553
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:553
 msgid "Process name"
 msgstr "进程名"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:557
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:557
 msgid "Process path"
 msgstr "进程路径"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:561
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:561
 msgid "Process path (regex)"
 msgstr "进程路径（正则表达式）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:88
-#: htdocs/luci-static/resources/view/homeproxy/node.js:144
-#: htdocs/luci-static/resources/view/homeproxy/node.js:344
-#: htdocs/luci-static/resources/view/homeproxy/server.js:237
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:88
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:144
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:344
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:237
 msgid "Protocol"
 msgstr "协议"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:282
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:282
 msgid "Protocol parameter. Enable length block encryption."
 msgstr "协议参数。启用长度块加密。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:275
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:275
 msgid ""
 "Protocol parameter. Will waste traffic randomly if enabled (enabled by "
 "default in v2ray and cannot be disabled)."
 msgstr "协议参数。 如启用会随机浪费流量（在 v2ray 中默认启用并且无法禁用）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:108
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:108
 msgid "Proxy Domain List"
 msgstr "代理域名列表"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:63
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:92
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:63
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:92
 msgid "Proxy IPv4 IP-s"
 msgstr "代理 IPv4 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:66
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:95
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:66
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:95
 msgid "Proxy IPv6 IP-s"
 msgstr "代理 IPv6 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:69
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:69
 msgid "Proxy MAC-s"
 msgstr "代理 MAC 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:50
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:50
 msgid "Proxy all except listed"
 msgstr "仅允许列表外"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:47
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:47
 msgid "Proxy filter mode"
 msgstr "代理过滤模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:49
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:49
 msgid "Proxy listed only"
 msgstr "仅允许列表内"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:122
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:122
 msgid "Proxy mode"
 msgstr "代理模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:91
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:91
 msgid "Proxy protocol"
 msgstr "代理协议"
 
-#: htdocs/luci-static/resources/homeproxy.js:336
-#: htdocs/luci-static/resources/homeproxy.js:522
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:95
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:245
+#: htdocs/luci-static/resources/homeproxy-pro.js:336
+#: htdocs/luci-static/resources/homeproxy-pro.js:522
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:95
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:245
 msgid "QUIC"
 msgstr "QUIC"
 
-#: htdocs/luci-static/resources/homeproxy.js:322
+#: htdocs/luci-static/resources/homeproxy-pro.js:322
 msgid "QUIC congestion control algorithm."
 msgstr "QUIC 拥塞控制算法。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:523
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:523
 msgid "Query EDNS client subnet"
 msgstr "查询 EDNS Client Subnet"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:247
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:471
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:247
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:471
 msgid "Query timeout"
 msgstr "查询超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:114
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:114
 msgid "Query type"
 msgstr "请求类型"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:293
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:293
 msgid "RCode"
 msgstr "RCode"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:96
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:96
 msgid "RDP"
 msgstr "RDP"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:495
-#: htdocs/luci-static/resources/view/homeproxy/server.js:464
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:495
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:464
 msgid "REALITY"
 msgstr "REALITY"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:469
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:469
 msgid "REALITY private key"
 msgstr "REALITY 私钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:500
-#: htdocs/luci-static/resources/view/homeproxy/server.js:485
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:500
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:485
 msgid "REALITY public key"
 msgstr "REALITY 公钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:506
-#: htdocs/luci-static/resources/view/homeproxy/server.js:489
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:506
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:489
 msgid "REALITY short ID"
 msgstr "REALITY 标识符"
 
-#: htdocs/luci-static/resources/homeproxy.js:417
+#: htdocs/luci-static/resources/homeproxy-pro.js:417
 msgid "RUNNING"
 msgstr "运行中"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:230
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:230
 msgid "Race"
 msgstr "并行竞争"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:222
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:222
 msgid "Random version will be used if empty."
 msgstr "如留空，则使用随机版本。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:119
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:119
 msgid "Recursive outbound detected!"
 msgstr "检测到递归出站！"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:305
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:305
 msgid "Recursive resolver detected!"
 msgstr "检测到递归解析器！"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:123
 msgid "Redirect TCP"
 msgstr "Redirect TCP"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:125
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:125
 msgid "Redirect TCP + TProxy UDP"
 msgstr "Redirect TCP + TProxy UDP"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:127
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:127
 msgid "Redirect TCP + Tun UDP"
 msgstr "Redirect TCP + Tun UDP"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:236
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:236
 msgid "Refresh every %s seconds."
 msgstr "每 %s 秒刷新。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:414
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:414
 msgid "Region ID"
 msgstr "区域 ID"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:167
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:167
 msgid "Reject"
 msgstr "拒绝"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:51
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:51
 msgid "Remote"
 msgstr "远程"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:891
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:891
 msgid "Remove %s nodes"
 msgstr "移除 %s 个节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:254
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:254
 msgid "Remove EDNS client subnet"
 msgstr "移除 EDNS Client Subnet"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:881
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:881
 msgid "Remove all nodes from subscriptions"
 msgstr "移除所有订阅节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:255
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:255
 msgid "Remove the edns0-subnet record from the query (1.14)."
 msgstr "从查询中移除 edns0-subnet 记录（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:281
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:281
 msgid "Reply with REFUSED"
 msgstr "回复 REFUSED"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:430
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:430
 msgid "Reply with TCP RST / ICMP port unreachable"
 msgstr "回复 TCP RST / ICMP 端口不可达"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:321
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:321
 msgid "Reserved field bytes"
 msgstr "保留字段字节"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:172
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:172
 msgid "Resolve"
 msgstr "解析"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:441
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:441
 msgid "Resolve strategy"
 msgstr "解析策略"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:258
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:258
 msgid "Resources management"
 msgstr "资源管理"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:272
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:272
 msgid "Response NS"
 msgstr "响应 NS 记录"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:260
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:260
 msgid "Response RCode"
 msgstr "响应 RCode"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:267
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:267
 msgid "Response answer"
 msgstr "响应 Answer 记录"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:276
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:276
 msgid "Response extra"
 msgstr "响应 Extra 记录"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:31
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:31
 msgid ""
 "Return expired cache immediately and refresh in background (sing-box 1.14)."
 msgstr "立即返回已过期缓存并在后台刷新（sing-box 1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:635
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:635
 msgid "Reuse address"
 msgstr "复用地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:636
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:636
 msgid "Reuse listener address."
 msgstr "复用监听地址。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:205
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:453
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:205
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:453
 msgid "Rewrite TTL"
 msgstr "重写 TTL"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:206
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:454
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:206
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:454
 msgid "Rewrite TTL in DNS responses."
 msgstr "在 DNS 响应中重写 TTL。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:165
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:165
 msgid "Route"
 msgstr "路由"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:166
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:166
 msgid "Route options"
 msgstr "路由选项"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:23
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:23
 msgid "Routing Nodes"
 msgstr "路由节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:25
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:25
 msgid "Routing Rules"
 msgstr "路由规则"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:23
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:23
 msgid "Routing Settings"
 msgstr "路由设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:82
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:82
 msgid "Routing mode"
 msgstr "路由模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:32
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:32
 msgid "Routing node"
 msgstr "路由节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:102
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:102
 msgid "Routing ports"
 msgstr "路由端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:34
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:34
 msgid "Routing rule"
 msgstr "路由规则"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:22
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:22
 msgid "Rule Set"
 msgstr "规则集"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:140
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:31
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:140
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:31
 msgid "Rule set"
 msgstr "规则集"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:156
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:156
 msgid "Rule set IP CIDR as source IP"
 msgstr "规则集 IP CIDR 作为源 IP"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:68
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:68
 msgid "Rule set URL"
 msgstr "规则集 URL"
 
-#: htdocs/luci-static/resources/homeproxy.js:141
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:97
+#: htdocs/luci-static/resources/homeproxy-pro.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:97
 msgid "SSH"
 msgstr "SSH"
 
-#: htdocs/luci-static/resources/homeproxy.js:421
+#: htdocs/luci-static/resources/homeproxy-pro.js:421
 msgid "STATUS UNKNOWN"
 msgstr "状态未知"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:98
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:98
 msgid "STUN"
 msgstr "STUN"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:530
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:530
 msgid "SUoT version"
 msgstr "SUoT 版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:128
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:128
 msgid "Safari / Apple Network API"
 msgstr "Safari / Apple Network API"
 
-#: htdocs/luci-static/resources/homeproxy.js:271
+#: htdocs/luci-static/resources/homeproxy-pro.js:271
 msgid "Salamander"
 msgstr "Salamander"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:55
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:55
 msgid "Same as main node"
 msgstr "保持与主节点一致"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:284
-#: htdocs/luci-static/resources/view/homeproxy/status.js:290
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:284
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:290
 msgid "Save"
 msgstr "保存"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:768
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:768
 msgid "Save current settings"
 msgstr "保存当前设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:765
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:765
 msgid "Save subscriptions settings"
 msgstr "保存订阅设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:236
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:236
 msgid "Send the query before pending race rules are judged (1.14)."
 msgstr "在待定 race 规则判定前即发送查询（1.14）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:179
-#: htdocs/luci-static/resources/view/homeproxy/server.js:176
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:179
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:176
 msgid "Server"
 msgstr "服务器"
 
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:30
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:30
 msgid "Server Settings"
 msgstr "服务器设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:339
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:339
 msgid ""
 "Server name to use when choosing a certificate if the ClientHello's "
 "ServerName field is empty."
 msgstr "当 ClientHello 的 ServerName 字段为空时，选择证书所使用的服务器名称。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:171
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:171
 msgid "Server settings"
 msgstr "服务器设置"
 
-#: root/usr/share/luci/menu.d/luci-app-homeproxy.json:38
+#: root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json:38
 msgid "Service Status"
 msgstr "服务状态"
 
-#: htdocs/luci-static/resources/homeproxy.js:138
+#: htdocs/luci-static/resources/homeproxy-pro.js:138
 msgid "ShadowTLS"
 msgstr "ShadowTLS"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:201
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:201
 msgid "ShadowTLS version"
 msgstr "ShadowTLS 版本"
 
-#: htdocs/luci-static/resources/homeproxy.js:137
+#: htdocs/luci-static/resources/homeproxy-pro.js:137
 msgid "Shadowsocks"
 msgstr "Shadowsocks"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:29
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:29
 msgid ""
 "Since sing-box 1.14 the default (Unset) behaves as hijack: sing-box sets the "
 "platform interface DNS and hijacks port 53. On OpenWrt this overlaps with "
@@ -2430,20 +2430,20 @@ msgstr ""
 "持 53 端口。OpenWrt 下这会与本插件自身的 dnsmasq/nftables DNS 劫持叠加，网关"
 "建议保持 Disabled，除非需要 sing-box 全权接管 TUN 内 DNS。"
 
-#: htdocs/luci-static/resources/homeproxy.js:139
+#: htdocs/luci-static/resources/homeproxy-pro.js:139
 msgid "Snell (1.14)"
 msgstr "Snell（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:376
-#: htdocs/luci-static/resources/view/homeproxy/server.js:263
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:376
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:263
 msgid "Snell version"
 msgstr "Snell 版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:124
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:124
 msgid "Sniffed client type (QUIC client type or SSH client name)."
 msgstr "嗅探到的客户端类型（QUIC 客户端类型或 SSH 客户端名称）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:89
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:89
 msgid ""
 "Sniffed protocol, see <a target=\"_blank\" href=\"https://sing-"
 "box.sagernet.org/configuration/route/sniff/\">Sniff</a> for details."
@@ -2451,60 +2451,60 @@ msgstr ""
 "嗅探到的协议，详情请参阅 <a target='_blank' href='https://sing-"
 "box.sagernet.org/configuration/route/sniff/'>嗅探</a>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:143
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:143
 msgid "Sniffer: advanced mode (100ms, universal list)"
 msgstr "嗅探：进阶模式（100ms，全协议列表）"
 
-#: htdocs/luci-static/resources/homeproxy.js:140
+#: htdocs/luci-static/resources/homeproxy-pro.js:140
 msgid "Socks"
 msgstr "Socks"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:211
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:211
 msgid "Socks version"
 msgstr "Socks 版本"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:212
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:212
 msgid "Socks4"
 msgstr "Socks4"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:213
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:213
 msgid "Socks4A"
 msgstr "Socks4A"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:214
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:214
 msgid "Socks5"
 msgstr "Socks5"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:495
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:495
 msgid "Source IP CIDR"
 msgstr "源 IP CIDR"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:513
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:513
 msgid "Source MAC address"
 msgstr "来源 MAC 地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:57
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:57
 msgid "Source file"
 msgstr "源文件"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:518
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:518
 msgid "Source hostname"
 msgstr "来源主机名"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:533
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:533
 msgid "Source port"
 msgstr "源端口"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:538
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:538
 msgid "Source port range"
 msgstr "源端口范围"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:411
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:411
 msgid ""
 "Specifies DNS server tag to use instead of selecting through DNS routing."
 msgstr "指定使用的 DNS 服务器，而不是通过 DNS 规则选择。"
 
-#: htdocs/luci-static/resources/homeproxy.js:21
+#: htdocs/luci-static/resources/homeproxy-pro.js:21
 msgid ""
 "Specifies the period of time (in seconds) after which a health check will be "
 "performed using a ping frame if no frames have been received on the "
@@ -2516,7 +2516,7 @@ msgstr ""
 "意，ping 响应被视为已接收的帧，因此如果连接上没有其他流量，则每隔该时间间隔执"
 "行一次健康检查。"
 
-#: htdocs/luci-static/resources/homeproxy.js:23
+#: htdocs/luci-static/resources/homeproxy-pro.js:23
 msgid ""
 "Specifies the time (in seconds) until idle clients should be closed with a "
 "GOAWAY frame. PING frames are not considered as activity."
@@ -2524,7 +2524,7 @@ msgstr ""
 "指定空闲客户端应在多久（单位：秒）内以 GOAWAY 帧关闭。PING 帧不计为活动。指定"
 "闲置客户端应在多长时间（单位：秒）内使用 GOAWAY 帧关闭。PING 帧不被视为活动。"
 
-#: htdocs/luci-static/resources/homeproxy.js:26
+#: htdocs/luci-static/resources/homeproxy-pro.js:26
 msgid ""
 "Specifies the timeout duration (in seconds) after sending a PING frame, "
 "within which a response must be received.<br/>If a response to the PING "
@@ -2536,66 +2536,66 @@ msgstr ""
 "秒）内必须接收到响应。<br/>如果在指定的超时时间内没有收到 PING 帧的响应，则连"
 "接将关闭。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:103
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:103
 msgid ""
 "Specify target ports to be proxied. Multiple ports must be separated by "
 "commas."
 msgstr "指定需要被代理的目标端口。多个端口必须用逗号隔开。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:235
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:235
 msgid "Speculative"
 msgstr "抢先查询"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:164
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:164
 msgid "Standard (default)"
 msgstr "标准（默认）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:43
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:43
 msgid "Store DNS cache"
 msgstr "存储 DNS 缓存"
 
-#: htdocs/luci-static/resources/homeproxy.js:259
+#: htdocs/luci-static/resources/homeproxy-pro.js:259
 msgid "String"
 msgstr "字符串"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:693
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:693
 msgid "Sub (%s)"
 msgstr "订阅（%s）"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:720
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:720
 msgid "Subscription URL-s"
 msgstr "订阅地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:857
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:857
 msgid "Subscription update did not complete cleanly. Last log:"
 msgstr "订阅更新未正常完成。最新日志："
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:805
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:805
 msgid ""
 "Subscription update is already running. This page will reload when the "
 "previous run finishes."
 msgstr "订阅更新已在运行中。本次页面会在上轮更新完成后自动刷新。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:867
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:867
 msgid ""
 "Subscription update is taking longer than 90 seconds. Check the log and "
 "reload manually."
 msgstr "订阅更新耗时已超过 90 秒。请查看日志并手动刷新页面。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:704
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:704
 msgid "Subscriptions"
 msgstr "订阅"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:639
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:639
 msgid "Successfully imported %s nodes of total %s."
 msgstr "成功导入 %s 个节点，共 %s 个。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:120
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:120
 msgid "Successfully updated."
 msgstr "更新成功。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:590
-#: htdocs/luci-static/resources/view/homeproxy/node.js:721
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:590
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:721
 msgid ""
 "Support Hysteria, Shadowsocks, Trojan, v2rayN (VMess), and XTLS (VLESS) "
 "online configuration delivery standard."
@@ -2603,96 +2603,96 @@ msgstr ""
 "支持 Hysteria、Shadowsocks、Trojan、v2rayN（VMess）和 XTLS（VLESS）在线配置交"
 "付标准。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:125
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:125
 msgid ""
 "Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified."
 msgstr "支持 UDP、TCP、DoH、DoQ、DoT。如未指定则使用 TCP 协议。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:160
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:160
 msgid "System"
 msgstr "系统"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:186
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:418
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:72
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:66
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:288
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:229
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:186
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:418
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:66
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:288
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:229
 msgid "System DNS"
 msgstr "系统 DNS"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:106
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:241
-#: htdocs/luci-static/resources/view/homeproxy/server.js:622
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:106
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:241
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:622
 msgid "TCP"
 msgstr "TCP"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:514
-#: htdocs/luci-static/resources/view/homeproxy/server.js:600
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:514
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:600
 msgid "TCP fast open"
 msgstr "TCP 快速打开"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:154
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:154
 msgid "TCP/IP stack"
 msgstr "TCP/IP 协议栈"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:155
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:155
 msgid "TCP/IP stack."
 msgstr "TCP/IP 协议栈。"
 
-#: htdocs/luci-static/resources/homeproxy.js:650
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:99
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:242
+#: htdocs/luci-static/resources/homeproxy-pro.js:650
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:99
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:242
 msgid "TLS"
 msgstr "TLS"
 
-#: htdocs/luci-static/resources/homeproxy.js:677
+#: htdocs/luci-static/resources/homeproxy-pro.js:677
 msgid "TLS ALPN"
 msgstr "TLS ALPN"
 
-#: htdocs/luci-static/resources/homeproxy.js:672
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:272
+#: htdocs/luci-static/resources/homeproxy-pro.js:672
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:272
 msgid "TLS SNI"
 msgstr "TLS SNI"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:377
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:377
 msgid "TLS fragment"
 msgstr "TLS 分片"
 
-#: htdocs/luci-static/resources/homeproxy.js:718
+#: htdocs/luci-static/resources/homeproxy-pro.js:718
 msgid "TLS handshake timeout in seconds. 15s is used by default."
 msgstr "TLS 握手超时（秒）。默认 15 秒。"
 
-#: htdocs/luci-static/resources/homeproxy.js:18
+#: htdocs/luci-static/resources/homeproxy-pro.js:18
 msgid "TLS is not enforced. If TLS is not configured, plain HTTP 1.1 is used."
 msgstr "不强制执行 TLS。如未配置 TLS，将使用纯 HTTP 1.1。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:371
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:379
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:371
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:379
 msgid "TLS record fragment"
 msgstr "TLS 记录分片"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:391
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:391
 msgid "TLS spoof SNI (1.14)"
 msgstr "TLS spoof SNI（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:398
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:398
 msgid "TLS spoof method (1.14)"
 msgstr "TLS spoof 方式（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:26
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:26
 msgid "TUN DNS"
 msgstr "TUN DNS"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:39
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:39
 msgid "TUN DNS addresses (1.14)"
 msgstr "TUN DNS 地址（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:28
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:28
 msgid "TUN DNS mode (1.14)"
 msgstr "TUN DNS 模式（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:281
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:281
 msgid ""
 "Tag of a another server to resolve the domain name in the address. Required "
 "if address contains domain."
@@ -2700,69 +2700,69 @@ msgstr ""
 "用于解析地址中域名的另一个服务器的标签。如果地址包含域名，则必填。用于解析本 "
 "DNS 服务器的域名的另一个 DNS 服务器的标签。如果服务器地址包括域名则必须。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:320
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:320
 msgid "Tag of an outbound for connecting to the dns server."
 msgstr "用于连接到 DNS 服务器的出站标签。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:180
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:180
 msgid "Tag of the target dns server."
 msgstr "目标 DNS 服务器标签。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:321
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:321
 msgid "Tag of the target outbound."
 msgstr "目标出站标签。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:252
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:252
 msgid ""
 "Tell the client to use the BBR flow control algorithm instead of Hysteria CC."
 msgstr "让客户端使用 BBR 流控算法。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:132
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:167
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:132
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:167
 msgid "Tencent Public DNS (119.29.29.29)"
 msgstr "腾讯公共 DNS（119.29.29.29）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:147
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:147
 msgid "Test URL"
 msgstr "测试 URL"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:167
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:41
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:70
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:167
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:41
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:70
 msgid "Test interval"
 msgstr "测试间隔"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:175
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:175
 msgid "Test interval must be less or equal than idle timeout."
 msgstr "测试间隔时间必须小于或等于空闲超时时间。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:183
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:47
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:76
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:183
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:47
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:76
 msgid "Test tolerance"
 msgstr "测试容差"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:268
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:268
 msgid "Text DNS records to match in the evaluated answer."
 msgstr "用于匹配已评估 Answer 的文本 DNS 记录。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:383
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:383
 msgid "The ACME CA provider to use."
 msgstr "使用的 ACME CA 颁发机构。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:62
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:62
 msgid "The DNS strategy for resolving the domain name in the address."
 msgstr "解析域名的默认策略。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:148
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:148
 msgid "The URL to test."
 msgstr "用于测试的 URL。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:250
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:250
 msgid "The address of the dns server."
 msgstr "DNS 服务器的地址。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:434
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:434
 msgid ""
 "The alternate port to use for the ACME HTTP challenge; if non-empty, this "
 "port will be used instead of 80 to spin up a listener for the HTTP challenge."
@@ -2771,7 +2771,7 @@ msgstr ""
 "战监听。用于 ACME HTTP 质询的备用端口；如果非空，将使用此端口而不是 80 来启"
 "动 HTTP 质询的侦听器。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:440
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:440
 msgid ""
 "The alternate port to use for the ACME TLS-ALPN challenge; the system must "
 "forward 443 to this port for challenge to succeed."
@@ -2779,7 +2779,7 @@ msgstr ""
 "用于 ACME TLS-ALPN 挑战的备用端口；系统必须将 443 转发到此端口，挑战才能成"
 "功。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:66
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:66
 msgid ""
 "The default rule uses the following matching logic:<br/><code>(domain || "
 "domain_suffix || domain_keyword || domain_regex || ip_cidr || "
@@ -2796,7 +2796,7 @@ msgstr ""
 "source_port_range)</code> &&<br/><code>其他字段</code>。<br/>此外，包含的规则"
 "集可视为合并项，而非单一规则的子项。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:59
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:59
 msgid ""
 "The default rule uses the following matching logic:<br/><code>(domain || "
 "domain_suffix || domain_keyword || domain_regex)</code> &&<br/><code>(port "
@@ -2811,121 +2811,121 @@ msgstr ""
 "><code>(source_port || source_port_range)</code> &&<br/><code>其他字段</"
 "code>。<br/>此外，包含的规则集可视为合并项，而非单一规则的子项。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:163
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:163
 msgid ""
 "The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT."
 msgstr "用于解析国内域名的 DNS 服务器。支持 UDP、TCP、DoH、DoQ、DoT。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:78
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:313
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:78
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:313
 msgid "The domain strategy for resolving the domain name in the address."
 msgstr "用于解析本 DNS 服务器的域名的策略。"
 
-#: htdocs/luci-static/resources/homeproxy.js:709
+#: htdocs/luci-static/resources/homeproxy-pro.js:709
 msgid ""
 "The elliptic curves that will be used in an ECDHE handshake, in preference "
 "order. If empty, the default will be used."
 msgstr "将在 ECDHE 握手中使用的椭圆曲线，按优先顺序排列。留空使用默认值。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:345
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:345
 msgid ""
 "The email address to use when creating or selecting an existing ACME server "
 "account."
 msgstr "创建或选择现有 ACME 服务器帐户时使用的电子邮件地址。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:385
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:385
 msgid ""
 "The fallback value in milliseconds used when TLS segmentation cannot "
 "automatically determine the wait time."
 msgstr "当 TLS 分段无法自动确定等待时间时使用的回退值（单位：毫秒）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:191
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:191
 msgid "The idle timeout in seconds."
 msgstr "空闲超时时间（单位：秒）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:701
+#: htdocs/luci-static/resources/homeproxy-pro.js:701
 msgid "The maximum TLS version that is acceptable."
 msgstr "可接受的最高 TLS 版本。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:495
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:495
 msgid "The maximum time difference between the server and the client."
 msgstr "服务器和客户端之间的最大时间差。"
 
-#: htdocs/luci-static/resources/homeproxy.js:693
+#: htdocs/luci-static/resources/homeproxy-pro.js:693
 msgid "The minimum TLS version that is acceptable."
 msgstr "可接受的最低 TLS 版本。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client.js:120
-#: htdocs/luci-static/resources/view/homeproxy/server.js:137
+#: htdocs/luci-static/resources/view/homeproxy-pro/client.js:120
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:137
 msgid "The modern ImmortalWrt proxy platform for ARM64/AMD64."
 msgstr "为 ARM64/AMD64 设计的现代 ImmortalWrt 代理平台。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:85
-#: htdocs/luci-static/resources/view/homeproxy/server.js:630
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:85
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:630
 msgid "The network interface to bind to."
 msgstr "绑定到的网络接口。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:260
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:260
 msgid "The path of the DNS server."
 msgstr "DNS 服务器的路径。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:447
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:447
 msgid ""
 "The path to the ECH config, in PEM format. If empty, load from DNS will be "
 "attempted."
 msgstr "PEM 格式的 ECH 配置路径。如果为空，将尝试从 DNS 加载。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:426
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:426
 msgid "The path to the server certificate, in PEM format."
 msgstr "服务端证书路径，需要 PEM 格式。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:207
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:207
 msgid "The port must be unique."
 msgstr "必须是唯一端口。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:255
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:255
 msgid "The port of the DNS server."
 msgstr "DNS 服务器的端口。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:264
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:264
 msgid "The pre-shared key (password) above must be 12-255 bytes for v6."
 msgstr "v6 下，上方的预共享密钥（密码）长度须为 12-255 字节。"
 
-#: htdocs/luci-static/resources/homeproxy.js:850
+#: htdocs/luci-static/resources/homeproxy-pro.js:850
 msgid "The request %s failed: %s."
 msgstr "请求 %s 失败：%s。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:294
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:294
 msgid "The response code."
 msgstr "响应代码。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:531
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:531
 msgid "The server private key, in PEM format."
 msgstr "服务端私钥，需要 PEM 格式。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:512
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:512
 msgid "The server public key, in PEM format."
 msgstr "服务端公钥，需要 PEM 格式。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:92
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:92
 msgid ""
 "The tag of the upstream outbound.<br/>Other dial fields will be ignored when "
 "enabled."
 msgstr "上游出站的标签。<br/>启用时，其他拨号字段将被忽略。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:168
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:42
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:71
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:168
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:42
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:71
 msgid "The test interval in seconds."
 msgstr "测试间隔时间（单位：秒）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:184
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:48
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:77
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:184
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:77
 msgid "The test tolerance in milliseconds."
 msgstr "测试容差时间（单位：毫秒）。"
 
-#: htdocs/luci-static/resources/homeproxy.js:28
+#: htdocs/luci-static/resources/homeproxy-pro.js:28
 msgid ""
 "The timeout (in seconds) that after performing a keepalive check, the client "
 "will wait for activity. If no activity is detected, the connection will be "
@@ -2935,8 +2935,8 @@ msgstr ""
 "关闭。经过一段时间（单位：秒）之后，客户端将执行 keepalive 检查并等待活动。如"
 "果没有检测到任何活动，则会关闭连接。"
 
-#: htdocs/luci-static/resources/homeproxy.js:686
-#: htdocs/luci-static/resources/view/homeproxy/node.js:756
+#: htdocs/luci-static/resources/homeproxy-pro.js:686
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:756
 msgid ""
 "This is <strong>DANGEROUS</strong>, your traffic is almost like "
 "<strong>PLAIN TEXT</strong>! Use at your own risk!"
@@ -2944,7 +2944,7 @@ msgstr ""
 "这非常<strong>危险</strong>，你的流量几乎等同于<strong>明文</strong>！风险自"
 "负！"
 
-#: htdocs/luci-static/resources/homeproxy.js:341
+#: htdocs/luci-static/resources/homeproxy-pro.js:341
 msgid ""
 "This is the TUIC port of the UDP over TCP protocol, designed to provide a "
 "QUIC stream based UDP relay mode that TUIC does not provide."
@@ -2952,211 +2952,211 @@ msgstr ""
 "这是 UDP over TCP 协议的 TUIC 版本，旨在提供 TUIC 本身不具备的基于 QUIC 流的 "
 "UDP 中继模式。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:133
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:168
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:133
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:168
 msgid "ThreatBook Public DNS (117.50.10.10)"
 msgstr "微步在线公共 DNS（117.50.10.10）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:365
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:365
 msgid ""
 "Timeout for UDP connections.<br/>Setting a larger value than the UDP timeout "
 "in inbounds will have no effect."
 msgstr "UDP 连接的超时时间。<br/>设置比入站的 UDP 超时更大的值将无效。"
 
-#: htdocs/luci-static/resources/homeproxy.js:624
+#: htdocs/luci-static/resources/homeproxy-pro.js:624
 msgid ""
 "To be compatible with Xray-core, set this to <code>Sec-WebSocket-Protocol</"
 "code>."
 msgstr ""
 "要与 Xray-core 兼容，请将其设置为 <code>Sec-WebSocket-Protocol</code>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:130
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:130
 msgid ""
 "To enable Tun support, you need to install <code>ip-full</code> and "
 "<code>kmod-tun</code>"
 msgstr ""
 "要启用 Tun 支持，你需要安装 <code>ip-full</code> 和 <code>kmod-tun</code>。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:178
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:178
 msgid "Trace"
 msgstr "跟踪"
 
-#: htdocs/luci-static/resources/homeproxy.js:517
+#: htdocs/luci-static/resources/homeproxy-pro.js:517
 msgid "Transport"
 msgstr "传输层"
 
-#: htdocs/luci-static/resources/homeproxy.js:142
+#: htdocs/luci-static/resources/homeproxy-pro.js:142
 msgid "Trojan"
 msgstr "Trojan"
 
-#: htdocs/luci-static/resources/homeproxy.js:143
+#: htdocs/luci-static/resources/homeproxy-pro.js:143
 msgid "Tuic"
 msgstr "Tuic"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:128
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:128
 msgid "Tun TCP/UDP"
 msgstr "Tun TCP/UDP"
 
-#: htdocs/luci-static/resources/homeproxy.js:461
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:239
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:49
+#: htdocs/luci-static/resources/homeproxy-pro.js:461
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:239
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:49
 msgid "Type"
 msgstr "类型"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:107
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:240
-#: htdocs/luci-static/resources/view/homeproxy/server.js:623
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:107
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:240
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:623
 msgid "UDP"
 msgstr "UDP"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:520
-#: htdocs/luci-static/resources/view/homeproxy/server.js:609
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:520
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:609
 msgid "UDP Fragment"
 msgstr "UDP 分片"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:24
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:24
 msgid "UDP NAT Settings"
 msgstr "UDP NAT 设置"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:182
-#: htdocs/luci-static/resources/view/homeproxy/server.js:614
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:182
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:614
 msgid "UDP NAT expiration time"
 msgstr "UDP NAT 过期时间"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:37
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:37
 msgid "UDP NAT filtering (1.14)"
 msgstr "UDP NAT 过滤（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:26
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:26
 msgid "UDP NAT mapping (1.14)"
 msgstr "UDP NAT 映射（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:48
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:48
 msgid "UDP NAT sessions max (1.14)"
 msgstr "UDP NAT 会话数上限（1.14）"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:524
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:524
 msgid "UDP over TCP"
 msgstr "UDP over TCP"
 
-#: htdocs/luci-static/resources/homeproxy.js:340
+#: htdocs/luci-static/resources/homeproxy-pro.js:340
 msgid "UDP over stream"
 msgstr "UDP over stream"
 
-#: htdocs/luci-static/resources/homeproxy.js:333
+#: htdocs/luci-static/resources/homeproxy-pro.js:333
 msgid "UDP packet relay mode."
 msgstr "UDP 包中继模式。"
 
-#: htdocs/luci-static/resources/homeproxy.js:332
+#: htdocs/luci-static/resources/homeproxy-pro.js:332
 msgid "UDP relay mode"
 msgstr "UDP 中继模式"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:364
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:364
 msgid "UDP timeout"
 msgstr "UDP 超时"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:52
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:27
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:56
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:52
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:27
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:56
 msgid "URLTest"
 msgstr "URLTest"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:127
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:34
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:63
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:127
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:34
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:63
 msgid "URLTest nodes"
 msgstr "URLTest 节点"
 
-#: htdocs/luci-static/resources/homeproxy.js:309
+#: htdocs/luci-static/resources/homeproxy-pro.js:309
 msgid "UUID"
 msgstr "UUID"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:132
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:132
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:61
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:61
 msgid "Unknown error: %s"
 msgstr "未知错误：%s"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/tun_dns.js:30
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/tun_dns.js:30
 msgid "Unset (default)"
 msgstr "不设置（默认）"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:488
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:488
 msgid "Unsupported fingerprint!"
 msgstr "不支持的指纹！"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:780
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:780
 msgid "Update %s subscriptions"
 msgstr "更新 %s 个订阅"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:123
 msgid "Update failed."
 msgstr "更新失败。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:132
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:132
 msgid "Update interval"
 msgstr "更新间隔"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:133
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:133
 msgid "Update interval of rule set."
 msgstr "规则集更新间隔。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:775
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:775
 msgid "Update nodes from subscriptions"
 msgstr "从订阅更新节点"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:717
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:717
 msgid "Update subscriptions via proxy."
 msgstr "使用代理更新订阅。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:710
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:710
 msgid "Update time"
 msgstr "更新时间"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:716
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:716
 msgid "Update via proxy"
 msgstr "使用代理更新"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:813
-#: htdocs/luci-static/resources/view/homeproxy/node.js:825
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:813
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:825
 msgid "Updating subscriptions…"
 msgstr "正在更新订阅…"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:457
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:457
 msgid "Upload ECH config"
 msgstr "上传 ECH 配置"
 
-#: htdocs/luci-static/resources/homeproxy.js:184
+#: htdocs/luci-static/resources/homeproxy-pro.js:184
 msgid "Upload bandwidth"
 msgstr "上传带宽"
 
-#: htdocs/luci-static/resources/homeproxy.js:185
+#: htdocs/luci-static/resources/homeproxy-pro.js:185
 msgid "Upload bandwidth in Mbps."
 msgstr "上传带宽（单位：Mbps）。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:433
-#: htdocs/luci-static/resources/view/homeproxy/server.js:522
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:433
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:522
 msgid "Upload certificate"
 msgstr "上传证书"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:541
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:541
 msgid "Upload key"
 msgstr "上传密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:436
-#: htdocs/luci-static/resources/view/homeproxy/node.js:460
-#: htdocs/luci-static/resources/view/homeproxy/server.js:525
-#: htdocs/luci-static/resources/view/homeproxy/server.js:544
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:436
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:460
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:525
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:544
 msgid "Upload..."
 msgstr "上传..."
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:328
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:328
 msgid "Use ACME TLS certificate issuer."
 msgstr "使用 ACME TLS 证书颁发机构。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:144
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:144
 msgid ""
 "Use the tutorial-recommended sniffer profile (100ms timeout, http/tls/stun/"
 "quic/dns). Default keeps the 300ms / unconstrained-list behaviour."
@@ -3164,182 +3164,182 @@ msgstr ""
 "使用教程推荐的嗅探配置（100ms 超时，http/tls/stun/quic/dns）。默认保留 300ms "
 "/ 不限定协议列表的行为。"
 
-#: htdocs/luci-static/resources/homeproxy.js:673
+#: htdocs/luci-static/resources/homeproxy-pro.js:673
 msgid ""
 "Used to verify the hostname on the returned certificates unless insecure is "
 "given."
 msgstr "用于验证返回证书上的主机名。如允许不安全连接，此配置无效。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:273
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:273
 msgid "Used to verify the hostname on the returned certificates."
 msgstr "用于验证返回证书上的主机名。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:136
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:136
 msgid "User"
 msgstr "用户"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:389
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:389
 msgid "User key"
 msgstr "用户密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:750
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:750
 msgid "User-Agent"
 msgstr "用户代理"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:68
-#: htdocs/luci-static/resources/view/homeproxy/server.js:211
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:68
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:211
 msgid "Username"
 msgstr "用户名"
 
-#: htdocs/luci-static/resources/homeproxy.js:145
+#: htdocs/luci-static/resources/homeproxy-pro.js:145
 msgid "VLESS"
 msgstr "VLESS"
 
-#: htdocs/luci-static/resources/homeproxy.js:146
+#: htdocs/luci-static/resources/homeproxy-pro.js:146
 msgid "VMess"
 msgstr "VMess"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:126
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:164
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:164
 msgid "WAN DNS (read from interface)"
 msgstr "WAN DNS（从接口获取）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:90
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:90
 msgid "WAN IP Policy"
 msgstr "WAN IP 策略"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:181
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:181
 msgid "Warn"
 msgstr "警告"
 
-#: htdocs/luci-static/resources/homeproxy.js:523
+#: htdocs/luci-static/resources/homeproxy-pro.js:523
 msgid "WebSocket"
 msgstr "WebSocket"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:197
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:197
 msgid ""
 "When the main DNS returns a mainland China IP, re-resolve via China DNS "
 "using evaluate/match_response."
 msgstr ""
 "当主 DNS 返回大陆 IP 时，通过 evaluate/match_response 改用国内 DNS 复解析。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:741
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:741
 msgid "Whitelist mode"
 msgstr "白名单模式"
 
-#: htdocs/luci-static/resources/homeproxy.js:144
+#: htdocs/luci-static/resources/homeproxy-pro.js:144
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:308
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:308
 msgid "WireGuard peer public key."
 msgstr "WireGuard 对端公钥。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:315
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:315
 msgid "WireGuard pre-shared key."
 msgstr "WireGuard 预共享密钥。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:300
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:300
 msgid "WireGuard requires base64-encoded private keys."
 msgstr "WireGuard 要求 base64 编码的私钥。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:92
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:92
 msgid "Write proxy protocol in the connection header."
 msgstr "在连接头中写入代理协议。"
 
-#: htdocs/luci-static/resources/homeproxy.js:633
-#: htdocs/luci-static/resources/view/homeproxy/node.js:763
+#: htdocs/luci-static/resources/homeproxy-pro.js:633
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:763
 msgid "Xudp (Xray-core)"
 msgstr "Xudp (Xray-core)"
 
-#: htdocs/luci-static/resources/homeproxy.js:1073
+#: htdocs/luci-static/resources/homeproxy-pro.js:1073
 msgid "Your %s was successfully uploaded. Size: %sB."
 msgstr "您的 %s 已成功上传。大小：%sB。"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:385
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:385
 msgid "ZeroSSL"
 msgstr "ZeroSSL"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:438
-#: htdocs/luci-static/resources/view/homeproxy/server.js:527
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:438
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:527
 msgid "certificate"
 msgstr "证书"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:358
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:358
 msgid "connect UDP connections"
 msgstr "主动连接 UDP"
 
-#: htdocs/luci-static/resources/homeproxy.js:694
-#: htdocs/luci-static/resources/homeproxy.js:702
+#: htdocs/luci-static/resources/homeproxy-pro.js:694
+#: htdocs/luci-static/resources/homeproxy-pro.js:702
 msgid "default"
 msgstr "默认"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:91
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:91
 msgid "failed"
 msgstr "失败"
 
-#: htdocs/luci-static/resources/homeproxy.js:519
+#: htdocs/luci-static/resources/homeproxy-pro.js:519
 msgid "gRPC"
 msgstr "gRPC"
 
-#: htdocs/luci-static/resources/homeproxy.js:560
+#: htdocs/luci-static/resources/homeproxy-pro.js:560
 msgid "gRPC permit without stream"
 msgstr "gRPC 允许无活动连接"
 
-#: htdocs/luci-static/resources/homeproxy.js:555
+#: htdocs/luci-static/resources/homeproxy-pro.js:555
 msgid "gRPC service name"
 msgstr "gRPC 服务名称"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:158
 msgid "gVisor"
 msgstr "gVisor"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:402
-#: htdocs/luci-static/resources/view/homeproxy/server.js:278
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:402
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:278
 msgid "http"
 msgstr ""
 
-#: htdocs/luci-static/resources/homeproxy.js:220
-#: htdocs/luci-static/resources/homeproxy.js:1126
-#: htdocs/luci-static/resources/homeproxy.js:1146
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:140
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:175
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:141
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:72
-#: htdocs/luci-static/resources/view/homeproxy/node.js:484
+#: htdocs/luci-static/resources/homeproxy-pro.js:220
+#: htdocs/luci-static/resources/homeproxy-pro.js:1126
+#: htdocs/luci-static/resources/homeproxy-pro.js:1146
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:140
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:175
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:141
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:72
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:484
 msgid "non-empty value"
 msgstr "非空值"
 
-#: htdocs/luci-static/resources/homeproxy.js:631
-#: htdocs/luci-static/resources/view/homeproxy/node.js:188
-#: htdocs/luci-static/resources/view/homeproxy/node.js:401
-#: htdocs/luci-static/resources/view/homeproxy/node.js:761
-#: htdocs/luci-static/resources/view/homeproxy/server.js:277
+#: htdocs/luci-static/resources/homeproxy-pro.js:631
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:188
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:401
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:761
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:277
 msgid "none"
 msgstr "无"
 
-#: htdocs/luci-static/resources/homeproxy.js:632
-#: htdocs/luci-static/resources/view/homeproxy/node.js:762
+#: htdocs/luci-static/resources/homeproxy-pro.js:632
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:762
 msgid "packet addr (v2ray-core v5+)"
 msgstr "packet addr (v2ray-core v5+)"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:88
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:88
 msgid "passed"
 msgstr "通过"
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:546
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:546
 msgid "private key"
 msgstr "私钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:127
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:127
 msgid "quic-go / uquic chrome"
 msgstr "quic-go / uquic chrome"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:302
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:302
 msgid "sing-box client"
 msgstr "sing-box 客户端"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:41
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:41
 msgid ""
 "sing-box default; recommended for home use (accepts replies from any remote "
 "after mapping). Choose stricter only for specific UDP issues."
@@ -3347,7 +3347,7 @@ msgstr ""
 "sing-box 默认值，家用推荐（建映射后接受任意远端回包）。仅当遇到特定 UDP 问题"
 "时才用更严格选项。"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/udp_nat.js:30
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/udp_nat.js:30
 msgid ""
 "sing-box default; recommended for home use (small NAT table, QUIC/game "
 "friendly). Choose stricter only for specific UDP issues."
@@ -3355,7 +3355,7 @@ msgstr ""
 "sing-box 默认值，家用推荐（NAT 表占用小，对游戏/QUIC 友好）。仅当遇到特定 "
 "UDP 问题时才用更严格选项。"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:377
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:377
 msgid ""
 "sing-box implements Snell v4/v5 wire as v4 and v6. The pre-shared key "
 "(Password above) must be 12-255 bytes for v6."
@@ -3363,15 +3363,15 @@ msgstr ""
 "sing-box 将 Snell v4/v5 线协议统一为 v4，另提供 v6；v6 的预共享密钥（上方密"
 "码）长度须为 12-255 字节。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:305
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:305
 msgid "sing-box server"
 msgstr "sing-box 服务端"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:466
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:466
 msgid "uTLS fingerprint"
 msgstr "uTLS 指纹"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:467
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:467
 msgid ""
 "uTLS is a fork of \"crypto/tls\", which provides ClientHello fingerprinting "
 "resistance."
@@ -3379,114 +3379,114 @@ msgstr ""
 "uTLS 是 “crypto/tls” 的一个分支，可提供 ClientHello 指纹识别抵抗能力。uTLS "
 "是 \"crypto/tls\" 的一个分支，拥有抵抗 ClientHello 指纹识别的能力。"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:97
+#: htdocs/luci-static/resources/view/homeproxy-pro/status.js:97
 msgid "unchecked"
 msgstr "未检查"
 
-#: htdocs/luci-static/resources/homeproxy.js:1035
+#: htdocs/luci-static/resources/homeproxy-pro.js:1035
 msgid "unique UCI identifier"
 msgstr "独立 UCI 标识"
 
-#: htdocs/luci-static/resources/homeproxy.js:1137
+#: htdocs/luci-static/resources/homeproxy-pro.js:1137
 msgid "unique value"
 msgstr "独立值"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:809
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:809
 msgid "unknown error"
 msgstr "未知错误"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:94
-#: htdocs/luci-static/resources/view/homeproxy/node.js:202
-#: htdocs/luci-static/resources/view/homeproxy/node.js:531
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:94
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:202
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:531
 msgid "v1"
 msgstr "v1"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:95
-#: htdocs/luci-static/resources/view/homeproxy/node.js:203
-#: htdocs/luci-static/resources/view/homeproxy/node.js:532
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:95
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:203
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:532
 msgid "v2"
 msgstr "v2"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:204
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:204
 msgid "v3"
 msgstr "v3"
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:383
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:383
 msgid "v4"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/server.js:269
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:269
 msgid "v5"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/node.js:384
-#: htdocs/luci-static/resources/view/homeproxy/server.js:270
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:384
+#: htdocs/luci-static/resources/view/homeproxy-pro/server.js:270
 msgid "v6"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:152
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:156
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:186
-#: htdocs/luci-static/resources/view/homeproxy/client/dns.js:190
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:152
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:156
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:186
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/dns.js:190
 msgid "valid DNS server address"
 msgstr "有效 DNS 服务器地址"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:155
-#: htdocs/luci-static/resources/view/homeproxy/client/nodes.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:80
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:83
-#: htdocs/luci-static/resources/view/homeproxy/node.js:727
-#: htdocs/luci-static/resources/view/homeproxy/node.js:730
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:155
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:80
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:83
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:727
+#: htdocs/luci-static/resources/view/homeproxy-pro/node.js:730
 msgid "valid URL"
 msgstr "有效网址"
 
-#: htdocs/luci-static/resources/homeproxy.js:1085
+#: htdocs/luci-static/resources/homeproxy-pro.js:1085
 msgid "valid base64 key with %d characters"
 msgstr "包含 %d 个字符的有效 base64 密钥"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:158
-#: htdocs/luci-static/resources/view/homeproxy/client/access.js:203
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:158
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/access.js:203
 msgid "valid hostname"
 msgstr "有效主机名"
 
-#: htdocs/luci-static/resources/homeproxy.js:1117
+#: htdocs/luci-static/resources/homeproxy-pro.js:1117
 msgid "valid port range (port1:port2)"
 msgstr "有效端口范围（port1:port2）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/routing.js:112
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/routing.js:112
 msgid "valid port value"
 msgstr "有效端口值"
 
-#: htdocs/luci-static/resources/homeproxy.js:1148
+#: htdocs/luci-static/resources/homeproxy-pro.js:1148
 msgid "valid uuid"
 msgstr "有效 uuid"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:402
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:402
 msgid "wrong-ack"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:401
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:401
 msgid "wrong-checksum"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:403
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:403
 msgid "wrong-md5"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:400
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:400
 msgid "wrong-sequence (default)"
 msgstr "wrong-sequence（默认）"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/common.js:404
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/common.js:404
 msgid "wrong-timestamp"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:75
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:123
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:75
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:123
 msgid "{tag} in URL when extra tags are used"
 msgstr "使用额外标签时 URL 需包含 {tag}"
 
-#: htdocs/luci-static/resources/view/homeproxy/client/subscription.js:126
+#: htdocs/luci-static/resources/view/homeproxy-pro/client/subscription.js:126
 msgid "{tag} in initial path when extra tags are used"
 msgstr "使用额外标签时初始路径需包含 {tag}"
 
diff --git a/luci-app-homeproxy-pro-pro/root/etc/capabilities/homeproxy-pro.json b/luci-app-homeproxy-pro/root/etc/capabilities/homeproxy-pro.json
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/capabilities/homeproxy-pro.json
rename to luci-app-homeproxy-pro/root/etc/capabilities/homeproxy-pro.json
diff --git a/luci-app-homeproxy-pro-pro/root/etc/config/homeproxy-pro b/luci-app-homeproxy-pro/root/etc/config/homeproxy-pro
similarity index 92%
rename from luci-app-homeproxy-pro-pro/root/etc/config/homeproxy-pro
rename to luci-app-homeproxy-pro/root/etc/config/homeproxy-pro
index 86cf16cad..04222645b 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/config/homeproxy-pro
+++ b/luci-app-homeproxy-pro/root/etc/config/homeproxy-pro
@@ -1,5 +1,5 @@
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option __warning 'DO NOT EDIT THIS SECTION, OR YOU ARE ON YOUR OWN!'
 	option common_port '22,53,80,143,443,465,587,853,873,993,995,5222,8080,8443,9418'
 	option mixed_port '5330'
@@ -18,10 +18,10 @@ config homeproxy 'infra'
 	option tproxy_mark '101'
 	option tun_mark '102'
 
-config homeproxy 'migration'
+config homeproxy-pro 'migration'
 	option crontab '1'
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option main_node 'nil'
 	option main_udp_node 'same'
 	option dns_server '8.8.8.8'
@@ -47,7 +47,7 @@ config homeproxy 'config'
 	option udp_filtering ''
 	option udp_nat_max ''
 
-config homeproxy 'control'
+config homeproxy-pro 'control'
 	option lan_proxy_mode 'disabled'
 	list wan_proxy_ipv4_ips '91.105.192.0/23'
 	list wan_proxy_ipv4_ips '91.108.4.0/22'
@@ -65,12 +65,12 @@ config homeproxy 'control'
 	list wan_proxy_ipv6_ips '2001:b28:f23f::/48'
 	list wan_proxy_ipv6_ips '2a0a:f280::/32'
 
-config homeproxy 'routing'
+config homeproxy-pro 'routing'
 	option default_outbound 'direct-out'
 	option default_outbound_dns 'default-dns'
 	option find_neighbor '0'
 
-config homeproxy 'dns'
+config homeproxy-pro 'dns'
 	option default_strategy 'prefer_ipv4'
 	option default_server 'default-dns'
 	option disable_cache '0'
@@ -80,7 +80,7 @@ config homeproxy 'dns'
 	option dns_timeout ''
 	option cache_file_store_dns '0'
 
-config homeproxy 'subscription'
+config homeproxy-pro 'subscription'
 	option auto_update '0'
 	option allow_insecure '0'
 	option packet_encoding 'xudp'
@@ -89,6 +89,6 @@ config homeproxy 'subscription'
 	list filter_keywords '重置|到期|过期|剩余|套餐'
 	list filter_keywords 'Expiration|Remaining'
 
-config homeproxy 'server'
+config homeproxy-pro 'server'
 	option enabled '0'
 	option log_level 'warn'
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip4.txt b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip4.txt
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip4.txt
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip4.txt
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip4.ver b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip4.ver
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip4.ver
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip4.ver
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip6.txt b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip6.txt
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip6.txt
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip6.txt
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip6.ver b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip6.ver
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_ip6.ver
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_ip6.ver
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_list.txt b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_list.txt
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_list.txt
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_list.txt
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_list.ver b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_list.ver
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/china_list.ver
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/china_list.ver
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/gfw_list.txt b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/gfw_list.txt
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/gfw_list.txt
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/gfw_list.txt
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/gfw_list.ver b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/gfw_list.ver
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/resources/gfw_list.ver
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/resources/gfw_list.ver
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/clean_log.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/clean_log.sh
similarity index 95%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/clean_log.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/clean_log.sh
index d2878ed0f..075ee4a35 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/clean_log.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/clean_log.sh
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2022-2023 ImmortalWrt.org
 
-NAME="homeproxy"
+NAME="homeproxy-pro"
 
 log_max_size="50" #KB
 main_log_file="/var/run/$NAME/$NAME.log"
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/adapter.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/adapter.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/adapter.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/adapter.uc
index b616bca6d..12199f122 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/adapter.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/adapter.uc
@@ -30,7 +30,7 @@
 import {
 	isEmpty, strToBool, strToInt, strToTime, removeBlankAttrs,
 	buildTLSObject, buildTransportObject, parse_port
-} from '../homeproxy.uc';
+} from '../homeproxy-pro.uc';
 
 import { Node, Inbound, INBOUND_TLS_SERVER } from './model.uc';
 
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/loader.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/loader.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/loader.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/loader.uc
index 4c26d766b..0e794fdec 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/loader.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/loader.uc
@@ -26,7 +26,7 @@ import {
 
 import { PROTOCOL_TO_UCI as PROTOCOL_OPTIONS } from '../parser/mapping.uc';
 
-const UCICONFIG = 'homeproxy';
+const UCICONFIG = 'homeproxy-pro';
 
 const SECTION = {
 	main: 'config',
@@ -63,7 +63,7 @@ function node_opt(uci, section_id, name) {
 /* --- sub-object extraction --------------------------------------------- */
 
 /* These three functions are the whole reason a Node is hierarchical: the
- * shared TLS/transport/multiplex builders (homeproxy.uc) take a flat,
+ * shared TLS/transport/multiplex builders (homeproxy-pro.uc) take a flat,
  * prefixed dict today, so every caller has to hand them the right subset. A
  * sub-object makes the boundary explicit and testable.
  *
@@ -369,7 +369,7 @@ export const Loader = {
 
 		uci.load(UCICONFIG);
 
-		const config = Config.create('homeproxy');
+		const config = Config.create('homeproxy-pro');
 
 		config.general = {
 			routing_mode: opt(uci, 'main', 'routing_mode') || 'bypass_mainland_china',
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/model.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/model.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/model.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/model.uc
index dbfc51d8c..2fcb06742 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/config/model.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/config/model.uc
@@ -20,7 +20,7 @@
 
 'use strict';
 
-import { isEmpty } from '../homeproxy.uc';
+import { isEmpty } from '../homeproxy-pro.uc';
 
 /* Canonical credential multiplexing for a Node. The current generator picks
  * these apart with ternaries per field (`username` vs `user` vs `password` vs
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_post.ut b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_post.ut
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_post.ut
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_post.ut
index 449c77546..7bd2c53ba 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_post.ut
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_post.ut
@@ -7,7 +7,7 @@
  * Copyright (C) 2025 ImmortalWrt.org
  *
  * Declares every homeproxy_* fw4 chain/set. The inventory of those objects is
- * tracked in scripts/fw4_names.sh, which init.d/homeproxy uses to clean them up
+ * tracked in scripts/fw4_names.sh, which init.d/homeproxy-pro uses to clean them up
  * on stop; add/remove entries there together with any change below.
  * tests/ucode/test_fw4_names.sh compares both lists, and
  * tests/ucode/test_firewall_template.sh renders this template and checks the
@@ -26,7 +26,7 @@
  */
 import { readfile } from 'fs';
 import { cursor } from 'uci';
-import { isEmpty, isValidCIDR } from '/etc/homeproxy/scripts/homeproxy.uc';
+import { isEmpty, isValidCIDR } from '/etc/homeproxy-pro/scripts/homeproxy-pro.uc';
 import {
 	ipv4_to_nftarr,
 	mac_to_nftarr,
@@ -34,7 +34,7 @@ import {
 	ports_to_nftarr,
 	isValidPort,
 	isValidIface
-} from '/etc/homeproxy/scripts/firewall_utils.uc';
+} from '/etc/homeproxy-pro/scripts/firewall_utils.uc';
 
 const fw4 = require('fw4');
 
@@ -139,10 +139,10 @@ function dnsmasq_nftset() {
 }
 
 /* Misc config */
-const resources_dir = '/etc/homeproxy/resources';
+const resources_dir = '/etc/homeproxy-pro/resources';
 
 /* UCI config start */
-const cfgname = 'homeproxy';
+const cfgname = 'homeproxy-pro';
 const uci = cursor();
 uci.load(cfgname);
 
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_pre.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_pre.uc
similarity index 97%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_pre.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_pre.uc
index aed86e739..0d2c95c07 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_pre.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_pre.uc
@@ -8,9 +8,9 @@
 
 import { writefile } from 'fs';
 import { cursor } from 'uci';
-import { isEmpty, RUN_DIR, validation } from './homeproxy.uc';
+import { isEmpty, RUN_DIR, validation } from './homeproxy-pro.uc';
 
-const cfgname = 'homeproxy';
+const cfgname = 'homeproxy-pro';
 const uci = cursor();
 uci.load(cfgname);
 
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_utils.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_utils.uc
similarity index 95%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_utils.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_utils.uc
index 6f1180f95..da4749055 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/firewall_utils.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/firewall_utils.uc
@@ -8,8 +8,8 @@
  * expression with `}`, and the next thing nft sees is whatever the attacker
  * put after it - up to and including `accept` for a chain that should be a
  * drop, or a `reject` outside any chain that the fw4 reload fails to
- * compile, taking the whole router firewall with it.  The homeproxy section
- * in /etc/config/homeproxy is UCI-writable from the subscription updater,
+ * compile, taking the whole router firewall with it.  The homeproxy-pro section
+ * in /etc/config/homeproxy-pro is UCI-writable from the subscription updater,
  * from any shell on the LAN and from any cron job the user has not locked
  * down; `tests/ucode/test_firewall_validators.uc` covers that the helpers
  * drop these inputs rather than letting them through, and `tests/arch-guard.sh`
@@ -30,11 +30,11 @@
 
 'use strict';
 
-/* isEmpty() lives in homeproxy.uc, not in the ucode globals.  Without this
+/* isEmpty() lives in homeproxy-pro.uc, not in the ucode globals.  Without this
  * import every helper below threw "access to undeclared variable isEmpty" the
  * moment it was called, which no host-side test caught because the test
  * harness stages its own stand-in module. */
-import { isEmpty } from './homeproxy.uc';
+import { isEmpty } from './homeproxy-pro.uc';
 
 /* IPv4 (with optional /CIDR) - the regex is the standard four-octet body
  * followed by an optional /0..32.  Anything outside that - "1.2.3.4.5",
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/fw4_names.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/fw4_names.sh
similarity index 89%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/fw4_names.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/fw4_names.sh
index cdff5ee94..66fe94f73 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/fw4_names.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/fw4_names.sh
@@ -2,11 +2,11 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# Single source of truth for every fw4 chain and set owned by homeproxy.
+# Single source of truth for every fw4 chain and set owned by homeproxy-pro.
 #
-#   * root/etc/homeproxy/scripts/firewall_post.ut declares these objects and
+#   * root/etc/homeproxy-pro/scripts/firewall_post.ut declares these objects and
 #     decides which of them actually exist for the current proxy mode.
-#   * root/etc/init.d/homeproxy flushes and deletes them on stop.
+#   * root/etc/init.d/homeproxy-pro flushes and deletes them on stop.
 #
 # When you add or remove a chain/set in firewall_post.ut, update this list in
 # the same commit -- tests/ucode/test_fw4_names.sh compares both sides and
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generate_client.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generate_client.uc
similarity index 97%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generate_client.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generate_client.uc
index c20805fb7..d1bae8a85 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generate_client.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generate_client.uc
@@ -5,7 +5,7 @@
  *     scripts/generate_client.uc: process-level entry point.
  *
  * The actual client generator is generator/client.uc; this script is the
- * thin entry point that init.d/homeproxy execve's. Responsibilities:
+ * thin entry point that init.d/homeproxy-pro execve's. Responsibilities:
  *
  *   1. Load UCI into the HomeProxyConfig domain model.
  *   2. Resolve the GenerationContext env: the WAN resolver (ubus) and the two
@@ -29,7 +29,7 @@ import { mkdtemp, readfile, writefile } from 'fs';
 
 import { Loader } from './config/loader.uc';
 import { generate } from './generator/client.uc';
-import { removeBlankAttrs, HP_DIR, RUN_DIR, shellQuote, UCICONFIG_DIR } from './homeproxy.uc';
+import { removeBlankAttrs, HP_DIR, RUN_DIR, shellQuote, UCICONFIG_DIR } from './homeproxy-pro.uc';
 
 /* Resolve the GenerationContext inputs. This is the only impure step on the
  * client generation path, and it is deliberately here rather than under
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generate_server.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generate_server.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generate_server.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generate_server.uc
index 12ef66be0..e6865d8a6 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generate_server.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generate_server.uc
@@ -15,7 +15,7 @@
 import { mkdtemp, writefile } from 'fs';
 import { Loader } from './config/loader.uc';
 import { generate_server } from './generator/server.uc';
-import { removeBlankAttrs, RUN_DIR, shellQuote, UCICONFIG_DIR } from './homeproxy.uc';
+import { removeBlankAttrs, RUN_DIR, shellQuote, UCICONFIG_DIR } from './homeproxy-pro.uc';
 
 const dm = Loader.load(UCICONFIG_DIR);
 const config = generate_server(dm);
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/client.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/client.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/client.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/client.uc
index 2af07761f..ec790ad5c 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/client.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/client.uc
@@ -39,7 +39,7 @@
 
 'use strict';
 
-import { isEmpty, strToInt, RUN_DIR } from '../homeproxy.uc';
+import { isEmpty, strToInt, RUN_DIR } from '../homeproxy-pro.uc';
 
 import { build_context } from './context.uc';
 import { build_dns } from './dns.uc';
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/common.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/common.uc
similarity index 96%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/common.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/common.uc
index 3484e508f..82395bc07 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/common.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/common.uc
@@ -18,14 +18,14 @@
 
 'use strict';
 
-import { isEmpty } from '../homeproxy.uc';
+import { isEmpty } from '../homeproxy-pro.uc';
 
 import { ConfigQuery } from '../config/model.uc';
 
-/* parse_port() lives in homeproxy.uc. The Adapter layer needs it
+/* parse_port() lives in homeproxy-pro.uc. The Adapter layer needs it
  * too (EndpointFactory builds the WireGuard endpoint) and an adapter must
  * not import from generator/, so the util moved to the module both layers
- * already share. Callers import it from '../homeproxy.uc' now. */
+ * already share. Callers import it from '../homeproxy-pro.uc' now. */
 
 /* Resolve a UCI outbound-style reference (string or array of strings)
  * into the sing-box tag the generator should emit. The arrays carry
@@ -181,7 +181,7 @@ export function attachSchema(config) {
  * other modes still resolve the proxy node hostname and resolve any
  * domain the user clicks through. cache_file is a no-op on a fresh
  * install (no cache to read) and the file is the only piece of state the
- * generator writes outside /etc/config/homeproxy.  Routing-mode gating
+ * generator writes outside /etc/config/homeproxy-pro.  Routing-mode gating
  * used to limit it to bypass_mainland_china + custom, which left
  * gfwlist / proxy_mainland_china / global with cold-start DNS on every
  * reload and made the difference between modes hard to explain.
@@ -199,7 +199,7 @@ export function attachExperimental(config, routing_mode, dns_store_dns) {
 	config.experimental = {
 		cache_file: {
 			enabled: true,
-			path: '/etc/homeproxy/cache.db',
+			path: '/etc/homeproxy-pro/cache.db',
 			store_dns: (dns_store_dns === '1') ? true : null
 		}
 	};
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/context.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/context.uc
similarity index 97%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/context.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/context.uc
index 2a9318644..94389321d 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/context.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/context.uc
@@ -9,8 +9,8 @@
  *
  *     env = {
  *         wan_dns,              the WAN resolver the CLI resolved via ubus
- *         direct_domain_list,   /etc/homeproxy/resources/direct_list.txt
- *         proxy_domain_list,    /etc/homeproxy/resources/proxy_list.txt
+ *         direct_domain_list,   /etc/homeproxy-pro/resources/direct_list.txt
+ *         proxy_domain_list,    /etc/homeproxy-pro/resources/proxy_list.txt
  *     }
  *
  * Why the split exists: this module used to sit inside generator/client.uc
@@ -37,7 +37,7 @@
 
 'use strict';
 
-import { isEmpty, strToInt } from '../homeproxy.uc';
+import { isEmpty, strToInt } from '../homeproxy-pro.uc';
 
 /* Build the routing-mode-independent ctx the section builders consume.
  * Mode-dependent defaults are filled in here so each builder can stay a
@@ -221,7 +221,7 @@ export function build_context(dm, env) {
 	/* Inline static rule-sets (direct-domain, proxy-domain) only fire
 	 * when the routing mode has a non-empty domain list. Both lists are
 	 * inputs now: the CLI reads the two files under
-	 * /etc/homeproxy/resources/ and passes them in. Custom mode ignores
+	 * /etc/homeproxy-pro/resources/ and passes them in. Custom mode ignores
 	 * them entirely, exactly as the pre-split read did. */
 	ctx.direct_domain_list = [];
 	ctx.proxy_domain_list = [];
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/dns.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/dns.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/dns.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/dns.uc
index 2fa3adb35..8a3b03cad 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/dns.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/dns.uc
@@ -25,7 +25,7 @@
 
 'use strict';
 
-import { isEmpty, strToBool, strToInt, strToTime, parseURL, validation, parse_port } from '../homeproxy.uc';
+import { isEmpty, strToBool, strToInt, strToTime, parseURL, validation, parse_port } from '../homeproxy-pro.uc';
 
 
 import { get_outbound, get_resolver, get_ruleset } from './common.uc';
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/inbound.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/inbound.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/inbound.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/inbound.uc
index f91840939..f1b708f7d 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/inbound.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/inbound.uc
@@ -12,7 +12,7 @@
 
 'use strict';
 
-import { isEmpty, strToInt, strToTime, strToBool } from '../homeproxy.uc';
+import { isEmpty, strToInt, strToTime, strToBool } from '../homeproxy-pro.uc';
 
 /* Append the always-on inbounds. dns-in is the local listener the DNS chain
  * hands queries to - runtime/dns.sh points dnsmasq at 127.0.0.1#<dns_port>,
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/outbound.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/outbound.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/outbound.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/outbound.uc
index 576d7a8d5..ddd725794 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/outbound.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/outbound.uc
@@ -31,7 +31,7 @@
 
 'use strict';
 
-import { isEmpty, strToInt, strToBool, strToTime } from '../homeproxy.uc';
+import { isEmpty, strToInt, strToBool, strToTime } from '../homeproxy-pro.uc';
 
 import { ConfigQuery } from '../config/model.uc';
 import { OutboundFactory, EndpointFactory } from '../config/adapter.uc';
@@ -103,13 +103,13 @@ function keep_candidate(dm, id) {
 	const node = ConfigQuery.node_by_id(dm, id);
 
 	if (!node) {
-		warn(sprintf("homeproxy: urltest candidate '%s' no longer exists, skipping.", id));
+		warn(sprintf("homeproxy-pro: urltest candidate '%s' no longer exists, skipping.", id));
 		return false;
 	}
 
 	const problems = OutboundFactory.problems(node);
 	if (length(problems)) {
-		warn(sprintf("homeproxy: skipping urltest candidate '%s': %s.", id, join(', ', problems)));
+		warn(sprintf("homeproxy-pro: skipping urltest candidate '%s': %s.", id, join(', ', problems)));
 		return false;
 	}
 
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/route.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/route.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/route.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/route.uc
index 1f271d453..bb6ff415a 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/route.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/route.uc
@@ -26,7 +26,7 @@
 
 'use strict';
 
-import { isEmpty, strToInt, strToTime, strToBool, parse_port } from '../homeproxy.uc';
+import { isEmpty, strToInt, strToTime, strToBool, parse_port } from '../homeproxy-pro.uc';
 
 
 import { get_outbound, get_resolver, get_ruleset, get_direct_override } from './common.uc';
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/ruleset.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/ruleset.uc
similarity index 91%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/ruleset.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/ruleset.uc
index cff487c62..374ef3446 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/ruleset.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/ruleset.uc
@@ -26,7 +26,7 @@
 
 'use strict';
 
-import { isEmpty, validateHomeProxyPath } from '../homeproxy.uc';
+import { isEmpty, validateHomeProxyPath } from '../homeproxy-pro.uc';
 
 import { get_outbound, isDirectOutboundTag } from './common.uc';
 
@@ -56,9 +56,9 @@ export function build_user_rulesets(rule_set_array, dm, ctx) {
 			   fail loud on a missing/disabled reference. */
 			const fetch_ref = (cfg.type === 'remote') ? (cfg.url || '') : (cfg.path || '');
 			if (!match(fetch_ref, /\{tag\}/))
-				die(sprintf("homeproxy: rule-set '%s' uses extra tags but its %s source lacks a {tag} placeholder; add {tag} to the source or drop the extra tags.", cfg.name, cfg.type));
+				die(sprintf("homeproxy-pro: rule-set '%s' uses extra tags but its %s source lacks a {tag} placeholder; add {tag} to the source or drop the extra tags.", cfg.name, cfg.type));
 			if (cfg.type === 'remote' && !isEmpty(cfg.initial_path) && !match(cfg.initial_path, /\{tag\}/))
-				die(sprintf("homeproxy: rule-set '%s' uses extra tags but its initial_path lacks a {tag} placeholder.", cfg.name));
+				die(sprintf("homeproxy-pro: rule-set '%s' uses extra tags but its initial_path lacks a {tag} placeholder.", cfg.name));
 		}
 
 		/* Local rule-set path is read by sing-box as root. The whitelist
@@ -70,7 +70,7 @@ export function build_user_rulesets(rule_set_array, dm, ctx) {
 		 * sing-box checking whatever the field evaluated to, and the
 		 * user only saw the reload keep the previous config. */
 		if (cfg.type === 'local' && cfg.path && !validateHomeProxyPath(cfg.path))
-			die(sprintf("homeproxy: rule-set '%s' path '%s' is outside the homeproxy whitelist; choose a path under /etc/homeproxy/.", cfg.name, cfg.path));
+			die(sprintf("homeproxy-pro: rule-set '%s' path '%s' is outside the homeproxy-pro whitelist; choose a path under /etc/homeproxy-pro/.", cfg.name, cfg.path));
 
 		const ruleset = {
 			type: cfg.type,
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/server.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/server.uc
similarity index 97%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/server.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/server.uc
index e48dd851e..96fd1f5dd 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/generator/server.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/generator/server.uc
@@ -40,7 +40,7 @@ export function generate_server(dm) {
 		log: {
 			disabled: false,
 			level: log_level,
-			output: '/var/run/homeproxy/sing-box-s.log',
+			output: '/var/run/homeproxy-pro/sing-box-s.log',
 			timestamp: true
 		},
 		inbounds: []
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc
similarity index 96%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc
index f2107aab4..c615079d3 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc
@@ -8,16 +8,16 @@ import { access, lstat, mkdtemp, open, rmdir, unlink } from 'fs';
 import { urldecode_params } from 'luci.http';
 
 /* Global variables start */
-export const HP_DIR = '/etc/homeproxy';
-export const RUN_DIR = '/var/run/homeproxy';
+export const HP_DIR = '/etc/homeproxy-pro';
+export const RUN_DIR = '/var/run/homeproxy-pro';
 /* Where the UCI configuration lives. This is /etc/config - NOT HP_DIR/config.
- * The package ships its config as the conffile /etc/config/homeproxy, and
+ * The package ships its config as the conffile /etc/config/homeproxy-pro, and
  * ucode's `cursor(dir)` treats `dir` as the *confdir*, so
- * cursor(HP_DIR + '/config') would read /etc/homeproxy/config/homeproxy, a
+ * cursor(HP_DIR + '/config') would read /etc/homeproxy-pro/config/homeproxy-pro, a
  * path that exists nowhere.  uci.load() then returns null, every uci.get()
  * returns null, and the Loader silently yields pure defaults: no main-out,
  * no route/direct final, none of the user's ports or nodes.
- * Verified on a device: cursor('/etc/homeproxy/config').get(...) is empty
+ * Verified on a device: cursor('/etc/homeproxy-pro/config').get(...) is empty
  * while cursor().get(...) returns the configured value.
  * The test suite stages a rewritten copy of this constant instead of the
  * old `__LOADER_DIR__` source sed. */
@@ -44,11 +44,11 @@ export function isBinary(str) {
  * sing-box config. sing-box runs as root and reads the file itself; an
  * arbitrary UCI value of e.g. /etc/passwd would leak the file to anyone
  * who could write to the UCI tree. The LuCI UI already gates the input
- * via validateCertificatePath() in homeproxy.js, but UCI can be set from
+ * via validateCertificatePath() in homeproxy-pro.js, but UCI can be set from
  * any node on the LAN (subscription updates, scripted edits) and the
  * UI check is only UX - we have to enforce on the backend.
  *
- *   /etc/homeproxy/...   - project-managed certs / ruleset paths / etc.
+ *   /etc/homeproxy-pro/...   - project-managed certs / ruleset paths / etc.
  *   /tmp/homeproxy_*     - upload staging files (cert_upload_* writes)
  *
  * Anything else (relative paths, /etc/passwd, /var/run/...) returns false
@@ -58,7 +58,7 @@ export function validateHomeProxyPath(p) {
 		return false;
 
 	/* Reject traversal *before* the prefix checks below: a plain prefix
-	 * comparison accepts '/etc/homeproxy/../../etc/shadow', and sing-box reads
+	 * comparison accepts '/etc/homeproxy-pro/../../etc/shadow', and sing-box reads
 	 * these paths as root. */
 	if (match(p, /(^|\/)\.\.(\/|$)/))
 		return false;
@@ -69,7 +69,7 @@ export function validateHomeProxyPath(p) {
 	if (substr(p, 0, 1) !== '/')
 		return false;
 
-	if (substr(p, 0, length('/etc/homeproxy/')) === '/etc/homeproxy/')
+	if (substr(p, 0, length('/etc/homeproxy-pro/')) === '/etc/homeproxy-pro/')
 		return true;
 
 	if (substr(p, 0, length('/tmp/homeproxy_')) === '/tmp/homeproxy_')
@@ -84,16 +84,16 @@ export function validateHomeProxyPath(p) {
  * certificate normally lives under /etc/ssl/ or under the ACME state in
  * /etc/acme/, and the two sing-box jails mount exactly those directories
  * (see runtime/service.sh's procd_add_jail_mount calls). validateHomeProxyPath()
- * only knows /etc/homeproxy/ and /tmp/homeproxy_, so a certificate the user
+ * only knows /etc/homeproxy-pro/ and /tmp/homeproxy_, so a certificate the user
  * legitimately picked from /etc/ssl/ was accepted by the LuCI validator and
  * then silently dropped here - certificate_path became null and the TLS
  * listener failed with no error pointing at the path.
  *
  * The list is mirrored by HP_CERT_PATH_ROOTS in
- * htdocs/luci-static/resources/homeproxy.js; guard 29 in tests/arch-guard.sh
+ * htdocs/luci-static/resources/homeproxy-pro.js; guard 29 in tests/arch-guard.sh
  * keeps the two in step.
  */
-export const CERT_PATH_ROOTS = ['/etc/homeproxy/certs/', '/etc/acme/', '/etc/ssl/'];
+export const CERT_PATH_ROOTS = ['/etc/homeproxy-pro/certs/', '/etc/acme/', '/etc/ssl/'];
 
 /* validateCertificatePath(p) - the TLS certificate/key path gate.
  *
@@ -222,8 +222,8 @@ export function getTime(epoch) {
 };
 
 /* Redact the credential-bearing parts of a URL before logging it. Any
- * subscription URL we ship into /var/run/homeproxy/homeproxy.log is
- * readable by anyone who can read /var/run/homeproxy - including UCI
+ * subscription URL we ship into /var/run/homeproxy-pro/homeproxy-pro.log is
+ * readable by anyone who can read /var/run/homeproxy-pro - including UCI
  * defaults that ship on the device and anyone with shell on the LAN.
  * (Confirmed on the device: the log is 0644.)
  *
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/migrate_config.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/migrate_config.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/migrate_config.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/migrate_config.uc
index 505726f4e..5b3fc6418 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/migrate_config.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/migrate_config.uc
@@ -8,11 +8,11 @@
 'use strict';
 
 import { cursor } from 'uci';
-import { isEmpty, parseURL, shellQuote, validation } from './homeproxy.uc';
+import { isEmpty, parseURL, shellQuote, validation } from './homeproxy-pro.uc';
 
 const uci = cursor();
 
-const uciconfig = 'homeproxy';
+const uciconfig = 'homeproxy-pro';
 uci.load(uciconfig);
 
 const uciinfra = 'infra',
@@ -93,7 +93,7 @@ if (isEmpty(uci.get(uciconfig, ucimain, 'log_level')))
 /* v28.9.1.16: cn_ip_fallback default flipped to '1' (tutorial §2.1 / docs/linux.json 与 pro 的差距分析.md).
  * Existing users get the behaviour change only when they ask for it, so write
  * '0' explicitly into their config on upgrade; new installs read '1' straight
- * from /etc/config/homeproxy (the package ships with that as the default).
+ * from /etc/config/homeproxy-pro (the package ships with that as the default).
  * isEmpty() is the same gate log_level uses, so an upgrade that already has
  * the option set (the fresh-install path of a prior release) keeps its value. */
 if (isEmpty(uci.get(uciconfig, ucimain, 'cn_ip_fallback')))
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/flatten.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/flatten.uc
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/flatten.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/flatten.uc
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/mapping.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/mapping.uc
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/mapping.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/mapping.uc
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/normalize.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/normalize.uc
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/normalize.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/normalize.uc
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/protocols.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/protocols.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/protocols.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/protocols.uc
index dc607f5b9..200578df3 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/protocols.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/protocols.uc
@@ -24,7 +24,7 @@
 
 import { urldecode, urlencode } from 'luci.http';
 
-import { decodeBase64Str, isEmpty, parseURL } from '../homeproxy.uc';
+import { decodeBase64Str, isEmpty, parseURL } from '../homeproxy-pro.uc';
 
 /* https://shadowsocks.org/guide/sip008.html */
 export function parse_sip008_uri(uri) {
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/uri.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/uri.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/uri.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/uri.uc
index ccd41b1d3..6ba9cb848 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/uri.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/uri.uc
@@ -16,7 +16,7 @@
 
 'use strict';
 
-import { isEmpty, validation } from '../homeproxy.uc';
+import { isEmpty, validation } from '../homeproxy-pro.uc';
 
 import {
 	parse_sip008_uri, parse_anytls_uri, parse_http_uri,
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/validator.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/validator.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/validator.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/validator.uc
index f98836664..058b62de5 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/parser/validator.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/parser/validator.uc
@@ -22,7 +22,7 @@
 
 'use strict';
 
-import { validation } from '../homeproxy.uc';
+import { validation } from '../homeproxy-pro.uc';
 
 /* Each entry carries a stable `kind` (so callers / tests can branch on
  * it) and a `message` for the log line. Adding a new rule is:
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/resource_blob_sha.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/resource_blob_sha.uc
similarity index 100%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/resource_blob_sha.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/resource_blob_sha.uc
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/config.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/config.sh
similarity index 93%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/config.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/config.sh
index a22078c80..2f5ec7ce9 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/config.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/config.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# Configuration transaction helpers for homeproxy.
+# Configuration transaction helpers for homeproxy-pro.
 #
 # The generated sing-box configuration is the only thing standing between the
 # router and a working service, so it is handled as a transaction:
@@ -15,9 +15,9 @@
 #     -> ensure-live    if generation produced nothing, restore the
 #                       known-good copy instead of failing the start
 #     -> rollback       a reload that comes up unhealthy puts the known-good
-#                       copy back (see reload_service in init.d/homeproxy)
+#                       copy back (see reload_service in init.d/homeproxy-pro)
 #
-# Sourced by /etc/init.d/homeproxy.  The functions only take explicit paths
+# Sourced by /etc/init.d/homeproxy-pro.  The functions only take explicit paths
 # and never call procd or ubus, so tests/runtime/test_config_transaction.sh
 # can exercise them without a router.
 
@@ -88,8 +88,8 @@ hp_same_file() {
 #
 # Two passes over the file, because the snapshot carries two shapes:
 #
-#   homeproxy.<section>.<option>=<value>   scalar, replayed with `uci set`
-#   list homeproxy.<section>.<option>=a,b  UCI list, replayed with
+#   homeproxy-pro.<section>.<option>=<value>   scalar, replayed with `uci set`
+#   list homeproxy-pro.<section>.<option>=a,b  UCI list, replayed with
 #                                         `uci delete` + `uci add_list`
 #
 # A list replayed through `uci set` becomes a *string*, and the firewall
@@ -146,6 +146,6 @@ hp_restore_known_good_uci() {
 		done
 	done < "$snap"
 
-	[ "$saved" = "1" ] && uci commit homeproxy </dev/null || return 1
+	[ "$saved" = "1" ] && uci commit homeproxy-pro </dev/null || return 1
 	return 0
 }
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/dns.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/dns.sh
similarity index 95%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/dns.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/dns.sh
index 68fc49d00..0b7084202 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/dns.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/dns.sh
@@ -2,21 +2,21 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# dnsmasq integration for homeproxy.
+# dnsmasq integration for homeproxy-pro.
 #
-# homeproxy does not run its own DNS front end: it points dnsmasq at the
+# homeproxy-pro does not run its own DNS front end: it points dnsmasq at the
 # sing-box DNS listener and, in the list-based routing modes, feeds it the
 # per-domain `server=` / `nftset=` mappings.  All of that used to live inline
-# in /etc/init.d/homeproxy.
+# in /etc/init.d/homeproxy-pro.
 #
 # Layering note: this is a device-side module.  It calls `log` and, in
 # hp_dnsmasq_write_snippets, relies on `config_load` having run (see
 # runtime/service.sh's header for the rationale).
 #
-# Sourced by /etc/init.d/homeproxy.
+# Sourced by /etc/init.d/homeproxy-pro.
 
 # hp_dnsmasq_resolve_dir
-# Locate the directory dnsmasq reads the homeproxy snippets from and store it
+# Locate the directory dnsmasq reads the homeproxy-pro snippets from and store it
 # in the global DNSMASQ_DIR.
 #
 # The UCI section name of the dnsmasq config is part of
@@ -40,12 +40,12 @@ hp_dnsmasq_resolve_dir() {
 	DNSMASQ_DIR=""
 	if [ -n "$dnsmasq_uci_config" ] && [ -f "/tmp/etc/dnsmasq.conf.$dnsmasq_uci_config" ]; then
 		dnsmasq_conf_dir="$(awk -F '=' '/^conf-dir=/ {print $2; exit}' "/tmp/etc/dnsmasq.conf.$dnsmasq_uci_config")"
-		[ -n "$dnsmasq_conf_dir" ] && DNSMASQ_DIR="$dnsmasq_conf_dir/dnsmasq-homeproxy.d"
+		[ -n "$dnsmasq_conf_dir" ] && DNSMASQ_DIR="$dnsmasq_conf_dir/dnsmasq-homeproxy-pro.d"
 	fi
 
 	if [ -z "$DNSMASQ_DIR" ]; then
-		log "WARNING: unable to derive the dnsmasq conf-dir (section '${dnsmasq_uci_config:-unknown}'), using /tmp/dnsmasq.d/dnsmasq-homeproxy.d."
-		DNSMASQ_DIR="/tmp/dnsmasq.d/dnsmasq-homeproxy.d"
+		log "WARNING: unable to derive the dnsmasq conf-dir (section '${dnsmasq_uci_config:-unknown}'), using /tmp/dnsmasq.d/dnsmasq-homeproxy-pro.d."
+		DNSMASQ_DIR="/tmp/dnsmasq.d/dnsmasq-homeproxy-pro.d"
 	fi
 }
 
@@ -193,7 +193,7 @@ hp_dnsmasq_write_snippets() {
 	local hp_dir="$2"
 	local routing_mode="$3"
 	local ipv6_support dns_port
-	local include="$dnsmasq_dir/../dnsmasq-homeproxy.conf"
+	local include="$dnsmasq_dir/../dnsmasq-homeproxy-pro.conf"
 	local stage changed=0
 
 	config_get_bool ipv6_support "config" "ipv6_support" "0"
@@ -250,7 +250,7 @@ hp_dnsmasq_write_snippets() {
 # pre-existing state, so there is no original to put back.
 hp_dnsmasq_remove_snippets() {
 	local dnsmasq_dir="$1"
-	local include="$dnsmasq_dir/../dnsmasq-homeproxy.conf"
+	local include="$dnsmasq_dir/../dnsmasq-homeproxy-pro.conf"
 
 	# Nothing to undo when nothing was written - which is the normal case on a
 	# router whose outbound node is 'nil', or one that never started. Removing
@@ -262,7 +262,7 @@ hp_dnsmasq_remove_snippets() {
 
 	rm -rf "$include" "$dnsmasq_dir"
 	/etc/init.d/dnsmasq restart >"/dev/null" 2>&1 \
-		|| log "Warning: failed to restart dnsmasq after removing the homeproxy snippets."
+		|| log "Warning: failed to restart dnsmasq after removing the homeproxy-pro snippets."
 }
 
 reload_service() {
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/firewall.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/firewall.sh
similarity index 90%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/firewall.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/firewall.sh
index 6eb1dedfc..728519d6d 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/firewall.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/firewall.sh
@@ -2,18 +2,18 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# fw4 integration for homeproxy.
+# fw4 integration for homeproxy-pro.
 #
-# homeproxy owns a fixed set of nft chains and sets inside the `fw4` table.
+# homeproxy-pro owns a fixed set of nft chains and sets inside the `fw4` table.
 # They are created by the rendered template (firewall_post.ut, applied by
 # `fw4 reload`) and torn down one object at a time on stop.  All of that used
-# to live inline in /etc/init.d/homeproxy.
+# to live inline in /etc/init.d/homeproxy-pro.
 #
 # Layering note: this is a device-side module.  It calls `log` and, for the
 # teardown, requires the HP_FW4_CHAINS / HP_FW4_SETS inventory to be in scope
-# (root/etc/homeproxy/scripts/fw4_names.sh, sourced by init.d).
+# (root/etc/homeproxy-pro/scripts/fw4_names.sh, sourced by init.d).
 #
-# Sourced by /etc/init.d/homeproxy.
+# Sourced by /etc/init.d/homeproxy-pro.
 
 # hp_restore_upnp_mappings
 # fw4 reload rewrites the whole ruleset, which drops the miniupnpd mappings,
@@ -69,7 +69,7 @@ hp_firewall_apply() {
 }
 
 # hp_firewall_teardown <run-dir> [keep-pre]
-# Flush and delete every fw4 object homeproxy owns.  Deleting one at a time
+# Flush and delete every fw4 object homeproxy-pro owns.  Deleting one at a time
 # matters: `nft -f` batches are atomic, so a single object that does not
 # exist in the current proxy mode would roll back the rest.
 #
@@ -98,13 +98,13 @@ hp_firewall_teardown() {
 	fi
 	: > "$run_dir/fw4_post.nft"
 
-	# Stop-time fw4 reload is best-effort on purpose: every homeproxy-owned
+	# Stop-time fw4 reload is best-effort on purpose: every homeproxy-pro-owned
 	# chain and set has already been flushed and deleted above, so the
 	# live ruleset no longer references them. A reload that succeeds here
 	# also re-loads /etc/config/firewall; a reload that fails leaves the
 	# rest of the user's ruleset untouched, which is the safer outcome -
 	# logging a Warning used to suggest the stop had lost something when
-	# in fact nothing homeproxy-owned was left to lose.
+	# in fact nothing homeproxy-pro-owned was left to lose.
 	fw4 reload >"/dev/null" 2>&1 || true
 	hp_restore_upnp_mappings
 }
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/health.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/health.sh
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/health.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/health.sh
index 664917e72..aef4d5cc7 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/health.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/health.sh
@@ -2,12 +2,12 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# Runtime health helpers for homeproxy.
+# Runtime health helpers for homeproxy-pro.
 #
 # After a reload the service must be able to answer "did the instance
 # actually come up with the new configuration?".  That answer decides whether
 # the transaction in runtime/config.sh rolls back, so it is kept here instead
-# of being inlined in init.d/homeproxy.
+# of being inlined in init.d/homeproxy-pro.
 #
 # A single "is a matching process alive?" probe is NOT a health check, and the
 # first version of this file learned that the hard way.  Measured on the test
@@ -28,10 +28,10 @@
 # several consecutive samples (a service that binds and then dies must not be
 # able to pass on a single lucky poll).
 #
-# Sourced by /etc/init.d/homeproxy; testable off-target by stubbing pgrep /
+# Sourced by /etc/init.d/homeproxy-pro; testable off-target by stubbing pgrep /
 # ubus / jsonfilter / netstat (see tests/runtime/).
 
-: "${HP_SERVICE:=homeproxy}"
+: "${HP_SERVICE:=homeproxy-pro}"
 
 # How many consecutive healthy samples hp_wait_service requires, and how many
 # seconds it may spend trying.
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/net.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/net.sh
similarity index 97%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/net.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/net.sh
index 2e59504a7..349fded8e 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/net.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/net.sh
@@ -2,17 +2,17 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# Routing/network plumbing for homeproxy.
+# Routing/network plumbing for homeproxy-pro.
 #
 # The tproxy and TUN paths need ip rules, a routing table and (for TUN) the
 # device itself before procd starts sing-box, and they need to be torn down
-# again on stop.  All of that used to live inline in /etc/init.d/homeproxy.
+# again on stop.  All of that used to live inline in /etc/init.d/homeproxy-pro.
 #
 # Layering note: this is a device-side module.  It calls `log` and, like the
 # other runtime modules, requires `config_load` to have run (it reads the
 # infra marks and the TUN device name itself).
 #
-# Sourced by /etc/init.d/homeproxy.
+# Sourced by /etc/init.d/homeproxy-pro.
 
 # hp_net_wait_wan [seconds]
 # Block until a default route or an "up" wan interface exists.  Bounded: after
@@ -122,7 +122,7 @@ hp_net_setup() {
 }
 
 # hp_net_teardown
-# Remove every tproxy/TUN rule and route homeproxy added.  Requires
+# Remove every tproxy/TUN rule and route homeproxy-pro added.  Requires
 # config_load.
 #
 # ip rule del removes a single matching rule, so a repeated start (or an
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/service.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/service.sh
similarity index 96%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/service.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/service.sh
index 766ff47fb..6ff65a691 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/runtime/service.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/runtime/service.sh
@@ -2,10 +2,10 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# Service-side runtime helpers for homeproxy.
+# Service-side runtime helpers for homeproxy-pro.
 #
 # These are the device-side orchestration pieces that used to be inlined in
-# /etc/init.d/homeproxy: the sing-box version gate, the auto-update cron
+# /etc/init.d/homeproxy-pro: the sing-box version gate, the auto-update cron
 # entry, the runtime-file preparation, the procd instance registrations and
 # the "generate -> known-good" transaction that start_service runs for each
 # side.
@@ -17,7 +17,7 @@
 # have run `config_load` and must be inside a procd init context.  That is
 # exactly why they were moved out of init.d and not turned into pure helpers.
 #
-# Sourced by /etc/init.d/homeproxy.
+# Sourced by /etc/init.d/homeproxy-pro.
 
 # hp_require_singbox
 # Refuse to start on a sing-box older than 1.14: the generated configuration
@@ -155,7 +155,7 @@ hp_prepare_runtime_files() {
 		if mkdir -p "$hp_dir/certs" 2>"/dev/null"; then
 			# The server runs jailed as the sing-box user and reads its
 			# certificate, key and ECH config from this directory, while an
-			# upload lands as root:0600 (luci.homeproxy).  Hand the directory
+			# upload lands as root:0600 (luci.homeproxy-pro).  Hand the directory
 			# and its files to that user and keep them 0700/0600: the jailed
 			# server can read them and nobody else can reach the private key.
 			# Without this the choice was "world-readable key" or "jailed
@@ -238,7 +238,7 @@ hp_procd_client_instance() {
 		procd_add_jail_mount "/tmp/dhcp.leases"
 		procd_add_jail_mount "/etc/localtime"
 		procd_add_jail_mount "/etc/TZ"
-		procd_set_param capabilities "/etc/capabilities/homeproxy.json"
+		procd_set_param capabilities "/etc/capabilities/homeproxy-pro.json"
 		procd_set_param no_new_privs 1
 		procd_set_param user sing-box
 		procd_set_param group sing-box
@@ -278,7 +278,7 @@ hp_procd_server_instance() {
 		procd_add_jail_mount "/etc/ssl/"
 		procd_add_jail_mount "/etc/localtime"
 		procd_add_jail_mount "/etc/TZ"
-		procd_set_param capabilities "/etc/capabilities/homeproxy.json"
+		procd_set_param capabilities "/etc/capabilities/homeproxy-pro.json"
 		procd_set_param no_new_privs 1
 		procd_set_param user sing-box
 		procd_set_param group sing-box
@@ -514,9 +514,9 @@ control.wan_direct_ipv6_ips"
 #
 # One line per key so a reader without uci-tools can iterate the file:
 #
-#   homeproxy.<section>.<option>=<value>     scalar
-#   list homeproxy.<section>.<option>=a,b    list, ','-joined
-#   list homeproxy.<section>.<option>=       list that was absent or empty
+#   homeproxy-pro.<section>.<option>=<value>     scalar
+#   list homeproxy-pro.<section>.<option>=a,b    list, ','-joined
+#   list homeproxy-pro.<section>.<option>=       list that was absent or empty
 #
 # An absent scalar is written as an empty value, which is how the replay
 # spells "remove the option again" (UCI deletes an option set to an empty
@@ -532,7 +532,7 @@ hp_write_uci_snapshot() {
 			sec="${pair%%.*}"
 			opt="${pair#*.}"
 			config_get val "$sec" "$opt"
-			printf 'homeproxy.%s.%s=%s\n' "$sec" "$opt" "$val"
+			printf 'homeproxy-pro.%s.%s=%s\n' "$sec" "$opt" "$val"
 		done
 
 		for pair in $HP_INTERCEPT_LISTS; do
@@ -544,7 +544,7 @@ hp_write_uci_snapshot() {
 			for el in $val; do
 				[ -z "$out" ] && out="$el" || out="$out,$el"
 			done
-			printf 'list homeproxy.%s.%s=%s\n' "$sec" "$opt" "$out"
+			printf 'list homeproxy-pro.%s.%s=%s\n' "$sec" "$opt" "$out"
 		done
 	} > "$snap.tmp" 2>"/dev/null" && mv -f "$snap.tmp" "$snap"
 }
@@ -555,7 +555,7 @@ hp_write_uci_snapshot() {
 # rollback target is always something that came up.
 #
 # Also writes $good_dir/uci-snapshot.txt (see HP_INTERCEPT_SCALARS above).
-# The rollback path in init.d/homeproxy reads that file back BEFORE its
+# The rollback path in init.d/homeproxy-pro reads that file back BEFORE its
 # stop;start, otherwise start_service reinstalls the new (failing) layer on
 # top of the rolled-back sing-box bytes - the classic "rollback restored the
 # config but nft is still the new chains" silent failure that took a
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/decoder.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/decoder.uc
similarity index 97%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/decoder.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/decoder.uc
index c7a0fcbb8..606d4978b 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/decoder.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/decoder.uc
@@ -26,7 +26,7 @@
 
 'use strict';
 
-import { isEmpty, decodeBase64Str, redactUrl } from '../homeproxy.uc';
+import { isEmpty, decodeBase64Str, redactUrl } from '../homeproxy-pro.uc';
 
 export function decode(content, log, url) {
 	if (isEmpty(content))
@@ -59,7 +59,7 @@ export function decode(content, log, url) {
 		}
 	} catch (e) {
 		/* The URL carries the subscription token and this line lands in
-		 * homeproxy.log, which is world-readable.  fetcher.uc and the
+		 * homeproxy-pro.log, which is world-readable.  fetcher.uc and the
 		 * orchestrator both redact; this path was missed. */
 		const tag = url ? sprintf('for %s, ', redactUrl(url)) : '';
 		log(sprintf('JSON parse failed %strying base64: %s', tag, e.message));
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc
similarity index 86%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc
index 351408ef6..d3841bada 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * Thin wrapper around homeproxy's wGETVerbose that logs
+ * Thin wrapper around homeproxy-pro's wGETVerbose that logs
  * the failure and returns a flat { content, error } shape. The
  * orchestrator used to inline the empty-content check + log
  * message right next to the call, which made the loop body hard
@@ -20,13 +20,13 @@
 
 'use strict';
 
-import { isEmpty, redactUrl, wGETVerbose } from '../homeproxy.uc';
+import { isEmpty, redactUrl, wGETVerbose } from '../homeproxy-pro.uc';
 
 export function fetch(url, user_agent, log) {
 	const result = wGETVerbose(url, user_agent);
 	if (isEmpty(result.content)) {
 		/* Redact the URL before logging: the query string is the
-		 * subscription token and homeproxy.log is world-readable on
+		 * subscription token and homeproxy-pro.log is world-readable on
 		 * a default install. The original URL goes back to the caller
 		 * via result.error so error propagation still works. */
 		log(sprintf('Failed to fetch resources from %s: %s',
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/filter.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/filter.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/filter.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/filter.uc
index fa125f60f..780067e5f 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/filter.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/filter.uc
@@ -18,7 +18,7 @@
 
 'use strict';
 
-import { isEmpty } from '../homeproxy.uc';
+import { isEmpty } from '../homeproxy-pro.uc';
 
 /* Decide whether a node named `name` should be dropped. `mode` is
  * one of:
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/repository.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/repository.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/repository.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/repository.uc
index a46bb46c9..281243adc 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/subscription/repository.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/subscription/repository.uc
@@ -44,7 +44,7 @@
 
 import { md5 } from 'digest';
 
-import { isEmpty } from '../homeproxy.uc';
+import { isEmpty } from '../homeproxy-pro.uc';
 
 /* Relative, like config/loader.uc's '../parser/mapping.uc': ucode's
  * resolver only searches top-level module names in the -L tree, so a
@@ -215,7 +215,7 @@ function maybeScrubUrltestNodes(uci, uciconfig, ucimain, listOption, log) {
  *
  * The new value is also pushed onto `result.log` so the orchestrator
  * can replay it (it uses `result.log` to log the same lines verbatim;
- * the homeproxy.log capture goes through the separate `log` arg). */
+ * the homeproxy-pro.log capture goes through the separate `log` arg). */
 function switchMainNodeOffDanglingRef(uci, uciconfig, ucimain, field, current_value, first_server, result, log) {
 	if (uci.get(uciconfig, current_value))
 		return current_value;
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_crond.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_crond.sh
similarity index 85%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_crond.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_crond.sh
index d3c608ab7..0c3cd9059 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_crond.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_crond.sh
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2023 ImmortalWrt.org
 
-SCRIPTS_DIR="/etc/homeproxy/scripts"
+SCRIPTS_DIR="/etc/homeproxy-pro/scripts"
 
 for i in "china_ip4" "china_ip6" "gfw_list" "china_list"; do
 	"$SCRIPTS_DIR"/update_resources.sh "$i"
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_resources.sh b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_resources.sh
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_resources.sh
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_resources.sh
index b1cdb8cb0..309217af8 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_resources.sh
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_resources.sh
@@ -15,7 +15,7 @@
 # entry; tests/runtime/test_resource_update.sh exercises the verification path
 # off-target with stubbed wget/jsonfilter/ucode.
 
-NAME="homeproxy"
+NAME="homeproxy-pro"
 
 # The blob-digest helper sits next to this script and is invoked through it, so
 # its location follows however the script was started (rpcd, cron, a shell).
@@ -75,7 +75,7 @@ check_list_update() {
 	local listref="$3"
 	local listname="$4"
 	local lock="$RUN_DIR/update_resources-$listtype.lock"
-	local github_token="$(uci -q get homeproxy.config.github_token)"
+	local github_token="$(uci -q get homeproxy-pro.config.github_token)"
 	local wget="wget --timeout=10 -q"
 
 	# fd 9, not 200: POSIX only guarantees 0-9, and dash fails the whole
diff --git a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_subscriptions.uc b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_subscriptions.uc
similarity index 96%
rename from luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_subscriptions.uc
rename to luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_subscriptions.uc
index 8b60af2ce..f01792192 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/homeproxy-pro/scripts/update_subscriptions.uc
+++ b/luci-app-homeproxy-pro/root/etc/homeproxy-pro/scripts/update_subscriptions.uc
@@ -52,7 +52,7 @@ import { cursor } from 'uci';
 import {
 	executeCommand, getTime, isEmpty, HP_DIR, RUN_DIR, redactUrl, shellQuote,
 	UCICONFIG_DIR
-} from './homeproxy.uc';
+} from './homeproxy-pro.uc';
 
 import { parse_uri } from './parser/uri.uc';
 import { normalize } from './parser/normalize.uc';
@@ -77,12 +77,12 @@ import { Loader } from './config/loader.uc';
  * A2: the run performs exactly one uci.commit(). The Repository modules stage
  * mutations only.
  *
- * UCICONFIG_DIR (homeproxy.uc) is the config *directory* Loader.load() takes,
+ * UCICONFIG_DIR (homeproxy-pro.uc) is the config *directory* Loader.load() takes,
  * and the sandboxed test points it at its own config instead of /etc/config
  * (tests/ucode/test_subscription_updater_runs.sh rewrites that line in
- * homeproxy.uc and fails loudly if the rewrite did not apply). */
-const CONFIG_FILE = UCICONFIG_DIR + '/homeproxy';
-const uciconfig = 'homeproxy';
+ * homeproxy-pro.uc and fails loudly if the rewrite did not apply). */
+const CONFIG_FILE = UCICONFIG_DIR + '/homeproxy-pro';
+const uciconfig = 'homeproxy-pro';
 
 const ucimain = 'config',
       ucinode = 'node';
@@ -139,7 +139,7 @@ function load_locked_state() {
 
 
 function log(...args) {
-	const logfile = open(`${RUN_DIR}/homeproxy.log`, 'a');
+	const logfile = open(`${RUN_DIR}/homeproxy-pro.log`, 'a');
 	logfile.write(`${getTime()} [SUBSCRIBE] ${join(' ', args)}\n`);
 	logfile.close();
 }
@@ -202,7 +202,7 @@ function main() {
 	/* ubus is unreachable when no ubusd is running (dev host)
 	 * and the feature query is optional: fall back to the same
 	 * empty feature set the code below already handles. */
-	const sing_features = (ubus?.call('luci.homeproxy', 'singbox_get_features', {})) || {};
+	const sing_features = (ubus?.call('luci.homeproxy-pro', 'singbox_get_features', {})) || {};
 	if (isEmpty(sing_features))
 		log('Warning: Failed to query sing-box features via ubus, assuming defaults.');
 
@@ -363,16 +363,16 @@ function main() {
 	log('Reloading service...');
 
 	/* Run the init script directly. The previous code called
-	 * `init_action('homeproxy', 'reload')` imported from luci.sys, but
+	 * `init_action('homeproxy-pro', 'reload')` imported from luci.sys, but
 	 * neither openwrt/luci nor immortalwrt/luci exports an `init_action`
 	 * from that module (it has process_list / conntrack_list /
 	 * init_list / init_index / init_enabled), so the import failed to
 	 * resolve and this script could not load on a router at all.
 	 *
-	 * executeCommand() is the package's own runner (homeproxy.uc); unlike
+	 * executeCommand() is the package's own runner (homeproxy-pro.uc); unlike
 	 * a bare system() call it returns the exit status and the captured
 	 * stderr, so a failed reload is recorded instead of disappearing. */
-	const reload = executeCommand('/etc/init.d/homeproxy', 'reload');
+	const reload = executeCommand('/etc/init.d/homeproxy-pro', 'reload');
 	if (reload.exitcode !== 0)
 		log(sprintf('Warning: reload exited with status %d: %s',
 			reload.exitcode, trim(reload.stderr || '')));
@@ -420,7 +420,7 @@ else {
 		if (config_backup != null) {
 			/* Write the snapshot beside the config and rename it into place.
 			 * A bare writefile() truncates first, so a crash or a full disk
-			 * part-way through the restore leaves /etc/config/homeproxy
+			 * part-way through the restore leaves /etc/config/homeproxy-pro
 			 * partial or empty - losing the very configuration this is
 			 * meant to protect. rename() is atomic within a directory. */
 			const restore_tmp = CONFIG_FILE + '.hp-restore';
diff --git a/luci-app-homeproxy-pro-pro/root/etc/init.d/homeproxy-pro b/luci-app-homeproxy-pro/root/etc/init.d/homeproxy-pro
similarity index 99%
rename from luci-app-homeproxy-pro-pro/root/etc/init.d/homeproxy-pro
rename to luci-app-homeproxy-pro/root/etc/init.d/homeproxy-pro
index 937f0ba42..401367aed 100755
--- a/luci-app-homeproxy-pro-pro/root/etc/init.d/homeproxy-pro
+++ b/luci-app-homeproxy-pro/root/etc/init.d/homeproxy-pro
@@ -5,7 +5,7 @@
 #
 # This file is the lifecycle orchestrator only.  Everything
 # that is not "read the configuration, decide, and drive procd" now lives in
-# /etc/homeproxy/scripts/runtime/:
+# /etc/homeproxy-pro/scripts/runtime/:
 #
 #   config.sh    generated-configuration transaction (known-good, restore,
 #                rollback) - pure, takes explicit paths
@@ -57,12 +57,12 @@ USE_PROCD=1
 START=99
 STOP=10
 
-CONF="homeproxy"
+CONF="homeproxy-pro"
 PROG="/usr/bin/sing-box"
 
-HP_DIR="/etc/homeproxy"
-RUN_DIR="/var/run/homeproxy"
-LOG_PATH="$RUN_DIR/homeproxy.log"
+HP_DIR="/etc/homeproxy-pro"
+RUN_DIR="/var/run/homeproxy-pro"
+LOG_PATH="$RUN_DIR/homeproxy-pro.log"
 
 # Last configuration that was proven to run.  start_service records it only
 # after the health gate passed, and reload_service restores it when a new
@@ -117,7 +117,7 @@ hp_dnsmasq_resolve_dir
 # points at the snippets.  Both live in tmpfs, so after a reboot there is
 # nothing stale to release.
 hp_intercept_installed() {
-	[ -s "$RUN_DIR/fw4_post.nft" ] || [ -e "$DNSMASQ_DIR/../dnsmasq-homeproxy.conf" ]
+	[ -s "$RUN_DIR/fw4_post.nft" ] || [ -e "$DNSMASQ_DIR/../dnsmasq-homeproxy-pro.conf" ]
 }
 
 # hp_release_intercept
diff --git a/luci-app-homeproxy-pro-pro/root/etc/uci-defaults/luci-homeproxy-pro b/luci-app-homeproxy-pro/root/etc/uci-defaults/luci-homeproxy-pro
similarity index 76%
rename from luci-app-homeproxy-pro-pro/root/etc/uci-defaults/luci-homeproxy-pro
rename to luci-app-homeproxy-pro/root/etc/uci-defaults/luci-homeproxy-pro
index fb6ebb36a..56dc30cb8 100644
--- a/luci-app-homeproxy-pro-pro/root/etc/uci-defaults/luci-homeproxy-pro
+++ b/luci-app-homeproxy-pro/root/etc/uci-defaults/luci-homeproxy-pro
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 [ -f "/www/luci-static/resources/icons/loading.gif" ] && \
-	sed -i "s,/loading.svg,/loading.gif,g" "/www/luci-static/resources/view/homeproxy/status.js"
+	sed -i "s,/loading.svg,/loading.gif,g" "/www/luci-static/resources/view/homeproxy-pro/status.js"
 
 uci -q batch <<-EOF >"/dev/null"
 	delete firewall.homeproxy_pre
@@ -9,21 +9,21 @@ uci -q batch <<-EOF >"/dev/null"
 	delete firewall.homeproxy_forward
 	set firewall.homeproxy_forward=include
 	set firewall.homeproxy_forward.type=nftables
-	set firewall.homeproxy_forward.path="/var/run/homeproxy/fw4_forward.nft"
+	set firewall.homeproxy_forward.path="/var/run/homeproxy-pro/fw4_forward.nft"
 	set firewall.homeproxy_forward.position="chain-pre"
 	set firewall.homeproxy_forward.chain="forward"
 
 	delete firewall.homeproxy_input
 	set firewall.homeproxy_input=include
 	set firewall.homeproxy_input.type=nftables
-	set firewall.homeproxy_input.path="/var/run/homeproxy/fw4_input.nft"
+	set firewall.homeproxy_input.path="/var/run/homeproxy-pro/fw4_input.nft"
 	set firewall.homeproxy_input.position="chain-pre"
 	set firewall.homeproxy_input.chain="input"
 
 	delete firewall.homeproxy_post
 	set firewall.homeproxy_post=include
 	set firewall.homeproxy_post.type=nftables
-	set firewall.homeproxy_post.path="/var/run/homeproxy/fw4_post.nft"
+	set firewall.homeproxy_post.path="/var/run/homeproxy-pro/fw4_post.nft"
 	set firewall.homeproxy_post.position="table-post"
 	commit firewall
 EOF
diff --git a/luci-app-homeproxy-pro/root/etc/uci-defaults/luci-homeproxy-pro-migration b/luci-app-homeproxy-pro/root/etc/uci-defaults/luci-homeproxy-pro-migration
new file mode 100644
index 000000000..727ffd4e1
--- /dev/null
+++ b/luci-app-homeproxy-pro/root/etc/uci-defaults/luci-homeproxy-pro-migration
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ucode "/etc/homeproxy-pro/scripts/migrate_config.uc"
+
+exit 0
diff --git a/luci-app-homeproxy-pro/root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json b/luci-app-homeproxy-pro/root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json
new file mode 100644
index 000000000..5164b09ba
--- /dev/null
+++ b/luci-app-homeproxy-pro/root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json
@@ -0,0 +1,45 @@
+{
+	"admin/services/homeproxy-pro": {
+		"title": "HomeProxy Pro",
+		"order": 10,
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"acl": [ "luci-app-homeproxy-pro" ],
+			"uci": { "homeproxy-pro": true }
+		}
+	},
+	"admin/services/homeproxy-pro/client": {
+		"title": "Client Settings",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "homeproxy-pro/client"
+		}
+	},
+	"admin/services/homeproxy-pro/node": {
+		"title": "Node Settings",
+		"order": 15,
+		"action": {
+			"type": "view",
+			"path": "homeproxy-pro/node"
+		}
+	},
+	"admin/services/homeproxy-pro/server": {
+		"title": "Server Settings",
+		"order": 20,
+		"action": {
+			"type": "view",
+			"path": "homeproxy-pro/server"
+		}
+	},
+	"admin/services/homeproxy-pro/status": {
+		"title": "Service Status",
+		"order": 30,
+		"action": {
+			"type": "view",
+			"path": "homeproxy-pro/status"
+		}
+	}
+}
diff --git a/luci-app-homeproxy-pro-pro/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json b/luci-app-homeproxy-pro/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json
similarity index 64%
rename from luci-app-homeproxy-pro-pro/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json
rename to luci-app-homeproxy-pro/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json
index 9fa923d52..4b9edac6f 100644
--- a/luci-app-homeproxy-pro-pro/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json
+++ b/luci-app-homeproxy-pro/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json
@@ -1,15 +1,15 @@
 {
-	"luci-app-homeproxy": {
-		"description": "Grant access to homeproxy configuration",
+	"luci-app-homeproxy-pro": {
+		"description": "Grant access to homeproxy-pro configuration",
 		"read": {
 			"file": {
-				"/var/run/homeproxy/homeproxy.log": [ "read" ],
-				"/var/run/homeproxy/sing-box-c.log": [ "read" ],
-				"/var/run/homeproxy/sing-box-s.log": [ "read" ]
+				"/var/run/homeproxy-pro/homeproxy-pro.log": [ "read" ],
+				"/var/run/homeproxy-pro/sing-box-c.log": [ "read" ],
+				"/var/run/homeproxy-pro/sing-box-s.log": [ "read" ]
 			},
 			"ubus": {
 				"service": [ "list" ],
-				"luci.homeproxy": [
+				"luci.homeproxy-pro": [
 					"acllist_read",
 					"connection_check",
 					"node_parse",
@@ -18,7 +18,7 @@
 					"update_subscriptions_status"
 				]
 			},
-			"uci": [ "homeproxy" ]
+			"uci": [ "homeproxy-pro" ]
 		},
 		"write": {
 			"file": {
@@ -28,7 +28,7 @@
 				"/tmp/homeproxy_cert_client_ech_conf.tmp": [ "write" ]
 			},
 			"ubus": {
-				"luci.homeproxy": [
+				"luci.homeproxy-pro": [
 					"acllist_write",
 					"certificate_write",
 					"log_clean",
@@ -37,7 +37,7 @@
 					"update_subscriptions"
 				]
 			},
-			"uci": [ "homeproxy" ]
+			"uci": [ "homeproxy-pro" ]
 		}
 	}
 }
diff --git a/luci-app-homeproxy-pro-pro/root/usr/share/rpcd/ucode/luci.homeproxy-pro b/luci-app-homeproxy-pro/root/usr/share/rpcd/ucode/luci.homeproxy-pro
similarity index 96%
rename from luci-app-homeproxy-pro-pro/root/usr/share/rpcd/ucode/luci.homeproxy-pro
rename to luci-app-homeproxy-pro/root/usr/share/rpcd/ucode/luci.homeproxy-pro
index 30c03c122..c0896a492 100644
--- a/luci-app-homeproxy-pro-pro/root/usr/share/rpcd/ucode/luci.homeproxy-pro
+++ b/luci-app-homeproxy-pro/root/usr/share/rpcd/ucode/luci.homeproxy-pro
@@ -9,8 +9,8 @@
 
 import { access, error, lstat, popen, readfile, writefile } from 'fs';
 
-import { isBinary, isValidECHConfig, isValidPEM, shellQuote, executeCommand } from '/etc/homeproxy/scripts/homeproxy.uc';
-import { parse_uri } from '/etc/homeproxy/scripts/parser/uri.uc';
+import { isBinary, isValidECHConfig, isValidPEM, shellQuote, executeCommand } from '/etc/homeproxy-pro/scripts/homeproxy-pro.uc';
+import { parse_uri } from '/etc/homeproxy-pro/scripts/parser/uri.uc';
 
 /* Kanged from ucode/luci - replaced by the imported shellQuote() so every shell
  * argument in this file goes through one helper. */
@@ -18,9 +18,9 @@ function hasKernelModule(kmod) {
 	return (system(sprintf('[ -e "/lib/modules/$(uname -r)"/%s ]', shellQuote(kmod))) === 0);
 }
 
-const HP_DIR = '/etc/homeproxy';
-const RUN_DIR = '/var/run/homeproxy';
-const LOG_PATH = `${RUN_DIR}/homeproxy.log`;
+const HP_DIR = '/etc/homeproxy-pro';
+const RUN_DIR = '/var/run/homeproxy-pro';
+const LOG_PATH = `${RUN_DIR}/homeproxy-pro.log`;
 
 /* Queried by singbox_get_features and by node_parse: the share-link parser
  * skips QUIC protocols and uTLS fingerprints the running sing-box cannot
@@ -120,7 +120,7 @@ const methods = {
 				 * certificate button, which was a race: the second upload
 				 * landed on top of the first while the backend was still
 				 * reading it, and a slow upload could overwrite a faster
-				 * one. The frontend (homeproxy.js uploadCertificate)
+				 * one. The frontend (homeproxy-pro.js uploadCertificate)
 				 * derives the same path from the UCI option name, and
 				 * the ACL write list enumerates all four. */
 				const tmpcert = `/tmp/homeproxy_cert_${filename}.tmp`;
@@ -214,7 +214,7 @@ const methods = {
 	log_clean: {
 		args: { type: 'type' },
 		call: function(req) {
-			if (index(['homeproxy', 'sing-box-c', 'sing-box-s'], req.args?.type) === -1)
+			if (index(['homeproxy-pro', 'sing-box-c', 'sing-box-s'], req.args?.type) === -1)
 				return { result: false, error: 'illegal type' };
 
 			const filestat = lstat(`${RUN_DIR}/${req.args?.type}.log`);
@@ -363,7 +363,7 @@ const methods = {
 		/* Run the subscription updater once and report how it went.
 		 *
 		 * The LuCI button used fs.exec_direct() on
-		 * /etc/homeproxy/scripts/update_subscriptions.uc, which is the only
+		 * /etc/homeproxy-pro/scripts/update_subscriptions.uc, which is the only
 		 * reason the package ACL had to grant `file exec` on a root-owned
 		 * entry point: the browser session was authorised to execute that
 		 * path. Through one named ubus method the session is granted the
@@ -372,7 +372,7 @@ const methods = {
 		 *
 		 * The previous synchronous shape returned the orchestrator's exit
 		 * status and captured stderr, but the full pipeline (wget fetch
-		 * through a CN -> overseas link, UCI commit, /etc/init.d/homeproxy
+		 * through a CN -> overseas link, UCI commit, /etc/init.d/homeproxy-pro
 		 * reload, the 30 s sing-box health gate) regularly took 10-15 s,
 		 * which exceeded the browser XHR timeout on every browser we tried.
 		 * The UI button then surfaced "XHR request timed out" while the
@@ -408,7 +408,7 @@ const methods = {
 	update_subscriptions_status: {
 		/* Status companion to update_subscriptions. Reports whether the
 		 * updater is still running (lock file present) and the last ~12
-		 * lines of the homeproxy log so the page can show what the run
+		 * lines of the homeproxy-pro log so the page can show what the run
 		 * said without re-reading everything. The log is world-readable
 		 * and is rotated by runtime/service.sh -> log-cleaner.sh.
 		 *
@@ -439,4 +439,4 @@ const methods = {
 	}
 };
 
-return { 'luci.homeproxy': methods };
+return { 'luci.homeproxy-pro': methods };
diff --git a/luci-app-homeproxy-pro-pro/tests/README.md b/luci-app-homeproxy-pro/tests/README.md
similarity index 85%
rename from luci-app-homeproxy-pro-pro/tests/README.md
rename to luci-app-homeproxy-pro/tests/README.md
index 71f2512ac..8031dd53a 100644
--- a/luci-app-homeproxy-pro-pro/tests/README.md
+++ b/luci-app-homeproxy-pro/tests/README.md
@@ -1,4 +1,4 @@
-# luci-app-homeproxy tests
+# luci-app-homeproxy-pro tests
 
 Automated checks for the pieces that `sing-box check` cannot validate: the
 share-link parsers, the UCI→JSON generators and the LuCI form definitions.
@@ -66,7 +66,7 @@ package and never runs `apk` or `opkg` on the target. That is a rule, not a
 preference.
 
 Installing on a live device runs the package manager, which rewrites
-`/etc/config/homeproxy` from the feed package — and on 2026-09-15 that destroyed
+`/etc/config/homeproxy-pro` from the feed package — and on 2026-09-15 that destroyed
 the test machine's node configuration. There was no backup and no snapshot, and
 six nodes plus the `dns`, `server` and `subscription` sections were
 unrecoverable. Staging cannot do that: everything it writes lives under
@@ -78,7 +78,7 @@ reports both versions before staging:
 ```
 == target and source versions (staging; the package is not installed) ==
   source  : 28.9.1.14-r1
-  target  : luci-app-homeproxy-26.236.50544~cb5d434
+  target  : luci-app-homeproxy-pro-26.236.50544~cb5d434
   sing-box: 1.14.1
 ```
 
@@ -114,9 +114,9 @@ the workflow print which value was used, so a fw4 layer that reported `NOT RUN`
 is visible rather than inferred.
 
 Installing the package and reloading the router is **not** part of this command.
-If a change needs that (anything in `/etc/init.d/homeproxy`,
+If a change needs that (anything in `/etc/init.d/homeproxy-pro`,
 `scripts/runtime/*.sh`, or the generation path), do it as a separate, deliberate
-step — and take `/etc/config/homeproxy` plus `/etc/homeproxy` aside first, with
+step — and take `/etc/config/homeproxy-pro` plus `/etc/homeproxy-pro` aside first, with
 the previous release's package kept for re-install. `apk` keeps a modified
 conffile and drops a `<file>.apk-new` next to it; check `md5sum` on the config
 before and after and delete the `.apk-new` files only once that matches.
@@ -163,7 +163,7 @@ default), so dropping the prefix undoes it completely. It builds:
 | `libubox`, `libuci`, `libubus` | ucode's `uci`/`ubus`/`uloop` plugins need them |
 | `libmd` | the `digest` module (`ucode-mod-digest` in the package Makefile) |
 | `ucode` | the interpreter itself, plus `utpl`/`ucc`. Pinned to the revision ImmortalWrt/OpenWrt snapshots ship as `2026.01.16~85922056` — see "Why ucode is pinned" below |
-| `liblucihttp` | `luci.http` is a thin wrapper over this C module and `homeproxy.uc` imports it |
+| `liblucihttp` | `luci.http` is a thin wrapper over this C module and `homeproxy-pro.uc` imports it |
 | `luci` ucode sources | `http.uc`, `sys.uc`, … installed to `<prefix>/share/ucode/luci` like OpenWrt does |
 | `sing-box` | the official 1.14.0 release binary; the fixtures are validated with `sing-box check` and the package targets 1.14 |
 
@@ -222,8 +222,8 @@ reach a device:
 | Was skipped | Now |
 | --- | --- |
 | `scripts/update_subscriptions.uc` | compiled like every other source; `luci.sys` comes from the toolchain |
-| `scripts/firewall_pre.uc` | compiled; its `homeproxy` import resolves through `-L` |
-| `rpcd/ucode/luci.homeproxy` | compiled from a copy whose absolute `/etc/homeproxy/...` imports are rewritten to the checkout |
+| `scripts/firewall_pre.uc` | compiled; its `homeproxy-pro` import resolves through `-L` |
+| `rpcd/ucode/luci.homeproxy-pro` | compiled from a copy whose absolute `/etc/homeproxy-pro/...` imports are rewritten to the checkout |
 | `tests/ucode/test_firewall_template.sh` | runs; `utpl` is a symlink to `ucode` and ships with the toolchain |
 
 A missing `utpl`, or any other gap in the toolchain, now FAILS instead of
@@ -247,7 +247,7 @@ default can be turned off for a target that legitimately lacks fw4
 
 Two further host differences are bridged so the remaining checks still run:
 
-* **`/sbin/validate_data`** — `homeproxy.uc` shells out to this OpenWrt helper
+* **`/sbin/validate_data`** — `homeproxy-pro.uc` shells out to this OpenWrt helper
   for hostname/address/port validation. `tests/toolchain/validate-data.sh`
   reproduces the caller's contract (exit 0 = valid) using the same validation
   code as the parser unit tests; `tests/ucode/run.sh` exports it as
@@ -266,16 +266,16 @@ Two further host differences are bridged so the remaining checks still run:
 
 | Path | Checks |
 | --- | --- |
-| `tests/i18n-coverage.py` | Reports how many `po/templates/homeproxy.pot` strings have a non-fuzzy, non-empty `po/zh_Hans/homeproxy.po` translation. Technical tokens that stay as-is are listed in `tests/i18n-ignore.txt`; anything else missing fails the run (`--fail-below 100`) and adds a job-summary entry. The release workflow (`build.yml`) deliberately warns instead of failing, so a translation gap cannot block packaging - the PR gates already catch it. |
+| `tests/i18n-coverage.py` | Reports how many `po/templates/homeproxy-pro.pot` strings have a non-fuzzy, non-empty `po/zh_Hans/homeproxy-pro.po` translation. Technical tokens that stay as-is are listed in `tests/i18n-ignore.txt`; anything else missing fails the run (`--fail-below 100`) and adds a job-summary entry. The release workflow (`build.yml`) deliberately warns instead of failing, so a translation gap cannot block packaging - the PR gates already catch it. |
 | `tests/luci-form-snapshot.js` | Dumps every option (name, kind, title, description, depends, values, datatype/default/…) of the node, client and server views. Diffs against `tests/snapshots/{node,client,server}.json`, so a refactor that changes a field or its visibility fails. |
 | `tests/ucode/test_homeproxy_utils.uc` | `executeCommand()` return shape, stderr/exit-code capture, binary detection, and a descriptor-leak check (200 calls). |
 | `tests/ucode/test_resource_blob_sha.sh` | `resource_blob_sha.uc`, the digest the resource updater verifies downloads with. The expected values are git's own (`git hash-object` on the same bytes), covering the two cases an implementation gets wrong quietly: the empty file (a real blob id, not "no digest") and content whose byte length differs from its character count. Unreadable input must produce *no* digest and exit non-zero - the updater treats an empty answer as "cannot verify" and refuses, so a made-up digest would turn an unreadable file into a passing check. Re-checks the repository's real resource files against git when the host has it. |
-| `tests/ucode/test_homeproxy_utils_inject.uc` | The failure path of `executeCommand()`: the script stages a copy of `homeproxy.uc` whose `system()` call is replaced by `die()`, then checks that the exception still propagates and that neither descriptor leaks. |
+| `tests/ucode/test_homeproxy_utils_inject.uc` | The failure path of `executeCommand()`: the script stages a copy of `homeproxy-pro.uc` whose `system()` call is replaced by `die()`, then checks that the exception still propagates and that neither descriptor leaks. |
 | `tests/ucode/test_tls_transport.uc` | Direct calls into `buildTLSObject()` / `buildTransportObject()`: client-vs-server-only fields (no `insecure` on a server inbound, no `utls` on a server, `public_key` only on the client and `private_key` only on the server for reality), the ECH client/server split, and the `validateHomeProxyPath()` gate on `cert_path` / `key_path`. This is the boundary the generator fixtures only exercised end-to-end, so it is where the "server emitted insecure=true" and "reality key on the wrong side" classes of bug get named. |
-| `tests/ucode/test_subscription_fetcher.uc` | `subscription/fetcher.uc` against a shimmed `wGETVerbose`: empty content logs a **redacted** URL and returns `{content:null,error}`; non-empty content returns the body and logs nothing. The redaction assertions are what stop the subscription token from reappearing in `homeproxy.log`: the userinfo, the **path** (providers hand out `https://host:port/<user>/<token>` with no query string) and the query string are all gone, while the host and port survive so the message still says which endpoint failed. The mocks carry verbatim copies of `redactUrl()`, and arch-guard 35 fails when one of them drifts from `homeproxy.uc`. |
+| `tests/ucode/test_subscription_fetcher.uc` | `subscription/fetcher.uc` against a shimmed `wGETVerbose`: empty content logs a **redacted** URL and returns `{content:null,error}`; non-empty content returns the body and logs nothing. The redaction assertions are what stop the subscription token from reappearing in `homeproxy-pro.log`: the userinfo, the **path** (providers hand out `https://host:port/<user>/<token>` with no query string) and the query string are all gone, while the host and port survive so the message still says which endpoint failed. The mocks carry verbatim copies of `redactUrl()`, and arch-guard 35 fails when one of them drifts from `homeproxy-pro.uc`. |
 | `tests/ucode/test_migrate_config.sh` | Runs `migrate_config.uc` (36 checks) against a sandboxed UCI file that needs every migration step it can see at once — the 1.14 DNS renames, the legacy `dns_server.address` split, `rcode://` → predefined rule, `rule_set_ipcidr_match_source` rename, `block-out`/`block-dns` → `action='reject'`, `auto_firewall` redistribution, and the `block-dns` default-server replacement. The staged copy's cursor is redirected at the sandbox; the runner aborts if that rewrite stops matching rather than letting the migration touch the live `/etc/config`. |
 | `tests/ucode/test_firewall_pre.sh` | Behaviour tests for `firewall_pre.uc` (8 scenarios, one process each because the script has no exports): the tun accept pair, the per-server accept rules, the explicit-network narrowing, and — most importantly — that an invalid port or network skips the server with a WARN instead of interpolating garbage into an nft statement, which would make nft reject the entire ruleset. |
-| `tests/ucode/test_fw4_names.sh` | Keeps the fw4 chain/set inventory in `scripts/fw4_names.sh` (used by `init.d/homeproxy` to clean up on stop) in sync with the objects declared in `scripts/firewall_post.ut`. |
+| `tests/ucode/test_fw4_names.sh` | Keeps the fw4 chain/set inventory in `scripts/fw4_names.sh` (used by `init.d/homeproxy-pro` to clean up on stop) in sync with the objects declared in `scripts/firewall_post.ut`. |
 | `tests/ucode/test_parse_uri.uc` | Per-scheme assertions on the `parse_uri()` result: anytls, http/https, hysteria, hysteria2/hy2, snell, socks(4/4a/5/5h), shadowsocks (SIP002 base64 + plain + plugin, Shadowrocket), trojan (ws/grpc), tuic, vless (reality/ws/http/httpupgrade), vmess (ws/h2/httpupgrade/grpc) and SIP008 objects, plus the rejection paths (unsupported kcp/quic, no QUIC support, invalid port, unknown scheme). |
 | `tests/ucode/test_parser_normalize.uc` | Asserts that `parser/normalize.uc` correctly maps the parser's flat UCI-key output to the canonical Node shape (`tls`, `transport`, `multiplex`, `common`, `credentials`, `protocol_options`); pins the contract between the parser, the Loader's `PROTOCOL_OPTIONS` (now derived from `parser/mapping.uc`) and the Adapter. |
 | `tests/ucode/test_parser_flatten.uc` | Round-trip invariant for the canonical-Node pipeline: `flatten(normalize(parse_uri(uri)))` must equal the parser's flat UCI dict field-for-field for every supported scheme. This is what stops the parser, the Loader's `PROTOCOL_OPTIONS` (now derived from `parser/mapping.uc`) and the Repository's flatten from drifting apart. |
@@ -289,16 +289,16 @@ Two further host differences are bridged so the remaining checks still run:
 | `tests/ucode/test_golden_inbounds.sh` | PR-04: the server-side counterpart. Builds one inbound per protocol from `tests/fixtures/generators/server.uci` and diffs the result against `tests/snapshots/generator/inbounds.json`. The ACME `data_directory` is normalised to `<HP_DIR>/certs` so the snapshot is portable across hosts. Before this existed the server path had no snapshot at all, which is how the fixture's unused `listen_port` option survived. Regenerate with `HP_UPDATE_SNAPSHOTS=1`. |
 | `tests/ucode/test_inbound_adapter.uc` | PR-04: `InboundFactory`'s protocol-shape decisions — snell / shadowsocks must get no `users[]` block (a snell users entry is read as an extra user key and makes sing-box reject the section), vless / vmess keep `flow` / `alterId` per-user, the snell listener set omits `udp_fragment` / `udp_timeout` / `network`, the server-only TLS tail (key material, ECH key, REALITY private key + handshake, ACME) reaches `buildTLSObject()`, hysteria v1 emits `obfs` as a string while hysteria2 emits the object, and the per-protocol credential requirements are enforced. |
 | `tests/ucode/test_protocol_inventory.sh` | Cross-checks the protocol surface: every type named by `parse_uri.uc`, `CREDENTIALS`, `PROTOCOL_OPTIONS`, `REQUIRED_CREDENTIALS`, `OPTION_FIELDS` and the golden snapshot must agree. This is the check that catches "added a protocol to one table and forgot another". |
-| `tests/frontend-protocol-inventory.js` | The frontend's single ordered protocol table (`homeproxy.js`'s `protocols`) against the backend tables that decide what the generators can build: every offered type must be modelled (`PROTOCOL_TO_UCI` on the client side, `INBOUND_CREDENTIALS` on the server side), every outbound-capable protocol (`OPTION_FIELDS`, `REQUIRED_CREDENTIALS`) must be selectable in the node form, both rendered orders are pinned, and protocols the backend models but no form offers must be listed as deliberate decisions. This is the check that would have caught `snell`: it had a form block, a credentials row and a golden outbound, but was missing from the node form's value list so it could not be selected. Node-only, no ucode needed. |
-| `tests/frontend-rpc-inventory.js` | The frontend RPC boundary: exactly one `rpc.declare` site (inside `homeproxy.js`'s `rpcCall`), no view wrapping a call in `L.resolveDefault`, `rpcCall` itself catching and falling back and reporting, and no view left with an unused `require rpc`. Source-level on purpose - the behaviour it protects needs a browser, but "nobody reintroduces a second declaration site" does not. Comments are stripped before matching, because a naive grep matches the doc comment that quotes the old idiom. |
+| `tests/frontend-protocol-inventory.js` | The frontend's single ordered protocol table (`homeproxy-pro.js`'s `protocols`) against the backend tables that decide what the generators can build: every offered type must be modelled (`PROTOCOL_TO_UCI` on the client side, `INBOUND_CREDENTIALS` on the server side), every outbound-capable protocol (`OPTION_FIELDS`, `REQUIRED_CREDENTIALS`) must be selectable in the node form, both rendered orders are pinned, and protocols the backend models but no form offers must be listed as deliberate decisions. This is the check that would have caught `snell`: it had a form block, a credentials row and a golden outbound, but was missing from the node form's value list so it could not be selected. Node-only, no ucode needed. |
+| `tests/frontend-rpc-inventory.js` | The frontend RPC boundary: exactly one `rpc.declare` site (inside `homeproxy-pro.js`'s `rpcCall`), no view wrapping a call in `L.resolveDefault`, `rpcCall` itself catching and falling back and reporting, and no view left with an unused `require rpc`. Source-level on purpose - the behaviour it protects needs a browser, but "nobody reintroduces a second declaration site" does not. Comments are stripped before matching, because a naive grep matches the doc comment that quotes the old idiom. |
 | `tests/frontend-validators.js` | Drives the shared form validators with a fake form context. The snapshots cannot cover these: a `validate` callback is a function, and the dump skips function-valued properties. Sharing the password validator between the node and server forms added the 2022-blake3 key-length check to the node form, which the server form had and the node form did not - a client could save a key that makes the generated configuration fail to decode. Reverse-proved: deleting that branch fails six checks. |
 | `tests/lib/luci-module.js` | The off-target LuCI module loader (`'require x as y';` rewritten into a dependency lookup), shared by the snapshot renderer and the frontend invariant tests. Its default `_()` returns a LuCI String object with `.format`, because the form code calls both halves. |
-| `tests/runtime/test_config_transaction.sh` | The `runtime/` helpers `init.d/homeproxy` leans on: the known-good copy, the fallback when generation produced nothing, the rollback, and the health probe. Pure shell, runs anywhere. |
+| `tests/runtime/test_config_transaction.sh` | The `runtime/` helpers `init.d/homeproxy-pro` leans on: the known-good copy, the fallback when generation produced nothing, the rollback, and the health probe. Pure shell, runs anywhere. |
 | `tests/runtime/test_dns_snippets.sh` | The dnsmasq snippet writer's incremental behaviour (review L6). Counts `init.d/dnsmasq restart` calls through a stub and asserts that an identical second write does *not* restart (a restart flushes every client's DNS cache), while a changed resource list, routing mode, DNS port or `ipv6_support` setting does. Also pins that a mode change drops the snippet the previous mode produced, and that removing a resource list removes its snippet so the next call is stable again. Pure shell, runs anywhere. |
 | `tests/runtime/test_health_probe.sh` | The functional health probes (`runtime/health.sh`): `hp_probe_dns` / `hp_probe_tcp` answer 0 / 1 / 2 and keep "cannot probe here" (no tool, no port) distinct from "the probe failed"; `hp_run_probes` *reports* by default and only fails the gate when `health_probe_strict` is on, and never fails it for a probe that could not run; `hp_config_port_for_tag` reads the probe ports out of the running configuration in both the generator's pretty shape and the compact one. `nslookup` and `nc` are stubbed, so it is pure shell and runs anywhere. |
 | `tests/runtime/test_crontab_perms.sh` | `hp_crontab_drop()` (runtime/service.sh) edits `/etc/crontabs/root` through a temporary file, and `mv` replaces the file rather than its contents - so the new one inherited the shell's umask (0644) while procd creates the root crontab as 0600. The test drives the function against a sandboxed crontab and pins: the entry is dropped, other jobs survive, the mode is 0600 (including a file an older version had already loosened), a missing crontab is reported as a failure and is not created. Pure shell, runs anywhere. |
 | `tests/runtime/test_resource_update.sh` | The content-verification path of `scripts/update_resources.sh`: the download URL is pinned to a commit, and the file is installed only when its git blob id matches the one GitHub reports for that path and commit. Drives all four outcomes (match, mismatch, no digest from the API, no local digest) with `wget` / `jsonfilter` / `ucode` / `uci` / `flock` stubbed and the script's absolute paths rewritten into a sandbox, asserting in each failure case that the installed list and its `.ver` are left untouched - the point of the check is that it refuses, so a driver that only walked the happy path would keep passing with the check deleted. Pure shell, runs anywhere. |
-| `tests/runtime/test_runtime_extraction.sh` | Drives `init.d/homeproxy` through a stubbed environment (fake `ip` / `nft` / `fw4` / `ucode` / `sing-box` / `uci` / `netstat` / `nslookup` / `nc`, fake procd and jsonfilter state, fixture UCI) across five scenarios and diffs the resulting command + file trace against a baseline. Two baselines exist and are captured with the SAME harness, so the diff between them is exactly the intentional change: `tests/fixtures/runtime/trace.pre-pr05.txt` (the 517-line init script before PHASE 7 moved the plumbing out — the record that the extraction was behaviour-preserving) and `tests/fixtures/runtime/trace.golden.txt` (after the health-gate fix). Scenario D is the P0 regression: a candidate whose `mixed_port` is already taken must be rejected by the health gate, the previous known-good must survive, and the reload must roll back onto it. The generated fixture configuration is pretty-printed like the generator's own `%.J` output, because the runtime reads that file (`hp_config_ports`, `hp_config_port_for_tag`) and a compact fixture would test a shape production never writes. Pure shell, no ucode needed. Regenerate with `HP_UPDATE_GOLDEN=1` (optionally `HP_GOLDEN=` / `HP_INITD=` to target another baseline or revision). |
+| `tests/runtime/test_runtime_extraction.sh` | Drives `init.d/homeproxy-pro` through a stubbed environment (fake `ip` / `nft` / `fw4` / `ucode` / `sing-box` / `uci` / `netstat` / `nslookup` / `nc`, fake procd and jsonfilter state, fixture UCI) across five scenarios and diffs the resulting command + file trace against a baseline. Two baselines exist and are captured with the SAME harness, so the diff between them is exactly the intentional change: `tests/fixtures/runtime/trace.pre-pr05.txt` (the 517-line init script before PHASE 7 moved the plumbing out — the record that the extraction was behaviour-preserving) and `tests/fixtures/runtime/trace.golden.txt` (after the health-gate fix). Scenario D is the P0 regression: a candidate whose `mixed_port` is already taken must be rejected by the health gate, the previous known-good must survive, and the reload must roll back onto it. The generated fixture configuration is pretty-printed like the generator's own `%.J` output, because the runtime reads that file (`hp_config_ports`, `hp_config_port_for_tag`) and a compact fixture would test a shape production never writes. Pure shell, no ucode needed. Regenerate with `HP_UPDATE_GOLDEN=1` (optionally `HP_GOLDEN=` / `HP_INITD=` to target another baseline or revision). |
 
 **`HP_UPDATE_GOLDEN=1` is a baseline-update mode, not a test.** It copies the
 trace the run just produced over the baseline and exits 0 *before* the golden
@@ -340,7 +340,7 @@ What the snapshots still cannot tell you: whether the form is *usable*. They
 prove a change to the option tree is deliberate and reviewable; they say nothing
 about whether the resulting page works in a browser.
 
-`tests/ucode/mocks/homeproxy.uc` is a test double for the real module: only
+`tests/ucode/mocks/homeproxy-pro.uc` is a test double for the real module: only
 `validation()` is stubbed (the real one runs `/sbin/validate_data`, which does
 not exist outside OpenWrt), everything else is a copy of the production code.
 
@@ -368,10 +368,10 @@ harness provides:
 | Path | Why |
 | --- | --- |
 | `scripts/update_resources.sh` | The version query and the download are a GitHub API round-trip plus a jsdelivr fetch, so the verification path is driven by `tests/runtime/test_resource_update.sh` with `wget` / `jsonfilter` / `ucode` / `uci` / `flock` stubbed and the script's absolute paths rewritten into a sandbox: matching digest installs, a mismatch or a missing digest refuses and leaves the installed list and its `.ver` alone. The `*)` usage branch is covered by the shell syntax check. |
-| `scripts/update_crond.sh` | A fixed list of invocations against hard-coded `/etc/homeproxy/scripts` paths. Covered by the shell syntax check. |
+| `scripts/update_crond.sh` | A fixed list of invocations against hard-coded `/etc/homeproxy-pro/scripts` paths. Covered by the shell syntax check. |
 | `scripts/clean_log.sh` | `while true; do sleep 180; …` — testing the rotation needs the loop made injectable first. Covered by the shell syntax check. |
-| `htdocs/.../view/homeproxy/status.js` | A LuCI view; its behaviour is only observable in a browser. |
-| `init.d/homeproxy` | procd semantics need a real procd, and `service_started` only behaves correctly when procd really starts the instances — the offline harness models that, but it is a model. PR-05 shrank the file from 517 to 253 lines by moving the dnsmasq / fw4 / tproxy-TUN / service-plumbing into `scripts/runtime/{service,dns,firewall,net}.sh`; the trace test proves the move kept the command-and-file behaviour identical, and the shell syntax check covers every file. The health gate itself was verified on the ImmortalWrt test machine (see the plan's 2.14.8). |
+| `htdocs/.../view/homeproxy-pro/status.js` | A LuCI view; its behaviour is only observable in a browser. |
+| `init.d/homeproxy-pro` | procd semantics need a real procd, and `service_started` only behaves correctly when procd really starts the instances — the offline harness models that, but it is a model. PR-05 shrank the file from 517 to 253 lines by moving the dnsmasq / fw4 / tproxy-TUN / service-plumbing into `scripts/runtime/{service,dns,firewall,net}.sh`; the trace test proves the move kept the command-and-file behaviour identical, and the shell syntax check covers every file. The health gate itself was verified on the ImmortalWrt test machine (see the plan's 2.14.8). |
 
 ## Architecture regression coverage
 
@@ -388,7 +388,7 @@ relied on. Two tests replaced it:
   the loader option table, the adapter tables and the golden snapshot all name
   the same set of protocols.
 
-`root/etc/init.d/homeproxy` is exercised for what can be checked off-target:
+`root/etc/init.d/homeproxy-pro` is exercised for what can be checked off-target:
 `tests/ucode/run.sh` syntax-checks it and the `runtime/` helpers,
 `tests/runtime/test_config_transaction.sh` covers the transaction semantics, and
 `tests/runtime/test_runtime_extraction.sh` pins the orchestration order
diff --git a/luci-app-homeproxy-pro-pro/tests/arch-guard.sh b/luci-app-homeproxy-pro/tests/arch-guard.sh
similarity index 95%
rename from luci-app-homeproxy-pro-pro/tests/arch-guard.sh
rename to luci-app-homeproxy-pro/tests/arch-guard.sh
index b56b03ff9..a193d2ce6 100755
--- a/luci-app-homeproxy-pro-pro/tests/arch-guard.sh
+++ b/luci-app-homeproxy-pro/tests/arch-guard.sh
@@ -8,7 +8,7 @@
 # because a real defect slipped through the whole suite:
 #
 #   guard 1  the generators read the UCI configuration through
-#            HP_DIR + '/config', i.e. /etc/homeproxy/config/homeproxy - a path
+#            HP_DIR + '/config', i.e. /etc/homeproxy-pro/config/homeproxy-pro - a path
 #            that exists nowhere.  uci.load() returned null, every uci.get()
 #            returned null, and the Loader silently produced pure defaults, so
 #            every generated config lacked the main-out, the route/dns finals
@@ -35,9 +35,9 @@
 set -u
 
 ROOT="$(cd "${1:-$(dirname "$0")/..}" && pwd)"
-SCRIPTS="$ROOT/root/etc/homeproxy/scripts"
-RPC="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy"
-ACL="$ROOT/root/usr/share/rpcd/acl.d/luci-app-homeproxy.json"
+SCRIPTS="$ROOT/root/etc/homeproxy-pro/scripts"
+RPC="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy-pro"
+ACL="$ROOT/root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json"
 VIEWS="$ROOT/htdocs/luci-static/resources"
 RUNTIME="$SCRIPTS/runtime"
 
@@ -102,11 +102,11 @@ echo "== guard 1: the generators read the production UCI directory =="
 
 # The confdir the Loader hands to cursor() must be /etc/config.  Anything else
 # means uci.load() reads a file the package does not ship.
-if grep -q "^export const UCICONFIG_DIR = '/etc/config';$" "$SCRIPTS/homeproxy.uc"; then
+if grep -q "^export const UCICONFIG_DIR = '/etc/config';$" "$SCRIPTS/homeproxy-pro.uc"; then
 	pass "UCICONFIG_DIR defaults to /etc/config"
 else
 	fail "UCICONFIG_DIR does not default to /etc/config"
-	grep -n "UCICONFIG_DIR" "$SCRIPTS/homeproxy.uc" | sed 's/^/      /'
+	grep -n "UCICONFIG_DIR" "$SCRIPTS/homeproxy-pro.uc" | sed 's/^/      /'
 fi
 
 for g in generate_client.uc generate_server.uc; do
@@ -119,7 +119,7 @@ for g in generate_client.uc generate_server.uc; do
 done
 
 # The original mistake, in either spelling: deriving the UCI directory from
-# HP_DIR.  HP_DIR is /etc/homeproxy and holds resources/scripts, not config.
+# HP_DIR.  HP_DIR is /etc/homeproxy-pro and holds resources/scripts, not config.
 assert_empty "no source derives the UCI dir from HP_DIR" \
 	grep -rn "Loader.load(HP_DIR\|Loader\.load( *HP_DIR" "$SCRIPTS"
 
@@ -291,7 +291,7 @@ fi
 ACL_METHODS="$(awk '
 	/"ubus"[[:space:]]*:/ { inubus = 1; next }
 	inubus && /^[[:space:]]*}/ { inubus = 0; next }
-	inubus && /"luci.homeproxy"[[:space:]]*:/ { inlist = 1; next }
+	inubus && /"luci.homeproxy-pro"[[:space:]]*:/ { inlist = 1; next }
 	inlist && /\]/ { inlist = 0; next }
 	inlist { print }
 ' "$ACL" | grep -oE '"[a-z_]+"' | tr -d '"' | sort -u)"
@@ -492,8 +492,8 @@ fi
 echo
 echo "== guard 10: nothing installs or removes packages on a target =="
 
-# On 2026-09-15 an `apk add luci-app-homeproxy` on the test machine rewrote
-# /etc/config/homeproxy from the feed package and destroyed the node
+# On 2026-09-15 an `apk add luci-app-homeproxy-pro` on the test machine rewrote
+# /etc/config/homeproxy-pro from the feed package and destroyed the node
 # configuration - six nodes plus the dns, server and subscription sections, with
 # no backup and no snapshot. The suite stages instead, and this is the guard
 # that keeps it that way: a package-manager *write* is never part of testing.
@@ -521,8 +521,8 @@ echo "== guard 11: firewall_post.ut validates every UCI-derived field =="
 # is an injection surface (closes a set expression, the whole fw4 reload
 # fails, the router loses its firewall).  The defensive helpers exist; the
 # guard exists so they cannot quietly stop being used.
-TEMPLATE="$ROOT/root/etc/homeproxy/scripts/firewall_post.ut"
-UTILS="$ROOT/root/etc/homeproxy/scripts/firewall_utils.uc"
+TEMPLATE="$ROOT/root/etc/homeproxy-pro/scripts/firewall_post.ut"
+UTILS="$ROOT/root/etc/homeproxy-pro/scripts/firewall_utils.uc"
 
 if [ -f "$UTILS" ]; then
 	pass "firewall_utils.uc exists (where the H1 validators live)"
@@ -611,12 +611,12 @@ echo "== guard 12: capabilities stay minimal =="
 # on a process that handles untrusted network traffic is gratuitous attack
 # surface.  Neither is granted anywhere.  inheritable is kept empty because
 # nothing the orchestrator spawns needs to inherit caps.
-CAPS="$ROOT/root/etc/capabilities/homeproxy.json"
+CAPS="$ROOT/root/etc/capabilities/homeproxy-pro.json"
 
 if [ -f "$CAPS" ]; then
-	pass "homeproxy.json exists"
+	pass "homeproxy-pro.json exists"
 else
-	fail "homeproxy.json is missing"
+	fail "homeproxy-pro.json is missing"
 fi
 
 for cap in CAP_SYS_PTRACE CAP_NET_RAW CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_MODULE CAP_SYS_RAWIO; do
@@ -639,7 +639,7 @@ done
 #
 # So the invariant is "ambient is a subset of inheritable", not "inheritable is
 # empty".  Verified on the test device: with an empty inheritable set
-# `homeproxy start` exits 1 and sing-box-c never runs; restoring the two
+# `homeproxy-pro start` exits 1 and sing-box-c never runs; restoring the two
 # entries makes start/reload/stop pass and the instances come up.
 AMBIENT="$(awk '/"ambient"/,/]/' "$CAPS" | grep -oE 'CAP_[A-Z_]+' | sort -u)"
 INHERITABLE="$(awk '/"inheritable"/,/]/' "$CAPS" | grep -oE 'CAP_[A-Z_]+' | sort -u | tr '\n' ' ')"
@@ -736,11 +736,11 @@ echo "== guard 14: wGETVerbose redacts the URL at the source =="
 # silently leaked the subscription token.  The fix moved redaction into
 # wGETVerbose itself, so the returned `error` is safe no matter where the
 # caller ships it.
-HOMEPROXY="$SCRIPTS/homeproxy.uc"
+HOMEPROXY="$SCRIPTS/homeproxy-pro.uc"
 FETCHER="$SCRIPTS/subscription/fetcher.uc"
 
 if grep -qE '^export function redactReason\b' "$HOMEPROXY"; then
-	pass "redactReason is exported from homeproxy.uc"
+	pass "redactReason is exported from homeproxy-pro.uc"
 else
 	fail "redactReason is missing - the H3 redaction has no entry point"
 fi
@@ -785,7 +785,7 @@ echo "== guard 15: every RPC whitelist uses index() === -1 ===="
 # (double quotes) are caught, as is a membership test split over several lines.
 # Object key checks (`in {}`), `for ... in ...` over a non-literal and a
 # mention inside a comment are deliberately not matches.
-RPC="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy"
+RPC="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy-pro"
 
 IN_ARR="$(python3 - "$RPC" <<'PY'
 import pathlib, re, sys
@@ -817,9 +817,9 @@ PY
 if [ "$IN_ARR" = "__SCAN_FAILED__" ]; then
 	fail "the 'in [...]' scan could not run - fix the guard before trusting a pass"
 elif [ -z "$IN_ARR" ]; then
-	pass "no array-membership 'in [...]' remains in luci.homeproxy"
+	pass "no array-membership 'in [...]' remains in luci.homeproxy-pro"
 else
-	fail "array-membership 'in [...]' remains in luci.homeproxy - the report's M6 said unify on index():"
+	fail "array-membership 'in [...]' remains in luci.homeproxy-pro - the report's M6 said unify on index():"
 	printf '      %s\n' "$IN_ARR"
 fi
 
@@ -827,9 +827,9 @@ fi
 # subset checks).  Asserted positively so the check cannot pass by finding
 # nothing (a regex in a comment would otherwise be enough).
 if grep -qE "index\(\[".*"\], req\.args\?\.type\) === -1" "$RPC"; then
-	pass "luci.homeproxy uses index() === -1 for whitelist checks"
+	pass "luci.homeproxy-pro uses index() === -1 for whitelist checks"
 else
-	fail "luci.homeproxy no longer uses index() === -1 for whitelist checks - did someone reintroduce the in-style?"
+	fail "luci.homeproxy-pro no longer uses index() === -1 for whitelist checks - did someone reintroduce the in-style?"
 fi
 
 echo
@@ -864,7 +864,7 @@ SHELL_CALLS="$(grep -rEn '(^|[^A-Za-z_])(system|popen)\(' \
 UNQUOTED="$(printf '%s\n' "$SHELL_CALLS" | python3 -c '
 import sys, re
 # Two styles reach the shell unquoted:
-#   (a) template literal with `${someVar}`     - luci.homeproxy
+#   (a) template literal with `${someVar}`     - luci.homeproxy-pro
 #   (b) string concatenation `+ someVar +`     - the generator scripts
 # A line is compliant if shellQuote() appears on it; both styles are
 # caught with one rule because the helper is the same either way.
@@ -921,7 +921,7 @@ echo "== guard 17: resource update has multi-mirror fallback =="
 # for the common case (fastly is up) and useful in the failure case
 # (gcore, cdn, or raw.githubusercontent.com catches it).  The list lives
 # in the script's MIRRORS variable; the order is part of the contract.
-UPDATE_SCRIPT="$ROOT/root/etc/homeproxy/scripts/update_resources.sh"
+UPDATE_SCRIPT="$ROOT/root/etc/homeproxy-pro/scripts/update_resources.sh"
 
 for mirror in fastly.jsdelivr.net gcore.jsdelivr.net cdn.jsdelivr.net raw.githubusercontent.com; do
 	if grep -qE "\b$mirror\b" "$UPDATE_SCRIPT"; then
@@ -953,7 +953,7 @@ fi
 
 # The RPC must return both version and updated_at.  Asserted positively
 # so the guard cannot pass by finding nothing.
-LUCI="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy"
+LUCI="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy-pro"
 if grep -qE "resources_get_version" "$LUCI" && grep -qE "\.updated_at" "$LUCI"; then
 	pass "resources_get_version returns updated_at"
 else
@@ -962,7 +962,7 @@ fi
 
 # The UI must read and display it.  Without this, the RPC field is
 # unused and the user sees nothing new.
-STATUS_JS="$ROOT/htdocs/luci-static/resources/view/homeproxy/status.js"
+STATUS_JS="$ROOT/htdocs/luci-static/resources/view/homeproxy-pro/status.js"
 if grep -qE "res\.updated_at" "$STATUS_JS"; then
 	pass "status.js renders the last-updated timestamp"
 else
@@ -977,7 +977,7 @@ echo "== guard 19: acllist_write rejects bad lines with a line number =="
 # bisect by hand.  The rejection now names the line, and the UI hint tells
 # the user what characters are banned.  Pinned by the guard so the line
 # number cannot quietly regress.
-LUCI="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy"
+LUCI="$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy-pro"
 ACLLIST_BODY="$(awk '/^[[:space:]]+acllist_write:/,/^[[:space:]]+},$/' "$LUCI")"
 
 if printf '%s' "$ACLLIST_BODY" | grep -qE "line \\\$\\{i \\+ 1\\}"; then
@@ -990,7 +990,7 @@ fi
 # description *before* trying to save.  Both proxy_list and direct_list
 # textareas must carry the hint; assert positively so the guard cannot
 # pass by finding nothing.
-ACCESS="$ROOT/htdocs/luci-static/resources/view/homeproxy/client/access.js"
+ACCESS="$ROOT/htdocs/luci-static/resources/view/homeproxy-pro/client/access.js"
 PROXY_HINT="$(awk '/_proxy_domain_list/,/description\s*=/' "$ACCESS" \
 	| grep -c 'One domain per line')"
 DIRECT_HINT="$(awk '/_direct_domain_list/,/description\s*=/' "$ACCESS" \
@@ -1031,7 +1031,7 @@ echo "== guard 21: dnsmasq snippet writer is incremental =="
 # tests/runtime/test_dns_snippets.sh pins the behaviour from the outside;
 # this guard pins the two structural pieces that make it possible, so a
 # future edit cannot quietly drop back to unconditional rewrite.
-DNS_SH="$ROOT/root/etc/homeproxy/scripts/runtime/dns.sh"
+DNS_SH="$ROOT/root/etc/homeproxy-pro/scripts/runtime/dns.sh"
 
 if grep -qE '^hp_dnsmasq_render_snippets\(\)' "$DNS_SH"; then
 	pass "dns.sh has a side-effect-free snippet renderer"
@@ -1085,11 +1085,11 @@ echo "== guard 22: client tab modules return a LuCI class =="
 #   if (!Class.isSubclass(_class))
 #       error('TypeError', '"%s" factory yields invalid constructor', name);
 #
-# The M5 split shipped six view.homeproxy.client.* modules returning a plain
+# The M5 split shipped six view.homeproxy-pro.client.* modules returning a plain
 # object (`return { render }`), so every tab threw and no browser could render
 # the client page.  Nothing caught it: the modules parse, and the snapshot
 # harness has its own loader that happily accepts a plain object.
-for f in "$VIEWS"/view/homeproxy/client/*.js; do
+for f in "$VIEWS"/view/homeproxy-pro/client/*.js; do
 	[ -f "$f" ] || continue
 	if grep -qE '^return baseclass\.extend\(' "$f"; then
 		pass "$(basename "$f") returns a LuCI class"
@@ -1115,7 +1115,7 @@ echo "== guard 23: an hp method that reads \`this\` is bound to hp =="
 BOUND_WRONG="$(python3 - "$ROOT" <<'PY'
 import re, sys, pathlib
 root = pathlib.Path(sys.argv[1])
-hp = (root / 'htdocs/luci-static/resources/homeproxy.js').read_text(encoding='utf-8')
+hp = (root / 'htdocs/luci-static/resources/homeproxy-pro.js').read_text(encoding='utf-8')
 
 # Top-level method -> does its body read `this`?
 uses_this, cur, body = set(), None, []
@@ -1132,7 +1132,7 @@ for line in hp.split('\n'):
 
 bad = []
 for f in sorted((root / 'htdocs').rglob('*.js')):
-    if f.name == 'homeproxy.js':
+    if f.name == 'homeproxy-pro.js':
         continue
     for n, line in enumerate(f.read_text(encoding='utf-8').split('\n'), 1):
         for meth, recv in re.findall(r'L\.bind\(hp\.([A-Za-z_$][\w$]*),\s*([A-Za-z_$][\w$]*)', line):
@@ -1210,7 +1210,7 @@ echo "== guard 26: ucode sources carry no PCRE-only regex syntax =="
 # ucode's regex engine is not PCRE, and it does not reject the unsupported
 # construct at parse time: `(?:...)` compiles fine and then fails when the
 # literal is evaluated ("Repetition not preceded by valid expression").  That
-# is how r11 shipped a luci.homeproxy whose resources_get_version threw on
+# is how r11 shipped a luci.homeproxy-pro whose resources_get_version threw on
 # every call - the build, `ucode -c` and every syntax check stayed green while
 # the resources panel rendered "undefined".  One grep keeps it out.
 PCRE_ONLY="$(grep -rn '(?:' "$ROOT/root" --include='*.uc' --include='*.ut' 2>"/dev/null" \
@@ -1295,14 +1295,14 @@ echo
 echo "== guard 29: the certificate path policy is identical in both layers =="
 
 # TLS certificate_path / key_path had two different policies: the LuCI form
-# offered /etc/homeproxy/certs/, /etc/acme/ and /etc/ssl/, while the backend
-# validator only knew /etc/homeproxy/ and /tmp/homeproxy_. A certificate the
+# offered /etc/homeproxy-pro/certs/, /etc/acme/ and /etc/ssl/, while the backend
+# validator only knew /etc/homeproxy-pro/ and /tmp/homeproxy_. A certificate the
 # user picked from /etc/ssl/ was therefore accepted by the UI, dropped by
 # buildTLSObject(), and the listener failed with nothing pointing at the path.
-# Both layers now read the same list - CERT_PATH_ROOTS in homeproxy.uc and
-# HP_CERT_PATH_ROOTS in homeproxy.js - and this guard keeps the two copies in
+# Both layers now read the same list - CERT_PATH_ROOTS in homeproxy-pro.uc and
+# HP_CERT_PATH_ROOTS in homeproxy-pro.js - and this guard keeps the two copies in
 # step, because nothing else can see across the JS/ucode boundary.
-CERT_ROOTS="$(python3 - "$SCRIPTS/homeproxy.uc" "$VIEWS/homeproxy.js" <<'PY'
+CERT_ROOTS="$(python3 - "$SCRIPTS/homeproxy-pro.uc" "$VIEWS/homeproxy-pro.js" <<'PY'
 import re, sys
 
 def roots(path, pattern, label):
@@ -1313,12 +1313,12 @@ def roots(path, pattern, label):
     return re.findall(r"'([^']+)'", m.group(1)), None
 
 problems = []
-backend, err = roots(sys.argv[1], r'\bCERT_PATH_ROOTS\s*=\s*\[([^\]]*)\]', 'homeproxy.uc')
+backend, err = roots(sys.argv[1], r'\bCERT_PATH_ROOTS\s*=\s*\[([^\]]*)\]', 'homeproxy-pro.uc')
 problems += [err] if err else []
-frontend, err = roots(sys.argv[2], r'\bHP_CERT_PATH_ROOTS\s*=\s*\[([^\]]*)\]', 'homeproxy.js')
+frontend, err = roots(sys.argv[2], r'\bHP_CERT_PATH_ROOTS\s*=\s*\[([^\]]*)\]', 'homeproxy-pro.js')
 problems += [err] if err else []
 if not problems and backend != frontend:
-    problems.append('homeproxy.uc %s != homeproxy.js %s' % (backend, frontend))
+    problems.append('homeproxy-pro.uc %s != homeproxy-pro.js %s' % (backend, frontend))
 print('\n'.join(problems))
 PY
 )" || CERT_ROOTS="__SCAN_FAILED__"
@@ -1335,7 +1335,7 @@ echo
 echo "== guard 30: the ACL grants no file execution =="
 
 # The subscription button used fs.exec_direct() on
-# /etc/homeproxy/scripts/update_subscriptions.uc, and that is the only reason
+# /etc/homeproxy-pro/scripts/update_subscriptions.uc, and that is the only reason
 # the ACL carried `"exec"` for a root-owned path: a browser session authorised
 # to execute a file, rather than to call one named method. The updater is a ubus
 # method now (update_subscriptions), so no path in this ACL may be executable -
@@ -1483,7 +1483,7 @@ echo "== guard 34: the bundled resource versions use the writers' format =="
 # shape is checked with case/parameter expansion rather than a grep interval,
 # which busybox grep may not support.
 RES_VER_BAD=""
-for f in "$ROOT"/root/etc/homeproxy/resources/*.ver; do
+for f in "$ROOT"/root/etc/homeproxy-pro/resources/*.ver; do
 	[ -f "$f" ] || continue
 	RES_VER="${f##*/}"
 	RES_VER_VALUE="$(cat "$f" 2>"/dev/null")"
@@ -1506,7 +1506,7 @@ echo
 echo "== guard 35: mock copies of redactUrl match the real one =="
 
 # tests/ucode/mocks/*.uc carry verbatim copies of redactUrl() so the parser and
-# fetcher tests can run without homeproxy.uc's other dependencies.  A copy is
+# fetcher tests can run without homeproxy-pro.uc's other dependencies.  A copy is
 # only worth having while it is identical: when the real function started
 # masking the URL path (the subscription token is often the path), both mocks
 # had to be updated by hand and nothing failed when they were not - the fetcher
@@ -1521,7 +1521,7 @@ extract_fn() {
 REAL_REDACT="$(extract_fn "$HOMEPROXY" redactUrl)"
 MOCK_DRIFT=""
 if [ -z "$REAL_REDACT" ]; then
-	fail "redactUrl could not be extracted from homeproxy.uc"
+	fail "redactUrl could not be extracted from homeproxy-pro.uc"
 else
 	for m in "$ROOT"/tests/ucode/mocks/*.uc; do
 		[ -f "$m" ] || continue
@@ -1531,9 +1531,9 @@ else
 		fi
 	done
 	if [ -n "$MOCK_DRIFT" ]; then
-		fail "mock copies of redactUrl have drifted from homeproxy.uc:$MOCK_DRIFT"
+		fail "mock copies of redactUrl have drifted from homeproxy-pro.uc:$MOCK_DRIFT"
 	else
-		pass "every mock's redactUrl is identical to homeproxy.uc's"
+		pass "every mock's redactUrl is identical to homeproxy-pro.uc's"
 	fi
 fi
 
@@ -1555,7 +1555,7 @@ echo "== guard 36: the certificate upload buttons pass the handler's arguments =
 # argument, or a bare value shifted into the wrong slot, changes the staging
 # path), and the handler must take exactly one parameter more than the call
 # passes - the event LuCI adds in front.
-CERT_HANDLER="$VIEWS/homeproxy.js"
+CERT_HANDLER="$VIEWS/homeproxy-pro.js"
 CERT_SITES=0
 CERT_BAD=""
 CERT_CALLS="$(mktemp)"
@@ -1573,7 +1573,7 @@ elif [ "$CERT_NARGS" != "3" ]; then
 	fail "uploadCertificate takes $CERT_NARGS parameters; the buttons pass the label and the filename, LuCI prepends the event, so it must take 3 (type, filename, ev)"
 fi
 
-grep -hoE "L\.bind\(hp\.uploadCertificate[^;]*" "$VIEWS"/view/homeproxy/*.js > "$CERT_CALLS" 2>"/dev/null"
+grep -hoE "L\.bind\(hp\.uploadCertificate[^;]*" "$VIEWS"/view/homeproxy-pro/*.js > "$CERT_CALLS" 2>"/dev/null"
 
 while IFS= read -r call; do
 	[ -n "$call" ] || continue
@@ -1765,7 +1765,7 @@ echo "== guard 39: sniffer_advanced_mode default stays at '0' =="
 # (100ms / universal list) is gated behind a UCI opt-in so an upgrade
 # does not change the sniffer behaviour.  The default must remain '0';
 # the generator falls back to '0' on a missing UCI value, and the
-# package-shipped /etc/config/homeproxy must not bump the default to
+# package-shipped /etc/config/homeproxy-pro must not bump the default to
 # '1' on a whim.  Two checks:
 #
 #   (a) the generator's fallback is '0';
@@ -1777,11 +1777,11 @@ else
 		fail "sniff rule's 300ms / default-list profile is no longer the safe default"
 fi
 
-# The package default lives in root/etc/config/homeproxy.  It must be
+# The package default lives in root/etc/config/homeproxy-pro.  It must be
 # '0' for upgrades to be invisible; new installs also default to the
 # same until the user opts in.
-if grep -q "^	option sniffer_advanced_mode '0'" "$ROOT/root/etc/config/homeproxy"; then
-	pass "the package-shipped /etc/config/homeproxy keeps sniffer_advanced_mode '0'"
+if grep -q "^	option sniffer_advanced_mode '0'" "$ROOT/root/etc/config/homeproxy-pro"; then
+	pass "the package-shipped /etc/config/homeproxy-pro keeps sniffer_advanced_mode '0'"
 else
 	fail "the package default for sniffer_advanced_mode is no longer '0'; users who"
 		fail "upgraded without touching the option would silently switch to 100ms +"
@@ -1808,7 +1808,7 @@ echo "== guard 40: rule/routing rule action enum agrees across UI and generator
 ACTION_ENUM="$(python3 - "$ROOT" <<'PY' || ACTION_ENUM="__SCAN_FAILED__"
 import re, sys, pathlib
 root = pathlib.Path(sys.argv[1])
-common = (root / 'htdocs/luci-static/resources/view/homeproxy/client/common.js').read_text()
+common = (root / 'htdocs/luci-static/resources/view/homeproxy-pro/client/common.js').read_text()
 
 # Find the action ListValue block: from "ss.taboption('field_other', form.ListValue, 'action'"
 # until 'so.default = 'route'' on the next non-conditional line.  Within that
@@ -1833,8 +1833,8 @@ def actions(branch):
 dns_actions = actions(is_dns_m.group(1))
 routing_actions = actions(is_dns_m.group(2))
 
-dns_uc = (root / 'root/etc/homeproxy/scripts/generator/dns.uc').read_text()
-route_uc = (root / 'root/etc/homeproxy/scripts/generator/route.uc').read_text()
+dns_uc = (root / 'root/etc/homeproxy-pro/scripts/generator/dns.uc').read_text()
+route_uc = (root / 'root/etc/homeproxy-pro/scripts/generator/route.uc').read_text()
 
 def gates(text):
     return set(re.findall(r"cfg\.action === '([^']+)'", text))
@@ -1874,12 +1874,12 @@ echo "== guard 41: experimental.cache_file is unconditional in attachExperimenta
 # `if (routing_mode in ['bypass_mainland_china', 'custom'])`, leaving
 # gfwlist / proxy_mainland_china / global with cold-start DNS on every
 # reload.  cache_file is a fresh-install no-op and the file is the only
-# piece of state the generator writes outside /etc/config/homeproxy, so
+# piece of state the generator writes outside /etc/config/homeproxy-pro, so
 # gating it on routing_mode buys nothing and lost DNS cache for 3 modes.
 # The fix removed the gate; this guard pins the unconditional emission so
 # a future refactor (e.g. adding a 'cache_file.enabled: 0' opt-out) does
 # not silently re-introduce the routing_mode gate.
-AE_RESULT="$(python3 - "$ROOT/root/etc/homeproxy/scripts/generator/common.uc" <<'PY' || echo __SCAN_FAILED__
+AE_RESULT="$(python3 - "$ROOT/root/etc/homeproxy-pro/scripts/generator/common.uc" <<'PY' || echo __SCAN_FAILED__
 import re, sys, pathlib
 src = pathlib.Path(sys.argv[1]).read_text()
 m = re.search(r'^export function attachExperimental\b.*?\n\};',
@@ -1930,7 +1930,7 @@ echo "== guard 42: NAPTR_BYPASS_SUFFIXES is the only domain_suffix qtype-35 sour
 # pins the actual invariant: a constant declaration exists, AND the
 # qtype-35 DNS rule's domain_suffix field references that constant
 # (not a hand-rolled literal array, which would re-inline the list).
-DNS_UC="$ROOT/root/etc/homeproxy/scripts/generator/dns.uc"
+DNS_UC="$ROOT/root/etc/homeproxy-pro/scripts/generator/dns.uc"
 NAPTR_CONST="$(grep -nE '^(const|var)\s+NAPTR_BYPASS_SUFFIXES\s*=' "$DNS_UC" || true)"
 NAPTR_USE="$(grep -nE '^\s*domain_suffix:\s*NAPTR_BYPASS_SUFFIXES\b' "$DNS_UC" || true)"
 NAPTR_LITERAL_USE="$(grep -nE '^\s*domain_suffix:\s*\[' "$DNS_UC" || true)"
@@ -1974,7 +1974,7 @@ echo "== guard 43: the rollback UCI snapshot matches the keys the intercept laye
 #                     case; the declared extras below are the only ones
 #                     allowed)
 #
-# init.d/homeproxy is deliberately NOT in the read set: its config_get calls
+# init.d/homeproxy-pro is deliberately NOT in the read set: its config_get calls
 # serve the health gate (health_probe_*) and the cron (subscription.*), which
 # do not steer the layer. Every key it reads that *does* steer the layer is
 # also read by firewall_post.ut, so nothing is lost by excluding it.
@@ -1986,11 +1986,11 @@ echo "== guard 43: the rollback UCI snapshot matches the keys the intercept laye
 SNAP_TMP="$(mktemp -d)"
 trap 'rm -rf "$SNAP_TMP"' EXIT INT TERM
 
-SNAP_POST="$ROOT/root/etc/homeproxy/scripts/firewall_post.ut"
-SNAP_PRE="$ROOT/root/etc/homeproxy/scripts/firewall_pre.uc"
-SNAP_NET="$ROOT/root/etc/homeproxy/scripts/runtime/net.sh"
-SNAP_DNS="$ROOT/root/etc/homeproxy/scripts/runtime/dns.sh"
-SNAP_SVC="$ROOT/root/etc/homeproxy/scripts/runtime/service.sh"
+SNAP_POST="$ROOT/root/etc/homeproxy-pro/scripts/firewall_post.ut"
+SNAP_PRE="$ROOT/root/etc/homeproxy-pro/scripts/firewall_pre.uc"
+SNAP_NET="$ROOT/root/etc/homeproxy-pro/scripts/runtime/net.sh"
+SNAP_DNS="$ROOT/root/etc/homeproxy-pro/scripts/runtime/dns.sh"
+SNAP_SVC="$ROOT/root/etc/homeproxy-pro/scripts/runtime/service.sh"
 
 for f in "$SNAP_POST" "$SNAP_PRE" "$SNAP_NET" "$SNAP_DNS" "$SNAP_SVC"; do
 	if [ ! -r "$f" ]; then
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/client.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/client.uci
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/client.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/client.uci
index eeaf7c03f..5a49f384d 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/client.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/client.uci
@@ -4,7 +4,7 @@
 # protocol reachable through a single urltest main node, so one run exercises
 # all outbound builders (TLS, transport, reality, mux, obfuscation).
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'tun'
 	option ipv6_support '0'
@@ -23,7 +23,7 @@ config homeproxy 'config'
 	list main_urltest_nodes 'n_socks'
 	list main_urltest_nodes 'n_shadowtls'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option tun_name 'singtun0'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/custom.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/custom.uci
similarity index 95%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/custom.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/custom.uci
index 4b19b1199..2b5d4e2cd 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/custom.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/custom.uci
@@ -12,17 +12,17 @@
 # __RULESET_DIR__ is substituted by tests/ucode/test_generators.sh with a
 # directory holding a real compiled .srs file.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'custom'
 	option proxy_mode 'redirect_tproxy'
 	option ipv6_support '0'
 	option log_level 'error'
 
-config homeproxy 'routing'
+config homeproxy-pro 'routing'
 	option default_outbound 'direct-out'
 	option default_outbound_dns 'default-dns'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option redirect_port '5331'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/direct_main.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/direct_main.uci
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/direct_main.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/direct_main.uci
index 82f360899..6000fc9bd 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/direct_main.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/direct_main.uci
@@ -16,7 +16,7 @@
 # and the service never started.  `sing-box check` accepts such a config, so
 # test_generators.sh inspects the generated JSON instead of trusting check.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'tun'
 	option ipv6_support '0'
@@ -25,7 +25,7 @@ config homeproxy 'config'
 	option main_udp_node 'nil'
 	option dns_server '223.5.5.5'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option tun_name 'singtun0'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/domain.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/domain.uci
similarity index 94%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/domain.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/domain.uci
index bd5907a54..53bf12298 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/domain.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/domain.uci
@@ -24,7 +24,7 @@
 # sub-object without depending on the generator's particular routing
 # mode or proxy mode.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'redirect_tproxy'
 	option ipv6_support '0'
@@ -39,7 +39,7 @@ config homeproxy 'config'
 	option github_token ''
 	option cn_ip_fallback '0'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option redirect_port '5331'
@@ -57,7 +57,7 @@ config homeproxy 'infra'
 	option dns_redirect '1'
 	option udp_timeout ''
 
-config homeproxy 'dns'
+config homeproxy-pro 'dns'
 	option default_strategy 'prefer_ipv4'
 	option default_server 'default-dns'
 	option disable_cache '0'
@@ -80,7 +80,7 @@ config dns_rule 'dr_hijack'
 	option mode 'default'
 	option action 'hijack-dns'
 
-config homeproxy 'routing'
+config homeproxy-pro 'routing'
 	option default_outbound 'direct-out'
 	option default_outbound_dns 'default-dns'
 	option domain_strategy ''
@@ -113,13 +113,13 @@ config ruleset 'rs_cn'
 	option download_detour 'main-out'
 	option update_interval '24h'
 
-config homeproxy 'control'
+config homeproxy-pro 'control'
 	option bind_interface ''
 	option lan_proxy_mode 'disabled'
 	list wan_proxy_ipv4_ips '91.108.4.0/22'
 	list wan_proxy_ipv6_ips '2001:67c:4e8::/48'
 
-config homeproxy 'subscription'
+config homeproxy-pro 'subscription'
 	option auto_update '0'
 	option allow_insecure '0'
 	option packet_encoding 'xudp'
@@ -130,7 +130,7 @@ config homeproxy 'subscription'
 	option user_agent 'HomeProxy/1.0'
 	list subscription_url 'https://example.com/sub'
 
-config homeproxy 'server'
+config homeproxy-pro 'server'
 	option enabled '1'
 	option log_level 'warn'
 
@@ -144,7 +144,7 @@ config server 's_vless'
 	option tls '1'
 	option tls_sni 'server.example.com'
 
-config homeproxy 'migration'
+config homeproxy-pro 'migration'
 	option crontab '1'
 
 config node 'n_anytls'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/outbounds.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/outbounds.uci
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/outbounds.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/outbounds.uci
index 323294748..0a959ae6f 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/outbounds.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/outbounds.uci
@@ -13,14 +13,14 @@
 # WireGuard is absent on purpose: it is emitted as a sing-box endpoint, not an
 # outbound, and is covered by wireguard.uci.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'tun'
 	option ipv6_support '0'
 	option main_node 'n_vless_reality_ws'
 	option main_udp_node 'nil'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option tun_name 'singtun0'
@@ -237,7 +237,7 @@ config node 'n_ssh'
 	list ssh_priv_key 'MF94IOMsS6yeu1jLGM2kAAAADmhvbWVwcm94eS10ZXN0AQIDBAUGBw=='
 	list ssh_priv_key '-----END OPENSSH PRIVATE KEY-----'
 	option ssh_client_version 'SSH-2.0-OpenSSH_8.9p1'
-	list ssh_host_key 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjQAO/kXgJXZOUaQ2DZzfPfMF94IOMsS6yeu1jLGM2k homeproxy-test'
+	list ssh_host_key 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjQAO/kXgJXZOUaQ2DZzfPfMF94IOMsS6yeu1jLGM2k homeproxy-pro-test'
 	list ssh_host_key_algo 'ssh-ed25519'
 
 config node 'n_direct'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/partial_invalid.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/partial_invalid.uci
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/partial_invalid.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/partial_invalid.uci
index d587571d6..fb4b585b1 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/partial_invalid.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/partial_invalid.uci
@@ -13,7 +13,7 @@
 # n_broken is a vless node with no uuid on purpose; the test asserts that
 # generation succeeds and that n_broken is absent from the emitted group.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'tun'
 	option ipv6_support '0'
@@ -24,7 +24,7 @@ config homeproxy 'config'
 	list main_urltest_nodes 'n_broken'
 	option dns_server 'https://cloudflare-dns.com/dns-query'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option tun_name 'singtun0'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/redirect.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/redirect.uci
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/redirect.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/redirect.uci
index 6bc350979..286d1e70e 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/redirect.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/redirect.uci
@@ -11,7 +11,7 @@
 # redirect-in/tproxy-in, the dns detours that are gated on self_mark, and the
 # per-outbound routing_mark itself.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'redirect_tproxy'
 	option ipv6_support '0'
@@ -30,7 +30,7 @@ config homeproxy 'config'
 	list main_urltest_nodes 'n_socks'
 	list main_urltest_nodes 'n_shadowtls'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option tun_name 'singtun0'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/server.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/server.uci
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/server.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/server.uci
index 6fb00e3e0..aa1a54d27 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/server.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/server.uci
@@ -4,7 +4,7 @@
 # covering the shared TLS/transport builders (ACME provider, ECH key, REALITY,
 # WebSocket/gRPC/HTTP transports) on the server side.
 
-config homeproxy 'server'
+config homeproxy-pro 'server'
 	option enabled '1'
 	option log_level 'warn'
 
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/wireguard.uci b/luci-app-homeproxy-pro/tests/fixtures/generators/wireguard.uci
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/generators/wireguard.uci
rename to luci-app-homeproxy-pro/tests/fixtures/generators/wireguard.uci
index d93b5255c..03c78702e 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/generators/wireguard.uci
+++ b/luci-app-homeproxy-pro/tests/fixtures/generators/wireguard.uci
@@ -11,7 +11,7 @@
 # The unit test asserts the key material survives, not just that sing-box
 # accepts the file.
 
-config homeproxy 'config'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'tun'
 	option ipv6_support '0'
@@ -20,7 +20,7 @@ config homeproxy 'config'
 	option main_udp_node 'nil'
 	option dns_server 'https://cloudflare-dns.com/dns-query'
 
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option mixed_port '5330'
 	option dns_port '5333'
 	option tun_name 'singtun0'
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/runtime/trace.golden.txt b/luci-app-homeproxy-pro/tests/fixtures/runtime/trace.golden.txt
similarity index 65%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/runtime/trace.golden.txt
rename to luci-app-homeproxy-pro/tests/fixtures/runtime/trace.golden.txt
index d6eb7a427..5507cd8aa 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/runtime/trace.golden.txt
+++ b/luci-app-homeproxy-pro/tests/fixtures/runtime/trace.golden.txt
@@ -1,13 +1,13 @@
 
 ===== scenario: A-tun-bypass-client-only (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 init.d/dnsmasq restart
 ip link show singtun0
 ip link set singtun0 up
@@ -16,19 +16,19 @@ ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -38,43 +38,43 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 nslookup -port=5333 example.com 127.0.0.1
 nc 127.0.0.1 5330
-chmod 600 var/run/homeproxy/known-good/sing-box-c.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-c.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -137,27 +137,27 @@ init.d/miniupnpd running
 init.d/miniupnpd restart
 init.d/dnsmasq restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/uci-snapshot.txt: homeproxy.config.main_node=n1|homeproxy.config.main_udp_node=nil|homeproxy.config.proxy_mode=tun|homeproxy.config.routing_mode=bypass_mainland_china|homeproxy.config.routing_port=|homeproxy.config.ipv6_support=0|homeproxy.config.china_dns_server=|homeproxy.infra.self_mark=|homeproxy.infra.redirect_port=|homeproxy.infra.tproxy_port=|homeproxy.infra.tproxy_mark=101|homeproxy.infra.tun_mark=102|homeproxy.infra.tun_name=singtun0|homeproxy.infra.tun_addr4=|homeproxy.infra.tun_addr6=|homeproxy.infra.dns_redirect=|homeproxy.infra.dns_port=5333|homeproxy.infra.common_port=|homeproxy.infra.table_mark=100|homeproxy.routing.bypass_cn_traffic=|homeproxy.routing.default_outbound=direct-out|homeproxy.server.enabled=0|homeproxy.control.lan_proxy_mode=|list homeproxy.control.listen_interfaces=|list homeproxy.control.lan_direct_ipv4_ips=|list homeproxy.control.lan_direct_ipv6_ips=|list homeproxy.control.lan_direct_mac_addrs=|list homeproxy.control.lan_proxy_ipv4_ips=|list homeproxy.control.lan_proxy_ipv6_ips=|list homeproxy.control.lan_proxy_mac_addrs=|list homeproxy.control.lan_gaming_mode_ipv4_ips=|list homeproxy.control.lan_gaming_mode_ipv6_ips=|list homeproxy.control.lan_gaming_mode_mac_addrs=|list homeproxy.control.lan_global_proxy_ipv4_ips=|list homeproxy.control.lan_global_proxy_ipv6_ips=|list homeproxy.control.lan_global_proxy_mac_addrs=|list homeproxy.control.wan_proxy_ipv4_ips=|list homeproxy.control.wan_proxy_ipv6_ips=|list homeproxy.control.wan_direct_ipv4_ips=|list homeproxy.control.wan_direct_ipv6_ips=|
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/uci-snapshot.txt: homeproxy-pro.config.main_node=n1|homeproxy-pro.config.main_udp_node=nil|homeproxy-pro.config.proxy_mode=tun|homeproxy-pro.config.routing_mode=bypass_mainland_china|homeproxy-pro.config.routing_port=|homeproxy-pro.config.ipv6_support=0|homeproxy-pro.config.china_dns_server=|homeproxy-pro.infra.self_mark=|homeproxy-pro.infra.redirect_port=|homeproxy-pro.infra.tproxy_port=|homeproxy-pro.infra.tproxy_mark=101|homeproxy-pro.infra.tun_mark=102|homeproxy-pro.infra.tun_name=singtun0|homeproxy-pro.infra.tun_addr4=|homeproxy-pro.infra.tun_addr6=|homeproxy-pro.infra.dns_redirect=|homeproxy-pro.infra.dns_port=5333|homeproxy-pro.infra.common_port=|homeproxy-pro.infra.table_mark=100|homeproxy-pro.routing.bypass_cn_traffic=|homeproxy-pro.routing.default_outbound=direct-out|homeproxy-pro.server.enabled=0|homeproxy-pro.control.lan_proxy_mode=|list homeproxy-pro.control.listen_interfaces=|list homeproxy-pro.control.lan_direct_ipv4_ips=|list homeproxy-pro.control.lan_direct_ipv6_ips=|list homeproxy-pro.control.lan_direct_mac_addrs=|list homeproxy-pro.control.lan_proxy_ipv4_ips=|list homeproxy-pro.control.lan_proxy_ipv6_ips=|list homeproxy-pro.control.lan_proxy_mac_addrs=|list homeproxy-pro.control.lan_gaming_mode_ipv4_ips=|list homeproxy-pro.control.lan_gaming_mode_ipv6_ips=|list homeproxy-pro.control.lan_gaming_mode_mac_addrs=|list homeproxy-pro.control.lan_global_proxy_ipv4_ips=|list homeproxy-pro.control.lan_global_proxy_ipv6_ips=|list homeproxy-pro.control.lan_global_proxy_mac_addrs=|list homeproxy-pro.control.wan_proxy_ipv4_ips=|list homeproxy-pro.control.wan_proxy_ipv6_ips=|list homeproxy-pro.control.wan_direct_ipv4_ips=|list homeproxy-pro.control.wan_direct_ipv6_ips=|
+file etc/homeproxy-pro/cache.db: 
 
 ===== scenario: B-tproxy-gfwlist-ipv6-with-server (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 chmod 600 etc/crontabs/root
 init.d/cron restart
 init.d/dnsmasq restart
@@ -169,18 +169,18 @@ ip -6 rule add fwmark 101 table 100
 ip -6 route replace local ::/0 dev lo table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -189,19 +189,19 @@ procd_set_param limits nofile=1000000 1000000
 procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
-ucode -S etc/homeproxy/scripts/generate_server.uc
+ucode -S etc/homeproxy-pro/scripts/generate_server.uc
 procd_open_instance sing-box-s
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-s.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-s.json
 procd_add_jail sing-box-s log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-s.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-s.log
-procd_add_jail_mount_rw etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-s.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-s.log
+procd_add_jail_mount_rw etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -211,61 +211,61 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box etc/homeproxy/certs
-chmod 700 etc/homeproxy/certs
-chown sing-box:sing-box etc/homeproxy/certs/server_privatekey.pem
-chmod 600 etc/homeproxy/certs/server_privatekey.pem
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-s.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box var/run/homeproxy/sing-box-s.log
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box etc/homeproxy-pro/certs
+chmod 700 etc/homeproxy-pro/certs
+chown sing-box:sing-box etc/homeproxy-pro/certs/server_privatekey.pem
+chmod 600 etc/homeproxy-pro/certs/server_privatekey.pem
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-s.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-s.log
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 nslookup -port=5333 example.com 127.0.0.1
 nc 127.0.0.1 5330
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
-chmod 600 var/run/homeproxy/known-good/sing-box-c.json
-config_load homeproxy
-chmod 600 var/run/homeproxy/known-good/sing-box-s.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-c.json
+config_load homeproxy-pro
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-s.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -328,28 +328,28 @@ init.d/miniupnpd running
 init.d/miniupnpd restart
 init.d/dnsmasq restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/sing-box-s.json: {|	"log": {},|	"inbounds": [],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/uci-snapshot.txt: homeproxy.config.main_node=n1|homeproxy.config.main_udp_node=u1|homeproxy.config.proxy_mode=redirect_tproxy|homeproxy.config.routing_mode=gfwlist|homeproxy.config.routing_port=|homeproxy.config.ipv6_support=1|homeproxy.config.china_dns_server=|homeproxy.infra.self_mark=|homeproxy.infra.redirect_port=|homeproxy.infra.tproxy_port=|homeproxy.infra.tproxy_mark=101|homeproxy.infra.tun_mark=102|homeproxy.infra.tun_name=singtun0|homeproxy.infra.tun_addr4=|homeproxy.infra.tun_addr6=|homeproxy.infra.dns_redirect=|homeproxy.infra.dns_port=5333|homeproxy.infra.common_port=|homeproxy.infra.table_mark=100|homeproxy.routing.bypass_cn_traffic=|homeproxy.routing.default_outbound=direct-out|homeproxy.server.enabled=1|homeproxy.control.lan_proxy_mode=|list homeproxy.control.listen_interfaces=|list homeproxy.control.lan_direct_ipv4_ips=|list homeproxy.control.lan_direct_ipv6_ips=|list homeproxy.control.lan_direct_mac_addrs=|list homeproxy.control.lan_proxy_ipv4_ips=|list homeproxy.control.lan_proxy_ipv6_ips=|list homeproxy.control.lan_proxy_mac_addrs=|list homeproxy.control.lan_gaming_mode_ipv4_ips=|list homeproxy.control.lan_gaming_mode_ipv6_ips=|list homeproxy.control.lan_gaming_mode_mac_addrs=|list homeproxy.control.lan_global_proxy_ipv4_ips=|list homeproxy.control.lan_global_proxy_ipv6_ips=|list homeproxy.control.lan_global_proxy_mac_addrs=|list homeproxy.control.wan_proxy_ipv4_ips=|list homeproxy.control.wan_proxy_ipv6_ips=|list homeproxy.control.wan_direct_ipv4_ips=|list homeproxy.control.wan_direct_ipv6_ips=|
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/sing-box-s.json: {|	"log": {},|	"inbounds": [],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/uci-snapshot.txt: homeproxy-pro.config.main_node=n1|homeproxy-pro.config.main_udp_node=u1|homeproxy-pro.config.proxy_mode=redirect_tproxy|homeproxy-pro.config.routing_mode=gfwlist|homeproxy-pro.config.routing_port=|homeproxy-pro.config.ipv6_support=1|homeproxy-pro.config.china_dns_server=|homeproxy-pro.infra.self_mark=|homeproxy-pro.infra.redirect_port=|homeproxy-pro.infra.tproxy_port=|homeproxy-pro.infra.tproxy_mark=101|homeproxy-pro.infra.tun_mark=102|homeproxy-pro.infra.tun_name=singtun0|homeproxy-pro.infra.tun_addr4=|homeproxy-pro.infra.tun_addr6=|homeproxy-pro.infra.dns_redirect=|homeproxy-pro.infra.dns_port=5333|homeproxy-pro.infra.common_port=|homeproxy-pro.infra.table_mark=100|homeproxy-pro.routing.bypass_cn_traffic=|homeproxy-pro.routing.default_outbound=direct-out|homeproxy-pro.server.enabled=1|homeproxy-pro.control.lan_proxy_mode=|list homeproxy-pro.control.listen_interfaces=|list homeproxy-pro.control.lan_direct_ipv4_ips=|list homeproxy-pro.control.lan_direct_ipv6_ips=|list homeproxy-pro.control.lan_direct_mac_addrs=|list homeproxy-pro.control.lan_proxy_ipv4_ips=|list homeproxy-pro.control.lan_proxy_ipv6_ips=|list homeproxy-pro.control.lan_proxy_mac_addrs=|list homeproxy-pro.control.lan_gaming_mode_ipv4_ips=|list homeproxy-pro.control.lan_gaming_mode_ipv6_ips=|list homeproxy-pro.control.lan_gaming_mode_mac_addrs=|list homeproxy-pro.control.lan_global_proxy_ipv4_ips=|list homeproxy-pro.control.lan_global_proxy_ipv6_ips=|list homeproxy-pro.control.lan_global_proxy_mac_addrs=|list homeproxy-pro.control.wan_proxy_ipv4_ips=|list homeproxy-pro.control.wan_proxy_ipv6_ips=|list homeproxy-pro.control.wan_direct_ipv4_ips=|list homeproxy-pro.control.wan_direct_ipv6_ips=|
 
 ===== scenario: C-nothing-configured (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 log Neither client nor server is configured. Service not started.
-config_load homeproxy
+config_load homeproxy-pro
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -411,23 +411,23 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
 
 ===== scenario: D-health-gate-rollback (reload) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 init.d/dnsmasq restart
 ip link show singtun0
 ip link set singtun0 up
@@ -436,19 +436,19 @@ ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -458,47 +458,47 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 nslookup -port=5333 example.com 127.0.0.1
 nc 127.0.0.1 5330
-chmod 600 var/run/homeproxy/known-good/sing-box-c.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-c.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 prime start rc=0
 log Reloading service...
-config_load homeproxy
-ucode -S etc/homeproxy/scripts/generate_client.uc
-chmod 600 var/run/homeproxy/candidate/sing-box-c.json
+config_load homeproxy-pro
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
+chmod 600 var/run/homeproxy-pro/candidate/sing-box-c.json
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 nft flush chain inet fw4 homeproxy_output_redir
 nft delete chain inet fw4 homeproxy_output_redir
 nft flush chain inet fw4 homeproxy_redirect
@@ -552,8 +552,8 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
-config_load homeproxy
+config_load homeproxy-pro
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
@@ -568,19 +568,19 @@ ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -590,107 +590,107 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 log Error: sing-box-c did not come up with the new configuration.
 log Reverting the intercept layer; traffic will go out unproxied until the client is up.
@@ -756,50 +756,50 @@ init.d/miniupnpd running
 init.d/miniupnpd restart
 init.d/dnsmasq restart
 log Error: sing-box-c did not come up with the new configuration, rolling back.
-uci set homeproxy.config.main_node=n1
-uci set homeproxy.config.main_udp_node=nil
-uci set homeproxy.config.proxy_mode=tun
-uci set homeproxy.config.routing_mode=bypass_mainland_china
-uci set homeproxy.config.routing_port=
-uci set homeproxy.config.ipv6_support=0
-uci set homeproxy.config.china_dns_server=
-uci set homeproxy.infra.self_mark=
-uci set homeproxy.infra.redirect_port=
-uci set homeproxy.infra.tproxy_port=
-uci set homeproxy.infra.tproxy_mark=101
-uci set homeproxy.infra.tun_mark=102
-uci set homeproxy.infra.tun_name=singtun0
-uci set homeproxy.infra.tun_addr4=
-uci set homeproxy.infra.tun_addr6=
-uci set homeproxy.infra.dns_redirect=
-uci set homeproxy.infra.dns_port=5333
-uci set homeproxy.infra.common_port=
-uci set homeproxy.infra.table_mark=100
-uci set homeproxy.routing.bypass_cn_traffic=
-uci set homeproxy.routing.default_outbound=direct-out
-uci set homeproxy.server.enabled=0
-uci set homeproxy.control.lan_proxy_mode=
-uci delete homeproxy.control.listen_interfaces
-uci delete homeproxy.control.lan_direct_ipv4_ips
-uci delete homeproxy.control.lan_direct_ipv6_ips
-uci delete homeproxy.control.lan_direct_mac_addrs
-uci delete homeproxy.control.lan_proxy_ipv4_ips
-uci delete homeproxy.control.lan_proxy_ipv6_ips
-uci delete homeproxy.control.lan_proxy_mac_addrs
-uci delete homeproxy.control.lan_gaming_mode_ipv4_ips
-uci delete homeproxy.control.lan_gaming_mode_ipv6_ips
-uci delete homeproxy.control.lan_gaming_mode_mac_addrs
-uci delete homeproxy.control.lan_global_proxy_ipv4_ips
-uci delete homeproxy.control.lan_global_proxy_ipv6_ips
-uci delete homeproxy.control.lan_global_proxy_mac_addrs
-uci delete homeproxy.control.wan_proxy_ipv4_ips
-uci delete homeproxy.control.wan_proxy_ipv6_ips
-uci delete homeproxy.control.wan_direct_ipv4_ips
-uci delete homeproxy.control.wan_direct_ipv6_ips
-uci commit homeproxy
+uci set homeproxy-pro.config.main_node=n1
+uci set homeproxy-pro.config.main_udp_node=nil
+uci set homeproxy-pro.config.proxy_mode=tun
+uci set homeproxy-pro.config.routing_mode=bypass_mainland_china
+uci set homeproxy-pro.config.routing_port=
+uci set homeproxy-pro.config.ipv6_support=0
+uci set homeproxy-pro.config.china_dns_server=
+uci set homeproxy-pro.infra.self_mark=
+uci set homeproxy-pro.infra.redirect_port=
+uci set homeproxy-pro.infra.tproxy_port=
+uci set homeproxy-pro.infra.tproxy_mark=101
+uci set homeproxy-pro.infra.tun_mark=102
+uci set homeproxy-pro.infra.tun_name=singtun0
+uci set homeproxy-pro.infra.tun_addr4=
+uci set homeproxy-pro.infra.tun_addr6=
+uci set homeproxy-pro.infra.dns_redirect=
+uci set homeproxy-pro.infra.dns_port=5333
+uci set homeproxy-pro.infra.common_port=
+uci set homeproxy-pro.infra.table_mark=100
+uci set homeproxy-pro.routing.bypass_cn_traffic=
+uci set homeproxy-pro.routing.default_outbound=direct-out
+uci set homeproxy-pro.server.enabled=0
+uci set homeproxy-pro.control.lan_proxy_mode=
+uci delete homeproxy-pro.control.listen_interfaces
+uci delete homeproxy-pro.control.lan_direct_ipv4_ips
+uci delete homeproxy-pro.control.lan_direct_ipv6_ips
+uci delete homeproxy-pro.control.lan_direct_mac_addrs
+uci delete homeproxy-pro.control.lan_proxy_ipv4_ips
+uci delete homeproxy-pro.control.lan_proxy_ipv6_ips
+uci delete homeproxy-pro.control.lan_proxy_mac_addrs
+uci delete homeproxy-pro.control.lan_gaming_mode_ipv4_ips
+uci delete homeproxy-pro.control.lan_gaming_mode_ipv6_ips
+uci delete homeproxy-pro.control.lan_gaming_mode_mac_addrs
+uci delete homeproxy-pro.control.lan_global_proxy_ipv4_ips
+uci delete homeproxy-pro.control.lan_global_proxy_ipv6_ips
+uci delete homeproxy-pro.control.lan_global_proxy_mac_addrs
+uci delete homeproxy-pro.control.wan_proxy_ipv4_ips
+uci delete homeproxy-pro.control.wan_proxy_ipv6_ips
+uci delete homeproxy-pro.control.wan_direct_ipv4_ips
+uci delete homeproxy-pro.control.wan_direct_ipv6_ips
+uci commit homeproxy-pro
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 nft flush chain inet fw4 homeproxy_output_redir
 nft delete chain inet fw4 homeproxy_output_redir
 nft flush chain inet fw4 homeproxy_redirect
@@ -853,8 +853,8 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
-config_load homeproxy
+config_load homeproxy-pro
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
@@ -869,19 +869,19 @@ ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -891,30 +891,30 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
@@ -927,21 +927,21 @@ ip link set singtun0 up
 ip route replace default dev singtun0 table 100
 ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-chmod 600 var/run/homeproxy/known-good/sing-box-c.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-c.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 log Rollback completed; the previous configuration is running.
 reload_service rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 nft flush chain inet fw4 homeproxy_output_redir
 nft delete chain inet fw4 homeproxy_output_redir
 nft flush chain inet fw4 homeproxy_redirect
@@ -995,28 +995,28 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/uci-snapshot.txt: homeproxy.config.main_node=n1|homeproxy.config.main_udp_node=nil|homeproxy.config.proxy_mode=tun|homeproxy.config.routing_mode=bypass_mainland_china|homeproxy.config.routing_port=|homeproxy.config.ipv6_support=0|homeproxy.config.china_dns_server=|homeproxy.infra.self_mark=|homeproxy.infra.redirect_port=|homeproxy.infra.tproxy_port=|homeproxy.infra.tproxy_mark=101|homeproxy.infra.tun_mark=102|homeproxy.infra.tun_name=singtun0|homeproxy.infra.tun_addr4=|homeproxy.infra.tun_addr6=|homeproxy.infra.dns_redirect=|homeproxy.infra.dns_port=5333|homeproxy.infra.common_port=|homeproxy.infra.table_mark=100|homeproxy.routing.bypass_cn_traffic=|homeproxy.routing.default_outbound=direct-out|homeproxy.server.enabled=0|homeproxy.control.lan_proxy_mode=|list homeproxy.control.listen_interfaces=|list homeproxy.control.lan_direct_ipv4_ips=|list homeproxy.control.lan_direct_ipv6_ips=|list homeproxy.control.lan_direct_mac_addrs=|list homeproxy.control.lan_proxy_ipv4_ips=|list homeproxy.control.lan_proxy_ipv6_ips=|list homeproxy.control.lan_proxy_mac_addrs=|list homeproxy.control.lan_gaming_mode_ipv4_ips=|list homeproxy.control.lan_gaming_mode_ipv6_ips=|list homeproxy.control.lan_gaming_mode_mac_addrs=|list homeproxy.control.lan_global_proxy_ipv4_ips=|list homeproxy.control.lan_global_proxy_ipv6_ips=|list homeproxy.control.lan_global_proxy_mac_addrs=|list homeproxy.control.wan_proxy_ipv4_ips=|list homeproxy.control.wan_proxy_ipv6_ips=|list homeproxy.control.wan_direct_ipv4_ips=|list homeproxy.control.wan_direct_ipv6_ips=|
-file etc/homeproxy/cache.db: 
-file dnsmasq/dnsmasq-homeproxy.conf: conf-dir=dnsmasq/dnsmasq-homeproxy.d|
-file dnsmasq/dnsmasq-homeproxy.d/proxy_list.conf: server=/proxy.example.net/127.0.0.1#5333|nftset=/proxy.example.net/4#inet#fw4#homeproxy_wan_proxy_addr_v4|
-file dnsmasq/dnsmasq-homeproxy.d/redirect-dns.conf: no-poll|no-resolv|server=127.0.0.1#5333|
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/uci-snapshot.txt: homeproxy-pro.config.main_node=n1|homeproxy-pro.config.main_udp_node=nil|homeproxy-pro.config.proxy_mode=tun|homeproxy-pro.config.routing_mode=bypass_mainland_china|homeproxy-pro.config.routing_port=|homeproxy-pro.config.ipv6_support=0|homeproxy-pro.config.china_dns_server=|homeproxy-pro.infra.self_mark=|homeproxy-pro.infra.redirect_port=|homeproxy-pro.infra.tproxy_port=|homeproxy-pro.infra.tproxy_mark=101|homeproxy-pro.infra.tun_mark=102|homeproxy-pro.infra.tun_name=singtun0|homeproxy-pro.infra.tun_addr4=|homeproxy-pro.infra.tun_addr6=|homeproxy-pro.infra.dns_redirect=|homeproxy-pro.infra.dns_port=5333|homeproxy-pro.infra.common_port=|homeproxy-pro.infra.table_mark=100|homeproxy-pro.routing.bypass_cn_traffic=|homeproxy-pro.routing.default_outbound=direct-out|homeproxy-pro.server.enabled=0|homeproxy-pro.control.lan_proxy_mode=|list homeproxy-pro.control.listen_interfaces=|list homeproxy-pro.control.lan_direct_ipv4_ips=|list homeproxy-pro.control.lan_direct_ipv6_ips=|list homeproxy-pro.control.lan_direct_mac_addrs=|list homeproxy-pro.control.lan_proxy_ipv4_ips=|list homeproxy-pro.control.lan_proxy_ipv6_ips=|list homeproxy-pro.control.lan_proxy_mac_addrs=|list homeproxy-pro.control.lan_gaming_mode_ipv4_ips=|list homeproxy-pro.control.lan_gaming_mode_ipv6_ips=|list homeproxy-pro.control.lan_gaming_mode_mac_addrs=|list homeproxy-pro.control.lan_global_proxy_ipv4_ips=|list homeproxy-pro.control.lan_global_proxy_ipv6_ips=|list homeproxy-pro.control.lan_global_proxy_mac_addrs=|list homeproxy-pro.control.wan_proxy_ipv4_ips=|list homeproxy-pro.control.wan_proxy_ipv6_ips=|list homeproxy-pro.control.wan_direct_ipv4_ips=|list homeproxy-pro.control.wan_direct_ipv6_ips=|
+file etc/homeproxy-pro/cache.db: 
+file dnsmasq/dnsmasq-homeproxy-pro.conf: conf-dir=dnsmasq/dnsmasq-homeproxy-pro.d|
+file dnsmasq/dnsmasq-homeproxy-pro.d/proxy_list.conf: server=/proxy.example.net/127.0.0.1#5333|nftset=/proxy.example.net/4#inet#fw4#homeproxy_wan_proxy_addr_v4|
+file dnsmasq/dnsmasq-homeproxy-pro.d/redirect-dns.conf: no-poll|no-resolv|server=127.0.0.1#5333|
 
 ===== scenario: E-custom-routing-runtime-files (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 init.d/dnsmasq restart
 ip link show singtun0
 ip link set singtun0 up
@@ -1025,19 +1025,19 @@ ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -1047,44 +1047,44 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown -R sing-box:sing-box etc/homeproxy/ruleset
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown -R sing-box:sing-box etc/homeproxy-pro/ruleset
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 nslookup -port=5333 example.com 127.0.0.1
 nc 127.0.0.1 5330
-chmod 600 var/run/homeproxy/known-good/sing-box-c.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-c.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -1147,28 +1147,28 @@ init.d/miniupnpd running
 init.d/miniupnpd restart
 init.d/dnsmasq restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/uci-snapshot.txt: homeproxy.config.main_node=n1|homeproxy.config.main_udp_node=nil|homeproxy.config.proxy_mode=tun|homeproxy.config.routing_mode=custom|homeproxy.config.routing_port=|homeproxy.config.ipv6_support=0|homeproxy.config.china_dns_server=|homeproxy.infra.self_mark=|homeproxy.infra.redirect_port=|homeproxy.infra.tproxy_port=|homeproxy.infra.tproxy_mark=101|homeproxy.infra.tun_mark=102|homeproxy.infra.tun_name=singtun0|homeproxy.infra.tun_addr4=|homeproxy.infra.tun_addr6=|homeproxy.infra.dns_redirect=|homeproxy.infra.dns_port=5333|homeproxy.infra.common_port=|homeproxy.infra.table_mark=100|homeproxy.routing.bypass_cn_traffic=|homeproxy.routing.default_outbound=direct-out|homeproxy.server.enabled=0|homeproxy.control.lan_proxy_mode=|list homeproxy.control.listen_interfaces=|list homeproxy.control.lan_direct_ipv4_ips=|list homeproxy.control.lan_direct_ipv6_ips=|list homeproxy.control.lan_direct_mac_addrs=|list homeproxy.control.lan_proxy_ipv4_ips=|list homeproxy.control.lan_proxy_ipv6_ips=|list homeproxy.control.lan_proxy_mac_addrs=|list homeproxy.control.lan_gaming_mode_ipv4_ips=|list homeproxy.control.lan_gaming_mode_ipv6_ips=|list homeproxy.control.lan_gaming_mode_mac_addrs=|list homeproxy.control.lan_global_proxy_ipv4_ips=|list homeproxy.control.lan_global_proxy_ipv6_ips=|list homeproxy.control.lan_global_proxy_mac_addrs=|list homeproxy.control.wan_proxy_ipv4_ips=|list homeproxy.control.wan_proxy_ipv6_ips=|list homeproxy.control.wan_direct_ipv4_ips=|list homeproxy.control.wan_direct_ipv6_ips=|
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/uci-snapshot.txt: homeproxy-pro.config.main_node=n1|homeproxy-pro.config.main_udp_node=nil|homeproxy-pro.config.proxy_mode=tun|homeproxy-pro.config.routing_mode=custom|homeproxy-pro.config.routing_port=|homeproxy-pro.config.ipv6_support=0|homeproxy-pro.config.china_dns_server=|homeproxy-pro.infra.self_mark=|homeproxy-pro.infra.redirect_port=|homeproxy-pro.infra.tproxy_port=|homeproxy-pro.infra.tproxy_mark=101|homeproxy-pro.infra.tun_mark=102|homeproxy-pro.infra.tun_name=singtun0|homeproxy-pro.infra.tun_addr4=|homeproxy-pro.infra.tun_addr6=|homeproxy-pro.infra.dns_redirect=|homeproxy-pro.infra.dns_port=5333|homeproxy-pro.infra.common_port=|homeproxy-pro.infra.table_mark=100|homeproxy-pro.routing.bypass_cn_traffic=|homeproxy-pro.routing.default_outbound=direct-out|homeproxy-pro.server.enabled=0|homeproxy-pro.control.lan_proxy_mode=|list homeproxy-pro.control.listen_interfaces=|list homeproxy-pro.control.lan_direct_ipv4_ips=|list homeproxy-pro.control.lan_direct_ipv6_ips=|list homeproxy-pro.control.lan_direct_mac_addrs=|list homeproxy-pro.control.lan_proxy_ipv4_ips=|list homeproxy-pro.control.lan_proxy_ipv6_ips=|list homeproxy-pro.control.lan_proxy_mac_addrs=|list homeproxy-pro.control.lan_gaming_mode_ipv4_ips=|list homeproxy-pro.control.lan_gaming_mode_ipv6_ips=|list homeproxy-pro.control.lan_gaming_mode_mac_addrs=|list homeproxy-pro.control.lan_global_proxy_ipv4_ips=|list homeproxy-pro.control.lan_global_proxy_ipv6_ips=|list homeproxy-pro.control.lan_global_proxy_mac_addrs=|list homeproxy-pro.control.wan_proxy_ipv4_ips=|list homeproxy-pro.control.wan_proxy_ipv6_ips=|list homeproxy-pro.control.wan_direct_ipv4_ips=|list homeproxy-pro.control.wan_direct_ipv6_ips=|
+file etc/homeproxy-pro/cache.db: 
 
 ===== scenario: F-custom-routing-nothing-configured (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 log Neither client nor server is configured. Service not started.
-config_load homeproxy
+config_load homeproxy-pro
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -1230,39 +1230,39 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
 
 ===== scenario: G-start-health-gate-failure (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 init.d/dnsmasq restart
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -1272,107 +1272,107 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 log Error: sing-box-c did not come up with the new configuration.
 log Reverting the intercept layer; traffic will go out unproxied until the client is up.
@@ -1440,7 +1440,7 @@ init.d/dnsmasq restart
 start rc=1
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -1502,25 +1502,25 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file etc/homeproxy-pro/cache.db: 
 
 ===== scenario: I-dns-snippet-write-failure (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 log Warning: infra.dns_port=70000 is out of range; skipping the dnsmasq snippets.
 log Error: the dnsmasq snippets were not installed; LAN DNS keeps using the previous configuration.
 ip link show singtun0
@@ -1530,19 +1530,19 @@ ip rule del fwmark 102 table 100
 ip rule add fwmark 102 table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -1552,30 +1552,30 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
@@ -1587,7 +1587,7 @@ log sing-box 1.14.0 started.
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -1649,41 +1649,41 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file etc/homeproxy-pro/cache.db: 
 
 ===== scenario: H-start-disables-client (start-twice) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 init.d/dnsmasq restart
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /tmp/dhcp.leases
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -1692,19 +1692,19 @@ procd_set_param limits nofile=1000000 1000000
 procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
-ucode -S etc/homeproxy/scripts/generate_server.uc
+ucode -S etc/homeproxy-pro/scripts/generate_server.uc
 procd_open_instance sing-box-s
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-s.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-s.json
 procd_add_jail sing-box-s log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-s.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-s.log
-procd_add_jail_mount_rw etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-s.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-s.log
+procd_add_jail_mount_rw etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -1714,60 +1714,60 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box etc/homeproxy/certs
-chmod 700 etc/homeproxy/certs
-chown sing-box:sing-box etc/homeproxy/certs/server_privatekey.pem
-chmod 600 etc/homeproxy/certs/server_privatekey.pem
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-s.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box var/run/homeproxy/sing-box-s.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box etc/homeproxy-pro/certs
+chmod 700 etc/homeproxy-pro/certs
+chown sing-box:sing-box etc/homeproxy-pro/certs/server_privatekey.pem
+chmod 600 etc/homeproxy-pro/certs/server_privatekey.pem
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-s.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-s.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 netstat -ltnup
 nslookup -port=5333 example.com 127.0.0.1
 nc 127.0.0.1 5330
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
-chmod 600 var/run/homeproxy/known-good/sing-box-c.json
-config_load homeproxy
-chmod 600 var/run/homeproxy/known-good/sing-box-s.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-c.json
+config_load homeproxy-pro
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-s.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 prime start rc=0
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 log Reverting the intercept layer; traffic will go out unproxied until the client is up.
 ip rule del fwmark 101 table 100
@@ -1832,19 +1832,19 @@ init.d/miniupnpd running
 init.d/miniupnpd restart
 init.d/dnsmasq restart
 uname -r
-ucode -S etc/homeproxy/scripts/generate_server.uc
+ucode -S etc/homeproxy-pro/scripts/generate_server.uc
 procd_open_instance sing-box-s
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-s.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-s.json
 procd_add_jail sing-box-s log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-s.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-s.log
-procd_add_jail_mount_rw etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-s.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-s.log
+procd_add_jail_mount_rw etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/acme/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -1854,43 +1854,43 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box etc/homeproxy/certs
-chmod 700 etc/homeproxy/certs
-chown sing-box:sing-box etc/homeproxy/certs/server_privatekey.pem
-chmod 600 etc/homeproxy/certs/server_privatekey.pem
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-s.json
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.log
-chown sing-box:sing-box var/run/homeproxy/sing-box-s.log
-chown sing-box:sing-box etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
+chown sing-box:sing-box etc/homeproxy-pro/certs
+chmod 700 etc/homeproxy-pro/certs
+chown sing-box:sing-box etc/homeproxy-pro/certs/server_privatekey.pem
+chmod 600 etc/homeproxy-pro/certs/server_privatekey.pem
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-s.json
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.log
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-s.log
+chown sing-box:sing-box etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
 fw4 reload
 init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
-config_load homeproxy
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+config_load homeproxy-pro
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-s']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-s']
 jsonfilter -e @.running
 jsonfilter -e @.exit_code
-chmod 600 var/run/homeproxy/known-good/sing-box-s.json
-config_load homeproxy
+chmod 600 var/run/homeproxy-pro/known-good/sing-box-s.json
+config_load homeproxy-pro
 sing-box version -n
 log sing-box 1.14.0 started.
 start rc=0
 chmod 600 etc/crontabs/root
 init.d/cron restart
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -1952,15 +1952,15 @@ init.d/miniupnpd enabled
 init.d/miniupnpd running
 init.d/miniupnpd restart
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/sing-box-s.json: {|	"log": {},|	"inbounds": [],|	"outbounds": []|}|
-file var/run/homeproxy/known-good/uci-snapshot.txt: homeproxy.config.main_node=nil|homeproxy.config.main_udp_node=nil|homeproxy.config.proxy_mode=redirect_tproxy|homeproxy.config.routing_mode=bypass_mainland_china|homeproxy.config.routing_port=|homeproxy.config.ipv6_support=0|homeproxy.config.china_dns_server=|homeproxy.infra.self_mark=|homeproxy.infra.redirect_port=|homeproxy.infra.tproxy_port=|homeproxy.infra.tproxy_mark=101|homeproxy.infra.tun_mark=102|homeproxy.infra.tun_name=singtun0|homeproxy.infra.tun_addr4=|homeproxy.infra.tun_addr6=|homeproxy.infra.dns_redirect=|homeproxy.infra.dns_port=5333|homeproxy.infra.common_port=|homeproxy.infra.table_mark=100|homeproxy.routing.bypass_cn_traffic=|homeproxy.routing.default_outbound=direct-out|homeproxy.server.enabled=1|homeproxy.control.lan_proxy_mode=|list homeproxy.control.listen_interfaces=|list homeproxy.control.lan_direct_ipv4_ips=|list homeproxy.control.lan_direct_ipv6_ips=|list homeproxy.control.lan_direct_mac_addrs=|list homeproxy.control.lan_proxy_ipv4_ips=|list homeproxy.control.lan_proxy_ipv6_ips=|list homeproxy.control.lan_proxy_mac_addrs=|list homeproxy.control.lan_gaming_mode_ipv4_ips=|list homeproxy.control.lan_gaming_mode_ipv6_ips=|list homeproxy.control.lan_gaming_mode_mac_addrs=|list homeproxy.control.lan_global_proxy_ipv4_ips=|list homeproxy.control.lan_global_proxy_ipv6_ips=|list homeproxy.control.lan_global_proxy_mac_addrs=|list homeproxy.control.wan_proxy_ipv4_ips=|list homeproxy.control.wan_proxy_ipv6_ips=|list homeproxy.control.wan_direct_ipv4_ips=|list homeproxy.control.wan_direct_ipv6_ips=|
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {|	"log": {},|	"inbounds": [|		{|			"tag": "dns-in",|			"listen_port": 5333|		},|		{|			"tag": "mixed-in",|			"listen_port": 5330|		}|	],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/sing-box-s.json: {|	"log": {},|	"inbounds": [],|	"outbounds": []|}|
+file var/run/homeproxy-pro/known-good/uci-snapshot.txt: homeproxy-pro.config.main_node=nil|homeproxy-pro.config.main_udp_node=nil|homeproxy-pro.config.proxy_mode=redirect_tproxy|homeproxy-pro.config.routing_mode=bypass_mainland_china|homeproxy-pro.config.routing_port=|homeproxy-pro.config.ipv6_support=0|homeproxy-pro.config.china_dns_server=|homeproxy-pro.infra.self_mark=|homeproxy-pro.infra.redirect_port=|homeproxy-pro.infra.tproxy_port=|homeproxy-pro.infra.tproxy_mark=101|homeproxy-pro.infra.tun_mark=102|homeproxy-pro.infra.tun_name=singtun0|homeproxy-pro.infra.tun_addr4=|homeproxy-pro.infra.tun_addr6=|homeproxy-pro.infra.dns_redirect=|homeproxy-pro.infra.dns_port=5333|homeproxy-pro.infra.common_port=|homeproxy-pro.infra.table_mark=100|homeproxy-pro.routing.bypass_cn_traffic=|homeproxy-pro.routing.default_outbound=direct-out|homeproxy-pro.server.enabled=1|homeproxy-pro.control.lan_proxy_mode=|list homeproxy-pro.control.listen_interfaces=|list homeproxy-pro.control.lan_direct_ipv4_ips=|list homeproxy-pro.control.lan_direct_ipv6_ips=|list homeproxy-pro.control.lan_direct_mac_addrs=|list homeproxy-pro.control.lan_proxy_ipv4_ips=|list homeproxy-pro.control.lan_proxy_ipv6_ips=|list homeproxy-pro.control.lan_proxy_mac_addrs=|list homeproxy-pro.control.lan_gaming_mode_ipv4_ips=|list homeproxy-pro.control.lan_gaming_mode_ipv6_ips=|list homeproxy-pro.control.lan_gaming_mode_mac_addrs=|list homeproxy-pro.control.lan_global_proxy_ipv4_ips=|list homeproxy-pro.control.lan_global_proxy_ipv6_ips=|list homeproxy-pro.control.lan_global_proxy_mac_addrs=|list homeproxy-pro.control.wan_proxy_ipv4_ips=|list homeproxy-pro.control.wan_proxy_ipv6_ips=|list homeproxy-pro.control.wan_direct_ipv4_ips=|list homeproxy-pro.control.wan_direct_ipv6_ips=|
+file etc/homeproxy-pro/cache.db: 
diff --git a/luci-app-homeproxy-pro-pro/tests/fixtures/runtime/trace.pre-pr05.txt b/luci-app-homeproxy-pro/tests/fixtures/runtime/trace.pre-pr05.txt
similarity index 79%
rename from luci-app-homeproxy-pro-pro/tests/fixtures/runtime/trace.pre-pr05.txt
rename to luci-app-homeproxy-pro/tests/fixtures/runtime/trace.pre-pr05.txt
index 92a2a324b..f255cc99b 100644
--- a/luci-app-homeproxy-pro-pro/tests/fixtures/runtime/trace.pre-pr05.txt
+++ b/luci-app-homeproxy-pro/tests/fixtures/runtime/trace.pre-pr05.txt
@@ -1,13 +1,13 @@
 
 ===== scenario: A-tun-bypass-client-only (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 log Warning: failed to restart dnsmasq, DNS-based routing may be stale.
 ip tuntap add mode tun user root name singtun0
 sleep 1s
@@ -16,16 +16,16 @@ ip route replace default dev singtun0 table 100
 ip rule add fwmark 102 lookup 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -35,19 +35,19 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json var/run/homeproxy/sing-box-c.log etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json var/run/homeproxy-pro/sing-box-c.log etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 sing-box version -n
 log sing-box 1.14.0 started.
 start rc=127
 log Warning: failed to drop the auto-update cron entry.
 log Warning: failed to restart cron.
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -105,28 +105,28 @@ nft delete set inet fw4 homeproxy_wan_direct_addr_v6
 nft flush set inet fw4 homeproxy_routing_port
 nft delete set inet fw4 homeproxy_routing_port
 fw4 reload
-log Warning: failed to restart dnsmasq after removing the homeproxy snippets.
+log Warning: failed to restart dnsmasq after removing the homeproxy-pro snippets.
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {"log":{},"inbounds":[{"tag":"dns-in","listen_port":5333},{"tag":"mixed-in","listen_port":5330}],"outbounds":[]}|
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {"log":{},"inbounds":[{"tag":"dns-in","listen_port":5333},{"tag":"mixed-in","listen_port":5330}],"outbounds":[]}|
+file etc/homeproxy-pro/cache.db: 
 
 ===== scenario: B-tproxy-gfwlist-ipv6-with-server (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 log Warning: failed to drop the previous auto-update cron entry.
 log Warning: failed to install the auto-update cron entry.
 log Warning: failed to restart cron.
@@ -137,15 +137,15 @@ ip -6 rule add fwmark 101 table 100
 ip -6 route add local ::/0 dev lo table 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -155,19 +155,19 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json var/run/homeproxy/sing-box-c.log etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json var/run/homeproxy-pro/sing-box-c.log etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 sing-box version -n
 log sing-box 1.14.0 started.
 start rc=127
 log Warning: failed to drop the auto-update cron entry.
 log Warning: failed to restart cron.
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -225,27 +225,27 @@ nft delete set inet fw4 homeproxy_wan_direct_addr_v6
 nft flush set inet fw4 homeproxy_routing_port
 nft delete set inet fw4 homeproxy_routing_port
 fw4 reload
-log Warning: failed to restart dnsmasq after removing the homeproxy snippets.
+log Warning: failed to restart dnsmasq after removing the homeproxy-pro snippets.
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {"log":{},"inbounds":[{"tag":"dns-in","listen_port":5333},{"tag":"mixed-in","listen_port":5330}],"outbounds":[]}|
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {"log":{},"inbounds":[{"tag":"dns-in","listen_port":5333},{"tag":"mixed-in","listen_port":5330}],"outbounds":[]}|
 
 ===== scenario: C-nothing-configured (start) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 log Neither client nor server is configured. Service not started.
 start rc=127
 log Warning: failed to drop the auto-update cron entry.
 log Warning: failed to restart cron.
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -303,25 +303,25 @@ nft delete set inet fw4 homeproxy_wan_direct_addr_v6
 nft flush set inet fw4 homeproxy_routing_port
 nft delete set inet fw4 homeproxy_routing_port
 fw4 reload
-log Warning: failed to restart dnsmasq after removing the homeproxy snippets.
+log Warning: failed to restart dnsmasq after removing the homeproxy-pro snippets.
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
 
 ===== scenario: D-health-gate-rollback (reload) =====
 uci -q show dhcp.@dnsmasq[0]
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 log Warning: failed to restart dnsmasq, DNS-based routing may be stale.
 ip tuntap add mode tun user root name singtun0
 sleep 1s
@@ -330,16 +330,16 @@ ip route replace default dev singtun0 table 100
 ip rule add fwmark 102 lookup 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -349,22 +349,22 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json var/run/homeproxy/sing-box-c.log etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json var/run/homeproxy-pro/sing-box-c.log etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 sing-box version -n
 log sing-box 1.14.0 started.
 prime start rc=127
 log Reloading service...
-config_load homeproxy
-ucode -S etc/homeproxy/scripts/generate_client.uc
+config_load homeproxy-pro
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 log Warning: failed to drop the auto-update cron entry.
 log Warning: failed to restart cron.
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -422,18 +422,18 @@ nft delete set inet fw4 homeproxy_wan_direct_addr_v6
 nft flush set inet fw4 homeproxy_routing_port
 nft delete set inet fw4 homeproxy_routing_port
 fw4 reload
-log Warning: failed to restart dnsmasq after removing the homeproxy snippets.
+log Warning: failed to restart dnsmasq after removing the homeproxy-pro snippets.
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
-config_load homeproxy
+config_load homeproxy-pro
 sing-box version -n
 uname -r
 ip route show default
 ip -6 route show default
 ifstatus wan
-ucode -S etc/homeproxy/scripts/generate_client.uc
+ucode -S etc/homeproxy-pro/scripts/generate_client.uc
 log Warning: failed to restart dnsmasq, DNS-based routing may be stale.
 ip tuntap add mode tun user root name singtun0
 sleep 1s
@@ -442,16 +442,16 @@ ip route replace default dev singtun0 table 100
 ip rule add fwmark 102 lookup 100
 procd_open_instance sing-box-c
 procd_set_param command /usr/bin/sing-box
-procd_append_param command run --config var/run/homeproxy/sing-box-c.json
+procd_append_param command run --config var/run/homeproxy-pro/sing-box-c.json
 procd_add_jail sing-box-c log procfs
-procd_add_jail_mount var/run/homeproxy/sing-box-c.json
-procd_add_jail_mount_rw var/run/homeproxy/sing-box-c.log
-procd_add_jail_mount_rw etc/homeproxy/cache.db
-procd_add_jail_mount etc/homeproxy/certs/
+procd_add_jail_mount var/run/homeproxy-pro/sing-box-c.json
+procd_add_jail_mount_rw var/run/homeproxy-pro/sing-box-c.log
+procd_add_jail_mount_rw etc/homeproxy-pro/cache.db
+procd_add_jail_mount etc/homeproxy-pro/certs/
 procd_add_jail_mount /etc/ssl/
 procd_add_jail_mount /etc/localtime
 procd_add_jail_mount /etc/TZ
-procd_set_param capabilities /etc/capabilities/homeproxy.json
+procd_set_param capabilities /etc/capabilities/homeproxy-pro.json
 procd_set_param no_new_privs 1
 procd_set_param user sing-box
 procd_set_param group sing-box
@@ -461,52 +461,52 @@ procd_set_param stderr 1
 procd_set_param respawn
 procd_close_instance
 procd_open_instance log-cleaner
-procd_set_param command etc/homeproxy/scripts/clean_log.sh
+procd_set_param command etc/homeproxy-pro/scripts/clean_log.sh
 procd_set_param respawn
 procd_close_instance
-chown sing-box:sing-box var/run/homeproxy/sing-box-c.json var/run/homeproxy/sing-box-c.log etc/homeproxy/cache.db
-ucode etc/homeproxy/scripts/firewall_pre.uc
-utpl -S etc/homeproxy/scripts/firewall_post.ut
+chown sing-box:sing-box var/run/homeproxy-pro/sing-box-c.json var/run/homeproxy-pro/sing-box-c.log etc/homeproxy-pro/cache.db
+ucode etc/homeproxy-pro/scripts/firewall_pre.uc
+utpl -S etc/homeproxy-pro/scripts/firewall_post.ut
 fw4 reload
 sing-box version -n
 log sing-box 1.14.0 started.
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
-jsonfilter -e @['homeproxy'].instances['sing-box-c']
+jsonfilter -e @['homeproxy-pro'].instances['sing-box-c']
 jsonfilter -e @.running
 sleep 1
 log Error: sing-box-c did not come up with the new configuration, rolling back.
 log Error: the failing configuration is already the known-good one; nothing to roll back to.
-log Error: rollback was not possible; the service may be down. Check var/run/homeproxy/homeproxy.log.
+log Error: rollback was not possible; the service may be down. Check var/run/homeproxy-pro/homeproxy-pro.log.
 reload_service rc=1
 log Warning: failed to drop the auto-update cron entry.
 log Warning: failed to restart cron.
-config_load homeproxy
+config_load homeproxy-pro
 ip rule del fwmark 101 table 100
 ip route del local 0.0.0.0/0 dev lo table 100
 ip -6 rule del fwmark 101 table 100
@@ -564,15 +564,15 @@ nft delete set inet fw4 homeproxy_wan_direct_addr_v6
 nft flush set inet fw4 homeproxy_routing_port
 nft delete set inet fw4 homeproxy_routing_port
 fw4 reload
-log Warning: failed to restart dnsmasq after removing the homeproxy snippets.
+log Warning: failed to restart dnsmasq after removing the homeproxy-pro snippets.
 log Service stopped.
-config_load homeproxy
+config_load homeproxy-pro
 ip link set singtun0 down
 ip tuntap del mode tun name singtun0
 stop rc=0
-file var/run/homeproxy/fw4_forward.nft: 
-file var/run/homeproxy/fw4_input.nft: 
-file var/run/homeproxy/fw4_post.nft: 
-file var/run/homeproxy/homeproxy.log: 
-file var/run/homeproxy/known-good/sing-box-c.json: {"log":{},"inbounds":[{"tag":"dns-in","listen_port":5333},{"tag":"mixed-in","listen_port":5399}],"outbounds":[]}|
-file etc/homeproxy/cache.db: 
+file var/run/homeproxy-pro/fw4_forward.nft: 
+file var/run/homeproxy-pro/fw4_input.nft: 
+file var/run/homeproxy-pro/fw4_post.nft: 
+file var/run/homeproxy-pro/homeproxy-pro.log: 
+file var/run/homeproxy-pro/known-good/sing-box-c.json: {"log":{},"inbounds":[{"tag":"dns-in","listen_port":5333},{"tag":"mixed-in","listen_port":5399}],"outbounds":[]}|
+file etc/homeproxy-pro/cache.db: 
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-certificate-upload.js b/luci-app-homeproxy-pro/tests/frontend-certificate-upload.js
similarity index 92%
rename from luci-app-homeproxy-pro-pro/tests/frontend-certificate-upload.js
rename to luci-app-homeproxy-pro/tests/frontend-certificate-upload.js
index a9a2c5788..50e706eef 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-certificate-upload.js
+++ b/luci-app-homeproxy-pro/tests/frontend-certificate-upload.js
@@ -14,8 +14,8 @@
  * handler's *first* parameter.  A handler that declares a leading parameter no
  * caller passes therefore shifts everything by one: filename becomes the event
  * object, the path becomes /tmp/homeproxy_cert_[object Event].tmp, and both the
- * ACL whitelist (acl.d/luci-app-homeproxy.json) and certificate_write
- * (luci.homeproxy, which reads /tmp/homeproxy_cert_${filename}.tmp) stop
+ * ACL whitelist (acl.d/luci-app-homeproxy-pro.json) and certificate_write
+ * (luci.homeproxy-pro, which reads /tmp/homeproxy_cert_${filename}.tmp) stop
  * matching.  Every upload fails and the UI only shows a generic error.
  *
  * The unit under test is the *argument alignment*, not the handler body, so
@@ -47,7 +47,7 @@ function check(what, ok, detail) {
 const VIEWS = [ 'node.js', 'server.js' ];
 const calls = [];
 for (const view of VIEWS) {
-	const file = path.join(root, 'htdocs/luci-static/resources/view/homeproxy', view);
+	const file = path.join(root, 'htdocs/luci-static/resources/view/homeproxy-pro', view);
 	const src = fs.readFileSync(file, 'utf8');
 	const re = /L\.bind\(hp\.uploadCertificate[^;]*\)/g;
 	let m;
@@ -76,7 +76,7 @@ function boundArgs(text) {
 
 const parsed = calls.map((c) => ({ ...c, args: boundArgs(c.text) }));
 
-/* --- load homeproxy.js the way LuCI does ---------------------------------- */
+/* --- load homeproxy-pro.js the way LuCI does ---------------------------------- */
 const uploads = [];
 const rpcCalls = [];
 
@@ -101,7 +101,7 @@ const uiStub = {
 };
 
 const hp = loadLuciModule(
-	path.join(root, 'htdocs/luci-static/resources/homeproxy.js'),
+	path.join(root, 'htdocs/luci-static/resources/homeproxy-pro.js'),
 	{
 		baseclass: { extend: (o) => o },
 		form: { DynamicList: { extend: (o) => o } },
@@ -110,7 +110,7 @@ const hp = loadLuciModule(
 	{ L, E: () => null }
 );
 
-check('homeproxy.js exposes uploadCertificate', typeof hp.uploadCertificate === 'function',
+check('homeproxy-pro.js exposes uploadCertificate', typeof hp.uploadCertificate === 'function',
 	typeof hp.uploadCertificate);
 
 /* --- drive each call site the way form.js does ---------------------------- */
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-md5.js b/luci-app-homeproxy-pro/tests/frontend-md5.js
similarity index 97%
rename from luci-app-homeproxy-pro-pro/tests/frontend-md5.js
rename to luci-app-homeproxy-pro/tests/frontend-md5.js
index ff9c82067..99042dbf3 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-md5.js
+++ b/luci-app-homeproxy-pro/tests/frontend-md5.js
@@ -2,7 +2,7 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * homeproxy.js calcStringMD5() must be *the* MD5 of RFC 1321, because its
+ * homeproxy-pro.js calcStringMD5() must be *the* MD5 of RFC 1321, because its
  * output is compared against a value another language computed.
  *
  * The contract, end to end:
@@ -11,7 +11,7 @@
  *                            -> written to UCI as the node's `grouphash`
  *   repository.uc            md5(node.grouphash + label)
  *                            -> the UCI section name of a subscription node
- *   view/homeproxy/node.js   hp.calcStringMD5(suburl.replace(/#.*$/, ''))
+ *   view/homeproxy-pro/node.js   hp.calcStringMD5(suburl.replace(/#.*$/, ''))
  *                            -> matched against `grouphash` to decide which
  *                               subscription tab a section belongs to, and
  *                               whether it is a subscription node at all
@@ -67,7 +67,7 @@ function check(what, ok, detail) {
  * inert set tests/frontend-validators.js uses, since the method touches none
  * of them. */
 const hp = loadLuciModule(
-	path.join(root, 'htdocs/luci-static/resources/homeproxy.js'),
+	path.join(root, 'htdocs/luci-static/resources/homeproxy-pro.js'),
 	{
 		baseclass: { extend: (o) => o },
 		form: { DynamicList: { extend: (o) => o } },
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-protocol-inventory.js b/luci-app-homeproxy-pro/tests/frontend-protocol-inventory.js
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/frontend-protocol-inventory.js
rename to luci-app-homeproxy-pro/tests/frontend-protocol-inventory.js
index 814ed745e..f0b6b3890 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-protocol-inventory.js
+++ b/luci-app-homeproxy-pro/tests/frontend-protocol-inventory.js
@@ -4,7 +4,7 @@
  *
  * Frontend protocol inventory.
  *
- * homeproxy.js carries one ordered `protocols` table and both forms render
+ * homeproxy-pro.js carries one ordered `protocols` table and both forms render
  * their type picker from it.  Before that table existed each form had its own
  * hand-written value list, and they had drifted in ways nothing could catch:
  * `snell` had a complete form block, a CREDENTIALS row and a golden outbound
@@ -41,14 +41,14 @@ const path = require('path');
 const { loadLuciModule } = require('./lib/luci-module.js');
 
 const root = path.resolve(process.argv[2] || '.');
-const scripts = path.join(root, 'root/etc/homeproxy/scripts');
+const scripts = path.join(root, 'root/etc/homeproxy-pro/scripts');
 
 /* The registry is data plus the renderer; loading it through the whole LuCI
  * mock would test the mock.  `protocols` only needs the module to evaluate its
  * top-level statements, so the imports are stubbed just far enough for that. */
 function loadHomeproxy() {
 	return loadLuciModule(
-		path.join(root, 'htdocs/luci-static/resources/homeproxy.js'),
+		path.join(root, 'htdocs/luci-static/resources/homeproxy-pro.js'),
 		{
 			baseclass: { extend: (o) => o },
 			form: { DynamicList: { extend: (o) => o } },
@@ -95,7 +95,7 @@ function check(what, ok, detail) {
 
 const hp = loadHomeproxy();
 const protocols = hp.protocols;
-check('homeproxy.js exports a protocols table', Array.isArray(protocols) && protocols.length > 0);
+check('homeproxy-pro.js exports a protocols table', Array.isArray(protocols) && protocols.length > 0);
 if (!Array.isArray(protocols)) {
 	console.error(`\n${checks} checks, ${failures} failures`);
 	process.exit(1);
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-rpc-fallbacks.js b/luci-app-homeproxy-pro/tests/frontend-rpc-fallbacks.js
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/frontend-rpc-fallbacks.js
rename to luci-app-homeproxy-pro/tests/frontend-rpc-fallbacks.js
index c81f7fd11..28ac251db 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-rpc-fallbacks.js
+++ b/luci-app-homeproxy-pro/tests/frontend-rpc-fallbacks.js
@@ -38,7 +38,7 @@ function check(what, ok, detail) {
 }
 
 const hp = loadLuciModule(
-	path.join(root, 'htdocs/luci-static/resources/homeproxy.js'),
+	path.join(root, 'htdocs/luci-static/resources/homeproxy-pro.js'),
 	{ baseclass: { extend: (o) => o }, form: { DynamicList: { extend: (o) => o } },
 	  fs: {}, rpc: {}, uci: {}, ui: {} });
 
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-rpc-inventory.js b/luci-app-homeproxy-pro/tests/frontend-rpc-inventory.js
similarity index 85%
rename from luci-app-homeproxy-pro-pro/tests/frontend-rpc-inventory.js
rename to luci-app-homeproxy-pro/tests/frontend-rpc-inventory.js
index 427b6c7c3..9524c2986 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-rpc-inventory.js
+++ b/luci-app-homeproxy-pro/tests/frontend-rpc-inventory.js
@@ -4,7 +4,7 @@
  *
  * Frontend RPC boundary.
  *
- * Every backend call goes through `homeproxy.js`'s `rpcCall()`, which is the
+ * Every backend call goes through `homeproxy-pro.js`'s `rpcCall()`, which is the
  * one place that knows how to declare an RPC and what to do when the call does
  * not come back.  Before that, nine call sites used
  * `L.resolveDefault(call(), {})` - which does NOT catch a rejection, it only
@@ -28,11 +28,11 @@ const path = require('path');
 const root = path.resolve(process.argv[2] || '.');
 const res = path.join(root, 'htdocs/luci-static/resources');
 const files = [
-	'homeproxy.js',
-	'view/homeproxy/node.js',
-	'view/homeproxy/client.js',
-	'view/homeproxy/server.js',
-	'view/homeproxy/status.js'
+	'homeproxy-pro.js',
+	'view/homeproxy-pro/node.js',
+	'view/homeproxy-pro/client.js',
+	'view/homeproxy-pro/server.js',
+	'view/homeproxy-pro/status.js'
 ];
 
 let checks = 0, failures = 0;
@@ -44,7 +44,7 @@ function check(what, ok, detail) {
 }
 
 /* Comments have to go before the pattern checks.  A naive grep matched the doc
- * comment in homeproxy.js that quotes the old `L.resolveDefault(call(), {})`
+ * comment in homeproxy-pro.js that quotes the old `L.resolveDefault(call(), {})`
  * idiom - which is exactly the trap the plan records for the Architecture
  * Guard: the check has to talk about code, not about prose describing code.
  * Only block comments are stripped; a `//` stripper would cut real code after a
@@ -60,8 +60,8 @@ for (const f of files)
 /* 1. One declaration site. */
 for (const f of files) {
 	const n = (sources[f].match(/\brpc\.declare\s*\(/g) || []).length;
-	if (f === 'homeproxy.js')
-		check('homeproxy.js declares the RPCs', n === 1, `${n} rpc.declare calls, expected 1 (inside rpcCall)`);
+	if (f === 'homeproxy-pro.js')
+		check('homeproxy-pro.js declares the RPCs', n === 1, `${n} rpc.declare calls, expected 1 (inside rpcCall)`);
 	else
 		check(`${f} declares no RPC of its own`, n === 0, `${n} rpc.declare call(s) outside the shared helper`);
 }
@@ -91,9 +91,9 @@ for (const f of files) {
 }
 
 /* 3. rpcCall itself has to catch, and has to have a fallback. */
-const hp = sources['homeproxy.js'];
+const hp = sources['homeproxy-pro.js'];
 const helper = /rpcCall\s*\(method,\s*args,\s*options\)\s*\{([\s\S]*?)\n\t\}/.exec(hp);
-check('homeproxy.js defines rpcCall', !!helper);
+check('homeproxy-pro.js defines rpcCall', !!helper);
 if (helper) {
 	check('rpcCall catches a failed call', /\.catch\(/.test(helper[1]));
 	check('rpcCall has a fallback for a failed call', /fallback/.test(helper[1]));
@@ -102,14 +102,14 @@ if (helper) {
 
 /* 4. A view that calls rpcCall must import the module that provides it. */
 for (const f of files) {
-	if (f === 'homeproxy.js') continue;
+	if (f === 'homeproxy-pro.js') continue;
 	if (!/\bhp\.rpcCall\s*\(/.test(sources[f])) continue;
-	check(`${f} imports homeproxy for hp.rpcCall`, /'require homeproxy as hp';/.test(sources[f]));
+	check(`${f} imports homeproxy-pro for hp.rpcCall`, /'require homeproxy-pro as hp';/.test(sources[f]));
 }
 
 /* 5. No file keeps an unused `require rpc` after the conversion. */
 for (const f of files) {
-	if (f === 'homeproxy.js') continue;
+	if (f === 'homeproxy-pro.js') continue;
 	const requiresRpc = /'require rpc';/.test(sources[f]);
 	const usesRpc = /\brpc\./.test(sources[f]);
 	check(`${f} has no unused 'require rpc'`, !requiresRpc || usesRpc);
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-title-escaping.js b/luci-app-homeproxy-pro/tests/frontend-title-escaping.js
similarity index 97%
rename from luci-app-homeproxy-pro-pro/tests/frontend-title-escaping.js
rename to luci-app-homeproxy-pro/tests/frontend-title-escaping.js
index d3160d0c5..713394e9d 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-title-escaping.js
+++ b/luci-app-homeproxy-pro/tests/frontend-title-escaping.js
@@ -43,7 +43,7 @@ function check(what, ok, detail) {
  * the test can present a hostile label. */
 let label = null;
 const hp = loadLuciModule(
-	path.join(root, 'htdocs/luci-static/resources/homeproxy.js'),
+	path.join(root, 'htdocs/luci-static/resources/homeproxy-pro.js'),
 	{ baseclass: { extend: (o) => o }, form: { DynamicList: { extend: (o) => o } },
 	  fs: {}, rpc: {}, ui: {},
 	  uci: { get: (_c, _s, o) => (o === 'label' ? label : null) } });
@@ -149,14 +149,14 @@ check('escapeHtml would be unsafe for the modal title (raw tag decoded back)',
 /* loadModalTitle must use the stripTags-aware escape on the label. */
 for (const p of ['&lt;img src=x onerror=alert(1)&gt;', '<img src=x onerror=alert(1)>']) {
 	label = p;
-	const title = hp.loadModalTitle('Node', 'Add', 'homeproxy', 'n1');
+	const title = hp.loadModalTitle('Node', 'Add', 'homeproxy-pro', 'n1');
 	check(`loadModalTitle escapes the label ${JSON.stringify(p)}`,
 		!titleBecomesMarkup(title),
 		`title = ${JSON.stringify(title)} -> ${JSON.stringify(stripTags(title))}`);
 }
 label = null;
 check('loadModalTitle falls back to addtitle without a label',
-	hp.loadModalTitle('Node', 'Add', 'homeproxy', 'n1') === 'Add');
+	hp.loadModalTitle('Node', 'Add', 'homeproxy-pro', 'n1') === 'Add');
 
 /* --- subscriptionInfo: the crash and the tab-title sink ------------------ */
 
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-validators.js b/luci-app-homeproxy-pro/tests/frontend-validators.js
similarity index 95%
rename from luci-app-homeproxy-pro-pro/tests/frontend-validators.js
rename to luci-app-homeproxy-pro/tests/frontend-validators.js
index 7e2d5ef16..693a19c30 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-validators.js
+++ b/luci-app-homeproxy-pro/tests/frontend-validators.js
@@ -42,7 +42,7 @@ function isError(result) {
 }
 
 const hp = loadLuciModule(
-	path.join(root, 'htdocs/luci-static/resources/homeproxy.js'),
+	path.join(root, 'htdocs/luci-static/resources/homeproxy-pro.js'),
 	{
 		baseclass: { extend: (o) => o },
 		form: { DynamicList: { extend: (o) => o } },
@@ -109,13 +109,13 @@ check('validateBase64Key ignores a missing section', hp.validateBase64Key(24, nu
 check('validateBase64Key rejects a value with no padding', isError(hp.validateBase64Key(24, 'sec1', 'A'.repeat(24))));
 
 /* validateCertificatePath: the certificate policy has to be the same list the
- * backend enforces (CERT_PATH_ROOTS in homeproxy.uc; guard 29 compares them
+ * backend enforces (CERT_PATH_ROOTS in homeproxy-pro.uc; guard 29 compares them
  * textually). A path the UI accepts and the backend drops used to make
  * certificate_path null silently, so the TLS listener failed with nothing
  * pointing at the path. The `..` rejection matters on its own: a prefix match
  * alone accepts /etc/ssl/../shadow, and sing-box opens these files as root. */
-check('cert path accepts /etc/homeproxy/certs/',
-	hp.validateCertificatePath('sec1', '/etc/homeproxy/certs/srv.pem') === true);
+check('cert path accepts /etc/homeproxy-pro/certs/',
+	hp.validateCertificatePath('sec1', '/etc/homeproxy-pro/certs/srv.pem') === true);
 check('cert path accepts /etc/acme/',
 	hp.validateCertificatePath('sec1', '/etc/acme/example.com/cert.pem') === true);
 check('cert path accepts /etc/ssl/',
diff --git a/luci-app-homeproxy-pro-pro/tests/frontend-view-wiring.js b/luci-app-homeproxy-pro/tests/frontend-view-wiring.js
similarity index 95%
rename from luci-app-homeproxy-pro-pro/tests/frontend-view-wiring.js
rename to luci-app-homeproxy-pro/tests/frontend-view-wiring.js
index 5bbdd5fe0..40372e2b2 100644
--- a/luci-app-homeproxy-pro-pro/tests/frontend-view-wiring.js
+++ b/luci-app-homeproxy-pro/tests/frontend-view-wiring.js
@@ -19,7 +19,7 @@
  *     routing_mode, so `formvalue()` returned null and the test was always
  *     true: a reset wiped the domain list even in custom mode.
  *
- *  3. view/homeproxy/status.js `getRuntimeLog` must receive each log's
+ *  3. view/homeproxy-pro/status.js `getRuntimeLog` must receive each log's
  *     basename. It used to derive it with `o.option.split('_')[1]`; it is now
  *     the third bound argument, ahead of the framework's
  *     (option_index, section_id, in_table). Shift that by one and the switch
@@ -79,7 +79,7 @@ class MockOption {
 	}
 	depends() {}
 	value() {}
-	cbid(section_id) { return `cbid.homeproxy.${section_id}.${this.__name}`; }
+	cbid(section_id) { return `cbid.homeproxy-pro.${section_id}.${this.__name}`; }
 }
 
 class MockSection {
@@ -147,12 +147,12 @@ const L = { bind: (fn, self, ...bound) => fn.bind(self, ...bound) };
 function testNodesValidator() {
 	const form = makeForm();
 	const nodes = loadLuciModule(
-		path.join(root, 'htdocs/luci-static/resources/view/homeproxy/client/nodes.js'),
+		path.join(root, 'htdocs/luci-static/resources/view/homeproxy-pro/client/nodes.js'),
 		{
 			baseclass: { extend: (o) => o },
 			form,
 			uci: { sections: () => {} },
-			homeproxy: {
+			homeproxy-pro: {
 				CBIStaticList: class {},
 				loadModalTitle: () => '',
 				loadDefaultLabel: () => '',
@@ -204,12 +204,12 @@ function testAccessDomainLists() {
 	const uciStub = { get: () => undefined };
 
 	const access = loadLuciModule(
-		path.join(root, 'htdocs/luci-static/resources/view/homeproxy/client/access.js'),
+		path.join(root, 'htdocs/luci-static/resources/view/homeproxy-pro/client/access.js'),
 		{
 			baseclass: { extend: (o) => o },
 			form,
 			uci: uciStub,
-			homeproxy: {
+			homeproxy-pro: {
 				rpcCall: (method, args) => {
 					writes.push({ method, args });
 					return Promise.resolve({ result: true });
@@ -311,7 +311,7 @@ function testLogViewWiring() {
 	let pollHandlers = null;
 
 	const status = loadLuciModule(
-		path.join(root, 'htdocs/luci-static/resources/view/homeproxy/status.js'),
+		path.join(root, 'htdocs/luci-static/resources/view/homeproxy-pro/status.js'),
 		{
 			baseclass: {},
 			dom: { content: () => {} },
@@ -327,7 +327,7 @@ function testLogViewWiring() {
 				hideModal: () => {}
 			},
 			view: { extend: (o) => o },
-			homeproxy: {
+			homeproxy-pro: {
 				statusPoller: (handlers) => { pollHandlers = handlers; return () => {}; },
 				rpcCall: (method, args) => { rpcCalls.push({ method, args }); return Promise.resolve({}); }
 			}
@@ -338,7 +338,7 @@ function testLogViewWiring() {
 	const section = map.sections[map.sections.length - 1];
 
 	const wanted = [
-		[ '_homeproxy_logview', 'homeproxy' ],
+		[ '_homeproxy_logview', 'homeproxy-pro' ],
 		[ '_sing-box-c_logview', 'sing-box-c' ],
 		[ '_sing-box-s_logview', 'sing-box-s' ]
 	];
@@ -369,7 +369,7 @@ function testLogViewWiring() {
 		 * shifted argument turns it into a label, no case matches, and the
 		 * select disappears. */
 		const select = findTag(tree, 'select');
-		const want_select = basename !== 'homeproxy';
+		const want_select = basename !== 'homeproxy-pro';
 		check(`status.js: ${option_name} log-level select ${want_select ? 'present' : 'absent'}`,
 			(select !== null) === want_select, String(select));
 		if (select)
@@ -387,9 +387,9 @@ function testLogViewWiring() {
 	return Promise.resolve(pollHandlers.read()).then(() => {
 		check('status.js: the poll reads each log by basename',
 			JSON.stringify(reads.slice().sort()) === JSON.stringify([
-				'/var/run/homeproxy/homeproxy.log',
-				'/var/run/homeproxy/sing-box-c.log',
-				'/var/run/homeproxy/sing-box-s.log'
+				'/var/run/homeproxy-pro/homeproxy-pro.log',
+				'/var/run/homeproxy-pro/sing-box-c.log',
+				'/var/run/homeproxy-pro/sing-box-s.log'
 			].sort()),
 			JSON.stringify(reads));
 	});
diff --git a/luci-app-homeproxy-pro-pro/tests/i18n-coverage.py b/luci-app-homeproxy-pro/tests/i18n-coverage.py
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/i18n-coverage.py
rename to luci-app-homeproxy-pro/tests/i18n-coverage.py
index d83735620..c9ae11cad 100755
--- a/luci-app-homeproxy-pro-pro/tests/i18n-coverage.py
+++ b/luci-app-homeproxy-pro/tests/i18n-coverage.py
@@ -3,8 +3,8 @@
 #
 # Copyright (C) 2025 ImmortalWrt.org
 #
-# Report how much of the gettext template (po/templates/homeproxy.pot) is
-# translated in po/zh_Hans/homeproxy.po. Missing, empty and fuzzy entries all
+# Report how much of the gettext template (po/templates/homeproxy-pro.pot) is
+# translated in po/zh_Hans/homeproxy-pro.po. Missing, empty and fuzzy entries all
 # count as untranslated. The check only warns by default so it does not block
 # a build; pass --fail-below to turn the warning into a failure.
 #
@@ -29,8 +29,8 @@ import re
 import sys
 
 ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-TEMPLATE = os.path.join(ROOT, "po/templates/homeproxy.pot")
-TRANSLATION = os.path.join(ROOT, "po/zh_Hans/homeproxy.po")
+TEMPLATE = os.path.join(ROOT, "po/templates/homeproxy-pro.pot")
+TRANSLATION = os.path.join(ROOT, "po/zh_Hans/homeproxy-pro.po")
 IGNORE = os.path.join(ROOT, "tests/i18n-ignore.txt")
 
 # The .pot is generated from the shipped sources and currently parses to 737
diff --git a/luci-app-homeproxy-pro-pro/tests/i18n-ignore.txt b/luci-app-homeproxy-pro/tests/i18n-ignore.txt
similarity index 100%
rename from luci-app-homeproxy-pro-pro/tests/i18n-ignore.txt
rename to luci-app-homeproxy-pro/tests/i18n-ignore.txt
diff --git a/luci-app-homeproxy-pro-pro/tests/json-assets.js b/luci-app-homeproxy-pro/tests/json-assets.js
similarity index 93%
rename from luci-app-homeproxy-pro-pro/tests/json-assets.js
rename to luci-app-homeproxy-pro/tests/json-assets.js
index abc045342..e30ca7122 100644
--- a/luci-app-homeproxy-pro-pro/tests/json-assets.js
+++ b/luci-app-homeproxy-pro/tests/json-assets.js
@@ -17,9 +17,9 @@
  *     view file that exists;
  *   - the ACL declares the same name menu.d depends on, has read and write
  *     sections, lists only string method names, and contains no wildcard;
- *   - capabilities/homeproxy.json has all five sets, with identical contents
+ *   - capabilities/homeproxy-pro.json has all five sets, with identical contents
  *     (they describe one privilege set, not five);
- *   - etc/config/homeproxy is valid UCI: every significant line is a config,
+ *   - etc/config/homeproxy-pro is valid UCI: every significant line is a config,
  *     option or list statement with a balanced quoted value.
  *
  * Usage: node tests/json-assets.js <repo-root>
@@ -68,7 +68,7 @@ for (const f of jsonFiles) {
 
 /* --- menu.d ------------------------------------------------------------- */
 
-const MENU = 'root/usr/share/luci/menu.d/luci-app-homeproxy.json';
+const MENU = 'root/usr/share/luci/menu.d/luci-app-homeproxy-pro.json';
 const menu = parsed[MENU];
 
 if (!menu) {
@@ -93,7 +93,7 @@ else {
 
 /* --- the ACL ------------------------------------------------------------ */
 
-const ACL = 'root/usr/share/rpcd/acl.d/luci-app-homeproxy.json';
+const ACL = 'root/usr/share/rpcd/acl.d/luci-app-homeproxy-pro.json';
 const acl = parsed[ACL];
 
 if (!acl) {
@@ -105,7 +105,7 @@ else {
 
 	/* menu.d gates the page on an ACL name; if they disagree the pages vanish
 	 * for a non-root user even though the ACL itself is fine. */
-	const dependsAcl = menu && menu['admin/services/homeproxy']?.depends?.acl;
+	const dependsAcl = menu && menu['admin/services/homeproxy-pro']?.depends?.acl;
 	if (Array.isArray(dependsAcl)) {
 		for (const d of dependsAcl)
 			check(`menu.d's depends.acl '${d}' exists in acl.d`, names.indexOf(d) !== -1,
@@ -142,7 +142,7 @@ else {
 
 /* --- capabilities ------------------------------------------------------- */
 
-const CAPS = 'root/etc/capabilities/homeproxy.json';
+const CAPS = 'root/etc/capabilities/homeproxy-pro.json';
 const caps = parsed[CAPS];
 
 if (!caps) {
@@ -177,7 +177,7 @@ else {
 
 /* --- the factory UCI config --------------------------------------------- */
 
-const CFG = 'root/etc/config/homeproxy';
+const CFG = 'root/etc/config/homeproxy-pro';
 const cfgLines = fs.readFileSync(path.join(root, CFG), 'utf8').split('\n');
 let cfgStatements = 0;
 
diff --git a/luci-app-homeproxy-pro-pro/tests/lib/luci-module.js b/luci-app-homeproxy-pro/tests/lib/luci-module.js
similarity index 100%
rename from luci-app-homeproxy-pro-pro/tests/lib/luci-module.js
rename to luci-app-homeproxy-pro/tests/lib/luci-module.js
diff --git a/luci-app-homeproxy-pro-pro/tests/luci-form-snapshot.js b/luci-app-homeproxy-pro/tests/luci-form-snapshot.js
similarity index 88%
rename from luci-app-homeproxy-pro-pro/tests/luci-form-snapshot.js
rename to luci-app-homeproxy-pro/tests/luci-form-snapshot.js
index ee95b616c..45419fe37 100644
--- a/luci-app-homeproxy-pro-pro/tests/luci-form-snapshot.js
+++ b/luci-app-homeproxy-pro/tests/luci-form-snapshot.js
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2025 ImmortalWrt.org
  *
- * Dump the LuCI form definition of the homeproxy node/client/server views as
+ * Dump the LuCI form definition of the homeproxy-pro node/client/server views as
  * JSON, using a minimal mock of the LuCI client runtime. It is meant to be run
  * against two checkouts (e.g. HEAD and the working tree) and the resulting
  * snapshots diffed, so that a pure refactor can be proven not to change any
@@ -305,7 +305,7 @@ function main() {
 		throw new Error(`unknown snapshot target: ${target} (expected node|client|server)`);
 
 	const viewDir = path.join(root, 'htdocs/luci-static/resources');
-	const homeproxy = loadLuciModule(path.join(viewDir, 'homeproxy.js'), {});
+	const homeproxy-pro = loadLuciModule(path.join(viewDir, 'homeproxy-pro.js'), {});
 
 	/* Per-tab modules of the client view. Each one is loaded with the deps
 	 * it actually `require`s - the loader rewrites the 'require ... as X;'
@@ -314,29 +314,29 @@ function main() {
 	 * per-tab shape the modules had at the top of client.js before the
 	 * split, plus `common` for the modules that pull in renderRuleSection.
 	 */
-	const tabsBase = { baseclass, homeproxy, form, uci };
+	const tabsBase = { baseclass, homeproxy-pro, form, uci };
 	const tabs = {};
 	if (target === 'client') {
-		const tabDir = path.join(viewDir, 'view/homeproxy/client');
-		tabs['view.homeproxy.client.common']       = loadLuciModule(path.join(tabDir, 'common.js'),
+		const tabDir = path.join(viewDir, 'view/homeproxy-pro/client');
+		tabs['view.homeproxy-pro.client.common']       = loadLuciModule(path.join(tabDir, 'common.js'),
 				{ ...tabsBase });
-		tabs['view.homeproxy.client.routing']      = loadLuciModule(path.join(tabDir, 'routing.js'),
-				{ ...tabsBase, 'view.homeproxy.client.common': tabs['view.homeproxy.client.common'] });
-		tabs['view.homeproxy.client.nodes']        = loadLuciModule(path.join(tabDir, 'nodes.js'),
+		tabs['view.homeproxy-pro.client.routing']      = loadLuciModule(path.join(tabDir, 'routing.js'),
+				{ ...tabsBase, 'view.homeproxy-pro.client.common': tabs['view.homeproxy-pro.client.common'] });
+		tabs['view.homeproxy-pro.client.nodes']        = loadLuciModule(path.join(tabDir, 'nodes.js'),
 				{ ...tabsBase, 'tools.widgets': widgets });
-		tabs['view.homeproxy.client.dns']          = loadLuciModule(path.join(tabDir, 'dns.js'),
-				{ ...tabsBase, 'view.homeproxy.client.common': tabs['view.homeproxy.client.common'] });
-		tabs['view.homeproxy.client.subscription'] = loadLuciModule(path.join(tabDir, 'subscription.js'),
+		tabs['view.homeproxy-pro.client.dns']          = loadLuciModule(path.join(tabDir, 'dns.js'),
+				{ ...tabsBase, 'view.homeproxy-pro.client.common': tabs['view.homeproxy-pro.client.common'] });
+		tabs['view.homeproxy-pro.client.subscription'] = loadLuciModule(path.join(tabDir, 'subscription.js'),
 				{ ...tabsBase });
-		tabs['view.homeproxy.client.access']       = loadLuciModule(path.join(tabDir, 'access.js'),
+		tabs['view.homeproxy-pro.client.access']       = loadLuciModule(path.join(tabDir, 'access.js'),
 				{ ...tabsBase, 'tools.widgets': widgets, 'tools.firewall': deps['tools.firewall'] });
-		tabs['view.homeproxy.client.udp_nat']      = loadLuciModule(path.join(tabDir, 'udp_nat.js'),
+		tabs['view.homeproxy-pro.client.udp_nat']      = loadLuciModule(path.join(tabDir, 'udp_nat.js'),
 				{ ...tabsBase });
-		tabs['view.homeproxy.client.tun_dns']      = loadLuciModule(path.join(tabDir, 'tun_dns.js'),
+		tabs['view.homeproxy-pro.client.tun_dns']      = loadLuciModule(path.join(tabDir, 'tun_dns.js'),
 				{ ...tabsBase });
 	}
 
-	const mod = loadLuciModule(path.join(viewDir, 'view/homeproxy', target + '.js'), { homeproxy, ...tabs });
+	const mod = loadLuciModule(path.join(viewDir, 'view/homeproxy-pro', target + '.js'), { homeproxy-pro, ...tabs });
 
 	const features = {
 		version: '1.14.0',
diff --git a/luci-app-homeproxy-pro-pro/tests/print-stats.sh b/luci-app-homeproxy-pro/tests/print-stats.sh
similarity index 100%
rename from luci-app-homeproxy-pro-pro/tests/print-stats.sh
rename to luci-app-homeproxy-pro/tests/print-stats.sh
diff --git a/luci-app-homeproxy-pro-pro/tests/run.sh b/luci-app-homeproxy-pro/tests/run.sh
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/run.sh
rename to luci-app-homeproxy-pro/tests/run.sh
index bdd9003d2..3faa8bed1 100755
--- a/luci-app-homeproxy-pro-pro/tests/run.sh
+++ b/luci-app-homeproxy-pro/tests/run.sh
@@ -222,7 +222,7 @@ elif [ -n "$HOST" ]; then
 	# package and never runs `apk`/`opkg` on the target.
 	#
 	# That is not a style preference. Running the package manager on a live
-	# device rewrote /etc/config/homeproxy with the feed package's default and
+	# device rewrote /etc/config/homeproxy-pro with the feed package's default and
 	# the user's node configuration was lost; there was no backup and no
 	# snapshot. Staging cannot do that - nothing it writes outlives the run.
 	#
@@ -240,7 +240,7 @@ elif [ -n "$HOST" ]; then
 	# escaping and the first attempt produced "unterminated quoted string".
 	# `apk info -v` prints the description, not the version; `apk list -I` gives
 	# "name-version arch {repo} [installed]".
-	$SSH "$HOST" 'pkg=$(apk list -I luci-app-homeproxy 2>/dev/null | head -1 | cut -d" " -f1); [ -n "$pkg" ] || pkg=$(opkg status luci-app-homeproxy 2>/dev/null | sed -n "s/^Version: //p" | head -1); [ -n "$pkg" ] || pkg="(not installed)"; sb=$(sing-box version 2>/dev/null | sed -n "s/^sing-box version \([0-9][0-9.]*\).*/\1/p" | head -1); echo "  target  : $pkg"; echo "  sing-box: ${sb:-unknown}"' || true
+	$SSH "$HOST" 'pkg=$(apk list -I luci-app-homeproxy-pro 2>/dev/null | head -1 | cut -d" " -f1); [ -n "$pkg" ] || pkg=$(opkg status luci-app-homeproxy-pro 2>/dev/null | sed -n "s/^Version: //p" | head -1); [ -n "$pkg" ] || pkg="(not installed)"; sb=$(sing-box version 2>/dev/null | sed -n "s/^sing-box version \([0-9][0-9.]*\).*/\1/p" | head -1); echo "  target  : $pkg"; echo "  sing-box: ${sb:-unknown}"' || true
 
 	if tar czf - -C "$ROOT" --exclude .git --exclude node_modules . \
 		| $SSH "$HOST" "rm -rf '$REMOTE_DIR' && mkdir -p '$REMOTE_DIR' && tar xzf - -C '$REMOTE_DIR'"; then
diff --git a/luci-app-homeproxy-pro-pro/tests/runtime/test_config_transaction.sh b/luci-app-homeproxy-pro/tests/runtime/test_config_transaction.sh
similarity index 86%
rename from luci-app-homeproxy-pro-pro/tests/runtime/test_config_transaction.sh
rename to luci-app-homeproxy-pro/tests/runtime/test_config_transaction.sh
index e30c2fb2f..c88eafcc5 100644
--- a/luci-app-homeproxy-pro-pro/tests/runtime/test_config_transaction.sh
+++ b/luci-app-homeproxy-pro/tests/runtime/test_config_transaction.sh
@@ -3,7 +3,7 @@
 #
 # Runtime configuration-transaction tests.
 #
-# These cover the pieces init.d/homeproxy relies on so that a bad
+# These cover the pieces init.d/homeproxy-pro relies on so that a bad
 # configuration cannot leave the router without a working service:
 #
 #   * the known-good copy recorded after a configuration passed check
@@ -18,7 +18,7 @@
 
 ROOT="${1:-.}"
 ROOT="$(cd "$ROOT" && pwd)"
-RUNTIME="$ROOT/root/etc/homeproxy/scripts/runtime"
+RUNTIME="$ROOT/root/etc/homeproxy-pro/scripts/runtime"
 
 WORK="$(mktemp -d "${TMPDIR:-/tmp}/hp-runtime.XXXXXX")" || exit 1
 trap 'rm -rf "$WORK"' EXIT INT TERM
@@ -96,7 +96,7 @@ hp_same_file "$LIVE" "$GOOD"
 expect "same_file: missing file is not equal" "$?" "1"
 
 # hp_restore_known_good_uci: the snapshot written by hp_promote_known_good.
-# The init.d/homeproxy rollback path reads $GOOD_DIR/uci-snapshot.txt
+# The init.d/homeproxy-pro rollback path reads $GOOD_DIR/uci-snapshot.txt
 # BEFORE stop;start, otherwise start_service installs the failing layer
 # on top of the rolled-back sing-box bytes (review P1-3, 2026-09-28).
 # The helper itself is a uci loop; we drive it with a stub `uci` so the
@@ -137,43 +137,43 @@ expect "uci restore: missing snapshot returns 1" "$?" "1"
 # with `uci delete` + `uci add_list`.
 : > "$HP_TEST_UCI_OUT"
 write_uci_stub
-printf 'homeproxy.config.proxy_mode=tproxy\n' > "$SNAP"
-printf 'homeproxy.config.routing_mode=bypass_mainland_china\n' >> "$SNAP"
-printf 'homeproxy.infra.self_mark=100\n' >> "$SNAP"
-printf 'homeproxy.infra.tun_name=singtun0\n' >> "$SNAP"
-printf 'homeproxy.infra.tun_addr4=172.16.0.1/30\n' >> "$SNAP"
-printf 'list homeproxy.control.lan_proxy_ipv4_ips=192.168.1.10,192.168.1.11\n' >> "$SNAP"
-printf 'list homeproxy.control.wan_proxy_ipv4_ips=\n' >> "$SNAP"
+printf 'homeproxy-pro.config.proxy_mode=tproxy\n' > "$SNAP"
+printf 'homeproxy-pro.config.routing_mode=bypass_mainland_china\n' >> "$SNAP"
+printf 'homeproxy-pro.infra.self_mark=100\n' >> "$SNAP"
+printf 'homeproxy-pro.infra.tun_name=singtun0\n' >> "$SNAP"
+printf 'homeproxy-pro.infra.tun_addr4=172.16.0.1/30\n' >> "$SNAP"
+printf 'list homeproxy-pro.control.lan_proxy_ipv4_ips=192.168.1.10,192.168.1.11\n' >> "$SNAP"
+printf 'list homeproxy-pro.control.wan_proxy_ipv4_ips=\n' >> "$SNAP"
 PATH="$BIN:$PATH" hp_restore_known_good_uci "$SNAP_DIR"
 expect "uci restore: happy path returns 0" "$?" "0"
 expect "uci restore: 5 scalars applied" \
-	"$(grep -c '^set homeproxy\.' "$HP_TEST_UCI_OUT")" "5"
+	"$(grep -c '^set homeproxy-pro\.' "$HP_TEST_UCI_OUT")" "5"
 expect "uci restore: proxy_mode applied" \
-	"$(grep -c '^set homeproxy.config.proxy_mode=tproxy$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^set homeproxy-pro.config.proxy_mode=tproxy$' "$HP_TEST_UCI_OUT")" "1"
 # The phantom key that used to be in the snapshot: nothing reads
 # `infra.tun_address`, and arch-guard guard 43 now fails if it comes back.
 expect "uci restore: tun_addr4 applied (not the phantom tun_address)" \
-	"$(grep -c '^set homeproxy.infra.tun_addr4=172.16.0.1/30$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^set homeproxy-pro.infra.tun_addr4=172.16.0.1/30$' "$HP_TEST_UCI_OUT")" "1"
 # A list must never go through `uci set`: that would store a string and
 # ipv4_to_nftarr() would return null, silently dropping the ACL rule.
 expect "uci restore: list is deleted before it is re-added" \
-	"$(grep -c '^delete homeproxy.control.lan_proxy_ipv4_ips$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^delete homeproxy-pro.control.lan_proxy_ipv4_ips$' "$HP_TEST_UCI_OUT")" "1"
 expect "uci restore: list elements re-added one by one" \
-	"$(grep -c '^add_list homeproxy.control.lan_proxy_ipv4_ips=' "$HP_TEST_UCI_OUT")" "2"
+	"$(grep -c '^add_list homeproxy-pro.control.lan_proxy_ipv4_ips=' "$HP_TEST_UCI_OUT")" "2"
 expect "uci restore: first list element" \
-	"$(grep -c '^add_list homeproxy.control.lan_proxy_ipv4_ips=192.168.1.10$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^add_list homeproxy-pro.control.lan_proxy_ipv4_ips=192.168.1.10$' "$HP_TEST_UCI_OUT")" "1"
 expect "uci restore: second list element" \
-	"$(grep -c '^add_list homeproxy.control.lan_proxy_ipv4_ips=192.168.1.11$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^add_list homeproxy-pro.control.lan_proxy_ipv4_ips=192.168.1.11$' "$HP_TEST_UCI_OUT")" "1"
 expect "uci restore: no list key is ever passed to uci set" \
 	"$(grep -c '^set list ' "$HP_TEST_UCI_OUT")" "0"
 # An empty recorded list means "absent or empty": the delete is the whole
 # operation, so a list the failing configuration added does not survive.
 expect "uci restore: empty list still dropped" \
-	"$(grep -c '^delete homeproxy.control.wan_proxy_ipv4_ips$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^delete homeproxy-pro.control.wan_proxy_ipv4_ips$' "$HP_TEST_UCI_OUT")" "1"
 expect "uci restore: empty list adds no element" \
-	"$(grep -c '^add_list homeproxy.control.wan_proxy_ipv4_ips=' "$HP_TEST_UCI_OUT")" "0"
-expect "uci restore: commit homeproxy called" \
-	"$(grep -c 'commit homeproxy$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c '^add_list homeproxy-pro.control.wan_proxy_ipv4_ips=' "$HP_TEST_UCI_OUT")" "0"
+expect "uci restore: commit homeproxy-pro called" \
+	"$(grep -c 'commit homeproxy-pro$' "$HP_TEST_UCI_OUT")" "1"
 
 # Empty file: no sets, no commit -> 1.
 : > "$HP_TEST_UCI_OUT"
@@ -186,12 +186,12 @@ expect "uci restore: empty snapshot writes no writes" \
 # Blank lines are skipped.
 : > "$HP_TEST_UCI_OUT"
 printf '\n# comment\n' > "$SNAP"
-printf 'homeproxy.config.proxy_mode=redirect_tproxy\n' >> "$SNAP"
+printf 'homeproxy-pro.config.proxy_mode=redirect_tproxy\n' >> "$SNAP"
 printf '\n\n' >> "$SNAP"
 PATH="$BIN:$PATH" hp_restore_known_good_uci "$SNAP_DIR"
 expect "uci restore: blank lines skipped returns 0" "$?" "0"
 expect "uci restore: only the real key applied" \
-	"$(grep -c 'homeproxy\.' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c 'homeproxy-pro\.' "$HP_TEST_UCI_OUT")" "1"
 
 # uci set succeeds, uci commit fails -> helper returns 1, no commit.
 cat > "$BIN/uci" <<STUB
@@ -204,7 +204,7 @@ esac
 STUB
 chmod +x "$BIN/uci"
 : > "$HP_TEST_UCI_OUT"
-printf 'homeproxy.config.proxy_mode=tproxy\n' > "$SNAP"
+printf 'homeproxy-pro.config.proxy_mode=tproxy\n' > "$SNAP"
 PATH="$BIN:$PATH" hp_restore_known_good_uci "$SNAP_DIR"
 expect "uci restore: failed commit returns 1" "$?" "1"
 # The stub still echoes the failed command (it writes first, then exits
@@ -214,7 +214,7 @@ expect "uci restore: failed commit returns 1" "$?" "1"
 # already says "no commit happened".  The grep here is a sanity probe
 # for the stub itself, not the helper - leave it informational.
 expect "uci restore: stub recorded the failed commit attempt" \
-	"$(grep -c 'commit homeproxy$' "$HP_TEST_UCI_OUT")" "1"
+	"$(grep -c 'commit homeproxy-pro$' "$HP_TEST_UCI_OUT")" "1"
 
 rm -f "$BIN/uci"
 echo "== health probe =="
diff --git a/luci-app-homeproxy-pro-pro/tests/runtime/test_crontab_perms.sh b/luci-app-homeproxy-pro/tests/runtime/test_crontab_perms.sh
similarity index 94%
rename from luci-app-homeproxy-pro-pro/tests/runtime/test_crontab_perms.sh
rename to luci-app-homeproxy-pro/tests/runtime/test_crontab_perms.sh
index b64d3aa8c..2546b7605 100644
--- a/luci-app-homeproxy-pro-pro/tests/runtime/test_crontab_perms.sh
+++ b/luci-app-homeproxy-pro/tests/runtime/test_crontab_perms.sh
@@ -35,17 +35,17 @@ rm -rf "$WORK"
 mkdir -p "$WORK"
 
 # The module is sourced by the init script, which provides log() and CONF.
-CONF="homeproxy"
+CONF="homeproxy-pro"
 log() { printf '%s\n' "$*" >> "$WORK/log"; }
 # shellcheck disable=SC1091
-. "$ROOT/root/etc/homeproxy/scripts/runtime/service.sh"
+. "$ROOT/root/etc/homeproxy-pro/scripts/runtime/service.sh"
 
 CRONTAB="$WORK/crontab"
 
 write_crontab() {
 	cat > "$CRONTAB" <<-'EOF'
 		0 3 * * * root /usr/bin/keep-me
-		30 4 * * * root /etc/homeproxy/scripts/update_subscriptions.uc #homeproxy_autosetup
+		30 4 * * * root /etc/homeproxy-pro/scripts/update_subscriptions.uc #homeproxy_autosetup
 	EOF
 }
 
diff --git a/luci-app-homeproxy-pro-pro/tests/runtime/test_dns_snippets.sh b/luci-app-homeproxy-pro/tests/runtime/test_dns_snippets.sh
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/runtime/test_dns_snippets.sh
rename to luci-app-homeproxy-pro/tests/runtime/test_dns_snippets.sh
index 5fba5299d..655027569 100755
--- a/luci-app-homeproxy-pro-pro/tests/runtime/test_dns_snippets.sh
+++ b/luci-app-homeproxy-pro/tests/runtime/test_dns_snippets.sh
@@ -32,7 +32,7 @@
 
 ROOT="${1:-.}"
 ROOT="$(cd "$ROOT" && pwd)"
-RUNTIME="$ROOT/root/etc/homeproxy/scripts/runtime"
+RUNTIME="$ROOT/root/etc/homeproxy-pro/scripts/runtime"
 
 WORK="${2:-$(mktemp -d "${TMPDIR:-/tmp}/hp-dns-snippets.XXXXXX")}"
 OWN_WORK=0
@@ -77,8 +77,8 @@ mkdir -p "$WORK/init.d" \
          "$WORK/hp/resources" \
          "$WORK/dnsmasq.d"
 
-DNS_DIR="$WORK/dnsmasq.d/dnsmasq-homeproxy.d"
-INCLUDE="$WORK/dnsmasq.d/dnsmasq-homeproxy.conf"
+DNS_DIR="$WORK/dnsmasq.d/dnsmasq-homeproxy-pro.d"
+INCLUDE="$WORK/dnsmasq.d/dnsmasq-homeproxy-pro.conf"
 RESTARTS="$WORK/restarts"
 LOG="$WORK/log"
 
diff --git a/luci-app-homeproxy-pro-pro/tests/runtime/test_health_probe.sh b/luci-app-homeproxy-pro/tests/runtime/test_health_probe.sh
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/runtime/test_health_probe.sh
rename to luci-app-homeproxy-pro/tests/runtime/test_health_probe.sh
index 3784e1f4e..7eb98708d 100755
--- a/luci-app-homeproxy-pro-pro/tests/runtime/test_health_probe.sh
+++ b/luci-app-homeproxy-pro/tests/runtime/test_health_probe.sh
@@ -22,7 +22,7 @@
 
 ROOT="${1:-.}"
 ROOT="$(cd "$ROOT" && pwd)"
-RUNTIME="$ROOT/root/etc/homeproxy/scripts/runtime"
+RUNTIME="$ROOT/root/etc/homeproxy-pro/scripts/runtime"
 
 WORK="$(mktemp -d "${TMPDIR:-/tmp}/hp-probes.XXXXXX")" || exit 1
 trap 'rm -rf "$WORK"' EXIT INT TERM
diff --git a/luci-app-homeproxy-pro-pro/tests/runtime/test_resource_update.sh b/luci-app-homeproxy-pro/tests/runtime/test_resource_update.sh
similarity index 93%
rename from luci-app-homeproxy-pro-pro/tests/runtime/test_resource_update.sh
rename to luci-app-homeproxy-pro/tests/runtime/test_resource_update.sh
index e3425b7fe..a1f28815f 100755
--- a/luci-app-homeproxy-pro-pro/tests/runtime/test_resource_update.sh
+++ b/luci-app-homeproxy-pro/tests/runtime/test_resource_update.sh
@@ -48,8 +48,8 @@ expect() {
 }
 
 # --- stage the script and its helper ----------------------------------------
-cp "$ROOT/root/etc/homeproxy/scripts/update_resources.sh" "$WORK/scripts/"
-cp "$ROOT/root/etc/homeproxy/scripts/resource_blob_sha.uc" "$WORK/scripts/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/update_resources.sh" "$WORK/scripts/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/resource_blob_sha.uc" "$WORK/scripts/"
 
 # Rewrite the two absolute runtime paths. The anchors are asserted below: a sed
 # that quietly stopped matching would leave the test writing to /etc.
@@ -181,7 +181,7 @@ run_case() {
 reset_state() {
 	printf 'stale-installed-copy\n' > "$WORK/resources/china_ip4.txt"
 	printf 'OLDVERSION' > "$WORK/resources/china_ip4.ver"
-	rm -f "$WORK/run/homeproxy.log" "$WORK/resources/china_ip4.updated_at"
+	rm -f "$WORK/run/homeproxy-pro.log" "$WORK/resources/china_ip4.updated_at"
 }
 
 echo "== case 1: the digest matches -> installed =="
@@ -192,7 +192,7 @@ expect "the new list was installed" "$(cat "$WORK/resources/china_ip4.txt")" "fr
 expect "the .ver was advanced to the resolved commit" \
 	"$(cat "$WORK/resources/china_ip4.ver")" "2026-01-02 $API_SHA"
 expect "the success is logged" \
-	"$(grep -c 'Successfully updated via' "$WORK/run/homeproxy.log")" "1"
+	"$(grep -c 'Successfully updated via' "$WORK/run/homeproxy-pro.log")" "1"
 
 echo "== case 2: the digest differs -> refused, previous state kept =="
 reset_state
@@ -203,7 +203,7 @@ expect "the installed list is untouched" \
 expect "the .ver is untouched" "$(cat "$WORK/resources/china_ip4.ver")" "OLDVERSION"
 expect "no .updated_at was written" "$([ -e "$WORK/resources/china_ip4.updated_at" ] && echo yes || echo no)" "no"
 expect "the refusal is logged with both ids" \
-	"$(grep -c "does not match the content of commit $API_SHA" "$WORK/run/homeproxy.log")" "1"
+	"$(grep -c "does not match the content of commit $API_SHA" "$WORK/run/homeproxy-pro.log")" "1"
 expect "the downloaded copy was discarded" "$([ -e "$WORK/run/ipv4.txt" ] && echo yes || echo no)" "no"
 
 echo "== case 3: no blob id from the API -> refused =="
@@ -214,12 +214,12 @@ expect "the installed list is untouched" \
 	"$(cat "$WORK/resources/china_ip4.txt")" "stale-installed-copy"
 expect "the .ver is untouched" "$(cat "$WORK/resources/china_ip4.ver")" "OLDVERSION"
 expect "the reason is logged" \
-	"$(grep -c 'GitHub reports no blob id' "$WORK/run/homeproxy.log")" "1"
+	"$(grep -c 'GitHub reports no blob id' "$WORK/run/homeproxy-pro.log")" "1"
 # Not merely "it refused": with the API check skipped, the comparison still
 # refuses (an empty API id never equals a real one), so without this the check
 # could be deleted and the case would still pass on the wrong reason.
 expect "the API-missing path is the one taken" \
-	"$(grep -c 'does not match the content of commit' "$WORK/run/homeproxy.log")" "0"
+	"$(grep -c 'does not match the content of commit' "$WORK/run/homeproxy-pro.log")" "0"
 
 echo "== case 4: no local digest -> refused =="
 reset_state
@@ -228,20 +228,20 @@ expect "exit status non-zero" "$rc" "1"
 expect "the installed list is untouched" \
 	"$(cat "$WORK/resources/china_ip4.txt")" "stale-installed-copy"
 expect "the reason is logged" \
-	"$(grep -c 'cannot compute the blob id' "$WORK/run/homeproxy.log")" "1"
+	"$(grep -c 'cannot compute the blob id' "$WORK/run/homeproxy-pro.log")" "1"
 expect "the local-digest path is the one taken" \
-	"$(grep -c 'does not match the content of commit' "$WORK/run/homeproxy.log")" "0"
+	"$(grep -c 'does not match the content of commit' "$WORK/run/homeproxy-pro.log")" "0"
 
 echo "== case 5: already at the resolved commit -> nothing downloaded =="
 reset_state
 printf '2026-01-02 %s' "$API_SHA" > "$WORK/resources/china_ip4.ver"
-: > "$WORK/run/homeproxy.log"
+: > "$WORK/run/homeproxy-pro.log"
 rc="$(run_case "$LOCAL_SHA" "$LOCAL_SHA")"
 expect "exit status 3 (up to date)" "$rc" "3"
 expect "the installed list is untouched" \
 	"$(cat "$WORK/resources/china_ip4.txt")" "stale-installed-copy"
 expect "it says so in the log" \
-	"$(grep -c 'already at the latest version' "$WORK/run/homeproxy.log")" "1"
+	"$(grep -c 'already at the latest version' "$WORK/run/homeproxy-pro.log")" "1"
 
 printf '%d checks, %d failures\n' "$CHECKS" "$FAILURES"
 if [ "$FAILED" != "0" ]; then
diff --git a/luci-app-homeproxy-pro-pro/tests/runtime/test_runtime_extraction.sh b/luci-app-homeproxy-pro/tests/runtime/test_runtime_extraction.sh
similarity index 94%
rename from luci-app-homeproxy-pro-pro/tests/runtime/test_runtime_extraction.sh
rename to luci-app-homeproxy-pro/tests/runtime/test_runtime_extraction.sh
index b53f8a7ae..bcc8c3d1f 100644
--- a/luci-app-homeproxy-pro-pro/tests/runtime/test_runtime_extraction.sh
+++ b/luci-app-homeproxy-pro/tests/runtime/test_runtime_extraction.sh
@@ -3,7 +3,7 @@
 #
 # Runtime orchestration trace test.
 #
-# Drives root/etc/init.d/homeproxy through a stubbed environment and records
+# Drives root/etc/init.d/homeproxy-pro through a stubbed environment and records
 # exactly what the orchestration does: which commands run, in what order, with
 # which arguments, and which files end up where.  The trace is compared against
 # tests/fixtures/runtime/trace.golden.txt.
@@ -126,9 +126,9 @@ cleanup() {
 trap cleanup EXIT INT TERM
 
 ROOT="$(cd "$ROOT" && pwd)"
-SCRIPTS="$ROOT/root/etc/homeproxy/scripts"
+SCRIPTS="$ROOT/root/etc/homeproxy-pro/scripts"
 GOLDEN="${HP_GOLDEN:-$ROOT/tests/fixtures/runtime/trace.golden.txt}"
-INITD="${HP_INITD:-$ROOT/root/etc/init.d/homeproxy}"
+INITD="${HP_INITD:-$ROOT/root/etc/init.d/homeproxy-pro}"
 
 TRACE="$WORK/trace.txt"
 SANDBOX="$WORK/box"
@@ -138,9 +138,9 @@ BIN="$WORK/bin"
 DNSMASQ_CONF="/tmp/etc/dnsmasq.conf.hp_test"
 
 rm -rf "$WORK"
-mkdir -p "$SANDBOX/etc/homeproxy/scripts/runtime" \
-         "$SANDBOX/etc/homeproxy/resources" \
-         "$SANDBOX/var/run/homeproxy" \
+mkdir -p "$SANDBOX/etc/homeproxy-pro/scripts/runtime" \
+         "$SANDBOX/etc/homeproxy-pro/resources" \
+         "$SANDBOX/var/run/homeproxy-pro" \
          "$SANDBOX/dnsmasq" \
          "$SANDBOX/sbin" \
          "$SANDBOX/init.d" \
@@ -167,13 +167,13 @@ EOF
 done
 
 # --- the payload the init script expects ---------------------------------
-cp "$SCRIPTS/runtime/"*.sh "$SANDBOX/etc/homeproxy/scripts/runtime/"
-cp "$SCRIPTS/fw4_names.sh" "$SANDBOX/etc/homeproxy/scripts/fw4_names.sh"
+cp "$SCRIPTS/runtime/"*.sh "$SANDBOX/etc/homeproxy-pro/scripts/runtime/"
+cp "$SCRIPTS/fw4_names.sh" "$SANDBOX/etc/homeproxy-pro/scripts/fw4_names.sh"
 # One line each is enough: the snippet generator rewrites these lists, it
 # does not parse them.
-printf 'example.com\nfoo.example.org\n' > "$SANDBOX/etc/homeproxy/resources/gfw_list.txt"
-printf 'example.cn\n' > "$SANDBOX/etc/homeproxy/resources/china_list.txt"
-printf 'proxy.example.net\n' > "$SANDBOX/etc/homeproxy/resources/proxy_list.txt"
+printf 'example.com\nfoo.example.org\n' > "$SANDBOX/etc/homeproxy-pro/resources/gfw_list.txt"
+printf 'example.cn\n' > "$SANDBOX/etc/homeproxy-pro/resources/china_list.txt"
+printf 'proxy.example.net\n' > "$SANDBOX/etc/homeproxy-pro/resources/proxy_list.txt"
 # Makes the conf-dir resolver take its success path.
 mkdir -p "$(dirname "$DNSMASQ_CONF")"
 printf 'conf-dir=%s\n' "$SANDBOX/dnsmasq" > "$DNSMASQ_CONF"
@@ -468,17 +468,17 @@ run_scenario() {
 	scenario="$1"; shift
 	action="$1"; shift
 
-	rm -rf "$SANDBOX/var/run/homeproxy" "$SANDBOX/dnsmasq/dnsmasq-homeproxy.d" \
-	       "$SANDBOX/dnsmasq/dnsmasq-homeproxy.conf" "$SANDBOX/etc/homeproxy/cache.db" \
-	       "$SANDBOX/etc/homeproxy/ruleset" "$SANDBOX/etc/homeproxy/certs"
-	mkdir -p "$SANDBOX/var/run/homeproxy" "$SANDBOX/dnsmasq"
+	rm -rf "$SANDBOX/var/run/homeproxy-pro" "$SANDBOX/dnsmasq/dnsmasq-homeproxy-pro.d" \
+	       "$SANDBOX/dnsmasq/dnsmasq-homeproxy-pro.conf" "$SANDBOX/etc/homeproxy-pro/cache.db" \
+	       "$SANDBOX/etc/homeproxy-pro/ruleset" "$SANDBOX/etc/homeproxy-pro/certs"
+	mkdir -p "$SANDBOX/var/run/homeproxy-pro" "$SANDBOX/dnsmasq"
 
 	printf '\n===== scenario: %s (%s) =====\n' "$scenario" "$action" >> "$TRACE"
 
 	(
 		PATH="$BIN:$PATH"; export PATH
 		TRACE="$TRACE"; export TRACE
-		HP_TEST_RUN_DIR="$SANDBOX/var/run/homeproxy"; export HP_TEST_RUN_DIR
+		HP_TEST_RUN_DIR="$SANDBOX/var/run/homeproxy-pro"; export HP_TEST_RUN_DIR
 
 		# harness.sh assigns the fixture defaults, so it has to be sourced
 		# BEFORE the per-scenario overrides - the other order silently
@@ -502,9 +502,9 @@ run_scenario() {
 		# lands as root:0600 and the jailed server needs it handed to the
 		# sing-box user, or it cannot start.
 		if [ "$HP_CFG_server_enabled" = "1" ]; then
-			mkdir -p "$SANDBOX/etc/homeproxy/certs"
+			mkdir -p "$SANDBOX/etc/homeproxy-pro/certs"
 			printf '%s\n' '-----BEGIN PRIVATE KEY-----' \
-				> "$SANDBOX/etc/homeproxy/certs/server_privatekey.pem"
+				> "$SANDBOX/etc/homeproxy-pro/certs/server_privatekey.pem"
 		fi
 
 		. "$WORK/initd.sh"
@@ -553,11 +553,11 @@ run_scenario() {
 
 	# Record the files that ended up in the output directories, with
 	# contents, so a changed snippet or a lost known-good copy is visible.
-	for f in "$SANDBOX/var/run/homeproxy"/* \
-	         "$SANDBOX/var/run/homeproxy/known-good"/* \
-	         "$SANDBOX/etc/homeproxy/cache.db" \
+	for f in "$SANDBOX/var/run/homeproxy-pro"/* \
+	         "$SANDBOX/var/run/homeproxy-pro/known-good"/* \
+	         "$SANDBOX/etc/homeproxy-pro/cache.db" \
 	         "$SANDBOX/dnsmasq"/* \
-	         "$SANDBOX/dnsmasq/dnsmasq-homeproxy.d"/*; do
+	         "$SANDBOX/dnsmasq/dnsmasq-homeproxy-pro.d"/*; do
 		[ -f "$f" ] || continue
 		printf 'file %s: ' "${f#"$SANDBOX"/}" >> "$TRACE"
 		tr '\n' '|' < "$f" >> "$TRACE"
@@ -587,17 +587,17 @@ sandbox_paths() {
 	    "$1" > "$1.tmp" && mv "$1.tmp" "$1"
 }
 
-sed -e "s#^HP_DIR=\"/etc/homeproxy\"#HP_DIR=\"$SANDBOX/etc/homeproxy\"#" \
-    -e "s#^RUN_DIR=\"/var/run/homeproxy\"#RUN_DIR=\"$SANDBOX/var/run/homeproxy\"#" \
+sed -e "s#^HP_DIR=\"/etc/homeproxy-pro\"#HP_DIR=\"$SANDBOX/etc/homeproxy-pro\"#" \
+    -e "s#^RUN_DIR=\"/var/run/homeproxy-pro\"#RUN_DIR=\"$SANDBOX/var/run/homeproxy-pro\"#" \
     "$INITD" > "$WORK/initd.sh"
 sandbox_paths "$WORK/initd.sh"
 
-for module in "$SANDBOX/etc/homeproxy/scripts/runtime"/*.sh; do
+for module in "$SANDBOX/etc/homeproxy-pro/scripts/runtime"/*.sh; do
 	sandbox_paths "$module"
 done
 
-for anchor in "HP_DIR=\"$SANDBOX/etc/homeproxy\"" \
-              "RUN_DIR=\"$SANDBOX/var/run/homeproxy\""; do
+for anchor in "HP_DIR=\"$SANDBOX/etc/homeproxy-pro\"" \
+              "RUN_DIR=\"$SANDBOX/var/run/homeproxy-pro\""; do
 	if ! grep -qF "$anchor" "$WORK/initd.sh"; then
 		echo "FAIL: could not sandbox $INITD - missing anchor: $anchor"
 		
@@ -608,7 +608,7 @@ done
 
 for anchor in "$SANDBOX/sbin/ujail" "$SANDBOX/init.d/dnsmasq" "$SANDBOX/init.d/cron" \
               "$SANDBOX/etc/crontabs/root"; do
-	if ! grep -qF "$anchor" "$WORK/initd.sh" "$SANDBOX/etc/homeproxy/scripts/runtime"/*.sh; then
+	if ! grep -qF "$anchor" "$WORK/initd.sh" "$SANDBOX/etc/homeproxy-pro/scripts/runtime"/*.sh; then
 		echo "FAIL: could not sandbox $anchor - the trace would depend on the host"
 		rm -f "$DNSMASQ_CONF"
 		exit 1
@@ -755,7 +755,7 @@ fi
 # the bytes that were checked. Counted inside the reload rather than over the
 # whole scenario, because the priming start legitimately generates once itself.
 reload_generates=$(awk '/^log Reloading service\.\.\.$/,/^reload_service rc=/' "$TRACE.norm" \
-	| grep -c '^ucode -S etc/homeproxy/scripts/generate_client\.uc$')
+	| grep -c '^ucode -S etc/homeproxy-pro/scripts/generate_client\.uc$')
 if [ "$reload_generates" = "1" ]; then
 	echo "PASS: a reload generates the client configuration exactly once"
 else
@@ -786,7 +786,7 @@ else
 fi
 
 if awk '/^===== scenario: G-start-health-gate-failure/,/^===== scenario: H-/' "$TRACE.norm" \
-	| grep -q "^file var/run/homeproxy/known-good/"; then
+	| grep -q "^file var/run/homeproxy-pro/known-good/"; then
 	echo "FAIL: a start that failed the health gate recorded a known-good configuration"
 	exit 1
 else
@@ -811,7 +811,7 @@ fi
 # dump holds 5398 the failed start promoted over it, if it holds anything else
 # the previous known-good survived - which is the required behaviour.
 if awk "$SCEN_I,0" "$TRACE.norm" \
-	| grep '^file var/run/homeproxy/known-good/sing-box-c.json:' \
+	| grep '^file var/run/homeproxy-pro/known-good/sing-box-c.json:' \
 	| grep -q '5398'; then
 	echo "FAIL: a start whose DNS snippets did not install recorded a known-good configuration"
 	exit 1
@@ -854,7 +854,7 @@ else
 fi
 
 if awk '/^===== scenario: H-start-disables-client/,0' "$TRACE.norm" \
-	| grep -q "^file dnsmasq/dnsmasq-homeproxy"; then
+	| grep -q "^file dnsmasq/dnsmasq-homeproxy-pro"; then
 	echo "FAIL: the dnsmasq snippets survived the client being switched off"
 	awk '/^===== scenario: H-start-disables-client/,0' "$TRACE.norm" | grep "^file dnsmasq"
 	exit 1
diff --git a/luci-app-homeproxy-pro-pro/tests/snapshots/client.json b/luci-app-homeproxy-pro/tests/snapshots/client.json
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/snapshots/client.json
rename to luci-app-homeproxy-pro/tests/snapshots/client.json
index cba451f1f..4cc8c260b 100644
--- a/luci-app-homeproxy-pro-pro/tests/snapshots/client.json
+++ b/luci-app-homeproxy-pro/tests/snapshots/client.json
@@ -357,11 +357,11 @@
 								"description": "TCP/IP stack.",
 								"depends": [
 									[
-										"homeproxy.config.proxy_mode",
+										"homeproxy-pro.config.proxy_mode",
 										"redirect_tun"
 									],
 									[
-										"homeproxy.config.proxy_mode",
+										"homeproxy-pro.config.proxy_mode",
 										"tun"
 									]
 								],
@@ -414,15 +414,15 @@
 								"description": "In seconds.",
 								"depends": [
 									[
-										"homeproxy.config.proxy_mode",
+										"homeproxy-pro.config.proxy_mode",
 										"redirect_tproxy"
 									],
 									[
-										"homeproxy.config.proxy_mode",
+										"homeproxy-pro.config.proxy_mode",
 										"redirect_tun"
 									],
 									[
-										"homeproxy.config.proxy_mode",
+										"homeproxy-pro.config.proxy_mode",
 										"tun"
 									]
 								],
@@ -547,9 +547,9 @@
 								"values": [],
 								"subsection": null,
 								"props": {
-									"load": "bind(206:006f14096ca5;\"homeproxy\")",
+									"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 									"modalonly": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"routing_node\",\"label\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"routing_node\",\"label\")"
 								}
 							},
 							{
@@ -580,7 +580,7 @@
 								"subsection": null,
 								"props": {
 									"editable": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"routing_node\",\"node\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"routing_node\",\"node\")"
 								}
 							},
 							{
@@ -837,9 +837,9 @@
 								"values": [],
 								"subsection": null,
 								"props": {
-									"load": "bind(206:006f14096ca5;\"homeproxy\")",
+									"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 									"modalonly": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"routing_rule\",\"label\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"routing_rule\",\"label\")"
 								}
 							},
 							{
@@ -1901,9 +1901,9 @@
 								"values": [],
 								"subsection": null,
 								"props": {
-									"load": "bind(206:006f14096ca5;\"homeproxy\")",
+									"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 									"modalonly": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"dns_server\",\"label\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"dns_server\",\"label\")"
 								}
 							},
 							{
@@ -2170,9 +2170,9 @@
 								"values": [],
 								"subsection": null,
 								"props": {
-									"load": "bind(206:006f14096ca5;\"homeproxy\")",
+									"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 									"modalonly": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"dns_rule\",\"label\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"dns_rule\",\"label\")"
 								}
 							},
 							{
@@ -3102,9 +3102,9 @@
 								"values": [],
 								"subsection": null,
 								"props": {
-									"load": "bind(206:006f14096ca5;\"homeproxy\")",
+									"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 									"modalonly": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"ruleset\",\"label\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"ruleset\",\"label\")"
 								}
 							},
 							{
@@ -3180,7 +3180,7 @@
 								"props": {
 									"datatype": "file",
 									"modalonly": true,
-									"placeholder": "/etc/homeproxy/ruleset/example.json",
+									"placeholder": "/etc/homeproxy-pro/ruleset/example.json",
 									"rmempty": false
 								}
 							},
@@ -3577,7 +3577,7 @@
 								"depends": [
 									{
 										"lan_proxy_mode": "except_listed",
-										"homeproxy.config.ipv6_support": "1"
+										"homeproxy-pro.config.ipv6_support": "1"
 									}
 								],
 								"values": [],
@@ -3622,7 +3622,7 @@
 								"depends": [
 									{
 										"lan_proxy_mode": "listed_only",
-										"homeproxy.config.ipv6_support": "1"
+										"homeproxy-pro.config.ipv6_support": "1"
 									}
 								],
 								"values": [],
@@ -3661,7 +3661,7 @@
 								"description": "Gaming mode IPv6 IP-s",
 								"depends": [
 									[
-										"homeproxy.config.ipv6_support",
+										"homeproxy-pro.config.ipv6_support",
 										"1"
 									]
 								],
@@ -3686,7 +3686,7 @@
 								"description": "Global proxy IPv4 IP-s",
 								"depends": [
 									{
-										"homeproxy.config.routing_mode": "custom",
+										"homeproxy-pro.config.routing_mode": "custom",
 										"!reverse": true
 									}
 								],
@@ -3701,8 +3701,8 @@
 								"description": "Global proxy IPv6 IP-s",
 								"depends": [
 									{
-										"homeproxy.config.routing_mode": {},
-										"homeproxy.config.ipv6_support": "1"
+										"homeproxy-pro.config.routing_mode": {},
+										"homeproxy-pro.config.ipv6_support": "1"
 									}
 								],
 								"values": [],
@@ -3716,7 +3716,7 @@
 								"description": "Global proxy MAC-s",
 								"depends": [
 									{
-										"homeproxy.config.routing_mode": "custom",
+										"homeproxy-pro.config.routing_mode": "custom",
 										"!reverse": true
 									}
 								],
@@ -3743,7 +3743,7 @@
 								"description": null,
 								"depends": [
 									[
-										"homeproxy.config.ipv6_support",
+										"homeproxy-pro.config.ipv6_support",
 										"1"
 									]
 								],
@@ -3772,7 +3772,7 @@
 								"description": null,
 								"depends": [
 									[
-										"homeproxy.config.ipv6_support",
+										"homeproxy-pro.config.ipv6_support",
 										"1"
 									]
 								],
@@ -3788,7 +3788,7 @@
 								"description": null,
 								"depends": [
 									{
-										"homeproxy.config.routing_mode": "custom",
+										"homeproxy-pro.config.routing_mode": "custom",
 										"!reverse": true
 									}
 								],
@@ -3811,7 +3811,7 @@
 								"description": null,
 								"depends": [
 									{
-										"homeproxy.config.routing_mode": "custom",
+										"homeproxy-pro.config.routing_mode": "custom",
 										"!reverse": true
 									}
 								],
diff --git a/luci-app-homeproxy-pro-pro/tests/snapshots/generator/inbounds.json b/luci-app-homeproxy-pro/tests/snapshots/generator/inbounds.json
similarity index 100%
rename from luci-app-homeproxy-pro-pro/tests/snapshots/generator/inbounds.json
rename to luci-app-homeproxy-pro/tests/snapshots/generator/inbounds.json
diff --git a/luci-app-homeproxy-pro-pro/tests/snapshots/generator/outbounds.json b/luci-app-homeproxy-pro/tests/snapshots/generator/outbounds.json
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/snapshots/generator/outbounds.json
rename to luci-app-homeproxy-pro/tests/snapshots/generator/outbounds.json
index 8a632b6fc..42bd290a4 100644
--- a/luci-app-homeproxy-pro-pro/tests/snapshots/generator/outbounds.json
+++ b/luci-app-homeproxy-pro/tests/snapshots/generator/outbounds.json
@@ -243,7 +243,7 @@
 		"private_key": "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\nQyNTUxOQAAACAY0ADv5F4CV2TlGkNg2c3z3zBfeCDjLEusnrtYyxjNpAAAAJgit4/AIreP\nwAAAAAtzc2gtZWQyNTUxOQAAACAY0ADv5F4CV2TlGkNg2c3z3zBfeCDjLEusnrtYyxjNpA\nAAAEC4rRAsuFAQRHkpIDid/Cj0n1PS6o88D3xsDoYkDUVx0xjQAO/kXgJXZOUaQ2DZzfPf\nMF94IOMsS6yeu1jLGM2kAAAADmhvbWVwcm94eS10ZXN0AQIDBAUGBw==\n-----END OPENSSH PRIVATE KEY-----",
 		"client_version": "SSH-2.0-OpenSSH_8.9p1",
 		"host_key": [
-			"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjQAO/kXgJXZOUaQ2DZzfPfMF94IOMsS6yeu1jLGM2k homeproxy-test"
+			"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBjQAO/kXgJXZOUaQ2DZzfPfMF94IOMsS6yeu1jLGM2k homeproxy-pro-test"
 		],
 		"host_key_algorithms": [
 			"ssh-ed25519"
diff --git a/luci-app-homeproxy-pro-pro/tests/snapshots/node.json b/luci-app-homeproxy-pro/tests/snapshots/node.json
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/snapshots/node.json
rename to luci-app-homeproxy-pro/tests/snapshots/node.json
index 805d82afe..2f9e56dda 100644
--- a/luci-app-homeproxy-pro-pro/tests/snapshots/node.json
+++ b/luci-app-homeproxy-pro/tests/snapshots/node.json
@@ -52,9 +52,9 @@
 								"values": [],
 								"subsection": null,
 								"props": {
-									"load": "bind(206:006f14096ca5;\"homeproxy\")",
+									"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 									"modalonly": true,
-									"validate": "bind(461:3a6d28762720;\"homeproxy\",\"node\",\"label\")"
+									"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"node\",\"label\")"
 								}
 							},
 							{
@@ -2268,7 +2268,7 @@
 								],
 								"values": [
 									[
-										"/etc/homeproxy/certs/client_ca.pem",
+										"/etc/homeproxy-pro/certs/client_ca.pem",
 										null
 									]
 								],
@@ -2287,7 +2287,7 @@
 								"depends": [
 									{
 										"tls_self_sign": "1",
-										"tls_cert_path": "/etc/homeproxy/certs/client_ca.pem"
+										"tls_cert_path": "/etc/homeproxy-pro/certs/client_ca.pem"
 									}
 								],
 								"values": [],
@@ -2329,7 +2329,7 @@
 								],
 								"values": [
 									[
-										"/etc/homeproxy/certs/client_ech_conf.pem",
+										"/etc/homeproxy-pro/certs/client_ech_conf.pem",
 										null
 									]
 								],
@@ -2347,7 +2347,7 @@
 								"depends": [
 									{
 										"tls_ech": "1",
-										"tls_ech_config_path": "/etc/homeproxy/certs/client_ech_conf.pem"
+										"tls_ech_config_path": "/etc/homeproxy-pro/certs/client_ech_conf.pem"
 									}
 								],
 								"values": [],
diff --git a/luci-app-homeproxy-pro-pro/tests/snapshots/server.json b/luci-app-homeproxy-pro/tests/snapshots/server.json
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/snapshots/server.json
rename to luci-app-homeproxy-pro/tests/snapshots/server.json
index 255df7d13..b098bba1e 100644
--- a/luci-app-homeproxy-pro-pro/tests/snapshots/server.json
+++ b/luci-app-homeproxy-pro/tests/snapshots/server.json
@@ -43,10 +43,10 @@
 					"values": [],
 					"subsection": null,
 					"props": {
-						"load": "bind(206:006f14096ca5;\"homeproxy\")",
+						"load": "bind(206:006f14096ca5;\"homeproxy-pro\")",
 						"modalonly": true,
 						"rmempty": false,
-						"validate": "bind(461:3a6d28762720;\"homeproxy\",\"server\",\"label\")"
+						"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"server\",\"label\")"
 					}
 				},
 				{
@@ -163,7 +163,7 @@
 					"subsection": null,
 					"props": {
 						"datatype": "port",
-						"validate": "bind(461:3a6d28762720;\"homeproxy\",\"server\",\"port\")"
+						"validate": "bind(461:3a6d28762720;\"homeproxy-pro\",\"server\",\"port\")"
 					}
 				},
 				{
@@ -1955,7 +1955,7 @@
 					],
 					"values": [
 						[
-							"/etc/homeproxy/certs/server_publickey.pem",
+							"/etc/homeproxy-pro/certs/server_publickey.pem",
 							null
 						]
 					],
@@ -1974,7 +1974,7 @@
 					"depends": [
 						{
 							"tls": "1",
-							"tls_cert_path": "/etc/homeproxy/certs/server_publickey.pem"
+							"tls_cert_path": "/etc/homeproxy-pro/certs/server_publickey.pem"
 						}
 					],
 					"values": [],
@@ -2015,7 +2015,7 @@
 					],
 					"values": [
 						[
-							"/etc/homeproxy/certs/server_privatekey.pem",
+							"/etc/homeproxy-pro/certs/server_privatekey.pem",
 							null
 						]
 					],
@@ -2034,7 +2034,7 @@
 					"depends": [
 						{
 							"tls": "1",
-							"tls_key_path": "/etc/homeproxy/certs/server_privatekey.pem"
+							"tls_key_path": "/etc/homeproxy-pro/certs/server_privatekey.pem"
 						}
 					],
 					"values": [],
diff --git a/luci-app-homeproxy-pro-pro/tests/toolchain/build-ucode-linux.sh b/luci-app-homeproxy-pro/tests/toolchain/build-ucode-linux.sh
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/toolchain/build-ucode-linux.sh
rename to luci-app-homeproxy-pro/tests/toolchain/build-ucode-linux.sh
index 4312ab401..93892e1b1 100755
--- a/luci-app-homeproxy-pro-pro/tests/toolchain/build-ucode-linux.sh
+++ b/luci-app-homeproxy-pro/tests/toolchain/build-ucode-linux.sh
@@ -138,7 +138,7 @@ build "$(clone jow-/ucode "$UCODE_REV")" \
 	-DFFI_SUPPORT=OFF -DNL80211_SUPPORT=OFF -DRTNL_SUPPORT=OFF \
 	-DDEBUG_SUPPORT=ON -DZLIB_SUPPORT=ON
 
-# liblucihttp: homeproxy.uc, parse_uri.uc and the RPC daemon import
+# liblucihttp: homeproxy-pro.uc, parse_uri.uc and the RPC daemon import
 # luci.http for urldecode_params()/urlencode()/urldecode(). luci.http is a
 # thin ucode wrapper around this C module, so it has to exist for the
 # generators to even load. Built after ucode, whose headers it needs.
diff --git a/luci-app-homeproxy-pro-pro/tests/toolchain/validate-data.sh b/luci-app-homeproxy-pro/tests/toolchain/validate-data.sh
similarity index 95%
rename from luci-app-homeproxy-pro-pro/tests/toolchain/validate-data.sh
rename to luci-app-homeproxy-pro/tests/toolchain/validate-data.sh
index 5e150c3e3..96efd4694 100755
--- a/luci-app-homeproxy-pro-pro/tests/toolchain/validate-data.sh
+++ b/luci-app-homeproxy-pro/tests/toolchain/validate-data.sh
@@ -3,7 +3,7 @@
 #
 # Local stand-in for OpenWrt's /sbin/validate_data.
 #
-# homeproxy.uc validates hostnames, addresses and ports by shelling out to
+# homeproxy-pro.uc validates hostnames, addresses and ports by shelling out to
 # validate_data, which only exists on an OpenWrt target; without it the
 # generators cannot run on a development host at all. This wrapper reproduces
 # the contract the caller relies on -- exit 0 means valid, non-zero means
@@ -41,6 +41,6 @@ data="${2:-}"
 # would report "invalid" for a valid name (and could in principle be made to
 # run something).
 HP_VD_TYPE="$datatype" HP_VD_DATA="$data" exec ucode -L "$HERE" -e '
-	import { validation } from "'"$REPO"'/tests/ucode/mocks/homeproxy.uc";
+	import { validation } from "'"$REPO"'/tests/ucode/mocks/homeproxy-pro.uc";
 	exit(validation(getenv("HP_VD_TYPE"), getenv("HP_VD_DATA")) === true ? 0 : 1);
 '
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro.uc b/luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro.uc
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro.uc
rename to luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro.uc
index aeacda2c4..45b47c4a4 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro.uc
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2025 ImmortalWrt.org
  *
- * Test double for root/etc/homeproxy/scripts/homeproxy.uc.
+ * Test double for root/etc/homeproxy-pro/scripts/homeproxy-pro.uc.
  *
  * Only `validation()` is stubbed: the real one shells out to
  * /sbin/validate_data, which does not exist outside OpenWrt. That stand-in
@@ -11,14 +11,14 @@
  * actually use - see the comment on validation() below for the contract and
  * the known differences. Everything else (isEmpty, decodeBase64Str, parseURL,
  * shellQuote, redactUrl) is a verbatim copy so the parser tests exercise the
- * same string handling as production. Keep these in sync when homeproxy.uc
+ * same string handling as production. Keep these in sync when homeproxy-pro.uc
  * changes; tests/ucode/test_mock_sync.sh enforces that for everything except
  * validation().
  */
 
 import { urldecode_params } from 'luci.http';
 
-/* Verbatim copy of homeproxy.uc:shellQuote - migrate_config.uc imports it to
+/* Verbatim copy of homeproxy-pro.uc:shellQuote - migrate_config.uc imports it to
  * build the crontab rewrite, so it has to exist here too. Compared against
  * production by tests/ucode/test_mock_sync.sh. */
 export function shellQuote(s) {
@@ -44,7 +44,7 @@ export function decodeBase64Str(str) {
 	return b64dec(str);
 };
 
-/* Verbatim copy of homeproxy.uc:redactUrl - decoder.uc imports it so the
+/* Verbatim copy of homeproxy-pro.uc:redactUrl - decoder.uc imports it so the
  * subscription token stays out of the parse-failed log line. */
 export function redactUrl(url) {
 	if (!url || type(url) !== 'string')
@@ -144,7 +144,7 @@ function isValidIp6(data) {
 	return dbl === -1 ? explicit === 8 : explicit < 8;
 };
 
-/* Pure-ucode stand-in for the datatypes homeproxy.uc asks /sbin/validate_data
+/* Pure-ucode stand-in for the datatypes homeproxy-pro.uc asks /sbin/validate_data
  * to check. Production shells out to OpenWrt's `libvalidate` (ubox
  * src/validate.c); off-target this function is what the parser unit tests and
  * tests/toolchain/validate-data.sh exercise, so it answers the same way the
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro_fetcher.uc b/luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro_fetcher.uc
similarity index 87%
rename from luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro_fetcher.uc
rename to luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro_fetcher.uc
index 891d994e4..1d48069e4 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro_fetcher.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro_fetcher.uc
@@ -1,19 +1,19 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * homeproxy module shim for subscription/fetcher unit tests.
+ * homeproxy-pro module shim for subscription/fetcher unit tests.
  *
- * The real homeproxy.uc wraps wGETVerbose around `executeCommand(
+ * The real homeproxy-pro.uc wraps wGETVerbose around `executeCommand(
  * /usr/bin/wget ...)`, which means a unit test that imports it
  * would shell out to the network. Tests stage this file as
- * `homeproxy` in their -L directory so the fetcher picks up the
+ * `homeproxy-pro` in their -L directory so the fetcher picks up the
  * shim's wGETVerbose instead.
  *
  * The shim reads HP_TEST_WGET_CONTENT / HP_TEST_WGET_ERROR globals
  * (set by the test before each fetch call) and returns them. The
  * two other names the fetcher imports (isEmpty, redactUrl) are
- * short enough to copy verbatim from homeproxy.uc so the shim is
- * fully self-contained - the real homeproxy.uc also imports
+ * short enough to copy verbatim from homeproxy-pro.uc so the shim is
+ * fully self-contained - the real homeproxy-pro.uc also imports
  * validate_data / popen / a long list of luci.* modules that the
  * testbed does not have on PATH, and pulling the full file would
  * pull those imports along.
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro_firewall.uc b/luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro_firewall.uc
similarity index 87%
rename from luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro_firewall.uc
rename to luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro_firewall.uc
index 8bf323382..88091147a 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/mocks/homeproxy-pro_firewall.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/mocks/homeproxy-pro_firewall.uc
@@ -1,17 +1,17 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * Test double for root/etc/homeproxy/scripts/homeproxy.uc, scoped to
+ * Test double for root/etc/homeproxy-pro/scripts/homeproxy-pro.uc, scoped to
  * what firewall_pre.uc imports: isEmpty, RUN_DIR, validation.
  *
  * RUN_DIR is read from the HP_FW_RUN_DIR global so the test can
  * point the script at a scratch dir; firewall_pre.uc writes
  * fw4_forward.nft / fw4_input.nft into RUN_DIR, and the test must
- * not clobber /var/run/homeproxy on a host that happens to have it.
+ * not clobber /var/run/homeproxy-pro on a host that happens to have it.
  *
  * validation() is the same pure-ucode stand-in the parser tests use
  * (the production one shells out to /sbin/validate_data, which does
- * not exist off-target). Keep it in sync with mocks/homeproxy.uc.
+ * not exist off-target). Keep it in sync with mocks/homeproxy-pro.uc.
  */
 
 export function isEmpty(res) {
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/run.sh b/luci-app-homeproxy-pro/tests/ucode/run.sh
similarity index 82%
rename from luci-app-homeproxy-pro-pro/tests/ucode/run.sh
rename to luci-app-homeproxy-pro/tests/ucode/run.sh
index de5a04940..92afbbe98 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/run.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/run.sh
@@ -41,7 +41,7 @@ if [ "$(uname -s)" != "Linux" ] && [ "${HP_ALLOW_NONLINUX_UCODE:-0}" != "1" ]; t
 	exit 2
 fi
 
-# homeproxy.uc validates data through /sbin/validate_data, which only exists on
+# homeproxy-pro.uc validates data through /sbin/validate_data, which only exists on
 # a target. Off-target the generator cases would fail on the very first
 # hostname check, so point them at the local stand-in (which in turn uses the
 # same validation code as the parser unit tests). On a target the production
@@ -54,11 +54,11 @@ fi
 # Nothing in this suite is target-only any more.  Every source compiles with
 # the toolchain from tests/toolchain/build-ucode-*.sh (which ships utpl, the
 # luci.* ucode modules and a matching sing-box), and the files that import
-# through an absolute /etc/homeproxy/... path are rewritten to the checkout
+# through an absolute /etc/homeproxy-pro/... path are rewritten to the checkout
 # below.  A missing piece of the toolchain now FAILS instead of being skipped:
 # the old target-only skips are exactly what let a non-compiling
 # update_subscriptions.uc, and a destructuring statement, reach the device.
-SCRIPTS_DIR="$ROOT/root/etc/homeproxy/scripts"
+SCRIPTS_DIR="$ROOT/root/etc/homeproxy-pro/scripts"
 mkdir -p "$WORK/syntax"
 
 echo "== ucode grammar canary =="
@@ -77,17 +77,17 @@ for file in "$SCRIPTS_DIR"/*.uc \
 	# Modules (with export statements) cannot be compiled as a program; they
 	# are loaded through `import` below instead.
 	case "$file" in
-	*homeproxy.uc|*firewall_utils.uc|*/parser/*.uc|*/subscription/*.uc|*/config/*.uc|*/generator/*.uc) continue ;;
+	*homeproxy-pro.uc|*firewall_utils.uc|*/parser/*.uc|*/subscription/*.uc|*/config/*.uc|*/generator/*.uc) continue ;;
 	esac
 
-	# luci.homeproxy imports homeproxy.uc through an absolute /etc/... path
+	# luci.homeproxy-pro imports homeproxy-pro.uc through an absolute /etc/... path
 	# that does not exist off-target.  Compile a rewritten copy instead of
 	# skipping the file.
 	target="$file"
 	case "$file" in
 	*/usr/share/rpcd/ucode/*)
 		target="$WORK/syntax/$(basename "$file")"
-		sed "s#'/etc/homeproxy/scripts/#'$SCRIPTS_DIR/#g" "$file" > "$target" ;;
+		sed "s#'/etc/homeproxy-pro/scripts/#'$SCRIPTS_DIR/#g" "$file" > "$target" ;;
 	esac
 
 	if ! ucode -L "$SCRIPTS_DIR" -c -o "/dev/null" "$target" 2> "$WORK/syntax.err"; then
@@ -101,8 +101,8 @@ done
 # want to validate. Only top-level module names are searched in the
 # -L tree, so anything in a subdirectory is loaded by absolute path
 # in the second loop below.
-for module in homeproxy firewall_utils; do
-	if ! ucode -L "$ROOT/root/etc/homeproxy/scripts" -e "import * as m from \"$module\";" 2> "$WORK/syntax.err"; then
+for module in homeproxy-pro firewall_utils; do
+	if ! ucode -L "$ROOT/root/etc/homeproxy-pro/scripts" -e "import * as m from \"$module\";" 2> "$WORK/syntax.err"; then
 		echo "FAIL: module $module"
 		head -8 "$WORK/syntax.err"
 		FAILED=1
@@ -130,12 +130,12 @@ echo "== fw4 chain/set inventory =="
 sh "$ROOT/tests/ucode/test_fw4_names.sh" "$ROOT" || FAILED=1
 
 echo "== shell syntax check =="
-# init.d/homeproxy and the runtime helpers are shell, so no ucode check covers
+# init.d/homeproxy-pro and the runtime helpers are shell, so no ucode check covers
 # them.  They decide whether a bad configuration can leave the router without
 # a service, so a syntax error there is as bad as one in the generators.
 for file in "$ROOT"/root/etc/init.d/* \
-            "$ROOT"/root/etc/homeproxy/scripts/*.sh \
-            "$ROOT"/root/etc/homeproxy/scripts/runtime/*.sh; do
+            "$ROOT"/root/etc/homeproxy-pro/scripts/*.sh \
+            "$ROOT"/root/etc/homeproxy-pro/scripts/runtime/*.sh; do
 	[ -f "$file" ] || continue
 	if ! sh -n "$file" 2> "$WORK/syntax.err"; then
 		echo "FAIL: ${file#"$ROOT"/}"
@@ -195,8 +195,8 @@ echo "== parse_uri unit tests =="
 # it the same way the production orchestrator does.
 rm -rf "$WORK/parse_uri"
 mkdir -p "$WORK/parse_uri/parser"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc "$WORK/parse_uri/parser/"
-cp "$ROOT/tests/ucode/mocks/homeproxy.uc" "$WORK/parse_uri/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc "$WORK/parse_uri/parser/"
+cp "$ROOT/tests/ucode/mocks/homeproxy-pro.uc" "$WORK/parse_uri/"
 cp "$ROOT/tests/ucode/test_parse_uri.uc" "$WORK/parse_uri/"
 
 if ( cd "$WORK/parse_uri" && ucode -L "$WORK/parse_uri" test_parse_uri.uc ); then
@@ -209,7 +209,7 @@ fi
 echo "== parser/normalize unit tests =="
 # PR-02: parser/normalize.uc turns the parser's flat UCI-key output
 # into the canonical Node shape the Adapter reads. The staged
-# $WORK/parse_uri/ already has parser/ and the homeproxy mock, so we
+# $WORK/parse_uri/ already has parser/ and the homeproxy-pro mock, so we
 # just drop the test next to test_parse_uri.uc.
 cp "$ROOT/tests/ucode/test_parser_normalize.uc" "$WORK/parse_uri/"
 if ( cd "$WORK/parse_uri" && ucode -L "$WORK/parse_uri" test_parser_normalize.uc ); then
@@ -234,31 +234,31 @@ else
 fi
 
 echo "== subscription filter unit tests =="
-# The production modules live at root/etc/homeproxy/scripts/subscription/
+# The production modules live at root/etc/homeproxy-pro/scripts/subscription/
 # *.uc and are imported by update_subscriptions.uc with a relative path.
 # For the unit tests we want the modules on a flat search path so their
-# `from 'homeproxy'` import resolves to the mock, so we stage them at
+# `from 'homeproxy-pro'` import resolves to the mock, so we stage them at
 # the work dir top level (drop the subscription/ prefix) and let the
 # test files import them as bare names.
 rm -rf "$WORK/subscription"
 # Mirror the production layout: the module under test lives in subscription/ and
-# reaches homeproxy.uc one level up (a relative import - production cannot rely on
+# reaches homeproxy-pro.uc one level up (a relative import - production cannot rely on
 # a module search path, see the note above the syntax check). The tests are the
 # entry scripts and import the module under test by name, so -L points at
 # subscription/.
 rm -rf "$WORK/subscription"
 mkdir -p "$WORK/subscription"
-cp "$ROOT/tests/ucode/mocks/homeproxy.uc" "$WORK/homeproxy.uc"
-cp "$ROOT/root/etc/homeproxy/scripts/subscription/filter.uc" "$WORK/subscription/filter.uc"
-cp "$ROOT/root/etc/homeproxy/scripts/subscription/decoder.uc" "$WORK/subscription/decoder.uc"
+cp "$ROOT/tests/ucode/mocks/homeproxy-pro.uc" "$WORK/homeproxy-pro.uc"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/subscription/filter.uc" "$WORK/subscription/filter.uc"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/subscription/decoder.uc" "$WORK/subscription/decoder.uc"
 # The filter test also asserts that applying the policy to the canonical Node
 # writes the same UCI keys the old flat order did, so it drives the real
 # normalize()/flatten() pair. Those live in parser/ and import ./mapping.uc
 # relatively, so all three are staged together next to the test.
 mkdir -p "$WORK/parser"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/normalize.uc" \
-   "$ROOT/root/etc/homeproxy/scripts/parser/flatten.uc" \
-   "$ROOT/root/etc/homeproxy/scripts/parser/mapping.uc" "$WORK/parser/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/normalize.uc" \
+   "$ROOT/root/etc/homeproxy-pro/scripts/parser/flatten.uc" \
+   "$ROOT/root/etc/homeproxy-pro/scripts/parser/mapping.uc" "$WORK/parser/"
 cp "$ROOT/tests/ucode/test_subscription_filter.uc" "$WORK/"
 cp "$ROOT/tests/ucode/test_subscription_decoder.uc" "$WORK/"
 
@@ -297,11 +297,11 @@ echo "== rpcd method behaviour =="
 sh "$ROOT/tests/ucode/test_rpc_methods.sh" "$ROOT" "$WORK/rpc_methods" || FAILED=1
 
 echo "== the scripts run the way production runs them =="
-# init.d/homeproxy calls `ucode -S "$HP_DIR/scripts/generate_client.uc"` and the
+# init.d/homeproxy-pro calls `ucode -S "$HP_DIR/scripts/generate_client.uc"` and the
 # cron entry runs update_subscriptions.uc through its shebang - neither passes a
 # module search path. Everything else in this suite passes -L (the harness has
 # to, to reach the staged tree), which is exactly why a bare
-# `import ... from 'homeproxy'` inside a subdirectory compiled here for months
+# `import ... from 'homeproxy-pro'` inside a subdirectory compiled here for months
 # and failed on the first real install: ucode resolves a bare specifier relative
 # to the IMPORTING module's directory, so config/model.uc looked in config/.
 #
@@ -310,14 +310,14 @@ echo "== the scripts run the way production runs them =="
 PROD="$WORK/prod-invocation"
 rm -rf "$PROD"
 mkdir -p "$PROD/scripts" "$PROD/cfg" "$PROD/run" "$PROD/resources"
-cp -R "$ROOT/root/etc/homeproxy/scripts/." "$PROD/scripts/"
-sed -e "s#^export const RUN_DIR = '/var/run/homeproxy';#export const RUN_DIR = '$PROD/run';#" \
-    -e "s#^export const HP_DIR = '/etc/homeproxy';#export const HP_DIR = '$PROD';#" \
+cp -R "$ROOT/root/etc/homeproxy-pro/scripts/." "$PROD/scripts/"
+sed -e "s#^export const RUN_DIR = '/var/run/homeproxy-pro';#export const RUN_DIR = '$PROD/run';#" \
+    -e "s#^export const HP_DIR = '/etc/homeproxy-pro';#export const HP_DIR = '$PROD';#" \
     -e "s#^export const UCICONFIG_DIR = '/etc/config';#export const UCICONFIG_DIR = '$PROD/cfg';#" \
-    "$PROD/scripts/homeproxy.uc" > "$PROD/scripts/homeproxy.uc.new"
-mv -f "$PROD/scripts/homeproxy.uc.new" "$PROD/scripts/homeproxy.uc"
-cat > "$PROD/cfg/homeproxy" <<'PRODCFG'
-config homeproxy 'config'
+    "$PROD/scripts/homeproxy-pro.uc" > "$PROD/scripts/homeproxy-pro.uc.new"
+mv -f "$PROD/scripts/homeproxy-pro.uc.new" "$PROD/scripts/homeproxy-pro.uc"
+cat > "$PROD/cfg/homeproxy-pro" <<'PRODCFG'
+config homeproxy-pro 'config'
 	option routing_mode 'bypass_mainland_china'
 	option proxy_mode 'tun'
 	option main_node 'nil'
@@ -362,16 +362,16 @@ echo "== test doubles still match production =="
 sh "$ROOT/tests/ucode/test_mock_sync.sh" "$ROOT" "$WORK/mock_sync" || FAILED=1
 
 echo "== the factory configuration loads =="
-# root/etc/config/homeproxy ships to every new install and was never read by
+# root/etc/config/homeproxy-pro ships to every new install and was never read by
 # any test; json-assets.js checks its grammar, this drives the real Loader.
 sh "$ROOT/tests/ucode/test_factory_config.sh" "$ROOT" "$WORK/factory_config" || FAILED=1
 
-echo "== homeproxy helper tests =="
-rm -rf "$WORK/homeproxy"
-mkdir -p "$WORK/homeproxy"
-cp "$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" "$WORK/homeproxy/"
-cp "$ROOT/tests/ucode/test_homeproxy_utils.uc" "$WORK/homeproxy/"
-if ( cd "$WORK/homeproxy" && ucode test_homeproxy_utils.uc ); then
+echo "== homeproxy-pro helper tests =="
+rm -rf "$WORK/homeproxy-pro"
+mkdir -p "$WORK/homeproxy-pro"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" "$WORK/homeproxy-pro/"
+cp "$ROOT/tests/ucode/test_homeproxy_utils.uc" "$WORK/homeproxy-pro/"
+if ( cd "$WORK/homeproxy-pro" && ucode test_homeproxy_utils.uc ); then
 	echo "PASS: executeCommand() regression tests"
 else
 	echo "FAIL: executeCommand() regression tests"
@@ -381,7 +381,7 @@ fi
 echo "== TLS / transport builder tests =="
 rm -rf "$WORK/tls_transport"
 mkdir -p "$WORK/tls_transport"
-cp "$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" "$WORK/tls_transport/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" "$WORK/tls_transport/"
 cp "$ROOT/tests/ucode/test_tls_transport.uc" "$WORK/tls_transport/"
 if ( cd "$WORK/tls_transport" && ucode test_tls_transport.uc ); then
 	echo "PASS: TLS / transport builder tests"
@@ -393,8 +393,8 @@ fi
 echo "== subscription fetcher tests =="
 rm -rf "$WORK/fetcher"
 mkdir -p "$WORK/fetcher/subscription"
-cp "$ROOT/tests/ucode/mocks/homeproxy_fetcher.uc" "$WORK/fetcher/homeproxy.uc"
-cp "$ROOT/root/etc/homeproxy/scripts/subscription/fetcher.uc" "$WORK/fetcher/subscription/fetcher.uc"
+cp "$ROOT/tests/ucode/mocks/homeproxy_fetcher.uc" "$WORK/fetcher/homeproxy-pro.uc"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/subscription/fetcher.uc" "$WORK/fetcher/subscription/fetcher.uc"
 cp "$ROOT/tests/ucode/test_subscription_fetcher.uc" "$WORK/fetcher/"
 if ( cd "$WORK/fetcher" && ucode -L "$WORK/fetcher/subscription" test_subscription_fetcher.uc ); then
 	echo "PASS: subscription fetcher tests"
@@ -410,12 +410,12 @@ echo "== executeCommand() failure-path test =="
 rm -rf "$WORK/homeproxy_inject"
 mkdir -p "$WORK/homeproxy_inject"
 sed 's|^\t\texitcode = system(.*);|\t\tdie("injected failure");|' \
-	"$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/homeproxy_inject/homeproxy.uc"
+	"$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/homeproxy_inject/homeproxy-pro.uc"
 
 # Hard guard: if the anchor stops matching, the sed no-ops and the test
 # passes without ever exercising the exceptional path - the same trap the
 # other staged rewrites guard against. Refuse to run instead.
-if ! grep -q 'die("injected failure")' "$WORK/homeproxy_inject/homeproxy.uc"; then
+if ! grep -q 'die("injected failure")' "$WORK/homeproxy_inject/homeproxy-pro.uc"; then
 	echo "FAIL: executeCommand() failure path: could not inject the failure"
 	echo "      (the 'exitcode = system(...)' anchor no longer matches)"
 	exit 1
@@ -443,17 +443,17 @@ echo "== inbound adapter unit tests =="
 # emitted JSON for the fixture; this pins the decisions behind it.
 rm -rf "$WORK/inbound_adapter"
 mkdir -p "$WORK/inbound_adapter/config" "$WORK/inbound_adapter/parser"
-# The adapter needs the real homeproxy.uc (buildTLSObject /
+# The adapter needs the real homeproxy-pro.uc (buildTLSObject /
 # buildTransportObject / strTo* / parse_port), not the test double; the
 # golden tests stage it the same way. HP_VALIDATE_DATA lets a development
-# host replace /sbin/validate_data, which homeproxy.uc calls.
+# host replace /sbin/validate_data, which homeproxy-pro.uc calls.
 INBOUND_VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
 sed -e "s#/sbin/validate_data#${INBOUND_VALIDATE_DATA}#" \
-	"$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/inbound_adapter/homeproxy.uc"
-cp "$ROOT/root/etc/homeproxy/scripts/config/loader.uc"  "$WORK/inbound_adapter/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/model.uc"   "$WORK/inbound_adapter/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/adapter.uc" "$WORK/inbound_adapter/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc       "$WORK/inbound_adapter/parser/"
+	"$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/inbound_adapter/homeproxy-pro.uc"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/loader.uc"  "$WORK/inbound_adapter/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/model.uc"   "$WORK/inbound_adapter/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/adapter.uc" "$WORK/inbound_adapter/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc       "$WORK/inbound_adapter/parser/"
 cp "$ROOT/tests/ucode/test_inbound_adapter.uc"          "$WORK/inbound_adapter/"
 
 if ( cd "$WORK/inbound_adapter" && ucode -L "$WORK/inbound_adapter" test_inbound_adapter.uc ); then
@@ -471,12 +471,12 @@ rm -rf "$WORK/gen_common"
 mkdir -p "$WORK/gen_common/config" "$WORK/gen_common/parser" "$WORK/gen_common/generator"
 GEN_VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
 sed -e "s#/sbin/validate_data#${GEN_VALIDATE_DATA}#" \
-	"$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/gen_common/homeproxy.uc"
-cp "$ROOT/root/etc/homeproxy/scripts/config/loader.uc"  "$WORK/gen_common/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/model.uc"   "$WORK/gen_common/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/adapter.uc" "$WORK/gen_common/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc       "$WORK/gen_common/parser/"
-cp "$ROOT/root/etc/homeproxy/scripts/generator/"*.uc    "$WORK/gen_common/generator/"
+	"$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/gen_common/homeproxy-pro.uc"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/loader.uc"  "$WORK/gen_common/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/model.uc"   "$WORK/gen_common/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/adapter.uc" "$WORK/gen_common/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc       "$WORK/gen_common/parser/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/generator/"*.uc    "$WORK/gen_common/generator/"
 cp "$ROOT/tests/ucode/test_generator_common.uc"         "$WORK/gen_common/"
 
 if ( cd "$WORK/gen_common" && ucode -L "$WORK/gen_common" test_generator_common.uc ); then
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_domain_model_skeleton.sh b/luci-app-homeproxy-pro/tests/ucode/test_domain_model_skeleton.sh
similarity index 75%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_domain_model_skeleton.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_domain_model_skeleton.sh
index be2659814..dbfeea999 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_domain_model_skeleton.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_domain_model_skeleton.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-only
 #
-# Stage A1.1 skeleton test: the production Config Loader (root/etc/homeproxy/
+# Stage A1.1 skeleton test: the production Config Loader (root/etc/homeproxy-pro/
 # scripts/config/loader.uc) must read the UCI fixture and produce a
 # HomeProxyConfig whose general / infra / nodes sub-objects match the
 # expected values. The other five sub-objects (dns, routing, endpoints,
 # access_control, server) are intentionally empty `{}` until A1.2 lands.
 #
 # Staging layout:
-#   $WORK/scripts/                     - test_domain_model_skeleton.uc + homeproxy.uc
+#   $WORK/scripts/                     - test_domain_model_skeleton.uc + homeproxy-pro.uc
 #   $WORK/scripts/config/              - loader.uc + model.uc + adapter.uc
-#   $WORK/scripts/config/homeproxy     - UCI file (from fixture)
+#   $WORK/scripts/config/homeproxy-pro     - UCI file (from fixture)
 #
 # The test runs `cd $WORK/scripts && ucode test_domain_model_skeleton.uc`,
 # so Loader.load('./config') finds both the config/loader.uc module
-# (relative-imported as ./config/loader.uc) and the homeproxy UCI file
+# (relative-imported as ./config/loader.uc) and the homeproxy-pro UCI file
 # in the same directory.
 #
 # Usage: sh tests/ucode/test_domain_model_skeleton.sh <repo-root> [work-dir]
@@ -32,16 +32,16 @@ mkdir -p "$WORK/scripts/config"
 # tests/README.md); on a target the production path is kept.
 VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
 sed -e "s#/sbin/validate_data#${VALIDATE_DATA}#" \
-    "$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/scripts/homeproxy.uc"
+    "$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/scripts/homeproxy-pro.uc"
 
-cp "$ROOT/root/etc/homeproxy/scripts/config/loader.uc"  "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/model.uc"   "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/adapter.uc" "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/loader.uc"  "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/model.uc"   "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/adapter.uc" "$WORK/scripts/config/"
 # PR-02: parse_uri.uc moved into scripts/parser/.  Stage the whole
 # tree so the Loader's '../parser/mapping.uc' import resolves inside
 # the sandbox.
 mkdir -p "$WORK/scripts/parser"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc       "$WORK/scripts/parser/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc       "$WORK/scripts/parser/"
 
 cp "$ROOT/tests/ucode/test_domain_model_skeleton.uc" "$WORK/scripts/"
 
@@ -49,7 +49,7 @@ cp "$ROOT/tests/ucode/test_domain_model_skeleton.uc" "$WORK/scripts/"
 # which carries every UCI section the Loader is supposed to read. The
 # generator regression suite uses client.uci and custom.uci; this fixture
 # is only consumed by the domain-model test.
-cp "$ROOT/tests/fixtures/generators/domain.uci" "$WORK/scripts/config/homeproxy"
+cp "$ROOT/tests/fixtures/generators/domain.uci" "$WORK/scripts/config/homeproxy-pro"
 
 if ( cd "$WORK/scripts" && ucode -L "$WORK/scripts" test_domain_model_skeleton.uc ); then
 	echo "PASS: domain model skeleton"
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_domain_model_skeleton.uc b/luci-app-homeproxy-pro/tests/ucode/test_domain_model_skeleton.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_domain_model_skeleton.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_domain_model_skeleton.uc
index 8a057cfef..f481068db 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_domain_model_skeleton.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_domain_model_skeleton.uc
@@ -21,7 +21,7 @@
  * `filter_keywords`, `subscription_url`).
  *
  * Run from tests/ucode/run.sh, which stages this file next to a scratch
- * homeproxy.uc and config/loader.uc + config/model.uc.
+ * homeproxy-pro.uc and config/loader.uc + config/model.uc.
  */
 
 'use strict';
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_factory_config.sh b/luci-app-homeproxy-pro/tests/ucode/test_factory_config.sh
similarity index 93%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_factory_config.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_factory_config.sh
index b9eec938a..eb07a1bb3 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_factory_config.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_factory_config.sh
@@ -3,7 +3,7 @@
 #
 # The factory configuration must be readable by the Loader.
 #
-# root/etc/config/homeproxy ships as the package conffile and is what every
+# root/etc/config/homeproxy-pro ships as the package conffile and is what every
 # fresh install starts from, but nothing ever read it: the form tests render
 # against their own fixtures, the generator tests stage a fixture, and the two
 # factory-ish UCI files were only ever checked by eye. A typo in a section name
@@ -28,9 +28,9 @@ fi
 rm -rf "$WORK"
 mkdir -p "$WORK/scripts" "$WORK/cfg"
 
-cp -R "$ROOT/root/etc/homeproxy/scripts/." "$WORK/scripts/"
-# The factory config is the UCI file itself; the Loader reads <dir>/homeproxy.
-cp "$ROOT/root/etc/config/homeproxy" "$WORK/cfg/homeproxy"
+cp -R "$ROOT/root/etc/homeproxy-pro/scripts/." "$WORK/scripts/"
+# The factory config is the UCI file itself; the Loader reads <dir>/homeproxy-pro.
+cp "$ROOT/root/etc/config/homeproxy-pro" "$WORK/cfg/homeproxy-pro"
 
 FAILED=0
 if ucode -L "$WORK/scripts" -L "$WORK" -e '
@@ -47,7 +47,7 @@ if ucode -L "$WORK/scripts" -L "$WORK" -e '
 		printf("FAIL %s: expected %J, got %J\n", name, want, got);
 	}
 
-	/* Values that are actually written in root/etc/config/homeproxy. If one of
+	/* Values that are actually written in root/etc/config/homeproxy-pro. If one of
 	 * them changes, this test changes with it - the point is that the Loader
 	 * reads the shipped file at all, not that these particular defaults are
 	 * permanent. */
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_pre.sh b/luci-app-homeproxy-pro/tests/ucode/test_firewall_pre.sh
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_pre.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_firewall_pre.sh
index 71a995c48..8067953f8 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_pre.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_firewall_pre.sh
@@ -11,7 +11,7 @@
 #
 #   - an invalid port emits `th dport  <garbage>` (nft rejects the
 #     whole ruleset, so the firewall fails to load and the router
-#     loses its ruleset, not just the homeproxy rules)
+#     loses its ruleset, not just the homeproxy-pro rules)
 #   - an invalid network is interpolated verbatim into the l4proto
 #     position
 #
@@ -39,7 +39,7 @@ STAGE="$WORK/scripts"
 rm -rf "$WORK"
 mkdir -p "$STAGE"
 
-cp "$ROOT/tests/ucode/mocks/homeproxy_firewall.uc" "$STAGE/homeproxy.uc"
+cp "$ROOT/tests/ucode/mocks/homeproxy_firewall.uc" "$STAGE/homeproxy-pro.uc"
 cp "$ROOT/tests/ucode/test_firewall_pre.uc" "$STAGE/"
 
 # Stage a cursor-redirected copy of firewall_pre.uc, with the shebang
@@ -57,7 +57,7 @@ cp "$ROOT/tests/ucode/test_firewall_pre.uc" "$STAGE/"
 # change in the source.
 sed -e '1{/^#!\/usr\/bin\/ucode$/d;}' \
 	-e 's|^const uci = cursor();$|const uci = cursor(ARGV[0]);|' \
-	"$ROOT/root/etc/homeproxy/scripts/firewall_pre.uc" > "$STAGE/firewall_pre.uc"
+	"$ROOT/root/etc/homeproxy-pro/scripts/firewall_pre.uc" > "$STAGE/firewall_pre.uc"
 
 # Hard guard: if an anchor stops matching, the sed no-ops. Losing the
 # cursor redirect means the test would read the *real* /etc/config and write
@@ -81,18 +81,18 @@ seed() {
 	shift
 	mkdir -p "$WORK/$scenario/sandbox" "$WORK/$scenario/run"
 	{
-		printf "config homeproxy 'config'\n"
+		printf "config homeproxy-pro 'config'\n"
 		printf "\toption routing_mode '%s'\n" "$ROUTING_MODE"
 		printf "\toption proxy_mode '%s'\n" "$PROXY_MODE"
 		printf "\toption main_node '%s'\n" "$MAIN_NODE"
-		printf "config homeproxy 'infra'\n"
+		printf "config homeproxy-pro 'infra'\n"
 		printf "\toption tun_name '%s'\n" "${TUN_NAME:-singtun0}"
-		printf "config homeproxy 'server'\n"
+		printf "config homeproxy-pro 'server'\n"
 		printf "\toption enabled '%s'\n" "$SERVER_ENABLED"
 		for line in "$@"; do
 			printf '%s\n' "$line"
 		done
-	} > "$WORK/$scenario/sandbox/homeproxy"
+	} > "$WORK/$scenario/sandbox/homeproxy-pro"
 }
 
 run_scenario() {
@@ -208,7 +208,7 @@ fi
 
 MOCK_STAGE="$WORK/mock-stage"
 mkdir -p "$MOCK_STAGE"
-cp "$ROOT/tests/ucode/mocks/homeproxy_firewall.uc" "$MOCK_STAGE/homeproxy.uc"
+cp "$ROOT/tests/ucode/mocks/homeproxy_firewall.uc" "$MOCK_STAGE/homeproxy-pro.uc"
 cp "$ROOT/tests/ucode/test_firewall_pre.uc" "$MOCK_STAGE/"
 
 # The cursor stub. It replaces libuci for this stage only; print / writefile and
@@ -251,7 +251,7 @@ STUB
 sed -e '1{/^#!\/usr\/bin\/ucode$/d;}' \
 	-e "s|^import { cursor } from 'uci';\$|import { cursor } from './test_uci.uc';|" \
 	-e 's|^const uci = cursor();$|const uci = cursor(ARGV[0]);|' \
-	"$ROOT/root/etc/homeproxy/scripts/firewall_pre.uc" > "$MOCK_STAGE/firewall_pre.uc"
+	"$ROOT/root/etc/homeproxy-pro/scripts/firewall_pre.uc" > "$MOCK_STAGE/firewall_pre.uc"
 
 # Same hard guards as above: a no-op sed must not silently fall back to libuci
 # (the hostile name would vanish and the scenario would pass for the wrong
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_pre.uc b/luci-app-homeproxy-pro/tests/ucode/test_firewall_pre.uc
similarity index 89%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_pre.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_firewall_pre.uc
index 77791baff..5b4f403d8 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_pre.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_firewall_pre.uc
@@ -48,9 +48,9 @@ case 'tun':
 	/* tun_mode routing: forward accepts traffic leaving the tun, input
 	 * accepts traffic arriving on it. */
 	expect('tun forward', forward,
-		'oifname singtun0 counter accept comment "!homeproxy: accept tun forward"');
+		'oifname singtun0 counter accept comment "!homeproxy-pro: accept tun forward"');
 	expect('tun input', input,
-		'iifname singtun0 counter accept comment "!homeproxy: accept tun input"');
+		'iifname singtun0 counter accept comment "!homeproxy-pro: accept tun input"');
 	break;
 
 case 'no-tun':
@@ -72,22 +72,22 @@ case 'good-tun':
 	/* The same path with a valid name still emits the pair, so the guard
 	 * above cannot pass by disabling the feature. */
 	expect('good-tun forward', forward,
-		'oifname singtun9 counter accept comment "!homeproxy: accept tun forward"');
+		'oifname singtun9 counter accept comment "!homeproxy-pro: accept tun forward"');
 	expect('good-tun input', input,
-		'iifname singtun9 counter accept comment "!homeproxy: accept tun input"');
+		'iifname singtun9 counter accept comment "!homeproxy-pro: accept tun input"');
 	break;
 
 case 'server':
 	/* server enabled + firewall='1' + a valid port: one accept rule per
 	 * server section, keyed on the destination port. */
 	expect('server input', input,
-		'meta l4proto { tcp, udp } th dport 443 counter accept comment "!homeproxy: accept server srv_ok"');
+		'meta l4proto { tcp, udp } th dport 443 counter accept comment "!homeproxy-pro: accept server srv_ok"');
 	break;
 
 case 'server-network':
 	/* an explicit network narrows the l4proto match. */
 	expect('server-network input', input,
-		'meta l4proto tcp th dport 8080 counter accept comment "!homeproxy: accept server srv_tcp"');
+		'meta l4proto tcp th dport 8080 counter accept comment "!homeproxy-pro: accept server srv_tcp"');
 	break;
 
 case 'invalid-port':
@@ -117,7 +117,7 @@ case 'mock-good-section-name':
 	 * which is what makes the `null` above the guard's doing rather than the
 	 * stub never reaching the emit path. */
 	expect('mock-good-section-name input', input,
-		'meta l4proto { tcp, udp } th dport 443 counter accept comment "!homeproxy: accept server srv_ok_mock"');
+		'meta l4proto { tcp, udp } th dport 443 counter accept comment "!homeproxy-pro: accept server srv_ok_mock"');
 	break;
 
 case 'firewall-off':
@@ -130,7 +130,7 @@ case 'both':
 	/* tun + server together: both fragments exist, each with its own
 	 * statements. */
 	expect('both forward', forward,
-		'oifname singtun0 counter accept comment "!homeproxy: accept tun forward"');
+		'oifname singtun0 counter accept comment "!homeproxy-pro: accept tun forward"');
 	expect('both input has tun', match(input, /iifname singtun0 counter accept/) != null, true);
 	expect('both input has server', match(input, /th dport 443 counter accept/) != null, true);
 	break;
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_template.sh b/luci-app-homeproxy-pro/tests/ucode/test_firewall_template.sh
similarity index 90%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_template.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_firewall_template.sh
index 556b4db11..e6568e9c3 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_template.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_firewall_template.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-only
 #
-# Render firewall_post.ut and verify the homeproxy fw4 objects survive as real
+# Render firewall_post.ut and verify the homeproxy-pro fw4 objects survive as real
 # nft statements.
 #
 # The template opens with `{%-`, which trims the whitespace in front of it: any
 # text placed above that tag loses its trailing newline and is glued onto the
 # first generated statement, turning it into a comment. That silently dropped
-# every homeproxy chain/set from the fw4 ruleset once, so keep this check.
+# every homeproxy-pro chain/set from the fw4 ruleset once, so keep this check.
 #
 # Two layers, because the render needs the real `fw4` ucode module which only
 # exists on a device (OpenWrt's firewall4 package ships /usr/share/ucode/fw4.uc):
@@ -34,7 +34,7 @@ ROOT="${1:-.}"
 ROOT="$(cd "$ROOT" && pwd)"
 FAILED=0
 
-TEMPLATE_SRC="$ROOT/root/etc/homeproxy/scripts/firewall_post.ut"
+TEMPLATE_SRC="$ROOT/root/etc/homeproxy-pro/scripts/firewall_post.ut"
 
 # --- layer 1: the glue condition cannot come back ------------------------
 # `{%-` trims the whitespace before it, so anything other than the shebang
@@ -91,7 +91,7 @@ if ! grep -q "resources_dir + '/.dnsmasq-nftset'" "$TEMPLATE_SRC"; then
 	echo "FAIL: the template does not read resources/.dnsmasq-nftset, the marker init.d writes"
 	FAILED=1
 fi
-if ! grep -q '\.dnsmasq-nftset' "$ROOT/root/etc/init.d/homeproxy"; then
+if ! grep -q '\.dnsmasq-nftset' "$ROOT/root/etc/init.d/homeproxy-pro"; then
 	echo "FAIL: init.d no longer records the dnsmasq nftset capability for the template"
 	FAILED=1
 fi
@@ -124,7 +124,7 @@ if ! ucode -e 'require("fw4");' > "/dev/null" 2>&1; then
 	echo "NOT RUN: the 'fw4' ucode module is not available (device-only), render skipped"
 
 	# A skipped layer must not be able to hide a broken template. Firewall4 is
-	# always installed where homeproxy runs, so the on-target suite sets
+	# always installed where homeproxy-pro runs, so the on-target suite sets
 	# HP_REQUIRE_FW4=1 (tests/run.sh does it in the ssh branch) and a skip there
 	# is a failure: it means the render stopped being exercised in the one
 	# environment that can exercise it. `utpl` itself is not the blocker - it
@@ -141,19 +141,19 @@ if ! ucode -e 'require("fw4");' > "/dev/null" 2>&1; then
 	exit $FAILED
 fi
 
-# The template is written for a device: it imports homeproxy.uc through
-# /etc/homeproxy/scripts/ and reads /etc/homeproxy/resources. Neither exists
+# The template is written for a device: it imports homeproxy-pro.uc through
+# /etc/homeproxy-pro/scripts/ and reads /etc/homeproxy-pro/resources. Neither exists
 # off-target, so render a staged copy with those prefixes rewritten to the
 # checkout - the same trick run.sh uses for the absolute import in
-# root/usr/share/rpcd/ucode/luci.homeproxy.
-sed -e "s#'/etc/homeproxy/#'$ROOT/root/etc/homeproxy/#g" "$TEMPLATE_SRC" > "$STAGED"
+# root/usr/share/rpcd/ucode/luci.homeproxy-pro.
+sed -e "s#'/etc/homeproxy-pro/#'$ROOT/root/etc/homeproxy-pro/#g" "$TEMPLATE_SRC" > "$STAGED"
 
 # Hard guard: if the prefix ever changes, the sed silently no-ops and the
 # render fails for an unrelated reason, which would look like a template
 # regression. Refuse to run instead.
-if grep -q "'/etc/homeproxy/" "$STAGED"; then
+if grep -q "'/etc/homeproxy-pro/" "$STAGED"; then
 	echo "FAIL: firewall_post.ut: could not rewrite the device paths"
-	echo "      (the '/etc/homeproxy/' prefix anchor no longer matches)"
+	echo "      (the '/etc/homeproxy-pro/' prefix anchor no longer matches)"
 	exit 1
 fi
 
@@ -182,7 +182,7 @@ if grep -nE "^#[^!].*homeproxy_[a-z0-9_]+ \{" "$OUT" > "/dev/null"; then
 fi
 
 if [ "$FAILED" -eq 0 ]; then
-	echo "PASS: firewall_post.ut renders homeproxy objects as standalone nft statements"
+	echo "PASS: firewall_post.ut renders homeproxy-pro objects as standalone nft statements"
 	echo "PASS: the gfwlist gate follows the dnsmasq nftset capability"
 fi
 
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_validators.sh b/luci-app-homeproxy-pro/tests/ucode/test_firewall_validators.sh
similarity index 82%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_validators.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_firewall_validators.sh
index 9b9d38c9c..f6696e934 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_validators.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_firewall_validators.sh
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # Direct unit tests for the firewall field validators
-# (root/etc/homeproxy/scripts/firewall_utils.uc).
+# (root/etc/homeproxy-pro/scripts/firewall_utils.uc).
 #
 # Why a separate file rather than extending test_firewall_template.sh:
 # the rendering test needs the device-only `fw4` ucode module, so on a
@@ -28,18 +28,18 @@ fi
 rm -rf "$WORK"
 mkdir -p "$WORK"
 
-# The validators import `isEmpty` from homeproxy.uc. Stage a copy that
+# The validators import `isEmpty` from homeproxy-pro.uc. Stage a copy that
 # just exports it - the validators under test are the only thing this
-# process exercises, so pulling in the full homeproxy.uc (with its
+# process exercises, so pulling in the full homeproxy-pro.uc (with its
 # validate_data / popen / luci.* imports) would break the unit test on
 # a host that lacks /sbin/validate_data.
-cat > "$WORK/homeproxy.uc" <<'HPEOF'
+cat > "$WORK/homeproxy-pro.uc" <<'HPEOF'
 export function isEmpty(res) {
 	return !res || res === 'nil' || (type(res) in ['array', 'object'] && length(res) === 0);
 };
 HPEOF
 
-cp "$ROOT/root/etc/homeproxy/scripts/firewall_utils.uc" "$WORK/firewall_utils.uc"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/firewall_utils.uc" "$WORK/firewall_utils.uc"
 cp "$ROOT/tests/ucode/test_firewall_validators.uc"     "$WORK/test_firewall_validators.uc"
 
 if ( cd "$WORK" && ucode test_firewall_validators.uc ); then
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_validators.uc b/luci-app-homeproxy-pro/tests/ucode/test_firewall_validators.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_validators.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_firewall_validators.uc
index 1c6953225..2ae44f6fe 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_firewall_validators.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_firewall_validators.uc
@@ -42,7 +42,7 @@
  *   are the report's "fix + reverse-verify" loop.
  *
  *   Run from tests/ucode/test_firewall_validators.sh, which stages
- *   firewall_utils.uc (and the homeproxy.uc bits the validators depend on)
+ *   firewall_utils.uc (and the homeproxy-pro.uc bits the validators depend on)
  *   in $WORK.
  */
 
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_fw4_names.sh b/luci-app-homeproxy-pro/tests/ucode/test_fw4_names.sh
similarity index 86%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_fw4_names.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_fw4_names.sh
index fd037df1c..366aa23d3 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_fw4_names.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_fw4_names.sh
@@ -3,7 +3,7 @@
 #
 # The fw4 chain/set inventory in scripts/fw4_names.sh must stay in sync with
 # the objects declared by scripts/firewall_post.ut: the first drives the
-# cleanup in init.d/homeproxy, the second creates them. A drift means either a
+# cleanup in init.d/homeproxy-pro, the second creates them. A drift means either a
 # leftover object or a delete of something that never existed (which used to
 # abort the whole cleanup batch).
 #
@@ -12,9 +12,9 @@
 ROOT="${1:-.}"
 ROOT="$(cd "$ROOT" && pwd)"
 
-NAMES="$ROOT/root/etc/homeproxy/scripts/fw4_names.sh"
-POST="$ROOT/root/etc/homeproxy/scripts/firewall_post.ut"
-PRE="$ROOT/root/etc/homeproxy/scripts/firewall_pre.uc"
+NAMES="$ROOT/root/etc/homeproxy-pro/scripts/fw4_names.sh"
+POST="$ROOT/root/etc/homeproxy-pro/scripts/firewall_post.ut"
+PRE="$ROOT/root/etc/homeproxy-pro/scripts/firewall_pre.uc"
 
 FAILED=0
 
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_generator_common.uc b/luci-app-homeproxy-pro/tests/ucode/test_generator_common.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_generator_common.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_generator_common.uc
index ffcee25e2..c886cac8e 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_generator_common.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_generator_common.uc
@@ -11,7 +11,7 @@
  * where sing-box refuses to detour into an empty direct outbound and rejects
  * the whole configuration.
  *
- * Run by tests/ucode/run.sh from a staging directory that holds homeproxy.uc,
+ * Run by tests/ucode/run.sh from a staging directory that holds homeproxy-pro.uc,
  * config/ and parser/.
  */
 
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_generators.sh b/luci-app-homeproxy-pro/tests/ucode/test_generators.sh
similarity index 96%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_generators.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_generators.sh
index 5e47e32c9..d1b3921e6 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_generators.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_generators.sh
@@ -3,7 +3,7 @@
 #
 # Run generate_client.uc / generate_server.uc against the UCI fixtures and let
 # sing-box validate the result. The generators read /etc/config and write
-# /var/run, so this script materialises an isolated copy of them: homeproxy.uc
+# /var/run, so this script materialises an isolated copy of them: homeproxy-pro.uc
 # is rewritten to point HP_DIR/RUN_DIR at a scratch directory, and the uci
 # cursor is pointed at the fixture config.
 #
@@ -52,7 +52,7 @@ run_case() {
 	if grep -q "__RULESET_DIR__" "$fixture"; then
 		# The fixture needs a real local rule-set on disk. The path must
 		# live under /tmp/homeproxy_* (validateHomeProxyPath() in
-		# homeproxy.uc whitelists /etc/homeproxy/ and /tmp/homeproxy_
+		# homeproxy-pro.uc whitelists /etc/homeproxy-pro/ and /tmp/homeproxy_
 		# only, and the custom fixture exercises the local-rule-set
 		# path whitelist gate introduced by the security patch).
 		printf '%s' '{"version":1,"rules":[{"domain_suffix":["example.com"]}]}' > "$dir/ruleset/src.json"
@@ -63,10 +63,10 @@ run_case() {
 		fi
 		# Stage the ruleset under a /tmp/homeproxy_* directory so the
 		# whitelist recognises the staging path. Production paths
-		# typically live at /etc/homeproxy/ruleset/...
+		# typically live at /etc/homeproxy-pro/ruleset/...
 		#
 		# The path cannot move under $WORK (validateHomeProxyPath() in
-		# homeproxy.uc whitelists /etc/homeproxy/ and /tmp/homeproxy_
+		# homeproxy-pro.uc whitelists /etc/homeproxy-pro/ and /tmp/homeproxy_
 		# only), but it can still be per-run: mktemp gives each run its
 		# own tree, and the trap removes it even when a case bails out
 		# early.  The old fixed /tmp/homeproxy_test_ruleset/$name leaked
@@ -78,22 +78,22 @@ run_case() {
 		HP_RULESET="$RULESET_ROOT/$name"
 		mkdir -p "$HP_RULESET"
 		cp "$dir/ruleset/test.srs" "$HP_RULESET/test.srs"
-		sed "s#__RULESET_DIR__#$HP_RULESET#" "$fixture" > "$dir/config/homeproxy"
+		sed "s#__RULESET_DIR__#$HP_RULESET#" "$fixture" > "$dir/config/homeproxy-pro"
 	else
-		cp "$fixture" "$dir/config/homeproxy"
+		cp "$fixture" "$dir/config/homeproxy-pro"
 	fi
 
 	if [ -n "$variation" ]; then
-		sed -e "$variation" "$dir/config/homeproxy" > "$dir/config/homeproxy.sed" \
+		sed -e "$variation" "$dir/config/homeproxy-pro" > "$dir/config/homeproxy-pro.sed" \
 			|| { echo "FAIL: $name: the fixture variation could not be applied"; FAILED=1; return; }
-		if cmp -s "$dir/config/homeproxy" "$dir/config/homeproxy.sed"; then
+		if cmp -s "$dir/config/homeproxy-pro" "$dir/config/homeproxy-pro.sed"; then
 			# A variation that matched nothing would run the same case twice
 			# and report a pass for behaviour that was never exercised.
 			echo "FAIL: $name: the fixture variation matched nothing ($variation)"
 			FAILED=1
 			return
 		fi
-		mv "$dir/config/homeproxy.sed" "$dir/config/homeproxy"
+		mv "$dir/config/homeproxy-pro.sed" "$dir/config/homeproxy-pro"
 	fi
 
 
@@ -102,39 +102,39 @@ run_case() {
 	#
 	# UCICONFIG_DIR is the UCI confdir the Loader hands to cursor().  On a
 	# target it is /etc/config; here it has to point at the fixture staged
-	# below as $dir/config/homeproxy.  Rewriting the constant is what keeps
+	# below as $dir/config/homeproxy-pro.  Rewriting the constant is what keeps
 	# the staging seam out of the source files - staging it as
 	# HP_DIR + '/config' instead would silently diverge from production,
 	# which is exactly the bug this constant replaced.
 	VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
-	sed -e "s#^export const HP_DIR = '/etc/homeproxy';#export const HP_DIR = '$dir';#" \
-	    -e "s#^export const RUN_DIR = '/var/run/homeproxy';#export const RUN_DIR = '$dir/run';#" \
+	sed -e "s#^export const HP_DIR = '/etc/homeproxy-pro';#export const HP_DIR = '$dir';#" \
+	    -e "s#^export const RUN_DIR = '/var/run/homeproxy-pro';#export const RUN_DIR = '$dir/run';#" \
 	    -e "s#^export const UCICONFIG_DIR = '/etc/config';#export const UCICONFIG_DIR = '$dir/config';#" \
 	    -e "s#/sbin/validate_data#${VALIDATE_DATA}#" \
-	    "$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$dir/scripts/homeproxy.uc"
+	    "$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$dir/scripts/homeproxy-pro.uc"
 
 	# Stage the config/ subtree (Loader / Model / Adapter, imported via
 	# the relative path "../config/*.uc" by the generator modules).
-	cp "$ROOT/root/etc/homeproxy/scripts/config/loader.uc"  "$dir/scripts/config/"
-	cp "$ROOT/root/etc/homeproxy/scripts/config/model.uc"   "$dir/scripts/config/"
-	cp "$ROOT/root/etc/homeproxy/scripts/config/adapter.uc" "$dir/scripts/config/"
+	cp "$ROOT/root/etc/homeproxy-pro/scripts/config/loader.uc"  "$dir/scripts/config/"
+	cp "$ROOT/root/etc/homeproxy-pro/scripts/config/model.uc"   "$dir/scripts/config/"
+	cp "$ROOT/root/etc/homeproxy-pro/scripts/config/adapter.uc" "$dir/scripts/config/"
 	# PR-02: config/loader.uc imports '../parser/mapping.uc', so the
 	# parser tree has to be staged as a sibling of config/ or the
 	# generator cannot even load the configuration.
 	mkdir -p "$dir/scripts/parser"
-	cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc "$dir/scripts/parser/"
+	cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc "$dir/scripts/parser/"
 
 	# Stage the generator/ subtree that PHASE 4 introduced. The CLI
 	# shells (scripts/generate_*.uc) import from generator/; the
 	# modules in turn import from common.uc, dns.uc, ... inside the
 	# same directory.
-	cp "$ROOT/root/etc/homeproxy/scripts/generator/"*.uc "$dir/scripts/generator/"
+	cp "$ROOT/root/etc/homeproxy-pro/scripts/generator/"*.uc "$dir/scripts/generator/"
 
 	# Stage the CLI shells themselves. This is the entry point the
 	# production init.d runs (`ucode -S generate_client.uc`); the
 	# test exercises the same code path end-to-end, not a parallel
 	# test-only driver.
-	cp "$ROOT/root/etc/homeproxy/scripts/$generator" "$dir/scripts/$generator"
+	cp "$ROOT/root/etc/homeproxy-pro/scripts/$generator" "$dir/scripts/$generator"
 
 	# No platform patching here on purpose.  The suite used to rewrite
 	# generator/client.uc's `routing_mark` to null on Darwin, because the
@@ -989,7 +989,7 @@ for rm in gfwlist proxy_mainland_china global; do
 	if [ ! -f "$cf_json" ]; then
 		echo "FAIL: cache-file-$rm: no config was generated"
 		FAILED=1
-	elif ! grep -q '"path": "/etc/homeproxy/cache.db"' "$cf_json"; then
+	elif ! grep -q '"path": "/etc/homeproxy-pro/cache.db"' "$cf_json"; then
 		echo "FAIL: cache-file-$rm: experimental.cache_file is missing for routing_mode='$rm'"
 		FAILED=1
 	else
@@ -1002,7 +1002,7 @@ cf_json="$WORK/cache-file-bypass_mainland_china/run/sing-box-c.json"
 if [ ! -f "$cf_json" ]; then
 	echo "FAIL: cache-file-bypass_mainland_china: no config was generated"
 	FAILED=1
-elif ! grep -q '"path": "/etc/homeproxy/cache.db"' "$cf_json"; then
+elif ! grep -q '"path": "/etc/homeproxy-pro/cache.db"' "$cf_json"; then
 	echo "FAIL: cache-file-bypass_mainland_china: experimental.cache_file is missing for routing_mode='bypass_mainland_china'"
 	FAILED=1
 else
@@ -1014,21 +1014,21 @@ cf_json="$WORK/cache-file-custom/run/sing-box-c.json"
 if [ ! -f "$cf_json" ]; then
 	echo "FAIL: cache-file-custom: no config was generated"
 	FAILED=1
-elif ! grep -q '"path": "/etc/homeproxy/cache.db"' "$cf_json"; then
+elif ! grep -q '"path": "/etc/homeproxy-pro/cache.db"' "$cf_json"; then
 	echo "FAIL: cache-file-custom: experimental.cache_file is missing for routing_mode='custom'"
 	FAILED=1
 else
 	echo "PASS: cache-file-custom: experimental.cache_file emitted for routing_mode='custom'"
 fi
 
-# 5) P3 #7 / §4.2.1: a local ruleset whose path is outside the homeproxy
+# 5) P3 #7 / §4.2.1: a local ruleset whose path is outside the homeproxy-pro
 #    whitelist (e.g. /etc/passwd) used to silently set the field to
 #    null. The fix is to die() with a message naming the offender.
 #    run_case_type_error observes the refusal. The variation targets
 #    the *staged* config (after run_case substituted the placeholder
 #    with the per-run /tmp path), so the pattern is on the real path
 #    prefix rather than the fixture literal.
-run_case_type_error local-ruleset-bad-path "outside the homeproxy whitelist" \
+run_case_type_error local-ruleset-bad-path "outside the homeproxy-pro whitelist" \
 	"$ROOT/tests/fixtures/generators/custom.uci" generate_client.uc sing-box-c.json \
 	"s%^[[:space:]]*option path '/tmp/homeproxy_test_ruleset\\.[^/]*/local-ruleset-bad-path/test.srs'%    option path '/etc/passwd'%"
 
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_golden_inbounds.sh b/luci-app-homeproxy-pro/tests/ucode/test_golden_inbounds.sh
similarity index 91%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_golden_inbounds.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_golden_inbounds.sh
index 45993a643..0fb8d7426 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_golden_inbounds.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_golden_inbounds.sh
@@ -36,16 +36,16 @@ rm -rf "$WORK"
 mkdir -p "$WORK/scripts/config" "$WORK/scripts/parser"
 
 # HP_VALIDATE_DATA lets a development host replace /sbin/validate_data; the
-# loader itself does not validate, but homeproxy.uc is imported by the adapter.
+# loader itself does not validate, but homeproxy-pro.uc is imported by the adapter.
 VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
 sed -e "s#/sbin/validate_data#${VALIDATE_DATA}#" \
-	"$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/scripts/homeproxy.uc"
+	"$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/scripts/homeproxy-pro.uc"
 
-cp "$ROOT/root/etc/homeproxy/scripts/config/loader.uc"  "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/model.uc"   "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/adapter.uc" "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc       "$WORK/scripts/parser/"
-cp "$FIXTURE" "$WORK/scripts/config/homeproxy"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/loader.uc"  "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/model.uc"   "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/adapter.uc" "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc       "$WORK/scripts/parser/"
+cp "$FIXTURE" "$WORK/scripts/config/homeproxy-pro"
 
 # One inbound per server section, keyed by the UCI section name so the
 # snapshot is stable across runs and only changes when the adapter or the
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_golden_outbounds.sh b/luci-app-homeproxy-pro/tests/ucode/test_golden_outbounds.sh
similarity index 92%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_golden_outbounds.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_golden_outbounds.sh
index a724ce63a..287646da6 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_golden_outbounds.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_golden_outbounds.sh
@@ -33,19 +33,19 @@ rm -rf "$WORK"
 mkdir -p "$WORK/scripts/config"
 
 # HP_VALIDATE_DATA lets a development host replace /sbin/validate_data; the
-# loader itself does not validate, but homeproxy.uc is imported by the adapter.
+# loader itself does not validate, but homeproxy-pro.uc is imported by the adapter.
 VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
 sed -e "s#/sbin/validate_data#${VALIDATE_DATA}#" \
-	"$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/scripts/homeproxy.uc"
+	"$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/scripts/homeproxy-pro.uc"
 
-cp "$ROOT/root/etc/homeproxy/scripts/config/loader.uc"  "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/model.uc"   "$WORK/scripts/config/"
-cp "$ROOT/root/etc/homeproxy/scripts/config/adapter.uc" "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/loader.uc"  "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/model.uc"   "$WORK/scripts/config/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/config/adapter.uc" "$WORK/scripts/config/"
 # PR-02: config/loader.uc imports '../parser/mapping.uc'; stage the
 # parser tree as a sibling of config/ or nothing loads.
 mkdir -p "$WORK/scripts/parser"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc "$WORK/scripts/parser/"
-cp "$FIXTURE" "$WORK/scripts/config/homeproxy"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc "$WORK/scripts/parser/"
+cp "$FIXTURE" "$WORK/scripts/config/homeproxy-pro"
 
 # One outbound per node, in fixture order.  %.J keeps the JSON value-exact and
 # the key order is the field-table order, so the snapshot is stable across
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_homeproxy-pro_utils.uc b/luci-app-homeproxy-pro/tests/ucode/test_homeproxy-pro_utils.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_homeproxy-pro_utils.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_homeproxy-pro_utils.uc
index 2c6dabfef..9b56b50c4 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_homeproxy-pro_utils.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_homeproxy-pro_utils.uc
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2025 ImmortalWrt.org
  *
- * Regression tests for homeproxy.uc helpers, focused on executeCommand():
+ * Regression tests for homeproxy-pro.uc helpers, focused on executeCommand():
  * return shape, stderr/exit-code capture, binary detection and (most
  * importantly) that the temporary descriptors are closed on every run.
  */
@@ -12,7 +12,7 @@
 'use strict';
 
 import { lsdir } from 'fs';
-import { executeCommand, isValidCIDR, isValidPEM, redactReason, redactUrl, shellQuote, wGETVerbose } from 'homeproxy';
+import { executeCommand, isValidCIDR, isValidPEM, redactReason, redactUrl, shellQuote, wGETVerbose } from 'homeproxy-pro';
 
 let failures = 0,
     checks = 0;
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_homeproxy-pro_utils_inject.uc b/luci-app-homeproxy-pro/tests/ucode/test_homeproxy-pro_utils_inject.uc
similarity index 94%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_homeproxy-pro_utils_inject.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_homeproxy-pro_utils_inject.uc
index a81722d7b..41b42caea 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_homeproxy-pro_utils_inject.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_homeproxy-pro_utils_inject.uc
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2025 ImmortalWrt.org
  *
- * Exceptional-path test for executeCommand(): the copy of homeproxy.uc staged
+ * Exceptional-path test for executeCommand(): the copy of homeproxy-pro.uc staged
  * next to this file has its `system()` call replaced by `die()`, so every call
  * throws before the descriptors are read. ucode has no `finally`, so this
  * checks that the catch block still closes both descriptors.
@@ -13,7 +13,7 @@
 'use strict';
 
 import { lsdir } from 'fs';
-import { executeCommand } from 'homeproxy';
+import { executeCommand } from 'homeproxy-pro';
 
 let failures = 0;
 
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_inbound_adapter.uc b/luci-app-homeproxy-pro/tests/ucode/test_inbound_adapter.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_inbound_adapter.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_inbound_adapter.uc
index 9792c9439..fad7c4183 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_inbound_adapter.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_inbound_adapter.uc
@@ -22,7 +22,7 @@
  *     {type, password, ...} object
  *
  * Run through tests/ucode/run.sh, which stages config/ + parser/ next to
- * the homeproxy test double.
+ * the homeproxy-pro test double.
  */
 
 'use strict';
@@ -364,7 +364,7 @@ function make_inbound(id, type, opts) {
 		uuid: 'u',
 		tls: '1',
 		tls_sni: 't.example.com',
-		tls_key_path: '/etc/homeproxy/certs/t.key',
+		tls_key_path: '/etc/homeproxy-pro/certs/t.key',
 		tls_ech_key: 'ECHKEY',
 		tls_acme: '1',
 		tls_acme_domain: 't.example.com',
@@ -373,7 +373,7 @@ function make_inbound(id, type, opts) {
 	});
 	const out = InboundFactory.create(inbound);
 
-	expect('tls: key_path', out.tls.key_path, '/etc/homeproxy/certs/t.key');
+	expect('tls: key_path', out.tls.key_path, '/etc/homeproxy-pro/certs/t.key');
 	expect('tls: ech.key', out.tls.ech.key, ['ECHKEY']);
 	expect('tls: acme type', out.tls.certificate_provider.type, 'acme');
 	expect('tls: acme domain is an array', out.tls.certificate_provider.domain, ['t.example.com']);
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_migrate_config.sh b/luci-app-homeproxy-pro/tests/ucode/test_migrate_config.sh
similarity index 92%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_migrate_config.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_migrate_config.sh
index 48526f6e5..3188c797c 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_migrate_config.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_migrate_config.sh
@@ -46,22 +46,22 @@ STAGE="$WORK/scripts"
 rm -rf "$WORK"
 mkdir -p "$SANDBOX" "$STAGE"
 
-# cursor(dir) reads <dir>/homeproxy directly (NOT <dir>/config/homeproxy).
-cat > "$SANDBOX/homeproxy" <<'EOF'
-config homeproxy 'config'
+# cursor(dir) reads <dir>/homeproxy-pro directly (NOT <dir>/config/homeproxy-pro).
+cat > "$SANDBOX/homeproxy-pro" <<'EOF'
+config homeproxy-pro 'config'
 	option log_level ''
 	option china_dns_server 'wan_114'
 	option routing_port 'all'
-config homeproxy 'infra'
+config homeproxy-pro 'infra'
 	option self_mark '100'
 	option china_dns_port '5354'
 	option github_token 'secret'
-config homeproxy 'dns'
+config homeproxy-pro 'dns'
 	option default_server 'block-dns'
 	option independent_cache '1'
 	option cache_file_store_rdrc '1'
 	option cache_file_rdrc_timeout '60'
-config homeproxy 'server'
+config homeproxy-pro 'server'
 	option auto_firewall '1'
 config dns_server 'ds_default'
 	option address 'tls://1.1.1.1:853'
@@ -82,7 +82,7 @@ config server 'srv_one'
 	option sniff_override '1'
 EOF
 
-# Stage the mock homeproxy + migrate_config.uc + test driver next to
+# Stage the mock homeproxy-pro + migrate_config.uc + test driver next to
 # each other so the bare-name imports resolve through -L.
 #
 # migrate_config.uc runs at import time and writes through a UCI
@@ -92,8 +92,8 @@ EOF
 # cursor() call - the project moved away from test seams in
 # production code when HP_TEST_HOOK was removed, and re-adding one
 # would go backwards.
-cp "$ROOT/tests/ucode/mocks/homeproxy.uc" "$STAGE/"
-cp "$ROOT/root/etc/homeproxy/scripts/migrate_config.uc" "$STAGE/"
+cp "$ROOT/tests/ucode/mocks/homeproxy-pro.uc" "$STAGE/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/migrate_config.uc" "$STAGE/"
 cp "$ROOT/tests/ucode/test_migrate_config.uc" "$STAGE/"
 
 # The shebang is dropped in the staged copy: migrate_config.uc is a
@@ -134,7 +134,7 @@ fi
 # A crontab that still carries the legacy entry, plus one line that must
 # survive.  The migration has to remove exactly the former.
 cat > "$SANDBOX/crontab" <<'CRONTAB'
-0 3 * * * /etc/homeproxy/scripts/update_crond.sh
+0 3 * * * /etc/homeproxy-pro/scripts/update_crond.sh
 */5 * * * * /usr/bin/echo keep-me
 CRONTAB
 mv "$STAGE/migrate_config.uc.new" "$STAGE/migrate_config.uc"
@@ -162,7 +162,7 @@ if ! grep -q 'keep-me' "$SANDBOX/crontab"; then
 	FAILED=1
 fi
 
-if ! grep -q "option crontab '1'" "$SANDBOX/homeproxy"; then
+if ! grep -q "option crontab '1'" "$SANDBOX/homeproxy-pro"; then
 	echo "FAIL: migrate_config regressions: the crontab marker was not set after a successful edit"
 	FAILED=1
 fi
diff --git a/luci-app-homeproxy-pro/tests/ucode/test_migrate_config.uc b/luci-app-homeproxy-pro/tests/ucode/test_migrate_config.uc
new file mode 100644
index 000000000..320e481fd
--- /dev/null
+++ b/luci-app-homeproxy-pro/tests/ucode/test_migrate_config.uc
@@ -0,0 +1,144 @@
+#!/usr/bin/ucode
+/*
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Driver for tests/ucode/test_migrate_config.sh.
+ *
+ * migrate_config.uc has no exports: the migration executes at import
+ * time and writes through a UCI cursor. The staged copy of
+ * migrate_config.uc has been rewritten by the runner so its cursor
+ * reads ARGV[0] (the sandbox dir) instead of /etc/config - so this
+ * driver just imports it and lets the side effect run.
+ *
+ * The assertions below then re-read the sandbox and check the
+ * post-state step by step, so a failure names the migration step
+ * that regressed rather than "migrate broke something".
+ */
+
+'use strict';
+
+import { cursor } from 'uci';
+
+import 'migrate_config';
+
+const uci = cursor(ARGV[0]);
+uci.load('homeproxy-pro');
+
+let failures = 0,
+    checks = 0;
+
+function expect(name, actual, want) {
+	checks++;
+	if (sprintf('%J', actual) !== sprintf('%J', want)) {
+		printf('FAIL %s: expected %J, got %J\n', name, want, actual);
+		failures++;
+	}
+}
+
+/* --- infra section ---------------------------------------------------- */
+
+/* chinadns-ng removed: china_dns_port deleted. */
+expect('infra.china_dns_port deleted', uci.get('homeproxy-pro', 'infra', 'china_dns_port'), null);
+
+/* github_token moved from infra to config. */
+expect('config.github_token set', uci.get('homeproxy-pro', 'config', 'github_token'), 'secret');
+expect('infra.github_token deleted', uci.get('homeproxy-pro', 'infra', 'github_token'), null);
+
+/* ntp_server introduced, defaults to the 'nil' sentinel. */
+expect('infra.ntp_server default', uci.get('homeproxy-pro', 'infra', 'ntp_server'), 'nil');
+
+/* tun_gso deprecated in sing-box 1.11: absent here, so nothing to do -
+ * assert it stays absent rather than flapping to a default. */
+expect('infra.tun_gso stays absent', uci.get('homeproxy-pro', 'infra', 'tun_gso'), null);
+
+/* --- config section --------------------------------------------------- */
+
+/* single-value chinadns server: legacy 'wan_114' maps to 114.114.114.114. */
+expect('config.china_dns_server→114', uci.get('homeproxy-pro', 'config', 'china_dns_server'), '114.114.114.114');
+
+/* log_level introduced, defaults to 'warn'. */
+expect('config.log_level default', uci.get('homeproxy-pro', 'config', 'log_level'), 'warn');
+
+/* routing_port='all' means "every port" = no option at all. */
+expect('config.routing_port deleted', uci.get('homeproxy-pro', 'config', 'routing_port'), null);
+
+/* --- dns section ------------------------------------------------------ */
+
+/* default_server='block-dns' becomes 'default-dns' plus an appended
+ * reject rule that reproduces the old "block everything" behaviour. */
+expect('dns.default_server→default-dns', uci.get('homeproxy-pro', 'dns', 'default_server'), 'default-dns');
+expect('dns final-block action', uci.get('homeproxy-pro', '_migration_dns_final_block', 'action'), 'reject');
+expect('dns final-block enabled', uci.get('homeproxy-pro', '_migration_dns_final_block', 'enabled'), '1');
+
+/* sing-box 1.14 deprecated DNS semantics. */
+expect('dns.independent_cache deleted', uci.get('homeproxy-pro', 'dns', 'independent_cache'), null);
+expect('dns.store_rdrc→store_dns', uci.get('homeproxy-pro', 'dns', 'cache_file_store_dns'), '1');
+expect('dns.store_rdrc deleted', uci.get('homeproxy-pro', 'dns', 'cache_file_store_rdrc'), null);
+expect('dns.rdrc_timeout deleted', uci.get('homeproxy-pro', 'dns', 'cache_file_rdrc_timeout'), null);
+
+/* --- dns_server: legacy address form ---------------------------------- */
+
+/* 'tls://1.1.1.1:853' splits into type/server/server_port, and the
+ * legacy address key is dropped so the generator stops reading it. */
+expect('ds_default.type', uci.get('homeproxy-pro', 'ds_default', 'type'), 'tls');
+expect('ds_default.server', uci.get('homeproxy-pro', 'ds_default', 'server'), '1.1.1.1');
+expect('ds_default.server_port', uci.get('homeproxy-pro', 'ds_default', 'server_port'), '853');
+expect('ds_default.address deleted', uci.get('homeproxy-pro', 'ds_default', 'address'), null);
+
+/* strategy / client_subnet moved out of the dns_server and into the
+ * dns_rule that referenced it. */
+expect('ds_default.strategy deleted', uci.get('homeproxy-pro', 'ds_default', 'strategy'), null);
+expect('ds_default.client_subnet deleted', uci.get('homeproxy-pro', 'ds_default', 'client_subnet'), null);
+expect('dr_uses_default.strategy', uci.get('homeproxy-pro', 'dr_uses_default', 'strategy'), 'prefer_ipv4');
+expect('dr_uses_default.client_subnet', uci.get('homeproxy-pro', 'dr_uses_default', 'client_subnet'), '1.2.3.0/24');
+
+/* RCode-as-address migrated into the predefined-rcode rule form; the
+ * dns_server section itself is removed. */
+expect('ds_rcode section deleted', uci.get_all('homeproxy-pro', 'ds_rcode'), null);
+
+/* --- dns_rule --------------------------------------------------------- */
+
+/* server='block-dns' moved into action='reject'. */
+expect('dr_block.action=reject', uci.get('homeproxy-pro', 'dr_block', 'action'), 'reject');
+expect('dr_block.server deleted', uci.get('homeproxy-pro', 'dr_block', 'server'), null);
+
+/* rule_set_ipcidr_match_source renamed to rule_set_ip_cidr_match_source. */
+expect('dr_stale.old key deleted', uci.get('homeproxy-pro', 'dr_stale', 'rule_set_ipcidr_match_source'), null);
+expect('dr_stale.new key set', uci.get('homeproxy-pro', 'dr_stale', 'rule_set_ip_cidr_match_source'), '1');
+
+/* a rule with no action gets the 'route' default. */
+expect('dr_uses_default.action=route', uci.get('homeproxy-pro', 'dr_uses_default', 'action'), 'route');
+
+/* --- routing_rule ----------------------------------------------------- */
+
+/* outbound='block-out' moved into action='reject'. */
+expect('rr_block.action=reject', uci.get('homeproxy-pro', 'rr_block', 'action'), 'reject');
+expect('rr_block.outbound deleted', uci.get('homeproxy-pro', 'rr_block', 'outbound'), null);
+
+/* --- server ----------------------------------------------------------- */
+
+/* auto_firewall was a single global flag; it is redistributed onto
+ * each server section as firewall='1'. */
+expect('srv_one.firewall set', uci.get('homeproxy-pro', 'srv_one', 'firewall'), '1');
+expect('server.auto_firewall deleted', uci.get('homeproxy-pro', 'server', 'auto_firewall'), null);
+
+/* sniff_override deprecated in sing-box 1.11. */
+expect('srv_one.sniff_override deleted', uci.get('homeproxy-pro', 'srv_one', 'sniff_override'), null);
+
+/* server log_level introduced, defaults to 'warn'. */
+expect('server.log_level default', uci.get('homeproxy-pro', 'server', 'log_level'), 'warn');
+
+/* --- migration bookkeeping -------------------------------------------- */
+
+/* the migration marker section must survive so the crontab cleanup
+ * does not run twice. */
+expect('migration.crontab marker', uci.get('homeproxy-pro', 'migration', 'crontab'), '1');
+
+/* --- summary ---------------------------------------------------------- */
+
+if (failures > 0)
+	printf('FAIL: %d/%d checks failed\n', failures, checks);
+else
+	printf('PASS: %d checks\n', checks);
+
+exit(failures > 0 ? 1 : 0);
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_mock_sync.sh b/luci-app-homeproxy-pro/tests/ucode/test_mock_sync.sh
similarity index 92%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_mock_sync.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_mock_sync.sh
index fcc509d5e..c28a2d524 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_mock_sync.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_mock_sync.sh
@@ -3,9 +3,9 @@
 #
 # The test doubles must still behave like the production code they copy.
 #
-# tests/ucode/mocks/homeproxy.uc says of isEmpty/decodeBase64Str/parseURL:
+# tests/ucode/mocks/homeproxy-pro.uc says of isEmpty/decodeBase64Str/parseURL:
 # "verbatim copy so the parser tests exercise the same string handling as
-# production. Keep these in sync when homeproxy.uc changes."  Nothing enforced
+# production. Keep these in sync when homeproxy-pro.uc changes."  Nothing enforced
 # that sentence.  tests/ucode/mocks/homeproxy_fetcher.uc carries the same note
 # for redactUrl, and the *security* assertion in
 # test_subscription_fetcher.uc - that a subscription token cannot reappear in
@@ -51,7 +51,7 @@ fi
 
 mkdir -p "$WORK/scripts"
 sed -e "s#/sbin/validate_data#$VALIDATE_DATA#" \
-	"$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/scripts/homeproxy.uc"
+	"$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/scripts/homeproxy-pro.uc"
 
 cat > "$WORK/sync.uc" <<'DRIVER'
 import {
@@ -60,7 +60,7 @@ import {
 	redactUrl as p_redactUrl,
 	parseURL as p_parseURL,
 	shellQuote as p_shellQuote
-} from '@@SCRIPTS@@/homeproxy.uc';
+} from '@@SCRIPTS@@/homeproxy-pro.uc';
 import {
 	isEmpty as m_isEmpty,
 	decodeBase64Str as m_decodeBase64Str,
@@ -137,12 +137,12 @@ exit(failures ? 1 : 0);
 DRIVER
 
 sed -e "s#@@SCRIPTS@@#$WORK/scripts#" \
-    -e "s#@@MOCK-HP@@#$ROOT/tests/ucode/mocks/homeproxy.uc#" \
+    -e "s#@@MOCK-HP@@#$ROOT/tests/ucode/mocks/homeproxy-pro.uc#" \
     -e "s#@@MOCK-FETCHER@@#$ROOT/tests/ucode/mocks/homeproxy_fetcher.uc#" \
     "$WORK/sync.uc" > "$WORK/sync.uc.new"
 mv -f "$WORK/sync.uc.new" "$WORK/sync.uc"
 
-if ucode -L "$ROOT/root/etc/homeproxy/scripts" "$WORK/sync.uc"; then
+if ucode -L "$ROOT/root/etc/homeproxy-pro/scripts" "$WORK/sync.uc"; then
 	echo "PASS: the test doubles agree with production"
 	rm -rf "$WORK"
 	exit 0
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_parse_uri.uc b/luci-app-homeproxy-pro/tests/ucode/test_parse_uri.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_parse_uri.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_parse_uri.uc
index e6944b79f..3fe078734 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_parse_uri.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_parse_uri.uc
@@ -6,7 +6,7 @@
  *
  * Unit tests for the share-link parsers in scripts/parser/. Run
  * through tests/ucode/run.sh, which stages the whole parser/ tree
- * next to the mocked homeproxy.uc.
+ * next to the mocked homeproxy-pro.uc.
  *
  * PR-02: parse_uri() now dispatches from scripts/parser/uri.uc,
  * pulling the per-scheme branches from parser/protocols.uc and the
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_parser_flatten.uc b/luci-app-homeproxy-pro/tests/ucode/test_parser_flatten.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_parser_flatten.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_parser_flatten.uc
index 3f7a12ea3..b3ba57012 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_parser_flatten.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_parser_flatten.uc
@@ -21,7 +21,7 @@
  *
  * Run through tests/ucode/run.sh's parser tree staging (same as
  * test_parse_uri.uc): the staged work dir has the production
- * parser/ tree plus the homeproxy mock.
+ * parser/ tree plus the homeproxy-pro mock.
  */
 
 'use strict';
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_parser_normalize.uc b/luci-app-homeproxy-pro/tests/ucode/test_parser_normalize.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_parser_normalize.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_parser_normalize.uc
index ff5a81628..b586c1459 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_parser_normalize.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_parser_normalize.uc
@@ -9,7 +9,7 @@
  *
  * Run through tests/ucode/run.sh's parser tree staging (same as
  * test_parse_uri.uc): the staged work dir has the production
- * parser/ tree plus the homeproxy mock.
+ * parser/ tree plus the homeproxy-pro mock.
  */
 
 'use strict';
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_protocol_inventory.sh b/luci-app-homeproxy-pro/tests/ucode/test_protocol_inventory.sh
similarity index 97%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_protocol_inventory.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_protocol_inventory.sh
index adf3ba4e8..d5a0afa95 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_protocol_inventory.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_protocol_inventory.sh
@@ -30,7 +30,7 @@ ROOT="${1:-.}"
 WORK="${2:-/tmp/hp-inventory-test}"
 
 ROOT="$(cd "$ROOT" && pwd)"
-SCRIPTS="$ROOT/root/etc/homeproxy/scripts"
+SCRIPTS="$ROOT/root/etc/homeproxy-pro/scripts"
 SNAPSHOT="$ROOT/tests/snapshots/generator/outbounds.json"
 FAILED=0
 
@@ -39,9 +39,9 @@ mkdir -p "$WORK/parser" "$WORK/inventory/config"
 
 # --- stage 1: what does the parser produce? ------------------------------
 # PR-02 moved the parsers to scripts/parser/{uri,protocols,validator,
-# normalize,mapping}.uc; stage the whole tree plus the homeproxy mock
+# normalize,mapping}.uc; stage the whole tree plus the homeproxy-pro mock
 # so the share-link importer can find every import it needs.
-cp "$ROOT/tests/ucode/mocks/homeproxy.uc" "$WORK/parser/homeproxy.uc"
+cp "$ROOT/tests/ucode/mocks/homeproxy-pro.uc" "$WORK/parser/homeproxy-pro.uc"
 # The test module imports 'parser/uri.uc', which resolves relative to
 # the -L search root, so the parser tree must be staged as a `parser/`
 # subdirectory of that root (not flattened into it).
@@ -100,7 +100,7 @@ fi
 # --- stage 2: do the tables and the golden snapshot agree? ---------------
 VALIDATE_DATA="${HP_VALIDATE_DATA:-/sbin/validate_data}"
 sed -e "s#/sbin/validate_data#${VALIDATE_DATA}#" \
-	"$SCRIPTS/homeproxy.uc" > "$WORK/inventory/homeproxy.uc"
+	"$SCRIPTS/homeproxy-pro.uc" > "$WORK/inventory/homeproxy-pro.uc"
 cp "$SCRIPTS/config/loader.uc"  "$WORK/inventory/config/"
 cp "$SCRIPTS/config/model.uc"   "$WORK/inventory/config/"
 cp "$SCRIPTS/config/adapter.uc" "$WORK/inventory/config/"
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_resource_blob_sha.sh b/luci-app-homeproxy-pro/tests/ucode/test_resource_blob_sha.sh
similarity index 95%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_resource_blob_sha.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_resource_blob_sha.sh
index 79b460155..08b03a9d1 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_resource_blob_sha.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_resource_blob_sha.sh
@@ -23,7 +23,7 @@ if ! command -v ucode > "/dev/null" 2>&1; then
 	exit 2
 fi
 
-HELPER="$ROOT/root/etc/homeproxy/scripts/resource_blob_sha.uc"
+HELPER="$ROOT/root/etc/homeproxy-pro/scripts/resource_blob_sha.uc"
 rm -rf "$WORK"
 mkdir -p "$WORK"
 
@@ -89,8 +89,8 @@ fi
 # does not). This is the check that would notice the helper drifting from git's
 # format on a file it actually has to hash.
 if command -v git > "/dev/null" 2>&1 && [ -d "$ROOT/.git" ]; then
-	for f in "root/etc/homeproxy/resources/china_ip4.txt" \
-	         "root/etc/homeproxy/resources/gfw_list.txt"; do
+	for f in "root/etc/homeproxy-pro/resources/china_ip4.txt" \
+	         "root/etc/homeproxy-pro/resources/gfw_list.txt"; do
 		[ -f "$ROOT/$f" ] || continue
 		expect "matches git hash-object: $(basename "$f")" \
 			"$(blob_sha "$ROOT/$f")" "$(git hash-object "$ROOT/$f")"
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_rpc_methods.sh b/luci-app-homeproxy-pro/tests/ucode/test_rpc_methods.sh
similarity index 92%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_rpc_methods.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_rpc_methods.sh
index 3749a4f45..92dddc085 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_rpc_methods.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_rpc_methods.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-only
 #
-# Behaviour tests for the rpcd module (root/usr/share/rpcd/ucode/luci.homeproxy).
+# Behaviour tests for the rpcd module (root/usr/share/rpcd/ucode/luci.homeproxy-pro).
 #
 # Until now that file was only ever compiled for syntax. tests/ucode/run.sh
 # rewrites its absolute imports and runs `ucode -c`, and nothing called a single
@@ -27,29 +27,29 @@ fi
 
 rm -rf "$WORK"
 mkdir -p "$WORK/scripts"
-cp -R "$ROOT/root/etc/homeproxy/scripts/." "$WORK/scripts/"
+cp -R "$ROOT/root/etc/homeproxy-pro/scripts/." "$WORK/scripts/"
 
-# stage_rewrite <src> <dst>: point a file's absolute /etc/homeproxy paths at the
+# stage_rewrite <src> <dst>: point a file's absolute /etc/homeproxy-pro paths at the
 # sandbox, and nothing else.  Both the imports and the runtime directories have
-# to move, or the test would write real certificates into /etc/homeproxy/certs.
+# to move, or the test would write real certificates into /etc/homeproxy-pro/certs.
 # The certificate staging prefix is moved too (it is a literal /tmp path inside
-# luci.homeproxy): the driver then writes and checks the staged upload under
+# luci.homeproxy-pro): the driver then writes and checks the staged upload under
 # $WORK/tmp, so the test never touches a fixed global path and two concurrent
 # runs cannot delete each other's upload between the stage and the call.
 stage_rewrite() {
-	sed -e "s#/etc/homeproxy/scripts/#$WORK/scripts/#g" \
-	    -e "s#^const HP_DIR = '/etc/homeproxy';#const HP_DIR = '$WORK';#" \
-	    -e "s#^export const HP_DIR = '/etc/homeproxy';#export const HP_DIR = '$WORK';#" \
-	    -e "s#^const RUN_DIR = '/var/run/homeproxy';#const RUN_DIR = '$WORK/run';#" \
-	    -e "s#^export const RUN_DIR = '/var/run/homeproxy';#export const RUN_DIR = '$WORK/run';#" \
+	sed -e "s#/etc/homeproxy-pro/scripts/#$WORK/scripts/#g" \
+	    -e "s#^const HP_DIR = '/etc/homeproxy-pro';#const HP_DIR = '$WORK';#" \
+	    -e "s#^export const HP_DIR = '/etc/homeproxy-pro';#export const HP_DIR = '$WORK';#" \
+	    -e "s#^const RUN_DIR = '/var/run/homeproxy-pro';#const RUN_DIR = '$WORK/run';#" \
+	    -e "s#^export const RUN_DIR = '/var/run/homeproxy-pro';#export const RUN_DIR = '$WORK/run';#" \
 	    -e "s#^export const UCICONFIG_DIR = '/etc/config';#export const UCICONFIG_DIR = '$WORK/cfg';#" \
 	    -e "s#/tmp/homeproxy_cert_#$WORK/tmp/homeproxy_cert_#g" \
 	    "$1" > "$2"
 }
 
-stage_rewrite "$WORK/scripts/homeproxy.uc" "$WORK/scripts/homeproxy.uc.new"
-mv -f "$WORK/scripts/homeproxy.uc.new" "$WORK/scripts/homeproxy.uc"
-stage_rewrite "$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy" "$WORK/rpc.uc"
+stage_rewrite "$WORK/scripts/homeproxy-pro.uc" "$WORK/scripts/homeproxy-pro.uc.new"
+mv -f "$WORK/scripts/homeproxy-pro.uc.new" "$WORK/scripts/homeproxy-pro.uc"
+stage_rewrite "$ROOT/root/usr/share/rpcd/ucode/luci.homeproxy-pro" "$WORK/rpc.uc"
 
 # update_subscriptions.call() execs the staged updater through /bin/sh, so its
 # shebang has to name the ucode that is running this test. On a target that is
@@ -253,7 +253,7 @@ printf('rpc methods: %d checks, %d failures\n', checks, failures);
 exit(failures ? 1 : 0);
 DRIVER
 
-# The module ends with `return { 'luci.homeproxy': methods };`, which makes it a
+# The module ends with `return { 'luci.homeproxy-pro': methods };`, which makes it a
 # program rather than an importable module - that is how rpcd runs it.  Drop
 # that one line and append the driver, so the module's top-level code builds
 # `methods` and the driver drives it in the same scope.  Nothing else about the
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_decoder.uc b/luci-app-homeproxy-pro/tests/ucode/test_subscription_decoder.uc
similarity index 98%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_decoder.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_subscription_decoder.uc
index 63909336d..8fe7689f9 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_decoder.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_subscription_decoder.uc
@@ -9,7 +9,7 @@
  * a hand-crafted base64 string.
  *
  * Run through tests/ucode/run.sh, which stages the module next to
- * tests/ucode/mocks/homeproxy.uc (which carries decodeBase64Str).
+ * tests/ucode/mocks/homeproxy-pro.uc (which carries decodeBase64Str).
  */
 
 'use strict';
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_fetcher.uc b/luci-app-homeproxy-pro/tests/ucode/test_subscription_fetcher.uc
similarity index 93%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_fetcher.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_subscription_fetcher.uc
index 8fab9d692..f327127ac 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_fetcher.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_subscription_fetcher.uc
@@ -12,9 +12,9 @@
  *   - non-empty content:
  *     - returns { content: <string>, error: null } with no log call
  *
- * The wGETVerbose used by the fetcher is imported from `homeproxy`.
- * Tests stage a `homeproxy` module that overrides only wGETVerbose
- * (everything else falls through to the real homeproxy.uc, so
+ * The wGETVerbose used by the fetcher is imported from `homeproxy-pro`.
+ * Tests stage a `homeproxy-pro` module that overrides only wGETVerbose
+ * (everything else falls through to the real homeproxy-pro.uc, so
  * redactUrl/isEmpty are not stubbed). The override reads the
  * pre-canned response / exit code from globals - global is the
  * only cross-module shared state ucode exposes without a real
@@ -23,7 +23,7 @@
  * REDACTION COVERAGE
  * ------------------
  * redactUrl() is exported from homeproxyuc and is what stops the
- * subscription token from landing in /var/run/homeproxy/homeproxy.log.
+ * subscription token from landing in /var/run/homeproxy-pro/homeproxy-pro.log.
  * The fetcher is the only place that logs a subscription URL on the
  * failure path; this test makes sure the redacted URL reaches the
  * log sink rather than the original (a security regression would
@@ -99,7 +99,7 @@ function make_log_capture() {
 /* Test 3: the path carries the token too. Many providers hand out
  * https://host:port/<user>/<token> with no query string at all - that is
  * what the device this was found on is configured with - and the redaction
- * used to keep the path while claiming homeproxy.log is world-readable.
+ * used to keep the path while claiming homeproxy-pro.log is world-readable.
  * The host and port have to survive, or the message stops being useful. */
 {
 	const cap = make_log_capture();
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_filter.uc b/luci-app-homeproxy-pro/tests/ucode/test_subscription_filter.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_filter.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_subscription_filter.uc
index a20d639ca..a9f3aad95 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_filter.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_subscription_filter.uc
@@ -10,7 +10,7 @@
  * move off the flat dict did not change what reaches UCI.
  *
  * Run through tests/ucode/run.sh, which stages the module next to
- * tests/ucode/mocks/homeproxy.uc so the `from 'homeproxy'` import
+ * tests/ucode/mocks/homeproxy-pro.uc so the `from 'homeproxy-pro'` import
  * resolves to the test double, and parser/ next to the test so the
  * round-trip imports resolve.
  */
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_repository.sh b/luci-app-homeproxy-pro/tests/ucode/test_subscription_repository.sh
similarity index 75%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_repository.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_subscription_repository.sh
index 05246acf0..256349663 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_repository.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_subscription_repository.sh
@@ -4,12 +4,12 @@
 # B1.2: integration test for subscription/repository.uc. Unlike
 # the filter/decoder unit tests, this one writes to a real UCI
 # cursor, so the runner stages a sandboxed config dir with a
-# pre-existing homeproxy file and points the cursor at it.
+# pre-existing homeproxy-pro file and points the cursor at it.
 #
 # Staging layout:
-#   $WORK/sandbox/homeproxy           UCI file with seed sections
+#   $WORK/sandbox/homeproxy-pro           UCI file with seed sections
 #   $WORK/sandbox/                    cursor root
-#   $WORK/scripts/                    test + homeproxy mock + module
+#   $WORK/scripts/                    test + homeproxy-pro mock + module
 #
 # cursor(dir) reads from <dir>/<name> directly (NOT <dir>/config/
 # <name>), so the seed file lives at the top of the sandbox dir.
@@ -32,19 +32,19 @@ STAGE="$WORK/scripts"
 rm -rf "$WORK"
 mkdir -p "$SANDBOX" "$STAGE"
 
-# Seed the UCI file. The cursor reads <sandbox>/homeproxy (NOT
-# <sandbox>/config/homeproxy); see the comment above.
+# Seed the UCI file. The cursor reads <sandbox>/homeproxy-pro (NOT
+# <sandbox>/config/homeproxy-pro); see the comment above.
 uci_seed() {
-	printf 'config homeproxy %s\n' "$1" >> "$SANDBOX/homeproxy"
+	printf 'config homeproxy-pro %s\n' "$1" >> "$SANDBOX/homeproxy-pro"
 	shift
 	for kv in "$@"; do
 		key="${kv%%=*}"
 		val="${kv#*=}"
-		printf '\toption %s %s\n' "$key" "$val" >> "$SANDBOX/homeproxy"
+		printf '\toption %s %s\n' "$key" "$val" >> "$SANDBOX/homeproxy-pro"
 	done
 }
 
-# The real /etc/config/homeproxy always carries `config homeproxy 'config'`;
+# The real /etc/config/homeproxy-pro always carries `config homeproxy-pro 'config'`;
 # the sandbox needs it too, because libuci's uci_set() creates an anonymous
 # section when the named one does not exist, and the main_node assertions
 # read the options back by the section name 'config'.
@@ -57,19 +57,19 @@ uci_seed cfgDROP00001 label=dropped-node grouphash=test-group type=vless \
 	address=gone.example.com
 
 # Stage the mock + the module + the test alongside each other so
-# bare-name imports (`from 'homeproxy'`, `from 'repository'`) resolve
+# bare-name imports (`from 'homeproxy-pro'`, `from 'repository'`) resolve
 # via the work-dir -L path.
 #
 # PR-03: Repository imports parser/flatten.uc, which in turn imports
 # parser/mapping.uc. Stage the whole parser/ tree into a sibling
 # `parser/` directory so the bare-name imports inside it resolve.
-cp "$ROOT/tests/ucode/mocks/homeproxy.uc" "$STAGE/"
+cp "$ROOT/tests/ucode/mocks/homeproxy-pro.uc" "$STAGE/"
 # repository.uc imports '../parser/flatten.uc', so parser/ must be a
 # sibling of the directory holding repository.uc (STAGE/subscription/),
 # not of STAGE itself.
 mkdir -p "$STAGE/subscription" "$STAGE/parser"
-cp "$ROOT/root/etc/homeproxy/scripts/parser/"*.uc "$STAGE/parser/"
-cp "$ROOT/root/etc/homeproxy/scripts/subscription/repository.uc" "$STAGE/subscription/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/parser/"*.uc "$STAGE/parser/"
+cp "$ROOT/root/etc/homeproxy-pro/scripts/subscription/repository.uc" "$STAGE/subscription/"
 cp "$ROOT/tests/ucode/test_subscription_repository.uc" "$STAGE/"
 
 if ( cd "$STAGE" && ucode -L "$STAGE" test_subscription_repository.uc "$SANDBOX" ); then
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_repository.uc b/luci-app-homeproxy-pro/tests/ucode/test_subscription_repository.uc
similarity index 99%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_repository.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_subscription_repository.uc
index cf855ea43..0984dd176 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_repository.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_subscription_repository.uc
@@ -61,7 +61,7 @@ function canonical_node(opts) {
 	};
 }
 
-const CFG = 'homeproxy';
+const CFG = 'homeproxy-pro';
 const TYPE = 'node';
 
 /* A2 (single commit): the repository must stage mutations and commit nothing.
@@ -394,7 +394,7 @@ expect('scrub: clean state changes nothing', scrub2.changed, 0);
 /* update_subscriptions.uc computes a node's `grouphash` as md5(url, fragment
  * stripped), and the Repository above names each section
  * md5(grouphash + label). The browser compares *its own* MD5 -
- * homeproxy.js calcStringMD5(), which cannot use crypto.subtle because the
+ * homeproxy-pro.js calcStringMD5(), which cannot use crypto.subtle because the
  * Web Crypto spec has no MD5 - against that grouphash to decide which
  * subscription tab a section belongs to, and whether it is a subscription
  * node at all.
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_updater_runs.sh b/luci-app-homeproxy-pro/tests/ucode/test_subscription_updater_runs.sh
similarity index 86%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_updater_runs.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_subscription_updater_runs.sh
index ed84dd6ea..38474cf68 100755
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_subscription_updater_runs.sh
+++ b/luci-app-homeproxy-pro/tests/ucode/test_subscription_updater_runs.sh
@@ -16,7 +16,7 @@
 # that was missing: given a configured subscription URL, the updater must
 # attempt an update and say something about the outcome.  The URL points at a
 # closed port, so the attempt fails fast and main() returns before the
-# `/etc/init.d/homeproxy reload` at its end - the device is not touched.
+# `/etc/init.d/homeproxy-pro reload` at its end - the device is not touched.
 #
 # Usage: sh tests/ucode/test_subscription_updater_runs.sh <repo-root> [workdir]
 
@@ -32,7 +32,7 @@ fi
 
 rm -rf "$WORK"
 mkdir -p "$WORK/scripts" "$WORK/cfg" "$WORK/run"
-cp -R "$ROOT/root/etc/homeproxy/scripts/." "$WORK/scripts/"
+cp -R "$ROOT/root/etc/homeproxy-pro/scripts/." "$WORK/scripts/"
 
 # Shadow `touch` so the test can see that a run refreshes its lock: the lock's
 # mtime is the only thing that separates a live run from one a kill left
@@ -50,17 +50,17 @@ PATH="$WORK/bin:$PATH"
 export PATH
 
 # Redirect the package's runtime dir into the sandbox so the test does not
-# append to the device's live /var/run/homeproxy/homeproxy.log, and point the
+# append to the device's live /var/run/homeproxy-pro/homeproxy-pro.log, and point the
 # configuration directory at the sandbox.  The updater reads the config
-# *inside* the lock now (A4), and it takes the directory from homeproxy.uc's
+# *inside* the lock now (A4), and it takes the directory from homeproxy-pro.uc's
 # UCICONFIG_DIR, so both rewrites land in this one file.
-sed -e "s#^export const RUN_DIR = '/var/run/homeproxy';#export const RUN_DIR = '$WORK/run';#" \
+sed -e "s#^export const RUN_DIR = '/var/run/homeproxy-pro';#export const RUN_DIR = '$WORK/run';#" \
     -e "s#^export const UCICONFIG_DIR = '/etc/config';#export const UCICONFIG_DIR = '$WORK/cfg';#" \
-    "$ROOT/root/etc/homeproxy/scripts/homeproxy.uc" > "$WORK/scripts/homeproxy.uc"
+    "$ROOT/root/etc/homeproxy-pro/scripts/homeproxy-pro.uc" > "$WORK/scripts/homeproxy-pro.uc"
 
 # An unpatched copy would read - and on a real device write - the live
-# /etc/config/homeproxy.  Fail here instead of silently testing the wrong file.
-if ! grep -q "^export const UCICONFIG_DIR = '$WORK/cfg';" "$WORK/scripts/homeproxy.uc"; then
+# /etc/config/homeproxy-pro.  Fail here instead of silently testing the wrong file.
+if ! grep -q "^export const UCICONFIG_DIR = '$WORK/cfg';" "$WORK/scripts/homeproxy-pro.uc"; then
 	echo "FAIL: could not point the updater at the sandbox config (anchor moved)"
 	rm -rf "$WORK"
 	exit 1
@@ -69,27 +69,27 @@ fi
 # Point the updater's Loader at the sandbox config.  Portable sed: write to a
 # temp file and rename, so this works under both busybox and BSD sed.
 #
-# The updater resolves the directory through homeproxy.uc's UCICONFIG_DIR (see
+# The updater resolves the directory through homeproxy-pro.uc's UCICONFIG_DIR (see
 # the rewrite above), so this step only needs to confirm the staged copy is the
 # one that was rewritten - it no longer contains a literal config path.
-if ! grep -q "^export const UCICONFIG_DIR = '$WORK/cfg';" "$WORK/scripts/homeproxy.uc"; then
-	echo "FAIL: the staged homeproxy.uc does not point at the sandbox config"
+if ! grep -q "^export const UCICONFIG_DIR = '$WORK/cfg';" "$WORK/scripts/homeproxy-pro.uc"; then
+	echo "FAIL: the staged homeproxy-pro.uc does not point at the sandbox config"
 	rm -rf "$WORK"
 	exit 1
 fi
 
-cat > "$WORK/cfg/homeproxy" <<-EOF
-	config homeproxy 'config'
+cat > "$WORK/cfg/homeproxy-pro" <<-EOF
+	config homeproxy-pro 'config'
 		option routing_mode 'proxy'
 		option main_node 'nil'
 
-	config homeproxy 'subscription'
+	config homeproxy-pro 'subscription'
 		list subscription_url 'https://127.0.0.1:1/never'
 		option filter_nodes 'disabled'
 		option auto_update '0'
 EOF
 
-LOGFILE="$WORK/run/homeproxy.log"
+LOGFILE="$WORK/run/homeproxy-pro.log"
 
 FAILED=0
 if ( cd "$WORK/scripts" && ucode -L "$WORK/scripts" update_subscriptions.uc ) > "$WORK/stdout" 2>&1; then
@@ -140,7 +140,7 @@ mkdir -p "$LOCKDIR"
 # A4: the lock is now taken *before* the configuration is read, so a run that
 # stands down must not have touched the config at all - and in particular must
 # not have written the recovery snapshot the failure path would restore.
-cp "$WORK/cfg/homeproxy" "$WORK/cfg.before-standdown"
+cp "$WORK/cfg/homeproxy-pro" "$WORK/cfg.before-standdown"
 
 if ( cd "$WORK/scripts" && ucode -L "$WORK/scripts" update_subscriptions.uc ) > "$WORK/stdout2" 2>&1; then
 	:
@@ -157,14 +157,14 @@ else
 	FAILED=1
 fi
 
-if cmp -s "$WORK/cfg.before-standdown" "$WORK/cfg/homeproxy"; then
+if cmp -s "$WORK/cfg.before-standdown" "$WORK/cfg/homeproxy-pro"; then
 	echo "PASS: a run that lost the lock left the configuration untouched"
 else
 	echo "FAIL: a run that lost the lock still rewrote the configuration"
 	FAILED=1
 fi
 
-if [ -e "$WORK/cfg/homeproxy.hp-restore" ]; then
+if [ -e "$WORK/cfg/homeproxy-pro.hp-restore" ]; then
 	echo "FAIL: a run that lost the lock wrote a recovery snapshot"
 	FAILED=1
 fi
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_tls_transport.uc b/luci-app-homeproxy-pro/tests/ucode/test_tls_transport.uc
similarity index 94%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_tls_transport.uc
rename to luci-app-homeproxy-pro/tests/ucode/test_tls_transport.uc
index 6fdd0f52c..ecd4a3595 100644
--- a/luci-app-homeproxy-pro-pro/tests/ucode/test_tls_transport.uc
+++ b/luci-app-homeproxy-pro/tests/ucode/test_tls_transport.uc
@@ -21,7 +21,7 @@
 
 'use strict';
 
-import { buildTLSObject, buildTransportObject, validateHomeProxyPath, validateCertificatePath, HP_DIR } from 'homeproxy';
+import { buildTLSObject, buildTransportObject, validateHomeProxyPath, validateCertificatePath, HP_DIR } from 'homeproxy-pro';
 
 let failures = 0,
     checks = 0;
@@ -56,12 +56,12 @@ expect('client.insecure=1 parsed', clientInsecure.insecure, true);
 const serverInsecure = buildTLSObject({ enabled: '1', server_name: 's', insecure: '1' }, true);
 expect('server.insecure forced null', serverInsecure.insecure, null);
 
-/* 4. cert_path whitelist - the validator accepts /etc/homeproxy/... and
+/* 4. cert_path whitelist - the validator accepts /etc/homeproxy-pro/... and
  *      /tmp/homeproxy_..., and rejects everything else (including
  *      /etc/passwd and relative paths). This is the security patch
  *      that backs the §4 path-whitelist entry; a regression here would
  *      let UCI drive sing-box into reading arbitrary files as root. */
-expect('cert.path /etc/homeproxy', validateHomeProxyPath('/etc/homeproxy/certs/server_publickey.pem'), true);
+expect('cert.path /etc/homeproxy-pro', validateHomeProxyPath('/etc/homeproxy-pro/certs/server_publickey.pem'), true);
 expect('cert.path /tmp/homeproxy_', validateHomeProxyPath('/tmp/homeproxy_test/foo.pem'), true);
 expect('cert.path /etc/passwd', validateHomeProxyPath('/etc/passwd'), false);
 expect('cert.path /var/run/cron', validateHomeProxyPath('/var/run/cron'), false);
@@ -69,8 +69,8 @@ expect('cert.path relative', validateHomeProxyPath('relative/path.pem'), false);
 expect('cert.path null', validateHomeProxyPath(null), false);
 expect('cert.path empty', validateHomeProxyPath(''), false);
 
-const clientCert = buildTLSObject({ enabled: '1', server_name: 's', cert_path: '/etc/homeproxy/certs/foo.pem' }, false);
-expect('client.cert_path accepted', clientCert.certificate_path, '/etc/homeproxy/certs/foo.pem');
+const clientCert = buildTLSObject({ enabled: '1', server_name: 's', cert_path: '/etc/homeproxy-pro/certs/foo.pem' }, false);
+expect('client.cert_path accepted', clientCert.certificate_path, '/etc/homeproxy-pro/certs/foo.pem');
 const clientCertBad = buildTLSObject({ enabled: '1', server_name: 's', cert_path: '/etc/passwd' }, false);
 expect('client.cert_path rejected→null', clientCertBad.certificate_path, null);
 
@@ -78,14 +78,14 @@ expect('client.cert_path rejected→null', clientCertBad.certificate_path, null)
  *       A TLS certificate normally lives under /etc/ssl/ or under the ACME
  *       state in /etc/acme/, and both sing-box jails mount those directories
  *       (runtime/service.sh). validateHomeProxyPath() only knows
- *       /etc/homeproxy/ and /tmp/homeproxy_, so a certificate the UI offered
+ *       /etc/homeproxy-pro/ and /tmp/homeproxy_, so a certificate the UI offered
  *       from /etc/ssl/ was accepted there and then silently dropped on the
  *       way into sing-box - certificate_path became null and the TLS listener
  *       failed with nothing pointing at the path. CERT_PATH_ROOTS is the
  *       backend half of the policy the frontend validator mirrors (guard 29). */
 expect('cert.paths /etc/ssl accepted', validateCertificatePath('/etc/ssl/certs/srv.pem'), true);
 expect('cert.paths /etc/acme accepted', validateCertificatePath('/etc/acme/example.com/cert.pem'), true);
-expect('cert.paths /etc/homeproxy/certs accepted', validateCertificatePath('/etc/homeproxy/certs/srv.pem'), true);
+expect('cert.paths /etc/homeproxy-pro/certs accepted', validateCertificatePath('/etc/homeproxy-pro/certs/srv.pem'), true);
 expect('cert.paths /tmp/homeproxy_ rejected',
 	validateCertificatePath('/tmp/homeproxy_test/foo.pem'), false);
 expect('cert.paths /etc/passwd rejected', validateCertificatePath('/etc/passwd'), false);
@@ -111,8 +111,8 @@ expect('client.cert_path traversal→null', traversalCert.certificate_path, null
 /* 4c. The client ECH config path is a file sing-box opens as root too, and it
  *       used to reach the config unvalidated. */
 const echOk = buildTLSObject(
-	{ enabled: '1', server_name: 's', ech: { enabled: '1', config_path: '/etc/homeproxy/certs/ech.pem' } }, false);
-expect('client.ech.config_path accepted', echOk.ech.config_path, '/etc/homeproxy/certs/ech.pem');
+	{ enabled: '1', server_name: 's', ech: { enabled: '1', config_path: '/etc/homeproxy-pro/certs/ech.pem' } }, false);
+expect('client.ech.config_path accepted', echOk.ech.config_path, '/etc/homeproxy-pro/certs/ech.pem');
 const echBad = buildTLSObject(
 	{ enabled: '1', server_name: 's', ech: { enabled: '1', config_path: '/etc/passwd' } }, false);
 expect('client.ech.config_path rejected→null', echBad.ech.config_path, null);
@@ -144,7 +144,7 @@ expect('server.reality.public_key', serverReality.reality.public_key, null);
 
 /* 7. ECH: client uses config/config_path; server uses key. */
 const clientEch = buildTLSObject({ enabled: '1', server_name: 's',
-	ech: { enabled: '1', config: 'AAAA', config_path: '/etc/homeproxy/certs/client_ech_conf.pem' } }, false);
+	ech: { enabled: '1', config: 'AAAA', config_path: '/etc/homeproxy-pro/certs/client_ech_conf.pem' } }, false);
 expect('client.ech.config', clientEch.ech.config, 'AAAA');
 
 const serverEch = buildTLSObject({ enabled: '1', server_name: 's' }, true, { tls_ech_key: 'AAAA\nBBBB' });
diff --git a/luci-app-homeproxy-pro-pro/tests/ucode/test_ucode_grammar.sh b/luci-app-homeproxy-pro/tests/ucode/test_ucode_grammar.sh
similarity index 100%
rename from luci-app-homeproxy-pro-pro/tests/ucode/test_ucode_grammar.sh
rename to luci-app-homeproxy-pro/tests/ucode/test_ucode_grammar.sh
diff --git a/luci-app-homeproxy/.gitignore b/luci-app-homeproxy/.gitignore
index 135b33915..10043cfca 100644
--- a/luci-app-homeproxy/.gitignore
+++ b/luci-app-homeproxy/.gitignore
@@ -1,2 +1,7 @@
 .DS_Store
 /homeproxy
+
+# Local working documents (review reports, improvement plans). They are kept in
+# the checkout on purpose and must never be published - same rule as
+# luci-app-homeproxy-pro.
+/docs/
diff --git a/luci-app-homeproxy/Makefile b/luci-app-homeproxy/Makefile
index cc476d80d..2c4c555d7 100644
--- a/luci-app-homeproxy/Makefile
+++ b/luci-app-homeproxy/Makefile
@@ -23,7 +23,7 @@ LUCI_DEPENDS:= \
 
 PKG_NAME:=luci-app-homeproxy
 PKG_VERSION:=27.919.1.14
-PKG_RELEASE:=18
+PKG_RELEASE:=19
 
 define Package/luci-app-homeproxy/conffiles
 /etc/config/homeproxy
diff --git a/luci-app-homeproxy/README.md b/luci-app-homeproxy/README.md
index da2c20ef6..a15979b2a 100644
--- a/luci-app-homeproxy/README.md
+++ b/luci-app-homeproxy/README.md
@@ -102,6 +102,28 @@
 
 > 回归保障：订阅抓取用 stub wget 覆盖 GNU / 非 GNU 两条分支，并在装有 `/bin/uclient-fetch` 的目标上直接执行生成的命令行；自定义路由新增 `custom.uci` fixture（本地规则集 + 直连节点覆盖 + 路由规则）。
 
+## 安全与可用性修复（r13）
+
+一轮以"资源/订阅链路真正生效"和"收敛暴露面"为目标的修复，全部结论都做了实机或本地复现。
+
+| 领域 | 变更 |
+| --- | --- |
+| **资源更新生效** | `update_resources.sh` 的 `--header-file=` 改为 `--header=`——uclient-fetch 与 GNU wget 都不认 `--header-file`，填了 GitHub token 时四个清单的版本探测会全部失败；新增 `/etc/init.d/homeproxy refresh_lists`，清单下载后重建 fw4 集合与 dnsmasq 片段（此前 cron 只改磁盘文件，只有订阅更新"顺带"重启时才真正生效） |
+| **规则集** | 删除无人引用的 `geosite-noncn`（sing-box 会初始化每一个声明的远程规则集，引用与否都会下载、失败即拒绝启动）；`geoip-cn` / `geosite-cn` 在本地 `.srs` 存在时生成为 `type: local`，否则回退远端——cron 经 jsdelivr 固定 commit 下载，冷启动不再依赖"经节点拉 CDN" |
+| **订阅与导入** | 入库前按协议校验必需字段并跳过坏节点（此前一个坏节点会让整份配置生成失败、看似更新成功却一直跑旧配置）；`flow` 只保留 `xtls-rprx-vision`；SS userinfo 先做百分号解码（`%3D` 不再丢 method/password）；`simple-obfs` 归一化为 `obfs-local`；不支持的 transport（xhttp 等）直接跳过；订阅更新加 mkdir 锁；`update_via_proxy=1` 时配置变更也会重启；日志中的订阅 URL 脱敏 |
+| **暴露面** | 生成的客户端/服务端配置权限改为 600（含全部节点凭据）；capabilities 去掉 `CAP_SYS_PTRACE` / `CAP_NET_RAW`；`dns-in` 只监听 `127.0.0.1`（此前 LAN 内可把它当解析器用）；custom 路由模式也进 ujail；core dump 关闭（`core=0`） |
+| **DNS** | `dns.servers[].headers` 由界面列表转成 1.14 要求的 map（此前填 Headers 会让整份配置非法）；`action: route` 缺 server 的 DNS 规则跳过并告警；`tls_fragment_fallback_delay` 单位修正为毫秒（原先被当成秒，放大 1000 倍）；新增 `block_https_rr` 开关（默认仍拦截 HTTPS/SVCB，需要 ECH 时关闭） |
+| **健壮性** | 大响应不再被单次 512 KiB 读取截断；防火墙模板对端口/mark/IP/MAC/接口名逐一校验（非法值不再让之后每次 `fw4 reload` 都失败）；`isValidCIDR` 严格校验前缀，堵住远程清单注入 nft 模板的路径；生成失败按退出码报错而不是沿用旧配置；`log()` 先建目录，首启诊断不再丢 |
+| **验证** | 新增 client 表单快照、client 生成 golden 快照（逐字节锁定生成结果）、700 KiB 读取与 CIDR 注入用例；CI 增加 shell/JS 语法检查，i18n 覆盖率由 warn 改为 fail |
+
+> 有意未改动的项：订阅抓取仍在 `update_via_proxy=0` 时先停服（这是该选项的定义，改抓取时序会改变抓取路径）；`tls_self_sign`、`hysteria_protocol` 与 `ssh_priv_key` 的 DynamicList 展示保持与 `-pro` 分支一致，留待两线一起收敛。
+
+### 已知限制
+
+- DNS 劫持只重定向 UDP/53，使用 DoT/DoH 的客户端绕过它（与 OpenWrt 原生 `dns_redirect` 行为一致）。
+- `bypass_mainland_china` / `custom` / `global` 下 dnsmasq 被配成 `no-resolv` + 转发给 sing-box，此时选 `system-dns` 会绕回 sing-box 自身，建议使用 `default-dns`。
+- 订阅更新在 `update_via_proxy=0` 期间服务处于停止状态，订阅多或源慢时停机时间会变长；需要零中断可开启 `update_via_proxy`。
+
 ## 运行要求
 
 - ImmortalWrt / OpenWrt ≥ 24.10+（apk 或 opkg 均可安装）
diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
index a0bd909e3..42604072e 100644
--- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
+++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
@@ -303,6 +303,11 @@ return view.extend({
 		o.depends('routing_mode', 'bypass_mainland_china');
 		o.rmempty = false;
 
+		o = s.taboption('routing', form.Flag, 'block_https_rr', _('Block HTTPS/SVCB DNS records'),
+			_('Answer HTTPS (type 65) and SVCB (type 64) queries with an empty response. Keeps clients off HTTPS-RR/ECH, which this DNS chain cannot serve through some proxies; disable it if ECH is wanted.'));
+		o.default = o.enabled;
+		o.rmempty = false;
+
 		o = s.taboption('routing', form.ListValue, 'tun_dns_mode', _('TUN DNS mode (1.14)'),
 			_('Since sing-box 1.14 the default (Unset) behaves as hijack: sing-box sets the platform interface DNS and hijacks port 53. On OpenWrt this overlaps with the own dnsmasq/nftables DNS hijack of this plugin, so keep Disabled on a gateway unless you need sing-box to own TUN DNS.'));
 		o.value('default', _('Unset (default)'));
@@ -1064,7 +1069,7 @@ return view.extend({
 		so.modalonly = true;
 
 		so = ss.option(form.DynamicList, 'headers', _('Headers'),
-			_('Additional headers to be sent to the DNS server.'));
+			_('Additional headers to be sent to the DNS server, one <code>Name: value</code> per line.'));
 		so.depends('type', 'https');
 		so.depends('type', 'h3');
 		so.modalonly = true;
diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
index 2443767f7..dc25eb39c 100644
--- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
+++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
@@ -184,6 +184,11 @@ function parseShareLink(uri, features) {
 				if (url.search && url.searchParams.get('plugin')) {
 					let plugin_info = url.searchParams.get('plugin').split(';');
 					plugin = plugin_info[0];
+					/* sing-box only knows obfs-local; simple-obfs (an old
+					   alias providers still emit) would otherwise be rejected
+					   as "plugin not found" and take the whole config with it */
+					if (plugin === 'simple-obfs')
+						plugin = 'obfs-local';
 					plugin_opts = (plugin_info.length > 1) ? plugin_info.slice(1).join(';') : null;
 				}
 
@@ -302,7 +307,10 @@ function parseShareLink(uri, features) {
 				tls_reality_public_key: params.get('pbk') ? decodeURIComponent(params.get('pbk')) : null,
 				tls_reality_short_id: params.get('sid'),
 				tls_utls: features.with_utls ? params.get('fp') : null,
-				vless_flow: ['tls', 'reality'].includes(params.get('security')) ? params.get('flow') : null
+				/* only the value sing-box supports: any other flow is
+				   rejected with "unsupported flow" and one bad node breaks
+				   the whole generated config */
+				vless_flow: (['tls', 'reality'].includes(params.get('security')) && params.get('flow') === 'xtls-rprx-vision') ? params.get('flow') : null
 			};
 			switch (params.get('type')) {
 			case 'grpc':
@@ -332,8 +340,10 @@ function parseShareLink(uri, features) {
 
 			break;
 		case 'vmess':
-			/* "Lovely" shadowrocket format */
-			if (uri.includes('&'))
+			/* "Lovely" shadowrocket format; uri is the split scheme/rest
+			   array, so this has to test the link body (testing the array
+			   itself compared '&' against its elements and never matched) */
+			if (uri[1].includes('&'))
 				return null;
 
 			/* https://github.com/2dust/v2rayN/wiki/Description-of-VMess-share-link */
@@ -1149,7 +1159,15 @@ return view.extend({
 								let packet_encoding = uci.get(data[0], 'subscription', 'packet_encoding');
 								let imported_node = 0;
 								input_links.forEach((l) => {
-									let config = parseShareLink(l, features);
+									let config;
+									try {
+										config = parseShareLink(l, features);
+									} catch (e) {
+										/* a single unparsable link must not abort
+										   the whole import (the changes made so
+										   far were left unsaved before) */
+										config = null;
+									}
 									if (config) {
 										if (config.tls === '1' && allow_insecure === '1')
 											config.tls_insecure = '1'
@@ -1157,7 +1175,16 @@ return view.extend({
 											config.packet_encoding = packet_encoding
 
 										let nameHash = hp.calcStringMD5(config.label);
+										let previous = uci.get(data[0], nameHash) || {};
 										let sid = uci.add(data[0], 'node', nameHash);
+										/* drop options the node no longer has:
+										   uci.set() only writes the keys below,
+										   so re-importing a changed protocol
+										   used to leave the old fields behind */
+										Object.keys(previous).forEach((k) => {
+											if (k.charAt(0) !== '.' && !(k in config))
+												uci.unset(data[0], sid, k);
+										});
 										Object.keys(config).forEach((k) => {
 											uci.set(data[0], sid, k, config[k]);
 										});
diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js
index f8a617000..d22a42b51 100644
--- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js
+++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js
@@ -257,6 +257,15 @@ return view.extend({
 		o.cfgvalue = L.bind(getResVersion, this, o, 'gfw_list');
 		o.rawhtml = true;
 
+		/* local rule-sets (used by bypass_mainland_china when present) */
+		o = s.option(form.DummyValue, '_geoip_cn_version', _('GeoIP CN rule-set version'));
+		o.cfgvalue = L.bind(getResVersion, this, o, 'geoip_cn');
+		o.rawhtml = true;
+
+		o = s.option(form.DummyValue, '_geosite_cn_version', _('GeoSite CN rule-set version'));
+		o.cfgvalue = L.bind(getResVersion, this, o, 'geosite_cn');
+		o.rawhtml = true;
+
 		o = s.option(form.Value, 'github_token', _('GitHub token'));
 		o.password = true;
 		o.renderWidget = function() {
diff --git a/luci-app-homeproxy/po/templates/homeproxy.pot b/luci-app-homeproxy/po/templates/homeproxy.pot
index 984d0b4fd..239dd91a1 100644
--- a/luci-app-homeproxy/po/templates/homeproxy.pot
+++ b/luci-app-homeproxy/po/templates/homeproxy.pot
@@ -106,8 +106,8 @@ msgstr ""
 msgid "Add a server"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client.js:1068
-msgid "Additional headers to be sent to the DNS server."
+#: htdocs/luci-static/resources/view/homeproxy/client.js:1072
+msgid "Additional headers to be sent to the DNS server, one <code>Name: value</code> per line."
 msgstr ""
 
 #: htdocs/luci-static/resources/view/homeproxy/client.js:1050
@@ -3502,3 +3502,22 @@ msgstr ""
 #: htdocs/luci-static/resources/view/homeproxy/client.js:1573
 msgid "{tag} in initial path when extra tags are used"
 msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy/client.js:302
+msgid "Block HTTPS/SVCB DNS records"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy/client.js:303
+msgid ""
+"Answer HTTPS (type 65) and SVCB (type 64) queries with an empty response. "
+"Keeps clients off HTTPS-RR/ECH, which this DNS chain cannot serve through "
+"some proxies; disable it if ECH is wanted."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy/status.js:260
+msgid "GeoIP CN rule-set version"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/homeproxy/status.js:264
+msgid "GeoSite CN rule-set version"
+msgstr ""
diff --git a/luci-app-homeproxy/po/zh_Hans/homeproxy.po b/luci-app-homeproxy/po/zh_Hans/homeproxy.po
index 5a9900d98..06f1e0d00 100644
--- a/luci-app-homeproxy/po/zh_Hans/homeproxy.po
+++ b/luci-app-homeproxy/po/zh_Hans/homeproxy.po
@@ -119,8 +119,8 @@ msgid "Add a server"
 msgstr "新增服务器"
 
 #: htdocs/luci-static/resources/view/homeproxy/client.js:1068
-msgid "Additional headers to be sent to the DNS server."
-msgstr "发送到 DNS 服务器的附加标头。"
+msgid "Additional headers to be sent to the DNS server, one <code>Name: value</code> per line."
+msgstr "发送到 DNS 服务器的附加请求头，每行一个 <code>名称: 值</code>。"
 
 #: htdocs/luci-static/resources/view/homeproxy/client.js:1050
 #: htdocs/luci-static/resources/view/homeproxy/node.js:468
@@ -3627,6 +3627,24 @@ msgstr "使用额外标签时 URL 需包含 {tag}"
 msgid "{tag} in initial path when extra tags are used"
 msgstr "使用额外标签时初始路径需包含 {tag}"
 
+
+msgid "Block HTTPS/SVCB DNS records"
+msgstr "拦截 HTTPS/SVCB DNS 记录"
+
+msgid ""
+"Answer HTTPS (type 65) and SVCB (type 64) queries with an empty response. "
+"Keeps clients off HTTPS-RR/ECH, which this DNS chain cannot serve through "
+"some proxies; disable it if ECH is wanted."
+msgstr ""
+"对 HTTPS（type 65）与 SVCB（type 64）查询返回空响应：这条 DNS 链路经某些代理"
+"无法正常提供 HTTPS-RR/ECH，因此默认拦截；需要 ECH 时请关闭。"
+
+msgid "GeoIP CN rule-set version"
+msgstr "GeoIP CN 规则集版本"
+
+msgid "GeoSite CN rule-set version"
+msgstr "GeoSite CN 规则集版本"
+
 #~ msgid "Disable Path MTU discovery"
 #~ msgstr "禁用路径 MTU 探测"
 
diff --git a/luci-app-homeproxy/root/etc/capabilities/homeproxy.json b/luci-app-homeproxy/root/etc/capabilities/homeproxy.json
index 8f54981ff..a38cb7199 100644
--- a/luci-app-homeproxy/root/etc/capabilities/homeproxy.json
+++ b/luci-app-homeproxy/root/etc/capabilities/homeproxy.json
@@ -1,32 +1,22 @@
 {
 	"bounding": [
 		"CAP_NET_ADMIN",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_NET_RAW",
-		"CAP_SYS_PTRACE"
+		"CAP_NET_BIND_SERVICE"
 	],
 	"effective": [
 		"CAP_NET_ADMIN",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_NET_RAW",
-		"CAP_SYS_PTRACE"
+		"CAP_NET_BIND_SERVICE"
 	],
 	"ambient": [
 		"CAP_NET_ADMIN",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_NET_RAW",
-		"CAP_SYS_PTRACE"
+		"CAP_NET_BIND_SERVICE"
 	],
 	"permitted": [
 		"CAP_NET_ADMIN",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_NET_RAW",
-		"CAP_SYS_PTRACE"
+		"CAP_NET_BIND_SERVICE"
 	],
 	"inheritable": [
 		"CAP_NET_ADMIN",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_NET_RAW",
-		"CAP_SYS_PTRACE"
+		"CAP_NET_BIND_SERVICE"
 	]
 }
diff --git a/luci-app-homeproxy/root/etc/config/homeproxy b/luci-app-homeproxy/root/etc/config/homeproxy
index b5838762c..39d97f31d 100644
--- a/luci-app-homeproxy/root/etc/config/homeproxy
+++ b/luci-app-homeproxy/root/etc/config/homeproxy
@@ -26,6 +26,7 @@ config homeproxy 'config'
 	option main_udp_node 'same'
 	option dns_server '8.8.8.8'
 	option china_dns_server '223.5.5.5'
+	option block_https_rr '1'
 	option routing_mode 'bypass_mainland_china'
 	option routing_port 'common'
 	option proxy_mode 'redirect_tproxy'
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut b/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut
index 37c653a55..1c9528561 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut
@@ -76,6 +76,61 @@ function resolve_mark(str) {
 		return `mark and ${fw4.hex(~mark.mask & 0xffffffff)} xor ${fw4.hex(mark.mark)}`;
 }
 
+/*
+ * Everything below is interpolated into an nftables script. fw4 loads its
+ * includes in one atomic transaction, so a single unparseable value does not
+ * just break this rule: every later `fw4 reload` fails and the whole firewall
+ * stops being updated. The UI validates its fields, but the values can also
+ * come from `uci set`, so each one is checked here as well and dropped when it
+ * is not the type the rule expects.
+ */
+const iface_re = /^[A-Za-z0-9._-]{1,15}$/;
+const mac_re = /^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$/;
+
+function filter_iface(list, fallback) {
+	if (isEmpty(list))
+		return list;
+
+	let out = [];
+	for (let i in list)
+		if (match(trim(i), iface_re))
+			push(out, trim(i));
+
+	if (isEmpty(out) && !isEmpty(fallback))
+		push(out, fallback);
+
+	return out;
+}
+
+function filter_mac(list) {
+	if (isEmpty(list))
+		return list;
+
+	let out = [];
+	for (let m in list)
+		if (match(trim(m), mac_re))
+			push(out, trim(m));
+
+	return out;
+}
+
+function filter_ipv4(list) {
+	if (isEmpty(list))
+		return list;
+
+	let out = [];
+	for (let ip in list)
+		if (isValidCIDR(ip, 4))
+			push(out, trim(ip));
+
+	return out;
+}
+
+function resolve_port(str, fallback) {
+	const port = trim(str ?? '');
+	return match(port, /^\d{1,5}$/) && int(port) > 0 && int(port) <= 65535 ? port : fallback;
+}
+
 /* Misc config */
 const resources_dir = '/etc/homeproxy/resources';
 
@@ -100,6 +155,19 @@ let routing_port = uci.get(cfgname, 'config', 'routing_port');
 if (routing_port === 'common')
 	routing_port = uci.get(cfgname, 'infra', 'common_port') || '22,53,80,143,443,465,587,853,873,993,995,8080,8443,9418';
 
+/* the port list is interpolated into an nftables set: keep only real ports,
+   and fall back to "no list" (the guards below then skip the set and its
+   rules) when nothing survives */
+if (routing_port) {
+	let ports = [];
+	for (let port in split(routing_port, ',')) {
+		const p = trim(port);
+		if (match(p, /^\d{1,5}$/) && int(p) > 0 && int(p) <= 65535)
+			push(ports, p);
+	}
+	routing_port = length(ports) ? join(',', ports) : null;
+}
+
 const proxy_mode = uci.get(cfgname, 'config', 'proxy_mode') || 'redirect_tproxy',
       ipv6_support = uci.get(cfgname, 'config', 'ipv6_support') || '0';
 
@@ -108,16 +176,19 @@ let self_mark, redirect_port,
     tun_name, tun_mark;
 
 if (match(proxy_mode, /redirect/)) {
-	self_mark = uci.get(cfgname, 'infra', 'self_mark') || '100';
-	redirect_port = uci.get(cfgname, 'infra', 'redirect_port') || '5331';
+	/* print as a valid mark expression; a hand-edited "value/mask" would
+	   otherwise reach nft verbatim and break the whole file */
+	self_mark = resolve_mark(uci.get(cfgname, 'infra', 'self_mark')) || resolve_mark('100');
+	redirect_port = resolve_port(uci.get(cfgname, 'infra', 'redirect_port'), '5331');
 }
 if (match(proxy_mode, /tproxy/))
 	if (outbound_udp_node !== 'nil' || routing_mode === 'custom') {
-		tproxy_port = uci.get(cfgname, 'infra', 'tproxy_port') || '5332';
+		tproxy_port = resolve_port(uci.get(cfgname, 'infra', 'tproxy_port'), '5332');
 		tproxy_mark = resolve_mark(uci.get(cfgname, 'infra', 'tproxy_mark') || '101');
 	}
 if (match(proxy_mode, /tun/)) {
-	tun_name = uci.get(cfgname, 'infra', 'tun_name') || 'singtun0';
+	const tun_name_raw = trim(uci.get(cfgname, 'infra', 'tun_name') ?? '');
+	tun_name = match(tun_name_raw, iface_re) ? tun_name_raw : 'singtun0';
 	tun_mark = resolve_mark(uci.get(cfgname, 'infra', 'tun_mark') || '102');
 }
 
@@ -132,12 +203,26 @@ const control_options = [
 ];
 const control_info = {};
 
-for (let i in control_options)
-	control_info[i] = uci.get(cfgname, 'control', i);
+for (let i in control_options) {
+	const raw = uci.get(cfgname, 'control', i);
+
+	if (match(i, /_mac_addrs$/))
+		control_info[i] = filter_mac(raw);
+	else if (match(i, /_ipv4_ips$/))
+		control_info[i] = filter_ipv4(raw);
+	else if (i === 'listen_interfaces')
+		/* fail closed: a configured but unusable interface list must not turn
+		   into "every interface" (that is exactly what the option restricts) */
+		control_info[i] = filter_iface(raw, '__hp_invalid_iface__');
+	else
+		control_info[i] = raw;
+}
 
 const dns_redirect = uci.get(cfgname, 'infra', 'dns_redirect') || '1';
+/* dnsmasq's port, not sing-box's dns_port (the hijack hands the query to
+   dnsmasq, which forwards to the sing-box listener itself) */
 const dns_hijacked = uci.get('dhcp', '@dnsmasq[0]', 'dns_redirect') || '0',
-      dns_port = uci.get('dhcp', '@dnsmasq[0]', 'port') || '53';
+      dnsmasq_port = resolve_port(uci.get('dhcp', '@dnsmasq[0]', 'port'), '53');
 /* UCI config end */
 -%}
 
@@ -288,7 +373,7 @@ chain dstnat {
 	{% if (control_info.listen_interfaces): %}
 	meta iifname {{ array_to_nftarr(control_info.listen_interfaces) }}
 	{%- endif /* listen_interfaces */ %}
-	meta nfproto { ipv4, ipv6 } udp dport 53 counter redirect to :{{ dns_port }} comment "!{{ cfgname }}: DNS hijack"
+	meta nfproto { ipv4, ipv6 } udp dport 53 counter redirect to :{{ dnsmasq_port }} comment "!{{ cfgname }}: DNS hijack"
 {% endif /* dns_hijacked */ %}
 {% if (match(proxy_mode, /redirect/)): %}
 	meta nfproto { {{ (ipv6_support === '1') ? 'ipv4, ipv6' : 'ipv4' }} } meta l4proto tcp jump homeproxy_redirect_lanac
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_pre.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_pre.uc
index 3b4bfe527..b70ddcc40 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_pre.uc
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_pre.uc
@@ -20,8 +20,12 @@ if (match(proxy_mode, /tun/)) {
 	else
 		outbound_node = uci.get(cfgname, 'config', 'main_node') || 'nil';
 
-	if (outbound_node !== 'nil')
-		tun_name = uci.get(cfgname, 'infra', 'tun_name') || 'singtun0';
+	if (outbound_node !== 'nil') {
+		/* the name is interpolated into an nftables rule: keep it to what an
+		   interface name can actually be */
+		const raw_tun = trim(uci.get(cfgname, 'infra', 'tun_name') ?? '');
+		tun_name = match(raw_tun, /^[A-Za-z0-9._-]{1,15}$/) ? raw_tun : 'singtun0';
+	}
 }
 
 const server_enabled = uci.get(cfgname, 'server', 'enabled');
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc
index f83803bf9..61ee004f6 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc
@@ -7,13 +7,13 @@
 
 'use strict';
 
-import { readfile, writefile } from 'fs';
+import { access, readfile, writefile } from 'fs';
 import { isnan } from 'math';
 import { connect } from 'ubus';
 import { cursor } from 'uci';
 
 import {
-	isEmpty, parseURL, strToBool, strToInt, strToTime,
+	isEmpty, parseURL, strToBool, strToInt, strToTime, strToMs,
 	removeBlankAttrs, validation, buildTLSObject, buildTransportObject,
 	HP_DIR, RUN_DIR
 } from 'homeproxy';
@@ -418,6 +418,57 @@ function isDirectOutboundTag(tag) {
 	const node = uci.get_all(uciconfig, node_name);
 	return !isEmpty(node) && node.type === 'direct';
 }
+
+/*
+ * Remote rule-sets are downloaded through a top-level http_client in sing-box
+ * 1.14 (the per-rule-set download_detour was removed). One client is created
+ * per distinct detour and reused by every rule-set that dials through it.
+ */
+const http_clients = [];
+const http_seen = {};
+
+function http_client_for(detour) {
+	if (isEmpty(detour))
+		detour = (routing_mode === 'custom') ? (get_outbound(default_outbound) || 'direct-out') : 'direct-out';
+
+	const tag = 'hp-' + detour;
+	if (http_seen[detour])
+		return tag;
+
+	http_seen[detour] = true;
+	const client = { tag: tag };
+	/* sing-box 1.14 rejects an empty detour on the direct outbound (pure TUN
+	   mode has no self_mark on it); omitting detour uses the same system
+	   direct dialer, so behaviour is unchanged. */
+	if (!(isEmpty(self_mark) && isDirectOutboundTag(detour)))
+		client.detour = detour;
+
+	push(http_clients, client);
+
+	return tag;
+}
+
+/*
+ * sing-box requires dns.servers[].headers to be a map, while the LuCI field is
+ * a dynamic list of "Name: value" lines (and older configs may hold either).
+ */
+function parse_headers(headers) {
+	if (isEmpty(headers))
+		return null;
+
+	if (type(headers) === 'object')
+		return headers;
+
+	const lines = (type(headers) === 'array') ? headers : [headers];
+	const out = {};
+	for (let line in lines) {
+		const pos = index(line, ':');
+		if (pos > 0)
+			out[trim(substr(line, 0, pos))] = trim(substr(line, pos + 1));
+	}
+
+	return isEmpty(out) ? null : out;
+}
 /* Config helper end */
 
 const config = {};
@@ -487,18 +538,22 @@ if (!isEmpty(main_node)) {
 			server: (routing_mode === 'bypass_mainland_china') ? 'china-dns' : 'default-dns'
 		});
 
-	/* Reject SVCB/HTTPS queries to avoid proxy DNS timeout on null domains */
-	push(config.dns.rules, {
-		query_type: [64, 65],
-		action: 'reject'
-	});
+	/* Reject SVCB/HTTPS queries to avoid proxy DNS timeout on null domains.
+	   Opt out with `block_https_rr 0` when clients should use HTTPS RR/ECH. */
+	if (uci.get(uciconfig, ucimain, 'block_https_rr') !== '0')
+		push(config.dns.rules, {
+			query_type: [64, 65],
+			action: 'reject'
+		});
 
 	if (routing_mode === 'bypass_mainland_china') {
 		push(config.dns.servers, {
 			tag: 'china-dns',
 			domain_resolver: {
 				server: 'default-dns',
-				strategy: 'prefer_ipv6'
+				/* follow the IPv6 setting like main-dns does, instead of
+				   preferring AAAA even on IPv4-only setups */
+				strategy: (ipv6_support !== '1') ? 'ipv4_only' : null
 			},
 			detour: self_mark ? 'direct-out' : null,
 			...parse_dnsserver(china_dns_server)
@@ -559,7 +614,7 @@ if (!isEmpty(main_node)) {
 			server: cfg.server,
 			server_port: strToInt(cfg.server_port),
 			path: cfg.path,
-			headers: cfg.headers,
+			headers: parse_headers(cfg.headers),
 			tls: cfg.tls_sni ? {
 				enabled: true,
 				server_name: cfg.tls_sni
@@ -668,6 +723,13 @@ if (!isEmpty(main_node)) {
 			rule.ip_is_private = strToBool(cfg.ip_is_private);
 		}
 
+		/* sing-box rejects the whole config when a route/evaluate action has no
+		   server, so drop such a rule with a reason instead. */
+		if ((rule.action === 'route' || rule.action === 'evaluate') && isEmpty(rule.server)) {
+			warn(sprintf("homeproxy: DNS rule '%s' has no server configured, skipping it.", cfg['.name']));
+			return;
+		}
+
 		push(builtin_dns_rules, rule);
 	});
 	config.dns.rules = builtin_dns_rules;
@@ -679,10 +741,18 @@ if (!isEmpty(main_node)) {
 /* Inbound start */
 config.inbounds = [];
 
+/*
+ * dns-in is the local listener the DNS chain hands queries to: dnsmasq
+ * forwards to 127.0.0.1#<dns_port> and the nft DNS hijack redirects to
+ * dnsmasq, not here.  It used to listen on '::', which published a
+ * proxy-backed resolver to every LAN client on the DNS port; loopback is the
+ * whole reachable surface it needs.  mixed-in stays on '::' - that one is the
+ * SOCKS/HTTP listener clients are meant to reach.
+ */
 push(config.inbounds, {
 	type: 'direct',
 	tag: 'dns-in',
-	listen: '::',
+	listen: '127.0.0.1',
 	listen_port: int(dns_port)
 });
 
@@ -986,36 +1056,48 @@ if (!isEmpty(main_node)) {
 
 	if (routing_mode === 'bypass_mainland_china') {
 		/*
-		 * Fetched straight from the upstream SagerNet repositories and
-		 * downloaded through the selected node. A direct fetch depends on
-		 * the CDN staying reachable from mainland China, where DNS pollution
-		 * makes it fail intermittently; the three files total ~250 KB per
-		 * day, so proxying the download costs almost nothing.
+		 * The two rule-sets sing-box actually needs for this mode. Each one is
+		 * used from the local .srs file when update_resources.sh has fetched
+		 * it, and only falls back to a remote fetch otherwise: a remote
+		 * rule-set is initialized at every start (sing-box fails to start when
+		 * the fetch fails even if nothing references it), which would make a
+		 * cold boot depend on reaching the CDN through the node. The fallback
+		 * keeps a fresh install working before the first resource update.
+		 * geosite-noncn is intentionally not declared: no rule references it,
+		 * and sing-box downloads it anyway.
 		 */
-		push(config.route.rule_set, {
-			type: 'remote',
-			tag: 'geoip-cn',
-			format: 'binary',
-			url: 'https://fastly.jsdelivr.net/gh/SagerNet/sing-geoip@rule-set/geoip-cn.srs',
-			update_interval: '24h',
-			download_detour: 'main-out'
-		});
-		push(config.route.rule_set, {
-			type: 'remote',
-			tag: 'geosite-cn',
-			format: 'binary',
-			url: 'https://fastly.jsdelivr.net/gh/SagerNet/sing-geosite@rule-set/geosite-geolocation-cn.srs',
-			update_interval: '24h',
-			download_detour: 'main-out'
-		});
-		push(config.route.rule_set, {
-			type: 'remote',
-			tag: 'geosite-noncn',
-			format: 'binary',
-			url: 'https://fastly.jsdelivr.net/gh/SagerNet/sing-geosite@rule-set/geosite-geolocation-!cn.srs',
-			update_interval: '24h',
-			download_detour: 'main-out'
-		});
+		const preset_rulesets = [
+			{
+				tag: 'geoip-cn',
+				path: HP_DIR + '/resources/geoip_cn.srs',
+				url: 'https://raw.githubusercontent.com/SagerNet/sing-geoip/rule-set/geoip-cn.srs'
+			},
+			{
+				tag: 'geosite-cn',
+				path: HP_DIR + '/resources/geosite_cn.srs',
+				url: 'https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-cn.srs'
+			}
+		];
+
+		for (let rs in preset_rulesets) {
+			if (access(rs.path)) {
+				push(config.route.rule_set, {
+					type: 'local',
+					tag: rs.tag,
+					format: 'binary',
+					path: rs.path
+				});
+			} else {
+				push(config.route.rule_set, {
+					type: 'remote',
+					tag: rs.tag,
+					format: 'binary',
+					url: rs.url,
+					update_interval: '24h',
+					http_client: http_client_for('main-out')
+				});
+			}
+		}
 	}
 
 	if (isEmpty(config.route.rule_set))
@@ -1084,7 +1166,7 @@ if (!isEmpty(main_node)) {
 			udp_connect: strToBool(cfg.udp_connect),
 			udp_timeout: strToTime(cfg.udp_timeout),
 			tls_fragment: strToBool(cfg.tls_fragment),
-			tls_fragment_fallback_delay: strToTime(cfg.tls_fragment_fallback_delay),
+			tls_fragment_fallback_delay: strToMs(cfg.tls_fragment_fallback_delay),
 			tls_record_fragment: strToBool(cfg.tls_record_fragment),
 			tls_spoof: cfg.tls_spoof || null,
 			tls_spoof_method: cfg.tls_spoof_method || null,
@@ -1147,48 +1229,18 @@ if (!isEmpty(main_node)) {
 			url: cfg.url,
 			update_interval: cfg.update_interval
 		};
-		/* download_detour is a pre-1.14 option that only makes sense for
-		   remote rule-sets; emitting it for local/inline ones makes sing-box
-		   1.14 reject the whole config. It is translated into http_clients
-		   right below. */
+		/* sing-box 1.14 downloads remote rule-sets through a top-level
+		   http_client; download_detour no longer exists. */
 		if (cfg.type === 'remote')
-			ruleset.download_detour = get_outbound(cfg.outbound) || get_outbound(default_outbound);
+			ruleset.http_client = http_client_for(get_outbound(cfg.outbound) || get_outbound(default_outbound));
 		if (cfg.type === 'remote' && !isEmpty(cfg.initial_path))
 			ruleset.initial_path = cfg.initial_path;
 		push(config.route.rule_set, ruleset);
 	});
 }
 
-/* sing-box 1.14: remote rule-sets download via top-level http_clients;
-   replaces the legacy download_detour field everywhere (preset + custom). */
-const http_clients = [];
-const http_seen = {};
-for (let rs in (config.route.rule_set || [])) {
-	/* Strip the legacy field from every entry first, including the
-	   local/inline ones: sing-box 1.14 rejects it everywhere except on
-	   remote rule-sets, where it is replaced by http_client below. */
-	let detour = rs.download_detour;
-	delete rs.download_detour;
-
-	if (rs.type !== 'remote')
-		continue;
-
-	if (isEmpty(detour))
-		detour = (routing_mode === 'custom') ? (get_outbound(default_outbound) || 'direct-out') : 'direct-out';
-
-	const tag = 'hp-' + detour;
-	rs.http_client = tag;
-	if (!http_seen[detour]) {
-		http_seen[detour] = true;
-		/* sing-box 1.14 rejects detouring to an empty direct outbound
-		   (pure TUN mode has no self_mark on direct-out). Omitting detour
-		   uses the same system direct dialer, so behavior is unchanged. */
-		const client = { tag: tag };
-		if (!(isEmpty(self_mark) && isDirectOutboundTag(detour)))
-			client.detour = detour;
-		push(http_clients, client);
-	}
-}
+/* Remote rule-sets download through the http_clients collected while the
+   rule-sets were built (see http_client_for). */
 if (length(http_clients))
 	config.http_clients = http_clients;
 /* Routing rules end */
@@ -1215,3 +1267,7 @@ if (system('/usr/bin/sing-box check --config ' + client_tmp) !== 0) {
 	exit(1);
 }
 system('mv -f ' + client_tmp + ' ' + RUN_DIR + '/sing-box-c.json');
+/* The generated config carries every node credential (passwords, UUIDs,
+   private keys) and writefile() has no mode argument, so it lands with the
+   process umask; chmod it to the sing-box user only. */
+system('chmod 600 ' + RUN_DIR + '/sing-box-c.json');
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_server.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_server.uc
index 40e0c93d4..23cfdb027 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_server.uc
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/generate_server.uc
@@ -150,3 +150,5 @@ if (system('/usr/bin/sing-box check --config ' + server_tmp) !== 0) {
 	exit(1);
 }
 system('mv -f ' + server_tmp + ' ' + RUN_DIR + '/sing-box-s.json');
+/* keep the config (key paths, user credentials) out of world-readable mode */
+system('chmod 600 ' + RUN_DIR + '/sing-box-s.json');
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/homeproxy.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/homeproxy.uc
index 60898c0b8..80d24fdca 100644
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/homeproxy.uc
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/homeproxy.uc
@@ -39,6 +39,29 @@ function closeFD(fd) {
 	}
 };
 
+/*
+ * Read a descriptor to EOF. A single read(size) only returns up to `size`
+ * bytes, so the previous one-shot read(512 KiB) silently truncated larger
+ * responses - a subscription list above that size was cut mid-base64/mid-JSON
+ * and only showed up as a parse failure. MAX_OUTPUT bounds what an oversized
+ * or endless response can allocate.
+ */
+const MAX_OUTPUT = 16 * 1024 * 1024;
+
+function readAll(fd) {
+	let out = '';
+	for (;;) {
+		const chunk = fd.read(64 * 1024) ?? '';
+		if (length(chunk) === 0)
+			break;
+		out += chunk;
+		if (length(out) >= MAX_OUTPUT)
+			break;
+	}
+
+	return out;
+};
+
 export function executeCommand(...args) {
 	let outfd = null, errfd = null;
 
@@ -51,8 +74,8 @@ export function executeCommand(...args) {
 		outfd.seek(0);
 		errfd.seek(0);
 
-		const stdout = outfd.read(1024 * 512) ?? '';
-		const stderr = errfd.read(1024 * 512) ?? '';
+		const stdout = readAll(outfd);
+		const stderr = readAll(errfd);
 
 		const binary = isBinary(stdout);
 
@@ -180,6 +203,19 @@ export function strToTime(str) {
 	return match(str, /[a-zA-Z]$/) ? str : (str + 's');
 };
 
+/*
+ * Milliseconds variant of strToTime(). Used by options whose LuCI field is
+ * documented and validated in milliseconds while sing-box expects a duration
+ * (e.g. route rule tls_fragment_fallback_delay, whose default is 500ms);
+ * strToTime() used to turn "500" into "500s".
+ */
+export function strToMs(str) {
+	if (isEmpty(str))
+		return null;
+
+	return match(str, /[a-zA-Z]$/) ? str : (str + 'ms');
+};
+
 export function removeBlankAttrs(res) {
 	let content;
 
@@ -229,11 +265,19 @@ export function isValidCIDR(addr, family) {
 	if (!addr)
 		return false;
 
-	/* Split address and optional prefix */
+	/* Split address and optional prefix. The prefix has to be validated as
+	   strictly as the address: `int()` accepts a leading number ("1.2.3.4/0 }
+	   ..." parses as 0), which would let a poisoned resource file inject
+	   statements into the nftables template this feeds. */
 	const parts = split(addr, '/');
 	const ip = parts[0];
 	const prefix = parts[1];
 
+	if (length(parts) > 2)
+		return false;
+	if (length(parts) === 2 && !match(prefix, /^\d{1,3}$/))
+		return false;
+
 	/* Validate IP part */
 	if (family === 4) {
 		if (!match(ip, /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/))
@@ -244,7 +288,7 @@ export function isValidCIDR(addr, family) {
 			if (int(o) > 255)
 				return false;
 		/* Validate prefix if present */
-		if (prefix && (int(prefix) < 0 || int(prefix) > 32))
+		if (prefix && int(prefix) > 32)
 			return false;
 	} else if (family === 6) {
 		/* Only hex digits and colons */
@@ -281,7 +325,7 @@ export function isValidCIDR(addr, family) {
 				return false;
 		}
 
-		if (prefix && (int(prefix) < 0 || int(prefix) > 128))
+		if (prefix && int(prefix) > 128)
 			return false;
 	} else {
 		return false;
@@ -307,6 +351,50 @@ export function decodeBase64Str(str) {
 	return b64dec(str);
 };
 
+/*
+ * Decode %XX escapes without touching '+'. urldecode() maps '+' to a space,
+ * which corrupts base64 userinfo ("+" is part of the alphabet), so share-link
+ * userinfo is percent-decoded with this instead.
+ */
+/*
+ * ucode has no tolower(), so both hex cases are mapped by hand.
+ */
+function hexValue(ch) {
+	const lower = index('0123456789abcdef', ch);
+	if (lower >= 0)
+		return lower;
+
+	const upper = index('ABCDEF', ch);
+
+	return upper < 0 ? -1 : 10 + upper;
+}
+
+/*
+ * ucode's regex engine rejects \x00 inside a character class ("Missing ']'"),
+ * so control bytes are checked by hand.
+ */
+function hasControlChar(str) {
+	for (let i = 0; i < length(str); i++) {
+		const code = ord(str, i);
+		if (code < 0x20 || code === 0x7f)
+			return true;
+	}
+
+	return false;
+}
+
+export function percentDecode(str) {
+	if (isEmpty(str))
+		return str;
+
+	return replace(str, /%([0-9A-Fa-f]{2})/g, (whole, hex) => {
+		const hi = hexValue(substr(hex, 0, 1));
+		const lo = hexValue(substr(hex, 1, 1));
+
+		return (hi < 0 || lo < 0) ? whole : chr(hi * 16 + lo);
+	});
+};
+
 export function parseURL(url) {
 	if (type(url) !== 'string')
 		return null;
@@ -361,18 +449,30 @@ export function parseURL(url) {
 		return null;
 
 	if (objurl.userinfo) {
-		objurl.userinfo = replace(objurl.userinfo, /:(.+)$/, (_, val) => {
+		/* Percent-decode first: providers emit base64 userinfo with the
+		   padding escaped ("=" as "%3D"), which used to decode to nothing
+		   and silently dropped method/password. */
+		let userinfo = percentDecode(objurl.userinfo);
+
+		userinfo = replace(userinfo, /:(.+)$/, (_, val) => {
 			objurl.password = val;
 			return '';
 		});
 
-		if (match(objurl.userinfo, /^[A-Za-z0-9\+\-\_\.]+$/)) {
-			objurl.username = objurl.userinfo;
-			delete objurl.userinfo;
-		} else {
-			delete objurl.userinfo;
+		/*
+		 * Keep anything without whitespace or control characters: real-world
+		 * userinfo carries base64 (with '=' or '+'), percent-encoded tokens
+		 * and passwords with punctuation. The previous class was written as
+		 * [A-Za-z0-9\+\-\_\.] but ucode's regex reads \+-\_ as the range
+		 * 0x2B-0x5F, so it accepted '=@:;[]\^<>,/' and rejected '!' - it
+		 * neither did what it documented nor covered real passwords.
+		 */
+		if (!match(userinfo, /\s/) && !hasControlChar(userinfo))
+			objurl.username = userinfo;
+		else
 			delete objurl.password;
-		}
+
+		delete objurl.userinfo;
 	};
 
 	if (!objurl.port)
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/parse_uri.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/parse_uri.uc
index 8becd1721..63801deb1 100644
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/parse_uri.uc
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/parse_uri.uc
@@ -8,7 +8,7 @@
 
 import { urldecode, urlencode } from 'luci.http';
 
-import { decodeBase64Str, parseURL, isEmpty, validation } from 'homeproxy';
+import { decodeBase64Str, parseURL, percentDecode, isEmpty, validation } from 'homeproxy';
 
 /*
  * Share-link parsers. Every protocol has its own parse_<scheme>_uri() so the
@@ -20,6 +20,17 @@ import { decodeBase64Str, parseURL, isEmpty, validation } from 'homeproxy';
  * logging callback, both injected so the parsers stay free of ubus/uci.
  */
 
+/*
+ * Transports sing-box accepts on a V2Ray-style outbound. Anything else
+ * (xhttp, splithttp, ...) makes sing-box reject the whole generated config,
+ * so such a node is dropped while importing instead of poisoning every node.
+ */
+const SUPPORTED_TRANSPORTS = ['ws', 'http', 'grpc', 'httpupgrade', 'quic'];
+
+function unsupported_transport(config) {
+	return !isEmpty(config.transport) && !(config.transport in SUPPORTED_TRANSPORTS);
+}
+
 /* https://shadowsocks.org/guide/sip008.html */
 export function parse_sip008_uri(uri) {
 	return {
@@ -178,8 +189,9 @@ export function parse_ss_uri(uri) {
 	if (length(ss_suri) <= 2) {
 		if (length(ss_suri) === 2)
 			ss_slabel = '#' + urlencode(ss_suri[1]);
-		if (decodeBase64Str(ss_suri[0]))
-			uri[1] = decodeBase64Str(ss_suri[0]) + ss_slabel;
+		const ss_decoded = decodeBase64Str(percentDecode(ss_suri[0]));
+		if (ss_decoded)
+			uri[1] = ss_decoded + ss_slabel;
 	}
 
 	/* Legacy format is not supported, it should be never appeared in modern subscriptions */
@@ -188,13 +200,13 @@ export function parse_ss_uri(uri) {
 	/* SIP002 format https://shadowsocks.org/guide/sip002.html */
 	const url = parseURL('http://' + uri[1]) || {};
 
-	let ss_userinfo = {};
+	let ss_userinfo = [];
 	if (url.username && url.password)
-		/* User info encoded with URIComponent */
-		ss_userinfo = [url.username, urldecode(url.password)];
+		/* User info encoded with URIComponent; parseURL() already decoded it */
+		ss_userinfo = [url.username, url.password];
 	else if (url.username)
-		/* User info encoded with base64 */
-		ss_userinfo = split(decodeBase64Str(urldecode(url.username)), ':', 2);
+		/* User info encoded with base64 (padding may have arrived as %3D) */
+		ss_userinfo = split(decodeBase64Str(url.username) ?? '', ':', 2);
 
 	let ss_plugin, ss_plugin_opts;
 	if (url.search && url.searchParams.plugin) {
@@ -250,6 +262,11 @@ export function parse_trojan_uri(uri) {
 		break;
 	}
 
+	if (unsupported_transport(config)) {
+		log(sprintf('Skipping unsupported %s transport node: %s.', config.transport, config.label || config.address));
+		return null;
+	}
+
 	return config;
 };
 
@@ -315,7 +332,11 @@ export function parse_vless_uri(uri, features, log) {
 		tls_reality_public_key: params.pbk ? urldecode(params.pbk) : null,
 		tls_reality_short_id: params.sid,
 		tls_utls: features.with_utls ? params.fp : null,
-		vless_flow: (params.security in ['tls', 'reality']) ? params.flow : null
+		/* sing-box rejects every other value ("unsupported flow") and a single
+		   rejected outbound makes the whole generated config fail, so only the
+		   supported value is imported (the common
+		   "xtls-rprx-vision-udp443" becomes "no flow" instead of breaking). */
+		vless_flow: (params.security in ['tls', 'reality'] && params.flow === 'xtls-rprx-vision') ? params.flow : null
 	};
 	switch (params.type) {
 	case 'grpc':
@@ -343,6 +364,11 @@ export function parse_vless_uri(uri, features, log) {
 		break;
 	}
 
+	if (unsupported_transport(config)) {
+		log(sprintf('Skipping unsupported %s transport node: %s.', config.transport, config.label || config.address));
+		return null;
+	}
+
 	return config;
 };
 
@@ -428,6 +454,11 @@ export function parse_vmess_uri(uri, features, log) {
 		break;
 	}
 
+	if (unsupported_transport(config)) {
+		log(sprintf('Skipping unsupported %s transport node: %s.', config.transport, config.label || config.address));
+		return null;
+	}
+
 	return config;
 };
 
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_crond.sh b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_crond.sh
index d3c608ab7..4f38f07cc 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_crond.sh
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_crond.sh
@@ -5,8 +5,21 @@
 
 SCRIPTS_DIR="/etc/homeproxy/scripts"
 
-for i in "china_ip4" "china_ip6" "gfw_list" "china_list"; do
+# update_resources.sh exit codes: 0 updated, 1 failed, 2 another run holds the
+# lock, 3 already up to date.
+changed=0
+for i in "china_ip4" "china_ip6" "gfw_list" "china_list" "geoip_cn" "geosite_cn"; do
 	"$SCRIPTS_DIR"/update_resources.sh "$i"
+	[ "$?" -eq 0 ] && changed=1
 done
 
+# The nft sets (china_ip4/ip6.txt) and the dnsmasq snippets (gfw_list.txt,
+# china_list.txt) are rendered from those files, and the client rule-sets are
+# loaded from the two .srs files, so a downloaded list only takes effect after
+# they have been regenerated. Without this the daily cron update rewrote the
+# files on disk and nothing else.
+[ "$changed" -eq 0 ] || /etc/init.d/homeproxy refresh_lists
+
+# update_subscriptions.uc restarts the service itself when it changed the UCI
+# configuration.
 "$SCRIPTS_DIR"/update_subscriptions.uc
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_resources.sh b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_resources.sh
index c100c6c18..6c2bd99e9 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_resources.sh
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_resources.sh
@@ -35,19 +35,21 @@ check_list_update() {
 		return 2
 	fi
 
-	local github_header_file=""
+	# --header= is the only header switch understood by all three wget
+	# implementations this runs on (uclient-fetch, GNU wget, busybox wget);
+	# the previous --header-file= is rejected by uclient-fetch and GNU wget
+	# alike, which made every version probe fail whenever a GitHub token was
+	# configured. The token is therefore visible in `ps` for the duration of
+	# the request; that is the trade-off for a single code path.
+	local api_url="https://api.github.com/repos/$listrepo/commits?sha=$listref&path=$listname&per_page=1"
+	local list_info
 	if [ -n "$github_token" ]; then
-		github_header_file="$RUN_DIR/.gh_header_${listtype}"
-		( umask 077; printf 'Authorization: Bearer %s\n' "$github_token" > "$github_header_file" )
-		trap "[ -n \"$github_header_file\" ] && rm -f \"$github_header_file\"" EXIT INT TERM
+		list_info="$($wget --header="Authorization: Bearer $github_token" -O- "$api_url")"
+	else
+		list_info="$($wget -O- "$api_url")"
 	fi
-
-	local list_info="$($wget ${github_header_file:+--header-file=$github_header_file} -O- "https://api.github.com/repos/$listrepo/commits?sha=$listref&path=$listname&per_page=1")"
 	local wget_exit=$?
 
-	[ -n "$github_header_file" ] && rm -f "$github_header_file"
-	trap - EXIT INT TERM
-
 	if [ $wget_exit -ne 0 ]; then
 		log "[$(to_upper "$listtype")] Failed to fetch version info (wget exit $wget_exit)."
 		return 1
@@ -105,8 +107,14 @@ case "$1" in
 	check_list_update "$1" "Loyalsoldier/v2ray-rules-dat" "release" "direct-list.txt" && \
 		sed -i -e "s/full://g" -e "/:/d" "$RESOURCES_DIR/china_list.txt"
 	;;
+"geoip_cn")
+	check_list_update "$1" "SagerNet/sing-geoip" "rule-set" "geoip-cn.srs"
+	;;
+"geosite_cn")
+	check_list_update "$1" "SagerNet/sing-geosite" "rule-set" "geosite-geolocation-cn.srs"
+	;;
 *)
-	echo -e "Usage: $0 <china_ip4 / china_ip6 / gfw_list / china_list>"
+	echo -e "Usage: $0 <china_ip4 / china_ip6 / gfw_list / china_list / geoip_cn / geosite_cn>"
 	exit 1
 	;;
 esac
diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc
index 4fcdee32e..d85f4874c 100755
--- a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc
+++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc
@@ -8,14 +8,14 @@
 'use strict';
 
 import { md5 } from 'digest';
-import { open } from 'fs';
+import { lstat, open } from 'fs';
 import { connect } from 'ubus';
 import { cursor } from 'uci';
 
 import { init_action } from 'luci.sys';
 
 import {
-	wGETVerbose, decodeBase64Str, getTime, isEmpty, HP_DIR, RUN_DIR
+	wGETVerbose, decodeBase64Str, getTime, isEmpty, shellQuote, HP_DIR, RUN_DIR
 } from 'homeproxy';
 
 import { parse_uri } from 'parse_uri';
@@ -88,6 +88,94 @@ function log(...args) {
 	logfile.close();
 }
 
+/*
+ * Subscription URLs usually carry the provider token in the query string;
+ * the log is surfaced in LuCI, so keep it out.
+ */
+function redact(url) {
+	return replace(url, /[?#].*$/, '');
+}
+
+/*
+ * mkdir is the lock: atomic everywhere this runs and no flock binding needed.
+ * A lock older than LOCK_STALE is broken, so a killed run cannot block every
+ * later update. Two concurrent runs (cron + the LuCI button) used to
+ * interleave commits and service restarts.
+ */
+const LOCK_DIR = RUN_DIR + '/update_subscriptions.lock';
+const LOCK_STALE = 600;
+
+function acquire_lock() {
+	if (system(sprintf('mkdir %s 2>/dev/null', shellQuote(LOCK_DIR))) === 0)
+		return true;
+
+	const st = lstat(LOCK_DIR);
+	const age = st ? max(0, time() - (st.mtime || 0)) : null;
+
+	if (age != null && age > LOCK_STALE) {
+		log(sprintf('Breaking a stale update lock (%s seconds old).', age));
+		system(sprintf('rmdir %s 2>/dev/null', shellQuote(LOCK_DIR)));
+
+		return system(sprintf('mkdir %s 2>/dev/null', shellQuote(LOCK_DIR))) === 0;
+	}
+
+	return false;
+}
+
+function release_lock() {
+	system(sprintf('rmdir %s 2>/dev/null', shellQuote(LOCK_DIR)));
+}
+
+/*
+ * sing-box rejects the whole generated config over one malformed node, and the
+ * generator keeps the old config when it fails, so a node that cannot possibly
+ * work must not reach UCI. Returns the reason, or null when the node is usable.
+ */
+function node_problem(cfg) {
+	if (isEmpty(cfg.address) || isEmpty(cfg.port))
+		return 'missing address or port';
+	if (!validation_port(cfg.port))
+		return 'invalid port';
+
+	switch (cfg.type) {
+	case 'shadowsocks':
+		if (isEmpty(cfg.shadowsocks_encrypt_method) || isEmpty(cfg.password))
+			return 'missing shadowsocks method or password';
+		break;
+	case 'vless':
+	case 'vmess':
+		if (isEmpty(cfg.uuid))
+			return 'missing uuid';
+		break;
+	case 'trojan':
+	case 'anytls':
+	case 'snell':
+		if (isEmpty(cfg.password))
+			return 'missing password';
+		break;
+	case 'tuic':
+		if (isEmpty(cfg.uuid) || isEmpty(cfg.password))
+			return 'missing uuid or password';
+		break;
+	case 'hysteria':
+	case 'hysteria2':
+		if (isEmpty(cfg.password) && isEmpty(cfg.hysteria_auth_payload))
+			return 'missing auth';
+		break;
+	case 'socks':
+	case 'http':
+		break;
+	default:
+		return 'unsupported type';
+	}
+
+	return null;
+}
+
+function validation_port(port) {
+	return match(port, /^\d{1,5}$/) != null && int(port) > 0 && int(port) <= 65535;
+}
+
 function main() {
 	if (via_proxy !== '1') {
 		log('Stopping service...');
@@ -98,10 +186,11 @@ function main() {
 		url = replace(url, /#.*$/, '');
 		const groupHash = md5(url);
 		node_cache[groupHash] = {};
+		const shown_url = redact(url);
 
 		const fetched = wGETVerbose(url, user_agent);
 		if (isEmpty(fetched.content)) {
-			log(sprintf('Failed to fetch resources from %s: %s', url, fetched.error || 'empty response'));
+			log(sprintf('Failed to fetch resources from %s: %s', shown_url, fetched.error || 'empty response'));
 			continue;
 		}
 		const res = fetched.content;
@@ -114,19 +203,43 @@ function main() {
 			if (nodes[0].server && nodes[0].method)
 				map(nodes, (_, i) => nodes[i].nodetype = 'sip008');
 		} catch(e) {
-			log(sprintf('JSON parse failed for %s, trying base64: %s', url, e.message));
+			/* Clash/mihomo subscriptions are YAML, not base64; say so instead
+			   of reporting a base64/JSON failure followed by "no valid node". */
+			if (match(res, /(^|\n)[ \t]*(proxies|proxy-groups)[ \t]*:/)) {
+				log(sprintf('Unsupported subscription format (Clash/mihomo YAML) at %s.', shown_url));
+				continue;
+			}
+
+			log(sprintf('JSON parse failed for %s, trying base64: %s', shown_url, e.message));
 			nodes = decodeBase64Str(res);
 			nodes = nodes ? split(trim(nodes), '\n') : [];
 		}
 
-		let count = 0;
+		let count = 0, skipped = 0;
 		for (let node in nodes) {
-			let config;
-			if (!isEmpty(node))
-				config = parse_uri(node, sing_features, log);
-			if (isEmpty(config))
+			if (isEmpty(node))
 				continue;
 
+			const config = parse_uri(node, sing_features, log);
+			if (isEmpty(config)) {
+				/* No credentials in the log: only the scheme says whether a
+				   parser is missing or the entry is simply not a node. Only
+				   the first few are printed, the rest is summarized below. */
+				if (skipped < 5)
+					log(sprintf('Skipping unparsable entry (%s) from %s.',
+						type(node) === 'string' ? replace(node, /:.*$/, '') : type(node), shown_url));
+				skipped++;
+				continue;
+			}
+
+			const problem = node_problem(config);
+			if (problem) {
+				if (skipped < 5)
+					log(sprintf('Skipping invalid node %s: %s.', config.label || config.address, problem));
+				skipped++;
+				continue;
+			}
+
 			const label = config.label;
 			config.label = null;
 			const confHash = md5(sprintf('%J', config)),
@@ -153,10 +266,13 @@ function main() {
 			}
 		}
 
+		if (skipped > 0)
+			log(sprintf('%s entries skipped from %s.', skipped, shown_url));
+
 		if (count === 0)
-			log(sprintf('No valid node found in %s.', url));
+			log(sprintf('No valid node found in %s.', shown_url));
 		else
-			log(sprintf('Successfully fetched %s nodes of total %s from %s.', count, length(nodes), url));
+			log(sprintf('Successfully fetched %s nodes of total %s from %s.', count, length(nodes), shown_url));
 	}
 
 	if (isEmpty(node_result)) {
@@ -170,7 +286,7 @@ function main() {
 		return false;
 	}
 
-	let added = 0, removed = 0;
+	let added = 0, removed = 0, changed = false;
 	uci.foreach(uciconfig, ucinode, (cfg) => {
 		/* Nodes created by the user */
 		if (!cfg.grouphash)
@@ -183,14 +299,30 @@ function main() {
 		if (!node_cache[cfg.grouphash][cfg['.name']]) {
 			uci.delete(uciconfig, cfg['.name']);
 			removed++;
+			changed = true;
 
 			log(sprintf('Removing node: %s.', cfg.label || cfg['name']));
 		} else {
 			map(keys(cfg), (v) => {
-				if (v in node_cache[cfg.grouphash][cfg['.name']])
-					uci.set(uciconfig, cfg['.name'], v, node_cache[cfg.grouphash][cfg['.name']][v]);
-				else
+				/* skip the cursor's own metadata (.name/.type/...): deleting
+				   those is a no-op and would mark every run as changed */
+				if (substr(v, 0, 1) === '.')
+					return null;
+
+				if (v in node_cache[cfg.grouphash][cfg['.name']]) {
+					/* only write what actually differs, so an unchanged
+					   subscription does not fake a change below */
+					const fresh = node_cache[cfg.grouphash][cfg['.name']][v];
+					const current = uci.get(uciconfig, cfg['.name'], v);
+					if (type(fresh) === 'array' ? (sprintf('%J', uci.get_all(uciconfig, cfg['.name'], v) || []) !== sprintf('%J', fresh))
+					    : (current !== sprintf('%s', fresh))) {
+						uci.set(uciconfig, cfg['.name'], v, fresh);
+						changed = true;
+					}
+				} else {
 					uci.delete(uciconfig, cfg['.name'], v);
+					changed = true;
+				}
 			});
 			node_cache[cfg.grouphash][cfg['.name']].isExisting = true;
 		}
@@ -205,11 +337,15 @@ function main() {
 			map(keys(node), (v) => uci.set(uciconfig, nameHash, v, node[v]));
 
 			added++;
+			changed = true;
 			log(sprintf('Adding node: %s.', node.label));
 		});
 	uci.commit(uciconfig);
 
-	let need_restart = (via_proxy !== '1');
+	/* via_proxy keeps the service up during the fetch, but a configuration
+	   change still has to be applied - it used to be committed and then
+	   ignored until the next restart. */
+	let need_restart = (via_proxy !== '1') || changed;
 	if (!isEmpty(main_node)) {
 		const first_server = uci.get_first(uciconfig, ucinode);
 		if (first_server) {
@@ -299,7 +435,12 @@ function main() {
 	log('Successfully updated subscriptions.');
 }
 
-if (!isEmpty(subscription_urls))
+if (!isEmpty(subscription_urls)) {
+	if (!acquire_lock()) {
+		log('Another subscription update is running, aborting.');
+		exit(0);
+	}
+
 	try {
 		call(main);
 	} catch(e) {
@@ -311,3 +452,6 @@ if (!isEmpty(subscription_urls))
 		init_action('homeproxy', 'stop');
 		init_action('homeproxy', 'start');
 	}
+
+	release_lock();
+}
diff --git a/luci-app-homeproxy/root/etc/init.d/homeproxy b/luci-app-homeproxy/root/etc/init.d/homeproxy
index 7784c5148..33e97738e 100755
--- a/luci-app-homeproxy/root/etc/init.d/homeproxy
+++ b/luci-app-homeproxy/root/etc/init.d/homeproxy
@@ -8,6 +8,13 @@ USE_PROCD=1
 START=99
 STOP=10
 
+# refresh_lists re-applies the on-disk resource lists (dnsmasq snippets + the
+# fw4 sets built from china_ip4/ip6.txt) without restarting sing-box. It is
+# called by update_crond.sh after a resource update, because a list update on
+# disk has no effect until the firewall/dnsmasq side is regenerated.
+EXTRA_COMMANDS="refresh_lists"
+EXTRA_HELP="	refresh_lists	Re-apply the updated resource lists (dnsmasq + fw4)"
+
 CONF="homeproxy"
 PROG="/usr/bin/sing-box"
 
@@ -19,6 +26,11 @@ LOG_PATH="$RUN_DIR/homeproxy.log"
 [ -f "$HP_DIR/scripts/fw4_names.sh" ] && . "$HP_DIR/scripts/fw4_names.sh"
 
 log() {
+	# The log file lives in tmpfs, so it does not exist yet on the first start
+	# (or right after a reboot) while the earliest diagnostics - missing
+	# sing-box, unsupported version, no node configured - are already being
+	# written. Create the directory here so those lines are not lost.
+	mkdir -p "$RUN_DIR" 2>"/dev/null"
 	echo -e "$(date "+%Y-%m-%d %H:%M:%S") [DAEMON] $*" >> "$LOG_PATH"
 }
 
@@ -39,7 +51,7 @@ if [ -n "$DNSMASQ_UCI_CONFIG" ] && [ -f "/tmp/etc/dnsmasq.conf.$DNSMASQ_UCI_CONF
 fi
 
 if [ -z "$DNSMASQ_DIR" ]; then
-	log "WARNING: unable to derive the dnsmasq conf-dir (section '${DNSMASQ_UCI_CONFIG:-unknown}'), using /tmp/dnsmasq.d/dnsmasq-homeproxy.d."
+	log "WARNING: unable to derive the dnsmasq conf-dir (section '${DNSMASQ_UCI_CONFIG:-unknown}'), using /tmp/dnsmasq.d/dnsmasq-homeproxy.d; DNS-based routing will not take effect on setups where dnsmasq reads a different conf-dir."
 	DNSMASQ_DIR="/tmp/dnsmasq.d/dnsmasq-homeproxy.d"
 fi
 
@@ -48,6 +60,72 @@ restore_upnp_mappings() {
 		&& /etc/init.d/miniupnpd restart >"/dev/null" 2>&1
 }
 
+# Render the dnsmasq snippets that implement DNS-based routing for the current
+# routing_mode (the conf-dir include plus one snippet per mode). Shared by
+# start_service and refresh_lists; requires config_load to have run. Existing
+# snippets are dropped first so a routing_mode switch cannot leave a stale
+# snippet behind when start runs without a preceding stop.
+render_dns_snippets() {
+	local ipv6_support dns_port
+	config_get_bool ipv6_support "config" "ipv6_support" "0"
+	config_get dns_port "infra" "dns_port" "5333"
+
+	mkdir -p "$DNSMASQ_DIR" || log "Warning: failed to create ${DNSMASQ_DIR}."
+	rm -f "$DNSMASQ_DIR"/*.conf 2>"/dev/null"
+	echo -e "conf-dir=$DNSMASQ_DIR" > "$DNSMASQ_DIR/../dnsmasq-homeproxy.conf" \
+		|| log "Warning: failed to write the dnsmasq conf-dir file."
+	case "$routing_mode" in
+	"bypass_mainland_china"|"custom"|"global")
+		cat <<-EOF > "$DNSMASQ_DIR/redirect-dns.conf"
+			no-poll
+			no-resolv
+			server=127.0.0.1#$dns_port
+		EOF
+		;;
+	"gfwlist")
+		local gfw_nftset_v6
+		[ "$ipv6_support" -eq "0" ] || gfw_nftset_v6=",6#inet#fw4#homeproxy_gfw_list_v6"
+		sed -r -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_gfw_list_v4$gfw_nftset_v6/g" \
+			"$HP_DIR/resources/gfw_list.txt" > "$DNSMASQ_DIR/gfw_list.conf"
+		;;
+	"proxy_mainland_china")
+		sed -r -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port/g" \
+			"$HP_DIR/resources/china_list.txt" > "$DNSMASQ_DIR/china_list.conf"
+		;;
+	esac
+
+	if [ "$routing_mode" != "custom" ] && [ -s "$HP_DIR/resources/proxy_list.txt" ]; then
+		local wan_nftset_v6
+		[ "$ipv6_support" -eq "0" ] || wan_nftset_v6=",6#inet#fw4#homeproxy_wan_proxy_addr_v6"
+		sed -r -e '/^\s*$/d' -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_wan_proxy_addr_v4$wan_nftset_v6/g" \
+			"$HP_DIR/resources/proxy_list.txt" > "$DNSMASQ_DIR/proxy_list.conf"
+	fi
+
+	/etc/init.d/dnsmasq restart >"/dev/null" 2>&1 \
+		|| log "Warning: failed to restart dnsmasq, DNS-based routing may be stale."
+}
+
+# (Re)render the fw4 snippets and reload the firewall. The nft sets that carry
+# the china/gfw address lists are built here from the resource files on disk,
+# so this must run again after a resource update (refresh_lists) as well.
+apply_firewall() {
+	local outbound_node="$1"
+
+	mkdir -p "$RUN_DIR" || { log "Error: failed to create ${RUN_DIR}."; return 1; }
+	# Truncate first: firewall_pre.uc only writes a file when it has content,
+	# so a mode/server switch would otherwise keep the previous rules.
+	: > "$RUN_DIR/fw4_forward.nft"
+	: > "$RUN_DIR/fw4_input.nft"
+	: > "$RUN_DIR/fw4_post.nft"
+
+	ucode "$HP_DIR/scripts/firewall_pre.uc" 2>"/dev/null" || log "Error: firewall pre-script failed."
+	if [ "$outbound_node" != "nil" ]; then
+		utpl -S "$HP_DIR/scripts/firewall_post.ut" > "$RUN_DIR/fw4_post.nft" 2>"/dev/null" || log "Error: firewall post-script failed."
+	fi
+	fw4 reload >"/dev/null" 2>&1 || log "Error: fw4 reload failed."
+	restore_upnp_mappings
+}
+
 start_service() {
 	config_load "$CONF"
 
@@ -102,10 +180,17 @@ start_service() {
 			sleep 1
 		done
 
-		ucode -S "$HP_DIR/scripts/generate_client.uc" 2>>"$LOG_PATH"
+		# Judge by the generator's exit code, not by the file: the generator
+		# keeps the previous sing-box-c.json when it fails, so an existing file
+		# only proves that some older config is valid - the service would then
+		# silently keep running the old nodes/routing while reporting success.
+		if ! ucode -S "$HP_DIR/scripts/generate_client.uc" 2>>"$LOG_PATH"; then
+			log "Error: failed to generate client configuration."
+			return 1
+		fi
 
 		if [ ! -e "$RUN_DIR/sing-box-c.json" ]; then
-			log "Error: failed to generate client configuration."
+			log "Error: client configuration was not generated."
 			return 1
 		elif ! "$PROG" check --config "$RUN_DIR/sing-box-c.json" 2>>"$LOG_PATH"; then
 			log "Error: wrong client configuration detected."
@@ -123,40 +208,7 @@ start_service() {
 			/etc/init.d/cron restart >"/dev/null" 2>&1 || log "Warning: failed to restart cron."
 		fi
 
-		local ipv6_support dns_port
-		config_get_bool ipv6_support "config" "ipv6_support" "0"
-		config_get dns_port "infra" "dns_port" "5333"
-		mkdir -p "$DNSMASQ_DIR" || log "Warning: failed to create ${DNSMASQ_DIR}."
-		echo -e "conf-dir=$DNSMASQ_DIR" > "$DNSMASQ_DIR/../dnsmasq-homeproxy.conf" \
-			|| log "Warning: failed to write the dnsmasq conf-dir file."
-		case "$routing_mode" in
-		"bypass_mainland_china"|"custom"|"global")
-			cat <<-EOF > "$DNSMASQ_DIR/redirect-dns.conf"
-				no-poll
-				no-resolv
-				server=127.0.0.1#$dns_port
-			EOF
-			;;
-		"gfwlist")
-			local gfw_nftset_v6
-			[ "$ipv6_support" -eq "0" ] || gfw_nftset_v6=",6#inet#fw4#homeproxy_gfw_list_v6"
-			sed -r -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_gfw_list_v4$gfw_nftset_v6/g" \
-				"$HP_DIR/resources/gfw_list.txt" > "$DNSMASQ_DIR/gfw_list.conf"
-			;;
-		"proxy_mainland_china")
-			sed -r -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port/g" \
-				"$HP_DIR/resources/china_list.txt" > "$DNSMASQ_DIR/china_list.conf"
-			;;
-		esac
-
-		if [ "$routing_mode" != "custom" ] && [ -s "$HP_DIR/resources/proxy_list.txt" ]; then
-			local wan_nftset_v6
-			[ "$ipv6_support" -eq "0" ] || wan_nftset_v6=",6#inet#fw4#homeproxy_wan_proxy_addr_v6"
-			sed -r -e '/^\s*$/d' -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_wan_proxy_addr_v4$wan_nftset_v6/g" \
-				"$HP_DIR/resources/proxy_list.txt" > "$DNSMASQ_DIR/proxy_list.conf"
-		fi
-		/etc/init.d/dnsmasq restart >"/dev/null" 2>&1 \
-			|| log "Warning: failed to restart dnsmasq, DNS-based routing may be stale."
+		render_dns_snippets
 
 		local table_mark
 		config_get table_mark "infra" "table_mark" "100"
@@ -213,22 +265,36 @@ start_service() {
 
 		[ "$disable_gso" -eq "1" ] && procd_set_param env "QUIC_GO_DISABLE_GSO"="true"
 
-		if [ -x "/sbin/ujail" ] && [ "$routing_mode" != "custom" ] && ! grep -Eq '"type": "(wireguard|tun)"' "$RUN_DIR/sing-box-c.json"; then
+		if [ -x "/sbin/ujail" ] && ! grep -Eq '"type": "(wireguard|tun)"' "$RUN_DIR/sing-box-c.json"; then
 			procd_add_jail "sing-box-c" log procfs
 			procd_add_jail_mount "$RUN_DIR/sing-box-c.json"
 			procd_add_jail_mount_rw "$RUN_DIR/sing-box-c.log"
-			[ "$routing_mode" != "bypass_mainland_china" ] || procd_add_jail_mount_rw "$HP_DIR/cache.db"
+			# custom routing may point a local rule-set at any path under
+			# HP_DIR, so the whole directory goes in read-only. procd orders
+			# the mounts by path, so this parent cannot shadow the read-write
+			# cache.db below.
+			procd_add_jail_mount "$HP_DIR/"
+			case "$routing_mode" in
+			"bypass_mainland_china"|"custom")
+				procd_add_jail_mount_rw "$HP_DIR/cache.db" ;;
+			esac
 			procd_add_jail_mount "$HP_DIR/certs/"
+			procd_add_jail_mount "/etc/acme/"
 			procd_add_jail_mount "/etc/ssl/"
+			# custom routing's find_neighbor reads LAN hostnames from the
+			# dnsmasq lease file.
+			procd_add_jail_mount "/tmp/dhcp.leases"
 			procd_add_jail_mount "/etc/localtime"
 			procd_add_jail_mount "/etc/TZ"
 			procd_set_param capabilities "/etc/capabilities/homeproxy.json"
 			procd_set_param no_new_privs 1
 			procd_set_param user sing-box
 			procd_set_param group sing-box
+		elif [ ! -x "/sbin/ujail" ]; then
+			log "Warning: /sbin/ujail is missing; sing-box client runs as root without a jail."
 		fi
 
-		procd_set_param limits core="unlimited"
+		procd_set_param limits core="0"
 		procd_set_param limits nofile="1000000 1000000"
 		procd_set_param stderr 1
 		procd_set_param respawn
@@ -237,10 +303,13 @@ start_service() {
 	fi
 
 	if [ "$server_enabled" = "1" ]; then
-		ucode -S "$HP_DIR/scripts/generate_server.uc" 2>>"$LOG_PATH"
+		if ! ucode -S "$HP_DIR/scripts/generate_server.uc" 2>>"$LOG_PATH"; then
+			log "Error: failed to generate server configuration."
+			return 1
+		fi
 
 		if [ ! -e "$RUN_DIR/sing-box-s.json" ]; then
-			log "Error: failed to generate server configuration."
+			log "Error: server configuration was not generated."
 			return 1
 		elif ! "$PROG" check --config "$RUN_DIR/sing-box-s.json" 2>>"$LOG_PATH"; then
 			log "Error: wrong server configuration detected."
@@ -269,7 +338,7 @@ start_service() {
 			procd_set_param group sing-box
 		fi
 
-		procd_set_param limits core="unlimited"
+		procd_set_param limits core="0"
 		procd_set_param limits nofile="1000000 1000000"
 		procd_set_param stderr 1
 		procd_set_param respawn
@@ -282,16 +351,22 @@ start_service() {
 	procd_set_param respawn
 	procd_close_instance
 
+	# cache_file is enabled for bypass_mainland_china and custom alike, and the
+	# file has to exist before the client jail binds it read-write.
 	case "$routing_mode" in
-	"bypass_mainland_china")
+	"bypass_mainland_china"|"custom")
 		[ -e "$HP_DIR/cache.db" ] || touch "$HP_DIR/cache.db" \
 			|| log "Warning: failed to create ${HP_DIR}/cache.db."
 		;;
-	"custom")
+	esac
+	if [ "$routing_mode" = "custom" ]; then
 		[ -d "$HP_DIR/ruleset" ] || mkdir -p "$HP_DIR/ruleset" \
 			|| log "Warning: failed to create ${HP_DIR}/ruleset."
-		;;
-	esac
+		# A local rule-set is opened by the client, which is jailed and no
+		# longer root, so the documented directory has to be readable by it.
+		chown -R sing-box:sing-box "$HP_DIR/ruleset" 2>"/dev/null" \
+			|| log "Warning: failed to hand ${HP_DIR}/ruleset to sing-box."
+	fi
 
 	[ "$outbound_node" = "nil" ] || echo > "$RUN_DIR/sing-box-c.log"
 	if [ "$server_enabled" = "1" ]; then
@@ -299,15 +374,18 @@ start_service() {
 		mkdir -p "$HP_DIR/certs" || log "Warning: failed to create ${HP_DIR}/certs."
 	fi
 
-	chown sing-box:sing-box "$RUN_DIR"/sing-box-*.json "$RUN_DIR"/sing-box-*.log "$HP_DIR"/cache.db 2>"/dev/null" \
-		|| log "Warning: failed to change the ownership of the runtime files to sing-box."
+	# chown only what is actually there: a mode that does not create one of
+	# these paths is not an error worth logging on every start.
+	for hp_file in "$RUN_DIR"/sing-box-*.json "$RUN_DIR"/sing-box-*.log "$HP_DIR"/cache.db; do
+		[ -e "$hp_file" ] || continue
+		chown sing-box:sing-box "$hp_file" 2>"/dev/null" \
+			|| log "Warning: failed to change the ownership of ${hp_file}."
+	done
+	# the generated client config carries every node credential
+	[ -e "$RUN_DIR/sing-box-c.json" ] && chmod 600 "$RUN_DIR/sing-box-c.json" 2>"/dev/null"
+	[ -e "$RUN_DIR/sing-box-s.json" ] && chmod 600 "$RUN_DIR/sing-box-s.json" 2>"/dev/null"
 
-	ucode "$HP_DIR/scripts/firewall_pre.uc" 2>"/dev/null" || log "Error: firewall pre-script failed."
-	if [ "$outbound_node" != "nil" ]; then
-		utpl -S "$HP_DIR/scripts/firewall_post.ut" > "$RUN_DIR/fw4_post.nft" 2>"/dev/null" || log "Error: firewall post-script failed."
-	fi
-	fw4 reload >"/dev/null" 2>&1 || log "Error: fw4 reload failed."
-	restore_upnp_mappings
+	apply_firewall "$outbound_node"
 
 	log "sing-box $(sing-box version -n 2>/dev/null || echo "unknown") started."
 }
@@ -390,7 +468,10 @@ reload_service() {
 	fi
 
 	if [ "$outbound_node" != "nil" ]; then
-		ucode -S "$HP_DIR/scripts/generate_client.uc" 2>>"$LOG_PATH"
+		if ! ucode -S "$HP_DIR/scripts/generate_client.uc" 2>>"$LOG_PATH"; then
+			log "Error: failed to generate client configuration, reload aborted."
+			return 1
+		fi
 		if ! "$PROG" check --config "$RUN_DIR/sing-box-c.json" 2>>"$LOG_PATH"; then
 			log "Error: new client config is invalid, reload aborted."
 			return 1
@@ -400,7 +481,10 @@ reload_service() {
 	local server_enabled
 	config_get_bool server_enabled "server" "enabled" "0"
 	if [ "$server_enabled" = "1" ]; then
-		ucode -S "$HP_DIR/scripts/generate_server.uc" 2>>"$LOG_PATH"
+		if ! ucode -S "$HP_DIR/scripts/generate_server.uc" 2>>"$LOG_PATH"; then
+			log "Error: failed to generate server configuration, reload aborted."
+			return 1
+		fi
 		if ! "$PROG" check --config "$RUN_DIR/sing-box-s.json" 2>>"$LOG_PATH"; then
 			log "Error: new server config is invalid, reload aborted."
 			return 1
@@ -411,6 +495,27 @@ reload_service() {
 	start
 }
 
+# Re-apply the resource lists that were refreshed on disk (called by
+# update_crond.sh). Only the firewall sets and the dnsmasq snippets depend on
+# those files, so sing-box itself is left running.
+refresh_lists() {
+	config_load "$CONF"
+
+	local routing_mode outbound_node
+	config_get routing_mode "config" "routing_mode" "bypass_mainland_china"
+	if [ "$routing_mode" != "custom" ]; then
+		config_get outbound_node "config" "main_node" "nil"
+	else
+		config_get outbound_node "routing" "default_outbound" "nil"
+	fi
+	[ "$outbound_node" != "nil" ] || return 0
+
+	render_dns_snippets
+	apply_firewall "$outbound_node"
+
+	log "Resource list changes applied (dnsmasq snippets + fw4 sets)."
+}
+
 service_triggers() {
 	procd_add_reload_trigger "$CONF"
 	procd_add_interface_trigger "interface.*.up" wan /etc/init.d/$CONF reload
diff --git a/luci-app-homeproxy/root/usr/share/rpcd/acl.d/luci-app-homeproxy.json b/luci-app-homeproxy/root/usr/share/rpcd/acl.d/luci-app-homeproxy.json
index b4b97ea84..68f27fc02 100644
--- a/luci-app-homeproxy/root/usr/share/rpcd/acl.d/luci-app-homeproxy.json
+++ b/luci-app-homeproxy/root/usr/share/rpcd/acl.d/luci-app-homeproxy.json
@@ -3,20 +3,34 @@
 		"description": "Grant access to homeproxy configuration",
 		"read": {
 			"file": {
-				"/etc/homeproxy/scripts/update_subscriptions.uc": [ "exec" ],
 				"/var/run/homeproxy/homeproxy.log": [ "read" ],
 				"/var/run/homeproxy/sing-box-c.log": [ "read" ],
 				"/var/run/homeproxy/sing-box-s.log": [ "read" ]
 			},
 			"ubus": {
 				"service": [ "list" ],
-				"luci.homeproxy": [ "*" ]
+				"luci.homeproxy": [
+					"acllist_read",
+					"connection_check",
+					"resources_get_version",
+					"singbox_get_features"
+				]
 			},
 			"uci": [ "homeproxy" ]
 		},
 		"write": {
 			"file": {
-				"/tmp/homeproxy_certificate.tmp": [ "write" ]
+				"/tmp/homeproxy_certificate.tmp": [ "write" ],
+				"/etc/homeproxy/scripts/update_subscriptions.uc": [ "exec" ]
+			},
+			"ubus": {
+				"luci.homeproxy": [
+					"acllist_write",
+					"certificate_write",
+					"log_clean",
+					"resources_update",
+					"singbox_generator"
+				]
 			},
 			"uci": [ "homeproxy" ]
 		}
diff --git a/luci-app-homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy b/luci-app-homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy
index fe1f0aa98..d946d0259 100644
--- a/luci-app-homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy
+++ b/luci-app-homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy
@@ -23,6 +23,11 @@ function hasKernelModule(kmod) {
 const HP_DIR = '/etc/homeproxy';
 const RUN_DIR = '/var/run/homeproxy';
 
+/* Resource lists the status page may query/update; single source for the two
+   methods below (the update path also validates the type against it to keep
+   path traversal out). */
+const RESOURCE_TYPES = ['china_ip4', 'china_ip6', 'gfw_list', 'china_list', 'geoip_cn', 'geosite_cn'];
+
 const methods = {
 	acllist_read: {
 		args: { type: 'type' },
@@ -108,6 +113,8 @@ const methods = {
 			switch (filename) {
 			case 'client_ca':
 			case 'server_publickey':
+			/* the ECH config the client form uploads (node.js uploadCertificate) */
+			case 'client_ech_conf':
 				return writeCertificate(filename, false);
 				break;
 			case 'server_privatekey':
@@ -234,7 +241,7 @@ const methods = {
 		args: { type: 'type' },
 		call: function(req) {
 			/* whitelist resource types to prevent path traversal */
-			if (index(['china_ip4', 'china_ip6', 'gfw_list', 'china_list'], req.args?.type) === -1)
+			if (index(RESOURCE_TYPES, req.args?.type) === -1)
 				return { error: 'illegal type', version: null };
 			let version = trim(readfile(`${HP_DIR}/resources/${req.args?.type}.ver`));
 			const fields = version ? match(version, /^(\S+) (\S+)$/) : null;
@@ -246,7 +253,7 @@ const methods = {
 	resources_update: {
 		args: { type: 'type' },
 		call: function(req) {
-			if (index(['china_ip4', 'china_ip6', 'gfw_list', 'china_list'], req.args?.type) === -1)
+			if (index(RESOURCE_TYPES, req.args?.type) === -1)
 				return { status: 255, error: 'illegal type' };
 			if (req.args?.type) {
 				const type = shellquote(req.args?.type);
diff --git a/luci-app-homeproxy/tests/README.md b/luci-app-homeproxy/tests/README.md
index 033b3bac3..8941293d1 100644
--- a/luci-app-homeproxy/tests/README.md
+++ b/luci-app-homeproxy/tests/README.md
@@ -10,8 +10,8 @@ tests/run.sh
 ```
 
 * The **LuCI form snapshots** run locally and only need `node`. They re-render
-  the node/server views through a mock LuCI runtime and diff the result against
-  `tests/snapshots/*.json`.
+  the node/client/server views through a mock LuCI runtime and diff the result
+  against `tests/snapshots/*.json`.
 * The **ucode tests** need `ucode`; the generator cases additionally run
   `sing-box check`, so they need sing-box ≥ 1.14 as well (available on an
   OpenWrt/ImmortalWrt target). When the host running `tests/run.sh` has neither,
@@ -35,14 +35,14 @@ sh tests/ucode/run.sh "$PWD"
 | Path | Checks |
 | --- | --- |
 | `tests/i18n-coverage.py` | Reports how many `po/templates/homeproxy.pot` strings have a non-fuzzy, non-empty `po/zh_Hans/homeproxy.po` translation. Technical tokens that stay as-is are listed in `tests/i18n-ignore.txt`; anything else missing produces a warning annotation (`--warn-below 100` by default) and a job-summary entry. Run by `.github/workflows/i18n.yml` on push/PR and before a release. |
-| `tests/luci-form-snapshot.js` | Dumps every option (name, kind, title, description, depends, values, datatype/default/…) of the node and server views. Diffs against `tests/snapshots/{node,server}.json`, so a refactor that changes a field or its visibility fails. |
-| `tests/ucode/test_homeproxy_utils.uc` | `executeCommand()` return shape, stderr/exit-code capture, binary detection, and a descriptor-leak check (200 calls). |
+| `tests/luci-form-snapshot.js` | Dumps every option (name, kind, title, description, depends, values, datatype/default/…) of the node, client and server views. Diffs against `tests/snapshots/{node,client,server}.json`, so a refactor that changes a field or its visibility fails. |
+| `tests/ucode/test_homeproxy_utils.uc` | `executeCommand()` return shape, stderr/exit-code capture, binary detection, a 700 KiB read (the one-shot 512 KiB read used to truncate large subscription lists), `isValidCIDR()` prefix/address validation incl. template-injection input, and a descriptor-leak check (200 calls). |
 | `tests/ucode/test_homeproxy_utils_inject.uc` | The failure path of `executeCommand()`: the script stages a copy of `homeproxy.uc` whose `system()` call is replaced by `die()`, then checks that the exception still propagates and that neither descriptor leaks. |
 | `tests/ucode/test_wget_flavor.uc` | The `wget --version` probe (`classifyWgetFlavor()`) and the command line `wGETVerbose()` builds from it. `run.sh` points the module at a stub wget and runs the file twice — once answering like GNU wget (expects `-nv`), once like uclient-fetch (expects `-q` and no GNU-only option at all). |
 | `tests/ucode/test_wget_verbose_uclient.uc` | Runs `wGETVerbose()` against the target's real `/bin/uclient-fetch` (skipped where it is absent). The request goes to a closed loopback port, so the point is only that uclient-fetch gets past getopt — a GNU-only flag in the command line fails the test. |
 | `tests/ucode/test_fw4_names.sh` | Keeps the fw4 chain/set inventory in `scripts/fw4_names.sh` (used by `init.d/homeproxy` to clean up on stop) in sync with the objects declared in `scripts/firewall_post.ut`. |
 | `tests/ucode/test_parse_uri.uc` | Per-scheme assertions on the `parse_uri()` result: anytls, http/https, hysteria, hysteria2/hy2, snell, socks(4/4a/5/5h), shadowsocks (SIP002 base64 + plain + plugin, Shadowrocket), trojan (ws/grpc), tuic, vless (reality/ws/http/httpupgrade), vmess (ws/h2/httpupgrade/grpc) and SIP008 objects, plus the rejection paths (unsupported kcp/quic, no QUIC support, invalid port, unknown scheme). |
-| `tests/ucode/test_generators.sh` | Runs `generate_client.uc`/`generate_server.uc` against the UCI fixtures in `tests/fixtures/generators/` inside a scratch directory (the `uci` cursor and `HP_DIR`/`RUN_DIR` are redirected) and validates each result with `sing-box check`. |
+| `tests/ucode/test_generators.sh` | Runs `generate_client.uc`/`generate_server.uc` against the UCI fixtures in `tests/fixtures/generators/` inside a scratch directory (the `uci` cursor and `HP_DIR`/`RUN_DIR` are redirected) and validates each result with `sing-box check`. The client case is additionally compared byte for byte against the golden snapshot `tests/snapshots/client.generated.json` (with the scratch directory normalized out), which is what catches rule-order/DNS-routing/field-emission regressions that `sing-box check` accepts. |
 
 `tests/ucode/mocks/homeproxy.uc` is a test double for the real module: only
 `validation()` is stubbed (the real one runs `/sbin/validate_data`, which does
@@ -58,5 +58,15 @@ not exist outside OpenWrt), everything else is a copy of the production code.
 
   ```sh
   node tests/luci-form-snapshot.js . node   > tests/snapshots/node.json
+  node tests/luci-form-snapshot.js . client > tests/snapshots/client.json
   node tests/luci-form-snapshot.js . server > tests/snapshots/server.json
   ```
+* Intentional generated-config change → regenerate the client golden after
+  reviewing the diff (the file lives in `/tmp/hp-ucode-tests/generators/client/`
+  on the host that ran the suite):
+
+  ```sh
+  sed 's#/tmp/hp-ucode-tests/generators/client#__WORKDIR__#g' \
+      /tmp/hp-ucode-tests/generators/client/run/sing-box-c.json \
+      > tests/snapshots/client.generated.json
+  ```
diff --git a/luci-app-homeproxy/tests/luci-form-snapshot.js b/luci-app-homeproxy/tests/luci-form-snapshot.js
index 10552940f..6978586aa 100644
--- a/luci-app-homeproxy/tests/luci-form-snapshot.js
+++ b/luci-app-homeproxy/tests/luci-form-snapshot.js
@@ -10,7 +10,7 @@
  * snapshots diffed, so that a pure refactor can be proven not to change any
  * option name, dependency, default or label.
  *
- * Usage: node tests/luci-form-snapshot.js <repo-root> [node|server]
+ * Usage: node tests/luci-form-snapshot.js <repo-root> [node|client|server]
  */
 
 'use strict';
@@ -171,11 +171,19 @@ const rpc = { declare: () => () => Promise.resolve({}) };
 const fsMock = { exec_direct: () => Promise.resolve(''), read: () => Promise.resolve(''), write: () => Promise.resolve() };
 const widgets = { DeviceSelect: class {} };
 
+/* tools.firewall is used by the client view for the LAN ACL lists; the mock
+   has to return an option object like the real addIPOption/addMACOption. */
+const fwtool = {
+	addIPOption: (section, _policy, name, title, _desc, _family, _hosts, _optional) => section.option(form.DynamicList, name, title),
+	addMACOption: (section, _policy, name, title, _desc, _hosts) => section.option(form.DynamicList, name, title)
+};
+
 const deps = {
 	baseclass, form, fs: fsMock, rpc, uci, ui, view, poll,
 	'luci.http': { urldecode: (s) => s, urlencode: (s) => s, urldecode_params: () => ({}) },
 	'luci.sys': { init_action: () => {} },
-	'tools.widgets': widgets
+	'tools.widgets': widgets,
+	'tools.firewall': fwtool
 };
 
 /* --- LuCI runtime mock end --------------------------------------------- */
@@ -195,7 +203,7 @@ function main() {
 	const root = process.argv[2];
 	const target = process.argv[3] || 'node';
 	if (!root)
-		throw new Error('usage: luci-form-snapshot.js <repo-root> [node|server]');
+		throw new Error('usage: luci-form-snapshot.js <repo-root> [node|client|server]');
 
 	const viewDir = path.join(root, 'htdocs/luci-static/resources');
 	const homeproxy = loadLuciModule(path.join(viewDir, 'homeproxy.js'), {});
diff --git a/luci-app-homeproxy/tests/run.sh b/luci-app-homeproxy/tests/run.sh
index b46570940..a4d7cef87 100755
--- a/luci-app-homeproxy/tests/run.sh
+++ b/luci-app-homeproxy/tests/run.sh
@@ -21,7 +21,7 @@ echo "== zh_Hans translation coverage =="
 python3 "$ROOT/tests/i18n-coverage.py" --warn-below 100
 
 echo "== LuCI form snapshots =="
-for target in node server; do
+for target in node client server; do
 	if ! node "$ROOT/tests/luci-form-snapshot.js" "$ROOT" "$target" > "/tmp/hp-snapshot-$target.json" 2> "/tmp/hp-snapshot-$target.err"; then
 		echo "FAIL: could not render the $target form"
 		cat "/tmp/hp-snapshot-$target.err"
diff --git a/luci-app-homeproxy/tests/snapshots/client.generated.json b/luci-app-homeproxy/tests/snapshots/client.generated.json
new file mode 100644
index 000000000..438629c8e
--- /dev/null
+++ b/luci-app-homeproxy/tests/snapshots/client.generated.json
@@ -0,0 +1,338 @@
+{
+	"log": {
+		"disabled": false,
+		"level": "error",
+		"output": "__WORKDIR__/run/sing-box-c.log",
+		"timestamp": true
+	},
+	"dns": {
+		"servers": [
+			{
+				"tag": "default-dns",
+				"type": "udp",
+				"server": "202.96.128.86"
+			},
+			{
+				"tag": "system-dns",
+				"type": "local"
+			},
+			{
+				"tag": "main-dns",
+				"domain_resolver": {
+					"server": "default-dns",
+					"strategy": "ipv4_only"
+				},
+				"detour": "main-out",
+				"type": "https",
+				"server": "cloudflare-dns.com",
+				"server_port": 443,
+				"path": "/dns-query"
+			},
+			{
+				"tag": "china-dns",
+				"domain_resolver": {
+					"server": "default-dns",
+					"strategy": "ipv4_only"
+				},
+				"type": "udp",
+				"server": "223.5.5.5"
+			}
+		],
+		"rules": [
+			{
+				"query_type": [
+					64,
+					65
+				],
+				"action": "reject"
+			},
+			{
+				"query_type": [
+					35
+				],
+				"domain_suffix": [
+					"r.10086.cn",
+					"10086.cn",
+					"pub.3gppnetwork.org"
+				],
+				"action": "route",
+				"server": "default-dns"
+			},
+			{
+				"rule_set": "geosite-cn",
+				"action": "route",
+				"server": "china-dns"
+			}
+		],
+		"strategy": "ipv4_only",
+		"final": "main-dns"
+	},
+	"inbounds": [
+		{
+			"type": "direct",
+			"tag": "dns-in",
+			"listen": "127.0.0.1",
+			"listen_port": 5333
+		},
+		{
+			"type": "mixed",
+			"tag": "mixed-in",
+			"listen": "::",
+			"listen_port": 5330,
+			"set_system_proxy": false
+		},
+		{
+			"type": "tun",
+			"tag": "tun-in",
+			"interface_name": "singtun0",
+			"address": [
+				"172.19.0.1/30"
+			],
+			"mtu": 9000,
+			"auto_route": false,
+			"stack": "system"
+		}
+	],
+	"outbounds": [
+		{
+			"type": "direct",
+			"tag": "direct-out"
+		},
+		{
+			"type": "block",
+			"tag": "block-out"
+		},
+		{
+			"type": "urltest",
+			"tag": "main-out",
+			"outbounds": [
+				"cfg-n_anytls-out",
+				"cfg-n_vless_reality_ws-out",
+				"cfg-n_vmess_http-out",
+				"cfg-n_trojan_grpc-out",
+				"cfg-n_ss-out",
+				"cfg-n_hy2-out",
+				"cfg-n_snell-out",
+				"cfg-n_http-out",
+				"cfg-n_socks-out",
+				"cfg-n_shadowtls-out"
+			]
+		},
+		{
+			"type": "anytls",
+			"tag": "cfg-n_anytls-out",
+			"server": "a.example.com",
+			"server_port": 443,
+			"password": "secret",
+			"idle_session_check_interval": "30s",
+			"idle_session_timeout": "30s",
+			"tls": {
+				"enabled": true,
+				"server_name": "a.example.com",
+				"insecure": false
+			}
+		},
+		{
+			"type": "vless",
+			"tag": "cfg-n_vless_reality_ws-out",
+			"server": "b.example.com",
+			"server_port": 443,
+			"uuid": "3af88561-9c69-4b19-8f7e-f08d580bc339",
+			"flow": "xtls-rprx-vision",
+			"packet_encoding": "xudp",
+			"tls": {
+				"enabled": true,
+				"server_name": "b.example.com",
+				"utls": {
+					"enabled": true,
+					"fingerprint": "chrome"
+				},
+				"reality": {
+					"enabled": true,
+					"public_key": "4UAg690QziXeelpUJoAmXiim0gfQESSiJkNfvF-o8Uw",
+					"short_id": "abcd"
+				}
+			},
+			"transport": {
+				"type": "ws",
+				"path": "/ws?ed=2048",
+				"headers": {
+					"Host": "b.example.com"
+				}
+			}
+		},
+		{
+			"type": "vmess",
+			"tag": "cfg-n_vmess_http-out",
+			"server": "c.example.com",
+			"server_port": 80,
+			"uuid": "3af88561-9c69-4b19-8f7e-f08d580bc339",
+			"security": "auto",
+			"global_padding": true,
+			"packet_encoding": "packetaddr",
+			"transport": {
+				"type": "http",
+				"host": "c.example.com",
+				"path": "/path",
+				"method": "GET"
+			}
+		},
+		{
+			"type": "trojan",
+			"tag": "cfg-n_trojan_grpc-out",
+			"server": "d.example.com",
+			"server_port": 443,
+			"password": "secret",
+			"tls": {
+				"enabled": true,
+				"server_name": "d.example.com",
+				"min_version": "1.2",
+				"max_version": "1.3",
+				"handshake_timeout": "15s",
+				"cipher_suites": "TLS_AES_128_GCM_SHA256"
+			},
+			"transport": {
+				"type": "grpc",
+				"service_name": "gs",
+				"permit_without_stream": true
+			}
+		},
+		{
+			"type": "shadowsocks",
+			"tag": "cfg-n_ss-out",
+			"server": "e.example.com",
+			"server_port": 8388,
+			"password": "secret",
+			"method": "aes-256-gcm",
+			"multiplex": {
+				"enabled": true,
+				"protocol": "h2mux",
+				"max_connections": 4,
+				"padding": true
+			},
+			"udp_over_tcp": {
+				"enabled": true,
+				"version": 2
+			}
+		},
+		{
+			"type": "hysteria2",
+			"tag": "cfg-n_hy2-out",
+			"server": "f.example.com",
+			"server_port": 443,
+			"server_ports": "20000:30000",
+			"password": "secret",
+			"hop_interval": "30s",
+			"up_mbps": 100,
+			"down_mbps": 500,
+			"obfs": {
+				"type": "salamander",
+				"password": "obfspass"
+			},
+			"bbr_profile": "conservative",
+			"tls": {
+				"enabled": true,
+				"server_name": "f.example.com"
+			}
+		},
+		{
+			"type": "snell",
+			"tag": "cfg-n_snell-out",
+			"server": "g.example.com",
+			"server_port": 443,
+			"psk": "psk123456789012",
+			"userkey": "ukey",
+			"reuse": true,
+			"obfs_mode": "http",
+			"obfs_host": "bing.com",
+			"version": 4
+		},
+		{
+			"type": "http",
+			"tag": "cfg-n_http-out",
+			"server": "h.example.com",
+			"server_port": 8080,
+			"username": "u",
+			"password": "p"
+		},
+		{
+			"type": "socks",
+			"tag": "cfg-n_socks-out",
+			"server": "i.example.com",
+			"server_port": 1080,
+			"username": "u",
+			"password": "p",
+			"version": "5"
+		},
+		{
+			"type": "shadowtls",
+			"tag": "cfg-n_shadowtls-out",
+			"server": "j.example.com",
+			"server_port": 443,
+			"password": "secret",
+			"version": 3,
+			"tls": {
+				"enabled": true,
+				"server_name": "j.example.com"
+			}
+		}
+	],
+	"route": {
+		"rules": [
+			{
+				"inbound": "dns-in",
+				"action": "hijack-dns"
+			},
+			{
+				"action": "sniff",
+				"timeout": "300ms"
+			},
+			{
+				"action": "resolve",
+				"strategy": "prefer_ipv4"
+			},
+			{
+				"rule_set": "geoip-cn",
+				"action": "route",
+				"outbound": "direct-out"
+			}
+		],
+		"rule_set": [
+			{
+				"type": "remote",
+				"tag": "geoip-cn",
+				"format": "binary",
+				"url": "https://raw.githubusercontent.com/SagerNet/sing-geoip/rule-set/geoip-cn.srs",
+				"update_interval": "24h",
+				"http_client": "hp-main-out"
+			},
+			{
+				"type": "remote",
+				"tag": "geosite-cn",
+				"format": "binary",
+				"url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-cn.srs",
+				"update_interval": "24h",
+				"http_client": "hp-main-out"
+			}
+		],
+		"auto_detect_interface": true,
+		"default_domain_resolver": {
+			"server": "default-dns",
+			"strategy": "prefer_ipv4"
+		},
+		"final": "main-out"
+	},
+	"http_clients": [
+		{
+			"tag": "hp-main-out",
+			"detour": "main-out"
+		}
+	],
+	"experimental": {
+		"cache_file": {
+			"enabled": true,
+			"path": "/etc/homeproxy/cache.db"
+		}
+	},
+	"$schema": "https://sing-box.sagernet.org/schema.json"
+}
diff --git a/luci-app-homeproxy/tests/snapshots/client.json b/luci-app-homeproxy/tests/snapshots/client.json
new file mode 100644
index 000000000..b528b5eb5
--- /dev/null
+++ b/luci-app-homeproxy/tests/snapshots/client.json
@@ -0,0 +1,677 @@
+{
+	"sections": [
+		{
+			"id": "TypedSection:#0",
+			"kind": "TypedSection",
+			"tabs": [],
+			"options": [],
+			"subsection": null
+		},
+		{
+			"id": "NamedSection:config#1",
+			"kind": "NamedSection",
+			"name": "config",
+			"tabs": [
+				[
+					"routing",
+					"Routing Settings"
+				],
+				[
+					"routing_node",
+					"Routing Nodes"
+				],
+				[
+					"routing_rule",
+					"Routing Rules"
+				],
+				[
+					"dns",
+					"DNS Settings"
+				],
+				[
+					"dns_server",
+					"DNS Servers"
+				],
+				[
+					"dns_rule",
+					"DNS Rules"
+				],
+				[
+					"ruleset",
+					"Rule Set"
+				],
+				[
+					"control",
+					"Access Control"
+				],
+				[
+					"dns_cache",
+					"DNS Cache (1.14)"
+				]
+			],
+			"options": [
+				{
+					"kind": "ListValue",
+					"name": "main_node",
+					"title": "Main node",
+					"description": null,
+					"depends": [
+						{
+							"routing_mode": "custom",
+							"!reverse": true
+						}
+					],
+					"values": [
+						[
+							"nil",
+							"Disable"
+						],
+						[
+							"urltest",
+							"URLTest"
+						]
+					],
+					"props": {
+						"default": "nil",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "CBI.StaticList",
+					"name": "main_urltest_nodes",
+					"title": "URLTest nodes",
+					"description": "List of nodes to test.",
+					"depends": [
+						[
+							"main_node",
+							"urltest"
+						]
+					],
+					"values": [],
+					"props": {
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "main_urltest_interval",
+					"title": "Test interval",
+					"description": "The test interval in seconds.",
+					"depends": [
+						[
+							"main_node",
+							"urltest"
+						]
+					],
+					"values": [],
+					"props": {
+						"datatype": "uinteger",
+						"placeholder": "180"
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "main_urltest_tolerance",
+					"title": "Test tolerance",
+					"description": "The test tolerance in milliseconds.",
+					"depends": [
+						[
+							"main_node",
+							"urltest"
+						]
+					],
+					"values": [],
+					"props": {
+						"datatype": "uinteger",
+						"placeholder": "50"
+					}
+				},
+				{
+					"kind": "ListValue",
+					"name": "main_udp_node",
+					"title": "Main UDP node",
+					"description": null,
+					"depends": [
+						{
+							"routing_mode": {},
+							"proxy_mode": {}
+						}
+					],
+					"values": [
+						[
+							"nil",
+							"Disable"
+						],
+						[
+							"same",
+							"Same as main node"
+						],
+						[
+							"urltest",
+							"URLTest"
+						]
+					],
+					"props": {
+						"default": "nil",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "CBI.StaticList",
+					"name": "main_udp_urltest_nodes",
+					"title": "URLTest nodes",
+					"description": "List of nodes to test.",
+					"depends": [
+						[
+							"main_udp_node",
+							"urltest"
+						]
+					],
+					"values": [],
+					"props": {
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "main_udp_urltest_interval",
+					"title": "Test interval",
+					"description": "The test interval in seconds.",
+					"depends": [
+						[
+							"main_udp_node",
+							"urltest"
+						]
+					],
+					"values": [],
+					"props": {
+						"datatype": "uinteger",
+						"placeholder": "180"
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "main_udp_urltest_tolerance",
+					"title": "Test tolerance",
+					"description": "The test tolerance in milliseconds.",
+					"depends": [
+						[
+							"main_udp_node",
+							"urltest"
+						]
+					],
+					"values": [],
+					"props": {
+						"datatype": "uinteger",
+						"placeholder": "50"
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "dns_server",
+					"title": "DNS server",
+					"description": "Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified.",
+					"depends": [
+						{
+							"routing_mode": "custom",
+							"!reverse": true
+						}
+					],
+					"values": [
+						[
+							"wan",
+							"WAN DNS (read from interface)"
+						],
+						[
+							"1.1.1.1",
+							"CloudFlare Public DNS (1.1.1.1)"
+						],
+						[
+							"208.67.222.222",
+							"Cisco Public DNS (208.67.222.222)"
+						],
+						[
+							"8.8.8.8",
+							"Google Public DNS (8.8.8.8)"
+						],
+						[
+							"",
+							"---"
+						],
+						[
+							"223.5.5.5",
+							"Aliyun Public DNS (223.5.5.5)"
+						],
+						[
+							"119.29.29.29",
+							"Tencent Public DNS (119.29.29.29)"
+						],
+						[
+							"117.50.10.10",
+							"ThreatBook Public DNS (117.50.10.10)"
+						]
+					],
+					"props": {
+						"default": "8.8.8.8",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "china_dns_server",
+					"title": "China DNS server",
+					"description": "The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT.",
+					"depends": [
+						[
+							"routing_mode",
+							"bypass_mainland_china"
+						]
+					],
+					"values": [
+						[
+							"wan",
+							"WAN DNS (read from interface)"
+						],
+						[
+							"223.5.5.5",
+							"Aliyun Public DNS (223.5.5.5)"
+						],
+						[
+							"210.2.4.8",
+							"CNNIC Public DNS (210.2.4.8)"
+						],
+						[
+							"119.29.29.29",
+							"Tencent Public DNS (119.29.29.29)"
+						],
+						[
+							"117.50.10.10",
+							"ThreatBook Public DNS (117.50.10.10)"
+						]
+					],
+					"props": {
+						"default": "223.5.5.5",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "ListValue",
+					"name": "routing_mode",
+					"title": "Routing mode",
+					"description": null,
+					"depends": [],
+					"values": [
+						[
+							"gfwlist",
+							"GFWList"
+						],
+						[
+							"bypass_mainland_china",
+							"Bypass mainland China"
+						],
+						[
+							"proxy_mainland_china",
+							"Only proxy mainland China"
+						],
+						[
+							"custom",
+							"Custom routing"
+						],
+						[
+							"global",
+							"Global"
+						]
+					],
+					"props": {
+						"default": "bypass_mainland_china",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "routing_port",
+					"title": "Routing ports",
+					"description": "Specify target ports to be proxied. Multiple ports must be separated by commas.",
+					"depends": [],
+					"values": [
+						[
+							"",
+							"All ports"
+						],
+						[
+							"common",
+							"Common ports only (bypass P2P traffic)"
+						]
+					],
+					"props": {}
+				},
+				{
+					"kind": "ListValue",
+					"name": "proxy_mode",
+					"title": "Proxy mode",
+					"description": null,
+					"depends": [],
+					"values": [
+						[
+							"redirect",
+							"Redirect TCP"
+						]
+					],
+					"props": {
+						"default": "redirect_tproxy",
+						"description": "To enable Tun support, you need to install <code>ip-full</code> and <code>kmod-tun</code>",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Flag",
+					"name": "ipv6_support",
+					"title": "IPv6 support",
+					"description": null,
+					"depends": [],
+					"values": [],
+					"props": {
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Flag",
+					"name": "cn_ip_fallback",
+					"title": "CN-IP DNS fallback (sing-box 1.14)",
+					"description": "When the main DNS returns a mainland China IP, re-resolve via China DNS using evaluate/match_response.",
+					"depends": [
+						[
+							"routing_mode",
+							"bypass_mainland_china"
+						]
+					],
+					"values": [],
+					"props": {
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Flag",
+					"name": "block_https_rr",
+					"title": "Block HTTPS/SVCB DNS records",
+					"description": "Answer HTTPS (type 65) and SVCB (type 64) queries with an empty response. Keeps clients off HTTPS-RR/ECH, which this DNS chain cannot serve through some proxies; disable it if ECH is wanted.",
+					"depends": [],
+					"values": [],
+					"props": {
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "ListValue",
+					"name": "tun_dns_mode",
+					"title": "TUN DNS mode (1.14)",
+					"description": "Since sing-box 1.14 the default (Unset) behaves as hijack: sing-box sets the platform interface DNS and hijacks port 53. On OpenWrt this overlaps with the own dnsmasq/nftables DNS hijack of this plugin, so keep Disabled on a gateway unless you need sing-box to own TUN DNS.",
+					"depends": [
+						[
+							"proxy_mode",
+							"redirect_tun"
+						],
+						[
+							"proxy_mode",
+							"tun"
+						]
+					],
+					"values": [
+						[
+							"default",
+							"Unset (default)"
+						],
+						[
+							"disabled",
+							"Disabled"
+						],
+						[
+							"native",
+							"Native"
+						],
+						[
+							"hijack",
+							"Hijack"
+						]
+					],
+					"props": {
+						"default": "default",
+						"rmempty": true
+					}
+				},
+				{
+					"kind": "DynamicList",
+					"name": "tun_dns_address",
+					"title": "TUN DNS addresses (1.14)",
+					"description": null,
+					"depends": [
+						{
+							"proxy_mode": {},
+							"tun_dns_mode": {}
+						}
+					],
+					"values": [],
+					"props": {
+						"datatype": "ipaddr",
+						"modalonly": true
+					}
+				},
+				{
+					"kind": "ListValue",
+					"name": "udp_mapping",
+					"title": "UDP NAT mapping (1.14)",
+					"description": null,
+					"depends": [
+						[
+							"proxy_mode",
+							"redirect_tproxy"
+						],
+						[
+							"proxy_mode",
+							"redirect_tun"
+						],
+						[
+							"proxy_mode",
+							"tun"
+						]
+					],
+					"values": [
+						[
+							"endpoint_independent",
+							"Endpoint independent"
+						],
+						[
+							"address_dependent",
+							"Address dependent"
+						],
+						[
+							"address_and_port_dependent",
+							"Address and port dependent"
+						]
+					],
+					"props": {
+						"default": "endpoint_independent",
+						"description": "sing-box default; recommended for home use (small NAT table, QUIC/game friendly). Choose stricter only for specific UDP issues.",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "ListValue",
+					"name": "udp_filtering",
+					"title": "UDP NAT filtering (1.14)",
+					"description": null,
+					"depends": [
+						[
+							"proxy_mode",
+							"redirect_tproxy"
+						],
+						[
+							"proxy_mode",
+							"redirect_tun"
+						],
+						[
+							"proxy_mode",
+							"tun"
+						]
+					],
+					"values": [
+						[
+							"endpoint_independent",
+							"Endpoint independent"
+						],
+						[
+							"address_dependent",
+							"Address dependent"
+						],
+						[
+							"address_and_port_dependent",
+							"Address and port dependent"
+						]
+					],
+					"props": {
+						"default": "endpoint_independent",
+						"description": "sing-box default; recommended for home use (accepts replies from any remote after mapping). Choose stricter only for specific UDP issues.",
+						"rmempty": false
+					}
+				},
+				{
+					"kind": "Value",
+					"name": "udp_nat_max",
+					"title": "UDP NAT sessions max (1.14)",
+					"description": null,
+					"depends": [
+						[
+							"proxy_mode",
+							"redirect_tproxy"
+						],
+						[
+							"proxy_mode",
+							"redirect_tun"
+						],
+						[
+							"proxy_mode",
+							"tun"
+						]
+					],
+					"values": [],
+					"props": {
+						"datatype": "uinteger"
+					}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_routing",
+					"description": "routing",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_routing_node",
+					"description": "routing_node",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_routing_rule",
+					"description": "routing_rule",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_dns",
+					"description": "dns",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_dns_server",
+					"description": "dns_server",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_dns_rule",
+					"description": "dns_rule",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_ruleset",
+					"description": "ruleset",
+					"depends": [
+						[
+							"routing_mode",
+							"custom"
+						]
+					],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_control",
+					"description": "control",
+					"depends": [],
+					"values": [],
+					"props": {}
+				},
+				{
+					"kind": "SectionValue",
+					"name": "_dns_cache",
+					"description": "dns",
+					"depends": [
+						{
+							"routing_mode": "custom",
+							"!reverse": true
+						}
+					],
+					"values": [],
+					"props": {}
+				}
+			],
+			"subsection": null
+		}
+	]
+}
diff --git a/luci-app-homeproxy/tests/ucode/mocks/homeproxy.uc b/luci-app-homeproxy/tests/ucode/mocks/homeproxy.uc
index c410fd07f..3a76b6d1d 100644
--- a/luci-app-homeproxy/tests/ucode/mocks/homeproxy.uc
+++ b/luci-app-homeproxy/tests/ucode/mocks/homeproxy.uc
@@ -62,6 +62,50 @@ export function validation(datatype, data) {
 	}
 };
 
+/*
+ * Decode %XX escapes without touching '+'. urldecode() maps '+' to a space,
+ * which corrupts base64 userinfo ("+" is part of the alphabet), so share-link
+ * userinfo is percent-decoded with this instead.
+ */
+/*
+ * ucode has no tolower(), so both hex cases are mapped by hand.
+ */
+function hexValue(ch) {
+	const lower = index('0123456789abcdef', ch);
+	if (lower >= 0)
+		return lower;
+
+	const upper = index('ABCDEF', ch);
+
+	return upper < 0 ? -1 : 10 + upper;
+}
+
+/*
+ * ucode's regex engine rejects \x00 inside a character class ("Missing ']'"),
+ * so control bytes are checked by hand.
+ */
+function hasControlChar(str) {
+	for (let i = 0; i < length(str); i++) {
+		const code = ord(str, i);
+		if (code < 0x20 || code === 0x7f)
+			return true;
+	}
+
+	return false;
+}
+
+export function percentDecode(str) {
+	if (isEmpty(str))
+		return str;
+
+	return replace(str, /%([0-9A-Fa-f]{2})/g, (whole, hex) => {
+		const hi = hexValue(substr(hex, 0, 1));
+		const lo = hexValue(substr(hex, 1, 1));
+
+		return (hi < 0 || lo < 0) ? whole : chr(hi * 16 + lo);
+	});
+};
+
 export function parseURL(url) {
 	if (type(url) !== 'string')
 		return null;
@@ -116,18 +160,20 @@ export function parseURL(url) {
 		return null;
 
 	if (objurl.userinfo) {
-		objurl.userinfo = replace(objurl.userinfo, /:(.+)$/, (_, val) => {
+		/* keep in sync with the production parser (homeproxy.uc) */
+		let userinfo = percentDecode(objurl.userinfo);
+
+		userinfo = replace(userinfo, /:(.+)$/, (_, val) => {
 			objurl.password = val;
 			return '';
 		});
 
-		if (match(objurl.userinfo, /^[A-Za-z0-9\+\-\_\.]+$/)) {
-			objurl.username = objurl.userinfo;
-			delete objurl.userinfo;
-		} else {
-			delete objurl.userinfo;
+		if (!match(userinfo, /\s/) && !hasControlChar(userinfo))
+			objurl.username = userinfo;
+		else
 			delete objurl.password;
-		}
+
+		delete objurl.userinfo;
 	};
 
 	if (!objurl.port)
diff --git a/luci-app-homeproxy/tests/ucode/test_generators.sh b/luci-app-homeproxy/tests/ucode/test_generators.sh
index 2c06ff131..09dd30260 100755
--- a/luci-app-homeproxy/tests/ucode/test_generators.sh
+++ b/luci-app-homeproxy/tests/ucode/test_generators.sh
@@ -20,6 +20,7 @@ run_case() {
 	fixture="$2"
 	generator="$3"
 	outfile="$4"
+	local_rs="$5"
 	dir="$WORK/$name"
 
 	rm -rf "$dir"
@@ -27,6 +28,18 @@ run_case() {
 	: > "$dir/resources/direct_list.txt"
 	: > "$dir/resources/proxy_list.txt"
 
+	if [ "$local_rs" = "1" ]; then
+		# with the .srs files that update_resources.sh downloads in place, the
+		# generator has to load them instead of the remote URLs
+		printf '%s' '{"version":1,"rules":[{"domain_suffix":["example.com"]}]}' > "$dir/rs-src.json"
+		if ! sing-box rule-set compile "$dir/rs-src.json" -o "$dir/resources/geoip_cn.srs" \
+			|| ! sing-box rule-set compile "$dir/rs-src.json" -o "$dir/resources/geosite_cn.srs"; then
+			echo "FAIL: $name: could not compile the local rule-set fixture"
+			FAILED=1
+			return
+		fi
+	fi
+
 	if grep -q "__RULESET_DIR__" "$fixture"; then
 		# The fixture needs a real local rule-set on disk.
 		printf '%s' '{"version":1,"rules":[{"domain_suffix":["example.com"]}]}' > "$dir/ruleset/src.json"
@@ -70,6 +83,26 @@ run_case() {
 
 run_case client "$ROOT/tests/fixtures/generators/client.uci" generate_client.uc sing-box-c.json
 
+# Golden comparison for the client generator. `sing-box check` only proves the
+# config parses; this proves the generated config did not change silently (rule
+# order, DNS routing decisions, whether a field is emitted at all). The work
+# directory is normalized out of the paths before comparing.
+CLIENT_GOLDEN="$ROOT/tests/snapshots/client.generated.json"
+CLIENT_OUT="$WORK/client/run/sing-box-c.json"
+if [ ! -f "$CLIENT_GOLDEN" ]; then
+	echo "FAIL: client: golden snapshot $CLIENT_GOLDEN is missing"
+	FAILED=1
+elif sed "s#$WORK/client#__WORKDIR__#g" "$CLIENT_OUT" > "$WORK/client/normalized.json" \
+	&& cmp -s "$CLIENT_GOLDEN" "$WORK/client/normalized.json"; then
+	echo "PASS: client generator matches the golden snapshot"
+else
+	echo "FAIL: client generator output differs from the golden snapshot (normalized output: $WORK/client/normalized.json)"
+	if command -v diff > "/dev/null" 2>&1; then
+		diff -u "$CLIENT_GOLDEN" "$WORK/client/normalized.json" | head -40
+	fi
+	FAILED=1
+fi
+
 # The preset remote rule-sets must be fetched through the node. A direct
 # download depends on the CDN staying reachable from mainland China and fails
 # intermittently under DNS pollution, which shows up as "open connection to
@@ -83,6 +116,18 @@ if ! grep -q '"detour": "main-out"' "$WORK/client/run/sing-box-c.json"; then
 	FAILED=1
 fi
 
+# Local rule-sets (downloaded by update_resources.sh) must be preferred over
+# the remote URLs, so a cold start does not depend on reaching the CDN through
+# the node.
+run_case client-local "$ROOT/tests/fixtures/generators/client.uci" generate_client.uc sing-box-c.json 1
+if grep -q '"type": "local"' "$WORK/client-local/run/sing-box-c.json" \
+	&& ! grep -q '"type": "remote"' "$WORK/client-local/run/sing-box-c.json"; then
+	echo "PASS: client-local uses the local rule-sets"
+else
+	echo "FAIL: client-local did not switch the preset rule-sets to local files"
+	FAILED=1
+fi
+
 run_case custom "$ROOT/tests/fixtures/generators/custom.uci" generate_client.uc sing-box-c.json
 run_case server "$ROOT/tests/fixtures/generators/server.uci" generate_server.uc sing-box-s.json
 
diff --git a/luci-app-homeproxy/tests/ucode/test_homeproxy_utils.uc b/luci-app-homeproxy/tests/ucode/test_homeproxy_utils.uc
index f46587a5e..c4d114681 100644
--- a/luci-app-homeproxy/tests/ucode/test_homeproxy_utils.uc
+++ b/luci-app-homeproxy/tests/ucode/test_homeproxy_utils.uc
@@ -12,7 +12,7 @@
 'use strict';
 
 import { lsdir } from 'fs';
-import { executeCommand, isValidPEM, shellQuote } from 'homeproxy';
+import { executeCommand, isValidCIDR, isValidPEM, shellQuote } from 'homeproxy';
 
 let failures = 0,
     checks = 0;
@@ -54,6 +54,25 @@ const bin = executeCommand('sh', '-c', shellQuote('printf "\\001\\002\\003"'));
 expect('bin.binary', bin.binary, true);
 expect('bin.stdout', bin.stdout, null);
 
+/* output larger than the old one-shot 512 KiB read must not be truncated
+   (subscription lists above that size used to arrive cut in half) */
+const big_want = 700 * 1024;
+const big = executeCommand('sh', '-c', shellQuote('yes a | head -c ' + big_want));
+expect('big.exitcode', big.exitcode, 0);
+expect('big.length', length(big.stdout), big_want);
+
+/* isValidCIDR(): the prefix needs the same strict validation as the address,
+   otherwise a poisoned resource file reaches the nftables template */
+expect('cidr.ok', isValidCIDR('1.2.3.4/24', 4), true);
+expect('cidr.bare', isValidCIDR('1.2.3.4', 4), true);
+expect('cidr.bad-prefix', isValidCIDR('1.2.3.4/abc', 4), false);
+expect('cidr.empty-prefix', isValidCIDR('1.2.3.4/', 4), false);
+expect('cidr.out-of-range', isValidCIDR('1.2.3.4/33', 4), false);
+expect('cidr.two-slashes', isValidCIDR('1.2.3.4/24/1', 4), false);
+expect('cidr.injection', isValidCIDR('1.2.3.4/0 } flush ruleset; table inet x {', 4), false);
+expect('cidr.v6-ok', isValidCIDR('2001:db8::/32', 6), true);
+expect('cidr.v6-injection', isValidCIDR('2001:db8::/32 } flush ruleset;', 6), false);
+
 /* isValidPEM(): certificate vs private key, boundaries and body */
 const pem_cert = '-----BEGIN CERTIFICATE-----\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n-----END CERTIFICATE-----';
 const pem_key = '-----BEGIN RSA PRIVATE KEY-----\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n-----END RSA PRIVATE KEY-----';
diff --git a/luci-app-homeproxy/tests/ucode/test_parse_uri.uc b/luci-app-homeproxy/tests/ucode/test_parse_uri.uc
index 8bab48f3c..af8a1e1de 100644
--- a/luci-app-homeproxy/tests/ucode/test_parse_uri.uc
+++ b/luci-app-homeproxy/tests/ucode/test_parse_uri.uc
@@ -165,6 +165,28 @@ expect_null('hysteria-without-quic', parse_uri('hysteria://s.example.com:443?aut
 expect_null('tuic-without-quic', parse_uri('tuic://u:p@s.example.com:443#NoQuic', NO_QUIC, LOG));
 expect_null('invalid-port', parse_uri('vless://u@t.example.com:99999?security=tls#BadPort', FEATURES, LOG));
 expect_null('unknown-scheme', parse_uri('unknown://u@t.example.com:443', FEATURES, LOG));
+/* sing-box has no xhttp transport; importing it used to make the whole
+   generated config fail with "unknown transport type" */
+expect_null('vless-xhttp-unsupported', parse_uri('vless://u@t.example.com:443?security=tls&type=xhttp#Xhttp', FEATURES, LOG));
+
+/* percent-encoded base64 userinfo (%3D instead of =): used to lose method and
+   password, which made the node break the generated config */
+expect_fields('ss-percent-encoded-userinfo', parse_uri('ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ%3D@j.example.com:8388#SSEnc', FEATURES, LOG), {
+	label: 'SSEnc', type: 'shadowsocks', address: 'j.example.com', port: '8388',
+	shadowsocks_encrypt_method: 'aes-256-gcm', password: 'password'
+});
+
+/* unsupported flow must import as "no flow" instead of breaking sing-box */
+expect_fields('vless-flow-udp443-dropped', parse_uri('vless://vless-uuid@n.example.com:443?security=tls&flow=xtls-rprx-vision-udp443&sni=n.example.com#FlowDrop', FEATURES, LOG), {
+	label: 'FlowDrop', type: 'vless', address: 'n.example.com', port: '443',
+	uuid: 'vless-uuid', tls: '1', tls_sni: 'n.example.com', vless_flow: null
+});
+
+/* punctuation in a password survives now that userinfo is not whitelisted */
+expect_fields('trojan-punctuation-password', parse_uri('trojan://pa!ss~1@m.example.com:443?sni=m.example.com#Punct', FEATURES, LOG), {
+	label: 'Punct', type: 'trojan', address: 'm.example.com', port: '443',
+	password: 'pa!ss~1', tls: '1', tls_sni: 'm.example.com'
+});
 
 printf('%d checks, %d failures\n', checks, failures);
 exit(failures === 0 ? 0 : 1);
diff --git a/luci-app-trafficctl/Makefile b/luci-app-trafficctl/Makefile
index 37fed11eb..14ea51da9 100644
--- a/luci-app-trafficctl/Makefile
+++ b/luci-app-trafficctl/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-trafficctl
-PKG_VERSION:=1.18.0
-PKG_RELEASE:=3
+PKG_VERSION:=1.18.1
+PKG_RELEASE:=4
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Denis Iusupov <yusdyr@gmail.com>