@ -31,6 +31,7 @@ import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
import { SnodeNamespaces } from '../../apis/snode_api/namespaces' ; import { SnodeNamespaces } from '../../apis/snode_api/namespaces' ;
import { DURATION } from '../../constants' ; import { DURATION } from '../../constants' ;
import { DisappearingMessages } from '../../disappearing_messages' ; import { DisappearingMessages } from '../../disappearing_messages' ;
import { ReadyToDisappearMsgUpdate } from '../../disappearing_messages/types' ;
import { MessageSender } from '../../sending' ; import { MessageSender } from '../../sending' ;
import { getIsRinging } from '../RingingManager' ; import { getIsRinging } from '../RingingManager' ;
import { getBlackSilenceMediaStream } from './Silence' ; import { getBlackSilenceMediaStream } from './Silence' ;
@ -39,6 +40,9 @@ export type InputItem = { deviceId: string; label: string };
export const callTimeoutMs = 60000 ; export const callTimeoutMs = 60000 ;
export type WithOptExpireUpdate = { expireDetails : ReadyToDisappearMsgUpdate | undefined } ;
export type WithMessageHash = { messageHash : string } ;
/ * * / * *
* This uuid is set only once we accepted a call or started one .
* This uuid is set only once we accepted a call or started one .
* /
* /
@ -108,6 +112,9 @@ type CachedCallMessageType = {
sdpMids : Array < string > ;
sdpMids : Array < string > ;
uuid : string ;
uuid : string ;
timestamp : number ;
timestamp : number ;
// when we receive some messages, we keep track of what were their
// expireUpdate, so we can add a message once the user / accepts denies the call
expireDetails : ( WithOptExpireUpdate & WithMessageHash ) | null ;
} ; } ;
/ * * / * *
@ -385,8 +392,12 @@ export async function selectAudioOutputByDeviceId(audioOutputDeviceId: string) {
}
}
} }
async function createOfferAndSendIt ( recipient : string { async function createOfferAndSendIt ( recipient : string , msgIdentifier : string | null ) {
try {
try {
const convo = getConversationController ( ) . get ( recipient ) ;
if ( ! convo ) {
throw new Error ( 'createOfferAndSendIt needs a convo' ) ;
}
makingOffer = true ;
makingOffer = true ;
window . log . info ( 'got createOfferAndSendIt event. creating offer' ) ;
window . log . info ( 'got createOfferAndSendIt event. creating offer' ) ;
await ( peerConnection as any ) ? . setLocalDescription ( ) ;
await ( peerConnection as any ) ? . setLocalDescription ( ) ;
@ -412,13 +423,19 @@ async function createOfferAndSendIt(recipient: string) {
''
''
) ;
) ;
// Note: we are forcing callMessages to be DaR if DaS, using the same timer
const { expirationType , expireTimer } = DisappearingMessages . forcedDeleteAfterReadMsgSetting (
convo
) ;
const offerMessage = new CallMessage ( {
const offerMessage = new CallMessage ( {
identifier : msgIdentifier || undefined ,
timestamp : Date.now ( ) ,
timestamp : Date.now ( ) ,
type : SignalService . CallMessage . Type . OFFER ,
type : SignalService . CallMessage . Type . OFFER ,
sdps : [ overridenSdps ] ,
sdps : [ overridenSdps ] ,
uuid : currentCallUUID ,
uuid : currentCallUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType ,
expireTimer : null ,
expireTimer ,
} ) ;
} ) ;
window . log . info ( ` sending ' ${ offer . type } '' with callUUID: ${ currentCallUUID } ` ) ;
window . log . info ( ` sending ' ${ offer . type } '' with callUUID: ${ currentCallUUID } ` ) ;
@ -505,7 +522,7 @@ export async function USER_callRecipient(recipient: string) {
timestamp : now ,
timestamp : now ,
type : SignalService . CallMessage . Type . PRE_OFFER ,
type : SignalService . CallMessage . Type . PRE_OFFER ,
uuid : currentCallUUID ,
uuid : currentCallUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType : null , // Note: Preoffer messages are not added to the DB, so no need to make them expire
expireTimer : null ,
expireTimer : null ,
} ) ;
} ) ;
@ -515,43 +532,8 @@ export async function USER_callRecipient(recipient: string) {
await calledConvo . unhideIfNeeded ( false ) ;
await calledConvo . unhideIfNeeded ( false ) ;
weAreCallerOnCurrentCall = true ;
weAreCallerOnCurrentCall = true ;
const expirationMode = calledConvo . getExpirationMode ( ) ;
const expireTimer = calledConvo . getExpireTimer ( ) || 0 ;
let expirationType ;
let expirationStartTimestamp ;
if ( calledConvo && expirationMode && expireTimer > 0 ) {
// TODO legacy messages support will be removed in a future release
expirationType = DisappearingMessages . changeToDisappearingMessageType (
calledConvo ,
expireTimer ,
expirationMode
) ;
if (
expirationMode === 'legacy' ||
expirationMode === 'deleteAfterSend' ||
expirationMode === 'deleteAfterRead' // we are the one initiaing the call, so that message is already read
) {
expirationStartTimestamp = DisappearingMessages . setExpirationStartTimestamp (
expirationMode ,
now ,
'USER_callRecipient'
) ;
}
}
// Locally, that message must expire
await calledConvo ? . addSingleOutgoingMessage ( {
callNotificationType : 'started-call' ,
sent_at : now ,
expirationType ,
expireTimer ,
expirationStartTimestamp ,
} ) ;
// initiating a call is analogous to sending a message request
// initiating a call is analogous to sending a message request
await approveConvoAndSendResponse ( recipient , true );
await approveConvoAndSendResponse ( recipient ) ;
// Note: we do the sending of the preoffer manually as the sendToPubkeyNonDurably rely on having a message saved to the db for MessageSentSuccess
// Note: we do the sending of the preoffer manually as the sendToPubkeyNonDurably rely on having a message saved to the db for MessageSentSuccess
// which is not the case for a pre offer message (the message only exists in memory)
// which is not the case for a pre offer message (the message only exists in memory)
@ -567,7 +549,25 @@ export async function USER_callRecipient(recipient: string) {
void PnServer . notifyPnServer ( wrappedEnvelope , recipient ) ;
void PnServer . notifyPnServer ( wrappedEnvelope , recipient ) ;
await openMediaDevicesAndAddTracks ( ) ;
await openMediaDevicesAndAddTracks ( ) ;
await createOfferAndSendIt ( recipient ) ;
// Note CallMessages are very custom, as we moslty don't sync them to ourselves.
// So here, we are creating a DaS/off message saved locally which will expire locally only,
// but the "offer" we are sending the the called pubkey had a DaR on it (as that one is synced, and should expire after our message was read)
const expireDetails = DisappearingMessages . forcedDeleteAfterSendMsgSetting ( calledConvo ) ;
let msgModel = await calledConvo ? . addSingleOutgoingMessage ( {
callNotificationType : 'started-call' ,
sent_at : now ,
expirationType : expireDetails.expirationType ,
expireTimer : expireDetails.expireTimer ,
} ) ;
msgModel = DisappearingMessages . getMessageReadyToDisappear ( calledConvo , msgModel , 0 , {
messageExpirationFromRetrieve : null ,
expirationTimer : expireDetails.expireTimer ,
expirationType : expireDetails.expirationType ,
} ) ;
const msgIdentifier = await msgModel . commit ( ) ;
await createOfferAndSendIt ( recipient , msgIdentifier ) ;
// close and end the call if callTimeoutMs is reached and still not connected
// close and end the call if callTimeoutMs is reached and still not connected
// eslint-disable-next-line @typescript-eslint/no-misused-promises
// eslint-disable-next-line @typescript-eslint/no-misused-promises
@ -615,7 +615,7 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => {
sdpMids : validCandidates.map ( c = > c . sdpMid ) ,
sdpMids : validCandidates.map ( c = > c . sdpMid ) ,
sdps : validCandidates.map ( c = > c . candidate ) ,
sdps : validCandidates.map ( c = > c . candidate ) ,
uuid : currentCallUUID ,
uuid : currentCallUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType : null , // Note: An ICE_CANDIDATES is not saved to the DB on the recipient's side, so no need to make it expire
expireTimer : null ,
expireTimer : null ,
} ) ;
} ) ;
@ -819,7 +819,7 @@ function createOrGetPeerConnection(withPubkey: string) {
// we are the caller and the connection got dropped out, we need to send a new offer with iceRestart set to true.
// we are the caller and the connection got dropped out, we need to send a new offer with iceRestart set to true.
// the recipient will get that new offer and send us a response back if he still online
// the recipient will get that new offer and send us a response back if he still online
( peerConnection as any ) . restartIce ( ) ;
( peerConnection as any ) . restartIce ( ) ;
await createOfferAndSendIt ( withPubkey ;
await createOfferAndSendIt ( withPubkey , null );
}
}
} , 2000 ) ;
} , 2000 ) ;
}
}
@ -914,58 +914,47 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
callerConvo . set ( 'active_at' , networkTimestamp ) ;
callerConvo . set ( 'active_at' , networkTimestamp ) ;
await callerConvo . unhideIfNeeded ( false ) ;
await callerConvo . unhideIfNeeded ( false ) ;
const expirationMode = callerConvo . getExpirationMode ( ) ;
const expireUpdate = DisappearingMessages . forcedDeleteAfterSendMsgSetting ( callerConvo ) ;
const expireTimer = callerConvo . getExpireTimer ( ) || 0 ;
let expirationType ;
let expirationStartTimestamp ;
if ( callerConvo && expirationMode && expireTimer > 0 ) {
const msgModel = await callerConvo . addSingleIncomingMessage ( {
// TODO legacy messages support will be removed in a future release
expirationType = DisappearingMessages . changeToDisappearingMessageType (
callerConvo ,
expireTimer ,
expirationMode
) ;
if (
expirationMode === 'legacy' ||
expirationMode === 'deleteAfterSend' ||
expirationMode === 'deleteAfterRead'
) {
expirationStartTimestamp = DisappearingMessages . setExpirationStartTimestamp (
expirationMode ,
networkTimestamp ,
'USER_acceptIncomingCallRequest'
) ;
}
}
await callerConvo ? . addSingleIncomingMessage ( {
callNotificationType : 'answered-a-call' ,
callNotificationType : 'answered-a-call' ,
source : UserUtils.getOurPubKeyStrFromCache ( ) ,
source : UserUtils.getOurPubKeyStrFromCache ( ) ,
sent_at : networkTimestamp ,
sent_at : networkTimestamp ,
received_at : networkTimestamp ,
received_at : networkTimestamp ,
unread : READ_MESSAGE_STATE.read ,
unread : READ_MESSAGE_STATE.read ,
expirationType ,
messageHash : lastOfferMessage.expireDetails?.messageHash ,
expir eTimer ,
expirationType : expireUpdate.expirationType ,
expir ationStartTimestamp ,
expireTimer : expireUpdate.expireTimer ,
} ) ;
} ) ;
await buildAnswerAndSendIt ( fromSender ) ;
const msgIdentifier = await msgModel . commit ( ) ;
await buildAnswerAndSendIt ( fromSender , msgIdentifier ) ;
// consider the conversation completely approved
// consider the conversation completely approved
await callerConvo . setDidApproveMe ( true ) ;
await callerConvo . setDidApproveMe ( true ) ;
await approveConvoAndSendResponse ( fromSender , true );
await approveConvoAndSendResponse ( fromSender ) ;
} }
export async function rejectCallAlreadyAnotherCall ( fromSender : string , forcedUUID : string ) { export async function rejectCallAlreadyAnotherCall ( fromSender : string , forcedUUID : string ) {
const convo = getConversationController ( ) . get ( fromSender ) ;
if ( ! convo ) {
throw new Error ( 'rejectCallAlreadyAnotherCall non existing convo' ) ;
}
window . log . info ( ` rejectCallAlreadyAnotherCall ${ ed25519Str ( fromSender ) } : ${ forcedUUID } ` ) ;
window . log . info ( ` rejectCallAlreadyAnotherCall ${ ed25519Str ( fromSender ) } : ${ forcedUUID } ` ) ;
rejectedCallUUIDS . add ( forcedUUID ) ;
rejectedCallUUIDS . add ( forcedUUID ) ;
// Note: we are forcing callMessages to be DaR if DaS, using the same timer
const { expirationType , expireTimer } = DisappearingMessages . forcedDeleteAfterReadMsgSetting (
convo
) ;
const rejectCallMessage = new CallMessage ( {
const rejectCallMessage = new CallMessage ( {
type : SignalService . CallMessage . Type . END_CALL ,
type : SignalService . CallMessage . Type . END_CALL ,
timestamp : Date.now ( ) ,
timestamp : Date.now ( ) ,
uuid : forcedUUID ,
uuid : forcedUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType ,
expireTimer : null ,
expireTimer ,
} ) ;
} ) ;
await sendCallMessageAndSync ( rejectCallMessage , fromSender ) ;
await sendCallMessageAndSync ( rejectCallMessage , fromSender ) ;
@ -985,12 +974,21 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) {
window . log . info ( ` USER_rejectIncomingCallRequest ${ ed25519Str ( fromSender ) } : ${ aboutCallUUID } ` ) ;
window . log . info ( ` USER_rejectIncomingCallRequest ${ ed25519Str ( fromSender ) } : ${ aboutCallUUID } ` ) ;
if ( aboutCallUUID ) {
if ( aboutCallUUID ) {
rejectedCallUUIDS . add ( aboutCallUUID ) ;
rejectedCallUUIDS . add ( aboutCallUUID ) ;
const convo = getConversationController ( ) . get ( fromSender ) ;
if ( ! convo ) {
throw new Error ( 'USER_rejectIncomingCallRequest not existing convo' ) ;
}
// Note: we are forcing callMessages to be DaR if DaS, using the same timer
const { expirationType , expireTimer } = DisappearingMessages . forcedDeleteAfterReadMsgSetting (
convo
) ;
const endCallMessage = new CallMessage ( {
const endCallMessage = new CallMessage ( {
type : SignalService . CallMessage . Type . END_CALL ,
type : SignalService . CallMessage . Type . END_CALL ,
timestamp : Date.now ( ) ,
timestamp : Date.now ( ) ,
uuid : aboutCallUUID ,
uuid : aboutCallUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType ,
expireTimer : null ,
expireTimer ,
} ) ;
} ) ;
// sync the reject event so our other devices remove the popup too
// sync the reject event so our other devices remove the popup too
await sendCallMessageAndSync ( endCallMessage , fromSender ) ;
await sendCallMessageAndSync ( endCallMessage , fromSender ) ;
@ -1003,7 +1001,7 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) {
if ( ongoingCallWith && ongoingCallStatus && ongoingCallWith === fromSender ) {
if ( ongoingCallWith && ongoingCallStatus && ongoingCallWith === fromSender ) {
closeVideoCall ( ) ;
closeVideoCall ( ) ;
}
}
await addMissedCallMessage ( fromSender , Date . now ( ) ;
await addMissedCallMessage ( fromSender , Date . now ( ) , lastOfferMessage ? . expireDetails || null );
} }
async function sendCallMessageAndSync ( callmessage : CallMessage , user : string ) { async function sendCallMessageAndSync ( callmessage : CallMessage , user : string ) {
@ -1028,13 +1026,21 @@ export async function USER_hangup(fromSender: string) {
window . log . warn ( 'should not be able to hangup without a currentCallUUID' ) ;
window . log . warn ( 'should not be able to hangup without a currentCallUUID' ) ;
return ;
return ;
}
}
const convo = getConversationController ( ) . get ( fromSender ) ;
if ( ! convo ) {
throw new Error ( 'USER_hangup not existing convo' ) ;
}
// Note: we are forcing callMessages to be DaR if DaS, using the same timer
const { expirationType , expireTimer } = DisappearingMessages . forcedDeleteAfterReadMsgSetting (
convo
) ;
rejectedCallUUIDS . add ( currentCallUUID ) ;
rejectedCallUUIDS . add ( currentCallUUID ) ;
const endCallMessage = new CallMessage ( {
const endCallMessage = new CallMessage ( {
type : SignalService . CallMessage . Type . END_CALL ,
type : SignalService . CallMessage . Type . END_CALL ,
timestamp : Date.now ( ) ,
timestamp : Date.now ( ) ,
uuid : currentCallUUID ,
uuid : currentCallUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType ,
expireTimer : null ,
expireTimer ,
} ) ;
} ) ;
void getMessageQueue ( ) . sendToPubKeyNonDurably ( {
void getMessageQueue ( ) . sendToPubKeyNonDurably ( {
pubkey : PubKey.cast ( fromSender ) ,
pubkey : PubKey.cast ( fromSender ) ,
@ -1093,7 +1099,7 @@ export async function handleCallTypeEndCall(sender: string, aboutCallUUID?: stri
}
}
} }
async function buildAnswerAndSendIt ( sender : string { async function buildAnswerAndSendIt ( sender : string , msgIdentifier : string | null ) {
if ( peerConnection ) {
if ( peerConnection ) {
if ( ! currentCallUUID ) {
if ( ! currentCallUUID ) {
window . log . warn ( 'cannot send answer without a currentCallUUID' ) ;
window . log . warn ( 'cannot send answer without a currentCallUUID' ) ;
@ -1105,14 +1111,23 @@ async function buildAnswerAndSendIt(sender: string) {
window . log . warn ( 'failed to create answer' ) ;
window . log . warn ( 'failed to create answer' ) ;
return ;
return ;
}
}
const convo = getConversationController ( ) . get ( sender ) ;
if ( ! convo ) {
throw new Error ( 'buildAnswerAndSendIt not existing convo' ) ;
}
// Note: we are forcing callMessages to be DaR if DaS, using the same timer
const { expirationType , expireTimer } = DisappearingMessages . forcedDeleteAfterReadMsgSetting (
convo
) ;
const answerSdp = answer . sdp ;
const answerSdp = answer . sdp ;
const callAnswerMessage = new CallMessage ( {
const callAnswerMessage = new CallMessage ( {
identifier : msgIdentifier || undefined ,
timestamp : Date.now ( ) ,
timestamp : Date.now ( ) ,
type : SignalService . CallMessage . Type . ANSWER ,
type : SignalService . CallMessage . Type . ANSWER ,
sdps : [ answerSdp ] ,
sdps : [ answerSdp ] ,
uuid : currentCallUUID ,
uuid : currentCallUUID ,
expirationType : null , // Note: CallMessages are expiring based on the recipient's side expiration setting
expirationType ,
expireTimer : null ,
expireTimer ,
} ) ;
} ) ;
window . log . info ( 'sending ANSWER MESSAGE and sync' ) ;
window . log . info ( 'sending ANSWER MESSAGE and sync' ) ;
@ -1126,8 +1141,9 @@ export function isCallRejected(uuid: string) {
function getCachedMessageFromCallMessage ( function getCachedMessageFromCallMessage (
callMessage : SignalService.CallMessage ,
callMessage : SignalService.CallMessage ,
envelopeTimestamp : number
envelopeTimestamp : number ,
) { expireDetails : ( WithOptExpireUpdate & WithMessageHash ) | null
) : CachedCallMessageType {
return {
return {
type : callMessage . type ,
type : callMessage . type ,
sdps : callMessage.sdps ,
sdps : callMessage.sdps ,
@ -1135,6 +1151,7 @@ function getCachedMessageFromCallMessage(
sdpMids : callMessage.sdpMids ,
sdpMids : callMessage.sdpMids ,
uuid : callMessage.uuid ,
uuid : callMessage.uuid ,
timestamp : envelopeTimestamp ,
timestamp : envelopeTimestamp ,
expireDetails ,
} ;
} ;
} }
@ -1153,7 +1170,8 @@ async function isUserApprovedOrWeSentAMessage(user: string) {
export async function handleCallTypeOffer ( export async function handleCallTypeOffer (
sender : string ,
sender : string ,
callMessage : SignalService.CallMessage ,
callMessage : SignalService.CallMessage ,
incomingOfferTimestamp : number
incomingOfferTimestamp : number ,
details : WithMessageHash & WithOptExpireUpdate
) { ) {
try {
try {
const remoteCallUUID = callMessage . uuid ;
const remoteCallUUID = callMessage . uuid ;
@ -1164,25 +1182,33 @@ export async function handleCallTypeOffer(
if ( ! getCallMediaPermissionsSettings ( ) ) {
if ( ! getCallMediaPermissionsSettings ( ) ) {
// we still add it to the cache so if user toggles settings in the next 60 sec, he can still reply to it
// we still add it to the cache so if user toggles settings in the next 60 sec, he can still reply to it
const cachedMsg = getCachedMessageFromCallMessage ( callMessage , incomingOfferTimestamp ) ;
const cachedMsg = getCachedMessageFromCallMessage (
callMessage ,
incomingOfferTimestamp ,
details
) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMsg ) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMsg ) ;
await handleMissedCall ( sender , incomingOfferTimestamp , 'permissions' ) ;
await handleMissedCall ( sender , incomingOfferTimestamp , 'permissions' , details );
return ;
return ;
}
}
const shouldDisplayOffer = await isUserApprovedOrWeSentAMessage ( sender ) ;
const shouldDisplayOffer = await isUserApprovedOrWeSentAMessage ( sender ) ;
if ( ! shouldDisplayOffer ) {
if ( ! shouldDisplayOffer ) {
const cachedMsg = getCachedMessageFromCallMessage ( callMessage , incomingOfferTimestamp ) ;
const cachedMsg = getCachedMessageFromCallMessage (
callMessage ,
incomingOfferTimestamp ,
details
) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMsg ) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMsg ) ;
await handleMissedCall ( sender , incomingOfferTimestamp , 'not-approved' ) ;
await handleMissedCall ( sender , incomingOfferTimestamp , 'not-approved' , details );
return ;
return ;
}
}
// if the offer is more than the call timeout, don't try to handle it (as the sender would have already closed it)
// if the offer is more than the call timeout, don't try to handle it (as the sender would have already closed it)
if ( incomingOfferTimestamp <= Date . now ( ) - callTimeoutMs ) {
if ( incomingOfferTimestamp <= Date . now ( ) - callTimeoutMs ) {
await handleMissedCall ( sender , incomingOfferTimestamp , 'too-old-timestamp' ;
await handleMissedCall ( sender , incomingOfferTimestamp , 'too-old-timestamp' , details );
return ;
return ;
}
}
@ -1195,7 +1221,7 @@ export async function handleCallTypeOffer(
return ;
return ;
}
}
// add a message in the convo with this user about the missed call.
// add a message in the convo with this user about the missed call.
await handleMissedCall ( sender , incomingOfferTimestamp , 'another-call-ongoing' ;
await handleMissedCall ( sender , incomingOfferTimestamp , 'another-call-ongoing' , details );
// Here, we are in a call, and we got an offer from someone we are in a call with, and not one of his other devices.
// Here, we are in a call, and we got an offer from someone we are in a call with, and not one of his other devices.
// Just hangup automatically the call on the calling side.
// Just hangup automatically the call on the calling side.
@ -1227,7 +1253,7 @@ export async function handleCallTypeOffer(
await peerConnection . setRemoteDescription ( remoteOfferDesc ) ; // SRD rolls back as needed
await peerConnection . setRemoteDescription ( remoteOfferDesc ) ; // SRD rolls back as needed
isSettingRemoteAnswerPending = false ;
isSettingRemoteAnswerPending = false ;
await buildAnswerAndSendIt ( sender ;
await buildAnswerAndSendIt ( sender , null );
} else {
} else {
window . inboxStore ? . dispatch ( incomingCall ( { pubkey : sender } ) ) ;
window . inboxStore ? . dispatch ( incomingCall ( { pubkey : sender } ) ) ;
@ -1240,7 +1266,11 @@ export async function handleCallTypeOffer(
await callerConvo . notifyIncomingCall ( ) ;
await callerConvo . notifyIncomingCall ( ) ;
}
}
}
}
const cachedMessage = getCachedMessageFromCallMessage ( callMessage , incomingOfferTimestamp ) ;
const cachedMessage = getCachedMessageFromCallMessage (
callMessage ,
incomingOfferTimestamp ,
details
) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMessage ) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMessage ) ;
} catch ( err ) {
} catch ( err ) {
@ -1251,7 +1281,8 @@ export async function handleCallTypeOffer(
export async function handleMissedCall ( export async function handleMissedCall (
sender : string ,
sender : string ,
incomingOfferTimestamp : number ,
incomingOfferTimestamp : number ,
reason : 'not-approved' | 'permissions' | 'another-call-ongoing' | 'too-old-timestamp'
reason : 'not-approved' | 'permissions' | 'another-call-ongoing' | 'too-old-timestamp' ,
details : WithMessageHash & WithOptExpireUpdate
) { ) {
const incomingCallConversation = getConversationController ( ) . get ( sender ) ;
const incomingCallConversation = getConversationController ( ) . get ( sender ) ;
@ -1276,10 +1307,14 @@ export async function handleMissedCall(
default :
default :
}
}
await addMissedCallMessage ( sender , incomingOfferTimestamp ;
await addMissedCallMessage ( sender , incomingOfferTimestamp , details );
} }
async function addMissedCallMessage ( callerPubkey : string , sentAt : number ) { async function addMissedCallMessage (
callerPubkey : string ,
sentAt : number ,
details : ( WithMessageHash & WithOptExpireUpdate ) | null
) {
const incomingCallConversation = getConversationController ( ) . get ( callerPubkey ) ;
const incomingCallConversation = getConversationController ( ) . get ( callerPubkey ) ;
if ( incomingCallConversation . isActive ( ) || incomingCallConversation . isHidden ( ) ) {
if ( incomingCallConversation . isActive ( ) || incomingCallConversation . isHidden ( ) ) {
@ -1287,44 +1322,25 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
await incomingCallConversation . unhideIfNeeded ( false ) ;
await incomingCallConversation . unhideIfNeeded ( false ) ;
}
}
// Note: Missed call messages are expiring with our side of the conversation settings.
// Note: Missed call messages should be sent with DaR setting or off. Don't enforce it here.
// if it's set to something, apply it to the missed message we are creating
const expirationMode = incomingCallConversation . getExpirationMode ( ) ;
const expireTimer = incomingCallConversation . getExpireTimer ( ) || 0 ;
let expirationType ;
let expirationStartTimestamp ;
if ( incomingCallConversation && expirationMode && expireTimer > 0 ) {
let msgModel = await incomingCallConversation ? . addSingleIncomingMessage ( {
// TODO legacy messages support will be removed in a future release
expirationType = DisappearingMessages . changeToDisappearingMessageType (
incomingCallConversation ,
expireTimer ,
expirationMode
) ;
if (
expirationMode === 'legacy' ||
expirationMode === 'deleteAfterSend' ||
expirationMode === 'deleteAfterRead'
) {
expirationStartTimestamp = DisappearingMessages . setExpirationStartTimestamp (
expirationMode ,
sentAt ,
'addMissedCallMessage'
) ;
}
}
await incomingCallConversation ? . addSingleIncomingMessage ( {
callNotificationType : 'missed-call' ,
callNotificationType : 'missed-call' ,
source : callerPubkey ,
source : callerPubkey ,
sent_at : sentAt ,
sent_at : sentAt ,
received_at : GetNetworkTime.getNowWithNetworkOffset ( ) ,
received_at : GetNetworkTime.getNowWithNetworkOffset ( ) ,
unread : READ_MESSAGE_STATE.unread ,
unread : READ_MESSAGE_STATE.unread ,
expirationType ,
messageHash : details?.messageHash ,
expireTimer ,
expirationStartTimestamp ,
} ) ;
} ) ;
msgModel = DisappearingMessages . getMessageReadyToDisappear (
incomingCallConversation ,
msgModel ,
0 ,
details ? . expireDetails
) ;
await msgModel . commit ( ) ;
} }
function getOwnerOfCallUUID ( callUUID : string ) { function getOwnerOfCallUUID ( callUUID : string ) {
@ -1344,7 +1360,8 @@ function getOwnerOfCallUUID(callUUID: string) {
export async function handleCallTypeAnswer ( export async function handleCallTypeAnswer (
sender : string ,
sender : string ,
callMessage : SignalService.CallMessage ,
callMessage : SignalService.CallMessage ,
envelopeTimestamp : number
envelopeTimestamp : number ,
expireDetails : ( WithOptExpireUpdate & WithMessageHash ) | null
) { ) {
if ( ! callMessage . sdps || callMessage . sdps . length === 0 ) {
if ( ! callMessage . sdps || callMessage . sdps . length === 0 ) {
window . log . warn ( 'cannot handle answered message without signal description proto sdps' ) ;
window . log . warn ( 'cannot handle answered message without signal description proto sdps' ) ;
@ -1392,7 +1409,11 @@ export async function handleCallTypeAnswer(
}
}
window . log . info ( ` handling callMessage ANSWER from ${ callMessageUUID } ` ) ;
window . log . info ( ` handling callMessage ANSWER from ${ callMessageUUID } ` ) ;
const cachedMessage = getCachedMessageFromCallMessage ( callMessage , envelopeTimestamp ) ;
const cachedMessage = getCachedMessageFromCallMessage (
callMessage ,
envelopeTimestamp ,
expireDetails
) ;
pushCallMessageToCallCache ( sender , callMessageUUID , cachedMessage ) ;
pushCallMessageToCallCache ( sender , callMessageUUID , cachedMessage ) ;
@ -1437,7 +1458,7 @@ export async function handleCallTypeIceCandidates(
return ;
return ;
}
}
window . log . info ( 'handling callMessage ICE_CANDIDATES' ) ;
window . log . info ( 'handling callMessage ICE_CANDIDATES' ) ;
const cachedMessage = getCachedMessageFromCallMessage ( callMessage , envelopeTimestamp ;
const cachedMessage = getCachedMessageFromCallMessage ( callMessage , envelopeTimestamp , null ); // we don't care about the expiredetails of those messages
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMessage ) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMessage ) ;
if ( currentCallUUID && callMessage . uuid === currentCallUUID ) {
if ( currentCallUUID && callMessage . uuid === currentCallUUID ) {
@ -1478,7 +1499,7 @@ export async function handleOtherCallTypes(
window . log . warn ( 'handleOtherCallTypes has no valid uuid' ) ;
window . log . warn ( 'handleOtherCallTypes has no valid uuid' ) ;
return ;
return ;
}
}
const cachedMessage = getCachedMessageFromCallMessage ( callMessage , envelopeTimestamp ;
const cachedMessage = getCachedMessageFromCallMessage ( callMessage , envelopeTimestamp , null ); // we don't care about the expireDetails of those other messages
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMessage ) ;
pushCallMessageToCallCache ( sender , remoteCallUUID , cachedMessage ) ;
} }
Audric Ackermann
1 year ago