Merge pull request #61 from internxt/handle_session_timeout

[PB-3892] Handle session timeout

Author: CandelR

JitsiConferenceEvents.spec.ts

@@ -25,6 +25,8 @@ describe( "/JitsiConferenceEvents members", () => {
         CONFERENCE_CREATED_TIMESTAMP,
         DTMF_SUPPORT_CHANGED,
         E2EE_SAS_AVAILABLE,
+        E2EE_KEY_SYNC_FAILED,
+        E2EE_KEY_SYNC_AFTER_TIMEOUT,
         ENCODE_TIME_STATS_RECEIVED,
         ENDPOINT_MESSAGE_RECEIVED,
         ENDPOINT_STATS_RECEIVED,
@@ -249,6 +251,8 @@ describe( "/JitsiConferenceEvents members", () => {
         expect( JitsiConferenceEvents.SILENT_STATUS_CHANGED ).toBe( 'conference.silentStatusChanged' );
         expect( JitsiConferenceEvents.REACTION_RECEIVED ).toBe( 'conference.reactionReceived' );
         expect( JitsiConferenceEvents.E2EE_SAS_AVAILABLE ).toBe( 'conference.e2ee.sas.available' );
+        expect( JitsiConferenceEvents.E2EE_KEY_SYNC_FAILED ).toBe( 'conference.e2ee.key_sync_failed' );
+        expect( JitsiConferenceEvents.E2EE_KEY_SYNC_AFTER_TIMEOUT ).toBe( 'conference.e2ee.key_sync_after_timeout' );
     } );
 
 it( "unknown members", () => {

JitsiConferenceEvents.ts

@@ -188,6 +188,8 @@ export enum JitsiConferenceEvents {
     DTMF_SUPPORT_CHANGED = 'conference.dtmfSupportChanged',
 
     E2EE_SAS_AVAILABLE = 'conference.e2ee.sas.available',
+    E2EE_KEY_SYNC_FAILED = 'conference.e2ee.key_sync_failed',
+    E2EE_KEY_SYNC_AFTER_TIMEOUT = 'conference.e2ee.key_sync_after_timeout',
 
     /**
      * Indicates that the encode time stats for the local video sources has been received.
@@ -527,6 +529,8 @@ export const DISPLAY_NAME_CHANGED = JitsiConferenceEvents.DISPLAY_NAME_CHANGED;
 export const DOMINANT_SPEAKER_CHANGED = JitsiConferenceEvents.DOMINANT_SPEAKER_CHANGED;
 export const DTMF_SUPPORT_CHANGED = JitsiConferenceEvents.DTMF_SUPPORT_CHANGED;
 export const E2EE_SAS_AVAILABLE = JitsiConferenceEvents.E2EE_SAS_AVAILABLE;
+export const E2EE_KEY_SYNC_FAILED = JitsiConferenceEvents.E2EE_KEY_SYNC_FAILED;
+export const E2EE_KEY_SYNC_AFTER_TIMEOUT = JitsiConferenceEvents.E2EE_KEY_SYNC_AFTER_TIMEOUT;
 export const ENCODE_TIME_STATS_RECEIVED = JitsiConferenceEvents.ENCODE_TIME_STATS_RECEIVED;
 export const ENDPOINT_MESSAGE_RECEIVED = JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED;
 export const ENDPOINT_STATS_RECEIVED = JitsiConferenceEvents.ENDPOINT_STATS_RECEIVED;

modules/e2ee-internxt/ManagedKeyHandler.ts

@@ -280,6 +280,8 @@ export class ManagedKeyHandler extends Listenable {
                     );
                     return result;
                 } catch (error) {
+                     this.conference.eventEmitter.emit(
+                JitsiConferenceEvents.E2EE_KEY_SYNC_FAILED);
                     this.log(
                         "error",
                         `Session initialization request timed out for ${pId}: ${error}`,
@@ -606,11 +608,14 @@ export class ManagedKeyHandler extends Listenable {
                     if (requestPromise) {
                         requestPromise.resolve();
                         this._reqs.delete(pId);
-                    } else
+                    } else {
+                        this.conference.eventEmitter.emit(
+                        JitsiConferenceEvents.E2EE_KEY_SYNC_AFTER_TIMEOUT);
                         this.log(
                             "warn",
                             `Session with ${pId} was established after reaching time out.`,
                         );
+                    }
                     break;
                 }
                 case OLM_MESSAGE_TYPES.ERROR: {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "lib-jitsi-meet",
-    "version": "0.0.6-alpha",
+    "version": "0.0.7-alpha",
     "description": "JS library for accessing Jitsi server side deployments",
     "repository": {
         "type": "git",