physical phone. added methods to support actions

nethesis · Feb 9, 2024 · 4907b8c · 4907b8c
1 parent c86d3b2
commit 4907b8c
Show file tree

Hide file tree

Showing 8 changed files with 283 additions and 22 deletions.
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -22,7 +22,7 @@
     "Start recording": "Start recording",
     "Switch call": "Switch call",
     "Call to transfer": "Call to transfer",
-    "Hangup and transfer": "Hangup and transfer"
+    "Hangup and transfer": "Transfer"
   },
   "DropdownContent": {
     "Microphones": "MICROPHONES",

diff --git a/src/components/CallView/Actions.tsx b/src/components/CallView/Actions.tsx
@@ -33,6 +33,8 @@ import { Tooltip } from 'react-tooltip/dist/react-tooltip.min.cjs'
 import { park } from '../../lib/phone/call'
 import { eventDispatch, useEventListener } from '../../utils'
 import { useTranslation } from 'react-i18next'
+import { isWebRTC } from '../../lib/user/default_device'
+import { sendPhysicalDTMF } from '../../services/astproxy'
 
 const Actions: FC = () => {
   // Get multiple values from currentCall store
@@ -56,7 +58,12 @@ const Actions: FC = () => {
 
   // Cancels the current transfer through dtmfs
   function calcelTransfer() {
-    sendDTMF('*')
+    if (isWebRTC()) {
+      sendDTMF('*')
+    } else {
+      sendPhysicalDTMF('*')
+    }
+
     const { audioPlayerPlaying } = store.getState().player
     // Check if the local audio is already playing and start playing
     if (!audioPlayerPlaying) {
@@ -66,7 +73,12 @@ const Actions: FC = () => {
       })
     }
     setTimeout(() => {
-      sendDTMF('1')
+      if (isWebRTC()) {
+        sendDTMF('1')
+      } else {
+        sendPhysicalDTMF('1')
+      }
+
       dispatch.player.stopAudioPlayer()
       // The workarround to disable transfer because of the wrong conv.connection value from ws
       if (transferring) {
@@ -91,8 +103,6 @@ const Actions: FC = () => {
     eventDispatch('phone-island-call-parked', {})
   }
 
-
-
   const { t } = useTranslation()
 
   // Phone island header section

diff --git a/src/components/KeypadView/index.tsx b/src/components/KeypadView/index.tsx
@@ -13,6 +13,8 @@ import { backToCallView } from '../../lib/island/island'
 import { playDtmfAudio } from '../../lib/phone/call'
 import { Tooltip } from 'react-tooltip/dist/react-tooltip.min.cjs'
 import { useTranslation } from 'react-i18next'
+import { isWebRTC } from '../../lib/user/default_device'
+import { sendPhysicalDTMF } from '../../services/astproxy'
 
 const DTMF_KEYS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '#']
 
@@ -26,7 +28,11 @@ const KeypadView: FC<KeypadViewTypes> = () => {
     dispatch.currentCall.updateKeypadValue(`${keypadValueRef.current}${key}`)
     keypadValueRef.current = `${keypadValueRef.current}${key}`
     playDtmfAudio(key)
-    sendDTMF(key)
+    if (isWebRTC()) {
+      sendDTMF(key)
+    } else {
+      sendPhysicalDTMF(key)
+    }
   }
 
   useEffect(() => {

diff --git a/src/components/Socket.tsx b/src/components/Socket.tsx
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import React, { type ReactNode, FC, useEffect, useRef } from 'react'
-import { useDispatch } from 'react-redux'
-import { Dispatch } from '../store'
+import { useDispatch, useSelector } from 'react-redux'
+import { Dispatch, RootState } from '../store'
 import { io } from 'socket.io-client'
 import { getDisplayName } from '../lib/phone/conversation'
 import {
@@ -25,6 +25,7 @@ import type {
   MainPresenceTypes,
 } from '../types'
 import { getTimestampInSeconds } from '../utils/genericFunctions/timestamp'
+import { userTotallyFree } from '../lib/user/extensions'
 
 interface SocketProps {
   children: ReactNode
@@ -47,6 +48,26 @@ export const Socket: FC<SocketProps> = ({
   const connectionCheckInterval = useRef<any>()
   const socket = useRef<any>()
 
+  // get user information
+  const userInformation = useSelector((state: RootState) => state.currentUser)
+
+  const checkDefaultDeviceConversationActive = (conv: any) => {
+    dispatch.currentCall.updateCurrentCall({
+      conversationId: conv.id,
+      accepted: true,
+      incoming: conv.direction === 'in' ? false : undefined,
+    })
+
+    // Stop the local audio element ringing
+    store.dispatch.player.stopAudioPlayer()
+  }
+
+  const checkDefaultDeviceConversationClosed = (conv: any) => {
+    // store.dispatch.player.stopAudioPlayer()
+    store.dispatch.currentCall.reset()
+    // store.dispatch.listen.reset()
+  }
+
   useEffect(() => {
     /**
      * Manages event and data for the currentUser
@@ -57,6 +78,7 @@ export const Socket: FC<SocketProps> = ({
     const handleCurrentUserEvents = (res: ExtensionTypes, conv: ConversationTypes) => {
       // Handle transferring data
       const { transferring, transferSwitching, transferCalls } = store.getState().currentCall
+
       // Check conversation isn't empty
       if (Object.keys(conv).length > 0) {
         // With conversation
@@ -87,6 +109,7 @@ export const Socket: FC<SocketProps> = ({
                   displayName: getDisplayName(conv),
                   number: `${conv.counterpartNum}`,
                   startTime: `${conv.startTime / 1000}`,
+                  ownerExtension: conv.owner,
                   username:
                     `${
                       extensions &&
@@ -101,6 +124,10 @@ export const Socket: FC<SocketProps> = ({
                   number: `${conv.counterpartNum}`,
                   startTime: `${getTimestampInSeconds()}`,
                 })
+
+                if (userInformation?.default_device?.type !== 'webrtc') {
+                  checkDefaultDeviceConversationActive(conv)
+                }
               }
               // Handle not connected calls
               else if (conv && !conv.connected) {
@@ -157,6 +184,7 @@ export const Socket: FC<SocketProps> = ({
                   displayName: getDisplayName(conv),
                   number: counterpartNum,
                   startTime: `${startTime / 1000}`,
+                  conversationId: conv.id,
                 })
                 // Set the view of the island to call
                 dispatch.island.setIslandView('call')
@@ -168,14 +196,12 @@ export const Socket: FC<SocketProps> = ({
         }
       } else {
         // Without conversation for physical phone management
-        // if (status) {
-        // if (res.status == 'online' && userTotallyFree()) {
-        //     // Stop ringing sounds
-        //     dispatch.player.stopAudioPlayer()
-        //     // Reset current call info
-        //     dispatch.currentCall.reset()
-        // }
-        // }
+        if (res.status == 'online' && userTotallyFree()) {
+          // Stop ringing sounds
+          dispatch.player.stopAudioPlayer()
+          // Reset current call info
+          dispatch.currentCall.reset()
+        }
       }
     }
 

diff --git a/src/lib/phone/call.ts b/src/lib/phone/call.ts
@@ -17,6 +17,12 @@ import { isWebRTC } from '../user/default_device'
 import {
   blindTransfer as blindTransferRequest,
   attendedTransfer as attendedTransferRequest,
+  hangupPhysical,
+  answerPhysical,
+  mutePhysical,
+  unmutePhysical,
+  pausePhysical,
+  callPhysical,
 } from '../../services/astproxy'
 import dtmfAudios from '../../static/dtmf'
 import { hangupConversation, parkConversation } from '../../services/astproxy'
@@ -27,7 +33,11 @@ import { hangupConversation, parkConversation } from '../../services/astproxy'
  */
 export function callNumber(number: string, sipHost: string) {
   const sipURI = `sip:${number}@${sipHost}`
-  callSipURI(sipURI)
+  if (isWebRTC()) {
+    callSipURI(sipURI)
+  } else {
+    callPhysical(number)
+  }
 }
 
 /**
@@ -68,6 +78,8 @@ export function callSipURI(sipURI: string) {
 export function answerIncomingCall() {
   if (isWebRTC()) {
     answerWebRTC()
+  } else {
+    answerPhysical()
   }
 }
 
@@ -95,11 +107,15 @@ export function hangupAllExtensions() {
 export function hangupCurrentCall() {
   const { outgoing, accepted } = store.getState().currentCall
   if (outgoing || accepted) {
-    hangup()
+    if (isWebRTC()) {
+      hangup()
+    } else {
+      hangupPhysical()
+    }
+    store.dispatch.player.stopAudioPlayer()
+    store.dispatch.currentCall.reset()
+    store.dispatch.listen.reset()
   }
-  store.dispatch.player.stopAudioPlayer()
-  store.dispatch.currentCall.reset()
-  store.dispatch.listen.reset()
 }
 
 /**
@@ -114,6 +130,8 @@ export function muteCurrentCall() {
         muted: true,
       })
     }
+  } else {
+    mutePhysical()
   }
 }
 
@@ -129,6 +147,8 @@ export function unmuteCurrentCall() {
         muted: false,
       })
     }
+  } else {
+    unmutePhysical()
   }
 }
 
@@ -146,6 +166,8 @@ export function pauseCurrentCall() {
       // Pause remote audio
       store.dispatch.player.pauseRemoteAudio()
     }
+  } else {
+    pausePhysical(true)
   }
 }
 
@@ -163,6 +185,8 @@ export function unpauseCurrentCall() {
       // Play remote audio
       store.dispatch.player.playRemoteAudio()
     }
+  } else {
+    pausePhysical(false)
   }
 }
 

diff --git a/src/models/currentCall.ts b/src/models/currentCall.ts
@@ -31,6 +31,7 @@ const defaultState = {
   transferringStartTime: '',
   transferSwitching: false,
   transferCalls: new Array(),
+  ownerExtension: '',
 }
 
 export const currentCall = createModel<RootModel>()({
@@ -159,4 +160,5 @@ export interface CurrentCallTypes {
   transferringStartTime?: string
   transferSwitching?: boolean
   transferCalls?: TransferCallsTypes[]
+  ownerExtension?: string
 }