agora-appbuilder-core 4.0.0-api.5 → 4.0.0-api.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (406) hide show
  1. package/package.json +2 -2
  2. package/template/.bundle/config +2 -0
  3. package/template/Gemfile +4 -0
  4. package/template/Gulpfile.js +29 -29
  5. package/template/_eslintrc.js +3 -3
  6. package/template/_gitignore +12 -11
  7. package/template/_package-lock.json +26471 -22749
  8. package/template/_prettierrc.js +2 -2
  9. package/template/agora-rn-uikit/src/Contexts/PropsContext.tsx +30 -10
  10. package/template/agora-rn-uikit/src/Contexts/RtcContext.tsx +19 -0
  11. package/template/agora-rn-uikit/src/Controls/BtnTemplate.tsx +1 -0
  12. package/template/agora-rn-uikit/src/Controls/Icons.ts +45 -0
  13. package/template/agora-rn-uikit/src/Controls/Local/EndCall.tsx +6 -4
  14. package/template/agora-rn-uikit/src/Controls/Local/FullScreen.tsx +3 -1
  15. package/template/agora-rn-uikit/src/Controls/Local/LocalAudioMute.tsx +1 -0
  16. package/template/agora-rn-uikit/src/Controls/Local/LocalVideoMute.tsx +1 -0
  17. package/template/agora-rn-uikit/src/Controls/Local/SwitchCamera.tsx +1 -0
  18. package/template/agora-rn-uikit/src/Controls/Remote/RemoteAudioMute.tsx +1 -0
  19. package/template/agora-rn-uikit/src/Controls/Remote/RemoteSwap.tsx +3 -1
  20. package/template/agora-rn-uikit/src/Controls/Remote/RemoteVideoMute.tsx +1 -0
  21. package/template/agora-rn-uikit/src/Reducer/ActiveSpeaker.ts +30 -0
  22. package/template/agora-rn-uikit/src/Reducer/LocalMuteAudio.ts +3 -1
  23. package/template/agora-rn-uikit/src/Reducer/LocalMuteVideo.ts +3 -1
  24. package/template/agora-rn-uikit/src/Reducer/LocalPermissionState.ts +1 -1
  25. package/template/agora-rn-uikit/src/Reducer/RemoteAudioStateChanged.ts +3 -3
  26. package/template/agora-rn-uikit/src/Reducer/RemoteVideoStateChanged.ts +5 -4
  27. package/template/agora-rn-uikit/src/Reducer/UpdateDualStreamMode.ts +1 -1
  28. package/template/agora-rn-uikit/src/Reducer/UserJoined.ts +8 -5
  29. package/template/agora-rn-uikit/src/Reducer/UserMuteRemoteAudio.ts +1 -1
  30. package/template/agora-rn-uikit/src/Reducer/UserMuteRemoteVideo.ts +1 -1
  31. package/template/agora-rn-uikit/src/Reducer/UserOffline.ts +1 -1
  32. package/template/agora-rn-uikit/src/Reducer/UserPin.ts +18 -1
  33. package/template/agora-rn-uikit/src/Reducer/UserSecondaryPin.ts +23 -0
  34. package/template/agora-rn-uikit/src/Reducer/index.ts +2 -0
  35. package/template/agora-rn-uikit/src/Rtc/Create.tsx +47 -21
  36. package/template/agora-rn-uikit/src/Rtc/Join.tsx +37 -15
  37. package/template/agora-rn-uikit/src/RtcConfigure.tsx +122 -12
  38. package/template/agora-rn-uikit/src/Views/MaxVideoView.native.tsx +32 -4
  39. package/template/agora-rn-uikit/src/Views/MaxVideoView.tsx +21 -2
  40. package/template/agora-rn-uikit/src/Views/MinVideoView.tsx +2 -0
  41. package/template/android/app/build.gradle +59 -156
  42. package/template/android/app/src/debug/AndroidManifest.xml +6 -1
  43. package/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java +7 -4
  44. package/template/android/app/src/main/AndroidManifest.xml +6 -19
  45. package/template/android/app/src/main/assets/fonts/icomoon.ttf +0 -0
  46. package/template/android/app/src/main/java/com/helloworld/MainActivity.java +17 -0
  47. package/template/android/app/src/main/java/com/helloworld/MainApplication.java +19 -36
  48. package/template/android/app/src/release/java/com/helloworld/ReactNativeFlipper.java +20 -0
  49. package/template/android/build.gradle +19 -33
  50. package/template/android/gradle/wrapper/gradle-wrapper.jar +0 -0
  51. package/template/android/gradle/wrapper/gradle-wrapper.properties +3 -2
  52. package/template/android/gradle.properties +18 -4
  53. package/template/android/gradlew +165 -104
  54. package/template/android/gradlew.bat +12 -23
  55. package/template/android/settings.gradle +1 -0
  56. package/template/bridge/rtc/webNg/RtcEngine.ts +131 -16
  57. package/template/bridge/rtc/webNg/index.ts +72 -1
  58. package/template/bridge/rtm/web/index.ts +5 -3
  59. package/template/configTransform.js +16 -1
  60. package/template/customization-api/action-library.ts +0 -8
  61. package/template/customization-api/app-state.ts +11 -2
  62. package/template/customization-api/customEvents.ts +6 -1
  63. package/template/customization-api/index.ts +4 -0
  64. package/template/customization-api/sub-components.ts +6 -3
  65. package/template/customization-api/temp.ts +50 -0
  66. package/template/customization-api/typeDefinition.ts +26 -14
  67. package/template/customization-api/types.ts +26 -0
  68. package/template/customization-api/utils.ts +2 -0
  69. package/template/customization-implementation/index.ts +0 -1
  70. package/template/defaultConfig.js +72 -0
  71. package/template/global.d.ts +13 -1
  72. package/template/index.js +0 -4
  73. package/template/index.web.js +0 -5
  74. package/template/index.wsdk.tsx +1 -19
  75. package/template/ios/.xcode.env +11 -0
  76. package/template/ios/HelloWorld/AppDelegate.h +2 -4
  77. package/template/ios/HelloWorld/AppDelegate.mm +42 -0
  78. package/template/ios/HelloWorld/Info.plist +1 -1
  79. package/template/ios/HelloWorld/main.m +2 -1
  80. package/template/ios/HelloWorld.xcodeproj/project.pbxproj +529 -17
  81. package/template/ios/HelloWorld.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +8 -0
  82. package/template/ios/HelloWorld.xcworkspace/contents.xcworkspacedata +10 -0
  83. package/template/ios/HelloWorld.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +8 -0
  84. package/template/ios/HelloWorldTests/HelloWorldTests.m +14 -13
  85. package/template/ios/HelloWorldTests/Info.plist +2 -2
  86. package/template/ios/Podfile +53 -20
  87. package/template/ios/Podfile.lock +873 -0
  88. package/template/ios/ScreenSharing/Info.plist +15 -0
  89. package/template/ios/ScreenSharing/SampleHandler.h +9 -0
  90. package/template/ios/ScreenSharing/SampleHandler.m +70 -0
  91. package/template/jest.config.js +4 -0
  92. package/template/metro.config.js +7 -32
  93. package/template/package.json +52 -39
  94. package/template/react-native-toast-message/index.d.ts +3 -1
  95. package/template/react-native-toast-message/index.js +1 -0
  96. package/template/react-native-toast-message/src/components/base/index.js +20 -32
  97. package/template/react-native-toast-message/src/components/base/styles.js +18 -21
  98. package/template/react-native-toast-message/src/components/checkbox.js +24 -19
  99. package/template/react-native-toast-message/src/index.js +3 -1
  100. package/template/react-native-toast-message/src/index.sdk.tsx +4 -1
  101. package/template/src/App.tsx +13 -85
  102. package/template/src/AppRoutes.tsx +77 -0
  103. package/template/src/AppWrapper.tsx +38 -33
  104. package/template/src/SDKAppWrapper.tsx +79 -43
  105. package/template/src/app-state/useNoiseSupression.native.tsx +67 -0
  106. package/template/src/app-state/useNoiseSupression.tsx +107 -0
  107. package/template/src/app-state/useVideoQuality.tsx +39 -0
  108. package/template/src/assets/font-styles.css +171 -3
  109. package/template/src/assets/fonts/icomoon.ttf +0 -0
  110. package/template/src/assets/selection.json +1 -1
  111. package/template/src/atoms/ActionMenu.tsx +50 -11
  112. package/template/src/atoms/Avatar.tsx +51 -0
  113. package/template/src/atoms/Card.tsx +21 -8
  114. package/template/src/atoms/Carousel.native.tsx +105 -0
  115. package/template/src/atoms/Carousel.tsx +103 -0
  116. package/template/src/atoms/Checkbox.tsx +98 -0
  117. package/template/src/atoms/CircularProgress.tsx +0 -1
  118. package/template/src/atoms/ClipboardIconButton.tsx +91 -0
  119. package/template/src/atoms/CustomIcon.tsx +45 -0
  120. package/template/src/atoms/DropDownMulti.tsx +349 -0
  121. package/template/src/atoms/Dropdown.tsx +3 -3
  122. package/template/src/atoms/IconButton.tsx +52 -9
  123. package/template/src/atoms/ImageIcon.tsx +6 -3
  124. package/template/src/atoms/InlineNotification.tsx +81 -0
  125. package/template/src/atoms/MeetingLink.tsx +160 -0
  126. package/template/src/atoms/ParticipantsCount.tsx +18 -7
  127. package/template/src/atoms/Popup.tsx +49 -27
  128. package/template/src/atoms/PrimaryButton.tsx +19 -5
  129. package/template/src/atoms/RecordingInfo.tsx +2 -2
  130. package/template/src/atoms/SecondaryButton.tsx +2 -0
  131. package/template/src/atoms/Spacer.tsx +1 -0
  132. package/template/src/atoms/TertiaryButton.tsx +35 -5
  133. package/template/src/atoms/TextInput.tsx +2 -1
  134. package/template/src/atoms/Toolbar.tsx +64 -30
  135. package/template/src/atoms/ToolbarItem.tsx +11 -5
  136. package/template/src/atoms/ToolbarPreset.tsx +13 -2
  137. package/template/src/atoms/Tooltip.tsx +26 -4
  138. package/template/src/auth/AuthProvider.tsx +500 -0
  139. package/template/src/auth/AuthRoute.tsx +94 -0
  140. package/template/src/auth/IDPAuth.electron.tsx +31 -0
  141. package/template/src/auth/IDPAuth.tsx +67 -0
  142. package/template/src/auth/IDPLogoutComponent.tsx +158 -0
  143. package/template/src/auth/UserCancelPopup.tsx +115 -0
  144. package/template/src/auth/config.ts +52 -0
  145. package/template/src/auth/openIDPURL.electron.tsx +39 -0
  146. package/template/src/auth/openIDPURL.native.tsx +51 -0
  147. package/template/src/auth/openIDPURL.tsx +20 -0
  148. package/template/src/auth/useIDPAuth.electron.tsx +65 -0
  149. package/template/src/auth/useIDPAuth.native.tsx +70 -0
  150. package/template/src/auth/useIDPAuth.tsx +63 -0
  151. package/template/src/auth/useTokenAuth.tsx +194 -0
  152. package/template/src/components/Chat.tsx +5 -8
  153. package/template/src/components/ChatContext.ts +4 -0
  154. package/template/src/components/ColorConfigure.tsx +0 -1
  155. package/template/src/components/CommonStyles.ts +9 -2
  156. package/template/src/components/Controls.tsx +659 -52
  157. package/template/src/components/DeviceConfigure.tsx +362 -156
  158. package/template/src/components/DeviceContext.tsx +2 -0
  159. package/template/src/components/EventsConfigure.tsx +713 -109
  160. package/template/src/components/GraphQLProvider.tsx +62 -36
  161. package/template/src/components/GridVideo.tsx +23 -13
  162. package/template/src/components/HostControlView.tsx +11 -14
  163. package/template/src/components/JoinPhrase.tsx +0 -1
  164. package/template/src/components/Leftbar.tsx +4 -3
  165. package/template/src/components/Navbar.tsx +110 -42
  166. package/template/src/components/NavbarMobile.tsx +47 -36
  167. package/template/src/components/Navigation.native.tsx +1 -15
  168. package/template/src/{subComponents/screenshare/ScreenshareButton.native.tsx → components/Navigation.sdk.tsx} +17 -3
  169. package/template/src/components/Navigation.tsx +1 -15
  170. package/template/src/components/ParticipantsView.tsx +56 -48
  171. package/template/src/components/PinnedVideo.tsx +188 -114
  172. package/template/src/components/Precall.native.tsx +169 -67
  173. package/template/src/components/Precall.tsx +237 -71
  174. package/template/src/components/RTMConfigure.tsx +167 -55
  175. package/template/src/components/Rightbar.tsx +4 -3
  176. package/template/src/components/Router.electron.ts +1 -0
  177. package/template/src/components/Router.native.ts +1 -0
  178. package/template/src/components/Router.sdk.ts +1 -0
  179. package/template/src/components/Router.ts +1 -0
  180. package/template/src/components/SdkApiContext.tsx +179 -27
  181. package/template/src/components/SdkMuteToggleListener.tsx +88 -0
  182. package/template/src/components/SessionContext.tsx +0 -1
  183. package/template/src/components/Settings.tsx +25 -3
  184. package/template/src/components/SettingsView.tsx +44 -9
  185. package/template/src/components/Share.tsx +149 -71
  186. package/template/src/components/StorageContext.tsx +19 -5
  187. package/template/src/components/ToastComponent.tsx +3 -0
  188. package/template/src/components/WhiteboardLayout.tsx +291 -0
  189. package/template/src/components/chat-messages/useChatMessages.tsx +420 -207
  190. package/template/src/components/common/Error.tsx +2 -0
  191. package/template/src/components/common/Logo.tsx +2 -2
  192. package/template/src/components/contexts/LiveStreamDataContext.tsx +5 -4
  193. package/template/src/components/contexts/ScreenShareContext.tsx +15 -1
  194. package/template/src/components/contexts/WaitingRoomContext.tsx +50 -0
  195. package/template/src/components/contexts/WhiteboardContext.tsx +54 -54
  196. package/template/src/components/disable-chat/useDisableChat.tsx +32 -0
  197. package/template/src/components/livestream/LiveStreamContext.tsx +262 -177
  198. package/template/src/components/livestream/Types.ts +34 -18
  199. package/template/src/components/livestream/views/LiveStreamAttendeeLandingTile.tsx +295 -0
  200. package/template/src/components/livestream/views/LiveStreamControls.tsx +2 -4
  201. package/template/src/components/meeting-info-invite/MeetingInfo.tsx +82 -0
  202. package/template/src/components/meeting-info-invite/MeetingInfoCardHeader.tsx +86 -0
  203. package/template/src/components/meeting-info-invite/MeetingInfoGridTile.tsx +218 -0
  204. package/template/src/components/meeting-info-invite/MeetingInfoLinks.tsx +122 -0
  205. package/template/src/components/participants/AllAudienceParticipants.tsx +4 -5
  206. package/template/src/components/participants/AllHostParticipants.tsx +5 -6
  207. package/template/src/components/participants/Participant.tsx +40 -9
  208. package/template/src/components/participants/ParticipantSectionTitle.tsx +5 -2
  209. package/template/src/components/participants/ScreenshareParticipants.tsx +15 -17
  210. package/template/src/components/participants/UserActionMenuOptions.tsx +157 -49
  211. package/template/src/components/participants/WaitingRoomParticipants.tsx +74 -0
  212. package/template/src/components/popups/InvitePopup.tsx +110 -45
  213. package/template/src/components/popups/StartScreenSharePopup.native.tsx +182 -0
  214. package/template/src/components/popups/StartScreenSharePopup.tsx +6 -0
  215. package/template/src/components/popups/StopRecordingPopup.tsx +11 -5
  216. package/template/src/components/popups/StopScreenSharePopup.native.tsx +135 -0
  217. package/template/src/components/popups/StopScreenSharePopup.tsx +6 -0
  218. package/template/src/components/popups/WhiteboardClearAllPopup.tsx +123 -0
  219. package/template/src/components/precall/LocalMute.tsx +69 -45
  220. package/template/src/components/precall/PermissionHelper.tsx +52 -24
  221. package/template/src/components/precall/PreCallSettings.tsx +1 -0
  222. package/template/src/components/precall/VideoFallback.tsx +173 -0
  223. package/template/src/components/precall/VideoPreview.native.tsx +16 -50
  224. package/template/src/components/precall/VideoPreview.tsx +27 -162
  225. package/template/src/components/precall/index.tsx +2 -0
  226. package/template/src/components/precall/joinCallBtn.native.tsx +10 -3
  227. package/template/src/components/precall/joinCallBtn.tsx +11 -2
  228. package/template/src/components/precall/joinWaitingRoomBtn.native.tsx +210 -0
  229. package/template/src/components/precall/joinWaitingRoomBtn.tsx +250 -0
  230. package/template/src/components/precall/meetingTitle.tsx +35 -9
  231. package/template/src/components/precall/selectDevice.tsx +5 -5
  232. package/template/src/components/precall/textInput.tsx +16 -18
  233. package/template/src/components/precall/usePreCall.tsx +14 -4
  234. package/template/src/components/room-info/useRoomInfo.tsx +34 -0
  235. package/template/src/components/useShareLink.tsx +24 -59
  236. package/template/src/components/useUserPreference.tsx +73 -10
  237. package/template/src/components/useVideoCall.tsx +76 -3
  238. package/template/src/components/virtual-background/VBButton.tsx +64 -0
  239. package/template/src/components/virtual-background/VBCard.native.tsx +282 -0
  240. package/template/src/components/virtual-background/VBCard.tsx +272 -0
  241. package/template/src/components/virtual-background/VBPanel.tsx +279 -0
  242. package/template/src/components/virtual-background/VButils.native.ts +37 -0
  243. package/template/src/components/virtual-background/VButils.ts +104 -0
  244. package/template/src/components/virtual-background/VideoPreview.native.tsx +43 -0
  245. package/template/src/components/virtual-background/VideoPreview.tsx +106 -0
  246. package/template/src/components/virtual-background/imagePaths.ts +87 -0
  247. package/template/src/components/virtual-background/images/beachImageBase64.ts +1 -0
  248. package/template/src/components/virtual-background/images/bedroomImageBase64.ts +1 -0
  249. package/template/src/components/virtual-background/images/bookImageBase64.ts +1 -0
  250. package/template/src/components/virtual-background/images/earthImageBase64.ts +1 -0
  251. package/template/src/components/virtual-background/images/index.ts +37 -0
  252. package/template/src/components/virtual-background/images/lampImageBase64.ts +1 -0
  253. package/template/src/components/virtual-background/images/mountainsImageBase64.ts +1 -0
  254. package/template/src/components/virtual-background/images/office1ImageBase64.ts +1 -0
  255. package/template/src/components/virtual-background/images/officeImageBase64.ts +1 -0
  256. package/template/src/components/virtual-background/images/plantsImageBase64.ts +1 -0
  257. package/template/src/components/virtual-background/images/skyImageBase64.ts +1 -0
  258. package/template/src/components/virtual-background/images/wallImageBase64.ts +1 -0
  259. package/template/src/components/virtual-background/useVB.native.tsx +188 -0
  260. package/template/src/components/virtual-background/useVB.tsx +267 -0
  261. package/template/src/components/whiteboard/StrokeWidthTool.tsx +137 -0
  262. package/template/src/components/whiteboard/WhiteboardButton.tsx +93 -0
  263. package/template/src/components/whiteboard/WhiteboardCanvas.tsx +99 -0
  264. package/template/src/components/whiteboard/WhiteboardConfigure.native.tsx +137 -0
  265. package/template/src/components/whiteboard/WhiteboardConfigure.tsx +441 -0
  266. package/template/src/components/whiteboard/WhiteboardCursor.tsx +152 -0
  267. package/template/src/components/whiteboard/WhiteboardToolBox.tsx +1246 -0
  268. package/template/src/components/whiteboard/WhiteboardView.native.tsx +109 -0
  269. package/template/src/components/whiteboard/WhiteboardView.tsx +81 -0
  270. package/template/src/components/whiteboard/WhiteboardWidget.tsx +674 -0
  271. package/template/src/components/whiteboard/WhiteboardWrapper.tsx +38 -0
  272. package/template/src/language/default-labels/commonLabels.ts +51 -14
  273. package/template/src/language/default-labels/createScreenLabels.ts +97 -17
  274. package/template/src/language/default-labels/joinScreenLabels.ts +45 -6
  275. package/template/src/language/default-labels/precallScreenLabels.ts +145 -23
  276. package/template/src/language/default-labels/shareLinkScreenLabels.ts +85 -37
  277. package/template/src/language/default-labels/videoCallScreenLabels.ts +1137 -158
  278. package/template/src/pages/Create.tsx +125 -80
  279. package/template/src/pages/Join.tsx +76 -34
  280. package/template/src/pages/Login.tsx +26 -0
  281. package/template/src/pages/VideoCall.tsx +229 -114
  282. package/template/src/pages/video-call/ActionSheet.native.tsx +54 -7
  283. package/template/src/pages/video-call/ActionSheet.tsx +55 -16
  284. package/template/src/pages/video-call/ActionSheetContent.tsx +366 -291
  285. package/template/src/pages/video-call/ActionSheetHandle.tsx +7 -1
  286. package/template/src/pages/video-call/DefaultLayouts.ts +11 -5
  287. package/template/src/pages/video-call/NameWithMicIcon.tsx +17 -9
  288. package/template/src/pages/video-call/PinchableView.tsx +119 -0
  289. package/template/src/pages/video-call/RenderComponent.tsx +12 -3
  290. package/template/src/pages/video-call/SidePanelHeader.tsx +208 -6
  291. package/template/src/pages/video-call/VideoCallMobileView.tsx +140 -106
  292. package/template/src/pages/video-call/VideoCallScreen.native.tsx +3 -2
  293. package/template/src/pages/video-call/VideoCallScreen.tsx +113 -66
  294. package/template/src/pages/video-call/VideoComponent.tsx +53 -5
  295. package/template/src/pages/video-call/VideoRenderer.tsx +309 -52
  296. package/template/src/pages/video-call/VisibilitySensor.tsx +104 -0
  297. package/template/src/pages/video-call/ZoomableWrapper.native.tsx +34 -0
  298. package/template/src/pages/video-call/ZoomableWrapper.tsx +5 -0
  299. package/template/src/pages/video-call/index.ts +2 -0
  300. package/template/src/rtm/RTMEngine.ts +9 -4
  301. package/template/src/rtm-events/constants.ts +20 -0
  302. package/template/src/rtm-events-api/Events.ts +2 -0
  303. package/template/src/rtm-events-api/LocalEvents.ts +8 -0
  304. package/template/src/selection.json +1 -0
  305. package/template/src/subComponents/ChatBubble.tsx +81 -64
  306. package/template/src/subComponents/ChatContainer.tsx +20 -13
  307. package/template/src/subComponents/ChatInput.ios.tsx +11 -2
  308. package/template/src/subComponents/ChatInput.tsx +12 -3
  309. package/template/src/subComponents/Checkbox.native.tsx +46 -46
  310. package/template/src/subComponents/Checkbox.tsx +7 -6
  311. package/template/src/subComponents/CopyJoinInfo.tsx +26 -11
  312. package/template/src/subComponents/EndcallPopup.tsx +83 -12
  313. package/template/src/subComponents/LanguageSelector.tsx +34 -30
  314. package/template/src/subComponents/LayoutIconButton.tsx +30 -8
  315. package/template/src/subComponents/LayoutIconDropdown.tsx +19 -3
  316. package/template/src/subComponents/Loading.tsx +60 -0
  317. package/template/src/subComponents/LocalAudioMute.tsx +106 -30
  318. package/template/src/subComponents/LocalEndCall.tsx +91 -15
  319. package/template/src/subComponents/LocalSwitchCamera.tsx +50 -11
  320. package/template/src/subComponents/LocalVideoMute.tsx +126 -32
  321. package/template/src/subComponents/LogoutButton.tsx +1 -1
  322. package/template/src/subComponents/NetworkQualityPill.tsx +14 -31
  323. package/template/src/subComponents/Recording.tsx +23 -6
  324. package/template/src/subComponents/RemoteAudioMute.tsx +3 -3
  325. package/template/src/subComponents/RemoteMutePopup.tsx +55 -14
  326. package/template/src/subComponents/RemoteVideoMute.tsx +3 -3
  327. package/template/src/subComponents/RemoveMeetingPopup.tsx +19 -6
  328. package/template/src/subComponents/RemoveScreensharePopup.tsx +20 -5
  329. package/template/src/subComponents/ScreenShareNotice.tsx +11 -6
  330. package/template/src/subComponents/SelectDevice.tsx +98 -32
  331. package/template/src/subComponents/SidePanelEnum.tsx +2 -0
  332. package/template/src/subComponents/SidePanelHeader.tsx +97 -63
  333. package/template/src/subComponents/ToastConfig.tsx +70 -61
  334. package/template/src/subComponents/caption/Caption.tsx +130 -0
  335. package/template/src/subComponents/caption/CaptionContainer.tsx +302 -0
  336. package/template/src/subComponents/caption/CaptionIcon.tsx +111 -0
  337. package/template/src/subComponents/caption/CaptionText.tsx +182 -0
  338. package/template/src/subComponents/caption/DownloadTranscriptBtn.tsx +65 -0
  339. package/template/src/subComponents/caption/LanguageSelectorPopup.tsx +192 -0
  340. package/template/src/subComponents/caption/Transcript.tsx +449 -0
  341. package/template/src/subComponents/caption/TranscriptIcon.tsx +123 -0
  342. package/template/src/subComponents/caption/TranscriptText.tsx +98 -0
  343. package/template/src/subComponents/caption/index.ts +3 -0
  344. package/template/src/subComponents/caption/proto/ptoto.js +91 -0
  345. package/template/src/subComponents/caption/proto/test.proto +23 -0
  346. package/template/src/subComponents/caption/useCaption.tsx +123 -0
  347. package/template/src/subComponents/caption/useCaptionWidth.ts +27 -0
  348. package/template/src/subComponents/caption/useSTTAPI.tsx +179 -0
  349. package/template/src/subComponents/caption/useStreamMessageUtils.native.ts +211 -0
  350. package/template/src/subComponents/caption/useStreamMessageUtils.ts +235 -0
  351. package/template/src/subComponents/caption/useTranscriptDownload.native.ts +68 -0
  352. package/template/src/subComponents/caption/useTranscriptDownload.ts +52 -0
  353. package/template/src/subComponents/caption/utils.ts +125 -0
  354. package/template/src/subComponents/chat/ChatParticipants.tsx +53 -17
  355. package/template/src/subComponents/livestream/CurrentLiveStreamRequestsView.tsx +11 -13
  356. package/template/src/subComponents/livestream/controls/LocalRaiseHand.tsx +33 -9
  357. package/template/src/subComponents/livestream/controls/RemoteLiveStreamApprovedRequestRecall.tsx +1 -0
  358. package/template/src/subComponents/livestream/controls/RemoteLiveStreamRequestApprove.tsx +10 -6
  359. package/template/src/subComponents/livestream/controls/RemoteLiveStreamRequestReject.tsx +28 -19
  360. package/template/src/subComponents/recording/useRecording.tsx +49 -20
  361. package/template/src/subComponents/recording/useRecordingLayoutQuery.tsx +0 -1
  362. package/template/src/subComponents/screenshare/ScreenshareButton.tsx +29 -10
  363. package/template/src/subComponents/screenshare/ScreenshareConfigure.native.tsx +270 -66
  364. package/template/src/subComponents/screenshare/ScreenshareConfigure.tsx +182 -95
  365. package/template/src/subComponents/screenshare/useScreenshare.tsx +2 -0
  366. package/template/src/subComponents/waiting-rooms/WaitingRoomControls.tsx +85 -0
  367. package/template/src/subComponents/waiting-rooms/useWaitingRoomAPI.ts +75 -0
  368. package/template/src/theme/index.ts +9 -0
  369. package/template/src/utils/SdkEvents.ts +14 -0
  370. package/template/src/utils/SdkMethodEvents.ts +23 -3
  371. package/template/src/utils/axiomLogger.ts +117 -0
  372. package/template/src/utils/book.jpg +0 -0
  373. package/template/src/utils/common.tsx +118 -6
  374. package/template/src/utils/endCallEveryOne.ts +7 -0
  375. package/template/src/utils/getCustomRoute.ts +7 -0
  376. package/template/src/utils/index.tsx +23 -0
  377. package/template/src/utils/useActionSheet.tsx +50 -0
  378. package/template/src/utils/useActiveSpeaker.ts +3 -7
  379. package/template/src/utils/useAppState.ts +17 -0
  380. package/template/src/utils/useAsyncEffect.ts +138 -0
  381. package/template/src/utils/useCreateRoom.ts +8 -12
  382. package/template/src/utils/useDisableButton.tsx +37 -0
  383. package/template/src/utils/useFindActiveSpeaker.native.ts +4 -0
  384. package/template/src/utils/useFindActiveSpeaker.ts +335 -0
  385. package/template/src/utils/useIsLocalUserSpeaking.native.ts +4 -0
  386. package/template/src/utils/useIsLocalUserSpeaking.ts +98 -0
  387. package/template/src/utils/useJoinRoom.ts +97 -36
  388. package/template/src/utils/useMuteToggleLocal.ts +114 -96
  389. package/template/src/utils/useString.ts +13 -3
  390. package/template/static.d.ts +42 -0
  391. package/template/tsconfig_rsdk_index.json +3 -3
  392. package/template/tsconfig_wsdk_index.json +1 -1
  393. package/template/web/index.html +20 -0
  394. package/template/webpack.commons.js +21 -10
  395. package/template/webpack.web.config.js +7 -3
  396. package/template/_buckconfig +0 -6
  397. package/template/_gitattributes +0 -1
  398. package/template/android/app/_BUCK +0 -55
  399. package/template/android/app/build_defs.bzl +0 -19
  400. package/template/ios/HelloWorld/AppDelegate.m +0 -74
  401. package/template/src/components/OAuth.electron.tsx +0 -41
  402. package/template/src/components/OAuth.native.tsx +0 -55
  403. package/template/src/components/OAuth.tsx +0 -30
  404. package/template/src/components/OAuthConfig.ts +0 -77
  405. package/template/src/components/Settings.native.tsx +0 -21
  406. package/template/src/components/StoreToken.tsx +0 -39
