@webex/plugin-meetings 3.0.0-beta.34 → 3.0.0-beta.340

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.
Files changed (392) hide show
  1. package/README.md +46 -8
  2. package/dist/annotation/annotation.types.js +7 -0
  3. package/dist/annotation/annotation.types.js.map +1 -0
  4. package/dist/annotation/constants.js +49 -0
  5. package/dist/annotation/constants.js.map +1 -0
  6. package/dist/annotation/index.js +342 -0
  7. package/dist/annotation/index.js.map +1 -0
  8. package/dist/breakouts/breakout.js +94 -15
  9. package/dist/breakouts/breakout.js.map +1 -1
  10. package/dist/breakouts/edit-lock-error.js +52 -0
  11. package/dist/breakouts/edit-lock-error.js.map +1 -0
  12. package/dist/breakouts/events.js +45 -0
  13. package/dist/breakouts/events.js.map +1 -0
  14. package/dist/breakouts/index.js +709 -35
  15. package/dist/breakouts/index.js.map +1 -1
  16. package/dist/breakouts/utils.js +45 -1
  17. package/dist/breakouts/utils.js.map +1 -1
  18. package/dist/common/errors/no-meeting-info.js +51 -0
  19. package/dist/common/errors/no-meeting-info.js.map +1 -0
  20. package/dist/common/errors/reclaim-host-role-errors.js +158 -0
  21. package/dist/common/errors/reclaim-host-role-errors.js.map +1 -0
  22. package/dist/common/errors/webex-errors.js +48 -7
  23. package/dist/common/errors/webex-errors.js.map +1 -1
  24. package/dist/common/logs/logger-proxy.js +1 -1
  25. package/dist/common/logs/logger-proxy.js.map +1 -1
  26. package/dist/common/logs/request.js +5 -1
  27. package/dist/common/logs/request.js.map +1 -1
  28. package/dist/common/queue.js +24 -9
  29. package/dist/common/queue.js.map +1 -1
  30. package/dist/config.js +5 -10
  31. package/dist/config.js.map +1 -1
  32. package/dist/constants.js +233 -29
  33. package/dist/constants.js.map +1 -1
  34. package/dist/controls-options-manager/enums.js +14 -2
  35. package/dist/controls-options-manager/enums.js.map +1 -1
  36. package/dist/controls-options-manager/index.js +109 -15
  37. package/dist/controls-options-manager/index.js.map +1 -1
  38. package/dist/controls-options-manager/types.js +7 -0
  39. package/dist/controls-options-manager/types.js.map +1 -0
  40. package/dist/controls-options-manager/util.js +309 -18
  41. package/dist/controls-options-manager/util.js.map +1 -1
  42. package/dist/index.js +112 -1
  43. package/dist/index.js.map +1 -1
  44. package/dist/interpretation/collection.js +23 -0
  45. package/dist/interpretation/collection.js.map +1 -0
  46. package/dist/interpretation/index.js +366 -0
  47. package/dist/interpretation/index.js.map +1 -0
  48. package/dist/interpretation/siLanguage.js +25 -0
  49. package/dist/interpretation/siLanguage.js.map +1 -0
  50. package/dist/locus-info/controlsUtils.js +91 -2
  51. package/dist/locus-info/controlsUtils.js.map +1 -1
  52. package/dist/locus-info/index.js +383 -62
  53. package/dist/locus-info/index.js.map +1 -1
  54. package/dist/locus-info/infoUtils.js +7 -1
  55. package/dist/locus-info/infoUtils.js.map +1 -1
  56. package/dist/locus-info/mediaSharesUtils.js +57 -1
  57. package/dist/locus-info/mediaSharesUtils.js.map +1 -1
  58. package/dist/locus-info/parser.js +249 -72
  59. package/dist/locus-info/parser.js.map +1 -1
  60. package/dist/locus-info/selfUtils.js +89 -14
  61. package/dist/locus-info/selfUtils.js.map +1 -1
  62. package/dist/media/index.js +62 -116
  63. package/dist/media/index.js.map +1 -1
  64. package/dist/media/properties.js +73 -124
  65. package/dist/media/properties.js.map +1 -1
  66. package/dist/mediaQualityMetrics/config.js +1 -204
  67. package/dist/mediaQualityMetrics/config.js.map +1 -1
  68. package/dist/meeting/in-meeting-actions.js +86 -2
  69. package/dist/meeting/in-meeting-actions.js.map +1 -1
  70. package/dist/meeting/index.js +3927 -2960
  71. package/dist/meeting/index.js.map +1 -1
  72. package/dist/meeting/locusMediaRequest.js +292 -0
  73. package/dist/meeting/locusMediaRequest.js.map +1 -0
  74. package/dist/meeting/muteState.js +224 -131
  75. package/dist/meeting/muteState.js.map +1 -1
  76. package/dist/meeting/request.js +260 -196
  77. package/dist/meeting/request.js.map +1 -1
  78. package/dist/meeting/util.js +601 -417
  79. package/dist/meeting/util.js.map +1 -1
  80. package/dist/meeting-info/index.js +73 -7
  81. package/dist/meeting-info/index.js.map +1 -1
  82. package/dist/meeting-info/meeting-info-v2.js +192 -51
  83. package/dist/meeting-info/meeting-info-v2.js.map +1 -1
  84. package/dist/meeting-info/util.js +1 -1
  85. package/dist/meeting-info/util.js.map +1 -1
  86. package/dist/meeting-info/utilv2.js +36 -36
  87. package/dist/meeting-info/utilv2.js.map +1 -1
  88. package/dist/meetings/collection.js +39 -0
  89. package/dist/meetings/collection.js.map +1 -1
  90. package/dist/meetings/index.js +424 -116
  91. package/dist/meetings/index.js.map +1 -1
  92. package/dist/meetings/meetings.types.js +7 -0
  93. package/dist/meetings/meetings.types.js.map +1 -0
  94. package/dist/meetings/request.js +2 -0
  95. package/dist/meetings/request.js.map +1 -1
  96. package/dist/meetings/util.js +72 -6
  97. package/dist/meetings/util.js.map +1 -1
  98. package/dist/member/index.js +58 -0
  99. package/dist/member/index.js.map +1 -1
  100. package/dist/member/types.js +25 -0
  101. package/dist/member/types.js.map +1 -0
  102. package/dist/member/util.js +132 -25
  103. package/dist/member/util.js.map +1 -1
  104. package/dist/members/collection.js +10 -0
  105. package/dist/members/collection.js.map +1 -1
  106. package/dist/members/index.js +102 -6
  107. package/dist/members/index.js.map +1 -1
  108. package/dist/members/request.js +106 -38
  109. package/dist/members/request.js.map +1 -1
  110. package/dist/members/types.js +15 -0
  111. package/dist/members/types.js.map +1 -0
  112. package/dist/members/util.js +326 -232
  113. package/dist/members/util.js.map +1 -1
  114. package/dist/metrics/constants.js +16 -5
  115. package/dist/metrics/constants.js.map +1 -1
  116. package/dist/metrics/index.js +1 -446
  117. package/dist/metrics/index.js.map +1 -1
  118. package/dist/multistream/mediaRequestManager.js +228 -58
  119. package/dist/multistream/mediaRequestManager.js.map +1 -1
  120. package/dist/multistream/receiveSlot.js +29 -16
  121. package/dist/multistream/receiveSlot.js.map +1 -1
  122. package/dist/multistream/receiveSlotManager.js +39 -36
  123. package/dist/multistream/receiveSlotManager.js.map +1 -1
  124. package/dist/multistream/remoteMedia.js +44 -18
  125. package/dist/multistream/remoteMedia.js.map +1 -1
  126. package/dist/multistream/remoteMediaGroup.js +60 -3
  127. package/dist/multistream/remoteMediaGroup.js.map +1 -1
  128. package/dist/multistream/remoteMediaManager.js +209 -59
  129. package/dist/multistream/remoteMediaManager.js.map +1 -1
  130. package/dist/multistream/sendSlotManager.js +233 -0
  131. package/dist/multistream/sendSlotManager.js.map +1 -0
  132. package/dist/reachability/clusterReachability.js +356 -0
  133. package/dist/reachability/clusterReachability.js.map +1 -0
  134. package/dist/reachability/index.js +273 -391
  135. package/dist/reachability/index.js.map +1 -1
  136. package/dist/reachability/request.js +17 -8
  137. package/dist/reachability/request.js.map +1 -1
  138. package/dist/reachability/util.js +29 -0
  139. package/dist/reachability/util.js.map +1 -0
  140. package/dist/reconnection-manager/index.js +214 -170
  141. package/dist/reconnection-manager/index.js.map +1 -1
  142. package/dist/recording-controller/index.js +21 -2
  143. package/dist/recording-controller/index.js.map +1 -1
  144. package/dist/recording-controller/util.js +9 -8
  145. package/dist/recording-controller/util.js.map +1 -1
  146. package/dist/roap/index.js +62 -35
  147. package/dist/roap/index.js.map +1 -1
  148. package/dist/roap/request.js +112 -97
  149. package/dist/roap/request.js.map +1 -1
  150. package/dist/roap/turnDiscovery.js +95 -38
  151. package/dist/roap/turnDiscovery.js.map +1 -1
  152. package/dist/rtcMetrics/constants.js +12 -0
  153. package/dist/rtcMetrics/constants.js.map +1 -0
  154. package/dist/rtcMetrics/index.js +142 -0
  155. package/dist/rtcMetrics/index.js.map +1 -0
  156. package/dist/statsAnalyzer/index.js +181 -214
  157. package/dist/statsAnalyzer/index.js.map +1 -1
  158. package/dist/statsAnalyzer/mqaUtil.js +22 -18
  159. package/dist/statsAnalyzer/mqaUtil.js.map +1 -1
  160. package/dist/types/annotation/annotation.types.d.ts +42 -0
  161. package/dist/types/annotation/constants.d.ts +31 -0
  162. package/dist/types/annotation/index.d.ts +117 -0
  163. package/dist/types/breakouts/edit-lock-error.d.ts +15 -0
  164. package/dist/types/breakouts/events.d.ts +8 -0
  165. package/dist/types/breakouts/utils.d.ts +14 -0
  166. package/dist/types/common/errors/no-meeting-info.d.ts +14 -0
  167. package/dist/types/common/errors/reclaim-host-role-errors.d.ts +60 -0
  168. package/dist/types/common/errors/webex-errors.d.ts +25 -1
  169. package/dist/types/common/logs/request.d.ts +2 -0
  170. package/dist/types/common/queue.d.ts +9 -7
  171. package/dist/types/config.d.ts +2 -7
  172. package/dist/types/constants.d.ts +201 -30
  173. package/dist/types/controls-options-manager/enums.d.ts +11 -1
  174. package/dist/types/controls-options-manager/index.d.ts +17 -1
  175. package/dist/types/controls-options-manager/types.d.ts +43 -0
  176. package/dist/types/controls-options-manager/util.d.ts +1 -7
  177. package/dist/types/index.d.ts +6 -4
  178. package/dist/types/interpretation/collection.d.ts +5 -0
  179. package/dist/types/interpretation/index.d.ts +5 -0
  180. package/dist/types/interpretation/siLanguage.d.ts +5 -0
  181. package/dist/types/locus-info/index.d.ts +57 -4
  182. package/dist/types/locus-info/parser.d.ts +66 -6
  183. package/dist/types/media/index.d.ts +2 -0
  184. package/dist/types/media/properties.d.ts +34 -48
  185. package/dist/types/mediaQualityMetrics/config.d.ts +0 -128
  186. package/dist/types/meeting/in-meeting-actions.d.ts +86 -2
  187. package/dist/types/meeting/index.d.ts +506 -512
  188. package/dist/types/meeting/locusMediaRequest.d.ts +74 -0
  189. package/dist/types/meeting/muteState.d.ts +93 -25
  190. package/dist/types/meeting/request.d.ts +72 -43
  191. package/dist/types/meeting/util.d.ts +101 -1
  192. package/dist/types/meeting-info/index.d.ts +13 -1
  193. package/dist/types/meeting-info/meeting-info-v2.d.ts +31 -1
  194. package/dist/types/meetings/collection.d.ts +17 -0
  195. package/dist/types/meetings/index.d.ts +91 -21
  196. package/dist/types/meetings/meetings.types.d.ts +4 -0
  197. package/dist/types/member/index.d.ts +14 -0
  198. package/dist/types/member/types.d.ts +32 -0
  199. package/dist/types/members/collection.d.ts +5 -0
  200. package/dist/types/members/index.d.ts +35 -2
  201. package/dist/types/members/request.d.ts +73 -9
  202. package/dist/types/members/types.d.ts +25 -0
  203. package/dist/types/members/util.d.ts +214 -1
  204. package/dist/types/metrics/constants.d.ts +15 -4
  205. package/dist/types/metrics/index.d.ts +4 -111
  206. package/dist/types/multistream/mediaRequestManager.d.ts +72 -5
  207. package/dist/types/multistream/receiveSlot.d.ts +13 -11
  208. package/dist/types/multistream/receiveSlotManager.d.ts +14 -4
  209. package/dist/types/multistream/remoteMedia.d.ts +8 -29
  210. package/dist/types/multistream/remoteMediaGroup.d.ts +0 -9
  211. package/dist/types/multistream/remoteMediaManager.d.ts +46 -2
  212. package/dist/types/multistream/sendSlotManager.d.ts +61 -0
  213. package/dist/types/reachability/clusterReachability.d.ts +109 -0
  214. package/dist/types/reachability/index.d.ts +60 -95
  215. package/dist/types/reachability/request.d.ts +7 -3
  216. package/dist/types/reachability/util.d.ts +8 -0
  217. package/dist/types/reconnection-manager/index.d.ts +19 -0
  218. package/dist/types/recording-controller/index.d.ts +15 -1
  219. package/dist/types/recording-controller/util.d.ts +5 -4
  220. package/dist/types/roap/index.d.ts +2 -1
  221. package/dist/types/roap/request.d.ts +15 -11
  222. package/dist/types/roap/turnDiscovery.d.ts +21 -3
  223. package/dist/types/rtcMetrics/constants.d.ts +4 -0
  224. package/dist/types/rtcMetrics/index.d.ts +54 -0
  225. package/dist/types/statsAnalyzer/index.d.ts +29 -11
  226. package/dist/types/webinar/collection.d.ts +16 -0
  227. package/dist/types/webinar/index.d.ts +5 -0
  228. package/dist/webinar/collection.js +44 -0
  229. package/dist/webinar/collection.js.map +1 -0
  230. package/dist/webinar/index.js +69 -0
  231. package/dist/webinar/index.js.map +1 -0
  232. package/package.json +22 -19
  233. package/src/annotation/annotation.types.ts +50 -0
  234. package/src/annotation/constants.ts +36 -0
  235. package/src/annotation/index.ts +328 -0
  236. package/src/breakouts/README.md +42 -12
  237. package/src/breakouts/breakout.ts +67 -9
  238. package/src/breakouts/edit-lock-error.ts +25 -0
  239. package/src/breakouts/events.ts +56 -0
  240. package/src/breakouts/index.ts +592 -20
  241. package/src/breakouts/utils.ts +42 -0
  242. package/src/common/errors/no-meeting-info.ts +24 -0
  243. package/src/common/errors/reclaim-host-role-errors.ts +134 -0
  244. package/src/common/errors/webex-errors.ts +44 -2
  245. package/src/common/logs/logger-proxy.ts +1 -1
  246. package/src/common/logs/request.ts +5 -1
  247. package/src/common/queue.ts +22 -8
  248. package/src/config.ts +4 -9
  249. package/src/constants.ts +224 -20
  250. package/src/controls-options-manager/enums.ts +12 -0
  251. package/src/controls-options-manager/index.ts +116 -21
  252. package/src/controls-options-manager/types.ts +59 -0
  253. package/src/controls-options-manager/util.ts +294 -14
  254. package/src/index.ts +40 -0
  255. package/src/interpretation/README.md +60 -0
  256. package/src/interpretation/collection.ts +19 -0
  257. package/src/interpretation/index.ts +332 -0
  258. package/src/interpretation/siLanguage.ts +18 -0
  259. package/src/locus-info/controlsUtils.ts +108 -0
  260. package/src/locus-info/index.ts +413 -59
  261. package/src/locus-info/infoUtils.ts +10 -2
  262. package/src/locus-info/mediaSharesUtils.ts +64 -0
  263. package/src/locus-info/parser.ts +258 -47
  264. package/src/locus-info/selfUtils.ts +81 -5
  265. package/src/media/index.ts +102 -122
  266. package/src/media/properties.ts +87 -110
  267. package/src/mediaQualityMetrics/config.ts +0 -135
  268. package/src/meeting/in-meeting-actions.ts +171 -3
  269. package/src/meeting/index.ts +3276 -2555
  270. package/src/meeting/locusMediaRequest.ts +313 -0
  271. package/src/meeting/muteState.ts +223 -136
  272. package/src/meeting/request.ts +177 -121
  273. package/src/meeting/util.ts +588 -394
  274. package/src/meeting-info/index.ts +81 -8
  275. package/src/meeting-info/meeting-info-v2.ts +170 -14
  276. package/src/meeting-info/util.ts +1 -1
  277. package/src/meeting-info/utilv2.ts +23 -23
  278. package/src/meetings/collection.ts +33 -0
  279. package/src/meetings/index.ts +454 -125
  280. package/src/meetings/meetings.types.ts +12 -0
  281. package/src/meetings/request.ts +2 -0
  282. package/src/meetings/util.ts +80 -11
  283. package/src/member/index.ts +58 -0
  284. package/src/member/types.ts +38 -0
  285. package/src/member/util.ts +141 -25
  286. package/src/members/collection.ts +8 -0
  287. package/src/members/index.ts +134 -8
  288. package/src/members/request.ts +97 -17
  289. package/src/members/types.ts +29 -0
  290. package/src/members/util.ts +333 -240
  291. package/src/metrics/constants.ts +15 -4
  292. package/src/metrics/index.ts +1 -469
  293. package/src/multistream/mediaRequestManager.ts +277 -82
  294. package/src/multistream/receiveSlot.ts +31 -17
  295. package/src/multistream/receiveSlotManager.ts +34 -24
  296. package/src/multistream/remoteMedia.ts +27 -2
  297. package/src/multistream/remoteMediaGroup.ts +59 -0
  298. package/src/multistream/remoteMediaManager.ts +148 -30
  299. package/src/multistream/sendSlotManager.ts +170 -0
  300. package/src/reachability/clusterReachability.ts +320 -0
  301. package/src/reachability/index.ts +236 -342
  302. package/src/reachability/request.ts +17 -8
  303. package/src/reachability/util.ts +24 -0
  304. package/src/reconnection-manager/index.ts +128 -106
  305. package/src/recording-controller/index.ts +20 -3
  306. package/src/recording-controller/util.ts +26 -9
  307. package/src/roap/index.ts +63 -32
  308. package/src/roap/request.ts +100 -104
  309. package/src/roap/turnDiscovery.ts +48 -26
  310. package/src/rtcMetrics/constants.ts +3 -0
  311. package/src/rtcMetrics/index.ts +124 -0
  312. package/src/statsAnalyzer/index.ts +218 -289
  313. package/src/statsAnalyzer/mqaUtil.ts +28 -30
  314. package/src/webinar/collection.ts +31 -0
  315. package/src/webinar/index.ts +62 -0
  316. package/test/integration/spec/converged-space-meetings.js +60 -3
  317. package/test/integration/spec/journey.js +320 -261
  318. package/test/integration/spec/space-meeting.js +76 -3
  319. package/test/unit/spec/annotation/index.ts +418 -0
  320. package/test/unit/spec/breakouts/breakout.ts +118 -28
  321. package/test/unit/spec/breakouts/edit-lock-error.ts +30 -0
  322. package/test/unit/spec/breakouts/events.ts +89 -0
  323. package/test/unit/spec/breakouts/index.ts +1395 -69
  324. package/test/unit/spec/breakouts/utils.js +52 -1
  325. package/test/unit/spec/common/queue.js +31 -2
  326. package/test/unit/spec/controls-options-manager/index.js +163 -0
  327. package/test/unit/spec/controls-options-manager/util.js +576 -60
  328. package/test/unit/spec/fixture/locus.js +1 -0
  329. package/test/unit/spec/interpretation/collection.ts +15 -0
  330. package/test/unit/spec/interpretation/index.ts +589 -0
  331. package/test/unit/spec/interpretation/siLanguage.ts +28 -0
  332. package/test/unit/spec/locus-info/controlsUtils.js +316 -43
  333. package/test/unit/spec/locus-info/index.js +1304 -33
  334. package/test/unit/spec/locus-info/infoUtils.js +37 -15
  335. package/test/unit/spec/locus-info/lib/SeqCmp.json +16 -0
  336. package/test/unit/spec/locus-info/mediaSharesUtils.ts +32 -0
  337. package/test/unit/spec/locus-info/parser.js +116 -35
  338. package/test/unit/spec/locus-info/selfConstant.js +27 -4
  339. package/test/unit/spec/locus-info/selfUtils.js +208 -17
  340. package/test/unit/spec/media/index.ts +120 -37
  341. package/test/unit/spec/media/properties.ts +2 -2
  342. package/test/unit/spec/meeting/in-meeting-actions.ts +85 -3
  343. package/test/unit/spec/meeting/index.js +5849 -2014
  344. package/test/unit/spec/meeting/locusMediaRequest.ts +442 -0
  345. package/test/unit/spec/meeting/muteState.js +402 -213
  346. package/test/unit/spec/meeting/request.js +483 -49
  347. package/test/unit/spec/meeting/utils.js +679 -64
  348. package/test/unit/spec/meeting-info/index.js +300 -0
  349. package/test/unit/spec/meeting-info/meetinginfov2.js +526 -5
  350. package/test/unit/spec/meeting-info/utilv2.js +21 -0
  351. package/test/unit/spec/meetings/collection.js +26 -0
  352. package/test/unit/spec/meetings/index.js +1231 -212
  353. package/test/unit/spec/meetings/utils.js +202 -2
  354. package/test/unit/spec/member/index.js +61 -6
  355. package/test/unit/spec/member/util.js +510 -34
  356. package/test/unit/spec/members/index.js +432 -1
  357. package/test/unit/spec/members/request.js +206 -27
  358. package/test/unit/spec/members/utils.js +210 -0
  359. package/test/unit/spec/metrics/index.js +1 -50
  360. package/test/unit/spec/multistream/mediaRequestManager.ts +776 -162
  361. package/test/unit/spec/multistream/receiveSlot.ts +28 -20
  362. package/test/unit/spec/multistream/receiveSlotManager.ts +32 -30
  363. package/test/unit/spec/multistream/remoteMedia.ts +30 -0
  364. package/test/unit/spec/multistream/remoteMediaGroup.ts +266 -0
  365. package/test/unit/spec/multistream/remoteMediaManager.ts +326 -0
  366. package/test/unit/spec/multistream/sendSlotManager.ts +242 -0
  367. package/test/unit/spec/reachability/clusterReachability.ts +279 -0
  368. package/test/unit/spec/reachability/index.ts +486 -13
  369. package/test/unit/spec/reachability/request.js +68 -0
  370. package/test/unit/spec/reachability/util.ts +40 -0
  371. package/test/unit/spec/reconnection-manager/index.js +117 -11
  372. package/test/unit/spec/recording-controller/index.js +294 -218
  373. package/test/unit/spec/recording-controller/util.js +223 -96
  374. package/test/unit/spec/roap/index.ts +174 -63
  375. package/test/unit/spec/roap/request.ts +226 -85
  376. package/test/unit/spec/roap/turnDiscovery.ts +76 -34
  377. package/test/unit/spec/rtcMetrics/index.ts +93 -0
  378. package/test/unit/spec/stats-analyzer/index.js +231 -7
  379. package/test/unit/spec/webinar/collection.ts +13 -0
  380. package/test/unit/spec/webinar/index.ts +60 -0
  381. package/test/utils/integrationTestUtils.js +46 -0
  382. package/test/utils/testUtils.js +0 -52
  383. package/dist/meeting/effectsState.js +0 -262
  384. package/dist/meeting/effectsState.js.map +0 -1
  385. package/dist/metrics/config.js +0 -289
  386. package/dist/metrics/config.js.map +0 -1
  387. package/dist/types/meeting/effectsState.d.ts +0 -42
  388. package/dist/types/metrics/config.d.ts +0 -169
  389. package/src/index.js +0 -16
  390. package/src/meeting/effectsState.ts +0 -211
  391. package/src/metrics/config.ts +0 -485
  392. package/test/unit/spec/meeting/effectsState.js +0 -285
