@tellescope/video-chat 0.0.14 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/video-chat",
-  "version": "0.0.14",
+  "version": "0.0.18",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -33,17 +33,17 @@
     "@fontsource/roboto": "^4.5.1",
     "@mui/icons-material": "^5.0.1",
     "@mui/material": "^5.0.2",
-    "@tellescope/constants": "^0.0.14",
-    "@tellescope/react-components": "^0.0.14",
-    "@tellescope/sdk": "^0.0.14",
-    "@tellescope/types-client": "^0.0.14",
-    "@tellescope/types-models": "^0.0.14",
-    "@tellescope/types-utilities": "^0.0.14",
-    "@tellescope/utilities": "^0.0.14",
+    "@tellescope/constants": "^0.0.18",
+    "@tellescope/react-components": "^0.0.18",
+    "@tellescope/sdk": "^0.0.18",
+    "@tellescope/types-client": "^0.0.18",
+    "@tellescope/types-models": "^0.0.18",
+    "@tellescope/types-utilities": "^0.0.18",
+    "@tellescope/utilities": "^0.0.18",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "amazon-chime-sdk-component-library-react": "^2.12.0",
-    "amazon-chime-sdk-js": "^2.23.0",
+    "amazon-chime-sdk-js": "^2.24.0",
     "eslint": "^7.32.0",
     "eslint-plugin-react": "^7.26.1",
     "nodemon": "^2.0.13",
@@ -54,7 +54,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "b57352502a35237c417fa4d5f571f0bb0aa07be2",
+  "gitHead": "8019bedb3e6f90e2d26ee71ee989bd05fc1b7ee6",
   "publishConfig": {
     "access": "public"
   }

package/src/controls.tsx

@@ -0,0 +1,86 @@
+// components that work with web or native
+import React from "react"
+
+import { 
+  VideoIcon,
+  VideoOffIcon,
+  MicrophoneIcon,
+  MicrophoneOffIcon,
+  CallEndIcon,
+
+  Paper,
+
+  Styled,
+} from "@tellescope/react-components/lib/esm/mui"
+import { LabeledIconButton } from "@tellescope/react-components/lib/esm/controls"
+import { Flex } from "@tellescope/react-components/lib/esm/layout"
+import {
+  CurrentCallContext,
+  useStartVideoCall,
+} from "./video"
+
+const DEFAULT_BUTTON_SIZE = 30
+interface ButtonProps {
+  size?: number,
+}
+export const VideoToggle = ({ size=DEFAULT_BUTTON_SIZE } : ButtonProps) => {
+  const { toggleVideo, videoIsEnabled } = React.useContext(CurrentCallContext)
+
+  return (
+    <LabeledIconButton size={size} Icon={videoIsEnabled ? VideoIcon : VideoOffIcon} onClick={toggleVideo} 
+      label={videoIsEnabled ? "Turn Camera Off" : "Turn Camera On"}
+    />
+  )
+}
+
+export const MicrophoneToggle = ({ size=DEFAULT_BUTTON_SIZE }: ButtonProps) => {
+  const { microphoneIsEnabled, toggleMicrophone } = React.useContext(CurrentCallContext)
+
+  return (
+    <LabeledIconButton size={size} Icon={microphoneIsEnabled ? MicrophoneIcon : MicrophoneOffIcon} onClick={toggleMicrophone} 
+      label={microphoneIsEnabled ? "Turn Microphone Off" : "Turn Microphone On"}
+    />
+  )
+}
+
+// ends meeting if host, otherwise leaves meeting
+export const EndMeeting = ({ size=DEFAULT_BUTTON_SIZE }: ButtonProps) => {
+  const { endMeeting } = useStartVideoCall()
+
+  return (
+    <LabeledIconButton size={size} Icon={CallEndIcon} onClick={endMeeting} label="End Meeting"/>
+  )
+}
+
+interface LeaveMeetingProps {
+  onLeave?: () => void,
+}
+export const LeaveMeeting = ({ onLeave, size=DEFAULT_BUTTON_SIZE } : LeaveMeetingProps & ButtonProps) => (
+  <LabeledIconButton size={size} Icon={CallEndIcon} onClick={onLeave} label="Leave Meeting"/>
+)
+
+interface ControlbarProps {
+  spacing?: number,
+  size?: number,
+
+}
+export const ControlBar = ({ onLeave, style, spacing=15, size } : ControlbarProps & LeaveMeetingProps & Styled) => {
+  const { isHost } = React.useContext(CurrentCallContext)
+  const itemStyle = { marginLeft: spacing, marginRight: spacing }
+
+  return (
+    <Flex flex={1} alignItems="center" justifyContent="center" style={style}>
+      <Paper elevation={5} style={{ display: 'flex', flexDirection: 'row', padding: spacing }}>
+        <Flex style={itemStyle}>
+          <VideoToggle size={size}/>
+        </Flex>
+        <Flex style={itemStyle}>
+          <MicrophoneToggle size={size}/>
+        </Flex>
+        <Flex style={itemStyle}>
+          {isHost ? <EndMeeting size={size}/> : <LeaveMeeting size={size} onLeave={onLeave}/>}
+        </Flex>
+      </Paper>
+    </Flex>
+  )
+}

