mirror of
https://github.com/vector-im/element-call.git
synced 2026-11-19 09:32:29 +08:00
Compare commits
49
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c00e332dd8 | ||
|
|
e5509ba49b | ||
|
|
4c2c7d51cf | ||
|
|
794585514a | ||
|
|
c078dd87fa | ||
|
|
2b3e2f6188 | ||
|
|
3491a68362 | ||
|
|
294b90b6dc | ||
|
|
ddd015d696 | ||
|
|
7532f72c90 | ||
|
|
e60bc9e98f | ||
|
|
1aa1af2ade | ||
|
|
ccadc17406 | ||
|
|
a731981388 | ||
|
|
4099c4383d | ||
|
|
d34775fc47 | ||
|
|
a29f0162ad | ||
|
|
a69a50d30c | ||
|
|
89a1bfac2d | ||
|
|
1fd9ac93c9 | ||
|
|
f6ef872242 | ||
|
|
07de8483d5 | ||
|
|
42b4c8301f | ||
|
|
c2f541ff8c | ||
|
|
c1049b6088 | ||
|
|
6577db16ce | ||
|
|
cdc3c2b216 | ||
|
|
47324b52f8 | ||
|
|
82706cca4f | ||
|
|
665a6be484 | ||
|
|
0076b54e52 | ||
|
|
614762b5f8 | ||
|
|
222982c52c | ||
|
|
171c289f2d | ||
|
|
9ad029d4ff | ||
|
|
a3950869fb | ||
|
|
5afc3c2598 | ||
|
|
8ad0cb1955 | ||
|
|
9bd464a7f1 | ||
|
|
f0adae41ef | ||
|
|
f9cc930155 | ||
|
|
eebcd133f3 | ||
|
|
79bd458dc2 | ||
|
|
a4b1ce52cd | ||
|
|
b22a937e7c | ||
|
|
0309ceb6aa | ||
|
|
3ecffccd9e | ||
|
|
3dd0b156cf | ||
|
|
214bb75d27 |
@@ -43,6 +43,29 @@ module.exports = {
|
|||||||
// To encourage good usage of RxJS:
|
// To encourage good usage of RxJS:
|
||||||
"rxjs/no-exposed-subjects": "error",
|
"rxjs/no-exposed-subjects": "error",
|
||||||
"rxjs/finnish": ["error", { names: { "^this$": false } }],
|
"rxjs/finnish": ["error", { names: { "^this$": false } }],
|
||||||
|
"no-restricted-imports": [
|
||||||
|
"error",
|
||||||
|
{
|
||||||
|
paths: ["matrix-widget-api", "matrix-js-sdk"].flatMap((lib) =>
|
||||||
|
["src", "src/", "src/index", "lib", "lib/", "lib/index"]
|
||||||
|
.map((path) => `${lib}/${path}`)
|
||||||
|
.map((name) => ({ name, message: `Please use ${lib} instead` })),
|
||||||
|
),
|
||||||
|
patterns: [
|
||||||
|
...["matrix-widget-api"].map((lib) => ({
|
||||||
|
group: ["src", "src/", "src/**", "lib", "lib/", "lib/**"].map(
|
||||||
|
(path) => `${lib}/${path}`,
|
||||||
|
),
|
||||||
|
message: `Please use ${lib} instead`,
|
||||||
|
})),
|
||||||
|
// XXX: We use /lib in lots of places, so allow for now.
|
||||||
|
...["matrix-js-sdk"].map((lib) => ({
|
||||||
|
group: ["src", "src/", "src/**"].map((path) => `${lib}/${path}`),
|
||||||
|
message: `Please use ${lib} instead`,
|
||||||
|
})),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
overrides: [
|
overrides: [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ jobs:
|
|||||||
run: find ${{ env.FILENAME_PREFIX }} -type f -print0 | sort -z | xargs -0 sha256sum | tee ${{ env.FILENAME_PREFIX }}.sha256
|
run: find ${{ env.FILENAME_PREFIX }} -type f -print0 | sort -z | xargs -0 sha256sum | tee ${{ env.FILENAME_PREFIX }}.sha256
|
||||||
- name: Upload
|
- name: Upload
|
||||||
if: ${{ needs.versioning.outputs.DRY_RUN == 'false' }}
|
if: ${{ needs.versioning.outputs.DRY_RUN == 'false' }}
|
||||||
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2
|
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
${{ env.FILENAME_PREFIX }}.tar.gz
|
${{ env.FILENAME_PREFIX }}.tar.gz
|
||||||
@@ -100,7 +100,7 @@ jobs:
|
|||||||
ARTIFACT_VERSION: ${{ steps.artifact_version.outputs.ARTIFACT_VERSION }}
|
ARTIFACT_VERSION: ${{ steps.artifact_version.outputs.ARTIFACT_VERSION }}
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
id-token: write # required for the provenance flag on npm publish
|
id-token: write # Allow npm to authenticate as a trusted publisher
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
|
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
|
||||||
@@ -126,8 +126,6 @@ jobs:
|
|||||||
npm version ${{ needs.versioning.outputs.PREFIXED_VERSION }} --no-git-tag-version
|
npm version ${{ needs.versioning.outputs.PREFIXED_VERSION }} --no-git-tag-version
|
||||||
echo "ARTIFACT_VERSION=$(jq '.version' --raw-output package.json)" >> "$GITHUB_ENV"
|
echo "ARTIFACT_VERSION=$(jq '.version' --raw-output package.json)" >> "$GITHUB_ENV"
|
||||||
npm publish --provenance --access public --tag ${{ needs.versioning.outputs.TAG }} ${{ needs.versioning.outputs.DRY_RUN == 'true' && '--dry-run' || '' }}
|
npm publish --provenance --access public --tag ${{ needs.versioning.outputs.TAG }} ${{ needs.versioning.outputs.DRY_RUN == 'true' && '--dry-run' || '' }}
|
||||||
env:
|
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
|
|
||||||
|
|
||||||
- id: artifact_version
|
- id: artifact_version
|
||||||
name: Output artifact version
|
name: Output artifact version
|
||||||
@@ -264,7 +262,7 @@ jobs:
|
|||||||
echo "iOS: ${{ needs.publish_ios.outputs.ARTIFACT_VERSION }}"
|
echo "iOS: ${{ needs.publish_ios.outputs.ARTIFACT_VERSION }}"
|
||||||
- name: Add release notes
|
- name: Add release notes
|
||||||
if: ${{ needs.versioning.outputs.DRY_RUN == 'false' }}
|
if: ${{ needs.versioning.outputs.DRY_RUN == 'false' }}
|
||||||
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2
|
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2
|
||||||
with:
|
with:
|
||||||
append_body: true
|
append_body: true
|
||||||
body: |
|
body: |
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ jobs:
|
|||||||
- name: Create Checksum
|
- name: Create Checksum
|
||||||
run: find ${{ env.FILENAME_PREFIX }} -type f -print0 | sort -z | xargs -0 sha256sum | tee ${{ env.FILENAME_PREFIX }}.sha256
|
run: find ${{ env.FILENAME_PREFIX }} -type f -print0 | sort -z | xargs -0 sha256sum | tee ${{ env.FILENAME_PREFIX }}.sha256
|
||||||
- name: Upload
|
- name: Upload
|
||||||
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2
|
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
${{ env.FILENAME_PREFIX }}.tar.gz
|
${{ env.FILENAME_PREFIX }}.tar.gz
|
||||||
@@ -68,7 +68,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Add release note
|
- name: Add release note
|
||||||
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2
|
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2
|
||||||
with:
|
with:
|
||||||
append_body: true
|
append_body: true
|
||||||
body: |
|
body: |
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
22
|
24
|
||||||
|
|||||||
+1
-2
@@ -13,7 +13,6 @@ coverage:
|
|||||||
informational: true
|
informational: true
|
||||||
patch:
|
patch:
|
||||||
default:
|
default:
|
||||||
# Encourage (but don't enforce) 80% coverage on all lines that a PR
|
# Enforce 80% coverage on all lines that a PR
|
||||||
# touches
|
# touches
|
||||||
target: 80%
|
target: 80%
|
||||||
informational: true
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
"api_host": "https://posthog-element-call.element.io"
|
"api_host": "https://posthog-element-call.element.io"
|
||||||
},
|
},
|
||||||
"rageshake": {
|
"rageshake": {
|
||||||
"submit_url": "https://element.io/bugreports/submit"
|
"submit_url": "https://rageshakes.element.io/api/submit"
|
||||||
},
|
},
|
||||||
"sentry": {
|
"sentry": {
|
||||||
"environment": "netlify-pr-preview",
|
"environment": "netlify-pr-preview",
|
||||||
|
|||||||
@@ -136,8 +136,8 @@ handle @jwt_service {
|
|||||||
reverse_proxy http://[::1]:8080 {
|
reverse_proxy http://[::1]:8080 {
|
||||||
header_up Host {host}
|
header_up Host {host}
|
||||||
header_up X-Forwarded-Server {host}
|
header_up X-Forwarded-Server {host}
|
||||||
header_up X-Real-IP {remote_addr}
|
header_up X-Real-IP {remote_host}
|
||||||
header_up X-Forwarded-For {remote_addr}
|
header_up X-Forwarded-For {remote_host}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,8 +146,8 @@ handle {
|
|||||||
reverse_proxy http://localhost:7880 {
|
reverse_proxy http://localhost:7880 {
|
||||||
header_up Host {host}
|
header_up Host {host}
|
||||||
header_up X-Forwarded-Server {host}
|
header_up X-Forwarded-Server {host}
|
||||||
header_up X-Real-IP {remote_addr}
|
header_up X-Real-IP {remote_host}
|
||||||
header_up X-Forwarded-For {remote_addr}
|
header_up X-Forwarded-For {remote_host}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|||||||
+1
-1
@@ -96,6 +96,6 @@ These parameters are only supported in the [embedded](./embedded-standalone.md)
|
|||||||
| -------------------- | -------------------------------------------------------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------- |
|
| -------------------- | -------------------------------------------------------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
| `posthogApiHost` | Posthog server URL | No | e.g. `https://posthog-element-call.element.io`. Only supported in embedded package. In full package the value from config is used. |
|
| `posthogApiHost` | Posthog server URL | No | e.g. `https://posthog-element-call.element.io`. Only supported in embedded package. In full package the value from config is used. |
|
||||||
| `posthogApiKey` | Posthog project API key | No | Only supported in embedded package. In full package the value from config is used. |
|
| `posthogApiKey` | Posthog project API key | No | Only supported in embedded package. In full package the value from config is used. |
|
||||||
| `rageshakeSubmitUrl` | Rageshake server URL endpoint | No | e.g. `https://element.io/bugreports/submit`. In full package the value from config is used. |
|
| `rageshakeSubmitUrl` | Rageshake server URL endpoint | No | e.g. `https://rageshakes.element.io/api/submit`. In full package the value from config is used. |
|
||||||
| `sentryDsn` | Sentry [DSN](https://docs.sentry.io/concepts/key-terms/dsn-explainer/) | No | In full package the value from config is used. |
|
| `sentryDsn` | Sentry [DSN](https://docs.sentry.io/concepts/key-terms/dsn-explainer/) | No | In full package the value from config is used. |
|
||||||
| `sentryEnvironment` | Sentry [environment](https://docs.sentry.io/concepts/key-terms/key-terms/) | No | In full package the value from config is used. |
|
| `sentryEnvironment` | Sentry [environment](https://docs.sentry.io/concepts/key-terms/key-terms/) | No | In full package the value from config is used. |
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
|
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
|
||||||
|
|
||||||
[versions]
|
[versions]
|
||||||
android_gradle_plugin = "8.11.1"
|
android_gradle_plugin = "8.13.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref = "android_gradle_plugin" }
|
android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref = "android_gradle_plugin" }
|
||||||
|
|||||||
@@ -64,6 +64,14 @@
|
|||||||
"developer_mode": {
|
"developer_mode": {
|
||||||
"always_show_iphone_earpiece": "Show iPhone earpiece option on all platforms",
|
"always_show_iphone_earpiece": "Show iPhone earpiece option on all platforms",
|
||||||
"crypto_version": "Crypto version: {{version}}",
|
"crypto_version": "Crypto version: {{version}}",
|
||||||
|
"custom_livekit_url": {
|
||||||
|
"current_url": "Currently set to: ",
|
||||||
|
"from_config": "Currently, no overwrite is set. Url from well-known or config is used.",
|
||||||
|
"label": "Custom Livekit-url",
|
||||||
|
"reset": "Reset overwrite",
|
||||||
|
"save": "Save",
|
||||||
|
"saving": "Saving..."
|
||||||
|
},
|
||||||
"debug_tile_layout_label": "Debug tile layout",
|
"debug_tile_layout_label": "Debug tile layout",
|
||||||
"device_id": "Device ID: {{id}}",
|
"device_id": "Device ID: {{id}}",
|
||||||
"duplicate_tiles_label": "Number of additional tile copies per participant",
|
"duplicate_tiles_label": "Number of additional tile copies per participant",
|
||||||
|
|||||||
+1
-1
@@ -71,7 +71,7 @@
|
|||||||
"@types/grecaptcha": "^3.0.9",
|
"@types/grecaptcha": "^3.0.9",
|
||||||
"@types/jsdom": "^21.1.7",
|
"@types/jsdom": "^21.1.7",
|
||||||
"@types/lodash-es": "^4.17.12",
|
"@types/lodash-es": "^4.17.12",
|
||||||
"@types/node": "^22.0.0",
|
"@types/node": "^24.0.0",
|
||||||
"@types/pako": "^2.0.3",
|
"@types/pako": "^2.0.3",
|
||||||
"@types/qrcode": "^1.5.5",
|
"@types/qrcode": "^1.5.5",
|
||||||
"@types/react": "^19.0.0",
|
"@types/react": "^19.0.0",
|
||||||
|
|||||||
@@ -159,7 +159,11 @@ export const widgetTest = test.extend<MyFixtures>({
|
|||||||
} = await registerUser(browser, userB);
|
} = await registerUser(browser, userB);
|
||||||
|
|
||||||
// Invite the second user
|
// Invite the second user
|
||||||
await ewPage1.getByRole("button", { name: "Add", exact: true }).click();
|
await ewPage1
|
||||||
|
.getByRole("navigation", { name: "Room list" })
|
||||||
|
.getByRole("button", { name: "New conversation" })
|
||||||
|
.click();
|
||||||
|
|
||||||
await ewPage1.getByRole("menuitem", { name: "New Room" }).click();
|
await ewPage1.getByRole("menuitem", { name: "New Room" }).click();
|
||||||
await ewPage1.getByRole("textbox", { name: "Name" }).fill("Welcome Room");
|
await ewPage1.getByRole("textbox", { name: "Name" }).fill("Welcome Room");
|
||||||
await ewPage1.getByRole("button", { name: "Create room" }).click();
|
await ewPage1.getByRole("button", { name: "Create room" }).click();
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ export interface ConfigOptions {
|
|||||||
delayed_leave_event_delay_ms?: number;
|
delayed_leave_event_delay_ms?: number;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The time (in milliseconds) after which a we consider a delayed event restart http request to have failed.
|
* The time (in milliseconds) after which we consider a delayed event restart http request to have failed.
|
||||||
* Setting this to a lower value will result in more frequent retries but also a higher chance of failiour.
|
* Setting this to a lower value will result in more frequent retries but also a higher chance of failiour.
|
||||||
*
|
*
|
||||||
* In the presence of network packet loss (hurting TCP connections), the custom delayedEventRestartLocalTimeoutMs
|
* In the presence of network packet loss (hurting TCP connections), the custom delayedEventRestartLocalTimeoutMs
|
||||||
|
|||||||
@@ -21,7 +21,16 @@ export type OpenIDClientParts = Pick<
|
|||||||
MatrixClient,
|
MatrixClient,
|
||||||
"getOpenIdToken" | "getDeviceId"
|
"getOpenIdToken" | "getDeviceId"
|
||||||
>;
|
>;
|
||||||
|
/**
|
||||||
|
* Gets a bearer token from the homeserver and then use it to authenticate
|
||||||
|
* to the matrix RTC backend in order to get acces to the SFU.
|
||||||
|
* It has built-in retry for calls to the homeserver with a backoff policy.
|
||||||
|
* @param client
|
||||||
|
* @param serviceUrl
|
||||||
|
* @param matrixRoomId
|
||||||
|
* @returns Object containing the token information
|
||||||
|
* @throws FailToGetOpenIdToken
|
||||||
|
*/
|
||||||
export async function getSFUConfigWithOpenID(
|
export async function getSFUConfigWithOpenID(
|
||||||
client: OpenIDClientParts,
|
client: OpenIDClientParts,
|
||||||
serviceUrl: string,
|
serviceUrl: string,
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import {
|
|||||||
WebBrowserIcon,
|
WebBrowserIcon,
|
||||||
} from "@vector-im/compound-design-tokens/assets/web/icons";
|
} from "@vector-im/compound-design-tokens/assets/web/icons";
|
||||||
import { Button } from "@vector-im/compound-web";
|
import { Button } from "@vector-im/compound-web";
|
||||||
|
import { logger } from "matrix-js-sdk/lib/logger";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
ConnectionLostError,
|
ConnectionLostError,
|
||||||
@@ -53,7 +54,7 @@ const ErrorPage: FC<ErrorPageProps> = ({
|
|||||||
widget,
|
widget,
|
||||||
}: ErrorPageProps): ReactElement => {
|
}: ErrorPageProps): ReactElement => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
logger.error("Error boundary caught:", error);
|
||||||
let icon: ComponentType<SVGAttributes<SVGElement>>;
|
let icon: ComponentType<SVGAttributes<SVGElement>>;
|
||||||
switch (error.category) {
|
switch (error.category) {
|
||||||
case ErrorCategory.CONFIGURATION_ISSUE:
|
case ErrorCategory.CONFIGURATION_ISSUE:
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import userEvent from "@testing-library/user-event";
|
|||||||
import { type RelationsContainer } from "matrix-js-sdk/lib/models/relations-container";
|
import { type RelationsContainer } from "matrix-js-sdk/lib/models/relations-container";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { TooltipProvider } from "@vector-im/compound-web";
|
import { TooltipProvider } from "@vector-im/compound-web";
|
||||||
|
import { type ITransport } from "matrix-widget-api";
|
||||||
|
|
||||||
import { prefetchSounds } from "../soundUtils";
|
import { prefetchSounds } from "../soundUtils";
|
||||||
import { useAudioContext } from "../useAudioContext";
|
import { useAudioContext } from "../useAudioContext";
|
||||||
@@ -43,7 +44,7 @@ import {
|
|||||||
MockRTCSession,
|
MockRTCSession,
|
||||||
} from "../utils/test";
|
} from "../utils/test";
|
||||||
import { GroupCallView } from "./GroupCallView";
|
import { GroupCallView } from "./GroupCallView";
|
||||||
import { type WidgetHelpers } from "../widget";
|
import { ElementWidgetActions, type WidgetHelpers } from "../widget";
|
||||||
import { LazyEventEmitter } from "../LazyEventEmitter";
|
import { LazyEventEmitter } from "../LazyEventEmitter";
|
||||||
import { MatrixRTCTransportMissingError } from "../utils/errors";
|
import { MatrixRTCTransportMissingError } from "../utils/errors";
|
||||||
import { ProcessorProvider } from "../livekit/TrackProcessorContext";
|
import { ProcessorProvider } from "../livekit/TrackProcessorContext";
|
||||||
@@ -112,6 +113,10 @@ beforeEach(() => {
|
|||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<button onClick={() => onLeave("user")}>Leave</button>
|
<button onClick={() => onLeave("user")}>Leave</button>
|
||||||
|
<button onClick={() => onLeave("allOthersLeft")}>
|
||||||
|
SimulateOtherLeft
|
||||||
|
</button>
|
||||||
|
<button onClick={() => onLeave("error")}>SimulateErrorLeft</button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -243,6 +248,112 @@ test.skip("GroupCallView plays a leave sound synchronously in widget mode", asyn
|
|||||||
expect(leaveRTCSession).toHaveBeenCalledOnce();
|
expect(leaveRTCSession).toHaveBeenCalledOnce();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test.skip("Should close widget when all other left and have time to play a sound", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const widgetClosedCalled = Promise.withResolvers<void>();
|
||||||
|
const widgetSendMock = vi.fn().mockImplementation((action: string) => {
|
||||||
|
if (action === ElementWidgetActions.Close) {
|
||||||
|
widgetClosedCalled.resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const widgetStopMock = vi.fn().mockResolvedValue(undefined);
|
||||||
|
const widget = {
|
||||||
|
api: {
|
||||||
|
setAlwaysOnScreen: vi.fn().mockResolvedValue(true),
|
||||||
|
transport: {
|
||||||
|
send: widgetSendMock,
|
||||||
|
reply: vi.fn().mockResolvedValue(undefined),
|
||||||
|
stop: widgetStopMock,
|
||||||
|
} as unknown as ITransport,
|
||||||
|
} as Partial<WidgetHelpers["api"]>,
|
||||||
|
lazyActions: new LazyEventEmitter(),
|
||||||
|
};
|
||||||
|
const resolvePlaySound = Promise.withResolvers<void>();
|
||||||
|
playSound = vi.fn().mockReturnValue(resolvePlaySound);
|
||||||
|
(useAudioContext as MockedFunction<typeof useAudioContext>).mockReturnValue({
|
||||||
|
playSound,
|
||||||
|
playSoundLooping: vitest.fn(),
|
||||||
|
soundDuration: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const { getByText } = createGroupCallView(widget as WidgetHelpers);
|
||||||
|
const leaveButton = getByText("SimulateOtherLeft");
|
||||||
|
await user.click(leaveButton);
|
||||||
|
await flushPromises();
|
||||||
|
expect(widgetSendMock).not.toHaveBeenCalled();
|
||||||
|
resolvePlaySound.resolve();
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
expect(playSound).toHaveBeenCalledWith("left");
|
||||||
|
|
||||||
|
await widgetClosedCalled.promise;
|
||||||
|
await flushPromises();
|
||||||
|
expect(widgetStopMock).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Should close widget when all other left", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
const widgetClosedCalled = Promise.withResolvers<void>();
|
||||||
|
const widgetSendMock = vi.fn().mockImplementation((action: string) => {
|
||||||
|
if (action === ElementWidgetActions.Close) {
|
||||||
|
widgetClosedCalled.resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const widgetStopMock = vi.fn().mockResolvedValue(undefined);
|
||||||
|
const widget = {
|
||||||
|
api: {
|
||||||
|
setAlwaysOnScreen: vi.fn().mockResolvedValue(true),
|
||||||
|
transport: {
|
||||||
|
send: widgetSendMock,
|
||||||
|
reply: vi.fn().mockResolvedValue(undefined),
|
||||||
|
stop: widgetStopMock,
|
||||||
|
} as unknown as ITransport,
|
||||||
|
} as Partial<WidgetHelpers["api"]>,
|
||||||
|
lazyActions: new LazyEventEmitter(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const { getByText } = createGroupCallView(widget as WidgetHelpers);
|
||||||
|
const leaveButton = getByText("SimulateOtherLeft");
|
||||||
|
await user.click(leaveButton);
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
await widgetClosedCalled.promise;
|
||||||
|
await flushPromises();
|
||||||
|
expect(widgetStopMock).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Should not close widget when auto leave due to error", async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
|
||||||
|
const widgetStopMock = vi.fn().mockResolvedValue(undefined);
|
||||||
|
const widgetSendMock = vi.fn().mockResolvedValue(undefined);
|
||||||
|
const widget = {
|
||||||
|
api: {
|
||||||
|
setAlwaysOnScreen: vi.fn().mockResolvedValue(true),
|
||||||
|
transport: {
|
||||||
|
send: widgetSendMock,
|
||||||
|
reply: vi.fn().mockResolvedValue(undefined),
|
||||||
|
stop: widgetStopMock,
|
||||||
|
} as unknown as ITransport,
|
||||||
|
} as Partial<WidgetHelpers["api"]>,
|
||||||
|
lazyActions: new LazyEventEmitter(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const alwaysOnScreenSpy = vi.spyOn(widget.api, "setAlwaysOnScreen");
|
||||||
|
|
||||||
|
const { getByText } = createGroupCallView(widget as WidgetHelpers);
|
||||||
|
const leaveButton = getByText("SimulateErrorLeft");
|
||||||
|
await user.click(leaveButton);
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
// When onLeft is called, we first set always on screen to false
|
||||||
|
await waitFor(() => expect(alwaysOnScreenSpy).toHaveBeenCalledWith(false));
|
||||||
|
await flushPromises();
|
||||||
|
// But then we do not close the widget automatically
|
||||||
|
expect(widgetStopMock).not.toHaveBeenCalledOnce();
|
||||||
|
expect(widgetSendMock).not.toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
|
||||||
test.skip("GroupCallView leaves the session when an error occurs", async () => {
|
test.skip("GroupCallView leaves the session when an error occurs", async () => {
|
||||||
(ActiveCall as MockedFunction<typeof ActiveCall>).mockImplementation(() => {
|
(ActiveCall as MockedFunction<typeof ActiveCall>).mockImplementation(() => {
|
||||||
const [error, setError] = useState<Error | null>(null);
|
const [error, setError] = useState<Error | null>(null);
|
||||||
|
|||||||
@@ -159,6 +159,7 @@ export const GroupCallView: FC<Props> = ({
|
|||||||
};
|
};
|
||||||
}, [rtcSession]);
|
}, [rtcSession]);
|
||||||
|
|
||||||
|
// TODO move this into the callViewModel LocalMembership.ts
|
||||||
useTypedEventEmitter(
|
useTypedEventEmitter(
|
||||||
rtcSession,
|
rtcSession,
|
||||||
MatrixRTCSessionEvent.MembershipManagerError,
|
MatrixRTCSessionEvent.MembershipManagerError,
|
||||||
@@ -313,7 +314,9 @@ export const GroupCallView: FC<Props> = ({
|
|||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const onLeft = useCallback(
|
const onLeft = useCallback(
|
||||||
(reason: "timeout" | "user" | "allOthersLeft" | "decline"): void => {
|
(
|
||||||
|
reason: "timeout" | "user" | "allOthersLeft" | "decline" | "error",
|
||||||
|
): void => {
|
||||||
let playSound: CallEventSounds = "left";
|
let playSound: CallEventSounds = "left";
|
||||||
if (reason === "timeout" || reason === "decline") playSound = reason;
|
if (reason === "timeout" || reason === "decline") playSound = reason;
|
||||||
|
|
||||||
@@ -366,7 +369,7 @@ export const GroupCallView: FC<Props> = ({
|
|||||||
}
|
}
|
||||||
// On a normal user hangup we can shut down and close the widget. But if an
|
// On a normal user hangup we can shut down and close the widget. But if an
|
||||||
// error occurs we should keep the widget open until the user reads it.
|
// error occurs we should keep the widget open until the user reads it.
|
||||||
if (reason === "user" && !getUrlParams().returnToLobby) {
|
if (reason != "error" && !getUrlParams().returnToLobby) {
|
||||||
try {
|
try {
|
||||||
await widget.api.transport.send(ElementWidgetActions.Close, {});
|
await widget.api.transport.send(ElementWidgetActions.Close, {});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -518,8 +521,7 @@ export const GroupCallView: FC<Props> = ({
|
|||||||
}}
|
}}
|
||||||
onError={
|
onError={
|
||||||
(/**error*/) => {
|
(/**error*/) => {
|
||||||
// TODO this should not be "user". It needs a new case
|
if (rtcSession.isJoined()) onLeft("error");
|
||||||
if (rtcSession.isJoined()) onLeft("user");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -115,7 +115,9 @@ export interface ActiveCallProps
|
|||||||
extends Omit<InCallViewProps, "vm" | "livekitRoom" | "connState"> {
|
extends Omit<InCallViewProps, "vm" | "livekitRoom" | "connState"> {
|
||||||
e2eeSystem: EncryptionSystem;
|
e2eeSystem: EncryptionSystem;
|
||||||
// TODO refactor those reasons into an enum
|
// TODO refactor those reasons into an enum
|
||||||
onLeft: (reason: "user" | "timeout" | "decline" | "allOthersLeft") => void;
|
onLeft: (
|
||||||
|
reason: "user" | "timeout" | "decline" | "allOthersLeft" | "error",
|
||||||
|
) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ActiveCall: FC<ActiveCallProps> = (props) => {
|
export const ActiveCall: FC<ActiveCallProps> = (props) => {
|
||||||
@@ -264,7 +266,7 @@ export const InCallView: FC<InCallViewProps> = ({
|
|||||||
const sharingScreen = useBehavior(vm.sharingScreen$);
|
const sharingScreen = useBehavior(vm.sharingScreen$);
|
||||||
|
|
||||||
const ringOverlay = useBehavior(vm.ringOverlay$);
|
const ringOverlay = useBehavior(vm.ringOverlay$);
|
||||||
const fatalCallError = useBehavior(vm.configError$);
|
const fatalCallError = useBehavior(vm.fatalError$);
|
||||||
// Stop the rendering and throw for the error boundary
|
// Stop the rendering and throw for the error boundary
|
||||||
if (fatalCallError) throw fatalCallError;
|
if (fatalCallError) throw fatalCallError;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2025 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
import { render, waitFor } from "@testing-library/react";
|
||||||
|
|
||||||
|
import type { MatrixClient } from "matrix-js-sdk";
|
||||||
|
import type { Room as LivekitRoom } from "livekit-client";
|
||||||
|
import { DeveloperSettingsTab } from "./DeveloperSettingsTab";
|
||||||
|
|
||||||
|
// Mock url params hook to avoid environment-dependent snapshot churn.
|
||||||
|
vi.mock("../UrlParams", () => ({
|
||||||
|
useUrlParams: (): { mocked: boolean; answer: number } => ({
|
||||||
|
mocked: true,
|
||||||
|
answer: 42,
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Provide a minimal mock of a Livekit Room structure used by the component.
|
||||||
|
function createMockLivekitRoom(
|
||||||
|
wsUrl: string,
|
||||||
|
serverInfo: object,
|
||||||
|
metadata: string,
|
||||||
|
): { isLocal: boolean; url: string; room: LivekitRoom } {
|
||||||
|
const mockRoom = {
|
||||||
|
serverInfo,
|
||||||
|
metadata,
|
||||||
|
engine: { client: { ws: { url: wsUrl } } },
|
||||||
|
} as unknown as LivekitRoom;
|
||||||
|
|
||||||
|
return {
|
||||||
|
isLocal: true,
|
||||||
|
url: wsUrl,
|
||||||
|
room: mockRoom,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Minimal MatrixClient mock with only the methods used by the component.
|
||||||
|
function createMockMatrixClient(): MatrixClient {
|
||||||
|
return {
|
||||||
|
doesServerSupportUnstableFeature: vi.fn().mockResolvedValue(true), // ensure stickyEventsSupported eventually becomes true
|
||||||
|
getCrypto: (): { getVersion: () => string } | undefined => ({
|
||||||
|
getVersion: () => "crypto-1.0.0",
|
||||||
|
}),
|
||||||
|
getUserId: () => "@alice:example.org",
|
||||||
|
getDeviceId: () => "DEVICE123",
|
||||||
|
} as unknown as MatrixClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("DeveloperSettingsTab", () => {
|
||||||
|
it("renders and matches snapshot", async () => {
|
||||||
|
const client = createMockMatrixClient();
|
||||||
|
|
||||||
|
const livekitRooms: {
|
||||||
|
room: LivekitRoom;
|
||||||
|
url: string;
|
||||||
|
isLocal?: boolean;
|
||||||
|
}[] = [
|
||||||
|
createMockLivekitRoom(
|
||||||
|
"wss://local-sfu.example.org",
|
||||||
|
{ region: "local", version: "1.2.3" },
|
||||||
|
"local-metadata",
|
||||||
|
),
|
||||||
|
{
|
||||||
|
isLocal: false,
|
||||||
|
url: "wss://remote-sfu.example.org",
|
||||||
|
room: {
|
||||||
|
serverInfo: { region: "remote", version: "4.5.6" },
|
||||||
|
metadata: "remote-metadata",
|
||||||
|
engine: { client: { ws: { url: "wss://remote-sfu.example.org" } } },
|
||||||
|
} as unknown as LivekitRoom,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<DeveloperSettingsTab
|
||||||
|
client={client}
|
||||||
|
livekitRooms={livekitRooms}
|
||||||
|
env={{ MY_MOCK_ENV: 10, ENV: "test" } as unknown as ImportMetaEnv}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Wait for the async sticky events feature check to resolve so the final UI
|
||||||
|
// (e.g. enabled Matrix_2_0 radio button) appears deterministically.
|
||||||
|
await waitFor(() =>
|
||||||
|
expect(client.doesServerSupportUnstableFeature).toHaveBeenCalled(),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -11,8 +11,8 @@ import {
|
|||||||
useCallback,
|
useCallback,
|
||||||
useEffect,
|
useEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
useState,
|
|
||||||
useId,
|
useId,
|
||||||
|
useState,
|
||||||
} from "react";
|
} from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import {
|
import {
|
||||||
@@ -21,6 +21,7 @@ import {
|
|||||||
} from "matrix-js-sdk";
|
} from "matrix-js-sdk";
|
||||||
import { logger } from "matrix-js-sdk/lib/logger";
|
import { logger } from "matrix-js-sdk/lib/logger";
|
||||||
import {
|
import {
|
||||||
|
EditInPlace,
|
||||||
Root as Form,
|
Root as Form,
|
||||||
Heading,
|
Heading,
|
||||||
HelpMessage,
|
HelpMessage,
|
||||||
@@ -38,6 +39,7 @@ import {
|
|||||||
muteAllAudio as muteAllAudioSetting,
|
muteAllAudio as muteAllAudioSetting,
|
||||||
alwaysShowIphoneEarpiece as alwaysShowIphoneEarpieceSetting,
|
alwaysShowIphoneEarpiece as alwaysShowIphoneEarpieceSetting,
|
||||||
matrixRTCMode as matrixRTCModeSetting,
|
matrixRTCMode as matrixRTCModeSetting,
|
||||||
|
customLivekitUrl as customLivekitUrlSetting,
|
||||||
MatrixRTCMode,
|
MatrixRTCMode,
|
||||||
} from "./settings";
|
} from "./settings";
|
||||||
import type { Room as LivekitRoom } from "livekit-client";
|
import type { Room as LivekitRoom } from "livekit-client";
|
||||||
@@ -47,9 +49,14 @@ import { useUrlParams } from "../UrlParams";
|
|||||||
interface Props {
|
interface Props {
|
||||||
client: MatrixClient;
|
client: MatrixClient;
|
||||||
livekitRooms?: { room: LivekitRoom; url: string; isLocal?: boolean }[];
|
livekitRooms?: { room: LivekitRoom; url: string; isLocal?: boolean }[];
|
||||||
|
env: ImportMetaEnv;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
|
export const DeveloperSettingsTab: FC<Props> = ({
|
||||||
|
client,
|
||||||
|
livekitRooms,
|
||||||
|
env,
|
||||||
|
}) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [duplicateTiles, setDuplicateTiles] = useSetting(duplicateTilesSetting);
|
const [duplicateTiles, setDuplicateTiles] = useSetting(duplicateTilesSetting);
|
||||||
const [debugTileLayout, setDebugTileLayout] = useSetting(
|
const [debugTileLayout, setDebugTileLayout] = useSetting(
|
||||||
@@ -85,6 +92,15 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
|
|||||||
alwaysShowIphoneEarpieceSetting,
|
alwaysShowIphoneEarpieceSetting,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const [customLivekitUrl, setCustomLivekitUrl] = useSetting(
|
||||||
|
customLivekitUrlSetting,
|
||||||
|
);
|
||||||
|
const [customLivekitUrlTextBuffer, setCustomLivekitUrlTextBuffer] =
|
||||||
|
useState(customLivekitUrl);
|
||||||
|
useEffect(() => {
|
||||||
|
setCustomLivekitUrlTextBuffer(customLivekitUrl);
|
||||||
|
}, [customLivekitUrl]);
|
||||||
|
|
||||||
const [muteAllAudio, setMuteAllAudio] = useSetting(muteAllAudioSetting);
|
const [muteAllAudio, setMuteAllAudio] = useSetting(muteAllAudioSetting);
|
||||||
|
|
||||||
const urlParams = useUrlParams();
|
const urlParams = useUrlParams();
|
||||||
@@ -101,7 +117,7 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
|
|||||||
}, [livekitRooms]);
|
}, [livekitRooms]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Form>
|
<>
|
||||||
<p>
|
<p>
|
||||||
{t("developer_mode.hostname", {
|
{t("developer_mode.hostname", {
|
||||||
hostname: window.location.hostname || "unknown",
|
hostname: window.location.hostname || "unknown",
|
||||||
@@ -200,9 +216,46 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
|
|||||||
)}
|
)}
|
||||||
/>{" "}
|
/>{" "}
|
||||||
</FieldRow>
|
</FieldRow>
|
||||||
|
<EditInPlace
|
||||||
|
onSubmit={(e) => e.preventDefault()}
|
||||||
|
helpLabel={
|
||||||
|
customLivekitUrl === null
|
||||||
|
? t("developer_mode.custom_livekit_url.from_config")
|
||||||
|
: t("developer_mode.custom_livekit_url.current_url") +
|
||||||
|
customLivekitUrl
|
||||||
|
}
|
||||||
|
label={t("developer_mode.custom_livekit_url.label")}
|
||||||
|
saveButtonLabel={t("developer_mode.custom_livekit_url.save")}
|
||||||
|
savingLabel={t("developer_mode.custom_livekit_url.saving")}
|
||||||
|
cancelButtonLabel={t("developer_mode.custom_livekit_url.reset")}
|
||||||
|
onSave={useCallback(
|
||||||
|
(e: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
setCustomLivekitUrl(
|
||||||
|
customLivekitUrlTextBuffer === ""
|
||||||
|
? null
|
||||||
|
: customLivekitUrlTextBuffer,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
[setCustomLivekitUrl, customLivekitUrlTextBuffer],
|
||||||
|
)}
|
||||||
|
value={customLivekitUrlTextBuffer ?? ""}
|
||||||
|
onChange={useCallback(
|
||||||
|
(event: ChangeEvent<HTMLInputElement>): void => {
|
||||||
|
setCustomLivekitUrlTextBuffer(event.target.value);
|
||||||
|
},
|
||||||
|
[setCustomLivekitUrlTextBuffer],
|
||||||
|
)}
|
||||||
|
onCancel={useCallback(
|
||||||
|
(e: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
setCustomLivekitUrl(null);
|
||||||
|
},
|
||||||
|
[setCustomLivekitUrl],
|
||||||
|
)}
|
||||||
|
/>
|
||||||
<Heading as="h3" type="body" weight="semibold" size="lg">
|
<Heading as="h3" type="body" weight="semibold" size="lg">
|
||||||
{t("developer_mode.matrixRTCMode.title")}
|
{t("developer_mode.matrixRTCMode.title")}
|
||||||
</Heading>
|
</Heading>
|
||||||
|
<Form>
|
||||||
<InlineField
|
<InlineField
|
||||||
name={matrixRTCModeRadioGroup}
|
name={matrixRTCModeRadioGroup}
|
||||||
control={
|
control={
|
||||||
@@ -249,6 +302,7 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
|
|||||||
{t("developer_mode.matrixRTCMode.Matrix_2_0.description")}
|
{t("developer_mode.matrixRTCMode.Matrix_2_0.description")}
|
||||||
</HelpMessage>
|
</HelpMessage>
|
||||||
</InlineField>
|
</InlineField>
|
||||||
|
</Form>
|
||||||
{livekitRooms?.map((livekitRoom) => (
|
{livekitRooms?.map((livekitRoom) => (
|
||||||
<>
|
<>
|
||||||
<h3>
|
<h3>
|
||||||
@@ -270,9 +324,9 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
|
|||||||
</>
|
</>
|
||||||
))}
|
))}
|
||||||
<p>{t("developer_mode.environment_variables")}</p>
|
<p>{t("developer_mode.environment_variables")}</p>
|
||||||
<pre>{JSON.stringify(import.meta.env, null, 2)}</pre>
|
<pre>{JSON.stringify(env, null, 2)}</pre>
|
||||||
<p>{t("developer_mode.url_params")}</p>
|
<p>{t("developer_mode.url_params")}</p>
|
||||||
<pre>{JSON.stringify(urlParams, null, 2)}</pre>
|
<pre>{JSON.stringify(urlParams, null, 2)}</pre>
|
||||||
</Form>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -209,7 +209,11 @@ export const SettingsModal: FC<Props> = ({
|
|||||||
key: "developer",
|
key: "developer",
|
||||||
name: t("settings.developer_tab_title"),
|
name: t("settings.developer_tab_title"),
|
||||||
content: (
|
content: (
|
||||||
<DeveloperSettingsTab client={client} livekitRooms={livekitRooms} />
|
<DeveloperSettingsTab
|
||||||
|
env={import.meta.env}
|
||||||
|
client={client}
|
||||||
|
livekitRooms={livekitRooms}
|
||||||
|
/>
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,411 @@
|
|||||||
|
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
||||||
|
|
||||||
|
exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
Hostname: localhost
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Element Call version: dev
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Crypto version: crypto-1.0.0
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Matrix ID: @alice:example.org
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Device ID: DEVICE123
|
||||||
|
</p>
|
||||||
|
<div
|
||||||
|
class="fieldRow"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="field inputField"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="«r1»"
|
||||||
|
id="duplicateTiles"
|
||||||
|
min="0"
|
||||||
|
type="number"
|
||||||
|
value="0"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
for="duplicateTiles"
|
||||||
|
>
|
||||||
|
Number of additional tile copies per participant
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="fieldRow"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="field checkboxField"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="«r2»"
|
||||||
|
id="debugTileLayout"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
for="debugTileLayout"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="checkbox"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
fill="none"
|
||||||
|
height="24"
|
||||||
|
stroke="#000"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="m20 6-11 11-5-5"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
Debug tile layout
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="fieldRow"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="field checkboxField"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="«r3»"
|
||||||
|
id="showConnectionStats"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
for="showConnectionStats"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="checkbox"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
fill="none"
|
||||||
|
height="24"
|
||||||
|
stroke="#000"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="m20 6-11 11-5-5"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
Show connection statistics
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="fieldRow"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="field checkboxField"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="«r4»"
|
||||||
|
id="muteAllAudio"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
for="muteAllAudio"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="checkbox"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
fill="none"
|
||||||
|
height="24"
|
||||||
|
stroke="#000"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="m20 6-11 11-5-5"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
Mute all audio (participants, reactions, join sounds)
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="fieldRow"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="field checkboxField"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="«r5»"
|
||||||
|
id="alwaysShowIphoneEarpiece"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
for="alwaysShowIphoneEarpiece"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="checkbox"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
fill="none"
|
||||||
|
height="24"
|
||||||
|
stroke="#000"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
stroke-width="2"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="m20 6-11 11-5-5"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
Show iPhone earpiece option on all platforms
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<form
|
||||||
|
class="_root_19upo_16"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_field_19upo_26"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="_label_19upo_59"
|
||||||
|
for="radix-«r6»"
|
||||||
|
>
|
||||||
|
Custom Livekit-url
|
||||||
|
</label>
|
||||||
|
<div
|
||||||
|
class="_controls_17lij_8"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="radix-«r7»"
|
||||||
|
class="_control_sqdq4_10"
|
||||||
|
id="radix-«r6»"
|
||||||
|
name="input"
|
||||||
|
title=""
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
class="_message_19upo_85 _help-message_19upo_91"
|
||||||
|
id="radix-«r7»"
|
||||||
|
>
|
||||||
|
Currently, no overwrite is set. Url from well-known or config is used.
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<h3
|
||||||
|
class="_typography_6v6n8_153 _font-body-lg-semibold_6v6n8_74"
|
||||||
|
>
|
||||||
|
MatrixRTC mode
|
||||||
|
</h3>
|
||||||
|
<form
|
||||||
|
class="_root_19upo_16"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_inline-field_19upo_32"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_inline-field-control_19upo_44"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_container_1e0uz_10"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="radix-«r9» radix-«rb» radix-«rd»"
|
||||||
|
checked=""
|
||||||
|
class="_input_1e0uz_18"
|
||||||
|
id="radix-«r8»"
|
||||||
|
name="«r0»"
|
||||||
|
title=""
|
||||||
|
type="radio"
|
||||||
|
value="legacy"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="_ui_1e0uz_19"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="_inline-field-body_19upo_38"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="_label_19upo_59"
|
||||||
|
for="radix-«r8»"
|
||||||
|
>
|
||||||
|
Legacy: state events & oldest membership SFU
|
||||||
|
</label>
|
||||||
|
<span
|
||||||
|
class="_message_19upo_85 _help-message_19upo_91"
|
||||||
|
id="radix-«r9»"
|
||||||
|
>
|
||||||
|
Compatible with old versions of EC that do not support multi SFU
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="_inline-field_19upo_32"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_inline-field-control_19upo_44"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_container_1e0uz_10"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="radix-«r9» radix-«rb» radix-«rd»"
|
||||||
|
class="_input_1e0uz_18"
|
||||||
|
id="radix-«ra»"
|
||||||
|
name="«r0»"
|
||||||
|
title=""
|
||||||
|
type="radio"
|
||||||
|
value="compatibil"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="_ui_1e0uz_19"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="_inline-field-body_19upo_38"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="_label_19upo_59"
|
||||||
|
for="radix-«ra»"
|
||||||
|
>
|
||||||
|
Compatibility: state events & multi SFU
|
||||||
|
</label>
|
||||||
|
<span
|
||||||
|
class="_message_19upo_85 _help-message_19upo_91"
|
||||||
|
id="radix-«rb»"
|
||||||
|
>
|
||||||
|
Compatible with homeservers that do not support sticky events (but all other EC clients are v0.17.0 or later)
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="_inline-field_19upo_32"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_inline-field-control_19upo_44"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="_container_1e0uz_10"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-describedby="radix-«r9» radix-«rb» radix-«rd»"
|
||||||
|
class="_input_1e0uz_18"
|
||||||
|
id="radix-«rc»"
|
||||||
|
name="«r0»"
|
||||||
|
title=""
|
||||||
|
type="radio"
|
||||||
|
value="matrix_2_0"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="_ui_1e0uz_19"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="_inline-field-body_19upo_38"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="_label_19upo_59"
|
||||||
|
for="radix-«rc»"
|
||||||
|
>
|
||||||
|
Matrix 2.0: sticky events & multi SFU
|
||||||
|
</label>
|
||||||
|
<span
|
||||||
|
class="_message_19upo_85 _help-message_19upo_91"
|
||||||
|
id="radix-«rd»"
|
||||||
|
>
|
||||||
|
Compatible only with homservers supporting sticky events and all EC clients v0.17.0 or later
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<h3>
|
||||||
|
LiveKit SFU: wss://local-sfu.example.org
|
||||||
|
</h3>
|
||||||
|
<p>
|
||||||
|
ws-url:
|
||||||
|
wss://local-sfu.example.org/
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
LiveKit Server Info
|
||||||
|
(
|
||||||
|
local
|
||||||
|
)
|
||||||
|
</p>
|
||||||
|
<pre
|
||||||
|
class="pre"
|
||||||
|
>
|
||||||
|
{
|
||||||
|
"region": "local",
|
||||||
|
"version": "1.2.3"
|
||||||
|
}
|
||||||
|
local-metadata
|
||||||
|
</pre>
|
||||||
|
<h3>
|
||||||
|
LiveKit SFU: wss://remote-sfu.example.org
|
||||||
|
</h3>
|
||||||
|
<p>
|
||||||
|
LiveKit Server Info
|
||||||
|
(
|
||||||
|
remote
|
||||||
|
)
|
||||||
|
</p>
|
||||||
|
<pre
|
||||||
|
class="pre"
|
||||||
|
>
|
||||||
|
{
|
||||||
|
"region": "remote",
|
||||||
|
"version": "4.5.6"
|
||||||
|
}
|
||||||
|
remote-metadata
|
||||||
|
</pre>
|
||||||
|
<p>
|
||||||
|
Environment variables
|
||||||
|
</p>
|
||||||
|
<pre>
|
||||||
|
{
|
||||||
|
"MY_MOCK_ENV": 10,
|
||||||
|
"ENV": "test"
|
||||||
|
}
|
||||||
|
</pre>
|
||||||
|
<p>
|
||||||
|
URL parameters
|
||||||
|
</p>
|
||||||
|
<pre>
|
||||||
|
{
|
||||||
|
"mocked": true,
|
||||||
|
"answer": 42
|
||||||
|
}
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
@@ -134,3 +134,8 @@ export const matrixRTCMode = new Setting<MatrixRTCMode>(
|
|||||||
"matrix-rtc-mode",
|
"matrix-rtc-mode",
|
||||||
MatrixRTCMode.Legacy,
|
MatrixRTCMode.Legacy,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
export const customLivekitUrl = new Setting<string | null>(
|
||||||
|
"custom-livekit-url",
|
||||||
|
null,
|
||||||
|
);
|
||||||
|
|||||||
@@ -16,7 +16,10 @@ import { BehaviorSubject } from "rxjs";
|
|||||||
* distinction between Behaviors and Observables, see
|
* distinction between Behaviors and Observables, see
|
||||||
* https://monoid.dk/post/behaviors-and-streams-why-both/.
|
* https://monoid.dk/post/behaviors-and-streams-why-both/.
|
||||||
*/
|
*/
|
||||||
export type Behavior<T> = Omit<BehaviorSubject<T>, "next" | "observers">;
|
export type Behavior<T> = Omit<
|
||||||
|
BehaviorSubject<T>,
|
||||||
|
"next" | "observers" | "error"
|
||||||
|
>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a Behavior which never changes in value.
|
* Creates a Behavior which never changes in value.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
/*
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2024 New Vector Ltd.
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { test, vi, onTestFinished, it, describe, expect } from "vitest";
|
import { test, vi, onTestFinished, it, describe } from "vitest";
|
||||||
import EventEmitter from "events";
|
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
combineLatest,
|
combineLatest,
|
||||||
@@ -18,12 +18,11 @@ import {
|
|||||||
of,
|
of,
|
||||||
switchMap,
|
switchMap,
|
||||||
} from "rxjs";
|
} from "rxjs";
|
||||||
import { SyncState, type MatrixClient } from "matrix-js-sdk";
|
import { SyncState } from "matrix-js-sdk";
|
||||||
import {
|
import {
|
||||||
ConnectionState,
|
ConnectionState,
|
||||||
type LocalTrackPublication,
|
type LocalTrackPublication,
|
||||||
type RemoteParticipant,
|
type RemoteParticipant,
|
||||||
type Room as LivekitRoom,
|
|
||||||
} from "livekit-client";
|
} from "livekit-client";
|
||||||
import * as ComponentsCore from "@livekit/components-core";
|
import * as ComponentsCore from "@livekit/components-core";
|
||||||
import {
|
import {
|
||||||
@@ -35,27 +34,18 @@ import {
|
|||||||
type LivekitTransport,
|
type LivekitTransport,
|
||||||
} from "matrix-js-sdk/lib/matrixrtc";
|
} from "matrix-js-sdk/lib/matrixrtc";
|
||||||
import { deepCompare } from "matrix-js-sdk/lib/utils";
|
import { deepCompare } from "matrix-js-sdk/lib/utils";
|
||||||
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
|
|
||||||
|
|
||||||
import { createCallViewModel$ } from "./CallViewModel";
|
|
||||||
import { type Layout } from "../layout-types.ts";
|
import { type Layout } from "../layout-types.ts";
|
||||||
import {
|
import {
|
||||||
mockLocalParticipant,
|
mockLocalParticipant,
|
||||||
mockMatrixRoom,
|
|
||||||
mockMatrixRoomMember,
|
mockMatrixRoomMember,
|
||||||
mockRemoteParticipant,
|
mockRemoteParticipant,
|
||||||
withTestScheduler,
|
withTestScheduler,
|
||||||
mockRtcMembership,
|
mockRtcMembership,
|
||||||
MockRTCSession,
|
|
||||||
mockMediaDevices,
|
|
||||||
mockMuteStates,
|
|
||||||
mockConfig,
|
|
||||||
testScope,
|
testScope,
|
||||||
mockLivekitRoom,
|
|
||||||
exampleTransport,
|
exampleTransport,
|
||||||
} from "../../utils/test.ts";
|
} from "../../utils/test.ts";
|
||||||
import { E2eeType } from "../../e2ee/e2eeType.ts";
|
import { E2eeType } from "../../e2ee/e2eeType.ts";
|
||||||
import type { RaisedHandInfo, ReactionInfo } from "../../reactions/index.ts";
|
|
||||||
import {
|
import {
|
||||||
aliceId,
|
aliceId,
|
||||||
aliceParticipant,
|
aliceParticipant,
|
||||||
@@ -70,10 +60,6 @@ import {
|
|||||||
import { MediaDevices } from "../MediaDevices.ts";
|
import { MediaDevices } from "../MediaDevices.ts";
|
||||||
import { getValue } from "../../utils/observable.ts";
|
import { getValue } from "../../utils/observable.ts";
|
||||||
import { type Behavior, constant } from "../Behavior.ts";
|
import { type Behavior, constant } from "../Behavior.ts";
|
||||||
import {
|
|
||||||
type ElementCallError,
|
|
||||||
MatrixRTCTransportMissingError,
|
|
||||||
} from "../../utils/errors.ts";
|
|
||||||
import { withCallViewModel } from "./CallViewModelTestUtils.ts";
|
import { withCallViewModel } from "./CallViewModelTestUtils.ts";
|
||||||
|
|
||||||
vi.mock("rxjs", async (importOriginal) => ({
|
vi.mock("rxjs", async (importOriginal) => ({
|
||||||
@@ -244,71 +230,6 @@ function mockRingEvent(
|
|||||||
const mockLegacyRingEvent = {} as { event_id: string } & ICallNotifyContent;
|
const mockLegacyRingEvent = {} as { event_id: string } & ICallNotifyContent;
|
||||||
|
|
||||||
describe("CallViewModel", () => {
|
describe("CallViewModel", () => {
|
||||||
// TODO: Restore this test. It requires makeTransport to not be mocked, unlike
|
|
||||||
// the rest of the tests in this file… what do we do?
|
|
||||||
it.skip("test missing RTC config error", async () => {
|
|
||||||
const rtcMemberships$ = new BehaviorSubject<CallMembership[]>([]);
|
|
||||||
const emitter = new EventEmitter();
|
|
||||||
const client = vi.mocked<MatrixClient>({
|
|
||||||
on: emitter.on.bind(emitter),
|
|
||||||
off: emitter.off.bind(emitter),
|
|
||||||
getSyncState: vi.fn().mockReturnValue(SyncState.Syncing),
|
|
||||||
getUserId: vi.fn().mockReturnValue("@user:localhost"),
|
|
||||||
getUser: vi.fn().mockReturnValue(null),
|
|
||||||
getDeviceId: vi.fn().mockReturnValue("DEVICE"),
|
|
||||||
credentials: {
|
|
||||||
userId: "@user:localhost",
|
|
||||||
},
|
|
||||||
getCrypto: vi.fn().mockReturnValue(undefined),
|
|
||||||
getDomain: vi.fn().mockReturnValue("example.org"),
|
|
||||||
} as unknown as MatrixClient);
|
|
||||||
|
|
||||||
const matrixRoom = mockMatrixRoom({
|
|
||||||
roomId: "!myRoomId:example.com",
|
|
||||||
client,
|
|
||||||
getMember: vi.fn().mockReturnValue(undefined),
|
|
||||||
});
|
|
||||||
|
|
||||||
const fakeRtcSession = new MockRTCSession(matrixRoom).withMemberships(
|
|
||||||
rtcMemberships$,
|
|
||||||
);
|
|
||||||
|
|
||||||
mockConfig({});
|
|
||||||
|
|
||||||
vi.spyOn(AutoDiscovery, "getRawClientConfig").mockResolvedValue({});
|
|
||||||
|
|
||||||
const callVM = createCallViewModel$(
|
|
||||||
testScope(),
|
|
||||||
fakeRtcSession.asMockedSession(),
|
|
||||||
matrixRoom,
|
|
||||||
mockMediaDevices({}),
|
|
||||||
mockMuteStates(),
|
|
||||||
{
|
|
||||||
encryptionSystem: { kind: E2eeType.PER_PARTICIPANT },
|
|
||||||
autoLeaveWhenOthersLeft: false,
|
|
||||||
livekitRoomFactory: (): LivekitRoom =>
|
|
||||||
mockLivekitRoom({
|
|
||||||
localParticipant,
|
|
||||||
disconnect: async () => Promise.resolve(),
|
|
||||||
setE2EEEnabled: async () => Promise.resolve(),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
new BehaviorSubject({} as Record<string, RaisedHandInfo>),
|
|
||||||
new BehaviorSubject({} as Record<string, ReactionInfo>),
|
|
||||||
constant({ processor: undefined, supported: false }),
|
|
||||||
);
|
|
||||||
|
|
||||||
const failPromise = Promise.withResolvers<ElementCallError>();
|
|
||||||
callVM.configError$.subscribe((error) => {
|
|
||||||
if (error) {
|
|
||||||
failPromise.resolve(error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const error = await failPromise.promise;
|
|
||||||
expect(error).toBeInstanceOf(MatrixRTCTransportMissingError);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("participants are retained during a focus switch", () => {
|
test("participants are retained during a focus switch", () => {
|
||||||
withTestScheduler(({ behavior, expectObservable }) => {
|
withTestScheduler(({ behavior, expectObservable }) => {
|
||||||
// Participants disappear on frame 2 and come back on frame 3
|
// Participants disappear on frame 2 and come back on frame 3
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2023, 2024, 2025 New Vector Ltd.
|
Copyright 2023, 2024, 2025 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
@@ -40,7 +41,10 @@ import {
|
|||||||
timer,
|
timer,
|
||||||
} from "rxjs";
|
} from "rxjs";
|
||||||
import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
|
import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
|
||||||
import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
|
import {
|
||||||
|
type LivekitTransport,
|
||||||
|
type MatrixRTCSession,
|
||||||
|
} from "matrix-js-sdk/lib/matrixrtc";
|
||||||
import { type IWidgetApiRequest } from "matrix-widget-api";
|
import { type IWidgetApiRequest } from "matrix-widget-api";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -93,8 +97,11 @@ import {
|
|||||||
} from "../layout-types.ts";
|
} from "../layout-types.ts";
|
||||||
import { type ElementCallError } from "../../utils/errors.ts";
|
import { type ElementCallError } from "../../utils/errors.ts";
|
||||||
import { type ObservableScope } from "../ObservableScope.ts";
|
import { type ObservableScope } from "../ObservableScope.ts";
|
||||||
|
import { createHomeserverConnected$ } from "./localMember/HomeserverConnected.ts";
|
||||||
import {
|
import {
|
||||||
createLocalMembership$,
|
createLocalMembership$,
|
||||||
|
enterRTCSession,
|
||||||
|
LivekitState,
|
||||||
type LocalMemberConnectionState,
|
type LocalMemberConnectionState,
|
||||||
} from "./localMember/LocalMembership.ts";
|
} from "./localMember/LocalMembership.ts";
|
||||||
import { createLocalTransport$ } from "./localMember/LocalTransport.ts";
|
import { createLocalTransport$ } from "./localMember/LocalTransport.ts";
|
||||||
@@ -119,6 +126,8 @@ import {
|
|||||||
createMatrixMemberMetadata$,
|
createMatrixMemberMetadata$,
|
||||||
createRoomMembers$,
|
createRoomMembers$,
|
||||||
} from "./remoteMembers/MatrixMemberMetadata.ts";
|
} from "./remoteMembers/MatrixMemberMetadata.ts";
|
||||||
|
import { Publisher } from "./localMember/Publisher.ts";
|
||||||
|
import { type Connection } from "./remoteMembers/Connection.ts";
|
||||||
|
|
||||||
const logger = rootLogger.getChild("[CallViewModel]");
|
const logger = rootLogger.getChild("[CallViewModel]");
|
||||||
//TODO
|
//TODO
|
||||||
@@ -229,7 +238,7 @@ export interface CallViewModel {
|
|||||||
* This is a fatal error that prevents the call from being created/joined.
|
* This is a fatal error that prevents the call from being created/joined.
|
||||||
* Should render a blocking error screen.
|
* Should render a blocking error screen.
|
||||||
*/
|
*/
|
||||||
configError$: Behavior<ElementCallError | null>;
|
fatalError$: Behavior<ElementCallError | null>;
|
||||||
|
|
||||||
// participants and counts
|
// participants and counts
|
||||||
/**
|
/**
|
||||||
@@ -356,9 +365,9 @@ export function createCallViewModel$(
|
|||||||
reactionsSubject$: Observable<Record<string, ReactionInfo>>,
|
reactionsSubject$: Observable<Record<string, ReactionInfo>>,
|
||||||
trackProcessorState$: Behavior<ProcessorState>,
|
trackProcessorState$: Behavior<ProcessorState>,
|
||||||
): CallViewModel {
|
): CallViewModel {
|
||||||
const userId = matrixRoom.client.getUserId()!;
|
const client = matrixRoom.client;
|
||||||
const deviceId = matrixRoom.client.getDeviceId()!;
|
const userId = client.getUserId()!;
|
||||||
|
const deviceId = client.getDeviceId()!;
|
||||||
const livekitKeyProvider = getE2eeKeyProvider(
|
const livekitKeyProvider = getE2eeKeyProvider(
|
||||||
options.encryptionSystem,
|
options.encryptionSystem,
|
||||||
matrixRTCSession,
|
matrixRTCSession,
|
||||||
@@ -370,8 +379,8 @@ export function createCallViewModel$(
|
|||||||
// For mocking purposes it is recommended to only mock the functions creating those outputs.
|
// For mocking purposes it is recommended to only mock the functions creating those outputs.
|
||||||
// All other fields are just temp computations for the mentioned output.
|
// All other fields are just temp computations for the mentioned output.
|
||||||
// The class does not need anything except the values underneath the bar.
|
// The class does not need anything except the values underneath the bar.
|
||||||
// The creation of the values under the bar are all tested independently and testing the callViewModel Should
|
// The creations of the values under the bar are all tested independently and testing the callViewModel Should
|
||||||
// not test their cretation. Call view model only needs:
|
// not test their creation. Call view model only needs:
|
||||||
// - memberships$ via createMemberships$
|
// - memberships$ via createMemberships$
|
||||||
// - localMembership via createLocalMembership$
|
// - localMembership via createLocalMembership$
|
||||||
// - callLifecycle via createCallNotificationLifecycle$
|
// - callLifecycle via createCallNotificationLifecycle$
|
||||||
@@ -392,7 +401,7 @@ export function createCallViewModel$(
|
|||||||
const localTransport$ = createLocalTransport$({
|
const localTransport$ = createLocalTransport$({
|
||||||
scope: scope,
|
scope: scope,
|
||||||
memberships$: memberships$,
|
memberships$: memberships$,
|
||||||
client: matrixRoom.client,
|
client,
|
||||||
roomId: matrixRoom.roomId,
|
roomId: matrixRoom.roomId,
|
||||||
useOldestMember$: scope.behavior(
|
useOldestMember$: scope.behavior(
|
||||||
matrixRTCMode.value$.pipe(map((v) => v === MatrixRTCMode.Legacy)),
|
matrixRTCMode.value$.pipe(map((v) => v === MatrixRTCMode.Legacy)),
|
||||||
@@ -400,7 +409,7 @@ export function createCallViewModel$(
|
|||||||
});
|
});
|
||||||
|
|
||||||
const connectionFactory = new ECConnectionFactory(
|
const connectionFactory = new ECConnectionFactory(
|
||||||
matrixRoom.client,
|
client,
|
||||||
mediaDevices,
|
mediaDevices,
|
||||||
trackProcessorState$,
|
trackProcessorState$,
|
||||||
livekitKeyProvider,
|
livekitKeyProvider,
|
||||||
@@ -437,7 +446,7 @@ export function createCallViewModel$(
|
|||||||
matrixRTCMode.value$.pipe(
|
matrixRTCMode.value$.pipe(
|
||||||
map((mode) => ({
|
map((mode) => ({
|
||||||
encryptMedia: livekitKeyProvider !== undefined,
|
encryptMedia: livekitKeyProvider !== undefined,
|
||||||
// TODO. This might need to get called again on each cahnge of matrixRTCMode...
|
// TODO. This might need to get called again on each change of matrixRTCMode...
|
||||||
matrixRTCMode: mode,
|
matrixRTCMode: mode,
|
||||||
})),
|
})),
|
||||||
),
|
),
|
||||||
@@ -445,15 +454,31 @@ export function createCallViewModel$(
|
|||||||
|
|
||||||
const localMembership = createLocalMembership$({
|
const localMembership = createLocalMembership$({
|
||||||
scope: scope,
|
scope: scope,
|
||||||
|
homeserverConnected$: createHomeserverConnected$(
|
||||||
|
scope,
|
||||||
|
client,
|
||||||
|
matrixRTCSession,
|
||||||
|
),
|
||||||
muteStates: muteStates,
|
muteStates: muteStates,
|
||||||
mediaDevices: mediaDevices,
|
joinMatrixRTC: async (transport: LivekitTransport) => {
|
||||||
|
return enterRTCSession(
|
||||||
|
matrixRTCSession,
|
||||||
|
transport,
|
||||||
|
connectOptions$.value,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
createPublisherFactory: (connection: Connection) => {
|
||||||
|
return new Publisher(
|
||||||
|
scope,
|
||||||
|
connection,
|
||||||
|
mediaDevices,
|
||||||
|
muteStates,
|
||||||
|
trackProcessorState$,
|
||||||
|
);
|
||||||
|
},
|
||||||
connectionManager: connectionManager,
|
connectionManager: connectionManager,
|
||||||
matrixRTCSession: matrixRTCSession,
|
matrixRTCSession: matrixRTCSession,
|
||||||
matrixRoom: matrixRoom,
|
|
||||||
localTransport$: localTransport$,
|
localTransport$: localTransport$,
|
||||||
trackProcessorState$: trackProcessorState$,
|
|
||||||
widget,
|
|
||||||
options: connectOptions$,
|
|
||||||
logger: logger.getChild(`[${Date.now()}]`),
|
logger: logger.getChild(`[${Date.now()}]`),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -635,7 +660,6 @@ export function createCallViewModel$(
|
|||||||
/**
|
/**
|
||||||
* List of user media (camera feeds) that we want tiles for.
|
* List of user media (camera feeds) that we want tiles for.
|
||||||
*/
|
*/
|
||||||
// TODO this also needs the local participant to be added.
|
|
||||||
const userMedia$ = scope.behavior<UserMedia[]>(
|
const userMedia$ = scope.behavior<UserMedia[]>(
|
||||||
combineLatest([
|
combineLatest([
|
||||||
localMatrixLivekitMember$,
|
localMatrixLivekitMember$,
|
||||||
@@ -1442,7 +1466,14 @@ export function createCallViewModel$(
|
|||||||
hoverScreen: (): void => screenHover$.next(),
|
hoverScreen: (): void => screenHover$.next(),
|
||||||
unhoverScreen: (): void => screenUnhover$.next(),
|
unhoverScreen: (): void => screenUnhover$.next(),
|
||||||
|
|
||||||
configError$: localMembership.configError$,
|
fatalError$: scope.behavior(
|
||||||
|
localMembership.connectionState.livekit$.pipe(
|
||||||
|
filter((v) => v.state === LivekitState.Error),
|
||||||
|
map((s) => s.error),
|
||||||
|
),
|
||||||
|
null,
|
||||||
|
),
|
||||||
|
|
||||||
participantCount$: participantCount$,
|
participantCount$: participantCount$,
|
||||||
audioParticipants$: audioParticipants$,
|
audioParticipants$: audioParticipants$,
|
||||||
|
|
||||||
@@ -1474,8 +1505,6 @@ export function createCallViewModel$(
|
|||||||
reconnecting$: reconnecting$,
|
reconnecting$: reconnecting$,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
// TODO-MULTI-SFU // Setup and update the keyProvider which was create by `createRoom` was a thing before. Now we never update if the E2EEsystem changes
|
|
||||||
// do we need this?
|
|
||||||
|
|
||||||
function getE2eeKeyProvider(
|
function getE2eeKeyProvider(
|
||||||
e2eeSystem: EncryptionSystem,
|
e2eeSystem: EncryptionSystem,
|
||||||
|
|||||||
@@ -0,0 +1,202 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, it, expect, beforeEach, afterEach } from "vitest";
|
||||||
|
import { EventEmitter } from "events";
|
||||||
|
import { ClientEvent, SyncState } from "matrix-js-sdk";
|
||||||
|
import { MembershipManagerEvent, Status } from "matrix-js-sdk/lib/matrixrtc";
|
||||||
|
|
||||||
|
import { ObservableScope } from "../../ObservableScope";
|
||||||
|
import { createHomeserverConnected$ } from "./HomeserverConnected";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Minimal stub of a Matrix client sufficient for our tests:
|
||||||
|
```
|
||||||
|
createHomeserverConnected$(
|
||||||
|
scope: ObservableScope,
|
||||||
|
client: NodeStyleEventEmitter & Pick<MatrixClient, "getSyncState">,
|
||||||
|
matrixRTCSession: NodeStyleEventEmitter &
|
||||||
|
Pick<MatrixRTCSession, "membershipStatus" | "probablyLeft">,
|
||||||
|
)
|
||||||
|
```
|
||||||
|
*/
|
||||||
|
class MockMatrixClient extends EventEmitter {
|
||||||
|
private syncState: SyncState;
|
||||||
|
public constructor(initial: SyncState) {
|
||||||
|
super();
|
||||||
|
this.syncState = initial;
|
||||||
|
}
|
||||||
|
public setSyncState(state: SyncState): void {
|
||||||
|
this.syncState = state;
|
||||||
|
// Matrix's Sync event in createHomeserverConnected$ expects [SyncState]
|
||||||
|
this.emit(ClientEvent.Sync, [state]);
|
||||||
|
}
|
||||||
|
public getSyncState(): SyncState {
|
||||||
|
return this.syncState;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Minimal stub of MatrixRTCSession (membership manager):
|
||||||
|
```
|
||||||
|
createHomeserverConnected$(
|
||||||
|
scope: ObservableScope,
|
||||||
|
client: NodeStyleEventEmitter & Pick<MatrixClient, "getSyncState">,
|
||||||
|
matrixRTCSession: NodeStyleEventEmitter &
|
||||||
|
Pick<MatrixRTCSession, "membershipStatus" | "probablyLeft">,
|
||||||
|
)
|
||||||
|
```
|
||||||
|
*/
|
||||||
|
class MockMatrixRTCSession extends EventEmitter {
|
||||||
|
public membershipStatus: Status;
|
||||||
|
public probablyLeft: boolean;
|
||||||
|
|
||||||
|
public constructor(props: {
|
||||||
|
membershipStatus: Status;
|
||||||
|
probablyLeft: boolean;
|
||||||
|
}) {
|
||||||
|
super();
|
||||||
|
this.membershipStatus = props.membershipStatus;
|
||||||
|
this.probablyLeft = props.probablyLeft;
|
||||||
|
}
|
||||||
|
|
||||||
|
public setMembershipStatus(status: Status): void {
|
||||||
|
this.membershipStatus = status;
|
||||||
|
this.emit(MembershipManagerEvent.StatusChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
public setProbablyLeft(flag: boolean): void {
|
||||||
|
this.probablyLeft = flag;
|
||||||
|
this.emit(MembershipManagerEvent.ProbablyLeft);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("createHomeserverConnected$", () => {
|
||||||
|
let scope: ObservableScope;
|
||||||
|
let client: MockMatrixClient;
|
||||||
|
let session: MockMatrixRTCSession;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
scope = new ObservableScope();
|
||||||
|
client = new MockMatrixClient(SyncState.Error); // start disconnected
|
||||||
|
session = new MockMatrixRTCSession({
|
||||||
|
membershipStatus: Status.Disconnected,
|
||||||
|
probablyLeft: false,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
scope.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
// LLM generated test cases. They are a bit overkill but I improved the mocking so it is
|
||||||
|
// easy enough to read them so I think they can stay.
|
||||||
|
it("is false when sync state is not Syncing", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("remains false while membership status is not Connected even if sync is Syncing", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
expect(hsConnected$.value).toBe(false); // membership still disconnected
|
||||||
|
});
|
||||||
|
|
||||||
|
it("is false when membership status transitions to Connected but ProbablyLeft is true", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
// Make sync loop OK
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
// Indicate probable leave before connection
|
||||||
|
session.setProbablyLeft(true);
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("becomes true only when all three conditions are satisfied", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
// 1. Sync loop connected
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
expect(hsConnected$.value).toBe(false); // not yet membership connected
|
||||||
|
// 2. Membership connected
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(true); // probablyLeft is false
|
||||||
|
});
|
||||||
|
|
||||||
|
it("drops back to false when sync loop leaves Syncing", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
// Reach connected state
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
|
||||||
|
// Sync loop error => should flip false
|
||||||
|
client.setSyncState(SyncState.Error);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("drops back to false when membership status becomes disconnected", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
|
||||||
|
session.setMembershipStatus(Status.Disconnected);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("drops to false when ProbablyLeft is emitted after being true", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
|
||||||
|
session.setProbablyLeft(true);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("recovers to true if ProbablyLeft becomes false again while other conditions remain true", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
|
||||||
|
session.setProbablyLeft(true);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
|
||||||
|
// Simulate clearing the flag (in realistic scenario membership manager would update)
|
||||||
|
session.setProbablyLeft(false);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("composite sequence reflects each individual failure reason", () => {
|
||||||
|
const hsConnected$ = createHomeserverConnected$(scope, client, session);
|
||||||
|
|
||||||
|
// Initially false (sync error + disconnected + not probably left)
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
|
||||||
|
// Fix sync only
|
||||||
|
client.setSyncState(SyncState.Syncing);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
|
||||||
|
// Fix membership
|
||||||
|
session.setMembershipStatus(Status.Connected);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
|
||||||
|
// Introduce probablyLeft -> false
|
||||||
|
session.setProbablyLeft(true);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
|
||||||
|
// Restore notProbablyLeft -> true again
|
||||||
|
session.setProbablyLeft(false);
|
||||||
|
expect(hsConnected$.value).toBe(true);
|
||||||
|
|
||||||
|
// Drop sync -> false
|
||||||
|
client.setSyncState(SyncState.Error);
|
||||||
|
expect(hsConnected$.value).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import {
|
||||||
|
MembershipManagerEvent,
|
||||||
|
Status,
|
||||||
|
type MatrixRTCSession,
|
||||||
|
} from "matrix-js-sdk/lib/matrixrtc";
|
||||||
|
import { ClientEvent, type MatrixClient, SyncState } from "matrix-js-sdk";
|
||||||
|
import { fromEvent, startWith, map, tap, type Observable } from "rxjs";
|
||||||
|
import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
|
||||||
|
|
||||||
|
import { type ObservableScope } from "../../ObservableScope";
|
||||||
|
import { type Behavior } from "../../Behavior";
|
||||||
|
import { and$ } from "../../../utils/observable";
|
||||||
|
import { type NodeStyleEventEmitter } from "../../../utils/test";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Logger instance (scoped child) for homeserver connection updates.
|
||||||
|
*/
|
||||||
|
const logger = rootLogger.getChild("[HomeserverConnected]");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Behavior representing whether we consider ourselves connected to the Matrix homeserver
|
||||||
|
* for the purposes of a MatrixRTC session.
|
||||||
|
*
|
||||||
|
* Becomes FALSE if ANY sub-condition is fulfilled:
|
||||||
|
* 1. Sync loop is not in SyncState.Syncing
|
||||||
|
* 2. membershipStatus !== Status.Connected
|
||||||
|
* 3. probablyLeft === true
|
||||||
|
*/
|
||||||
|
export function createHomeserverConnected$(
|
||||||
|
scope: ObservableScope,
|
||||||
|
client: NodeStyleEventEmitter & Pick<MatrixClient, "getSyncState">,
|
||||||
|
matrixRTCSession: NodeStyleEventEmitter &
|
||||||
|
Pick<MatrixRTCSession, "membershipStatus" | "probablyLeft">,
|
||||||
|
): Behavior<boolean> {
|
||||||
|
const syncing$ = (
|
||||||
|
fromEvent(client, ClientEvent.Sync) as Observable<[SyncState]>
|
||||||
|
).pipe(
|
||||||
|
startWith([client.getSyncState()]),
|
||||||
|
map(([state]) => state === SyncState.Syncing),
|
||||||
|
);
|
||||||
|
|
||||||
|
const membershipConnected$ = fromEvent(
|
||||||
|
matrixRTCSession,
|
||||||
|
MembershipManagerEvent.StatusChanged,
|
||||||
|
).pipe(
|
||||||
|
startWith(null),
|
||||||
|
map(() => matrixRTCSession.membershipStatus === Status.Connected),
|
||||||
|
);
|
||||||
|
|
||||||
|
// This is basically notProbablyLeft$
|
||||||
|
//
|
||||||
|
// probablyLeft is computed by a local timer that mimics the server delayed event.
|
||||||
|
// If we locally predict our server event timed out. We consider ourselves as probablyLeft
|
||||||
|
// even though we might not yet have received the delayed event leave.
|
||||||
|
//
|
||||||
|
// If that is not the case we certainly still have a valid membership on the matrix network
|
||||||
|
// independet if the sync currently works.
|
||||||
|
const certainlyConnected$ = fromEvent(
|
||||||
|
matrixRTCSession,
|
||||||
|
MembershipManagerEvent.ProbablyLeft,
|
||||||
|
).pipe(
|
||||||
|
startWith(null),
|
||||||
|
map(() => matrixRTCSession.probablyLeft !== true),
|
||||||
|
);
|
||||||
|
|
||||||
|
const connectedCombined$ = and$(
|
||||||
|
syncing$,
|
||||||
|
membershipConnected$,
|
||||||
|
certainlyConnected$,
|
||||||
|
).pipe(
|
||||||
|
tap((connected) => {
|
||||||
|
logger.info(`Homeserver connected update: ${connected}`);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
return scope.behavior(connectedCombined$);
|
||||||
|
}
|
||||||
@@ -1,35 +1,44 @@
|
|||||||
/*
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2024 New Vector Ltd.
|
Copyright 2024 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
|
import {
|
||||||
import { expect, test, vi } from "vitest";
|
type LivekitTransport,
|
||||||
|
type MatrixRTCSession,
|
||||||
|
} from "matrix-js-sdk/lib/matrixrtc";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
|
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
|
||||||
import EventEmitter from "events";
|
import { map } from "rxjs";
|
||||||
|
import { logger } from "matrix-js-sdk/lib/logger";
|
||||||
|
|
||||||
import { MatrixRTCMode } from "../../../settings/settings";
|
import { MatrixRTCMode } from "../../../settings/settings";
|
||||||
import { mockConfig } from "../../../utils/test";
|
import {
|
||||||
import { enterRTCSession } from "./LocalMembership";
|
mockConfig,
|
||||||
|
mockMuteStates,
|
||||||
|
withTestScheduler,
|
||||||
|
} from "../../../utils/test";
|
||||||
|
import {
|
||||||
|
createLocalMembership$,
|
||||||
|
enterRTCSession,
|
||||||
|
LivekitState,
|
||||||
|
} from "./LocalMembership";
|
||||||
|
import { MatrixRTCTransportMissingError } from "../../../utils/errors";
|
||||||
|
import { Epoch } from "../../ObservableScope";
|
||||||
|
import { constant } from "../../Behavior";
|
||||||
|
import { ConnectionManagerData } from "../remoteMembers/ConnectionManager";
|
||||||
|
import { type Publisher } from "./Publisher";
|
||||||
|
|
||||||
const MATRIX_RTC_MODE = MatrixRTCMode.Legacy;
|
const MATRIX_RTC_MODE = MatrixRTCMode.Legacy;
|
||||||
const getUrlParams = vi.hoisted(() => vi.fn(() => ({})));
|
const getUrlParams = vi.hoisted(() => vi.fn(() => ({})));
|
||||||
vi.mock("../../../UrlParams", () => ({ getUrlParams }));
|
vi.mock("../../../UrlParams", () => ({ getUrlParams }));
|
||||||
|
|
||||||
vi.mock("../../../widget", async (importOriginal) => ({
|
describe("LocalMembership", () => {
|
||||||
...(await importOriginal()),
|
describe("enterRTCSession", () => {
|
||||||
widget: {
|
it("It joins the correct Session", async () => {
|
||||||
api: {
|
|
||||||
setAlwaysOnScreen: (): void => {},
|
|
||||||
transport: { send: vi.fn(), reply: vi.fn(), stop: vi.fn() },
|
|
||||||
},
|
|
||||||
lazyActions: new EventEmitter(),
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
test("It joins the correct Session", async () => {
|
|
||||||
const focusFromOlderMembership = {
|
const focusFromOlderMembership = {
|
||||||
type: "livekit",
|
type: "livekit",
|
||||||
livekit_service_url: "http://my-oldest-member-service-url.com",
|
livekit_service_url: "http://my-oldest-member-service-url.com",
|
||||||
@@ -112,9 +121,9 @@ test("It joins the correct Session", async () => {
|
|||||||
useLegacyMemberEvents: false,
|
useLegacyMemberEvents: false,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("It should not fail with configuration error if homeserver config has livekit url but not fallback", async () => {
|
it("It should not fail with configuration error if homeserver config has livekit url but not fallback", async () => {
|
||||||
mockConfig({});
|
mockConfig({});
|
||||||
vi.spyOn(AutoDiscovery, "getRawClientConfig").mockResolvedValue({
|
vi.spyOn(AutoDiscovery, "getRawClientConfig").mockResolvedValue({
|
||||||
"org.matrix.msc4143.rtc_foci": [
|
"org.matrix.msc4143.rtc_foci": [
|
||||||
@@ -155,4 +164,66 @@ test("It should not fail with configuration error if homeserver config has livek
|
|||||||
matrixRTCMode: MATRIX_RTC_MODE,
|
matrixRTCMode: MATRIX_RTC_MODE,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const defaultCreateLocalMemberValues = {
|
||||||
|
options: constant({
|
||||||
|
encryptMedia: false,
|
||||||
|
matrixRTCMode: MatrixRTCMode.Matrix_2_0,
|
||||||
|
}),
|
||||||
|
matrixRTCSession: {
|
||||||
|
updateCallIntent: () => {},
|
||||||
|
leaveRoomSession: () => {},
|
||||||
|
} as unknown as MatrixRTCSession,
|
||||||
|
muteStates: mockMuteStates(),
|
||||||
|
isHomeserverConnected: constant(true),
|
||||||
|
trackProcessorState$: constant({
|
||||||
|
supported: false,
|
||||||
|
processor: undefined,
|
||||||
|
}),
|
||||||
|
logger: logger,
|
||||||
|
createPublisherFactory: (): Publisher => ({}) as unknown as Publisher,
|
||||||
|
joinMatrixRTC: async (): Promise<void> => {},
|
||||||
|
homeserverConnected$: constant(true),
|
||||||
|
};
|
||||||
|
|
||||||
|
it("throws error on missing RTC config error", () => {
|
||||||
|
withTestScheduler(({ scope, hot, expectObservable }) => {
|
||||||
|
const goodTransport = {
|
||||||
|
livekit_service_url: "other",
|
||||||
|
} as LivekitTransport;
|
||||||
|
|
||||||
|
const localTransport$ = scope.behavior<LivekitTransport>(
|
||||||
|
hot("1ms #", {}, new MatrixRTCTransportMissingError("domain.com")),
|
||||||
|
goodTransport,
|
||||||
|
);
|
||||||
|
|
||||||
|
const mockConnectionManager = {
|
||||||
|
transports$: scope.behavior(
|
||||||
|
localTransport$.pipe(map((t) => new Epoch([t]))),
|
||||||
|
),
|
||||||
|
connectionManagerData$: constant(
|
||||||
|
new Epoch(new ConnectionManagerData()),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
|
||||||
|
const localMembership = createLocalMembership$({
|
||||||
|
scope,
|
||||||
|
...defaultCreateLocalMemberValues,
|
||||||
|
connectionManager: mockConnectionManager,
|
||||||
|
localTransport$,
|
||||||
|
});
|
||||||
|
|
||||||
|
expectObservable(localMembership.connectionState.livekit$).toBe("ne", {
|
||||||
|
n: { state: LivekitState.Uninitialized },
|
||||||
|
e: {
|
||||||
|
state: LivekitState.Error,
|
||||||
|
error: expect.toSatisfy(
|
||||||
|
(e) => e instanceof MatrixRTCTransportMissingError,
|
||||||
|
),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-IdFentifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-IdFentifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
@@ -10,25 +10,22 @@ import {
|
|||||||
type Participant,
|
type Participant,
|
||||||
ParticipantEvent,
|
ParticipantEvent,
|
||||||
type LocalParticipant,
|
type LocalParticipant,
|
||||||
|
type ScreenShareCaptureOptions,
|
||||||
} from "livekit-client";
|
} from "livekit-client";
|
||||||
import { observeParticipantEvents } from "@livekit/components-core";
|
import { observeParticipantEvents } from "@livekit/components-core";
|
||||||
import {
|
import {
|
||||||
type LivekitTransport,
|
type LivekitTransport,
|
||||||
type MatrixRTCSession,
|
type MatrixRTCSession,
|
||||||
MembershipManagerEvent,
|
|
||||||
Status,
|
|
||||||
} from "matrix-js-sdk/lib/matrixrtc";
|
} from "matrix-js-sdk/lib/matrixrtc";
|
||||||
import { ClientEvent, SyncState, type Room as MatrixRoom } from "matrix-js-sdk";
|
|
||||||
import {
|
import {
|
||||||
BehaviorSubject,
|
BehaviorSubject,
|
||||||
|
catchError,
|
||||||
combineLatest,
|
combineLatest,
|
||||||
distinctUntilChanged,
|
distinctUntilChanged,
|
||||||
fromEvent,
|
|
||||||
map,
|
map,
|
||||||
type Observable,
|
type Observable,
|
||||||
of,
|
of,
|
||||||
scan,
|
scan,
|
||||||
startWith,
|
|
||||||
switchMap,
|
switchMap,
|
||||||
tap,
|
tap,
|
||||||
} from "rxjs";
|
} from "rxjs";
|
||||||
@@ -37,18 +34,11 @@ import { type Logger } from "matrix-js-sdk/lib/logger";
|
|||||||
import { type Behavior } from "../../Behavior";
|
import { type Behavior } from "../../Behavior";
|
||||||
import { type IConnectionManager } from "../remoteMembers/ConnectionManager";
|
import { type IConnectionManager } from "../remoteMembers/ConnectionManager";
|
||||||
import { ObservableScope } from "../../ObservableScope";
|
import { ObservableScope } from "../../ObservableScope";
|
||||||
import { Publisher } from "./Publisher";
|
import { type Publisher } from "./Publisher";
|
||||||
import { type MuteStates } from "../../MuteStates";
|
import { type MuteStates } from "../../MuteStates";
|
||||||
import { type ProcessorState } from "../../../livekit/TrackProcessorContext";
|
|
||||||
import { type MediaDevices } from "../../MediaDevices";
|
|
||||||
import { and$ } from "../../../utils/observable";
|
import { and$ } from "../../../utils/observable";
|
||||||
import { ElementCallError, UnknownCallError } from "../../../utils/errors";
|
import { ElementCallError, UnknownCallError } from "../../../utils/errors";
|
||||||
import {
|
import { ElementWidgetActions, widget } from "../../../widget";
|
||||||
ElementWidgetActions,
|
|
||||||
widget,
|
|
||||||
type WidgetHelpers,
|
|
||||||
} from "../../../widget";
|
|
||||||
import { areLivekitTransportsEqual } from "../remoteMembers/MatrixLivekitMembers";
|
|
||||||
import { getUrlParams } from "../../../UrlParams.ts";
|
import { getUrlParams } from "../../../UrlParams.ts";
|
||||||
import { PosthogAnalytics } from "../../../analytics/PosthogAnalytics.ts";
|
import { PosthogAnalytics } from "../../../analytics/PosthogAnalytics.ts";
|
||||||
import { MatrixRTCMode } from "../../../settings/settings.ts";
|
import { MatrixRTCMode } from "../../../settings/settings.ts";
|
||||||
@@ -68,7 +58,7 @@ export enum LivekitState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type LocalMemberLivekitState =
|
type LocalMemberLivekitState =
|
||||||
| { state: LivekitState.Error; error: string }
|
| { state: LivekitState.Error; error: ElementCallError }
|
||||||
| { state: LivekitState.Connected }
|
| { state: LivekitState.Connected }
|
||||||
| { state: LivekitState.Connecting }
|
| { state: LivekitState.Connecting }
|
||||||
| { state: LivekitState.Uninitialized }
|
| { state: LivekitState.Uninitialized }
|
||||||
@@ -79,12 +69,14 @@ export enum MatrixState {
|
|||||||
Connected = "connected",
|
Connected = "connected",
|
||||||
Disconnected = "disconnected",
|
Disconnected = "disconnected",
|
||||||
Connecting = "connecting",
|
Connecting = "connecting",
|
||||||
|
Error = "Error",
|
||||||
}
|
}
|
||||||
|
|
||||||
type LocalMemberMatrixState =
|
type LocalMemberMatrixState =
|
||||||
| { state: MatrixState.Connected }
|
| { state: MatrixState.Connected }
|
||||||
| { state: MatrixState.Connecting }
|
| { state: MatrixState.Connecting }
|
||||||
| { state: MatrixState.Disconnected };
|
| { state: MatrixState.Disconnected }
|
||||||
|
| { state: MatrixState.Error; error: Error };
|
||||||
|
|
||||||
export interface LocalMemberConnectionState {
|
export interface LocalMemberConnectionState {
|
||||||
livekit$: Behavior<LocalMemberLivekitState>;
|
livekit$: Behavior<LocalMemberLivekitState>;
|
||||||
@@ -102,17 +94,21 @@ export interface LocalMemberConnectionState {
|
|||||||
* - Publisher.publishTracks()
|
* - Publisher.publishTracks()
|
||||||
* - send join state/sticky event
|
* - send join state/sticky event
|
||||||
*/
|
*/
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
options: Behavior<EnterRTCSessionOptions>;
|
// TODO add a comment into some code style readme or file header callviewmodel
|
||||||
|
// that the inputs for those createSomething$() functions should NOT contain any js-sdk objectes
|
||||||
scope: ObservableScope;
|
scope: ObservableScope;
|
||||||
mediaDevices: MediaDevices;
|
|
||||||
muteStates: MuteStates;
|
muteStates: MuteStates;
|
||||||
connectionManager: IConnectionManager;
|
connectionManager: IConnectionManager;
|
||||||
matrixRTCSession: MatrixRTCSession;
|
createPublisherFactory: (connection: Connection) => Publisher;
|
||||||
matrixRoom: MatrixRoom;
|
joinMatrixRTC: (trasnport: LivekitTransport) => Promise<void>;
|
||||||
|
homeserverConnected$: Behavior<boolean>;
|
||||||
localTransport$: Behavior<LivekitTransport | null>;
|
localTransport$: Behavior<LivekitTransport | null>;
|
||||||
trackProcessorState$: Behavior<ProcessorState>;
|
matrixRTCSession: Pick<
|
||||||
widget: WidgetHelpers | null;
|
MatrixRTCSession,
|
||||||
|
"updateCallIntent" | "leaveRoomSession"
|
||||||
|
>;
|
||||||
logger: Logger;
|
logger: Logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,18 +127,15 @@ interface Props {
|
|||||||
*/
|
*/
|
||||||
export const createLocalMembership$ = ({
|
export const createLocalMembership$ = ({
|
||||||
scope,
|
scope,
|
||||||
options,
|
|
||||||
muteStates,
|
|
||||||
mediaDevices,
|
|
||||||
connectionManager,
|
connectionManager,
|
||||||
matrixRTCSession,
|
localTransport$: localTransportCanThrow$,
|
||||||
localTransport$,
|
homeserverConnected$,
|
||||||
matrixRoom,
|
createPublisherFactory,
|
||||||
trackProcessorState$,
|
joinMatrixRTC,
|
||||||
widget,
|
|
||||||
logger: parentLogger,
|
logger: parentLogger,
|
||||||
|
muteStates,
|
||||||
|
matrixRTCSession,
|
||||||
}: Props): {
|
}: Props): {
|
||||||
// publisher: Publisher
|
|
||||||
requestConnect: () => LocalMemberConnectionState;
|
requestConnect: () => LocalMemberConnectionState;
|
||||||
startTracks: () => Behavior<LocalTrack[]>;
|
startTracks: () => Behavior<LocalTrack[]>;
|
||||||
requestDisconnect: () => Observable<LocalMemberLivekitState> | null;
|
requestDisconnect: () => Observable<LocalMemberLivekitState> | null;
|
||||||
@@ -154,17 +147,13 @@ export const createLocalMembership$ = ({
|
|||||||
toggleScreenSharing: (() => void) | null;
|
toggleScreenSharing: (() => void) | null;
|
||||||
participant$: Behavior<LocalParticipant | null>;
|
participant$: Behavior<LocalParticipant | null>;
|
||||||
connection$: Behavior<Connection | null>;
|
connection$: Behavior<Connection | null>;
|
||||||
// deprecated fields
|
|
||||||
/** @deprecated use state instead*/
|
|
||||||
homeserverConnected$: Behavior<boolean>;
|
homeserverConnected$: Behavior<boolean>;
|
||||||
|
// deprecated fields
|
||||||
/** @deprecated use state instead*/
|
/** @deprecated use state instead*/
|
||||||
connected$: Behavior<boolean>;
|
connected$: Behavior<boolean>;
|
||||||
// this needs to be discussed
|
// this needs to be discussed
|
||||||
/** @deprecated use state instead*/
|
/** @deprecated use state instead*/
|
||||||
reconnecting$: Behavior<boolean>;
|
reconnecting$: Behavior<boolean>;
|
||||||
// also needs to be disccues
|
|
||||||
/** @deprecated use state instead*/
|
|
||||||
configError$: Behavior<ElementCallError | null>;
|
|
||||||
} => {
|
} => {
|
||||||
const logger = parentLogger.getChild("[LocalMembership]");
|
const logger = parentLogger.getChild("[LocalMembership]");
|
||||||
logger.debug(`Creating local membership..`);
|
logger.debug(`Creating local membership..`);
|
||||||
@@ -188,18 +177,38 @@ export const createLocalMembership$ = ({
|
|||||||
// This should be used in a combineLatest with publisher$ to connect.
|
// This should be used in a combineLatest with publisher$ to connect.
|
||||||
const tracks$ = new BehaviorSubject<LocalTrack[]>([]);
|
const tracks$ = new BehaviorSubject<LocalTrack[]>([]);
|
||||||
|
|
||||||
|
// unwrap the local transport and set the state of the LocalMembership to error in case the transport is an error.
|
||||||
|
const localTransport$ = scope.behavior(
|
||||||
|
localTransportCanThrow$.pipe(
|
||||||
|
catchError((e: unknown) => {
|
||||||
|
let error: ElementCallError;
|
||||||
|
if (e instanceof ElementCallError) {
|
||||||
|
error = e;
|
||||||
|
} else {
|
||||||
|
error = new UnknownCallError(
|
||||||
|
e instanceof Error
|
||||||
|
? e
|
||||||
|
: new Error("Unknown error from localTransport"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
state.livekit$.next({ state: LivekitState.Error, error });
|
||||||
|
return of(null);
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
// Drop Epoch data here since we will not combine this anymore
|
// Drop Epoch data here since we will not combine this anymore
|
||||||
const localConnection$ = scope.behavior(
|
const localConnection$ = scope.behavior(
|
||||||
combineLatest([connectionManager.connections$, localTransport$]).pipe(
|
combineLatest([
|
||||||
map(([connections, localTransport]) => {
|
connectionManager.connectionManagerData$,
|
||||||
|
localTransport$,
|
||||||
|
]).pipe(
|
||||||
|
map(([connectionData, localTransport]) => {
|
||||||
if (localTransport === null) {
|
if (localTransport === null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return (
|
|
||||||
connections.value.find((connection) =>
|
return connectionData.value.getConnectionForTransport(localTransport);
|
||||||
areLivekitTransportsEqual(connection.transport, localTransport),
|
|
||||||
) ?? null
|
|
||||||
);
|
|
||||||
}),
|
}),
|
||||||
tap((connection) => {
|
tap((connection) => {
|
||||||
logger.info(
|
logger.info(
|
||||||
@@ -208,40 +217,6 @@ export const createLocalMembership$ = ({
|
|||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
/**
|
|
||||||
* Whether we are connected to the MatrixRTC session.
|
|
||||||
*/
|
|
||||||
const homeserverConnected$ = scope.behavior(
|
|
||||||
// To consider ourselves connected to MatrixRTC, we check the following:
|
|
||||||
and$(
|
|
||||||
// The client is connected to the sync loop
|
|
||||||
(
|
|
||||||
fromEvent(matrixRoom.client, ClientEvent.Sync) as Observable<
|
|
||||||
[SyncState]
|
|
||||||
>
|
|
||||||
).pipe(
|
|
||||||
startWith([matrixRoom.client.getSyncState()]),
|
|
||||||
map(([state]) => state === SyncState.Syncing),
|
|
||||||
),
|
|
||||||
// Room state observed by session says we're connected
|
|
||||||
fromEvent(matrixRTCSession, MembershipManagerEvent.StatusChanged).pipe(
|
|
||||||
startWith(null),
|
|
||||||
map(() => matrixRTCSession.membershipStatus === Status.Connected),
|
|
||||||
),
|
|
||||||
// Also watch out for warnings that we've likely hit a timeout and our
|
|
||||||
// delayed leave event is being sent (this condition is here because it
|
|
||||||
// provides an earlier warning than the sync loop timeout, and we wouldn't
|
|
||||||
// see the actual leave event until we reconnect to the sync loop)
|
|
||||||
fromEvent(matrixRTCSession, MembershipManagerEvent.ProbablyLeft).pipe(
|
|
||||||
startWith(null),
|
|
||||||
map(() => matrixRTCSession.probablyLeft !== true),
|
|
||||||
),
|
|
||||||
).pipe(
|
|
||||||
tap((connected) => {
|
|
||||||
logger.info(`Homeserver connected update: ${connected}`);
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
// * Whether we are "fully" connected to the call. Accounts for both the
|
// * Whether we are "fully" connected to the call. Accounts for both the
|
||||||
@@ -262,21 +237,18 @@ export const createLocalMembership$ = ({
|
|||||||
);
|
);
|
||||||
|
|
||||||
const publisher$ = new BehaviorSubject<Publisher | null>(null);
|
const publisher$ = new BehaviorSubject<Publisher | null>(null);
|
||||||
localConnection$.subscribe((connection) => {
|
localConnection$.pipe(scope.bind()).subscribe((connection) => {
|
||||||
if (connection !== null && publisher$.value === null) {
|
if (connection !== null && publisher$.value === null) {
|
||||||
// TODO looks strange to not change publisher if connection changes.
|
// TODO looks strange to not change publisher if connection changes.
|
||||||
publisher$.next(
|
// @toger5 will take care of this!
|
||||||
new Publisher(
|
publisher$.next(createPublisherFactory(connection));
|
||||||
scope,
|
|
||||||
connection,
|
|
||||||
mediaDevices,
|
|
||||||
muteStates,
|
|
||||||
trackProcessorState$,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// const mutestate= publisher$.pipe(switchMap((publisher) => {
|
||||||
|
// return publisher.muteState$
|
||||||
|
// });
|
||||||
|
|
||||||
combineLatest([publisher$, trackStartRequested$]).subscribe(
|
combineLatest([publisher$, trackStartRequested$]).subscribe(
|
||||||
([publisher, shouldStartTracks]) => {
|
([publisher, shouldStartTracks]) => {
|
||||||
if (publisher && shouldStartTracks) {
|
if (publisher && shouldStartTracks) {
|
||||||
@@ -339,7 +311,7 @@ export const createLocalMembership$ = ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
combineLatest([localTransport$, connectRequested$]).subscribe(
|
combineLatest([localTransport$, connectRequested$]).subscribe(
|
||||||
// TODO reconnect on options change.
|
// TODO reconnect when transport changes => create test.
|
||||||
([transport, connectRequested]) => {
|
([transport, connectRequested]) => {
|
||||||
if (
|
if (
|
||||||
transport === null ||
|
transport === null ||
|
||||||
@@ -359,13 +331,20 @@ export const createLocalMembership$ = ({
|
|||||||
}
|
}
|
||||||
state.matrix$.next({ state: MatrixState.Connecting });
|
state.matrix$.next({ state: MatrixState.Connecting });
|
||||||
logger.info("Matrix State connecting");
|
logger.info("Matrix State connecting");
|
||||||
enterRTCSession(matrixRTCSession, transport, options.value).catch(
|
|
||||||
(error) => {
|
joinMatrixRTC(transport).catch((error) => {
|
||||||
logger.error(error);
|
logger.error(error);
|
||||||
|
state.matrix$.next({ state: MatrixState.Error, error });
|
||||||
|
});
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
|
||||||
);
|
// TODO add this and update `state.matrix$` based on it.
|
||||||
|
// useTypedEventEmitter(
|
||||||
|
// rtcSession,
|
||||||
|
// MatrixRTCSessionEvent.MembershipManagerError,
|
||||||
|
// (error) => setExternalError(new ConnectionLostError()),
|
||||||
|
// );
|
||||||
|
|
||||||
const requestConnect = (): LocalMemberConnectionState => {
|
const requestConnect = (): LocalMemberConnectionState => {
|
||||||
trackStartRequested$.next(true);
|
trackStartRequested$.next(true);
|
||||||
@@ -440,18 +419,25 @@ export const createLocalMembership$ = ({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
// TODO: Refactor updateCallIntent to sth like this:
|
||||||
|
// combineLatest([muteStates.video.enabled$,localTransport$, state.matrix$]).pipe(map(()=>{
|
||||||
|
// matrixRTCSession.updateCallIntent(videoEnabled ? "video" : "audio"),
|
||||||
|
// }))
|
||||||
|
//
|
||||||
|
|
||||||
const configError$ = new BehaviorSubject<ElementCallError | null>(null);
|
|
||||||
// TODO I do not fully understand what this does.
|
// TODO I do not fully understand what this does.
|
||||||
// Is it needed?
|
// Is it needed?
|
||||||
// Is this at the right place?
|
// Is this at the right place?
|
||||||
// Can this be simplified?
|
// Can this be simplified?
|
||||||
// Start and stop session membership as needed
|
// Start and stop session membership as needed
|
||||||
scope.reconcile(localTransport$, async (advertised) => {
|
// Discussed in statndup -> It seems we can remove this (there is another call to enterRTCSession in this file)
|
||||||
if (advertised !== null && advertised !== undefined) {
|
// MAKE SURE TO UNDERSTAND why reconcile is needed and what is potentially missing from the alternative enterRTCSession block.
|
||||||
|
// @toger5 will try to take care of this.
|
||||||
|
scope.reconcile(localTransport$, async (transport) => {
|
||||||
|
if (transport !== null && transport !== undefined) {
|
||||||
try {
|
try {
|
||||||
await enterRTCSession(matrixRTCSession, advertised, options.value);
|
state.matrix$.next({ state: MatrixState.Connecting });
|
||||||
configError$.next(null);
|
await joinMatrixRTC(transport);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logger.error("Error entering RTC session", e);
|
logger.error("Error entering RTC session", e);
|
||||||
}
|
}
|
||||||
@@ -493,14 +479,13 @@ export const createLocalMembership$ = ({
|
|||||||
return s.error instanceof ElementCallError
|
return s.error instanceof ElementCallError
|
||||||
? s.error
|
? s.error
|
||||||
: new UnknownCallError(s.error);
|
: new UnknownCallError(s.error);
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
scope.bind(),
|
scope.bind(),
|
||||||
)
|
)
|
||||||
.subscribe((fatalError) => {
|
.subscribe((error) => {
|
||||||
configError$.next(fatalError);
|
if (error !== undefined)
|
||||||
|
state.livekit$.next({ state: LivekitState.Error, error });
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -509,17 +494,31 @@ export const createLocalMembership$ = ({
|
|||||||
const sharingScreen$ = scope.behavior(
|
const sharingScreen$ = scope.behavior(
|
||||||
localConnection$.pipe(
|
localConnection$.pipe(
|
||||||
switchMap((c) =>
|
switchMap((c) =>
|
||||||
c === null
|
c !== null
|
||||||
? of(false)
|
? observeSharingScreen$(c.livekitRoom.localParticipant)
|
||||||
: observeSharingScreen$(c.livekitRoom.localParticipant),
|
: of(false),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
const toggleScreenSharing =
|
let toggleScreenSharing = null;
|
||||||
|
if (
|
||||||
"getDisplayMedia" in (navigator.mediaDevices ?? {}) &&
|
"getDisplayMedia" in (navigator.mediaDevices ?? {}) &&
|
||||||
!getUrlParams().hideScreensharing
|
!getUrlParams().hideScreensharing
|
||||||
? (): void =>
|
) {
|
||||||
|
toggleScreenSharing = (): void => {
|
||||||
|
const screenshareSettings: ScreenShareCaptureOptions = {
|
||||||
|
audio: true,
|
||||||
|
selfBrowserSurface: "include",
|
||||||
|
surfaceSwitching: "include",
|
||||||
|
systemAudio: "include",
|
||||||
|
};
|
||||||
|
const targetScreenshareState = !sharingScreen$.value;
|
||||||
|
logger.info(
|
||||||
|
`toggleScreenSharing called. Switching ${
|
||||||
|
targetScreenshareState ? "On" : "Off"
|
||||||
|
}`,
|
||||||
|
);
|
||||||
// If a connection is ready, toggle screen sharing.
|
// If a connection is ready, toggle screen sharing.
|
||||||
// We deliberately do nothing in the case of a null connection because
|
// We deliberately do nothing in the case of a null connection because
|
||||||
// it looks nice for the call control buttons to all become available
|
// it looks nice for the call control buttons to all become available
|
||||||
@@ -528,18 +527,14 @@ export const createLocalMembership$ = ({
|
|||||||
// We also allow screen sharing to be toggled even if the connection
|
// We also allow screen sharing to be toggled even if the connection
|
||||||
// is still initializing or publishing tracks, because there's no
|
// is still initializing or publishing tracks, because there's no
|
||||||
// technical reason to disallow this. LiveKit will publish if it can.
|
// technical reason to disallow this. LiveKit will publish if it can.
|
||||||
void localConnection$.value?.livekitRoom.localParticipant
|
localConnection$.value?.livekitRoom.localParticipant
|
||||||
.setScreenShareEnabled(!sharingScreen$.value, {
|
.setScreenShareEnabled(targetScreenshareState, screenshareSettings)
|
||||||
audio: true,
|
.catch(logger.error);
|
||||||
selfBrowserSurface: "include",
|
};
|
||||||
surfaceSwitching: "include",
|
}
|
||||||
systemAudio: "include",
|
|
||||||
})
|
|
||||||
.catch(logger.error)
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const participant$ = scope.behavior(
|
const participant$ = scope.behavior(
|
||||||
localConnection$.pipe(map((c) => c?.livekitRoom.localParticipant ?? null)),
|
localConnection$.pipe(map((c) => c?.livekitRoom?.localParticipant ?? null)),
|
||||||
);
|
);
|
||||||
return {
|
return {
|
||||||
startTracks,
|
startTracks,
|
||||||
@@ -549,7 +544,7 @@ export const createLocalMembership$ = ({
|
|||||||
homeserverConnected$,
|
homeserverConnected$,
|
||||||
connected$,
|
connected$,
|
||||||
reconnecting$,
|
reconnecting$,
|
||||||
configError$,
|
|
||||||
sharingScreen$,
|
sharingScreen$,
|
||||||
toggleScreenSharing,
|
toggleScreenSharing,
|
||||||
participant$,
|
participant$,
|
||||||
@@ -573,7 +568,12 @@ interface EnterRTCSessionOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO! document this function properly
|
* Does the necessary steps to enter the RTC session on the matrix side:
|
||||||
|
* - Preparing the membership info (FOCUS to use, options)
|
||||||
|
* - Sends the matrix event to join the call, and starts the membership manager:
|
||||||
|
* - Delay events management
|
||||||
|
* - Handles retries (fails only after several attempts)
|
||||||
|
*
|
||||||
* @param rtcSession
|
* @param rtcSession
|
||||||
* @param transport
|
* @param transport
|
||||||
* @param options
|
* @param options
|
||||||
@@ -598,6 +598,7 @@ export async function enterRTCSession(
|
|||||||
const { sendNotificationType: notificationType, callIntent } = getUrlParams();
|
const { sendNotificationType: notificationType, callIntent } = getUrlParams();
|
||||||
const multiSFU = matrixRTCMode !== MatrixRTCMode.Legacy;
|
const multiSFU = matrixRTCMode !== MatrixRTCMode.Legacy;
|
||||||
// Multi-sfu does not need a preferred foci list. just the focus that is actually used.
|
// Multi-sfu does not need a preferred foci list. just the focus that is actually used.
|
||||||
|
// TODO where/how do we track errors originating from the ongoing rtcSession?
|
||||||
rtcSession.joinRoomSession(
|
rtcSession.joinRoomSession(
|
||||||
multiSFU ? [] : [transport],
|
multiSFU ? [] : [transport],
|
||||||
multiSFU ? transport : undefined,
|
multiSFU ? transport : undefined,
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
Please see LICENSE in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { type CallMembership } from "matrix-js-sdk/lib/matrixrtc";
|
||||||
|
|
||||||
|
import { mockConfig, flushPromises } from "../../../utils/test";
|
||||||
|
import { createLocalTransport$ } from "./LocalTransport";
|
||||||
|
import { constant } from "../../Behavior";
|
||||||
|
import { Epoch, ObservableScope } from "../../ObservableScope";
|
||||||
|
import {
|
||||||
|
MatrixRTCTransportMissingError,
|
||||||
|
FailToGetOpenIdToken,
|
||||||
|
} from "../../../utils/errors";
|
||||||
|
import * as openIDSFU from "../../../livekit/openIDSFU";
|
||||||
|
|
||||||
|
describe("LocalTransport", () => {
|
||||||
|
let scope: ObservableScope;
|
||||||
|
beforeEach(() => (scope = new ObservableScope()));
|
||||||
|
afterEach(() => scope.end());
|
||||||
|
|
||||||
|
it("throws if config is missing", async () => {
|
||||||
|
const localTransport$ = createLocalTransport$({
|
||||||
|
scope,
|
||||||
|
roomId: "!room:example.org",
|
||||||
|
useOldestMember$: constant(false),
|
||||||
|
memberships$: constant(new Epoch<CallMembership[]>([])),
|
||||||
|
client: {
|
||||||
|
getDomain: () => "",
|
||||||
|
// These won't be called in this error path but satisfy the type
|
||||||
|
getOpenIdToken: vi.fn(),
|
||||||
|
getDeviceId: vi.fn(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
expect(() => localTransport$.value).toThrow(
|
||||||
|
new MatrixRTCTransportMissingError(""),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws FailToGetOpenIdToken when OpenID fetch fails", async () => {
|
||||||
|
// Provide a valid config so makeTransportInternal resolves a transport
|
||||||
|
const scope = new ObservableScope();
|
||||||
|
mockConfig({
|
||||||
|
livekit: { livekit_service_url: "https://lk.example.org" },
|
||||||
|
});
|
||||||
|
const resolver = Promise.withResolvers<void>();
|
||||||
|
vi.spyOn(openIDSFU, "getSFUConfigWithOpenID").mockImplementation(
|
||||||
|
async () => {
|
||||||
|
await resolver.promise;
|
||||||
|
throw new FailToGetOpenIdToken(new Error("no openid"));
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const observations: unknown[] = [];
|
||||||
|
const errors: Error[] = [];
|
||||||
|
const localTransport$ = createLocalTransport$({
|
||||||
|
scope,
|
||||||
|
roomId: "!room:example.org",
|
||||||
|
useOldestMember$: constant(false),
|
||||||
|
memberships$: constant(new Epoch<CallMembership[]>([])),
|
||||||
|
client: {
|
||||||
|
// Use empty domain to skip .well-known and use config directly
|
||||||
|
getDomain: () => "",
|
||||||
|
getOpenIdToken: vi.fn(),
|
||||||
|
getDeviceId: vi.fn(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
localTransport$.subscribe(
|
||||||
|
(o) => observations.push(o),
|
||||||
|
(e) => errors.push(e),
|
||||||
|
);
|
||||||
|
resolver.resolve();
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
const expectedError = new FailToGetOpenIdToken(new Error("no openid"));
|
||||||
|
expect(observations).toStrictEqual([null]);
|
||||||
|
expect(errors).toStrictEqual([expectedError]);
|
||||||
|
expect(() => localTransport$.value).toThrow(expectedError);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("emits preferred transport after OpenID resolves", async () => {
|
||||||
|
// Use config so transport discovery succeeds, but delay OpenID JWT fetch
|
||||||
|
mockConfig({
|
||||||
|
livekit: { livekit_service_url: "https://lk.example.org" },
|
||||||
|
});
|
||||||
|
|
||||||
|
const openIdResolver = Promise.withResolvers<openIDSFU.SFUConfig>();
|
||||||
|
|
||||||
|
vi.spyOn(openIDSFU, "getSFUConfigWithOpenID").mockReturnValue(
|
||||||
|
openIdResolver.promise,
|
||||||
|
);
|
||||||
|
|
||||||
|
const localTransport$ = createLocalTransport$({
|
||||||
|
scope,
|
||||||
|
roomId: "!room:example.org",
|
||||||
|
useOldestMember$: constant(false),
|
||||||
|
memberships$: constant(new Epoch<CallMembership[]>([])),
|
||||||
|
client: {
|
||||||
|
getDomain: () => "",
|
||||||
|
getOpenIdToken: vi.fn(),
|
||||||
|
getDeviceId: vi.fn(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
openIdResolver.resolve?.({ url: "https://lk.example.org", jwt: "jwt" });
|
||||||
|
expect(localTransport$.value).toBe(null);
|
||||||
|
await flushPromises();
|
||||||
|
// final
|
||||||
|
expect(localTransport$.value).toStrictEqual({
|
||||||
|
livekit_alias: "!room:example.org",
|
||||||
|
livekit_service_url: "https://lk.example.org",
|
||||||
|
type: "livekit",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-IdFentifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-IdFentifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
@@ -13,32 +13,39 @@ import {
|
|||||||
isLivekitTransportConfig,
|
isLivekitTransportConfig,
|
||||||
} from "matrix-js-sdk/lib/matrixrtc";
|
} from "matrix-js-sdk/lib/matrixrtc";
|
||||||
import { type MatrixClient } from "matrix-js-sdk";
|
import { type MatrixClient } from "matrix-js-sdk";
|
||||||
import { combineLatest, distinctUntilChanged, first, from, map } from "rxjs";
|
import {
|
||||||
import { logger } from "matrix-js-sdk/lib/logger";
|
combineLatest,
|
||||||
|
distinctUntilChanged,
|
||||||
|
first,
|
||||||
|
from,
|
||||||
|
map,
|
||||||
|
switchMap,
|
||||||
|
} from "rxjs";
|
||||||
|
import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
|
||||||
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
|
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
|
||||||
|
|
||||||
import { type Behavior } from "../../Behavior.ts";
|
import { type Behavior } from "../../Behavior.ts";
|
||||||
import { type Epoch, type ObservableScope } from "../../ObservableScope.ts";
|
import { type Epoch, type ObservableScope } from "../../ObservableScope.ts";
|
||||||
import { Config } from "../../../config/Config.ts";
|
import { Config } from "../../../config/Config.ts";
|
||||||
import { MatrixRTCTransportMissingError } from "../../../utils/errors.ts";
|
import { MatrixRTCTransportMissingError } from "../../../utils/errors.ts";
|
||||||
import { getSFUConfigWithOpenID } from "../../../livekit/openIDSFU.ts";
|
import {
|
||||||
|
getSFUConfigWithOpenID,
|
||||||
|
type OpenIDClientParts,
|
||||||
|
} from "../../../livekit/openIDSFU.ts";
|
||||||
import { areLivekitTransportsEqual } from "../remoteMembers/MatrixLivekitMembers.ts";
|
import { areLivekitTransportsEqual } from "../remoteMembers/MatrixLivekitMembers.ts";
|
||||||
|
import { customLivekitUrl } from "../../../settings/settings.ts";
|
||||||
|
|
||||||
|
const logger = rootLogger.getChild("[LocalTransport]");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* - get well known
|
* It figures out “which LiveKit focus URL/alias the local user should use,”
|
||||||
* - get oldest membership
|
* optionally aligning with the oldest member, and ensures the SFU path is primed
|
||||||
* - get transport to use
|
* before advertising that choice.
|
||||||
* - get openId + jwt token
|
|
||||||
* - wait for createTrack() call
|
|
||||||
* - create tracks
|
|
||||||
* - wait for join() call
|
|
||||||
* - Publisher.publishTracks()
|
|
||||||
* - send join state/sticky event
|
|
||||||
*/
|
*/
|
||||||
interface Props {
|
interface Props {
|
||||||
scope: ObservableScope;
|
scope: ObservableScope;
|
||||||
memberships$: Behavior<Epoch<CallMembership[]>>;
|
memberships$: Behavior<Epoch<CallMembership[]>>;
|
||||||
client: MatrixClient;
|
client: Pick<MatrixClient, "getDomain"> & OpenIDClientParts;
|
||||||
roomId: string;
|
roomId: string;
|
||||||
useOldestMember$: Behavior<boolean>;
|
useOldestMember$: Behavior<boolean>;
|
||||||
}
|
}
|
||||||
@@ -49,6 +56,8 @@ interface Props {
|
|||||||
*
|
*
|
||||||
* @prop useOldestMember Whether to use the same transport as the oldest member.
|
* @prop useOldestMember Whether to use the same transport as the oldest member.
|
||||||
* This will only update once the first oldest member appears. Will not recompute if the oldest member leaves.
|
* This will only update once the first oldest member appears. Will not recompute if the oldest member leaves.
|
||||||
|
*
|
||||||
|
* @throws MatrixRTCTransportMissingError | FailToGetOpenIdToken
|
||||||
*/
|
*/
|
||||||
export const createLocalTransport$ = ({
|
export const createLocalTransport$ = ({
|
||||||
scope,
|
scope,
|
||||||
@@ -75,16 +84,20 @@ export const createLocalTransport$ = ({
|
|||||||
/**
|
/**
|
||||||
* The transport that we would personally prefer to publish on (if not for the
|
* The transport that we would personally prefer to publish on (if not for the
|
||||||
* transport preferences of others, perhaps).
|
* transport preferences of others, perhaps).
|
||||||
|
*
|
||||||
|
* @throws
|
||||||
*/
|
*/
|
||||||
const preferredTransport$: Behavior<LivekitTransport | null> = scope.behavior(
|
const preferredTransport$: Behavior<LivekitTransport | null> = scope.behavior(
|
||||||
from(makeTransport(client, roomId)),
|
customLivekitUrl.value$.pipe(
|
||||||
|
switchMap((customUrl) => from(makeTransport(client, roomId, customUrl))),
|
||||||
|
),
|
||||||
null,
|
null,
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The transport we should advertise in our MatrixRTC membership.
|
* The chosen transport we should advertise in our MatrixRTC membership.
|
||||||
*/
|
*/
|
||||||
const advertisedTransport$ = scope.behavior(
|
return scope.behavior(
|
||||||
combineLatest([
|
combineLatest([
|
||||||
useOldestMember$,
|
useOldestMember$,
|
||||||
oldestMemberTransport$,
|
oldestMemberTransport$,
|
||||||
@@ -98,82 +111,78 @@ export const createLocalTransport$ = ({
|
|||||||
distinctUntilChanged(areLivekitTransportsEqual),
|
distinctUntilChanged(areLivekitTransportsEqual),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
return advertisedTransport$;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const FOCI_WK_KEY = "org.matrix.msc4143.rtc_foci";
|
const FOCI_WK_KEY = "org.matrix.msc4143.rtc_foci";
|
||||||
|
|
||||||
async function makeTransportInternal(
|
/**
|
||||||
client: MatrixClient,
|
*
|
||||||
|
* @param client
|
||||||
|
* @param roomId
|
||||||
|
* @returns
|
||||||
|
* @throws MatrixRTCTransportMissingError | FailToGetOpenIdToken
|
||||||
|
*/
|
||||||
|
async function makeTransport(
|
||||||
|
client: Pick<MatrixClient, "getDomain"> & OpenIDClientParts,
|
||||||
roomId: string,
|
roomId: string,
|
||||||
|
urlFromDevSettings: string | null,
|
||||||
): Promise<LivekitTransport> {
|
): Promise<LivekitTransport> {
|
||||||
logger.log("Searching for a preferred transport");
|
let transport: LivekitTransport | undefined;
|
||||||
|
logger.trace("Searching for a preferred transport");
|
||||||
//TODO refactor this to use the jwt service returned alias.
|
//TODO refactor this to use the jwt service returned alias.
|
||||||
const livekitAlias = roomId;
|
const livekitAlias = roomId;
|
||||||
// TODO-MULTI-SFU: Either remove this dev tool or make it more official
|
|
||||||
const urlFromStorage =
|
// DEVTOOL: Highest priority: Load from devtool setting
|
||||||
localStorage.getItem("robin-matrixrtc-auth") ??
|
if (urlFromDevSettings !== null) {
|
||||||
localStorage.getItem("timo-focus-url");
|
|
||||||
if (urlFromStorage !== null) {
|
|
||||||
const transportFromStorage: LivekitTransport = {
|
const transportFromStorage: LivekitTransport = {
|
||||||
type: "livekit",
|
type: "livekit",
|
||||||
livekit_service_url: urlFromStorage,
|
livekit_service_url: urlFromDevSettings,
|
||||||
livekit_alias: livekitAlias,
|
livekit_alias: livekitAlias,
|
||||||
};
|
};
|
||||||
logger.log(
|
logger.info(
|
||||||
"Using LiveKit transport from local storage: ",
|
"Using LiveKit transport from dev tools: ",
|
||||||
transportFromStorage,
|
transportFromStorage,
|
||||||
);
|
);
|
||||||
return transportFromStorage;
|
transport = transportFromStorage;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prioritize the .well-known/matrix/client, if available, over the configured SFU
|
// WELL_KNOWN: Prioritize the .well-known/matrix/client, if available, over the configured SFU
|
||||||
const domain = client.getDomain();
|
const domain = client.getDomain();
|
||||||
if (domain) {
|
if (domain && transport === undefined) {
|
||||||
// we use AutoDiscovery instead of relying on the MatrixClient having already
|
// we use AutoDiscovery instead of relying on the MatrixClient having already
|
||||||
// been fully configured and started
|
// been fully configured and started
|
||||||
const wellKnownFoci = (await AutoDiscovery.getRawClientConfig(domain))?.[
|
const wellKnownFoci = (await AutoDiscovery.getRawClientConfig(domain))?.[
|
||||||
FOCI_WK_KEY
|
FOCI_WK_KEY
|
||||||
];
|
];
|
||||||
if (Array.isArray(wellKnownFoci)) {
|
if (Array.isArray(wellKnownFoci)) {
|
||||||
const transport: LivekitTransportConfig | undefined = wellKnownFoci.find(
|
const wellKnownTransport: LivekitTransportConfig | undefined =
|
||||||
(f) => f && isLivekitTransportConfig(f),
|
wellKnownFoci.find((f) => f && isLivekitTransportConfig(f));
|
||||||
);
|
if (wellKnownTransport !== undefined) {
|
||||||
if (transport !== undefined) {
|
logger.info("Using LiveKit transport from .well-known: ", transport);
|
||||||
logger.log("Using LiveKit transport from .well-known: ", transport);
|
transport = { ...wellKnownTransport, livekit_alias: livekitAlias };
|
||||||
return { ...transport, livekit_alias: livekitAlias };
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CONFIG: Least prioritized; Load from config file
|
||||||
const urlFromConf = Config.get().livekit?.livekit_service_url;
|
const urlFromConf = Config.get().livekit?.livekit_service_url;
|
||||||
if (urlFromConf) {
|
if (urlFromConf && transport === undefined) {
|
||||||
const transportFromConf: LivekitTransport = {
|
const transportFromConf: LivekitTransport = {
|
||||||
type: "livekit",
|
type: "livekit",
|
||||||
livekit_service_url: urlFromConf,
|
livekit_service_url: urlFromConf,
|
||||||
livekit_alias: livekitAlias,
|
livekit_alias: livekitAlias,
|
||||||
};
|
};
|
||||||
logger.log("Using LiveKit transport from config: ", transportFromConf);
|
logger.info("Using LiveKit transport from config: ", transportFromConf);
|
||||||
return transportFromConf;
|
transport = transportFromConf;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new MatrixRTCTransportMissingError(domain ?? "");
|
if (!transport) throw new MatrixRTCTransportMissingError(domain ?? ""); // this will call the jwt/sfu/get endpoint to pre create the livekit room.
|
||||||
}
|
|
||||||
|
|
||||||
async function makeTransport(
|
|
||||||
client: MatrixClient,
|
|
||||||
roomId: string,
|
|
||||||
): Promise<LivekitTransport> {
|
|
||||||
const transport = await makeTransportInternal(client, roomId);
|
|
||||||
// this will call the jwt/sfu/get endpoint to pre create the livekit room.
|
|
||||||
try {
|
|
||||||
await getSFUConfigWithOpenID(
|
await getSFUConfigWithOpenID(
|
||||||
client,
|
client,
|
||||||
transport.livekit_service_url,
|
transport.livekit_service_url,
|
||||||
transport.livekit_alias,
|
transport.livekit_alias,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
|
||||||
logger.warn(`Failed to get SFU config for transport: ${e}`);
|
|
||||||
}
|
|
||||||
return transport;
|
return transport;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 New Vector Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import type { Behavior } from "../../Behavior.ts";
|
|||||||
import type { ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
|
import type { ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
|
||||||
import { defaultLiveKitOptions } from "../../../livekit/options.ts";
|
import { defaultLiveKitOptions } from "../../../livekit/options.ts";
|
||||||
|
|
||||||
|
// TODO evaluate if this should be done like the Publisher Factory
|
||||||
export interface ConnectionFactory {
|
export interface ConnectionFactory {
|
||||||
createConnection(
|
createConnection(
|
||||||
transport: LivekitTransport,
|
transport: LivekitTransport,
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
|
|||||||
import { type Participant as LivekitParticipant } from "livekit-client";
|
import { type Participant as LivekitParticipant } from "livekit-client";
|
||||||
import { logger } from "matrix-js-sdk/lib/logger";
|
import { logger } from "matrix-js-sdk/lib/logger";
|
||||||
|
|
||||||
import { Epoch, ObservableScope } from "../../ObservableScope.ts";
|
import { Epoch, mapEpoch, ObservableScope } from "../../ObservableScope.ts";
|
||||||
import {
|
import {
|
||||||
createConnectionManager$,
|
createConnectionManager$,
|
||||||
type ConnectionManagerData,
|
type ConnectionManagerData,
|
||||||
@@ -73,7 +73,7 @@ afterEach(() => {
|
|||||||
describe("connections$ stream", () => {
|
describe("connections$ stream", () => {
|
||||||
test("Should create and start new connections for each transports", () => {
|
test("Should create and start new connections for each transports", () => {
|
||||||
withTestScheduler(({ behavior, expectObservable }) => {
|
withTestScheduler(({ behavior, expectObservable }) => {
|
||||||
const { connections$ } = createConnectionManager$({
|
const { connectionManagerData$ } = createConnectionManager$({
|
||||||
scope: testScope,
|
scope: testScope,
|
||||||
connectionFactory: fakeConnectionFactory,
|
connectionFactory: fakeConnectionFactory,
|
||||||
inputTransports$: behavior("a", {
|
inputTransports$: behavior("a", {
|
||||||
@@ -82,7 +82,9 @@ describe("connections$ stream", () => {
|
|||||||
logger: logger,
|
logger: logger,
|
||||||
});
|
});
|
||||||
|
|
||||||
expectObservable(connections$).toBe("a", {
|
expectObservable(
|
||||||
|
connectionManagerData$.pipe(mapEpoch((d) => d.getConnections())),
|
||||||
|
).toBe("a", {
|
||||||
a: expect.toSatisfy((e: Epoch<Connection[]>) => {
|
a: expect.toSatisfy((e: Epoch<Connection[]>) => {
|
||||||
const connections = e.value;
|
const connections = e.value;
|
||||||
expect(connections.length).toBe(2);
|
expect(connections.length).toBe(2);
|
||||||
@@ -110,7 +112,7 @@ describe("connections$ stream", () => {
|
|||||||
|
|
||||||
test("Should start connection only once", () => {
|
test("Should start connection only once", () => {
|
||||||
withTestScheduler(({ behavior, expectObservable }) => {
|
withTestScheduler(({ behavior, expectObservable }) => {
|
||||||
const { connections$ } = createConnectionManager$({
|
const { connectionManagerData$ } = createConnectionManager$({
|
||||||
scope: testScope,
|
scope: testScope,
|
||||||
connectionFactory: fakeConnectionFactory,
|
connectionFactory: fakeConnectionFactory,
|
||||||
inputTransports$: behavior("abcdef", {
|
inputTransports$: behavior("abcdef", {
|
||||||
@@ -124,7 +126,9 @@ describe("connections$ stream", () => {
|
|||||||
logger: logger,
|
logger: logger,
|
||||||
});
|
});
|
||||||
|
|
||||||
expectObservable(connections$).toBe("xxxxxa", {
|
expectObservable(
|
||||||
|
connectionManagerData$.pipe(mapEpoch((d) => d.getConnections())),
|
||||||
|
).toBe("xxxxxa", {
|
||||||
x: expect.anything(),
|
x: expect.anything(),
|
||||||
a: expect.toSatisfy((e: Epoch<Connection[]>) => {
|
a: expect.toSatisfy((e: Epoch<Connection[]>) => {
|
||||||
const connections = e.value;
|
const connections = e.value;
|
||||||
@@ -153,7 +157,7 @@ describe("connections$ stream", () => {
|
|||||||
|
|
||||||
test("Should cleanup connections when not needed anymore", () => {
|
test("Should cleanup connections when not needed anymore", () => {
|
||||||
withTestScheduler(({ behavior, expectObservable }) => {
|
withTestScheduler(({ behavior, expectObservable }) => {
|
||||||
const { connections$ } = createConnectionManager$({
|
const { connectionManagerData$ } = createConnectionManager$({
|
||||||
scope: testScope,
|
scope: testScope,
|
||||||
connectionFactory: fakeConnectionFactory,
|
connectionFactory: fakeConnectionFactory,
|
||||||
inputTransports$: behavior("abc", {
|
inputTransports$: behavior("abc", {
|
||||||
@@ -164,7 +168,9 @@ describe("connections$ stream", () => {
|
|||||||
logger: logger,
|
logger: logger,
|
||||||
});
|
});
|
||||||
|
|
||||||
expectObservable(connections$).toBe("xab", {
|
expectObservable(
|
||||||
|
connectionManagerData$.pipe(mapEpoch((d) => d.getConnections())),
|
||||||
|
).toBe("xab", {
|
||||||
x: expect.anything(),
|
x: expect.anything(),
|
||||||
a: expect.toSatisfy((e: Epoch<Connection[]>) => {
|
a: expect.toSatisfy((e: Epoch<Connection[]>) => {
|
||||||
const connections = e.value;
|
const connections = e.value;
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
// TODOs:
|
|
||||||
// - make ConnectionManager its own actual class
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2025 Element Creations Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 New Vector Ltd.
|
||||||
@@ -97,7 +94,6 @@ interface Props {
|
|||||||
export interface IConnectionManager {
|
export interface IConnectionManager {
|
||||||
transports$: Behavior<Epoch<LivekitTransport[]>>;
|
transports$: Behavior<Epoch<LivekitTransport[]>>;
|
||||||
connectionManagerData$: Behavior<Epoch<ConnectionManagerData>>;
|
connectionManagerData$: Behavior<Epoch<ConnectionManagerData>>;
|
||||||
connections$: Behavior<Epoch<Connection[]>>;
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Crete a `ConnectionManager`
|
* Crete a `ConnectionManager`
|
||||||
@@ -220,7 +216,7 @@ export function createConnectionManager$({
|
|||||||
new Epoch(new ConnectionManagerData()),
|
new Epoch(new ConnectionManagerData()),
|
||||||
);
|
);
|
||||||
|
|
||||||
return { transports$, connectionManagerData$, connections$ };
|
return { transports$, connectionManagerData$ };
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeDuplicateTransports(
|
function removeDuplicateTransports(
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ describe("MatrixMemberMetadata", () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO this is a regression, now there the own user is not always in the map. Ask Timo if fine
|
|
||||||
it("should show our own user if present in rtc session and room", () => {
|
it("should show our own user if present in rtc session and room", () => {
|
||||||
withTestScheduler(({ behavior, expectObservable }) => {
|
withTestScheduler(({ behavior, expectObservable }) => {
|
||||||
fakeMemberWith({
|
fakeMemberWith({
|
||||||
@@ -517,7 +516,6 @@ describe("MatrixMemberMetadata", () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO this is a regression, now there the own user is not always in the map. Ask Timo if fine
|
|
||||||
it("should use avatar url from room members", () => {
|
it("should use avatar url from room members", () => {
|
||||||
withTestScheduler(({ behavior, expectObservable }) => {
|
withTestScheduler(({ behavior, expectObservable }) => {
|
||||||
fakeMemberWith({
|
fakeMemberWith({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2025 New Vector Ltd.
|
Copyright 2025 Element Creations Ltd.
|
||||||
|
|
||||||
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
|
|||||||
@@ -79,6 +79,13 @@ export async function flushPromises(): Promise<void> {
|
|||||||
await new Promise<void>((resolve) => window.setTimeout(resolve));
|
await new Promise<void>((resolve) => window.setTimeout(resolve));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type NodeEventHandler = (...args: unknown[]) => void;
|
||||||
|
|
||||||
|
export interface NodeStyleEventEmitter {
|
||||||
|
addListener(eventName: string | symbol, handler: NodeEventHandler): this;
|
||||||
|
removeListener(eventName: string | symbol, handler: NodeEventHandler): this;
|
||||||
|
}
|
||||||
|
|
||||||
export interface OurRunHelpers extends RunHelpers {
|
export interface OurRunHelpers extends RunHelpers {
|
||||||
/**
|
/**
|
||||||
* Schedules a sequence of actions to happen, as described by a marble
|
* Schedules a sequence of actions to happen, as described by a marble
|
||||||
|
|||||||
@@ -2731,37 +2731,39 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@livekit/components-core@npm:0.12.10, @livekit/components-core@npm:^0.12.0":
|
"@livekit/components-core@npm:0.12.11, @livekit/components-core@npm:^0.12.0":
|
||||||
version: 0.12.10
|
version: 0.12.11
|
||||||
resolution: "@livekit/components-core@npm:0.12.10"
|
resolution: "@livekit/components-core@npm:0.12.11"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@floating-ui/dom": "npm:1.6.13"
|
"@floating-ui/dom": "npm:1.6.13"
|
||||||
loglevel: "npm:1.9.1"
|
loglevel: "npm:1.9.1"
|
||||||
rxjs: "npm:7.8.2"
|
rxjs: "npm:7.8.2"
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
livekit-client: ^2.13.3
|
livekit-client: ^2.15.14
|
||||||
tslib: ^2.6.2
|
tslib: ^2.6.2
|
||||||
checksum: 10c0/bfd84fb950f72dd037bd5329658c1e750a8ac6b8f2953ea673e3e944b8ea9d412ef9c98eb8b690052323e03c675964b162aacb00e60530cdc5187f77d21979bd
|
checksum: 10c0/9c2ac3d30bb8cc9067ae0b2049784f81e90e57df9eabf7edbaf3c8ceb65a63f644a4e6abeb6cc38d3ebe52663d8dbb88535e01a965011f365d5ae1f3daf86052
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@livekit/components-react@npm:^2.0.0":
|
"@livekit/components-react@npm:^2.0.0":
|
||||||
version: 2.9.15
|
version: 2.9.16
|
||||||
resolution: "@livekit/components-react@npm:2.9.15"
|
resolution: "@livekit/components-react@npm:2.9.16"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@livekit/components-core": "npm:0.12.10"
|
"@livekit/components-core": "npm:0.12.11"
|
||||||
clsx: "npm:2.1.1"
|
clsx: "npm:2.1.1"
|
||||||
|
events: "npm:^3.3.0"
|
||||||
|
jose: "npm:^6.0.12"
|
||||||
usehooks-ts: "npm:3.1.1"
|
usehooks-ts: "npm:3.1.1"
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
"@livekit/krisp-noise-filter": ^0.2.12 || ^0.3.0
|
"@livekit/krisp-noise-filter": ^0.2.12 || ^0.3.0
|
||||||
livekit-client: ^2.13.3
|
livekit-client: ^2.15.14
|
||||||
react: ">=18"
|
react: ">=18"
|
||||||
react-dom: ">=18"
|
react-dom: ">=18"
|
||||||
tslib: ^2.6.2
|
tslib: ^2.6.2
|
||||||
peerDependenciesMeta:
|
peerDependenciesMeta:
|
||||||
"@livekit/krisp-noise-filter":
|
"@livekit/krisp-noise-filter":
|
||||||
optional: true
|
optional: true
|
||||||
checksum: 10c0/58a93d85c3b8267d0afd00eceb4f34992ce66124f93450e828a78dd825ecc20e254c3123ed22ec33061a3728f50f4f020ff896769fb3a0ff79656ed8cf452a2b
|
checksum: 10c0/4ba4ff473c5a29d3107412733a6676a3b708d70684ed463e9b34cda26abb3d2f317c2828a52e730837b756de9df3fc248260d6f390aedebfb6ec96ef63c7b151
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -5247,12 +5249,12 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@types/node@npm:^22.0.0":
|
"@types/node@npm:^24.0.0":
|
||||||
version: 22.17.0
|
version: 24.10.0
|
||||||
resolution: "@types/node@npm:22.17.0"
|
resolution: "@types/node@npm:24.10.0"
|
||||||
dependencies:
|
dependencies:
|
||||||
undici-types: "npm:~6.21.0"
|
undici-types: "npm:~7.16.0"
|
||||||
checksum: 10c0/e1c603b660d3de3243dfc02ded5d40623ff3f36315ffbdd8cdc81bc2c5a8da172035879d437b72e9fa61ca01827f28e9c2b0c32898f411a8e9ba0a5efac0b4ca
|
checksum: 10c0/f82ed7194e16f5590ef7afdc20c6d09068c76d50278b485ede8f0c5749683536e3064ffa8def8db76915196afb3724b854aa5723c64d6571b890b14492943b46
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -7507,7 +7509,7 @@ __metadata:
|
|||||||
"@types/grecaptcha": "npm:^3.0.9"
|
"@types/grecaptcha": "npm:^3.0.9"
|
||||||
"@types/jsdom": "npm:^21.1.7"
|
"@types/jsdom": "npm:^21.1.7"
|
||||||
"@types/lodash-es": "npm:^4.17.12"
|
"@types/lodash-es": "npm:^4.17.12"
|
||||||
"@types/node": "npm:^22.0.0"
|
"@types/node": "npm:^24.0.0"
|
||||||
"@types/pako": "npm:^2.0.3"
|
"@types/pako": "npm:^2.0.3"
|
||||||
"@types/qrcode": "npm:^1.5.5"
|
"@types/qrcode": "npm:^1.5.5"
|
||||||
"@types/react": "npm:^19.0.0"
|
"@types/react": "npm:^19.0.0"
|
||||||
@@ -9828,6 +9830,13 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"jose@npm:^6.0.12":
|
||||||
|
version: 6.1.2
|
||||||
|
resolution: "jose@npm:6.1.2"
|
||||||
|
checksum: 10c0/55f79426f43e652ed6d5de938d50f66bb0a10dcae078db81a23f8d3303e889ce226f000e815f3211f9956bb84badce10da892d130d40fe2eca658045a6f1778e
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"jose@npm:^6.1.0":
|
"jose@npm:^6.1.0":
|
||||||
version: 6.1.0
|
version: 6.1.0
|
||||||
resolution: "jose@npm:6.1.0"
|
resolution: "jose@npm:6.1.0"
|
||||||
@@ -10110,8 +10119,8 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"livekit-client@npm:^2.13.0":
|
"livekit-client@npm:^2.13.0":
|
||||||
version: 2.15.13
|
version: 2.16.0
|
||||||
resolution: "livekit-client@npm:2.15.13"
|
resolution: "livekit-client@npm:2.16.0"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@livekit/mutex": "npm:1.1.1"
|
"@livekit/mutex": "npm:1.1.1"
|
||||||
"@livekit/protocol": "npm:1.42.2"
|
"@livekit/protocol": "npm:1.42.2"
|
||||||
@@ -10125,7 +10134,7 @@ __metadata:
|
|||||||
webrtc-adapter: "npm:^9.0.1"
|
webrtc-adapter: "npm:^9.0.1"
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
"@types/dom-mediacapture-record": ^1
|
"@types/dom-mediacapture-record": ^1
|
||||||
checksum: 10c0/5a061df9000461a6d40ef8aa1e72e8aedc640181cc57fe6f2c48c5c7f90ce96a735b125aede377fc43f4692a685e098f17eeae0f42c5b2fed473305867bf2789
|
checksum: 10c0/5d03adc5d09efde343ab894db397529dff26117598e773b23a5df90a4fb166bde12c6bb1f2cfd1d28dbaf93fe9f275026d7abb75f2ffd2ba816393a2d58e6c7e
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -13603,10 +13612,10 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"undici-types@npm:~6.21.0":
|
"undici-types@npm:~7.16.0":
|
||||||
version: 6.21.0
|
version: 7.16.0
|
||||||
resolution: "undici-types@npm:6.21.0"
|
resolution: "undici-types@npm:7.16.0"
|
||||||
checksum: 10c0/c01ed51829b10aa72fc3ce64b747f8e74ae9b60eafa19a7b46ef624403508a54c526ffab06a14a26b3120d055e1104d7abe7c9017e83ced038ea5cf52f8d5e04
|
checksum: 10c0/3033e2f2b5c9f1504bdc5934646cb54e37ecaca0f9249c983f7b1fc2e87c6d18399ebb05dc7fd5419e02b2e915f734d872a65da2e3eeed1813951c427d33cc9a
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user