重构 Nginx 管理器和同步服务，添加运行时确保功能，更新相关测试用例和文档

atsf_agent/internal/sync/service.go

@@ -3,7 +3,6 @@ package sync
 import (
 	"context"
 
-	"atsflare-agent/internal/nginx"
 	"atsflare-agent/internal/protocol"
 	"atsflare-agent/internal/state"
 )
@@ -18,13 +17,19 @@ type ConfigClient interface {
 	ReportApplyLog(ctx context.Context, payload protocol.ApplyLogPayload) error
 }
 
+type NginxManager interface {
+	Apply(ctx context.Context, content string) error
+	EnsureRuntime(ctx context.Context, recreate bool) error
+	CurrentChecksum() (string, error)
+}
+
 type Service struct {
 	client       ConfigClient
-	nginxManager *nginx.Manager
+	nginxManager NginxManager
 	stateStore   *state.Store
 }
 
-func New(client ConfigClient, nginxManager *nginx.Manager, stateStore *state.Store) *Service {
+func New(client ConfigClient, nginxManager NginxManager, stateStore *state.Store) *Service {
 	return &Service{
 		client:       client,
 		nginxManager: nginxManager,
@@ -33,6 +38,14 @@ func New(client ConfigClient, nginxManager *nginx.Manager, stateStore *state.Sto
 }
 
 func (s *Service) SyncOnce(ctx context.Context) error {
+	return s.sync(ctx, false)
+}
+
+func (s *Service) SyncOnStartup(ctx context.Context) error {
+	return s.sync(ctx, true)
+}
+
+func (s *Service) sync(ctx context.Context, startup bool) error {
 	snapshot, err := s.stateStore.Load()
 	if err != nil {
 		return err
@@ -41,7 +54,22 @@ func (s *Service) SyncOnce(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	if snapshot.CurrentVersion == config.Version && snapshot.CurrentChecksum == config.Checksum {
+	currentChecksum, err := s.nginxManager.CurrentChecksum()
+	if err != nil {
+		return err
+	}
+	if currentChecksum == config.Checksum {
+		if startup {
+			if err = s.nginxManager.EnsureRuntime(ctx, true); err != nil {
+				return err
+			}
+		}
+		snapshot.CurrentVersion = config.Version
+		snapshot.CurrentChecksum = config.Checksum
+		snapshot.LastError = ""
+		return s.stateStore.Save(snapshot)
+	}
+	if snapshot.CurrentVersion == config.Version && snapshot.CurrentChecksum == config.Checksum && !startup {
 		return nil
 	}
 	if err = s.nginxManager.Apply(ctx, config.RenderedConfig); err != nil {

atsf_agent/internal/sync/service_test.go

@@ -22,6 +22,14 @@ type fakeClient struct {
 	reports []protocol.ApplyLogPayload
 }
 
+type fakeManager struct {
+	applyErr           error
+	currentChecksum    string
+	currentChecksumErr error
+	ensureCalls        []bool
+	applyContents      []string
+}
+
 func (f *fakeExecutor) Test(ctx context.Context) error {
 	return f.testErr
 }
@@ -30,6 +38,10 @@ func (f *fakeExecutor) Reload(ctx context.Context) error {
 	return f.reloadErr
 }
 
+func (f *fakeExecutor) EnsureRuntime(ctx context.Context, recreate bool) error {
+	return nil
+}
+
 func (f *fakeClient) GetActiveConfig(ctx context.Context) (*protocol.ActiveConfigResponse, error) {
 	return &f.config, nil
 }
@@ -39,6 +51,20 @@ func (f *fakeClient) ReportApplyLog(ctx context.Context, payload protocol.ApplyL
 	return nil
 }
 
+func (m *fakeManager) Apply(ctx context.Context, content string) error {
+	m.applyContents = append(m.applyContents, content)
+	return m.applyErr
+}
+
+func (m *fakeManager) EnsureRuntime(ctx context.Context, recreate bool) error {
+	m.ensureCalls = append(m.ensureCalls, recreate)
+	return nil
+}
+
+func (m *fakeManager) CurrentChecksum() (string, error) {
+	return m.currentChecksum, m.currentChecksumErr
+}
+
 func TestSyncOnceSuccess(t *testing.T) {
 	client := &fakeClient{
 		config: protocol.ActiveConfigResponse{
@@ -148,3 +174,41 @@ func TestSyncOnceRollbackOnNginxFailure(t *testing.T) {
 		t.Fatal("expected failed apply report to be sent")
 	}
 }
+
+func TestSyncOnStartupRecreatesRuntimeWhenChecksumMatches(t *testing.T) {
+	client := &fakeClient{
+		config: protocol.ActiveConfigResponse{
+			Version:        "20260309-003",
+			Checksum:       "checksum-3",
+			RenderedConfig: "server { listen 82; }",
+			CreatedAt:      time.Now().Format(time.RFC3339),
+		},
+	}
+	stateStore := state.NewStore(filepath.Join(t.TempDir(), "state.json"))
+	nodeID, err := stateStore.EnsureNodeID()
+	if err != nil {
+		t.Fatalf("EnsureNodeID failed: %v", err)
+	}
+	if err = stateStore.Save(&state.Snapshot{NodeID: nodeID}); err != nil {
+		t.Fatalf("failed to seed state: %v", err)
+	}
+
+	manager := &fakeManager{currentChecksum: "checksum-3"}
+	service := New(client, manager, stateStore)
+	if err = service.SyncOnStartup(context.Background()); err != nil {
+		t.Fatalf("SyncOnStartup failed: %v", err)
+	}
+	if len(manager.ensureCalls) != 1 || !manager.ensureCalls[0] {
+		t.Fatal("expected startup sync to recreate runtime")
+	}
+	if len(client.reports) != 0 {
+		t.Fatal("expected no apply report when checksum already matches")
+	}
+	snapshot, err := stateStore.Load()
+	if err != nil {
+		t.Fatalf("failed to load state: %v", err)
+	}
+	if snapshot.CurrentChecksum != "checksum-3" || snapshot.CurrentVersion != "20260309-003" {
+		t.Fatal("expected snapshot to be refreshed from active config")
+	}
+}