v2.5.0: maintenance and bot user management

lib/telemt_config.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# GoTelegram v2.2 — Генерация TOML конфигурации для telemt
+# GoTelegram v2.5.0 — Генерация TOML конфигурации для telemt
 
 # ── Популярные домены (не заблокированные в РФ) ──────────────────────────────
 QUICK_DOMAINS=(
@@ -48,15 +48,38 @@ generate_telemt_toml() {
 # Сгенерировано: $(date -Iseconds)
 # Режим: ${mask_mode}
 
+[general]
+use_middle_proxy = true
+log_level = "normal"
+
+[general.modes]
+classic = false
+secure = false
+tls = true
+
+[general.links]
+show = "*"
+public_port = ${port}
+
 [server]
 port = ${port}
 listen_addr_ipv4 = "0.0.0.0"
+metrics_listen = "127.0.0.1:9090"
+metrics_whitelist = ["127.0.0.1/32", "::1/128"]
+
+[server.api]
+enabled = true
+listen = "127.0.0.1:9091"
+whitelist = ["127.0.0.1/32", "::1/128"]
+minimal_runtime_enabled = false
+minimal_runtime_cache_ttl_ms = 1000
 
 [censorship]
 tls_domain = "${mask_domain}"
 mask = true
 mask_port = ${mask_port}
 tls_emulation = $([ "$mask_mode" = "pro" ] && echo "false" || echo "true")
+unknown_sni_action = "mask"
 
 [access.users]
 main = "${secret}"
@@ -106,21 +129,57 @@ get_config_value() {
     case "$key" in
         secret)
             # [access.users] main = "..."
-            grep -A5 '\[access.users\]' "$config" | grep -m1 '=' | sed 's/.*=\s*"\(.*\)"/\1/' | tr -d ' '
+            awk '
+                /^\[access\.users\]/ { in_users=1; next }
+                /^\[/ && in_users { exit }
+                in_users && $1 == "main" {
+                    sub(/^[^=]*=[[:space:]]*"/, "")
+                    sub(/".*$/, "")
+                    print
+                    exit
+                }
+            ' "$config" | tr -d ' '
             ;;
         port)
             # [server] port = 443
-            grep -A5 '\[server\]' "$config" | grep 'port\s*=' | head -1 | sed 's/.*=\s*\([0-9]*\)/\1/' | tr -d ' '
+            awk '
+                /^\[server\]/ { in_server=1; next }
+                /^\[/ && in_server { exit }
+                in_server && $1 == "port" {
+                    sub(/^[^=]*=[[:space:]]*/, "")
+                    gsub(/[[:space:]]/, "")
+                    print
+                    exit
+                }
+            ' "$config"
             ;;
         mask_host|tls_domain)
             # [censorship] tls_domain = "..."
-            grep -A10 '\[censorship\]' "$config" | grep 'tls_domain\s*=' | sed 's/.*=\s*"\(.*\)"/\1/'
+            awk '
+                /^\[censorship\]/ { in_cens=1; next }
+                /^\[/ && in_cens { exit }
+                in_cens && $1 == "tls_domain" {
+                    sub(/^[^=]*=[[:space:]]*"/, "")
+                    sub(/".*$/, "")
+                    print
+                    exit
+                }
+            ' "$config"
             ;;
         mask_port)
-            grep -A10 '\[censorship\]' "$config" | grep 'mask_port\s*=' | sed 's/.*=\s*\([0-9]*\)/\1/' | tr -d ' '
+            awk '
+                /^\[censorship\]/ { in_cens=1; next }
+                /^\[/ && in_cens { exit }
+                in_cens && $1 == "mask_port" {
+                    sub(/^[^=]*=[[:space:]]*/, "")
+                    gsub(/[[:space:]]/, "")
+                    print
+                    exit
+                }
+            ' "$config"
             ;;
         *)
-            grep "$key" "$config" | head -1 | sed 's/.*=\s*"\?\(.*\)"\?/\1/' | tr -d ' "'
+            grep "$key" "$config" | head -1 | sed 's/^[^=]*=[[:space:]]*//; s/^"//; s/"$//' | tr -d ' '
             ;;
     esac
 }