Skip to content

[_] handle case when self is kicked out but not during login #126

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.

Sign up for GitHub

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

Merged
TamaraFinogina merged 2 commits into from
May 19, 2026
Merged

[_] handle case when self is kicked out but not during login #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3456f51
handle case when self is kicked out but not during login
TamaraFinogina May 19, 2026
1ecaf5a
up the version
TamaraFinogina May 19, 2026
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
8 changes: 8 additions & 0 deletions JitsiConference.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3470,6 +3470,14 @@ export default class JitsiConference extends Listenable {
}

if (isSelfPresence) {
if (!actorParticipant) {
// When meet-server kicks us we need to send the PARTICIPANT_KICKED event, but there is no
// JitsiParticipant object for ourselves so create a minimum fake one.
actorParticipant = {
getDisplayName: () => 'Display Name',
getId: () => kickedParticipantId,
};
}
this.leave().finally(() => this._xmpp.disconnect());
this.eventEmitter.emit(
JitsiConferenceEvents.KICKED, actorParticipant, reason, isReplaceParticipant);
Expand Down
49 changes: 25 additions & 24 deletions modules/e2ee-internxt/ManagedKeyHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ export class ManagedKeyHandler extends Listenable {
e2eeCtx: E2EEContext;
enabled: boolean;
initialized: boolean;
initSessions: Promise<unknown[]>;
initSessions: Promise<unknown[]> | null;
_olmAdapter: OlmAdapter;
_conferenceJoined: boolean;

onUserJoined: EventListener;
onUserLeft: EventListener;
onEndpointMessageReceived: EventListener;
onConferenceJoined: EventListener;
onConferenceLeft: EventListener;
onMediaSessionStarted: EventListener;
onTrackAdded: EventListener;
onRemoteTrackAdded: EventListener;
onTrackMuteChanged: EventListener;
onSasUpdated: EventListener;
onUserJoined: ((id: string) => void) | undefined;
onUserLeft: ((id: string) => void) | undefined;
onEndpointMessageReceived: ((participant: JitsiParticipant, payload: any) => void) | undefined;
onConferenceJoined: (() => void) | undefined;
onConferenceLeft: (() => void) | undefined;
onMediaSessionStarted: ((session: JingleSessionPC) => void) | undefined;
onTrackAdded: ((track: JitsiTrack) => void) | undefined;
onRemoteTrackAdded: ((track: JitsiLocalTrack, tpc: TraceablePeerConnection) => void) | undefined;
onTrackMuteChanged: ((track: JitsiLocalTrack) => void) | undefined;
onSasUpdated: ((sasStr: string) => void) | undefined;

/**
* Build a new AutomaticKeyHandler instance, which will be used in a given conference.
Expand All @@ -83,7 +83,7 @@ export class ManagedKeyHandler extends Listenable {
this.initialized = false;
this.max_wait = REQ_TIMEOUT;
this.conference = conference;
this.myID = conference.myUserId();
this.myID = conference.myUserId() || '';
this.e2eeCtx = new E2EEContext();
this._reqs = new Map();
this.update = new Map();
Expand All @@ -94,6 +94,7 @@ export class ManagedKeyHandler extends Listenable {
this.enabled = false;
this._participantEventQueue = [];
this._processingEvents = false;
this.initSessions = null;

this.onUserJoined = this._onParticipantJoined.bind(this);
this.onUserLeft = this._onParticipantLeft.bind(this);
Expand Down Expand Up @@ -134,7 +135,7 @@ export class ManagedKeyHandler extends Listenable {
JitsiConferenceEvents.TRACK_ADDED,
this.onTrackAdded,
);
this.conference.rtc.on(
this.conference.rtc?.on(
RTCEvents.REMOTE_TRACK_ADDED,
this.onRemoteTrackAdded,
);
Expand Down Expand Up @@ -922,7 +923,7 @@ export class ManagedKeyHandler extends Listenable {
JitsiConferenceEvents.TRACK_ADDED,
this.onTrackAdded,
);
this.conference.rtc.off(
this.conference.rtc?.off(
RTCEvents.REMOTE_TRACK_ADDED,
this.onRemoteTrackAdded,
);
Expand All @@ -932,16 +933,16 @@ export class ManagedKeyHandler extends Listenable {
);
this.e2eeCtx.off('sasUpdated', this.onSasUpdated);

this.onUserJoined = null;
this.onUserLeft = null;
this.onEndpointMessageReceived = null;
this.onConferenceJoined = null;
this.onConferenceLeft = null;
this.onMediaSessionStarted = null;
this.onTrackAdded = null;
this.onRemoteTrackAdded = null;
this.onTrackMuteChanged = null;
this.onSasUpdated = null;
this.onUserJoined = undefined;
this.onUserLeft = undefined;
this.onEndpointMessageReceived = undefined;
this.onConferenceJoined = undefined;
this.onConferenceLeft = undefined;
this.onMediaSessionStarted = undefined;
this.onTrackAdded = undefined;
this.onRemoteTrackAdded = undefined;
this.onTrackMuteChanged = undefined;
this.onSasUpdated = undefined;

this.e2eeCtx.dispose();
this._reqs.clear();
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lib-meet",
"version": "1.0.0",
"version": "1.0.1",
"description": "JS library for accessing Jitsi server side deployments",
"repository": {
"type": "git",
Expand Down
Loading