package/src/index.native.ts

@@ -1 +1,2 @@
-export * from "./video" 
+export * from "./video" 
+export * from "./controls" 

package/src/index.ts

@@ -1 +1,2 @@
-export * from "./video";
+export * from "./video";
+export * from "./controls"

package/src/native/RNVideoRenderView.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 import { requireNativeComponent, findNodeHandle, ViewStyle } from 'react-native';
 import { NativeFunction } from './bridge';
 
-export class RNVideoView extends React.Component<{ tileId: string | number, style: ViewStyle }> {
+export class RNVideoView extends React.Component<{ tileId: number, style?: ViewStyle }> {
   componentDidMount() {
     // we need to delay the bind video 
     // Because "componentDidMount" will be called "immediately after the initial rendering occurs"

package/src/video.native.tsx

@@ -7,7 +7,7 @@
  */
 
 import React, { useCallback, useContext, useEffect, useState } from "react"
-import { View, Text, StyleSheet } from "react-native"
+import { View, StyleSheet } from "react-native"
 import {
   AttendeeInfo,
   MeetingInfo,
@@ -16,14 +16,25 @@ import {
   UserIdentity,
 } from '@tellescope/types-utilities'
 import { useSession } from "@tellescope/react-components/lib/esm/authentication"
-import { Button } from "@tellescope/react-components/lib/esm/mui"
+import { Flex } from "@tellescope/react-components/lib/esm/layout"
+import { 
+  Button, 
+  Typography, 
+  convert_CSS_to_RNStyles,
+
+  VideoIcon,
+  VideoOffIcon,
+  MicrophoneIcon,
+  MicrophoneOffIcon,
+} from "@tellescope/react-components/lib/esm/mui.native"
 
 import {
   CurrentCallContext,
   JoinVideoCallReturnType,
   StartVideoCallReturnType,
   VideoProps,
-  AttendeeDisplayInfo
+  AttendeeDisplayInfo,
+  VideoViewProps,
 } from "./video.js"
 
 import {
@@ -33,17 +44,38 @@ import {
 } from "./native/bridge"
 import { RNVideoView } from "./native/RNVideoRenderView"
 
-export const WithVideo = ({ children } : VideoProps ) => {
+export { CurrentCallContext }
+
+interface TileState {
+  isLocal: boolean,
+  isScreenShare: boolean,
+  tileId: number,
+}
+
+export const WithVideo = ({ children } : VideoProps) => {
   const [meeting, setMeeting] = useState(undefined as MeetingInfo | undefined)
+  const [isHost, setIsHost] = useState(false)
 
   const [inMeeting, setInMeeting] = useState(false)
   const [isLoading, setIsLoading] = useState(false)
+  const [muted, setMuted] = useState(false)
   const [videoIsEnabled, setVideoIsEnabled] = useState(false)
-  const [videoTiles, setVideoTiles] = useState([] as string[])
-  const [screenShareTile, setScreenShareTile] = useState('')
+  const [videoTiles, setVideoTiles] = useState([] as number[])
+  const [localTileId, setLocalTileId] = useState(null as number | null)
+  const [screenShareTile, setScreenShareTile] = useState(null as number | null)
   const [attendees, setAttendees] = useState ([] as AttendeeDisplayInfo[])
 
-  const toggleVideo = () => NativeFunction.setCameraOn(!videoIsEnabled)
+  const toggleVideo = async () => {
+    NativeFunction.setCameraOn(!videoIsEnabled)
+    if (videoIsEnabled) {
+      setLocalTileId(null)
+    }
+    setVideoIsEnabled(v => !v)
+  }
+  const toggleMic = async () => {
+    NativeFunction.setMute(!muted)
+    setMuted(m => !m)
+  }
   const emitter = getSDKEventEmitter()
 
   useEffect(() => { 
@@ -52,19 +84,22 @@ export const WithVideo = ({ children } : VideoProps ) => {
       setIsLoading(false)
     });
 
-    const endSubscription = emitter.addListener(MobileSDKEvent.OnMeetingEnd, () => {
-      setInMeeting(true)
+    // called when user clicks Leave Meeting or meeting is ended by host
+    const endSubscription = emitter.addListener(MobileSDKEvent.OnMeetingEnd, a => {
+      setInMeeting(false)
       setIsLoading(false)
     });
 
-    const joinSubscription = emitter.addListener(MobileSDKEvent.OnAttendeesJoin, ({ attendeeId, externalUserId }) => {
+    const joinSubscription = emitter.addListener(MobileSDKEvent.OnAttendeesJoin, (added: { attendeeId: string, externalUserId: string }) => {
+      const { attendeeId, externalUserId } = added
       setAttendees(as => !as.find(a => a.attendeeId === attendeeId) 
         ? [{ attendeeId, externalUserId, muted: false }, ...as] 
         : as
       )
     });
 
-    const leaveSubscription = emitter.addListener(MobileSDKEvent.OnAttendeesLeave, ({ attendeeId }) => {
+    const leaveSubscription = emitter.addListener(MobileSDKEvent.OnAttendeesLeave, (leaving: { attendeeId: string }) => {
+      const { attendeeId } = leaving
       setAttendees(as => as.filter(a => a.attendeeId !== attendeeId))
     });
 
@@ -80,25 +115,27 @@ export const WithVideo = ({ children } : VideoProps ) => {
       setAttendees(as => as.map(a => a.attendeeId === attendeeId ? { ...a, muted: false } : a))
     });
 
-    const addVideoSubscription = emitter.addListener(MobileSDKEvent.OnAddVideoTile, (tileState) => {
+    const addVideoSubscription = emitter.addListener(MobileSDKEvent.OnAddVideoTile, (tileState: TileState) => {
       if (tileState.isScreenShare) {
         setScreenShareTile(tileState.tileId)
         return
       }
-      setVideoTiles(v => [...v, tileState.titleId])
+      if (tileState.isLocal) {
+        setLocalTileId(tileState.tileId)
+      }
+      setVideoTiles(v => [...v, tileState.tileId])
       setVideoIsEnabled(v => tileState.isLocal ? true : v)
     });
 
-    const removeVideoSubscription = emitter.addListener(MobileSDKEvent.OnRemoveVideoTile, (tileState) => {
+    const removeVideoSubscription = emitter.addListener(MobileSDKEvent.OnRemoveVideoTile, (tileState: TileState) => {
       if (tileState.isScreenShare) {
-        setScreenShareTile('')
+        setScreenShareTile(null)
         return
       }
       setVideoTiles(vs => vs.filter(v => v !== tileState.tileId))
       setVideoIsEnabled(v => tileState.isLocal ? false : v)
     });
 
-
     return () => {
       startSubscription.remove();
       endSubscription.remove();
@@ -113,15 +150,46 @@ export const WithVideo = ({ children } : VideoProps ) => {
   }, [emitter]) 
 
   return (
-    <CurrentCallContext.Provider value={{ attendees, videoTiles, meeting, shareScreenId: screenShareTile, setMeeting, videoIsEnabled, toggleVideo }}>
+    <CurrentCallContext.Provider value={{ 
+      isHost, setIsHost,
+      attendees, 
+      localTileId,
+      videoTiles, 
+      meeting, 
+      shareScreenId: screenShareTile, 
+      setMeeting, 
+      videoIsEnabled, 
+      toggleVideo, 
+      microphoneIsEnabled: !muted,
+      toggleMicrophone: toggleMic,
+    }}>
       {children}
     </CurrentCallContext.Provider>
   )
 }
 
+
+export const useRemoteViews = (props={} as { style: React.CSSProperties }) => {
+  const { localTileId, videoTiles } = React.useContext(CurrentCallContext)
+  const nonLocal = videoTiles.filter(v => v !== localTileId)
+
+  return nonLocal.map(tileId => 
+    <RNVideoView key={tileId} style={convert_CSS_to_RNStyles(props.style) ?? styles.video} tileId={tileId} />
+  )
+}
+
+export const SelfView = ({ style } : VideoViewProps) => {
+  const { localTileId } = React.useContext(CurrentCallContext)
+  if (localTileId === null) return null // localTileId may be zero, don't return null on simple falsey check
+  
+  return (
+    <RNVideoView style={convert_CSS_to_RNStyles(style) ?? styles.video} tileId={localTileId}/>
+  )
+}
+
 export const useStartVideoCall = (): StartVideoCallReturnType => {
   const session = useSession()
-  const { meeting, setMeeting, videoIsEnabled, toggleVideo } = React.useContext(CurrentCallContext)
+  const { meeting, setMeeting, setIsHost, videoIsEnabled, toggleVideo } = React.useContext(CurrentCallContext)
 
   const [starting, setStarting] = useState(false)
   const [ending, setEnding] = useState(false)
@@ -137,6 +205,7 @@ export const useStartVideoCall = (): StartVideoCallReturnType => {
       NativeFunction.startMeeting(meeting.Meeting, host.Attendee)
 
       setMeeting(meeting.Meeting)
+      setIsHost(true)
     } catch(err) {
       console.error(err)
     }
@@ -162,7 +231,16 @@ export const useStartVideoCall = (): StartVideoCallReturnType => {
     setMeeting(undefined)
   }
 
-  return { meeting, videoIsEnabled, starting, ending, toggleVideo, createAndStartMeeting, addAttendees, endMeeting }
+  return { 
+    meeting, 
+    videoIsEnabled, 
+    starting, 
+    ending, 
+    toggleVideo, 
+    createAndStartMeeting, 
+    addAttendees, 
+    endMeeting,
+  }
 }
 
 export const useJoinVideoCall = (): JoinVideoCallReturnType => {
@@ -174,66 +252,57 @@ export const useJoinVideoCall = (): JoinVideoCallReturnType => {
 
   return { meeting, videoIsEnabled, toggleVideo, joinMeeting }
 }
-
 export const VideoTileGrid = () => {
   const { 
     // attendees, 
-    videoIsEnabled, 
     videoTiles, 
-    shareScreenId 
+    toggleVideo,
   } = useContext(CurrentCallContext)
 
   return (
-    <View style={[styles.container, { justifyContent: 'flex-start' }]}>
-      <Text style={styles.title}>TITLE</Text>
-      <View style={styles.buttonContainer}>
-        {/* <MuteButton muted={currentMuted} onPress={() => NativeFunction.setMute(!currentMuted) }/>          */}
-        {/* <CameraButton disabled={selfVideoEnabled} onPress={() =>  NativeFunction.setCameraOn(!videoIsEnabled)}/> */}
-        <Button disabled={videoIsEnabled} onPress={() =>  NativeFunction.setCameraOn(!videoIsEnabled)}>
-          Toggle Video
-        </Button>
-        {/* <HangOffButton onPress={() => NativeFunction.stopMeeting()} /> */}
-        <Button onPress={() => NativeFunction.stopMeeting()}> Leave Meeting </Button>
-      </View>
-      <Text style={styles.title}>Video</Text>
-      <View style={styles.videoContainer}>
+    <Flex column justifyContent="space-between" alignItems="center">
+      <Flex style={styles.videoContainer}>
         {
           videoTiles.length > 0 ? videoTiles.map(tileId => 
             <RNVideoView style={styles.video} key={tileId} tileId={tileId} />
-          ) : <Text style={styles.subtitle}>No one is sharing video at this moment</Text>
+          ) : <Typography style={styles.subtitle}>No one is sharing video at this moment</Typography>
         }
-      </View>
+      </Flex>
+
+      {/* 
       {
         !!shareScreenId &&    
         <React.Fragment>
-          <Text style={styles.title}>Screen Share</Text>
+          <Typography style={styles.title}>Screen Share</Typography>
           <View style={styles.videoContainer}>
             <RNVideoView style={styles.screenShare} key={shareScreenId} tileId={shareScreenId} />
           </View>
         </React.Fragment>
-      }
-      <Text style={styles.title}>Attendee</Text>
+      } 
+      */}
+
+      <Flex justifyContent="space-between" style={{ height: '5%' }}>
+        {/* <MuteButton muted={currentMuted} onPress={() => NativeFunction.setMute(!currentMuted) }/>          */}
+        {/* <CameraButton disabled={selfVideoEnabled} onPress={() =>  NativeFunction.setCameraOn(!videoIsEnabled)}/> */}
+        <Button onPress={toggleVideo}>
+          Toggle Video
+        </Button>
+        {/* <HangOffButton onPress={() => NativeFunction.stopMeeting()} /> */}
+        <Button onPress={() => NativeFunction.stopMeeting()}> Leave Meeting </Button>
+      </Flex>
+
       {/* <FlatList
         style={styles.attendeeList}
         data={attendees}
         renderItem={({ item }) => <AttendeeItem attendeeName={attendeeNameMap[item] ? attendeeNameMap[item] : item} muted={this.state.mutedAttendee.includes(item)}/>}
         keyExtractor={(item) => item}
       /> */}
-    </View>
+
+    </Flex>
   );
 }
 
 const styles = StyleSheet.create({
-  container: {
-    justifyContent: 'center',
-    alignItems: 'center',
-    height: '95%',
-    backgroundColor: 'white'
-  },
-  buttonContainer: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-  },
   title: {
     fontSize: 30,
     fontWeight: '700'
@@ -247,6 +316,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-around',
     width: '100%',
+    height: '95%',
     // This is an existing React Native issue:
     // When you create a native android component
     // that use GLSurfaceView (We use this internally), the entire screen will
@@ -254,8 +324,7 @@ const styles = StyleSheet.create({
     overflow: 'hidden'
   },
   video: {
-    width: '45%',
-    margin: '1%',
+    width: '100%',
     aspectRatio: 16 / 9,
   },
   screenShare: {

package/src/video.tsx

@@ -12,14 +12,6 @@ import {
   MeetingInfo,
 } from '@tellescope/types-models'
 
-import {
-  user_display_name,
-} from "@tellescope/utilities"
-
-import {
-  Session,
-  EnduserSession,
-} from "@tellescope/sdk"
 
 import { ThemeProvider } from 'styled-components';
 import {
@@ -31,11 +23,15 @@ import {
   // VideoGrid,
   // VideoTile,
   // PreviewVideo,
-  // RemoteVideo,
+  RemoteVideo,
+  useAttendeeAudioStatus,
+  LocalVideo,
   useLocalVideo,
   useMeetingManager,
   useRosterState,
-  useRemoteVideoTileState
+  useRemoteVideoTileState,
+  VideoTile,
+  useToggleLocalMute,
   // useRemoteVideoTileState,
   // useContentShareControls, // screen sharing
 } from 'amazon-chime-sdk-component-library-react';
@@ -46,8 +42,11 @@ export type AttendeeDisplayInfo =  { attendeeId: string, externalUserId: string
 export const CurrentCallContext = React.createContext({} as {
   meeting: MeetingInfo | undefined, setMeeting: (m: MeetingInfo | undefined) => void,
   videoIsEnabled: boolean, toggleVideo: () => Promise<void>,
-  attendees: AttendeeDisplayInfo[], shareScreenId: string,
-  videoTiles: (number | string)[],
+  microphoneIsEnabled: boolean, toggleMicrophone: () => Promise<void>,
+  attendees: AttendeeDisplayInfo[], shareScreenId: number | null,
+  localTileId: number | null,
+  isHost: boolean, setIsHost: (b: boolean) => void;
+  videoTiles: (number)[],
 })
 export interface VideoProps {
   children?: React.ReactNode,
@@ -55,10 +54,12 @@ export interface VideoProps {
 }
 const WithContext = ({ children } : { children: React.ReactNode }) => {
   const [meeting, setMeeting] = useState(undefined as MeetingInfo | undefined)
-  const { toggleVideo, isVideoEnabled: videoIsEnabled } = useLocalVideo();
+  const [isHost, setIsHost] = useState(false)
+  const { toggleVideo, isVideoEnabled: videoIsEnabled, tileId: localTileId } = useLocalVideo();
   const { roster } = useRosterState()
   const { tileId } = useContentShareState()
   const { tiles } = useRemoteVideoTileState()
+  const { muted, toggleMute } = useToggleLocalMute()
 
   const attendees = [] as AttendeeDisplayInfo[]
   for (const attendeeId in roster) {
@@ -67,7 +68,19 @@ const WithContext = ({ children } : { children: React.ReactNode }) => {
   }
 
   return (
-    <CurrentCallContext.Provider value={{ attendees, videoTiles: tiles, shareScreenId: tileId?.toString() ?? '', meeting, setMeeting, videoIsEnabled, toggleVideo }}>
+    <CurrentCallContext.Provider value={{ 
+      isHost, setIsHost,
+      attendees, 
+      localTileId,
+      videoTiles: tiles, 
+      shareScreenId: tileId, 
+      meeting, 
+      setMeeting, 
+      videoIsEnabled, 
+      toggleVideo, 
+      microphoneIsEnabled: !muted,
+      toggleMicrophone: async () => toggleMute(),
+    }}>
       {children}
     </CurrentCallContext.Provider>
   )
@@ -85,9 +98,9 @@ export const WithVideo = ({ children, theme=darkTheme }: VideoProps) => (
 export const useStartVideoCall = () => {
   const [starting, setStarting] = useState(false)
   const [ending, setEnding] = useState(false)
-  const { meeting, setMeeting, toggleVideo, videoIsEnabled } = React.useContext(CurrentCallContext)
+  const { meeting, setMeeting, toggleVideo, videoIsEnabled, setIsHost } = React.useContext(CurrentCallContext)
 
-  const session = useSession()
+  const session = useSession() // meetings can only be started by users, not endusers (for now)
   const meetingManager = useMeetingManager();
 
   const createAndStartMeeting = async (initialAttendees?: UserIdentity[]) => {
@@ -104,6 +117,7 @@ export const useStartVideoCall = () => {
       }
 
       setMeeting(meeting.Meeting)
+      setIsHost(true)
     } catch(err) {
       console.error(err)
     }
@@ -147,4 +161,19 @@ export const useJoinVideoCall = () => {
 }
 export type JoinVideoCallReturnType = ReturnType<typeof useJoinVideoCall>
 
+export interface VideoViewProps {
+  style?: CSSProperties,
+}
+export const SelfView = ({ style }: VideoViewProps) => <div style={style}><LocalVideo/></div>
+
+export const useRemoteViews = (props={} as VideoViewProps) => {
+  const { localTileId, videoTiles } = React.useContext(CurrentCallContext)
+  const nonLocal = videoTiles.filter(v => v !== localTileId)
+
+  return nonLocal.map(tileId => 
+    <RemoteVideo key={tileId} style={props.style} tileId={tileId} />
+  )
+}
+
+
 export { VideoTileGrid }