Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send correlation id #126

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Send correlation id #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 30 additions & 6 deletions app/routes/_room.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import invariant from 'tiny-invariant'
import { EnsureOnline } from '~/components/EnsureOnline'
import { EnsurePermissions } from '~/components/EnsurePermissions'
import { Icon } from '~/components/Icon/Icon'
import { Spinner } from '~/components/Spinner'
import { useStateObservable, useSubscribedState } from '~/hooks/rxjsHooks'

import { usePeerConnection } from '~/hooks/usePeerConnection'
Expand Down Expand Up @@ -74,12 +75,28 @@ export default function RoomWithPermissions() {
</div>
}
>
<Room />
<RoomPreparation />
</EnsureOnline>
</EnsurePermissions>
)
}

function RoomPreparation() {
const { mode } = useLoaderData<typeof loader>()
const { roomName } = useParams()
invariant(roomName)
const userMedia = useUserMedia(mode)
const room = useRoom({ roomName, userMedia })

return room.roomState.meetingId ? (
<Room room={room} userMedia={userMedia} />
) : (
<div className="grid place-items-center h-full">
<Spinner className="text-gray-500" />
</div>
)
}

function tryToGetDimensions(videoStreamTrack?: MediaStreamTrack) {
if (
videoStreamTrack === undefined ||
Expand All @@ -98,14 +115,18 @@ function tryToGetDimensions(videoStreamTrack?: MediaStreamTrack) {
return { height, width }
}

function Room() {
interface RoomProps {
room: ReturnType<typeof useRoom>
userMedia: ReturnType<typeof useUserMedia>
}

function Room({ room, userMedia }: RoomProps) {
const [joined, setJoined] = useState(false)
const [dataSaverMode, setDataSaverMode] = useState(false)
const { roomName } = useParams()
invariant(roomName)

const {
mode,
userDirectoryUrl,
traceLink,
feedbackEnabled,
Expand All @@ -117,11 +138,14 @@ function Room() {
maxApiHistory = 100,
} = useLoaderData<typeof loader>()

const userMedia = useUserMedia(mode)
const room = useRoom({ roomName, userMedia })
const params = new URLSearchParams(apiExtraParams)

invariant(room.roomState.meetingId, 'Meeting ID cannot be missing')
params.set('correlationId', room.roomState.meetingId)

const { peer, iceConnectionState } = usePeerConnection({
maxApiHistory,
apiExtraParams,
apiExtraParams: params.toString(),
iceServers,
apiBase: '/api/calls',
})
Expand Down
10 changes: 5 additions & 5 deletions app/utils/rxjs/RxjsPeer.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export class RxjsPeer {
console.debug('🆕 creating new session')
const { apiBase } = this.config
const response = await this.fetchWithRecordedHistory(
`${apiBase}/sessions/new?SESSION`,
`${apiBase}/sessions/new?CreatingSession&${this.config.apiExtraParams}`,
{ method: 'POST' }
)
if (response.status > 400) {
Expand Down Expand Up @@ -260,7 +260,7 @@ export class RxjsPeer {
})),
}
const response = await this.fetchWithRecordedHistory(
`${this.config.apiBase}/sessions/${sessionId}/tracks/new?PUSHING`,
`${this.config.apiBase}/sessions/${sessionId}/tracks/new?PushingTrack&${this.config.apiExtraParams}`,
{
method: 'POST',
body: JSON.stringify(requestBody),
Expand Down Expand Up @@ -393,7 +393,7 @@ export class RxjsPeer {
this.taskScheduler.schedule(async () => {
const newTrackResponse: TracksResponse =
await this.fetchWithRecordedHistory(
`${this.config.apiBase}/sessions/${sessionId}/tracks/new?PULLING`,
`${this.config.apiBase}/sessions/${sessionId}/tracks/new?PullingTrack&${this.config.apiExtraParams}`,
{
method: 'POST',
body: JSON.stringify({
Expand Down Expand Up @@ -434,7 +434,7 @@ export class RxjsPeer {

const renegotiationResponse =
await this.fetchWithRecordedHistory(
`${this.config.apiBase}/sessions/${sessionId}/renegotiate`,
`${this.config.apiBase}/sessions/${sessionId}/renegotiate?${this.config.apiExtraParams}`,
{
method: 'PUT',
body: JSON.stringify({
Expand Down Expand Up @@ -537,7 +537,7 @@ export class RxjsPeer {
force: false,
}
const response = await this.fetchWithRecordedHistory(
`${apiBase}/sessions/${sessionId}/tracks/close`,
`${apiBase}/sessions/${sessionId}/tracks/close?${this.config.apiExtraParams}`,
{
method: 'PUT',
body: JSON.stringify(requestBody),
Expand Down
Loading