Browse Source

feat(reload): on offer / answer error.

factor2
Hristo Terezov 6 years ago
parent
commit
a91b49c2c1

+ 1
- 7
conference.js View File

379
             APP.UI.notifyGracefulShutdown();
379
             APP.UI.notifyGracefulShutdown();
380
             break;
380
             break;
381
 
381
 
382
-        case JitsiConferenceErrors.JINGLE_FATAL_ERROR: {
383
-            const [ error ] = params;
384
-
385
-            APP.UI.notifyInternalError(error);
386
-            break;
387
-        }
388
-
389
         case JitsiConferenceErrors.CONFERENCE_DESTROYED: {
382
         case JitsiConferenceErrors.CONFERENCE_DESTROYED: {
390
             const [ reason ] = params;
383
             const [ reason ] = params;
391
 
384
 
407
 
400
 
408
         case JitsiConferenceErrors.FOCUS_LEFT:
401
         case JitsiConferenceErrors.FOCUS_LEFT:
409
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
402
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
403
+        case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
410
             APP.store.dispatch(conferenceWillLeave(room));
404
             APP.store.dispatch(conferenceWillLeave(room));
411
 
405
 
412
             // FIXME the conference should be stopped by the library and not by
406
             // FIXME the conference should be stopped by the library and not by

+ 2
- 2
package-lock.json View File

8946
       }
8946
       }
8947
     },
8947
     },
8948
     "lib-jitsi-meet": {
8948
     "lib-jitsi-meet": {
8949
-      "version": "github:jitsi/lib-jitsi-meet#a89d67388f49cc18aae080cb388877380a7664b1",
8950
-      "from": "github:jitsi/lib-jitsi-meet#a89d67388f49cc18aae080cb388877380a7664b1",
8949
+      "version": "github:jitsi/lib-jitsi-meet#ee1854c1b12a229f70f351acaebe6686f38f6a85",
8950
+      "from": "github:jitsi/lib-jitsi-meet#ee1854c1b12a229f70f351acaebe6686f38f6a85",
8951
       "requires": {
8951
       "requires": {
8952
         "@jitsi/sdp-interop": "0.1.14",
8952
         "@jitsi/sdp-interop": "0.1.14",
8953
         "@jitsi/sdp-simulcast": "0.2.1",
8953
         "@jitsi/sdp-simulcast": "0.2.1",

+ 1
- 1
package.json View File

52
     "js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
52
     "js-utils": "github:jitsi/js-utils#73a67a7a60d52f8e895f50939c8fcbd1f20fe7b5",
53
     "jsrsasign": "8.0.12",
53
     "jsrsasign": "8.0.12",
54
     "jwt-decode": "2.2.0",
54
     "jwt-decode": "2.2.0",
55
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#a89d67388f49cc18aae080cb388877380a7664b1",
55
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#ee1854c1b12a229f70f351acaebe6686f38f6a85",
56
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
56
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
57
     "lodash": "4.17.11",
57
     "lodash": "4.17.11",
58
     "moment": "2.19.4",
58
     "moment": "2.19.4",

+ 12
- 0
react/features/analytics/AnalyticsEvents.js View File

271
     };
271
     };
272
 }
272
 }
273
 
273
 
274
+/**
275
+ * Creates an "offer/answer failure" event.
276
+ *
277
+ * @returns {Object} The event in a format suitable for sending via
278
+ * sendAnalytics.
279
+ */
280
+export function createOfferAnswerFailedEvent() {
281
+    return {
282
+        action: 'offer.answer.failure'
283
+    };
284
+}
285
+
274
 /**
286
 /**
275
  * Creates a "page reload" event.
287
  * Creates a "page reload" event.
276
  *
288
  *

+ 8
- 2
react/features/base/conference/middleware.js View File

6
     ACTION_UNPINNED,
6
     ACTION_UNPINNED,
7
     createAudioOnlyChangedEvent,
7
     createAudioOnlyChangedEvent,
8
     createConnectionEvent,
8
     createConnectionEvent,
9
+    createOfferAnswerFailedEvent,
9
     createPinnedEvent,
10
     createPinnedEvent,
10
     sendAnalytics
11
     sendAnalytics
11
 } from '../../analytics';
12
 } from '../../analytics';
12
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection';
13
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection';
14
+import { JitsiConferenceErrors } from '../lib-jitsi-meet';
13
 import { setVideoMuted, VIDEO_MUTISM_AUTHORITY } from '../media';
15
 import { setVideoMuted, VIDEO_MUTISM_AUTHORITY } from '../media';
14
 import {
16
 import {
15
     getLocalParticipant,
17
     getLocalParticipant,
152
 function _conferenceFailed(store, next, action) {
154
 function _conferenceFailed(store, next, action) {
153
     const result = next(action);
155
     const result = next(action);
154
 
156
 
157
+    const { conference, error } = action;
158
+
159
+    if (error.name === JitsiConferenceErrors.OFFER_ANSWER_FAILED) {
160
+        sendAnalytics(createOfferAnswerFailedEvent());
161
+    }
162
+
155
     // FIXME: Workaround for the web version. Currently, the creation of the
163
     // FIXME: Workaround for the web version. Currently, the creation of the
156
     // conference is handled by /conference.js and appropriate failure handlers
164
     // conference is handled by /conference.js and appropriate failure handlers
157
     // are set there.
165
     // are set there.
165
     }
173
     }
166
 
174
 
167
     // XXX After next(action), it is clear whether the error is recoverable.
175
     // XXX After next(action), it is clear whether the error is recoverable.
168
-    const { conference, error } = action;
169
-
170
     !error.recoverable
176
     !error.recoverable
171
         && conference
177
         && conference
172
         && conference.leave().catch(reason => {
178
         && conference.leave().catch(reason => {

+ 1
- 0
react/features/base/lib-jitsi-meet/functions.js View File

70
     return (
70
     return (
71
         error === JitsiConferenceErrors.FOCUS_DISCONNECTED
71
         error === JitsiConferenceErrors.FOCUS_DISCONNECTED
72
             || error === JitsiConferenceErrors.FOCUS_LEFT
72
             || error === JitsiConferenceErrors.FOCUS_LEFT
73
+            || error === JitsiConferenceErrors.OFFER_ANSWER_FAILED
73
             || error === JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE);
74
             || error === JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE);
74
 }
75
 }
75
 
76
 

Loading…
Cancel
Save