mirror of
https://github.com/suitenumerique/meet.git
synced 2026-07-29 05:09:16 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 39d3f6dd8e |
@@ -82,7 +82,7 @@ jobs:
|
|||||||
- name: Install Node.js
|
- name: Install Node.js
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
with:
|
with:
|
||||||
node-version: "22"
|
node-version: "18"
|
||||||
|
|
||||||
- name: Restore the mail templates
|
- name: Restore the mail templates
|
||||||
uses: actions/cache@v5
|
uses: actions/cache@v5
|
||||||
|
|||||||
@@ -10,68 +10,6 @@ and this project adheres to
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- ✨(summary) report exception type in failure analytics
|
|
||||||
- ✨(frontend) add configurable documentation menu item
|
|
||||||
- ✨(frontend) allow promoting authenticated participants
|
|
||||||
- ✨(frontend) introduce an "unauthenticated" participant badge
|
|
||||||
- ✨(frontend) add connection test feature
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- ⬆️(frontend) upgrade @mediapipe/tasks-vision from 0.10.14 to 0.10.35
|
|
||||||
- ⬆️(frontend) upgrade i18next from 26.3.1 to 26.3.4
|
|
||||||
- ⬆️(frontend) upgrade posthog-js from 1.391.2 to 1.395.0
|
|
||||||
- ⬆️(frontend) upgrade @tanstack/react-query from 5.101.0 to 5.101.1
|
|
||||||
- ⬆️(frontend) upgrade livekit-client from 2.19.2 to 2.20.0
|
|
||||||
- ⚡️(frontend) limit unnecessary re-renders #1510
|
|
||||||
- 📝(legal) update terms of service
|
|
||||||
- 💄(frontend) render Avatar initials in uppercase
|
|
||||||
- 💄(frontend) improve participant name rendering in the list
|
|
||||||
|
|
||||||
## Fixed
|
|
||||||
|
|
||||||
- 🐛(transcription) fix silent bug in speaker assignment
|
|
||||||
- 🐛(summary) extend tasks auto retry logic
|
|
||||||
- 🐛(summary) properly detect when failure webhook should be sent
|
|
||||||
- 🐛(backend) preserve recording metadata when updating room access
|
|
||||||
- 🐛(backend) allow any string as sub in the API serializer
|
|
||||||
- 🐛(frontend) fall back to user.full_name on request-entry
|
|
||||||
- 🚸(frontend) show two initials in the Avatar when possible
|
|
||||||
|
|
||||||
## [1.24.0] - 2026-07-21
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- ✨(backend) allow searching the recording admin table by owner email
|
|
||||||
- ✨(frontend) add participant color gradient when camera is off #1490
|
|
||||||
- ✨(all) allow forcing SSO display name for authenticated users
|
|
||||||
- ➕(frontend) install vite-plugin-static-copy for MediaPipe WASM assets
|
|
||||||
- ✨(addon) show add-in tools when creating meetings in shared calendars
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
|
|
||||||
- 🗑️(settings) deprecate SUMMARY_SERVICE_VERSION=1
|
|
||||||
- ⬆️(mail) update mjml to v5 and @html-to/text-cli
|
|
||||||
- 🚸(frontend) initialize the join input name with the persisted full name
|
|
||||||
- ♻️(frontend) refactor background processors to use the new API
|
|
||||||
- ♻️(frontend) inline model weights to avoid loading them from remote
|
|
||||||
- ♻️(frontend) inline MediaPipe WASM modules to avoid loading from remote
|
|
||||||
- ⬆️(frontend) upgrade posthog-js from 1.387.0 to 1.391.2
|
|
||||||
- ⬆️(frontend) upgrade react-stately from 3.47.0 to 3.48.0
|
|
||||||
- ⬆️(frontend) upgrade react-aria from 3.49.0 to 3.50.0
|
|
||||||
- ⬆️(frontend) upgrade react-aria-components from 1.18.0 to 1.19.0
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
|
|
||||||
- 🩹(backend) identify externally provisioned users to PostHog
|
|
||||||
- 🐛(backend) fix info panel crash for unregistered rooms
|
|
||||||
- ♿️(frontend) focus side panel container on open #1452
|
|
||||||
- 🐛(summary) whisper call error handling
|
|
||||||
|
|
||||||
## [1.23.0] - 2026-07-08
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- ✨(backend) extend analytics module to support feature flags
|
- ✨(backend) extend analytics module to support feature flags
|
||||||
- ✨(backend) implement feature flags in Posthog analytics backend
|
- ✨(backend) implement feature flags in Posthog analytics backend
|
||||||
- ✨(agents) report errors to Sentry for all LiveKit agents
|
- ✨(agents) report errors to Sentry for all LiveKit agents
|
||||||
@@ -85,12 +23,6 @@ and this project adheres to
|
|||||||
- ♻️(backend) refactor analytics backend from Protocol to abstract class
|
- ♻️(backend) refactor analytics backend from Protocol to abstract class
|
||||||
- 🔥(summary) remove call to summary enabled feature flag
|
- 🔥(summary) remove call to summary enabled feature flag
|
||||||
- ♻️(frontend) wrap MuteEveryoneButton with AdminOrOwnerOnly
|
- ♻️(frontend) wrap MuteEveryoneButton with AdminOrOwnerOnly
|
||||||
- ⬆️(frontend) upgrade livekit-client from 2.19.0 to 2.19.2
|
|
||||||
- ⬆️(frontend) upgrade posthog-js from 1.386.5 to 1.387.0
|
|
||||||
- ⬆️(frontend) upgrade @tanstack/react-query from 5.100.14 to 5.101.0
|
|
||||||
- ⬆️(frontend) update the frontend build image to Node 22
|
|
||||||
- 🔒️(frontend) update docker image to nginx-unprivileged:1.30.3-alpine3.23
|
|
||||||
- ✨(summary) more precise analytics events
|
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
@@ -110,7 +42,6 @@ and this project adheres to
|
|||||||
- ✨(backend) add fallback to save recordings without S3/MinIO webhooks
|
- ✨(backend) add fallback to save recordings without S3/MinIO webhooks
|
||||||
- 🩹(frontend) enable screen share button in PiP #1458
|
- 🩹(frontend) enable screen share button in PiP #1458
|
||||||
- 🐛(backend) support unencoded S3 notification object keys #1455
|
- 🐛(backend) support unencoded S3 notification object keys #1455
|
||||||
- ✨(frontend) prioritize screen share in picture-in-picture layout #1467
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
|
|||||||
uv sync --locked --no-dev
|
uv sync --locked --no-dev
|
||||||
|
|
||||||
# ---- mails ----
|
# ---- mails ----
|
||||||
FROM node:22 AS mail-builder
|
FROM node:20 AS mail-builder
|
||||||
|
|
||||||
COPY ./src/mail /mail/app
|
COPY ./src/mail /mail/app
|
||||||
|
|
||||||
|
|||||||
-12
@@ -15,15 +15,3 @@ the following command inside your docker container:
|
|||||||
(Note : in your development environment, you can `make migrate`.)
|
(Note : in your development environment, you can `make migrate`.)
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
## v1.23.0
|
|
||||||
|
|
||||||
As part of the 1.23.0 release, the legacy `api/v1` implementation has been removed from the _experimental_ Summary service and Meet has been migrated to the new `api/v2`.
|
|
||||||
|
|
||||||
**To avoid a breaking change, the Meet backend continues to use the Summary service's v1-compatible API format by default (`SUMMARY_SERVICE_VERSION` setting defaults to `1`).**
|
|
||||||
|
|
||||||
If you are deploying both Meet and Summary from this repository, you must configure the Meet backend to use the v2 API by setting the following environment variable `SUMMARY_SERVICE_VERSION=2`.
|
|
||||||
|
|
||||||
If you are upgrading only the Meet deployment while keeping an older Summary v1 compatible deployment, no action is required, as the v1-compatible API remains the default.
|
|
||||||
|
|
||||||
Note that we plan on removing the legacy `v1` summary compatibility in a future major version. If you have your own implementation for the summary service, we recommend updating its API contract and setting `SUMMARY_SERVICE_VERSION=2`.
|
|
||||||
|
|||||||
@@ -113,12 +113,6 @@ update_python_version "summary"
|
|||||||
# Update agents pyproject.toml
|
# Update agents pyproject.toml
|
||||||
update_python_version "agents"
|
update_python_version "agents"
|
||||||
|
|
||||||
# Run uv lock in agents
|
|
||||||
print_info "Running uv lock in agents..."
|
|
||||||
cd "src/agents"
|
|
||||||
uv lock
|
|
||||||
cd -
|
|
||||||
|
|
||||||
# Update CHANGELOG
|
# Update CHANGELOG
|
||||||
print_info "Updating CHANGELOG..."
|
print_info "Updating CHANGELOG..."
|
||||||
|
|
||||||
@@ -164,7 +158,6 @@ echo " - src/backend/pyproject.toml"
|
|||||||
echo " - src/backend/uv.lock"
|
echo " - src/backend/uv.lock"
|
||||||
echo " - src/summary/pyproject.toml"
|
echo " - src/summary/pyproject.toml"
|
||||||
echo " - src/agents/pyproject.toml"
|
echo " - src/agents/pyproject.toml"
|
||||||
echo " - src/agents/uv.lock"
|
|
||||||
echo " - CHANGELOG.md"
|
echo " - CHANGELOG.md"
|
||||||
echo ""
|
echo ""
|
||||||
print_warning "Next steps:"
|
print_warning "Next steps:"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# ---- Front-end image ----
|
# ---- Front-end image ----
|
||||||
FROM node:22-alpine AS frontend-deps
|
FROM node:20-alpine AS frontend-deps
|
||||||
|
|
||||||
WORKDIR /home/frontend/
|
WORKDIR /home/frontend/
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ RUN npx webpack --mode production
|
|||||||
|
|
||||||
|
|
||||||
# ---- Front-end image ----
|
# ---- Front-end image ----
|
||||||
FROM nginxinc/nginx-unprivileged:1.30.3-alpine3.23 AS frontend-production
|
FROM nginxinc/nginx-unprivileged:alpine3.23 AS frontend-production
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
|
|||||||
@@ -344,7 +344,6 @@ These are the environmental options available on meet backend.
|
|||||||
| FRONTEND_SILENCE_LIVEKIT_DEBUG | Silence LiveKit debug logs | false |
|
| FRONTEND_SILENCE_LIVEKIT_DEBUG | Silence LiveKit debug logs | false |
|
||||||
| FRONTEND_IS_SILENT_LOGIN_ENABLED | Enable silent login feature | true |
|
| FRONTEND_IS_SILENT_LOGIN_ENABLED | Enable silent login feature | true |
|
||||||
| FRONTEND_FEEDBACK | Frontend feedback configuration | {} |
|
| FRONTEND_FEEDBACK | Frontend feedback configuration | {} |
|
||||||
| FRONTEND_DOCUMENTATION_URL | URL of the documentation opened from the room options menu. If unset, the documentation menu item is hidden | |
|
|
||||||
| FRONTEND_USE_FRENCH_GOV_FOOTER | Show the French government footer in the homepage | false |
|
| FRONTEND_USE_FRENCH_GOV_FOOTER | Show the French government footer in the homepage | false |
|
||||||
| FRONTEND_USE_PROCONNECT_BUTTON | Show a "Login with ProConnect" button in the homepage instead of a "Login" button | false |
|
| FRONTEND_USE_PROCONNECT_BUTTON | Show a "Login with ProConnect" button in the homepage instead of a "Login" button | false |
|
||||||
| DJANGO_EMAIL_BACKEND | Email backend library | django.core.mail.backends.smtp.EmailBackend |
|
| DJANGO_EMAIL_BACKEND | Email backend library | django.core.mail.backends.smtp.EmailBackend |
|
||||||
|
|||||||
+4
-4
@@ -11,14 +11,14 @@ There are two ways to customize LaSuite Meet:
|
|||||||
|
|
||||||
### How to Use
|
### How to Use
|
||||||
|
|
||||||
To use this feature, simply set the `FRONTEND_CUSTOM_CSS_URL` environment variable (of the **backend** service) to the URL of your custom CSS file. For example:
|
To use this feature, simply set the `FRONTEND_CSS_URL` environment variable to the URL of your custom CSS file. For example:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
FRONTEND_CUSTOM_CSS_URL=https://example.com/custom-style.css
|
FRONTEND_CSS_URL=https://example.com/custom-style.css
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!TIP]
|
> [!TIP]
|
||||||
> If you serve your CSS file on the same domain as LaSuite Meet, paths are supported, i.e. `FRONTEND_CUSTOM_CSS_URL=/custom/style.css` will load `https://your-domain.com/custom/style.css`.
|
> If you serve your CSS file on the same domain as LaSuite Meet, paths are supported, i.e. `FRONTEND_CSS_URL=/custom/style.css` will load `https://your-domain.com/custom/style.css`.
|
||||||
|
|
||||||
Setting this variable makes the app load your CSS at runtime, adding a `<link>` to `<head>` so you can override CSS variables and customize the frontend without rebuilding.
|
Setting this variable makes the app load your CSS at runtime, adding a `<link>` to `<head>` so you can override CSS variables and customize the frontend without rebuilding.
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ Let's say you want to change the font of our application to a custom font. You c
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Then, set the `FRONTEND_CUSTOM_CSS_URL` environment variable to the URL of your custom CSS file. Once you've done this, our application will load your custom CSS file and apply the styles, changing the default font to the one you specified.
|
Then, set the `FRONTEND_CSS_URL` environment variable to the URL of your custom CSS file. Once you've done this, our application will load your custom CSS file and apply the styles, changing the default font to the one you specified.
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!IMPORTANT]
|
||||||
> You can override any CSS token—semantic or palette. See [panda.config.ts](../src/frontend/panda.config.ts) for all defined semantic tokens.
|
> You can override any CSS token—semantic or palette. See [panda.config.ts](../src/frontend/panda.config.ts) for all defined semantic tokens.
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
publiccodeYmlVersion: 0.5.0
|
|
||||||
name: LaSuite Meet
|
|
||||||
applicationSuite: LaSuite
|
|
||||||
url: https://github.com/suitenumerique/meet
|
|
||||||
releaseDate: 2026-07-22
|
|
||||||
platforms:
|
|
||||||
- web
|
|
||||||
organisation:
|
|
||||||
name: DINUM
|
|
||||||
uri: https://numerique.gouv.fr
|
|
||||||
fundedBy:
|
|
||||||
- name: Direction interministérielle du numérique (DINUM)
|
|
||||||
uri: https://www.numerique.gouv.fr
|
|
||||||
developmentStatus: stable
|
|
||||||
softwareType: standalone/web
|
|
||||||
intendedAudience:
|
|
||||||
countries:
|
|
||||||
- FR
|
|
||||||
description:
|
|
||||||
en:
|
|
||||||
localisedName: LaSuite Meet
|
|
||||||
shortDescription: "Open Source video conference solution, based on LiveKit"
|
|
||||||
longDescription: "Open Source video conference application, based on LiveKit,
|
|
||||||
Django and React. It is the official web video conference application of
|
|
||||||
French Ministries."
|
|
||||||
features:
|
|
||||||
- Optimized for stability in large meetings (+100 p.)
|
|
||||||
- Support for multiple screen sharing streams
|
|
||||||
- Non-persistent, secure chat
|
|
||||||
- Meeting recording
|
|
||||||
- Meeting transcription & Summary
|
|
||||||
- Telephony integration
|
|
||||||
- Secure participation with robust authentication and access control
|
|
||||||
- Customizable frontend style
|
|
||||||
legal:
|
|
||||||
license: MIT
|
|
||||||
maintenance:
|
|
||||||
type: internal
|
|
||||||
contacts:
|
|
||||||
- name: "Samuel Paccoud"
|
|
||||||
email: samuel.paccoud@numerique.gouv.fr
|
|
||||||
affiliation: DINUM
|
|
||||||
- name: "Antoine Lebaud"
|
|
||||||
email: antoine.lebaud.ext@numerique.gouv.fr
|
|
||||||
affiliation: DINUM
|
|
||||||
localisation:
|
|
||||||
localisationReady: true
|
|
||||||
availableLanguages:
|
|
||||||
- fr
|
|
||||||
- de
|
|
||||||
- en
|
|
||||||
- nl
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:mailappor="http://schemas.microsoft.com/office/mailappversionoverrides/1.0" xsi:type="MailApp">
|
<OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:mailappor="http://schemas.microsoft.com/office/mailappversionoverrides/1.0" xsi:type="MailApp">
|
||||||
<Id>a025f0f6-757a-4790-97f3-99c66c4a5795</Id>
|
<Id>a025f0f6-757a-4790-97f3-99c66c4a5795</Id>
|
||||||
<Version>1.0.0.0</Version>
|
<Version>0.0.2.0</Version>
|
||||||
<ProviderName>__APP_NAME__</ProviderName>
|
<ProviderName>__APP_NAME__</ProviderName>
|
||||||
<DefaultLocale>fr-FR</DefaultLocale>
|
<DefaultLocale>fr-FR</DefaultLocale>
|
||||||
<DisplayName DefaultValue="__APP_NAME__"/>
|
<DisplayName DefaultValue="__APP_NAME__"/>
|
||||||
@@ -205,174 +205,5 @@
|
|||||||
</bt:String>
|
</bt:String>
|
||||||
</bt:LongStrings>
|
</bt:LongStrings>
|
||||||
</Resources>
|
</Resources>
|
||||||
|
|
||||||
<!-- ─── V1.1 override: required for shared folder / delegate support ─── -->
|
|
||||||
<VersionOverrides xmlns="http://schemas.microsoft.com/office/mailappversionoverrides/1.1" xsi:type="VersionOverridesV1_1">
|
|
||||||
<Requirements>
|
|
||||||
<bt:Sets DefaultMinVersion="1.8">
|
|
||||||
<bt:Set Name="Mailbox"/>
|
|
||||||
</bt:Sets>
|
|
||||||
</Requirements>
|
|
||||||
<Hosts>
|
|
||||||
<Host xsi:type="MailHost">
|
|
||||||
<DesktopFormFactor>
|
|
||||||
<FunctionFile resid="Commands.Url"/>
|
|
||||||
<SupportsSharedFolders>true</SupportsSharedFolders>
|
|
||||||
|
|
||||||
<!-- ─── Mail: Read ─────────────────────────────────────────── -->
|
|
||||||
<ExtensionPoint xsi:type="MessageReadCommandSurface">
|
|
||||||
<OfficeTab id="TabDefault">
|
|
||||||
<Group id="msgReadGroup">
|
|
||||||
<Label resid="GroupLabel"/>
|
|
||||||
<Control xsi:type="Button" id="msgReadOpenPaneButton">
|
|
||||||
<Label resid="TaskpaneButton.Label"/>
|
|
||||||
<Supertip>
|
|
||||||
<Title resid="TaskpaneButton.Label"/>
|
|
||||||
<Description resid="TaskpaneButton.Tooltip"/>
|
|
||||||
</Supertip>
|
|
||||||
<Icon>
|
|
||||||
<bt:Image size="16" resid="Icon.16x16"/>
|
|
||||||
<bt:Image size="32" resid="Icon.32x32"/>
|
|
||||||
<bt:Image size="80" resid="Icon.80x80"/>
|
|
||||||
</Icon>
|
|
||||||
<Action xsi:type="ShowTaskpane">
|
|
||||||
<SourceLocation resid="Taskpane.Url"/>
|
|
||||||
</Action>
|
|
||||||
</Control>
|
|
||||||
</Group>
|
|
||||||
</OfficeTab>
|
|
||||||
</ExtensionPoint>
|
|
||||||
|
|
||||||
<!-- ─── Mail: Compose ─────────────────────────────────────── -->
|
|
||||||
<ExtensionPoint xsi:type="MessageComposeCommandSurface">
|
|
||||||
<OfficeTab id="TabDefault">
|
|
||||||
<Group id="msgComposeGroup">
|
|
||||||
<Label resid="GroupLabel"/>
|
|
||||||
<Control xsi:type="Button" id="msgComposeGenerateLinkButton">
|
|
||||||
<Label resid="GenerateLink.Label"/>
|
|
||||||
<Supertip>
|
|
||||||
<Title resid="GenerateLink.Label"/>
|
|
||||||
<Description resid="GenerateLink.Tooltip"/>
|
|
||||||
</Supertip>
|
|
||||||
<Icon>
|
|
||||||
<bt:Image size="16" resid="Icon.16x16"/>
|
|
||||||
<bt:Image size="32" resid="Icon.32x32"/>
|
|
||||||
<bt:Image size="80" resid="Icon.80x80"/>
|
|
||||||
</Icon>
|
|
||||||
<Action xsi:type="ExecuteFunction">
|
|
||||||
<FunctionName>generateMeetingLinkFromMail</FunctionName>
|
|
||||||
</Action>
|
|
||||||
</Control>
|
|
||||||
<Control xsi:type="Button" id="msgComposeOpenPaneButton">
|
|
||||||
<Label resid="TaskpaneButton.Label"/>
|
|
||||||
<Supertip>
|
|
||||||
<Title resid="TaskpaneButton.Label"/>
|
|
||||||
<Description resid="TaskpaneButton.Tooltip"/>
|
|
||||||
</Supertip>
|
|
||||||
<Icon>
|
|
||||||
<bt:Image size="16" resid="Settings.16x16"/>
|
|
||||||
<bt:Image size="32" resid="Settings.32x32"/>
|
|
||||||
<bt:Image size="80" resid="Settings.80x80"/>
|
|
||||||
</Icon>
|
|
||||||
<Action xsi:type="ShowTaskpane">
|
|
||||||
<SourceLocation resid="Taskpane.Url"/>
|
|
||||||
</Action>
|
|
||||||
</Control>
|
|
||||||
</Group>
|
|
||||||
</OfficeTab>
|
|
||||||
</ExtensionPoint>
|
|
||||||
|
|
||||||
<!-- ─── Calendar: Compose (New/Edit appointment) ──────────── -->
|
|
||||||
<ExtensionPoint xsi:type="AppointmentOrganizerCommandSurface">
|
|
||||||
<OfficeTab id="TabDefault">
|
|
||||||
<Group id="apptComposeGroup">
|
|
||||||
<Label resid="GroupLabel"/>
|
|
||||||
<Control xsi:type="Button" id="apptGenerateLinkButton">
|
|
||||||
<Label resid="GenerateLink.Label"/>
|
|
||||||
<Supertip>
|
|
||||||
<Title resid="GenerateLink.Label"/>
|
|
||||||
<Description resid="GenerateLink.Tooltip"/>
|
|
||||||
</Supertip>
|
|
||||||
<Icon>
|
|
||||||
<bt:Image size="16" resid="Icon.16x16"/>
|
|
||||||
<bt:Image size="32" resid="Icon.32x32"/>
|
|
||||||
<bt:Image size="80" resid="Icon.80x80"/>
|
|
||||||
</Icon>
|
|
||||||
<Action xsi:type="ExecuteFunction">
|
|
||||||
<FunctionName>generateMeetingLinkFromCalendar</FunctionName>
|
|
||||||
</Action>
|
|
||||||
</Control>
|
|
||||||
|
|
||||||
<Control xsi:type="Button" id="apptOpenSettingsButton">
|
|
||||||
<Label resid="OpenSettings.Label"/>
|
|
||||||
<Supertip>
|
|
||||||
<Title resid="OpenSettings.Label"/>
|
|
||||||
<Description resid="OpenSettings.Tooltip"/>
|
|
||||||
</Supertip>
|
|
||||||
<Icon>
|
|
||||||
<bt:Image size="16" resid="Settings.16x16"/>
|
|
||||||
<bt:Image size="32" resid="Settings.32x32"/>
|
|
||||||
<bt:Image size="80" resid="Settings.80x80"/>
|
|
||||||
</Icon>
|
|
||||||
<Action xsi:type="ShowTaskpane">
|
|
||||||
<SourceLocation resid="Taskpane.Url"/>
|
|
||||||
</Action>
|
|
||||||
</Control>
|
|
||||||
|
|
||||||
</Group>
|
|
||||||
</OfficeTab>
|
|
||||||
</ExtensionPoint>
|
|
||||||
|
|
||||||
</DesktopFormFactor>
|
|
||||||
</Host>
|
|
||||||
</Hosts>
|
|
||||||
<Resources>
|
|
||||||
<bt:Images>
|
|
||||||
<bt:Image id="Settings.16x16" DefaultValue="https://localhost:3000/addons/outlook/assets/settings-16.png"/>
|
|
||||||
<bt:Image id="Settings.32x32" DefaultValue="https://localhost:3000/addons/outlook/assets/settings-32.png"/>
|
|
||||||
<bt:Image id="Settings.80x80" DefaultValue="https://localhost:3000/addons/outlook/assets/settings-80.png"/>
|
|
||||||
<bt:Image id="Add.16x16" DefaultValue="https://localhost:3000/addons/outlook/assets/add-16.png"/>
|
|
||||||
<bt:Image id="Add.32x32" DefaultValue="https://localhost:3000/addons/outlook/assets/add-32.png"/>
|
|
||||||
<bt:Image id="Add.80x80" DefaultValue="https://localhost:3000/addons/outlook/assets/add-80.png"/>
|
|
||||||
<bt:Image id="Icon.16x16" DefaultValue="https://localhost:3000/addons/outlook/assets/icon-16.png"/>
|
|
||||||
<bt:Image id="Icon.32x32" DefaultValue="https://localhost:3000/addons/outlook/assets/icon-32.png"/>
|
|
||||||
<bt:Image id="Icon.80x80" DefaultValue="https://localhost:3000/addons/outlook/assets/icon-80.png"/>
|
|
||||||
</bt:Images>
|
|
||||||
<bt:Urls>
|
|
||||||
<bt:Url id="Commands.Url" DefaultValue="https://localhost:3000/addons/outlook/commands.html"/>
|
|
||||||
<bt:Url id="Taskpane.Url" DefaultValue="https://localhost:3000/addons/outlook/taskpane.html"/>
|
|
||||||
</bt:Urls>
|
|
||||||
<bt:ShortStrings>
|
|
||||||
<!-- Default (French) -->
|
|
||||||
<bt:String id="GroupLabel" DefaultValue="__APP_NAME__"/>
|
|
||||||
<bt:String id="GenerateLink.Label" DefaultValue="Ajouter un lien __APP_NAME__">
|
|
||||||
<bt:Override Locale="en-US" Value="Add a __APP_NAME__ link"/>
|
|
||||||
<bt:Override Locale="de-DE" Value="__APP_NAME__-Link hinzufügen"/>
|
|
||||||
</bt:String>
|
|
||||||
<bt:String id="TaskpaneButton.Label" DefaultValue="Ouvrir les paramètres">
|
|
||||||
<bt:Override Locale="en-US" Value="Open settings"/>
|
|
||||||
<bt:Override Locale="de-DE" Value="Einstellungen öffnen"/>
|
|
||||||
</bt:String>
|
|
||||||
<bt:String id="OpenSettings.Label" DefaultValue="Paramètres">
|
|
||||||
<bt:Override Locale="en-US" Value="Settings"/>
|
|
||||||
<bt:Override Locale="de-DE" Value="Einstellungen"/>
|
|
||||||
</bt:String>
|
|
||||||
</bt:ShortStrings>
|
|
||||||
<bt:LongStrings>
|
|
||||||
<bt:String id="GenerateLink.Tooltip" DefaultValue="Génère un lien de réunion __APP_NAME__ et l'insère dans l'événement.">
|
|
||||||
<bt:Override Locale="de-DE" Value="Generiert einen __APP_NAME__-Besprechungslink und fügt ihn in den Termin ein."/>
|
|
||||||
<bt:Override Locale="en-US" Value="Generates a __APP_NAME__ meeting link and inserts it into the item."/>
|
|
||||||
</bt:String>
|
|
||||||
<bt:String id="TaskpaneButton.Tooltip" DefaultValue="Ouvre les paramètres de connexion __APP_NAME__.">
|
|
||||||
<bt:Override Locale="de-DE" Value="Öffnet die __APP_NAME__-Verbindungseinstellungen."/>
|
|
||||||
<bt:Override Locale="en-US" Value="Opens the __APP_NAME__ connection settings."/>
|
|
||||||
</bt:String>
|
|
||||||
<bt:String id="OpenSettings.Tooltip" DefaultValue="Ouvre les paramètres de connexion __APP_NAME__.">
|
|
||||||
<bt:Override Locale="de-DE" Value="Öffnet die __APP_NAME__-Verbindungseinstellungen."/>
|
|
||||||
<bt:Override Locale="en-US" Value="Opens the __APP_NAME__ connection settings."/>
|
|
||||||
</bt:String>
|
|
||||||
</bt:LongStrings>
|
|
||||||
</Resources>
|
|
||||||
</VersionOverrides>
|
|
||||||
</VersionOverrides>
|
</VersionOverrides>
|
||||||
</OfficeApp>
|
</OfficeApp>
|
||||||
|
|||||||
Generated
+4
-4
@@ -10,7 +10,7 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"core-js": "3.49.0",
|
"core-js": "3.49.0",
|
||||||
"i18next": "^26.3.4",
|
"i18next": "26.3.1",
|
||||||
"i18next-browser-languagedetector": "8.2.1",
|
"i18next-browser-languagedetector": "8.2.1",
|
||||||
"regenerator-runtime": "0.14.1"
|
"regenerator-runtime": "0.14.1"
|
||||||
},
|
},
|
||||||
@@ -9364,9 +9364,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/i18next": {
|
"node_modules/i18next": {
|
||||||
"version": "26.3.4",
|
"version": "26.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz",
|
||||||
"integrity": "sha512-pa7m0d7pBDqGHZxljT+WPFeyFgQ7P7SciPPo1tTqYuO0z4sqADYhwnBESmmGp/wEof1inwdls/k8ZgTg8rxFHA==",
|
"integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "individual",
|
"type": "individual",
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"core-js": "3.49.0",
|
"core-js": "3.49.0",
|
||||||
"i18next": "26.3.4",
|
"i18next": "26.3.1",
|
||||||
"i18next-browser-languagedetector": "8.2.1",
|
"i18next-browser-languagedetector": "8.2.1",
|
||||||
"regenerator-runtime": "0.14.1"
|
"regenerator-runtime": "0.14.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -57,7 +57,8 @@
|
|||||||
data-i18n="footer.feedback"
|
data-i18n="footer.feedback"
|
||||||
></a>
|
></a>
|
||||||
<div id="footer-right">
|
<div id="footer-right">
|
||||||
<span class="version-number">1.0.0</span>
|
<span class="version-badge">beta</span>
|
||||||
|
<span class="version-number">0.0.2</span>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "agents"
|
name = "agents"
|
||||||
version = "1.24.0"
|
version = "1.22.0"
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"livekit-agents==1.6.4",
|
"livekit-agents==1.6.4",
|
||||||
|
|||||||
Generated
+1
-1
@@ -9,7 +9,7 @@ resolution-markers = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "agents"
|
name = "agents"
|
||||||
version = "1.24.0"
|
version = "1.22.0"
|
||||||
source = { virtual = "." }
|
source = { virtual = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "livekit-agents" },
|
{ name = "livekit-agents" },
|
||||||
|
|||||||
@@ -402,14 +402,7 @@ class RecordingAdmin(admin.ModelAdmin):
|
|||||||
"""Recording admin interface declaration."""
|
"""Recording admin interface declaration."""
|
||||||
|
|
||||||
inlines = (RecordingAccessInline,)
|
inlines = (RecordingAccessInline,)
|
||||||
search_fields = [
|
search_fields = ["status", "=id", "worker_id", "room__slug", "=room__id"]
|
||||||
"status",
|
|
||||||
"=id",
|
|
||||||
"worker_id",
|
|
||||||
"room__slug",
|
|
||||||
"=room__id",
|
|
||||||
"accesses__user__email",
|
|
||||||
]
|
|
||||||
list_display = (
|
list_display = (
|
||||||
"id",
|
"id",
|
||||||
"status",
|
"status",
|
||||||
|
|||||||
@@ -68,9 +68,6 @@ def get_frontend_configuration(request):
|
|||||||
"enable_firefox_proxy_workaround": settings.LIVEKIT_ENABLE_FIREFOX_PROXY_WORKAROUND,
|
"enable_firefox_proxy_workaround": settings.LIVEKIT_ENABLE_FIREFOX_PROXY_WORKAROUND,
|
||||||
"default_sources": settings.LIVEKIT_DEFAULT_SOURCES,
|
"default_sources": settings.LIVEKIT_DEFAULT_SOURCES,
|
||||||
},
|
},
|
||||||
"authenticated_users_can_edit_display_name": (
|
|
||||||
settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
frontend_configuration.update(settings.FRONTEND_CONFIGURATION)
|
frontend_configuration.update(settings.FRONTEND_CONFIGURATION)
|
||||||
return Response(frontend_configuration)
|
return Response(frontend_configuration)
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
"""Connection test API endpoint."""
|
|
||||||
|
|
||||||
from datetime import timedelta
|
|
||||||
from uuid import uuid4
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from rest_framework.decorators import api_view, throttle_classes
|
|
||||||
from rest_framework.response import Response
|
|
||||||
|
|
||||||
from core.api.throttling import (
|
|
||||||
ConnectionTestAnonRateThrottle,
|
|
||||||
ConnectionTestUserRateThrottle,
|
|
||||||
)
|
|
||||||
from core.tasks.connection_test import delete_connection_test_room
|
|
||||||
from core.utils import generate_token
|
|
||||||
|
|
||||||
CONNECTION_TEST_USERNAME = "Test connexion"
|
|
||||||
|
|
||||||
|
|
||||||
@api_view(["GET"])
|
|
||||||
@throttle_classes([ConnectionTestUserRateThrottle, ConnectionTestAnonRateThrottle])
|
|
||||||
def get_connection_test_config(request):
|
|
||||||
"""Return a short-lived LiveKit token for an ephemeral connection test room."""
|
|
||||||
room = f"{settings.CONNECTION_TEST_ROOM_PREFIX}{uuid4()}"
|
|
||||||
expires_in = settings.CONNECTION_TEST_TOKEN_TTL_SECONDS
|
|
||||||
|
|
||||||
# LiveKit refreshes tokens for connected clients, so JWT TTL alone does not
|
|
||||||
# eject someone who stays connected. Schedule a hard DeleteRoom when Celery
|
|
||||||
# is available.
|
|
||||||
if settings.CELERY_ENABLED:
|
|
||||||
delete_connection_test_room.apply_async(
|
|
||||||
args=[room],
|
|
||||||
countdown=settings.CONNECTION_TEST_ROOM_MAX_AGE_SECONDS,
|
|
||||||
)
|
|
||||||
|
|
||||||
return Response(
|
|
||||||
{
|
|
||||||
"livekit": {
|
|
||||||
"url": settings.LIVEKIT_CONFIGURATION["url"],
|
|
||||||
"room": room,
|
|
||||||
"token": generate_token(
|
|
||||||
room=room,
|
|
||||||
user=request.user,
|
|
||||||
username=CONNECTION_TEST_USERNAME,
|
|
||||||
ttl=timedelta(seconds=expires_in),
|
|
||||||
),
|
|
||||||
"expires_in": expires_in,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
)
|
|
||||||
@@ -6,11 +6,6 @@ from django.http import Http404
|
|||||||
from rest_framework import permissions
|
from rest_framework import permissions
|
||||||
|
|
||||||
from ..models import RoleChoices
|
from ..models import RoleChoices
|
||||||
from ..services.participants_management import (
|
|
||||||
ParticipantNotFoundException,
|
|
||||||
ParticipantsManagement,
|
|
||||||
ParticipantsManagementException,
|
|
||||||
)
|
|
||||||
|
|
||||||
ACTION_FOR_METHOD_TO_PERMISSION = {
|
ACTION_FOR_METHOD_TO_PERMISSION = {
|
||||||
"versions_detail": {"DELETE": "versions_destroy", "GET": "versions_retrieve"}
|
"versions_detail": {"DELETE": "versions_destroy", "GET": "versions_retrieve"}
|
||||||
@@ -171,30 +166,3 @@ class CanMuteParticipant(permissions.BasePermission):
|
|||||||
|
|
||||||
# LiveKit token scoped to this room
|
# LiveKit token scoped to this room
|
||||||
return request.auth.video.room == str(obj.id)
|
return request.auth.video.room == str(obj.id)
|
||||||
|
|
||||||
|
|
||||||
class IsPresentInMeeting(permissions.BasePermission):
|
|
||||||
"""Check that the requesting user is currently connected to the meeting.
|
|
||||||
|
|
||||||
The requester must be session-authenticated (their DB identity is needed
|
|
||||||
to check privileges); presence is verified against LiveKit using their
|
|
||||||
`sub` as participant identity. Fails closed on LiveKit errors.
|
|
||||||
"""
|
|
||||||
|
|
||||||
message = "You must be connected to the meeting to perform this action."
|
|
||||||
|
|
||||||
def has_object_permission(self, request, view, obj):
|
|
||||||
"""Verify the requester's identity is a participant of the room."""
|
|
||||||
user = request.user
|
|
||||||
|
|
||||||
if not user or not user.is_authenticated:
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
|
||||||
return ParticipantsManagement().check_if_in_meeting(
|
|
||||||
room_name=str(obj.pk), identity=str(user.sub)
|
|
||||||
)
|
|
||||||
except ParticipantNotFoundException:
|
|
||||||
return False
|
|
||||||
except ParticipantsManagementException:
|
|
||||||
return False
|
|
||||||
|
|||||||
@@ -183,11 +183,13 @@ class RoomSerializer(serializers.ModelSerializer):
|
|||||||
user=request.user,
|
user=request.user,
|
||||||
username=username,
|
username=username,
|
||||||
configuration=output["configuration"],
|
configuration=output["configuration"],
|
||||||
role=role,
|
is_admin_or_owner=is_admin_or_owner,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
del output["pin_code"]
|
del output["pin_code"]
|
||||||
|
|
||||||
|
output["is_administrable"] = is_admin_or_owner
|
||||||
|
|
||||||
return output
|
return output
|
||||||
|
|
||||||
|
|
||||||
@@ -297,8 +299,8 @@ class RoomInviteSerializer(serializers.Serializer):
|
|||||||
class BaseParticipantsManagementSerializer(BaseValidationOnlySerializer):
|
class BaseParticipantsManagementSerializer(BaseValidationOnlySerializer):
|
||||||
"""Base serializer for participant management operations."""
|
"""Base serializer for participant management operations."""
|
||||||
|
|
||||||
participant_identity = serializers.CharField(
|
participant_identity = serializers.UUIDField(
|
||||||
help_text="LiveKit participant identity (matching the user's sub format)"
|
help_text="LiveKit participant identity (UUID format)"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -310,15 +312,6 @@ class MuteParticipantSerializer(BaseParticipantsManagementSerializer):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class ParticipantRoleSerializer(BaseParticipantsManagementSerializer):
|
|
||||||
"""Validate an in-meeting role change (promotion/demotion) request."""
|
|
||||||
|
|
||||||
role = serializers.ChoiceField(
|
|
||||||
choices=[models.RoleChoices.MEMBER, models.RoleChoices.ADMIN],
|
|
||||||
help_text="Target role. Ownership cannot be granted this way.",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
TrackSource = Literal["camera", "microphone", "screen_share", "screen_share_audio"]
|
TrackSource = Literal["camera", "microphone", "screen_share", "screen_share_audio"]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -73,15 +73,3 @@ class CreationCallbackAnonRateThrottle(MonitoredAnonRateThrottle):
|
|||||||
"""Throttle Anonymous user requesting room generation callback"""
|
"""Throttle Anonymous user requesting room generation callback"""
|
||||||
|
|
||||||
scope = "creation_callback"
|
scope = "creation_callback"
|
||||||
|
|
||||||
|
|
||||||
class ConnectionTestUserRateThrottle(MonitoredUserRateThrottle):
|
|
||||||
"""Throttle authenticated users requesting connection test tokens."""
|
|
||||||
|
|
||||||
scope = "connection_test"
|
|
||||||
|
|
||||||
|
|
||||||
class ConnectionTestAnonRateThrottle(MonitoredAnonRateThrottle):
|
|
||||||
"""Throttle anonymous users requesting connection test tokens."""
|
|
||||||
|
|
||||||
scope = "connection_test"
|
|
||||||
|
|||||||
@@ -88,15 +88,10 @@ from core.services.room_management import (
|
|||||||
RoomManagementException,
|
RoomManagementException,
|
||||||
RoomNotFoundException,
|
RoomNotFoundException,
|
||||||
)
|
)
|
||||||
from core.services.room_roles import (
|
|
||||||
RoomRoleError,
|
|
||||||
RoomRoleService,
|
|
||||||
)
|
|
||||||
from core.services.subtitle import SubtitleException, SubtitleService
|
from core.services.subtitle import SubtitleException, SubtitleService
|
||||||
from core.tasks.file import process_file_deletion
|
from core.tasks.file import process_file_deletion
|
||||||
|
|
||||||
from ..authentication.livekit import LiveKitTokenAuthentication
|
from ..authentication.livekit import LiveKitTokenAuthentication
|
||||||
from ..models import RoomAccessLevel
|
|
||||||
from . import permissions, serializers, throttling
|
from . import permissions, serializers, throttling
|
||||||
from .feature_flag import FeatureFlag
|
from .feature_flag import FeatureFlag
|
||||||
|
|
||||||
@@ -272,9 +267,6 @@ class RoomViewSet(
|
|||||||
username = request.query_params.get("username", None)
|
username = request.query_params.get("username", None)
|
||||||
data = {
|
data = {
|
||||||
"id": None,
|
"id": None,
|
||||||
"slug": slug,
|
|
||||||
"is_administrable": False,
|
|
||||||
"access_level": RoomAccessLevel.PUBLIC,
|
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": settings.LIVEKIT_CONFIGURATION["url"],
|
"url": settings.LIVEKIT_CONFIGURATION["url"],
|
||||||
"room": slug,
|
"room": slug,
|
||||||
@@ -643,53 +635,6 @@ class RoomViewSet(
|
|||||||
status=drf_status.HTTP_200_OK,
|
status=drf_status.HTTP_200_OK,
|
||||||
)
|
)
|
||||||
|
|
||||||
@decorators.action(
|
|
||||||
detail=True,
|
|
||||||
methods=["post"],
|
|
||||||
url_path="update-participant-role",
|
|
||||||
permission_classes=[
|
|
||||||
permissions.HasPrivilegesOnRoom,
|
|
||||||
permissions.IsPresentInMeeting,
|
|
||||||
],
|
|
||||||
)
|
|
||||||
def update_participant_role(self, request, pk=None): # pylint: disable=unused-argument
|
|
||||||
"""Promote or demote a participant currently connected to the meeting.
|
|
||||||
|
|
||||||
Requires the requester to be session-authenticated, have privileges
|
|
||||||
(admin/owner) on the room, and be connected to the meeting.
|
|
||||||
|
|
||||||
If the target participant has a user account, the role is persisted
|
|
||||||
(`ResourceAccess`) then mirrored to their LiveKit attributes.
|
|
||||||
|
|
||||||
If the participant is anonymous, the promotion will fail.
|
|
||||||
"""
|
|
||||||
|
|
||||||
room = self.get_object()
|
|
||||||
|
|
||||||
serializer = serializers.ParticipantRoleSerializer(data=request.data)
|
|
||||||
serializer.is_valid(raise_exception=True)
|
|
||||||
|
|
||||||
participant_identity = serializer.validated_data["participant_identity"]
|
|
||||||
role = serializer.validated_data["role"]
|
|
||||||
|
|
||||||
if str(request.user.sub) == str(participant_identity):
|
|
||||||
return drf_response.Response(
|
|
||||||
{"error": "You cannot change your own role."},
|
|
||||||
status=drf_status.HTTP_403_FORBIDDEN,
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
result = RoomRoleService().set_participant_role(
|
|
||||||
room=room,
|
|
||||||
participant_identity=participant_identity,
|
|
||||||
role=role,
|
|
||||||
actor=request.user,
|
|
||||||
)
|
|
||||||
except RoomRoleError as e:
|
|
||||||
return drf_response.Response({"error": str(e)}, status=e.status_code)
|
|
||||||
|
|
||||||
return drf_response.Response(result, status=drf_status.HTTP_200_OK)
|
|
||||||
|
|
||||||
@decorators.action(
|
@decorators.action(
|
||||||
detail=True,
|
detail=True,
|
||||||
methods=["post"],
|
methods=["post"],
|
||||||
|
|||||||
@@ -215,6 +215,5 @@ class RoomViewSet(
|
|||||||
"client_id": client_id,
|
"client_id": client_id,
|
||||||
"external_api": True,
|
"external_api": True,
|
||||||
"auth_method": auth_method,
|
"auth_method": auth_method,
|
||||||
"$set": {"email": self.request.user.email},
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ from livekit import api
|
|||||||
from core import models, utils
|
from core import models, utils
|
||||||
from core.models import Recording
|
from core.models import Recording
|
||||||
from core.recording.event.notification import notification_service
|
from core.recording.event.notification import notification_service
|
||||||
from core.services.room_management import (
|
|
||||||
RoomManagement,
|
|
||||||
RoomManagementException,
|
|
||||||
RoomNotFoundException,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = getLogger(__name__)
|
logger = getLogger(__name__)
|
||||||
|
|
||||||
@@ -44,15 +39,10 @@ class RecordingEventsService:
|
|||||||
recording_status = status_mapping.get(egress_status)
|
recording_status = status_mapping.get(egress_status)
|
||||||
if recording_status:
|
if recording_status:
|
||||||
try:
|
try:
|
||||||
RoomManagement().update_metadata(
|
utils.update_room_metadata(
|
||||||
room_name, {"recording_status": recording_status}
|
room_name, {"recording_status": recording_status}
|
||||||
)
|
)
|
||||||
except RoomNotFoundException:
|
except utils.MetadataUpdateException as e:
|
||||||
logger.info(
|
|
||||||
"LiveKit room %s no longer exists, skipping metadata update",
|
|
||||||
room_name,
|
|
||||||
)
|
|
||||||
except RoomManagementException as e:
|
|
||||||
logger.exception("Failed to update room's metadata: %s", e)
|
logger.exception("Failed to update room's metadata: %s", e)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
@@ -2,12 +2,8 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from core import utils
|
||||||
from core.models import Recording, RecordingStatusChoices
|
from core.models import Recording, RecordingStatusChoices
|
||||||
from core.services.room_management import (
|
|
||||||
RoomManagement,
|
|
||||||
RoomManagementException,
|
|
||||||
RoomNotFoundException,
|
|
||||||
)
|
|
||||||
|
|
||||||
from .exceptions import (
|
from .exceptions import (
|
||||||
RecordingStartError,
|
RecordingStartError,
|
||||||
@@ -68,15 +64,10 @@ class WorkerServiceMediator:
|
|||||||
mode = recording.options.get("original_mode", None) or recording.mode
|
mode = recording.options.get("original_mode", None) or recording.mode
|
||||||
|
|
||||||
try:
|
try:
|
||||||
RoomManagement().update_metadata(
|
utils.update_room_metadata(
|
||||||
room_name, {"recording_mode": mode, "recording_status": "starting"}
|
room_name, {"recording_mode": mode, "recording_status": "starting"}
|
||||||
)
|
)
|
||||||
except RoomNotFoundException:
|
except utils.MetadataUpdateException as e:
|
||||||
logger.info(
|
|
||||||
"LiveKit room %s no longer exists, skipping metadata update",
|
|
||||||
room_name,
|
|
||||||
)
|
|
||||||
except RoomManagementException as e:
|
|
||||||
logger.exception("Failed to update room's metadata: %s", e)
|
logger.exception("Failed to update room's metadata: %s", e)
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from django.conf import settings
|
|||||||
|
|
||||||
from livekit import api
|
from livekit import api
|
||||||
|
|
||||||
from core import models
|
from core import models, utils
|
||||||
from core.recording.services.metadata_collector import (
|
from core.recording.services.metadata_collector import (
|
||||||
MetadataCollectorException,
|
MetadataCollectorException,
|
||||||
MetadataCollectorService,
|
MetadataCollectorService,
|
||||||
@@ -23,11 +23,6 @@ from core.recording.services.recording_events import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from .lobby import LobbyService
|
from .lobby import LobbyService
|
||||||
from .room_management import (
|
|
||||||
RoomManagement,
|
|
||||||
RoomManagementException,
|
|
||||||
RoomNotFoundException,
|
|
||||||
)
|
|
||||||
from .telephony import TelephonyException, TelephonyService
|
from .telephony import TelephonyException, TelephonyService
|
||||||
|
|
||||||
logger = getLogger(__name__)
|
logger = getLogger(__name__)
|
||||||
@@ -182,15 +177,10 @@ class LiveKitEventsService:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
room_name = str(recording.room.id)
|
room_name = str(recording.room.id)
|
||||||
RoomManagement().update_metadata(
|
utils.update_room_metadata(
|
||||||
room_name, remove_keys=["recording_mode", "recording_status"]
|
room_name, {}, ["recording_mode", "recording_status"]
|
||||||
)
|
)
|
||||||
except RoomNotFoundException:
|
except utils.MetadataUpdateException as e:
|
||||||
logger.info(
|
|
||||||
"LiveKit room %s no longer exists, skipping metadata update",
|
|
||||||
room_name,
|
|
||||||
)
|
|
||||||
except RoomManagementException as e:
|
|
||||||
logger.exception("Failed to update room's metadata: %s", e)
|
logger.exception("Failed to update room's metadata: %s", e)
|
||||||
|
|
||||||
if recording.options.get("metadata_collector_dispatch_id", None) is not None:
|
if recording.options.get("metadata_collector_dispatch_id", None) is not None:
|
||||||
@@ -228,21 +218,9 @@ class LiveKitEventsService:
|
|||||||
|
|
||||||
# Silently ignoring EGRESS_ABORTED, EGRESS_FAILED
|
# Silently ignoring EGRESS_ABORTED, EGRESS_FAILED
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _is_connection_test_room(room_name: str) -> bool:
|
|
||||||
"""Return True for ephemeral rooms created by the connection test endpoint."""
|
|
||||||
return room_name.startswith(settings.CONNECTION_TEST_ROOM_PREFIX)
|
|
||||||
|
|
||||||
def _handle_room_started(self, data):
|
def _handle_room_started(self, data):
|
||||||
"""Handle 'room_started' event."""
|
"""Handle 'room_started' event."""
|
||||||
|
|
||||||
if self._is_connection_test_room(data.room.name):
|
|
||||||
logger.info(
|
|
||||||
"Ignoring room_started event for connection test room '%s'.",
|
|
||||||
data.room.name,
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
room_id = uuid.UUID(data.room.name)
|
room_id = uuid.UUID(data.room.name)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
@@ -268,13 +246,6 @@ class LiveKitEventsService:
|
|||||||
def _handle_room_finished(self, data):
|
def _handle_room_finished(self, data):
|
||||||
"""Handle 'room_finished' event."""
|
"""Handle 'room_finished' event."""
|
||||||
|
|
||||||
if self._is_connection_test_room(data.room.name):
|
|
||||||
logger.info(
|
|
||||||
"Ignoring room_finished event for connection test room '%s'.",
|
|
||||||
data.room.name,
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
room_id = uuid.UUID(data.room.name)
|
room_id = uuid.UUID(data.room.name)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
|
|||||||
@@ -104,30 +104,21 @@ class LobbyService:
|
|||||||
)
|
)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def can_bypass_lobby(room, user, role) -> bool:
|
def can_bypass_lobby(room, user) -> bool:
|
||||||
"""Determines if a user can bypass the waiting lobby and join a room directly.
|
"""Determines if a user can bypass the waiting lobby and join a room directly.
|
||||||
|
|
||||||
A user can bypass the lobby if:
|
A user can bypass the lobby if:
|
||||||
1. The room is public (open to everyone)
|
1. The room is public (open to everyone)
|
||||||
2. The room has TRUSTED access level and the user is authenticated
|
2. The room has TRUSTED access level and the user is authenticated
|
||||||
2. The room has RESTRICTED access level and the user has any role
|
|
||||||
|
|
||||||
Note: Room access levels can change while participants are waiting in the lobby.
|
Note: Room access levels can change while participants are waiting in the lobby.
|
||||||
This function only checks the current state and should be called each time
|
This function only checks the current state and should be called each time
|
||||||
a participant requests entry to ensure consistent access control, even for
|
a participant requests entry to ensure consistent access control, even for
|
||||||
participants who have already begun waiting.
|
participants who have already begun waiting.
|
||||||
"""
|
"""
|
||||||
return (
|
return room.is_public or (
|
||||||
room.is_public
|
room.access_level == models.RoomAccessLevel.TRUSTED
|
||||||
or (
|
and user.is_authenticated
|
||||||
room.access_level == models.RoomAccessLevel.TRUSTED
|
|
||||||
and user.is_authenticated
|
|
||||||
)
|
|
||||||
or (
|
|
||||||
room.access_level == models.RoomAccessLevel.RESTRICTED
|
|
||||||
and user.is_authenticated
|
|
||||||
and role is not None
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def request_entry(
|
def request_entry(
|
||||||
@@ -153,9 +144,8 @@ class LobbyService:
|
|||||||
participant = self._get_participant(room.id, participant_id)
|
participant = self._get_participant(room.id, participant_id)
|
||||||
|
|
||||||
room_id = str(room.id)
|
room_id = str(room.id)
|
||||||
user_role = room.get_role(request.user)
|
|
||||||
|
|
||||||
if self.can_bypass_lobby(room=room, user=request.user, role=user_role):
|
if self.can_bypass_lobby(room=room, user=request.user):
|
||||||
if participant is None:
|
if participant is None:
|
||||||
participant = LobbyParticipant(
|
participant = LobbyParticipant(
|
||||||
status=LobbyParticipantStatus.ACCEPTED,
|
status=LobbyParticipantStatus.ACCEPTED,
|
||||||
@@ -172,8 +162,8 @@ class LobbyService:
|
|||||||
username=username,
|
username=username,
|
||||||
color=participant.color,
|
color=participant.color,
|
||||||
configuration=room.configuration,
|
configuration=room.configuration,
|
||||||
|
is_admin_or_owner=False,
|
||||||
participant_id=participant_id,
|
participant_id=participant_id,
|
||||||
role=user_role,
|
|
||||||
)
|
)
|
||||||
return participant, livekit_config
|
return participant, livekit_config
|
||||||
|
|
||||||
@@ -193,8 +183,8 @@ class LobbyService:
|
|||||||
username=username,
|
username=username,
|
||||||
color=participant.color,
|
color=participant.color,
|
||||||
configuration=room.configuration,
|
configuration=room.configuration,
|
||||||
|
is_admin_or_owner=False,
|
||||||
participant_id=participant_id,
|
participant_id=participant_id,
|
||||||
role=user_role,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return participant, livekit_config
|
return participant, livekit_config
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ from typing import Dict, Optional
|
|||||||
|
|
||||||
from asgiref.sync import async_to_sync
|
from asgiref.sync import async_to_sync
|
||||||
from livekit.api import (
|
from livekit.api import (
|
||||||
ListRoomsRequest,
|
|
||||||
TwirpError,
|
TwirpError,
|
||||||
UpdateRoomMetadataRequest,
|
UpdateRoomMetadataRequest,
|
||||||
)
|
)
|
||||||
@@ -30,45 +29,20 @@ class RoomManagement:
|
|||||||
"""Service for managing LiveKit rooms."""
|
"""Service for managing LiveKit rooms."""
|
||||||
|
|
||||||
@async_to_sync
|
@async_to_sync
|
||||||
async def update_metadata(
|
async def update_metadata(self, room_name: str, metadata: Optional[Dict] = None):
|
||||||
self,
|
"""Update a LiveKit room's metadata.
|
||||||
room_name: str,
|
|
||||||
metadata: Optional[Dict] = None,
|
|
||||||
remove_keys: Optional[list[str]] = None,
|
|
||||||
):
|
|
||||||
"""Merge values into a LiveKit room's metadata.
|
|
||||||
|
|
||||||
The `room_name` corresponds to the LiveKit room identifier
|
The `room_name` corresponds to the LiveKit room identifier
|
||||||
(i.e. the Room model's UUID as a string).
|
(i.e. the Room model's UUID as a string).
|
||||||
|
|
||||||
Raises:
|
|
||||||
RoomNotFoundException: the room does not exist in LiveKit.
|
|
||||||
RoomManagementException: the metadata update otherwise fails.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
lkapi = utils.create_livekit_client()
|
lkapi = utils.create_livekit_client()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = await lkapi.room.list_rooms(ListRoomsRequest(names=[room_name]))
|
|
||||||
|
|
||||||
if not response.rooms:
|
|
||||||
logger.warning(
|
|
||||||
"Room %s not found in LiveKit, skipping metadata update",
|
|
||||||
room_name,
|
|
||||||
)
|
|
||||||
raise RoomNotFoundException("Room does not exist")
|
|
||||||
|
|
||||||
existing_metadata = json.loads(response.rooms[0].metadata or "{}")
|
|
||||||
|
|
||||||
for key in remove_keys or []:
|
|
||||||
existing_metadata.pop(key, None)
|
|
||||||
|
|
||||||
updated_metadata = {**existing_metadata, **(metadata or {})}
|
|
||||||
|
|
||||||
await lkapi.room.update_room_metadata(
|
await lkapi.room.update_room_metadata(
|
||||||
UpdateRoomMetadataRequest(
|
UpdateRoomMetadataRequest(
|
||||||
room=room_name,
|
room=room_name,
|
||||||
metadata=json.dumps(updated_metadata),
|
metadata=json.dumps(metadata) if metadata is not None else "",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,178 +0,0 @@
|
|||||||
"""Room role management service.
|
|
||||||
|
|
||||||
Single entry point for changing a user's role on a room, used by:
|
|
||||||
- the in-meeting endpoint (promote/demote a connected participant)
|
|
||||||
- (more to come soon)
|
|
||||||
|
|
||||||
`ResourceAccess` is the source of truth. The LiveKit `room_role`
|
|
||||||
participant attribute is only a projection of it, synced best-effort.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from logging import getLogger
|
|
||||||
from uuid import UUID
|
|
||||||
|
|
||||||
from core import models
|
|
||||||
from core.services.participants_management import (
|
|
||||||
ParticipantNotFoundException,
|
|
||||||
ParticipantsManagement,
|
|
||||||
ParticipantsManagementException,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class RoomRoleError(Exception):
|
|
||||||
"""Base exception for room role management errors."""
|
|
||||||
|
|
||||||
status_code = 400
|
|
||||||
|
|
||||||
|
|
||||||
class SelfActionError(RoomRoleError):
|
|
||||||
"""Raised when a user tries to change their own role."""
|
|
||||||
|
|
||||||
status_code = 403
|
|
||||||
|
|
||||||
|
|
||||||
class OwnerRoleError(RoomRoleError):
|
|
||||||
"""Raised when trying to demote an owner or grant ownership."""
|
|
||||||
|
|
||||||
status_code = 403
|
|
||||||
|
|
||||||
|
|
||||||
class ParticipantNotInMeetingError(RoomRoleError):
|
|
||||||
"""Raised when the target participant is not connected to the meeting."""
|
|
||||||
|
|
||||||
status_code = 404
|
|
||||||
|
|
||||||
|
|
||||||
class UserNotFoundError(RoomRoleError):
|
|
||||||
"""Raised when the target participant has no user account in database."""
|
|
||||||
|
|
||||||
status_code = 404
|
|
||||||
|
|
||||||
|
|
||||||
ASSIGNABLE_ROLES = (models.RoleChoices.MEMBER, models.RoleChoices.ADMIN)
|
|
||||||
|
|
||||||
|
|
||||||
class RoomRoleService:
|
|
||||||
"""Manage promotion and demotion of room co-hosts."""
|
|
||||||
|
|
||||||
def set_role(
|
|
||||||
self, room: models.Room, user: models.User, role: str, actor: models.User
|
|
||||||
):
|
|
||||||
"""Persist `role` for `user` on `room`, idempotently and atomically.
|
|
||||||
|
|
||||||
Returns the up-to-date `ResourceAccess`. Never grants or removes
|
|
||||||
ownership: granting OWNER is refused, and an existing OWNER access
|
|
||||||
is never modified.
|
|
||||||
"""
|
|
||||||
|
|
||||||
if role not in ASSIGNABLE_ROLES:
|
|
||||||
raise OwnerRoleError("Ownership cannot be granted through this action.")
|
|
||||||
|
|
||||||
if actor is not None and user == actor:
|
|
||||||
raise SelfActionError("You cannot change your own role.")
|
|
||||||
|
|
||||||
access, created = models.ResourceAccess.objects.get_or_create(
|
|
||||||
resource=room,
|
|
||||||
user=user,
|
|
||||||
defaults={"role": role},
|
|
||||||
)
|
|
||||||
|
|
||||||
if created:
|
|
||||||
return access
|
|
||||||
|
|
||||||
if access.role == models.RoleChoices.OWNER:
|
|
||||||
raise OwnerRoleError("Room owners cannot be demoted.")
|
|
||||||
|
|
||||||
if access.role != role:
|
|
||||||
access.role = role
|
|
||||||
access.save(update_fields=["role", "updated_at"])
|
|
||||||
|
|
||||||
return access
|
|
||||||
|
|
||||||
def set_participant_role(
|
|
||||||
self,
|
|
||||||
room: models.Room,
|
|
||||||
participant_identity: UUID,
|
|
||||||
role: str,
|
|
||||||
actor: models.User,
|
|
||||||
):
|
|
||||||
"""Change the role of a participant currently connected to the meeting.
|
|
||||||
|
|
||||||
- The participant must be connected (checked against LiveKit).
|
|
||||||
- The participant must map to a user account.
|
|
||||||
- The role is persisted in DB then mirrored to LiveKit.
|
|
||||||
|
|
||||||
Returns a dict: {"role", "livekit_synced"}.
|
|
||||||
"""
|
|
||||||
|
|
||||||
room_name = str(room.pk)
|
|
||||||
participants_management = ParticipantsManagement()
|
|
||||||
|
|
||||||
try:
|
|
||||||
is_in_meeting = participants_management.check_if_in_meeting(
|
|
||||||
room_name=room_name, identity=str(participant_identity)
|
|
||||||
)
|
|
||||||
except ParticipantNotFoundException as e:
|
|
||||||
raise ParticipantNotInMeetingError(
|
|
||||||
"Participant is not connected to this meeting."
|
|
||||||
) from e
|
|
||||||
|
|
||||||
if not is_in_meeting:
|
|
||||||
raise ParticipantNotInMeetingError(
|
|
||||||
"Participant is not connected to this meeting."
|
|
||||||
)
|
|
||||||
|
|
||||||
user = models.User.objects.filter(sub=participant_identity).first()
|
|
||||||
|
|
||||||
if user is None:
|
|
||||||
raise UserNotFoundError(
|
|
||||||
"This participant has no user account and cannot be assigned a role."
|
|
||||||
)
|
|
||||||
|
|
||||||
# Source of truth first: even if the LiveKit sync below fails,
|
|
||||||
# the role is real and any fresh token will carry it.
|
|
||||||
self.set_role(room=room, user=user, role=role, actor=actor)
|
|
||||||
|
|
||||||
livekit_synced = self._sync_livekit_role(
|
|
||||||
room_name=room_name,
|
|
||||||
participant_identity=str(participant_identity),
|
|
||||||
role=str(role),
|
|
||||||
)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"role": role,
|
|
||||||
"livekit_synced": livekit_synced,
|
|
||||||
}
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _sync_livekit_role(room_name: str, participant_identity: str, role: str):
|
|
||||||
"""Mirror the role to the participant's LiveKit attributes.
|
|
||||||
|
|
||||||
Best-effort: returns False on failure instead of raising, so callers
|
|
||||||
can report a partial success. Re-running the action re-syncs.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
ParticipantsManagement().update(
|
|
||||||
room_name=room_name,
|
|
||||||
identity=participant_identity,
|
|
||||||
attributes={"room_role": role},
|
|
||||||
)
|
|
||||||
except ParticipantNotFoundException:
|
|
||||||
# The participant left between the presence check and the update:
|
|
||||||
# harmless, the DB state (if any) remains authoritative.
|
|
||||||
logger.info(
|
|
||||||
"Participant %s left room %s before role sync",
|
|
||||||
participant_identity,
|
|
||||||
room_name,
|
|
||||||
)
|
|
||||||
return False
|
|
||||||
except ParticipantsManagementException:
|
|
||||||
logger.exception(
|
|
||||||
"Could not sync role to LiveKit for participant %s in room %s",
|
|
||||||
participant_identity,
|
|
||||||
room_name,
|
|
||||||
)
|
|
||||||
return False
|
|
||||||
return True
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
"""Celery tasks for the core app."""
|
|
||||||
|
|
||||||
from core.tasks.connection_test import delete_connection_test_room
|
|
||||||
from core.tasks.file import process_file_deletion
|
|
||||||
|
|
||||||
__all__ = (
|
|
||||||
"delete_connection_test_room",
|
|
||||||
"process_file_deletion",
|
|
||||||
)
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
"""Tasks related to connection test rooms."""
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from asgiref.sync import async_to_sync
|
|
||||||
from livekit.api import ( # pylint: disable=no-name-in-module
|
|
||||||
DeleteRoomRequest,
|
|
||||||
TwirpError,
|
|
||||||
)
|
|
||||||
|
|
||||||
from core.tasks._task import task
|
|
||||||
from core.utils import create_livekit_client
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
@task
|
|
||||||
def delete_connection_test_room(room_name: str):
|
|
||||||
"""Force-delete an ephemeral connection-test room.
|
|
||||||
|
|
||||||
Used as a hard cap so a participant cannot keep an auto-refreshed
|
|
||||||
LiveKit session open indefinitely after requesting a test token.
|
|
||||||
"""
|
|
||||||
prefix = settings.CONNECTION_TEST_ROOM_PREFIX
|
|
||||||
if not room_name.startswith(prefix):
|
|
||||||
logger.error(
|
|
||||||
"Refusing to delete room '%s': expected prefix '%s'.",
|
|
||||||
room_name,
|
|
||||||
prefix,
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
async_to_sync(_delete_room)(room_name)
|
|
||||||
|
|
||||||
|
|
||||||
async def _delete_room(room_name: str):
|
|
||||||
lkapi = create_livekit_client()
|
|
||||||
try:
|
|
||||||
await lkapi.room.delete_room(DeleteRoomRequest(room=room_name))
|
|
||||||
logger.info("Deleted connection test room '%s'.", room_name)
|
|
||||||
except TwirpError as exc:
|
|
||||||
# Room may already be gone after empty/departure timeout.
|
|
||||||
logger.info(
|
|
||||||
"Could not delete connection test room '%s': %s",
|
|
||||||
room_name,
|
|
||||||
exc,
|
|
||||||
)
|
|
||||||
finally:
|
|
||||||
await lkapi.aclose()
|
|
||||||
@@ -34,8 +34,10 @@ def mediator(mock_worker_service):
|
|||||||
return WorkerServiceMediator(mock_worker_service)
|
return WorkerServiceMediator(mock_worker_service)
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_start_recording_success(mock_update_metadata, mediator, mock_worker_service):
|
def test_start_recording_success(
|
||||||
|
mock_update_room_metadata, mediator, mock_worker_service
|
||||||
|
):
|
||||||
"""Test successful recording start"""
|
"""Test successful recording start"""
|
||||||
# Setup
|
# Setup
|
||||||
worker_id = "test-worker-123"
|
worker_id = "test-worker-123"
|
||||||
@@ -58,7 +60,7 @@ def test_start_recording_success(mock_update_metadata, mediator, mock_worker_ser
|
|||||||
assert mock_recording.worker_id == worker_id
|
assert mock_recording.worker_id == worker_id
|
||||||
assert mock_recording.status == RecordingStatusChoices.ACTIVE
|
assert mock_recording.status == RecordingStatusChoices.ACTIVE
|
||||||
|
|
||||||
mock_update_metadata.assert_called_once_with(
|
mock_update_room_metadata.assert_called_once_with(
|
||||||
str(mock_recording.room.id),
|
str(mock_recording.room.id),
|
||||||
{"recording_mode": mock_recording.mode, "recording_status": "starting"},
|
{"recording_mode": mock_recording.mode, "recording_status": "starting"},
|
||||||
)
|
)
|
||||||
@@ -67,9 +69,9 @@ def test_start_recording_success(mock_update_metadata, mediator, mock_worker_ser
|
|||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"error_class", [WorkerRequestError, WorkerConnectionError, WorkerResponseError]
|
"error_class", [WorkerRequestError, WorkerConnectionError, WorkerResponseError]
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_mediator_start_recording_worker_errors(
|
def test_mediator_start_recording_worker_errors(
|
||||||
mock_update_metadata, mediator, mock_worker_service, error_class
|
mock_update_room_metadata, mediator, mock_worker_service, error_class
|
||||||
):
|
):
|
||||||
"""Test handling of various worker errors during start"""
|
"""Test handling of various worker errors during start"""
|
||||||
# Setup
|
# Setup
|
||||||
@@ -87,7 +89,7 @@ def test_mediator_start_recording_worker_errors(
|
|||||||
assert mock_recording.status == RecordingStatusChoices.FAILED_TO_START
|
assert mock_recording.status == RecordingStatusChoices.FAILED_TO_START
|
||||||
assert mock_recording.worker_id is None
|
assert mock_recording.worker_id is None
|
||||||
|
|
||||||
mock_update_metadata.assert_not_called()
|
mock_update_room_metadata.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
@@ -101,9 +103,9 @@ def test_mediator_start_recording_worker_errors(
|
|||||||
RecordingStatusChoices.ABORTED,
|
RecordingStatusChoices.ABORTED,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_mediator_start_recording_from_forbidden_status(
|
def test_mediator_start_recording_from_forbidden_status(
|
||||||
mock_update_metadata, mediator, mock_worker_service, status
|
mock_update_room_metadata, mediator, mock_worker_service, status
|
||||||
):
|
):
|
||||||
"""Test handling of various worker errors during start"""
|
"""Test handling of various worker errors during start"""
|
||||||
# Setup
|
# Setup
|
||||||
@@ -117,7 +119,7 @@ def test_mediator_start_recording_from_forbidden_status(
|
|||||||
mock_recording.refresh_from_db()
|
mock_recording.refresh_from_db()
|
||||||
assert mock_recording.status == status
|
assert mock_recording.status == status
|
||||||
|
|
||||||
mock_update_metadata.assert_not_called()
|
mock_update_room_metadata.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_mediator_stop_recording_success(mediator, mock_worker_service):
|
def test_mediator_stop_recording_success(mediator, mock_worker_service):
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ def test_mute_participant_with_livekit_token_for_this_room(mock_livekit_client):
|
|||||||
room = RoomFactory()
|
room = RoomFactory()
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -106,7 +106,7 @@ def test_mute_participant_with_livekit_token_for_another_room_forbidden(
|
|||||||
other_room = RoomFactory()
|
other_room = RoomFactory()
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(other_room.id), user)
|
token = utils.generate_token(str(other_room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": target_room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": target_room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -146,7 +146,7 @@ def test_mute_participant_everyone_can_mute_disabled_blocks_non_admin(
|
|||||||
room = RoomFactory(configuration={"everyone_can_mute": False})
|
room = RoomFactory(configuration={"everyone_can_mute": False})
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -293,7 +293,7 @@ def test_mute_participant_admin_with_token_for_this_room(mock_livekit_client):
|
|||||||
)
|
)
|
||||||
# Token identity matches the admin user so LiveKitTokenAuthentication
|
# Token identity matches the admin user so LiveKitTokenAuthentication
|
||||||
# resolves request.user back to the admin.
|
# resolves request.user back to the admin.
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=True)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -323,7 +323,7 @@ def test_mute_participant_admin_with_token_for_another_room(mock_livekit_client)
|
|||||||
# Token is scoped to a DIFFERENT room, and admin status must only be
|
# Token is scoped to a DIFFERENT room, and admin status must only be
|
||||||
# honored when established via session, never via a LiveKit
|
# honored when established via session, never via a LiveKit
|
||||||
# token, which can be replayed off-host.
|
# token, which can be replayed off-host.
|
||||||
token = utils.generate_token(str(other_room.id), user)
|
token = utils.generate_token(str(other_room.id), user, is_admin_or_owner=True)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": target_room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": target_room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -354,7 +354,7 @@ def test_mute_participant_admin_token_replayed_does_not_grant_admin(
|
|||||||
role=random.choice(["administrator", "owner"]),
|
role=random.choice(["administrator", "owner"]),
|
||||||
)
|
)
|
||||||
# The token is the only credential.
|
# The token is the only credential.
|
||||||
token = utils.generate_token(str(room.id), admin_user)
|
token = utils.generate_token(str(room.id), admin_user, is_admin_or_owner=True)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -374,7 +374,7 @@ def test_mute_participant_livekit_token_triggers_presence_check(mock_livekit_cli
|
|||||||
room = RoomFactory()
|
room = RoomFactory()
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -405,7 +405,7 @@ def test_mute_participant_livekit_token_presence_check_returns_participant(
|
|||||||
)
|
)
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -433,7 +433,7 @@ def test_mute_participant_livekit_token_presence_check_participant_not_found(
|
|||||||
)
|
)
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -462,7 +462,7 @@ def test_mute_participant_livekit_token_presence_check_twirp_error_forbidden(
|
|||||||
)
|
)
|
||||||
|
|
||||||
user = AnonymousUser()
|
user = AnonymousUser()
|
||||||
token = utils.generate_token(str(room.id), user)
|
token = utils.generate_token(str(room.id), user, is_admin_or_owner=False)
|
||||||
|
|
||||||
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-mute-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(
|
response = client.post(
|
||||||
@@ -719,13 +719,13 @@ def test_update_participant_invalid_payload():
|
|||||||
)
|
)
|
||||||
client.force_authenticate(user=user)
|
client.force_authenticate(user=user)
|
||||||
|
|
||||||
payload = {"participant_identity": ["test"]}
|
payload = {"participant_identity": "invalid-uuid"}
|
||||||
|
|
||||||
url = reverse("rooms-update-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-update-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(url, payload, format="json")
|
response = client.post(url, payload, format="json")
|
||||||
|
|
||||||
assert response.status_code == status.HTTP_400_BAD_REQUEST
|
assert response.status_code == status.HTTP_400_BAD_REQUEST
|
||||||
assert "Not a valid string." in str(response.data)
|
assert "Must be a valid UUID." in str(response.data)
|
||||||
|
|
||||||
|
|
||||||
def test_update_participant_no_update_fields():
|
def test_update_participant_no_update_fields():
|
||||||
@@ -918,7 +918,7 @@ def test_remove_participant_invalid_payload():
|
|||||||
)
|
)
|
||||||
client.force_authenticate(user=user)
|
client.force_authenticate(user=user)
|
||||||
|
|
||||||
payload = {"participant_identity": ["invalid-uuid"]}
|
payload = {"participant_identity": "invalid-uuid"}
|
||||||
|
|
||||||
url = reverse("rooms-remove-participant", kwargs={"pk": room.id})
|
url = reverse("rooms-remove-participant", kwargs={"pk": room.id})
|
||||||
response = client.post(url, payload, format="json")
|
response = client.post(url, payload, format="json")
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import pytest
|
|||||||
from rest_framework.test import APIClient
|
from rest_framework.test import APIClient
|
||||||
|
|
||||||
from ...factories import RoomFactory, UserFactory, UserResourceAccessFactory
|
from ...factories import RoomFactory, UserFactory, UserResourceAccessFactory
|
||||||
from ...models import RoleChoices, RoomAccessLevel
|
from ...models import RoomAccessLevel
|
||||||
|
|
||||||
pytestmark = pytest.mark.django_db
|
pytestmark = pytest.mark.django_db
|
||||||
|
|
||||||
@@ -31,6 +31,7 @@ def test_api_rooms_retrieve_anonymous_private_pk():
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": "restricted",
|
"access_level": "restricted",
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"name": room.name,
|
"name": room.name,
|
||||||
"slug": room.slug,
|
"slug": room.slug,
|
||||||
}
|
}
|
||||||
@@ -50,6 +51,7 @@ def test_api_rooms_retrieve_anonymous_trusted_pk():
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": "trusted",
|
"access_level": "trusted",
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"name": room.name,
|
"name": room.name,
|
||||||
"slug": room.slug,
|
"slug": room.slug,
|
||||||
}
|
}
|
||||||
@@ -68,6 +70,7 @@ def test_api_rooms_retrieve_anonymous_private_pk_no_dashes():
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": "restricted",
|
"access_level": "restricted",
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"name": room.name,
|
"name": room.name,
|
||||||
"slug": room.slug,
|
"slug": room.slug,
|
||||||
}
|
}
|
||||||
@@ -84,6 +87,7 @@ def test_api_rooms_retrieve_anonymous_private_slug():
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": "restricted",
|
"access_level": "restricted",
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"name": room.name,
|
"name": room.name,
|
||||||
"slug": room.slug,
|
"slug": room.slug,
|
||||||
}
|
}
|
||||||
@@ -100,6 +104,7 @@ def test_api_rooms_retrieve_anonymous_private_slug_not_normalized():
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": "restricted",
|
"access_level": "restricted",
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"name": room.name,
|
"name": room.name,
|
||||||
"slug": room.slug,
|
"slug": room.slug,
|
||||||
}
|
}
|
||||||
@@ -125,9 +130,6 @@ def test_api_rooms_retrieve_anonymous_unregistered_allowed(mock_token):
|
|||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert response.json() == {
|
assert response.json() == {
|
||||||
"id": None,
|
"id": None,
|
||||||
"slug": "unregistered-room",
|
|
||||||
"access_level": "public",
|
|
||||||
"is_administrable": False,
|
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
"room": "unregistered-room",
|
"room": "unregistered-room",
|
||||||
@@ -160,9 +162,6 @@ def test_api_rooms_retrieve_anonymous_unregistered_allowed_not_normalized(mock_t
|
|||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert response.json() == {
|
assert response.json() == {
|
||||||
"id": None,
|
"id": None,
|
||||||
"slug": "reunion",
|
|
||||||
"access_level": "public",
|
|
||||||
"is_administrable": False,
|
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
"room": "reunion",
|
"room": "reunion",
|
||||||
@@ -209,6 +208,7 @@ def test_api_rooms_retrieve_anonymous_public(mock_token):
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": str(room.access_level),
|
"access_level": str(room.access_level),
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
"room": expected_name,
|
"room": expected_name,
|
||||||
@@ -255,6 +255,7 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
|
|||||||
"configuration": {"can_publish_sources": ["camera"]},
|
"configuration": {"can_publish_sources": ["camera"]},
|
||||||
"access_level": str(room.access_level),
|
"access_level": str(room.access_level),
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
"room": expected_name,
|
"room": expected_name,
|
||||||
@@ -271,7 +272,7 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
|
|||||||
username=None,
|
username=None,
|
||||||
color=None,
|
color=None,
|
||||||
sources=["camera"],
|
sources=["camera"],
|
||||||
role=None,
|
is_admin_or_owner=False,
|
||||||
participant_id=None,
|
participant_id=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -306,6 +307,7 @@ def test_api_rooms_retrieve_authenticated_trusted(mock_token):
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": str(room.access_level),
|
"access_level": str(room.access_level),
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
"room": expected_name,
|
"room": expected_name,
|
||||||
@@ -322,7 +324,7 @@ def test_api_rooms_retrieve_authenticated_trusted(mock_token):
|
|||||||
username=None,
|
username=None,
|
||||||
color=None,
|
color=None,
|
||||||
sources=None,
|
sources=None,
|
||||||
role=None,
|
is_admin_or_owner=False,
|
||||||
participant_id=None,
|
participant_id=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -347,6 +349,7 @@ def test_api_rooms_retrieve_authenticated():
|
|||||||
"configuration": {},
|
"configuration": {},
|
||||||
"access_level": "restricted",
|
"access_level": "restricted",
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"name": room.name,
|
"name": room.name,
|
||||||
"slug": room.slug,
|
"slug": room.slug,
|
||||||
}
|
}
|
||||||
@@ -392,6 +395,7 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
|
|||||||
"configuration": {"can_publish_sources": ["camera"]},
|
"configuration": {"can_publish_sources": ["camera"]},
|
||||||
"access_level": str(room.access_level),
|
"access_level": str(room.access_level),
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": False,
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
"room": expected_name,
|
"room": expected_name,
|
||||||
@@ -408,7 +412,7 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
|
|||||||
username=None,
|
username=None,
|
||||||
color=None,
|
color=None,
|
||||||
sources=["camera"],
|
sources=["camera"],
|
||||||
role=str(RoleChoices.MEMBER),
|
is_admin_or_owner=False,
|
||||||
participant_id=None,
|
participant_id=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -483,6 +487,7 @@ def test_api_rooms_retrieve_administrators(
|
|||||||
assert content_dict == {
|
assert content_dict == {
|
||||||
"access_level": str(room.access_level),
|
"access_level": str(room.access_level),
|
||||||
"id": str(room.id),
|
"id": str(room.id),
|
||||||
|
"is_administrable": True,
|
||||||
"configuration": {},
|
"configuration": {},
|
||||||
"livekit": {
|
"livekit": {
|
||||||
"url": "test_url_value",
|
"url": "test_url_value",
|
||||||
@@ -500,6 +505,6 @@ def test_api_rooms_retrieve_administrators(
|
|||||||
username=None,
|
username=None,
|
||||||
color=None,
|
color=None,
|
||||||
sources=None,
|
sources=None,
|
||||||
role=str(user_access.role),
|
is_admin_or_owner=True,
|
||||||
participant_id=None,
|
participant_id=None,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,319 +0,0 @@
|
|||||||
"""
|
|
||||||
Test rooms API endpoints in the Meet core app: update-participant-role.
|
|
||||||
"""
|
|
||||||
|
|
||||||
# pylint: disable=redefined-outer-name,unused-argument
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
from rest_framework.test import APIClient
|
|
||||||
|
|
||||||
from ...factories import RoomFactory, UserFactory
|
|
||||||
from ...models import ResourceAccess, RoleChoices
|
|
||||||
from ...services.participants_management import ParticipantNotFoundException
|
|
||||||
|
|
||||||
pytestmark = pytest.mark.django_db
|
|
||||||
|
|
||||||
|
|
||||||
def test_update_participant_role_anonymous():
|
|
||||||
"""Anonymous requesters are rejected."""
|
|
||||||
client = APIClient()
|
|
||||||
room = RoomFactory()
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": "some-identity", "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 401
|
|
||||||
|
|
||||||
|
|
||||||
def test_update_participant_role_requires_privileges():
|
|
||||||
"""A simple member cannot promote other participants."""
|
|
||||||
client = APIClient()
|
|
||||||
user = UserFactory()
|
|
||||||
room = RoomFactory(users=[(user, RoleChoices.MEMBER)])
|
|
||||||
client.force_login(user)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": "some-identity", "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 403
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_requester_not_in_meeting(mock_perm_pm):
|
|
||||||
"""An admin who is not connected to the meeting is rejected."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = False
|
|
||||||
client = APIClient()
|
|
||||||
user = UserFactory()
|
|
||||||
room = RoomFactory(users=[(user, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(user)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": "some-identity", "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 403
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.assert_called_once_with(
|
|
||||||
room_name=str(room.pk), identity=str(user.sub)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_cannot_target_self(mock_perm_pm):
|
|
||||||
"""Requesters cannot change their own role."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
client = APIClient()
|
|
||||||
user = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(user, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(user)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": user.sub, "role": "member"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 403
|
|
||||||
assert response.json() == {"error": "You cannot change your own role."}
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_promotes_authenticated_target(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""Promoting a connected, authenticated participant persists the role."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_sync.return_value = True
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
target = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.OWNER)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": str(target.sub), "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
assert response.json() == {
|
|
||||||
"role": "administrator",
|
|
||||||
"livekit_synced": True,
|
|
||||||
}
|
|
||||||
access = ResourceAccess.objects.get(resource=room, user=target)
|
|
||||||
assert access.role == RoleChoices.ADMIN
|
|
||||||
mock_sync.assert_called_once_with(
|
|
||||||
room_name=str(room.pk),
|
|
||||||
participant_identity=str(target.sub),
|
|
||||||
role="administrator",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_demotes_authenticated_target(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""Demoting a connected admin back to member updates the access row."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_sync.return_value = True
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
target = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.OWNER), (target, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": str(target.sub), "role": "member"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
access = ResourceAccess.objects.get(resource=room, user=target)
|
|
||||||
assert access.role == RoleChoices.MEMBER
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_cannot_demote_owner(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""Room owners can never be demoted."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
owner = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.ADMIN), (owner, RoleChoices.OWNER)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": str(owner.sub), "role": "member"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 403
|
|
||||||
assert response.json() == {"error": "Room owners cannot be demoted."}
|
|
||||||
assert (
|
|
||||||
ResourceAccess.objects.get(resource=room, user=owner).role == RoleChoices.OWNER
|
|
||||||
)
|
|
||||||
mock_sync.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_anonymous_target_is_ephemeral(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""Promoting an anonymous participant should not be possible."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_sync.return_value = True
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
anonymous_identity = uuid.uuid4()
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": anonymous_identity, "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 404
|
|
||||||
assert response.json() == {
|
|
||||||
"error": "This participant has no user account and cannot be assigned a role."
|
|
||||||
}
|
|
||||||
assert not ResourceAccess.objects.filter(resource=room).exclude(user=admin).exists()
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_target_not_in_meeting(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""Only connected participants can be promoted or demoted."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.side_effect = (
|
|
||||||
ParticipantNotFoundException("Participant does not exist")
|
|
||||||
)
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
target = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": str(target.sub), "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 404
|
|
||||||
assert not ResourceAccess.objects.filter(resource=room, user=target).exists()
|
|
||||||
mock_sync.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_is_idempotent_and_resyncs(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""Promoting an existing admin succeeds and still re-syncs LiveKit."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_sync.return_value = True
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
target = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.OWNER), (target, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": str(target.sub), "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
mock_sync.assert_called_once()
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.room_roles.RoomRoleService._sync_livekit_role")
|
|
||||||
@mock.patch("core.services.room_roles.ParticipantsManagement")
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_livekit_failure_reports_partial_success(
|
|
||||||
mock_perm_pm, mock_svc_pm, mock_sync
|
|
||||||
):
|
|
||||||
"""A LiveKit sync failure does not lose the persisted role."""
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_svc_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
mock_sync.return_value = False
|
|
||||||
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
target = UserFactory(sub=uuid.uuid4())
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.OWNER)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": str(target.sub), "role": "administrator"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
assert response.json() == {
|
|
||||||
"role": "administrator",
|
|
||||||
"livekit_synced": False,
|
|
||||||
}
|
|
||||||
assert (
|
|
||||||
ResourceAccess.objects.get(resource=room, user=target).role == RoleChoices.ADMIN
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.api.permissions.ParticipantsManagement")
|
|
||||||
def test_update_participant_role_rejects_owner_role(mock_perm_pm):
|
|
||||||
"""The owner role can never be granted through this endpoint."""
|
|
||||||
client = APIClient()
|
|
||||||
admin = UserFactory()
|
|
||||||
room = RoomFactory(users=[(admin, RoleChoices.ADMIN)])
|
|
||||||
client.force_login(admin)
|
|
||||||
|
|
||||||
mock_perm_pm.return_value.check_if_in_meeting.return_value = True
|
|
||||||
response = client.post(
|
|
||||||
f"/api/v1.0/rooms/{room.id}/update-participant-role/",
|
|
||||||
{"participant_identity": "some-identity", "role": "owner"},
|
|
||||||
format="json",
|
|
||||||
)
|
|
||||||
|
|
||||||
assert response.status_code == 400
|
|
||||||
@@ -6,8 +6,6 @@ Test LiveKitEvents service.
|
|||||||
import uuid
|
import uuid
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from django.test.utils import override_settings
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from livekit.api import EgressStatus
|
from livekit.api import EgressStatus
|
||||||
|
|
||||||
@@ -22,9 +20,8 @@ from core.services.livekit_events import (
|
|||||||
api,
|
api,
|
||||||
)
|
)
|
||||||
from core.services.lobby import LobbyService
|
from core.services.lobby import LobbyService
|
||||||
from core.services.room_management import RoomManagementException
|
|
||||||
from core.services.telephony import TelephonyException, TelephonyService
|
from core.services.telephony import TelephonyException, TelephonyService
|
||||||
from core.utils import NotificationError
|
from core.utils import MetadataUpdateException, NotificationError
|
||||||
|
|
||||||
pytestmark = pytest.mark.django_db
|
pytestmark = pytest.mark.django_db
|
||||||
|
|
||||||
@@ -73,9 +70,9 @@ def test_initialization(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_success(
|
def test_handle_egress_ended_success(
|
||||||
mock_update_metadata, mock_notify, mode, notification_type, service
|
mock_update_room_metadata, mock_notify, mode, notification_type, service
|
||||||
):
|
):
|
||||||
"""Should successfully stop recording and notifies all participant."""
|
"""Should successfully stop recording and notifies all participant."""
|
||||||
|
|
||||||
@@ -89,8 +86,8 @@ def test_handle_egress_ended_success(
|
|||||||
mock_notify.assert_called_once_with(
|
mock_notify.assert_called_once_with(
|
||||||
room_name=str(recording.room.id), notification_data={"type": notification_type}
|
room_name=str(recording.room.id), notification_data={"type": notification_type}
|
||||||
)
|
)
|
||||||
mock_update_metadata.assert_called_once_with(
|
mock_update_room_metadata.assert_called_once_with(
|
||||||
str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
|
str(recording.room.id), {}, ["recording_mode", "recording_status"]
|
||||||
)
|
)
|
||||||
|
|
||||||
recording.refresh_from_db()
|
recording.refresh_from_db()
|
||||||
@@ -107,9 +104,9 @@ def test_handle_egress_ended_success(
|
|||||||
(EgressStatus.EGRESS_ABORTED, "aborted"),
|
(EgressStatus.EGRESS_ABORTED, "aborted"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_updated_success(
|
def test_handle_egress_updated_success(
|
||||||
mock_update_metadata, egress_status, status, service
|
mock_update_room_metadata, egress_status, status, service
|
||||||
):
|
):
|
||||||
"""Should successfully update room's metadata."""
|
"""Should successfully update room's metadata."""
|
||||||
|
|
||||||
@@ -120,7 +117,7 @@ def test_handle_egress_updated_success(
|
|||||||
|
|
||||||
service._handle_egress_updated(mock_data)
|
service._handle_egress_updated(mock_data)
|
||||||
|
|
||||||
mock_update_metadata.assert_called_once_with(
|
mock_update_room_metadata.assert_called_once_with(
|
||||||
str(recording.room.id), {"recording_status": status}
|
str(recording.room.id), {"recording_status": status}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -132,9 +129,9 @@ def test_handle_egress_updated_success(
|
|||||||
EgressStatus.EGRESS_LIMIT_REACHED,
|
EgressStatus.EGRESS_LIMIT_REACHED,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_updated_non_handled(
|
def test_handle_egress_updated_non_handled(
|
||||||
mock_update_metadata, egress_status, service
|
mock_update_room_metadata, egress_status, service
|
||||||
):
|
):
|
||||||
"""Should ignore certain egress status and don't trigger metadata updates."""
|
"""Should ignore certain egress status and don't trigger metadata updates."""
|
||||||
|
|
||||||
@@ -145,7 +142,7 @@ def test_handle_egress_updated_non_handled(
|
|||||||
|
|
||||||
service._handle_egress_updated(mock_data)
|
service._handle_egress_updated(mock_data)
|
||||||
|
|
||||||
mock_update_metadata.assert_not_called()
|
mock_update_room_metadata.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
@@ -156,9 +153,9 @@ def test_handle_egress_updated_non_handled(
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_metadata_update_fails(
|
def test_handle_egress_ended_metadata_update_fails(
|
||||||
mock_update_metadata, mock_notify, mode, notification_type, service
|
mock_update_room_metadata, mock_notify, mode, notification_type, service
|
||||||
):
|
):
|
||||||
"""Should successfully stop and save recording when metadata's update fails."""
|
"""Should successfully stop and save recording when metadata's update fails."""
|
||||||
|
|
||||||
@@ -167,7 +164,7 @@ def test_handle_egress_ended_metadata_update_fails(
|
|||||||
mock_data.egress_info.egress_id = recording.worker_id
|
mock_data.egress_info.egress_id = recording.worker_id
|
||||||
mock_data.egress_info.status = EgressStatus.EGRESS_LIMIT_REACHED
|
mock_data.egress_info.status = EgressStatus.EGRESS_LIMIT_REACHED
|
||||||
|
|
||||||
mock_update_metadata.side_effect = RoomManagementException("Error notifying")
|
mock_update_room_metadata.side_effect = MetadataUpdateException("Error notifying")
|
||||||
|
|
||||||
service._handle_egress_ended(mock_data)
|
service._handle_egress_ended(mock_data)
|
||||||
|
|
||||||
@@ -181,9 +178,9 @@ def test_handle_egress_ended_metadata_update_fails(
|
|||||||
|
|
||||||
|
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_notification_fails(
|
def test_handle_egress_ended_notification_fails(
|
||||||
mock_update_metadata, mock_notify, service
|
mock_update_room_metadata, mock_notify, service
|
||||||
):
|
):
|
||||||
"""Should raise ActionFailedError when notification fails but still stop recording."""
|
"""Should raise ActionFailedError when notification fails but still stop recording."""
|
||||||
|
|
||||||
@@ -203,15 +200,15 @@ def test_handle_egress_ended_notification_fails(
|
|||||||
recording.refresh_from_db()
|
recording.refresh_from_db()
|
||||||
assert recording.status == "stopped"
|
assert recording.status == "stopped"
|
||||||
|
|
||||||
mock_update_metadata.assert_called_once_with(
|
mock_update_room_metadata.assert_called_once_with(
|
||||||
str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
|
str(recording.room.id), {}, ["recording_mode", "recording_status"]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_recording_not_found(
|
def test_handle_egress_ended_recording_not_found(
|
||||||
mock_update_metadata, mock_notify, service
|
mock_update_room_metadata, mock_notify, service
|
||||||
):
|
):
|
||||||
"""Should raise ActionFailedError when recording doesn't exist."""
|
"""Should raise ActionFailedError when recording doesn't exist."""
|
||||||
|
|
||||||
@@ -226,16 +223,16 @@ def test_handle_egress_ended_recording_not_found(
|
|||||||
service._handle_egress_ended(mock_data)
|
service._handle_egress_ended(mock_data)
|
||||||
|
|
||||||
mock_notify.assert_not_called()
|
mock_notify.assert_not_called()
|
||||||
mock_update_metadata.assert_not_called()
|
mock_update_room_metadata.assert_not_called()
|
||||||
|
|
||||||
recording.refresh_from_db()
|
recording.refresh_from_db()
|
||||||
assert recording.status == "active"
|
assert recording.status == "active"
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_recording_not_active(
|
def test_handle_egress_ended_recording_not_active(
|
||||||
mock_update_metadata, mock_notify, service
|
mock_update_room_metadata, mock_notify, service
|
||||||
):
|
):
|
||||||
"""Should ignore non-active recordings."""
|
"""Should ignore non-active recordings."""
|
||||||
|
|
||||||
@@ -247,8 +244,8 @@ def test_handle_egress_ended_recording_not_active(
|
|||||||
service._handle_egress_ended(mock_data)
|
service._handle_egress_ended(mock_data)
|
||||||
|
|
||||||
mock_notify.assert_not_called()
|
mock_notify.assert_not_called()
|
||||||
mock_update_metadata.assert_called_once_with(
|
mock_update_room_metadata.assert_called_once_with(
|
||||||
str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
|
str(recording.room.id), {}, ["recording_mode", "recording_status"]
|
||||||
)
|
)
|
||||||
|
|
||||||
recording.refresh_from_db()
|
recording.refresh_from_db()
|
||||||
@@ -256,9 +253,9 @@ def test_handle_egress_ended_recording_not_active(
|
|||||||
|
|
||||||
|
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_recording_not_limit_reached(
|
def test_handle_egress_ended_recording_not_limit_reached(
|
||||||
mock_update_metadata, mock_notify, service
|
mock_update_room_metadata, mock_notify, service
|
||||||
):
|
):
|
||||||
"""Should ignore egress non-limit-reached statuses."""
|
"""Should ignore egress non-limit-reached statuses."""
|
||||||
|
|
||||||
@@ -270,16 +267,16 @@ def test_handle_egress_ended_recording_not_limit_reached(
|
|||||||
service._handle_egress_ended(mock_data)
|
service._handle_egress_ended(mock_data)
|
||||||
|
|
||||||
mock_notify.assert_not_called()
|
mock_notify.assert_not_called()
|
||||||
mock_update_metadata.assert_called_once_with(
|
mock_update_room_metadata.assert_called_once_with(
|
||||||
str(recording.room.id), remove_keys=["recording_mode", "recording_status"]
|
str(recording.room.id), {}, ["recording_mode", "recording_status"]
|
||||||
)
|
)
|
||||||
assert recording.status == "stopped"
|
assert recording.status == "stopped"
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.services.livekit_events.MetadataCollectorService")
|
@mock.patch("core.services.livekit_events.MetadataCollectorService")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_calls_metadata_collector_stop_when_conditions_are_met(
|
def test_handle_egress_ended_calls_metadata_collector_stop_when_conditions_are_met(
|
||||||
mock_update_metadata, mock_collector_class, service, settings
|
mock_update_room_metadata, mock_collector_class, service, settings
|
||||||
):
|
):
|
||||||
"""Should call MetadataCollectorService.stop when it exists."""
|
"""Should call MetadataCollectorService.stop when it exists."""
|
||||||
settings.METADATA_COLLECTOR_ENABLED = True
|
settings.METADATA_COLLECTOR_ENABLED = True
|
||||||
@@ -309,7 +306,7 @@ def test_handle_egress_ended_calls_metadata_collector_stop_when_conditions_are_m
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.livekit_events.MetadataCollectorService")
|
@mock.patch("core.services.livekit_events.MetadataCollectorService")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_does_not_call_metadata_collector_stop_when_conditions_not_met(
|
def test_handle_egress_ended_does_not_call_metadata_collector_stop_when_conditions_not_met(
|
||||||
_, mock_collector_class, metadata_enabled, options, service, settings
|
_, mock_collector_class, metadata_enabled, options, service, settings
|
||||||
): # pylint: disable=too-many-arguments,too-many-positional-arguments
|
): # pylint: disable=too-many-arguments,too-many-positional-arguments
|
||||||
@@ -338,7 +335,7 @@ def test_handle_egress_ended_does_not_call_metadata_collector_stop_when_conditio
|
|||||||
"notify_external_services"
|
"notify_external_services"
|
||||||
)
|
)
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"egress_status",
|
"egress_status",
|
||||||
[EgressStatus.EGRESS_COMPLETE, EgressStatus.EGRESS_LIMIT_REACHED],
|
[EgressStatus.EGRESS_COMPLETE, EgressStatus.EGRESS_LIMIT_REACHED],
|
||||||
@@ -348,7 +345,7 @@ def test_handle_egress_ended_does_not_call_metadata_collector_stop_when_conditio
|
|||||||
[(True, "notification_succeeded"), (False, "saved")],
|
[(True, "notification_succeeded"), (False, "saved")],
|
||||||
)
|
)
|
||||||
def test_handle_egress_ended_finalizes_recording( # noqa: PLR0913
|
def test_handle_egress_ended_finalizes_recording( # noqa: PLR0913
|
||||||
mock_update_metadata,
|
mock_update_room_metadata,
|
||||||
mock_notify,
|
mock_notify,
|
||||||
mock_notify_external_services,
|
mock_notify_external_services,
|
||||||
notify_return_value,
|
notify_return_value,
|
||||||
@@ -381,7 +378,7 @@ def test_handle_egress_ended_finalizes_recording( # noqa: PLR0913
|
|||||||
"notify_external_services"
|
"notify_external_services"
|
||||||
)
|
)
|
||||||
@mock.patch("core.utils.notify_participants")
|
@mock.patch("core.utils.notify_participants")
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"egress_status, expected_status",
|
"egress_status, expected_status",
|
||||||
[
|
[
|
||||||
@@ -390,7 +387,7 @@ def test_handle_egress_ended_finalizes_recording( # noqa: PLR0913
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_handle_egress_ended_does_not_finalize_when_webhooks_enabled( # noqa: PLR0913
|
def test_handle_egress_ended_does_not_finalize_when_webhooks_enabled( # noqa: PLR0913
|
||||||
mock_update_metadata,
|
mock_update_room_metadata,
|
||||||
mock_notify,
|
mock_notify,
|
||||||
mock_notify_external_services,
|
mock_notify_external_services,
|
||||||
egress_status,
|
egress_status,
|
||||||
@@ -427,9 +424,9 @@ def test_handle_egress_ended_does_not_finalize_when_webhooks_enabled( # noqa: P
|
|||||||
EgressStatus.EGRESS_ABORTED,
|
EgressStatus.EGRESS_ABORTED,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_does_not_save_on_wrong_status(
|
def test_handle_egress_ended_does_not_save_on_wrong_status(
|
||||||
mock_update_metadata, egress_status, service, settings
|
mock_update_room_metadata, egress_status, service, settings
|
||||||
):
|
):
|
||||||
"""Shouldn't save on invalid status."""
|
"""Shouldn't save on invalid status."""
|
||||||
settings.RECORDING_STORAGE_EVENT_ENABLE = False
|
settings.RECORDING_STORAGE_EVENT_ENABLE = False
|
||||||
@@ -448,9 +445,9 @@ def test_handle_egress_ended_does_not_save_on_wrong_status(
|
|||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"status", ["failed_to_start", "aborted", "failed_to_stop", "saved", "initiated"]
|
"status", ["failed_to_start", "aborted", "failed_to_stop", "saved", "initiated"]
|
||||||
)
|
)
|
||||||
@mock.patch("core.services.room_management.RoomManagement.update_metadata")
|
@mock.patch("core.utils.update_room_metadata")
|
||||||
def test_handle_egress_ended_ignores_non_savable_recording(
|
def test_handle_egress_ended_ignores_non_savable_recording(
|
||||||
mock_update_metadata, status, service, settings
|
mock_update_room_metadata, status, service, settings
|
||||||
):
|
):
|
||||||
"""Should handle non-savable recordings idempotently without raising.
|
"""Should handle non-savable recordings idempotently without raising.
|
||||||
|
|
||||||
@@ -553,23 +550,6 @@ def test_handle_room_finished_raises_error_when_telephony_deletion_fails(
|
|||||||
mock_clear_cache.assert_not_called()
|
mock_clear_cache.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CONNECTION_TEST_ROOM_PREFIX="connection-test-")
|
|
||||||
@mock.patch.object(LobbyService, "clear_room_cache")
|
|
||||||
@mock.patch.object(TelephonyService, "delete_dispatch_rule")
|
|
||||||
def test_handle_room_finished_ignores_connection_test_room(
|
|
||||||
mock_delete_dispatch_rule, mock_clear_cache, service, settings
|
|
||||||
):
|
|
||||||
"""Should ignore room_finished events for connection test rooms."""
|
|
||||||
settings.ROOM_TELEPHONY_ENABLED = True
|
|
||||||
mock_data = mock.MagicMock()
|
|
||||||
mock_data.room.name = f"{settings.CONNECTION_TEST_ROOM_PREFIX}{uuid.uuid4()}"
|
|
||||||
|
|
||||||
service._handle_room_finished(mock_data)
|
|
||||||
|
|
||||||
mock_delete_dispatch_rule.assert_not_called()
|
|
||||||
mock_clear_cache.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
def test_handle_room_finished_raises_error_for_invalid_room_name(service):
|
def test_handle_room_finished_raises_error_for_invalid_room_name(service):
|
||||||
"""Should raise ActionFailedError when room name format is invalid when room finishes."""
|
"""Should raise ActionFailedError when room name format is invalid when room finishes."""
|
||||||
mock_data = mock.MagicMock()
|
mock_data = mock.MagicMock()
|
||||||
@@ -620,15 +600,6 @@ def test_handle_room_started_raises_error_for_invalid_room_name(service):
|
|||||||
service._handle_room_started(mock_data)
|
service._handle_room_started(mock_data)
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CONNECTION_TEST_ROOM_PREFIX="connection-test-")
|
|
||||||
def test_handle_room_started_ignores_connection_test_room(service, settings):
|
|
||||||
"""Should ignore room_started events for connection test rooms."""
|
|
||||||
mock_data = mock.MagicMock()
|
|
||||||
mock_data.room.name = f"{settings.CONNECTION_TEST_ROOM_PREFIX}{uuid.uuid4()}"
|
|
||||||
|
|
||||||
service._handle_room_started(mock_data)
|
|
||||||
|
|
||||||
|
|
||||||
def test_handle_room_started_raises_error_for_nonexistent_room(service):
|
def test_handle_room_started_raises_error_for_nonexistent_room(service):
|
||||||
"""Should raise ActionFailedError when a room starts that doesn't exist in the database."""
|
"""Should raise ActionFailedError when a room starts that doesn't exist in the database."""
|
||||||
mock_data = mock.MagicMock()
|
mock_data = mock.MagicMock()
|
||||||
|
|||||||
@@ -9,14 +9,13 @@ import uuid
|
|||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.models import AnonymousUser
|
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
from django.http import HttpResponse
|
from django.http import HttpResponse
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from core.factories import RoomFactory, UserFactory, UserResourceAccessFactory
|
from core.factories import RoomFactory
|
||||||
from core.models import RoleChoices, RoomAccessLevel
|
from core.models import RoomAccessLevel
|
||||||
from core.services.lobby import (
|
from core.services.lobby import (
|
||||||
LobbyParticipant,
|
LobbyParticipant,
|
||||||
LobbyParticipantNotFound,
|
LobbyParticipantNotFound,
|
||||||
@@ -189,17 +188,17 @@ def test_prepare_response_new_cookie(lobby_service, participant_id):
|
|||||||
|
|
||||||
|
|
||||||
def test_can_bypass_lobby_public_room(lobby_service):
|
def test_can_bypass_lobby_public_room(lobby_service):
|
||||||
"""Should return True for public rooms regardless of user auth and role."""
|
"""Should return True for public rooms regardless of user auth."""
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
|
room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
|
||||||
|
|
||||||
# Anonymous user
|
# Anonymous user
|
||||||
user = mock.Mock()
|
user = mock.Mock()
|
||||||
user.is_authenticated = False
|
user.is_authenticated = False
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=None) is True
|
assert lobby_service.can_bypass_lobby(room, user) is True
|
||||||
|
|
||||||
# Authenticated user
|
# Authenticated user
|
||||||
user.is_authenticated = True
|
user.is_authenticated = True
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=None) is True
|
assert lobby_service.can_bypass_lobby(room, user) is True
|
||||||
|
|
||||||
|
|
||||||
def test_can_bypass_lobby_trusted_room_authenticated(lobby_service):
|
def test_can_bypass_lobby_trusted_room_authenticated(lobby_service):
|
||||||
@@ -209,7 +208,7 @@ def test_can_bypass_lobby_trusted_room_authenticated(lobby_service):
|
|||||||
# Authenticated user
|
# Authenticated user
|
||||||
user = mock.Mock()
|
user = mock.Mock()
|
||||||
user.is_authenticated = True
|
user.is_authenticated = True
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=None) is True
|
assert lobby_service.can_bypass_lobby(room, user) is True
|
||||||
|
|
||||||
|
|
||||||
def test_can_bypass_lobby_trusted_room_anonymous(lobby_service):
|
def test_can_bypass_lobby_trusted_room_anonymous(lobby_service):
|
||||||
@@ -219,34 +218,21 @@ def test_can_bypass_lobby_trusted_room_anonymous(lobby_service):
|
|||||||
# Anonymous user
|
# Anonymous user
|
||||||
user = mock.Mock()
|
user = mock.Mock()
|
||||||
user.is_authenticated = False
|
user.is_authenticated = False
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=None) is False
|
assert lobby_service.can_bypass_lobby(room, user) is False
|
||||||
|
|
||||||
|
|
||||||
def test_can_bypass_lobby_private_room(lobby_service):
|
def test_can_bypass_lobby_private_room(lobby_service):
|
||||||
"""Should return False for private rooms regardless of user auth if role is not."""
|
"""Should return False for private rooms regardless of user auth."""
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
||||||
|
|
||||||
# Anonymous user
|
# Anonymous user
|
||||||
user = mock.Mock()
|
user = mock.Mock()
|
||||||
user.is_authenticated = False
|
user.is_authenticated = False
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=None) is False
|
assert lobby_service.can_bypass_lobby(room, user) is False
|
||||||
|
|
||||||
# Authenticated user
|
# Authenticated user
|
||||||
user.is_authenticated = True
|
user.is_authenticated = True
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=None) is False
|
assert lobby_service.can_bypass_lobby(room, user) is False
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
|
||||||
"role",
|
|
||||||
[RoleChoices.MEMBER, RoleChoices.ADMIN, RoleChoices.OWNER],
|
|
||||||
)
|
|
||||||
def test_can_bypass_lobby_private_room_with_any_role(role, lobby_service):
|
|
||||||
"""Should return True for private rooms if the user is authenticated and has any role."""
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
|
||||||
|
|
||||||
user = mock.Mock()
|
|
||||||
user.is_authenticated = True
|
|
||||||
assert lobby_service.can_bypass_lobby(room, user, role=role) is True
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.utils.generate_livekit_config")
|
@mock.patch("core.utils.generate_livekit_config")
|
||||||
@@ -255,7 +241,7 @@ def test_request_entry_public_room(
|
|||||||
):
|
):
|
||||||
"""Test requesting entry to a public room."""
|
"""Test requesting entry to a public room."""
|
||||||
request = mock.Mock()
|
request = mock.Mock()
|
||||||
request.user = AnonymousUser()
|
request.user = mock.Mock()
|
||||||
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
|
room = RoomFactory(access_level=RoomAccessLevel.PUBLIC)
|
||||||
|
|
||||||
@@ -280,8 +266,8 @@ def test_request_entry_public_room(
|
|||||||
username=username,
|
username=username,
|
||||||
color=participant.color,
|
color=participant.color,
|
||||||
configuration=room.configuration,
|
configuration=room.configuration,
|
||||||
|
is_admin_or_owner=False,
|
||||||
participant_id="test-participant-id",
|
participant_id="test-participant-id",
|
||||||
role=None,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
||||||
@@ -293,7 +279,8 @@ def test_request_entry_trusted_room(
|
|||||||
):
|
):
|
||||||
"""Test requesting entry to a trusted room when the user is authenticated."""
|
"""Test requesting entry to a trusted room when the user is authenticated."""
|
||||||
request = mock.Mock()
|
request = mock.Mock()
|
||||||
request.user = UserFactory()
|
request.user = mock.Mock()
|
||||||
|
request.user.is_authenticated = True
|
||||||
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
|
room = RoomFactory(access_level=RoomAccessLevel.TRUSTED)
|
||||||
|
|
||||||
@@ -318,8 +305,8 @@ def test_request_entry_trusted_room(
|
|||||||
username=username,
|
username=username,
|
||||||
color=participant.color,
|
color=participant.color,
|
||||||
configuration=room.configuration,
|
configuration=room.configuration,
|
||||||
|
is_admin_or_owner=False,
|
||||||
participant_id="test-participant-id",
|
participant_id="test-participant-id",
|
||||||
role=None,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
||||||
@@ -332,7 +319,6 @@ def test_request_entry_new_participant(
|
|||||||
"""Test requesting entry for a new participant."""
|
"""Test requesting entry for a new participant."""
|
||||||
request = mock.Mock()
|
request = mock.Mock()
|
||||||
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
||||||
request.user = AnonymousUser()
|
|
||||||
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
||||||
|
|
||||||
@@ -362,7 +348,6 @@ def test_request_entry_waiting_participant(
|
|||||||
"""Test requesting entry for a waiting participant."""
|
"""Test requesting entry for a waiting participant."""
|
||||||
request = mock.Mock()
|
request = mock.Mock()
|
||||||
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
||||||
request.user = AnonymousUser()
|
|
||||||
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
||||||
|
|
||||||
@@ -389,7 +374,7 @@ def test_request_entry_accepted_participant(
|
|||||||
):
|
):
|
||||||
"""Test requesting entry for an accepted participant."""
|
"""Test requesting entry for an accepted participant."""
|
||||||
request = mock.Mock()
|
request = mock.Mock()
|
||||||
request.user = AnonymousUser()
|
request.user = mock.Mock()
|
||||||
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
||||||
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
||||||
@@ -415,48 +400,8 @@ def test_request_entry_accepted_participant(
|
|||||||
username=username,
|
username=username,
|
||||||
color="#123456",
|
color="#123456",
|
||||||
configuration=room.configuration,
|
configuration=room.configuration,
|
||||||
|
is_admin_or_owner=False,
|
||||||
participant_id="test-participant-id",
|
participant_id="test-participant-id",
|
||||||
role=None,
|
|
||||||
)
|
|
||||||
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("core.utils.generate_livekit_config")
|
|
||||||
def test_request_entry_participant_with_role(
|
|
||||||
mock_generate_config, lobby_service, participant_id, username
|
|
||||||
):
|
|
||||||
"""Test requesting entry for a participant with a role on the room."""
|
|
||||||
request = mock.Mock()
|
|
||||||
request.user = UserFactory()
|
|
||||||
request.COOKIES = {settings.LOBBY_COOKIE_NAME: participant_id}
|
|
||||||
|
|
||||||
room = RoomFactory(access_level=RoomAccessLevel.RESTRICTED)
|
|
||||||
|
|
||||||
UserResourceAccessFactory(resource=room, user=request.user, role="administrator")
|
|
||||||
|
|
||||||
mocked_participant = LobbyParticipant(
|
|
||||||
status=LobbyParticipantStatus.ACCEPTED,
|
|
||||||
username=username,
|
|
||||||
id=participant_id,
|
|
||||||
color="#123456",
|
|
||||||
)
|
|
||||||
lobby_service._get_or_create_participant_id = mock.Mock(return_value=participant_id)
|
|
||||||
lobby_service._get_participant = mock.Mock(return_value=mocked_participant)
|
|
||||||
|
|
||||||
mock_generate_config.return_value = {"token": "test-token"}
|
|
||||||
|
|
||||||
participant, livekit_config = lobby_service.request_entry(room, request, username)
|
|
||||||
|
|
||||||
assert participant.status == LobbyParticipantStatus.ACCEPTED
|
|
||||||
assert livekit_config == {"token": "test-token"}
|
|
||||||
mock_generate_config.assert_called_once_with(
|
|
||||||
room_id=str(room.id),
|
|
||||||
user=request.user,
|
|
||||||
username=username,
|
|
||||||
color="#123456",
|
|
||||||
configuration=room.configuration,
|
|
||||||
participant_id="test-participant-id",
|
|
||||||
role="administrator",
|
|
||||||
)
|
)
|
||||||
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
lobby_service._get_participant.assert_called_once_with(room.id, participant_id)
|
||||||
|
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
"""Tests for connection test Celery tasks."""
|
|
||||||
|
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
from django.test.utils import override_settings
|
|
||||||
|
|
||||||
from livekit.api import TwirpError
|
|
||||||
|
|
||||||
from core.tasks.connection_test import delete_connection_test_room
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CONNECTION_TEST_ROOM_PREFIX="connection-test-")
|
|
||||||
@mock.patch("core.tasks.connection_test.create_livekit_client")
|
|
||||||
def test_delete_connection_test_room_calls_livekit(mock_create_livekit_client):
|
|
||||||
"""DeleteRoom is called for rooms with the connection-test prefix."""
|
|
||||||
mock_api = mock.MagicMock()
|
|
||||||
mock_api.room.delete_room = mock.AsyncMock()
|
|
||||||
mock_api.aclose = mock.AsyncMock()
|
|
||||||
mock_create_livekit_client.return_value = mock_api
|
|
||||||
|
|
||||||
delete_connection_test_room("connection-test-abc")
|
|
||||||
|
|
||||||
mock_api.room.delete_room.assert_awaited_once()
|
|
||||||
request = mock_api.room.delete_room.await_args.args[0]
|
|
||||||
assert request.room == "connection-test-abc"
|
|
||||||
mock_api.aclose.assert_awaited_once()
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CONNECTION_TEST_ROOM_PREFIX="connection-test-")
|
|
||||||
@mock.patch("core.tasks.connection_test.create_livekit_client")
|
|
||||||
def test_delete_connection_test_room_refuses_other_rooms(mock_create_livekit_client):
|
|
||||||
"""Refuse to delete rooms outside the connection-test namespace."""
|
|
||||||
delete_connection_test_room("production-room")
|
|
||||||
|
|
||||||
mock_create_livekit_client.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CONNECTION_TEST_ROOM_PREFIX="connection-test-")
|
|
||||||
@mock.patch("core.tasks.connection_test.create_livekit_client")
|
|
||||||
def test_delete_connection_test_room_ignores_missing_room(mock_create_livekit_client):
|
|
||||||
"""Missing rooms are treated as already cleaned up."""
|
|
||||||
mock_api = mock.MagicMock()
|
|
||||||
mock_api.room.delete_room = mock.AsyncMock(
|
|
||||||
side_effect=TwirpError("not_found", "room not found", status=404)
|
|
||||||
)
|
|
||||||
mock_api.aclose = mock.AsyncMock()
|
|
||||||
mock_create_livekit_client.return_value = mock_api
|
|
||||||
|
|
||||||
delete_connection_test_room("connection-test-gone")
|
|
||||||
|
|
||||||
mock_api.aclose.assert_awaited_once()
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
"""Test connection test API endpoint."""
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
from django.test.utils import override_settings
|
|
||||||
|
|
||||||
import jwt
|
|
||||||
import pytest
|
|
||||||
from rest_framework.test import APIClient
|
|
||||||
|
|
||||||
from core.api.connection_test import CONNECTION_TEST_USERNAME
|
|
||||||
|
|
||||||
pytestmark = pytest.mark.django_db
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(
|
|
||||||
CONNECTION_TEST_TOKEN_TTL_SECONDS=600,
|
|
||||||
CONNECTION_TEST_ROOM_PREFIX="connection-test-",
|
|
||||||
)
|
|
||||||
def test_api_connection_test_returns_ephemeral_livekit_config():
|
|
||||||
"""Each request gets a dedicated room and a short-lived token."""
|
|
||||||
client = APIClient()
|
|
||||||
response_a = client.get("/api/v1.0/connection-test/")
|
|
||||||
response_b = client.get("/api/v1.0/connection-test/")
|
|
||||||
|
|
||||||
assert response_a.status_code == 200
|
|
||||||
assert response_b.status_code == 200
|
|
||||||
|
|
||||||
data_a = response_a.json()
|
|
||||||
data_b = response_b.json()
|
|
||||||
|
|
||||||
room_a = data_a["livekit"]["room"]
|
|
||||||
room_b = data_b["livekit"]["room"]
|
|
||||||
|
|
||||||
assert room_a.startswith("connection-test-")
|
|
||||||
assert room_b.startswith("connection-test-")
|
|
||||||
uuid.UUID(room_a.removeprefix("connection-test-"))
|
|
||||||
uuid.UUID(room_b.removeprefix("connection-test-"))
|
|
||||||
assert room_a != room_b
|
|
||||||
assert data_a["livekit"]["url"]
|
|
||||||
assert data_a["livekit"]["token"]
|
|
||||||
assert data_a["livekit"]["expires_in"] == 600
|
|
||||||
assert data_a["livekit"]["token"] != data_b["livekit"]["token"]
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CONNECTION_TEST_TOKEN_TTL_SECONDS=300)
|
|
||||||
def test_api_connection_test_token_is_short_lived_for_user(settings):
|
|
||||||
"""Connection test tokens expire quickly for users."""
|
|
||||||
client = APIClient()
|
|
||||||
response = client.get("/api/v1.0/connection-test/")
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
|
|
||||||
config = response.json()["livekit"]
|
|
||||||
payload = jwt.decode(
|
|
||||||
config["token"],
|
|
||||||
settings.LIVEKIT_CONFIGURATION["api_secret"],
|
|
||||||
algorithms=["HS256"],
|
|
||||||
options={"verify_exp": False},
|
|
||||||
)
|
|
||||||
|
|
||||||
assert config["expires_in"] == 300
|
|
||||||
assert payload["video"]["room"] == config["room"]
|
|
||||||
assert payload["name"] == CONNECTION_TEST_USERNAME
|
|
||||||
assert payload["video"]["roomAdmin"] is False
|
|
||||||
assert payload["exp"] - payload["nbf"] == 300
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(
|
|
||||||
CELERY_ENABLED=True,
|
|
||||||
CONNECTION_TEST_ROOM_MAX_AGE_SECONDS=300,
|
|
||||||
CONNECTION_TEST_ROOM_PREFIX="connection-test-",
|
|
||||||
)
|
|
||||||
@mock.patch("core.api.connection_test.delete_connection_test_room.apply_async")
|
|
||||||
def test_api_connection_test_schedules_room_deletion(mock_apply_async):
|
|
||||||
"""When Celery is enabled, schedule a hard room delete after max age."""
|
|
||||||
client = APIClient()
|
|
||||||
response = client.get("/api/v1.0/connection-test/")
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
room = response.json()["livekit"]["room"]
|
|
||||||
mock_apply_async.assert_called_once_with(args=[room], countdown=300)
|
|
||||||
|
|
||||||
|
|
||||||
@override_settings(CELERY_ENABLED=False)
|
|
||||||
@mock.patch("core.api.connection_test.delete_connection_test_room.apply_async")
|
|
||||||
def test_api_connection_test_skips_room_deletion_without_celery(mock_apply_async):
|
|
||||||
"""Without Celery, do not schedule deletion (apply_async would run immediately)."""
|
|
||||||
client = APIClient()
|
|
||||||
response = client.get("/api/v1.0/connection-test/")
|
|
||||||
|
|
||||||
assert response.status_code == 200
|
|
||||||
mock_apply_async.assert_not_called()
|
|
||||||
@@ -2,109 +2,13 @@
|
|||||||
Test utils functions
|
Test utils functions
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=W0621
|
|
||||||
import json
|
import json
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.contrib.auth.models import AnonymousUser
|
|
||||||
|
|
||||||
import jwt
|
|
||||||
import pytest
|
import pytest
|
||||||
from livekit.api import TwirpError
|
from livekit.api import TwirpError
|
||||||
|
|
||||||
from core.factories import UserFactory
|
from core.utils import NotificationError, create_livekit_client, notify_participants
|
||||||
from core.utils import (
|
|
||||||
NotificationError,
|
|
||||||
create_livekit_client,
|
|
||||||
generate_token,
|
|
||||||
notify_participants,
|
|
||||||
)
|
|
||||||
|
|
||||||
pytestmark = pytest.mark.django_db
|
|
||||||
|
|
||||||
|
|
||||||
def decode_token(token: str) -> dict:
|
|
||||||
"""Decode a LiveKit JWT access token for inspection."""
|
|
||||||
return jwt.decode(
|
|
||||||
token,
|
|
||||||
settings.LIVEKIT_CONFIGURATION["api_secret"],
|
|
||||||
algorithms=["HS256"],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_generate_token_authenticated_uses_full_name():
|
|
||||||
"""The token's display name should default to the user's full name."""
|
|
||||||
user = UserFactory(full_name="Jane Doe")
|
|
||||||
|
|
||||||
token = generate_token(room="my-room", user=user)
|
|
||||||
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Jane Doe"
|
|
||||||
assert claims["sub"] == str(user.sub)
|
|
||||||
|
|
||||||
|
|
||||||
def test_generate_token_authenticated_fallback_user_representation():
|
|
||||||
"""
|
|
||||||
When the user has no full name, the token's display name should fall back
|
|
||||||
to the user's string representation.
|
|
||||||
"""
|
|
||||||
user = UserFactory(full_name=None)
|
|
||||||
|
|
||||||
token = generate_token(room="my-room", user=user)
|
|
||||||
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == str(user)
|
|
||||||
|
|
||||||
|
|
||||||
def test_generate_token_explicit_username_overrides_default():
|
|
||||||
"""An explicitly provided username should take precedence over the full name."""
|
|
||||||
user = UserFactory(full_name="Jane Doe")
|
|
||||||
|
|
||||||
token = generate_token(room="my-room", user=user, username="Custom Name")
|
|
||||||
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Custom Name"
|
|
||||||
|
|
||||||
|
|
||||||
def test_authenticated_username_ignored_when_editing_disabled(settings):
|
|
||||||
"""With editing disabled, an authenticated user's username is ignored."""
|
|
||||||
settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = False
|
|
||||||
user = UserFactory(full_name="Jane Doe")
|
|
||||||
token = generate_token(room="my-room", user=user, username="Custom Name")
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Jane Doe"
|
|
||||||
|
|
||||||
|
|
||||||
def test_authenticated_default_name_unaffected_when_editing_disabled(settings):
|
|
||||||
"""Disabling editing doesn't disturb the default full-name path."""
|
|
||||||
settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = False
|
|
||||||
user = UserFactory(full_name="Jane Doe")
|
|
||||||
token = generate_token(room="my-room", user=user)
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Jane Doe"
|
|
||||||
|
|
||||||
|
|
||||||
def test_anonymous_uses_username_when_provided():
|
|
||||||
"""An anonymous user's provided username is used as the display name."""
|
|
||||||
token = generate_token(room="my-room", user=AnonymousUser(), username="Guest42")
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Guest42"
|
|
||||||
|
|
||||||
|
|
||||||
def test_anonymous_username_used_even_when_editing_disabled(settings):
|
|
||||||
"""The setting governs authenticated users only; anonymous can still set a name."""
|
|
||||||
settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = False
|
|
||||||
token = generate_token(room="my-room", user=AnonymousUser(), username="Guest42")
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Guest42"
|
|
||||||
|
|
||||||
|
|
||||||
def test_anonymous_falls_back_to_anonymous_label():
|
|
||||||
"""With no username, an anonymous user is labelled 'Anonymous'."""
|
|
||||||
token = generate_token(room="my-room", user=AnonymousUser())
|
|
||||||
claims = decode_token(token)
|
|
||||||
assert claims["name"] == "Anonymous"
|
|
||||||
|
|
||||||
|
|
||||||
@mock.patch("asyncio.get_running_loop")
|
@mock.patch("asyncio.get_running_loop")
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ from rest_framework.routers import DefaultRouter, SimpleRouter
|
|||||||
|
|
||||||
from core.addons import viewsets as addons_viewsets
|
from core.addons import viewsets as addons_viewsets
|
||||||
from core.api import get_frontend_configuration, viewsets
|
from core.api import get_frontend_configuration, viewsets
|
||||||
from core.api.connection_test import get_connection_test_config
|
|
||||||
from core.external_api import viewsets as external_viewsets
|
from core.external_api import viewsets as external_viewsets
|
||||||
|
|
||||||
# - Main endpoints
|
# - Main endpoints
|
||||||
@@ -47,11 +46,6 @@ urlpatterns = [
|
|||||||
*router.urls,
|
*router.urls,
|
||||||
*oidc_urls,
|
*oidc_urls,
|
||||||
path("config/", get_frontend_configuration, name="config"),
|
path("config/", get_frontend_configuration, name="config"),
|
||||||
path(
|
|
||||||
"connection-test/",
|
|
||||||
get_connection_test_config,
|
|
||||||
name="connection_test",
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
+60
-23
@@ -12,7 +12,6 @@ import mimetypes
|
|||||||
import random
|
import random
|
||||||
import secrets
|
import secrets
|
||||||
import string
|
import string
|
||||||
from datetime import timedelta
|
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
@@ -32,6 +31,7 @@ from livekit.api import ( # pylint: disable=E0611
|
|||||||
LiveKitAPI,
|
LiveKitAPI,
|
||||||
SendDataRequest,
|
SendDataRequest,
|
||||||
TwirpError,
|
TwirpError,
|
||||||
|
UpdateRoomMetadataRequest,
|
||||||
VideoGrants,
|
VideoGrants,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -66,9 +66,8 @@ def generate_token(
|
|||||||
username: Optional[str] = None,
|
username: Optional[str] = None,
|
||||||
color: Optional[str] = None,
|
color: Optional[str] = None,
|
||||||
sources: Optional[List[str]] = None,
|
sources: Optional[List[str]] = None,
|
||||||
role: Optional[str] = None,
|
is_admin_or_owner: bool = False,
|
||||||
participant_id: Optional[str] = None,
|
participant_id: Optional[str] = None,
|
||||||
ttl: Optional[timedelta] = None,
|
|
||||||
) -> str:
|
) -> str:
|
||||||
"""Generate a LiveKit access token for a user in a specific room.
|
"""Generate a LiveKit access token for a user in a specific room.
|
||||||
|
|
||||||
@@ -81,16 +80,14 @@ def generate_token(
|
|||||||
If none, a value will be generated
|
If none, a value will be generated
|
||||||
sources: (Optional[List[str]]): List of media sources the user can publish
|
sources: (Optional[List[str]]): List of media sources the user can publish
|
||||||
If none, defaults to LIVEKIT_DEFAULT_SOURCES.
|
If none, defaults to LIVEKIT_DEFAULT_SOURCES.
|
||||||
role (Optional[str]): Room's access role if any
|
is_admin_or_owner (bool): Whether user has admin privileges
|
||||||
participant_id (Optional[str]): Stable identifier for anonymous users;
|
participant_id (Optional[str]): Stable identifier for anonymous users;
|
||||||
used as identity when user.is_anonymous.
|
used as identity when user.is_anonymous.
|
||||||
ttl (Optional[timedelta]): Token validity duration. Defaults to LiveKit SDK default.
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
str: The LiveKit JWT access token.
|
str: The LiveKit JWT access token.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
is_admin_or_owner = role in ("owner", "administrator")
|
|
||||||
if is_admin_or_owner:
|
if is_admin_or_owner:
|
||||||
sources = settings.LIVEKIT_DEFAULT_SOURCES
|
sources = settings.LIVEKIT_DEFAULT_SOURCES
|
||||||
|
|
||||||
@@ -112,16 +109,11 @@ def generate_token(
|
|||||||
default_username = "Anonymous"
|
default_username = "Anonymous"
|
||||||
else:
|
else:
|
||||||
identity = str(user.sub)
|
identity = str(user.sub)
|
||||||
default_username = user.full_name or str(user)
|
default_username = str(user)
|
||||||
|
|
||||||
if color is None:
|
if color is None:
|
||||||
color = generate_color(identity)
|
color = generate_color(identity)
|
||||||
|
|
||||||
can_edit = (
|
|
||||||
settings.AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME or user.is_anonymous
|
|
||||||
)
|
|
||||||
display_name = (username or default_username) if can_edit else default_username
|
|
||||||
|
|
||||||
token = (
|
token = (
|
||||||
AccessToken(
|
AccessToken(
|
||||||
api_key=settings.LIVEKIT_CONFIGURATION["api_key"],
|
api_key=settings.LIVEKIT_CONFIGURATION["api_key"],
|
||||||
@@ -129,17 +121,11 @@ def generate_token(
|
|||||||
)
|
)
|
||||||
.with_grants(video_grants)
|
.with_grants(video_grants)
|
||||||
.with_identity(identity)
|
.with_identity(identity)
|
||||||
.with_name(display_name)
|
.with_name(username or default_username)
|
||||||
.with_attributes(
|
.with_attributes(
|
||||||
{
|
{"color": color, "room_admin": "true" if is_admin_or_owner else "false"}
|
||||||
"color": color,
|
|
||||||
"room_role": role,
|
|
||||||
"is_authenticated": "true" if user.is_authenticated else "false",
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
if ttl is not None:
|
|
||||||
token = token.with_ttl(ttl)
|
|
||||||
|
|
||||||
return token.to_jwt()
|
return token.to_jwt()
|
||||||
|
|
||||||
@@ -148,7 +134,7 @@ def generate_livekit_config(
|
|||||||
room_id: str,
|
room_id: str,
|
||||||
user,
|
user,
|
||||||
username: str,
|
username: str,
|
||||||
role: Optional[str] = None,
|
is_admin_or_owner: bool,
|
||||||
color: Optional[str] = None,
|
color: Optional[str] = None,
|
||||||
configuration: Optional[dict] = None,
|
configuration: Optional[dict] = None,
|
||||||
participant_id: Optional[str] = None,
|
participant_id: Optional[str] = None,
|
||||||
@@ -159,7 +145,7 @@ def generate_livekit_config(
|
|||||||
room_id: Room identifier
|
room_id: Room identifier
|
||||||
user: User instance requesting access
|
user: User instance requesting access
|
||||||
username: Display name in room
|
username: Display name in room
|
||||||
role (str): Room's access role if any
|
is_admin_or_owner (bool): Whether the user has admin/owner privileges for this room.
|
||||||
color (Optional[str]): Optional color to associate with the participant.
|
color (Optional[str]): Optional color to associate with the participant.
|
||||||
configuration (Optional[dict]): Room configuration dict that can override default settings.
|
configuration (Optional[dict]): Room configuration dict that can override default settings.
|
||||||
participant_id (Optional[str]): Stable identifier for anonymous users;
|
participant_id (Optional[str]): Stable identifier for anonymous users;
|
||||||
@@ -182,7 +168,7 @@ def generate_livekit_config(
|
|||||||
username=username,
|
username=username,
|
||||||
color=color,
|
color=color,
|
||||||
sources=sources,
|
sources=sources,
|
||||||
role=role,
|
is_admin_or_owner=is_admin_or_owner,
|
||||||
participant_id=participant_id,
|
participant_id=participant_id,
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
@@ -267,6 +253,57 @@ async def notify_participants(room_name: str, notification_data: dict):
|
|||||||
await lkapi.aclose()
|
await lkapi.aclose()
|
||||||
|
|
||||||
|
|
||||||
|
class MetadataUpdateException(Exception):
|
||||||
|
"""Room's metadata update fails."""
|
||||||
|
|
||||||
|
|
||||||
|
@async_to_sync
|
||||||
|
async def update_room_metadata(
|
||||||
|
room_name: str, metadata: dict, remove_keys: Optional[list[str]] = None
|
||||||
|
):
|
||||||
|
"""Update LiveKit room metadata by merging new values with existing metadata.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_name: Name of the room to update
|
||||||
|
metadata: Dictionary of metadata key-values to add/update
|
||||||
|
remove_keys: Optional list of keys to remove from existing metadata.
|
||||||
|
"""
|
||||||
|
|
||||||
|
lkapi = create_livekit_client()
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await lkapi.room.list_rooms(
|
||||||
|
ListRoomsRequest(
|
||||||
|
names=[room_name],
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
if not response.rooms:
|
||||||
|
return
|
||||||
|
|
||||||
|
room = response.rooms[0]
|
||||||
|
|
||||||
|
existing_metadata = json.loads(room.metadata) if room.metadata else {}
|
||||||
|
|
||||||
|
if remove_keys:
|
||||||
|
for key in remove_keys:
|
||||||
|
existing_metadata.pop(key, None)
|
||||||
|
|
||||||
|
updated_metadata = {**existing_metadata, **metadata}
|
||||||
|
|
||||||
|
await lkapi.room.update_room_metadata(
|
||||||
|
UpdateRoomMetadataRequest(
|
||||||
|
room=room_name, metadata=json.dumps(updated_metadata).encode("utf-8")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except TwirpError as e:
|
||||||
|
raise MetadataUpdateException(
|
||||||
|
f"Failed to update metadata for room {room_name}: {e}"
|
||||||
|
) from e
|
||||||
|
finally:
|
||||||
|
await lkapi.aclose()
|
||||||
|
|
||||||
|
|
||||||
ALPHANUMERIC_CHARSET = string.ascii_letters + string.digits
|
ALPHANUMERIC_CHARSET = string.ascii_letters + string.digits
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
|
|||||||
# pylint: disable=too-many-lines
|
# pylint: disable=too-many-lines
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import warnings
|
|
||||||
from os import path
|
from os import path
|
||||||
from socket import gethostbyname, gethostname
|
from socket import gethostbyname, gethostname
|
||||||
|
|
||||||
@@ -349,11 +348,6 @@ class Base(Configuration):
|
|||||||
environ_name="CREATION_CALLBACK_THROTTLE_RATES",
|
environ_name="CREATION_CALLBACK_THROTTLE_RATES",
|
||||||
environ_prefix=None,
|
environ_prefix=None,
|
||||||
),
|
),
|
||||||
"connection_test": values.Value(
|
|
||||||
default="30/minute",
|
|
||||||
environ_name="CONNECTION_TEST_THROTTLE_RATES",
|
|
||||||
environ_prefix=None,
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
MONITORED_THROTTLE_FAILURE_CALLBACK = (
|
MONITORED_THROTTLE_FAILURE_CALLBACK = (
|
||||||
@@ -403,9 +397,6 @@ class Base(Configuration):
|
|||||||
"feedback": values.DictValue(
|
"feedback": values.DictValue(
|
||||||
{}, environ_name="FRONTEND_FEEDBACK", environ_prefix=None
|
{}, environ_name="FRONTEND_FEEDBACK", environ_prefix=None
|
||||||
),
|
),
|
||||||
"documentation_url": values.Value(
|
|
||||||
None, environ_name="FRONTEND_DOCUMENTATION_URL", environ_prefix=None
|
|
||||||
),
|
|
||||||
"external_home_url": values.Value(
|
"external_home_url": values.Value(
|
||||||
None, environ_name="FRONTEND_EXTERNAL_HOME_URL", environ_prefix=None
|
None, environ_name="FRONTEND_EXTERNAL_HOME_URL", environ_prefix=None
|
||||||
),
|
),
|
||||||
@@ -660,21 +651,6 @@ class Base(Configuration):
|
|||||||
environ_prefix=None,
|
environ_prefix=None,
|
||||||
default=False,
|
default=False,
|
||||||
)
|
)
|
||||||
CONNECTION_TEST_TOKEN_TTL_SECONDS = values.PositiveIntegerValue(
|
|
||||||
300,
|
|
||||||
environ_name="CONNECTION_TEST_TOKEN_TTL_SECONDS",
|
|
||||||
environ_prefix=None,
|
|
||||||
)
|
|
||||||
CONNECTION_TEST_ROOM_MAX_AGE_SECONDS = values.PositiveIntegerValue(
|
|
||||||
300,
|
|
||||||
environ_name="CONNECTION_TEST_ROOM_MAX_AGE_SECONDS",
|
|
||||||
environ_prefix=None,
|
|
||||||
)
|
|
||||||
CONNECTION_TEST_ROOM_PREFIX = values.Value(
|
|
||||||
"connection-test-",
|
|
||||||
environ_name="CONNECTION_TEST_ROOM_PREFIX",
|
|
||||||
environ_prefix=None,
|
|
||||||
)
|
|
||||||
LIVEKIT_VERIFY_SSL = values.BooleanValue(
|
LIVEKIT_VERIFY_SSL = values.BooleanValue(
|
||||||
True, environ_name="LIVEKIT_VERIFY_SSL", environ_prefix=None
|
True, environ_name="LIVEKIT_VERIFY_SSL", environ_prefix=None
|
||||||
)
|
)
|
||||||
@@ -694,11 +670,6 @@ class Base(Configuration):
|
|||||||
environ_name="PARTICIPANT_FORBIDDEN_PERMISSION_FIELDS",
|
environ_name="PARTICIPANT_FORBIDDEN_PERMISSION_FIELDS",
|
||||||
environ_prefix=None,
|
environ_prefix=None,
|
||||||
)
|
)
|
||||||
AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME = values.BooleanValue(
|
|
||||||
True,
|
|
||||||
environ_name="AUTHENTICATED_PARTICIPANTS_CAN_EDIT_DISPLAY_NAME",
|
|
||||||
environ_prefix=None,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Recording settings
|
# Recording settings
|
||||||
RECORDING_ENABLE = values.BooleanValue(
|
RECORDING_ENABLE = values.BooleanValue(
|
||||||
@@ -1157,20 +1128,6 @@ class Base(Configuration):
|
|||||||
"FILE_UPLOAD_TMP_PATH cannot be the same as FILE_UPLOAD_PATH"
|
"FILE_UPLOAD_TMP_PATH cannot be the same as FILE_UPLOAD_PATH"
|
||||||
)
|
)
|
||||||
|
|
||||||
if (
|
|
||||||
cls.SUMMARY_SERVICE_VERSION == 1
|
|
||||||
and cls.SUMMARY_SERVICE_ENDPOINT is not None
|
|
||||||
):
|
|
||||||
warnings.warn(
|
|
||||||
"SUMMARY_SERVICE_VERSION=1 is deprecated. "
|
|
||||||
"The legacy v1 API has been removed from the experimental "
|
|
||||||
"Summary service. Please update your Summary service deployment to "
|
|
||||||
"the v2 API and set SUMMARY_SERVICE_VERSION=2.",
|
|
||||||
# We use UserWarning to make sure it shows up in production deployment
|
|
||||||
UserWarning,
|
|
||||||
stacklevel=2,
|
|
||||||
)
|
|
||||||
|
|
||||||
# The SENTRY_DSN setting should be available to activate sentry for an environment
|
# The SENTRY_DSN setting should be available to activate sentry for an environment
|
||||||
if cls.SENTRY_DSN is not None:
|
if cls.SENTRY_DSN is not None:
|
||||||
sentry_sdk.init(
|
sentry_sdk.init(
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ build-backend = "uv_build"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "meet"
|
name = "meet"
|
||||||
version = "1.24.0"
|
version = "1.22.0"
|
||||||
authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
|
authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 5 - Production/Stable",
|
"Development Status :: 5 - Production/Stable",
|
||||||
|
|||||||
Generated
+1
-1
@@ -1187,7 +1187,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "meet"
|
name = "meet"
|
||||||
version = "1.24.0"
|
version = "1.22.0"
|
||||||
source = { editable = "." }
|
source = { editable = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "aiohttp" },
|
{ name = "aiohttp" },
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM node:22-alpine AS frontend-deps
|
FROM node:20-alpine AS frontend-deps
|
||||||
|
|
||||||
USER node
|
USER node
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ ENV VITE_API_BASE_URL=${VITE_API_BASE_URL}
|
|||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# ---- Front-end image ----
|
# ---- Front-end image ----
|
||||||
FROM nginxinc/nginx-unprivileged:1.30.3-alpine3.23 AS frontend-production
|
FROM nginxinc/nginx-unprivileged:alpine3.23 AS frontend-production
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
|
|||||||
Generated
+54
-239
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "meet",
|
"name": "meet",
|
||||||
"version": "1.24.0",
|
"version": "1.22.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "meet",
|
"name": "meet",
|
||||||
"version": "1.24.0",
|
"version": "1.22.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource-variable/atkinson-hyperlegible-next": "5.2.6",
|
"@fontsource-variable/atkinson-hyperlegible-next": "5.2.6",
|
||||||
"@fontsource-variable/lexend": "5.2.11",
|
"@fontsource-variable/lexend": "5.2.11",
|
||||||
@@ -15,11 +15,10 @@
|
|||||||
"@livekit/components-react": "2.9.21",
|
"@livekit/components-react": "2.9.21",
|
||||||
"@livekit/components-styles": "1.2.0",
|
"@livekit/components-styles": "1.2.0",
|
||||||
"@livekit/track-processors": "0.7.2",
|
"@livekit/track-processors": "0.7.2",
|
||||||
"@mediapipe/tasks-vision": "0.10.35",
|
|
||||||
"@pandacss/preset-panda": "1.11.3",
|
"@pandacss/preset-panda": "1.11.3",
|
||||||
"@react-types/overlays": "3.10.0",
|
"@react-types/overlays": "3.10.0",
|
||||||
"@remixicon/react": "4.9.0",
|
"@remixicon/react": "4.9.0",
|
||||||
"@tanstack/react-query": "5.101.1",
|
"@tanstack/react-query": "5.100.14",
|
||||||
"@timephy/rnnoise-wasm": "1.0.0",
|
"@timephy/rnnoise-wasm": "1.0.0",
|
||||||
"crisp-sdk-web": "1.1.2",
|
"crisp-sdk-web": "1.1.2",
|
||||||
"derive-valtio": "0.2.0",
|
"derive-valtio": "0.2.0",
|
||||||
@@ -29,14 +28,14 @@
|
|||||||
"i18next-browser-languagedetector": "8.2.1",
|
"i18next-browser-languagedetector": "8.2.1",
|
||||||
"i18next-parser": "9.4.0",
|
"i18next-parser": "9.4.0",
|
||||||
"i18next-resources-to-backend": "1.2.1",
|
"i18next-resources-to-backend": "1.2.1",
|
||||||
"livekit-client": "2.20.0",
|
"livekit-client": "2.19.0",
|
||||||
"posthog-js": "1.395.0",
|
"posthog-js": "1.386.5",
|
||||||
"react": "18.3.1",
|
"react": "18.3.1",
|
||||||
"react-aria": "3.50.0",
|
"react-aria": "3.49.0",
|
||||||
"react-aria-components": "1.19.0",
|
"react-aria-components": "1.18.0",
|
||||||
"react-dom": "18.3.1",
|
"react-dom": "18.3.1",
|
||||||
"react-i18next": "17.0.8",
|
"react-i18next": "17.0.8",
|
||||||
"react-stately": "3.48.0",
|
"react-stately": "3.47.0",
|
||||||
"use-sound": "5.0.0",
|
"use-sound": "5.0.0",
|
||||||
"valtio": "2.3.2",
|
"valtio": "2.3.2",
|
||||||
"wouter": "3.10.0"
|
"wouter": "3.10.0"
|
||||||
@@ -64,7 +63,6 @@
|
|||||||
"typescript": "6.0.3",
|
"typescript": "6.0.3",
|
||||||
"typescript-eslint": "8.60.1",
|
"typescript-eslint": "8.60.1",
|
||||||
"vite": "8.0.14",
|
"vite": "8.0.14",
|
||||||
"vite-plugin-static-copy": "4.1.1",
|
|
||||||
"vite-plugin-svgr": "5.2.0"
|
"vite-plugin-svgr": "5.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -112,62 +110,6 @@
|
|||||||
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
|
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@adobe/react-spectrum/node_modules/react-aria": {
|
|
||||||
"version": "3.49.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/react-aria/-/react-aria-3.49.0.tgz",
|
|
||||||
"integrity": "sha512-4+oK9FwJQWYhyA5zLfj/feOGY0zZbkE1muoF4gyxMroHVypjcYaRSTlJwvxph2zIlxt757KX6xIK2wJ5Aw1Kog==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@internationalized/date": "^3.12.2",
|
|
||||||
"@internationalized/number": "^3.6.7",
|
|
||||||
"@internationalized/string": "^3.2.9",
|
|
||||||
"@react-types/shared": "^3.35.0",
|
|
||||||
"@swc/helpers": "^0.5.0",
|
|
||||||
"aria-hidden": "^1.2.3",
|
|
||||||
"clsx": "^2.0.0",
|
|
||||||
"react-stately": "3.47.0",
|
|
||||||
"use-sync-external-store": "^1.6.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
|
|
||||||
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@adobe/react-spectrum/node_modules/react-aria-components": {
|
|
||||||
"version": "1.18.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/react-aria-components/-/react-aria-components-1.18.0.tgz",
|
|
||||||
"integrity": "sha512-FhRQjuDkH4WhgFv+O2sYTzK3JzdZTGpBeaqfRlfTo+DcSZzD8elJEkytHe7SDpcexVKeire8NVd7OruZHfCVoA==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@internationalized/date": "^3.12.2",
|
|
||||||
"@react-types/shared": "^3.35.0",
|
|
||||||
"@swc/helpers": "^0.5.0",
|
|
||||||
"client-only": "^0.0.1",
|
|
||||||
"react-aria": "3.49.0",
|
|
||||||
"react-stately": "3.47.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
|
|
||||||
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@adobe/react-spectrum/node_modules/react-stately": {
|
|
||||||
"version": "3.47.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/react-stately/-/react-stately-3.47.0.tgz",
|
|
||||||
"integrity": "sha512-H3ar+SOWP920EbVg7qWfP3fZjZiwhlEJAEJQqjt+w8oKijCwFgr0+R4941PIHscOXRNRvEOjvWilitImC0DdBg==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@internationalized/date": "^3.12.2",
|
|
||||||
"@internationalized/number": "^3.6.7",
|
|
||||||
"@internationalized/string": "^3.2.9",
|
|
||||||
"@react-types/shared": "^3.35.0",
|
|
||||||
"@swc/helpers": "^0.5.0",
|
|
||||||
"use-sync-external-store": "^1.6.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
"version": "7.29.0",
|
"version": "7.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
|
||||||
@@ -1028,9 +970,9 @@
|
|||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/@livekit/protocol": {
|
"node_modules/@livekit/protocol": {
|
||||||
"version": "1.46.6",
|
"version": "1.45.8",
|
||||||
"resolved": "https://registry.npmjs.org/@livekit/protocol/-/protocol-1.46.6.tgz",
|
"resolved": "https://registry.npmjs.org/@livekit/protocol/-/protocol-1.45.8.tgz",
|
||||||
"integrity": "sha512-upzlHP1vi/kZ/QqALZTFskQ0ifqc2f15RKucHYOsIHJsaXvEYanG75mAb7o+Yomfs4XhQ4BaRsdY+TFHXpaqrg==",
|
"integrity": "sha512-Q+l57E7w/xxOBFVWzdX5rkAZO7ffyF+rlDzNUYq2SU114+5aTyCq+PK4unaEVDNd4952Af7wteKr3sOgasGuaA==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@bufbuild/protobuf": "^1.10.0"
|
"@bufbuild/protobuf": "^1.10.0"
|
||||||
@@ -1049,18 +991,12 @@
|
|||||||
"livekit-client": "^1.12.0 || ^2.1.0"
|
"livekit-client": "^1.12.0 || ^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@livekit/track-processors/node_modules/@mediapipe/tasks-vision": {
|
"node_modules/@mediapipe/tasks-vision": {
|
||||||
"version": "0.10.14",
|
"version": "0.10.14",
|
||||||
"resolved": "https://registry.npmjs.org/@mediapipe/tasks-vision/-/tasks-vision-0.10.14.tgz",
|
"resolved": "https://registry.npmjs.org/@mediapipe/tasks-vision/-/tasks-vision-0.10.14.tgz",
|
||||||
"integrity": "sha512-vOifgZhkndgybdvoRITzRkIueWWSiCKuEUXXK6Q4FaJsFvRJuwgg++vqFUMlL0Uox62U5aEXFhHxlhV7Ja5e3Q==",
|
"integrity": "sha512-vOifgZhkndgybdvoRITzRkIueWWSiCKuEUXXK6Q4FaJsFvRJuwgg++vqFUMlL0Uox62U5aEXFhHxlhV7Ja5e3Q==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/@mediapipe/tasks-vision": {
|
|
||||||
"version": "0.10.35",
|
|
||||||
"resolved": "https://registry.npmjs.org/@mediapipe/tasks-vision/-/tasks-vision-0.10.35.tgz",
|
|
||||||
"integrity": "sha512-HOvadwVRE6JC+45nyYhmnywnr5h/J8KZvOeUNVOG9q/0875pZgItznFB9bRTvLc264YSJqiZ1NsIpCStJw/egg==",
|
|
||||||
"license": "Apache-2.0"
|
|
||||||
},
|
|
||||||
"node_modules/@modelcontextprotocol/sdk": {
|
"node_modules/@modelcontextprotocol/sdk": {
|
||||||
"version": "1.29.0",
|
"version": "1.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
|
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
|
||||||
@@ -1816,9 +1752,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@react-types/shared": {
|
"node_modules/@react-types/shared": {
|
||||||
"version": "3.36.0",
|
"version": "3.35.0",
|
||||||
"resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.36.0.tgz",
|
"resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.35.0.tgz",
|
||||||
"integrity": "sha512-DkP/H0C2YjjS7gZWKNqOmU8a16qHPjQNdzMwmTq9SzplM6Iw0kVMTZ0OIoe6FOgGqa+FwMsE2QbPjh/n3g/jXQ==",
|
"integrity": "sha512-iNWvuzEwANttpQpdlu8nPBtdHb0mcCMj1ZTH//iRB5E/14IAnyRlR25rxH7pNLyzHINsPGEKnWvpwDMCT6vziQ==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
|
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
|
||||||
@@ -2421,9 +2357,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tanstack/query-core": {
|
"node_modules/@tanstack/query-core": {
|
||||||
"version": "5.101.1",
|
"version": "5.100.14",
|
||||||
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.101.1.tgz",
|
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.100.14.tgz",
|
||||||
"integrity": "sha512-Y6Y92dkXtNqx67m2pMSxUsA3zOCwv862JexZRP8/EPwvKXMPu9m8rv43spiXWzOUIggQ3SQApttALStzhA8B4g==",
|
"integrity": "sha512-5X41dGpxgeaHISCRW2oYwcSycZeULZzAunaudXT9ov1KOTj9xwt0CH6hbwqP1/z74ZWF7rYFnDpyYH07XFcZew==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "github",
|
"type": "github",
|
||||||
@@ -2442,12 +2378,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tanstack/react-query": {
|
"node_modules/@tanstack/react-query": {
|
||||||
"version": "5.101.1",
|
"version": "5.100.14",
|
||||||
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.101.1.tgz",
|
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.100.14.tgz",
|
||||||
"integrity": "sha512-ZnONUuQKJe1bJMStXUL1s5uKN9FcfC28j5cK+iDZcdSHtUv1wtin1cGc/Oewhf2Oc4eKY7lggtpvT/AbMmhHew==",
|
"integrity": "sha512-oOr6aRdSFEwWhzxEkD/9ZcItM3+LjBSkeVmadWKwUssAHTsqd/7bOjWrX4AbvEkoEhgAxzN0Xk6H/aYzXiYBAw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tanstack/query-core": "5.101.1"
|
"@tanstack/query-core": "5.100.14"
|
||||||
},
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "github",
|
"type": "github",
|
||||||
@@ -3256,19 +3192,6 @@
|
|||||||
"node": ">=6.0.0"
|
"node": ">=6.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/binary-extensions": {
|
|
||||||
"version": "2.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
|
|
||||||
"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/bl": {
|
"node_modules/bl": {
|
||||||
"version": "5.1.0",
|
"version": "5.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
|
||||||
@@ -7171,19 +7094,6 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/is-binary-path": {
|
|
||||||
"version": "2.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
|
|
||||||
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"binary-extensions": "^2.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/is-boolean-object": {
|
"node_modules/is-boolean-object": {
|
||||||
"version": "1.2.2",
|
"version": "1.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
|
||||||
@@ -8125,13 +8035,13 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/livekit-client": {
|
"node_modules/livekit-client": {
|
||||||
"version": "2.20.0",
|
"version": "2.19.0",
|
||||||
"resolved": "https://registry.npmjs.org/livekit-client/-/livekit-client-2.20.0.tgz",
|
"resolved": "https://registry.npmjs.org/livekit-client/-/livekit-client-2.19.0.tgz",
|
||||||
"integrity": "sha512-RIJcpvBmOmwz3jTj3rmdY6Dzr55HrhcaJjMgY+HSmoEM+yIRyA40m7r8UKv0hnZWM3z/AYhP1q8C8ciz5UWFKQ==",
|
"integrity": "sha512-aolY1XDAtx0nHKBNm29W9OhzBnSz1CP5kq3phvRhFfi1NbvMXs8tcACjAkZTnIKgihkp+BiJScZZ3tZv0Gz8sA==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@livekit/mutex": "1.1.1",
|
"@livekit/mutex": "1.1.1",
|
||||||
"@livekit/protocol": "1.46.6",
|
"@livekit/protocol": "1.45.8",
|
||||||
"events": "^3.3.0",
|
"events": "^3.3.0",
|
||||||
"jose": "^6.1.0",
|
"jose": "^6.1.0",
|
||||||
"loglevel": "^1.9.2",
|
"loglevel": "^1.9.2",
|
||||||
@@ -8765,19 +8675,6 @@
|
|||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/p-map": {
|
|
||||||
"version": "7.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.5.tgz",
|
|
||||||
"integrity": "sha512-e8vJF4XdVkzqqSHguEMz41mQO1wKwxKm5ENrUJQUu9kLDCtn83cxbyHZcszr4QC5zEA7WffRRC4gsTecC7J9oA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/package-manager-detector": {
|
"node_modules/package-manager-detector": {
|
||||||
"version": "1.6.0",
|
"version": "1.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz",
|
||||||
@@ -9136,19 +9033,19 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/posthog-js": {
|
"node_modules/posthog-js": {
|
||||||
"version": "1.395.0",
|
"version": "1.386.5",
|
||||||
"resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.395.0.tgz",
|
"resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.386.5.tgz",
|
||||||
"integrity": "sha512-5iTb00CGt2eQUUiBQysQiX89RAbCN6wK2sDNzvs9zv0alaY8mJ0ZySrUD3LQ+XyLhgM5pCpacBuUwChqiYDLDw==",
|
"integrity": "sha512-ASejQQf5Xw0XolMwH/KCLZlZtoyLK6VsvORwGagAtfa8/ElIOF76BMQspkDsRTybEI+uzHqRDm2m/na1Dki2mA==",
|
||||||
"license": "SEE LICENSE IN LICENSE",
|
"license": "SEE LICENSE IN LICENSE",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@posthog/core": "^1.38.0",
|
"@posthog/core": "^1.32.3",
|
||||||
"@posthog/types": "^1.391.1",
|
"@posthog/types": "^1.386.3",
|
||||||
"core-js": "^3.38.1",
|
"core-js": "^3.38.1",
|
||||||
"dompurify": "^3.3.2",
|
"dompurify": "^3.3.2",
|
||||||
"fflate": "^0.4.8",
|
"fflate": "^0.4.8",
|
||||||
"preact": "^10.29.2",
|
"preact": "^10.28.2",
|
||||||
"query-selector-shadow-dom": "^1.0.1",
|
"query-selector-shadow-dom": "^1.0.1",
|
||||||
"web-vitals": "^5.3.0"
|
"web-vitals": "^5.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/powershell-utils": {
|
"node_modules/powershell-utils": {
|
||||||
@@ -9165,21 +9062,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/preact": {
|
"node_modules/preact": {
|
||||||
"version": "10.29.7",
|
"version": "10.28.3",
|
||||||
"resolved": "https://registry.npmjs.org/preact/-/preact-10.29.7.tgz",
|
"resolved": "https://registry.npmjs.org/preact/-/preact-10.28.3.tgz",
|
||||||
"integrity": "sha512-DCHYrK/B10yUD3ZjLfhZ3WIE/9Vf9VFUODcRE2dRomTYDpJk6z6L9wecSfhfE6M9ZTHUdyQkoC46arIDhEV84Q==",
|
"integrity": "sha512-tCmoRkPQLpBeWzpmbhryairGnhW9tKV6c6gr/w+RhoRoKEJwsjzipwp//1oCpGPOchvSLaAPlpcJi9MwMmoPyA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "opencollective",
|
"type": "opencollective",
|
||||||
"url": "https://opencollective.com/preact"
|
"url": "https://opencollective.com/preact"
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"preact-render-to-string": ">=5"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"preact-render-to-string": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/prelude-ls": {
|
"node_modules/prelude-ls": {
|
||||||
@@ -9386,19 +9275,19 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/react-aria": {
|
"node_modules/react-aria": {
|
||||||
"version": "3.50.0",
|
"version": "3.49.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-aria/-/react-aria-3.50.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-aria/-/react-aria-3.49.0.tgz",
|
||||||
"integrity": "sha512-S0Os6QZk33fzUAKu1QLT9afoUaCBt1ZNdoiq0n2YMVgKIdNIQS8zxiZ8O9hYE6QyDkHKjD6q39LQZ+qaSAIgjw==",
|
"integrity": "sha512-4+oK9FwJQWYhyA5zLfj/feOGY0zZbkE1muoF4gyxMroHVypjcYaRSTlJwvxph2zIlxt757KX6xIK2wJ5Aw1Kog==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@internationalized/date": "^3.12.2",
|
"@internationalized/date": "^3.12.2",
|
||||||
"@internationalized/number": "^3.6.7",
|
"@internationalized/number": "^3.6.7",
|
||||||
"@internationalized/string": "^3.2.9",
|
"@internationalized/string": "^3.2.9",
|
||||||
"@react-types/shared": "^3.36.0",
|
"@react-types/shared": "^3.35.0",
|
||||||
"@swc/helpers": "^0.5.0",
|
"@swc/helpers": "^0.5.0",
|
||||||
"aria-hidden": "^1.2.3",
|
"aria-hidden": "^1.2.3",
|
||||||
"clsx": "^2.0.0",
|
"clsx": "^2.0.0",
|
||||||
"react-stately": "3.48.0",
|
"react-stately": "3.47.0",
|
||||||
"use-sync-external-store": "^1.6.0"
|
"use-sync-external-store": "^1.6.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
@@ -9407,17 +9296,17 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/react-aria-components": {
|
"node_modules/react-aria-components": {
|
||||||
"version": "1.19.0",
|
"version": "1.18.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-aria-components/-/react-aria-components-1.19.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-aria-components/-/react-aria-components-1.18.0.tgz",
|
||||||
"integrity": "sha512-2smSS5nqJ8cGYMQezuUXveZm7eMyHCqTN6mDpylQBYLYbdF5dxCCuW1DHn1VKLe1DybSfPvX/cZtJlDmvFfn8A==",
|
"integrity": "sha512-FhRQjuDkH4WhgFv+O2sYTzK3JzdZTGpBeaqfRlfTo+DcSZzD8elJEkytHe7SDpcexVKeire8NVd7OruZHfCVoA==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@internationalized/date": "^3.12.2",
|
"@internationalized/date": "^3.12.2",
|
||||||
"@react-types/shared": "^3.36.0",
|
"@react-types/shared": "^3.35.0",
|
||||||
"@swc/helpers": "^0.5.0",
|
"@swc/helpers": "^0.5.0",
|
||||||
"client-only": "^0.0.1",
|
"client-only": "^0.0.1",
|
||||||
"react-aria": "3.50.0",
|
"react-aria": "3.49.0",
|
||||||
"react-stately": "3.48.0"
|
"react-stately": "3.47.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
|
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
|
||||||
@@ -9471,15 +9360,15 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/react-stately": {
|
"node_modules/react-stately": {
|
||||||
"version": "3.48.0",
|
"version": "3.47.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-stately/-/react-stately-3.48.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-stately/-/react-stately-3.47.0.tgz",
|
||||||
"integrity": "sha512-ImicSAG+lTotAe5izcs1fz49Zk48w7pDusqYg04WaPhCoej8BJ24soMu3iLXIrsi273s4P1gZrYGrqReMfgEEA==",
|
"integrity": "sha512-H3ar+SOWP920EbVg7qWfP3fZjZiwhlEJAEJQqjt+w8oKijCwFgr0+R4941PIHscOXRNRvEOjvWilitImC0DdBg==",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@internationalized/date": "^3.12.2",
|
"@internationalized/date": "^3.12.2",
|
||||||
"@internationalized/number": "^3.6.7",
|
"@internationalized/number": "^3.6.7",
|
||||||
"@internationalized/string": "^3.2.9",
|
"@internationalized/string": "^3.2.9",
|
||||||
"@react-types/shared": "^3.36.0",
|
"@react-types/shared": "^3.35.0",
|
||||||
"@swc/helpers": "^0.5.0",
|
"@swc/helpers": "^0.5.0",
|
||||||
"use-sync-external-store": "^1.6.0"
|
"use-sync-external-store": "^1.6.0"
|
||||||
},
|
},
|
||||||
@@ -11248,80 +11137,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vite-plugin-static-copy": {
|
|
||||||
"version": "4.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-4.1.1.tgz",
|
|
||||||
"integrity": "sha512-GrlA8YklrAfSyxJ4M3fdQLOo9oNkp56IM9FYgX/WtEgeIFkPwhu4wzpufBCIuNKCa6Fn77FkRdYxkHqV0FwjAw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"chokidar": "^3.6.0",
|
|
||||||
"p-map": "^7.0.4",
|
|
||||||
"picocolors": "^1.1.1",
|
|
||||||
"tinyglobby": "^0.2.17"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^22.0.0 || >=24.0.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/sapphi-red"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vite-plugin-static-copy/node_modules/chokidar": {
|
|
||||||
"version": "3.6.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
|
|
||||||
"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"anymatch": "~3.1.2",
|
|
||||||
"braces": "~3.0.2",
|
|
||||||
"glob-parent": "~5.1.2",
|
|
||||||
"is-binary-path": "~2.1.0",
|
|
||||||
"is-glob": "~4.0.1",
|
|
||||||
"normalize-path": "~3.0.0",
|
|
||||||
"readdirp": "~3.6.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 8.10.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://paulmillr.com/funding/"
|
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"fsevents": "~2.3.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vite-plugin-static-copy/node_modules/glob-parent": {
|
|
||||||
"version": "5.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
|
|
||||||
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"is-glob": "^4.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vite-plugin-static-copy/node_modules/readdirp": {
|
|
||||||
"version": "3.6.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
|
|
||||||
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"picomatch": "^2.2.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vite-plugin-svgr": {
|
"node_modules/vite-plugin-svgr": {
|
||||||
"version": "5.2.0",
|
"version": "5.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-5.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-5.2.0.tgz",
|
||||||
@@ -11655,9 +11470,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/web-vitals": {
|
"node_modules/web-vitals": {
|
||||||
"version": "5.3.0",
|
"version": "5.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-5.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-5.1.0.tgz",
|
||||||
"integrity": "sha512-q6LWsLatGYZp5VGBIOvbTj6JBV2nOmC8KvWztXBmwJcfFAzhwKwbOxhUH306XY3CcaZDUlSmSuNPBsCn0bFu+g==",
|
"integrity": "sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/webrtc-adapter": {
|
"node_modules/webrtc-adapter": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "meet",
|
"name": "meet",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.24.0",
|
"version": "1.22.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "panda codegen && vite",
|
"dev": "panda codegen && vite",
|
||||||
@@ -17,16 +17,15 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource-variable/atkinson-hyperlegible-next": "5.2.6",
|
"@fontsource-variable/atkinson-hyperlegible-next": "5.2.6",
|
||||||
"@fontsource-variable/lexend": "5.2.11",
|
"@fontsource-variable/lexend": "5.2.11",
|
||||||
"@fontsource/opendyslexic": "5.2.5",
|
|
||||||
"@libreaudio/la-call": "0.1.4",
|
"@libreaudio/la-call": "0.1.4",
|
||||||
|
"@fontsource/opendyslexic": "5.2.5",
|
||||||
"@livekit/components-react": "2.9.21",
|
"@livekit/components-react": "2.9.21",
|
||||||
"@livekit/components-styles": "1.2.0",
|
"@livekit/components-styles": "1.2.0",
|
||||||
"@livekit/track-processors": "0.7.2",
|
"@livekit/track-processors": "0.7.2",
|
||||||
"@mediapipe/tasks-vision": "0.10.35",
|
|
||||||
"@pandacss/preset-panda": "1.11.3",
|
"@pandacss/preset-panda": "1.11.3",
|
||||||
"@react-types/overlays": "3.10.0",
|
"@react-types/overlays": "3.10.0",
|
||||||
"@remixicon/react": "4.9.0",
|
"@remixicon/react": "4.9.0",
|
||||||
"@tanstack/react-query": "5.101.1",
|
"@tanstack/react-query": "5.100.14",
|
||||||
"@timephy/rnnoise-wasm": "1.0.0",
|
"@timephy/rnnoise-wasm": "1.0.0",
|
||||||
"crisp-sdk-web": "1.1.2",
|
"crisp-sdk-web": "1.1.2",
|
||||||
"derive-valtio": "0.2.0",
|
"derive-valtio": "0.2.0",
|
||||||
@@ -36,14 +35,14 @@
|
|||||||
"i18next-browser-languagedetector": "8.2.1",
|
"i18next-browser-languagedetector": "8.2.1",
|
||||||
"i18next-parser": "9.4.0",
|
"i18next-parser": "9.4.0",
|
||||||
"i18next-resources-to-backend": "1.2.1",
|
"i18next-resources-to-backend": "1.2.1",
|
||||||
"livekit-client": "2.20.0",
|
"livekit-client": "2.19.0",
|
||||||
"posthog-js": "1.395.0",
|
"posthog-js": "1.386.5",
|
||||||
"react": "18.3.1",
|
"react": "18.3.1",
|
||||||
"react-aria": "3.50.0",
|
"react-aria": "3.49.0",
|
||||||
"react-aria-components": "1.19.0",
|
"react-aria-components": "1.18.0",
|
||||||
"react-dom": "18.3.1",
|
"react-dom": "18.3.1",
|
||||||
"react-i18next": "17.0.8",
|
"react-i18next": "17.0.8",
|
||||||
"react-stately": "3.48.0",
|
"react-stately": "3.47.0",
|
||||||
"use-sound": "5.0.0",
|
"use-sound": "5.0.0",
|
||||||
"valtio": "2.3.2",
|
"valtio": "2.3.2",
|
||||||
"wouter": "3.10.0"
|
"wouter": "3.10.0"
|
||||||
@@ -71,7 +70,6 @@
|
|||||||
"typescript": "6.0.3",
|
"typescript": "6.0.3",
|
||||||
"typescript-eslint": "8.60.1",
|
"typescript-eslint": "8.60.1",
|
||||||
"vite": "8.0.14",
|
"vite": "8.0.14",
|
||||||
"vite-plugin-static-copy": "4.1.1",
|
|
||||||
"vite-plugin-svgr": "5.2.0"
|
"vite-plugin-svgr": "5.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,10 +114,6 @@ const config: Config = {
|
|||||||
clipPath: 'polygon(50% 50%, 0 0, 100% 0, 100% 100%, 0 100%, 0 0)',
|
clipPath: 'polygon(50% 50%, 0 0, 100% 0, 100% 100%, 0 100%, 0 0)',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
overlayIn: {
|
|
||||||
from: { opacity: 0 },
|
|
||||||
to: { opacity: 0.6 },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
tokens: defineTokens({
|
tokens: defineTokens({
|
||||||
/* we take a few things from the panda preset but for now we clear out some stuff.
|
/* we take a few things from the panda preset but for now we clear out some stuff.
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -20,7 +20,6 @@ export interface ApiConfig {
|
|||||||
feedback: {
|
feedback: {
|
||||||
url: string
|
url: string
|
||||||
}
|
}
|
||||||
documentation_url?: string
|
|
||||||
external_home_url?: string
|
external_home_url?: string
|
||||||
silence_livekit_debug_logs?: boolean
|
silence_livekit_debug_logs?: boolean
|
||||||
is_silent_login_enabled?: boolean
|
is_silent_login_enabled?: boolean
|
||||||
@@ -59,7 +58,6 @@ export interface ApiConfig {
|
|||||||
transcription_destination?: string
|
transcription_destination?: string
|
||||||
max_participants_for_sound: number
|
max_participants_for_sound: number
|
||||||
auto_mute_on_join_threshold: number
|
auto_mute_on_join_threshold: number
|
||||||
authenticated_users_can_edit_display_name: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const fetchConfig = (): Promise<ApiConfig> => {
|
const fetchConfig = (): Promise<ApiConfig> => {
|
||||||
|
|||||||
@@ -7,20 +7,36 @@ const avatar = cva({
|
|||||||
color: 'white',
|
color: 'white',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
borderRadius: '50%',
|
borderRadius: '50%',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
userSelect: 'none',
|
userSelect: 'none',
|
||||||
cursor: 'default',
|
cursor: 'default',
|
||||||
flexGrow: 0,
|
flexGrow: 0,
|
||||||
flexShrink: 0,
|
flexShrink: 0,
|
||||||
overflow: 'hidden',
|
|
||||||
},
|
},
|
||||||
variants: {
|
variants: {
|
||||||
context: {
|
context: {
|
||||||
subtitles: { width: '40px', height: '40px' },
|
subtitles: {
|
||||||
list: { width: '32px', height: '32px' },
|
width: '40px',
|
||||||
placeholder: { width: '100%', height: '100%' },
|
height: '40px',
|
||||||
|
fontSize: '1.3rem',
|
||||||
|
lineHeight: '1rem',
|
||||||
|
},
|
||||||
|
list: {
|
||||||
|
width: '32px',
|
||||||
|
height: '32px',
|
||||||
|
fontSize: '1.3rem',
|
||||||
|
lineHeight: '1rem',
|
||||||
|
},
|
||||||
|
placeholder: {
|
||||||
|
width: '100%',
|
||||||
|
height: '100%',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
notification: {
|
notification: {
|
||||||
true: { border: '2px solid white' },
|
true: {
|
||||||
|
border: '2px solid white',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
defaultVariants: {
|
defaultVariants: {
|
||||||
@@ -28,49 +44,37 @@ const avatar = cva({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const getInitials = (name?: string): string => {
|
|
||||||
if (!name) return ''
|
|
||||||
const words = name.trim().split(/\s+/).filter(Boolean)
|
|
||||||
if (words.length === 0) return ''
|
|
||||||
const first = words[0].charAt(0)
|
|
||||||
const second = words.length > 1 ? words[1].charAt(0) : ''
|
|
||||||
return (first + second).toUpperCase()
|
|
||||||
}
|
|
||||||
|
|
||||||
export type AvatarProps = React.HTMLAttributes<HTMLDivElement> & {
|
export type AvatarProps = React.HTMLAttributes<HTMLDivElement> & {
|
||||||
name?: string
|
name?: string
|
||||||
bgColor?: string
|
bgColor?: string
|
||||||
} & RecipeVariantProps<typeof avatar>
|
} & RecipeVariantProps<typeof avatar>
|
||||||
|
|
||||||
export const Avatar = React.memo(
|
export const Avatar = ({
|
||||||
({ name, bgColor, context, notification, style, ...props }: AvatarProps) => {
|
name,
|
||||||
const initials = getInitials(name)
|
bgColor,
|
||||||
return (
|
context,
|
||||||
<div
|
notification,
|
||||||
style={{ backgroundColor: bgColor, ...style }}
|
style,
|
||||||
className={avatar({ context, notification })}
|
...props
|
||||||
{...props}
|
}: AvatarProps) => {
|
||||||
|
const initial = name?.trim()?.charAt(0) ?? ''
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
backgroundColor: bgColor,
|
||||||
|
...style,
|
||||||
|
}}
|
||||||
|
className={avatar({ context, notification })}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
className={css({
|
||||||
|
marginTop: '-0.3rem',
|
||||||
|
})}
|
||||||
>
|
>
|
||||||
<svg
|
{initial}
|
||||||
viewBox="0 0 100 100"
|
</span>
|
||||||
aria-hidden="true"
|
</div>
|
||||||
className={css({ width: '100%', height: '100%', display: 'block' })}
|
)
|
||||||
>
|
}
|
||||||
<text
|
|
||||||
x="50"
|
|
||||||
y="50"
|
|
||||||
textAnchor="middle"
|
|
||||||
dominantBaseline="central"
|
|
||||||
fontSize={initials.length > 1 ? 48 : 52}
|
|
||||||
fontWeight="500"
|
|
||||||
fill="currentColor"
|
|
||||||
>
|
|
||||||
{initials.toUpperCase()}
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
Avatar.displayName = 'Avatar'
|
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { Text } from '@/primitives'
|
|
||||||
import { ChatMessages } from './ChatMessages'
|
|
||||||
import { ChatTextArea } from './ChatTextArea'
|
|
||||||
import { styled } from '@/styled-system/jsx'
|
|
||||||
|
|
||||||
const ChatContainer = styled('div', {
|
|
||||||
base: {
|
|
||||||
display: 'flex',
|
|
||||||
padding: '0 1.5rem',
|
|
||||||
flexGrow: 1,
|
|
||||||
flexDirection: 'column',
|
|
||||||
minHeight: 0,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const ChatMessagesContainer = styled('div', {
|
|
||||||
base: {
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
flexGrow: 1,
|
|
||||||
minHeight: 0,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const TextContainer = styled('div', {
|
|
||||||
base: {
|
|
||||||
display: 'flex',
|
|
||||||
padding: '0.75rem',
|
|
||||||
backgroundColor: 'greyscale.50',
|
|
||||||
borderRadius: 4,
|
|
||||||
marginBottom: '0.75rem',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export const Chat = () => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'chat' })
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ChatContainer>
|
|
||||||
<TextContainer>
|
|
||||||
<Text variant="sm">{t('disclaimer')}</Text>
|
|
||||||
</TextContainer>
|
|
||||||
<ChatMessagesContainer>
|
|
||||||
<ChatMessages />
|
|
||||||
</ChatMessagesContainer>
|
|
||||||
<ChatTextArea />
|
|
||||||
</ChatContainer>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import type { ChatRow } from '@/stores/chat'
|
|
||||||
import { styled } from '@/styled-system/jsx'
|
|
||||||
import { ChatMessageMetadata } from './ChatMessageMedata'
|
|
||||||
import { ChatMessageBody } from './ChatMessageBody'
|
|
||||||
|
|
||||||
const StyledContainer = styled('li', {
|
|
||||||
base: {
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
gap: '0.25rem',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
type ChatMessageProps = {
|
|
||||||
item: ChatRow
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ChatMessage = ({ item }: ChatMessageProps) => {
|
|
||||||
const time = new Date(item.timestamp)
|
|
||||||
const locale = navigator ? navigator.language : 'en-US'
|
|
||||||
return (
|
|
||||||
<StyledContainer
|
|
||||||
title={time.toLocaleTimeString(locale, { timeStyle: 'full' })}
|
|
||||||
>
|
|
||||||
{!item.hideMetadata && (
|
|
||||||
<ChatMessageMetadata
|
|
||||||
timestamp={item.timestamp}
|
|
||||||
identity={item.identity}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<ChatMessageBody message={item.message} />
|
|
||||||
</StyledContainer>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { ChatRow } from '@/stores/chat'
|
|
||||||
import React, { useMemo } from 'react'
|
|
||||||
import { formatChatMessageLinks } from '@livekit/components-react'
|
|
||||||
import { css } from '@/styled-system/css'
|
|
||||||
import { Text } from '@/primitives'
|
|
||||||
|
|
||||||
type ChatMessageBodyProps = Pick<ChatRow, 'message'>
|
|
||||||
|
|
||||||
export const ChatMessageBody = React.memo(
|
|
||||||
({ message }: ChatMessageBodyProps) => {
|
|
||||||
const formattedMessage = useMemo(() => {
|
|
||||||
return formatChatMessageLinks(message)
|
|
||||||
}, [message])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Text
|
|
||||||
variant="sm"
|
|
||||||
margin={false}
|
|
||||||
className={css({
|
|
||||||
whiteSpace: 'pre-wrap',
|
|
||||||
'& .lk-chat-link': {
|
|
||||||
color: 'blue',
|
|
||||||
textDecoration: 'underline',
|
|
||||||
},
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
{formattedMessage}
|
|
||||||
</Text>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
ChatMessageBody.displayName = 'ChatMessageBody'
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
import { styled } from '@/styled-system/jsx'
|
|
||||||
import { ChatRow, chatStore } from '@/stores/chat'
|
|
||||||
import React, { useMemo } from 'react'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import { Text } from '@/primitives'
|
|
||||||
|
|
||||||
const StyledContainer = styled('span', {
|
|
||||||
base: {
|
|
||||||
display: 'flex',
|
|
||||||
gap: '0.5rem',
|
|
||||||
paddingTop: '0.75rem',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
type ChatMessageMetadataProps = Pick<ChatRow, 'identity' | 'timestamp'>
|
|
||||||
|
|
||||||
export const ChatMessageMetadata = React.memo(
|
|
||||||
({ identity, timestamp }: ChatMessageMetadataProps) => {
|
|
||||||
const time = new Date(timestamp)
|
|
||||||
const locale = navigator ? navigator.language : 'en-US'
|
|
||||||
|
|
||||||
const { names } = useSnapshot(chatStore)
|
|
||||||
|
|
||||||
const currentDisplayName = useMemo(() => {
|
|
||||||
if (identity) return names[identity] ?? identity
|
|
||||||
}, [names, identity])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<StyledContainer>
|
|
||||||
<Text bold={true} variant="sm">
|
|
||||||
{currentDisplayName}
|
|
||||||
</Text>
|
|
||||||
<Text variant="smNote" wrap="no">
|
|
||||||
{time.toLocaleTimeString(locale, { timeStyle: 'short' })}
|
|
||||||
</Text>
|
|
||||||
</StyledContainer>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
ChatMessageMetadata.displayName = 'ChatMessageMetadata'
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import {
|
|
||||||
ListBox,
|
|
||||||
ListBoxItem,
|
|
||||||
ListLayout,
|
|
||||||
Virtualizer,
|
|
||||||
} from 'react-aria-components'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { ChatMessage } from './ChatMessage.tsx'
|
|
||||||
import { useLayoutEffect, useRef } from 'react'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import { ChatRow, chatStore } from '@/stores/chat'
|
|
||||||
|
|
||||||
// Estimated height of a chat entry in px. ListLayout measures the real
|
|
||||||
// rendered height of each row; this value is only used to size the
|
|
||||||
// scrollbar before rows have been measured.
|
|
||||||
const ESTIMATED_ROW_HEIGHT = 56
|
|
||||||
const BOTTOM_THRESHOLD_PX = 32
|
|
||||||
|
|
||||||
export const ChatMessages = () => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'chat' })
|
|
||||||
const { rows: items } = useSnapshot(chatStore)
|
|
||||||
|
|
||||||
const listRef = useRef<HTMLDivElement>(null)
|
|
||||||
const stick = useRef(true)
|
|
||||||
|
|
||||||
useLayoutEffect(() => {
|
|
||||||
const el = listRef.current
|
|
||||||
if (!el) return
|
|
||||||
const pin = () => {
|
|
||||||
if (stick.current) el.scrollTop = el.scrollHeight
|
|
||||||
}
|
|
||||||
const onScroll = () => {
|
|
||||||
stick.current =
|
|
||||||
el.scrollHeight - el.scrollTop - el.clientHeight <= BOTTOM_THRESHOLD_PX
|
|
||||||
}
|
|
||||||
const ro = new ResizeObserver(pin)
|
|
||||||
// Sizer div = ListLayout's content size. Fires on append, and again each
|
|
||||||
// time an estimated row height is replaced by a measured one.
|
|
||||||
if (el.firstElementChild) ro.observe(el.firstElementChild)
|
|
||||||
// Container. Height goes 0 -> N as the panel animates in, and on resize.
|
|
||||||
ro.observe(el)
|
|
||||||
el.addEventListener('scroll', onScroll, { passive: true })
|
|
||||||
pin()
|
|
||||||
return () => {
|
|
||||||
ro.disconnect()
|
|
||||||
el.removeEventListener('scroll', onScroll)
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Virtualizer
|
|
||||||
layout={ListLayout}
|
|
||||||
layoutOptions={{
|
|
||||||
estimatedRowSize: ESTIMATED_ROW_HEIGHT,
|
|
||||||
gap: 4,
|
|
||||||
padding: 4,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<ListBox
|
|
||||||
ref={listRef}
|
|
||||||
aria-label={t('messagesLabel', 'Chat messages')}
|
|
||||||
items={items}
|
|
||||||
selectionMode="none"
|
|
||||||
style={{
|
|
||||||
display: 'block',
|
|
||||||
height: '100%',
|
|
||||||
width: '100%',
|
|
||||||
overflow: 'auto',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{(item: ChatRow) => (
|
|
||||||
<ListBoxItem style={{ width: '100%' }}>
|
|
||||||
<ChatMessage item={item} />
|
|
||||||
</ListBoxItem>
|
|
||||||
)}
|
|
||||||
</ListBox>
|
|
||||||
</Virtualizer>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
// features/rooms/chat/ChatProvider.tsx — renders no DOM, mounted once at room level
|
|
||||||
import { ref } from 'valtio'
|
|
||||||
import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
|
|
||||||
import React, { useEffect } from 'react'
|
|
||||||
import { useChat, useRoomContext } from '@livekit/components-react'
|
|
||||||
import { appendRow, chatStore, resetChatStore } from '@/stores/chat'
|
|
||||||
import type { ChatMessage } from '@livekit/components-core'
|
|
||||||
import {
|
|
||||||
LocalParticipant,
|
|
||||||
Participant,
|
|
||||||
RemoteParticipant,
|
|
||||||
RoomEvent,
|
|
||||||
} from 'livekit-client'
|
|
||||||
|
|
||||||
export const ChatProvider = () => {
|
|
||||||
const lastReadMsgAt = React.useRef<ChatMessage['timestamp']>(0)
|
|
||||||
const { send, chatMessages, isSending } = useChat()
|
|
||||||
const { isChatOpen } = useSidePanel()
|
|
||||||
|
|
||||||
const room = useRoomContext()
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
resetChatStore()
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
// Tigger the message notification (temporary)
|
|
||||||
useEffect(() => {
|
|
||||||
// TEMPORARY: This is a brittle workaround that relies on message count tracking
|
|
||||||
// due to recent LiveKit useChat changes breaking the previous implementation
|
|
||||||
// (see https://github.com/livekit/components-js/issues/1158)
|
|
||||||
// Remove this once we refactor chat to use the new text stream approach
|
|
||||||
const latestMessage = chatMessages.slice(-1)[0]
|
|
||||||
if (!latestMessage) return
|
|
||||||
const from = latestMessage.from as
|
|
||||||
| RemoteParticipant
|
|
||||||
| LocalParticipant
|
|
||||||
| undefined
|
|
||||||
|
|
||||||
room.emit(RoomEvent.ChatMessage, latestMessage, from)
|
|
||||||
}, [chatMessages, room])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
for (let i = chatStore.rows.length; i < chatMessages.length; i++) {
|
|
||||||
appendRow(chatMessages[i])
|
|
||||||
}
|
|
||||||
}, [chatMessages])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
chatStore.send = ref(send)
|
|
||||||
}, [send])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
chatStore.isSending = isSending
|
|
||||||
}, [isSending])
|
|
||||||
|
|
||||||
// Set the unread messages count
|
|
||||||
useEffect(() => {
|
|
||||||
if (chatMessages.length === 0) return
|
|
||||||
const last = chatMessages[chatMessages.length - 1]
|
|
||||||
if (isChatOpen) {
|
|
||||||
lastReadMsgAt.current = last.timestamp
|
|
||||||
chatStore.unreadMessages = 0
|
|
||||||
return
|
|
||||||
}
|
|
||||||
chatStore.unreadMessages = chatMessages.filter(
|
|
||||||
(m) => !lastReadMsgAt.current || m.timestamp > lastReadMsgAt.current
|
|
||||||
).length
|
|
||||||
}, [chatMessages, isChatOpen])
|
|
||||||
|
|
||||||
// Listen to participant name changes
|
|
||||||
useEffect(() => {
|
|
||||||
const setName = (p: Participant) => {
|
|
||||||
chatStore.names[p.identity] = p.name || p.identity
|
|
||||||
}
|
|
||||||
const onNameChanged = (_name: string, p: Participant) => setName(p)
|
|
||||||
room.on(RoomEvent.ParticipantNameChanged, onNameChanged)
|
|
||||||
return () => {
|
|
||||||
room.off(RoomEvent.ParticipantNameChanged, onNameChanged)
|
|
||||||
}
|
|
||||||
}, [room])
|
|
||||||
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
import React from 'react'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { Button } from '@/primitives'
|
|
||||||
import { RiSendPlane2Fill } from '@remixicon/react'
|
|
||||||
|
|
||||||
type ChatSubmitButtonProps = {
|
|
||||||
handleSubmit: () => Promise<void>
|
|
||||||
isDisabled: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ChatSubmitButton = React.memo(
|
|
||||||
({ handleSubmit, isDisabled }: ChatSubmitButtonProps) => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'controls.chat.input' })
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
square
|
|
||||||
invisible
|
|
||||||
variant="tertiaryText"
|
|
||||||
size="sm"
|
|
||||||
onPress={handleSubmit}
|
|
||||||
isDisabled={isDisabled}
|
|
||||||
aria-label={t('button.label')}
|
|
||||||
>
|
|
||||||
<RiSendPlane2Fill />
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
ChatSubmitButton.displayName = 'ChatSubmitButton'
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
import { TextArea } from '@/primitives'
|
|
||||||
import { styled } from '@/styled-system/jsx'
|
|
||||||
import React, { useCallback, useEffect } from 'react'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import {
|
|
||||||
chatStore,
|
|
||||||
clearTextAreaValue,
|
|
||||||
persistTextAreaValue,
|
|
||||||
} from '@/stores/chat'
|
|
||||||
import { ChatSubmitButton } from './ChatSubmitButton'
|
|
||||||
|
|
||||||
const StyledContainer = styled('div', {
|
|
||||||
base: {
|
|
||||||
display: 'flex',
|
|
||||||
margin: '0.75rem 0 1.5rem',
|
|
||||||
padding: '0.5rem',
|
|
||||||
backgroundColor: 'gray.100',
|
|
||||||
borderRadius: 4,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export const ChatTextArea = () => {
|
|
||||||
const { isSending, send, textAreaValue } = useSnapshot(chatStore)
|
|
||||||
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'controls.chat.input' })
|
|
||||||
|
|
||||||
const inputRef = React.useRef<HTMLTextAreaElement>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const el = inputRef.current
|
|
||||||
if (!el) return
|
|
||||||
const raf = requestAnimationFrame(() => {
|
|
||||||
el.focus({ preventScroll: true })
|
|
||||||
const end = el.value.length
|
|
||||||
el.setSelectionRange(end, end)
|
|
||||||
})
|
|
||||||
return () => cancelAnimationFrame(raf)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const handleSubmit = useCallback(async () => {
|
|
||||||
const text = chatStore.textAreaValue
|
|
||||||
if (!send || !text) return
|
|
||||||
await send(text)
|
|
||||||
inputRef?.current?.focus({ preventScroll: true })
|
|
||||||
clearTextAreaValue()
|
|
||||||
}, [send, inputRef])
|
|
||||||
|
|
||||||
const isDisabled = !textAreaValue.trim() || isSending
|
|
||||||
|
|
||||||
const onKeyDown = async (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
|
|
||||||
e.stopPropagation()
|
|
||||||
if (e.key !== 'Enter' || (e.key === 'Enter' && e.shiftKey) || isDisabled)
|
|
||||||
return
|
|
||||||
e.preventDefault()
|
|
||||||
await handleSubmit()
|
|
||||||
}
|
|
||||||
|
|
||||||
const onKeyUp = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
|
|
||||||
e.stopPropagation()
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<StyledContainer>
|
|
||||||
<TextArea
|
|
||||||
ref={inputRef}
|
|
||||||
value={textAreaValue}
|
|
||||||
onKeyDown={onKeyDown}
|
|
||||||
onKeyUp={onKeyUp}
|
|
||||||
onChange={(e) => {
|
|
||||||
persistTextAreaValue(e.target.value)
|
|
||||||
}}
|
|
||||||
fieldSizing={'content'}
|
|
||||||
style={{
|
|
||||||
border: 'none',
|
|
||||||
resize: 'none',
|
|
||||||
height: 'auto',
|
|
||||||
maxHeight: '240px',
|
|
||||||
minHeight: `34px`,
|
|
||||||
lineHeight: 1.25,
|
|
||||||
padding: '7px 10px',
|
|
||||||
}}
|
|
||||||
placeholderStyle="strong"
|
|
||||||
spellCheck={false}
|
|
||||||
maxLength={2000}
|
|
||||||
placeholder={t('textArea.placeholder')}
|
|
||||||
aria-label={t('textArea.label')}
|
|
||||||
/>
|
|
||||||
<ChatSubmitButton handleSubmit={handleSubmit} isDisabled={isDisabled} />
|
|
||||||
</StyledContainer>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { fetchApi } from '@/api/fetchApi'
|
|
||||||
|
|
||||||
export type ConnectionTestTokenResponse = {
|
|
||||||
livekit: {
|
|
||||||
url: string
|
|
||||||
room: string
|
|
||||||
token: string
|
|
||||||
expires_in: number
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const fetchConnectionTestToken = () =>
|
|
||||||
fetchApi<ConnectionTestTokenResponse>('/connection-test/')
|
|
||||||
@@ -1,245 +0,0 @@
|
|||||||
import { useRef, useState } from 'react'
|
|
||||||
import {
|
|
||||||
CheckStatus,
|
|
||||||
ConnectionCheck,
|
|
||||||
createLocalAudioTrack,
|
|
||||||
createLocalVideoTrack,
|
|
||||||
getBrowser,
|
|
||||||
type CheckInfo,
|
|
||||||
type LocalVideoTrack,
|
|
||||||
} from 'livekit-client'
|
|
||||||
import { fetchConnectionTestToken } from '../api/fetchConnectionTestToken'
|
|
||||||
import {
|
|
||||||
createInitialSteps,
|
|
||||||
type ConnectionTestLog,
|
|
||||||
type ConnectionTestStepId,
|
|
||||||
type ConnectionTestStepResult,
|
|
||||||
type ConnectionTestStepStatus,
|
|
||||||
} from '../types'
|
|
||||||
import { openPermissionsDialog } from '@/stores/permissions'
|
|
||||||
|
|
||||||
const LIVEKIT_STEP_IDS: ConnectionTestStepId[] = [
|
|
||||||
'websocket',
|
|
||||||
'webrtc',
|
|
||||||
'turn',
|
|
||||||
'reconnect',
|
|
||||||
'publishAudio',
|
|
||||||
'publishVideo',
|
|
||||||
]
|
|
||||||
|
|
||||||
const CHECK_STATUS_TO_STEP: Record<CheckStatus, ConnectionTestStepStatus> = {
|
|
||||||
[CheckStatus.IDLE]: 'pending',
|
|
||||||
[CheckStatus.RUNNING]: 'running',
|
|
||||||
[CheckStatus.SUCCESS]: 'success',
|
|
||||||
[CheckStatus.FAILED]: 'failed',
|
|
||||||
[CheckStatus.SKIPPED]: 'skipped',
|
|
||||||
}
|
|
||||||
|
|
||||||
const getErrorMessage = (error: unknown, fallback = 'Unknown error') =>
|
|
||||||
error instanceof Error ? error.message : fallback
|
|
||||||
|
|
||||||
const fromCheckInfo = (info: CheckInfo): Partial<ConnectionTestStepResult> => ({
|
|
||||||
status: CHECK_STATUS_TO_STEP[info.status] ?? 'failed',
|
|
||||||
summary: info.description,
|
|
||||||
logs: info.logs,
|
|
||||||
})
|
|
||||||
|
|
||||||
const groupDevicesByKind = (devices: MediaDeviceInfo[]) => {
|
|
||||||
const grouped: Record<MediaDeviceKind, string[]> = {
|
|
||||||
audioinput: [],
|
|
||||||
audiooutput: [],
|
|
||||||
videoinput: [],
|
|
||||||
}
|
|
||||||
for (const device of devices) {
|
|
||||||
grouped[device.kind].push(device.label || device.deviceId)
|
|
||||||
}
|
|
||||||
return grouped
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useConnectionTestRunner = () => {
|
|
||||||
const [steps, setSteps] = useState(createInitialSteps)
|
|
||||||
const [isRunning, setIsRunning] = useState(false)
|
|
||||||
const [videoTrack, setVideoTrack] = useState<LocalVideoTrack | null>(null)
|
|
||||||
const videoTrackRef = useRef<LocalVideoTrack | null>(null)
|
|
||||||
const abortRef = useRef<AbortController | null>(null)
|
|
||||||
|
|
||||||
const updateStep = (
|
|
||||||
id: ConnectionTestStepId,
|
|
||||||
patch: Partial<ConnectionTestStepResult>
|
|
||||||
) => {
|
|
||||||
setSteps((current) =>
|
|
||||||
current.map((step) => (step.id === id ? { ...step, ...patch } : step))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const stopVideoTrack = () => {
|
|
||||||
videoTrackRef.current?.stop()
|
|
||||||
videoTrackRef.current = null
|
|
||||||
setVideoTrack(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
const skipSteps = (
|
|
||||||
ids: ConnectionTestStepId[],
|
|
||||||
summary: string,
|
|
||||||
logs?: ConnectionTestLog[]
|
|
||||||
) => {
|
|
||||||
for (const id of ids) {
|
|
||||||
updateStep(id, { status: 'skipped', summary, logs })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Returns true on success, false on failure, null if aborted. */
|
|
||||||
const runStep = async (
|
|
||||||
id: ConnectionTestStepId,
|
|
||||||
signal: AbortSignal,
|
|
||||||
fn: () => Promise<Partial<ConnectionTestStepResult>>
|
|
||||||
): Promise<boolean | null> => {
|
|
||||||
if (signal.aborted) return null
|
|
||||||
|
|
||||||
updateStep(id, { status: 'running', summary: undefined, logs: undefined })
|
|
||||||
|
|
||||||
try {
|
|
||||||
const result = await fn()
|
|
||||||
if (signal.aborted) return null
|
|
||||||
// `result.status` overrides when set (LiveKit checks map their own status)
|
|
||||||
updateStep(id, { status: 'success', ...result })
|
|
||||||
return true
|
|
||||||
} catch (error) {
|
|
||||||
if (signal.aborted) return null
|
|
||||||
updateStep(id, {
|
|
||||||
status: 'failed',
|
|
||||||
summary: getErrorMessage(error),
|
|
||||||
})
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const runTest = async () => {
|
|
||||||
abortRef.current?.abort()
|
|
||||||
const controller = new AbortController()
|
|
||||||
abortRef.current = controller
|
|
||||||
const { signal } = controller
|
|
||||||
|
|
||||||
setIsRunning(true)
|
|
||||||
setSteps(createInitialSteps())
|
|
||||||
stopVideoTrack()
|
|
||||||
|
|
||||||
try {
|
|
||||||
await runStep('browser', signal, async () => {
|
|
||||||
const browser = getBrowser()
|
|
||||||
if (!browser) throw new Error('Browser not detected')
|
|
||||||
return {
|
|
||||||
summary: `${browser.name} ${browser.version}`,
|
|
||||||
data: {
|
|
||||||
name: browser.name,
|
|
||||||
version: browser.version,
|
|
||||||
os: browser.os,
|
|
||||||
osVersion: browser.osVersion,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if (signal.aborted) return
|
|
||||||
|
|
||||||
const microphoneOk = await runStep('microphone', signal, async () => {
|
|
||||||
const track = await createLocalAudioTrack()
|
|
||||||
const label =
|
|
||||||
track.mediaStreamTrack.label ||
|
|
||||||
track.mediaStreamTrack.getSettings().deviceId ||
|
|
||||||
''
|
|
||||||
track.stop()
|
|
||||||
return { summary: label, data: { label } }
|
|
||||||
})
|
|
||||||
if (signal.aborted) return
|
|
||||||
if (!microphoneOk) openPermissionsDialog('audioinput')
|
|
||||||
|
|
||||||
const cameraOk = await runStep('camera', signal, async () => {
|
|
||||||
const track = await createLocalVideoTrack()
|
|
||||||
videoTrackRef.current = track
|
|
||||||
setVideoTrack(track)
|
|
||||||
const settings = track.mediaStreamTrack.getSettings()
|
|
||||||
const label = track.mediaStreamTrack.label || ''
|
|
||||||
return {
|
|
||||||
summary: label,
|
|
||||||
data: {
|
|
||||||
label,
|
|
||||||
width: settings.width,
|
|
||||||
height: settings.height,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if (signal.aborted) return
|
|
||||||
if (!cameraOk) openPermissionsDialog('videoinput')
|
|
||||||
|
|
||||||
await runStep('devices', signal, async () => {
|
|
||||||
const devices = await navigator.mediaDevices.enumerateDevices()
|
|
||||||
return {
|
|
||||||
summary: String(devices.length),
|
|
||||||
data: groupDevicesByKind(devices),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
if (signal.aborted) return
|
|
||||||
|
|
||||||
let checker: ConnectionCheck
|
|
||||||
try {
|
|
||||||
const { livekit } = await fetchConnectionTestToken()
|
|
||||||
checker = new ConnectionCheck(livekit.url, livekit.token)
|
|
||||||
} catch (error) {
|
|
||||||
skipSteps(
|
|
||||||
LIVEKIT_STEP_IDS,
|
|
||||||
getErrorMessage(error, 'Failed to fetch test token')
|
|
||||||
)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
await runStep('websocket', signal, async () =>
|
|
||||||
fromCheckInfo(await checker.checkWebsocket())
|
|
||||||
)
|
|
||||||
await runStep('webrtc', signal, async () =>
|
|
||||||
fromCheckInfo(await checker.checkWebRTC())
|
|
||||||
)
|
|
||||||
await runStep('turn', signal, async () =>
|
|
||||||
fromCheckInfo(await checker.checkTURN())
|
|
||||||
)
|
|
||||||
await runStep('reconnect', signal, async () =>
|
|
||||||
fromCheckInfo(await checker.checkReconnect())
|
|
||||||
)
|
|
||||||
|
|
||||||
if (!microphoneOk) {
|
|
||||||
skipSteps(['publishAudio'], 'Microphone permission required')
|
|
||||||
} else {
|
|
||||||
await runStep('publishAudio', signal, async () =>
|
|
||||||
fromCheckInfo(await checker.checkPublishAudio())
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!cameraOk) {
|
|
||||||
skipSteps(['publishVideo'], 'Camera permission required')
|
|
||||||
} else {
|
|
||||||
stopVideoTrack()
|
|
||||||
await runStep('publishVideo', signal, async () =>
|
|
||||||
fromCheckInfo(await checker.checkPublishVideo())
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
if (!signal.aborted) {
|
|
||||||
stopVideoTrack()
|
|
||||||
setIsRunning(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const reset = () => {
|
|
||||||
abortRef.current?.abort()
|
|
||||||
stopVideoTrack()
|
|
||||||
setSteps(createInitialSteps())
|
|
||||||
setIsRunning(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
steps,
|
|
||||||
isRunning,
|
|
||||||
videoTrack,
|
|
||||||
runTest,
|
|
||||||
reset,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
import { useEffect, useRef, useState } from 'react'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { CenteredContent } from '@/layout/CenteredContent'
|
|
||||||
import { Screen } from '@/layout/Screen'
|
|
||||||
import { Box, Button, Text, Ul } from '@/primitives'
|
|
||||||
import { Spinner } from '@/primitives/Spinner'
|
|
||||||
import { Center, HStack, VStack } from '@/styled-system/jsx'
|
|
||||||
import { Permissions } from '@/features/rooms/components/Permissions'
|
|
||||||
import { useConnectionTestRunner } from '../hooks/useConnectionTestRunner'
|
|
||||||
import type { ConnectionTestStepId, ConnectionTestStepResult } from '../types'
|
|
||||||
import { downloadConnectionTestReport } from '../utils/downloadConnectionTestReport'
|
|
||||||
|
|
||||||
const HIDE_LIVEKIT_VIDEO_CLASS = 'connection-test-hide-livekit-video'
|
|
||||||
|
|
||||||
const TestStepItem = ({ step }: { step: ConnectionTestStepResult }) => {
|
|
||||||
const { t } = useTranslation('connectionTest')
|
|
||||||
const [showDetails, setShowDetails] = useState(false)
|
|
||||||
const hasLogs = Boolean(step.logs?.length)
|
|
||||||
const statusLabel = t(`status.${step.status}`)
|
|
||||||
const stepLabel = t(`steps.${step.id as ConnectionTestStepId}`)
|
|
||||||
|
|
||||||
const statusVariant =
|
|
||||||
step.status === 'failed'
|
|
||||||
? 'warning'
|
|
||||||
: step.status === 'success'
|
|
||||||
? 'body'
|
|
||||||
: 'smNote'
|
|
||||||
|
|
||||||
return (
|
|
||||||
<VStack gap="0.25rem" alignItems="stretch" width="100%">
|
|
||||||
<HStack
|
|
||||||
justifyContent="space-between"
|
|
||||||
alignItems="flex-start"
|
|
||||||
width="100%"
|
|
||||||
>
|
|
||||||
<Text variant="bodyXsMedium">{stepLabel}</Text>
|
|
||||||
{step.status === 'running' ? (
|
|
||||||
<Spinner size={20} />
|
|
||||||
) : (
|
|
||||||
<Text variant={statusVariant}>{statusLabel}</Text>
|
|
||||||
)}
|
|
||||||
</HStack>
|
|
||||||
{step.summary && (
|
|
||||||
<Text variant="smNote" margin={false}>
|
|
||||||
{step.summary}
|
|
||||||
</Text>
|
|
||||||
)}
|
|
||||||
{hasLogs && step.status !== 'pending' && step.status !== 'running' && (
|
|
||||||
<Button
|
|
||||||
variant="secondaryText"
|
|
||||||
size="sm"
|
|
||||||
onPress={() => setShowDetails((open) => !open)}
|
|
||||||
>
|
|
||||||
{t('details')}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
{showDetails && step.logs && (
|
|
||||||
<Ul>
|
|
||||||
{step.logs.map((log, index) => (
|
|
||||||
<li key={index}>
|
|
||||||
<Text variant="xsNote" as="span">
|
|
||||||
{log.message}
|
|
||||||
</Text>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
</Ul>
|
|
||||||
)}
|
|
||||||
</VStack>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const ConnectionTest = () => {
|
|
||||||
const { t } = useTranslation('connectionTest')
|
|
||||||
const { steps, isRunning, videoTrack, runTest } = useConnectionTestRunner()
|
|
||||||
const videoRef = useRef<HTMLVideoElement>(null)
|
|
||||||
|
|
||||||
const hasStarted = steps.some((step) => step.status !== 'pending')
|
|
||||||
const hasFailed = steps.some((step) => step.status === 'failed')
|
|
||||||
const isPublishVideoRunning = steps.some(
|
|
||||||
(step) => step.id === 'publishVideo' && step.status === 'running'
|
|
||||||
)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const element = videoRef.current
|
|
||||||
if (!element || !videoTrack) return
|
|
||||||
|
|
||||||
videoTrack.attach(element)
|
|
||||||
return () => {
|
|
||||||
videoTrack.detach(element)
|
|
||||||
}
|
|
||||||
}, [videoTrack])
|
|
||||||
|
|
||||||
// LiveKit appends a bare <video> to document.body during publishVideo.
|
|
||||||
// Keep it in the DOM (so the frame check still works) but hide it visually.
|
|
||||||
useEffect(() => {
|
|
||||||
document.body.classList.toggle(
|
|
||||||
HIDE_LIVEKIT_VIDEO_CLASS,
|
|
||||||
isPublishVideoRunning
|
|
||||||
)
|
|
||||||
return () => {
|
|
||||||
document.body.classList.remove(HIDE_LIVEKIT_VIDEO_CLASS)
|
|
||||||
}
|
|
||||||
}, [isPublishVideoRunning])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Screen layout="centered">
|
|
||||||
<Permissions />
|
|
||||||
<CenteredContent title={t('title')} withBackButton>
|
|
||||||
<Center>
|
|
||||||
<VStack gap="1.5rem" maxWidth="36rem" width="100%">
|
|
||||||
<Text as="p" variant="paragraph" centered last>
|
|
||||||
{t('intro')}
|
|
||||||
</Text>
|
|
||||||
|
|
||||||
<Button variant="primary" onPress={runTest} isDisabled={isRunning}>
|
|
||||||
{hasStarted ? t('reset') : t('runTest')}
|
|
||||||
</Button>
|
|
||||||
|
|
||||||
{videoTrack && (
|
|
||||||
<Center>
|
|
||||||
<video ref={videoRef} autoPlay playsInline muted />
|
|
||||||
</Center>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{hasStarted && (
|
|
||||||
<Box variant="light" width="100%">
|
|
||||||
<VStack gap="1rem" alignItems="stretch">
|
|
||||||
{steps.map((step) => (
|
|
||||||
<TestStepItem key={step.id} step={step} />
|
|
||||||
))}
|
|
||||||
</VStack>
|
|
||||||
</Box>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{hasFailed && !isRunning && (
|
|
||||||
<Text variant="smNote" centered>
|
|
||||||
{t('help.firewall')}
|
|
||||||
</Text>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{hasStarted && !isRunning && (
|
|
||||||
<Button
|
|
||||||
variant="secondary"
|
|
||||||
onPress={() => downloadConnectionTestReport(steps)}
|
|
||||||
>
|
|
||||||
{t('downloadReport')}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</VStack>
|
|
||||||
</Center>
|
|
||||||
</CenteredContent>
|
|
||||||
</Screen>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default ConnectionTest
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
export type ConnectionTestStepId =
|
|
||||||
| 'browser'
|
|
||||||
| 'microphone'
|
|
||||||
| 'camera'
|
|
||||||
| 'devices'
|
|
||||||
| 'websocket'
|
|
||||||
| 'webrtc'
|
|
||||||
| 'turn'
|
|
||||||
| 'reconnect'
|
|
||||||
| 'publishAudio'
|
|
||||||
| 'publishVideo'
|
|
||||||
|
|
||||||
export type ConnectionTestStepStatus =
|
|
||||||
| 'pending'
|
|
||||||
| 'running'
|
|
||||||
| 'success'
|
|
||||||
| 'failed'
|
|
||||||
| 'skipped'
|
|
||||||
|
|
||||||
export type ConnectionTestLog = {
|
|
||||||
level: 'info' | 'warning' | 'error'
|
|
||||||
message: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ConnectionTestStepResult = {
|
|
||||||
id: ConnectionTestStepId
|
|
||||||
status: ConnectionTestStepStatus
|
|
||||||
summary?: string
|
|
||||||
logs?: ConnectionTestLog[]
|
|
||||||
data?: Record<string, unknown>
|
|
||||||
}
|
|
||||||
|
|
||||||
export const CONNECTION_TEST_STEP_IDS: ConnectionTestStepId[] = [
|
|
||||||
'browser',
|
|
||||||
'microphone',
|
|
||||||
'camera',
|
|
||||||
'devices',
|
|
||||||
'websocket',
|
|
||||||
'webrtc',
|
|
||||||
'turn',
|
|
||||||
'reconnect',
|
|
||||||
'publishAudio',
|
|
||||||
'publishVideo',
|
|
||||||
]
|
|
||||||
|
|
||||||
export const createInitialSteps = (): ConnectionTestStepResult[] =>
|
|
||||||
CONNECTION_TEST_STEP_IDS.map((id) => ({ id, status: 'pending' }))
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
import type { ConnectionTestStepResult } from '../types'
|
|
||||||
|
|
||||||
export type ConnectionTestReport = {
|
|
||||||
generatedAt: string
|
|
||||||
userAgent: string
|
|
||||||
steps: Record<
|
|
||||||
string,
|
|
||||||
{
|
|
||||||
status: ConnectionTestStepResult['status']
|
|
||||||
summary?: string
|
|
||||||
logs?: ConnectionTestStepResult['logs']
|
|
||||||
data?: ConnectionTestStepResult['data']
|
|
||||||
}
|
|
||||||
>
|
|
||||||
}
|
|
||||||
|
|
||||||
export const buildConnectionTestReport = (
|
|
||||||
steps: ConnectionTestStepResult[]
|
|
||||||
): ConnectionTestReport => ({
|
|
||||||
generatedAt: new Date().toISOString(),
|
|
||||||
userAgent: navigator.userAgent,
|
|
||||||
steps: Object.fromEntries(
|
|
||||||
steps.map(({ id, status, summary, logs, data }) => [
|
|
||||||
id,
|
|
||||||
{
|
|
||||||
status,
|
|
||||||
...(summary !== undefined ? { summary } : {}),
|
|
||||||
...(logs?.length ? { logs } : {}),
|
|
||||||
...(data !== undefined ? { data } : {}),
|
|
||||||
},
|
|
||||||
])
|
|
||||||
),
|
|
||||||
})
|
|
||||||
|
|
||||||
export const downloadConnectionTestReport = (
|
|
||||||
steps: ConnectionTestStepResult[]
|
|
||||||
) => {
|
|
||||||
const report = buildConnectionTestReport(steps)
|
|
||||||
const timestamp = report.generatedAt.slice(0, 19).replace(/:/g, '-')
|
|
||||||
const blob = new Blob([JSON.stringify(report, null, 2)], {
|
|
||||||
type: 'application/json',
|
|
||||||
})
|
|
||||||
const url = URL.createObjectURL(blob)
|
|
||||||
const anchor = document.createElement('a')
|
|
||||||
anchor.href = url
|
|
||||||
anchor.download = `connection-test-${timestamp}.json`
|
|
||||||
anchor.click()
|
|
||||||
URL.revokeObjectURL(url)
|
|
||||||
}
|
|
||||||
@@ -9,11 +9,10 @@ import { useState } from 'react'
|
|||||||
|
|
||||||
import { menuRecipe } from '@/primitives/menuRecipe'
|
import { menuRecipe } from '@/primitives/menuRecipe'
|
||||||
import { ApiRoom } from '@/features/rooms/api/ApiRoom'
|
import { ApiRoom } from '@/features/rooms/api/ApiRoom'
|
||||||
import { useSnapshot } from 'valtio'
|
import { loadUserChoices } from '@livekit/components-core'
|
||||||
import { userStore } from '@/stores/user'
|
|
||||||
|
|
||||||
export const CreateMeetingMenu = () => {
|
export const CreateMeetingMenu = () => {
|
||||||
const { username } = useSnapshot(userStore)
|
const { username } = loadUserChoices()
|
||||||
|
|
||||||
const { t } = useTranslation('home')
|
const { t } = useTranslation('home')
|
||||||
const { mutateAsync: createRoom } = useCreateRoom()
|
const { mutateAsync: createRoom } = useCreateRoom()
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { getScrollBarWidth } from '@livekit/components-core'
|
|||||||
import * as React from 'react'
|
import * as React from 'react'
|
||||||
import { TrackLoop, useVisualStableUpdate } from '@livekit/components-react'
|
import { TrackLoop, useVisualStableUpdate } from '@livekit/components-react'
|
||||||
import { useSize } from '@/features/rooms/livekit/hooks/useResizeObserver'
|
import { useSize } from '@/features/rooms/livekit/hooks/useResizeObserver'
|
||||||
import { useCallback, useEffect, useLayoutEffect } from 'react'
|
|
||||||
|
|
||||||
const MIN_HEIGHT = 130
|
const MIN_HEIGHT = 130
|
||||||
const MIN_WIDTH = 140
|
const MIN_WIDTH = 140
|
||||||
@@ -11,72 +10,6 @@ const MIN_VISIBLE_TILES = 1
|
|||||||
const ASPECT_RATIO = 16 / 10
|
const ASPECT_RATIO = 16 / 10
|
||||||
const ASPECT_RATIO_INVERT = (1 - ASPECT_RATIO) * -1
|
const ASPECT_RATIO_INVERT = (1 - ASPECT_RATIO) * -1
|
||||||
|
|
||||||
type CarouselOrientation = 'vertical' | 'horizontal'
|
|
||||||
|
|
||||||
interface CarouselLayoutState {
|
|
||||||
orientation: CarouselOrientation
|
|
||||||
maxVisibleTiles: number
|
|
||||||
}
|
|
||||||
|
|
||||||
interface CarouselLayoutObserverProps {
|
|
||||||
asideEl: React.RefObject<HTMLDivElement>
|
|
||||||
orientation?: CarouselOrientation
|
|
||||||
onLayoutChange: (layout: CarouselLayoutState) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
const CarouselLayoutObserver = ({
|
|
||||||
orientation,
|
|
||||||
asideEl,
|
|
||||||
onLayoutChange,
|
|
||||||
}: CarouselLayoutObserverProps) => {
|
|
||||||
const { width, height } = useSize(asideEl)
|
|
||||||
|
|
||||||
// Hysteresis memory: avoids flapping between N and N+1 tiles when the
|
|
||||||
// container size hovers around a breakpoint. A ref (not state) because
|
|
||||||
// updating it must not trigger a re-render.
|
|
||||||
const prevTilesRef = React.useRef(0)
|
|
||||||
|
|
||||||
const carouselOrientation: CarouselOrientation =
|
|
||||||
orientation ?? (height >= width ? 'vertical' : 'horizontal')
|
|
||||||
|
|
||||||
const tileSpan =
|
|
||||||
carouselOrientation === 'vertical'
|
|
||||||
? Math.max(width * ASPECT_RATIO_INVERT, MIN_HEIGHT)
|
|
||||||
: Math.max(height * ASPECT_RATIO, MIN_WIDTH)
|
|
||||||
|
|
||||||
const scrollBarWidth = getScrollBarWidth()
|
|
||||||
|
|
||||||
const availableSpan =
|
|
||||||
(carouselOrientation === 'vertical' ? height : width) - scrollBarWidth
|
|
||||||
|
|
||||||
const tilesThatFit = Math.max(availableSpan / tileSpan, MIN_VISIBLE_TILES)
|
|
||||||
|
|
||||||
let maxVisibleTiles: number
|
|
||||||
if (Math.abs(tilesThatFit - prevTilesRef.current) < 0.5) {
|
|
||||||
// Within the dead zone: keep the previous count.
|
|
||||||
maxVisibleTiles = Math.round(prevTilesRef.current)
|
|
||||||
} else {
|
|
||||||
maxVisibleTiles = Math.round(tilesThatFit)
|
|
||||||
prevTilesRef.current = tilesThatFit
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply cosmetic layout output straight to the DOM.
|
|
||||||
useLayoutEffect(() => {
|
|
||||||
const el = asideEl.current
|
|
||||||
if (!el) return
|
|
||||||
el.dataset.lkOrientation = carouselOrientation
|
|
||||||
el.style.setProperty('--lk-max-visible-tiles', maxVisibleTiles.toString())
|
|
||||||
}, [asideEl, carouselOrientation, maxVisibleTiles])
|
|
||||||
|
|
||||||
// Report upward only what the parent actually needs for
|
|
||||||
// `useVisualStableUpdate` (and only when it changes — see parent handler).
|
|
||||||
useEffect(() => {
|
|
||||||
onLayoutChange({ orientation: carouselOrientation, maxVisibleTiles })
|
|
||||||
}, [carouselOrientation, maxVisibleTiles, onLayoutChange])
|
|
||||||
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @public */
|
/** @public */
|
||||||
export interface CarouselLayoutProps extends React.HTMLAttributes<HTMLMediaElement> {
|
export interface CarouselLayoutProps extends React.HTMLAttributes<HTMLMediaElement> {
|
||||||
tracks: TrackReferenceOrPlaceholder[]
|
tracks: TrackReferenceOrPlaceholder[]
|
||||||
@@ -107,42 +40,52 @@ export function CarouselLayout({
|
|||||||
...props
|
...props
|
||||||
}: CarouselLayoutProps) {
|
}: CarouselLayoutProps) {
|
||||||
const asideEl = React.useRef<HTMLDivElement>(null)
|
const asideEl = React.useRef<HTMLDivElement>(null)
|
||||||
|
const [prevTiles, setPrevTiles] = React.useState(0)
|
||||||
|
const { width, height } = useSize(asideEl)
|
||||||
|
const carouselOrientation = orientation
|
||||||
|
? orientation
|
||||||
|
: height >= width
|
||||||
|
? 'vertical'
|
||||||
|
: 'horizontal'
|
||||||
|
|
||||||
const [layout, setLayout] = React.useState<CarouselLayoutState>({
|
const tileSpan =
|
||||||
orientation: orientation ?? 'vertical',
|
carouselOrientation === 'vertical'
|
||||||
maxVisibleTiles: MIN_VISIBLE_TILES,
|
? Math.max(width * ASPECT_RATIO_INVERT, MIN_HEIGHT)
|
||||||
})
|
: Math.max(height * ASPECT_RATIO, MIN_WIDTH)
|
||||||
|
const scrollBarWidth = getScrollBarWidth()
|
||||||
|
|
||||||
// Stable callback + identity check: the parent only re-renders when the
|
const tilesThatFit =
|
||||||
// derived layout genuinely changed, not on every resize tick.
|
carouselOrientation === 'vertical'
|
||||||
const handleLayoutChange = useCallback((next: CarouselLayoutState) => {
|
? Math.max((height - scrollBarWidth) / tileSpan, MIN_VISIBLE_TILES)
|
||||||
setLayout((prev) =>
|
: Math.max((width - scrollBarWidth) / tileSpan, MIN_VISIBLE_TILES)
|
||||||
prev.orientation === next.orientation &&
|
|
||||||
prev.maxVisibleTiles === next.maxVisibleTiles
|
|
||||||
? prev
|
|
||||||
: next
|
|
||||||
)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const sortedTiles = useVisualStableUpdate(tracks, layout.maxVisibleTiles)
|
let maxVisibleTiles = Math.round(tilesThatFit)
|
||||||
|
if (Math.abs(tilesThatFit - prevTiles) < 0.5) {
|
||||||
|
maxVisibleTiles = Math.round(prevTiles)
|
||||||
|
} else if (prevTiles !== tilesThatFit) {
|
||||||
|
setPrevTiles(tilesThatFit)
|
||||||
|
}
|
||||||
|
|
||||||
|
const sortedTiles = useVisualStableUpdate(tracks, maxVisibleTiles)
|
||||||
|
|
||||||
|
React.useLayoutEffect(() => {
|
||||||
|
if (asideEl.current) {
|
||||||
|
asideEl.current.dataset.lkOrientation = carouselOrientation
|
||||||
|
asideEl.current.style.setProperty(
|
||||||
|
'--lk-max-visible-tiles',
|
||||||
|
maxVisibleTiles.toString()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}, [maxVisibleTiles, carouselOrientation])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<aside
|
||||||
<CarouselLayoutObserver
|
key={carouselOrientation}
|
||||||
asideEl={asideEl}
|
className="lk-carousel"
|
||||||
orientation={orientation}
|
ref={asideEl}
|
||||||
onLayoutChange={handleLayoutChange}
|
{...props}
|
||||||
/>
|
>
|
||||||
{/* `key` intentionally remounts the container when orientation flips, */}
|
<TrackLoop tracks={sortedTiles}>{props.children}</TrackLoop>
|
||||||
{/* which resets scroll position and re-runs the observer measurement. */}
|
</aside>
|
||||||
<aside
|
|
||||||
key={layout.orientation}
|
|
||||||
className="lk-carousel"
|
|
||||||
ref={asideEl}
|
|
||||||
{...props}
|
|
||||||
>
|
|
||||||
<TrackLoop tracks={sortedTiles}>{props.children}</TrackLoop>
|
|
||||||
</aside>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,36 +10,6 @@ import { mergeProps } from '@/utils/mergeProps'
|
|||||||
import { PaginationIndicator } from './PaginationIndicator'
|
import { PaginationIndicator } from './PaginationIndicator'
|
||||||
import { useGridLayout } from '../hooks/useGridLayout'
|
import { useGridLayout } from '../hooks/useGridLayout'
|
||||||
import { PaginationControl } from './PaginationControl'
|
import { PaginationControl } from './PaginationControl'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
|
||||||
import { useSpeakerPromotionTrigger } from '../hooks/useSpeakerPromotionTrigger'
|
|
||||||
|
|
||||||
interface GridLayoutObserverProps {
|
|
||||||
gridEl: React.RefObject<HTMLDivElement>
|
|
||||||
trackCount: number
|
|
||||||
onMaxTilesChange: (maxTiles: number) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Headless component that runs the layout calculation in isolation and
|
|
||||||
* reports the resulting tile capacity upward.
|
|
||||||
*
|
|
||||||
* `useGridLayout` re-renders its host on every layout recalculation
|
|
||||||
* (e.g. container resizes). Rendering it in a null child means only this
|
|
||||||
* component churns; the parent `GridLayout` re-renders solely when
|
|
||||||
* `maxTiles` actually changes, since `setState` bails out on equal values.
|
|
||||||
*/
|
|
||||||
const GridLayoutObserver = ({
|
|
||||||
gridEl,
|
|
||||||
trackCount,
|
|
||||||
onMaxTilesChange,
|
|
||||||
}: GridLayoutObserverProps) => {
|
|
||||||
const { layout } = useGridLayout(gridEl, trackCount)
|
|
||||||
useEffect(() => {
|
|
||||||
onMaxTilesChange(layout.maxTiles)
|
|
||||||
}, [onMaxTilesChange, layout.maxTiles])
|
|
||||||
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @public */
|
/** @public */
|
||||||
export interface GridLayoutProps
|
export interface GridLayoutProps
|
||||||
@@ -67,15 +37,14 @@ export interface GridLayoutProps
|
|||||||
* @public
|
* @public
|
||||||
*/
|
*/
|
||||||
export function GridLayout({ tracks, ...props }: GridLayoutProps) {
|
export function GridLayout({ tracks, ...props }: GridLayoutProps) {
|
||||||
const gridEl = useRef<HTMLDivElement>(null)
|
const gridEl = React.createRef<HTMLDivElement>()
|
||||||
const [maxTiles, setMaxTiles] = useState(1)
|
|
||||||
|
|
||||||
const elementProps = React.useMemo(
|
const elementProps = React.useMemo(
|
||||||
() => mergeProps(props, { className: 'lk-grid-layout' }),
|
() => mergeProps(props, { className: 'lk-grid-layout' }),
|
||||||
[props]
|
[props]
|
||||||
)
|
)
|
||||||
const pagination = usePagination(maxTiles, tracks)
|
const { layout } = useGridLayout(gridEl, tracks.length)
|
||||||
useSpeakerPromotionTrigger(pagination.tracks)
|
const pagination = usePagination(layout.maxTiles, tracks)
|
||||||
|
|
||||||
useSwipe(gridEl, {
|
useSwipe(gridEl, {
|
||||||
onLeftSwipe: pagination.nextPage,
|
onLeftSwipe: pagination.nextPage,
|
||||||
@@ -88,13 +57,8 @@ export function GridLayout({ tracks, ...props }: GridLayoutProps) {
|
|||||||
data-lk-pagination={pagination.totalPageCount > 1}
|
data-lk-pagination={pagination.totalPageCount > 1}
|
||||||
{...elementProps}
|
{...elementProps}
|
||||||
>
|
>
|
||||||
<GridLayoutObserver
|
|
||||||
gridEl={gridEl}
|
|
||||||
trackCount={tracks.length}
|
|
||||||
onMaxTilesChange={setMaxTiles}
|
|
||||||
/>
|
|
||||||
<TrackLoop tracks={pagination.tracks}>{props.children}</TrackLoop>
|
<TrackLoop tracks={pagination.tracks}>{props.children}</TrackLoop>
|
||||||
{tracks.length > maxTiles && (
|
{tracks.length > layout.maxTiles && (
|
||||||
<>
|
<>
|
||||||
<PaginationIndicator
|
<PaginationIndicator
|
||||||
totalPageCount={pagination.totalPageCount}
|
totalPageCount={pagination.totalPageCount}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
import { usePinAnnouncements } from '../hooks/usePinAnnouncements'
|
|
||||||
|
|
||||||
export const PinAnnouncer = () => {
|
|
||||||
usePinAnnouncements()
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
import { FocusLayoutContainer, useTracks } from '@livekit/components-react'
|
|
||||||
import { CarouselLayout } from '@/features/layout/components/CarouselLayout'
|
|
||||||
import { FocusLayout } from '@/features/layout/components/FocusLayout'
|
|
||||||
import { ParticipantTile } from '@/features/participantTile/components/ParticipantTile'
|
|
||||||
import { GridLayout } from '@/features/layout/components/GridLayout'
|
|
||||||
import {
|
|
||||||
isEqualTrackRef,
|
|
||||||
isTrackReference,
|
|
||||||
log,
|
|
||||||
type TrackReferenceOrPlaceholder,
|
|
||||||
} from '@livekit/components-core'
|
|
||||||
import { Track } from 'livekit-client'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import { clearPinnedTrack, layoutStore, setPinnedTrack } from '@/stores/layout'
|
|
||||||
import { useEffect, useRef } from 'react'
|
|
||||||
|
|
||||||
export const StageLayout = () => {
|
|
||||||
const lastAutoFocusedScreenShareTrack =
|
|
||||||
useRef<TrackReferenceOrPlaceholder | null>(null)
|
|
||||||
|
|
||||||
const tracks = useTracks(
|
|
||||||
[
|
|
||||||
{ source: Track.Source.Camera, withPlaceholder: true },
|
|
||||||
{ source: Track.Source.ScreenShare, withPlaceholder: false },
|
|
||||||
],
|
|
||||||
{ updateOnlyOn: [], onlySubscribed: false }
|
|
||||||
)
|
|
||||||
|
|
||||||
const screenShareTracks = tracks
|
|
||||||
.filter(isTrackReference)
|
|
||||||
.filter((track) => track.publication.source === Track.Source.ScreenShare)
|
|
||||||
|
|
||||||
const { pinnedTrackRef } = useSnapshot(layoutStore)
|
|
||||||
|
|
||||||
const carouselTracks = tracks.filter(
|
|
||||||
(track) => !isEqualTrackRef(track, pinnedTrackRef)
|
|
||||||
)
|
|
||||||
|
|
||||||
/* eslint-disable react-hooks/exhaustive-deps */
|
|
||||||
// Code duplicated from LiveKit; this warning will be addressed in the refactoring.
|
|
||||||
useEffect(() => {
|
|
||||||
// If screen share tracks are published, and no pin is set explicitly, auto set the screen share.
|
|
||||||
if (
|
|
||||||
screenShareTracks.some((track) => track.publication.isSubscribed) &&
|
|
||||||
lastAutoFocusedScreenShareTrack.current === null
|
|
||||||
) {
|
|
||||||
log.debug('Auto set screen share focus:', {
|
|
||||||
newScreenShareTrack: screenShareTracks[0],
|
|
||||||
})
|
|
||||||
setPinnedTrack(screenShareTracks[0])
|
|
||||||
lastAutoFocusedScreenShareTrack.current = screenShareTracks[0]
|
|
||||||
} else if (
|
|
||||||
lastAutoFocusedScreenShareTrack.current &&
|
|
||||||
!screenShareTracks.some(
|
|
||||||
(track) =>
|
|
||||||
track.publication.trackSid ===
|
|
||||||
lastAutoFocusedScreenShareTrack.current?.publication?.trackSid
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
log.debug('Auto clearing screen share focus.')
|
|
||||||
clearPinnedTrack()
|
|
||||||
lastAutoFocusedScreenShareTrack.current = null
|
|
||||||
}
|
|
||||||
if (pinnedTrackRef && !isTrackReference(pinnedTrackRef)) {
|
|
||||||
const updatedFocusTrack = tracks.find(
|
|
||||||
(tr) =>
|
|
||||||
tr.participant.identity === pinnedTrackRef.participant.identity &&
|
|
||||||
tr.source === pinnedTrackRef.source
|
|
||||||
)
|
|
||||||
if (
|
|
||||||
updatedFocusTrack !== pinnedTrackRef &&
|
|
||||||
isTrackReference(updatedFocusTrack)
|
|
||||||
) {
|
|
||||||
setPinnedTrack(updatedFocusTrack)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [
|
|
||||||
screenShareTracks
|
|
||||||
.map(
|
|
||||||
(ref) => `${ref.publication.trackSid}_${ref.publication.isSubscribed}`
|
|
||||||
)
|
|
||||||
.join(),
|
|
||||||
pinnedTrackRef?.publication?.trackSid,
|
|
||||||
tracks,
|
|
||||||
])
|
|
||||||
/* eslint-enable react-hooks/exhaustive-deps */
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{!pinnedTrackRef ? (
|
|
||||||
<div className="lk-grid-layout-wrapper" style={{ height: 'auto' }}>
|
|
||||||
<GridLayout tracks={tracks} style={{ padding: 0 }}>
|
|
||||||
<ParticipantTile />
|
|
||||||
</GridLayout>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="lk-focus-layout-wrapper" style={{ height: 'auto' }}>
|
|
||||||
<FocusLayoutContainer style={{ padding: 0 }}>
|
|
||||||
<CarouselLayout
|
|
||||||
tracks={carouselTracks}
|
|
||||||
style={{
|
|
||||||
minWidth: '200px',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<ParticipantTile />
|
|
||||||
</CarouselLayout>
|
|
||||||
<FocusLayout trackRef={pinnedTrackRef} />
|
|
||||||
</FocusLayoutContainer>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
import { useEffect, useRef, useCallback } from 'react'
|
|
||||||
import { useRoomContext } from '@livekit/components-react'
|
|
||||||
import { Participant } from 'livekit-client'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { layoutStore } from '@/stores/layout'
|
|
||||||
import { getParticipantName } from '@/features/rooms/utils/getParticipantName'
|
|
||||||
import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
|
|
||||||
|
|
||||||
export const usePinAnnouncements = () => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'pinAnnouncements' })
|
|
||||||
const { t: tRooms } = useTranslation('rooms')
|
|
||||||
|
|
||||||
const room = useRoomContext()
|
|
||||||
const announce = useScreenReaderAnnounce()
|
|
||||||
|
|
||||||
const { pinnedTrackRef } = useSnapshot(layoutStore)
|
|
||||||
const lastPinnedIdentityRef = useRef<string | null>(null)
|
|
||||||
|
|
||||||
const getAnnouncementName = useCallback(
|
|
||||||
(participant?: Participant | null) => {
|
|
||||||
if (!participant) return tRooms('participants.unknown')
|
|
||||||
return participant.isLocal
|
|
||||||
? tRooms('participants.you')
|
|
||||||
: getParticipantName(participant)
|
|
||||||
},
|
|
||||||
[tRooms]
|
|
||||||
)
|
|
||||||
|
|
||||||
const pinnedIdentity = pinnedTrackRef?.participant?.identity ?? null
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
// 1. unpin
|
|
||||||
if (!pinnedIdentity) {
|
|
||||||
const lastIdentity = lastPinnedIdentityRef.current
|
|
||||||
if (!lastIdentity) return
|
|
||||||
|
|
||||||
const lastParticipant =
|
|
||||||
room.localParticipant.identity === lastIdentity
|
|
||||||
? room.localParticipant
|
|
||||||
: room.remoteParticipants.get(lastIdentity)
|
|
||||||
|
|
||||||
announce(
|
|
||||||
lastParticipant?.isLocal
|
|
||||||
? t('self.unpin')
|
|
||||||
: t('unpin', { name: getAnnouncementName(lastParticipant) })
|
|
||||||
)
|
|
||||||
|
|
||||||
lastPinnedIdentityRef.current = null
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. same pin → do nothing
|
|
||||||
if (lastPinnedIdentityRef.current === pinnedIdentity) return
|
|
||||||
|
|
||||||
// 3. new pin
|
|
||||||
const participant =
|
|
||||||
room.localParticipant.identity === pinnedIdentity
|
|
||||||
? room.localParticipant
|
|
||||||
: room.remoteParticipants.get(pinnedIdentity)
|
|
||||||
|
|
||||||
lastPinnedIdentityRef.current = pinnedIdentity
|
|
||||||
|
|
||||||
announce(
|
|
||||||
participant?.isLocal
|
|
||||||
? t('self.pin')
|
|
||||||
: t('pin', { name: getAnnouncementName(participant) })
|
|
||||||
)
|
|
||||||
}, [pinnedIdentity, announce, getAnnouncementName, room, t])
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
import { RoomEvent } from 'livekit-client'
|
|
||||||
import type { Participant } from 'livekit-client'
|
|
||||||
import type { TrackReferenceOrPlaceholder } from '@livekit/components-core'
|
|
||||||
import { useRoomContext } from '@livekit/components-react'
|
|
||||||
import { useEffect, useReducer, useRef } from 'react'
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tripwire for speaker promotion.
|
|
||||||
*
|
|
||||||
* Listens to `RoomEvent.ActiveSpeakersChanged` imperatively and forces ONE
|
|
||||||
* re-render of the host component only when an active speaker has none of
|
|
||||||
* their tiles are within the visible span (`maxVisibleTiles`). That render
|
|
||||||
* re-runs `useVisualStableUpdate`, which reads live `participant.isSpeaking`
|
|
||||||
* state and performs the actual swap.
|
|
||||||
*
|
|
||||||
* Speakers already visible are ignored. Everything else costs zero React work.
|
|
||||||
*
|
|
||||||
* Requires the parent to NOT re-render on speaker events itself, i.e.
|
|
||||||
* `useTracks(..., { updateOnlyOn: [] })` upstream.
|
|
||||||
*/
|
|
||||||
export function useSpeakerPromotionTrigger(
|
|
||||||
sortedTiles: TrackReferenceOrPlaceholder[]
|
|
||||||
) {
|
|
||||||
const room = useRoomContext()
|
|
||||||
const [, forceRender] = useReducer((n: number) => n + 1, 0)
|
|
||||||
|
|
||||||
// Refs so the listener reads current values without re-subscribing
|
|
||||||
// and without itself being a render dependency.
|
|
||||||
const tilesRef = useRef(sortedTiles)
|
|
||||||
tilesRef.current = sortedTiles
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const onActiveSpeakersChanged = (speakers: Participant[]) => {
|
|
||||||
const tiles = tilesRef.current
|
|
||||||
const hiddenSpeakerExists = speakers.some(
|
|
||||||
(speaker) =>
|
|
||||||
!tiles.some((t) => t.participant.identity === speaker.identity)
|
|
||||||
)
|
|
||||||
if (hiddenSpeakerExists) {
|
|
||||||
forceRender()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
room.on(RoomEvent.ActiveSpeakersChanged, onActiveSpeakersChanged)
|
|
||||||
return () => {
|
|
||||||
room.off(RoomEvent.ActiveSpeakersChanged, onActiveSpeakersChanged)
|
|
||||||
}
|
|
||||||
}, [room])
|
|
||||||
}
|
|
||||||
@@ -168,31 +168,6 @@ export const MainNotificationToast = () => {
|
|||||||
}
|
}
|
||||||
}, [room, triggerNotificationSoundIfRoomIsSmall])
|
}, [room, triggerNotificationSoundIfRoomIsSmall])
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const handleAttributeChanged = (
|
|
||||||
changedAttributes: Record<string, string>,
|
|
||||||
participant: Participant
|
|
||||||
) => {
|
|
||||||
if (!participant.isLocal || !('room_role' in changedAttributes)) return
|
|
||||||
const newRole = changedAttributes['room_role']
|
|
||||||
toastQueue.add(
|
|
||||||
{
|
|
||||||
participant,
|
|
||||||
type: NotificationType.RoleChanged,
|
|
||||||
newRole: newRole,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
timeout: NotificationDuration.ROLE_CHANGED,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
room.on(RoomEvent.ParticipantAttributesChanged, handleAttributeChanged)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
room.off(RoomEvent.ParticipantAttributesChanged, handleAttributeChanged)
|
|
||||||
}
|
|
||||||
}, [room])
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const removeParticipantNotifications = (participant: Participant) => {
|
const removeParticipantNotifications = (participant: Participant) => {
|
||||||
toastQueue.visibleToasts.forEach((toast) => {
|
toastQueue.visibleToasts.forEach((toast) => {
|
||||||
|
|||||||
@@ -14,5 +14,4 @@ export const NotificationDuration = {
|
|||||||
RECORDING_SAVING: ToastDuration.EXTRA_LONG,
|
RECORDING_SAVING: ToastDuration.EXTRA_LONG,
|
||||||
REACTION_RECEIVED: ToastDuration.SHORT,
|
REACTION_RECEIVED: ToastDuration.SHORT,
|
||||||
RECORDING_REQUESTED: ToastDuration.LONG,
|
RECORDING_REQUESTED: ToastDuration.LONG,
|
||||||
ROLE_CHANGED: ToastDuration.LONG,
|
|
||||||
} as const
|
} as const
|
||||||
|
|||||||
@@ -17,5 +17,4 @@ export enum NotificationType {
|
|||||||
ScreenRecordingLimitReached = 'screenRecordingLimitReached',
|
ScreenRecordingLimitReached = 'screenRecordingLimitReached',
|
||||||
RecordingSaving = 'recordingSaving',
|
RecordingSaving = 'recordingSaving',
|
||||||
PermissionsRemoved = 'permissionsRemoved',
|
PermissionsRemoved = 'permissionsRemoved',
|
||||||
RoleChanged = 'roleChanged',
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ import { Button as RACButton } from 'react-aria-components'
|
|||||||
import { Track } from 'livekit-client'
|
import { Track } from 'livekit-client'
|
||||||
import Source = Track.Source
|
import Source = Track.Source
|
||||||
|
|
||||||
import { ParticipantTile } from '@/features/participantTile/components/ParticipantTile.tsx'
|
import { useMaybeLayoutContext } from '@livekit/components-react'
|
||||||
|
import { ParticipantTile } from '@/features/rooms/livekit/components/ParticipantTile'
|
||||||
import { type ToastProps } from './Toast'
|
import { type ToastProps } from './Toast'
|
||||||
import { HStack, styled } from '@/styled-system/jsx'
|
import { HStack, styled } from '@/styled-system/jsx'
|
||||||
import { Div } from '@/primitives'
|
import { Div } from '@/primitives'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { StyledToastContainer } from './StyledToastContainer'
|
import { StyledToastContainer } from './StyledToastContainer'
|
||||||
import { setPinnedTrack } from '@/stores/layout'
|
|
||||||
|
|
||||||
const ClickableToast = styled(RACButton, {
|
const ClickableToast = styled(RACButton, {
|
||||||
base: {
|
base: {
|
||||||
@@ -28,6 +28,7 @@ export function ToastJoined({ state, ...props }: Readonly<ToastProps>) {
|
|||||||
state,
|
state,
|
||||||
ref
|
ref
|
||||||
)
|
)
|
||||||
|
const layoutContext = useMaybeLayoutContext()
|
||||||
const participant = props.toast.content.participant
|
const participant = props.toast.content.participant
|
||||||
|
|
||||||
if (!participant) return
|
if (!participant) return
|
||||||
@@ -37,13 +38,18 @@ export function ToastJoined({ state, ...props }: Readonly<ToastProps>) {
|
|||||||
publication: participant.getTrackPublication(Source.Camera),
|
publication: participant.getTrackPublication(Source.Camera),
|
||||||
source: Source.Camera,
|
source: Source.Camera,
|
||||||
}
|
}
|
||||||
|
const pinParticipant = () => {
|
||||||
|
layoutContext?.pin.dispatch?.({
|
||||||
|
msg: 'set_pin',
|
||||||
|
trackReference,
|
||||||
|
})
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<StyledToastContainer {...toastProps} ref={ref}>
|
<StyledToastContainer {...toastProps} ref={ref}>
|
||||||
<ClickableToast
|
<ClickableToast
|
||||||
ref={ref}
|
ref={ref}
|
||||||
onPress={(e) => {
|
onPress={(e) => {
|
||||||
setPinnedTrack(trackReference)
|
pinParticipant()
|
||||||
closeButtonProps.onPress?.(e)
|
closeButtonProps.onPress?.(e)
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import { ToastRecordingSaving } from './ToastRecordingSaving'
|
|||||||
import { ToastPermissionsRemoved } from './ToastPermissionsRemoved'
|
import { ToastPermissionsRemoved } from './ToastPermissionsRemoved'
|
||||||
import { ToastRecordingRequest } from './ToastRecordingRequest'
|
import { ToastRecordingRequest } from './ToastRecordingRequest'
|
||||||
import { ToastAutoMuteLargeRoom } from './ToastAutoMuteLargeRoom'
|
import { ToastAutoMuteLargeRoom } from './ToastAutoMuteLargeRoom'
|
||||||
import { ToastRoleChanged } from '@/features/notifications/components/ToastRoleChanged'
|
|
||||||
|
|
||||||
interface ToastRegionProps extends AriaToastRegionProps {
|
interface ToastRegionProps extends AriaToastRegionProps {
|
||||||
state: ToastState<ToastData>
|
state: ToastState<ToastData>
|
||||||
@@ -71,9 +70,6 @@ const renderToast = (
|
|||||||
<ToastRecordingSaving key={toast.key} toast={toast} state={state} />
|
<ToastRecordingSaving key={toast.key} toast={toast} state={state} />
|
||||||
)
|
)
|
||||||
|
|
||||||
case NotificationType.RoleChanged:
|
|
||||||
return <ToastRoleChanged key={toast.key} toast={toast} state={state} />
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return <Toast key={toast.key} toast={toast} state={state} />
|
return <Toast key={toast.key} toast={toast} state={state} />
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
import { useToast } from 'react-aria'
|
|
||||||
import { useRef } from 'react'
|
|
||||||
|
|
||||||
import { type ToastProps } from './Toast'
|
|
||||||
import { HStack } from '@/styled-system/jsx'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { StyledToastContainer } from './StyledToastContainer'
|
|
||||||
|
|
||||||
export function ToastRoleChanged({ state, ...props }: Readonly<ToastProps>) {
|
|
||||||
const { t } = useTranslation('notifications', { keyPrefix: 'roleChanged' })
|
|
||||||
const ref = useRef(null)
|
|
||||||
const { toastProps, contentProps } = useToast(props, state, ref)
|
|
||||||
const newRole = t(`roles.${props.toast.content.newRole}`)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<StyledToastContainer {...toastProps} ref={ref}>
|
|
||||||
<HStack
|
|
||||||
justify="center"
|
|
||||||
alignItems="center"
|
|
||||||
{...contentProps}
|
|
||||||
padding={14}
|
|
||||||
gap={0}
|
|
||||||
>
|
|
||||||
{t('body', { role: newRole })}
|
|
||||||
</HStack>
|
|
||||||
</StyledToastContainer>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
+2
-2
@@ -7,8 +7,8 @@ import { RiInfinityLine } from '@remixicon/react'
|
|||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
import { usePrevious } from '@/hooks/usePrevious'
|
import { usePrevious } from '@/hooks/usePrevious'
|
||||||
import type { WaitingParticipant } from '@/features/participants/api/listWaitingParticipants'
|
import { WaitingParticipant } from '@/features/rooms/api/listWaitingParticipants'
|
||||||
import { useWaitingParticipants } from '@/features/participants/hooks/useWaitingParticipants'
|
import { useWaitingParticipants } from '@/features/rooms/hooks/useWaitingParticipants'
|
||||||
import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
|
import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
|
||||||
import { useNotificationSound } from '../hooks/useSoundNotification'
|
import { useNotificationSound } from '../hooks/useSoundNotification'
|
||||||
import { NotificationType } from '@/features/notifications'
|
import { NotificationType } from '@/features/notifications'
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
import {
|
|
||||||
ConnectionQualityIndicator,
|
|
||||||
LockLockedIcon,
|
|
||||||
ScreenShareIcon,
|
|
||||||
useIsEncrypted,
|
|
||||||
} from '@livekit/components-react'
|
|
||||||
import { HStack } from '@/styled-system/jsx'
|
|
||||||
import { Participant } from 'livekit-client'
|
|
||||||
import { MutedMicIndicator } from './MutedMicIndicator'
|
|
||||||
import { ParticipantName } from './ParticipantName'
|
|
||||||
import { RaisedHandMetadataWrapper } from './RaisedHandMetadataWrapper'
|
|
||||||
|
|
||||||
export const ParticipantMetadata = ({
|
|
||||||
displayedName,
|
|
||||||
participant,
|
|
||||||
isScreenShare,
|
|
||||||
}: {
|
|
||||||
displayedName: string
|
|
||||||
participant: Participant
|
|
||||||
isScreenShare: boolean
|
|
||||||
}) => {
|
|
||||||
const isEncrypted = useIsEncrypted(participant)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="lk-participant-metadata">
|
|
||||||
<HStack gap={0.25}>
|
|
||||||
{!isScreenShare && <MutedMicIndicator participant={participant} />}
|
|
||||||
<RaisedHandMetadataWrapper
|
|
||||||
participant={participant}
|
|
||||||
enabled={!isScreenShare}
|
|
||||||
>
|
|
||||||
{isScreenShare && (
|
|
||||||
<ScreenShareIcon
|
|
||||||
style={{
|
|
||||||
maxWidth: '20px',
|
|
||||||
width: '100%',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{isEncrypted && !isScreenShare && (
|
|
||||||
<LockLockedIcon style={{ marginRight: '0.25rem' }} />
|
|
||||||
)}
|
|
||||||
<div className="lk-participant-name-wrapper">
|
|
||||||
<ParticipantName
|
|
||||||
displayedName={displayedName}
|
|
||||||
isScreenShare={isScreenShare}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</RaisedHandMetadataWrapper>
|
|
||||||
</HStack>
|
|
||||||
<ConnectionQualityIndicator className="lk-participant-metadata-item" />
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
import React, { CSSProperties } from 'react'
|
|
||||||
import { Text } from '@/primitives'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
|
|
||||||
const participantNameStyles: CSSProperties = {
|
|
||||||
paddingBottom: '0.1rem',
|
|
||||||
overflow: 'hidden',
|
|
||||||
textOverflow: 'ellipsis',
|
|
||||||
whiteSpace: 'nowrap',
|
|
||||||
}
|
|
||||||
|
|
||||||
const participantNameScreenShareStyles: CSSProperties = {
|
|
||||||
...participantNameStyles,
|
|
||||||
marginLeft: '0.4rem',
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ParticipantName = React.memo(
|
|
||||||
({
|
|
||||||
displayedName,
|
|
||||||
isScreenShare = false,
|
|
||||||
}: {
|
|
||||||
displayedName?: string
|
|
||||||
isScreenShare: boolean
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participantTile' })
|
|
||||||
if (isScreenShare) {
|
|
||||||
return (
|
|
||||||
<Text variant="sm" style={participantNameScreenShareStyles}>
|
|
||||||
{t('screenShare', { name: displayedName })}
|
|
||||||
</Text>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Text variant="sm" style={participantNameStyles} aria-hidden="true">
|
|
||||||
{displayedName}
|
|
||||||
</Text>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
ParticipantName.displayName = 'ParticipantName'
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
import { styled } from '@/styled-system/jsx'
|
|
||||||
import { Avatar } from '@/components/Avatar'
|
|
||||||
import { getParticipantBackgroundGradient } from '@/features/rooms/utils/getParticipantBackgroundGradient'
|
|
||||||
import React, { useMemo } from 'react'
|
|
||||||
|
|
||||||
const StyledParticipantPlaceHolder = styled('div', {
|
|
||||||
base: {
|
|
||||||
width: '100%',
|
|
||||||
height: '100%',
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
containerType: 'size',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const StyledAvatarWrapper = styled('div', {
|
|
||||||
base: {
|
|
||||||
borderRadius: '50%',
|
|
||||||
aspectRatio: '1 / 1',
|
|
||||||
width: 'min(90cqmin, 160px)',
|
|
||||||
fontSize: 'min(27cqmin, 48px)',
|
|
||||||
'[data-lk-speaking="true"] &': {
|
|
||||||
animation: 'pulse 1s infinite',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
type ParticipantPlaceholderProps = {
|
|
||||||
color: string
|
|
||||||
displayedNamed: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ParticipantPlaceholder = React.memo(
|
|
||||||
({ color, displayedNamed }: ParticipantPlaceholderProps) => {
|
|
||||||
const backgroundGradient = useMemo(
|
|
||||||
() => getParticipantBackgroundGradient(color),
|
|
||||||
[color]
|
|
||||||
)
|
|
||||||
return (
|
|
||||||
<StyledParticipantPlaceHolder
|
|
||||||
style={{
|
|
||||||
backgroundColor: color,
|
|
||||||
backgroundImage: backgroundGradient,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<StyledAvatarWrapper>
|
|
||||||
<Avatar name={displayedNamed} bgColor={color} context="placeholder" />
|
|
||||||
</StyledAvatarWrapper>
|
|
||||||
</StyledParticipantPlaceHolder>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
ParticipantPlaceholder.displayName = 'ParticipantPlaceholder'
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
import React, { ReactNode, RefObject, useEffect, useRef } from 'react'
|
|
||||||
import {
|
|
||||||
useRaisedHand,
|
|
||||||
useRaisedHandPosition,
|
|
||||||
} from '@/features/rooms/livekit/hooks/useRaisedHand'
|
|
||||||
import { Participant } from 'livekit-client'
|
|
||||||
import { RiHand } from '@remixicon/react'
|
|
||||||
|
|
||||||
const PositionInQueue = React.memo(
|
|
||||||
({ positionInQueue }: { positionInQueue?: number }) => {
|
|
||||||
if (!positionInQueue) return
|
|
||||||
return (
|
|
||||||
<span
|
|
||||||
style={{ display: 'inline-flex', alignItems: 'center', gap: '0.1rem' }}
|
|
||||||
>
|
|
||||||
<span>{positionInQueue}</span>
|
|
||||||
<RiHand
|
|
||||||
color="black"
|
|
||||||
size={16}
|
|
||||||
style={{
|
|
||||||
marginRight: '0.4rem',
|
|
||||||
marginLeft: '0.1rem',
|
|
||||||
minWidth: '16px',
|
|
||||||
animationDuration: '300ms',
|
|
||||||
animationName: 'wave_hand',
|
|
||||||
animationIterationCount: '2',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
PositionInQueue.displayName = 'PositionInQueue'
|
|
||||||
|
|
||||||
const RaisedHandActiveItem = ({
|
|
||||||
participant,
|
|
||||||
targetRef,
|
|
||||||
}: {
|
|
||||||
participant: Participant
|
|
||||||
targetRef: RefObject<HTMLElement | null>
|
|
||||||
}) => {
|
|
||||||
const { positionInQueue, firstInQueue } = useRaisedHandPosition({
|
|
||||||
participant,
|
|
||||||
})
|
|
||||||
useEffect(() => {
|
|
||||||
const el = targetRef.current
|
|
||||||
if (!el) return
|
|
||||||
|
|
||||||
el.style.backgroundColor = firstInQueue ? '#fde047' : 'white'
|
|
||||||
el.style.color = 'black'
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
el.style.backgroundColor = ''
|
|
||||||
el.style.color = ''
|
|
||||||
}
|
|
||||||
}, [targetRef, firstInQueue])
|
|
||||||
|
|
||||||
return <PositionInQueue positionInQueue={positionInQueue} />
|
|
||||||
}
|
|
||||||
|
|
||||||
export const RaisedHandMetadataWrapper = ({
|
|
||||||
participant,
|
|
||||||
enabled = true,
|
|
||||||
children,
|
|
||||||
}: {
|
|
||||||
participant: Participant
|
|
||||||
enabled?: boolean
|
|
||||||
children: ReactNode
|
|
||||||
}) => {
|
|
||||||
const ref = useRef(null)
|
|
||||||
|
|
||||||
const { isHandRaised } = useRaisedHand({ participant })
|
|
||||||
const showHand = isHandRaised && enabled
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
ref={ref}
|
|
||||||
className="lk-participant-metadata-item"
|
|
||||||
style={{
|
|
||||||
padding: '0.1rem 0.25rem',
|
|
||||||
transition: 'background 200ms ease',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{showHand && (
|
|
||||||
<RaisedHandActiveItem participant={participant} targetRef={ref} />
|
|
||||||
)}
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
import React from 'react'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
|
|
||||||
import { Button } from '@/primitives'
|
|
||||||
import { RiImageCircleAiFill } from '@remixicon/react'
|
|
||||||
|
|
||||||
export const EffectsButton = React.memo(() => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participantTileFocus' })
|
|
||||||
const { isEffectsOpen, toggleEffects } = useSidePanel()
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
size={'sm'}
|
|
||||||
variant={'primaryTextDark'}
|
|
||||||
square
|
|
||||||
tooltip={t('effects')}
|
|
||||||
onPress={() => !isEffectsOpen && toggleEffects()}
|
|
||||||
>
|
|
||||||
<RiImageCircleAiFill />
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
EffectsButton.displayName = 'EffectsButton'
|
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
import {
|
|
||||||
isEqualTrackRef,
|
|
||||||
TrackReferenceOrPlaceholder,
|
|
||||||
} from '@livekit/components-core'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import { clearPinnedTrack, layoutStore, setPinnedTrack } from '@/stores/layout'
|
|
||||||
import { Button } from '@/primitives'
|
|
||||||
import { RiPushpin2Line, RiUnpinLine } from '@remixicon/react'
|
|
||||||
|
|
||||||
export const FocusButton = ({
|
|
||||||
trackRef,
|
|
||||||
}: {
|
|
||||||
trackRef: TrackReferenceOrPlaceholder
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participantTileFocus' })
|
|
||||||
|
|
||||||
const { pinnedTrackRef } = useSnapshot(layoutStore)
|
|
||||||
const inFocus = isEqualTrackRef(trackRef, pinnedTrackRef)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="primaryTextDark"
|
|
||||||
square
|
|
||||||
tooltip={inFocus ? t('pin.disable') : t('pin.enable')}
|
|
||||||
onPress={() => (inFocus ? clearPinnedTrack() : setPinnedTrack(trackRef))}
|
|
||||||
>
|
|
||||||
{inFocus ? <RiUnpinLine /> : <RiPushpin2Line />}
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
-45
@@ -1,45 +0,0 @@
|
|||||||
import { Participant, Track } from 'livekit-client'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { useTrackMutedIndicator } from '@livekit/components-react'
|
|
||||||
import { useMuteParticipant } from '@/features/rooms/api/muteParticipant'
|
|
||||||
import { useState } from 'react'
|
|
||||||
import { Button } from '@/primitives'
|
|
||||||
import { RiMicLine, RiMicOffLine } from '@remixicon/react'
|
|
||||||
import { MuteAlertDialog } from '@/features/rooms/livekit/components/MuteAlertDialog'
|
|
||||||
|
|
||||||
export const MuteButton = ({ participant }: { participant: Participant }) => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participantTileFocus' })
|
|
||||||
|
|
||||||
const { isMuted } = useTrackMutedIndicator({
|
|
||||||
participant: participant,
|
|
||||||
source: Track.Source.Microphone,
|
|
||||||
})
|
|
||||||
|
|
||||||
const { muteParticipant } = useMuteParticipant()
|
|
||||||
const [isAlertOpen, setIsAlertOpen] = useState(false)
|
|
||||||
|
|
||||||
const name = participant.name || participant.identity
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Button
|
|
||||||
isDisabled={isMuted}
|
|
||||||
size={'sm'}
|
|
||||||
variant={'primaryTextDark'}
|
|
||||||
square
|
|
||||||
onPress={() => setIsAlertOpen(true)}
|
|
||||||
tooltip={t('muteParticipant', { name })}
|
|
||||||
>
|
|
||||||
{!isMuted ? <RiMicLine /> : <RiMicOffLine />}
|
|
||||||
</Button>
|
|
||||||
<MuteAlertDialog
|
|
||||||
isOpen={isAlertOpen}
|
|
||||||
onSubmit={() =>
|
|
||||||
muteParticipant(participant).then(() => setIsAlertOpen(false))
|
|
||||||
}
|
|
||||||
onClose={() => setIsAlertOpen(false)}
|
|
||||||
name={name}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
-112
@@ -1,112 +0,0 @@
|
|||||||
import { css } from '@/styled-system/css'
|
|
||||||
import { HStack } from '@/styled-system/jsx'
|
|
||||||
import { TrackReferenceOrPlaceholder } from '@livekit/components-core'
|
|
||||||
import { ReactNode, useEffect, useRef, useState } from 'react'
|
|
||||||
import { Track } from 'livekit-client'
|
|
||||||
import { useCanMute } from '@/features/rooms/livekit/hooks/useCanMute'
|
|
||||||
import { FocusButton } from './FocusButton'
|
|
||||||
import { EffectsButton } from './EffectsButton'
|
|
||||||
import { MuteButton } from './MuteButton'
|
|
||||||
import { ZoomButton } from './ZoomButton'
|
|
||||||
|
|
||||||
const MOUSE_IDLE_TIME = 3000
|
|
||||||
|
|
||||||
type FadeOverlayProps = {
|
|
||||||
children: ReactNode
|
|
||||||
hasKeyboardFocus: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
const FadeOverlay = ({ children, hasKeyboardFocus }: FadeOverlayProps) => {
|
|
||||||
const [active, setActive] = useState(false)
|
|
||||||
const idleTimerRef = useRef<number | null>(null)
|
|
||||||
|
|
||||||
const clearIdleTimer = () => {
|
|
||||||
if (idleTimerRef.current) window.clearTimeout(idleTimerRef.current)
|
|
||||||
}
|
|
||||||
|
|
||||||
const armIdleTimer = () => {
|
|
||||||
clearIdleTimer()
|
|
||||||
idleTimerRef.current = window.setTimeout(() => {
|
|
||||||
setActive(false)
|
|
||||||
}, MOUSE_IDLE_TIME)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleActivity = () => {
|
|
||||||
setActive(true)
|
|
||||||
armIdleTimer()
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => clearIdleTimer, [])
|
|
||||||
|
|
||||||
const isVisible = hasKeyboardFocus || active
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={css({
|
|
||||||
position: 'absolute',
|
|
||||||
left: '0',
|
|
||||||
top: '0',
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
width: '100%',
|
|
||||||
height: '100%',
|
|
||||||
})}
|
|
||||||
data-visible={isVisible || undefined}
|
|
||||||
aria-hidden={!isVisible}
|
|
||||||
onMouseEnter={handleActivity}
|
|
||||||
onMouseMove={handleActivity}
|
|
||||||
onMouseLeave={() => {
|
|
||||||
clearIdleTimer()
|
|
||||||
setActive(false)
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{isVisible && children}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ParticipantTileFocus = ({
|
|
||||||
trackRef,
|
|
||||||
hasKeyboardFocus,
|
|
||||||
}: {
|
|
||||||
trackRef: TrackReferenceOrPlaceholder
|
|
||||||
hasKeyboardFocus: boolean
|
|
||||||
}) => {
|
|
||||||
const participant = trackRef.participant
|
|
||||||
const isScreenShare = trackRef.source == Track.Source.ScreenShare
|
|
||||||
const isLocal = participant.isLocal
|
|
||||||
const canMute = useCanMute(participant)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<FadeOverlay hasKeyboardFocus={hasKeyboardFocus}>
|
|
||||||
<div
|
|
||||||
className={css({
|
|
||||||
backgroundColor: 'primaryDark.50',
|
|
||||||
zIndex: 1,
|
|
||||||
borderRadius: '0.25rem',
|
|
||||||
display: 'flex',
|
|
||||||
opacity: 0.6,
|
|
||||||
animation: 'overlayIn 200ms linear 300ms backwards',
|
|
||||||
_hover: {
|
|
||||||
opacity: 0.95,
|
|
||||||
},
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<HStack gap={0.5} padding={0.5}>
|
|
||||||
<FocusButton trackRef={trackRef} />
|
|
||||||
{!isScreenShare ? (
|
|
||||||
<>
|
|
||||||
{isLocal ? (
|
|
||||||
<EffectsButton />
|
|
||||||
) : (
|
|
||||||
canMute && <MuteButton participant={participant} />
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
!isLocal && <ZoomButton trackRef={trackRef} />
|
|
||||||
)}
|
|
||||||
</HStack>
|
|
||||||
</div>
|
|
||||||
</FadeOverlay>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
import { TrackReferenceOrPlaceholder } from '@livekit/components-core'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { useFullScreen } from '@/features/rooms/livekit/hooks/useFullScreen'
|
|
||||||
import { Button } from '@/primitives'
|
|
||||||
import { RiFullscreenLine } from '@remixicon/react'
|
|
||||||
|
|
||||||
export const ZoomButton = ({
|
|
||||||
trackRef,
|
|
||||||
}: {
|
|
||||||
trackRef: TrackReferenceOrPlaceholder
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participantTileFocus' })
|
|
||||||
const { toggleFullScreen, isFullscreenAvailable } = useFullScreen({
|
|
||||||
trackRef,
|
|
||||||
})
|
|
||||||
|
|
||||||
if (!isFullscreenAvailable) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="primaryTextDark"
|
|
||||||
square
|
|
||||||
tooltip={t('fullScreen')}
|
|
||||||
onPress={() => toggleFullScreen()}
|
|
||||||
>
|
|
||||||
<RiFullscreenLine />
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import { fetchApi } from '@/api/fetchApi'
|
|
||||||
import { useRoomData } from '@/features/rooms/livekit/hooks/useRoomData'
|
|
||||||
import { AssignableParticipantRole } from '@/features/rooms/api/ApiRoom'
|
|
||||||
|
|
||||||
export const useParticipantRole = () => {
|
|
||||||
const data = useRoomData()
|
|
||||||
|
|
||||||
const updateParticipantRole = async (
|
|
||||||
identity: string,
|
|
||||||
role: AssignableParticipantRole
|
|
||||||
) => {
|
|
||||||
if (!data?.id) {
|
|
||||||
throw new Error('Room id is not available')
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
return fetchApi(`rooms/${data.id}/update-participant-role/`, {
|
|
||||||
method: 'POST',
|
|
||||||
body: JSON.stringify({
|
|
||||||
participant_identity: identity,
|
|
||||||
role: role,
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
} catch (error) {
|
|
||||||
console.error(
|
|
||||||
`Failed to update participant's role ${identity}: ${error instanceof Error ? error.message : 'Unknown error'}`
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return { updateParticipantRole }
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
import React, { useLayoutEffect, useRef, useState } from 'react'
|
|
||||||
import { Text } from '@/primitives'
|
|
||||||
import { css } from '@/styled-system/css'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { VisualOnlyTooltip } from '@/primitives/VisualOnlyTooltip'
|
|
||||||
|
|
||||||
export const ParticipantName = React.memo(
|
|
||||||
({ displayedName, isLocal }: { displayedName: string; isLocal: boolean }) => {
|
|
||||||
const { t } = useTranslation('rooms')
|
|
||||||
|
|
||||||
const nameRef = useRef<HTMLParagraphElement>(null)
|
|
||||||
const [isTruncated, setIsTruncated] = useState(false)
|
|
||||||
|
|
||||||
useLayoutEffect(() => {
|
|
||||||
const el = nameRef.current
|
|
||||||
if (!el) return
|
|
||||||
const truncated = el.scrollWidth > el.clientWidth
|
|
||||||
setIsTruncated((prev) => (prev === truncated ? prev : truncated))
|
|
||||||
}, [displayedName])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Text
|
|
||||||
as="div"
|
|
||||||
variant="sm"
|
|
||||||
className={css({
|
|
||||||
userSelect: 'none',
|
|
||||||
cursor: 'default',
|
|
||||||
display: 'flex',
|
|
||||||
minWidth: 0,
|
|
||||||
width: 'full',
|
|
||||||
maxWidth: 'full',
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<VisualOnlyTooltip
|
|
||||||
tooltip={displayedName}
|
|
||||||
disabled={!isTruncated}
|
|
||||||
className={css({ display: 'flex', minWidth: 0, flex: 1 })}
|
|
||||||
>
|
|
||||||
<p
|
|
||||||
className={css({
|
|
||||||
whiteSpace: 'nowrap',
|
|
||||||
overflow: 'hidden',
|
|
||||||
textOverflow: 'ellipsis',
|
|
||||||
display: 'block',
|
|
||||||
minWidth: 0,
|
|
||||||
})}
|
|
||||||
ref={nameRef}
|
|
||||||
>
|
|
||||||
{displayedName}
|
|
||||||
</p>
|
|
||||||
</VisualOnlyTooltip>
|
|
||||||
{isLocal && (
|
|
||||||
<span
|
|
||||||
className={css({
|
|
||||||
marginLeft: '.25rem',
|
|
||||||
whiteSpace: 'nowrap',
|
|
||||||
flexShrink: 0,
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
({t('participants.you')})
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</Text>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
ParticipantName.displayName = 'ParticipantName'
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
import { ReactNode, useId, useState } from 'react'
|
|
||||||
import { RiArrowUpSLine } from '@remixicon/react'
|
|
||||||
import { styled, HStack, VStack } from '@/styled-system/jsx'
|
|
||||||
|
|
||||||
const Container = styled('div', {
|
|
||||||
base: {
|
|
||||||
border: '1px solid',
|
|
||||||
borderColor: 'greyscale.250',
|
|
||||||
borderRadius: '8px',
|
|
||||||
margin: '0 .625rem 0.9375rem',
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const Header = styled('button', {
|
|
||||||
base: {
|
|
||||||
minHeight: '2.5rem',
|
|
||||||
paddingX: '1.25rem',
|
|
||||||
paddingY: '0.5rem',
|
|
||||||
gap: '0.5rem',
|
|
||||||
cursor: 'pointer',
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'space-between',
|
|
||||||
alignItems: 'center',
|
|
||||||
width: '100%',
|
|
||||||
fontSize: '1rem',
|
|
||||||
transition: 'background 200ms',
|
|
||||||
borderTopRadius: '7px', // container radius (8) minus its 1px border
|
|
||||||
_hover: { backgroundColor: 'greyscale.50' },
|
|
||||||
},
|
|
||||||
variants: {
|
|
||||||
isOpen: { false: { borderRadius: '7px' } },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const Chevron = styled(RiArrowUpSLine, {
|
|
||||||
base: { transition: 'transform 200ms', flexShrink: 0 },
|
|
||||||
variants: {
|
|
||||||
isOpen: { false: { transform: 'rotate(180deg)' } },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const List = styled(VStack, {
|
|
||||||
base: {
|
|
||||||
borderTop: '1px solid',
|
|
||||||
borderTopColor: 'greyscale.250',
|
|
||||||
alignItems: 'start',
|
|
||||||
minHeight: 0,
|
|
||||||
flexGrow: 1,
|
|
||||||
paddingY: '0.5rem',
|
|
||||||
paddingX: '1rem',
|
|
||||||
gap: 0,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export type ParticipantsCollapsibleSectionProps = {
|
|
||||||
heading: string
|
|
||||||
count: number
|
|
||||||
action?: ReactNode
|
|
||||||
children: ReactNode
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ParticipantsCollapsibleSection = ({
|
|
||||||
heading,
|
|
||||||
count,
|
|
||||||
action,
|
|
||||||
children,
|
|
||||||
}: ParticipantsCollapsibleSectionProps) => {
|
|
||||||
const [isOpen, setIsOpen] = useState(true)
|
|
||||||
const listId = useId()
|
|
||||||
return (
|
|
||||||
<Container>
|
|
||||||
<Header
|
|
||||||
type="button"
|
|
||||||
isOpen={isOpen}
|
|
||||||
aria-expanded={isOpen}
|
|
||||||
aria-controls={listId}
|
|
||||||
onClick={() => setIsOpen((open) => !open)}
|
|
||||||
>
|
|
||||||
<HStack justify="space-between" width="100%">
|
|
||||||
<span>{heading}</span>
|
|
||||||
<span>{count}</span>
|
|
||||||
</HStack>
|
|
||||||
<Chevron size={32} isOpen={isOpen} aria-hidden />
|
|
||||||
</Header>
|
|
||||||
{isOpen && (
|
|
||||||
<List id={listId} role="list">
|
|
||||||
{action}
|
|
||||||
{children}
|
|
||||||
</List>
|
|
||||||
)}
|
|
||||||
</Container>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import React from 'react'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { useRemoteParticipants } from '@livekit/components-react'
|
|
||||||
import { srOnly } from '@/styles/a11y'
|
|
||||||
import { css } from '@/styled-system/css'
|
|
||||||
import { RiInfinityLine } from '@remixicon/react'
|
|
||||||
|
|
||||||
const badgeStyles = css({
|
|
||||||
position: 'absolute',
|
|
||||||
top: '-.25rem',
|
|
||||||
right: '-.25rem',
|
|
||||||
width: '1.25rem',
|
|
||||||
height: '1.25rem',
|
|
||||||
backgroundColor: 'gray',
|
|
||||||
borderRadius: '50%',
|
|
||||||
color: 'white',
|
|
||||||
fontSize: '0.75rem',
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'center',
|
|
||||||
textAlign: 'center',
|
|
||||||
zIndex: 1,
|
|
||||||
userSelect: 'none',
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Isolated so participant join/leave events only re-render the badge,
|
|
||||||
* not the button, tooltip or shortcut registration.
|
|
||||||
*/
|
|
||||||
export const ParticipantsCount = React.memo(
|
|
||||||
({ describedById }: { describedById: string }) => {
|
|
||||||
const { t } = useTranslation('rooms', {
|
|
||||||
keyPrefix: 'controls.participants',
|
|
||||||
})
|
|
||||||
const remoteParticipants = useRemoteParticipants({
|
|
||||||
updateOnlyOn: [],
|
|
||||||
})
|
|
||||||
const count = (remoteParticipants?.length ?? 0) + 1
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<span id={describedById} className={srOnly}>
|
|
||||||
{t('count', { count })}
|
|
||||||
</span>
|
|
||||||
<div className={badgeStyles} aria-hidden>
|
|
||||||
{count < 100 ? count : <RiInfinityLine size={10} />}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
ParticipantsCount.displayName = 'ParticipantsCount'
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
import { css } from '@/styled-system/css'
|
|
||||||
import {
|
|
||||||
useRemoteParticipants,
|
|
||||||
useRoomContext,
|
|
||||||
} from '@livekit/components-react'
|
|
||||||
import { RoomEvent } from 'livekit-client'
|
|
||||||
import { Div, H } from '@/primitives'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { ParticipantRow } from './ParticipantRow'
|
|
||||||
import { ParticipantsCollapsibleSection } from './ParticipantsCollapsibleSection'
|
|
||||||
import { LowerAllHandsButton } from './LowerAllHandsButton'
|
|
||||||
import { MuteEveryoneButton } from './MuteEveryoneButton'
|
|
||||||
import { WaitingParticipantsSection } from './WaitingParticipantsSection'
|
|
||||||
import { RaisedHandRow } from './RaisedHandRow'
|
|
||||||
|
|
||||||
const JoinedParticipantsSections = () => {
|
|
||||||
const room = useRoomContext()
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participants' })
|
|
||||||
|
|
||||||
// `updateOnlyOn` filters on the room event *type*, not on which participant
|
|
||||||
// the event is about. `ParticipantNameChanged` and `ParticipantAttributesChanged`
|
|
||||||
// are room-wide and fire for the local participant too, so this hook re-emits
|
|
||||||
// (and we re-render) on local changes, despite its name.
|
|
||||||
//
|
|
||||||
// That is deliberate here: we prepend `room.localParticipant` to the list below,
|
|
||||||
// and its hand-raise state comes from `attributes.handRaisedAt`. Without the
|
|
||||||
// local events waking this component up, raising your own hand would not
|
|
||||||
// update the UI. Do not "optimise" these away.
|
|
||||||
const remoteParticipants = useRemoteParticipants({
|
|
||||||
updateOnlyOn: [
|
|
||||||
RoomEvent.ParticipantNameChanged,
|
|
||||||
RoomEvent.ParticipantAttributesChanged,
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
const allParticipants = [
|
|
||||||
room.localParticipant,
|
|
||||||
...[...remoteParticipants].sort((a, b) =>
|
|
||||||
(a.name || a.identity).localeCompare(b.name || b.identity)
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
const participantsWithRaisedHands = allParticipants
|
|
||||||
.filter((p) => !!p.attributes.handRaisedAt)
|
|
||||||
.sort((a, b) => {
|
|
||||||
const raisedAtA = Date.parse(a.attributes.handRaisedAt!)
|
|
||||||
const raisedAtB = Date.parse(b.attributes.handRaisedAt!)
|
|
||||||
return (
|
|
||||||
(Number.isNaN(raisedAtA) ? Infinity : raisedAtA) -
|
|
||||||
(Number.isNaN(raisedAtB) ? Infinity : raisedAtB)
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{participantsWithRaisedHands.length > 0 && (
|
|
||||||
<ParticipantsCollapsibleSection
|
|
||||||
heading={t('raisedHands')}
|
|
||||||
count={participantsWithRaisedHands.length}
|
|
||||||
action={
|
|
||||||
<LowerAllHandsButton participants={participantsWithRaisedHands} />
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{participantsWithRaisedHands.map((p) => (
|
|
||||||
<RaisedHandRow key={p.identity} participant={p} />
|
|
||||||
))}
|
|
||||||
</ParticipantsCollapsibleSection>
|
|
||||||
)}
|
|
||||||
<ParticipantsCollapsibleSection
|
|
||||||
heading={t('contributors')}
|
|
||||||
count={allParticipants.length}
|
|
||||||
action={<MuteEveryoneButton participants={remoteParticipants} />}
|
|
||||||
>
|
|
||||||
{allParticipants.map((p) => (
|
|
||||||
<ParticipantRow key={p.identity} participant={p} />
|
|
||||||
))}
|
|
||||||
</ParticipantsCollapsibleSection>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export const ParticipantsList = () => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participants' })
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Div overflowY="scroll">
|
|
||||||
<H
|
|
||||||
lvl={2}
|
|
||||||
className={css({
|
|
||||||
fontSize: '0.875rem',
|
|
||||||
fontWeight: 'bold',
|
|
||||||
color: 'greyscale.600',
|
|
||||||
padding: '0 1.5rem',
|
|
||||||
marginBottom: '0.83em',
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
{t('subheading').toUpperCase()}
|
|
||||||
</H>
|
|
||||||
<WaitingParticipantsSection />
|
|
||||||
<JoinedParticipantsSections />
|
|
||||||
</Div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import { Participant, Track } from 'livekit-client'
|
|
||||||
import { RiPushpin2Fill } from '@remixicon/react'
|
|
||||||
import { css } from '@/styled-system/css'
|
|
||||||
import { useMemo } from 'react'
|
|
||||||
import { useSnapshot } from 'valtio'
|
|
||||||
import { layoutStore } from '@/stores/layout'
|
|
||||||
import { isEqualTrackRef } from '@livekit/components-core'
|
|
||||||
import Source = Track.Source
|
|
||||||
|
|
||||||
export const PinBadge = ({ participant }: { participant: Participant }) => {
|
|
||||||
const cameraTrackRef = useMemo(() => {
|
|
||||||
return {
|
|
||||||
participant: participant,
|
|
||||||
publication: participant.getTrackPublication(Source.Camera),
|
|
||||||
source: Source.Camera,
|
|
||||||
}
|
|
||||||
}, [participant])
|
|
||||||
|
|
||||||
const screenShareTrackRef = useMemo(() => {
|
|
||||||
return {
|
|
||||||
participant: participant,
|
|
||||||
publication: participant.getTrackPublication(Source.ScreenShare),
|
|
||||||
source: Source.ScreenShare,
|
|
||||||
}
|
|
||||||
}, [participant])
|
|
||||||
|
|
||||||
const { pinnedTrackRef } = useSnapshot(layoutStore)
|
|
||||||
const inFocus =
|
|
||||||
isEqualTrackRef(pinnedTrackRef, cameraTrackRef) ||
|
|
||||||
isEqualTrackRef(pinnedTrackRef, screenShareTrackRef)
|
|
||||||
|
|
||||||
if (!inFocus) return
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={css({
|
|
||||||
height: '18px',
|
|
||||||
width: '18px',
|
|
||||||
borderRadius: '100%',
|
|
||||||
background: 'white',
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
position: 'absolute',
|
|
||||||
bottom: '-2px',
|
|
||||||
right: '-4px',
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<RiPushpin2Fill size={14} aria-hidden />
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
import { css } from '@/styled-system/css'
|
|
||||||
|
|
||||||
import { HStack } from '@/styled-system/jsx'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { Avatar } from '@/components/Avatar'
|
|
||||||
import { useLowerHandParticipant } from '../api/lowerHandParticipant'
|
|
||||||
import { getParticipantColor } from '@/features/rooms/utils/getParticipantColor'
|
|
||||||
import type { Participant } from 'livekit-client'
|
|
||||||
import { isLocal } from '@/utils/livekit'
|
|
||||||
import { RiHand } from '@remixicon/react'
|
|
||||||
import { Button } from '@/primitives'
|
|
||||||
import { AdminOrOwnerOnly } from '@/features/rooms/components/AdminOrOwnerOnly'
|
|
||||||
import { ParticipantName } from './ParticipantName'
|
|
||||||
|
|
||||||
const ActionButton = ({
|
|
||||||
participant,
|
|
||||||
name,
|
|
||||||
}: {
|
|
||||||
participant: Participant
|
|
||||||
name: string
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('rooms')
|
|
||||||
const { lowerHandParticipant } = useLowerHandParticipant()
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
square
|
|
||||||
variant="greyscale"
|
|
||||||
size="sm"
|
|
||||||
onPress={() => lowerHandParticipant(participant)}
|
|
||||||
aria-label={t('participants.lowerParticipantHand', { name })}
|
|
||||||
tooltip={t('participants.lowerParticipantHand', { name })}
|
|
||||||
data-attr="participants-lower-hand"
|
|
||||||
>
|
|
||||||
<RiHand />
|
|
||||||
</Button>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
type HandRaisedListItemProps = {
|
|
||||||
participant: Participant
|
|
||||||
}
|
|
||||||
|
|
||||||
export const RaisedHandRow = ({ participant }: HandRaisedListItemProps) => {
|
|
||||||
const name = participant.name || participant.identity
|
|
||||||
return (
|
|
||||||
<HStack
|
|
||||||
role="listitem"
|
|
||||||
justify="space-between"
|
|
||||||
key={participant.identity}
|
|
||||||
id={participant.identity}
|
|
||||||
className={css({
|
|
||||||
padding: '0.25rem 0',
|
|
||||||
width: 'full',
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<HStack flex="1" minW="0" overflow="hidden">
|
|
||||||
<Avatar name={name} bgColor={getParticipantColor(participant)} />
|
|
||||||
<ParticipantName displayedName={name} isLocal={isLocal(participant)} />
|
|
||||||
</HStack>
|
|
||||||
<HStack flexShrink={0}>
|
|
||||||
<AdminOrOwnerOnly>
|
|
||||||
<ActionButton participant={participant} name={name} />
|
|
||||||
</AdminOrOwnerOnly>
|
|
||||||
</HStack>
|
|
||||||
</HStack>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
import { Participant } from 'livekit-client'
|
|
||||||
import { css } from '@/styled-system/css'
|
|
||||||
import { useParticipantAttribute } from '@livekit/components-react'
|
|
||||||
import { RiErrorWarningFill } from '@remixicon/react'
|
|
||||||
import { VisualOnlyTooltip } from '@/primitives/VisualOnlyTooltip'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
|
|
||||||
export const UnauthenticatedBadge = ({
|
|
||||||
participant,
|
|
||||||
}: {
|
|
||||||
participant: Participant
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('rooms', {
|
|
||||||
keyPrefix: 'participants.unauthenticated',
|
|
||||||
})
|
|
||||||
const is_authenticated = useParticipantAttribute('is_authenticated', {
|
|
||||||
participant,
|
|
||||||
})
|
|
||||||
|
|
||||||
if (is_authenticated == 'true') return
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={css({
|
|
||||||
height: '18px',
|
|
||||||
width: '18px',
|
|
||||||
borderRadius: '100%',
|
|
||||||
background: 'orange.200',
|
|
||||||
color: 'orange.800',
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
position: 'absolute',
|
|
||||||
bottom: '-2px',
|
|
||||||
right: '-4px',
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<VisualOnlyTooltip tooltip={t('badge')}>
|
|
||||||
<RiErrorWarningFill size={14} aria-hidden />
|
|
||||||
</VisualOnlyTooltip>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { ParticipantsCollapsibleSection } from './ParticipantsCollapsibleSection'
|
|
||||||
import { WaitingParticipantRow } from './WaitingParticipantRow'
|
|
||||||
import { useWaitingParticipants } from '../hooks/useWaitingParticipants'
|
|
||||||
|
|
||||||
export const WaitingParticipantsSection = () => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participants.waiting' })
|
|
||||||
|
|
||||||
const { waitingParticipants, handleParticipantEntry } =
|
|
||||||
useWaitingParticipants()
|
|
||||||
|
|
||||||
if (waitingParticipants?.length == 0) return
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ParticipantsCollapsibleSection
|
|
||||||
heading={t('title')}
|
|
||||||
count={waitingParticipants.length}
|
|
||||||
>
|
|
||||||
{waitingParticipants.map((p) => (
|
|
||||||
<WaitingParticipantRow
|
|
||||||
key={p.id}
|
|
||||||
participant={p}
|
|
||||||
onAction={handleParticipantEntry}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</ParticipantsCollapsibleSection>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
import { Menu as RACMenu } from 'react-aria-components'
|
|
||||||
import type { Participant } from 'livekit-client'
|
|
||||||
import { PinMenuItem } from './items/PinMenuItem'
|
|
||||||
import { RemoveMenuItem } from './items/RemoveMenuItem'
|
|
||||||
import { PromoteMenuItem } from './items/PromoteMenuItem'
|
|
||||||
import { useIsAdminOrOwner } from '@/features/rooms/livekit/hooks/useIsAdminOrOwner'
|
|
||||||
import { useParticipantAttributes } from '@livekit/components-react'
|
|
||||||
|
|
||||||
export const ParticipantMenu = ({
|
|
||||||
participant,
|
|
||||||
}: {
|
|
||||||
participant: Participant
|
|
||||||
}) => {
|
|
||||||
const isLocalUserAdminOrOwner = useIsAdminOrOwner()
|
|
||||||
|
|
||||||
const { attributes } = useParticipantAttributes({ participant })
|
|
||||||
|
|
||||||
const isAdmin = attributes?.room_role === 'administrator'
|
|
||||||
const isOwner = attributes?.room_role === 'owner'
|
|
||||||
const isAuthenticated = attributes?.is_authenticated == 'true'
|
|
||||||
|
|
||||||
const canManage = !participant.isLocal && isLocalUserAdminOrOwner && !isOwner
|
|
||||||
|
|
||||||
return (
|
|
||||||
<RACMenu
|
|
||||||
style={{
|
|
||||||
minWidth: '100px',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<PinMenuItem participant={participant} />
|
|
||||||
{canManage && (
|
|
||||||
<RemoveMenuItem
|
|
||||||
identity={participant.identity}
|
|
||||||
displayedName={participant.name}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{canManage && isAuthenticated && (
|
|
||||||
<PromoteMenuItem
|
|
||||||
identity={participant.identity}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
displayedName={participant.name}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</RACMenu>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
import React, { useCallback } from 'react'
|
|
||||||
import { MenuItem } from 'react-aria-components'
|
|
||||||
import { useTranslation } from 'react-i18next'
|
|
||||||
import { RiAdminLine, RiUserMinusLine } from '@remixicon/react'
|
|
||||||
import { useParticipantRole } from '@/features/participants/api/updateParticipantRole'
|
|
||||||
import { menuRecipe } from '@/primitives/menuRecipe'
|
|
||||||
import { HStack } from '@/styled-system/jsx'
|
|
||||||
|
|
||||||
type PromoteMenuItemProps = {
|
|
||||||
identity: string
|
|
||||||
displayedName?: string
|
|
||||||
isAdmin: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export const PromoteMenuItem = React.memo(
|
|
||||||
({ identity, displayedName, isAdmin }: PromoteMenuItemProps) => {
|
|
||||||
const { t } = useTranslation('rooms', { keyPrefix: 'participantMenu' })
|
|
||||||
|
|
||||||
const { updateParticipantRole } = useParticipantRole()
|
|
||||||
|
|
||||||
const label = isAdmin ? 'demote' : 'promote'
|
|
||||||
const Icon = isAdmin ? RiUserMinusLine : RiAdminLine
|
|
||||||
|
|
||||||
const toggleRole = useCallback(
|
|
||||||
() =>
|
|
||||||
updateParticipantRole(identity, isAdmin ? 'member' : 'administrator'),
|
|
||||||
[isAdmin, updateParticipantRole, identity]
|
|
||||||
)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<MenuItem
|
|
||||||
aria-label={t(`${label}.ariaLabel`, {
|
|
||||||
name: displayedName || identity,
|
|
||||||
})}
|
|
||||||
className={menuRecipe({ icon: true }).item}
|
|
||||||
onAction={toggleRole}
|
|
||||||
>
|
|
||||||
<HStack gap={0.25} minWidth={280}>
|
|
||||||
<Icon size={20} aria-hidden />
|
|
||||||
{t(`${label}.label`)}
|
|
||||||
</HStack>
|
|
||||||
</MenuItem>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
PromoteMenuItem.displayName = 'PromoteMenuItem'
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user