fix: rebuild native fnOS package with fnpack

fnos/cmd/main

@@ -2,7 +2,7 @@
 set -u
 
 PACKAGE_ROOT=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
-APP_ROOT="${TRIM_APPDEST:-$PACKAGE_ROOT}"
+APP_ROOT="${TRIM_APPDEST:-$PACKAGE_ROOT/app}"
 DATA_ROOT="${TRIM_PKGVAR:-$PACKAGE_ROOT/var}"
 VOLUME_ROOT="${TRIM_APPDEST_VOL:-$DATA_ROOT/volume}"
 RECORD_ROOT="${LIVE_RECORDER_RECORD_ROOT:-$VOLUME_ROOT/@appshare/liverecorder/records}"
@@ -10,6 +10,10 @@ RUNTIME_ROOT="$APP_ROOT/runtime"
 SERVER="$APP_ROOT/server/LiveRecorder.WebApi"
 PG_BIN="$RUNTIME_ROOT/usr/lib/postgresql/15/bin"
 PG_SHARE="$RUNTIME_ROOT/usr/share/postgresql/15"
+PG_LIB="$RUNTIME_ROOT/usr/lib/postgresql/15/lib"
+NODE_BIN="$RUNTIME_ROOT/bin/node"
+CURL_BIN="$RUNTIME_ROOT/bin/curl"
+CA_BUNDLE="$RUNTIME_ROOT/etc/ssl/certs/ca-certificates.crt"
 PG_DATA="$DATA_ROOT/postgres"
 RUN_ROOT="$DATA_ROOT/run"
 LOG_ROOT="$DATA_ROOT/log"
@@ -19,7 +23,9 @@ PG_LOG="$LOG_ROOT/postgresql.log"
 ADMIN_PASSWORD_FILE="$DATA_ROOT/admin-password.seed"
 PG_PORT="${LIVE_RECORDER_POSTGRES_PORT:-54329}"
 SERVICE_PORT="${TRIM_SERVICE_PORT:-18080}"
