mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Track acceptedTime during call, fix call screen duration

Browse source
This commit is contained in:
Jamie Kyle 2023-09-20 07:00:01 -07:00 committed by GitHub
parent 95b0f67a47
commit bc67d421ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 92 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/components/CallManager.tsx
View file

@ -149,7 +149,6 @@ function ActiveCallManager({
conversation,
hasLocalAudio,
hasLocalVideo,
joinedAt,
peekedParticipants,
pip,
presentingSourcesAvailable,
@ -327,7 +326,6 @@ function ActiveCallManager({
groupMembers={groupMembers}
hangUpActiveCall={hangUpActiveCall}
i18n={i18n}
joinedAt={joinedAt}
me={me}
openSystemPreferencesAction={openSystemPreferencesAction}
setGroupCallVideoRequest={setGroupCallVideoRequestForConversation}

8
ts/components/CallScreen.tsx
View file

@ -57,7 +57,6 @@ export type PropsType = {
groupMembers?: Array<Pick<ConversationType, 'id' | 'firstName' | 'title'>>;
hangUpActiveCall: (reason: string) => void;
i18n: LocalizerType;
joinedAt?: number;
me: ConversationType;
openSystemPreferencesAction: () => unknown;
setGroupCallVideoRequest: (
@ -82,7 +81,7 @@ export type PropsType = {
type DirectCallHeaderMessagePropsType = {
i18n: LocalizerType;
callState: CallState;
joinedAt?: number;
joinedAt: number | null;
};
export const isInSpeakerView = (
@ -104,7 +103,7 @@ function DirectCallHeaderMessage({
>();
useEffect(() => {
if (!joinedAt) {
if (joinedAt == null) {
return noop;
}
// It's really jumpy with a value of 500ms.
@ -136,7 +135,6 @@ export function CallScreen({
groupMembers,
hangUpActiveCall,
i18n,
joinedAt,
me,
openSystemPreferencesAction,
setGroupCallVideoRequest,
@ -289,7 +287,7 @@ export function CallScreen({
<DirectCallHeaderMessage
i18n={i18n}
callState={activeCall.callState || CallState.Prering}
joinedAt={joinedAt}
joinedAt={activeCall.joinedAt}
/>
);
headerTitle = isRinging ? undefined : conversation.title;

7
ts/services/calling.ts
View file

@ -2101,8 +2101,14 @@ export class CallingClass {
return;
}
let acceptedTime: number | null = null;
// eslint-disable-next-line no-param-reassign
call.handleStateChanged = async () => {
if (call.state === CallState.Accepted) {
acceptedTime = acceptedTime ?? Date.now();
}
if (call.state === CallState.Ended) {
this.stopDeviceReselectionTimer();
this.lastMediaDeviceSettings = undefined;
@ -2121,6 +2127,7 @@ export class CallingClass {
conversationId: conversation.id,
callState: call.state,
callEndedReason: call.endedReason,
acceptedTime,
});
};

10
ts/state/ducks/calling.ts
View file

@ -121,7 +121,7 @@ export type ActiveCallStateType = {
hasLocalVideo: boolean;
localAudioLevel: number;
viewMode: CallViewMode;
joinedAt?: number;
joinedAt: number | null;
outgoingRing: boolean;
pip: boolean;
presentingSource?: PresentedSource;
@ -150,7 +150,7 @@ export type AcceptCallType = ReadonlyDeep<{
export type CallStateChangeType = ReadonlyDeep<{
conversationId: string;
acceptedTime?: number;
acceptedTime: number | null;
callState: CallState;
callEndedReason?: CallEndedReason;
}>;
@ -1647,6 +1647,7 @@ export function reducer(
settingsDialogOpen: false,
showParticipantsList: false,
outgoingRing,
joinedAt: null,
},
};
}
@ -1675,6 +1676,7 @@ export function reducer(
settingsDialogOpen: false,
showParticipantsList: false,
outgoingRing: true,
joinedAt: null,
},
};
}
@ -1698,6 +1700,7 @@ export function reducer(
settingsDialogOpen: false,
showParticipantsList: false,
outgoingRing: false,
joinedAt: null,
},
};
}
@ -1852,6 +1855,7 @@ export function reducer(
settingsDialogOpen: false,
showParticipantsList: false,
outgoingRing: true,
joinedAt: null,
},
};
}
@ -1882,7 +1886,7 @@ export function reducer(
) {
activeCallState = {
...state.activeCallState,
joinedAt: action.payload.acceptedTime,
joinedAt: action.payload.acceptedTime ?? null,
};
} else {
({ activeCallState } = state);

9
ts/state/smart/CallManager.tsx
View file

@ -14,7 +14,10 @@ import type { ConversationType } from '../ducks/conversations';
import { getIncomingCall } from '../selectors/calling';
import { isGroupCallOutboundRingEnabled } from '../../util/isGroupCallOutboundRingEnabled';
import type {
ActiveCallBaseType,
ActiveCallType,
ActiveDirectCallType,
ActiveGroupCallType,
GroupCallRemoteParticipantType,
} from '../../types/Calling';
import { isAciString } from '../../util/isAciString';
@ -138,7 +141,7 @@ const mapStateToActiveCallProp = (
return convoForAci ? conversationSelector(convoForAci.id) : undefined;
});
const baseResult = {
const baseResult: ActiveCallBaseType = {
conversation,
hasLocalAudio: activeCallState.hasLocalAudio,
hasLocalVideo: activeCallState.hasLocalVideo,
@ -185,7 +188,7 @@ const mapStateToActiveCallProp = (
serviceId: conversation.serviceId,
},
],
};
} satisfies ActiveDirectCallType;
case CallMode.Group: {
const conversationsWithSafetyNumberChanges: Array<ConversationType> = [];
const groupMembers: Array<ConversationType> = [];
@ -282,7 +285,7 @@ const mapStateToActiveCallProp = (
peekedParticipants,
remoteParticipants,
remoteAudioLevels: call.remoteAudioLevels || new Map<number, number>(),
};
} satisfies ActiveGroupCallType;
}
default:
throw missingCaseError(call);

115
ts/test-electron/state/ducks/calling_test.ts
View file

@ -4,12 +4,16 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { cloneDeep, noop } from 'lodash';
import type { PeekInfo } from '@signalapp/ringrtc';
import type { StateType as RootStateType } from '../../../state/reducer';
import { reducer as rootReducer } from '../../../state/reducer';
import { noopAction } from '../../../state/ducks/noop';
import type {
ActiveCallStateType,
CallingStateType,
DirectCallStateType,
GroupCallStateChangeActionType,
GroupCallStateType,
} from '../../../state/ducks/calling';
import {
actions,
@ -33,25 +37,30 @@ import type { UnwrapPromise } from '../../../types/Util';
const ACI_1 = generateAci();
type CallingStateTypeWithActiveCall = CallingStateType & {
activeCallState: ActiveCallStateType;
};
describe('calling duck', () => {
const directCallState: DirectCallStateType = {
callMode: CallMode.Direct,
conversationId: 'fake-direct-call-conversation-id',
callState: CallState.Accepted,
isIncoming: false,
isVideoCall: false,
hasRemoteVideo: false,
};
const stateWithDirectCall: CallingStateType = {
...getEmptyState(),
callsByConversation: {
'fake-direct-call-conversation-id': {
callMode: CallMode.Direct as CallMode.Direct,
conversationId: 'fake-direct-call-conversation-id',
callState: CallState.Accepted,
isIncoming: false,
isVideoCall: false,
hasRemoteVideo: false,
},
[directCallState.conversationId]: directCallState,
},
};
const stateWithActiveDirectCall = {
const stateWithActiveDirectCall: CallingStateTypeWithActiveCall = {
...stateWithDirectCall,
activeCallState: {
conversationId: 'fake-direct-call-conversation-id',
conversationId: directCallState.conversationId,
hasLocalAudio: true,
hasLocalVideo: false,
localAudioLevel: 0,
@ -61,20 +70,21 @@ describe('calling duck', () => {
outgoingRing: true,
pip: false,
settingsDialogOpen: false,
joinedAt: null,
},
};
const stateWithIncomingDirectCall = {
const stateWithIncomingDirectCall: CallingStateType = {
...getEmptyState(),
callsByConversation: {
'fake-direct-call-conversation-id': {
callMode: CallMode.Direct as CallMode.Direct,
callMode: CallMode.Direct,
conversationId: 'fake-direct-call-conversation-id',
callState: CallState.Ringing,
isIncoming: true,
isVideoCall: false,
hasRemoteVideo: false,
},
} satisfies DirectCallStateType,
},
};
@ -83,11 +93,11 @@ describe('calling duck', () => {
const remoteAci = generateAci();
const ringerAci = generateAci();
const stateWithGroupCall = {
const stateWithGroupCall: CallingStateType = {
...getEmptyState(),
callsByConversation: {
'fake-group-call-conversation-id': {
callMode: CallMode.Group as CallMode.Group,
callMode: CallMode.Group,
conversationId: 'fake-group-call-conversation-id',
connectionState: GroupCallConnectionState.Connected,
joinState: GroupCallJoinState.NotJoined,
@ -109,11 +119,11 @@ describe('calling duck', () => {
videoAspectRatio: 4 / 3,
},
],
},
} satisfies GroupCallStateType,
},
};
const stateWithIncomingGroupCall = {
const stateWithIncomingGroupCall: CallingStateType = {
...stateWithGroupCall,
callsByConversation: {
...stateWithGroupCall.callsByConversation,
@ -127,7 +137,7 @@ describe('calling duck', () => {
},
};
const stateWithActiveGroupCall = {
const stateWithActiveGroupCall: CallingStateTypeWithActiveCall = {
...stateWithGroupCall,
activeCallState: {
conversationId: 'fake-group-call-conversation-id',
@ -140,18 +150,20 @@ describe('calling duck', () => {
outgoingRing: false,
pip: false,
settingsDialogOpen: false,
joinedAt: null,
},
};
const stateWithActivePresentationViewGroupCall = {
...stateWithGroupCall,
activeCallState: {
...stateWithActiveGroupCall.activeCallState,
viewMode: CallViewMode.Presentation,
},
};
const stateWithActivePresentationViewGroupCall: CallingStateTypeWithActiveCall =
{
...stateWithGroupCall,
activeCallState: {
...stateWithActiveGroupCall.activeCallState,
viewMode: CallViewMode.Presentation,
},
};
const stateWithActiveSpeakerViewGroupCall = {
const stateWithActiveSpeakerViewGroupCall: CallingStateTypeWithActiveCall = {
...stateWithGroupCall,
activeCallState: {
...stateWithActiveGroupCall.activeCallState,
@ -240,20 +252,18 @@ describe('calling duck', () => {
isSharingScreen: true,
};
const state = {
const state: CallingStateTypeWithActiveCall = {
...stateWithActiveDirectCall,
};
const nextState = reducer(state, remoteSharingScreenChange(payload));
const expectedState = {
const expectedState: CallingStateTypeWithActiveCall = {
...stateWithActiveDirectCall,
callsByConversation: {
'fake-direct-call-conversation-id': {
...stateWithActiveDirectCall.callsByConversation[
'fake-direct-call-conversation-id'
],
[directCallState.conversationId]: {
...directCallState,
isSharingScreen: true,
},
} satisfies DirectCallStateType,
},
};
@ -276,7 +286,7 @@ describe('calling duck', () => {
id: 'window:786',
name: 'Application',
};
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: {
...stateWithActiveGroupCall,
@ -301,7 +311,7 @@ describe('calling duck', () => {
id: 'window:786',
name: 'Application',
};
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: {
...stateWithActiveGroupCall,
@ -325,7 +335,7 @@ describe('calling duck', () => {
name: 'Application',
};
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: {
...stateWithActiveGroupCall,
@ -352,7 +362,7 @@ describe('calling duck', () => {
const dispatch = sinon.spy();
const { setPresenting } = actions;
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: {
...stateWithActiveGroupCall,
@ -386,7 +396,7 @@ describe('calling duck', () => {
});
describe('accepting a direct call', () => {
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: stateWithIncomingDirectCall,
});
@ -472,12 +482,13 @@ describe('calling duck', () => {
outgoingRing: false,
pip: false,
settingsDialogOpen: false,
});
joinedAt: null,
} satisfies ActiveCallStateType);
});
});
describe('accepting a group call', () => {
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: stateWithIncomingGroupCall,
});
@ -565,7 +576,8 @@ describe('calling duck', () => {
outgoingRing: false,
pip: false,
settingsDialogOpen: false,
});
joinedAt: null,
} satisfies ActiveCallStateType);
});
});
});
@ -677,7 +689,7 @@ describe('calling duck', () => {
});
describe('declining a direct call', () => {
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: stateWithIncomingDirectCall,
});
@ -735,7 +747,7 @@ describe('calling duck', () => {
});
describe('declining a group call', () => {
const getState = () => ({
const getState = (): RootStateType => ({
...getEmptyRootState(),
calling: stateWithIncomingGroupCall,
});
@ -1157,7 +1169,8 @@ describe('calling duck', () => {
outgoingRing: false,
pip: false,
settingsDialogOpen: false,
});
joinedAt: null,
} satisfies ActiveCallStateType);
});
it('if the call is active, updates the active call state', () => {
@ -1225,7 +1238,7 @@ describe('calling duck', () => {
});
it('stops ringing if someone enters the call', () => {
const state = {
const state: CallingStateType = {
...stateWithActiveGroupCall,
activeCallState: {
...stateWithActiveGroupCall.activeCallState,
@ -1328,7 +1341,7 @@ describe('calling duck', () => {
});
it('closes the PiP', () => {
const state = {
const state: CallingStateType = {
...stateWithActiveDirectCall,
activeCallState: {
...stateWithActiveDirectCall.activeCallState,
@ -1576,9 +1589,11 @@ describe('calling duck', () => {
noop,
() => {
const callingState = cloneDeep(stateWithGroupCall);
callingState.callsByConversation[
const call = callingState.callsByConversation[
'fake-group-call-conversation-id'
].peekInfo.deviceCount = 8;
] as GroupCallStateType;
const peekInfo = call.peekInfo as unknown as PeekInfo;
peekInfo.deviceCount = 8;
return { ...rootState, calling: callingState };
},
null
@ -1686,7 +1701,8 @@ describe('calling duck', () => {
pip: false,
settingsDialogOpen: false,
outgoingRing: true,
});
joinedAt: null,
} satisfies ActiveCallStateType);
});
it('saves a group call and makes it active', async () => {
@ -1972,6 +1988,7 @@ describe('calling duck', () => {
pip: false,
settingsDialogOpen: false,
outgoingRing: true,
joinedAt: null,
});
});

1
ts/test-electron/state/selectors/calling_test.ts
View file

@ -72,6 +72,7 @@ describe('state/selectors/calling', () => {
outgoingRing: true,
pip: false,
settingsDialogOpen: false,
joinedAt: null,
},
};

4
ts/types/Calling.ts
View file

@ -32,14 +32,14 @@ export type PresentedSource = {
name: string;
};
type ActiveCallBaseType = {
export type ActiveCallBaseType = {
conversation: ConversationType;
hasLocalAudio: boolean;
hasLocalVideo: boolean;
localAudioLevel: number;
viewMode: CallViewMode;
isSharingScreen?: boolean;
joinedAt?: number;
joinedAt: number | null;
outgoingRing: boolean;
pip: boolean;
presentingSource?: PresentedSource;