@@ -1,17 +1,19 @@
1
1
  /* eslint-disable require-jsdoc */
2
2
  import {
3
- MediaRequest as WcmeMediaRequest,
3
+ StreamRequest,
4
4
  Policy,
5
5
  ActiveSpeakerInfo,
6
6
  ReceiverSelectedInfo,
7
7
  CodecInfo as WcmeCodecInfo,
8
8
  H264Codec,
9
+ getRecommendedMaxBitrateForFrameSize,
10
+ RecommendedOpusBitrates,
9
11
  } from '@webex/internal-media-core';
10
- import {cloneDeep} from 'lodash';
12
+ import {cloneDeepWith, debounce, isEmpty} from 'lodash';
11
13
 
12
14
  import LoggerProxy from '../common/logs/logger-proxy';
13
15
 
14
- import {ReceiveSlot, ReceiveSlotEvents, ReceiveSlotId} from './receiveSlot';
16
+ import {ReceiveSlot, ReceiveSlotEvents} from './receiveSlot';
15
17
  import {getMaxFs} from './remoteMedia';
16
18
 
17
19
  export interface ActiveSpeakerPolicyInfo {
@@ -44,6 +46,8 @@ export interface MediaRequest {
44
46
  policyInfo: PolicyInfo;
45
47
  receiveSlots: Array<ReceiveSlot>;
46
48
  codecInfo?: CodecInfo;
49
+ preferredMaxFs?: number;
50
+ handleMaxFs?: ({maxFs}: {maxFs: number}) => void;
47
51
  }
48
52
 
49
53
  export type MediaRequestId = string;
@@ -56,60 +60,58 @@ const CODEC_DEFAULTS = {
56
60
  },
57
61
  };
