diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index 78ae2e7..66a17a1 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -263,16 +263,33 @@ install_xray_tmp() { printf 'OK: xray_bin сохранен в /etc/config/owrtremote\n' } -ensure_tmp_xray() { - local configured +ensure_xray_available() { + local configured candidate found configured="$(uci_get xray_bin /usr/bin/xray)" - case "$configured" in - /tmp/owrt-xray/xray|/tmp/xray) - [ -x "$configured" ] && return 0 - log "Xray был в /tmp и пропал после перезагрузки, ставлю заново..." - install_xray_tmp - ;; - esac + [ -x "$configured" ] && return 0 + + for candidate in /usr/bin/xray /usr/bin/xray-core /usr/local/bin/xray /opt/bin/xray /tmp/owrt-xray/xray /tmp/xray; do + if [ -x "$candidate" ]; then + found="$candidate" + break + fi + done + + if [ -z "$found" ]; then + found="$(command -v xray 2>/dev/null || command -v xray-core 2>/dev/null || true)" + fi + + if [ -n "$found" ] && [ -x "$found" ]; then + [ "$found" = "$configured" ] || { + uci set "$CONFIG.$SECTION.xray_bin=$found" + uci commit "$CONFIG" + log "Xray найден: $found" + } + return 0 + fi + + log "Xray не найден ($configured), ставлю временный Xray в /tmp..." + install_xray_tmp } service_enabled() { @@ -404,7 +421,7 @@ run_xray() { enabled="$(uci_get enabled 0)" truthy "$enabled" || die "сервис выключен: включи option enabled '1'" - ensure_tmp_xray + ensure_xray_available xray_bin="$(xray_bin_path)" xray_config="$(render_client_config)" [ -x "$xray_bin" ] || die "xray не найден или не исполняемый: $xray_bin" @@ -544,7 +561,7 @@ status() { doctor() { local ok xray_bin ok=1 - ensure_tmp_xray + ensure_xray_available xray_bin="$(xray_bin_path)" [ -x "$xray_bin" ] || { diff --git a/files/www/cgi-bin/owrt-remote b/files/www/cgi-bin/owrt-remote index ff55679..cbdf97d 100644 --- a/files/www/cgi-bin/owrt-remote +++ b/files/www/cgi-bin/owrt-remote @@ -2,7 +2,7 @@ KEY_FILE="${KEY_FILE:-/etc/owrt-remote/web.key}" AGENT="${AGENT:-/usr/sbin/owrt-remote}" -OWRT_REMOTE_UI_VERSION="2026-06-29-xray-apply-v16" +OWRT_REMOTE_UI_VERSION="2026-06-30-mobile-header-xray-v17" PARAMS_FILE="${TMPDIR:-/tmp}/owrt-remote-cgi.$$" RESULT_TITLE="" RESULT_BODY="" @@ -305,14 +305,16 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr .notice{max-height:280px;overflow:auto;margin-top:16px;border-radius:8px;padding:12px;border:1px solid var(--line);background:rgba(255,255,255,.08);white-space:pre-wrap;overflow-wrap:anywhere;word-break:break-word;font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}.notice strong{display:block;margin-bottom:4px;font:700 14px/1.4 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}.notice.ok{border-color:rgba(34,197,94,.46);background:rgba(34,197,94,.12)}.notice.bad{border-color:rgba(251,113,133,.46);background:rgba(251,113,133,.12)}.notice.warn{border-color:rgba(245,158,11,.46);background:rgba(245,158,11,.12)} .code{background:rgba(255,255,255,.06);border:1px solid var(--line);color:var(--text);border-radius:8px;padding:12px;overflow:auto;overflow-wrap:anywhere;min-height:120px;white-space:pre-wrap;font:12px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)} .helperText{margin:0 0 12px;color:var(--muted)}.xrayApply{margin-top:14px;padding:14px;border:1px solid rgba(34,211,238,.42);border-radius:8px;background:linear-gradient(135deg,rgba(34,211,238,.16),rgba(124,58,237,.20),rgba(236,72,153,.11));box-shadow:0 18px 42px rgba(34,211,238,.10)}.xrayApply h3{margin:0 0 8px;font-size:16px;color:#a5f3fc}.scriptBox{width:100%;min-height:240px;resize:vertical;border:1px solid rgba(34,211,238,.28);border-radius:8px;background:rgba(8,5,18,.78);padding:12px;color:var(--text);font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre;overflow:auto} +.brandPanel{display:grid;grid-template-columns:repeat(2,minmax(0,132px));gap:8px}.brandPanel .titleRow,.brandPanel .links{grid-column:1/-1}.brandPanel .appBanner{width:100%;min-width:0}.brandPanel .links{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:0}.brandPanel .links a{width:100%;min-width:0} @media(max-width:820px){.grid,.formgrid,.metrics{grid-template-columns:1fr}.hero{align-items:flex-start;flex-direction:column}.topActions{justify-content:flex-start;padding-top:0}.wrap{padding:14px}h1{font-size:24px}.appBanner{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}.actions .btn,.actions button{width:100%}} +@media(max-width:820px){.brandPanel{grid-template-columns:repeat(2,minmax(0,1fr));width:100%}.brandPanel .appBanner{width:100%}}