@@ -0,0 +1,335 @@
1
+ import {
2
+ useLocalUid,
3
+ useLocalUserInfo,
4
+ useContent,
5
+ useRtc,
6
+ UidType,
7
+ } from 'customization-api';
8
+ import {useContext, useEffect, useRef} from 'react';
9
+ import events, {PersistanceLevel} from '../rtm-events-api';
10
+ import useIsLocalUserSpeaking from './useIsLocalUserSpeaking';
11
+ import {filterObject} from '../utils/index';
12
+ import ChatContext from '../components/ChatContext';
13
+ import LocalEventEmitter, {
14
+ LocalEventsEnum,
15
+ } from '../rtm-events-api/LocalEvents';
16
+
17
+ enum volumeEnum {
18
+ IS_SPEAKING = 'IS_SPEAKING',
19
+ SPEAKING_VOLUME = 'SPEAKING_VOLUME',
20
+ NON_SPEAKING_VOLUME = 'NON_SPEAKING_VOLUME',
21
+ }
22
+ const useFindActiveSpeaker = () => {
23
+ const localUid = useLocalUid();
24
+ const isLocalUserSpeaking = useIsLocalUserSpeaking();
25
+ const {hasUserJoinedRTM} = useContext(ChatContext);
26
+ const {RtcEngineUnsafe} = useRtc();
27
+ const {defaultContent} = useContent();
28
+ const {uid} = useLocalUserInfo();
29
+ const defaultContentRef = useRef(defaultContent);
30
+ const maxSpeakingVolumeRef = useRef(0);
31
+ const minNonSpeakingVolumeRef = useRef(100);
32
+ const usersVolume = useRef({});
33
+ const activeSpeakerUid = useRef(undefined);
34
+
35
+ const emitActiveSpeaker = (uid: UidType) => {
36
+ if (uid !== activeSpeakerUid.current) {
37
+ activeSpeakerUid.current = uid;
38
+ LocalEventEmitter.emit(LocalEventsEnum.ACTIVE_SPEAKER, uid);
39
+ }
40
+ };
41
+
42
+ useEffect(() => {
43
+ defaultContentRef.current = defaultContent;
44
+ }, [defaultContent]);
45
+
46
+ const normalize = (value, min, max) => {
47
+ return (value - min) / (max - min);
48
+ };
49
+
50
+ const log: (arg1: string, ...args: any[]) => void = (arg1, ...args) => {
51
+ console.log('[ActiveSpeaker]' + arg1, ...args);
52
+ };
53
+
54
+ useEffect(() => {
55
+ if ($config.ACTIVE_SPEAKER) {
56
+ isLocalUserSpeaking
57
+ ? log(' %cLocal user started speaking', 'color:green')
58
+ : log(' %cLocal user stopped speaking', 'color:red');
59
+
60
+ //sending local user speaking and non speaking volume to remote users
61
+ let volume = 0;
62
+ //@ts-ignore
63
+ const volumes = RtcEngineUnsafe?.getUsersVolumeLevel();
64
+
65
+ const localUserData = volumes.find(i => i.uid == uid);
66
+ if (localUserData && localUserData.level) {
67
+ volume = Math.round(localUserData.level * 100) / 100;
68
+ }
69
+ if (volume) {
70
+ if (isLocalUserSpeaking && volume > maxSpeakingVolumeRef.current) {
71
+ //for remote users
72
+ maxSpeakingVolumeRef.current = volume;
73
+ hasUserJoinedRTM &&
74
+ events.send(
75
+ volumeEnum.SPEAKING_VOLUME,
76
+ volume.toString(),
77
+ PersistanceLevel.Sender,
78
+ );
79
+ //for local user
80
+ speakingVolumeEventCallBack({
81
+ payload: volume.toString(),
82
+ sender: uid,
83
+ });
84
+ } else if (
85
+ !isLocalUserSpeaking &&
86
+ volume < minNonSpeakingVolumeRef.current
87
+ ) {
88
+ //for remote users
89
+ minNonSpeakingVolumeRef.current = volume;
90
+ hasUserJoinedRTM &&
91
+ events.send(
92
+ volumeEnum.NON_SPEAKING_VOLUME,
93
+ volume.toString(),
94
+ PersistanceLevel.Sender,
95
+ );
96
+ //for local user
97
+ nonSpeakingVolumeEventCallback({
98
+ payload: volume.toString(),
99
+ sender: uid,
100
+ });
101
+ }
102
+ }
103
+
104
+ //inform local user is speaking
105
+ if (isLocalUserSpeaking) {
106
+ //inform remote users
107
+ hasUserJoinedRTM &&
108
+ events.send(volumeEnum.IS_SPEAKING, 'true', PersistanceLevel.Sender);
109
+ //for local usage
110
+ isSpeakingEventCallback({payload: 'true', sender: uid});
111
+ } else {
112
+ //inform remote users
113
+ hasUserJoinedRTM &&
114
+ events.send(volumeEnum.IS_SPEAKING, 'false', PersistanceLevel.Sender);
115
+ //for local usage
116
+ isSpeakingEventCallback({payload: 'false', sender: uid});
117
+ }
118
+ }
119
+ }, [isLocalUserSpeaking, hasUserJoinedRTM]);
120
+
121
+ //findout who is active speaker using usersVolume(speaking and non speaking volume) and current user volume
122
+ const findActiveSpeaker = () => {
123
+ //filter the user id who are all speaking
124
+ const speakingUids = Object.keys(
125
+ //@ts-ignore
126
+ filterObject(usersVolume.current, ([k, v]) => {
127
+ //@ts-ignore
128
+ return v?.isSpeaking && defaultContentRef.current[k]?.audio;
129
+ }),
130
+ );
131
+ if (!speakingUids || speakingUids?.length == 0) {
132
+ log(' %cFinal No Active speaker', 'color:red');
133
+ emitActiveSpeaker(0);
134
+ } else {
135
+ if (speakingUids?.length === 1) {
136
+ log(
137
+ ' %cFinal Active Speaker - Only one user is speaking',
138
+ 'color:green',
139
+ defaultContentRef.current[speakingUids[0]]?.name,
140
+ );
141
+ emitActiveSpeaker(parseInt(speakingUids[0]));
142
+ } else {
143
+ //for logging
144
+ let speakerNames = '';
145
+
146
+ //get current volume levels for users
147
+ //@ts-ignore
148
+ const currentUsersVolume = RtcEngineUnsafe?.getUsersVolumeLevel();
149
+
150
+ const normalizedValues = {};
151
+ speakingUids?.forEach(speakerUid => {
152
+ //for logging
153
+ speakerNames =
154
+ speakerNames + ' ' + defaultContentRef.current[speakerUid]?.name;
155
+
156
+ const uuid = parseInt(speakerUid);
157
+ const data = currentUsersVolume?.find(i => i.uid === uuid);
158
+ const returnVal = normalize(
159
+ data?.level || usersVolume.current[uuid]?.speakingVolume, //current level
160
+ usersVolume.current[uuid]?.nonSpeakingVolume || 0,
161
+ usersVolume.current[uuid]?.speakingVolume || 100,
162
+ );
163
+ normalizedValues[uuid] = returnVal;
164
+ });
165
+
166
+ log(
167
+ ' %cFinal Multiple users are speaking',
168
+ 'color:green',
169
+ speakerNames,
170
+ );
171
+
172
+ const sorted = Object.keys(normalizedValues).sort((a, b) => {
173
+ return normalizedValues[b] - normalizedValues[a];
174
+ });
175
+
176
+ log(
177
+ ' %cFinal Active Speaker',
178
+ 'color:green',
179
+ defaultContentRef.current[sorted[0]]?.name,
180
+ );
181
+
182
+ emitActiveSpeaker(parseInt(sorted[0]));
183
+
184
+ //for logging purpose
185
+ let obj = {};
186
+ sorted.map(i => {
187
+ let id = parseInt(i);
188
+ const curtdata = currentUsersVolume.find(i => i.uid === id);
189
+ const cl =
190
+ curtdata && curtdata?.level
191
+ ? Math.round(curtdata?.level * 100) / 100
192
+ : 0;
193
+ obj[id] = {
194
+ name: defaultContentRef.current[id]?.name,
195
+ normalizedVolume: normalizedValues[id],
196
+ currentVolume: cl || usersVolume.current[id]?.speakingVolume,
197
+ minNonSpeakingVolume: usersVolume.current[id]?.nonSpeakingVolume,
198
+ speakingVolume: usersVolume.current[id]?.speakingVolume,
199
+ isSpeaking: usersVolume.current[id]?.isSpeaking,
200
+ };
201
+ });
202
+ log(' %cFinal Active speaker data', 'color:green', JSON.stringify(obj));
203
+ //for logging purpose
204
+ }
205
+ }
206
+
207
+ /*
208
+ //get current volume levels for users
209
+ //@ts-ignore
210
+ const currentUsersVolume = RtcEngineUnsafe?.getUsersVolumeLevel();
211
+
212
+ const normalizedValues = {};
213
+
214
+ currentUsersVolume.forEach((i) => {
215
+ //validation
216
+ if (
217
+ defaultContentRef.current[i.uid]?.audio &&
218
+ usersVolume.current[i.uid]?.isSpeaking
219
+ ) {
220
+ const returnVal = normalize(
221
+ i.level, //current level
222
+ usersVolume.current[i.uid]?.nonSpeakingVolume || 0,
223
+ usersVolume.current[i.uid]?.speakingVolume || 100,
224
+ );
225
+ normalizedValues[i.uid] = returnVal;
226
+ }
227
+ });
228
+
229
+ const sorted = Object.keys(normalizedValues).sort((a, b) => {
230
+ return normalizedValues[b] - normalizedValues[a];
231
+ });
232
+
233
+ if (!sorted || !sorted?.length) {
234
+ console.log('debugging no active speaker');
235
+ setActiveSpeaker(0);
236
+ } else if (
237
+ sorted &&
238
+ sorted.length &&
239
+ parseInt(sorted[0]) !== activeSpeaker
240
+ ) {
241
+ setActiveSpeaker(parseInt(sorted[0]));
242
+
243
+ //for logging purpose
244
+ let obj = {};
245
+ sorted.map((i) => {
246
+ let id = parseInt(i);
247
+ const curtdata = currentUsersVolume.find((i) => i.uid === id);
248
+ const cl =
249
+ curtdata && curtdata?.level
250
+ ? Math.round(curtdata?.level * 100) / 100
251
+ : 'no vol';
252
+ obj[id] = {
253
+ name: defaultContentRef.current[id]?.name,
254
+ normalizedVolume: normalizedValues[id],
255
+ currentVolume: cl,
256
+ minNonSpeakingVolume: usersVolume.current[id]?.nonSpeakingVolume,
257
+ speakingVolume: usersVolume.current[id]?.speakingVolume,
258
+ isSpeaking: usersVolume.current[id]?.isSpeaking,
259
+ };
260
+ });
261
+ console.log('debugging active speaker data', JSON.stringify(obj));
262
+ //for logging purpose
263
+ }*/
264
+ };
265
+
266
+ const isSpeakingEventCallback = ({payload, sender}) => {
267
+ if (sender == localUid) {
268
+ // log(' local user speaking stauts', sender, '=', payload);
269
+ } else {
270
+ log(' remote user speaking status ', sender, '=', payload);
271
+ }
272
+
273
+ usersVolume.current = {
274
+ ...usersVolume.current,
275
+ [sender]: {
276
+ ...usersVolume.current[sender],
277
+ isSpeaking: payload === 'true' ? true : false,
278
+ },
279
+ };
280
+ findActiveSpeaker();
281
+ };
282
+
283
+ const speakingVolumeEventCallBack = ({payload, sender}) => {
284
+ if (sender == localUid) {
285
+ log(' local user speaking volume ', sender, '=', payload);
286
+ } else {
287
+ log(' remote user speaking volume ', sender, '=', payload);
288
+ }
289
+
290
+ usersVolume.current = {
291
+ ...usersVolume.current,
292
+ [sender]: {
293
+ ...usersVolume.current[sender],
294
+ speakingVolume: parseFloat(payload),
295
+ },
296
+ };
297
+ };
298
+
299
+ const nonSpeakingVolumeEventCallback = ({payload, sender}) => {
300
+ if (sender == localUid) {
301
+ log(' local user non speaking volume ', sender, '=', payload);
302
+ } else {
303
+ log(' remote user non speaking volume ', sender, '=', payload);
304
+ }
305
+
306
+ usersVolume.current = {
307
+ ...usersVolume.current,
308
+ [sender]: {
309
+ ...usersVolume.current[sender],
310
+ nonSpeakingVolume: parseFloat(payload),
311
+ },
312
+ };
313
+ };
314
+ useEffect(() => {
315
+ if ($config.ACTIVE_SPEAKER) {
316
+ events.on(volumeEnum.SPEAKING_VOLUME, speakingVolumeEventCallBack);
317
+ events.on(volumeEnum.NON_SPEAKING_VOLUME, nonSpeakingVolumeEventCallback);
318
+ events.on(volumeEnum.IS_SPEAKING, isSpeakingEventCallback);
319
+ }
320
+
321
+ return () => {
322
+ if ($config.ACTIVE_SPEAKER) {
323
+ events.off(volumeEnum.SPEAKING_VOLUME, speakingVolumeEventCallBack);
324
+ events.off(
325
+ volumeEnum.NON_SPEAKING_VOLUME,
326
+ nonSpeakingVolumeEventCallback,
327
+ );
328
+ events.off(volumeEnum.IS_SPEAKING, isSpeakingEventCallback);
329
+ }
330
+ };
331
+ }, []);
332
+
333
+ return null;
334
+ };
335
+ export default useFindActiveSpeaker;
@@ -0,0 +1,4 @@
1
+ const useIsLocalUserSpeaking = () => {
2
+ return false;
3
+ };
4
+ export default useIsLocalUserSpeaking;
@@ -0,0 +1,98 @@
1
+ import {useLocalUserInfo} from 'customization-api';
2
+ import hark from 'hark';
3
+ import {useEffect, useRef, useState} from 'react';
4
+ import {useAsyncEffect} from './useAsyncEffect';
5
+ import LocalEventEmitter, {
6
+ LocalEventsEnum,
7
+ } from '../rtm-events-api/LocalEvents';
8
+
9
+ const useIsLocalUserSpeaking = () => {
10
+ const log: (arg1: string, ...args: any[]) => void = (arg1, ...args) => {
11
+ console.log('[ActiveSpeaker]' + arg1, ...args);
12
+ };
13
+ const [isSpeaking, setIsSpeaking] = useState(false);
14
+ const {audio} = useLocalUserInfo();
15
+ const speechRef = useRef(null);
16
+ const audioRef = useRef(audio);
17
+ const audioTrackRef = useRef(null);
18
+
19
+ useEffect(() => {
20
+ audioRef.current = audio;
21
+ /**
22
+ * if user mute the mic while speaking then stoppedSpeakingCallBack won't be executed because of if (audioRef.current) condition
23
+ * so if audio is muted then set speaking as false
24
+ */
25
+ if (!audio) {
26
+ setIsSpeaking(false);
27
+ }
28
+ }, [audio]);
29
+
30
+ const speakingCallBack = () => {
31
+ if (audioRef.current) {
32
+ setIsSpeaking(true);
33
+ }
34
+ };
35
+ const stoppedSpeakingCallBack = () => {
36
+ if (audioRef.current) {
37
+ setIsSpeaking(false);
38
+ }
39
+ };
40
+
41
+ useEffect(() => {
42
+ LocalEventEmitter.on(LocalEventsEnum.MIC_CHANGED, () => {
43
+ listenForSpeaker();
44
+ });
45
+ }, []);
46
+
47
+ const listenForSpeaker = async () => {
48
+ try {
49
+ if (speechRef.current) {
50
+ speechRef.current?.stop && speechRef.current?.stop();
51
+ }
52
+ if (audioTrackRef?.current) {
53
+ audioTrackRef.current?.length &&
54
+ audioTrackRef.current[0]?.stop &&
55
+ audioTrackRef.current[0]?.stop();
56
+ }
57
+ } catch (error) {
58
+ log(' Error on stopping the hark', error);
59
+ }
60
+ try {
61
+ //detect local user speaking or not
62
+ const audioStream = await navigator.mediaDevices.getUserMedia({
63
+ audio: true,
64
+ });
65
+ audioTrackRef.current = audioStream.getAudioTracks();
66
+ speechRef.current = null;
67
+ speechRef.current = hark(audioStream, {
68
+ interval: 100,
69
+ });
70
+ speechRef.current.on('speaking', speakingCallBack);
71
+ speechRef.current.on('stopped_speaking', stoppedSpeakingCallBack);
72
+ } catch (error) {
73
+ log(' Error on starting the hark', error);
74
+ }
75
+ };
76
+
77
+ useAsyncEffect(async () => {
78
+ if ($config.ACTIVE_SPEAKER) {
79
+ await listenForSpeaker();
80
+ return () => {
81
+ try {
82
+ speechRef.current &&
83
+ speechRef.current.stop &&
84
+ speechRef.current.stop();
85
+ audioTrackRef.current &&
86
+ audioTrackRef.current?.length &&
87
+ audioTrackRef.current[0]?.stop &&
88
+ audioTrackRef.current[0]?.stop();
89
+ } catch (error) {
90
+ console.log('error couldnt stop the track');
91
+ }
92
+ };
93
+ }
94
+ }, []);
95
+
96
+ return isSpeaking;
97
+ };
98
+ export default useIsLocalUserSpeaking;
@@ -4,6 +4,9 @@ import StorageContext from '../components/StorageContext';
4
4
  import {RoomInfoContextInterface} from '../components/room-info/useRoomInfo';
