Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/AvatarCall.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export function AvatarCall({
onEnd,
onError,
children,
initialScreenStream,
__unstable_roomOptions,
...props
}: AvatarCallProps) {
Expand Down Expand Up @@ -112,6 +113,7 @@ export function AvatarCall({
video={video}
onEnd={onEnd}
onError={handleSessionError}
initialScreenStream={initialScreenStream}
__unstable_roomOptions={__unstable_roomOptions}
>
{children ?? defaultChildren}
Expand Down
31 changes: 30 additions & 1 deletion src/components/AvatarSession.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
useRoomContext,
} from '@livekit/components-react';
import type { RoomOptions } from 'livekit-client';
import { ConnectionState } from 'livekit-client';
import { ConnectionState, Track } from 'livekit-client';
import {
createContext,
type ReactNode,
Expand Down Expand Up @@ -151,6 +151,7 @@ export function AvatarSession({
video: requestVideo = true,
onEnd,
onError,
initialScreenStream,
__unstable_roomOptions,
}: AvatarSessionProps) {
const errorRef = useRef<Error | null>(null);
Expand Down Expand Up @@ -187,6 +188,7 @@ export function AvatarSession({
sessionId={credentials.sessionId}
onEnd={onEnd}
errorRef={errorRef}
initialScreenStream={initialScreenStream}
>
{children}
</AvatarSessionContextInner>
Expand All @@ -202,18 +204,45 @@ function AvatarSessionContextInner({
sessionId,
onEnd,
errorRef,
initialScreenStream,
children,
}: {
sessionId: string;
onEnd?: () => void;
errorRef: React.RefObject<Error | null>;
initialScreenStream?: MediaStream;
children: ReactNode;
}) {
const room = useRoomContext();
const connectionState = useConnectionState();
const onEndRef = useRef(onEnd);
onEndRef.current = onEnd;

const publishedRef = useRef(false);

useEffect(() => {
if (connectionState !== ConnectionState.Connected) return;
if (!initialScreenStream || publishedRef.current) return;
publishedRef.current = true;

const videoTrack = initialScreenStream.getVideoTracks()[0];
if (videoTrack) {
room.localParticipant.publishTrack(videoTrack, {
source: Track.Source.ScreenShare,
});
}
const audioTrack = initialScreenStream.getAudioTracks()[0];
if (audioTrack) {
room.localParticipant.publishTrack(audioTrack, {
source: Track.Source.ScreenShareAudio,
});
}

return () => {
initialScreenStream.getTracks().forEach(t => { t.stop(); });
};
}, [connectionState, initialScreenStream, room]);

const end = useCallback(async () => {
try {
// Send END_CALL message to the avatar
Expand Down
10 changes: 10 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ export interface AvatarSessionProps {
onEnd?: () => void;
/** Callback when an error occurs */
onError?: (error: Error) => void;
/**
* Pre-captured screen share stream (from getDisplayMedia).
* When provided, screen sharing activates automatically once the session connects.
*/
initialScreenStream?: MediaStream;
/**
* Advanced LiveKit room options. Not part of the public API.
* @internal
Expand Down Expand Up @@ -121,6 +126,11 @@ export interface AvatarCallProps
onError?: (error: Error) => void;
/** Custom children - defaults to AvatarVideo + ControlBar if not provided */
children?: React.ReactNode;
/**
* Pre-captured screen share stream (from getDisplayMedia).
* When provided, screen sharing activates automatically once the session connects.
*/
initialScreenStream?: MediaStream;
/**
* Advanced LiveKit room options. Not part of the public API.
* @internal
Expand Down
Loading