feat: 实现配置校验与运维命令及优雅停机

cmd/nixmsg/serve.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net"
 	"net/http"
 	"os"
 	"os/signal"
 	"path/filepath"
+	"strings"
 	"syscall"
 	"time"
 
@@ -23,6 +25,12 @@ func cmdServe(_ []string) error {
 	if err != nil {
 		return err
 	}
+	// P-WIRE-BEGIN
+	if err := cfg.Validate(); err != nil {
+		return err
+	}
+	setupJSONLogger(cfg.Log)
+	// P-WIRE-END
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer stop()
 	return runServe(ctx, cfg)
@@ -41,6 +49,16 @@ func runServe(ctx context.Context, cfg config.Config) error {
 	}
 	defer func() { _ = db.Close() }()
 
+	// P-WIRE-BEGIN
+	ok, err := store.HasAdminPassword(ctx, db.Write)
+	if err != nil {
+		return err
+	}
+	if !ok {
+		return errors.New("admin password not initialized; run: nixmsg admin init")
+	}
+	// P-WIRE-END
+
 	// 启动恢复入口已挂上（假实现为空操作）；M 线替换 message.Service 后生效。
 	if recoverErr := deps.Messages.RecoverOnStart(ctx); recoverErr != nil {
 		return fmt.Errorf("message recover: %w", recoverErr)
@@ -62,6 +80,17 @@ func runServe(ctx context.Context, cfg config.Config) error {
 		w.WriteHeader(http.StatusOK)
 		_, _ = w.Write([]byte("ok"))
 	})
+	// P-WIRE-BEGIN
+	mux.HandleFunc("GET /readyz", func(w http.ResponseWriter, r *http.Request) {
+		if readyErr := db.Ready(r.Context()); readyErr != nil {
+			slog.Error("readyz failed", "err", readyErr)
+			http.Error(w, "not ready", http.StatusServiceUnavailable)
+			return
+		}
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("ok"))
+	})
+	// P-WIRE-END
 	// 确保前端资源被链接进二进制；完整静态托管由后续任务完善。
 	_ = web.Dist()
 
@@ -87,9 +116,17 @@ func runServe(ctx context.Context, cfg config.Config) error {
 
 	select {
 	case <-ctx.Done():
-		shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		// P-WIRE-BEGIN
+		// 先停止接受新连接，再等写队列最多 10 秒，然后断开并退出。
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 		defer cancel()
 		_ = srv.Shutdown(shutdownCtx)
+		drainCtx, drainCancel := context.WithTimeout(context.Background(), 10*time.Second)
+		defer drainCancel()
+		if drainErr := db.Queue.Drain(drainCtx); drainErr != nil && !errors.Is(drainErr, context.DeadlineExceeded) {
+			slog.Error("write queue drain", "err", drainErr)
+		}
+		// P-WIRE-END
 		serveErr := <-errCh
 		if serveErr != nil && !errors.Is(serveErr, http.ErrServerClosed) {
 			return serveErr
@@ -107,3 +144,20 @@ func writeListenAddr(dataDir, addr string) error {
 	path := filepath.Join(dataDir, "listen.addr")
 	return os.WriteFile(path, []byte(addr+"\n"), 0o644)
 }
+
+// P-WIRE-BEGIN
+func setupJSONLogger(cfg config.LogConfig) {
+	level := slog.LevelInfo
+	switch strings.ToLower(strings.TrimSpace(cfg.Level)) {
+	case "debug":
+		level = slog.LevelDebug
+	case "warn", "warning":
+		level = slog.LevelWarn
+	case "error":
+		level = slog.LevelError
+	}
+	h := slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})
+	slog.SetDefault(slog.New(h))
+}
+
+// P-WIRE-END