stream.place
Live video on the AT Protocol
live-dashboard: first pass at visual changes for pre-live
+27
-5
js/app/components/live-dashboard/livestream-panel.tsx
+27
-5
js/app/components/live-dashboard/livestream-panel.tsx
···
209
const userIsLive = useLiveUser();
210
const captureFrame = useCaptureVideoFrame();
211
const profile = useUserProfile();
212
-
const livestream = useLivestream();
213
const createStreamRecord = useCreateStreamRecord();
214
const updateStreamRecord = useUpdateStreamRecord();
215
const endLivestream = useEndLivestream();
216
const url = useUrl();
217
218
const [title, setTitle] = useState("");
219
const [loading, setLoading] = useState(false);
···
352
353
const handleEndLivestream = useCallback(async () => {
354
if (!livestream) return;
355
-
await endLivestream(livestream);
356
}, [livestream, endLivestream]);
357
358
const handleImageSelect = useCallback(() => {
359
// Default web file picker behavior
···
418
showsVerticalScrollIndicator: false,
419
}
420
: {};
421
422
return (
423
<>
···
668
</Text>
669
</Button>
670
<Button
671
-
variant="destructive"
672
onPress={handleEndLivestream}
673
style={[
674
r.md,
675
py[3],
676
w.percent[100],
677
layout.flex.center,
678
-
{ opacity: disabled ? 0.5 : 1 },
679
]}
680
>
681
<Text
682
style={[text.white, { fontSize: 16, fontWeight: "bold" }]}
683
>
684
-
End Livestream
685
</Text>
686
</Button>
687
</View>
···
209
const userIsLive = useLiveUser();
210
const captureFrame = useCaptureVideoFrame();
211
const profile = useUserProfile();
212
+
const livestream = useLivestream(true);
213
const createStreamRecord = useCreateStreamRecord();
214
const updateStreamRecord = useUpdateStreamRecord();
215
const endLivestream = useEndLivestream();
216
const url = useUrl();
217
+
const [endingLivestream, setEndingLivestream] = useState(false);
218
219
const [title, setTitle] = useState("");
220
const [loading, setLoading] = useState(false);
···
353
354
const handleEndLivestream = useCallback(async () => {
355
if (!livestream) return;
356
+
setEndingLivestream(true);
357
+
try {
358
+
await endLivestream(livestream);
359
+
} catch (error) {
360
+
console.error("Error ending livestream:", error);
361
+
toast.show("Error", "Failed to end livestream", {
362
+
duration: 3,
363
+
});
364
+
}
365
}, [livestream, endLivestream]);
366
+
367
+
useEffect(() => {
368
+
if (livestream && livestream.record.endedAt !== undefined) {
369
+
setEndingLivestream(false);
370
+
}
371
+
}, [livestream]);
372
373
const handleImageSelect = useCallback(() => {
374
// Default web file picker behavior
···
433
showsVerticalScrollIndicator: false,
434
}
435
: {};
436
+
437
+
const canEndLivestream =
438
+
livestream && livestream.record.endedAt === undefined;
439
440
return (
441
<>
···
686
</Text>
687
</Button>
688
<Button
689
+
variant={canEndLivestream ? "destructive" : "secondary"}
690
onPress={handleEndLivestream}
691
style={[
692
r.md,
693
py[3],
694
w.percent[100],
695
layout.flex.center,
696
+
{
697
+
opacity: !canEndLivestream ? 0.5 : 1,
698
+
cursor: canEndLivestream ? "pointer" : "not-allowed",
699
+
},
700
]}
701
+
disabled={!canEndLivestream || endingLivestream}
702
>
703
<Text
704
style={[text.white, { fontSize: 16, fontWeight: "bold" }]}
705
>
706
+
{endingLivestream ? "Ending Livestream..." : "End Livestream"}
707
</Text>
708
</Button>
709
</View>
+36
-11
js/app/components/live-dashboard/stream-monitor.tsx
+36
-11
js/app/components/live-dashboard/stream-monitor.tsx
···
33
const isUserLive = useLiveUser();
34
const profile = useLivestreamStore((x) => x.profile);
35
const ingestConnectionState = usePlayerStore((x) => x.ingestConnectionState);
36
-
const ls = useLivestream();
37
const segmentTiming = useSegmentTiming();
38
39
// Use hook data primarily, fallback to props
···
88
return "red";
89
}
90
};
91
return (
92
<View
93
style={[
···
166
{ flex: 1, minWidth: 0, gap: 12 },
167
]}
168
>
169
-
<View style={{ flex: 1, minWidth: 0 }}>
170
-
<Text
171
-
style={[text.white, { fontSize: 18, fontWeight: "600" }]}
172
-
numberOfLines={1}
173
-
ellipsizeMode="tail"
174
-
>
175
-
{ls?.record.title || "Stream Title"}
176
-
</Text>
177
-
</View>
178
<View
179
style={[
180
layout.flex.row,
···
209
]}
210
/>
211
<Text style={[text.gray[400], { fontSize: 14 }]}>
212
-
{isLive ? "LIVE" : "OFFLINE"}
213
</Text>
214
</View>
215
</View>
···
33
const isUserLive = useLiveUser();
34
const profile = useLivestreamStore((x) => x.profile);
35
const ingestConnectionState = usePlayerStore((x) => x.ingestConnectionState);
36
+
let ls = useLivestream();
37
const segmentTiming = useSegmentTiming();
38
39
// Use hook data primarily, fallback to props
···
88
return "red";
89
}
90
};
91
+
92
+
const getStreamStatus = () => {
93
+
if (!isLive) return "OFFLINE";
94
+
if (!ls) return "NOT LIVE";
95
+
return "LIVE";
96
+
};
97
+
98
+
const getStreamTitle = () => {
99
+
if (!ls) {
100
+
return (
101
+
<Text
102
+
style={[
103
+
text.white,
104
+
{ fontSize: 14, fontWeight: "400", fontStyle: "italic" },
105
+
]}
106
+
numberOfLines={1}
107
+
ellipsizeMode="tail"
108
+
>
109
+
Stream not live yet. Press "Announce Livestream" to start!
110
+
</Text>
111
+
);
112
+
}
113
+
return (
114
+
<Text
115
+
style={[text.white, { fontSize: 18, fontWeight: "600" }]}
116
+
numberOfLines={1}
117
+
ellipsizeMode="tail"
118
+
>
119
+
{ls?.record.title || "Stream Title"}
120
+
</Text>
121
+
);
122
+
};
123
+
124
return (
125
<View
126
style={[
···
199
{ flex: 1, minWidth: 0, gap: 12 },
200
]}
201
>
202
+
<View style={{ flex: 1, minWidth: 0 }}>{getStreamTitle()}</View>
203
<View
204
style={[
205
layout.flex.row,
···
234
]}
235
/>
236
<Text style={[text.gray[400], { fontSize: 14 }]}>
237
+
{getStreamStatus()}
238
</Text>
239
</View>
240
</View>
+7
-1
js/components/src/livestream-store/livestream-store.tsx
+7
-1
js/components/src/livestream-store/livestream-store.tsx
···
62
63
export const useViewers = () => useLivestreamStore((x) => x.viewers);
64
65
+
export const useLivestream = (includeEnded: boolean = false) =>
66
+
useLivestreamStore((x) => {
67
+
const ls = x.livestream;
68
+
if (!ls) return null;
69
+
if (!includeEnded && ls.record.endedAt !== undefined) return null;
70
+
return ls;
71
+
});
72
73
export const useSegment = () => useLivestreamStore((x) => x.segment);
74
+1
-1
pkg/api/playback.go
+1
-1
pkg/api/playback.go
···
56
offer := webrtc.SessionDescription{Type: webrtc.SDPTypeOffer, SDP: string(body)}
57
var answer *webrtc.SessionDescription
58
if a.CLI.NewWebRTCPlayback {
59
-
answer, err = a.MediaManager.WebRTCPlayback2(ctx, user, rendition, &offer)
60
} else {
61
answer, err = a.MediaManager.WebRTCPlayback(ctx, user, rendition, &offer)
62
}
···
56
offer := webrtc.SessionDescription{Type: webrtc.SDPTypeOffer, SDP: string(body)}
57
var answer *webrtc.SessionDescription
58
if a.CLI.NewWebRTCPlayback {
59
+
answer, err = a.MediaManager.WebRTCPlayback2(ctx, user, rendition, &offer, "")
60
} else {
61
answer, err = a.MediaManager.WebRTCPlayback(ctx, user, rendition, &offer)
62
}
+5
-1
pkg/media/webrtc_playback2.go
+5
-1
pkg/media/webrtc_playback2.go
···
14
)
15
16
// This function remains in scope for the duration of a single users' playback
17
-
func (mm *MediaManager) WebRTCPlayback2(ctx context.Context, user string, rendition string, offer *webrtc.SessionDescription) (*webrtc.SessionDescription, error) {
18
uu, err := uuid.NewV7()
19
if err != nil {
20
return nil, err
···
93
return
94
case file := <-segChan.C:
95
log.Debug(ctx, "got segment", "file", file.Filepath)
96
latency += file.PacketizedData.Duration
97
packetQueue <- file.PacketizedData
98
}
···
14
)
15
16
// This function remains in scope for the duration of a single users' playback
17
+
func (mm *MediaManager) WebRTCPlayback2(ctx context.Context, user string, rendition string, offer *webrtc.SessionDescription, viewer string) (*webrtc.SessionDescription, error) {
18
uu, err := uuid.NewV7()
19
if err != nil {
20
return nil, err
···
93
return
94
case file := <-segChan.C:
95
log.Debug(ctx, "got segment", "file", file.Filepath)
96
+
if !file.Published && viewer != user {
97
+
log.Warn(ctx, "segment is not published and viewer is not the user", "viewer", viewer, "user", user)
98
+
continue
99
+
}
100
latency += file.PacketizedData.Duration
101
packetQueue <- file.PacketizedData
102
}
+1
-1
pkg/media/webrtc_playback2_test.go
+1
-1
pkg/media/webrtc_playback2_test.go
+8
-1
pkg/spxrpc/place_stream_playback.go
+8
-1
pkg/spxrpc/place_stream_playback.go
···
8
9
"github.com/labstack/echo/v4"
10
"github.com/pion/webrtc/v4"
11
)
12
13
func (s *Server) handlePlaceStreamPlaybackWhep(ctx context.Context, rendition string, streamer string, r io.Reader, _contentType string) (io.Reader, error) {
14
if streamer == "" {
15
return nil, echo.NewHTTPError(http.StatusBadRequest, "streamer is required")
16
}
17
if rendition == "" {
18
return nil, echo.NewHTTPError(http.StatusBadRequest, "rendition is required")
19
}
20
repo, err := s.ATSync.SyncBlueskyRepoCached(ctx, streamer)
21
if err != nil {
22
return nil, err
···
26
return nil, echo.NewHTTPError(http.StatusBadRequest, "error reading body", err)
27
}
28
offer := webrtc.SessionDescription{Type: webrtc.SDPTypeOffer, SDP: string(body)}
29
-
answer, err := s.mm.WebRTCPlayback2(ctx, repo.DID, rendition, &offer)
30
if err != nil {
31
return nil, echo.NewHTTPError(http.StatusInternalServerError, "error playing back", err)
32
}
···
8
9
"github.com/labstack/echo/v4"
10
"github.com/pion/webrtc/v4"
11
+
"github.com/streamplace/oatproxy/pkg/oatproxy"
12
)
13
14
func (s *Server) handlePlaceStreamPlaybackWhep(ctx context.Context, rendition string, streamer string, r io.Reader, _contentType string) (io.Reader, error) {
15
+
16
if streamer == "" {
17
return nil, echo.NewHTTPError(http.StatusBadRequest, "streamer is required")
18
}
19
if rendition == "" {
20
return nil, echo.NewHTTPError(http.StatusBadRequest, "rendition is required")
21
}
22
+
viewer := ""
23
+
session, _ := oatproxy.GetOAuthSession(ctx)
24
+
if session != nil {
25
+
viewer = session.DID
26
+
}
27
repo, err := s.ATSync.SyncBlueskyRepoCached(ctx, streamer)
28
if err != nil {
29
return nil, err
···
33
return nil, echo.NewHTTPError(http.StatusBadRequest, "error reading body", err)
34
}
35
offer := webrtc.SessionDescription{Type: webrtc.SDPTypeOffer, SDP: string(body)}
36
+
answer, err := s.mm.WebRTCPlayback2(ctx, repo.DID, rendition, &offer, viewer)
37
if err != nil {
38
return nil, echo.NewHTTPError(http.StatusInternalServerError, "error playing back", err)
39
}