5
5
  import {useSetRoomInfo} from '../components/room-info/useSetRoomInfo';
6
6
  import {GraphQLContext} from '../components/GraphQLProvider';
7
+ import useGetName from './useGetName';
8
+ import useWaitingRoomAPI from '../subComponents/waiting-rooms/useWaitingRoomAPI';
9
+ import {base64ToUint8Array} from '../utils';
7
10
 
8
11
  const JOIN_CHANNEL_PHRASE_AND_GET_USER = gql`
9
12
  query JoinChannel($passphrase: String!) {
@@ -12,11 +15,16 @@ const JOIN_CHANNEL_PHRASE_AND_GET_USER = gql`
12
15
  title
13
16
  isHost
14
17
  secret
18
+ secretSalt
15
19
  mainUser {
16
20
  rtc
17
21
  rtm
18
22
  uid
19
23
  }
24
+ whiteboard {
25
+ room_uuid
26
+ room_token
27
+ }
20
28
  screenShare {
21
29
  rtc
22
30
  rtm
@@ -37,11 +45,16 @@ const JOIN_CHANNEL_PHRASE = gql`
37
45
  title
38
46
  isHost
39
47
  secret
48
+ secretSalt
40
49
  mainUser {
41
50
  rtc
42
51
  rtm
43
52
  uid
44
53
  }
54
+ whiteboard {
55
+ room_uuid
56
+ room_token
57
+ }
45
58
  screenShare {
46
59
  rtc
47
60
  rtm
@@ -56,66 +69,114 @@ const JOIN_CHANNEL_PHRASE = gql`
56
69
  export default function useJoinRoom() {
57
70
  const {store} = useContext(StorageContext);
58
71
  const {setRoomInfo} = useSetRoomInfo();
72
+
59
73
  const {client} = useContext(GraphQLContext);
74
+ const username = useGetName();
75
+ const {request: requestToJoin} = useWaitingRoomAPI();
76
+ const isWaitingRoomEnabled = $config.ENABLE_WAITING_ROOM;
77
+
60
78
  return async (phrase: string) => {
61
- setRoomInfo((prevState) => {
79
+ setRoomInfo(prevState => {
62
80
  return {
63
81
  ...prevState,
64
82
  isJoinDataFetched: false,
65
83
  };
66
84
  });
67
85
  try {
68
- const response = await client.query({
69
- query:
70
- store.token === null
71
- ? JOIN_CHANNEL_PHRASE
72
- : JOIN_CHANNEL_PHRASE_AND_GET_USER,
73
- variables: {
74
- passphrase: phrase,
75
- },
76
- });
77
- if (response.error) {
86
+ let response = null;
87
+ if (isWaitingRoomEnabled) {
88
+ response = await requestToJoin({
89
+ meetingPhrase: phrase,
90
+ send_event: false,
91
+ });
92
+ } else {
93
+ response = await client.query({
94
+ query:
95
+ store.token === null
96
+ ? JOIN_CHANNEL_PHRASE
97
+ : JOIN_CHANNEL_PHRASE_AND_GET_USER,
98
+ variables: {
99
+ passphrase: phrase,
100
+ //userName: username,
101
+ },
102
+ });
103
+ }
104
+ if (response?.error) {
78
105
  throw response.error;
79
106
  } else {
80
- if (response && response.data) {
81
- let data = response.data;
107
+ if ((response && response.data) || isWaitingRoomEnabled) {
108
+ let data = isWaitingRoomEnabled ? response : response.data;
82
109
  let roomInfo: Partial<RoomInfoContextInterface['data']> = {};
83
- if (data?.joinChannel?.channel) {
84
- roomInfo.channel = data.joinChannel.channel;
110
+
111
+ if (data?.joinChannel?.channel || data?.channel) {
112
+ roomInfo.channel = isWaitingRoomEnabled
113
+ ? data.channel
114
+ : data.joinChannel.channel;
85
115
  }
86
- if (data?.joinChannel?.mainUser?.uid) {
87
- roomInfo.uid = data.joinChannel.mainUser.uid;
116
+ if (data?.joinChannel?.mainUser?.uid || data?.mainUser?.uid) {
117
+ roomInfo.uid = isWaitingRoomEnabled
118
+ ? data.mainUser.uid
119
+ : data.joinChannel.mainUser.uid;
88
120
  }
89
- if (data?.joinChannel?.mainUser?.rtc) {
90
- roomInfo.token = data.joinChannel.mainUser.rtc;
121
+ if (data?.joinChannel?.mainUser?.rtc || data?.mainUser?.rtc) {
122
+ roomInfo.token = isWaitingRoomEnabled
123
+ ? data.mainUser.rtc
124
+ : data.joinChannel.mainUser.rtc;
91
125
  }
92
- if (data?.joinChannel?.mainUser?.rtm) {
93
- roomInfo.rtmToken = data.joinChannel.mainUser.rtm;
126
+ if (data?.joinChannel?.mainUser?.rtm || data?.mainUser?.rtm) {
127
+ roomInfo.rtmToken = isWaitingRoomEnabled
128
+ ? data.mainUser.rtm
129
+ : data.joinChannel.mainUser.rtm;
94
130
  }
95
- if (data?.joinChannel?.secret) {
96
- roomInfo.encryptionSecret = data.joinChannel.secret;
131
+ if (data?.joinChannel?.secret || data?.secret) {
132
+ roomInfo.encryptionSecret = isWaitingRoomEnabled
133
+ ? data.secret
134
+ : data.joinChannel.secret;
97
135
  }
98
- if (data?.joinChannel?.screenShare?.uid) {
99
- roomInfo.screenShareUid = data.joinChannel.screenShare.uid;
136
+ if (data?.joinChannel?.secretSalt || data?.secretSalt) {
137
+ roomInfo.encryptionSecretSalt = base64ToUint8Array(
138
+ isWaitingRoomEnabled
139
+ ? data.secretSalt
140
+ : data.joinChannel.secretSalt,
141
+ );
100
142
  }
101
- if (data?.joinChannel?.screenShare?.rtc) {
102
- roomInfo.screenShareToken = data.joinChannel.screenShare.rtc;
143
+ if (data?.joinChannel?.screenShare?.uid || data?.screenShare?.uid) {
144
+ roomInfo.screenShareUid = isWaitingRoomEnabled
145
+ ? data.screenShare.uid
146
+ : data.joinChannel.screenShare.uid;
103
147
  }
104
- if (data?.joinChannel?.isHost) {
105
- roomInfo.isHost = data.joinChannel.isHost;
148
+ if (data?.joinChannel?.screenShare?.rtc || data?.screenShare?.rtc) {
149
+ roomInfo.screenShareToken = isWaitingRoomEnabled
150
+ ? data.screenShare.rtc
151
+ : data.joinChannel.screenShare.rtc;
106
152
  }
107
- if (data?.joinChannel?.title) {
108
- roomInfo.meetingTitle = data.joinChannel.title;
153
+ roomInfo.isHost = isWaitingRoomEnabled
154
+ ? data.isHost
155
+ : data.joinChannel.isHost;
156
+
157
+ if (data?.joinChannel?.title || data?.title) {
158
+ roomInfo.meetingTitle = isWaitingRoomEnabled
159
+ ? data.title
160
+ : data.joinChannel.title;
161
+ }
162
+ if (data?.joinChannel?.whiteboard || data?.whiteboard) {
163
+ const whiteboard: RoomInfoContextInterface['data']['whiteboard'] = {
164
+ room_token: isWaitingRoomEnabled
165
+ ? data.whiteboard.room_token
166
+ : data?.joinChannel?.whiteboard?.room_token,
167
+ room_uuid: isWaitingRoomEnabled
168
+ ? data.whiteboard.room_uuid
169
+ : data?.joinChannel?.whiteboard?.room_uuid,
170
+ };
171
+ if (whiteboard?.room_token && whiteboard?.room_uuid) {
172
+ roomInfo.whiteboard = whiteboard;
173
+ }
109
174
  }
110
175
  //getUser is not available from backend
111
176
  // if (data?.getUser?.name) {
112
177
  // roomInfo.username = data.getUser.name;
113
178
  // }
114
- console.log('!!!!!Meetinginfo', {
115
- roomInfo,
116
- response: response.data,
117
- });
118
- setRoomInfo((prevState) => {
179
+ setRoomInfo(prevState => {
119
180
  let compiledMeetingInfo = {
120
181
  ...prevState.data,
121
182
  ...roomInfo,