Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
matrix-js-sdk
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Matrix.org
matrix-js-sdk
Commits
c5698935
Commit
c5698935
authored
4 months ago
by
Timo
Browse files
Options
Downloads
Patches
Plain Diff
make LegacyMembershipManger local variables consistent with config
parent
85a27866
Branches
toger5/rename-config-properties
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/matrixrtc/LegacyMembershipManager.ts
+13
-13
13 additions, 13 deletions
src/matrixrtc/LegacyMembershipManager.ts
with
13 additions
and
13 deletions
src/matrixrtc/LegacyMembershipManager.ts
+
13
−
13
View file @
c5698935
...
...
@@ -63,31 +63,31 @@ export class LegacyMembershipManager implements IMembershipManager {
private
updateCallMembershipRunning
=
false
;
private
needCallMembershipUpdate
=
false
;
/**
* If the server disallows the configured {@link
membershipServerSideExpiryTimeout
},
* If the server disallows the configured {@link
delayedLeaveEventDelayMs
},
* this stores a delay that the server does allow.
*/
private
membershipServerSideExpiryTimeout
Override
?:
number
;
private
delayedLeaveEventDelayMs
Override
?:
number
;
private
disconnectDelayId
:
string
|
undefined
;
private
get
callMemberEventRetryDelayMinimum
():
number
{
private
get
networkErrorLocalRetryMs
():
number
{
return
this
.
joinConfig
?.
networkErrorLocalRetryMs
??
this
.
joinConfig
?.
callMemberEventRetryDelayMinimum
??
3
_000
;
}
private
get
membershipE
xpiryTimeout
():
number
{
private
get
membershipE
ventExpiryMs
():
number
{
return
(
this
.
joinConfig
?.
membershipEventExpiryMs
??
this
.
joinConfig
?.
membershipExpiryTimeout
??
DEFAULT_EXPIRE_DURATION
);
}
private
get
membershipServerSideExpiryTimeout
():
number
{
private
get
delayedLeaveEventDelayMs
():
number
{
return
(
this
.
membershipServerSideExpiryTimeout
Override
??
this
.
delayedLeaveEventDelayMs
Override
??
this
.
joinConfig
?.
delayedLeaveEventDelayMs
??
this
.
joinConfig
?.
membershipServerSideExpiryTimeout
??
8
_000
);
}
private
get
membershipKeepAlivePeriod
():
number
{
private
get
delayedLeaveEventRestartMs
():
number
{
return
this
.
joinConfig
?.
delayedLeaveEventRestartMs
??
this
.
joinConfig
?.
membershipKeepAlivePeriod
??
5
_000
;
}
...
...
@@ -138,7 +138,7 @@ export class LegacyMembershipManager implements IMembershipManager {
public
join
(
fociPreferred
:
Focus
[],
fociActive
?:
Focus
):
void
{
this
.
ownFocusActive
=
fociActive
;
this
.
ownFociPreferred
=
fociPreferred
;
this
.
relativeExpiry
=
this
.
membershipE
xpiryTimeout
;
this
.
relativeExpiry
=
this
.
membershipE
ventExpiryMs
;
// We don't wait for this, mostly because it may fail and schedule a retry, so this
// function returning doesn't really mean anything at all.
void
this
.
triggerCallMembershipEventUpdate
();
...
...
@@ -262,7 +262,7 @@ export class LegacyMembershipManager implements IMembershipManager {
this
.
client
.
_unstable_sendDelayedStateEvent
(
this
.
room
.
roomId
,
{
delay
:
this
.
membershipServerSideExpiryTimeout
,
delay
:
this
.
delayedLeaveEventDelayMs
,
},
EventType
.
GroupCallMemberPrefix
,
{},
// leave event
...
...
@@ -279,9 +279,9 @@ export class LegacyMembershipManager implements IMembershipManager {
const
maxDelayAllowed
=
e
.
data
[
"
org.matrix.msc4140.max_delay
"
];
if
(
typeof
maxDelayAllowed
===
"
number
"
&&
this
.
membershipServerSideExpiryTimeout
>
maxDelayAllowed
this
.
delayedLeaveEventDelayMs
>
maxDelayAllowed
)
{
this
.
membershipServerSideExpiryTimeout
Override
=
maxDelayAllowed
;
this
.
delayedLeaveEventDelayMs
Override
=
maxDelayAllowed
;
return
prepareDelayedDisconnection
();
}
}
...
...
@@ -351,7 +351,7 @@ export class LegacyMembershipManager implements IMembershipManager {
}
logger
.
info
(
"
Sent updated call member event.
"
);
}
catch
(
e
)
{
const
resendDelay
=
this
.
callMemberEventRetryDelayMinimum
;
const
resendDelay
=
this
.
networkErrorLocalRetryMs
;
logger
.
warn
(
`Failed to send call member event (retrying in
${
resendDelay
}
):
${
e
}
`
);
await
sleep
(
resendDelay
);
await
this
.
triggerCallMembershipEventUpdate
();
...
...
@@ -359,7 +359,7 @@ export class LegacyMembershipManager implements IMembershipManager {
}
private
scheduleDelayDisconnection
():
void
{
this
.
memberEventTimeout
=
setTimeout
(()
=>
void
this
.
delayDisconnection
(),
this
.
membershipKeepAlivePeriod
);
this
.
memberEventTimeout
=
setTimeout
(()
=>
void
this
.
delayDisconnection
(),
this
.
delayedLeaveEventRestartMs
);
}
private
readonly
delayDisconnection
=
async
():
Promise
<
void
>
=>
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment