react-native-altibbi 0.1.9 → 0.3.0

package/src/video/OT.d.ts

@@ -1,15 +1,6 @@
-declare const OT: any;
-declare const nativeEvents: NativeEventEmitter;
-declare function checkAndroidPermissions(): Promise<any>;
-declare function setNativeEvents(events: any): void;
-declare function removeNativeEvents(events: any): void;
+export let OT: any;
+export let nativeEvents: NativeEventEmitter;
+export function checkAndroidPermissions(audioTrack: any, videoTrack: any, isScreenSharing: any): Promise<any>;
+export function setNativeEvents(events: any): void;
+export function removeNativeEvents(events: any): void;
 import { NativeEventEmitter } from 'react-native';
-
-// Export the declared types
-export {
-  OT,
-  nativeEvents,
-  checkAndroidPermissions,
-  setNativeEvents,
-  removeNativeEvents,
-};

package/src/video/OT.js

@@ -4,10 +4,12 @@ import { each } from 'underscore';
 const OT = NativeModules.OTSessionManager;
 const nativeEvents = new NativeEventEmitter(OT);
 
-const checkAndroidPermissions = () => new Promise((resolve, reject) => {
-  PermissionsAndroid.requestMultiple([
-    PermissionsAndroid.PERMISSIONS.CAMERA,
-    PermissionsAndroid.PERMISSIONS.RECORD_AUDIO])
+const checkAndroidPermissions = (audioTrack, videoTrack, isScreenSharing) => new Promise((resolve, reject) => {
+  const permissionsToCheck = [
+    ... audioTrack ? [PermissionsAndroid.PERMISSIONS.RECORD_AUDIO] : [],
+    ... (videoTrack && !isScreenSharing) ? [PermissionsAndroid.PERMISSIONS.CAMERA] : [],
+  ];
+  PermissionsAndroid.requestMultiple(permissionsToCheck)
     .then((result) => {
       const permissionsError = {};
       permissionsError.permissionsDenied = [];

package/src/video/OTPublisher.d.ts

@@ -1,27 +1,33 @@
 export default OTPublisher;
-declare class OTPublisher extends Component<any, any, any> {
+declare class OTPublisher extends React.Component<any, any, any> {
     constructor(props: any, context: any);
     state: {
-        initError: any;
-        publisher: any;
+        initError: null;
+        publisher: null;
         publisherId: any;
     };
     initComponent: () => void;
     componentEvents: {
+        publisherStreamCreated: string;
+        publisherStreamDestroyed: string;
         sessionConnected: string;
-    };
-    componentEventsArray: string[];
-    otrnEventHandler: (event: any) => void;
-    publisherEvents: {};
-    sessionConnected: import("react-native").EmitterSubscription;
+    } | undefined;
+    componentEventsArray: string[] | undefined;
+    otrnEventHandler: ((event: any) => void) | undefined;
+    publisherEvents: {} | undefined;
+    publisherStreamCreated: import("react-native").EmitterSubscription | undefined;
+    publisherStreamDestroyed: import("react-native").EmitterSubscription | undefined;
+    sessionConnected: import("react-native").EmitterSubscription | undefined;
     componentDidMount(): void;
     componentDidUpdate(previousProps: any): void;
     componentWillUnmount(): void;
     sessionConnectedHandler: () => void;
     createPublisher(): void;
-    initPublisher(): void;
+    initPublisher(publisherProperties: any): void;
     publish(): void;
     getRtcStatsReport(): void;
+    publisherStreamCreatedHandler: (stream: any) => void;
+    publisherStreamDestroyedHandler: (stream: any) => void;
     setVideoTransformers(videoTransformers: any): void;
     render(): JSX.Element;
 }
@@ -34,5 +40,5 @@ declare namespace OTPublisher {
     }
     export { OTContext as contextType };
 }
-import { Component } from 'react';
+import React from 'react';
 import OTContext from './contexts/OTContext';

package/src/video/OTPublisher.js

@@ -31,6 +31,8 @@ class OTPublisher extends Component {
   }
   initComponent = () => {
     this.componentEvents = {
+      publisherStreamCreated: 'publisherStreamCreated',
+      publisherStreamDestroyed: 'publisherStreamDestroyed:',
       sessionConnected:
         Platform.OS === 'android'
           ? 'session:onConnected'
@@ -44,6 +46,14 @@ class OTPublisher extends Component {
     );
     setNativeEvents(this.publisherEvents);
     OT.setJSComponentEvents(this.componentEventsArray);
+    this.publisherStreamCreated = nativeEvents.addListener(
+      'publisherStreamCreated',
+      stream => this.publisherStreamCreatedHandler(stream)
+    );
+    this.publisherStreamDestroyed = nativeEvents.addListener(
+      'publisherStreamDestroyed',
+      stream => this.publisherStreamDestroyedHandler(stream)
+    );
     if (this.context.sessionId) {
       this.sessionConnected = nativeEvents.addListener(
         `${this.context.sessionId}:${this.componentEvents.sessionConnected}`,
@@ -99,20 +109,22 @@ class OTPublisher extends Component {
     }
   };
   createPublisher() {
+    const publisherProperties = sanitizeProperties(this.props.properties);
     if (Platform.OS === 'android') {
-      checkAndroidPermissions()
+      const { audioTrack, videoTrack, videoSource } = publisherProperties;
+      const isScreenSharing = (videoSource === 'screen');
+      checkAndroidPermissions(audioTrack, videoTrack, isScreenSharing)
         .then(() => {
-          this.initPublisher();
+          this.initPublisher(publisherProperties);
         })
         .catch((error) => {
           this.otrnEventHandler(error);
         });
     } else {
-      this.initPublisher();
+      this.initPublisher(publisherProperties);
     }
   }
-  initPublisher() {
-    const publisherProperties = sanitizeProperties(this.props.properties);
+  initPublisher(publisherProperties) {
     OT.initPublisher(
       this.state.publisherId,
       publisherProperties,
@@ -157,6 +169,26 @@ class OTPublisher extends Component {
     OT.getRtcStatsReport(this.state.publisherId);
   }
 
+  publisherStreamCreatedHandler = (stream) => {
+    if (
+      this.props.eventHandlers
+      && this.props.eventHandlers.streamCreated
+      && stream.publisherId === this.state.publisherId
+    ) {
+      this.props.eventHandlers.streamCreated(stream);
+    }
+  }
+
+  publisherStreamDestroyedHandler = (stream) => {
+    if (
+      this.props.eventHandlers
+      && this.props.eventHandlers.streamCreated
+      && stream.publisherId === this.state.publisherId
+    ) {
+      this.props.eventHandlers.streamDestroyed(stream);
+    }
+  }
+
   setVideoTransformers(videoTransformers) {
     OT.setVideoTransformers(this.state.publisherId, videoTransformers);
   }

package/src/video/OTSession.d.ts

@@ -1,48 +1,49 @@
-import { Component } from 'react';
-
-declare class OTSession extends Component<any, any> {
-  constructor(props: any);
-  state: {
-    sessionInfo: any;
-  };
-  otrnEventHandler: (event: any) => void;
-  initComponent: () => void;
-  sanitizedCredentials: {};
-  componentDidMount(): void;
-  componentDidUpdate(previousProps: any): void;
-  componentWillUnmount(): void;
-  createSession(credentials: any, sessionOptions: any): void;
-  disconnectSession(): void;
-  getSessionInfo(): any;
-  getCapabilities(): Promise<any>;
-  reportIssue(): Promise<any>;
-  signal(signal: any): void;
-  forceMuteAll(excludedStreamIds: any): any;
-  forceMuteStream(streamId: any): any;
-  disableForceMute(): any;
-  render(): JSX.Element;
+import React from 'react';
+import PropTypes from 'prop-types';
+declare class OTSession extends React.Component<any, any, any> {
+    constructor(props: any);
+    state: {
+        sessionInfo: null;
+    };
+    otrnEventHandler: (event: any) => void;
+    initComponent: () => void;
+    sanitizedCredentials: {} | undefined;
+    componentDidMount(): void;
+    componentDidUpdate(previousProps: any): void;
+    componentWillUnmount(): void;
+    createSession(credentials: any, sessionOptions: any, encryptionSecret: any): void;
+    disconnectSession(): void;
+    getSessionInfo(): null;
+    getCapabilities(): Promise<any>;
+    reportIssue(): Promise<any>;
+    signal(signal: any): void;
+    forceMuteAll(excludedStreamIds: any): any;
+    forceMuteStream(streamId: any): any;
+    disableForceMute(): any;
+    setEncryptionSecret(secret: any): void;
+    render(): JSX.Element;
 }
-
 declare namespace OTSession {
-  let propTypes: {
-    apiKey: any;
-    sessionId: any;
-    token: any;
-    children: any;
-    style: any;
-    eventHandlers: any;
-    options: any;
-    signal: any;
-  };
+  namespace propTypes {
+    let apiKey: PropTypes.Validator<string>;
+    let sessionId: PropTypes.Validator<string>;
+    let token: PropTypes.Validator<string>;
+    let children: PropTypes.Requireable<NonNullable<PropTypes.ReactElementLike | (PropTypes.ReactElementLike | null | undefined)[] | null | undefined>>;
+    let style: any;
+    let eventHandlers: PropTypes.Requireable<object>;
+    let options: PropTypes.Requireable<object>;
+    let signal: PropTypes.Requireable<object>;
+    let encryptionSecret: PropTypes.Requireable<string>;
+  }
 
-  let defaultProps: {
-    eventHandlers: {};
-    options: {};
-    signal: {};
-    style: {
+  namespace defaultProps {
+    // Declare the types (no initialization)
+    let eventHandlers: object;
+    let options: object;
+    let signal: object;
+    let style: {
       flex: number;
     };
-  };
+  }
 }
-
 export default OTSession;

package/src/video/OTSession.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { pick, isNull } from 'underscore';
 import { setNativeEvents, removeNativeEvents,  OT } from './OT';
 import { sanitizeSessionEvents, sanitizeSessionOptions, sanitizeSignalData,
-   sanitizeCredentials, getConnectionStatus } from './helpers/OTSessionHelper';
+  sanitizeCredentials, sanitizeEncryptionSecret, getConnectionStatus } from './helpers/OTSessionHelper';
 import { handleError } from './OTError';
 import { logOT, getOtrnErrorEventHandler } from './helpers/OTHelper';
 import OTContext from './contexts/OTContext';
@@ -29,9 +29,10 @@ export default class OTSession extends Component {
   }
   componentDidMount() {
     const sessionOptions = sanitizeSessionOptions(this.props.options);
+    const encryptionSecret = sanitizeEncryptionSecret(this.props.encryptionSecret);
     const { apiKey, sessionId, token } = this.sanitizedCredentials;
     if (apiKey && sessionId && token) {
-      this.createSession(this.sanitizedCredentials, sessionOptions);
+      this.createSession(this.sanitizedCredentials, sessionOptions, encryptionSecret);
       logOT({ apiKey, sessionId, action: 'rn_initialize', proxyUrl: sessionOptions.proxyUrl });
     } else {
       handleError('Please check your OpenTok credentials.');
@@ -48,19 +49,28 @@ export default class OTSession extends Component {
     const updateSessionProperty = (key, defaultValue) => {
       if (shouldUpdate(key, defaultValue)) {
         const value = useDefault(this.props[key], defaultValue);
-        this.signal(value);
+        if (key === 'signal') {
+          this.signal(value);
+        }
+        if (key === 'encryptionSecret') {
+          this.setEncryptionSecret(value);
+        }
       }
     };
 
     updateSessionProperty('signal', {});
+    updateSessionProperty('encryptionSecret', undefined);
   }
   componentWillUnmount() {
     this.disconnectSession();
   }
-  createSession(credentials, sessionOptions) {
+  createSession(credentials, sessionOptions, encryptionSecret) {
     const { signal } = this.props;
     const { apiKey, sessionId, token } = credentials;
     OT.initSession(apiKey, sessionId, sessionOptions);
+    if (encryptionSecret) {
+      this.setEncryptionSecret(encryptionSecret);
+    }
     OT.connect(sessionId, token, (error) => {
       if (error) {
         this.otrnEventHandler(error);
@@ -128,6 +138,14 @@ export default class OTSession extends Component {
   disableForceMute() {
     return OT.disableForceMute(this.props.sessionId);
   }
+  setEncryptionSecret(secret) {
+    const errorHandler = this.props.eventHandlers.error;
+    OT.setEncryptionSecret(this.props.sessionId, sanitizeEncryptionSecret(secret), (error) => {
+      if (error && errorHandler) {
+        errorHandler(error);
+      }
+    });
+  }
   render() {
     const { style, children, sessionId, apiKey, token } = this.props;
     const { sessionInfo } = this.state;
@@ -156,6 +174,7 @@ OTSession.propTypes = {
   eventHandlers: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   options: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   signal: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  encryptionSecret: PropTypes.string,
 };
 
 OTSession.defaultProps = {

package/src/video/OTSubscriber.d.ts

@@ -1,24 +1,30 @@
-declare class OTSubscriber extends Component<any, any, any> {
+declare class OTSubscriber extends React.Component<any, any, any> {
     constructor(props: any, context: any);
     state: {
-        streams: any[];
+        streams: never[];
         subscribeToSelf: any;
     };
     componentEvents: {
         streamDestroyed: string;
         streamCreated: string;
         captionReceived: string;
+        publisherStreamCreated: string;
+        publisherStreamDestroyed: string;
     };
     componentEventsArray: string[];
     otrnEventHandler: (event: any) => void;
     initComponent: () => void;
-    streamCreated: import("react-native").EmitterSubscription;
-    streamDestroyed: import("react-native").EmitterSubscription;
+    streamCreated: import("react-native").EmitterSubscription | undefined;
+    streamDestroyed: import("react-native").EmitterSubscription | undefined;
+    publisherStreamCreated: import("react-native").EmitterSubscription | undefined;
+    publisherStreamDestroyed: import("react-native").EmitterSubscription | undefined;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
     streamCreatedHandler: (stream: any) => void;
     streamDestroyedHandler: (stream: any) => void;
-    getRtcStatsReport(streamId: any): void;
+    publisherStreamCreatedHandler: (stream: any) => void;
+    publisherStreamDestroyedHandler: (stream: any) => void;
+    getRtcStatsReport(): void;
     render(): any;
 }
 declare namespace OTSubscriber {
@@ -35,5 +41,5 @@ declare namespace OTSubscriber {
     export { OTContext as contextType };
 }
 export default OTSubscriber;
-import { Component } from 'react';
+import React from 'react';
 import OTContext from './contexts/OTContext';

package/src/video/OTSubscriber.js

@@ -19,6 +19,8 @@ export default class OTSubscriber extends Component {
       streamDestroyed: Platform.OS === 'android' ? 'session:onStreamDropped' : 'session:streamDestroyed',
       streamCreated: Platform.OS === 'android' ? 'session:onStreamReceived' : 'session:streamCreated',
       captionReceived: Platform.OS === 'android' ? 'session:onCaptionText' : 'subscriber:subscriberCaptionReceived:',
+      publisherStreamCreated: 'publisherStreamCreated',
+      publisherStreamDestroyed: 'publisherStreamDestroyed'
     };
     this.componentEventsArray = Object.values(this.componentEvents);
     this.otrnEventHandler = getOtrnErrorEventHandler(this.props.eventHandlers);
@@ -36,6 +38,14 @@ export default class OTSubscriber extends Component {
       OT.setJSComponentEvents(this.componentEventsArray);
       setNativeEvents(subscriberEvents);
     }
+    this.publisherStreamCreated = nativeEvents.addListener(
+      'publisherStreamCreated',
+      stream => this.publisherStreamCreatedHandler(stream)
+    );
+    this.publisherStreamDestroyed = nativeEvents.addListener(
+      'publisherStreamDestroyed',
+      stream => this.publisherStreamDestroyedHandler(stream)
+    );
   }
   componentDidUpdate() {
     const { streamProperties } = this.props;
@@ -67,6 +77,8 @@ export default class OTSubscriber extends Component {
   componentWillUnmount() {
     this.streamCreated.remove();
     this.streamDestroyed.remove();
+    this.publisherStreamCreated.remove();
+    this.publisherStreamDestroyed.remove();
     OT.removeJSComponentEvents(this.componentEventsArray);
     const events = sanitizeSubscriberEvents(this.props.eventHandlers);
     removeNativeEvents(events);
@@ -78,7 +90,7 @@ export default class OTSubscriber extends Component {
     const subscriberProperties = streamProperties[stream.streamId] ?
       sanitizeProperties(streamProperties[stream.streamId]) :
       sanitizeProperties(properties);
-      // Subscribe to streams. If subscribeToSelf is true, subscribe also to his own stream
+    // Subscribe to streams. If subscribeToSelf is true, subscribe also to his own stream
     const sessionInfoConnectionId = sessionInfo && sessionInfo.connection ? sessionInfo.connection.connectionId : null;
     if (subscribeToSelf || (sessionInfoConnectionId !== stream.connectionId)) {
       OT.subscribeToStream(stream.streamId, sessionId, subscriberProperties, (error) => {
@@ -106,8 +118,18 @@ export default class OTSubscriber extends Component {
       }
     });
   }
-  getRtcStatsReport(streamId) {
-    OT.getSubscriberRtcStatsReport(streamId);
+  publisherStreamCreatedHandler = (stream) => {
+    if (this.state.subscribeToSelf) {
+      this.streamCreatedHandler(stream);
+    }
+  }
+  publisherStreamDestroyedHandler = (stream) => {
+    if (this.state.subscribeToSelf) {
+      this.streamDestroyedHandler(stream);
+    }
+  }
+  getRtcStatsReport() {
+    OT.getSubscriberRtcStatsReport();
   }
   render() {
     if (!this.props.children) {

package/src/video/helpers/OTHelper.js

@@ -69,7 +69,7 @@ const logRequest = (body, proxyUrl) => {
   axios({
     url,
     method: 'post',
-    data: JSON.stringify(body),
+    data: body,
   })
     .then(() => {
       // response complete

package/src/video/helpers/OTPublisherHelper.js

@@ -35,6 +35,31 @@ const sanitizeVideoSource = (videoSource = 'camera') => (videoSource === 'camera
 const sanitizeAudioBitrate = (audioBitrate = 40000) =>
   (audioBitrate < 6000 || audioBitrate > 510000 ? 40000 : audioBitrate);
 
+const sanitizeSubscriberAudioFallback = (audioFallback, audioFallbackEnabled, videoSource) => {
+  if (typeof audioFallback === 'undefined') {
+    if (typeof audioFallbackEnabled !== 'undefined') {
+      return !!audioFallbackEnabled;
+    }
+  }
+  if (typeof audioFallback !== 'object') {
+    return !(videoSource === 'screen');
+  }
+  if (typeof audioFallback.subscriber !== 'undefined') {
+    return !!audioFallback.subscriber;
+  }
+  return !(videoSource === 'screen');
+};
+
+const sanitizePublisherAudioFallback = (audioFallback, videoSource) => {
+  if (typeof audioFallback !== 'object') {
+    return !(videoSource === 'screen');
+  }
+  if (typeof audioFallback.publisher !== 'undefined') {
+    return !!audioFallback.publisher;
+  }
+  return !(videoSource === 'screen');
+};
+
 const sanitizeVideoContentHint = (sanitizeVideoContentHint = '') => {
   switch (sanitizeVideoContentHint) {
     case 'motion':
@@ -58,7 +83,8 @@ const sanitizeProperties = (properties) => {
       publishCaptions: false,
       name: '',
       cameraPosition: 'front',
-      audioFallbackEnabled: true,
+      publisherAudioFallback: false,
+      subscriberAudioFallback: true,
       audioBitrate: 40000,
       enableDtx: false,
       frameRate: 30,
@@ -68,6 +94,14 @@ const sanitizeProperties = (properties) => {
       scalableScreenshare: false,
     };
   }
+
+  if (typeof properties.audioFallbackEnabled !== 'undefined') {
+    console.log('audioFallbackEnabled is deprecated -- use audioFallback.');
+    if (properties.audioFallback) {
+      delete properties.audioFallbackEnabled;
+    }
+  }
+
   return {
     videoTrack: sanitizeBooleanProperty(properties.videoTrack),
     audioTrack: sanitizeBooleanProperty(properties.audioTrack),
@@ -76,7 +110,15 @@ const sanitizeProperties = (properties) => {
     publishCaptions: sanitizeBooleanProperty(properties.publishCaptions),
     name: properties.name ? properties.name : '',
     cameraPosition: sanitizeCameraPosition(properties.cameraPosition),
-    audioFallbackEnabled: sanitizeBooleanProperty(properties.audioFallbackEnabled),
+    publisherAudioFallback: sanitizePublisherAudioFallback(
+      properties.audioFallback,
+      properties.videoSource,
+    ),
+    subscriberAudioFallback: sanitizeSubscriberAudioFallback(
+      properties.audioFallback,
+      properties.audioFallbackEnabled,
+      properties.videoSource,
+    ),
     audioBitrate: sanitizeAudioBitrate(properties.audioBitrate),
     enableDtx: sanitizeBooleanProperty(properties.enableDtx ? properties.enableDtx : false),
     frameRate: sanitizeFrameRate(properties.frameRate),
@@ -97,20 +139,28 @@ const sanitizePublisherEvents = (publisherId, events) => {
       streamDestroyed: 'streamDestroyed',
       error: 'didFailWithError',
       audioLevel: 'audioLevelUpdated',
-      audioNetworkStats: 'audioStats',
+      audioNetworkStats: 'audioNetworkStatsUpdated',
       rtcStatsReport: 'rtcStatsReport',
-      videoNetworkStats: 'videoStats',
+      videoNetworkStats: 'videoNetworkStatsUpdated',
       muteForced: 'muteForced',
+      videoDisabled: 'videoDisabled',
+      videoEnabled: 'videoEnabled',
+      videoDisableWarning: 'videoDisableWarning',
+      videoDisableWarningLifted: 'videoDisableWarningLifted',
     },
     android: {
-      streamCreated: 'onStreamCreated',
-      streamDestroyed: 'onStreamDestroyed',
+      streamCreated: 'streamCreated',
+      streamDestroyed: 'streamDestroyed',
       error: 'onError',
       audioLevel: 'onAudioLevelUpdated',
       audioNetworkStats: 'onAudioStats',
       rtcStatsReport: 'onRtcStatsReport',
       videoNetworkStats: 'onVideoStats',
       muteForced: 'onMuteForced',
+      videoDisabled: 'onVideoDisabled',
+      videoEnabled: 'onVideoEnabled',
+      videoDisableWarning: 'onVideoDisableWarning',
+      videoDisableWarningLifted: 'onVideoDisableWarningLifted',
     },
   };
   return reassignEvents('publisher', customEvents, events, publisherId);

package/src/video/helpers/OTSessionHelper.js

@@ -191,6 +191,12 @@ const sanitizeSignalData = (signal) => {
   };
 };
 
+const sanitizeEncryptionSecret = (secret) => {
+  if (typeof secret !== undefined) {
+    return String(secret);
+  }
+};
+
 const sanitizeCredentials = (credentials) => {
   const _credentials = {};
   each(credentials, (value, key) => {
@@ -227,6 +233,7 @@ export {
   sanitizeSessionEvents,
   sanitizeSessionOptions,
   sanitizeSignalData,
+  sanitizeEncryptionSecret,
   sanitizeCredentials,
   getConnectionStatus,
   isConnected

package/src/video/helpers/OTSubscriberHelper.js

@@ -27,7 +27,7 @@ const sanitizeSubscriberEvents = (events) => {
       videoDisableWarning: 'subscriberVideoDisableWarning',
       videoDisableWarningLifted: 'subscriberVideoDisableWarningLifted',
       videoDataReceived: 'subscriberVideoDataReceived',
-      captionReceived: 'subscriberCaptionReceived:',
+      captionReceived: 'subscriberCaptionReceived',
     },
     android: {
       connected: 'onConnected',