-RUNTIME_LIBRARY_PATH="$RUNTIME_ROOT/lib/x86_64-linux-gnu:$RUNTIME_ROOT/usr/lib/x86_64-linux-gnu:$RUNTIME_ROOT/usr/lib/x86_64-linux-gnu/pulseaudio:$RUNTIME_ROOT/usr/lib/x86_64-linux-gnu/blas:$RUNTIME_ROOT/usr/lib/x86_64-linux-gnu/lapack:$RUNTIME_ROOT/usr/lib/postgresql/15/lib"
+SYSTEM_PATH="${PATH:-/usr/local/bin:/usr/bin:/bin}"
+RUNTIME_PATH="$RUNTIME_ROOT/bin:$SYSTEM_PATH"
+RUNTIME_LIBRARY_PATH="$RUNTIME_ROOT/lib:$PG_LIB"
 
 log_message() {
     mkdir -p "$LOG_ROOT"
@@ -38,11 +44,26 @@ app_pid() {
 }
 
 run_pg() {
-    env LD_LIBRARY_PATH="$RUNTIME_LIBRARY_PATH" PATH="$PG_BIN:$RUNTIME_ROOT/usr/bin:/usr/bin:/bin" "$@"
+    env LD_LIBRARY_PATH="$RUNTIME_LIBRARY_PATH" PATH="$PG_BIN:$RUNTIME_PATH" "$@"
 }
 
 run_native() {
-    env LD_LIBRARY_PATH="$RUNTIME_LIBRARY_PATH" PATH="$RUNTIME_ROOT/usr/bin:/usr/bin:/bin" "$@"
+    env LD_LIBRARY_PATH="$RUNTIME_LIBRARY_PATH" PATH="$RUNTIME_PATH" \
+        SSL_CERT_FILE="$CA_BUNDLE" CURL_CA_BUNDLE="$CA_BUNDLE" "$@"
+}
+
+system_media_tools_available() {
+    missing_tools=""
+    for tool_name in ffmpeg ffprobe; do
+        if ! PATH="$SYSTEM_PATH" command -v "$tool_name" >/dev/null 2>&1; then
+            missing_tools="$missing_tools $tool_name"
+        fi
+    done
+    if [ -n "$missing_tools" ]; then
+        log_message "缺少 fnOS 系统媒体工具：${missing_tools# }。请先在系统环境中安装 FFmpeg（必须同时提供 ffmpeg 与 ffprobe）。"
+        return 1
+    fi
+    return 0
 }
 
 postgres_running() {
@@ -107,7 +128,13 @@ start_postgres() {
 
 stop_postgres() {
     if postgres_running; then
-        run_pg "$PG_BIN/pg_ctl" -D "$PG_DATA" -m fast -w stop >>"$PG_LOG" 2>&1 || true
+        # A first-run migration can dirty enough pages that a NAS needs more
+        # than pg_ctl's 60-second default to finish the shutdown checkpoint.
+        # Do not let restart race a database that is still shutting down.
+        if ! run_pg "$PG_BIN/pg_ctl" -D "$PG_DATA" -m fast -t 180 -w stop >>"$PG_LOG" 2>&1; then
+            log_message "PostgreSQL 未能在 180 秒内安全停止，已取消后续重启。"
+            return 1
+        fi
     fi
 }
 
@@ -126,7 +153,9 @@ launch_app_process() {
         export XDG_CACHE_HOME="$DATA_ROOT/cache"
         export TMPDIR="$DATA_ROOT/tmp"
         export LD_LIBRARY_PATH="$RUNTIME_LIBRARY_PATH"
-        export PATH="$RUNTIME_ROOT/usr/bin:/usr/bin:/bin"
+        export PATH="$RUNTIME_PATH"
+        export SSL_CERT_FILE="$CA_BUNDLE"
+        export CURL_CA_BUNDLE="$CA_BUNDLE"
         mkdir -p "$XDG_CACHE_HOME" "$TMPDIR"
         cd "$APP_ROOT/server" || exit 1
         exec "$SERVER"
@@ -143,10 +172,11 @@ start_app() {
         log_message "应用程序不存在或不可执行：$SERVER"
         return 1
     fi
-    if [ ! -x "$PG_BIN/postgres" ] || [ ! -x "$RUNTIME_ROOT/usr/bin/ffmpeg" ] || [ ! -x "$RUNTIME_ROOT/usr/bin/node" ]; then
+    if [ ! -x "$PG_BIN/postgres" ] || [ ! -x "$NODE_BIN" ] || [ ! -x "$CURL_BIN" ] || [ ! -s "$CA_BUNDLE" ]; then
         log_message "FPK 原生运行环境不完整。"
         return 1
     fi
+    system_media_tools_available || return 1
     if pid=$(app_pid); then
         log_message "应用已运行，PID $pid。"
         return 0
@@ -160,7 +190,7 @@ start_app() {
 
     attempt=0
     while [ "$attempt" -lt 90 ]; do
-        if run_native "$RUNTIME_ROOT/usr/bin/curl" -fsS "http://127.0.0.1:$SERVICE_PORT/health/ready" >/dev/null 2>&1; then
+        if run_native "$CURL_BIN" -fsS "http://127.0.0.1:$SERVICE_PORT/health/ready" >/dev/null 2>&1; then
             rm -f "$ADMIN_PASSWORD_FILE"
             log_message "应用启动成功，PID $pid，端口 $SERVICE_PORT。"
             return 0
@@ -203,7 +233,7 @@ stop_app() {
 case "${1:-status}" in
     start) start_app ;;
     stop) stop_app ;;
-    restart) stop_app; start_app ;;
+    restart) stop_app && start_app ;;
     status)
         if app_pid >/dev/null && postgres_running; then
             exit 0

fnos/manifest

@@ -1,13 +1,12 @@
 appname=liverecorder
-version=1.0.0
+version=1.0.1
 display_name=Live Recorder
-desc=原生自包含直播录制系统，内置 PostgreSQL、FFmpeg、Node.js 和 Web 管理界面，支持分片录制、弹幕采集与 OpenList 自动上传
+desc=原生直播录制系统，离线内置 PostgreSQL、Node.js 和 Web 管理界面，支持分片录制、弹幕采集与 OpenList 自动上传
 platform=x86
 source=thirdparty
 maintainer=Live Recorder Contributors
 os_min_version=1.2.0
 desktop_uidir=ui
 desktop_applaunchname=liverecorder.Application
-checksum=@CHECKSUM@
 checkport=true
 ctl_stop=true