This commit is contained in:
eric
2026-03-29 02:33:37 -05:00
parent 16dc9abbbb
commit ef87c43b33
17 changed files with 1197 additions and 407 deletions

View File

@@ -95,12 +95,6 @@ SERVICE_SPECS: tuple[ServiceSpec, ...] = (
"browser",
"可选Docker 内嵌 Chromium 桌面,适合远程开 YouTube StudioENABLE_NEKO=1 时安装",
),
ServiceSpec(
"neko_firefox",
"Neko Firefox (第二桌面)",
"browser",
"可选:第二套 Neko 桌面Firefoxarm64/x86 多架构ENABLE_NEKO_FF=1口令与 Chromium 相同",
),
ServiceSpec(
"android_gateway",
"Android Gateway",
@@ -583,8 +577,6 @@ async def stack_stream_probes() -> dict[str, Any]:
srs_p = int(env.get("SRS_HTTP_PORT", "8080") or 8080)
srs_api_p = int(env.get("SRS_API_PORT", "1985") or 1985)
neko_p = int(env.get("NEKO_HTTP_PORT", "9200") or 9200)
neko_ff_on = env.get("ENABLE_NEKO_FF", "0") == "1"
neko_ff_p = int(env.get("NEKO_FF_HTTP_PORT", "9201") or 9201)
loop = asyncio.get_event_loop()
def run_srs() -> dict[str, Any]:
@@ -609,18 +601,6 @@ async def stack_stream_probes() -> dict[str, Any]:
http = _probe_http_get(f"http://127.0.0.1:{neko_p}/", timeout=2.5)
return {"port": neko_p, "tcp": tcp, "http": http}
def run_neko_ff() -> dict[str, Any]:
tcp = _probe_tcp_port("127.0.0.1", neko_ff_p)
http = _probe_http_get(f"http://127.0.0.1:{neko_ff_p}/", timeout=2.5)
return {"port": neko_ff_p, "tcp": tcp, "http": http}
if neko_ff_on:
srs_d, neko_d, neko_ff_d = await asyncio.gather(
loop.run_in_executor(None, run_srs),
loop.run_in_executor(None, run_neko),
loop.run_in_executor(None, run_neko_ff),
)
return {"srs": srs_d, "neko": neko_d, "neko_firefox": neko_ff_d}
srs_d, neko_d = await asyncio.gather(
loop.run_in_executor(None, run_srs),
loop.run_in_executor(None, run_neko),
@@ -642,8 +622,6 @@ def stack_summary() -> dict:
android_panel = env.get("ANDROID_PANEL_PORT", "5000")
chrome_dbg = env.get("BROWSER_REMOTE_DEBUG_PORT", "9222")
neko_port = env.get("NEKO_HTTP_PORT", "9200")
neko_ff_port = env.get("NEKO_FF_HTTP_PORT", "9201")
neko_ff_on = env.get("ENABLE_NEKO_FF", "0") == "1"
ql: dict[str, str] = {
"control_plane": f"http://{mdns_host}:{web_port}",
"webtty": f"http://{mdns_host}:{webtty}",
@@ -655,8 +633,6 @@ def stack_summary() -> dict:
"chromium_remote_debug": f"http://{mdns_host}:{chrome_dbg}",
"neko_browser": f"http://{mdns_host}:{neko_port}",
}
if neko_ff_on:
ql["neko_firefox_browser"] = f"http://{mdns_host}:{neko_ff_port}"
return {
"hostname": hostname,
"mdns_host": mdns_host,
@@ -679,7 +655,6 @@ def stack_summary() -> dict:
" WebRTC 需 NEKO_WEBRTC_NAT1TO1 为板子局域网 IP并放行 UDP 端口段。"
),
},
"neko_firefox_enabled": neko_ff_on,
"quick_links": ql,
}