From ddd0e7737d77182f77b154ac3853b0981495a428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= Date: Sun, 24 Nov 2019 16:39:22 +0100 Subject: [PATCH] Update eslint to v6.7.0: - Change key-spacing rule to adhere to new behavior in eslint v6.7.0: https://github.com/eslint/eslint/issues/12597 --- .eslintrc.js | 312 ++++++++-------- package.json | 2 +- src/Device.ts | 54 +-- src/Transport.ts | 10 +- src/handlers/Chrome55.ts | 68 ++-- src/handlers/Chrome67.ts | 70 ++-- src/handlers/Chrome70.ts | 70 ++-- src/handlers/Chrome74.ts | 70 ++-- src/handlers/Edge11.ts | 16 +- src/handlers/Firefox60.ts | 58 +-- src/handlers/ReactNative.ts | 86 ++--- src/handlers/Safari11.ts | 58 +-- src/handlers/Safari12.ts | 60 +-- src/handlers/sdp/MediaSection.ts | 130 +++---- src/handlers/sdp/RemoteSdp.ts | 70 ++-- src/handlers/sdp/commonUtils.ts | 36 +- src/handlers/sdp/plainRtpUtils.ts | 6 +- src/handlers/sdp/planBUtils.ts | 32 +- src/handlers/sdp/unifiedPlanUtils.ts | 32 +- src/ortc.ts | 166 ++++----- src/scalabilityModes.ts | 8 +- test/FakeHandler.js | 38 +- test/fakeParameters.js | 530 +++++++++++++-------------- test/test.js | 182 ++++----- 24 files changed, 1082 insertions(+), 1082 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 51674f1e..0527c4d2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,177 +1,177 @@ const eslintConfig = { - env : + env: { - browser : true, - es6 : true, - node : true + browser: true, + es6 : true, + node : true // 'jest/globals': true }, - plugins : [], - settings : {}, - parserOptions : + plugins : [], + settings : {}, + parserOptions: { - ecmaVersion : 2018, - sourceType : 'module', - ecmaFeatures : + ecmaVersion : 2018, + sourceType : 'module', + ecmaFeatures: { - impliedStrict : true + impliedStrict: true } }, - rules : + rules: { - 'array-bracket-spacing' : [ 2, 'always', + 'array-bracket-spacing': [ 2, 'always', { - objectsInArrays : true, - arraysInArrays : true + objectsInArrays: true, + arraysInArrays : true } ], - 'arrow-parens' : [ 2, 'always' ], - 'arrow-spacing' : 2, - 'block-spacing' : [ 2, 'always' ], - 'brace-style' : [ 2, 'allman', { allowSingleLine: true } ], - 'camelcase' : 2, - 'comma-dangle' : 2, - 'comma-spacing' : [ 2, { before: false, after: true } ], - 'comma-style' : 2, - 'computed-property-spacing' : 2, - 'constructor-super' : 2, - 'func-call-spacing' : 2, - 'generator-star-spacing' : 2, - 'guard-for-in' : 2, - 'indent' : [ 2, 'tab', { 'SwitchCase': 1 } ], - 'key-spacing' : [ 2, + 'arrow-parens' : [ 2, 'always' ], + 'arrow-spacing' : 2, + 'block-spacing' : [ 2, 'always' ], + 'brace-style' : [ 2, 'allman', { allowSingleLine: true } ], + 'camelcase' : 2, + 'comma-dangle' : 2, + 'comma-spacing' : [ 2, { before: false, after: true } ], + 'comma-style' : 2, + 'computed-property-spacing': 2, + 'constructor-super' : 2, + 'func-call-spacing' : 2, + 'generator-star-spacing' : 2, + 'guard-for-in' : 2, + 'indent' : [ 2, 'tab', { 'SwitchCase': 1 } ], + 'key-spacing' : [ 2, { - singleLine : + singleLine: { - beforeColon : false, - afterColon : true + beforeColon: false, + afterColon : true }, - multiLine : + multiLine: { - beforeColon : true, - afterColon : true, - align : 'colon' + beforeColon: false, + afterColon : true, + align : 'colon' } } ], - 'keyword-spacing' : 2, - 'linebreak-style' : [ 2, 'unix' ], - 'lines-around-comment' : [ 2, + 'keyword-spacing' : 2, + 'linebreak-style' : [ 2, 'unix' ], + 'lines-around-comment': [ 2, { - allowBlockStart : true, - allowObjectStart : true, - beforeBlockComment : false, - beforeLineComment : false + allowBlockStart : true, + allowObjectStart : true, + beforeBlockComment: false, + beforeLineComment : false } ], - 'max-len' : [ 2, 90, + 'max-len': [ 2, 90, { - tabWidth : 2, - comments : 100, - ignoreUrls : true, - ignoreStrings : true, - ignoreTemplateLiterals : true, - ignoreRegExpLiterals : true + tabWidth : 2, + comments : 100, + ignoreUrls : true, + ignoreStrings : true, + ignoreTemplateLiterals: true, + ignoreRegExpLiterals : true } ], - 'newline-after-var' : 2, - 'newline-before-return' : 2, - 'newline-per-chained-call' : 2, - 'no-alert' : 2, - 'no-caller' : 2, - 'no-case-declarations' : 2, - 'no-catch-shadow' : 2, - 'no-class-assign' : 2, - 'no-confusing-arrow' : 2, - 'no-console' : 2, - 'no-const-assign' : 2, - 'no-debugger' : 2, - 'no-dupe-args' : 2, - 'no-dupe-keys' : 2, - 'no-duplicate-case' : 2, - 'no-div-regex' : 2, - 'no-empty' : [ 2, { allowEmptyCatch: true } ], - 'no-empty-pattern' : 2, - 'no-else-return' : 0, - 'no-eval' : 2, - 'no-extend-native' : 2, - 'no-ex-assign' : 2, - 'no-extra-bind' : 2, - 'no-extra-boolean-cast' : 2, - 'no-extra-label' : 2, - 'no-extra-semi' : 2, - 'no-fallthrough' : 2, - 'no-func-assign' : 2, - 'no-global-assign' : 2, - 'no-implicit-coercion' : 2, - 'no-implicit-globals' : 2, - 'no-inner-declarations' : 2, - 'no-invalid-regexp' : 2, - 'no-invalid-this' : 2, - 'no-irregular-whitespace' : 2, - 'no-lonely-if' : 2, - 'no-mixed-operators' : 2, - 'no-mixed-spaces-and-tabs' : 2, - 'no-multi-spaces' : 2, - 'no-multi-str' : 2, - 'no-multiple-empty-lines' : [ 1, { max: 1, maxEOF: 0, maxBOF: 0 } ], - 'no-native-reassign' : 2, - 'no-negated-in-lhs' : 2, - 'no-new' : 2, - 'no-new-func' : 2, - 'no-new-wrappers' : 2, - 'no-obj-calls' : 2, - 'no-proto' : 2, - 'no-prototype-builtins' : 0, - 'no-redeclare' : 2, - 'no-regex-spaces' : 2, - 'no-restricted-imports' : 2, - 'no-return-assign' : 2, - 'no-self-assign' : 2, - 'no-self-compare' : 2, - 'no-sequences' : 2, - 'no-shadow' : 2, - 'no-shadow-restricted-names' : 2, - 'no-spaced-func' : 2, - 'no-sparse-arrays' : 2, - 'no-this-before-super' : 2, - 'no-throw-literal' : 2, - 'no-undef' : 2, - 'no-unexpected-multiline' : 2, - 'no-unmodified-loop-condition' : 2, - 'no-unreachable' : 2, - 'no-unused-vars' : [ 1, { vars: 'all', args: 'after-used' } ], - 'no-use-before-define' : [ 2, { functions: false } ], - 'no-useless-call' : 2, - 'no-useless-computed-key' : 2, - 'no-useless-concat' : 2, - 'no-useless-rename' : 2, - 'no-var' : 2, - 'no-whitespace-before-property' : 2, - 'object-curly-newline' : 0, - 'object-curly-spacing' : [ 2, 'always' ], - 'object-property-newline' : [ 2, { allowMultiplePropertiesPerLine: true } ], - 'prefer-const' : 2, - 'prefer-rest-params' : 2, - 'prefer-spread' : 2, - 'prefer-template' : 2, - 'quotes' : [ 2, 'single', { avoidEscape: true } ], - 'semi' : [ 2, 'always' ], - 'semi-spacing' : 2, - 'space-before-blocks' : 2, - 'space-before-function-paren' : [ 2, + 'newline-after-var' : 2, + 'newline-before-return' : 2, + 'newline-per-chained-call' : 2, + 'no-alert' : 2, + 'no-caller' : 2, + 'no-case-declarations' : 2, + 'no-catch-shadow' : 2, + 'no-class-assign' : 2, + 'no-confusing-arrow' : 2, + 'no-console' : 2, + 'no-const-assign' : 2, + 'no-debugger' : 2, + 'no-dupe-args' : 2, + 'no-dupe-keys' : 2, + 'no-duplicate-case' : 2, + 'no-div-regex' : 2, + 'no-empty' : [ 2, { allowEmptyCatch: true } ], + 'no-empty-pattern' : 2, + 'no-else-return' : 0, + 'no-eval' : 2, + 'no-extend-native' : 2, + 'no-ex-assign' : 2, + 'no-extra-bind' : 2, + 'no-extra-boolean-cast' : 2, + 'no-extra-label' : 2, + 'no-extra-semi' : 2, + 'no-fallthrough' : 2, + 'no-func-assign' : 2, + 'no-global-assign' : 2, + 'no-implicit-coercion' : 2, + 'no-implicit-globals' : 2, + 'no-inner-declarations' : 2, + 'no-invalid-regexp' : 2, + 'no-invalid-this' : 2, + 'no-irregular-whitespace' : 2, + 'no-lonely-if' : 2, + 'no-mixed-operators' : 2, + 'no-mixed-spaces-and-tabs' : 2, + 'no-multi-spaces' : 2, + 'no-multi-str' : 2, + 'no-multiple-empty-lines' : [ 1, { max: 1, maxEOF: 0, maxBOF: 0 } ], + 'no-native-reassign' : 2, + 'no-negated-in-lhs' : 2, + 'no-new' : 2, + 'no-new-func' : 2, + 'no-new-wrappers' : 2, + 'no-obj-calls' : 2, + 'no-proto' : 2, + 'no-prototype-builtins' : 0, + 'no-redeclare' : 2, + 'no-regex-spaces' : 2, + 'no-restricted-imports' : 2, + 'no-return-assign' : 2, + 'no-self-assign' : 2, + 'no-self-compare' : 2, + 'no-sequences' : 2, + 'no-shadow' : 2, + 'no-shadow-restricted-names' : 2, + 'no-spaced-func' : 2, + 'no-sparse-arrays' : 2, + 'no-this-before-super' : 2, + 'no-throw-literal' : 2, + 'no-undef' : 2, + 'no-unexpected-multiline' : 2, + 'no-unmodified-loop-condition' : 2, + 'no-unreachable' : 2, + 'no-unused-vars' : [ 1, { vars: 'all', args: 'after-used' } ], + 'no-use-before-define' : [ 2, { functions: false } ], + 'no-useless-call' : 2, + 'no-useless-computed-key' : 2, + 'no-useless-concat' : 2, + 'no-useless-rename' : 2, + 'no-var' : 2, + 'no-whitespace-before-property': 2, + 'object-curly-newline' : 0, + 'object-curly-spacing' : [ 2, 'always' ], + 'object-property-newline' : [ 2, { allowMultiplePropertiesPerLine: true } ], + 'prefer-const' : 2, + 'prefer-rest-params' : 2, + 'prefer-spread' : 2, + 'prefer-template' : 2, + 'quotes' : [ 2, 'single', { avoidEscape: true } ], + 'semi' : [ 2, 'always' ], + 'semi-spacing' : 2, + 'space-before-blocks' : 2, + 'space-before-function-paren' : [ 2, { - anonymous : 'never', - named : 'never', - asyncArrow : 'always' + anonymous : 'never', + named : 'never', + asyncArrow: 'always' } ], - 'space-in-parens' : [ 2, 'never' ], - 'spaced-comment' : [ 2, 'always' ], - 'strict' : 2, - 'valid-typeof' : 2, - 'yoda' : 2 + 'space-in-parens': [ 2, 'never' ], + 'spaced-comment' : [ 2, 'always' ], + 'strict' : 2, + 'valid-typeof' : 2, + 'yoda' : 2 } }; @@ -194,23 +194,23 @@ switch (process.env.MEDIASOUP_NODE_LANGUAGE) eslintConfig.rules = { ...eslintConfig.rules, - 'no-unused-vars' : 0, - '@typescript-eslint/ban-ts-ignore' : 0, - '@typescript-eslint/member-delimiter-style' : [ 2, + 'no-unused-vars' : 0, + '@typescript-eslint/ban-ts-ignore' : 0, + '@typescript-eslint/member-delimiter-style': [ 2, { - multiline : { delimiter: 'semi', requireLast: true }, - singleline : { delimiter: 'semi', requireLast: false } + multiline : { delimiter: 'semi', requireLast: true }, + singleline: { delimiter: 'semi', requireLast: false } } ], - '@typescript-eslint/no-explicit-any' : 0, - '@typescript-eslint/no-unused-vars' : [ 2, + '@typescript-eslint/no-explicit-any': 0, + '@typescript-eslint/no-unused-vars' : [ 2, { - vars : 'all', - args : 'after-used', - ignoreRestSiblings : false + vars : 'all', + args : 'after-used', + ignoreRestSiblings: false } ], - '@typescript-eslint/no-use-before-define' : 0 + '@typescript-eslint/no-use-before-define': 0 }; break; diff --git a/package.json b/package.json index 33b2ec3f..717140fe 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@types/uuid": "^3.4.6", "@typescript-eslint/eslint-plugin": "^2.8.0", "@typescript-eslint/parser": "^2.8.0", - "eslint": "^6.6.0", + "eslint": "^6.7.0", "eslint-plugin-jest": "^23.0.4", "jest": "^24.9.0", "jest-tobetype": "^1.2.3", diff --git a/src/Device.ts b/src/Device.ts index a4d3b369..ee5a10e9 100644 --- a/src/Device.ts +++ b/src/Device.ts @@ -215,8 +215,8 @@ export default class Device this._canProduceByKind = { - audio : false, - video : false + audio: false, + video: false }; this._sctpCapabilities = null; @@ -355,17 +355,17 @@ export default class Device return this._createTransport( { - direction : 'send', - id : id, - iceParameters : iceParameters, - iceCandidates : iceCandidates, - dtlsParameters : dtlsParameters, - sctpParameters : sctpParameters, - iceServers : iceServers, - iceTransportPolicy : iceTransportPolicy, - additionalSettings : additionalSettings, - proprietaryConstraints : proprietaryConstraints, - appData : appData + direction : 'send', + id : id, + iceParameters : iceParameters, + iceCandidates : iceCandidates, + dtlsParameters : dtlsParameters, + sctpParameters : sctpParameters, + iceServers : iceServers, + iceTransportPolicy : iceTransportPolicy, + additionalSettings : additionalSettings, + proprietaryConstraints: proprietaryConstraints, + appData : appData }); } @@ -394,17 +394,17 @@ export default class Device return this._createTransport( { - direction : 'recv', - id : id, - iceParameters : iceParameters, - iceCandidates : iceCandidates, - dtlsParameters : dtlsParameters, - sctpParameters : sctpParameters, - iceServers : iceServers, - iceTransportPolicy : iceTransportPolicy, - additionalSettings : additionalSettings, - proprietaryConstraints : proprietaryConstraints, - appData : appData + direction : 'recv', + id : id, + iceParameters : iceParameters, + iceCandidates : iceCandidates, + dtlsParameters : dtlsParameters, + sctpParameters : sctpParameters, + iceServers : iceServers, + iceTransportPolicy : iceTransportPolicy, + additionalSettings : additionalSettings, + proprietaryConstraints: proprietaryConstraints, + appData : appData }); } @@ -455,9 +455,9 @@ export default class Device additionalSettings, proprietaryConstraints, appData, - Handler : this._Handler, - extendedRtpCapabilities : this._extendedRtpCapabilities, - canProduceByKind : this._canProduceByKind + Handler : this._Handler, + extendedRtpCapabilities: this._extendedRtpCapabilities, + canProduceByKind : this._canProduceByKind }); return transport; diff --git a/src/Transport.ts b/src/Transport.ts index 11480808..36fa1e0d 100644 --- a/src/Transport.ts +++ b/src/Transport.ts @@ -470,7 +470,7 @@ export default class Transport extends EnhancedEventEmitter const { localId, rtpParameters } = await this._handler.send( { track, - encodings : normalizedEncodings, + encodings: normalizedEncodings, codecOptions }); @@ -479,7 +479,7 @@ export default class Transport extends EnhancedEventEmitter const { id } = await this.safeEmitAsPromise( 'produce', { - kind : track.kind, + kind: track.kind, rtpParameters, appData }); @@ -574,9 +574,9 @@ export default class Transport extends EnhancedEventEmitter await this._handler.receive( { - id : 'probator', - kind : 'video', - rtpParameters : probatorRtpParameters + id : 'probator', + kind : 'video', + rtpParameters: probatorRtpParameters }); logger.debug('consume() | Consumer for RTP probation created'); diff --git a/src/handlers/Chrome55.ts b/src/handlers/Chrome55.ts index d5571c23..8f7f974e 100644 --- a/src/handlers/Chrome55.ts +++ b/src/handlers/Chrome55.ts @@ -77,16 +77,16 @@ class Handler extends EnhancedEventEmitter iceCandidates, dtlsParameters, sctpParameters, - planB : true + planB: true }); this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'plan-b', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'plan-b', ...additionalSettings }, proprietaryConstraints); @@ -232,7 +232,7 @@ export class SendHandler extends Handler { offerMediaObject, track, - numStreams : encodings.length + numStreams: encodings.length }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -281,8 +281,8 @@ export class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -397,11 +397,11 @@ export class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated : true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol, priority @@ -445,10 +445,10 @@ export class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -507,9 +507,9 @@ class RecvHandler extends Handler { mid, kind, - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, streamId, - trackId : localId + trackId : localId }); const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -528,7 +528,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -606,11 +606,11 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated : true, + id : streamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol }; @@ -694,19 +694,19 @@ export default class Chrome55 const pc = new (RTCPeerConnection as any)( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'plan-b' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'plan-b' }); try { const offer = await pc.createOffer( { - offerToReceiveAudio : true, - offerToReceiveVideo : true + offerToReceiveAudio: true, + offerToReceiveVideo: true }); try { pc.close(); } @@ -732,7 +732,7 @@ export default class Chrome55 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -771,14 +771,14 @@ export default class Chrome55 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/Chrome67.ts b/src/handlers/Chrome67.ts index cefbbe51..e8362b1d 100644 --- a/src/handlers/Chrome67.ts +++ b/src/handlers/Chrome67.ts @@ -76,16 +76,16 @@ class Handler extends EnhancedEventEmitter iceCandidates, dtlsParameters, sctpParameters, - planB : true + planB: true }); this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'plan-b', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'plan-b', ...additionalSettings }, proprietaryConstraints); @@ -230,7 +230,7 @@ class SendHandler extends Handler { offerMediaObject, track, - numStreams : encodings.length + numStreams: encodings.length }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -279,8 +279,8 @@ class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -458,11 +458,11 @@ class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated : true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol, priority @@ -506,10 +506,10 @@ class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -569,9 +569,9 @@ class RecvHandler extends Handler { mid, kind, - offerRtpParameters : rtpParameters, - streamId : rtpParameters.rtcp.cname, - trackId : localId + offerRtpParameters: rtpParameters, + streamId : rtpParameters.rtcp.cname, + trackId : localId }); const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -590,7 +590,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -669,11 +669,11 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated : true, + id : streamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol }; @@ -757,19 +757,19 @@ export default class Chrome67 const pc = new (RTCPeerConnection as any)( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'plan-b' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'plan-b' }); try { const offer = await pc.createOffer( { - offerToReceiveAudio : true, - offerToReceiveVideo : true + offerToReceiveAudio: true, + offerToReceiveVideo: true }); try { pc.close(); } @@ -795,7 +795,7 @@ export default class Chrome67 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -834,14 +834,14 @@ export default class Chrome67 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/Chrome70.ts b/src/handlers/Chrome70.ts index 8c8df6fd..74a0f802 100644 --- a/src/handlers/Chrome70.ts +++ b/src/handlers/Chrome70.ts @@ -84,11 +84,11 @@ class Handler extends EnhancedEventEmitter this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'unified-plan', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'unified-plan', ...additionalSettings }, proprietaryConstraints); @@ -225,7 +225,7 @@ class SendHandler extends Handler sdpUnifiedPlanUtils.addLegacySimulcast( { offerMediaObject, - numStreams : encodings.length + numStreams: encodings.length }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -253,7 +253,7 @@ class SendHandler extends Handler sdpUnifiedPlanUtils.addLegacySimulcast( { offerMediaObject, - numStreams : layers.spatialLayers + numStreams: layers.spatialLayers }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -314,9 +314,9 @@ class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - reuseMid : mediaSectionIdx.reuseMid, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + reuseMid : mediaSectionIdx.reuseMid, + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -452,11 +452,11 @@ class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated : true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol, priority @@ -500,10 +500,10 @@ class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -560,11 +560,11 @@ class RecvHandler extends Handler this._remoteSdp.receive( { - mid : localId, + mid : localId, kind, - offerRtpParameters : rtpParameters, - streamId : rtpParameters.rtcp.cname, - trackId : id + offerRtpParameters: rtpParameters, + streamId : rtpParameters.rtcp.cname, + trackId : id }); const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -583,7 +583,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -664,11 +664,11 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated : true, + id : streamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol }; @@ -752,11 +752,11 @@ export default class Chrome70 const pc = new (RTCPeerConnection as any)( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'unified-plan' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'unified-plan' }); try @@ -789,7 +789,7 @@ export default class Chrome70 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -828,14 +828,14 @@ export default class Chrome70 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/Chrome74.ts b/src/handlers/Chrome74.ts index 071cadb5..0c9904e2 100644 --- a/src/handlers/Chrome74.ts +++ b/src/handlers/Chrome74.ts @@ -84,11 +84,11 @@ class Handler extends EnhancedEventEmitter this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'unified-plan', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'unified-plan', ...additionalSettings }, proprietaryConstraints); @@ -215,9 +215,9 @@ class SendHandler extends Handler const transceiver = this._pc.addTransceiver( track, { - direction : 'sendonly', - streams : [ this._stream ], - sendEncodings : encodings + direction : 'sendonly', + streams : [ this._stream ], + sendEncodings: encodings }); let offer = await this._pc.createOffer(); let localSdpObject = sdpTransform.parse(offer.sdp); @@ -253,7 +253,7 @@ class SendHandler extends Handler sdpUnifiedPlanUtils.addLegacySimulcast( { offerMediaObject, - numStreams : layers.spatialLayers + numStreams: layers.spatialLayers }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -320,9 +320,9 @@ class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - reuseMid : mediaSectionIdx.reuseMid, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + reuseMid : mediaSectionIdx.reuseMid, + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -458,8 +458,8 @@ class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated: true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -506,10 +506,10 @@ class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -566,11 +566,11 @@ class RecvHandler extends Handler this._remoteSdp.receive( { - mid : localId, + mid : localId, kind, - offerRtpParameters : rtpParameters, - streamId : rtpParameters.rtcp.cname, - trackId : id + offerRtpParameters: rtpParameters, + streamId : rtpParameters.rtcp.cname, + trackId : id }); const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -589,7 +589,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -670,8 +670,8 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated: true, + id : streamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -757,11 +757,11 @@ export default class Chrome74 const pc = new (RTCPeerConnection as any)( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'unified-plan' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'unified-plan' }); try @@ -794,7 +794,7 @@ export default class Chrome74 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -833,14 +833,14 @@ export default class Chrome74 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/Edge11.ts b/src/handlers/Edge11.ts index 7f2d42b8..44b1441d 100644 --- a/src/handlers/Edge11.ts +++ b/src/handlers/Edge11.ts @@ -29,7 +29,7 @@ export default class Edge11 extends EnhancedEventEmitter logger.debug('getNativeSctpCapabilities()'); return { - numStreams : 0 + numStreams: 0 }; } @@ -99,8 +99,8 @@ export default class Edge11 extends EnhancedEventEmitter this._sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; this._remoteIceParameters = iceParameters; @@ -184,9 +184,9 @@ export default class Edge11 extends EnhancedEventEmitter // Fill RTCRtpParameters.rtcp. rtpParameters.rtcp = { - cname : this._cname, - reducedSize : true, - mux : true + cname : this._cname, + reducedSize: true, + mux : true }; // NOTE: Convert our standard RTCRtpParameters into those that Edge @@ -439,8 +439,8 @@ export default class Edge11 extends EnhancedEventEmitter { const iceGatherer = new (RTCIceGatherer as any)( { - iceServers : iceServers || [], - gatherPolicy : iceTransportPolicy || 'all' + iceServers : iceServers || [], + gatherPolicy: iceTransportPolicy || 'all' }); iceGatherer.addEventListener('error', (event: any) => diff --git a/src/handlers/Firefox60.ts b/src/handlers/Firefox60.ts index acbbc2f5..f3c27dc5 100644 --- a/src/handlers/Firefox60.ts +++ b/src/handlers/Firefox60.ts @@ -84,10 +84,10 @@ class Handler extends EnhancedEventEmitter this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', ...additionalSettings }, proprietaryConstraints); @@ -298,9 +298,9 @@ class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - reuseMid : mediaSectionIdx.reuseMid, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + reuseMid : mediaSectionIdx.reuseMid, + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -440,8 +440,8 @@ class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated: true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -487,10 +487,10 @@ class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -547,11 +547,11 @@ class RecvHandler extends Handler this._remoteSdp.receive( { - mid : localId, + mid : localId, kind, - offerRtpParameters : rtpParameters, - streamId : rtpParameters.rtcp.cname, - trackId : id + offerRtpParameters: rtpParameters, + streamId : rtpParameters.rtcp.cname, + trackId : id }); const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -570,7 +570,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -651,8 +651,8 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated: true, + id : streamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -738,10 +738,10 @@ export default class Firefox60 const pc = new RTCPeerConnection( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require' }); // NOTE: We need to add a real video track to get the RID extension mapping. @@ -806,7 +806,7 @@ export default class Firefox60 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -845,14 +845,14 @@ export default class Firefox60 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/ReactNative.ts b/src/handlers/ReactNative.ts index 9edd1aad..40840321 100644 --- a/src/handlers/ReactNative.ts +++ b/src/handlers/ReactNative.ts @@ -77,16 +77,16 @@ class Handler extends EnhancedEventEmitter iceCandidates, dtlsParameters, sctpParameters, - planB : true + planB: true }); this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'plan-b', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'plan-b', ...additionalSettings }, proprietaryConstraints); @@ -212,8 +212,8 @@ export class SendHandler extends Handler let offer = await this._pc.createOffer( { - offerToReceiveAudio : false, - offerToReceiveVideo : false + offerToReceiveAudio: false, + offerToReceiveVideo: false }); let localSdpObject = sdpTransform.parse(offer.sdp); let offerMediaObject; @@ -235,7 +235,7 @@ export class SendHandler extends Handler { offerMediaObject, track, - numStreams : encodings.length + numStreams: encodings.length }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -289,8 +289,8 @@ export class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -326,8 +326,8 @@ export class SendHandler extends Handler const offer = await this._pc.createOffer( { - offerToReceiveAudio : false, - offerToReceiveVideo : false + offerToReceiveAudio: false, + offerToReceiveVideo: false }); logger.debug( @@ -452,11 +452,11 @@ export class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated : true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol, priority @@ -475,8 +475,8 @@ export class SendHandler extends Handler { const offer = await this._pc.createOffer( { - offerToReceiveAudio : false, - offerToReceiveVideo : false + offerToReceiveAudio: false, + offerToReceiveVideo: false }); const localSdpObject = sdpTransform.parse(offer.sdp); const offerMediaObject = localSdpObject.media @@ -504,10 +504,10 @@ export class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -528,9 +528,9 @@ export class SendHandler extends Handler const offer = await this._pc.createOffer( { - iceRestart : true, - offerToReceiveAudio : false, - offerToReceiveVideo : false + iceRestart : true, + offerToReceiveAudio: false, + offerToReceiveVideo: false }); logger.debug( @@ -584,9 +584,9 @@ class RecvHandler extends Handler { mid, kind, - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, streamId, - trackId : localId + trackId : localId }); const offer: RTCSessionDescriptionInit = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -607,7 +607,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -689,11 +689,11 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated : true, + id : streamId, ordered, maxPacketLifeTime, - maxRetransmitTime : maxPacketLifeTime, // NOTE: Old spec. + maxRetransmitTime: maxPacketLifeTime, // NOTE: Old spec. maxRetransmits, protocol }; @@ -779,19 +779,19 @@ export default class ReactNative const pc = new (RTCPeerConnection as any)( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', - sdpSemantics : 'plan-b' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', + sdpSemantics : 'plan-b' }); try { const offer = await pc.createOffer( { - offerToReceiveAudio : true, - offerToReceiveVideo : true + offerToReceiveAudio: true, + offerToReceiveVideo: true }); try { pc.close(); } @@ -817,7 +817,7 @@ export default class ReactNative logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -856,14 +856,14 @@ export default class ReactNative { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/Safari11.ts b/src/handlers/Safari11.ts index 3227b8ab..a0e3e8cb 100644 --- a/src/handlers/Safari11.ts +++ b/src/handlers/Safari11.ts @@ -76,15 +76,15 @@ class Handler extends EnhancedEventEmitter iceCandidates, dtlsParameters, sctpParameters, - planB : true + planB: true }); this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', ...additionalSettings }, proprietaryConstraints); @@ -229,7 +229,7 @@ class SendHandler extends Handler { offerMediaObject, track, - numStreams : encodings.length + numStreams: encodings.length }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -281,8 +281,8 @@ class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -460,8 +460,8 @@ class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated: true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -507,10 +507,10 @@ class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -570,9 +570,9 @@ class RecvHandler extends Handler { mid, kind, - offerRtpParameters : rtpParameters, - streamId : rtpParameters.rtcp.cname, - trackId : localId + offerRtpParameters: rtpParameters, + streamId : rtpParameters.rtcp.cname, + trackId : localId }); const offer: RTCSessionDescriptionInit = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -591,7 +591,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -670,8 +670,8 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated: true, + id : streamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -757,10 +757,10 @@ export default class Safari11 const pc = new RTCPeerConnection( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require' }); try @@ -793,7 +793,7 @@ export default class Safari11 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -832,14 +832,14 @@ export default class Safari11 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/Safari12.ts b/src/handlers/Safari12.ts index e27e67e6..e3992311 100644 --- a/src/handlers/Safari12.ts +++ b/src/handlers/Safari12.ts @@ -83,10 +83,10 @@ class Handler extends EnhancedEventEmitter this._pc = new (RTCPeerConnection as any)( { - iceServers : iceServers || [], - iceTransportPolicy : iceTransportPolicy || 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require', + iceServers : iceServers || [], + iceTransportPolicy: iceTransportPolicy || 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require', ...additionalSettings }, proprietaryConstraints); @@ -223,7 +223,7 @@ class SendHandler extends Handler sdpUnifiedPlanUtils.addLegacySimulcast( { offerMediaObject, - numStreams : encodings.length + numStreams: encodings.length }); offer = { type: 'offer', sdp: sdpTransform.write(localSdpObject) }; @@ -280,9 +280,9 @@ class SendHandler extends Handler this._remoteSdp.send( { offerMediaObject, - reuseMid : mediaSectionIdx.reuseMid, - offerRtpParameters : sendingRtpParameters, - answerRtpParameters : this._sendingRemoteRtpParametersByKind[track.kind], + reuseMid : mediaSectionIdx.reuseMid, + offerRtpParameters : sendingRtpParameters, + answerRtpParameters: this._sendingRemoteRtpParametersByKind[track.kind], codecOptions }); @@ -418,8 +418,8 @@ class SendHandler extends Handler const options = { - negotiated : true, - id : this._nextSctpStreamId, + negotiated: true, + id : this._nextSctpStreamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -465,10 +465,10 @@ class SendHandler extends Handler const sctpStreamParameters = { - streamId : options.id, - ordered : options.ordered, - maxPacketLifeTime : options.maxPacketLifeTime, - maxRetransmits : options.maxRetransmits + streamId : options.id, + ordered : options.ordered, + maxPacketLifeTime: options.maxPacketLifeTime, + maxRetransmits : options.maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -525,11 +525,11 @@ class RecvHandler extends Handler this._remoteSdp.receive( { - mid : localId, + mid : localId, kind, - offerRtpParameters : rtpParameters, - streamId : rtpParameters.rtcp.cname, - trackId : id + offerRtpParameters: rtpParameters, + streamId : rtpParameters.rtcp.cname, + trackId : id }); const offer = { type: 'offer', sdp: this._remoteSdp.getSdp() }; @@ -548,7 +548,7 @@ class RecvHandler extends Handler // parameters in the offer. sdpCommonUtils.applyCodecParameters( { - offerRtpParameters : rtpParameters, + offerRtpParameters: rtpParameters, answerMediaObject }); @@ -619,8 +619,8 @@ class RecvHandler extends Handler const options = { - negotiated : true, - id : streamId, + negotiated: true, + id : streamId, ordered, maxPacketLifeTime, maxRetransmits, @@ -716,10 +716,10 @@ export default class Safari12 const pc = new RTCPeerConnection( { - iceServers : [], - iceTransportPolicy : 'all', - bundlePolicy : 'max-bundle', - rtcpMuxPolicy : 'require' + iceServers : [], + iceTransportPolicy: 'all', + bundlePolicy : 'max-bundle', + rtcpMuxPolicy : 'require' }); try @@ -752,7 +752,7 @@ export default class Safari12 logger.debug('getNativeSctpCapabilities()'); return { - numStreams : SCTP_NUM_STREAMS + numStreams: SCTP_NUM_STREAMS }; } @@ -791,14 +791,14 @@ export default class Safari12 { const sendingRtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; const sendingRemoteRtpParametersByKind = { - audio : ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRemoteRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRemoteRtpParameters('video', extendedRtpCapabilities) }; return new SendHandler( diff --git a/src/handlers/sdp/MediaSection.ts b/src/handlers/sdp/MediaSection.ts index a6cb019d..161af322 100644 --- a/src/handlers/sdp/MediaSection.ts +++ b/src/handlers/sdp/MediaSection.ts @@ -148,8 +148,8 @@ export class AnswerMediaSection extends MediaSection { this._mediaObject.connection = { - ip : plainRtpParameters.ip, - version : plainRtpParameters.ipVersion + ip : plainRtpParameters.ip, + version: plainRtpParameters.ipVersion }; this._mediaObject.port = plainRtpParameters.port; } @@ -168,9 +168,9 @@ export class AnswerMediaSection extends MediaSection { const rtp: any = { - payload : codec.payloadType, - codec : codec.mimeType.replace(/^.*\//, ''), - rate : codec.clockRate + payload: codec.payloadType, + codec : codec.mimeType.replace(/^.*\//, ''), + rate : codec.clockRate }; if (codec.channels > 1) @@ -244,8 +244,8 @@ export class AnswerMediaSection extends MediaSection const fmtp = { - payload : codec.payloadType, - config : '' + payload: codec.payloadType, + config : '' }; for (const key of Object.keys(codecParameters)) @@ -265,9 +265,9 @@ export class AnswerMediaSection extends MediaSection { this._mediaObject.rtcpFb.push( { - payload : codec.payloadType, - type : fb.type, - subtype : fb.parameter || '' + payload: codec.payloadType, + type : fb.type, + subtype: fb.parameter || '' }); } } @@ -290,8 +290,8 @@ export class AnswerMediaSection extends MediaSection this._mediaObject.ext.push( { - uri : ext.uri, - value : ext.id + uri : ext.uri, + value: ext.id }); } @@ -304,8 +304,8 @@ export class AnswerMediaSection extends MediaSection { this._mediaObject.simulcast = { - dir1 : 'recv', - list1 : offerMediaObject.simulcast.list1 + dir1 : 'recv', + list1: offerMediaObject.simulcast.list1 }; this._mediaObject.rids = []; @@ -317,8 +317,8 @@ export class AnswerMediaSection extends MediaSection this._mediaObject.rids.push( { - id : rid.id, - direction : 'recv' + id : rid.id, + direction: 'recv' }); } } @@ -328,7 +328,7 @@ export class AnswerMediaSection extends MediaSection // eslint-disable-next-line camelcase, @typescript-eslint/camelcase this._mediaObject.simulcast_03 = { - value : offerMediaObject.simulcast_03.value.replace(/send/g, 'recv') + value: offerMediaObject.simulcast_03.value.replace(/send/g, 'recv') }; this._mediaObject.rids = []; @@ -340,8 +340,8 @@ export class AnswerMediaSection extends MediaSection this._mediaObject.rids.push( { - id : rid.id, - direction : 'recv' + id : rid.id, + direction: 'recv' }); } } @@ -370,9 +370,9 @@ export class AnswerMediaSection extends MediaSection this._mediaObject.payloads = sctpParameters.port; this._mediaObject.sctpmap = { - app : 'webrtc-datachannel', - sctpmapNumber : sctpParameters.port, - maxMessageSize : sctpParameters.maxMessageSize + app : 'webrtc-datachannel', + sctpmapNumber : sctpParameters.port, + maxMessageSize: sctpParameters.maxMessageSize }; } @@ -436,8 +436,8 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.connection = { - ip : plainRtpParameters.ip, - version : plainRtpParameters.ipVersion + ip : plainRtpParameters.ip, + version: plainRtpParameters.ipVersion }; this._mediaObject.protocol = 'RTP/AVP'; this._mediaObject.port = plainRtpParameters.port; @@ -460,9 +460,9 @@ export class OfferMediaSection extends MediaSection { const rtp: any = { - payload : codec.payloadType, - codec : codec.mimeType.replace(/^.*\//, ''), - rate : codec.clockRate + payload: codec.payloadType, + codec : codec.mimeType.replace(/^.*\//, ''), + rate : codec.clockRate }; if (codec.channels > 1) @@ -474,8 +474,8 @@ export class OfferMediaSection extends MediaSection { const fmtp = { - payload : codec.payloadType, - config : '' + payload: codec.payloadType, + config : '' }; for (const key of Object.keys(codec.parameters)) @@ -496,9 +496,9 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.rtcpFb.push( { - payload : codec.payloadType, - type : fb.type, - subtype : fb.parameter || '' + payload: codec.payloadType, + type : fb.type, + subtype: fb.parameter || '' }); } } @@ -514,8 +514,8 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ext.push( { - uri : ext.uri, - value : ext.id + uri : ext.uri, + value: ext.id }); } @@ -535,9 +535,9 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ssrcs.push( { - id : ssrc, - attribute : 'cname', - value : offerRtpParameters.rtcp.cname + id : ssrc, + attribute: 'cname', + value : offerRtpParameters.rtcp.cname }); } @@ -545,9 +545,9 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ssrcs.push( { - id : ssrc, - attribute : 'msid', - value : `${streamId || '-'} ${trackId}` + id : ssrc, + attribute: 'msid', + value : `${streamId || '-'} ${trackId}` }); } @@ -557,9 +557,9 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'cname', - value : offerRtpParameters.rtcp.cname + id : rtxSsrc, + attribute: 'cname', + value : offerRtpParameters.rtcp.cname }); } @@ -567,17 +567,17 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'msid', - value : `${streamId || '-'} ${trackId}` + id : rtxSsrc, + attribute: 'msid', + value : `${streamId || '-'} ${trackId}` }); } // Associate original and retransmission SSRCs. this._mediaObject.ssrcGroups.push( { - semantics : 'FID', - ssrcs : `${ssrc} ${rtxSsrc}` + semantics: 'FID', + ssrcs : `${ssrc} ${rtxSsrc}` }); } @@ -599,9 +599,9 @@ export class OfferMediaSection extends MediaSection this._mediaObject.payloads = sctpParameters.port; this._mediaObject.sctpmap = { - app : 'webrtc-datachannel', - sctpmapNumber : sctpParameters.port, - maxMessageSize : sctpParameters.maxMessageSize + app : 'webrtc-datachannel', + sctpmapNumber : sctpParameters.port, + maxMessageSize: sctpParameters.maxMessageSize }; } @@ -640,17 +640,17 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ssrcs.push( { - id : ssrc, - attribute : 'cname', - value : offerRtpParameters.rtcp.cname + id : ssrc, + attribute: 'cname', + value : offerRtpParameters.rtcp.cname }); } this._mediaObject.ssrcs.push( { - id : ssrc, - attribute : 'msid', - value : `${streamId || '-'} ${trackId}` + id : ssrc, + attribute: 'msid', + value : `${streamId || '-'} ${trackId}` }); if (rtxSsrc) @@ -659,24 +659,24 @@ export class OfferMediaSection extends MediaSection { this._mediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'cname', - value : offerRtpParameters.rtcp.cname + id : rtxSsrc, + attribute: 'cname', + value : offerRtpParameters.rtcp.cname }); } this._mediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'msid', - value : `${streamId || '-'} ${trackId}` + id : rtxSsrc, + attribute: 'msid', + value : `${streamId || '-'} ${trackId}` }); // Associate original and retransmission SSRCs. this._mediaObject.ssrcGroups.push( { - semantics : 'FID', - ssrcs : `${ssrc} ${rtxSsrc}` + semantics: 'FID', + ssrcs : `${ssrc} ${rtxSsrc}` }); } } diff --git a/src/handlers/sdp/RemoteSdp.ts b/src/handlers/sdp/RemoteSdp.ts index f6c4bd00..eb981fe0 100644 --- a/src/handlers/sdp/RemoteSdp.ts +++ b/src/handlers/sdp/RemoteSdp.ts @@ -78,19 +78,19 @@ export default class RemoteSdp this._sdpObject = { - version : 0, - origin : + version: 0, + origin : { - address : '0.0.0.0', - ipVer : 4, - netType : 'IN', - sessionId : 10000, - sessionVersion : 0, - username : 'mediasoup-client' + address : '0.0.0.0', + ipVer : 4, + netType : 'IN', + sessionId : 10000, + sessionVersion: 0, + username : 'mediasoup-client' }, - name : '-', - timing : { start: 0, stop: 0 }, - media : [] + name : '-', + timing: { start: 0, stop: 0 }, + media : [] }; // If ICE parameters are given, add ICE-Lite indicator. @@ -109,8 +109,8 @@ export default class RemoteSdp this._sdpObject.fingerprint = { - type : dtlsParameters.fingerprints[numFingerprints - 1].algorithm, - hash : dtlsParameters.fingerprints[numFingerprints - 1].value + type: dtlsParameters.fingerprints[numFingerprints - 1].algorithm, + hash: dtlsParameters.fingerprints[numFingerprints - 1].value }; this._sdpObject.groups = [ { type: 'BUNDLE', mids: '' } ]; @@ -187,11 +187,11 @@ export default class RemoteSdp { const mediaSection = new AnswerMediaSection( { - iceParameters : this._iceParameters, - iceCandidates : this._iceCandidates, - dtlsParameters : this._dtlsParameters, - plainRtpParameters : this._plainRtpParameters, - planB : this._planB, + iceParameters : this._iceParameters, + iceCandidates : this._iceCandidates, + dtlsParameters : this._dtlsParameters, + plainRtpParameters: this._plainRtpParameters, + planB : this._planB, offerMediaObject, offerRtpParameters, answerRtpParameters, @@ -237,11 +237,11 @@ export default class RemoteSdp { const mediaSection = new OfferMediaSection( { - iceParameters : this._iceParameters, - iceCandidates : this._iceCandidates, - dtlsParameters : this._dtlsParameters, - plainRtpParameters : this._plainRtpParameters, - planB : this._planB, + iceParameters : this._iceParameters, + iceCandidates : this._iceCandidates, + dtlsParameters : this._dtlsParameters, + plainRtpParameters: this._plainRtpParameters, + planB : this._planB, mid, kind, offerRtpParameters, @@ -306,11 +306,11 @@ export default class RemoteSdp { const mediaSection = new AnswerMediaSection( { - iceParameters : this._iceParameters, - iceCandidates : this._iceCandidates, - dtlsParameters : this._dtlsParameters, - sctpParameters : this._sctpParameters, - plainRtpParameters : this._plainRtpParameters, + iceParameters : this._iceParameters, + iceCandidates : this._iceCandidates, + dtlsParameters : this._dtlsParameters, + sctpParameters : this._sctpParameters, + plainRtpParameters: this._plainRtpParameters, offerMediaObject }); @@ -321,13 +321,13 @@ export default class RemoteSdp { const mediaSection = new OfferMediaSection( { - iceParameters : this._iceParameters, - iceCandidates : this._iceCandidates, - dtlsParameters : this._dtlsParameters, - sctpParameters : this._sctpParameters, - plainRtpParameters : this._plainRtpParameters, - mid : 'datachannel', - kind : 'application', + iceParameters : this._iceParameters, + iceCandidates : this._iceCandidates, + dtlsParameters : this._dtlsParameters, + sctpParameters : this._sctpParameters, + plainRtpParameters: this._plainRtpParameters, + mid : 'datachannel', + kind : 'application', oldDataChannelSpec }); diff --git a/src/handlers/sdp/commonUtils.ts b/src/handlers/sdp/commonUtils.ts index 658bf60a..979da915 100644 --- a/src/handlers/sdp/commonUtils.ts +++ b/src/handlers/sdp/commonUtils.ts @@ -52,13 +52,13 @@ export function extractRtpCapabilities({ sdpObject }: { sdpObject: any }): RtpCa { const codec: RtpCodecCapability = { - mimeType : `${kind}/${rtp.codec}`, - kind : kind, - clockRate : rtp.rate, - preferredPayloadType : rtp.payload, - channels : rtp.encoding, - rtcpFeedback : [], - parameters : {} + mimeType : `${kind}/${rtp.codec}`, + kind : kind, + clockRate : rtp.rate, + preferredPayloadType: rtp.payload, + channels : rtp.encoding, + rtcpFeedback : [], + parameters : {} }; if (codec.kind !== 'audio') @@ -99,8 +99,8 @@ export function extractRtpCapabilities({ sdpObject }: { sdpObject: any }): RtpCa const feedback = { - type : fb.type, - parameter : fb.subtype + type : fb.type, + parameter: fb.subtype }; if (!feedback.parameter) @@ -114,9 +114,9 @@ export function extractRtpCapabilities({ sdpObject }: { sdpObject: any }): RtpCa { const headerExtension = { - kind : kind, - uri : ext.uri, - preferredId : ext.value + kind : kind, + uri : ext.uri, + preferredId: ext.value }; headerExtensions.push(headerExtension); @@ -125,9 +125,9 @@ export function extractRtpCapabilities({ sdpObject }: { sdpObject: any }): RtpCa const rtpCapabilities: RtpCapabilities = { - codecs : Array.from(codecsMap.values()), - headerExtensions : headerExtensions, - fecMechanisms : [] + codecs : Array.from(codecsMap.values()), + headerExtensions: headerExtensions, + fecMechanisms : [] }; return rtpCapabilities; @@ -169,11 +169,11 @@ export function extractDtlsParameters(param: { sdpObject: any }): any const dtlsParameters = { role, - fingerprints : + fingerprints: [ { - algorithm : fingerprint.type, - value : fingerprint.hash + algorithm: fingerprint.type, + value : fingerprint.hash } ] }; diff --git a/src/handlers/sdp/plainRtpUtils.ts b/src/handlers/sdp/plainRtpUtils.ts index 15708364..9ff810e6 100644 --- a/src/handlers/sdp/plainRtpUtils.ts +++ b/src/handlers/sdp/plainRtpUtils.ts @@ -22,9 +22,9 @@ export function extractPlainRtpParameters( const connectionObject = mediaObject.connection || sdpObject.connection; return { - ip : connectionObject.ip, - ipVersion : connectionObject.version, - port : mediaObject.port + ip : connectionObject.ip, + ipVersion: connectionObject.version, + port : mediaObject.port }; } diff --git a/src/handlers/sdp/planBUtils.ts b/src/handlers/sdp/planBUtils.ts index c1803c90..921919b8 100644 --- a/src/handlers/sdp/planBUtils.ts +++ b/src/handlers/sdp/planBUtils.ts @@ -173,8 +173,8 @@ export function addLegacySimulcast( offerMediaObject.ssrcGroups.push( { - semantics : 'SIM', - ssrcs : ssrcs.join(' ') + semantics: 'SIM', + ssrcs : ssrcs.join(' ') }); for (let i = 0; i < ssrcs.length; ++i) @@ -183,16 +183,16 @@ export function addLegacySimulcast( offerMediaObject.ssrcs.push( { - id : ssrc, - attribute : 'cname', - value : cname + id : ssrc, + attribute: 'cname', + value : cname }); offerMediaObject.ssrcs.push( { - id : ssrc, - attribute : 'msid', - value : `${streamId} ${track.id}` + id : ssrc, + attribute: 'msid', + value : `${streamId} ${track.id}` }); } @@ -203,22 +203,22 @@ export function addLegacySimulcast( offerMediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'cname', - value : cname + id : rtxSsrc, + attribute: 'cname', + value : cname }); offerMediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'msid', - value : `${streamId} ${track.id}` + id : rtxSsrc, + attribute: 'msid', + value : `${streamId} ${track.id}` }); offerMediaObject.ssrcGroups.push( { - semantics : 'FID', - ssrcs : `${ssrc} ${rtxSsrc}` + semantics: 'FID', + ssrcs : `${ssrc} ${rtxSsrc}` }); } } diff --git a/src/handlers/sdp/unifiedPlanUtils.ts b/src/handlers/sdp/unifiedPlanUtils.ts index dc87da89..32564d71 100644 --- a/src/handlers/sdp/unifiedPlanUtils.ts +++ b/src/handlers/sdp/unifiedPlanUtils.ts @@ -139,8 +139,8 @@ export function addLegacySimulcast( offerMediaObject.ssrcGroups.push( { - semantics : 'SIM', - ssrcs : ssrcs.join(' ') + semantics: 'SIM', + ssrcs : ssrcs.join(' ') }); for (let i = 0; i < ssrcs.length; ++i) @@ -149,16 +149,16 @@ export function addLegacySimulcast( offerMediaObject.ssrcs.push( { - id : ssrc, - attribute : 'cname', - value : cname + id : ssrc, + attribute: 'cname', + value : cname }); offerMediaObject.ssrcs.push( { - id : ssrc, - attribute : 'msid', - value : `${streamId} ${trackId}` + id : ssrc, + attribute: 'msid', + value : `${streamId} ${trackId}` }); } @@ -169,22 +169,22 @@ export function addLegacySimulcast( offerMediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'cname', - value : cname + id : rtxSsrc, + attribute: 'cname', + value : cname }); offerMediaObject.ssrcs.push( { - id : rtxSsrc, - attribute : 'msid', - value : `${streamId} ${trackId}` + id : rtxSsrc, + attribute: 'msid', + value : `${streamId} ${trackId}` }); offerMediaObject.ssrcGroups.push( { - semantics : 'FID', - ssrcs : `${ssrc} ${rtxSsrc}` + semantics: 'FID', + ssrcs : `${ssrc} ${rtxSsrc}` }); } } diff --git a/src/ortc.ts b/src/ortc.ts index bdae6776..a3d361dc 100644 --- a/src/ortc.ts +++ b/src/ortc.ts @@ -13,9 +13,9 @@ export function getExtendedRtpCapabilities( { const extendedRtpCapabilities: any = { - codecs : [], - headerExtensions : [], - fecMechanisms : [] + codecs : [], + headerExtensions: [], + fecMechanisms : [] }; // Match media codecs and keep the order preferred by remoteCaps. @@ -43,17 +43,17 @@ export function getExtendedRtpCapabilities( { const extendedCodec: any = { - mimeType : matchingLocalCodec.mimeType, - kind : matchingLocalCodec.kind, - clockRate : matchingLocalCodec.clockRate, - localPayloadType : matchingLocalCodec.preferredPayloadType, - localRtxPayloadType : null, - remotePayloadType : remoteCodec.preferredPayloadType, - remoteRtxPayloadType : null, - channels : matchingLocalCodec.channels, - rtcpFeedback : reduceRtcpFeedback(matchingLocalCodec, remoteCodec), - localParameters : matchingLocalCodec.parameters || {}, - remoteParameters : remoteCodec.parameters || {} + mimeType : matchingLocalCodec.mimeType, + kind : matchingLocalCodec.kind, + clockRate : matchingLocalCodec.clockRate, + localPayloadType : matchingLocalCodec.preferredPayloadType, + localRtxPayloadType : null, + remotePayloadType : remoteCodec.preferredPayloadType, + remoteRtxPayloadType: null, + channels : matchingLocalCodec.channels, + rtcpFeedback : reduceRtcpFeedback(matchingLocalCodec, remoteCodec), + localParameters : matchingLocalCodec.parameters || {}, + remoteParameters : remoteCodec.parameters || {} }; if (!extendedCodec.channels) @@ -95,11 +95,11 @@ export function getExtendedRtpCapabilities( { const extendedExt = { - kind : remoteExt.kind, - uri : remoteExt.uri, - sendId : matchingLocalExt.preferredId, - recvId : remoteExt.preferredId, - direction : 'sendrecv' + kind : remoteExt.kind, + uri : remoteExt.uri, + sendId : matchingLocalExt.preferredId, + recvId : remoteExt.preferredId, + direction: 'sendrecv' }; switch (remoteExt.direction) @@ -132,22 +132,22 @@ export function getRecvRtpCapabilities(extendedRtpCapabilities: any): RtpCapabil { const rtpCapabilities: RtpCapabilities = { - codecs : [], - headerExtensions : [], - fecMechanisms : [] + codecs : [], + headerExtensions: [], + fecMechanisms : [] }; for (const extendedCodec of extendedRtpCapabilities.codecs) { const codec = { - mimeType : extendedCodec.mimeType, - kind : extendedCodec.kind, - clockRate : extendedCodec.clockRate, - preferredPayloadType : extendedCodec.remotePayloadType, - channels : extendedCodec.channels, - rtcpFeedback : extendedCodec.rtcpFeedback, - parameters : extendedCodec.localParameters + mimeType : extendedCodec.mimeType, + kind : extendedCodec.kind, + clockRate : extendedCodec.clockRate, + preferredPayloadType: extendedCodec.remotePayloadType, + channels : extendedCodec.channels, + rtcpFeedback : extendedCodec.rtcpFeedback, + parameters : extendedCodec.localParameters }; if (!codec.channels) @@ -160,14 +160,14 @@ export function getRecvRtpCapabilities(extendedRtpCapabilities: any): RtpCapabil { const extendedRtxCodec: any = { - mimeType : `${extendedCodec.kind}/rtx`, - kind : extendedCodec.kind, - clockRate : extendedCodec.clockRate, - preferredPayloadType : extendedCodec.remoteRtxPayloadType, - rtcpFeedback : [], - parameters : + mimeType : `${extendedCodec.kind}/rtx`, + kind : extendedCodec.kind, + clockRate : extendedCodec.clockRate, + preferredPayloadType: extendedCodec.remoteRtxPayloadType, + rtcpFeedback : [], + parameters : { - apt : extendedCodec.remotePayloadType + apt: extendedCodec.remotePayloadType } }; @@ -188,9 +188,9 @@ export function getRecvRtpCapabilities(extendedRtpCapabilities: any): RtpCapabil const ext = { - kind : extendedExtension.kind, - uri : extendedExtension.uri, - preferredId : extendedExtension.recvId + kind : extendedExtension.kind, + uri : extendedExtension.uri, + preferredId: extendedExtension.recvId }; rtpCapabilities.headerExtensions.push(ext); @@ -210,11 +210,11 @@ export function getSendingRtpParameters(kind: 'audio' | 'video', extendedRtpCapa { const rtpParameters: RtpParameters = { - mid : null, - codecs : [], - headerExtensions : [], - encodings : [], - rtcp : {} + mid : null, + codecs : [], + headerExtensions: [], + encodings : [], + rtcp : {} }; for (const extendedCodec of extendedRtpCapabilities.codecs) @@ -224,12 +224,12 @@ export function getSendingRtpParameters(kind: 'audio' | 'video', extendedRtpCapa const codec = { - mimeType : extendedCodec.mimeType, - clockRate : extendedCodec.clockRate, - payloadType : extendedCodec.localPayloadType, - channels : extendedCodec.channels, - rtcpFeedback : extendedCodec.rtcpFeedback, - parameters : extendedCodec.localParameters + mimeType : extendedCodec.mimeType, + clockRate : extendedCodec.clockRate, + payloadType : extendedCodec.localPayloadType, + channels : extendedCodec.channels, + rtcpFeedback: extendedCodec.rtcpFeedback, + parameters : extendedCodec.localParameters }; if (!codec.channels) @@ -242,13 +242,13 @@ export function getSendingRtpParameters(kind: 'audio' | 'video', extendedRtpCapa { const rtxCodec: RtpCodecParameters = { - mimeType : `${extendedCodec.kind}/rtx`, - clockRate : extendedCodec.clockRate, - payloadType : extendedCodec.localRtxPayloadType, - rtcpFeedback : [], - parameters : + mimeType : `${extendedCodec.kind}/rtx`, + clockRate : extendedCodec.clockRate, + payloadType : extendedCodec.localRtxPayloadType, + rtcpFeedback: [], + parameters : { - apt : extendedCodec.localPayloadType + apt: extendedCodec.localPayloadType } }; @@ -275,8 +275,8 @@ export function getSendingRtpParameters(kind: 'audio' | 'video', extendedRtpCapa const ext = { - uri : extendedExtension.uri, - id : extendedExtension.sendId + uri: extendedExtension.uri, + id : extendedExtension.sendId }; rtpParameters.headerExtensions.push(ext); @@ -292,11 +292,11 @@ export function getSendingRemoteRtpParameters(kind: 'audio' | 'video', extendedR { const rtpParameters: RtpParameters = { - mid : null, - codecs : [], - headerExtensions : [], - encodings : [], - rtcp : {} + mid : null, + codecs : [], + headerExtensions: [], + encodings : [], + rtcp : {} }; for (const extendedCodec of extendedRtpCapabilities.codecs) @@ -306,12 +306,12 @@ export function getSendingRemoteRtpParameters(kind: 'audio' | 'video', extendedR const codec = { - mimeType : extendedCodec.mimeType, - clockRate : extendedCodec.clockRate, - payloadType : extendedCodec.localPayloadType, - channels : extendedCodec.channels, - rtcpFeedback : extendedCodec.rtcpFeedback, - parameters : extendedCodec.remoteParameters + mimeType : extendedCodec.mimeType, + clockRate : extendedCodec.clockRate, + payloadType : extendedCodec.localPayloadType, + channels : extendedCodec.channels, + rtcpFeedback: extendedCodec.rtcpFeedback, + parameters : extendedCodec.remoteParameters }; if (!codec.channels) @@ -324,13 +324,13 @@ export function getSendingRemoteRtpParameters(kind: 'audio' | 'video', extendedR { const rtxCodec: RtpCodecParameters = { - mimeType : `${extendedCodec.kind}/rtx`, - clockRate : extendedCodec.clockRate, - payloadType : extendedCodec.localRtxPayloadType, - rtcpFeedback : [], - parameters : + mimeType : `${extendedCodec.kind}/rtx`, + clockRate : extendedCodec.clockRate, + payloadType : extendedCodec.localRtxPayloadType, + rtcpFeedback: [], + parameters : { - apt : extendedCodec.localPayloadType + apt: extendedCodec.localPayloadType } }; @@ -357,8 +357,8 @@ export function getSendingRemoteRtpParameters(kind: 'audio' | 'video', extendedR const ext = { - uri : extendedExtension.uri, - id : extendedExtension.sendId + uri: extendedExtension.uri, + id : extendedExtension.sendId }; rtpParameters.headerExtensions.push(ext); @@ -439,13 +439,13 @@ export function generateProbatorRtpParameters( { const rtpParameters: RtpParameters = { - mid : null, - codecs : [], - headerExtensions : [], - encodings : [], - rtcp : + mid : null, + codecs : [], + headerExtensions: [], + encodings : [], + rtcp : { - cname : 'probator' + cname: 'probator' } }; diff --git a/src/scalabilityModes.ts b/src/scalabilityModes.ts index 94a93e5e..40d4f4dc 100644 --- a/src/scalabilityModes.ts +++ b/src/scalabilityModes.ts @@ -13,15 +13,15 @@ export function parse(scalabilityMode: string): ScalabilityMode if (match) { return { - spatialLayers : Number(match[1]), - temporalLayers : Number(match[2]) + spatialLayers : Number(match[1]), + temporalLayers: Number(match[2]) }; } else { return { - spatialLayers : 1, - temporalLayers : 1 + spatialLayers : 1, + temporalLayers: 1 }; } } diff --git a/test/FakeHandler.js b/test/FakeHandler.js index 155269ef..080c137e 100644 --- a/test/FakeHandler.js +++ b/test/FakeHandler.js @@ -22,7 +22,7 @@ class FakeHandler extends EventEmitter static async getNativeSctpCapabilities() { return { - numStreams : 4096 + numStreams: 4096 }; } @@ -46,8 +46,8 @@ class FakeHandler extends EventEmitter // @type {Object} this._rtpParametersByKind = { - audio : ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), - video : ortc.getSendingRtpParameters('video', extendedRtpCapabilities) + audio: ortc.getSendingRtpParameters('audio', extendedRtpCapabilities), + video: ortc.getSendingRtpParameters('video', extendedRtpCapabilities) }; // Local RTCP CNAME. @@ -124,9 +124,9 @@ class FakeHandler extends EventEmitter // Fill RTCRtpParameters.rtcp. rtpParameters.rtcp = { - cname : this._cname, - reducedSize : true, - mux : true + cname : this._cname, + reducedSize: true, + mux : true }; const localId = this._nextLocalId++; @@ -170,23 +170,23 @@ class FakeHandler extends EventEmitter const dataChannel = { - id : this._nextSctpStreamId++, + id : this._nextSctpStreamId++, ordered, maxPacketLifeTime, maxRetransmits, priority, label, protocol, - addEventListener : () => {}, - close : () => {} + addEventListener: () => {}, + close : () => {} }; const sctpStreamParameters = { - streamId : this._nextSctpStreamId, - ordered : ordered, - maxPacketLifeTime : maxPacketLifeTime, - maxRetransmits : maxRetransmits + streamId : this._nextSctpStreamId, + ordered : ordered, + maxPacketLifeTime: maxPacketLifeTime, + maxRetransmits : maxRetransmits }; return { dataChannel, sctpStreamParameters }; @@ -232,14 +232,14 @@ class FakeHandler extends EventEmitter const dataChannel = { - id : sctpStreamParameters.id, - ordered : sctpStreamParameters.ordered, - maxPacketLifeTime : sctpStreamParameters.maxPacketLifeTime, - maxRetransmits : sctpStreamParameters.maxRetransmits, + id : sctpStreamParameters.id, + ordered : sctpStreamParameters.ordered, + maxPacketLifeTime: sctpStreamParameters.maxPacketLifeTime, + maxRetransmits : sctpStreamParameters.maxRetransmits, label, protocol, - addEventListener : () => {}, - close : () => {} + addEventListener : () => {}, + close : () => {} }; return { dataChannel }; diff --git a/test/fakeParameters.js b/test/fakeParameters.js index b0ee30a6..3779ffb8 100644 --- a/test/fakeParameters.js +++ b/test/fakeParameters.js @@ -3,180 +3,180 @@ const uuidv4 = require('uuid/v4'); exports.generateRouterRtpCapabilities = function() { return { - codecs : + codecs: [ { - mimeType : 'audio/opus', - kind : 'audio', - clockRate : 48000, - preferredPayloadType : 100, - channels : 2, - rtcpFeedback : [], - parameters : + mimeType : 'audio/opus', + kind : 'audio', + clockRate : 48000, + preferredPayloadType: 100, + channels : 2, + rtcpFeedback : [], + parameters : { - useinbandfec : 1, - foo : 'bar' + useinbandfec: 1, + foo : 'bar' } }, { - mimeType : 'video/VP8', - kind : 'video', - clockRate : 90000, - preferredPayloadType : 101, - rtcpFeedback : + mimeType : 'video/VP8', + kind : 'video', + clockRate : 90000, + preferredPayloadType: 101, + rtcpFeedback : [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' } ], - parameters : + parameters: { - 'x-google-start-bitrate' : 1500 + 'x-google-start-bitrate': 1500 } }, { - mimeType : 'video/rtx', - kind : 'video', - clockRate : 90000, - preferredPayloadType : 102, - rtcpFeedback : [], - parameters : + mimeType : 'video/rtx', + kind : 'video', + clockRate : 90000, + preferredPayloadType: 102, + rtcpFeedback : [], + parameters : { - apt : 101 + apt: 101 } }, { - mimeType : 'video/H264', - kind : 'video', - clockRate : 90000, - preferredPayloadType : 103, - rtcpFeedback : + mimeType : 'video/H264', + kind : 'video', + clockRate : 90000, + preferredPayloadType: 103, + rtcpFeedback : [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' } ], - parameters : + parameters: { - 'level-asymmetry-allowed' : 1, - 'packetization-mode' : 1, - 'profile-level-id' : '42e01f' + 'level-asymmetry-allowed': 1, + 'packetization-mode' : 1, + 'profile-level-id' : '42e01f' } }, { - mimeType : 'video/rtx', - kind : 'video', - clockRate : 90000, - preferredPayloadType : 104, - rtcpFeedback : [], - parameters : + mimeType : 'video/rtx', + kind : 'video', + clockRate : 90000, + preferredPayloadType: 104, + rtcpFeedback : [], + parameters : { - apt : 103 + apt: 103 } } ], - headerExtensions : + headerExtensions: [ { - kind : 'audio', - uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', - preferredId : 1, - preferredEncrypt : false + kind : 'audio', + uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', + preferredId : 1, + preferredEncrypt: false }, { - kind : 'video', - uri : 'urn:ietf:params:rtp-hdrext:toffset', - preferredId : 2, - preferredEncrypt : false + kind : 'video', + uri : 'urn:ietf:params:rtp-hdrext:toffset', + preferredId : 2, + preferredEncrypt: false }, { - kind : 'audio', - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', // eslint-disable-line max-len - preferredId : 3, - preferredEncrypt : false + kind : 'audio', + uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', // eslint-disable-line max-len + preferredId : 3, + preferredEncrypt: false }, { - kind : 'video', - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', // eslint-disable-line max-len - preferredId : 3, - preferredEncrypt : false + kind : 'video', + uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', // eslint-disable-line max-len + preferredId : 3, + preferredEncrypt: false }, { - kind : 'video', - uri : 'urn:3gpp:video-orientation', - preferredId : 4, - preferredEncrypt : false + kind : 'video', + uri : 'urn:3gpp:video-orientation', + preferredId : 4, + preferredEncrypt: false }, { - kind : 'audio', - uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', - preferredId : 5, - preferredEncrypt : false + kind : 'audio', + uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', + preferredId : 5, + preferredEncrypt: false }, { - kind : 'video', - uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', - preferredId : 5, - preferredEncrypt : false + kind : 'video', + uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', + preferredId : 5, + preferredEncrypt: false }, { - kind : 'video', - uri : 'urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id', - preferredId : 6, - preferredEncrypt : false + kind : 'video', + uri : 'urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id', + preferredId : 6, + preferredEncrypt: false } ], - fecMechanisms : [] + fecMechanisms: [] }; }; exports.generateNativeRtpCapabilities = function() { return { - codecs : + codecs: [ { - mimeType : 'audio/opus', - kind : 'audio', - clockRate : 48000, - preferredPayloadType : 111, - channels : 2, - rtcpFeedback : + mimeType : 'audio/opus', + kind : 'audio', + clockRate : 48000, + preferredPayloadType: 111, + channels : 2, + rtcpFeedback : [ { type: 'transport-cc' } ], - parameters : + parameters: { - minptime : 10, - useinbandfec : 1 + minptime : 10, + useinbandfec: 1 } }, { - mimeType : 'audio/ISAC', - kind : 'audio', - clockRate : 16000, - preferredPayloadType : 103, - channels : 1, - rtcpFeedback : [], - parameters : {} + mimeType : 'audio/ISAC', + kind : 'audio', + clockRate : 16000, + preferredPayloadType: 103, + channels : 1, + rtcpFeedback : [], + parameters : {} }, { - mimeType : 'audio/CN', - kind : 'audio', - clockRate : 32000, - preferredPayloadType : 106, - channels : 1, - rtcpFeedback : [], - parameters : {} + mimeType : 'audio/CN', + kind : 'audio', + clockRate : 32000, + preferredPayloadType: 106, + channels : 1, + rtcpFeedback : [], + parameters : {} }, { - mimeType : 'video/VP8', - kind : 'video', - clockRate : 90000, - preferredPayloadType : 96, - rtcpFeedback : + mimeType : 'video/VP8', + kind : 'video', + clockRate : 90000, + preferredPayloadType: 96, + rtcpFeedback : [ { type: 'goog-remb' }, { type: 'transport-cc' }, @@ -184,156 +184,156 @@ exports.generateNativeRtpCapabilities = function() { type: 'nack' }, { type: 'nack', parameter: 'pli' } ], - parameters : + parameters: { - baz : '1234abcd' + baz: '1234abcd' } }, { - mimeType : 'video/rtx', - kind : 'video', - clockRate : 90000, - preferredPayloadType : 97, - rtcpFeedback : [], - parameters : + mimeType : 'video/rtx', + kind : 'video', + clockRate : 90000, + preferredPayloadType: 97, + rtcpFeedback : [], + parameters : { - apt : 96 + apt: 96 } } ], - headerExtensions : + headerExtensions: [ { - kind : 'audio', - uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', - preferredId : 10 + kind : 'audio', + uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', + preferredId: 10 }, { - kind : 'audio', - uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', - preferredId : 9 + kind : 'audio', + uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', + preferredId: 9 }, { - kind : 'video', - uri : 'urn:ietf:params:rtp-hdrext:toffset', - preferredId : 2 + kind : 'video', + uri : 'urn:ietf:params:rtp-hdrext:toffset', + preferredId: 2 }, { - kind : 'video', - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', - preferredId : 3 + kind : 'video', + uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', + preferredId: 3 }, { - kind : 'video', - uri : 'urn:3gpp:video-orientation', - preferredId : 4 + kind : 'video', + uri : 'urn:3gpp:video-orientation', + preferredId: 4 }, { - kind : 'video', - uri : 'http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01', - preferredId : 5 + kind : 'video', + uri : 'http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01', + preferredId: 5 }, { - kind : 'video', - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/playout-delay', - preferredId : 6 + kind : 'video', + uri : 'http://www.webrtc.org/experiments/rtp-hdrext/playout-delay', + preferredId: 6 }, { - kind : 'video', - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/video-content-type', - preferredId : 7 + kind : 'video', + uri : 'http://www.webrtc.org/experiments/rtp-hdrext/video-content-type', + preferredId: 7 }, { - kind : 'video', - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/video-timing', - preferredId : 8 + kind : 'video', + uri : 'http://www.webrtc.org/experiments/rtp-hdrext/video-timing', + preferredId: 8 }, { - kind : 'video', - uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', - preferredId : 9 + kind : 'video', + uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', + preferredId: 9 } ], - fecMechanisms : [] + fecMechanisms: [] }; }; exports.generateNativeSctpCapabilities = function() { return { - numStreams : { OS: 2048, MIS: 2048 } + numStreams: { OS: 2048, MIS: 2048 } }; }; exports.generateLocalDtlsParameters = function() { return { - fingerprints : + fingerprints: [ { - algorithm : 'sha-256', - value : '82:5A:68:3D:36:C3:0A:DE:AF:E7:32:43:D2:88:83:57:AC:2D:65:E5:80:C4:B6:FB:AF:1A:A0:21:9F:6D:0C:AD' + algorithm: 'sha-256', + value : '82:5A:68:3D:36:C3:0A:DE:AF:E7:32:43:D2:88:83:57:AC:2D:65:E5:80:C4:B6:FB:AF:1A:A0:21:9F:6D:0C:AD' } ], - role : 'auto' + role: 'auto' }; }; exports.generateTransportRemoteParameters = function() { return { - id : uuidv4(), - iceParameters : + id : uuidv4(), + iceParameters: { - iceLite : true, - password : 'yku5ej8nvfaor28lvtrabcx0wkrpkztz', - usernameFragment : 'h3hk1iz6qqlnqlne' + iceLite : true, + password : 'yku5ej8nvfaor28lvtrabcx0wkrpkztz', + usernameFragment: 'h3hk1iz6qqlnqlne' }, - iceCandidates : + iceCandidates: [ { - family : 'ipv4', - foundation : 'udpcandidate', - ip : '9.9.9.9', - port : 40533, - priority : 1078862079, - protocol : 'udp', - type : 'host' + family : 'ipv4', + foundation: 'udpcandidate', + ip : '9.9.9.9', + port : 40533, + priority : 1078862079, + protocol : 'udp', + type : 'host' }, { - family : 'ipv6', - foundation : 'udpcandidate', - ip : '9:9:9:9:9:9', - port : 41333, - priority : 1078862089, - protocol : 'udp', - type : 'host' + family : 'ipv6', + foundation: 'udpcandidate', + ip : '9:9:9:9:9:9', + port : 41333, + priority : 1078862089, + protocol : 'udp', + type : 'host' } ], - dtlsParameters : + dtlsParameters: { - fingerprints : + fingerprints: [ { - algorithm : 'sha-256', - value : 'A9:F4:E0:D2:74:D3:0F:D9:CA:A5:2F:9F:7F:47:FA:F0:C4:72:DD:73:49:D0:3B:14:90:20:51:30:1B:90:8E:71' + algorithm: 'sha-256', + value : 'A9:F4:E0:D2:74:D3:0F:D9:CA:A5:2F:9F:7F:47:FA:F0:C4:72:DD:73:49:D0:3B:14:90:20:51:30:1B:90:8E:71' }, { - algorithm : 'sha-384', - value : '03:D9:0B:87:13:98:F6:6D:BC:FC:92:2E:39:D4:E1:97:32:61:30:56:84:70:81:6E:D1:82:97:EA:D9:C1:21:0F:6B:C5:E7:7F:E1:97:0C:17:97:6E:CF:B3:EF:2E:74:B0' + algorithm: 'sha-384', + value : '03:D9:0B:87:13:98:F6:6D:BC:FC:92:2E:39:D4:E1:97:32:61:30:56:84:70:81:6E:D1:82:97:EA:D9:C1:21:0F:6B:C5:E7:7F:E1:97:0C:17:97:6E:CF:B3:EF:2E:74:B0' }, { - algorithm : 'sha-512', - value : '84:27:A4:28:A4:73:AF:43:02:2A:44:68:FF:2F:29:5C:3B:11:9A:60:F4:A8:F0:F5:AC:A0:E3:49:3E:B1:34:53:A9:85:CE:51:9B:ED:87:5E:B8:F4:8E:3D:FA:20:51:B8:96:EE:DA:56:DC:2F:5C:62:79:15:23:E0:21:82:2B:2C' + algorithm: 'sha-512', + value : '84:27:A4:28:A4:73:AF:43:02:2A:44:68:FF:2F:29:5C:3B:11:9A:60:F4:A8:F0:F5:AC:A0:E3:49:3E:B1:34:53:A9:85:CE:51:9B:ED:87:5E:B8:F4:8E:3D:FA:20:51:B8:96:EE:DA:56:DC:2F:5C:62:79:15:23:E0:21:82:2B:2C' } ], - role : 'auto' + role: 'auto' }, - sctpParameters : + sctpParameters: { - port : 5000, - numStreams : 2048, - maxMessageSize : 2000000 + port : 5000, + numStreams : 2048, + maxMessageSize: 2000000 } }; }; @@ -341,7 +341,7 @@ exports.generateTransportRemoteParameters = function() exports.generateProducerRemoteParameters = function() { return { - id : uuidv4() + id: uuidv4() }; }; @@ -352,44 +352,44 @@ exports.generateConsumerRemoteParameters = function({ id, codecMimeType } = {}) case 'audio/opus': { return { - id : id || uuidv4(), - producerId : uuidv4(), - kind : 'audio', - rtpParameters : + id : id || uuidv4(), + producerId : uuidv4(), + kind : 'audio', + rtpParameters: { - codecs : + codecs: [ { - mimeType : 'audio/opus', - clockRate : 48000, - payloadType : 100, - channels : 2, - rtcpFeedback : [], - parameters : + mimeType : 'audio/opus', + clockRate : 48000, + payloadType : 100, + channels : 2, + rtcpFeedback: [], + parameters : { - useinbandfec : 1, - foo : 'bar' + useinbandfec: 1, + foo : 'bar' } } ], - encodings : + encodings: [ { - ssrc : 46687003 + ssrc: 46687003 } ], - headerExtensions : + headerExtensions: [ { - uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', - id : 1 + uri: 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', + id : 1 } ], - rtcp : + rtcp: { - cname : 'wB4Ql4lrsxYLjzuN', - reducedSize : true, - mux : true + cname : 'wB4Ql4lrsxYLjzuN', + reducedSize: true, + mux : true } } }; @@ -398,40 +398,40 @@ exports.generateConsumerRemoteParameters = function({ id, codecMimeType } = {}) case 'audio/ISAC': { return { - id : id || uuidv4(), - producerId : uuidv4(), - kind : 'audio', - rtpParameters : + id : id || uuidv4(), + producerId : uuidv4(), + kind : 'audio', + rtpParameters: { - codecs : + codecs: [ { - mimeType : 'audio/ISAC', - clockRate : 16000, - payloadType : 111, - channels : 1, - rtcpFeedback : [], - parameters : {} + mimeType : 'audio/ISAC', + clockRate : 16000, + payloadType : 111, + channels : 1, + rtcpFeedback: [], + parameters : {} } ], - encodings : + encodings: [ { - ssrc : 46687004 + ssrc: 46687004 } ], - headerExtensions : + headerExtensions: [ { - uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', - id : 1 + uri: 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', + id : 1 } ], - rtcp : + rtcp: { - cname : 'wB4Ql4lrsxYLjzuN', - reducedSize : true, - mux : true + cname : 'wB4Ql4lrsxYLjzuN', + reducedSize: true, + mux : true } } }; @@ -440,70 +440,70 @@ exports.generateConsumerRemoteParameters = function({ id, codecMimeType } = {}) case 'video/VP8': { return { - id : id || uuidv4(), - producerId : uuidv4(), - kind : 'video', - rtpParameters : + id : id || uuidv4(), + producerId : uuidv4(), + kind : 'video', + rtpParameters: { - codecs : + codecs: [ { - mimeType : 'video/VP8', - clockRate : 90000, - payloadType : 101, - rtcpFeedback : + mimeType : 'video/VP8', + clockRate : 90000, + payloadType : 101, + rtcpFeedback: [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' } ], - parameters : + parameters: { - 'x-google-start-bitrate' : 1500 + 'x-google-start-bitrate': 1500 } }, { - mimeType : 'video/rtx', - clockRate : 90000, - payloadType : 102, - rtcpFeedback : [], - parameters : + mimeType : 'video/rtx', + clockRate : 90000, + payloadType : 102, + rtcpFeedback: [], + parameters : { - apt : 101 + apt: 101 } } ], - encodings : + encodings: [ { - ssrc : 99991111, - rtx : + ssrc: 99991111, + rtx : { - ssrc : 99991112 + ssrc: 99991112 } } ], - headerExtensions : + headerExtensions: [ { - uri : 'urn:ietf:params:rtp-hdrext:toffset', - id : 2 + uri: 'urn:ietf:params:rtp-hdrext:toffset', + id : 2 }, { - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', // eslint-disable-line max-len - id : 3 + uri: 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', // eslint-disable-line max-len + id : 3 }, { - uri : 'urn:3gpp:video-orientation', - id : 4 + uri: 'urn:3gpp:video-orientation', + id : 4 } ], - rtcp : + rtcp: { - cname : 'wB4Ql4lrsxYLjzuN', - reducedSize : true, - mux : true + cname : 'wB4Ql4lrsxYLjzuN', + reducedSize: true, + mux : true } } }; @@ -519,21 +519,21 @@ exports.generateConsumerRemoteParameters = function({ id, codecMimeType } = {}) exports.generateDataProducerRemoteParameters = function() { return { - id : uuidv4() + id: uuidv4() }; }; exports.generateDataConsumerRemoteParameters = function({ id } = {}) { return { - id : id || uuidv4(), - dataProducerId : uuidv4(), - sctpStreamParameters : + id : id || uuidv4(), + dataProducerId : uuidv4(), + sctpStreamParameters: { - streamId : 666, - ordered : true, - maxPacketLifeTime : 5000, - maxRetransmits : undefined + streamId : 666, + ordered : true, + maxPacketLifeTime: 5000, + maxRetransmits : undefined } }; }; diff --git a/test/test.js b/test/test.js index 9cbc814e..ec456c0f 100644 --- a/test/test.js +++ b/test/test.js @@ -184,7 +184,7 @@ test('device.createSendTransport() for sending media succeeds', () => iceCandidates, dtlsParameters, sctpParameters, - appData : { baz: 'BAZ' } + appData: { baz: 'BAZ' } })) .toBeType('object'); @@ -235,9 +235,9 @@ test('device.createSendTransport() with missing remote Transport parameters thro expect(() => device.createSendTransport( { - id : '1234', - iceParameters : {}, - iceCandidates : [] + id : '1234', + iceParameters: {}, + iceCandidates: [] })) .toThrow(TypeError); }, 500); @@ -259,7 +259,7 @@ test('device.createRecvTransport() with a non object appData throws TypeError', iceCandidates, dtlsParameters, sctpParameters, - appData : 1234 + appData: 1234 })) .toThrow(TypeError); }, 500); @@ -362,15 +362,15 @@ test('transport.produce() succeeds', async () => codecs = audioProducer.rtpParameters.codecs; expect(codecs[0]).toEqual( { - mimeType : 'audio/opus', - clockRate : 48000, - payloadType : 111, - channels : 2, - rtcpFeedback : [], - parameters : + mimeType : 'audio/opus', + clockRate : 48000, + payloadType : 111, + channels : 2, + rtcpFeedback: [], + parameters : { - minptime : 10, - useinbandfec : 1 + minptime : 10, + useinbandfec: 1 } }); @@ -378,12 +378,12 @@ test('transport.produce() succeeds', async () => expect(headerExtensions).toEqual( [ { - uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', - id : 10 + uri: 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', + id : 10 }, { - uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', - id : 9 + uri: 'urn:ietf:params:rtp-hdrext:sdes:mid', + id : 9 } ]); @@ -428,30 +428,30 @@ test('transport.produce() succeeds', async () => codecs = videoProducer.rtpParameters.codecs; expect(codecs[0]).toEqual( { - mimeType : 'video/VP8', - clockRate : 90000, - payloadType : 96, - rtcpFeedback : + mimeType : 'video/VP8', + clockRate : 90000, + payloadType : 96, + rtcpFeedback: [ { type: 'goog-remb' }, { type: 'ccm', parameter: 'fir' }, { type: 'nack' }, { type: 'nack', parameter: 'pli' } ], - parameters : + parameters: { - baz : '1234abcd' + baz: '1234abcd' } }); expect(codecs[1]).toEqual( { - mimeType : 'video/rtx', - clockRate : 90000, - payloadType : 97, - rtcpFeedback : [], - parameters : + mimeType : 'video/rtx', + clockRate : 90000, + payloadType : 97, + rtcpFeedback: [], + parameters : { - apt : 96 + apt: 96 } }); @@ -459,20 +459,20 @@ test('transport.produce() succeeds', async () => expect(headerExtensions).toEqual( [ { - uri : 'urn:ietf:params:rtp-hdrext:toffset', - id : 2 + uri: 'urn:ietf:params:rtp-hdrext:toffset', + id : 2 }, { - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', - id : 3 + uri: 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', + id : 3 }, { - uri : 'urn:3gpp:video-orientation', - id : 4 + uri: 'urn:3gpp:video-orientation', + id : 4 }, { - uri : 'urn:ietf:params:rtp-hdrext:sdes:mid', - id : 9 + uri: 'urn:ietf:params:rtp-hdrext:sdes:mid', + id : 9 } ]); @@ -565,11 +565,11 @@ test('transport.consume() succeeds', async () => audioConsumer = await recvTransport.consume( { - id : audioConsumerRemoteParameters.id, - producerId : audioConsumerRemoteParameters.producerId, - kind : audioConsumerRemoteParameters.kind, - rtpParameters : audioConsumerRemoteParameters.rtpParameters, - appData : { bar: 'BAR' } + id : audioConsumerRemoteParameters.id, + producerId : audioConsumerRemoteParameters.producerId, + kind : audioConsumerRemoteParameters.kind, + rtpParameters: audioConsumerRemoteParameters.rtpParameters, + appData : { bar: 'BAR' } }); expect(connectEventNumTimesCalled).toBe(1); @@ -586,15 +586,15 @@ test('transport.consume() succeeds', async () => codecs = audioConsumer.rtpParameters.codecs; expect(codecs[0]).toEqual( { - mimeType : 'audio/opus', - clockRate : 48000, - payloadType : 100, - channels : 2, - rtcpFeedback : [], - parameters : + mimeType : 'audio/opus', + clockRate : 48000, + payloadType : 100, + channels : 2, + rtcpFeedback: [], + parameters : { - useinbandfec : 1, - foo : 'bar' + useinbandfec: 1, + foo : 'bar' } }); @@ -602,8 +602,8 @@ test('transport.consume() succeeds', async () => expect(headerExtensions).toEqual( [ { - uri : 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', - id : 1 + uri: 'urn:ietf:params:rtp-hdrext:ssrc-audio-level', + id : 1 } ]); @@ -623,10 +623,10 @@ test('transport.consume() succeeds', async () => videoConsumer = await recvTransport.consume( { - id : videoConsumerRemoteParameters.id, - producerId : videoConsumerRemoteParameters.producerId, - kind : videoConsumerRemoteParameters.kind, - rtpParameters : videoConsumerRemoteParameters.rtpParameters + id : videoConsumerRemoteParameters.id, + producerId : videoConsumerRemoteParameters.producerId, + kind : videoConsumerRemoteParameters.kind, + rtpParameters: videoConsumerRemoteParameters.rtpParameters }); expect(connectEventNumTimesCalled).toBe(1); @@ -643,30 +643,30 @@ test('transport.consume() succeeds', async () => codecs = videoConsumer.rtpParameters.codecs; expect(codecs[0]).toEqual( { - mimeType : 'video/VP8', - clockRate : 90000, - payloadType : 101, - rtcpFeedback : + mimeType : 'video/VP8', + clockRate : 90000, + payloadType : 101, + rtcpFeedback: [ { type: 'nack' }, { type: 'nack', parameter: 'pli' }, { type: 'ccm', parameter: 'fir' }, { type: 'goog-remb' } ], - parameters : + parameters: { - 'x-google-start-bitrate' : 1500 + 'x-google-start-bitrate': 1500 } }); expect(codecs[1]).toEqual( { - mimeType : 'video/rtx', - clockRate : 90000, - payloadType : 102, - rtcpFeedback : [], - parameters : + mimeType : 'video/rtx', + clockRate : 90000, + payloadType : 102, + rtcpFeedback: [], + parameters : { - apt : 101 + apt: 101 } }); @@ -674,16 +674,16 @@ test('transport.consume() succeeds', async () => expect(headerExtensions).toEqual( [ { - uri : 'urn:ietf:params:rtp-hdrext:toffset', - id : 2 + uri: 'urn:ietf:params:rtp-hdrext:toffset', + id : 2 }, { - uri : 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', - id : 3 + uri: 'http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time', + id : 3 }, { - uri : 'urn:3gpp:video-orientation', - id : 4 + uri: 'urn:3gpp:video-orientation', + id : 4 } ]); @@ -726,18 +726,18 @@ test('transport.consume() with missing remote Consumer parameters rejects with T await expect(recvTransport.consume( { - id : '1234', - producerId : '4444', - kind : 'audio' + id : '1234', + producerId: '4444', + kind : 'audio' })) .rejects .toThrow(TypeError); await expect(recvTransport.consume( { - id : '1234', - producerId : '4444', - kind : 'audio' + id : '1234', + producerId: '4444', + kind : 'audio' })) .rejects .toThrow(TypeError); @@ -819,11 +819,11 @@ test('transport.produceData() succeeds', async () => dataProducer = await sendTransport.produceData( { - ordered : false, - maxPacketLifeTime : 5555, - label : 'FOO', - protocol : 'BAR', - appData : { foo: 'FOO' } + ordered : false, + maxPacketLifeTime: 5555, + label : 'FOO', + protocol : 'BAR', + appData : { foo: 'FOO' } }); expect(produceDataEventNumTimesCalled).toBe(1); @@ -862,12 +862,12 @@ test('transport.consumeData() succeeds', async () => dataConsumer = await recvTransport.consumeData( { - id : dataConsumerRemoteParameters.id, - dataProducerId : dataConsumerRemoteParameters.dataProducerId, - sctpStreamParameters : dataConsumerRemoteParameters.sctpStreamParameters, - label : 'FOO', - protocol : 'BAR', - appData : { bar: 'BAR' } + id : dataConsumerRemoteParameters.id, + dataProducerId : dataConsumerRemoteParameters.dataProducerId, + sctpStreamParameters: dataConsumerRemoteParameters.sctpStreamParameters, + label : 'FOO', + protocol : 'BAR', + appData : { bar: 'BAR' } }); expect(dataConsumer).toBeType('object');