diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index 9f0fafd..106f7ae 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -68,6 +68,38 @@ safe_id() { printf '%s' "$1" | tr -cs 'A-Za-z0-9._-' '-' } +normalize_url_base() { + local value + value="${1%/}" + printf '%s' "$value" +} + +json_unescape_basic() { + printf '%s' "$1" | sed 's/\\"/"/g; s/\\\\/\\/g' +} + +json_extract_object_string() { + local file object key compact value + file="$1" + object="$2" + key="$3" + compact="$(tr -d '\r\n' <"$file" 2>/dev/null || true)" + [ -n "$compact" ] || return 0 + value="$(printf '%s' "$compact" | sed -n "s/.*\"$object\"[[:space:]]*:[[:space:]]*{[^}]*\"$key\"[[:space:]]*:[[:space:]]*\"\\([^\"]*\\)\".*/\\1/p" | head -n 1)" + json_unescape_basic "$value" +} + +uci_set_if_changed() { + local key next current + key="$1" + next="$2" + [ -n "$next" ] || return 1 + current="$(uci_get "$key" '')" + [ "$current" = "$next" ] && return 1 + uci -q set "$CONFIG.$SECTION.$key=$next" >/dev/null 2>&1 || return 1 + return 0 +} + host_model() { if [ -r /tmp/sysinfo/model ]; then cat /tmp/sysinfo/model @@ -688,8 +720,69 @@ post_json() { die "для heartbeat нужен uclient-fetch, wget или curl" } +heartbeat_base_from_endpoint() { + printf '%s' "${1%/api/heartbeat}" +} + +heartbeat_emit_endpoint() { + local base marker + base="$(normalize_url_base "$1")" + [ -n "$base" ] || return 0 + marker="|$base|" + case "${HEARTBEAT_ENDPOINT_SEEN:-}" in + *"$marker"*) return 0 ;; + esac + HEARTBEAT_ENDPOINT_SEEN="${HEARTBEAT_ENDPOINT_SEEN:-}$marker" + printf '%s/api/heartbeat\n' "$base" +} + +heartbeat_candidate_endpoints() { + local hub_url public_url vps_host + HEARTBEAT_ENDPOINT_SEEN='|' + hub_url="$(uci_get hub_url '')" + public_url="$(uci_get public_url '')" + vps_host="$(uci_get vps_host '')" + heartbeat_emit_endpoint "$hub_url" + heartbeat_emit_endpoint "$public_url" + case "$vps_host" in + '') + ;; + http://*|https://*) + heartbeat_emit_endpoint "$vps_host" + ;; + *) + heartbeat_emit_endpoint "https://$vps_host" + heartbeat_emit_endpoint "http://$vps_host" + heartbeat_emit_endpoint "http://$vps_host:8088" + ;; + esac +} + +heartbeat_apply_hub_update() { + local response_file fallback_base next_hub_url next_public_url next_vps_host changed + response_file="$1" + fallback_base="$2" + next_hub_url="$(json_extract_object_string "$response_file" hub_update hub_url)" + next_public_url="$(json_extract_object_string "$response_file" hub_update public_url)" + next_vps_host="$(json_extract_object_string "$response_file" hub_update vps_host)" + [ -n "$next_hub_url" ] || next_hub_url="$fallback_base" + changed=0 + if uci_set_if_changed hub_url "$next_hub_url"; then + changed=1 + fi + if uci_set_if_changed public_url "$next_public_url"; then + changed=1 + fi + if uci_set_if_changed vps_host "$next_vps_host"; then + changed=1 + fi + [ "$changed" = "1" ] || return 0 + uci commit "$CONFIG" >/dev/null 2>&1 || true + log "heartbeat updated hub settings: hub_url=$(uci_get hub_url '') public_url=$(uci_get public_url '') vps_host=$(uci_get vps_host '')" +} + send_heartbeat() { - local hub_url token endpoint tmp event + local hub_url token endpoint tmp response event used fallback_base event="${1:-}" hub_url="$(uci_get hub_url '')" token="$(uci_get hub_token '')" @@ -698,9 +791,22 @@ send_heartbeat() { endpoint="${hub_url%/}/api/heartbeat" tmp="${TMPDIR:-/tmp}/owrt-remote-heartbeat.$$" + response="${TMPDIR:-/tmp}/owrt-remote-heartbeat.response.$$" heartbeat_json "$event" >"$tmp" - post_json "$endpoint" "$token" "$tmp" - rm -f "$tmp" + used=0 + for endpoint in $(heartbeat_candidate_endpoints); do + used=1 + if post_json "$endpoint" "$token" "$tmp" >"$response"; then + fallback_base="$(heartbeat_base_from_endpoint "$endpoint")" + heartbeat_apply_hub_update "$response" "$fallback_base" + cat "$response" + rm -f "$tmp" "$response" + return 0 + fi + done + rm -f "$tmp" "$response" + [ "$used" = "1" ] || die "hub_url/public_url/vps_host пустые" + return 1 } heartbeat_mark_ok() { diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index ccc5983..9a27b8d 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -569,6 +569,25 @@ def public_url_rp_id(public_url): return "" +def canonical_router_hub_update(router, app_public_url="", request_origin=""): + router = router or {} + app_origin = public_url_origin(app_public_url) + request_origin = public_url_origin(request_origin) + public_url = app_origin or public_url_origin(router.get("public_url", "")) + hub_url = public_url or request_origin + vps_host = str(router.get("vps_host") or "").strip() + if not vps_host and hub_url: + try: + vps_host = urllib.parse.urlsplit(hub_url).hostname or "" + except Exception: + vps_host = "" + return { + "hub_url": hub_url, + "public_url": public_url, + "vps_host": vps_host, + } + + def verify_password_login(username, password, otp=""): auth = load_auth() if not verify_login(username, password): @@ -2022,6 +2041,28 @@ def extract_hub_backup(archive_path, tmp_dir): tar.extractall(tmp_dir, members) +def rewrite_router_endpoints(conn, vps_host="", public_url=""): + rewritten = {} + next_vps_host = str(vps_host or "").strip() + next_public_url = str(public_url or "").strip() + ts = now_ts() + if next_vps_host: + conn.execute( + "update routers set vps_host = ?, updated_at = ? where deleted_at = 0", + (next_vps_host, ts), + ) + rewritten["vps_host"] = next_vps_host + if next_public_url: + conn.execute( + "update routers set public_url = ?, updated_at = ? where deleted_at = 0", + (next_public_url, ts), + ) + rewritten["public_url"] = next_public_url + if rewritten: + conn.commit() + return rewritten + + def restore_hub_backup(archive_path, db_path=DB_PATH, vps_host="", public_url=""): ensure_state() archive_path = Path(archive_path) @@ -2057,13 +2098,7 @@ def restore_hub_backup(archive_path, db_path=DB_PATH, vps_host="", public_url="" conn = connect(db_path) try: init_db(conn) - if vps_host: - conn.execute("update routers set vps_host = ?, updated_at = ?", (str(vps_host).strip(), now_ts())) - rewritten["vps_host"] = str(vps_host).strip() - if public_url: - conn.execute("update routers set public_url = ?, updated_at = ?", (str(public_url).strip(), now_ts())) - rewritten["public_url"] = str(public_url).strip() - conn.commit() + rewritten = rewrite_router_endpoints(conn, vps_host=vps_host, public_url=public_url) finally: conn.close() xray = None @@ -3128,6 +3163,7 @@ systemctl restart owrt-remote-xray +
@@ -6570,6 +6606,7 @@ const backupFile = document.getElementById('backupFile'); const backupVpsHost = document.getElementById('backupVpsHost'); const backupPublicUrl = document.getElementById('backupPublicUrl'); const backupRestore = document.getElementById('backupRestore'); +const backupRewrite = document.getElementById('backupRewrite'); const backupMsg = document.getElementById('backupMsg'); const authForm = document.getElementById('authForm'); const authUsernameField = authForm && authForm.elements ? authForm.elements.namedItem('username') : null; @@ -7347,6 +7384,39 @@ backupRestore.addEventListener('click', async () => {{ }} }}); +backupRewrite.addEventListener('click', async () => {{ + const vpsHost = backupVpsHost.value.trim(); + const publicUrl = backupPublicUrl.value.trim(); + if (!vpsHost && !publicUrl) {{ + setBackupMsg('Укажи новый VPS host/IP или Public URL для перепривязки роутеров.', true); + return; + }} + if (!confirm('Переписать endpoint-адреса у всех активных роутеров в Hub? Роутеры применят новые значения после следующего успешного heartbeat.')) return; + backupRewrite.disabled = true; + setBackupMsg('Переписываю endpoint-адреса роутеров в Hub...'); + try {{ + const res = await fetch('/api/routers/rewrite-endpoints', {{ + method: 'POST', + headers: {{'Content-Type': 'application/json'}}, + body: JSON.stringify({{ + vps_host: vpsHost, + public_url: publicUrl + }}) + }}); + const data = await res.json().catch(() => ({{}})); + if (!res.ok || !data.ok) throw new Error(data.error || res.status); + const changed = Object.keys(data.rewritten || {{}}).length + ? ' Переписано: ' + Object.entries(data.rewritten).map(([k, v]) => `${{k}}=${{v}}`).join(', ') + '.' + : ''; + setBackupMsg(`Роутеры перепривязаны в Hub.${{changed}} Активных роутеров: ${{Number(data.routers || 0)}}. После следующего heartbeat они подтянут новые адреса сами.`); + await loadRouters(); + }} catch (e) {{ + setBackupMsg('Перепривязка роутеров не удалась: ' + (e.message || e), true); + }} finally {{ + backupRewrite.disabled = false; + }} +}}); + notifyEnable.addEventListener('click', enableNotifications); notifyClear.addEventListener('click', async () => {{ if (!confirm('Очистить все уведомления?')) return; @@ -10540,6 +10610,29 @@ exit 127 except Exception as exc: self.send_json(400, {"ok": False, "error": str(exc)}) + def router_endpoints_rewrite(self): + try: + payload = self.read_payload() + vps_host = str(payload.get("vps_host") or "").strip() + public_url = str(payload.get("public_url") or "").strip() + if not vps_host and not public_url: + self.send_json(400, {"ok": False, "error": "vps_host or public_url is required"}) + return + with self.app.conn() as conn: + rewritten = rewrite_router_endpoints(conn, vps_host=vps_host, public_url=public_url) + total = conn.execute("select count(*) from routers where deleted_at = 0").fetchone()[0] + add_notification( + "router-endpoints-rewrite", + "Router endpoints updated", + "Hub updated router endpoint settings. Routers will pick up new values on the next successful heartbeat/fallback.", + "warn", + [], + {"rewritten": rewritten, "routers": total}, + ) + self.send_json(200, {"ok": True, "rewritten": rewritten, "routers": total}) + except Exception as exc: + self.send_json(400, {"ok": False, "error": str(exc)}) + def do_GET(self): path = self.parsed().path if path == "/health": @@ -10762,6 +10855,7 @@ exit 127 { "ok": True, "router": router, + "hub_update": canonical_router_hub_update(router, self.app.public_url, self.request_origin()), "xray_reload": xray_reload, "xray_restart": xray_restart, }, @@ -10841,6 +10935,9 @@ exit 127 if path == "/api/backup/restore": self.backup_restore() return + if path == "/api/routers/rewrite-endpoints": + self.router_endpoints_rewrite() + return if path == "/api/push/subscribe": try: payload = self.read_payload() @@ -11655,6 +11752,14 @@ def cmd_restore(args): print("Restart Hub after restore: systemctl restart owrt-remote") +def cmd_rewrite_endpoints(args): + with connect(args.db) as conn: + init_db(conn) + rewritten = rewrite_router_endpoints(conn, args.vps_host, args.public_url) + total = conn.execute("select count(*) from routers where deleted_at = 0").fetchone()[0] + print(json.dumps({"ok": True, "rewritten": rewritten, "routers": total}, ensure_ascii=False, indent=2)) + + def parse_extra_ports(value): ports = [] for item in str(value or "").replace(";", ",").split(","): @@ -11821,6 +11926,11 @@ def parser(): restore.add_argument("--public-url", default="", help="rewrite routers to new public Hub URL") restore.set_defaults(func=cmd_restore) + rewrite = sub.add_parser("rewrite-endpoints", help="rewrite active router endpoint settings in Hub DB") + rewrite.add_argument("--vps-host", default="", help="new VPS host/IP for active routers") + rewrite.add_argument("--public-url", default="", help="new public Hub URL for active routers") + rewrite.set_defaults(func=cmd_rewrite_endpoints) + serve = sub.add_parser("serve", help="run web dashboard") serve.add_argument("--host", default=os.environ.get("OWRT_REMOTE_BIND", "0.0.0.0")) serve.add_argument("--port", type=int, default=int(os.environ.get("OWRT_REMOTE_PORT", "8088")))