Add expire_ts compatibility to matrixRTC #4032
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
toger5
force-pushed
the
toger5/matrix-rtc-expires_at
branch
from
f68a2a0
to
d797ac2
Compare
Signed-off-by: Timo K <[email protected]>
Signed-off-by: Timo K <[email protected]>
fkwp
approved these changes
Jan 26, 2024
src/matrixrtc/CallMembership.ts
Outdated
| const relativeCreationTime = this.parentEvent.getTs() - this.createdTs(); | ||
| if (this.data.expires_ts) { | ||
| // With expires_ts we cannot convert to local time. | ||
| // TODO: Check the server timestamp and compute a diff to local time. |
There was a problem hiding this comment.
do we already have a follow-up ticket for that TODO?
There was a problem hiding this comment.
As discussed I refactored this to use its own class for tracking the server/client diff with unimplmeneted clock sync diffs.
(It actally computes the diff once we get an event with an age property and from that point on its using this offset)
There was a problem hiding this comment.
The refactor is now on a different branch so that we can merge this "low risk"/"lightweight" version.
We will do the server-client-time sync properly here: #4038
| @@ -624,6 +624,9 @@ export class MatrixRTCSession extends TypedEventEmitter<MatrixRTCSessionEvent, M | |||
| }; | |||
|
|
|||
| if (prevMembership) m.created_ts = prevMembership.createdTs(); | |||
| if (m.created_ts) m.expires_ts = m.created_ts + (m.expires ?? 0); | |||
| // TODO: Date.now() should be the origin_server_ts (now). | |||
There was a problem hiding this comment.
do we have the follow-up ticket for that TODO already?
toger5
force-pushed
the
toger5/matrix-rtc-expires_at
branch
from
05de2f0
to
348c37f
Compare
Signed-off-by: Timo K <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currenlty we use a combination of two fields in the Call member state events (
created_ts+expires)We want to move to just use a
expire_ts.This needs rethinking the logic behind syncing clients clocks.
created_tswas mirring theorigin_server_timestampon update.But
expire_tscan only be known when the clock sync is known.Checklist
Here's what your changelog entry will look like:
✨ Features