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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export type RoomControlsProps = {
};

const RoomControls: FC<RoomControlsProps> = ({ roomId }) => {
const url = `https://dss.fishjam.io/${roomId}`;
const url = `https://deepsea.fishjam.io/${roomId}`;
const [isStoryPanelOpen, setIsStoryPanelOpen] = useState(false);
const trpc = useTRPCClient();

Expand Down
52 changes: 48 additions & 4 deletions deep-sea-stories/packages/web/src/views/GameView.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,56 @@
import { usePeers } from '@fishjam-cloud/react-client';
import type { FC } from 'react';
import { useMemo, useEffect, useRef } from 'react';
import { useQuery } from '@tanstack/react-query';
import AgentPanel from '@/components/AgentPanel';
import { PeerTile } from '@/components/PeerTile';
import RoomControls from '@/components/RoomControls';
import { useTRPCClient } from '@/contexts/trpc';

export type GameViewProps = {
roomId: string;
};

const GameView: FC<GameViewProps> = ({ roomId }) => {
const { remotePeers, localPeer } = usePeers<{ name: string }>();
const peers = remotePeers.length + 1;
const trpcClient = useTRPCClient();
const agentAudioRef = useRef<HTMLAudioElement>(null);

const { data: roomData } = useQuery({
queryKey: ['room', roomId],
queryFn: () => trpcClient.getRoom.query({ roomId }),
staleTime: Infinity,
});

const agentPeerId = useMemo(
() => roomData?.peers?.find((peer) => peer.type === 'agent')?.id,
[roomData?.peers],
);

const displayedPeers = useMemo(
() =>
agentPeerId
? remotePeers.filter((peer) => String(peer.id) !== String(agentPeerId))
: remotePeers,
[remotePeers, agentPeerId],
);

const agentPeer = useMemo(
() =>
agentPeerId
? remotePeers.find((peer) => String(peer.id) === String(agentPeerId))
: undefined,
[remotePeers, agentPeerId],
);

useEffect(() => {
if (!agentAudioRef.current) return;
const audioStream = agentPeer?.tracks[0]?.stream;
agentAudioRef.current.srcObject = audioStream ?? null;
}, [agentPeer?.tracks[0]?.stream]);

const gridColumns = displayedPeers.length + 1;

return (
<>
<section className="w-full h-1/2 flex gap-8 pt-10 px-10">
Expand All @@ -19,25 +59,29 @@ const GameView: FC<GameViewProps> = ({ roomId }) => {
</section>
<section
className="w-full h-1/2 grid place-items-center gap-4 py-10 px-10"
style={{ gridTemplateColumns: `repeat(${peers}, minmax(0, 1fr))` }}
style={{
gridTemplateColumns: `repeat(${gridColumns}, minmax(0, 1fr))`,
}}
>
<PeerTile
className="max-w-2xl"
name="You"
stream={localPeer?.cameraTrack?.stream}
/>
{remotePeers.map((peer) => (
{displayedPeers.map((peer) => (
<PeerTile
className="max-w-2xl"
name={peer.metadata?.peer?.name ?? peer.id}
key={peer.id}
stream={
peer.customVideoTracks[0]?.stream ?? peer.cameraTrack?.stream
}
audioStream={peer.tracks[0]?.stream ?? peer.microphoneTrack?.stream}
audioStream={peer.microphoneTrack?.stream}
/>
))}
</section>
{/* biome-ignore lint/a11y/useMediaCaption: Peer audio feed from WebRTC doesn't have captions */}
<audio ref={agentAudioRef} autoPlay playsInline title={'Agent audio'} />
</>
);
};
Expand Down