@webex/plugin-meetings 3.8.0-next.33 → 3.8.0-next.35
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/breakouts/breakout.js +1 -1
- package/dist/breakouts/index.js +1 -1
- package/dist/interpretation/index.js +1 -1
- package/dist/interpretation/siLanguage.js +1 -1
- package/dist/locus-info/controlsUtils.js +13 -7
- package/dist/locus-info/controlsUtils.js.map +1 -1
- package/dist/locus-info/index.js +2 -1
- package/dist/locus-info/index.js.map +1 -1
- package/dist/meeting/index.js +95 -53
- package/dist/meeting/index.js.map +1 -1
- package/dist/types/locus-info/index.d.ts +1 -0
- package/dist/types/meeting/index.d.ts +6 -0
- package/dist/webinar/index.js +1 -1
- package/package.json +3 -3
- package/src/locus-info/controlsUtils.ts +24 -12
- package/src/locus-info/index.ts +5 -1
- package/src/meeting/index.ts +107 -54
- package/test/unit/spec/locus-info/controlsUtils.js +61 -9
- package/test/unit/spec/meeting/index.js +175 -14
@@ -115,9 +115,9 @@ import {ERROR_DESCRIPTIONS} from '@webex/internal-plugin-metrics/src/call-diagno
|
|
115
115
|
import MeetingCollection from '@webex/plugin-meetings/src/meetings/collection';
|
116
116
|
|
117
117
|
import {EVENT_TRIGGERS as VOICEAEVENTS} from '@webex/internal-plugin-voicea';
|
118
|
-
import {
|
118
|
+
import {createBrbState} from '@webex/plugin-meetings/src/meeting/brbState';
|
119
119
|
import JoinForbiddenError from '../../../../src/common/errors/join-forbidden-error';
|
120
|
-
import {
|
120
|
+
import {EventEmitter} from 'stream';
|
121
121
|
|
122
122
|
describe('plugin-meetings', () => {
|
123
123
|
const logger = {
|
@@ -282,7 +282,7 @@ describe('plugin-meetings', () => {
|
|
282
282
|
testDestination = `testDestination-${uuid.v4()}`;
|
283
283
|
correlationId = uuid.v4();
|
284
284
|
uploadEvent = new EventEmitter();
|
285
|
-
uploadEvent.addListener('progress', () => {})
|
285
|
+
uploadEvent.addListener('progress', () => {});
|
286
286
|
|
287
287
|
meeting = new Meeting(
|
288
288
|
{
|
@@ -3436,6 +3436,40 @@ describe('plugin-meetings', () => {
|
|
3436
3436
|
});
|
3437
3437
|
});
|
3438
3438
|
|
3439
|
+
it('LOCAL_MEDIA_STARTED triggers "meeting:media:local:start" event and does not send metric because we already have', async () => {
|
3440
|
+
meeting.shareCAEventSentStatus = {
|
3441
|
+
transmitStart: true,
|
3442
|
+
transmitStop: false,
|
3443
|
+
receiveStart: false,
|
3444
|
+
receiveStop: false,
|
3445
|
+
};
|
3446
|
+
statsAnalyzerStub.emit(
|
3447
|
+
{file: 'test', function: 'test'},
|
3448
|
+
StatsAnalyzerEventNames.LOCAL_MEDIA_STARTED,
|
3449
|
+
{mediaType: 'share'}
|
3450
|
+
);
|
3451
|
+
|
3452
|
+
assert.calledWith(
|
3453
|
+
TriggerProxy.trigger,
|
3454
|
+
sinon.match.instanceOf(Meeting),
|
3455
|
+
{
|
3456
|
+
file: 'meeting/index',
|
3457
|
+
function: 'addMedia',
|
3458
|
+
},
|
3459
|
+
EVENT_TRIGGERS.MEETING_MEDIA_LOCAL_STARTED,
|
3460
|
+
{
|
3461
|
+
mediaType: 'share',
|
3462
|
+
}
|
3463
|
+
);
|
3464
|
+
assert.neverCalledWith(webex.internal.newMetrics.submitClientEvent, {
|
3465
|
+
name: 'client.media.tx.start',
|
3466
|
+
payload: {mediaType: 'share', shareInstanceId: meeting.remoteShareInstanceId},
|
3467
|
+
options: {
|
3468
|
+
meetingId: meeting.id,
|
3469
|
+
},
|
3470
|
+
});
|
3471
|
+
});
|
3472
|
+
|
3439
3473
|
it('LOCAL_MEDIA_STOPPED triggers the right metrics', async () => {
|
3440
3474
|
statsAnalyzerStub.emit(
|
3441
3475
|
{file: 'test', function: 'test'},
|
@@ -3452,6 +3486,28 @@ describe('plugin-meetings', () => {
|
|
3452
3486
|
});
|
3453
3487
|
});
|
3454
3488
|
|
3489
|
+
it('LOCAL_MEDIA_STOPPED does not send metric because we already have', async () => {
|
3490
|
+
meeting.shareCAEventSentStatus = {
|
3491
|
+
transmitStart: false,
|
3492
|
+
transmitStop: true,
|
3493
|
+
receiveStart: false,
|
3494
|
+
receiveStop: false,
|
3495
|
+
};
|
3496
|
+
statsAnalyzerStub.emit(
|
3497
|
+
{file: 'test', function: 'test'},
|
3498
|
+
StatsAnalyzerEventNames.LOCAL_MEDIA_STOPPED,
|
3499
|
+
{mediaType: 'share'}
|
3500
|
+
);
|
3501
|
+
|
3502
|
+
assert.neverCalledWith(webex.internal.newMetrics.submitClientEvent, {
|
3503
|
+
name: 'client.media.tx.stop',
|
3504
|
+
payload: {mediaType: 'share', shareInstanceId: meeting.remoteShareInstanceId},
|
3505
|
+
options: {
|
3506
|
+
meetingId: meeting.id,
|
3507
|
+
},
|
3508
|
+
});
|
3509
|
+
});
|
3510
|
+
|
3455
3511
|
it('REMOTE_MEDIA_STARTED triggers "meeting:media:remote:start" event and sends metrics', async () => {
|
3456
3512
|
statsAnalyzerStub.emit(
|
3457
3513
|
{file: 'test', function: 'test'},
|
@@ -3532,6 +3588,47 @@ describe('plugin-meetings', () => {
|
|
3532
3588
|
});
|
3533
3589
|
});
|
3534
3590
|
|
3591
|
+
it('REMOTE_MEDIA_STARTED triggers "meeting:media:remote:start" event and does not send metric because we already have', async () => {
|
3592
|
+
meeting.shareCAEventSentStatus = {
|
3593
|
+
transmitStart: false,
|
3594
|
+
transmitStop: false,
|
3595
|
+
receiveStart: true,
|
3596
|
+
receiveStop: false,
|
3597
|
+
};
|
3598
|
+
statsAnalyzerStub.emit(
|
3599
|
+
{file: 'test', function: 'test'},
|
3600
|
+
StatsAnalyzerEventNames.REMOTE_MEDIA_STARTED,
|
3601
|
+
{mediaType: 'share'}
|
3602
|
+
);
|
3603
|
+
|
3604
|
+
assert.calledWith(
|
3605
|
+
TriggerProxy.trigger,
|
3606
|
+
sinon.match.instanceOf(Meeting),
|
3607
|
+
{
|
3608
|
+
file: 'meeting/index',
|
3609
|
+
function: 'addMedia',
|
3610
|
+
},
|
3611
|
+
EVENT_TRIGGERS.MEETING_MEDIA_REMOTE_STARTED,
|
3612
|
+
{
|
3613
|
+
mediaType: 'share',
|
3614
|
+
}
|
3615
|
+
);
|
3616
|
+
assert.neverCalledWith(webex.internal.newMetrics.submitClientEvent, {
|
3617
|
+
name: 'client.media.render.start',
|
3618
|
+
payload: {mediaType: 'share', shareInstanceId: meeting.remoteShareInstanceId},
|
3619
|
+
options: {
|
3620
|
+
meetingId: meeting.id,
|
3621
|
+
},
|
3622
|
+
});
|
3623
|
+
assert.neverCalledWith(webex.internal.newMetrics.submitClientEvent, {
|
3624
|
+
name: 'client.media.rx.start',
|
3625
|
+
payload: {mediaType: 'share', shareInstanceId: meeting.remoteShareInstanceId},
|
3626
|
+
options: {
|
3627
|
+
meetingId: meeting.id,
|
3628
|
+
},
|
3629
|
+
});
|
3630
|
+
});
|
3631
|
+
|
3535
3632
|
it('REMOTE_MEDIA_STOPPED triggers the right metrics for share', async () => {
|
3536
3633
|
statsAnalyzerStub.emit(
|
3537
3634
|
{file: 'test', function: 'test'},
|
@@ -3556,6 +3653,34 @@ describe('plugin-meetings', () => {
|
|
3556
3653
|
});
|
3557
3654
|
});
|
3558
3655
|
|
3656
|
+
it('REMOTE_MEDIA_STOPPED does not send metric because we already have', async () => {
|
3657
|
+
meeting.shareCAEventSentStatus = {
|
3658
|
+
transmitStart: false,
|
3659
|
+
transmitStop: false,
|
3660
|
+
receiveStart: true,
|
3661
|
+
receiveStop: true,
|
3662
|
+
};
|
3663
|
+
statsAnalyzerStub.emit(
|
3664
|
+
{file: 'test', function: 'test'},
|
3665
|
+
StatsAnalyzerEventNames.REMOTE_MEDIA_STOPPED,
|
3666
|
+
{mediaType: 'share'}
|
3667
|
+
);
|
3668
|
+
assert.neverCalledWith(webex.internal.newMetrics.submitClientEvent, {
|
3669
|
+
name: 'client.media.render.stop',
|
3670
|
+
payload: {mediaType: 'share', shareInstanceId: meeting.remoteShareInstanceId},
|
3671
|
+
options: {
|
3672
|
+
meetingId: meeting.id,
|
3673
|
+
},
|
3674
|
+
});
|
3675
|
+
assert.neverCalledWith(webex.internal.newMetrics.submitClientEvent, {
|
3676
|
+
name: 'client.media.rx.stop',
|
3677
|
+
payload: {mediaType: 'share', shareInstanceId: meeting.remoteShareInstanceId},
|
3678
|
+
options: {
|
3679
|
+
meetingId: meeting.id,
|
3680
|
+
},
|
3681
|
+
});
|
3682
|
+
});
|
3683
|
+
|
3559
3684
|
it('counts the number of members that are in the meeting for MEDIA_QUALITY event', async () => {
|
3560
3685
|
let fakeMembersCollection = {
|
3561
3686
|
members: {
|
@@ -3884,20 +4009,24 @@ describe('plugin-meetings', () => {
|
|
3884
4009
|
} catch (err) {
|
3885
4010
|
assert.instanceOf(err, Error);
|
3886
4011
|
assert.equal(err.message, 'setBrb failed');
|
3887
|
-
assert.isRejected(
|
4012
|
+
assert.isRejected(Promise.reject());
|
3888
4013
|
}
|
3889
4014
|
});
|
3890
4015
|
|
3891
4016
|
it('updates remote mute state when brb is enabled', async () => {
|
3892
|
-
meeting.audio = {
|
4017
|
+
meeting.audio = {handleServerRemoteMuteUpdate: sinon.stub()};
|
3893
4018
|
|
3894
4019
|
await meeting.beRightBack(true);
|
3895
4020
|
|
3896
|
-
sinon.assert.calledOnceWithExactly(
|
4021
|
+
sinon.assert.calledOnceWithExactly(
|
4022
|
+
meeting.audio.handleServerRemoteMuteUpdate,
|
4023
|
+
meeting,
|
4024
|
+
true
|
4025
|
+
);
|
3897
4026
|
});
|
3898
4027
|
|
3899
4028
|
it('does not update remote mute state when brb is disabled', async () => {
|
3900
|
-
meeting.audio = {
|
4029
|
+
meeting.audio = {handleServerRemoteMuteUpdate: sinon.stub()};
|
3901
4030
|
|
3902
4031
|
await meeting.beRightBack(false);
|
3903
4032
|
|
@@ -3956,7 +4085,10 @@ describe('plugin-meetings', () => {
|
|
3956
4085
|
.resolves({id: 'fake clientMediaPreferences'});
|
3957
4086
|
meeting.roap.doTurnDiscovery = sinon.stub().resolves({
|
3958
4087
|
turnServerInfo: {
|
3959
|
-
urls: [
|
4088
|
+
urls: [
|
4089
|
+
'turns:turn-server-url1:443?transport=tcp',
|
4090
|
+
'turns:turn-server-url2:443?transport=tcp',
|
4091
|
+
],
|
3960
4092
|
username: 'turn user',
|
3961
4093
|
password: 'turn password',
|
3962
4094
|
},
|
@@ -3974,7 +4106,10 @@ describe('plugin-meetings', () => {
|
|
3974
4106
|
expectedMediaConnectionConfig = {
|
3975
4107
|
iceServers: [
|
3976
4108
|
{
|
3977
|
-
urls: [
|
4109
|
+
urls: [
|
4110
|
+
'turns:turn-server-url1:443?transport=tcp',
|
4111
|
+
'turns:turn-server-url2:443?transport=tcp',
|
4112
|
+
],
|
3978
4113
|
username: 'turn user',
|
3979
4114
|
credential: 'turn password',
|
3980
4115
|
},
|
@@ -4056,9 +4191,11 @@ describe('plugin-meetings', () => {
|
|
4056
4191
|
.stub(InternalMediaCoreModule, 'MultistreamRoapMediaConnection')
|
4057
4192
|
.returns(fakeMultistreamRoapMediaConnection);
|
4058
4193
|
|
4059
|
-
locusMediaRequestStub = sinon
|
4060
|
-
|
4061
|
-
|
4194
|
+
locusMediaRequestStub = sinon.stub(WebexPlugin.prototype, 'request').resolves({
|
4195
|
+
body: {locus: {fullState: {}}},
|
4196
|
+
upload: sinon.match.instanceOf(EventEmitter),
|
4197
|
+
download: sinon.match.instanceOf(EventEmitter),
|
4198
|
+
});
|
4062
4199
|
|
4063
4200
|
// setup some things and mocks so that the call to join() works
|
4064
4201
|
// (we need to call join() because it creates the LocusMediaRequest instance
|
@@ -5242,7 +5379,10 @@ describe('plugin-meetings', () => {
|
|
5242
5379
|
// and check that when we fallback to transcoded we still do another TURN discovery
|
5243
5380
|
await runCheck(
|
5244
5381
|
{
|
5245
|
-
urls: [
|
5382
|
+
urls: [
|
5383
|
+
'turns:turn-server-url1:443?transport=tcp',
|
5384
|
+
'turns:turn-server-url2:443?transport=tcp',
|
5385
|
+
],
|
5246
5386
|
username: 'turn user',
|
5247
5387
|
password: 'turn password',
|
5248
5388
|
},
|
@@ -5256,7 +5396,10 @@ describe('plugin-meetings', () => {
|
|
5256
5396
|
// but doing it just for completeness
|
5257
5397
|
await runCheck(
|
5258
5398
|
{
|
5259
|
-
urls: [
|
5399
|
+
urls: [
|
5400
|
+
'turns:turn-server-url1:443?transport=tcp',
|
5401
|
+
'turns:turn-server-url2:443?transport=tcp',
|
5402
|
+
],
|
5260
5403
|
username: 'turn user',
|
5261
5404
|
password: 'turn password',
|
5262
5405
|
},
|
@@ -7640,6 +7783,12 @@ describe('plugin-meetings', () => {
|
|
7640
7783
|
meeting.audio = {handleLocalStreamChange: sinon.stub()};
|
7641
7784
|
meeting.video = {handleLocalStreamChange: sinon.stub()};
|
7642
7785
|
meeting.statsAnalyzer = {updateMediaStatus: sinon.stub()};
|
7786
|
+
meeting.shareCAEventSentStatus = {
|
7787
|
+
transmitStart: false,
|
7788
|
+
transmitStop: false,
|
7789
|
+
receiveStart: false,
|
7790
|
+
receiveStop: false,
|
7791
|
+
};
|
7643
7792
|
fakeMultistreamRoapMediaConnection = {
|
7644
7793
|
createSendSlot: () => {
|
7645
7794
|
return {
|
@@ -7707,6 +7856,9 @@ describe('plugin-meetings', () => {
|
|
7707
7856
|
});
|
7708
7857
|
assert.equal(meeting.mediaProperties.mediaDirection.sendShare, true);
|
7709
7858
|
|
7859
|
+
assert.equal(meeting.shareCAEventSentStatus.transmitStart, false);
|
7860
|
+
assert.equal(meeting.shareCAEventSentStatus.transmitStop, false);
|
7861
|
+
|
7710
7862
|
assert.calledWith(meeting.statsAnalyzer.updateMediaStatus, {
|
7711
7863
|
expected: {sendShare: true},
|
7712
7864
|
});
|
@@ -7727,18 +7879,23 @@ describe('plugin-meetings', () => {
|
|
7727
7879
|
assert.equal(meeting.mediaProperties.shareAudioStream, stream);
|
7728
7880
|
assert.equal(meeting.mediaProperties.mediaDirection.sendShare, true);
|
7729
7881
|
|
7882
|
+
assert.equal(meeting.shareCAEventSentStatus.transmitStart, false);
|
7883
|
+
assert.equal(meeting.shareCAEventSentStatus.transmitStop, false);
|
7884
|
+
|
7730
7885
|
assert.calledWith(meeting.statsAnalyzer.updateMediaStatus, {
|
7731
7886
|
expected: {sendShare: true},
|
7732
7887
|
});
|
7733
7888
|
};
|
7734
7889
|
|
7735
7890
|
it('requests screen share floor and publishes the screen share video stream', async () => {
|
7891
|
+
meeting.shareCAEventSentStatus.transmitStart = true;
|
7736
7892
|
await meeting.publishStreams({screenShare: {video: videoShareStream}});
|
7737
7893
|
|
7738
7894
|
checkScreenShareVideoPublished(videoShareStream);
|
7739
7895
|
});
|
7740
7896
|
|
7741
7897
|
it('requests screen share floor and publishes the screen share audio stream', async () => {
|
7898
|
+
meeting.shareCAEventSentStatus.transmitStart = true;
|
7742
7899
|
await meeting.publishStreams({screenShare: {audio: audioShareStream}});
|
7743
7900
|
|
7744
7901
|
checkScreenShareAudioPublished(audioShareStream);
|
@@ -12032,6 +12189,8 @@ describe('plugin-meetings', () => {
|
|
12032
12189
|
// Set the webinar attendee flag
|
12033
12190
|
meeting.webinar = {selfIsAttendee: true};
|
12034
12191
|
meeting.locusInfo.info.isWebinar = true;
|
12192
|
+
meeting.shareCAEventSentStatus.receiveStart = true;
|
12193
|
+
meeting.shareCAEventSentStatus.receiveStop = true;
|
12035
12194
|
|
12036
12195
|
// Step 1: Start sharing whiteboard A
|
12037
12196
|
const data1 = generateData(
|
@@ -12055,6 +12214,8 @@ describe('plugin-meetings', () => {
|
|
12055
12214
|
|
12056
12215
|
// Specific assertions for webinar attendee status
|
12057
12216
|
assert.equal(meeting.shareStatus, SHARE_STATUS.REMOTE_SHARE_ACTIVE);
|
12217
|
+
assert.equal(meeting.shareCAEventSentStatus.receiveStart, false);
|
12218
|
+
assert.equal(meeting.shareCAEventSentStatus.receiveStop, false);
|
12058
12219
|
});
|
12059
12220
|
});
|
12060
12221
|
|