ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-browser: log error on filter event handlers when missing (https://github.com/OpenVidu/openvidu/pull/567)

pull/707/head
pabloFuente 2022-03-10 16:14:12 +01:00
parent 569a8a470c
commit 48b8bd5c5a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openvidu-browser/src/OpenVidu/Session.ts
View File

@ -171,7 +171,7 @@ export class Session extends EventDispatcher {
metadata: !!metadata ? this.stringClientMetadata(metadata) : '' metadata: !!metadata ? this.stringClientMetadata(metadata) : ''
}; };
this.connectAux(token) this.connectAux(token)
.then(() =>resolve()) .then(() => resolve())
.catch(error => reject(error)); .catch(error => reject(error));
} else { } else {
return reject(new OpenViduError(OpenViduErrorName.BROWSER_NOT_SUPPORTED, 'Browser ' + platform.getName() + ' (version ' + platform.getVersion() + ') for ' + platform.getFamily() + ' is not supported in OpenVidu')); return reject(new OpenViduError(OpenViduErrorName.BROWSER_NOT_SUPPORTED, 'Browser ' + platform.getName() + ' (version ' + platform.getVersion() + ') for ' + platform.getFamily() + ' is not supported in OpenVidu'));
@ -1088,9 +1088,18 @@ export class Session extends EventDispatcher {
const connectionId: string = event.connectionId; const connectionId: string = event.connectionId;
this.getConnection(connectionId, 'No connection found for connectionId ' + connectionId) this.getConnection(connectionId, 'No connection found for connectionId ' + connectionId)
.then(connection => { .then(connection => {
logger.info('Filter event dispatched'); logger.info(`Filter event of type "${event.eventType}" dispatched`);
const stream: Stream = connection.stream!; const stream: Stream = connection.stream!;
stream.filter!.handlers.get(event.eventType)?.call(this, new FilterEvent(stream.filter!, event.eventType, event.data)); if (!stream || !stream.filter) {
return logger.error(`Filter event of type "${event.eventType}" dispatched for stream ${stream.streamId} but there is no ${!stream ? 'stream' : 'filter'} defined`);
}
const eventHandler = stream.filter.handlers.get(event.eventType);
if (!eventHandler || typeof eventHandler !== 'function') {
const actualHandlers: string[] = Array.from(stream.filter.handlers.keys());
return logger.error(`Filter event of type "${event.eventType}" not handled or not a function! Active filter events: ${actualHandlers.join(',')}`);
} else {
eventHandler.call(this, new FilterEvent(stream.filter, event.eventType, event.data));
}
}); });
} }
@ -1503,9 +1512,9 @@ export class Session extends EventDispatcher {
this.sessionId = opts.session; this.sessionId = opts.session;
if (opts.customIceServers != null && opts.customIceServers.length > 0) { if (opts.customIceServers != null && opts.customIceServers.length > 0) {
this.openvidu.iceServers = []; this.openvidu.iceServers = [];
for(const iceServer of opts.customIceServers) { for (const iceServer of opts.customIceServers) {
let rtcIceServer: RTCIceServer = { let rtcIceServer: RTCIceServer = {
urls: [ iceServer.url ] urls: [iceServer.url]
} }
logger.log("STUN/TURN server IP: " + iceServer.url); logger.log("STUN/TURN server IP: " + iceServer.url);
if (iceServer.username != null && iceServer.credential != null) { if (iceServer.username != null && iceServer.credential != null) {