Skip to content

Shorter timeout for delayed event restart https requests #3382

New issue

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

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

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@
"i18next-parser": "^9.1.0",
"jsdom": "^26.0.0",
"knip": "^5.27.2",
"livekit-client": "^2.13.0",
"livekit-client": "2.15.0",
"lodash-es": "^4.17.21",
"loglevel": "^1.9.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#head=develop",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#16e1fc94e03811f6e8c28f1aedbd562198da8f77",
"matrix-widget-api": "^1.13.0",
"normalize.css": "^8.0.1",
"observable-hooks": "^4.2.3",
Expand Down
3 changes: 3 additions & 0 deletions src/rtcSessionHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ export async function enterRTCSession(
makeKeyDelay:
matrixRtcSessionConfig?.wait_for_key_rotation_ms ??
matrixRtcSessionConfig?.key_rotation_on_leave_delay,
// Do not expose the `delayedEventRestartLocalTimeoutMs` property to the config.
// This might be too involved and just decrease the experience of configuring EC.
delayedEventRestartLocalTimeoutMs: 2300,
membershipEventExpiryMs:
matrixRtcSessionConfig?.membership_event_expiry_ms,
useExperimentalToDeviceTransport,
Expand Down
43 changes: 17 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2740,16 +2740,7 @@ __metadata:
languageName: node
linkType: hard

"@livekit/protocol@npm:1.39.2":
version: 1.39.2
resolution: "@livekit/protocol@npm:1.39.2"
dependencies:
"@bufbuild/protobuf": "npm:^1.10.0"
checksum: 10c0/ce5f3ee3ab10ea1578fb40c1d16224879e48143a1bbbfb5e36a080fa5468892eaccfe21aad1166b5443f67e2aa54236facafd4b3235e41b331e91ca405379368
languageName: node
linkType: hard

"@livekit/protocol@npm:^1.38.0":
"@livekit/protocol@npm:1.39.3, @livekit/protocol@npm:^1.38.0":
version: 1.39.3
resolution: "@livekit/protocol@npm:1.39.3"
dependencies:
Expand All @@ -2770,10 +2761,10 @@ __metadata:
languageName: node
linkType: hard

"@matrix-org/matrix-sdk-crypto-wasm@npm:^14.2.0":
version: 14.2.0
resolution: "@matrix-org/matrix-sdk-crypto-wasm@npm:14.2.0"
checksum: 10c0/cc51417d71ffe506401dbb85ff4930bf89b33b6718c9052ba3cc1b2989e989e5e7e6fceea7c5fb58576d64e7a5c947c4cece89dbfa785083d293508c80e0713d
"@matrix-org/matrix-sdk-crypto-wasm@npm:^15.0.0":
version: 15.0.0
resolution: "@matrix-org/matrix-sdk-crypto-wasm@npm:15.0.0"
checksum: 10c0/4db5dc78a0fd4850d95bcc18ba5c6436bf80f7a64cf66569d349687529d44aed4319659c988a106f9446e6aca9af982b59412bb674f151ef52d8ecee7ead6dd4
languageName: node
linkType: hard

Expand Down Expand Up @@ -7510,10 +7501,10 @@ __metadata:
i18next-parser: "npm:^9.1.0"
jsdom: "npm:^26.0.0"
knip: "npm:^5.27.2"
livekit-client: "npm:^2.13.0"
livekit-client: "npm:2.15.0"
lodash-es: "npm:^4.17.21"
loglevel: "npm:^1.9.1"
matrix-js-sdk: "github:matrix-org/matrix-js-sdk#head=develop"
matrix-js-sdk: "github:matrix-org/matrix-js-sdk#16e1fc94e03811f6e8c28f1aedbd562198da8f77"
matrix-widget-api: "npm:^1.13.0"
normalize.css: "npm:^8.0.1"
observable-hooks: "npm:^4.2.3"
Expand Down Expand Up @@ -10021,12 +10012,12 @@ __metadata:
languageName: node
linkType: hard

"livekit-client@npm:^2.13.0":
version: 2.14.0
resolution: "livekit-client@npm:2.14.0"
"livekit-client@npm:2.15.0":
version: 2.15.0
resolution: "livekit-client@npm:2.15.0"
dependencies:
"@livekit/mutex": "npm:1.1.1"
"@livekit/protocol": "npm:1.39.2"
"@livekit/protocol": "npm:1.39.3"
events: "npm:^3.3.0"
loglevel: "npm:^1.9.2"
sdp-transform: "npm:^2.15.0"
Expand All @@ -10036,7 +10027,7 @@ __metadata:
webrtc-adapter: "npm:^9.0.1"
peerDependencies:
"@types/dom-mediacapture-record": ^1
checksum: 10c0/2c3a134c5463fb06f7b5b191329530546cf28309c919f0cfc1fb1b334daa92e8d1ad23dba570d55ee12ad68592871ab18fcab02e784ed340773c84b19619a9ca
checksum: 10c0/e3e6d6463d9664b51fa43e935e72ee80802364de389fb5b07492cf6e518bbd45d00feba974c17fd32762f03eb6c038ec7c675b0ea763342710ad1f3ca2cd1216
languageName: node
linkType: hard

Expand Down Expand Up @@ -10254,12 +10245,12 @@ __metadata:
languageName: node
linkType: hard

"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=develop":
version: 37.8.0
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=adaf92162377414df620e004d8c58c67118490ca"
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#16e1fc94e03811f6e8c28f1aedbd562198da8f77":
version: 37.10.0
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=16e1fc94e03811f6e8c28f1aedbd562198da8f77"
dependencies:
"@babel/runtime": "npm:^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm": "npm:^14.2.0"
"@matrix-org/matrix-sdk-crypto-wasm": "npm:^15.0.0"
another-json: "npm:^0.2.0"
bs58: "npm:^6.0.0"
content-type: "npm:^1.0.4"
Expand All @@ -10272,7 +10263,7 @@ __metadata:
sdp-transform: "npm:^2.14.1"
unhomoglyph: "npm:^1.0.6"
uuid: "npm:11"
checksum: 10c0/8e842056ff926c615d53a4a333c9e54d0fbe7f88b97b55629464e67850cc512606accde6a8724dd48ac82714483f685515913b5556e9824c4d63c443317be1ef
checksum: 10c0/16972eb9ab8270208c633c24138ed72994c7d92811b4a5730fec01bc5a2bca64d75de1f9dccebe94c88278c26648273ef4bec9b251878b10982cd7c5508b568a
languageName: node
linkType: hard

Expand Down