@tellescope/video-chat 0.0.15 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/video-chat",
-  "version": "0.0.15",
+  "version": "0.0.19",
   "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.15",
-    "@tellescope/react-components": "^0.0.15",
-    "@tellescope/sdk": "^0.0.15",
-    "@tellescope/types-client": "^0.0.15",
-    "@tellescope/types-models": "^0.0.15",
-    "@tellescope/types-utilities": "^0.0.15",
-    "@tellescope/utilities": "^0.0.15",
+    "@tellescope/constants": "^0.0.19",
+    "@tellescope/react-components": "^0.0.19",
+    "@tellescope/sdk": "^0.0.19",
+    "@tellescope/types-client": "^0.0.19",
+    "@tellescope/types-models": "^0.0.19",
+    "@tellescope/types-utilities": "^0.0.19",
+    "@tellescope/utilities": "^0.0.19",
     "@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": "bafbe70fd6546fdbc894fd408ae071709d3c5b80",
+  "gitHead": "ddee8ca945d3daf7355a9eada1305666e56d7434",
   "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

@@ -17,14 +17,24 @@ import {
 } from '@tellescope/types-utilities'
 import { useSession } from "@tellescope/react-components/lib/esm/authentication"
 import { Flex } from "@tellescope/react-components/lib/esm/layout"
-import { Button, Typography } from "@tellescope/react-components/lib/esm/mui"
+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 {
@@ -34,26 +44,38 @@ import {
 } from "./native/bridge"
 import { RNVideoView } from "./native/RNVideoRenderView"
 
+export { CurrentCallContext }
+
 interface TileState {
   isLocal: boolean,
   isScreenShare: boolean,
   tileId: number,
 }
 
-export const WithVideo = ({ children } : VideoProps ) => {
+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 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 = async () => {
-    console.log('toggling', NativeFunction.setCameraOn(!videoIsEnabled))
+    NativeFunction.setCameraOn(!videoIsEnabled)
+    if (videoIsEnabled) {
+      setLocalTileId(null)
+    }
     setVideoIsEnabled(v => !v)
   }
+  const toggleMic = async () => {
+    NativeFunction.setMute(!muted)
+    setMuted(m => !m)
+  }
   const emitter = getSDKEventEmitter()
 
   useEffect(() => { 
@@ -98,6 +120,9 @@ export const WithVideo = ({ children } : VideoProps ) => {
         setScreenShareTile(tileState.tileId)
         return
       }
+      if (tileState.isLocal) {
+        setLocalTileId(tileState.tileId)
+      }
       setVideoTiles(v => [...v, tileState.tileId])
       setVideoIsEnabled(v => tileState.isLocal ? true : v)
     });
@@ -126,22 +151,45 @@ export const WithVideo = ({ children } : VideoProps ) => {
 
   return (
     <CurrentCallContext.Provider value={{ 
+      isHost, setIsHost,
       attendees, 
+      localTileId,
       videoTiles, 
       meeting, 
       shareScreenId: screenShareTile, 
       setMeeting, 
       videoIsEnabled, 
-      toggleVideo 
+      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)
@@ -157,6 +205,7 @@ export const useStartVideoCall = (): StartVideoCallReturnType => {
       NativeFunction.startMeeting(meeting.Meeting, host.Attendee)
 
       setMeeting(meeting.Meeting)
+      setIsHost(true)
     } catch(err) {
       console.error(err)
     }
@@ -182,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 => {

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,12 +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';
@@ -47,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>,
+  microphoneIsEnabled: boolean, toggleMicrophone: () => Promise<void>,
   attendees: AttendeeDisplayInfo[], shareScreenId: number | null,
-  videoTiles: (number | string)[],
+  localTileId: number | null,
+  isHost: boolean, setIsHost: (b: boolean) => void;
+  videoTiles: (number)[],
 })
 export interface VideoProps {
   children?: React.ReactNode,
@@ -56,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) {
@@ -68,7 +68,19 @@ const WithContext = ({ children } : { children: React.ReactNode }) => {
   }
 
   return (
-    <CurrentCallContext.Provider value={{ attendees, videoTiles: tiles, shareScreenId: tileId, 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>
   )
@@ -86,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[]) => {
@@ -105,6 +117,7 @@ export const useStartVideoCall = () => {
       }
 
       setMeeting(meeting.Meeting)
+      setIsHost(true)
     } catch(err) {
       console.error(err)
     }
@@ -148,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 }