ES6 for JitsiTrackError

JitsiConference.js

@@ -9,9 +9,9 @@ var JitsiConferenceErrors = require("./JitsiConferenceErrors");
 var JitsiParticipant = require("./JitsiParticipant");
 var Statistics = require("./modules/statistics/statistics");
 var JitsiDTMFManager = require('./modules/DTMF/JitsiDTMFManager');
+import JitsiTrackError from "./JitsiTrackError";
 import * as JitsiTrackErrors from "./JitsiTrackErrors";
 import * as JitsiTrackEvents from "./JitsiTrackEvents";
-var JitsiTrackError = require("./JitsiTrackError");
 var Settings = require("./modules/settings/Settings");
 var ComponentsVersions = require("./modules/version/ComponentsVersions");
 var GlobalOnErrorHandler = require("./modules/util/GlobalOnErrorHandler");

JitsiMeetJS.js

@@ -7,9 +7,9 @@ var JitsiConnectionEvents = require("./JitsiConnectionEvents");
 var JitsiMediaDevicesEvents = require('./JitsiMediaDevicesEvents');
 var JitsiConnectionErrors = require("./JitsiConnectionErrors");
 var JitsiConferenceErrors = require("./JitsiConferenceErrors");
+import JitsiTrackError from "./JitsiTrackError";
 import * as JitsiTrackErrors from "./JitsiTrackErrors";
 import * as JitsiTrackEvents from "./JitsiTrackEvents";
-var JitsiTrackError = require("./JitsiTrackError");
 var JitsiRecorderErrors = require("./JitsiRecorderErrors");
 var Logger = require("jitsi-meet-logger");
 var MediaType = require("./service/RTC/MediaType");

JitsiTrackError.js

@@ -1,6 +1,6 @@
 import * as JitsiTrackErrors from "./JitsiTrackErrors";
 
-var TRACK_ERROR_TO_MESSAGE_MAP = {};
+const TRACK_ERROR_TO_MESSAGE_MAP = {};
 
 TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.UNSUPPORTED_RESOLUTION]
     = "Video resolution is not supported: ";
@@ -28,100 +28,108 @@ TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.TRACK_MUTE_UNMUTE_IN_PROGRESS]
     = "Track mute/unmute process is currently in progress";
 
 /**
- * Object representing error that happened to a JitsiTrack. Can represent
- * various types of errors. For error descriptions (@see JitsiTrackErrors).
- * @constructor
+ * Represents an error that occurred to a JitsiTrack. Can represent various
+ * types of errors. For error descriptions (@see JitsiTrackErrors).
+ *
  * @extends Error
- * @param {Object|string} error - error object or error name
- * @param {Object|string} (options) - getUserMedia constraints object or error
- *      message
- * @param {('audio'|'video'|'desktop'|'screen'|'audiooutput')[]} (devices) -
- *      list of getUserMedia requested devices
  */