58
62
 
63
+ const DEBOUNCED_SOURCE_UPDATE_TIME = 1000;
64
+
59
65
  type DegradationPreferences = {
60
66
  maxMacroblocksLimit: number;
61
67
  };
62
68
 
63
- type SendMediaRequestsCallback = (mediaRequests: WcmeMediaRequest[]) => void;
69
+ type SendMediaRequestsCallback = (streamRequests: StreamRequest[]) => void;
70
+ type Kind = 'audio' | 'video';
71
+
72
+ type Options = {
73
+ degradationPreferences: DegradationPreferences;
74
+ kind: Kind;
75
+ trimRequestsToNumOfSources: boolean; // if enabled, AS speaker requests will be trimmed based on the calls to setNumCurrentSources()
76
+ };
77
+
78
+ type ClientRequestsMap = {[key: MediaRequestId]: MediaRequest};
64
79
 
65
80
  export class MediaRequestManager {
66
81
  private sendMediaRequestsCallback: SendMediaRequestsCallback;
67
82
 
68
- private counter: number;
83
+ private kind: Kind;
69
84
 
70
- private clientRequests: {[key: MediaRequestId]: MediaRequest};
85
+ private counter: number;
71
86
 
72
- private slotsActiveInLastMediaRequest: {[key: ReceiveSlotId]: ReceiveSlot};
87
+ private clientRequests: ClientRequestsMap;
73
88
 
74
89
  private degradationPreferences: DegradationPreferences;
75
90
 
76
91
  private sourceUpdateListener: () => void;
77
92
 
78
- constructor(
79
- degradationPreferences: DegradationPreferences,
80
- sendMediaRequestsCallback: SendMediaRequestsCallback
81
- ) {
93
+ private debouncedSourceUpdateListener: () => void;
94
+
95
+ private previousStreamRequests: Array<StreamRequest> = [];
96
+
97
+ private trimRequestsToNumOfSources: boolean;
98
+ private numTotalSources: number;
99
+ private numLiveSources: number;
100
+
101
+ constructor(sendMediaRequestsCallback: SendMediaRequestsCallback, options: Options) {
82
102
  this.sendMediaRequestsCallback = sendMediaRequestsCallback;
83
103
  this.counter = 0;
104
+ this.numLiveSources = 0;
105
+ this.numTotalSources = 0;
84
106
  this.clientRequests = {};
85
- this.slotsActiveInLastMediaRequest = {};
86
- this.degradationPreferences = degradationPreferences;
107
+ this.degradationPreferences = options.degradationPreferences;
108
+ this.kind = options.kind;
109
+ this.trimRequestsToNumOfSources = options.trimRequestsToNumOfSources;
87
110
  this.sourceUpdateListener = this.commit.bind(this);
88
- }
89
-
90
- private resetInactiveReceiveSlots() {
91
- const activeSlots: {[key: ReceiveSlotId]: ReceiveSlot} = {};
92
-
93
- // create a map of all currently used slot ids
94
- Object.values(this.clientRequests).forEach((request) =>
95
- request.receiveSlots.forEach((slot) => {
96
- activeSlots[slot.id] = slot;
97
- })
111
+ this.debouncedSourceUpdateListener = debounce(
112
+ this.sourceUpdateListener,
113
+ DEBOUNCED_SOURCE_UPDATE_TIME
98
114
  );
99
-
100
- // when we stop using some receive slots and they are not included in the new media request,
101
- // we will never get a 'no source' notification for them, so we reset their state,
102
- // so that the client doesn't try to display their video anymore
103
- for (const [slotId, slot] of Object.entries(this.slotsActiveInLastMediaRequest)) {
104
- if (!(slotId in activeSlots)) {
105
- LoggerProxy.logger.info(
106
- `multistream:mediaRequestManager --> resetting sourceState to "no source" for slot ${slot.id}`
107
- );
108
- slot.resetSourceState();
109
- }
110
- }
111
-
112
- this.slotsActiveInLastMediaRequest = activeSlots;
113
115
  }
114
116
 
115
117
  public setDegradationPreferences(degradationPreferences: DegradationPreferences) {
@@ -117,8 +119,7 @@ export class MediaRequestManager {
117
119
  this.sendRequests(); // re-send requests after preferences are set
118
120
  }
119
121
 
120
- private getDegradedClientRequests() {
121
- const clientRequests = cloneDeep(this.clientRequests);
122
+ private getDegradedClientRequests(clientRequests: ClientRequestsMap) {
122
123
  const maxFsLimits = [
123
124
  getMaxFs('best'),
124
125
  getMaxFs('large'),
@@ -131,16 +132,15 @@ export class MediaRequestManager {
131
132
  // reduce max-fs until total macroblocks is below limit
132
133
  for (let i = 0; i < maxFsLimits.length; i += 1) {
133
134
  let totalMacroblocksRequested = 0;
134
- Object.entries(clientRequests).forEach(([id, mr]) => {
135
+ Object.values(clientRequests).forEach((mr) => {
135
136
  if (mr.codecInfo) {
136
137
  mr.codecInfo.maxFs = Math.min(
138
+ mr.preferredMaxFs || CODEC_DEFAULTS.h264.maxFs,
137
139
  mr.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs,
138
140
  maxFsLimits[i]
139
141
  );
140
142
  // we only consider sources with "live" state
141
- const slotsWithLiveSource = this.clientRequests[id].receiveSlots.filter(
142
- (rs) => rs.sourceState === 'live'
143
- );
143
+ const slotsWithLiveSource = mr.receiveSlots.filter((rs) => rs.sourceState === 'live');
144
144
  totalMacroblocksRequested += mr.codecInfo.maxFs * slotsWithLiveSource.length;
145
145
  }
146
146
  });
@@ -157,52 +157,229 @@ export class MediaRequestManager {
157
157
  );
158
158
  }
159
159
  }
160
+ }
161
+
162
+ /**
163
+ * Returns true if two stream requests are the same, false otherwise.
164
+ *
165
+ * @param {StreamRequest} streamRequestA - Stream request A for comparison.
166
+ * @param {StreamRequest} streamRequestB - Stream request B for comparison.
167
+ * @returns {boolean} - Whether they are equal.
168
+ */
169
+ // eslint-disable-next-line class-methods-use-this
170
+ public isEqual(streamRequestA: StreamRequest, streamRequestB: StreamRequest) {
171
+ return (
172
+ JSON.stringify(streamRequestA._toJmpStreamRequest()) ===
173
+ JSON.stringify(streamRequestB._toJmpStreamRequest())
174
+ );
175
+ }
176
+
177
+ /**
178
+ * Compares new stream requests to previous ones and determines
179
+ * if they are the same.
180
+ *
181
+ * @param {StreamRequest[]} newRequests - Array with new requests.
182
+ * @returns {boolean} - True if they are equal, false otherwise.
183
+ */
184
+ private checkIsNewRequestsEqualToPrev(newRequests: StreamRequest[]) {
185
+ return (
186
+ !isEmpty(this.previousStreamRequests) &&
187
+ this.previousStreamRequests.length === newRequests.length &&
188
+ this.previousStreamRequests.every((req, idx) => this.isEqual(req, newRequests[idx]))
189
+ );
190
+ }
191
+
192
+ /**
193
+ * Returns the maxPayloadBitsPerSecond per Stream
194
+ *
195
+ * If MediaRequestManager kind is "audio", a constant bitrate will be returned.
196
+ * If MediaRequestManager kind is "video", the bitrate will be calculated based
197
+ * on maxFs (default h264 maxFs as fallback if maxFs is not defined)
198
+ *
199
+ * @param {MediaRequest} mediaRequest - mediaRequest to take data from
200
+ * @returns {number} maxPayloadBitsPerSecond
201
+ */
202
+ private getMaxPayloadBitsPerSecond(mediaRequest: MediaRequest): number {
203
+ if (this.kind === 'audio') {
204
+ // return mono_music bitrate default if the kind of mediarequest manager is audio:
205
+ return RecommendedOpusBitrates.FB_MONO_MUSIC;
206
+ }
207
+
208
+ return getRecommendedMaxBitrateForFrameSize(
209
+ mediaRequest.codecInfo.maxFs || CODEC_DEFAULTS.h264.maxFs
210
+ );
211
+ }
160
212
 
161
- return clientRequests;
213
+ /**
214
+ * Returns the max Macro Blocks per second (maxMbps) per H264 Stream
215
+ *
216
+ * The maxMbps will be calculated based on maxFs and maxFps
217
+ * (default h264 maxFps as fallback if maxFps is not defined)
218
+ *
219
+ * @param {MediaRequest} mediaRequest - mediaRequest to take data from
220
+ * @returns {number} maxMbps
221
+ */
222
+ // eslint-disable-next-line class-methods-use-this
223
+ private getH264MaxMbps(mediaRequest: MediaRequest): number {
224
+ // fallback for maxFps (not needed for maxFs, since there is a fallback already in getDegradedClientRequests)
225
+ const maxFps = mediaRequest.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps;
226
+
227
+ // divided by 100 since maxFps is 3000 (for 30 frames per seconds)
228
+ return (mediaRequest.codecInfo.maxFs * maxFps) / 100;
229
+ }
230
+
231
+ /**
232
+ * Clears the previous stream requests.
233
+ *
234
+ * @returns {void}
235
+ */
236
+ public clearPreviousRequests(): void {
237
+ this.previousStreamRequests = [];
238
+ }
239
+
240
+ /** Modifies the passed in clientRequests and makes sure that in total they don't ask
241
+ * for more streams than there are available.
242
+ *
243
+ * @param {Object} clientRequests
244
+ * @returns {void}
245
+ */
246
+ private trimRequests(clientRequests: ClientRequestsMap) {
247
+ const preferLiveVideo = this.getPreferLiveVideo();
248
+
249
+ if (!this.trimRequestsToNumOfSources) {
250
+ return;
251
+ }
252
+
253
+ // preferLiveVideo being undefined means that there are no active-speaker requests so we don't need to do any trimming
254
+ if (preferLiveVideo === undefined) {
255
+ return;
256
+ }
257
+
258
+ let numStreamsAvailable = preferLiveVideo ? this.numLiveSources : this.numTotalSources;
259
+
260
+ Object.values(clientRequests)
261
+ .sort((a, b) => {
262
+ // we have to count how many streams we're asking for
263
+ // and should not ask for more than numStreamsAvailable in total,
264
+ // so we might need to trim active-speaker requests and first ones to trim should be
265
+ // the ones with lowest priority
266
+
267
+ // receiver-selected requests have priority over active-speakers
268
+ if (a.policyInfo.policy === 'receiver-selected') {
269
+ return -1;
270
+ }
271
+ if (b.policyInfo.policy === 'receiver-selected') {
272
+ return 1;
273
+ }
274
+
275
+ // and active-speakers are sorted by descending priority
276
+ return b.policyInfo.priority - a.policyInfo.priority;
277
+ })
278
+ .forEach((request) => {
279
+ // we only trim active-speaker requests
280
+ if (request.policyInfo.policy === 'active-speaker') {
281
+ const trimmedCount = Math.min(numStreamsAvailable, request.receiveSlots.length);
282
+
283
+ request.receiveSlots.length = trimmedCount;
284
+
285
+ numStreamsAvailable -= trimmedCount;
286
+ } else {
287
+ numStreamsAvailable -= request.receiveSlots.length;
288
+ }
289
+
290
+ if (numStreamsAvailable < 0) {
291
+ numStreamsAvailable = 0;
292
+ }
293
+ });
294
+ }
295
+
296
+ private getPreferLiveVideo(): boolean | undefined {
297
+ let preferLiveVideo;
298
+
299
+ Object.values(this.clientRequests).forEach((mr) => {
300
+ if (mr.policyInfo.policy === 'active-speaker') {
301
+ // take the value from first encountered active speaker request
302
+ if (preferLiveVideo === undefined) {
303
+ preferLiveVideo = mr.policyInfo.preferLiveVideo;
304
+ }
305
+
306
+ if (mr.policyInfo.preferLiveVideo !== preferLiveVideo) {
307
+ throw new Error(
308
+ 'a mix of active-speaker groups with different values for preferLiveVideo is not supported'
309
+ );
310
+ }
311
+ }
312
+ });
313
+
314
+ return preferLiveVideo;
315
+ }
316
+
317
+ private cloneClientRequests(): ClientRequestsMap {
318
+ // we clone the client requests but without cloning the ReceiveSlots that they reference
319
+ return cloneDeepWith(this.clientRequests, (value, key) => {
320
+ if (key === 'receiveSlots') {
321
+ return [...value];
322
+ }
323
+
324
+ return undefined;
325
+ });
162
326
  }
163
327
 
164
328
  private sendRequests() {
165
- const wcmeMediaRequests: WcmeMediaRequest[] = [];
329
+ const streamRequests: StreamRequest[] = [];
330
+
331
+ // clone the requests so that any modifications we do to them don't affect the original ones
332
+ const clientRequests = this.cloneClientRequests();
166
333
 
167
- const clientRequests = this.getDegradedClientRequests();
168
- const maxPayloadBitsPerSecond = 10 * 1000 * 1000;
334
+ this.trimRequests(clientRequests);
335
+ this.getDegradedClientRequests(clientRequests);
169
336
 
170
- // map all the client media requests to wcme media requests
337
+ // map all the client media requests to wcme stream requests
171
338
  Object.values(clientRequests).forEach((mr) => {
172
- wcmeMediaRequests.push(
173
- new WcmeMediaRequest(
174
- mr.policyInfo.policy === 'active-speaker'
175
- ? Policy.ActiveSpeaker
176
- : Policy.ReceiverSelected,
177
- mr.policyInfo.policy === 'active-speaker'
178
- ? new ActiveSpeakerInfo(
179
- mr.policyInfo.priority,
180
- mr.policyInfo.crossPriorityDuplication,
181
- mr.policyInfo.crossPolicyDuplication,
182
- mr.policyInfo.preferLiveVideo
183
- )
184
- : new ReceiverSelectedInfo(mr.policyInfo.csi),
185
- mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),
186
- maxPayloadBitsPerSecond,
187
- mr.codecInfo && [
188
- new WcmeCodecInfo(
189
- 0x80,
190
- new H264Codec(
191
- mr.codecInfo.maxFs,
192
- mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,
193
- mr.codecInfo.maxMbps || CODEC_DEFAULTS.h264.maxMbps,
194
- mr.codecInfo.maxWidth,
195
- mr.codecInfo.maxHeight
196
- )
197
- ),
198
- ]
199
- )
200
- );
339
+ if (mr.receiveSlots.length > 0) {
340
+ streamRequests.push(
341
+ new StreamRequest(
342
+ mr.policyInfo.policy === 'active-speaker'
343
+ ? Policy.ActiveSpeaker
344
+ : Policy.ReceiverSelected,
345
+ mr.policyInfo.policy === 'active-speaker'
346
+ ? new ActiveSpeakerInfo(
347
+ mr.policyInfo.priority,
348
+ mr.policyInfo.crossPriorityDuplication,
349
+ mr.policyInfo.crossPolicyDuplication,
350
+ mr.policyInfo.preferLiveVideo
351
+ )
352
+ : new ReceiverSelectedInfo(mr.policyInfo.csi),
353
+ mr.receiveSlots.map((receiveSlot) => receiveSlot.wcmeReceiveSlot),
354
+ this.getMaxPayloadBitsPerSecond(mr),
355
+ mr.codecInfo && [
356
+ new WcmeCodecInfo(
357
+ 0x80,
358
+ new H264Codec(
359
+ mr.codecInfo.maxFs,
360
+ mr.codecInfo.maxFps || CODEC_DEFAULTS.h264.maxFps,
361
+ this.getH264MaxMbps(mr),
362
+ mr.codecInfo.maxWidth,
363
+ mr.codecInfo.maxHeight
364
+ )
365
+ ),
366
+ ]
367
+ )
368
+ );
369
+ }
201
370
  });
202
371
 
203
- this.sendMediaRequestsCallback(wcmeMediaRequests);
204
-
205
- this.resetInactiveReceiveSlots();
372
+ //! IMPORTANT: this is only a temporary fix. This will soon be done in the jmp layer (@webex/json-multistream)
373
+ // https://jira-eng-gpk2.cisco.com/jira/browse/WEBEX-326713
374
+ if (!this.checkIsNewRequestsEqualToPrev(streamRequests)) {
375
+ this.sendMediaRequestsCallback(streamRequests);
376
+ this.previousStreamRequests = streamRequests;
377
+ LoggerProxy.logger.info(`multistream:sendRequests --> media requests sent. `);
378
+ } else {
379
+ LoggerProxy.logger.info(
380
+ `multistream:sendRequests --> detected duplicate WCME requests, skipping them... `
381
+ );
382
+ }
206
383
  }
207
384
 
208
385
  public addRequest(mediaRequest: MediaRequest, commit = true): MediaRequestId {
@@ -211,8 +388,15 @@ export class MediaRequestManager {
211
388
 
212
389
  this.clientRequests[newId] = mediaRequest;
213
390
 
391
+ const eventHandler = ({maxFs}) => {
392
+ mediaRequest.preferredMaxFs = maxFs;
393
+ this.debouncedSourceUpdateListener();
394
+ };
395
+ mediaRequest.handleMaxFs = eventHandler;
396
+
214
397
  mediaRequest.receiveSlots.forEach((rs) => {
215
398
  rs.on(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);
399
+ rs.on(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
216
400
  });
217
401
 
218
402
  if (commit) {
@@ -223,8 +407,11 @@ export class MediaRequestManager {
223
407
  }
224
408
 
225
409
  public cancelRequest(requestId: MediaRequestId, commit = true) {
226
- this.clientRequests[requestId]?.receiveSlots.forEach((rs) => {
410
+ const mediaRequest = this.clientRequests[requestId];
411
+
412
+ mediaRequest?.receiveSlots.forEach((rs) => {
227
413
  rs.off(ReceiveSlotEvents.SourceUpdate, this.sourceUpdateListener);
414
+ rs.off(ReceiveSlotEvents.MaxFsUpdate, mediaRequest.handleMaxFs);
228
415
  });
229
416
 
230
417
  delete this.clientRequests[requestId];
@@ -240,6 +427,14 @@ export class MediaRequestManager {
240
427
 
241
428
  public reset() {
242
429
  this.clientRequests = {};
243
- this.slotsActiveInLastMediaRequest = {};
430
+ this.numTotalSources = 0;
431
+ this.numLiveSources = 0;
432
+ }
433
+
434
+ public setNumCurrentSources(numTotalSources: number, numLiveSources: number) {
435
+ this.numTotalSources = numTotalSources;
436
+ this.numLiveSources = numLiveSources;
437
+
438
+ this.sendRequests();
244
439
  }
245
440
  }
@@ -3,7 +3,7 @@ import {
3
3
  MediaType,
4
4
  ReceiveSlot as WcmeReceiveSlot,
5
5
  ReceiveSlotEvents as WcmeReceiveSlotEvents,
6
- SourceState,
6
+ StreamState,
7
7
  } from '@webex/internal-media-core';
8
8
 
9
9
  import LoggerProxy from '../common/logs/logger-proxy';
@@ -11,9 +11,10 @@ import EventsScope from '../common/events/events-scope';
11
11
 
12
12
  export const ReceiveSlotEvents = {
13
13
  SourceUpdate: 'sourceUpdate',
14
+ MaxFsUpdate: 'maxFsUpdate',
14
15
  };
15
16
 
16
- export type {SourceState} from '@webex/internal-media-core';
17
+ export type {StreamState} from '@webex/internal-media-core';
17
18
  export type CSI = number;
18
19
  export type MemberId = string;
19
20
  export type ReceiveSlotId = string;
@@ -39,7 +40,7 @@ export class ReceiveSlot extends EventsScope {
39
40
 
40
41
  #csi?: CSI;
41
42
 
42
- #sourceState: SourceState;
43
+ #sourceState: StreamState;
43
44
 
44
45
  /**
45
46
  * constructor - don't use it directly, you should always use meeting.receiveSlotManager.allocateSlot()
@@ -81,6 +82,25 @@ export class ReceiveSlot extends EventsScope {
81
82
  return this.#csi;
82
83
  }
83
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
+
84
104
  /**
85
105
  * Getter for sourceState
86
106
  */
@@ -99,7 +119,7 @@ export class ReceiveSlot extends EventsScope {
99
119
 
100
120
  this.mcReceiveSlot.on(
101
121
  WcmeReceiveSlotEvents.SourceUpdate,
102
- (state: SourceState, csi?: number) => {
122
+ (state: StreamState, csi?: number) => {
103
123
  LoggerProxy.logger.log(
104
124
  `ReceiveSlot#setupEventListeners --> got source update on receive slot ${this.id}, mediaType=${this.mediaType}, csi=${csi}, state=${state}`
105
125
  );
@@ -139,6 +159,13 @@ export class ReceiveSlot extends EventsScope {
139
159
  }
140
160
  }
141
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
+
142
169
  /**
143
170
  * The MediaStream object associated with this slot.
144
171
  *
@@ -154,17 +181,4 @@ export class ReceiveSlot extends EventsScope {
154
181
  get wcmeReceiveSlot(): WcmeReceiveSlot {
155
182
  return this.mcReceiveSlot;
156
183
  }
157
-
158
- /**
159
- * Resets the source state to the default 'no source' value.
160
- * This function should be called on receive slots that are
161
- * no longer part of a media request. It's needed because WCME
162
- * does not send any more events on such slots, so the sourceState
163
- * value would not represent the truth anymore.
164
- */
165
- public resetSourceState() {
166
- this.#sourceState = 'no source';
167
- this.#csi = undefined;
168
- this.#memberId = undefined;
169
- }
170
184
  }
@@ -1,11 +1,13 @@
1
1
  /* eslint-disable valid-jsdoc */
2
2
  /* eslint-disable import/prefer-default-export */
3
- import {MediaType} from '@webex/internal-media-core';
4
-
3
+ import {MediaType, ReceiveSlot as WcmeReceiveSlot} from '@webex/internal-media-core';
5
4
  import LoggerProxy from '../common/logs/logger-proxy';
6
- import Meeting from '../meeting';
7
5
 
8
- import {CSI, ReceiveSlot} from './receiveSlot';
6
+ import {FindMemberIdCallback, ReceiveSlot} from './receiveSlot';
7
+
8
+ export type CreateSlotCallback = (mediaType: MediaType) => Promise<WcmeReceiveSlot>;
9
+
10
+ export type {CSI, FindMemberIdCallback} from './receiveSlot';
9
11
 
10
12
  /**
11
13
  * Manages all receive slots used by a meeting. WMCE receive slots cannot be ever deleted,
@@ -16,13 +18,18 @@ export class ReceiveSlotManager {
16
18
 
17
19
  private freeSlots: {[key in MediaType]: ReceiveSlot[]};
18
20
 
19
- private meeting: Meeting;
21
+ private createSlotCallback: CreateSlotCallback;
22
+
23
+ private findMemberIdByCsiCallback: FindMemberIdCallback;
20
24
 
21
25
  /**
22
26
  * Constructor
23
27
  * @param {Meeting} meeting
24
28
  */
25
- constructor(meeting) {
29
+ constructor(
30
+ createSlotCallback: CreateSlotCallback,
31
+ findMemberIdByCsiCallback: FindMemberIdCallback
32
+ ) {
26
33
  this.allocatedSlots = {
27
34
  [MediaType.AudioMain]: [],
28
35
  [MediaType.VideoMain]: [],
@@ -35,7 +42,8 @@ export class ReceiveSlotManager {
35
42
  [MediaType.AudioSlides]: [],
36
43
  [MediaType.VideoSlides]: [],
37
44
  };
38
- this.meeting = meeting;
45
+ this.createSlotCallback = createSlotCallback;
46
+ this.findMemberIdByCsiCallback = findMemberIdByCsiCallback;
39
47
  }
40
48
 
41
49
  /**
@@ -45,34 +53,24 @@ export class ReceiveSlotManager {
45
53
  * @returns {Promise<ReceiveSlot>}
46
54
  */
47
55
  async allocateSlot(mediaType: MediaType): Promise<ReceiveSlot> {
48
- if (!this.meeting?.mediaProperties?.webrtcMediaConnection) {
49
- return Promise.reject(new Error('Webrtc media connection is missing'));
50
- }
51
-
52
56
  // try to use one of the free ones
53
57
  const availableSlot = this.freeSlots[mediaType].pop();
54
58
 
55
59
  if (availableSlot) {
56
60
  this.allocatedSlots[mediaType].push(availableSlot);
57
61
 
58
- LoggerProxy.logger.log(`receive slot re-used: ${availableSlot.id}`);
62
+ LoggerProxy.logger.log(`${mediaType}: receive slot re-used: ${availableSlot.id}`);
59
63
 
60
64
  return availableSlot;
61
65
  }
62
66
 
63
67
  // we have to create a new one
64
- const wcmeReceiveSlot =
65
- await this.meeting.mediaProperties.webrtcMediaConnection.createReceiveSlot(mediaType);
66
-
67
- const receiveSlot = new ReceiveSlot(
68
- mediaType,
69
- wcmeReceiveSlot,
70
- // @ts-ignore
71
- (csi: CSI) => this.meeting.members.findMemberByCsi(csi)?.id
72
- );
68
+ const wcmeReceiveSlot = await this.createSlotCallback(mediaType);
69
+
70
+ const receiveSlot = new ReceiveSlot(mediaType, wcmeReceiveSlot, this.findMemberIdByCsiCallback);
73
71
 
74
72
  this.allocatedSlots[mediaType].push(receiveSlot);
75
- LoggerProxy.logger.log(`new receive slot allocated: ${receiveSlot.id}`);
73
+ LoggerProxy.logger.log(`${mediaType}: new receive slot allocated: ${receiveSlot.id}`);
76
74
 
77
75
  return receiveSlot;
78
76
  }
@@ -89,10 +87,10 @@ export class ReceiveSlotManager {
89
87
  if (idx >= 0) {
90
88
  this.allocatedSlots[slot.mediaType].splice(idx, 1);
91
89
  this.freeSlots[slot.mediaType].push(slot);
92
- LoggerProxy.logger.log(`receive slot released: ${slot.id}`);
90
+ LoggerProxy.logger.log(`${slot.mediaType}: receive slot released: ${slot.id}`);
93
91
  } else {
94
92
  LoggerProxy.logger.warn(
95
- 'ReceiveSlotManager#releaseSlot --> trying to release a slot that is not managed by this ReceiveSlotManager'
93
+ `ReceiveSlotManager#releaseSlot --> trying to release a ${slot.mediaType}} slot that is not managed by this ReceiveSlotManager`
96
94
  );
97
95
  }
98
96
  }
@@ -153,4 +151,16 @@ export class ReceiveSlotManager {
153
151
  });
154
152
  });
155
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
+ }
156
166
  }