Evgen/3x-ui-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(installer): skip hosts group_id on 3x-ui releases before 3.5.0

Browse Source 
The hosts.group_id column only exists since 3x-ui v3.5.0, so pinning an
older release via -version made the hosts INSERT fail. Probe the
migrated schema with PRAGMA table_info and include group_id only when
the column is present.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Ivan Razin
2026-07-16 15:47:58 +03:00
co-authored by Claude Fable 5
parent 882ad252b4
commit 53c1ea88d4
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x-ui-latest.sh
+16 -11
View File
@@ -805,12 +805,17 @@ configure_xui_db() {
private_key=$(echo "$output" | grep "^PrivateKey:" | awk '{print $2}') private_key=$(echo "$output" | grep "^PrivateKey:" | awk '{print $2}')
public_key=$(echo "$output" | grep "^Password" | awk '{print $3}') public_key=$(echo "$output" | grep "^Password" | awk '{print $3}')
trojan_pass=$(gen_random_string 10) trojan_pass=$(gen_random_string 10)
# Per-host group_id: without it the panel cannot edit or delete the host # Per-host group_id: without it the panel cannot edit or delete the host.
local gid_reality gid_ws gid_xhttp gid_trojan # The column only exists since 3x-ui v3.5.0 (pinnable via -version), so
gid_reality=$(gen_group_id) # probe the migrated schema and skip it on older releases.
gid_ws=$(gen_group_id) local gid_col="" gid_reality="" gid_ws="" gid_xhttp="" gid_trojan=""
gid_xhttp=$(gen_group_id) if sqlite3 "$XUIDB" "PRAGMA table_info(hosts);" | grep -qw "group_id"; then
gid_trojan=$(gen_group_id) gid_col='"group_id",'
gid_reality="'$(gen_group_id)',"
gid_ws="'$(gen_group_id)',"
gid_xhttp="'$(gen_group_id)',"
gid_trojan="'$(gen_group_id)',"
fi
emoji_flag=$(LC_ALL=en_US.UTF-8 curl -s --max-time 10 https://ipwho.is/ | jq -r '.flag.emoji' 2>/dev/null) emoji_flag=$(LC_ALL=en_US.UTF-8 curl -s --max-time 10 https://ipwho.is/ | jq -r '.flag.emoji' 2>/dev/null)
[[ -z "$emoji_flag" || "$emoji_flag" == "null" ]] && emoji_flag="🌐" [[ -z "$emoji_flag" || "$emoji_flag" == "null" ]] && emoji_flag="🌐"
@@ -1000,12 +1005,12 @@ VALUES (
-- rendered as the share-link endpoint at subscription time. -- rendered as the share-link endpoint at subscription time.
-- REALITY keeps its own TLS params (security=same); the rest front through -- REALITY keeps its own TLS params (security=same); the rest front through
-- nginx at :443 with TLS. -- nginx at :443 with TLS.
INSERT INTO "hosts" ("inbound_id","group_id","sort_order","remark","address","port","security","fingerprint","alpn") INSERT INTO "hosts" ("inbound_id",${gid_col}"sort_order","remark","address","port","security","fingerprint","alpn")
VALUES VALUES
((SELECT id FROM inbounds WHERE tag='inbound-8443'), '${gid_reality}', 0, 'reality', '${domain}', 443, 'same', '', '[]'), ((SELECT id FROM inbounds WHERE tag='inbound-8443'), ${gid_reality} 0, 'reality', '${domain}', 443, 'same', '', '[]'),
((SELECT id FROM inbounds WHERE tag='inbound-${ws_port}'), '${gid_ws}', 0, 'ws', '${domain}', 443, 'tls', 'firefox', '["h2","http/1.1"]'), ((SELECT id FROM inbounds WHERE tag='inbound-${ws_port}'), ${gid_ws} 0, 'ws', '${domain}', 443, 'tls', 'firefox', '["h2","http/1.1"]'),
((SELECT id FROM inbounds WHERE tag='inbound-/dev/shm/uds2023.sock,0666:0|'), '${gid_xhttp}', 0, 'xhttp', '${domain}', 443, 'tls', 'firefox', '["h2","http/1.1"]'), ((SELECT id FROM inbounds WHERE tag='inbound-/dev/shm/uds2023.sock,0666:0|'), ${gid_xhttp} 0, 'xhttp', '${domain}', 443, 'tls', 'firefox', '["h2","http/1.1"]'),
((SELECT id FROM inbounds WHERE tag='inbound-${trojan_port}'), '${gid_trojan}', 0, 'trojan', '${domain}', 443, 'tls', 'firefox', '["h2","http/1.1"]'); ((SELECT id FROM inbounds WHERE tag='inbound-${trojan_port}'), ${gid_trojan} 0, 'trojan', '${domain}', 443, 'tls', 'firefox', '["h2","http/1.1"]');
EOF EOF
/usr/local/x-ui/x-ui setting \ /usr/local/x-ui/x-ui setting \