@webex/plugin-meetings 3.9.0-webinar5k.1 → 3.9.0
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/constants.js +16 -0
- package/dist/constants.js.map +1 -1
- package/dist/interpretation/index.js +1 -1
- package/dist/interpretation/siLanguage.js +1 -1
- package/dist/locus-info/index.js +40 -328
- package/dist/locus-info/index.js.map +1 -1
- package/dist/meeting/in-meeting-actions.js +6 -0
- package/dist/meeting/in-meeting-actions.js.map +1 -1
- package/dist/meeting/index.js +196 -160
- package/dist/meeting/index.js.map +1 -1
- package/dist/meeting/muteState.js +5 -2
- package/dist/meeting/muteState.js.map +1 -1
- package/dist/meeting/type.js +7 -0
- package/dist/meeting/type.js.map +1 -0
- package/dist/meeting/util.js +79 -10
- package/dist/meeting/util.js.map +1 -1
- package/dist/meetings/index.js +37 -39
- package/dist/meetings/index.js.map +1 -1
- package/dist/member/types.js.map +1 -1
- package/dist/members/collection.js +0 -13
- package/dist/members/collection.js.map +1 -1
- package/dist/members/index.js +21 -40
- package/dist/members/index.js.map +1 -1
- package/dist/members/util.js.map +1 -1
- package/dist/multistream/mediaRequestManager.js +1 -1
- package/dist/multistream/mediaRequestManager.js.map +1 -1
- package/dist/multistream/remoteMedia.js +34 -5
- package/dist/multistream/remoteMedia.js.map +1 -1
- package/dist/multistream/remoteMediaGroup.js +42 -2
- package/dist/multistream/remoteMediaGroup.js.map +1 -1
- package/dist/types/constants.d.ts +16 -0
- package/dist/types/locus-info/index.d.ts +3 -102
- package/dist/types/meeting/in-meeting-actions.d.ts +6 -0
- package/dist/types/meeting/index.d.ts +23 -28
- package/dist/types/meeting/type.d.ts +9 -0
- package/dist/types/meeting/util.d.ts +6 -3
- package/dist/types/member/types.d.ts +0 -1
- package/dist/types/members/collection.d.ts +0 -6
- package/dist/types/members/index.d.ts +7 -16
- package/dist/types/members/util.d.ts +2 -1
- package/dist/types/multistream/remoteMedia.d.ts +20 -1
- package/dist/types/multistream/remoteMediaGroup.d.ts +11 -0
- package/dist/webinar/index.js +1 -1
- package/package.json +22 -24
- package/src/constants.ts +16 -2
- package/src/locus-info/index.ts +39 -409
- package/src/meeting/in-meeting-actions.ts +13 -0
- package/src/meeting/index.ts +92 -63
- package/src/meeting/muteState.ts +6 -2
- package/src/meeting/type.ts +9 -0
- package/src/meeting/util.ts +93 -19
- package/src/meetings/index.ts +6 -19
- package/src/member/types.ts +0 -1
- package/src/members/collection.ts +0 -11
- package/src/members/index.ts +10 -33
- package/src/members/util.ts +2 -1
- package/src/multistream/mediaRequestManager.ts +7 -7
- package/src/multistream/remoteMedia.ts +34 -4
- package/src/multistream/remoteMediaGroup.ts +37 -2
- package/test/unit/spec/locus-info/index.js +8 -365
- package/test/unit/spec/meeting/in-meeting-actions.ts +6 -0
- package/test/unit/spec/meeting/index.js +254 -38
- package/test/unit/spec/meeting/utils.js +122 -1
- package/test/unit/spec/meetings/index.js +2 -0
- package/test/unit/spec/members/index.js +37 -1
- package/test/unit/spec/multistream/mediaRequestManager.ts +19 -6
- package/test/unit/spec/multistream/remoteMedia.ts +66 -2
- package/dist/hashTree/constants.js +0 -23
- package/dist/hashTree/constants.js.map +0 -1
- package/dist/hashTree/hashTree.js +0 -516
- package/dist/hashTree/hashTree.js.map +0 -1
- package/dist/hashTree/hashTreeParser.js +0 -521
- package/dist/hashTree/hashTreeParser.js.map +0 -1
- package/dist/types/hashTree/constants.d.ts +0 -8
- package/dist/types/hashTree/hashTree.d.ts +0 -128
- package/dist/types/hashTree/hashTreeParser.d.ts +0 -152
- package/src/hashTree/constants.ts +0 -12
- package/src/hashTree/hashTree.ts +0 -460
- package/src/hashTree/hashTreeParser.ts +0 -556
- package/test/unit/spec/hashTree/hashTree.ts +0 -394
- package/test/unit/spec/hashTree/hashTreeParser.ts +0 -156
@@ -177,6 +177,26 @@ describe('plugin-meetings', () => {
|
|
177
177
|
assert.isFalse(MembersUtil.isInvalidInvitee({email: 'sip:test@cisco.com'}), 'SIP email should be valid');
|
178
178
|
});
|
179
179
|
|
180
|
+
it('should skip email validation if skipEmailValidation is true', async () => {
|
181
|
+
sandbox.spy(MembersUtil, 'isInvalidInvitee');
|
182
|
+
|
183
|
+
const members = createMembers({url: true});
|
184
|
+
|
185
|
+
await members.addMember({email: '8618578675309', skipEmailValidation: true});
|
186
|
+
|
187
|
+
assert.notCalled(MembersUtil.isInvalidInvitee);
|
188
|
+
});
|
189
|
+
|
190
|
+
it('should not skip email validation if skipEmailValidation is not equal true', async () => {
|
191
|
+
sandbox.spy(MembersUtil, 'isInvalidInvitee');
|
192
|
+
|
193
|
+
const members = createMembers({url: true});
|
194
|
+
|
195
|
+
await members.addMember({email: '86185786@ds.com'});
|
196
|
+
|
197
|
+
assert.called(MembersUtil.isInvalidInvitee);
|
198
|
+
});
|
199
|
+
|
180
200
|
it('should accept valid phone with isInternalNumber', async () => {
|
181
201
|
sandbox.spy(MembersUtil, 'isInvalidInvitee');
|
182
202
|
|
@@ -190,6 +210,22 @@ describe('plugin-meetings', () => {
|
|
190
210
|
assert.isFalse(MembersUtil.isInvalidInvitee({phoneNumber: '18578675309', isInternalNumber: true}));
|
191
211
|
assert.isTrue(MembersUtil.isInvalidInvitee({phoneNumber: '+8618578675309', isInternalNumber: true}));
|
192
212
|
});
|
213
|
+
|
214
|
+
it('should not crash if params is undefined', async () => {
|
215
|
+
sandbox.spy(MembersUtil, 'isInvalidInvitee');
|
216
|
+
|
217
|
+
const members = createMembers({url: true});
|
218
|
+
|
219
|
+
try {
|
220
|
+
await members.addMember(undefined);
|
221
|
+
} catch (err) {
|
222
|
+
assert.instanceOf(err, ParameterError);
|
223
|
+
|
224
|
+
assert.equal(err.message, 'The invitee must be defined with either a valid email, emailAddress or phoneNumber property.');
|
225
|
+
}
|
226
|
+
|
227
|
+
assert.called(MembersUtil.isInvalidInvitee);
|
228
|
+
});
|
193
229
|
});
|
194
230
|
|
195
231
|
describe('#admitMembers', () => {
|
@@ -307,7 +343,7 @@ describe('plugin-meetings', () => {
|
|
307
343
|
},
|
308
344
|
EVENT_TRIGGERS.MEMBERS_UPDATE,
|
309
345
|
{
|
310
|
-
delta: {added: [], updated: []
|
346
|
+
delta: {added: [], updated: []},
|
311
347
|
full: {},
|
312
348
|
isReplace: true,
|
313
349
|
}
|
@@ -3,7 +3,7 @@ import {MediaRequestManager} from '@webex/plugin-meetings/src/multistream/mediaR
|
|
3
3
|
import {ReceiveSlot} from '@webex/plugin-meetings/src/multistream/receiveSlot';
|
4
4
|
import sinon from 'sinon';
|
5
5
|
import {assert} from '@webex/test-helper-chai';
|
6
|
-
import {getMaxFs} from '@webex/plugin-meetings/src/multistream/remoteMedia';
|
6
|
+
import {getMaxFs, MAX_FS_VALUES} from '@webex/plugin-meetings/src/multistream/remoteMedia';
|
7
7
|
import FakeTimers from '@sinonjs/fake-timers';
|
8
8
|
import * as InternalMediaCoreModule from '@webex/internal-media-core';
|
9
9
|
import { expect } from 'chai';
|
@@ -36,12 +36,15 @@ describe('MediaRequestManager', () => {
|
|
36
36
|
const CROSS_POLICY_DUPLICATION = true;
|
37
37
|
const MAX_FPS = 3000;
|
38
38
|
const MAX_FS_360p = 920;
|
39
|
+
const MAX_FS_540p = 2040;
|
39
40
|
const MAX_FS_720p = 3600;
|
40
41
|
const MAX_FS_1080p = 8192;
|
41
42
|
const MAX_MBPS_360p = 27600;
|
43
|
+
const MAX_MBPS_540p = 61200;
|
42
44
|
const MAX_MBPS_720p = 108000;
|
43
45
|
const MAX_MBPS_1080p = 245760;
|
44
46
|
const MAX_PAYLOADBITSPS_360p = 640000;
|
47
|
+
const MAX_PAYLOADBITSPS_540p = 880000;
|
45
48
|
const MAX_PAYLOADBITSPS_720p = 2500000;
|
46
49
|
const MAX_PAYLOADBITSPS_1080p = 4000000;
|
47
50
|
|
@@ -82,7 +85,14 @@ describe('MediaRequestManager', () => {
|
|
82
85
|
});
|
83
86
|
|
84
87
|
// helper function for adding an active speaker request
|
85
|
-
const addActiveSpeakerRequest = (
|
88
|
+
const addActiveSpeakerRequest = (
|
89
|
+
priority,
|
90
|
+
receiveSlots,
|
91
|
+
maxFs,
|
92
|
+
commit = false,
|
93
|
+
preferLiveVideo = true,
|
94
|
+
namedMediaGroups = undefined
|
95
|
+
) =>
|
86
96
|
mediaRequestManager.addRequest(
|
87
97
|
{
|
88
98
|
policyInfo: {
|
@@ -216,6 +226,9 @@ describe('MediaRequestManager', () => {
|
|
216
226
|
},
|
217
227
|
false
|
218
228
|
);
|
229
|
+
|
230
|
+
|
231
|
+
|
219
232
|
mediaRequestManager.addRequest(
|
220
233
|
{
|
221
234
|
policyInfo: {
|
@@ -892,15 +905,15 @@ describe('MediaRequestManager', () => {
|
|
892
905
|
// request 10 "large" 1080p streams
|
893
906
|
addActiveSpeakerRequest(255, fakeReceiveSlots.slice(0, 10), getMaxFs('large'), true);
|
894
907
|
|
895
|
-
// check that resulting requests are 10
|
908
|
+
// check that resulting requests are 10 540p streams
|
896
909
|
checkMediaRequestsSent([
|
897
910
|
{
|
898
911
|
policy: 'active-speaker',
|
899
912
|
priority: 255,
|
900
913
|
receiveSlots: fakeWcmeSlots.slice(0, 10),
|
901
|
-
maxPayloadBitsPerSecond:
|
902
|
-
maxFs:
|
903
|
-
maxMbps:
|
914
|
+
maxPayloadBitsPerSecond: MAX_PAYLOADBITSPS_540p,
|
915
|
+
maxFs: MAX_FS_VALUES['540p'],
|
916
|
+
maxMbps: MAX_MBPS_540p,
|
904
917
|
},
|
905
918
|
]);
|
906
919
|
});
|
@@ -3,7 +3,7 @@ import 'jsdom-global/register';
|
|
3
3
|
import EventEmitter from 'events';
|
4
4
|
|
5
5
|
import {MediaType} from '@webex/internal-media-core';
|
6
|
-
import {RemoteMedia, RemoteMediaEvents} from '@webex/plugin-meetings/src/multistream/remoteMedia';
|
6
|
+
import {RemoteMedia, RemoteMediaEvents, RemoteVideoResolution} from '@webex/plugin-meetings/src/multistream/remoteMedia';
|
7
7
|
import {ReceiveSlotEvents} from '@webex/plugin-meetings/src/multistream/receiveSlot';
|
8
8
|
import sinon from 'sinon';
|
9
9
|
import {assert} from '@webex/test-helper-chai';
|
@@ -257,7 +257,9 @@ describe('RemoteMedia', () => {
|
|
257
257
|
{height: 198, fs: 920}, // 360p
|
258
258
|
{height: 360, fs: 920},
|
259
259
|
{height: 395, fs: 920},
|
260
|
-
{height: 396, fs:
|
260
|
+
{height: 396, fs: 2040}, // 540p
|
261
|
+
{height: 540, fs: 2040},
|
262
|
+
{height: 610, fs: 3600}, // 720p
|
261
263
|
{height: 720, fs: 3600},
|
262
264
|
{height: 721, fs: 8192}, // 1080p
|
263
265
|
{height: 1080, fs: 8192},
|
@@ -271,4 +273,66 @@ describe('RemoteMedia', () => {
|
|
271
273
|
}
|
272
274
|
);
|
273
275
|
});
|
276
|
+
|
277
|
+
describe('getEffectiveMaxFs()', () => {
|
278
|
+
it('returns maxFrameSize when it is greater than 0', () => {
|
279
|
+
remoteMedia.setSizeHint(960, 540);
|
280
|
+
|
281
|
+
const result = remoteMedia.getEffectiveMaxFs();
|
282
|
+
|
283
|
+
assert.strictEqual(result, 2040);
|
284
|
+
});
|
285
|
+
|
286
|
+
it('returns getMaxFs result when maxFrameSize is 0 and resolution is provided', () => {
|
287
|
+
remoteMedia.setSizeHint(0, 0);
|
288
|
+
|
289
|
+
// remoteMedia was created with {resolution: 'medium'} in beforeEach
|
290
|
+
|
291
|
+
const result = remoteMedia.getEffectiveMaxFs();
|
292
|
+
|
293
|
+
// 'medium' resolution should map to 720p which is 3600
|
294
|
+
assert.strictEqual(result, 3600);
|
295
|
+
});
|
296
|
+
|
297
|
+
it('returns undefined when maxFrameSize is 0 and no resolution is provided', () => {
|
298
|
+
remoteMedia.setSizeHint(0, 0);
|
299
|
+
|
300
|
+
// Create a new RemoteMedia without resolution option
|
301
|
+
const remoteMediaWithoutResolution = new RemoteMedia(fakeReceiveSlot, fakeMediaRequestManager);
|
302
|
+
|
303
|
+
const result = remoteMediaWithoutResolution.getEffectiveMaxFs();
|
304
|
+
|
305
|
+
assert.strictEqual(result, undefined);
|
306
|
+
});
|
307
|
+
|
308
|
+
it('prioritizes maxFrameSize over resolution option', () => {
|
309
|
+
remoteMedia.setSizeHint(640, 360);
|
310
|
+
// remoteMedia was created with {resolution: 'medium'} in beforeEach
|
311
|
+
|
312
|
+
const result = remoteMedia.getEffectiveMaxFs();
|
313
|
+
|
314
|
+
// Should return maxFrameSize (500) instead of resolution-based value (3600)
|
315
|
+
assert.strictEqual(result, 920);
|
316
|
+
});
|
317
|
+
|
318
|
+
it('works correctly with different resolution options', () => {
|
319
|
+
const testCases: Array<{ resolution: RemoteVideoResolution; expected: number }> = [
|
320
|
+
{ resolution: 'thumbnail', expected: 60 },
|
321
|
+
{ resolution: 'very small', expected: 240 },
|
322
|
+
{ resolution: 'small', expected: 920 },
|
323
|
+
{ resolution: 'medium', expected: 3600 },
|
324
|
+
{ resolution: 'large', expected: 8192 },
|
325
|
+
{ resolution: 'best', expected: 8192 },
|
326
|
+
];
|
327
|
+
|
328
|
+
testCases.forEach(({ resolution, expected }) => {
|
329
|
+
const testRemoteMedia = new RemoteMedia(fakeReceiveSlot, fakeMediaRequestManager, { resolution });
|
330
|
+
testRemoteMedia.setSizeHint(0, 0); // Ensure maxFrameSize doesn't interfere
|
331
|
+
|
332
|
+
const result = testRemoteMedia.getEffectiveMaxFs();
|
333
|
+
|
334
|
+
assert.strictEqual(result, expected, `Failed for resolution: ${resolution}`);
|
335
|
+
});
|
336
|
+
});
|
337
|
+
});
|
274
338
|
});
|
@@ -1,23 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
|
3
|
-
var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
|
4
|
-
_Object$defineProperty(exports, "__esModule", {
|
5
|
-
value: true
|
6
|
-
});
|
7
|
-
exports.EMPTY_HASH = exports.DataSetNames = void 0;
|
8
|
-
// TODO: Consider moving these to the main meetings constants file at some point
|
9
|
-
// Only worth doing so if they are used outside of the hash tree
|
10
|
-
|
11
|
-
var EMPTY_HASH = exports.EMPTY_HASH = '99aa06d3014798d86001c324468d497f';
|
12
|
-
var DataSetNames = exports.DataSetNames = {
|
13
|
-
MAIN: 'main',
|
14
|
-
// sent to web client, contains also panelists, over LLM
|
15
|
-
ATTENDEES: 'attendees',
|
16
|
-
// NOT SENT to web client, all the attendees in the locus
|
17
|
-
ATD_ACTIVE: 'atd-active',
|
18
|
-
// only sent to panelists, over LLM; the attendees that have their hands raised or are allowed to unmute themselves
|
19
|
-
ATD_UNMUTED: 'atd-unmuted',
|
20
|
-
// sent to web client, over LLM, not sent to panelists; the attendees that are unmuted
|
21
|
-
SELF: 'self' // sent to web client, over Mercury
|
22
|
-
};
|
23
|
-
//# sourceMappingURL=constants.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"names":["EMPTY_HASH","exports","DataSetNames","MAIN","ATTENDEES","ATD_ACTIVE","ATD_UNMUTED","SELF"],"sources":["constants.ts"],"sourcesContent":["// TODO: Consider moving these to the main meetings constants file at some point\n// Only worth doing so if they are used outside of the hash tree\n\nexport const EMPTY_HASH = '99aa06d3014798d86001c324468d497f';\n\nexport const DataSetNames = {\n MAIN: 'main', // sent to web client, contains also panelists, over LLM\n ATTENDEES: 'attendees', // NOT SENT to web client, all the attendees in the locus\n ATD_ACTIVE: 'atd-active', // only sent to panelists, over LLM; the attendees that have their hands raised or are allowed to unmute themselves\n ATD_UNMUTED: 'atd-unmuted', // sent to web client, over LLM, not sent to panelists; the attendees that are unmuted\n SELF: 'self', // sent to web client, over Mercury\n};\n"],"mappings":";;;;;;;AAAA;AACA;;AAEO,IAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG,kCAAkC;AAErD,IAAME,YAAY,GAAAD,OAAA,CAAAC,YAAA,GAAG;EAC1BC,IAAI,EAAE,MAAM;EAAE;EACdC,SAAS,EAAE,WAAW;EAAE;EACxBC,UAAU,EAAE,YAAY;EAAE;EAC1BC,WAAW,EAAE,aAAa;EAAE;EAC5BC,IAAI,EAAE,MAAM,CAAE;AAChB,CAAC"}
|