From 65798d01b688abd782e7149ff37db3e0e9a46014 Mon Sep 17 00:00:00 2001 From: ila <2+ila@noreply.git.ilapage.cn> Date: Thu, 13 Aug 2026 12:23:45 +0800 Subject: [PATCH] feat: complete split camera credentials (#50) --- Sense/server/app/sense/admission/service.go | 48 +++++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/Sense/server/app/sense/admission/service.go b/Sense/server/app/sense/admission/service.go index d980b2b..674ce1f 100644 --- a/Sense/server/app/sense/admission/service.go +++ b/Sense/server/app/sense/admission/service.go @@ -5,7 +5,6 @@ import ( "fmt" "sort" "strings" - "sync" "time" "yovision.local/sense/app/sense/adapters/onvif" @@ -37,13 +36,16 @@ type Service struct { rtsp rtsp.Verifier discoveryIP string discoveryTimeout time.Duration - mu sync.RWMutex - results map[string]Result + store Store now func() time.Time } -func NewService(client onvif.Client, verifier rtsp.Verifier, discoveryIP string) *Service { - return &Service{onvif: client, rtsp: verifier, discoveryIP: discoveryIP, discoveryTimeout: 3 * time.Second, results: map[string]Result{}, now: time.Now} +func NewService(client onvif.Client, verifier rtsp.Verifier, discoveryIP string, stores ...Store) *Service { + var store Store = NewMemoryStore() + if len(stores) > 0 && stores[0] != nil { + store = stores[0] + } + return &Service{onvif: client, rtsp: verifier, discoveryIP: discoveryIP, discoveryTimeout: 3 * time.Second, store: store, now: time.Now} } func (s *Service) Discover(ctx context.Context) ([]string, error) { if strings.TrimSpace(s.discoveryIP) == "" { @@ -52,21 +54,25 @@ func (s *Service) Discover(ctx context.Context) ([]string, error) { return onvif.Discover(ctx, s.discoveryIP, s.discoveryTimeout) } func (s *Service) Probe(ctx context.Context, actor identity.Principal, deviceID, address string) (Result, error) { - credential, err := device.ReadCredential(ctx, deviceID) + onvifCredential, err := device.ReadONVIFCredential(ctx, deviceID) if err != nil { return Result{}, fmt.Errorf("credential_required") } - profiles, err := s.onvif.Profiles(ctx, address, onvif.Credential{Username: credential.Username, Password: credential.Password}) + profiles, err := s.onvif.Profiles(ctx, address, onvif.Credential{Username: onvifCredential.Username, Password: onvifCredential.Password}) if err != nil { status, detail := classify(err) result := Result{DeviceID: deviceID, Address: address, Status: status, Detail: detail, CheckedAt: s.now().UTC()} - s.save(result) + _ = s.store.Save(ctx, result) identity.RecordAudit(ctx, actor.UserID, "admission.probe", deviceID, "failure", map[string]any{"status": status}) return result, nil } + rtspCredential, err := device.ReadRTSPCredential(ctx, deviceID) + if err != nil { + return Result{}, fmt.Errorf("rtsp_credential_required") + } items := make([]Profile, 0, len(profiles)) for _, profile := range profiles { - verification, verifyErr := s.rtsp.Verify(ctx, profile.StreamURI, rtsp.Credential{Username: credential.Username, Password: credential.Password}) + verification, verifyErr := s.rtsp.Verify(ctx, profile.StreamURI, rtsp.Credential{Username: rtspCredential.Username, Password: rtspCredential.Password}) if verifyErr != nil { verification = rtsp.Result{Status: "failed", Detail: "视频地址格式不正确"} } @@ -89,20 +95,23 @@ func (s *Service) Probe(ctx context.Context, actor identity.Principal, deviceID, } } result := Result{DeviceID: deviceID, Address: address, Status: status, Detail: detail, Profiles: items, CheckedAt: s.now().UTC()} - s.save(result) + if err := s.store.Save(ctx, result); err != nil { + return Result{}, err + } + for _, item := range items { + if item.Verification.Status == "ready" { + if err := device.MarkActive(ctx, deviceID); err != nil { + return Result{}, err + } + break + } + } identity.RecordAudit(ctx, actor.UserID, "admission.probe", deviceID, "success", map[string]any{"profile_count": len(items), "status": status}) return result, nil } func (s *Service) Get(deviceID string) (Result, bool) { - s.mu.RLock() - defer s.mu.RUnlock() - value, ok := s.results[deviceID] - return value, ok -} -func (s *Service) save(result Result) { - s.mu.Lock() - defer s.mu.Unlock() - s.results[result.DeviceID] = result + value, err := s.store.Get(context.Background(), deviceID) + return value, err == nil } func classify(err error) (string, string) { value := strings.ToLower(err.Error()) @@ -117,3 +126,4 @@ func classify(err error) (string, string) { return "unreachable", "无法读取设备信息,请检查地址和网络" } } +