fix: 修复实时监看按需拉流循环等待 (#54)

Sense/server/app/sense/liveview/service.go

@@ -47,6 +47,7 @@ type Service struct {
 	base     *url.URL
 	ttl      time.Duration
 	route    func(context.Context, string) (media.Route, error)
+	refresh  func(context.Context, string) (media.Route, error)
 	routes   func(context.Context) ([]media.Route, error)
 	mu       sync.RWMutex
 	sessions map[string]Session
@@ -64,7 +65,7 @@ func NewService(rawBase string, ttl time.Duration) (*Service, error) {
 	if ttl <= 0 || ttl > 10*time.Minute {
 		ttl = 2 * time.Minute
 	}
-	return &Service{base: parsed, ttl: ttl, route: media.PlaybackRoute, routes: media.PlaybackRoutes, sessions: map[string]Session{}, now: time.Now}, nil
+	return &Service{base: parsed, ttl: ttl, route: media.PlaybackRoute, refresh: media.RefreshPlaybackRoute, routes: media.PlaybackRoutes, sessions: map[string]Session{}, now: time.Now}, nil
 }
 func (s *Service) Routes(ctx context.Context) ([]Route, error) {
 	items, err := s.routes(ctx)
@@ -117,7 +118,7 @@ func (s *Service) Get(ctx context.Context, owner, id string) (Session, error) {
 	if !ok || session.OwnerID != owner || !s.now().Before(session.ExpiresAt) {
 		return Session{}, fmt.Errorf("playback session expired")
 	}
-	route, err := s.route(ctx, session.RouteID)
+	route, err := s.refresh(ctx, session.RouteID)
 	if err != nil {
 		return Session{}, err
 	}

Sense/server/app/sense/liveview/service_test.go

@@ -44,3 +44,27 @@ func TestTTLIsBounded(t *testing.T) {
 		t.Fatalf("ttl=%v", service.ttl)
 	}
 }
+
+func TestSessionPollRefreshesOnDemandMediaState(t *testing.T) {
+	service, err := NewService("http://127.0.0.1:8889", time.Minute)
+	if err != nil {
+		t.Fatal(err)
+	}
+	route := media.Route{ID: "device:main", DeviceID: "device", ProfileToken: "main", Path: "sense_device_main", Desired: "running", Actual: "waiting"}
+	service.route = func(context.Context, string) (media.Route, error) { return route, nil }
+	service.refresh = func(context.Context, string) (media.Route, error) {
+		updated := route
+		updated.Actual = "ready"
+		updated.Detail = "上游拉流正常"
+		updated.Readers = 1
+		return updated, nil
+	}
+	session, err := service.Create(context.Background(), "owner", route.ID)
+	if err != nil || session.Status != "waiting" || session.PlayerURL == "" {
+		t.Fatalf("session=%#v err=%v", session, err)
+	}
+	updated, err := service.Get(context.Background(), "owner", session.ID)
+	if err != nil || updated.Status != "ready" || updated.Detail != "上游拉流正常" {
+		t.Fatalf("updated=%#v err=%v", updated, err)
+	}
+}