Add instance identifier and add listener removal logic

This commit is contained in:
Tiago Jacobs 2022-05-02 19:10:09 -03:00
parent 2960002bca
commit 438f21e222
11 changed files with 61 additions and 33 deletions

View File

@ -1,9 +1,10 @@
import type { MutableRefObject } from 'react';
import type { EmitterSubscription } from 'react-native';
import nativeEmitter from '../native-messaging/emitter';
export function setupListener(_webViewRef: MutableRefObject<any>) {
export function setupListener(_webViewRef: MutableRefObject<any>):EmitterSubscription {
// Resolve promise when SDP offer is available
nativeEmitter.addListener('onBroadcastFinished', () => {
return nativeEmitter.addListener('onBroadcastFinished', () => {
console.log(`Broadcast finished`);
_webViewRef.current.injectJavaScript(
`window.bbbMobileScreenShareBroadcastFinishedCallback && window.bbbMobileScreenShareBroadcastFinishedCallback();`

View File

@ -1,9 +1,10 @@
import type { MutableRefObject } from 'react';
import type { EmitterSubscription } from 'react-native';
import nativeEmitter from '../native-messaging/emitter';
export function setupListener(_webViewRef: MutableRefObject<any>) {
export function setupListener(_webViewRef: MutableRefObject<any>):EmitterSubscription {
// Resolve promise when SDP offer is available
nativeEmitter.addListener(
return nativeEmitter.addListener(
'onScreenShareLocalIceCandidate',
(jsonEncodedIceCandidate) => {
let iceCandidate = JSON.parse(jsonEncodedIceCandidate);

View File

@ -1,9 +1,10 @@
import type { MutableRefObject } from 'react';
import type { EmitterSubscription } from 'react-native';
import nativeEmitter from '../native-messaging/emitter';
export function setupListener(_webViewRef: MutableRefObject<any>) {
export function setupListener(_webViewRef: MutableRefObject<any>):EmitterSubscription {
// Resolve promise when SDP offer is available
nativeEmitter.addListener('onScreenShareSignalingStateChange', (newState) => {
return nativeEmitter.addListener('onScreenShareSignalingStateChange', (newState) => {
console.log(`Temos um novo state: ${newState}`);
_webViewRef.current.injectJavaScript(
`window.bbbMobileScreenShareSignalingStateChangeCallback && window.bbbMobileScreenShareSignalingStateChangeCallback(${JSON.stringify(

View File

@ -1,4 +1,4 @@
import { Platform, ViewStyle } from 'react-native';
import { EmitterSubscription, Platform, ViewStyle } from 'react-native';
import React, { useEffect, useRef } from 'react';
import BBBN_SystemBroadcastPicker from './native-components/BBBN_SystemBroadcastPicker';
import { WebView } from 'react-native-webview';
@ -14,6 +14,10 @@ type BigbluebuttonMobileSdkProps = {
onSuccess?: any;
};
const data = {
instances: 0
}
const renderPlatformSpecificComponents = () =>
Platform.select({
ios: <BBBN_SystemBroadcastPicker />,
@ -27,11 +31,27 @@ export const BigBlueButtonMobile = ({
onSuccess,
}: BigbluebuttonMobileSdkProps) => {
const webViewRef = useRef(null);
const thisInstanceId = ++data.instances;
// console.log("XXX - ", thisInstanceId);
useEffect(() => {
onScreenShareLocalIceCandidate.setupListener(webViewRef);
onScreenShareSignalingStateChange.setupListener(webViewRef);
onBroadcastFinished.setupListener(webViewRef);
const logPrefix = `[${thisInstanceId}] - ${url.substring(8, 16)}`;
console.log(`${logPrefix} - addingListeners`);
const listeners:EmitterSubscription[] = [];
listeners.push(onScreenShareLocalIceCandidate.setupListener(webViewRef));
listeners.push(onScreenShareSignalingStateChange.setupListener(webViewRef));
listeners.push(onBroadcastFinished.setupListener(webViewRef));
return () => {
console.log(`${logPrefix} - Removing listeners`);
listeners.forEach( (listener, index) => {
console.log(`${logPrefix} - Removing listener ${index}`);
listener.remove();
} );
}
}, [webViewRef]);
return (
@ -43,7 +63,7 @@ export const BigBlueButtonMobile = ({
source={{ uri: url }}
style={{ ...style }}
contentMode={'mobile'}
onMessage={(msg) => handleWebviewMessage(webViewRef, msg)}
onMessage={(msg) => handleWebviewMessage(thisInstanceId, webViewRef, msg)}
applicationNameForUserAgent="BBBMobile"
allowsInlineMediaPlayback={true}
onLoadEnd={(content: any) => {

View File

@ -14,14 +14,14 @@ nativeEmitter.addListener('onAddScreenShareRemoteIceCandidateCompleted', () => {
});
// Entry point of this method
function addScreenShareRemoteIceCandidate(remoteCandidateJson: string) {
function addScreenShareRemoteIceCandidate(instanceId: Number, remoteCandidateJson: string) {
return new Promise((res, rej) => {
// store the resolver for later call (when event is received)
resolve = res;
try {
console.log(
`>nativeAddScreenShareRemoteIceCandidate ${remoteCandidateJson}`
`[${instanceId}] - >nativeAddScreenShareRemoteIceCandidate ${remoteCandidateJson}`
);
// call native swift method that triggers the broadcast popup
nativeAddScreenShareRemoteIceCandidate(remoteCandidateJson);

View File

@ -14,13 +14,13 @@ nativeEmitter.addListener('onFullAudioOfferCreated', (sdp) => {
});
// Entry point of this method
function createFullAudioOffer() {
function createFullAudioOffer(instanceId: Number) {
return new Promise((res, rej) => {
// store the resolver for later call (when event is received)
resolve = res;
try {
console.log(`>nativeCreateFullAudioOffer`);
console.log(`[${instanceId}] - >nativeCreateFullAudioOffer`);
// call native swift method that triggers the broadcast popup
nativeCreateFullAudioOffer();
} catch (e) {

View File

@ -14,13 +14,13 @@ nativeEmitter.addListener('onScreenShareOfferCreated', (sdp) => {
});
// Entry point of this method
function createScreenShareOffer() {
function createScreenShareOffer(instanceId: Number) {
return new Promise((res, rej) => {
// store the resolver for later call (when event is received)
resolve = res;
try {
console.log(`>nativeCreateScreenShareOffer`);
console.log(`[${instanceId}] - >nativeCreateScreenShareOffer`);
// call native swift method that triggers the broadcast popup
nativeCreateScreenShareOffer();
} catch (e) {

View File

@ -19,14 +19,14 @@ nativeEmitter.addListener('onBroadcastStarted', () => {
});
// Entry point of this method
function initializeScreenShare() {
function initializeScreenShare(instanceId: Number) {
return new Promise((res, rej) => {
// store the resolver for later call (when event is received)
resolve = res;
try {
// call native swift method that triggers the broadcast popup
console.log(`>nativeInitializeScreenShare`);
console.log(`[${instanceId}] - >nativeInitializeScreenShare`);
nativeInitializeScreenShare();
} catch (e) {
rej(`Call to nativeInitializeScreenShare failed zzy`);

View File

@ -14,13 +14,13 @@ nativeEmitter.addListener('onSetFullAudioRemoteSDPCompleted', () => {
});
// Entry point of this method
function setFullAudioRemoteSDP(remoteSdp: string) {
function setFullAudioRemoteSDP(instanceId: Number, remoteSdp: string) {
return new Promise((res, rej) => {
// store the resolver for later call (when event is received)
resolve = res;
try {
console.log(`>nativeSetFullAudioRemoteSDP ${remoteSdp}`);
console.log(`[${instanceId}] - >nativeSetFullAudioRemoteSDP ${remoteSdp}`);
// call native swift method that triggers the broadcast popup
nativeSetFullAudioRemoteSDP(remoteSdp);
} catch (e) {

View File

@ -14,13 +14,13 @@ nativeEmitter.addListener('onSetScreenShareRemoteSDPCompleted', () => {
});
// Entry point of this method
function setScreenShareRemoteSDP(remoteSdp: string) {
function setScreenShareRemoteSDP(instanceId: Number, remoteSdp: string) {
return new Promise((res, rej) => {
// store the resolver for later call (when event is received)
resolve = res;
try {
console.log(`>nativeSetScreenShareRemoteSDP ${remoteSdp}`);
console.log(`[${instanceId}] - >nativeSetScreenShareRemoteSDP ${remoteSdp}`);
// call native swift method that triggers the broadcast popup
nativeSetScreenShareRemoteSDP(remoteSdp);
} catch (e) {

View File

@ -8,13 +8,14 @@ import addScreenShareRemoteIceCandidate from '../methods/addScreenShareRemoteIce
import createFullAudioOffer from '../methods/createFullAudioOffer';
function observePromiseResult(
instanceId: Number,
webViewRef: MutableRefObject<WebView>,
sequence: number,
prom: Promise<any>
) {
prom
.then((result: any) => {
console.log(`Promise ${sequence} resolved!`, result);
console.log(`[${instanceId}] - Promise ${sequence} resolved!`, result);
webViewRef.current.injectJavaScript(
`window.nativeMethodCallResult(${sequence}, true ${
result ? ',' + JSON.stringify(result) : ''
@ -22,7 +23,7 @@ function observePromiseResult(
);
})
.catch((exception: any) => {
console.error(`Promise ${sequence} failed!`, exception);
console.error(`[${instanceId}] - Promise ${sequence} failed!`, exception);
webViewRef.current.injectJavaScript(
`window.nativeMethodCallResult(${sequence}, false ${
exception ? ',' + JSON.stringify(exception) : ''
@ -32,41 +33,45 @@ function observePromiseResult(
}
export function handleWebviewMessage(
instanceId: Number,
webViewRef: MutableRefObject<any>,
event: WebViewMessageEvent
) {
const stringData = event?.nativeEvent?.data;
console.log("handleWebviewMessage - ", instanceId);
const data = JSON.parse(stringData);
if (data?.method && data?.sequence) {
let promise;
switch (data?.method) {
case 'initializeScreenShare':
promise = initializeScreenShare();
promise = initializeScreenShare(instanceId);
break;
case 'createFullAudioOffer':
promise = createFullAudioOffer();
promise = createFullAudioOffer(instanceId);
break;
case 'createScreenShareOffer':
promise = createScreenShareOffer();
promise = createScreenShareOffer(instanceId);
break;
case 'setScreenShareRemoteSDP':
promise = setScreenShareRemoteSDP(data?.arguments[0].sdp);
promise = setScreenShareRemoteSDP(instanceId, data?.arguments[0].sdp);
break;
case 'setFullAudioRemoteSDP':
promise = setFullAudioRemoteSDP(data?.arguments[0].sdp);
promise = setFullAudioRemoteSDP(instanceId, data?.arguments[0].sdp);
break;
case 'addRemoteIceCandidate':
promise = addScreenShareRemoteIceCandidate(
instanceId,
JSON.stringify(data?.arguments[0])
);
break;
default:
throw `Unknown method ${data?.method}`;
throw `[${instanceId}] - Unknown method ${data?.method}`;
}
observePromiseResult(webViewRef, data.sequence, promise);
observePromiseResult(instanceId, webViewRef, data.sequence, promise);
} else {
console.log(`Ignoring unknown message: $stringData`);
console.log(`[${instanceId}] - Ignoring unknown message: $stringData`);
}
}