diff --git a/Makefile b/Makefile index c8933f49..fb849fa2 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,6 @@ DEV_STACK_SERVICES ?= $(DEV_BASE_SERVICES) $(DEV_OPTIONAL_SERVICES) DEV_STACK_WAIT_SERVICES ?= $(DEV_STACK_SERVICES) rustfs-init openlist-init nextcloud-init seafile-init emby-init jellyfin-init DEV_WAIT_TIMEOUT ?= 120 DEV_LOG_TAIL ?= 100 -DEV_START_TIMEOUT ?= 120 CPU_COUNT ?= $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 1) DEV_JOBS ?= $(CPU_COUNT) CARGO_JOBS_ARGS ?= -j "$(DEV_JOBS)" @@ -48,9 +47,7 @@ DEV_SSRF_ALLOW_PRIVATE_NETWORK_TARGETS ?= false DEV_DATA_DIR := $(CURDIR)/.dev-data DEV_SOCKET := $(DEV_DATA_DIR)/run/synctv.sock -DEV_PID := $(DEV_DATA_DIR)/run/synctv.pid -DEV_LOG := $(DEV_DATA_DIR)/run/synctv.log -DEV_BIN ?= $(CURDIR)/target/debug/synctv +DEV_BIN ?= DEV_DATABASE_URL := postgresql://synctv:synctv@127.0.0.1:5432/synctv DEV_REDIS_URL := redis://127.0.0.1:6379 DEV_ROOT_USERNAME := root @@ -121,7 +118,7 @@ export SYNCTV_MANAGEMENT_TRANSPORT=unix; \ export SYNCTV_MANAGEMENT_UNIX_SOCKET_PATH="$(DEV_SOCKET)" endef -.PHONY: help clean compose-init compose-config compose-pull compose-up compose-down compose-logs compose-ps dev-check dev-env dev-up dev-stack dev-build release-build dev-serve dev-start dev-stop dev-down dev-clean dev-reset dev-data-reset dev-logs dev-ps dev-status dev-wait dev-shell dev-migrate dev-dropdb dev-db dev-redis dev-open dev-smoke fmt fmt-check check check-all-targets build-workspace proto-freshness feature-check feature-check-key-crates-tls-ring-webpki sqlx-prepare nextest nextest-default nextest-ignored doc-test clippy clippy-check install-cargo-audit audit audit-advisories install-cargo-deny deny-check deny-advisories deny-licenses deny-bans deny-sources install-cargo-udeps udeps cargo-workspace-version set-release-version validate-helm require-cross install-cross cross-linux-check cross-windows-check cross-darwin-check cross-linux-clippy cross-windows-clippy cross-darwin-clippy +.PHONY: help clean compose-init compose-config compose-pull compose-up compose-down compose-logs compose-ps dev-check dev-env dev-up dev-stack dev-build release-build dev-serve dev-down dev-clean dev-reset dev-data-reset dev-logs dev-ps dev-status dev-wait dev-shell dev-migrate dev-dropdb dev-db dev-redis dev-open dev-smoke fmt fmt-check check check-all-targets build-workspace proto-freshness feature-check feature-check-key-crates-tls-ring-webpki sqlx-prepare nextest nextest-default nextest-ignored doc-test clippy clippy-check install-cargo-audit audit audit-advisories install-cargo-deny deny-check deny-advisories deny-licenses deny-bans deny-sources install-cargo-udeps udeps cargo-workspace-version set-release-version validate-helm require-cross install-cross cross-linux-check cross-windows-check cross-darwin-check cross-linux-clippy cross-windows-clippy cross-darwin-clippy help: ## Show available targets. @awk 'BEGIN {FS = ":.*##"; printf "SyncTV targets:\n"} /^[a-zA-Z0-9_.-]+:.*##/ {printf " %-18s %s\n", $$1, $$2}' $(MAKEFILE_LIST) @@ -216,7 +213,7 @@ dev-stack: dev-up ## Start media, storage, and auth development dependencies aft @$(MAKE) dev-wait SERVICES="$(DEV_STACK_WAIT_SERVICES)" @$(MAKE) dev-env -dev-build: ## Build the local SyncTV binary used by background dev commands. +dev-build: ## Build the local SyncTV binary. SQLX_OFFLINE=true $(CARGO) build $(CARGO_BUILD_ARGS) -p synctv --bin synctv $(DEV_CARGO_FEATURE_ARGS) release-build: ## Build the optimized SyncTV release binary. @@ -224,69 +221,18 @@ release-build: ## Build the optimized SyncTV release binary. dev-serve: dev-up ## Run SyncTV locally with development defaults. mkdir -p "$(DEV_DATA_DIR)/run" - $(DEV_ENV_EXPORTS); \ - SQLX_OFFLINE=true $(CARGO) run $(CARGO_BUILD_ARGS) -p synctv --bin synctv $(DEV_CARGO_FEATURE_ARGS) -- serve - -dev-start: dev-up dev-build ## Start SyncTV in the background with development defaults. - @mkdir -p "$(DEV_DATA_DIR)/run" - @if [ -f "$(DEV_PID)" ] && kill -0 "$$(cat "$(DEV_PID)")" 2>/dev/null; then \ - printf "SyncTV already running with pid %s.\n" "$$(cat "$(DEV_PID)")"; \ - elif [ -S "$(DEV_SOCKET)" ] && "$(DEV_BIN)" --endpoint "unix://$(DEV_SOCKET)" system stats --output json >/dev/null 2>&1; then \ - printf "SyncTV already responding on %s.\n" "$(DEV_SOCKET)"; \ + @if [ -n "$(DEV_BIN)" ]; then \ + $(DEV_ENV_EXPORTS); \ + exec "$(DEV_BIN)" serve; \ else \ - rm -f "$(DEV_PID)" "$(DEV_SOCKET)"; \ $(DEV_ENV_EXPORTS); \ - nohup "$(DEV_BIN)" serve >"$(DEV_LOG)" 2>&1 < /dev/null & \ - pid="$$!"; \ - printf "%s\n" "$$pid" >"$(DEV_PID)"; \ - printf "Started SyncTV pid %s. Logs: %s\n" "$$pid" "$(DEV_LOG)"; \ - deadline=$$((SECONDS + $(DEV_START_TIMEOUT))); \ - until [ -S "$(DEV_SOCKET)" ] && "$(DEV_BIN)" --endpoint "unix://$(DEV_SOCKET)" system stats --output json >/dev/null 2>&1 && curl -fsS http://127.0.0.1:8081/health/ready >/dev/null; do \ - if ! kill -0 "$$pid" 2>/dev/null; then \ - printf "SyncTV exited during startup. Last log lines:\n"; \ - tail -n 80 "$(DEV_LOG)" || true; \ - exit 1; \ - fi; \ - if [ "$$SECONDS" -ge "$$deadline" ]; then \ - printf "Timed out waiting for SyncTV. Last log lines:\n"; \ - tail -n 80 "$(DEV_LOG)" || true; \ - exit 1; \ - fi; \ - sleep 2; \ - done; \ - printf "SyncTV ready at http://127.0.0.1:8080.\n"; \ + SQLX_OFFLINE=true exec $(CARGO) run $(CARGO_BUILD_ARGS) -p synctv --bin synctv $(DEV_CARGO_FEATURE_ARGS) -- serve; \ fi -dev-stop: ## Stop locally running SyncTV processes started by dev-serve/dev-start. - @if [ -S "$(DEV_SOCKET)" ] && [ -x "$(DEV_BIN)" ]; then \ - "$(DEV_BIN)" --endpoint "unix://$(DEV_SOCKET)" stop >/dev/null 2>&1 || true; \ - fi - @if [ -f "$(DEV_PID)" ]; then \ - pid="$$(cat "$(DEV_PID)")"; \ - if [ -n "$$pid" ] && kill -0 "$$pid" 2>/dev/null; then \ - for _ in $$(seq 1 20); do \ - kill -0 "$$pid" 2>/dev/null || break; \ - sleep 0.5; \ - done; \ - if kill -0 "$$pid" 2>/dev/null; then \ - kill "$$pid" 2>/dev/null || true; \ - fi; \ - printf "Stopped local SyncTV process: %s\n" "$$pid"; \ - fi; \ - fi - @pids="$$(pgrep -f '[/]synctv serve|[c]argo (\+nightly )?run -p synctv .* serve' || true)"; \ - if [ -n "$$pids" ]; then \ - kill $$pids; \ - printf "Stopped local SyncTV process(es): %s\n" "$$pids"; \ - elif [ ! -f "$(DEV_PID)" ]; then \ - printf "No local SyncTV process found.\n"; \ - fi; \ - rm -f "$(DEV_PID)" "$(DEV_SOCKET)" - -dev-down: dev-stop ## Stop development containers and keep volumes. +dev-down: ## Stop development containers and keep volumes. $(COMPOSE_DEV_PROFILES) down --remove-orphans -dev-clean: dev-stop ## Stop development containers and remove Compose volumes. +dev-clean: ## Stop development containers and remove Compose volumes. $(COMPOSE_DEV_PROFILES) down -v --remove-orphans dev-data-reset: ## Remove local .dev-data used by dev-serve. diff --git a/README.md b/README.md index cf64a49b..59195a39 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,6 @@ Development environment from a full repository checkout: # Starts PostgreSQL and Redis, then runs SyncTV locally with development settings. make dev-serve -# Starts SyncTV in the background with the same development settings. -make dev-start -make dev-stop - # Starts optional media/auth/storage dependencies too. make dev-stack diff --git a/README.zh-CN.md b/README.zh-CN.md index 672a0d22..68eec402 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -52,10 +52,6 @@ SyncTV 是使用 Rust 实现的实时同步观影平台，支持媒体 Provider # 启动 PostgreSQL 和 Redis，然后用开发配置在本机运行 SyncTV。 make dev-serve -# 使用同一套开发配置在后台启动 SyncTV。 -make dev-start -make dev-stop - # 同时启动媒体、认证和对象存储等可选依赖。 make dev-stack diff --git a/scripts/dev-e2e-smoke.sh b/scripts/dev-e2e-smoke.sh index fb8fb351..6b682afa 100755 --- a/scripts/dev-e2e-smoke.sh +++ b/scripts/dev-e2e-smoke.sh @@ -26,6 +26,7 @@ SMOKE_USER="devuser_$RUN_ID" SMOKE_ROOM="Smoke Room $RUN_ID" HTTP_PID="" +SYNCTV_PID="" trap 'rc=$?; printf "FAILED rc=%s line=%s command=%s\n" "$rc" "$LINENO" "$BASH_COMMAND" >&2' ERR @@ -42,7 +43,13 @@ cleanup() { if [ -n "${HTTP_PID:-}" ] && kill -0 "$HTTP_PID" 2>/dev/null; then kill "$HTTP_PID" 2>/dev/null || true fi - make dev-stop DEV_BIN="$BIN" >/dev/null 2>&1 || true + if [ -n "${SYNCTV_PID:-}" ] && kill -0 "$SYNCTV_PID" 2>/dev/null; then + cli stop >/dev/null 2>&1 || { + pkill -TERM -P "$SYNCTV_PID" 2>/dev/null || true + kill "$SYNCTV_PID" 2>/dev/null || true + } + wait "$SYNCTV_PID" 2>/dev/null || true + fi } trap cleanup EXIT @@ -93,8 +100,12 @@ start_stack() { start_synctv() { log "Starting SyncTV host server" mkdir -p "$RUN_DIR" "$RESULTS_DIR" - make dev-stop DEV_BIN="$BIN" >/dev/null 2>&1 || true - make dev-start DEV_BIN="$BIN" + if curl -fsS "$HEALTH_URL/health/ready" >/dev/null 2>&1 || \ + { [ -S "$RUN_DIR/synctv.sock" ] && cli system stats --output json >/dev/null 2>&1; }; then + die "SyncTV is already running; stop it before running the smoke test" + fi + make dev-serve DEV_BIN="$BIN" >"$RUN_DIR/synctv-smoke.log" 2>&1 & + SYNCTV_PID="$!" wait_socket wait_http "$HEALTH_URL/health/ready" }