Pārlūkot izejas kodu

Transform JitsiTrackError into format acceptable by callstats

dev1
tsareg 9 gadus atpakaļ
vecāks
revīzija
c815e913d7
2 mainītis faili ar 16 papildinājumiem un 9 dzēšanām
  1. 3
    6
      JitsiTrackError.js
  2. 13
    3
      modules/statistics/statistics.js

+ 3
- 6
JitsiTrackError.js Parādīt failu

59
             case "PermissionDeniedError":
59
             case "PermissionDeniedError":
60
             case "SecurityError":
60
             case "SecurityError":
61
                 this.name = JitsiTrackErrors.PERMISSION_DENIED;
61
                 this.name = JitsiTrackErrors.PERMISSION_DENIED;
62
-                this.message = error.message
63
-                    || TRACK_ERROR_TO_MESSAGE_MAP[
62
+                this.message = TRACK_ERROR_TO_MESSAGE_MAP[
64
                         JitsiTrackErrors.PERMISSION_DENIED]
63
                         JitsiTrackErrors.PERMISSION_DENIED]
65
                         + (this.gum.devices || []).join(", ");
64
                         + (this.gum.devices || []).join(", ");
66
                 break;
65
                 break;
84
                         constraintName === "width" ||
83
                         constraintName === "width" ||
85
                         constraintName === "height")) {
84
                         constraintName === "height")) {
86
                     this.name = JitsiTrackErrors.UNSUPPORTED_RESOLUTION;
85
                     this.name = JitsiTrackErrors.UNSUPPORTED_RESOLUTION;
87
-                    this.message = error.message ||
88
-                        TRACK_ERROR_TO_MESSAGE_MAP[
86
+                    this.message = TRACK_ERROR_TO_MESSAGE_MAP[
89
                             JitsiTrackErrors.UNSUPPORTED_RESOLUTION] +
87
                             JitsiTrackErrors.UNSUPPORTED_RESOLUTION] +
90
                         getResolutionFromFailedConstraint(constraintName,
88
                         getResolutionFromFailedConstraint(constraintName,
91
                             options);
89
                             options);
92
                 } else {
90
                 } else {
93
                     this.name = JitsiTrackErrors.CONSTRAINT_FAILED;
91
                     this.name = JitsiTrackErrors.CONSTRAINT_FAILED;
94
-                    this.message = error.message ||
95
-                        TRACK_ERROR_TO_MESSAGE_MAP[
92
+                    this.message = TRACK_ERROR_TO_MESSAGE_MAP[
96
                             JitsiTrackErrors.CONSTRAINT_FAILED] +
93
                             JitsiTrackErrors.CONSTRAINT_FAILED] +
97
                         error.constraintName;
94
                         error.constraintName;
98
                 }
95
                 }

+ 13
- 3
modules/statistics/statistics.js Parādīt failu

6
 var StatisticsEvents = require("../../service/statistics/Events");
6
 var StatisticsEvents = require("../../service/statistics/Events");
7
 var CallStats = require("./CallStats");
7
 var CallStats = require("./CallStats");
8
 var ScriptUtil = require('../util/ScriptUtil');
8
 var ScriptUtil = require('../util/ScriptUtil');
9
+var JitsiTrackError = require("../../JitsiTrackError");
9
 
10
 
10
 // Since callstats.io is a third party, we cannot guarantee the quality of their
11
 // Since callstats.io is a third party, we cannot guarantee the quality of their
11
 // service. More specifically, their server may take noticeably long time to
12
 // service. More specifically, their server may take noticeably long time to
265
  * @param {Error} e error to send
266
  * @param {Error} e error to send
266
  */
267
  */
267
 Statistics.prototype.sendGetUserMediaFailed = function (e) {
268
 Statistics.prototype.sendGetUserMediaFailed = function (e) {
268
-    if(this.callstats)
269
-        CallStats.sendGetUserMediaFailed(e, this.callstats);
269
+    if(this.callstats) {
270
+        CallStats.sendGetUserMediaFailed(
271
+            e instanceof JitsiTrackError
272
+                ? formatJitsiTrackErrorForCallStats(e)
273
+                : e,
274
+            this.callstats);
275
+    }
270
 };
276
 };
271
 
277
 
272
 /**
278
 /**
275
  * @param {Error} e error to send
281
  * @param {Error} e error to send
276
  */
282
  */
277
 Statistics.sendGetUserMediaFailed = function (e) {
283
 Statistics.sendGetUserMediaFailed = function (e) {
278
-    CallStats.sendGetUserMediaFailed(e, null);
284
+    CallStats.sendGetUserMediaFailed(
285
+        e instanceof JitsiTrackError
286
+            ? formatJitsiTrackErrorForCallStats(e)
287
+            : e,
288
+        null);
279
 };
289
 };
280
 
290
 
281
 /**
291
 /**

Notiek ielāde…
Atcelt
Saglabāt