diff --git a/JitsiConference.js b/JitsiConference.js index cf2040d900..1da1870b43 100644 --- a/JitsiConference.js +++ b/JitsiConference.js @@ -49,8 +49,8 @@ import { FEATURE_JIGASI, JITSI_MEET_MUC_TYPE } from './modules/xmpp/xmpp'; -import BridgeVideoType from './service/RTC/BridgeVideoType'; -import CodecMimeType from './service/RTC/CodecMimeType'; +import { BridgeVideoType } from './service/RTC/BridgeVideoType'; +import { CodecMimeType } from './service/RTC/CodecMimeType'; import { MediaType } from './service/RTC/MediaType'; import RTCEvents from './service/RTC/RTCEvents'; import { SignalingEvents } from './service/RTC/SignalingEvents'; diff --git a/modules/RTC/CodecSelection.js b/modules/RTC/CodecSelection.js index 63b9df1bda..c7b5a6b399 100644 --- a/modules/RTC/CodecSelection.js +++ b/modules/RTC/CodecSelection.js @@ -2,7 +2,7 @@ import { getLogger } from '@jitsi/logger'; import * as JitsiConferenceEvents from '../../JitsiConferenceEvents'; -import CodecMimeType from '../../service/RTC/CodecMimeType'; +import { CodecMimeType } from '../../service/RTC/CodecMimeType'; import { MediaType } from '../../service/RTC/MediaType'; import browser from '../browser'; diff --git a/modules/RTC/JitsiLocalTrack.js b/modules/RTC/JitsiLocalTrack.js index 722b836b5d..4f67cb3c05 100644 --- a/modules/RTC/JitsiLocalTrack.js +++ b/modules/RTC/JitsiLocalTrack.js @@ -10,7 +10,7 @@ import { NO_DATA_FROM_SOURCE, TRACK_MUTE_CHANGED } from '../../JitsiTrackEvents'; -import CameraFacingMode from '../../service/RTC/CameraFacingMode'; +import { CameraFacingMode } from '../../service/RTC/CameraFacingMode'; import { MediaType } from '../../service/RTC/MediaType'; import RTCEvents from '../../service/RTC/RTCEvents'; import { VideoType } from '../../service/RTC/VideoType'; diff --git a/modules/RTC/RTCUtils.js b/modules/RTC/RTCUtils.js index 43a0b55db0..c60a26b383 100644 --- a/modules/RTC/RTCUtils.js +++ b/modules/RTC/RTCUtils.js @@ -4,7 +4,7 @@ import 'webrtc-adapter'; import JitsiTrackError from '../../JitsiTrackError'; import * as JitsiTrackErrors from '../../JitsiTrackErrors'; -import CameraFacingMode from '../../service/RTC/CameraFacingMode'; +import { CameraFacingMode } from '../../service/RTC/CameraFacingMode'; import RTCEvents from '../../service/RTC/RTCEvents'; import Resolutions from '../../service/RTC/Resolutions'; import { VideoType } from '../../service/RTC/VideoType'; diff --git a/modules/RTC/TPCUtils.js b/modules/RTC/TPCUtils.js index 2779c7c449..0abb120de0 100644 --- a/modules/RTC/TPCUtils.js +++ b/modules/RTC/TPCUtils.js @@ -2,7 +2,7 @@ import { getLogger } from '@jitsi/logger'; import clonedeep from 'lodash.clonedeep'; import transform from 'sdp-transform'; -import CodecMimeType from '../../service/RTC/CodecMimeType'; +import { CodecMimeType } from '../../service/RTC/CodecMimeType'; import { MediaDirection } from '../../service/RTC/MediaDirection'; import { MediaType } from '../../service/RTC/MediaType'; import { getSourceIndexFromSourceName } from '../../service/RTC/SignalingLayer'; @@ -12,7 +12,7 @@ import { VIDEO_QUALITY_LEVELS, VIDEO_QUALITY_SETTINGS } from '../../service/RTC/StandardVideoSettings'; -import VideoEncoderScalabilityMode from '../../service/RTC/VideoEncoderScalabilityMode'; +import { VideoEncoderScalabilityMode } from '../../service/RTC/VideoEncoderScalabilityMode'; import { VideoType } from '../../service/RTC/VideoType'; import browser from '../browser'; diff --git a/modules/RTC/TPCUtils.spec.js b/modules/RTC/TPCUtils.spec.js index 3509960628..4804378fd2 100644 --- a/modules/RTC/TPCUtils.spec.js +++ b/modules/RTC/TPCUtils.spec.js @@ -1,6 +1,6 @@ /* eslint-disable max-len */ -import CodecMimeType from '../../service/RTC/CodecMimeType'; -import VideoEncoderScalabilityMode from '../../service/RTC/VideoEncoderScalabilityMode'; +import { CodecMimeType } from '../../service/RTC/CodecMimeType'; +import { VideoEncoderScalabilityMode } from '../../service/RTC/VideoEncoderScalabilityMode'; import { MockJitsiLocalTrack, MockPeerConnection } from './MockClasses'; import { TPCUtils } from './TPCUtils'; diff --git a/modules/RTC/TraceablePeerConnection.js b/modules/RTC/TraceablePeerConnection.js index 84856ab9e6..cb8736d957 100644 --- a/modules/RTC/TraceablePeerConnection.js +++ b/modules/RTC/TraceablePeerConnection.js @@ -2,7 +2,7 @@ import { getLogger } from '@jitsi/logger'; import { Interop } from '@jitsi/sdp-interop'; import transform from 'sdp-transform'; -import CodecMimeType from '../../service/RTC/CodecMimeType'; +import { CodecMimeType } from '../../service/RTC/CodecMimeType'; import { MediaDirection } from '../../service/RTC/MediaDirection'; import { MediaType } from '../../service/RTC/MediaType'; import RTCEvents from '../../service/RTC/RTCEvents'; diff --git a/modules/sdp/SDPUtil.js b/modules/sdp/SDPUtil.js index dce8f6a048..24e2dc5ea6 100644 --- a/modules/sdp/SDPUtil.js +++ b/modules/sdp/SDPUtil.js @@ -1,7 +1,7 @@ import { getLogger } from '@jitsi/logger'; const logger = getLogger(__filename); -import CodecMimeType from '../../service/RTC/CodecMimeType'; +import { CodecMimeType } from '../../service/RTC/CodecMimeType'; import { MediaDirection } from '../../service/RTC/MediaDirection'; import browser from '../browser'; import RandomUtil from '../util/RandomUtil'; diff --git a/service/RTC/BridgeVideoType.spec.ts b/service/RTC/BridgeVideoType.spec.ts index 085d681104..af8336bb91 100644 --- a/service/RTC/BridgeVideoType.spec.ts +++ b/service/RTC/BridgeVideoType.spec.ts @@ -4,25 +4,17 @@ import * as exported from "./BridgeVideoType"; describe( "/service/RTC/BridgeVideoType members", () => { const { - CAMERA, - DESKTOP, - DESKTOP_HIGH_FPS, - NONE, BridgeVideoType, ...others - } = exported as any; // TODO: remove cast after typescript conversion + } = exported; it( "known members", () => { - expect( CAMERA ).toBe( 'camera' ); - expect( DESKTOP ).toBe( 'desktop' ); - expect( DESKTOP_HIGH_FPS ).toBe( 'desktop_high_fps' ); - expect( NONE ).toBe( 'none' ); - if ( BridgeVideoType ) { - expect( BridgeVideoType.CAMERA ).toBe( 'camera' ); - expect( BridgeVideoType.DESKTOP ).toBe( 'desktop' ); - expect( BridgeVideoType.DESKTOP_HIGH_FPS ).toBe( 'desktop_high_fps' ); - expect( BridgeVideoType.NONE ).toBe( 'none' ); - } + expect( BridgeVideoType ).toBeDefined(); + + expect( BridgeVideoType.CAMERA ).toBe( 'camera' ); + expect( BridgeVideoType.DESKTOP ).toBe( 'desktop' ); + expect( BridgeVideoType.DESKTOP_HIGH_FPS ).toBe( 'desktop_high_fps' ); + expect( BridgeVideoType.NONE ).toBe( 'none' ); } ); it( "unknown members", () => { diff --git a/service/RTC/BridgeVideoType.js b/service/RTC/BridgeVideoType.ts similarity index 69% rename from service/RTC/BridgeVideoType.js rename to service/RTC/BridgeVideoType.ts index a430ffeedd..7879bbe429 100644 --- a/service/RTC/BridgeVideoType.js +++ b/service/RTC/BridgeVideoType.ts @@ -2,26 +2,24 @@ * Enumeration of the video types that are signaled to the bridge * @type {{CAMERA: string, DESKTOP: string, DESKTOP_HIGH_FPS: string, NONE: string}} */ -const BridgeVideoType = { +export enum BridgeVideoType { /** * The camera video type. */ - CAMERA: 'camera', + CAMERA = 'camera', /** * The low fps desktop video type. */ - DESKTOP: 'desktop', + DESKTOP = 'desktop', /** * The high fps desktop video type. */ - DESKTOP_HIGH_FPS: 'desktop_high_fps', + DESKTOP_HIGH_FPS = 'desktop_high_fps', /** * Video type when no local source is present. */ - NONE: 'none' -}; - -module.exports = BridgeVideoType; + NONE = 'none' +} diff --git a/service/RTC/CameraFacingMode.spec.ts b/service/RTC/CameraFacingMode.spec.ts index 28533308cf..71d600d576 100644 --- a/service/RTC/CameraFacingMode.spec.ts +++ b/service/RTC/CameraFacingMode.spec.ts @@ -4,19 +4,15 @@ import * as exported from "./CameraFacingMode"; describe( "/service/RTC/CameraFacingMode members", () => { const { - ENVIRONMENT, - USER, CameraFacingMode, ...others - } = exported as any; // TODO: remove cast after typescript conversion + } = exported; it( "known members", () => { - expect( ENVIRONMENT ).toBe( 'environment' ); - expect( USER ).toBe( 'user' ); - if ( CameraFacingMode ) { - expect( CameraFacingMode.ENVIRONMENT ).toBe( 'environment' ); - expect( CameraFacingMode.USER ).toBe( 'user' ); - } + expect( CameraFacingMode ).toBeDefined(); + + expect( CameraFacingMode.ENVIRONMENT ).toBe( 'environment' ); + expect( CameraFacingMode.USER ).toBe( 'user' ); } ); it( "unknown members", () => { diff --git a/service/RTC/CameraFacingMode.js b/service/RTC/CameraFacingMode.ts similarity index 81% rename from service/RTC/CameraFacingMode.js rename to service/RTC/CameraFacingMode.ts index 4b32e2a7c4..afc4562760 100644 --- a/service/RTC/CameraFacingMode.js +++ b/service/RTC/CameraFacingMode.ts @@ -7,16 +7,14 @@ * * @enum {string} */ -const CameraFacingMode = { +export enum CameraFacingMode { /** * The mode which specifies the environment-facing camera. */ - ENVIRONMENT: 'environment', + ENVIRONMENT = 'environment', /** * The mode which specifies the user-facing camera. */ - USER: 'user' -}; - -module.exports = CameraFacingMode; + USER = 'user' +} diff --git a/service/RTC/CodecMimeType.spec.ts b/service/RTC/CodecMimeType.spec.ts index 6479a99e82..b6d30797cc 100644 --- a/service/RTC/CodecMimeType.spec.ts +++ b/service/RTC/CodecMimeType.spec.ts @@ -4,26 +4,11 @@ import * as exported from "./CodecMimeType"; describe( "/service/RTC/CodecMimeType members", () => { const { - default: { - AV1, - H264, - OPUS, - ULPFEC, - VP8, - VP9, - }, CodecMimeType, ...others - } = exported as any; // TODO: remove cast after typescript conversion + } = exported; it( "known members", () => { - expect( AV1 ).toBe( 'av1' ); - expect( H264 ).toBe( 'h264' ); - expect( OPUS ).toBe( 'opus' ); - expect( ULPFEC ).toBe( 'ulpfec' ); - expect( VP8 ).toBe( 'vp8' ); - expect( VP9 ).toBe( 'vp9' ); - expect( CodecMimeType ).toBeDefined(); expect( CodecMimeType.AV1 ).toBe( 'av1' ); diff --git a/service/RTC/CodecMimeType.js b/service/RTC/CodecMimeType.ts similarity index 72% rename from service/RTC/CodecMimeType.js rename to service/RTC/CodecMimeType.ts index 0d2f05552e..cd06b96711 100644 --- a/service/RTC/CodecMimeType.js +++ b/service/RTC/CodecMimeType.ts @@ -2,41 +2,39 @@ * Enumeration of the codec mime types * @type {{AV1: string, H264: string, OPUS: string, RED: string, ULPFEC: string, VP8: string, VP9: string}} */ -export const CodecMimeType = { +export enum CodecMimeType { /** * AV1 codec mime type. */ - AV1: 'av1', + AV1 = 'av1', /** * The h264 codec mime type. */ - H264: 'h264', + H264 = 'h264', /** * The opus codec mime type. */ - OPUS: 'opus', + OPUS = 'opus', /** * The red codec mime type. */ - RED: 'red', + RED = 'red', /** * The ulpfec codec mime type. */ - ULPFEC: 'ulpfec', + ULPFEC = 'ulpfec', /** * The vp8 codec mime type. */ - VP8: 'vp8', + VP8 = 'vp8', /** * The vp9 codec mime type. */ - VP9: 'vp9' -}; - -export default CodecMimeType; + VP9 = 'vp9' +} diff --git a/service/RTC/MediaDirection.ts b/service/RTC/MediaDirection.ts index e84d279080..36cc3061bf 100644 --- a/service/RTC/MediaDirection.ts +++ b/service/RTC/MediaDirection.ts @@ -21,4 +21,4 @@ export enum MediaDirection { * Media is sent and received. */ SENDRECV = 'sendrecv' -}; +} diff --git a/service/RTC/RTCEvents.ts b/service/RTC/RTCEvents.ts index 629247e184..b0e7da0c31 100644 --- a/service/RTC/RTCEvents.ts +++ b/service/RTC/RTCEvents.ts @@ -123,7 +123,7 @@ export enum RTCEvents { * new remote sources. */ AUDIO_SSRCS_REMAPPED = 'rtc.audio_ssrcs_remapped' -}; +} export const CREATE_ANSWER_FAILED = RTCEvents.CREATE_ANSWER_FAILED; export const CREATE_OFFER_FAILED = RTCEvents.CREATE_OFFER_FAILED; diff --git a/service/RTC/StandardVideoSettings.ts b/service/RTC/StandardVideoSettings.ts index d2f82f38b8..ee361a9c8c 100644 --- a/service/RTC/StandardVideoSettings.ts +++ b/service/RTC/StandardVideoSettings.ts @@ -147,4 +147,4 @@ export enum VIDEO_QUALITY_SETTINGS { // When the camera is turned off. NONE = 'none' -}; +} diff --git a/service/RTC/VideoEncoderScalabilityMode.ts b/service/RTC/VideoEncoderScalabilityMode.ts index 334daa32c1..019bcf5be2 100644 --- a/service/RTC/VideoEncoderScalabilityMode.ts +++ b/service/RTC/VideoEncoderScalabilityMode.ts @@ -2,7 +2,7 @@ * Enumeration of the scalability modes supported by the video encoders. * For more information, check https://www.w3.org/TR/webrtc-svc/#dependencydiagrams* * - * const VideoEncoderScalabilityMode: { + * enum VideoEncoderScalabilityMode { * L1T3: string; * L2T3: string; * L2T3_KEY: string; @@ -10,31 +10,29 @@ * L3T3_KEY: string; * } */ -export const VideoEncoderScalabilityMode = { +export enum VideoEncoderScalabilityMode { /** * L1T3 mode: 1-layer spatial and 3-layer temporal scalabilty encoding. */ - L1T3: 'L1T3', + L1T3 = 'L1T3', /** * L2T2 mode: 2-layer spatial and 3-layer temporal scalability encoding. */ - L2T3: 'L2T3', + L2T3 = 'L2T3', /** * L2T3_KEY mode: 2-layer spatial and 3-layer temporal scalability K-SVC encoding. */ - L2T3_KEY: 'L2T3_KEY', + L2T3_KEY = 'L2T3_KEY', /** * L3T3 mode: -layer spatial and 3-layer temporal scalability encoding. */ - L3T3: 'L3T3', + L3T3 = 'L3T3', /** * L3T3_Key mode: 3-layer spatial and 3-layer temporal scalability K-SVC encoding. */ - L3T3_KEY: 'L3T3_KEY' -}; - -export default VideoEncoderScalabilityMode; + L3T3_KEY = 'L3T3_KEY' +} diff --git a/service/RTC/VideoType.ts b/service/RTC/VideoType.ts index 9898462294..91928ca718 100644 --- a/service/RTC/VideoType.ts +++ b/service/RTC/VideoType.ts @@ -11,4 +11,4 @@ export enum VideoType { * The desktop video type. */ DESKTOP = 'desktop' -}; +}