-function JitsiTrackError(error, options, devices) {
-    if (typeof error === "object" && typeof error.name !== "undefined") {
-        /**
-         * Additional information about original getUserMedia error
-         * and constraints.
-         * @type {{
-         *          error: Object,
-         *          constraints: Object,
-         *          devices: Array.<'audio'|'video'|'desktop'|'screen'>
-         *      }}
-         */
-        this.gum = {
-            error: error,
-            constraints: options,
-            devices: devices && Array.isArray(devices)
-                ? devices.slice(0)
-                : undefined
-        };
+export default class JitsiTrackError extends Error {
+    /**
+     * Initializes a new JitsiTrackError instance.
+     *
+     * @constructor
+     * @param {Object|string} error - error object or error name
+     * @param {Object|string} (options) - getUserMedia constraints object or
+     * error message
+     * @param {('audio'|'video'|'desktop'|'screen'|'audiooutput')[]} (devices) -
+     * list of getUserMedia requested devices
+     */
+    constructor(error, options, devices) {
+        super();
 
-        switch (error.name) {
+        if (typeof error === "object" && typeof error.name !== "undefined") {
+            /**
+             * Additional information about original getUserMedia error
+             * and constraints.
+             * @type {{
+             *     error: Object,
+             *     constraints: Object,
+             *     devices: Array.<'audio'|'video'|'desktop'|'screen'>
+             * }}
+             */
+            this.gum = {
+                error,
+                constraints: options,
+                devices: devices && Array.isArray(devices)
+                    ? devices.slice(0)
+                    : undefined
+            };
+
+            switch (error.name) {
             case "PermissionDeniedError":
             case "SecurityError":
                 this.name = JitsiTrackErrors.PERMISSION_DENIED;
-                this.message = TRACK_ERROR_TO_MESSAGE_MAP[
-                        JitsiTrackErrors.PERMISSION_DENIED]
+                this.message
+                    = TRACK_ERROR_TO_MESSAGE_MAP[this.name]
                         + (this.gum.devices || []).join(", ");
                 break;
             case "DevicesNotFoundError":
             case "NotFoundError":
                 this.name = JitsiTrackErrors.NOT_FOUND;
-                this.message = TRACK_ERROR_TO_MESSAGE_MAP[
-                        JitsiTrackErrors.NOT_FOUND]
+                this.message
+                    = TRACK_ERROR_TO_MESSAGE_MAP[this.name]
                         + (this.gum.devices || []).join(", ");
                 break;
             case "ConstraintNotSatisfiedError":
             case "OverconstrainedError":
                 var constraintName = error.constraintName;
 
-                if (options && options.video
-                    && (devices || []).indexOf('video') > -1
-                    &&
-                    (constraintName === "minWidth" ||
-                        constraintName === "maxWidth" ||
-                        constraintName === "minHeight" ||
-                        constraintName === "maxHeight" ||
-                        constraintName === "width" ||
-                        constraintName === "height")) {
+                if (options
+                        && options.video
+                        && (!devices || devices.indexOf('video') > -1)
+                        && (constraintName === "minWidth"
+                            || constraintName === "maxWidth"
+                            || constraintName === "minHeight"
+                            || constraintName === "maxHeight"
+                            || constraintName === "width"
+                            || constraintName === "height")) {
                     this.name = JitsiTrackErrors.UNSUPPORTED_RESOLUTION;
-                    this.message = TRACK_ERROR_TO_MESSAGE_MAP[
-                            JitsiTrackErrors.UNSUPPORTED_RESOLUTION] +
-                        getResolutionFromFailedConstraint(constraintName,
-                            options);
+                    this.message
+                        = TRACK_ERROR_TO_MESSAGE_MAP[this.name]
+                            + getResolutionFromFailedConstraint(
+                                    constraintName,
+                                    options);
                 } else {
                     this.name = JitsiTrackErrors.CONSTRAINT_FAILED;
-                    this.message = TRACK_ERROR_TO_MESSAGE_MAP[
-                            JitsiTrackErrors.CONSTRAINT_FAILED] +
-                        error.constraintName;
+                    this.message
+                        = TRACK_ERROR_TO_MESSAGE_MAP[this.name]
+                            + error.constraintName;
                 }
                 break;
             default:
                 this.name = JitsiTrackErrors.GENERAL;
-                this.message = error.message ||
-                    TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.GENERAL];
+                this.message
+                    = error.message || TRACK_ERROR_TO_MESSAGE_MAP[this.name];
                 break;
-        }
-    } else if (typeof error === "string") {
-        if (TRACK_ERROR_TO_MESSAGE_MAP[error]) {
-            this.name = error;
-            this.message = options || TRACK_ERROR_TO_MESSAGE_MAP[error];
+            }
+        } else if (typeof error === "string") {
+            if (TRACK_ERROR_TO_MESSAGE_MAP[error]) {
+                this.name = error;
+                this.message = options || TRACK_ERROR_TO_MESSAGE_MAP[error];
+            } else {
+                // this is some generic error that do not fit any of our
+                // pre-defined errors, so don't give it any specific name, just
+                // store message
+                this.message = error;
+            }
         } else {
-            // this is some generic error that do not fit any of our pre-defined
-            // errors, so don't give it any specific name, just store message
-            this.message = error;
+            throw new Error("Invalid arguments");
         }
-    } else {
-        throw new Error("Invalid arguments");
-    }
 
-    this.stack = error.stack || (new Error()).stack;
+        this.stack = error.stack || (new Error()).stack;
+    }
 }
 
-JitsiTrackError.prototype = Object.create(Error.prototype);
-JitsiTrackError.prototype.constructor = JitsiTrackError;
-
 /**
  * Gets failed resolution constraint from corresponding object.
  * @param {string} failedConstraintName
@@ -130,16 +138,15 @@ JitsiTrackError.prototype.constructor = JitsiTrackError;
  */
 function getResolutionFromFailedConstraint(failedConstraintName, constraints) {
     if (constraints && constraints.video && constraints.video.mandatory) {
-        if (failedConstraintName === "width") {
+        switch (failedConstraintName) {
+        case "width":
             return constraints.video.mandatory.minWidth;
-        } else if (failedConstraintName === "height") {
+        case "height":
             return constraints.video.mandatory.minHeight;
-        } else {
+        default:
             return constraints.video.mandatory[failedConstraintName] || "";
         }
     }
 
     return "";
 }
-
-module.exports = JitsiTrackError;

modules/RTC/JitsiLocalTrack.js

@@ -2,9 +2,9 @@
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var JitsiTrack = require("./JitsiTrack");
 var RTCBrowserType = require("./RTCBrowserType");
+import JitsiTrackError from "../../JitsiTrackError";
 import * as JitsiTrackErrors from "../../JitsiTrackErrors";
 import * as JitsiTrackEvents from "../../JitsiTrackEvents";
-var JitsiTrackError = require("../../JitsiTrackError");
 var RTCEvents = require("../../service/RTC/RTCEvents");
 var RTCUtils = require("./RTCUtils");
 var MediaType = require('../../service/RTC/MediaType');

modules/RTC/RTCUtils.js

@@ -13,8 +13,8 @@ var AdapterJS = require("./adapter.screenshare");
 var SDPUtil = require("../xmpp/SDPUtil");
 var EventEmitter = require("events");
 var screenObtainer = require("./ScreenObtainer");
+import JitsiTrackError from "../../JitsiTrackError";
 import * as JitsiTrackErrors from "../../JitsiTrackErrors";
-var JitsiTrackError = require("../../JitsiTrackError");
 var MediaType = require("../../service/RTC/MediaType");
 var VideoType = require("../../service/RTC/VideoType");
 var CameraFacingMode = require("../../service/RTC/CameraFacingMode");

modules/RTC/ScreenObtainer.js

@@ -3,8 +3,8 @@
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var RTCBrowserType = require("./RTCBrowserType");
 var AdapterJS = require("./adapter.screenshare");
+import JitsiTrackError from "../../JitsiTrackError";
 import * as JitsiTrackErrors from "../../JitsiTrackErrors";
-var JitsiTrackError = require("../../JitsiTrackError");
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
 
 /**

modules/statistics/statistics.js

@@ -7,7 +7,7 @@ var StatisticsEvents = require("../../service/statistics/Events");
 var AnalyticsAdapter = require("./AnalyticsAdapter");
 var CallStats = require("./CallStats");
 var ScriptUtil = require('../util/ScriptUtil');
-var JitsiTrackError = require("../../JitsiTrackError");
+import JitsiTrackError from "../../JitsiTrackError";
 
 /**
  * True if callstats API is loaded