defaultDeviceType. Check default device type and launch webrtc event (#…

…47)
nethesis · Apr 22, 2024 · faaaa04 · faaaa04
1 parent 1ba0b96
commit faaaa04
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/src/components/Socket.tsx b/src/components/Socket.tsx
@@ -129,7 +129,7 @@ export const Socket: FC<SocketProps> = ({
                   startTime: `${getTimestampInSeconds()}`,
                 })
 
-                if (userInformation?.default_device?.type !== 'webrtc') {
+                if (userInformation?.default_device?.type === 'physical') {
                   checkDefaultDeviceConversationActive(conv)
                 }
               }

diff --git a/src/components/WebRTC.tsx b/src/components/WebRTC.tsx
@@ -170,13 +170,15 @@ export const WebRTC: FC<WebRTCProps> = ({
                           janus.current.log(
                             'Successfully un-registered as ' + result['username'] + '!',
                           )
+                        eventDispatch('phone-island-webrtc-unregistered', {})
                         break
 
                       case 'registered':
                         if (janus.current.log)
                           janus.current.log(
                             'Successfully registered as ' + result['username'] + '!',
                           )
+                        eventDispatch('phone-island-webrtc-registered', {})
                         if (!store.getState().webrtc.registered) {
                           store.dispatch.webrtc.updateWebRTC({
                             registered: true,

diff --git a/src/events/SocketEvents.ts b/src/events/SocketEvents.ts
@@ -33,9 +33,16 @@ export function dispatchMainPresence(event: MainPresenceTypes) {
  * @param event The extenUpdate event from socket
  */
 export function dispatchConversations(event: ExtensionTypes) {
-  const data: ConversationsEventType = {
+  const data: any = {
     [event.username]: {
-      conversations: event.conversations,
+      conversations: event?.conversations,
+      status: event?.status,
+      sipuseragent: event?.sipuseragent,
+      username: event?.username,
+      port: event?.port,
+      dnd: event?.dnd,
+      number: event?.exten,
+      ip: event?.ip,
     },
   }
   // Dispatch the event on window for external handlers

diff --git a/src/lib/user/default_device.ts b/src/lib/user/default_device.ts
@@ -8,7 +8,7 @@ import { store } from '../../store'
  */
 export function isWebRTC() {
   const { default_device } = store.getState().currentUser
-  if (default_device?.type === 'webrtc') {
+  if (default_device?.type === 'webrtc' || default_device?.type === 'nethlink') {
     return true
   }
   return false

diff --git a/src/lib/user/extensions.ts b/src/lib/user/extensions.ts
@@ -14,7 +14,7 @@ export function getWebrtcExtensions(): UserExtensionTypes | UserExtensionTypes[]
   // Get endpoints currentUser store
   const { endpoints } = store.getState().currentUser
   if (endpoints?.extension && endpoints.extension.length > 0) {
-    const webrtcExtensions = endpoints?.extension.filter((extension) => extension.type === 'webrtc')
+    const webrtcExtensions = endpoints?.extension.filter((extension) => extension?.type === 'webrtc' || extension?.type === 'nethlink')
     return webrtcExtensions.length === 1
       ? webrtcExtensions[0]
       : webrtcExtensions.length > 1

diff --git a/src/models/currentCall.ts b/src/models/currentCall.ts
@@ -86,7 +86,8 @@ export const currentCall = createModel<RootModel>()({
       // Check call type and incoming confirmation source
       if (
         (rootState.currentUser.default_device?.type === 'webrtc' && payload.incomingWebRTC) ||
-        (rootState.currentUser.default_device?.type === 'physical' && payload.incomingSocket)
+        (rootState.currentUser.default_device?.type === 'physical' && payload.incomingSocket) ||
+        (rootState?.currentUser?.default_device?.type === 'nethlink' && payload?.incomingWebRTC)
       ) {
         payload.incoming = true
 
@@ -102,7 +103,8 @@ export const currentCall = createModel<RootModel>()({
       // Check call type and outgoing confirmation source
       if (
         (rootState.currentUser.default_device?.type === 'webrtc' && payload.outgoingWebRTC) ||
-        (rootState.currentUser.default_device?.type === 'physical' && payload.outgoingSocket)
+        (rootState.currentUser.default_device?.type === 'physical' && payload.outgoingSocket) ||
+        (rootState.currentUser.default_device?.type === 'nethlink' && payload.outgoingWebRTC)
       ) {
         payload.outgoing = true
         // Dispatch an event for outgoing call
@@ -117,7 +119,8 @@ export const currentCall = createModel<RootModel>()({
       // Check call type and accepted confirmation source
       if (
         (rootState.currentUser.default_device?.type === 'webrtc' && payload.acceptedWebRTC) ||
-        (rootState.currentUser.default_device?.type === 'physical' && payload.acceptedSocket)
+        (rootState.currentUser.default_device?.type === 'physical' && payload.acceptedSocket) ||
+        (rootState.currentUser.default_device?.type === 'nethlink' && payload.acceptedWebRTC)
       ) {
         payload.accepted = true
         eventDispatch('phone-island-call-answered', {})

diff --git a/src/types/user.ts b/src/types/user.ts
@@ -8,7 +8,7 @@ export interface UserCachesTypes {
   operatorsAvatars: AvatarsTypes
 }
 
-export type ExtensionTypeTypes = 'webrtc' | 'physical'
+export type ExtensionTypeTypes = 'webrtc' | 'physical' | 'nethlink'
 
 export interface UserExtensionTypes {
   id: string