@webex/plugin-meetings 3.0.0-beta.1 → 3.0.0-beta.11
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/dist/common/browser-detection.js.map +1 -1
- package/dist/common/collection.js.map +1 -1
- package/dist/common/config.js.map +1 -1
- package/dist/common/errors/captcha-error.js +7 -0
- package/dist/common/errors/captcha-error.js.map +1 -1
- package/dist/common/errors/intent-to-join.js +8 -0
- package/dist/common/errors/intent-to-join.js.map +1 -1
- package/dist/common/errors/join-meeting.js +8 -0
- package/dist/common/errors/join-meeting.js.map +1 -1
- package/dist/common/errors/media.js +7 -0
- package/dist/common/errors/media.js.map +1 -1
- package/dist/common/errors/parameter.js.map +1 -1
- package/dist/common/errors/password-error.js +7 -0
- package/dist/common/errors/password-error.js.map +1 -1
- package/dist/common/errors/permission.js +7 -0
- package/dist/common/errors/permission.js.map +1 -1
- package/dist/common/errors/reconnection-in-progress.js.map +1 -1
- package/dist/common/errors/reconnection.js +7 -0
- package/dist/common/errors/reconnection.js.map +1 -1
- package/dist/common/errors/stats.js +7 -0
- package/dist/common/errors/stats.js.map +1 -1
- package/dist/common/errors/webex-errors.js +5 -29
- package/dist/common/errors/webex-errors.js.map +1 -1
- package/dist/common/errors/webex-meetings-error.js +5 -2
- package/dist/common/errors/webex-meetings-error.js.map +1 -1
- package/dist/common/events/events-scope.js.map +1 -1
- package/dist/common/events/events.js.map +1 -1
- package/dist/common/events/trigger-proxy.js.map +1 -1
- package/dist/common/events/util.js.map +1 -1
- package/dist/common/logs/logger-config.js.map +1 -1
- package/dist/common/logs/logger-proxy.js.map +1 -1
- package/dist/common/logs/request.js +3 -0
- package/dist/common/logs/request.js.map +1 -1
- package/dist/common/queue.js.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/constants.js +15 -74
- package/dist/constants.js.map +1 -1
- package/dist/locus-info/controlsUtils.js.map +1 -1
- package/dist/locus-info/embeddedAppsUtils.js.map +1 -1
- package/dist/locus-info/fullState.js.map +1 -1
- package/dist/locus-info/hostUtils.js.map +1 -1
- package/dist/locus-info/index.js +43 -5
- package/dist/locus-info/index.js.map +1 -1
- package/dist/locus-info/infoUtils.js +4 -0
- package/dist/locus-info/infoUtils.js.map +1 -1
- package/dist/locus-info/mediaSharesUtils.js.map +1 -1
- package/dist/locus-info/parser.js +12 -3
- package/dist/locus-info/parser.js.map +1 -1
- package/dist/locus-info/selfUtils.js.map +1 -1
- package/dist/media/index.js +71 -210
- package/dist/media/index.js.map +1 -1
- package/dist/media/internal-media-core-wrapper.js +22 -0
- package/dist/media/internal-media-core-wrapper.js.map +1 -0
- package/dist/media/properties.js +32 -25
- package/dist/media/properties.js.map +1 -1
- package/dist/media/util.js +0 -27
- package/dist/media/util.js.map +1 -1
- package/dist/mediaQualityMetrics/config.js.map +1 -1
- package/dist/meeting/effectsState.js +8 -1
- package/dist/meeting/effectsState.js.map +1 -1
- package/dist/meeting/index.js +1146 -602
- package/dist/meeting/index.js.map +1 -1
- package/dist/meeting/muteState.js +6 -0
- package/dist/meeting/muteState.js.map +1 -1
- package/dist/meeting/request.js +83 -24
- package/dist/meeting/request.js.map +1 -1
- package/dist/meeting/state.js.map +1 -1
- package/dist/meeting/util.js +5 -44
- package/dist/meeting/util.js.map +1 -1
- package/dist/meeting-info/collection.js +4 -1
- package/dist/meeting-info/collection.js.map +1 -1
- package/dist/meeting-info/index.js +5 -0
- package/dist/meeting-info/index.js.map +1 -1
- package/dist/meeting-info/meeting-info-v2.js +14 -2
- package/dist/meeting-info/meeting-info-v2.js.map +1 -1
- package/dist/meeting-info/request.js +3 -0
- package/dist/meeting-info/request.js.map +1 -1
- package/dist/meeting-info/util.js.map +1 -1
- package/dist/meeting-info/utilv2.js.map +1 -1
- package/dist/meetings/collection.js +4 -1
- package/dist/meetings/collection.js.map +1 -1
- package/dist/meetings/index.js +136 -25
- package/dist/meetings/index.js.map +1 -1
- package/dist/meetings/request.js +4 -0
- package/dist/meetings/request.js.map +1 -1
- package/dist/meetings/util.js +24 -1
- package/dist/meetings/util.js.map +1 -1
- package/dist/member/index.js +30 -7
- package/dist/member/index.js.map +1 -1
- package/dist/member/util.js +2 -1
- package/dist/member/util.js.map +1 -1
- package/dist/members/collection.js +1 -0
- package/dist/members/collection.js.map +1 -1
- package/dist/members/index.js +82 -1
- package/dist/members/index.js.map +1 -1
- package/dist/members/request.js +19 -9
- package/dist/members/request.js.map +1 -1
- package/dist/members/util.js.map +1 -1
- package/dist/metrics/config.js.map +1 -1
- package/dist/metrics/constants.js.map +1 -1
- package/dist/metrics/index.js +8 -0
- package/dist/metrics/index.js.map +1 -1
- package/dist/multistream/mediaRequestManager.js +133 -0
- package/dist/multistream/mediaRequestManager.js.map +1 -0
- package/dist/multistream/multistreamMedia.js +116 -0
- package/dist/multistream/multistreamMedia.js.map +1 -0
- package/dist/multistream/receiveSlot.js +209 -0
- package/dist/multistream/receiveSlot.js.map +1 -0
- package/dist/multistream/receiveSlotManager.js +195 -0
- package/dist/multistream/receiveSlotManager.js.map +1 -0
- package/dist/multistream/remoteMedia.js +289 -0
- package/dist/multistream/remoteMedia.js.map +1 -0
- package/dist/multistream/remoteMediaGroup.js +243 -0
- package/dist/multistream/remoteMediaGroup.js.map +1 -0
- package/dist/multistream/remoteMediaManager.js +1113 -0
- package/dist/multistream/remoteMediaManager.js.map +1 -0
- package/dist/networkQualityMonitor/index.js +10 -2
- package/dist/networkQualityMonitor/index.js.map +1 -1
- package/dist/personal-meeting-room/index.js +11 -0
- package/dist/personal-meeting-room/index.js.map +1 -1
- package/dist/personal-meeting-room/request.js +2 -1
- package/dist/personal-meeting-room/request.js.map +1 -1
- package/dist/personal-meeting-room/util.js.map +1 -1
- package/dist/reachability/index.js +17 -7
- package/dist/reachability/index.js.map +1 -1
- package/dist/reachability/request.js +1 -0
- package/dist/reachability/request.js.map +1 -1
- package/dist/reactions/reactions.js +111 -0
- package/dist/reactions/reactions.js.map +1 -0
- package/dist/reactions/reactions.type.js +40 -0
- package/dist/reactions/reactions.type.js.map +1 -0
- package/dist/reconnection-manager/index.js +130 -132
- package/dist/reconnection-manager/index.js.map +1 -1
- package/dist/roap/index.js +58 -231
- package/dist/roap/index.js.map +1 -1
- package/dist/roap/request.js +7 -116
- package/dist/roap/request.js.map +1 -1
- package/dist/roap/turnDiscovery.js +20 -6
- package/dist/roap/turnDiscovery.js.map +1 -1
- package/dist/statsAnalyzer/global.js +2 -0
- package/dist/statsAnalyzer/global.js.map +1 -1
- package/dist/statsAnalyzer/index.js +58 -37
- package/dist/statsAnalyzer/index.js.map +1 -1
- package/dist/statsAnalyzer/mqaUtil.js +9 -3
- package/dist/statsAnalyzer/mqaUtil.js.map +1 -1
- package/dist/transcription/index.js +10 -3
- package/dist/transcription/index.js.map +1 -1
- package/package.json +21 -20
- package/src/common/{browser-detection.js → browser-detection.ts} +1 -1
- package/src/common/collection.ts +6 -6
- package/src/common/{config.js → config.ts} +1 -1
- package/src/common/errors/{captcha-error.js → captcha-error.ts} +5 -1
- package/src/common/errors/{intent-to-join.js → intent-to-join.ts} +6 -1
- package/src/common/errors/{join-meeting.js → join-meeting.ts} +6 -1
- package/src/common/errors/{media.js → media.ts} +5 -1
- package/src/common/errors/parameter.ts +3 -2
- package/src/common/errors/{password-error.js → password-error.ts} +5 -1
- package/src/common/errors/{permission.js → permission.ts} +5 -1
- package/src/common/errors/{reconnection-in-progress.js → reconnection-in-progress.ts} +0 -0
- package/src/common/errors/{reconnection.js → reconnection.ts} +5 -1
- package/src/common/errors/{stats.js → stats.ts} +5 -1
- package/src/common/errors/{webex-errors.js → webex-errors.ts} +1 -20
- package/src/common/errors/{webex-meetings-error.js → webex-meetings-error.ts} +3 -1
- package/src/common/events/{events-scope.js → events-scope.ts} +1 -1
- package/src/common/events/{events.js → events.ts} +0 -0
- package/src/common/events/{trigger-proxy.js → trigger-proxy.ts} +1 -2
- package/src/common/events/{util.js → util.ts} +1 -1
- package/src/common/logs/{logger-config.js → logger-config.ts} +1 -2
- package/src/common/logs/{logger-proxy.js → logger-proxy.ts} +1 -1
- package/src/common/logs/{request.js → request.ts} +12 -2
- package/src/common/queue.ts +1 -2
- package/src/{config.js → config.ts} +2 -0
- package/src/constants.ts +139 -179
- package/src/locus-info/{controlsUtils.js → controlsUtils.ts} +4 -4
- package/src/locus-info/{embeddedAppsUtils.js → embeddedAppsUtils.ts} +5 -6
- package/src/locus-info/{fullState.js → fullState.ts} +1 -1
- package/src/locus-info/{hostUtils.js → hostUtils.ts} +5 -5
- package/src/locus-info/{index.js → index.ts} +67 -32
- package/src/locus-info/{infoUtils.js → infoUtils.ts} +7 -4
- package/src/locus-info/{mediaSharesUtils.js → mediaSharesUtils.ts} +13 -13
- package/src/locus-info/{parser.js → parser.ts} +22 -12
- package/src/locus-info/{selfUtils.js → selfUtils.ts} +17 -19
- package/src/media/{index.js → index.ts} +130 -205
- package/src/media/internal-media-core-wrapper.ts +9 -0
- package/src/media/{properties.js → properties.ts} +35 -29
- package/src/media/util.ts +16 -0
- package/src/mediaQualityMetrics/{config.js → config.ts} +1 -1
- package/src/meeting/{effectsState.js → effectsState.ts} +12 -6
- package/src/meeting/{index.js → index.ts} +993 -474
- package/src/meeting/{muteState.js → muteState.ts} +16 -11
- package/src/meeting/{request.js → request.ts} +148 -36
- package/src/meeting/{state.js → state.ts} +6 -6
- package/src/meeting/{util.js → util.ts} +9 -51
- package/src/meeting-info/{collection.js → collection.ts} +4 -1
- package/src/meeting-info/{index.js → index.ts} +10 -6
- package/src/meeting-info/{meeting-info-v2.js → meeting-info-v2.ts} +28 -10
- package/src/meeting-info/{request.js → request.ts} +6 -2
- package/src/meeting-info/{util.js → util.ts} +6 -5
- package/src/meeting-info/{utilv2.js → utilv2.ts} +8 -7
- package/src/meetings/{collection.js → collection.ts} +5 -2
- package/src/meetings/{index.js → index.ts} +118 -22
- package/src/meetings/{request.js → request.ts} +6 -1
- package/src/meetings/{util.js → util.ts} +28 -5
- package/src/member/{index.js → index.ts} +46 -15
- package/src/member/{util.js → util.ts} +17 -16
- package/src/members/{collection.js → collection.ts} +2 -1
- package/src/members/{index.js → index.ts} +94 -26
- package/src/members/{request.js → request.ts} +16 -5
- package/src/members/{util.js → util.ts} +7 -7
- package/src/metrics/{config.js → config.ts} +0 -2
- package/src/metrics/{constants.js → constants.ts} +0 -0
- package/src/metrics/{index.js → index.ts} +27 -8
- package/src/multistream/mediaRequestManager.ts +166 -0
- package/src/multistream/multistreamMedia.ts +92 -0
- package/src/multistream/receiveSlot.ts +141 -0
- package/src/multistream/receiveSlotManager.ts +142 -0
- package/src/multistream/remoteMedia.ts +228 -0
- package/src/multistream/remoteMediaGroup.ts +224 -0
- package/src/multistream/remoteMediaManager.ts +911 -0
- package/src/networkQualityMonitor/{index.js → index.ts} +18 -3
- package/src/personal-meeting-room/{index.js → index.ts} +17 -4
- package/src/personal-meeting-room/{request.js → request.ts} +3 -1
- package/src/personal-meeting-room/{util.js → util.ts} +1 -1
- package/src/reachability/{index.js → index.ts} +28 -17
- package/src/reachability/request.ts +4 -2
- package/src/reactions/reactions.ts +104 -0
- package/src/reactions/reactions.type.ts +36 -0
- package/src/reconnection-manager/{index.js → index.ts} +81 -65
- package/src/roap/index.ts +229 -0
- package/src/roap/{request.js → request.ts} +15 -74
- package/src/roap/turnDiscovery.ts +26 -11
- package/src/statsAnalyzer/{global.js → global.ts} +2 -0
- package/src/statsAnalyzer/{index.js → index.ts} +66 -61
- package/src/statsAnalyzer/{mqaUtil.js → mqaUtil.ts} +6 -1
- package/src/transcription/{index.js → index.ts} +16 -11
- package/test/integration/spec/journey.js +1 -1
- package/test/integration/spec/space-meeting.js +1 -2
- package/test/unit/spec/locus-info/infoUtils.js +17 -1
- package/test/unit/spec/media/index.ts +207 -0
- package/test/unit/spec/media/properties.ts +73 -82
- package/test/unit/spec/meeting/effectsState.js +1 -3
- package/test/unit/spec/meeting/index.js +672 -245
- package/test/unit/spec/meeting/muteState.js +7 -0
- package/test/unit/spec/meeting/request.js +25 -1
- package/test/unit/spec/meeting/utils.js +63 -2
- package/test/unit/spec/meetings/index.js +0 -4
- package/test/unit/spec/members/index.js +164 -2
- package/test/unit/spec/multistream/mediaRequestManager.ts +515 -0
- package/test/unit/spec/multistream/receiveSlot.ts +104 -0
- package/test/unit/spec/multistream/receiveSlotManager.ts +173 -0
- package/test/unit/spec/multistream/remoteMedia.ts +225 -0
- package/test/unit/spec/multistream/remoteMediaGroup.ts +396 -0
- package/test/unit/spec/multistream/remoteMediaManager.ts +1309 -0
- package/test/unit/spec/reconnection-manager/index.js +68 -2
- package/test/unit/spec/roap/index.ts +63 -35
- package/test/unit/spec/stats-analyzer/index.js +19 -22
- package/dist/peer-connection-manager/index.js +0 -794
- package/dist/peer-connection-manager/index.js.map +0 -1
- package/dist/peer-connection-manager/util.js +0 -124
- package/dist/peer-connection-manager/util.js.map +0 -1
- package/dist/roap/collection.js +0 -73
- package/dist/roap/collection.js.map +0 -1
- package/dist/roap/handler.js +0 -337
- package/dist/roap/handler.js.map +0 -1
- package/dist/roap/state.js +0 -164
- package/dist/roap/state.js.map +0 -1
- package/dist/roap/util.js +0 -102
- package/dist/roap/util.js.map +0 -1
- package/src/media/util.js +0 -38
- package/src/peer-connection-manager/index.js +0 -723
- package/src/peer-connection-manager/util.ts +0 -117
- package/src/roap/collection.js +0 -63
- package/src/roap/handler.js +0 -252
- package/src/roap/index.js +0 -380
- package/src/roap/state.js +0 -149
- package/src/roap/util.js +0 -93
- package/test/unit/spec/peerconnection-manager/index.js +0 -188
- package/test/unit/spec/peerconnection-manager/utils.js +0 -48
- package/test/unit/spec/peerconnection-manager/utils.test-fixtures.ts +0 -389
- package/test/unit/spec/roap/util.js +0 -30
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import sinon from 'sinon';
|
|
2
|
+
import {assert} from '@webex/test-helper-chai';
|
|
3
|
+
import {MediaConnection as MC} from '@webex/internal-media-core';
|
|
4
|
+
import {ReceiveSlotManager} from '@webex/plugin-meetings/src/multistream/receiveSlotManager';
|
|
5
|
+
import * as ReceiveSlotModule from '@webex/plugin-meetings/src/multistream/receiveSlot';
|
|
6
|
+
|
|
7
|
+
describe('ReceiveSlotManager', () => {
|
|
8
|
+
let fakeMeeting;
|
|
9
|
+
let fakeWcmeSlot;
|
|
10
|
+
let fakeReceiveSlots;
|
|
11
|
+
let mockReceiveSlotCtor;
|
|
12
|
+
let receiveSlotManager;
|
|
13
|
+
|
|
14
|
+
beforeEach(() => {
|
|
15
|
+
fakeWcmeSlot = {
|
|
16
|
+
id: 'fake wcme slot',
|
|
17
|
+
};
|
|
18
|
+
fakeMeeting = {
|
|
19
|
+
mediaProperties: {
|
|
20
|
+
webrtcMediaConnection: {
|
|
21
|
+
createReceiveSlot: sinon.stub().resolves(fakeWcmeSlot),
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
members: {
|
|
25
|
+
findMemberByCsi: sinon.stub(),
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
fakeReceiveSlots = [];
|
|
29
|
+
mockReceiveSlotCtor = sinon.stub(ReceiveSlotModule, 'ReceiveSlot').callsFake((mediaType) => {
|
|
30
|
+
const fakeReceiveSlot = {
|
|
31
|
+
id: `fake sdk receive slot ${fakeReceiveSlots.length + 1}`,
|
|
32
|
+
mediaType,
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
fakeReceiveSlots.push(fakeReceiveSlot);
|
|
36
|
+
|
|
37
|
+
return fakeReceiveSlot;
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
receiveSlotManager = new ReceiveSlotManager(fakeMeeting);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
afterEach(() => {
|
|
44
|
+
sinon.restore();
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
it('rejects if there is no media connection', async () => {
|
|
48
|
+
fakeMeeting.mediaProperties.webrtcMediaConnection = null;
|
|
49
|
+
|
|
50
|
+
assert.isRejected(
|
|
51
|
+
receiveSlotManager.allocateSlot(MC.MediaType.VideoMain),
|
|
52
|
+
'Webrtc media connection is missing'
|
|
53
|
+
);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('allocates a slot when allocateSlot() is called and there are no free slots', async () => {
|
|
57
|
+
assert.deepEqual(receiveSlotManager.getStats(), {numAllocatedSlots: {}, numFreeSlots: {}});
|
|
58
|
+
|
|
59
|
+
const slot = await receiveSlotManager.allocateSlot(MC.MediaType.VideoMain);
|
|
60
|
+
|
|
61
|
+
assert.calledOnce(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
62
|
+
assert.calledWith(
|
|
63
|
+
fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot,
|
|
64
|
+
MC.MediaType.VideoMain
|
|
65
|
+
);
|
|
66
|
+
|
|
67
|
+
assert.calledOnce(mockReceiveSlotCtor);
|
|
68
|
+
assert.calledWith(mockReceiveSlotCtor, MC.MediaType.VideoMain, fakeWcmeSlot, sinon.match.func);
|
|
69
|
+
assert.strictEqual(slot, fakeReceiveSlots[0]);
|
|
70
|
+
|
|
71
|
+
assert.deepEqual(receiveSlotManager.getStats(), {
|
|
72
|
+
numAllocatedSlots: {'VIDEO-MAIN': 1},
|
|
73
|
+
numFreeSlots: {},
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('reuses previously freed slot when allocateSlot() is called and a free slot is available', async () => {
|
|
78
|
+
const slot1 = await receiveSlotManager.allocateSlot(MC.MediaType.VideoMain);
|
|
79
|
+
|
|
80
|
+
assert.calledOnce(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
81
|
+
assert.calledOnce(mockReceiveSlotCtor);
|
|
82
|
+
assert.strictEqual(slot1, fakeReceiveSlots[0]);
|
|
83
|
+
|
|
84
|
+
// release the allocated slot
|
|
85
|
+
receiveSlotManager.releaseSlot(slot1);
|
|
86
|
+
|
|
87
|
+
assert.deepEqual(receiveSlotManager.getStats(), {
|
|
88
|
+
numAllocatedSlots: {},
|
|
89
|
+
numFreeSlots: {'VIDEO-MAIN': 1},
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot.resetHistory();
|
|
93
|
+
mockReceiveSlotCtor.resetHistory();
|
|
94
|
+
|
|
95
|
+
// allocate another slot, this time the previous one should be returned instead of allocating any new ones
|
|
96
|
+
const slot2 = await receiveSlotManager.allocateSlot(MC.MediaType.VideoMain);
|
|
97
|
+
|
|
98
|
+
assert.notCalled(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
99
|
+
assert.notCalled(mockReceiveSlotCtor);
|
|
100
|
+
|
|
101
|
+
// verify that in fact we got the same slot again
|
|
102
|
+
assert.strictEqual(slot1, slot2);
|
|
103
|
+
|
|
104
|
+
assert.deepEqual(receiveSlotManager.getStats(), {
|
|
105
|
+
numAllocatedSlots: {'VIDEO-MAIN': 1},
|
|
106
|
+
numFreeSlots: {},
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
it('does not reuse any slots after reset() is called', async () => {
|
|
111
|
+
const slot1 = await receiveSlotManager.allocateSlot(MC.MediaType.VideoMain);
|
|
112
|
+
|
|
113
|
+
assert.calledOnce(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
114
|
+
assert.calledOnce(mockReceiveSlotCtor);
|
|
115
|
+
assert.strictEqual(slot1, fakeReceiveSlots[0]);
|
|
116
|
+
|
|
117
|
+
// release the slot so we have 1 free slot, but also call reset() which should clear everything
|
|
118
|
+
receiveSlotManager.releaseSlot(slot1);
|
|
119
|
+
receiveSlotManager.reset();
|
|
120
|
+
|
|
121
|
+
// reset the mocks and set the ReceiveSlot constructor to return a different slot
|
|
122
|
+
fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot.resetHistory();
|
|
123
|
+
mockReceiveSlotCtor.resetHistory();
|
|
124
|
+
|
|
125
|
+
assert.deepEqual(receiveSlotManager.getStats(), {numAllocatedSlots: {}, numFreeSlots: {}});
|
|
126
|
+
|
|
127
|
+
// allocate another slot, because we called reset(), the old free slot should not be reused
|
|
128
|
+
const slot2 = await receiveSlotManager.allocateSlot(MC.MediaType.VideoMain);
|
|
129
|
+
|
|
130
|
+
assert.calledOnce(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
131
|
+
assert.calledOnce(mockReceiveSlotCtor);
|
|
132
|
+
|
|
133
|
+
// verify that in fact we got a brand new slot
|
|
134
|
+
assert.strictEqual(slot2, fakeReceiveSlots[1]);
|
|
135
|
+
|
|
136
|
+
assert.deepEqual(receiveSlotManager.getStats(), {
|
|
137
|
+
numAllocatedSlots: {'VIDEO-MAIN': 1},
|
|
138
|
+
numFreeSlots: {},
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
it('does not reuse slots if they have different media type', async () => {
|
|
143
|
+
const slot1 = await receiveSlotManager.allocateSlot(MC.MediaType.VideoMain);
|
|
144
|
+
|
|
145
|
+
assert.calledOnce(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
146
|
+
assert.calledOnce(mockReceiveSlotCtor);
|
|
147
|
+
|
|
148
|
+
receiveSlotManager.releaseSlot(slot1);
|
|
149
|
+
|
|
150
|
+
fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot.resetHistory();
|
|
151
|
+
mockReceiveSlotCtor.resetHistory();
|
|
152
|
+
|
|
153
|
+
// allocate another slot, this time for main audio, so it should be a completely new slot
|
|
154
|
+
const slot2 = await receiveSlotManager.allocateSlot(MC.MediaType.AudioMain);
|
|
155
|
+
|
|
156
|
+
assert.calledOnce(fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot);
|
|
157
|
+
assert.calledWith(
|
|
158
|
+
fakeMeeting.mediaProperties.webrtcMediaConnection.createReceiveSlot,
|
|
159
|
+
MC.MediaType.AudioMain
|
|
160
|
+
);
|
|
161
|
+
|
|
162
|
+
assert.calledOnce(mockReceiveSlotCtor);
|
|
163
|
+
assert.calledWith(mockReceiveSlotCtor, MC.MediaType.AudioMain, fakeWcmeSlot, sinon.match.func);
|
|
164
|
+
|
|
165
|
+
// verify that in fact we got a brand new slot
|
|
166
|
+
assert.strictEqual(slot2, fakeReceiveSlots[1]);
|
|
167
|
+
|
|
168
|
+
assert.deepEqual(receiveSlotManager.getStats(), {
|
|
169
|
+
numAllocatedSlots: {'AUDIO-MAIN': 1},
|
|
170
|
+
numFreeSlots: {'VIDEO-MAIN': 1},
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
});
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
/* eslint-disable require-jsdoc */
|
|
2
|
+
import EventEmitter from 'events';
|
|
3
|
+
|
|
4
|
+
import {MediaConnection as MC} from '@webex/internal-media-core';
|
|
5
|
+
import {RemoteMedia, RemoteMediaEvents} from '@webex/plugin-meetings/src/multistream/remoteMedia';
|
|
6
|
+
import {ReceiveSlotEvents} from '@webex/plugin-meetings/src/multistream/receiveSlot';
|
|
7
|
+
import sinon from 'sinon';
|
|
8
|
+
import {assert} from '@webex/test-helper-chai';
|
|
9
|
+
|
|
10
|
+
describe('RemoteMedia', () => {
|
|
11
|
+
let remoteMedia;
|
|
12
|
+
let fakeReceiveSlot;
|
|
13
|
+
let fakeStream;
|
|
14
|
+
let fakeMediaRequestManager;
|
|
15
|
+
|
|
16
|
+
beforeEach(() => {
|
|
17
|
+
fakeStream = {id: 'fake stream'};
|
|
18
|
+
fakeReceiveSlot = new EventEmitter();
|
|
19
|
+
fakeReceiveSlot.mediaType = MC.MediaType.AudioMain;
|
|
20
|
+
fakeReceiveSlot.memberId = '12345678';
|
|
21
|
+
fakeReceiveSlot.csi = 999;
|
|
22
|
+
fakeReceiveSlot.sourceState = 'avatar';
|
|
23
|
+
fakeReceiveSlot.stream = fakeStream;
|
|
24
|
+
|
|
25
|
+
fakeMediaRequestManager = {
|
|
26
|
+
addRequest: sinon.stub(),
|
|
27
|
+
cancelRequest: sinon.stub(),
|
|
28
|
+
};
|
|
29
|
+
remoteMedia = new RemoteMedia(fakeReceiveSlot, fakeMediaRequestManager, {resolution: 'medium'});
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
describe('forwards events from the underlying receive slot', () => {
|
|
33
|
+
[
|
|
34
|
+
{
|
|
35
|
+
receiveSlotEvent: ReceiveSlotEvents.SourceUpdate,
|
|
36
|
+
expectedEvent: RemoteMediaEvents.SourceUpdate,
|
|
37
|
+
title: 'SourceUpdate',
|
|
38
|
+
},
|
|
39
|
+
].forEach(({receiveSlotEvent, expectedEvent, title}) =>
|
|
40
|
+
it(`forwards ${title}`, () => {
|
|
41
|
+
let eventEmittedCount = 0;
|
|
42
|
+
let eventData;
|
|
43
|
+
const fakeData = {something: 'some value'};
|
|
44
|
+
|
|
45
|
+
remoteMedia.on(expectedEvent, (data) => {
|
|
46
|
+
eventEmittedCount += 1;
|
|
47
|
+
eventData = data;
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
fakeReceiveSlot.emit(receiveSlotEvent, fakeData);
|
|
51
|
+
|
|
52
|
+
assert.strictEqual(eventEmittedCount, 1);
|
|
53
|
+
assert.strictEqual(eventData, fakeData);
|
|
54
|
+
})
|
|
55
|
+
);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it("exposes underlying receive slot's properties", () => {
|
|
59
|
+
assert.strictEqual(remoteMedia.mediaType, fakeReceiveSlot.mediaType);
|
|
60
|
+
assert.strictEqual(remoteMedia.memberId, fakeReceiveSlot.memberId);
|
|
61
|
+
assert.strictEqual(remoteMedia.csi, fakeReceiveSlot.csi);
|
|
62
|
+
assert.strictEqual(remoteMedia.sourceState, fakeReceiveSlot.sourceState);
|
|
63
|
+
assert.strictEqual(remoteMedia.stream, fakeReceiveSlot.stream);
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
describe('sendMediaRequest', () => {
|
|
67
|
+
it('sends correct media request', () => {
|
|
68
|
+
const csi = 987654321;
|
|
69
|
+
const csi2 = 12345;
|
|
70
|
+
|
|
71
|
+
remoteMedia.sendMediaRequest(csi, true);
|
|
72
|
+
|
|
73
|
+
assert.calledOnce(fakeMediaRequestManager.addRequest);
|
|
74
|
+
assert.calledWith(
|
|
75
|
+
fakeMediaRequestManager.addRequest,
|
|
76
|
+
sinon.match({
|
|
77
|
+
policyInfo: sinon.match({
|
|
78
|
+
policy: 'receiver-selected',
|
|
79
|
+
csi,
|
|
80
|
+
}),
|
|
81
|
+
receiveSlots: [fakeReceiveSlot],
|
|
82
|
+
codecInfo: sinon.match({
|
|
83
|
+
codec: 'h264',
|
|
84
|
+
maxFs: 3600,
|
|
85
|
+
}),
|
|
86
|
+
}),
|
|
87
|
+
true
|
|
88
|
+
);
|
|
89
|
+
|
|
90
|
+
fakeMediaRequestManager.addRequest.resetHistory();
|
|
91
|
+
|
|
92
|
+
// now call again, with different csi and commit=false
|
|
93
|
+
remoteMedia.sendMediaRequest(csi2, false);
|
|
94
|
+
|
|
95
|
+
assert.calledOnce(fakeMediaRequestManager.addRequest);
|
|
96
|
+
assert.calledWith(
|
|
97
|
+
fakeMediaRequestManager.addRequest,
|
|
98
|
+
sinon.match({
|
|
99
|
+
policyInfo: sinon.match({
|
|
100
|
+
policy: 'receiver-selected',
|
|
101
|
+
csi: csi2,
|
|
102
|
+
}),
|
|
103
|
+
receiveSlots: [fakeReceiveSlot],
|
|
104
|
+
codecInfo: sinon.match({
|
|
105
|
+
codec: 'h264',
|
|
106
|
+
maxFs: 3600,
|
|
107
|
+
}),
|
|
108
|
+
}),
|
|
109
|
+
false
|
|
110
|
+
);
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
it('cancels previous request', () => {
|
|
114
|
+
const fakeRequestId = 111;
|
|
115
|
+
|
|
116
|
+
fakeMediaRequestManager.addRequest.returns(fakeRequestId);
|
|
117
|
+
|
|
118
|
+
// send the 1st media request
|
|
119
|
+
remoteMedia.sendMediaRequest(1234, true);
|
|
120
|
+
|
|
121
|
+
fakeMediaRequestManager.addRequest.resetHistory();
|
|
122
|
+
|
|
123
|
+
// send a 2nd one (the 1st one should get cancelled)
|
|
124
|
+
remoteMedia.sendMediaRequest(5678, false);
|
|
125
|
+
|
|
126
|
+
assert.calledOnce(fakeMediaRequestManager.cancelRequest);
|
|
127
|
+
assert.calledWith(fakeMediaRequestManager.cancelRequest, fakeRequestId);
|
|
128
|
+
|
|
129
|
+
assert.calledOnce(fakeMediaRequestManager.addRequest);
|
|
130
|
+
assert.calledWith(
|
|
131
|
+
fakeMediaRequestManager.addRequest,
|
|
132
|
+
sinon.match({
|
|
133
|
+
policyInfo: sinon.match({
|
|
134
|
+
policy: 'receiver-selected',
|
|
135
|
+
csi: 5678,
|
|
136
|
+
}),
|
|
137
|
+
receiveSlots: [fakeReceiveSlot],
|
|
138
|
+
codecInfo: sinon.match({
|
|
139
|
+
codec: 'h264',
|
|
140
|
+
maxFs: 3600,
|
|
141
|
+
}),
|
|
142
|
+
}),
|
|
143
|
+
false
|
|
144
|
+
);
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
it('throws when called on a stopped RemoteMedia instance', () => {
|
|
148
|
+
remoteMedia.stop();
|
|
149
|
+
assert.throws(
|
|
150
|
+
() => remoteMedia.sendMediaRequest(1234, true),
|
|
151
|
+
'sendMediaRequest() called on an invalidated RemoteMedia instance'
|
|
152
|
+
);
|
|
153
|
+
});
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
describe('cancelMediaRequest', () => {
|
|
157
|
+
it('cancels the media request', () => {
|
|
158
|
+
const fakeRequestId = 11;
|
|
159
|
+
|
|
160
|
+
fakeMediaRequestManager.addRequest.returns(fakeRequestId);
|
|
161
|
+
|
|
162
|
+
// send a media request
|
|
163
|
+
remoteMedia.sendMediaRequest(1234, true);
|
|
164
|
+
|
|
165
|
+
fakeMediaRequestManager.addRequest.resetHistory();
|
|
166
|
+
|
|
167
|
+
// cancel it
|
|
168
|
+
remoteMedia.cancelMediaRequest();
|
|
169
|
+
|
|
170
|
+
assert.calledOnce(fakeMediaRequestManager.cancelRequest);
|
|
171
|
+
assert.calledWith(fakeMediaRequestManager.cancelRequest, fakeRequestId);
|
|
172
|
+
|
|
173
|
+
assert.notCalled(fakeMediaRequestManager.addRequest);
|
|
174
|
+
});
|
|
175
|
+
it('does not do anything if there was no request sent', () => {
|
|
176
|
+
remoteMedia.cancelMediaRequest();
|
|
177
|
+
|
|
178
|
+
assert.notCalled(fakeMediaRequestManager.cancelRequest);
|
|
179
|
+
assert.notCalled(fakeMediaRequestManager.addRequest);
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
describe('stop()', () => {
|
|
184
|
+
it('cancels media request, unsets the receive slot and removes all the listeners from it', () => {
|
|
185
|
+
const cancelMediaRequestSpy = sinon.spy(remoteMedia, 'cancelMediaRequest');
|
|
186
|
+
|
|
187
|
+
let stoppedListenerCalled = false;
|
|
188
|
+
|
|
189
|
+
remoteMedia.on(RemoteMediaEvents.Stopped, () => {
|
|
190
|
+
stoppedListenerCalled = true;
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
remoteMedia.stop(true);
|
|
194
|
+
|
|
195
|
+
assert.isTrue(stoppedListenerCalled);
|
|
196
|
+
|
|
197
|
+
assert.calledOnce(cancelMediaRequestSpy);
|
|
198
|
+
assert.calledWith(cancelMediaRequestSpy, true);
|
|
199
|
+
|
|
200
|
+
assert.strictEqual(remoteMedia.mediaType, undefined);
|
|
201
|
+
assert.strictEqual(remoteMedia.memberId, undefined);
|
|
202
|
+
assert.strictEqual(remoteMedia.csi, undefined);
|
|
203
|
+
assert.strictEqual(remoteMedia.sourceState, undefined);
|
|
204
|
+
assert.strictEqual(remoteMedia.stream, undefined);
|
|
205
|
+
|
|
206
|
+
// check that events emitted from receive slot don't get forwarded anymore
|
|
207
|
+
[
|
|
208
|
+
{
|
|
209
|
+
receiveSlotEvent: ReceiveSlotEvents.SourceUpdate,
|
|
210
|
+
remoteMediaEvent: RemoteMediaEvents.SourceUpdate,
|
|
211
|
+
},
|
|
212
|
+
].forEach(({receiveSlotEvent, remoteMediaEvent}) => {
|
|
213
|
+
let eventEmitted = false;
|
|
214
|
+
|
|
215
|
+
remoteMedia.on(remoteMediaEvent, () => {
|
|
216
|
+
eventEmitted = true;
|
|
217
|
+
});
|
|
218
|
+
|
|
219
|
+
fakeReceiveSlot.emit(receiveSlotEvent);
|
|
220
|
+
|
|
221
|
+
assert.strictEqual(eventEmitted, false);
|
|
222
|
+
});
|
|
223
|
+
});
|
|
224
|
+
});
|
|
225
|
+
});
|