mirror of
https://github.com/Monadical-SAS/reflector.git
synced 2026-02-04 09:56:47 +00:00
Compare commits
5 Commits
v0.30.0
...
feature-le
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
485b455c69 | ||
|
|
74c9ec2ff1 | ||
|
|
aac89e8d03 | ||
|
|
13088e72f8 | ||
|
|
775c9b667d |
@@ -129,6 +129,10 @@ class DailyClient(VideoPlatformClient):
|
|||||||
"""Get room presence/session data for a Daily.co room."""
|
"""Get room presence/session data for a Daily.co room."""
|
||||||
return await self._api_client.get_room_presence(room_name)
|
return await self._api_client.get_room_presence(room_name)
|
||||||
|
|
||||||
|
async def delete_room(self, room_name: str) -> None:
|
||||||
|
"""Delete a Daily.co room (idempotent - succeeds even if room doesn't exist)."""
|
||||||
|
return await self._api_client.delete_room(room_name)
|
||||||
|
|
||||||
async def get_meeting_participants(
|
async def get_meeting_participants(
|
||||||
self, meeting_id: str
|
self, meeting_id: str
|
||||||
) -> MeetingParticipantsResponse:
|
) -> MeetingParticipantsResponse:
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from reflector.services.ics_sync import ics_sync_service
|
|||||||
from reflector.settings import settings
|
from reflector.settings import settings
|
||||||
from reflector.utils.url import add_query_param
|
from reflector.utils.url import add_query_param
|
||||||
from reflector.video_platforms.factory import create_platform_client
|
from reflector.video_platforms.factory import create_platform_client
|
||||||
|
from reflector.worker.process import poll_daily_room_presence_task
|
||||||
from reflector.worker.webhook import test_webhook
|
from reflector.worker.webhook import test_webhook
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -365,6 +366,53 @@ async def rooms_create_meeting(
|
|||||||
return meeting
|
return meeting
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/rooms/{room_name}/meetings/{meeting_id}/joined")
|
||||||
|
async def rooms_joined_meeting(
|
||||||
|
room_name: str,
|
||||||
|
meeting_id: str,
|
||||||
|
):
|
||||||
|
"""Trigger presence poll (ideally when user actually joins meeting in Daily iframe)"""
|
||||||
|
room = await rooms_controller.get_by_name(room_name)
|
||||||
|
if not room:
|
||||||
|
raise HTTPException(status_code=404, detail="Room not found")
|
||||||
|
|
||||||
|
meeting = await meetings_controller.get_by_id(meeting_id, room=room)
|
||||||
|
if not meeting:
|
||||||
|
raise HTTPException(status_code=404, detail="Meeting not found")
|
||||||
|
|
||||||
|
if meeting.platform == "daily":
|
||||||
|
poll_daily_room_presence_task.delay(meeting_id)
|
||||||
|
|
||||||
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/rooms/{room_name}/meetings/{meeting_id}/leave")
|
||||||
|
async def rooms_leave_meeting(
|
||||||
|
room_name: str,
|
||||||
|
meeting_id: str,
|
||||||
|
delay_seconds: int = 2,
|
||||||
|
):
|
||||||
|
"""Trigger presence recheck when user leaves meeting (e.g., tab close/navigation).
|
||||||
|
|
||||||
|
Queues presence poll with optional delay to allow Daily.co to detect disconnect.
|
||||||
|
"""
|
||||||
|
room = await rooms_controller.get_by_name(room_name)
|
||||||
|
if not room:
|
||||||
|
raise HTTPException(status_code=404, detail="Room not found")
|
||||||
|
|
||||||
|
meeting = await meetings_controller.get_by_id(meeting_id, room=room)
|
||||||
|
if not meeting:
|
||||||
|
raise HTTPException(status_code=404, detail="Meeting not found")
|
||||||
|
|
||||||
|
if meeting.platform == "daily":
|
||||||
|
poll_daily_room_presence_task.apply_async(
|
||||||
|
args=[meeting_id],
|
||||||
|
countdown=delay_seconds,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/rooms/{room_id}/webhook/test", response_model=WebhookTestResult)
|
@router.post("/rooms/{room_id}/webhook/test", response_model=WebhookTestResult)
|
||||||
async def rooms_test_webhook(
|
async def rooms_test_webhook(
|
||||||
room_id: str,
|
room_id: str,
|
||||||
|
|||||||
@@ -845,15 +845,47 @@ async def process_meetings():
|
|||||||
end_date = end_date.replace(tzinfo=timezone.utc)
|
end_date = end_date.replace(tzinfo=timezone.utc)
|
||||||
|
|
||||||
client = create_platform_client(meeting.platform)
|
client = create_platform_client(meeting.platform)
|
||||||
room_sessions = await client.get_room_sessions(meeting.room_name)
|
has_active_sessions = False
|
||||||
|
has_had_sessions = False
|
||||||
|
|
||||||
has_active_sessions = bool(
|
if meeting.platform == "daily":
|
||||||
room_sessions and any(s.ended_at is None for s in room_sessions)
|
try:
|
||||||
)
|
presence = await client.get_room_presence(meeting.room_name)
|
||||||
has_had_sessions = bool(room_sessions)
|
has_active_sessions = presence.total_count > 0
|
||||||
logger_.info(
|
|
||||||
f"has_active_sessions={has_active_sessions}, has_had_sessions={has_had_sessions}"
|
room_sessions = await client.get_room_sessions(
|
||||||
)
|
meeting.room_name
|
||||||
|
)
|
||||||
|
has_had_sessions = bool(room_sessions)
|
||||||
|
|
||||||
|
logger_.info(
|
||||||
|
"Daily.co presence check",
|
||||||
|
has_active_sessions=has_active_sessions,
|
||||||
|
has_had_sessions=has_had_sessions,
|
||||||
|
presence_count=presence.total_count,
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
logger_.warning(
|
||||||
|
"Daily.co presence API failed, falling back to DB sessions",
|
||||||
|
exc_info=True,
|
||||||
|
)
|
||||||
|
room_sessions = await client.get_room_sessions(
|
||||||
|
meeting.room_name
|
||||||
|
)
|
||||||
|
has_active_sessions = bool(
|
||||||
|
room_sessions
|
||||||
|
and any(s.ended_at is None for s in room_sessions)
|
||||||
|
)
|
||||||
|
has_had_sessions = bool(room_sessions)
|
||||||
|
else:
|
||||||
|
room_sessions = await client.get_room_sessions(meeting.room_name)
|
||||||
|
has_active_sessions = bool(
|
||||||
|
room_sessions and any(s.ended_at is None for s in room_sessions)
|
||||||
|
)
|
||||||
|
has_had_sessions = bool(room_sessions)
|
||||||
|
logger_.info(
|
||||||
|
f"has_active_sessions={has_active_sessions}, has_had_sessions={has_had_sessions}"
|
||||||
|
)
|
||||||
|
|
||||||
if has_active_sessions:
|
if has_active_sessions:
|
||||||
logger_.debug("Meeting still has active sessions, keep it")
|
logger_.debug("Meeting still has active sessions, keep it")
|
||||||
@@ -872,7 +904,20 @@ async def process_meetings():
|
|||||||
await meetings_controller.update_meeting(
|
await meetings_controller.update_meeting(
|
||||||
meeting.id, is_active=False
|
meeting.id, is_active=False
|
||||||
)
|
)
|
||||||
logger_.info("Meeting is deactivated")
|
logger_.info("Meeting deactivated in database")
|
||||||
|
|
||||||
|
if meeting.platform == "daily":
|
||||||
|
try:
|
||||||
|
await client.delete_room(meeting.room_name)
|
||||||
|
logger_.info(
|
||||||
|
"Daily.co room deleted", room_name=meeting.room_name
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
logger_.warning(
|
||||||
|
"Failed to delete Daily.co room",
|
||||||
|
room_name=meeting.room_name,
|
||||||
|
exc_info=True,
|
||||||
|
)
|
||||||
|
|
||||||
processed_count += 1
|
processed_count += 1
|
||||||
|
|
||||||
|
|||||||
286
server/tests/test_daily_presence_deactivation.py
Normal file
286
server/tests/test_daily_presence_deactivation.py
Normal file
@@ -0,0 +1,286 @@
|
|||||||
|
"""Unit tests for Daily.co presence-based meeting deactivation logic.
|
||||||
|
|
||||||
|
Tests the fix for split room race condition by verifying:
|
||||||
|
1. Real-time presence checking via Daily.co API
|
||||||
|
2. Room deletion when meetings deactivate
|
||||||
|
"""
|
||||||
|
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from unittest.mock import AsyncMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from reflector.dailyco_api.responses import (
|
||||||
|
RoomPresenceParticipant,
|
||||||
|
RoomPresenceResponse,
|
||||||
|
)
|
||||||
|
from reflector.db.daily_participant_sessions import (
|
||||||
|
DailyParticipantSession,
|
||||||
|
daily_participant_sessions_controller,
|
||||||
|
)
|
||||||
|
from reflector.db.meetings import meetings_controller
|
||||||
|
from reflector.db.rooms import rooms_controller
|
||||||
|
from reflector.video_platforms.daily import DailyClient
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
async def daily_room_and_meeting():
|
||||||
|
"""Create test room and meeting for Daily platform."""
|
||||||
|
room = await rooms_controller.add(
|
||||||
|
name="test-daily",
|
||||||
|
user_id="test-user",
|
||||||
|
platform="daily",
|
||||||
|
zulip_auto_post=False,
|
||||||
|
zulip_stream="",
|
||||||
|
zulip_topic="",
|
||||||
|
is_locked=False,
|
||||||
|
room_mode="normal",
|
||||||
|
recording_type="cloud",
|
||||||
|
recording_trigger="automatic-2nd-participant",
|
||||||
|
is_shared=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
current_time = datetime.now(timezone.utc)
|
||||||
|
end_time = current_time + timedelta(hours=2)
|
||||||
|
|
||||||
|
meeting = await meetings_controller.create(
|
||||||
|
id="test-meeting-id",
|
||||||
|
room_name="test-daily-20260129120000",
|
||||||
|
room_url="https://daily.co/test",
|
||||||
|
host_room_url="https://daily.co/test",
|
||||||
|
start_date=current_time,
|
||||||
|
end_date=end_time,
|
||||||
|
room=room,
|
||||||
|
)
|
||||||
|
|
||||||
|
return room, meeting
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_daily_client_has_delete_room_method():
|
||||||
|
"""Verify DailyClient has delete_room method for cleanup."""
|
||||||
|
# Create a mock DailyClient
|
||||||
|
with patch("reflector.dailyco_api.client.DailyApiClient"):
|
||||||
|
from reflector.video_platforms.models import VideoPlatformConfig
|
||||||
|
|
||||||
|
config = VideoPlatformConfig(api_key="test-key", webhook_secret="test-secret")
|
||||||
|
client = DailyClient(config)
|
||||||
|
|
||||||
|
# Verify delete_room method exists
|
||||||
|
assert hasattr(client, "delete_room")
|
||||||
|
assert callable(getattr(client, "delete_room"))
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_get_room_presence_returns_realtime_data(daily_room_and_meeting):
|
||||||
|
"""Test that get_room_presence returns real-time participant data."""
|
||||||
|
room, meeting = daily_room_and_meeting
|
||||||
|
|
||||||
|
# Mock Daily.co API response
|
||||||
|
mock_presence = RoomPresenceResponse(
|
||||||
|
total_count=2,
|
||||||
|
data=[
|
||||||
|
RoomPresenceParticipant(
|
||||||
|
room=meeting.room_name,
|
||||||
|
id="session-1",
|
||||||
|
userId="user-1",
|
||||||
|
userName="User One",
|
||||||
|
joinTime="2026-01-29T12:00:00.000Z",
|
||||||
|
duration=120,
|
||||||
|
),
|
||||||
|
RoomPresenceParticipant(
|
||||||
|
room=meeting.room_name,
|
||||||
|
id="session-2",
|
||||||
|
userId="user-2",
|
||||||
|
userName="User Two",
|
||||||
|
joinTime="2026-01-29T12:05:00.000Z",
|
||||||
|
duration=60,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
with patch("reflector.dailyco_api.client.DailyApiClient") as mock_api:
|
||||||
|
from reflector.video_platforms.models import VideoPlatformConfig
|
||||||
|
|
||||||
|
config = VideoPlatformConfig(api_key="test-key", webhook_secret="test-secret")
|
||||||
|
client = DailyClient(config)
|
||||||
|
|
||||||
|
# Mock the API client method
|
||||||
|
client._api_client.get_room_presence = AsyncMock(return_value=mock_presence)
|
||||||
|
|
||||||
|
# Call get_room_presence
|
||||||
|
result = await client.get_room_presence(meeting.room_name)
|
||||||
|
|
||||||
|
# Verify it calls Daily.co API
|
||||||
|
client._api_client.get_room_presence.assert_called_once_with(meeting.room_name)
|
||||||
|
|
||||||
|
# Verify result contains real-time data
|
||||||
|
assert result.total_count == 2
|
||||||
|
assert len(result.data) == 2
|
||||||
|
assert result.data[0].id == "session-1"
|
||||||
|
assert result.data[1].id == "session-2"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_presence_shows_active_even_when_db_stale(daily_room_and_meeting):
|
||||||
|
"""Test that Daily.co presence API is source of truth, not stale DB sessions."""
|
||||||
|
room, meeting = daily_room_and_meeting
|
||||||
|
current_time = datetime.now(timezone.utc)
|
||||||
|
|
||||||
|
# Create stale DB session (left_at=NULL but user actually left)
|
||||||
|
session_id = f"{meeting.id}:stale-user:{int((current_time - timedelta(minutes=5)).timestamp() * 1000)}"
|
||||||
|
await daily_participant_sessions_controller.upsert_joined(
|
||||||
|
DailyParticipantSession(
|
||||||
|
id=session_id,
|
||||||
|
meeting_id=meeting.id,
|
||||||
|
room_id=room.id,
|
||||||
|
session_id="stale-daily-session",
|
||||||
|
user_name="Stale User",
|
||||||
|
user_id="stale-user",
|
||||||
|
joined_at=current_time - timedelta(minutes=5),
|
||||||
|
left_at=None, # Stale - shows active but user left
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Verify DB shows active session
|
||||||
|
db_sessions = await daily_participant_sessions_controller.get_active_by_meeting(
|
||||||
|
meeting.id
|
||||||
|
)
|
||||||
|
assert len(db_sessions) == 1
|
||||||
|
|
||||||
|
# But Daily.co API shows room is empty
|
||||||
|
mock_presence = RoomPresenceResponse(total_count=0, data=[])
|
||||||
|
|
||||||
|
with patch("reflector.dailyco_api.client.DailyApiClient"):
|
||||||
|
from reflector.video_platforms.models import VideoPlatformConfig
|
||||||
|
|
||||||
|
config = VideoPlatformConfig(api_key="test-key", webhook_secret="test-secret")
|
||||||
|
client = DailyClient(config)
|
||||||
|
client._api_client.get_room_presence = AsyncMock(return_value=mock_presence)
|
||||||
|
|
||||||
|
# Get real-time presence
|
||||||
|
presence = await client.get_room_presence(meeting.room_name)
|
||||||
|
|
||||||
|
# Real-time API shows no participants (truth)
|
||||||
|
assert presence.total_count == 0
|
||||||
|
assert len(presence.data) == 0
|
||||||
|
|
||||||
|
# DB shows 1 participant (stale)
|
||||||
|
assert len(db_sessions) == 1
|
||||||
|
|
||||||
|
# Implementation should trust presence API, not DB
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_meeting_deactivation_logic_with_presence_empty():
|
||||||
|
"""Test the core deactivation decision logic when presence shows room empty."""
|
||||||
|
# This tests the logic that will be in process_meetings
|
||||||
|
|
||||||
|
# Simulate: DB shows stale active session
|
||||||
|
has_active_db_sessions = True # DB is stale
|
||||||
|
|
||||||
|
# Simulate: Daily.co presence API shows room empty
|
||||||
|
presence_count = 0 # Real-time truth
|
||||||
|
|
||||||
|
# Simulate: Meeting has been used before
|
||||||
|
has_had_sessions = True
|
||||||
|
|
||||||
|
# Decision logic (what process_meetings should do):
|
||||||
|
# - If presence API available: trust it
|
||||||
|
# - If presence shows empty AND has_had_sessions: deactivate
|
||||||
|
|
||||||
|
if presence_count == 0 and has_had_sessions:
|
||||||
|
should_deactivate = True
|
||||||
|
else:
|
||||||
|
should_deactivate = False
|
||||||
|
|
||||||
|
assert should_deactivate is True # Should deactivate despite stale DB
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_meeting_deactivation_logic_with_presence_active():
|
||||||
|
"""Test that meetings stay active when presence shows participants."""
|
||||||
|
# Simulate: DB shows no sessions (not yet updated)
|
||||||
|
has_active_db_sessions = False # DB hasn't caught up
|
||||||
|
|
||||||
|
# Simulate: Daily.co presence API shows active participant
|
||||||
|
presence_count = 1 # Real-time truth
|
||||||
|
|
||||||
|
# Decision logic: presence shows activity, keep meeting active
|
||||||
|
if presence_count > 0:
|
||||||
|
should_deactivate = False
|
||||||
|
else:
|
||||||
|
should_deactivate = True
|
||||||
|
|
||||||
|
assert should_deactivate is False # Should stay active
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_delete_room_called_on_deactivation(daily_room_and_meeting):
|
||||||
|
"""Test that Daily.co room is deleted when meeting deactivates."""
|
||||||
|
room, meeting = daily_room_and_meeting
|
||||||
|
|
||||||
|
with patch("reflector.dailyco_api.client.DailyApiClient"):
|
||||||
|
from reflector.video_platforms.models import VideoPlatformConfig
|
||||||
|
|
||||||
|
config = VideoPlatformConfig(api_key="test-key", webhook_secret="test-secret")
|
||||||
|
client = DailyClient(config)
|
||||||
|
|
||||||
|
# Mock delete_room API call
|
||||||
|
client._api_client.delete_room = AsyncMock()
|
||||||
|
|
||||||
|
# Simulate deactivation - should delete room
|
||||||
|
await client._api_client.delete_room(meeting.room_name)
|
||||||
|
|
||||||
|
# Verify delete was called
|
||||||
|
client._api_client.delete_room.assert_called_once_with(meeting.room_name)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_delete_room_idempotent_on_404():
|
||||||
|
"""Test that room deletion is idempotent (succeeds even if room doesn't exist)."""
|
||||||
|
from reflector.dailyco_api.client import DailyApiClient
|
||||||
|
|
||||||
|
# Create real client to test delete_room logic
|
||||||
|
client = DailyApiClient(api_key="test-key")
|
||||||
|
|
||||||
|
# Mock the HTTP client
|
||||||
|
mock_http_client = AsyncMock()
|
||||||
|
mock_response = AsyncMock()
|
||||||
|
mock_response.status_code = 404 # Room not found
|
||||||
|
mock_http_client.delete = AsyncMock(return_value=mock_response)
|
||||||
|
|
||||||
|
# Mock _get_client to return our mock
|
||||||
|
async def mock_get_client():
|
||||||
|
return mock_http_client
|
||||||
|
|
||||||
|
client._get_client = mock_get_client
|
||||||
|
|
||||||
|
# delete_room should succeed even on 404 (idempotent)
|
||||||
|
await client.delete_room("nonexistent-room")
|
||||||
|
|
||||||
|
# Verify delete was attempted
|
||||||
|
mock_http_client.delete.assert_called_once()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_api_failure_fallback_to_db_sessions():
|
||||||
|
"""Test that system falls back to DB sessions if Daily.co API fails."""
|
||||||
|
# Simulate: Daily.co API throws exception
|
||||||
|
api_exception = Exception("API unavailable")
|
||||||
|
|
||||||
|
# Simulate: DB shows active session
|
||||||
|
has_active_db_sessions = True
|
||||||
|
|
||||||
|
# Decision logic with fallback:
|
||||||
|
try:
|
||||||
|
presence_count = None
|
||||||
|
raise api_exception # Simulating API failure
|
||||||
|
except Exception:
|
||||||
|
# Fallback: use DB sessions (conservative - don't deactivate if unsure)
|
||||||
|
if has_active_db_sessions:
|
||||||
|
should_deactivate = False
|
||||||
|
else:
|
||||||
|
should_deactivate = True
|
||||||
|
|
||||||
|
assert should_deactivate is False # Conservative: keep active on API failure
|
||||||
@@ -24,15 +24,24 @@ import { useAuth } from "../../lib/AuthProvider";
|
|||||||
import { useConsentDialog } from "../../lib/consent";
|
import { useConsentDialog } from "../../lib/consent";
|
||||||
import {
|
import {
|
||||||
useRoomJoinMeeting,
|
useRoomJoinMeeting,
|
||||||
|
useRoomJoinedMeeting,
|
||||||
|
useRoomLeaveMeeting,
|
||||||
useMeetingStartRecording,
|
useMeetingStartRecording,
|
||||||
|
leaveRoomPostUrl,
|
||||||
|
LeaveRoomBody,
|
||||||
} from "../../lib/apiHooks";
|
} from "../../lib/apiHooks";
|
||||||
import { omit } from "remeda";
|
import { omit } from "remeda";
|
||||||
import {
|
import {
|
||||||
assertExists,
|
assertExists,
|
||||||
|
assertExistsAndNonEmptyString,
|
||||||
NonEmptyString,
|
NonEmptyString,
|
||||||
parseNonEmptyString,
|
parseNonEmptyString,
|
||||||
} from "../../lib/utils";
|
} from "../../lib/utils";
|
||||||
import { assertMeetingId, DailyRecordingType } from "../../lib/types";
|
import {
|
||||||
|
assertMeetingId,
|
||||||
|
DailyRecordingType,
|
||||||
|
MeetingId,
|
||||||
|
} from "../../lib/types";
|
||||||
import { useUuidV5 } from "react-uuid-hook";
|
import { useUuidV5 } from "react-uuid-hook";
|
||||||
|
|
||||||
const CONSENT_BUTTON_ID = "recording-consent";
|
const CONSENT_BUTTON_ID = "recording-consent";
|
||||||
@@ -179,6 +188,58 @@ const useFrame = (
|
|||||||
] as const;
|
] as const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const leaveDaily = () => {
|
||||||
|
const frame = DailyIframe.getCallInstance();
|
||||||
|
frame?.leave();
|
||||||
|
};
|
||||||
|
|
||||||
|
const useDirtyDisconnects = (
|
||||||
|
meetingId: NonEmptyString,
|
||||||
|
roomName: NonEmptyString,
|
||||||
|
) => {
|
||||||
|
useEffect(() => {
|
||||||
|
if (!meetingId || !roomName) return;
|
||||||
|
|
||||||
|
const handleBeforeUnload = () => {
|
||||||
|
leaveDaily();
|
||||||
|
navigator.sendBeacon(
|
||||||
|
leaveRoomPostUrl(
|
||||||
|
{
|
||||||
|
room_name: roomName,
|
||||||
|
meeting_id: meetingId,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
delay_seconds: 5,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
undefined satisfies LeaveRoomBody,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
window.addEventListener("beforeunload", handleBeforeUnload);
|
||||||
|
return () => window.removeEventListener("beforeunload", handleBeforeUnload);
|
||||||
|
}, [meetingId, roomName]);
|
||||||
|
};
|
||||||
|
|
||||||
|
const useDisconnects = (
|
||||||
|
meetingId: NonEmptyString,
|
||||||
|
roomName: NonEmptyString,
|
||||||
|
leaveMutation: ReturnType<typeof useRoomLeaveMeeting>,
|
||||||
|
) => {
|
||||||
|
useDirtyDisconnects(meetingId, roomName);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
return () => {
|
||||||
|
leaveDaily();
|
||||||
|
leaveMutation.mutate({
|
||||||
|
params: {
|
||||||
|
path: { meeting_id: meetingId, room_name: roomName },
|
||||||
|
query: { delay_seconds: 5 },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}, [meetingId, roomName]);
|
||||||
|
};
|
||||||
|
|
||||||
export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
@@ -186,6 +247,8 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
const authLastUserId = auth.lastUserId;
|
const authLastUserId = auth.lastUserId;
|
||||||
const [container, setContainer] = useState<HTMLDivElement | null>(null);
|
const [container, setContainer] = useState<HTMLDivElement | null>(null);
|
||||||
const joinMutation = useRoomJoinMeeting();
|
const joinMutation = useRoomJoinMeeting();
|
||||||
|
const joinedMutation = useRoomJoinedMeeting();
|
||||||
|
const leaveMutation = useRoomLeaveMeeting();
|
||||||
const startRecordingMutation = useMeetingStartRecording();
|
const startRecordingMutation = useMeetingStartRecording();
|
||||||
const [joinedMeeting, setJoinedMeeting] = useState<Meeting | null>(null);
|
const [joinedMeeting, setJoinedMeeting] = useState<Meeting | null>(null);
|
||||||
|
|
||||||
@@ -195,7 +258,9 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
useUuidV5(meeting.id, RAW_TRACKS_NAMESPACE)[0],
|
useUuidV5(meeting.id, RAW_TRACKS_NAMESPACE)[0],
|
||||||
);
|
);
|
||||||
|
|
||||||
const roomName = params?.roomName as string;
|
if (typeof params.roomName === "object")
|
||||||
|
throw new Error(`Invalid room name in params. array? ${params.roomName}`);
|
||||||
|
const roomName = assertExistsAndNonEmptyString(params.roomName);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
showConsentModal,
|
showConsentModal,
|
||||||
@@ -237,6 +302,8 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
router.push("/browse");
|
router.push("/browse");
|
||||||
}, [router]);
|
}, [router]);
|
||||||
|
|
||||||
|
useDisconnects(meeting.id as MeetingId, roomName, leaveMutation);
|
||||||
|
|
||||||
const handleCustomButtonClick = useCallback(
|
const handleCustomButtonClick = useCallback(
|
||||||
(ev: DailyEventObjectCustomButtonClick) => {
|
(ev: DailyEventObjectCustomButtonClick) => {
|
||||||
if (ev.button_id === CONSENT_BUTTON_ID) {
|
if (ev.button_id === CONSENT_BUTTON_ID) {
|
||||||
@@ -249,6 +316,15 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const handleFrameJoinMeeting = useCallback(() => {
|
const handleFrameJoinMeeting = useCallback(() => {
|
||||||
|
joinedMutation.mutate({
|
||||||
|
params: {
|
||||||
|
path: {
|
||||||
|
room_name: roomName,
|
||||||
|
meeting_id: meeting.id,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
if (meeting.recording_type === "cloud") {
|
if (meeting.recording_type === "cloud") {
|
||||||
console.log("Starting dual recording via REST API", {
|
console.log("Starting dual recording via REST API", {
|
||||||
cloudInstanceId,
|
cloudInstanceId,
|
||||||
@@ -308,8 +384,10 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
startRecordingWithRetry("raw-tracks", rawTracksInstanceId);
|
startRecordingWithRetry("raw-tracks", rawTracksInstanceId);
|
||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
meeting.recording_type,
|
joinedMutation,
|
||||||
|
roomName,
|
||||||
meeting.id,
|
meeting.id,
|
||||||
|
meeting.recording_type,
|
||||||
startRecordingMutation,
|
startRecordingMutation,
|
||||||
cloudInstanceId,
|
cloudInstanceId,
|
||||||
rawTracksInstanceId,
|
rawTracksInstanceId,
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { $api } from "./apiClient";
|
import { $api, API_URL } from "./apiClient";
|
||||||
import { useError } from "../(errors)/errorContext";
|
import { useError } from "../(errors)/errorContext";
|
||||||
import { QueryClient, useQueryClient } from "@tanstack/react-query";
|
import { QueryClient, useQueryClient } from "@tanstack/react-query";
|
||||||
import type { components } from "../reflector-api";
|
import type { components, operations } from "../reflector-api";
|
||||||
import { useAuth } from "./AuthProvider";
|
import { useAuth } from "./AuthProvider";
|
||||||
import { MeetingId } from "./types";
|
import { MeetingId } from "./types";
|
||||||
|
import { NonEmptyString } from "./utils";
|
||||||
|
import { createFinalURL, createQuerySerializer } from "openapi-fetch";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* XXX error types returned from the hooks are not always correct; declared types are ValidationError but real type could be string or any other
|
* XXX error types returned from the hooks are not always correct; declared types are ValidationError but real type could be string or any other
|
||||||
@@ -766,6 +768,44 @@ export function useRoomJoinMeeting() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const LEAVE_ROOM_POST_URL_TEMPLATE =
|
||||||
|
"/v1/rooms/{room_name}/meetings/{meeting_id}/leave" as const;
|
||||||
|
|
||||||
|
export const leaveRoomPostUrl = (
|
||||||
|
path: operations["v1_rooms_leave_meeting"]["parameters"]["path"],
|
||||||
|
query?: operations["v1_rooms_leave_meeting"]["parameters"]["query"],
|
||||||
|
): string =>
|
||||||
|
createFinalURL(LEAVE_ROOM_POST_URL_TEMPLATE, {
|
||||||
|
baseUrl: API_URL,
|
||||||
|
params: { path, query },
|
||||||
|
querySerializer: createQuerySerializer(),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type LeaveRoomBody = operations["v1_rooms_leave_meeting"]["requestBody"];
|
||||||
|
|
||||||
|
export function useRoomLeaveMeeting() {
|
||||||
|
return $api.useMutation("post", LEAVE_ROOM_POST_URL_TEMPLATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const JOINED_ROOM_POST_URL_TEMPLATE =
|
||||||
|
"/v1/rooms/{room_name}/meetings/{meeting_id}/joined" as const;
|
||||||
|
|
||||||
|
export const joinedRoomPostUrl = (
|
||||||
|
params: operations["v1_rooms_joined_meeting"]["parameters"]["path"],
|
||||||
|
): string =>
|
||||||
|
createFinalURL(JOINED_ROOM_POST_URL_TEMPLATE, {
|
||||||
|
baseUrl: API_URL,
|
||||||
|
params: { path: params },
|
||||||
|
querySerializer: () => "",
|
||||||
|
});
|
||||||
|
|
||||||
|
export type JoinedRoomBody =
|
||||||
|
operations["v1_rooms_joined_meeting"]["requestBody"];
|
||||||
|
|
||||||
|
export function useRoomJoinedMeeting() {
|
||||||
|
return $api.useMutation("post", JOINED_ROOM_POST_URL_TEMPLATE);
|
||||||
|
}
|
||||||
|
|
||||||
export function useRoomIcsSync() {
|
export function useRoomIcsSync() {
|
||||||
const { setError } = useError();
|
const { setError } = useError();
|
||||||
|
|
||||||
|
|||||||
108
www/app/reflector-api.d.ts
vendored
108
www/app/reflector-api.d.ts
vendored
@@ -171,6 +171,48 @@ export interface paths {
|
|||||||
patch?: never;
|
patch?: never;
|
||||||
trace?: never;
|
trace?: never;
|
||||||
};
|
};
|
||||||
|
"/v1/rooms/{room_name}/meetings/{meeting_id}/joined": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
/**
|
||||||
|
* Rooms Joined Meeting
|
||||||
|
* @description Trigger presence poll (ideally when user actually joins meeting in Daily iframe)
|
||||||
|
*/
|
||||||
|
post: operations["v1_rooms_joined_meeting"];
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
|
"/v1/rooms/{room_name}/meetings/{meeting_id}/leave": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
/**
|
||||||
|
* Rooms Leave Meeting
|
||||||
|
* @description Trigger presence recheck when user leaves meeting (e.g., tab close/navigation).
|
||||||
|
*
|
||||||
|
* Queues presence poll with optional delay to allow Daily.co to detect disconnect.
|
||||||
|
*/
|
||||||
|
post: operations["v1_rooms_leave_meeting"];
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
"/v1/rooms/{room_id}/webhook/test": {
|
"/v1/rooms/{room_id}/webhook/test": {
|
||||||
parameters: {
|
parameters: {
|
||||||
query?: never;
|
query?: never;
|
||||||
@@ -2435,6 +2477,72 @@ export interface operations {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
v1_rooms_joined_meeting: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
room_name: string;
|
||||||
|
meeting_id: string;
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Successful Response */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": unknown;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Validation Error */
|
||||||
|
422: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["HTTPValidationError"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
v1_rooms_leave_meeting: {
|
||||||
|
parameters: {
|
||||||
|
query?: {
|
||||||
|
delay_seconds?: number;
|
||||||
|
};
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
room_name: string;
|
||||||
|
meeting_id: string;
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Successful Response */
|
||||||
|
200: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": unknown;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Validation Error */
|
||||||
|
422: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["HTTPValidationError"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
v1_rooms_test_webhook: {
|
v1_rooms_test_webhook: {
|
||||||
parameters: {
|
parameters: {
|
||||||
query?: never;
|
query?: never;
|
||||||
|
|||||||
Reference in New Issue
Block a user