@webex/plugin-meetings 3.0.0-beta.14 → 3.0.0-beta.141
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +45 -1
- package/UPGRADING.md +9 -9
- package/browsers.js +19 -24
- package/dist/annotation/annotation.types.js +7 -0
- package/dist/annotation/annotation.types.js.map +1 -0
- package/dist/annotation/constants.js +48 -0
- package/dist/annotation/constants.js.map +1 -0
- package/dist/annotation/index.js +355 -0
- package/dist/annotation/index.js.map +1 -0
- package/dist/breakouts/breakout.js +193 -0
- package/dist/breakouts/breakout.js.map +1 -0
- package/dist/breakouts/collection.js +23 -0
- package/dist/breakouts/collection.js.map +1 -0
- package/dist/breakouts/edit-lock-error.js +52 -0
- package/dist/breakouts/edit-lock-error.js.map +1 -0
- package/dist/breakouts/events.js +43 -0
- package/dist/breakouts/events.js.map +1 -0
- package/dist/breakouts/index.js +1012 -0
- package/dist/breakouts/index.js.map +1 -0
- package/dist/breakouts/request.js +78 -0
- package/dist/breakouts/request.js.map +1 -0
- package/dist/breakouts/utils.js +67 -0
- package/dist/breakouts/utils.js.map +1 -0
- package/dist/common/browser-detection.js +1 -20
- package/dist/common/browser-detection.js.map +1 -1
- package/dist/common/collection.js +5 -20
- package/dist/common/collection.js.map +1 -1
- package/dist/common/config.js +0 -7
- package/dist/common/config.js.map +1 -1
- package/dist/common/errors/captcha-error.js +5 -26
- package/dist/common/errors/captcha-error.js.map +1 -1
- package/dist/common/errors/intent-to-join.js +5 -26
- package/dist/common/errors/intent-to-join.js.map +1 -1
- package/dist/common/errors/join-meeting.js +6 -27
- package/dist/common/errors/join-meeting.js.map +1 -1
- package/dist/common/errors/media.js +5 -26
- package/dist/common/errors/media.js.map +1 -1
- package/dist/common/errors/parameter.js +5 -33
- package/dist/common/errors/parameter.js.map +1 -1
- package/dist/common/errors/password-error.js +5 -26
- package/dist/common/errors/password-error.js.map +1 -1
- package/dist/common/errors/permission.js +4 -25
- package/dist/common/errors/permission.js.map +1 -1
- package/dist/common/errors/reconnection-in-progress.js +0 -17
- package/dist/common/errors/reconnection-in-progress.js.map +1 -1
- package/dist/common/errors/reconnection.js +5 -26
- package/dist/common/errors/reconnection.js.map +1 -1
- package/dist/common/errors/stats.js +5 -26
- package/dist/common/errors/stats.js.map +1 -1
- package/dist/common/errors/webex-errors.js +6 -41
- package/dist/common/errors/webex-errors.js.map +1 -1
- package/dist/common/errors/webex-meetings-error.js +1 -24
- package/dist/common/errors/webex-meetings-error.js.map +1 -1
- package/dist/common/events/events-scope.js +0 -22
- package/dist/common/events/events-scope.js.map +1 -1
- package/dist/common/events/events.js +0 -23
- package/dist/common/events/events.js.map +1 -1
- package/dist/common/events/trigger-proxy.js +0 -12
- package/dist/common/events/trigger-proxy.js.map +1 -1
- package/dist/common/events/util.js +0 -15
- package/dist/common/events/util.js.map +1 -1
- package/dist/common/logs/logger-config.js +0 -4
- package/dist/common/logs/logger-config.js.map +1 -1
- package/dist/common/logs/logger-proxy.js +1 -8
- package/dist/common/logs/logger-proxy.js.map +1 -1
- package/dist/common/logs/request.js +35 -61
- package/dist/common/logs/request.js.map +1 -1
- package/dist/common/queue.js +4 -14
- package/dist/common/queue.js.map +1 -1
- package/dist/config.js +6 -6
- package/dist/config.js.map +1 -1
- package/dist/constants.js +204 -53
- package/dist/constants.js.map +1 -1
- package/dist/controls-options-manager/constants.js +14 -0
- package/dist/controls-options-manager/constants.js.map +1 -0
- package/dist/controls-options-manager/enums.js +27 -0
- package/dist/controls-options-manager/enums.js.map +1 -0
- package/dist/controls-options-manager/index.js +297 -0
- package/dist/controls-options-manager/index.js.map +1 -0
- package/dist/controls-options-manager/types.js +7 -0
- package/dist/controls-options-manager/types.js.map +1 -0
- package/dist/controls-options-manager/util.js +300 -0
- package/dist/controls-options-manager/util.js.map +1 -0
- package/dist/index.js +72 -17
- package/dist/index.js.map +1 -1
- package/dist/locus-info/controlsUtils.js +100 -29
- package/dist/locus-info/controlsUtils.js.map +1 -1
- package/dist/locus-info/embeddedAppsUtils.js +3 -26
- package/dist/locus-info/embeddedAppsUtils.js.map +1 -1
- package/dist/locus-info/fullState.js +0 -15
- package/dist/locus-info/fullState.js.map +1 -1
- package/dist/locus-info/hostUtils.js +4 -12
- package/dist/locus-info/hostUtils.js.map +1 -1
- package/dist/locus-info/index.js +398 -216
- package/dist/locus-info/index.js.map +1 -1
- package/dist/locus-info/infoUtils.js +0 -38
- package/dist/locus-info/infoUtils.js.map +1 -1
- package/dist/locus-info/mediaSharesUtils.js +54 -38
- package/dist/locus-info/mediaSharesUtils.js.map +1 -1
- package/dist/locus-info/parser.js +89 -124
- package/dist/locus-info/parser.js.map +1 -1
- package/dist/locus-info/selfUtils.js +94 -92
- package/dist/locus-info/selfUtils.js.map +1 -1
- package/dist/media/index.js +55 -165
- package/dist/media/index.js.map +1 -1
- package/dist/media/properties.js +71 -117
- package/dist/media/properties.js.map +1 -1
- package/dist/media/util.js +2 -9
- package/dist/media/util.js.map +1 -1
- package/dist/mediaQualityMetrics/config.js +505 -495
- package/dist/mediaQualityMetrics/config.js.map +1 -1
- package/dist/meeting/in-meeting-actions.js +77 -14
- package/dist/meeting/in-meeting-actions.js.map +1 -1
- package/dist/meeting/index.js +2576 -2455
- package/dist/meeting/index.js.map +1 -1
- package/dist/meeting/locusMediaRequest.js +291 -0
- package/dist/meeting/locusMediaRequest.js.map +1 -0
- package/dist/meeting/muteState.js +292 -138
- package/dist/meeting/muteState.js.map +1 -1
- package/dist/meeting/request.js +296 -342
- package/dist/meeting/request.js.map +1 -1
- package/dist/meeting/request.type.js +0 -1
- package/dist/meeting/request.type.js.map +1 -1
- package/dist/meeting/state.js +21 -31
- package/dist/meeting/state.js.map +1 -1
- package/dist/meeting/util.js +463 -583
- package/dist/meeting/util.js.map +1 -1
- package/dist/meeting-info/collection.js +3 -25
- package/dist/meeting-info/collection.js.map +1 -1
- package/dist/meeting-info/index.js +10 -33
- package/dist/meeting-info/index.js.map +1 -1
- package/dist/meeting-info/meeting-info-v2.js +305 -286
- package/dist/meeting-info/meeting-info-v2.js.map +1 -1
- package/dist/meeting-info/request.js +1 -16
- package/dist/meeting-info/request.js.map +1 -1
- package/dist/meeting-info/util.js +98 -183
- package/dist/meeting-info/util.js.map +1 -1
- package/dist/meeting-info/utilv2.js +156 -232
- package/dist/meeting-info/utilv2.js.map +1 -1
- package/dist/meetings/collection.js +24 -20
- package/dist/meetings/collection.js.map +1 -1
- package/dist/meetings/index.js +692 -593
- package/dist/meetings/index.js.map +1 -1
- package/dist/meetings/request.js +23 -42
- package/dist/meetings/request.js.map +1 -1
- package/dist/meetings/util.js +186 -155
- package/dist/meetings/util.js.map +1 -1
- package/dist/member/index.js +89 -88
- package/dist/member/index.js.map +1 -1
- package/dist/member/types.js +15 -0
- package/dist/member/types.js.map +1 -0
- package/dist/member/util.js +101 -69
- package/dist/member/util.js.map +1 -1
- package/dist/members/collection.js +12 -12
- package/dist/members/collection.js.map +1 -1
- package/dist/members/index.js +166 -205
- package/dist/members/index.js.map +1 -1
- package/dist/members/request.js +120 -85
- package/dist/members/request.js.map +1 -1
- package/dist/members/types.js +15 -0
- package/dist/members/types.js.map +1 -0
- package/dist/members/util.js +314 -260
- package/dist/members/util.js.map +1 -1
- package/dist/metrics/config.js +50 -16
- package/dist/metrics/config.js.map +1 -1
- package/dist/metrics/constants.js +4 -7
- package/dist/metrics/constants.js.map +1 -1
- package/dist/metrics/index.js +93 -162
- package/dist/metrics/index.js.map +1 -1
- package/dist/multistream/mediaRequestManager.js +170 -50
- package/dist/multistream/mediaRequestManager.js.map +1 -1
- package/dist/multistream/receiveSlot.js +58 -65
- package/dist/multistream/receiveSlot.js.map +1 -1
- package/dist/multistream/receiveSlotManager.js +74 -93
- package/dist/multistream/receiveSlotManager.js.map +1 -1
- package/dist/multistream/remoteMedia.js +55 -74
- package/dist/multistream/remoteMedia.js.map +1 -1
- package/dist/multistream/remoteMediaGroup.js +14 -40
- package/dist/multistream/remoteMediaGroup.js.map +1 -1
- package/dist/multistream/remoteMediaManager.js +481 -442
- package/dist/multistream/remoteMediaManager.js.map +1 -1
- package/dist/networkQualityMonitor/index.js +32 -59
- package/dist/networkQualityMonitor/index.js.map +1 -1
- package/dist/personal-meeting-room/index.js +10 -45
- package/dist/personal-meeting-room/index.js.map +1 -1
- package/dist/personal-meeting-room/request.js +2 -33
- package/dist/personal-meeting-room/request.js.map +1 -1
- package/dist/personal-meeting-room/util.js +0 -13
- package/dist/personal-meeting-room/util.js.map +1 -1
- package/dist/reachability/index.js +190 -199
- package/dist/reachability/index.js.map +1 -1
- package/dist/reachability/request.js +14 -23
- package/dist/reachability/request.js.map +1 -1
- package/dist/reactions/constants.js +13 -0
- package/dist/reactions/constants.js.map +1 -0
- package/dist/reactions/reactions.js +2 -4
- package/dist/reactions/reactions.js.map +1 -1
- package/dist/reactions/reactions.type.js +19 -23
- package/dist/reactions/reactions.type.js.map +1 -1
- package/dist/reconnection-manager/index.js +326 -465
- package/dist/reconnection-manager/index.js.map +1 -1
- package/dist/recording-controller/enums.js +17 -0
- package/dist/recording-controller/enums.js.map +1 -0
- package/dist/recording-controller/index.js +343 -0
- package/dist/recording-controller/index.js.map +1 -0
- package/dist/recording-controller/util.js +63 -0
- package/dist/recording-controller/util.js.map +1 -0
- package/dist/roap/index.js +31 -75
- package/dist/roap/index.js.map +1 -1
- package/dist/roap/request.js +129 -136
- package/dist/roap/request.js.map +1 -1
- package/dist/roap/turnDiscovery.js +143 -103
- package/dist/roap/turnDiscovery.js.map +1 -1
- package/dist/statsAnalyzer/global.js +1 -95
- package/dist/statsAnalyzer/global.js.map +1 -1
- package/dist/statsAnalyzer/index.js +369 -462
- package/dist/statsAnalyzer/index.js.map +1 -1
- package/dist/statsAnalyzer/mqaUtil.js +144 -94
- package/dist/statsAnalyzer/mqaUtil.js.map +1 -1
- package/dist/transcription/index.js +13 -45
- package/dist/transcription/index.js.map +1 -1
- package/dist/types/annotation/annotation.types.d.ts +35 -0
- package/dist/types/annotation/constants.d.ts +31 -0
- package/dist/types/annotation/index.d.ts +124 -0
- package/dist/types/breakouts/breakout.d.ts +8 -0
- package/dist/types/breakouts/collection.d.ts +5 -0
- package/dist/types/breakouts/edit-lock-error.d.ts +15 -0
- package/dist/types/breakouts/events.d.ts +2 -0
- package/dist/types/breakouts/index.d.ts +5 -0
- package/dist/types/breakouts/request.d.ts +22 -0
- package/dist/types/breakouts/utils.d.ts +15 -0
- package/dist/types/common/browser-detection.d.ts +9 -0
- package/dist/types/common/collection.d.ts +48 -0
- package/dist/types/common/config.d.ts +2 -0
- package/dist/types/common/errors/captcha-error.d.ts +15 -0
- package/dist/types/common/errors/intent-to-join.d.ts +16 -0
- package/dist/types/common/errors/join-meeting.d.ts +17 -0
- package/dist/types/common/errors/media.d.ts +15 -0
- package/dist/types/common/errors/parameter.d.ts +15 -0
- package/dist/types/common/errors/password-error.d.ts +15 -0
- package/dist/types/common/errors/permission.d.ts +14 -0
- package/dist/types/common/errors/reconnection-in-progress.d.ts +9 -0
- package/dist/types/common/errors/reconnection.d.ts +15 -0
- package/dist/types/common/errors/stats.d.ts +15 -0
- package/dist/types/common/errors/webex-errors.d.ts +69 -0
- package/dist/types/common/errors/webex-meetings-error.d.ts +20 -0
- package/dist/types/common/events/events-scope.d.ts +17 -0
- package/dist/types/common/events/events.d.ts +12 -0
- package/dist/types/common/events/trigger-proxy.d.ts +2 -0
- package/dist/types/common/events/util.d.ts +2 -0
- package/dist/types/common/logs/logger-config.d.ts +2 -0
- package/dist/types/common/logs/logger-proxy.d.ts +2 -0
- package/dist/types/common/logs/request.d.ts +34 -0
- package/dist/types/common/queue.d.ts +32 -0
- package/dist/types/config.d.ts +78 -0
- package/dist/types/constants.d.ts +994 -0
- package/dist/types/controls-options-manager/constants.d.ts +4 -0
- package/dist/types/controls-options-manager/enums.d.ts +15 -0
- package/dist/types/controls-options-manager/index.d.ts +136 -0
- package/dist/types/controls-options-manager/types.d.ts +43 -0
- package/dist/types/controls-options-manager/util.d.ts +1 -0
- package/dist/types/index.d.ts +7 -0
- package/dist/types/locus-info/controlsUtils.d.ts +2 -0
- package/dist/types/locus-info/embeddedAppsUtils.d.ts +2 -0
- package/dist/types/locus-info/fullState.d.ts +2 -0
- package/dist/types/locus-info/hostUtils.d.ts +2 -0
- package/dist/types/locus-info/index.d.ts +315 -0
- package/dist/types/locus-info/infoUtils.d.ts +2 -0
- package/dist/types/locus-info/mediaSharesUtils.d.ts +2 -0
- package/dist/types/locus-info/parser.d.ts +212 -0
- package/dist/types/locus-info/selfUtils.d.ts +2 -0
- package/dist/types/media/index.d.ts +34 -0
- package/dist/types/media/properties.d.ts +108 -0
- package/dist/types/media/util.d.ts +2 -0
- package/dist/types/mediaQualityMetrics/config.d.ts +365 -0
- package/dist/types/meeting/in-meeting-actions.d.ts +147 -0
- package/dist/types/meeting/index.d.ts +1762 -0
- package/dist/types/meeting/locusMediaRequest.d.ts +70 -0
- package/dist/types/meeting/muteState.d.ts +186 -0
- package/dist/types/meeting/request.d.ts +269 -0
- package/dist/types/meeting/request.type.d.ts +11 -0
- package/dist/types/meeting/state.d.ts +9 -0
- package/dist/types/meeting/util.d.ts +76 -0
- package/dist/types/meeting-info/collection.d.ts +20 -0
- package/dist/types/meeting-info/index.d.ts +57 -0
- package/dist/types/meeting-info/meeting-info-v2.d.ts +122 -0
- package/dist/types/meeting-info/request.d.ts +22 -0
- package/dist/types/meeting-info/util.d.ts +2 -0
- package/dist/types/meeting-info/utilv2.d.ts +2 -0
- package/dist/types/meetings/collection.d.ts +31 -0
- package/dist/types/meetings/index.d.ts +345 -0
- package/dist/types/meetings/request.d.ts +27 -0
- package/dist/types/meetings/util.d.ts +18 -0
- package/dist/types/member/index.d.ts +157 -0
- package/dist/types/member/types.d.ts +21 -0
- package/dist/types/member/util.d.ts +2 -0
- package/dist/types/members/collection.d.ts +29 -0
- package/dist/types/members/index.d.ts +353 -0
- package/dist/types/members/request.d.ts +114 -0
- package/dist/types/members/types.d.ts +24 -0
- package/dist/types/members/util.d.ts +210 -0
- package/dist/types/metrics/config.d.ts +195 -0
- package/dist/types/metrics/constants.d.ts +55 -0
- package/dist/types/metrics/index.d.ts +169 -0
- package/dist/types/multistream/mediaRequestManager.d.ts +104 -0
- package/dist/types/multistream/receiveSlot.d.ts +68 -0
- package/dist/types/multistream/receiveSlotManager.d.ts +56 -0
- package/dist/types/multistream/remoteMedia.d.ts +72 -0
- package/dist/types/multistream/remoteMediaGroup.d.ts +48 -0
- package/dist/types/multistream/remoteMediaManager.d.ts +267 -0
- package/dist/types/networkQualityMonitor/index.d.ts +70 -0
- package/dist/types/personal-meeting-room/index.d.ts +47 -0
- package/dist/types/personal-meeting-room/request.d.ts +14 -0
- package/dist/types/personal-meeting-room/util.d.ts +2 -0
- package/dist/types/reachability/index.d.ts +152 -0
- package/dist/types/reachability/request.d.ts +37 -0
- package/dist/types/reactions/constants.d.ts +3 -0
- package/dist/types/reactions/reactions.d.ts +4 -0
- package/dist/types/reactions/reactions.type.d.ts +52 -0
- package/dist/types/reconnection-manager/index.d.ts +126 -0
- package/dist/types/recording-controller/enums.d.ts +7 -0
- package/dist/types/recording-controller/index.d.ts +193 -0
- package/dist/types/recording-controller/util.d.ts +13 -0
- package/dist/types/roap/index.d.ts +77 -0
- package/dist/types/roap/request.d.ts +36 -0
- package/dist/types/roap/turnDiscovery.d.ts +91 -0
- package/dist/types/statsAnalyzer/global.d.ts +36 -0
- package/dist/types/statsAnalyzer/index.d.ts +200 -0
- package/dist/types/statsAnalyzer/mqaUtil.d.ts +24 -0
- package/dist/types/transcription/index.d.ts +64 -0
- package/internal-README.md +7 -6
- package/package.json +28 -21
- package/src/annotation/annotation.types.ts +42 -0
- package/src/annotation/constants.ts +36 -0
- package/src/annotation/index.ts +339 -0
- package/src/breakouts/README.md +220 -0
- package/src/breakouts/breakout.ts +163 -0
- package/src/breakouts/collection.ts +19 -0
- package/src/breakouts/edit-lock-error.ts +25 -0
- package/src/breakouts/events.ts +37 -0
- package/src/breakouts/index.ts +888 -0
- package/src/breakouts/request.ts +55 -0
- package/src/breakouts/utils.ts +57 -0
- package/src/common/browser-detection.ts +9 -6
- package/src/common/collection.ts +3 -1
- package/src/common/errors/captcha-error.ts +6 -6
- package/src/common/errors/intent-to-join.ts +6 -6
- package/src/common/errors/join-meeting.ts +12 -8
- package/src/common/errors/media.ts +6 -6
- package/src/common/errors/parameter.ts +9 -6
- package/src/common/errors/password-error.ts +6 -6
- package/src/common/errors/permission.ts +5 -5
- package/src/common/errors/reconnection.ts +6 -6
- package/src/common/errors/stats.ts +6 -6
- package/src/common/errors/webex-errors.ts +7 -5
- package/src/common/errors/webex-meetings-error.ts +1 -1
- package/src/common/events/events-scope.ts +5 -1
- package/src/common/events/events.ts +5 -1
- package/src/common/events/trigger-proxy.ts +8 -3
- package/src/common/events/util.ts +1 -2
- package/src/common/logs/logger-proxy.ts +22 -11
- package/src/common/logs/request.ts +11 -8
- package/src/config.ts +16 -12
- package/src/constants.ts +154 -7
- package/src/controls-options-manager/constants.ts +5 -0
- package/src/controls-options-manager/enums.ts +18 -0
- package/src/controls-options-manager/index.ts +278 -0
- package/src/controls-options-manager/types.ts +59 -0
- package/src/controls-options-manager/util.ts +286 -0
- package/src/index.ts +33 -0
- package/src/locus-info/controlsUtils.ts +142 -24
- package/src/locus-info/fullState.ts +15 -11
- package/src/locus-info/hostUtils.ts +4 -3
- package/src/locus-info/index.ts +335 -55
- package/src/locus-info/infoUtils.ts +12 -4
- package/src/locus-info/mediaSharesUtils.ts +52 -4
- package/src/locus-info/parser.ts +47 -69
- package/src/locus-info/selfUtils.ts +175 -56
- package/src/media/index.ts +139 -196
- package/src/media/properties.ts +43 -36
- package/src/media/util.ts +1 -1
- package/src/mediaQualityMetrics/config.ts +380 -378
- package/src/meeting/in-meeting-actions.ts +159 -3
- package/src/meeting/index.ts +2809 -1589
- package/src/meeting/locusMediaRequest.ts +309 -0
- package/src/meeting/muteState.ts +290 -72
- package/src/meeting/request.ts +229 -182
- package/src/meeting/request.type.ts +10 -8
- package/src/meeting/state.ts +45 -30
- package/src/meeting/util.ts +445 -395
- package/src/meeting-info/collection.ts +2 -1
- package/src/meeting-info/index.ts +32 -30
- package/src/meeting-info/meeting-info-v2.ts +235 -116
- package/src/meeting-info/request.ts +9 -3
- package/src/meeting-info/util.ts +54 -46
- package/src/meeting-info/utilv2.ts +71 -55
- package/src/meetings/collection.ts +21 -1
- package/src/meetings/index.ts +771 -437
- package/src/meetings/request.ts +29 -25
- package/src/meetings/util.ts +132 -33
- package/src/member/index.ts +95 -49
- package/src/member/types.ts +24 -0
- package/src/member/util.ts +106 -13
- package/src/members/collection.ts +8 -1
- package/src/members/index.ts +288 -130
- package/src/members/request.ts +144 -31
- package/src/members/types.ts +28 -0
- package/src/members/util.ts +316 -235
- package/src/metrics/config.ts +302 -90
- package/src/metrics/constants.ts +2 -6
- package/src/metrics/index.ts +124 -95
- package/src/multistream/mediaRequestManager.ts +210 -45
- package/src/multistream/receiveSlot.ts +69 -26
- package/src/multistream/receiveSlotManager.ts +62 -38
- package/src/multistream/remoteMedia.ts +30 -4
- package/src/multistream/remoteMediaGroup.ts +11 -3
- package/src/multistream/remoteMediaManager.ts +245 -66
- package/src/networkQualityMonitor/index.ts +24 -27
- package/src/personal-meeting-room/index.ts +12 -16
- package/src/personal-meeting-room/request.ts +10 -3
- package/src/personal-meeting-room/util.ts +3 -3
- package/src/reachability/index.ts +131 -79
- package/src/reachability/request.ts +43 -34
- package/src/reactions/constants.ts +4 -0
- package/src/reactions/reactions.ts +8 -8
- package/src/reactions/reactions.type.ts +31 -5
- package/src/reconnection-manager/index.ts +193 -112
- package/src/recording-controller/enums.ts +8 -0
- package/src/recording-controller/index.ts +315 -0
- package/src/recording-controller/util.ts +58 -0
- package/src/roap/index.ts +53 -53
- package/src/roap/request.ts +77 -65
- package/src/roap/turnDiscovery.ts +101 -48
- package/src/statsAnalyzer/global.ts +8 -104
- package/src/statsAnalyzer/index.ts +624 -377
- package/src/statsAnalyzer/mqaUtil.ts +203 -90
- package/src/transcription/index.ts +34 -32
- package/test/integration/spec/converged-space-meetings.js +177 -0
- package/test/integration/spec/journey.js +670 -466
- package/test/integration/spec/space-meeting.js +320 -204
- package/test/integration/spec/transcription.js +7 -8
- package/test/unit/spec/annotation/index.ts +433 -0
- package/test/unit/spec/breakouts/breakout.ts +203 -0
- package/test/unit/spec/breakouts/collection.ts +15 -0
- package/test/unit/spec/breakouts/edit-lock-error.ts +30 -0
- package/test/unit/spec/breakouts/events.ts +77 -0
- package/test/unit/spec/breakouts/index.ts +1685 -0
- package/test/unit/spec/breakouts/request.ts +104 -0
- package/test/unit/spec/breakouts/utils.js +72 -0
- package/test/unit/spec/common/browser-detection.js +9 -28
- package/test/unit/spec/controls-options-manager/index.js +287 -0
- package/test/unit/spec/controls-options-manager/util.js +518 -0
- package/test/unit/spec/fixture/locus.js +93 -90
- package/test/unit/spec/locus-info/controlsUtils.js +305 -32
- package/test/unit/spec/locus-info/embeddedAppsUtils.js +8 -6
- package/test/unit/spec/locus-info/index.js +615 -5
- package/test/unit/spec/locus-info/infoUtils.js +26 -33
- package/test/unit/spec/locus-info/lib/BasicSeqCmp.json +88 -430
- package/test/unit/spec/locus-info/lib/SeqCmp.json +513 -685
- package/test/unit/spec/locus-info/mediaSharesUtils.ts +22 -0
- package/test/unit/spec/locus-info/parser.js +3 -9
- package/test/unit/spec/locus-info/selfConstant.js +110 -103
- package/test/unit/spec/locus-info/selfUtils.js +221 -12
- package/test/unit/spec/media/index.ts +104 -8
- package/test/unit/spec/media/properties.ts +9 -9
- package/test/unit/spec/meeting/in-meeting-actions.ts +76 -3
- package/test/unit/spec/meeting/index.js +3077 -923
- package/test/unit/spec/meeting/locusMediaRequest.ts +436 -0
- package/test/unit/spec/meeting/muteState.js +421 -94
- package/test/unit/spec/meeting/request.js +408 -85
- package/test/unit/spec/meeting/utils.js +326 -189
- package/test/unit/spec/meeting-info/meetinginfov2.js +481 -76
- package/test/unit/spec/meeting-info/request.js +7 -9
- package/test/unit/spec/meeting-info/util.js +11 -12
- package/test/unit/spec/meeting-info/utilv2.js +131 -74
- package/test/unit/spec/meetings/collection.js +15 -1
- package/test/unit/spec/meetings/index.js +1126 -328
- package/test/unit/spec/meetings/utils.js +220 -14
- package/test/unit/spec/member/index.js +24 -1
- package/test/unit/spec/member/util.js +383 -32
- package/test/unit/spec/members/index.js +424 -55
- package/test/unit/spec/members/request.js +228 -40
- package/test/unit/spec/members/utils.js +191 -4
- package/test/unit/spec/metrics/index.js +113 -20
- package/test/unit/spec/multistream/mediaRequestManager.ts +676 -105
- package/test/unit/spec/multistream/receiveSlot.ts +76 -17
- package/test/unit/spec/multistream/receiveSlotManager.ts +69 -39
- package/test/unit/spec/multistream/remoteMedia.ts +32 -2
- package/test/unit/spec/multistream/remoteMediaGroup.ts +52 -5
- package/test/unit/spec/multistream/remoteMediaManager.ts +585 -65
- package/test/unit/spec/networkQualityMonitor/index.js +24 -18
- package/test/unit/spec/personal-meeting-room/personal-meeting-room.js +2 -7
- package/test/unit/spec/reachability/index.ts +176 -27
- package/test/unit/spec/reachability/request.js +66 -0
- package/test/unit/spec/reconnection-manager/index.js +62 -31
- package/test/unit/spec/recording-controller/index.js +231 -0
- package/test/unit/spec/recording-controller/util.js +102 -0
- package/test/unit/spec/roap/index.ts +19 -49
- package/test/unit/spec/roap/request.ts +187 -0
- package/test/unit/spec/roap/turnDiscovery.ts +92 -50
- package/test/unit/spec/stats-analyzer/index.js +116 -60
- package/test/utils/cmr.js +44 -42
- package/test/utils/constants.js +9 -0
- package/test/utils/integrationTestUtils.js +64 -0
- package/test/utils/testUtils.js +63 -99
- package/test/utils/webex-config.js +22 -18
- package/test/utils/webex-test-users.js +57 -50
- package/tsconfig.json +6 -0
- package/dist/media/internal-media-core-wrapper.js +0 -22
- package/dist/media/internal-media-core-wrapper.js.map +0 -1
- package/dist/meeting/effectsState.js +0 -334
- package/dist/meeting/effectsState.js.map +0 -1
- package/dist/multistream/multistreamMedia.js +0 -116
- package/dist/multistream/multistreamMedia.js.map +0 -1
- package/src/index.js +0 -15
- package/src/media/internal-media-core-wrapper.ts +0 -9
- package/src/meeting/effectsState.ts +0 -211
- package/src/multistream/multistreamMedia.ts +0 -92
- package/test/unit/spec/meeting/effectsState.js +0 -291
|
@@ -1,9 +1,20 @@
|
|
|
1
1
|
/* eslint-disable require-jsdoc */
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
StreamRequest,
|
|
4
|
+
Policy,
|
|
5
|
+
ActiveSpeakerInfo,
|
|
6
|
+
ReceiverSelectedInfo,
|
|
7
|
+
CodecInfo as WcmeCodecInfo,
|
|
8
|
+
H264Codec,
|
|
9
|
+
getRecommendedMaxBitrateForFrameSize,
|
|
10
|
+
RecommendedOpusBitrates,
|
|
11
|
+
} from '@webex/internal-media-core';
|
|
12
|
+
import {cloneDeep, debounce, isEmpty} from 'lodash';
|
|
3
13
|
|
|
4
14
|
import LoggerProxy from '../common/logs/logger-proxy';
|
|
5
15
|
|
|
6
|
-
import {ReceiveSlot,
|
|
16
|
+
import {ReceiveSlot, ReceiveSlotEvents} from './receiveSlot';
|
|
17
|
+
import {getMaxFs} from './remoteMedia';
|
|
7
18
|
|
|
8
19
|
export interface ActiveSpeakerPolicyInfo {
|
|
9
20
|
policy: 'active-speaker';
|
|
@@ -35,6 +46,8 @@ export interface MediaRequest {
|
|
|
35
46
|
policyInfo: PolicyInfo;
|
|
36
47
|
receiveSlots: Array<ReceiveSlot>;
|
|
37
48
|
codecInfo?: CodecInfo;
|
|
49
|
+
preferredMaxFs?: number;
|
|
50
|
+
handleMaxFs?: ({maxFs}: {maxFs: number}) => void;
|
|
38
51
|
}
|
|
39
52
|
|
|
40
53
|
export type MediaRequestId = string;
|
|
@@ -47,79 +60,206 @@ const CODEC_DEFAULTS = {
|
|
|
47
60
|
},
|
|
48
61
|
};
|
|
49
62
|
|
|
50
|
-
|
|
63
|
+
const DEBOUNCED_SOURCE_UPDATE_TIME = 1000;
|
|
51
64
|
|
|
65
|
+
type DegradationPreferences = {
|
|
66
|
+
maxMacroblocksLimit: number;
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
type SendMediaRequestsCallback = (streamRequests: StreamRequest[]) => void;
|
|
70
|
+
type Kind = 'audio' | 'video';
|
|
71
|
+
|
|
72
|
+
type Options = {
|
|
73
|
+
degradationPreferences: DegradationPreferences;
|
|
74
|
+
kind: Kind;
|
|
75
|
+
};
|
|
52
76
|
export class MediaRequestManager {
|
|
53
77
|
private sendMediaRequestsCallback: SendMediaRequestsCallback;
|
|
54
78
|
|
|
55
|
-
private
|
|
79
|
+
private kind: Kind;
|
|
80
|
+
|
|
81
|
+
private counter: number;
|
|
56
82
|
|
|
57
83
|
private clientRequests: {[key: MediaRequestId]: MediaRequest};
|
|
58
84
|
|
|
59
|
-
private
|
|
85
|
+
private degradationPreferences: DegradationPreferences;
|
|
60
86
|
|
|
61
|
-
|
|
87
|
+
private sourceUpdateListener: () => void;
|
|
88
|
+
|
|
89
|
+
private debouncedSourceUpdateListener: () => void;
|
|
90
|
+
|
|
91
|
+
private previousStreamRequests: Array<StreamRequest> = [];
|
|
92
|
+
|
|
93
|
+
constructor(sendMediaRequestsCallback: SendMediaRequestsCallback, options: Options) {
|
|
62
94
|
this.sendMediaRequestsCallback = sendMediaRequestsCallback;
|
|
63
95
|
this.counter = 0;
|
|
64
96
|
this.clientRequests = {};
|
|
65
|
-
this.
|
|
97
|
+
this.degradationPreferences = options.degradationPreferences;
|
|
98
|
+
this.kind = options.kind;
|
|
99
|
+
this.sourceUpdateListener = this.commit.bind(this);
|
|
100
|
+
this.debouncedSourceUpdateListener = debounce(
|
|
101
|
+
this.sourceUpdateListener,
|
|
102
|
+
DEBOUNCED_SOURCE_UPDATE_TIME
|
|
103
|
+
);
|
|
66
104
|
}
|
|
67
105
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
Object.values(this.clientRequests).forEach((request) =>
|
|
73
|
-
request.receiveSlots.forEach((slot) => {
|
|
74
|
-
activeSlots[slot.id] = slot;
|
|
75
|
-
})
|
|
76
|
-
);
|
|
106
|
+
public setDegradationPreferences(degradationPreferences: DegradationPreferences) {
|
|
107
|
+
this.degradationPreferences = degradationPreferences;
|
|
108
|
+
this.sendRequests(); // re-send requests after preferences are set
|
|
109
|
+
}
|
|
77
110
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
111
|
+
private getDegradedClientRequests() {
|
|
112
|
+
const clientRequests = cloneDeep(this.clientRequests);
|
|
113
|
+
const maxFsLimits = [
|
|
114
|
+
getMaxFs('best'),
|
|
115
|
+
getMaxFs('large'),
|
|
116
|
+
getMaxFs('medium'),
|
|
117
|
+
getMaxFs('small'),
|
|
118
|
+
getMaxFs('very small'),
|
|
119
|
+
getMaxFs('thumbnail'),
|
|
120
|
+
];
|
|
121
|
+
|
|
122
|
+
// reduce max-fs until total macroblocks is below limit
|
|
123
|
+
for (let i = 0; i < maxFsLimits.length; i += 1) {
|
|
124
|
+
let totalMacroblocksRequested = 0;
|
|
125
|
+
Object.entries(clientRequests).forEach(([id, mr]) => {
|
|
126
|
+
if (mr.codecInfo) {
|
|
127
|
+
mr.codecInfo.maxFs = Math.min(
|
|
128
|
+
mr.preferredMaxFs || CODEC_DEFAULTS.h264.maxFs,
|
|
129
|
+
mr.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs,
|
|
130
|
+
maxFsLimits[i]
|
|
131
|
+
);
|
|
132
|
+
// we only consider sources with "live" state
|
|
133
|
+
const slotsWithLiveSource = this.clientRequests[id].receiveSlots.filter(
|
|
134
|
+
(rs) => rs.sourceState === 'live'
|
|
135
|
+
);
|
|
136
|
+
totalMacroblocksRequested += mr.codecInfo.maxFs * slotsWithLiveSource.length;
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
if (totalMacroblocksRequested <= this.degradationPreferences.maxMacroblocksLimit) {
|
|
140
|
+
if (i !== 0) {
|
|
141
|
+
LoggerProxy.logger.warn(
|
|
142
|
+
`multistream:mediaRequestManager --> too many streams with high max-fs, frame size will be limited to ${maxFsLimits[i]}`
|
|
143
|
+
);
|
|
144
|
+
}
|
|
145
|
+
break;
|
|
146
|
+
} else if (i === maxFsLimits.length - 1) {
|
|
147
|
+
LoggerProxy.logger.warn(
|
|
148
|
+
`multistream:mediaRequestManager --> even with frame size limited to ${maxFsLimits[i]} you are still requesting too many streams, consider reducing the number of requests`
|
|
85
149
|
);
|
|
86
|
-
slot.resetSourceState();
|
|
87
150
|
}
|
|
88
151
|
}
|
|
89
152
|
|
|
90
|
-
|
|
153
|
+
return clientRequests;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Returns true if two stream requests are the same, false otherwise.
|
|
158
|
+
*
|
|
159
|
+
* @param {StreamRequest} streamRequestA - Stream request A for comparison.
|
|
160
|
+
* @param {StreamRequest} streamRequestB - Stream request B for comparison.
|
|
161
|
+
* @returns {boolean} - Whether they are equal.
|
|
162
|
+
*/
|
|
163
|
+
// eslint-disable-next-line class-methods-use-this
|
|
164
|
+
public isEqual(streamRequestA: StreamRequest, streamRequestB: StreamRequest) {
|
|
165
|
+
return (
|
|
166
|
+
JSON.stringify(streamRequestA._toJmpStreamRequest()) ===
|
|
167
|
+
JSON.stringify(streamRequestB._toJmpStreamRequest())
|
|
168
|
+
);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/**
|
|
172
|
+
* Compares new stream requests to previous ones and determines
|
|
173
|
+
* if they are the same.
|
|
174
|
+
*
|
|
175
|
+
* @param {StreamRequest[]} newRequests - Array with new requests.
|
|
176
|
+
* @returns {boolean} - True if they are equal, false otherwise.
|
|
177
|
+
*/
|
|
178
|
+
private checkIsNewRequestsEqualToPrev(newRequests: StreamRequest[]) {
|
|
179
|
+
return (
|
|
180
|
+
!isEmpty(this.previousStreamRequests) &&
|
|
181
|
+
this.previousStreamRequests.length === newRequests.length &&
|
|
182
|
+
this.previousStreamRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))
|
|
183
|
+
);
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/**
|
|
187
|
+
* Returns the maxPayloadBitsPerSecond per Stream
|
|
188
|
+
*
|
|
189
|
+
* If MediaRequestManager kind is "audio", a constant bitrate will be returned.
|
|
190
|
+
* If MediaRequestManager kind is "video", the bitrate will be calculated based
|
|
191
|
+
* on maxFs (default h264 maxFs as fallback if maxFs is not defined)
|
|
192
|
+
*
|
|
193
|
+
* @param {MediaRequest} mediaRequest - mediaRequest to take data from
|
|
194
|
+
* @returns {number} maxPayloadBitsPerSecond
|
|
195
|
+
*/
|
|
196
|
+
private getMaxPayloadBitsPerSecond(mediaRequest: MediaRequest): number {
|
|
197
|
+
if (this.kind === 'audio') {
|
|
198
|
+
// return mono_music bitrate default if the kind of mediarequest manager is audio:
|
|
199
|
+
return RecommendedOpusBitrates.FB_MONO_MUSIC;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
return getRecommendedMaxBitrateForFrameSize(
|
|
203
|
+
mediaRequest.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs
|
|
204
|
+
);
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
/**
|
|
208
|
+
* Returns the max Macro Blocks per second (maxMbps) per H264 Stream
|
|
209
|
+
*
|
|
210
|
+
* The maxMbps will be calculated based on maxFs and maxFps
|
|
211
|
+
* (default h264 maxFps as fallback if maxFps is not defined)
|
|
212
|
+
*
|
|
213
|
+
* @param {MediaRequest} mediaRequest - mediaRequest to take data from
|
|
214
|
+
* @returns {number} maxMbps
|
|
215
|
+
*/
|
|
216
|
+
// eslint-disable-next-line class-methods-use-this
|
|
217
|
+
private getH264MaxMbps(mediaRequest: MediaRequest): number {
|
|
218
|
+
// fallback for maxFps (not needed for maxFs, since there is a fallback already in getDegradedClientRequests)
|
|
219
|
+
const maxFps = mediaRequest.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps;
|
|
220
|
+
|
|
221
|
+
// divided by 100 since maxFps is 3000 (for 30 frames per seconds)
|
|
222
|
+
return (mediaRequest.codecInfo.maxFs * maxFps) / 100;
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
/**
|
|
226
|
+
* Clears the previous stream requests.
|
|
227
|
+
*
|
|
228
|
+
* @returns {void}
|
|
229
|
+
*/
|
|
230
|
+
public clearPreviousRequests(): void {
|
|
231
|
+
this.previousStreamRequests = [];
|
|
91
232
|
}
|
|
92
233
|
|
|
93
234
|
private sendRequests() {
|
|
94
|
-
const
|
|
235
|
+
const streamRequests: StreamRequest[] = [];
|
|
95
236
|
|
|
96
|
-
|
|
97
|
-
const maxPayloadBitsPerSecond = 10 * 1000 * 1000;
|
|
237
|
+
const clientRequests = this.getDegradedClientRequests();
|
|
98
238
|
|
|
99
|
-
// map all the client media requests to wcme
|
|
100
|
-
Object.values(
|
|
101
|
-
|
|
102
|
-
new
|
|
239
|
+
// map all the client media requests to wcme stream requests
|
|
240
|
+
Object.values(clientRequests).forEach((mr) => {
|
|
241
|
+
streamRequests.push(
|
|
242
|
+
new StreamRequest(
|
|
103
243
|
mr.policyInfo.policy === 'active-speaker'
|
|
104
|
-
?
|
|
105
|
-
:
|
|
244
|
+
? Policy.ActiveSpeaker
|
|
245
|
+
: Policy.ReceiverSelected,
|
|
106
246
|
mr.policyInfo.policy === 'active-speaker'
|
|
107
|
-
? new
|
|
247
|
+
? new ActiveSpeakerInfo(
|
|
108
248
|
mr.policyInfo.priority,
|
|
109
249
|
mr.policyInfo.crossPriorityDuplication,
|
|
110
250
|
mr.policyInfo.crossPolicyDuplication,
|
|
111
251
|
mr.policyInfo.preferLiveVideo
|
|
112
252
|
)
|
|
113
|
-
: new
|
|
253
|
+
: new ReceiverSelectedInfo(mr.policyInfo.csi),
|
|
114
254
|
mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),
|
|
115
|
-
|
|
255
|
+
this.getMaxPayloadBitsPerSecond(mr),
|
|
116
256
|
mr.codecInfo && [
|
|
117
|
-
new
|
|
257
|
+
new WcmeCodecInfo(
|
|
118
258
|
0x80,
|
|
119
|
-
new
|
|
120
|
-
mr.codecInfo.maxFs
|
|
259
|
+
new H264Codec(
|
|
260
|
+
mr.codecInfo.maxFs,
|
|
121
261
|
mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,
|
|
122
|
-
mr
|
|
262
|
+
this.getH264MaxMbps(mr),
|
|
123
263
|
mr.codecInfo.maxWidth,
|
|
124
264
|
mr.codecInfo.maxHeight
|
|
125
265
|
)
|
|
@@ -129,9 +269,17 @@ export class MediaRequestManager {
|
|
|
129
269
|
);
|
|
130
270
|
});
|
|
131
271
|
|
|
132
|
-
this.
|
|
133
|
-
|
|
134
|
-
this.
|
|
272
|
+
//! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/json-multistream)
|
|
273
|
+
// https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713
|
|
274
|
+
if (!this.checkIsNewRequestsEqualToPrev(streamRequests)) {
|
|
275
|
+
this.sendMediaRequestsCallback(streamRequests);
|
|
276
|
+
this.previousStreamRequests = streamRequests;
|
|
277
|
+
LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);
|
|
278
|
+
} else {
|
|
279
|
+
LoggerProxy.logger.info(
|
|
280
|
+
`multistream:sendRequests --> detected duplicate WCME requests, skipping them... `
|
|
281
|
+
);
|
|
282
|
+
}
|
|
135
283
|
}
|
|
136
284
|
|
|
137
285
|
public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {
|
|
@@ -140,6 +288,17 @@ export class MediaRequestManager {
|
|
|
140
288
|
|
|
141
289
|
this.clientRequests[newId] = mediaRequest;
|
|
142
290
|
|
|
291
|
+
const eventHandler = ({maxFs}) => {
|
|
292
|
+
mediaRequest.preferredMaxFs = maxFs;
|
|
293
|
+
this.debouncedSourceUpdateListener();
|
|
294
|
+
};
|
|
295
|
+
mediaRequest.handleMaxFs = eventHandler;
|
|
296
|
+
|
|
297
|
+
mediaRequest.receiveSlots.forEach((rs) => {
|
|
298
|
+
rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);
|
|
299
|
+
rs.on(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
|
|
300
|
+
});
|
|
301
|
+
|
|
143
302
|
if (commit) {
|
|
144
303
|
this.commit();
|
|
145
304
|
}
|
|
@@ -148,6 +307,13 @@ export class MediaRequestManager {
|
|
|
148
307
|
}
|
|
149
308
|
|
|
150
309
|
public cancelRequest(requestId: MediaRequestId, commit = true) {
|
|
310
|
+
const mediaRequest = this.clientRequests[requestId];
|
|
311
|
+
|
|
312
|
+
mediaRequest?.receiveSlots.forEach((rs) => {
|
|
313
|
+
rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);
|
|
314
|
+
rs.off(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
|
|
315
|
+
});
|
|
316
|
+
|
|
151
317
|
delete this.clientRequests[requestId];
|
|
152
318
|
|
|
153
319
|
if (commit) {
|
|
@@ -161,6 +327,5 @@ export class MediaRequestManager {
|
|
|
161
327
|
|
|
162
328
|
public reset() {
|
|
163
329
|
this.clientRequests = {};
|
|
164
|
-
this.slotsActiveInLastMediaRequest = {};
|
|
165
330
|
}
|
|
166
331
|
}
|
|
@@ -1,13 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
/* eslint-disable valid-jsdoc */
|
|
2
|
+
import {
|
|
3
|
+
MediaType,
|
|
4
|
+
ReceiveSlot as WcmeReceiveSlot,
|
|
5
|
+
ReceiveSlotEvents as WcmeReceiveSlotEvents,
|
|
6
|
+
StreamState,
|
|
7
|
+
} from '@webex/internal-media-core';
|
|
2
8
|
|
|
3
9
|
import LoggerProxy from '../common/logs/logger-proxy';
|
|
4
10
|
import EventsScope from '../common/events/events-scope';
|
|
5
11
|
|
|
6
12
|
export const ReceiveSlotEvents = {
|
|
7
13
|
SourceUpdate: 'sourceUpdate',
|
|
14
|
+
MaxFsUpdate: 'maxFsUpdate',
|
|
8
15
|
};
|
|
9
16
|
|
|
10
|
-
export type
|
|
17
|
+
export type {StreamState} from '@webex/internal-media-core';
|
|
11
18
|
export type CSI = number;
|
|
12
19
|
export type MemberId = string;
|
|
13
20
|
export type ReceiveSlotId = string;
|
|
@@ -21,31 +28,31 @@ export type FindMemberIdCallback = (csi: CSI) => MemberId | undefined;
|
|
|
21
28
|
* for example some participant's main video or audio
|
|
22
29
|
*/
|
|
23
30
|
export class ReceiveSlot extends EventsScope {
|
|
24
|
-
private readonly mcReceiveSlot:
|
|
31
|
+
private readonly mcReceiveSlot: WcmeReceiveSlot;
|
|
25
32
|
|
|
26
33
|
private readonly findMemberIdCallback: FindMemberIdCallback;
|
|
27
34
|
|
|
28
35
|
public readonly id: ReceiveSlotId;
|
|
29
36
|
|
|
30
|
-
public readonly mediaType:
|
|
37
|
+
public readonly mediaType: MediaType;
|
|
31
38
|
|
|
32
39
|
#memberId?: MemberId;
|
|
33
40
|
|
|
34
41
|
#csi?: CSI;
|
|
35
42
|
|
|
36
|
-
#sourceState:
|
|
43
|
+
#sourceState: StreamState;
|
|
37
44
|
|
|
38
45
|
/**
|
|
39
46
|
* constructor - don't use it directly, you should always use meeting.receiveSlotManager.allocateSlot()
|
|
40
47
|
* to create any receive slots
|
|
41
48
|
*
|
|
42
|
-
* @param {
|
|
43
|
-
* @param {
|
|
49
|
+
* @param {MediaType} mediaType
|
|
50
|
+
* @param {ReceiveSlot} mcReceiveSlot
|
|
44
51
|
* @param {FindMemberIdCallback} findMemberIdCallback callback for finding memberId for given CSI
|
|
45
52
|
*/
|
|
46
53
|
constructor(
|
|
47
|
-
mediaType:
|
|
48
|
-
mcReceiveSlot:
|
|
54
|
+
mediaType: MediaType,
|
|
55
|
+
mcReceiveSlot: WcmeReceiveSlot,
|
|
49
56
|
findMemberIdCallback: FindMemberIdCallback
|
|
50
57
|
) {
|
|
51
58
|
super();
|
|
@@ -75,6 +82,25 @@ export class ReceiveSlot extends EventsScope {
|
|
|
75
82
|
return this.#csi;
|
|
76
83
|
}
|
|
77
84
|
|
|
85
|
+
/**
|
|
86
|
+
* Set the max frame size for this slot
|
|
87
|
+
* @param newFs frame size
|
|
88
|
+
*/
|
|
89
|
+
public setMaxFs(newFs) {
|
|
90
|
+
// emit event for media request manager to listen to
|
|
91
|
+
|
|
92
|
+
this.emit(
|
|
93
|
+
{
|
|
94
|
+
file: 'meeting/receiveSlot',
|
|
95
|
+
function: 'findMemberId',
|
|
96
|
+
},
|
|
97
|
+
ReceiveSlotEvents.MaxFsUpdate,
|
|
98
|
+
{
|
|
99
|
+
maxFs: newFs,
|
|
100
|
+
}
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
|
|
78
104
|
/**
|
|
79
105
|
* Getter for sourceState
|
|
80
106
|
*/
|
|
@@ -85,15 +111,15 @@ export class ReceiveSlot extends EventsScope {
|
|
|
85
111
|
/**
|
|
86
112
|
* registers event handlers with the underlying ReceiveSlot
|
|
87
113
|
*/
|
|
88
|
-
setupEventListeners() {
|
|
114
|
+
private setupEventListeners() {
|
|
89
115
|
const scope = {
|
|
90
116
|
file: 'meeting/receiveSlot',
|
|
91
117
|
function: 'setupEventListeners',
|
|
92
118
|
};
|
|
93
119
|
|
|
94
120
|
this.mcReceiveSlot.on(
|
|
95
|
-
|
|
96
|
-
(state:
|
|
121
|
+
WcmeReceiveSlotEvents.SourceUpdate,
|
|
122
|
+
(state: StreamState, csi?: number) => {
|
|
97
123
|
LoggerProxy.logger.log(
|
|
98
124
|
`ReceiveSlot#setupEventListeners --> got source update on receive slot ${this.id}, mediaType=${this.mediaType}, csi=${csi}, state=${state}`
|
|
99
125
|
);
|
|
@@ -110,6 +136,36 @@ export class ReceiveSlot extends EventsScope {
|
|
|
110
136
|
);
|
|
111
137
|
}
|
|
112
138
|
|
|
139
|
+
/** Tries to find the member id for this receive slot if it hasn't got one */
|
|
140
|
+
public findMemberId() {
|
|
141
|
+
if (this.#memberId === undefined && this.#csi) {
|
|
142
|
+
this.#memberId = this.findMemberIdCallback(this.#csi);
|
|
143
|
+
|
|
144
|
+
if (this.#memberId) {
|
|
145
|
+
// if we found the memberId, simulate source update so that the client app knows that something's changed
|
|
146
|
+
this.emit(
|
|
147
|
+
{
|
|
148
|
+
file: 'meeting/receiveSlot',
|
|
149
|
+
function: 'findMemberId',
|
|
150
|
+
},
|
|
151
|
+
ReceiveSlotEvents.SourceUpdate,
|
|
152
|
+
{
|
|
153
|
+
state: this.#sourceState,
|
|
154
|
+
csi: this.#csi,
|
|
155
|
+
memberId: this.#memberId,
|
|
156
|
+
}
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/**
|
|
163
|
+
* @returns {string} a log message used to identify the receive slot
|
|
164
|
+
*/
|
|
165
|
+
public get logString() {
|
|
166
|
+
return `ReceiveSlot - ${this.id}: ${JSON.stringify(this.mcReceiveSlot.id)}`;
|
|
167
|
+
}
|
|
168
|
+
|
|
113
169
|
/**
|
|
114
170
|
* The MediaStream object associated with this slot.
|
|
115
171
|
*
|
|
@@ -122,20 +178,7 @@ export class ReceiveSlot extends EventsScope {
|
|
|
122
178
|
/**
|
|
123
179
|
* The underlying WCME receive slot
|
|
124
180
|
*/
|
|
125
|
-
get wcmeReceiveSlot():
|
|
181
|
+
get wcmeReceiveSlot(): WcmeReceiveSlot {
|
|
126
182
|
return this.mcReceiveSlot;
|
|
127
183
|
}
|
|
128
|
-
|
|
129
|
-
/**
|
|
130
|
-
* Resets the source state to the default 'no source' value.
|
|
131
|
-
* This function should be called on receive slots that are
|
|
132
|
-
* no longer part of a media request. It's needed because WCME
|
|
133
|
-
* does not send any more events on such slots, so the sourceState
|
|
134
|
-
* value would not represent the truth anymore.
|
|
135
|
-
*/
|
|
136
|
-
public resetSourceState() {
|
|
137
|
-
this.#sourceState = 'no source';
|
|
138
|
-
this.#csi = undefined;
|
|
139
|
-
this.#memberId = undefined;
|
|
140
|
-
}
|
|
141
184
|
}
|
|
@@ -1,53 +1,58 @@
|
|
|
1
|
+
/* eslint-disable valid-jsdoc */
|
|
1
2
|
/* eslint-disable import/prefer-default-export */
|
|
2
|
-
import {
|
|
3
|
-
|
|
3
|
+
import {MediaType, ReceiveSlot as WcmeReceiveSlot} from '@webex/internal-media-core';
|
|
4
4
|
import LoggerProxy from '../common/logs/logger-proxy';
|
|
5
|
-
import Meeting from '../meeting';
|
|
6
5
|
|
|
7
|
-
import {
|
|
6
|
+
import {FindMemberIdCallback, ReceiveSlot} from './receiveSlot';
|
|
7
|
+
|
|
8
|
+
export type CreateSlotCallback = (mediaType: MediaType) => Promise<WcmeReceiveSlot>;
|
|
9
|
+
|
|
10
|
+
export type {CSI, FindMemberIdCallback} from './receiveSlot';
|
|
8
11
|
|
|
9
12
|
/**
|
|
10
13
|
* Manages all receive slots used by a meeting. WMCE receive slots cannot be ever deleted,
|
|
11
14
|
* so this manager has a pool in order to re-use the slots that were released earlier.
|
|
12
15
|
*/
|
|
13
16
|
export class ReceiveSlotManager {
|
|
14
|
-
private allocatedSlots: {[key in
|
|
17
|
+
private allocatedSlots: {[key in MediaType]: ReceiveSlot[]};
|
|
15
18
|
|
|
16
|
-
private freeSlots: {[key in
|
|
19
|
+
private freeSlots: {[key in MediaType]: ReceiveSlot[]};
|
|
17
20
|
|
|
18
|
-
private
|
|
21
|
+
private createSlotCallback: CreateSlotCallback;
|
|
22
|
+
|
|
23
|
+
private findMemberIdByCsiCallback: FindMemberIdCallback;
|
|
19
24
|
|
|
20
25
|
/**
|
|
21
26
|
* Constructor
|
|
22
27
|
* @param {Meeting} meeting
|
|
23
28
|
*/
|
|
24
|
-
constructor(
|
|
29
|
+
constructor(
|
|
30
|
+
createSlotCallback: CreateSlotCallback,
|
|
31
|
+
findMemberIdByCsiCallback: FindMemberIdCallback
|
|
32
|
+
) {
|
|
25
33
|
this.allocatedSlots = {
|
|
26
|
-
[
|
|
27
|
-
[
|
|
28
|
-
[
|
|
29
|
-
[
|
|
34
|
+
[MediaType.AudioMain]: [],
|
|
35
|
+
[MediaType.VideoMain]: [],
|
|
36
|
+
[MediaType.AudioSlides]: [],
|
|
37
|
+
[MediaType.VideoSlides]: [],
|
|
30
38
|
};
|
|
31
39
|
this.freeSlots = {
|
|
32
|
-
[
|
|
33
|
-
[
|
|
34
|
-
[
|
|
35
|
-
[
|
|
40
|
+
[MediaType.AudioMain]: [],
|
|
41
|
+
[MediaType.VideoMain]: [],
|
|
42
|
+
[MediaType.AudioSlides]: [],
|
|
43
|
+
[MediaType.VideoSlides]: [],
|
|
36
44
|
};
|
|
37
|
-
this.
|
|
45
|
+
this.createSlotCallback = createSlotCallback;
|
|
46
|
+
this.findMemberIdByCsiCallback = findMemberIdByCsiCallback;
|
|
38
47
|
}
|
|
39
48
|
|
|
40
49
|
/**
|
|
41
50
|
* Creates a new receive slot or returns one from the existing pool of free slots
|
|
42
51
|
*
|
|
43
|
-
* @param {
|
|
52
|
+
* @param {MediaType} mediaType
|
|
44
53
|
* @returns {Promise<ReceiveSlot>}
|
|
45
54
|
*/
|
|
46
|
-
async allocateSlot(mediaType:
|
|
47
|
-
if (!this.meeting?.mediaProperties?.webrtcMediaConnection) {
|
|
48
|
-
return Promise.reject(new Error('Webrtc media connection is missing'));
|
|
49
|
-
}
|
|
50
|
-
|
|
55
|
+
async allocateSlot(mediaType: MediaType): Promise<ReceiveSlot> {
|
|
51
56
|
// try to use one of the free ones
|
|
52
57
|
const availableSlot = this.freeSlots[mediaType].pop();
|
|
53
58
|
|
|
@@ -60,14 +65,9 @@ export class ReceiveSlotManager {
|
|
|
60
65
|
}
|
|
61
66
|
|
|
62
67
|
// we have to create a new one
|
|
63
|
-
const wcmeReceiveSlot =
|
|
64
|
-
await this.meeting.mediaProperties.webrtcMediaConnection.createReceiveSlot(mediaType);
|
|
68
|
+
const wcmeReceiveSlot = await this.createSlotCallback(mediaType);
|
|
65
69
|
|
|
66
|
-
const receiveSlot = new ReceiveSlot(
|
|
67
|
-
mediaType,
|
|
68
|
-
wcmeReceiveSlot,
|
|
69
|
-
(csi: CSI) => this.meeting.members.findMemberByCsi(csi)?.id
|
|
70
|
-
);
|
|
70
|
+
const receiveSlot = new ReceiveSlot(mediaType, wcmeReceiveSlot, this.findMemberIdByCsiCallback);
|
|
71
71
|
|
|
72
72
|
this.allocatedSlots[mediaType].push(receiveSlot);
|
|
73
73
|
LoggerProxy.logger.log(`new receive slot allocated: ${receiveSlot.id}`);
|
|
@@ -100,16 +100,16 @@ export class ReceiveSlotManager {
|
|
|
100
100
|
*/
|
|
101
101
|
reset() {
|
|
102
102
|
this.allocatedSlots = {
|
|
103
|
-
[
|
|
104
|
-
[
|
|
105
|
-
[
|
|
106
|
-
[
|
|
103
|
+
[MediaType.AudioMain]: [],
|
|
104
|
+
[MediaType.VideoMain]: [],
|
|
105
|
+
[MediaType.AudioSlides]: [],
|
|
106
|
+
[MediaType.VideoSlides]: [],
|
|
107
107
|
};
|
|
108
108
|
this.freeSlots = {
|
|
109
|
-
[
|
|
110
|
-
[
|
|
111
|
-
[
|
|
112
|
-
[
|
|
109
|
+
[MediaType.AudioMain]: [],
|
|
110
|
+
[MediaType.VideoMain]: [],
|
|
111
|
+
[MediaType.AudioSlides]: [],
|
|
112
|
+
[MediaType.VideoSlides]: [],
|
|
113
113
|
};
|
|
114
114
|
}
|
|
115
115
|
|
|
@@ -139,4 +139,28 @@ export class ReceiveSlotManager {
|
|
|
139
139
|
numFreeSlots,
|
|
140
140
|
};
|
|
141
141
|
}
|
|
142
|
+
|
|
143
|
+
/**
|
|
144
|
+
* Tries to find the member id on all allocated receive slots
|
|
145
|
+
* This function should be called when new members are added to the meeting.
|
|
146
|
+
*/
|
|
147
|
+
updateMemberIds() {
|
|
148
|
+
Object.keys(this.allocatedSlots).forEach((key) => {
|
|
149
|
+
this.allocatedSlots[key].forEach((slot: ReceiveSlot) => {
|
|
150
|
+
slot.findMemberId();
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* Find a receive slot by a ssrc.
|
|
157
|
+
*
|
|
158
|
+
* @param ssrc - The ssrc of the receive slot to find.
|
|
159
|
+
* @returns - The receive slot with this ssrc, undefined if not found.
|
|
160
|
+
*/
|
|
161
|
+
findReceiveSlotBySsrc(ssrc: number): ReceiveSlot | undefined {
|
|
162
|
+
return Object.values(this.allocatedSlots)
|
|
163
|
+
.flat()
|
|
164
|
+
.find((r) => ssrc && r.wcmeReceiveSlot?.id?.ssrc === ssrc);
|
|
165
|
+
}
|
|
142
166
|
}
|