Skip to content

Add guard for stale call ringing [WPB-27813] #22360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zskhan wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add guard for stale call ringing [WPB-27813] #22360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 111 additions & 0 deletions apps/webapp/src/script/repositories/calling/CallingRepository.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,117 @@ describe('CallingRepository ISO', () => {
return avsCall && avsCall.destroy(avsUser);
});

it('forwards a fresh incoming SETUP request to AVS', async () => {
const currentTimestamp = new Date('2026-01-20T20:00:31.000Z').getTime();
const freshEventTimestamp = currentTimestamp - 21_000;
const selfUser = new User(createUuid(), '', translateForTest);
selfUser.isMe = true;

const conversation = new Conversation(createUuid(), '', CONVERSATION_PROTOCOL.PROTEUS, translateForTest);
const {repository: callingRepo} = createCallingRepositoryForTest({
conversationState: {
findConversation: jest.fn().mockImplementation(() => conversation),
participating_user_ets: jest.fn(),
} as unknown as ConversationState,
serverTimeHandler: {
toServerTimestamp: jest.fn().mockReturnValue(currentTimestamp),
},
});

const avs = await callingRepo.initAvs(selfUser, createUuid());
avsUser = avs.wUser;
avsCall = avs.wCall;
const recvMsgSpy = jest.spyOn(avsCall, 'recvMsg').mockReturnValue(0);
recvMsgSpy.mockClear();

const event = {
content: {resp: false, type: CALL_MESSAGE_TYPE.SETUP, version: '3.0'},
conversation: conversation.id,
from: createUuid(),
sender: createUuid(),
time: new Date(freshEventTimestamp).toISOString(),
type: CALL.E_CALL,
} as CallingEvent;

await callingRepo.onCallEvent(event, '');

expect(recvMsgSpy).toHaveBeenCalled();
});

it('ignores an incoming SETUP event that was received hours ago', async () => {
const currentTimestamp = new Date('2026-01-20T20:00:31.000Z').getTime();
const staleEventTimestamp = currentTimestamp - 31_000;
const selfUser = new User(createUuid(), '', translateForTest);
selfUser.isMe = true;

const conversation = new Conversation(createUuid(), '', CONVERSATION_PROTOCOL.PROTEUS, translateForTest);
const {repository: callingRepo} = createCallingRepositoryForTest({
conversationState: {
findConversation: jest.fn().mockImplementation(() => conversation),
participating_user_ets: jest.fn(),
} as unknown as ConversationState,
serverTimeHandler: {
toServerTimestamp: jest.fn().mockReturnValue(currentTimestamp),
},
});

const avs = await callingRepo.initAvs(selfUser, createUuid());
avsUser = avs.wUser;
avsCall = avs.wCall;
const recvMsgSpy = jest.spyOn(avsCall, 'recvMsg').mockReturnValue(0);
recvMsgSpy.mockClear();

const event = {
content: {resp: false, type: CALL_MESSAGE_TYPE.SETUP, version: '3.0'},
conversation: conversation.id,
from: createUuid(),
sender: createUuid(),
time: new Date(staleEventTimestamp).toISOString(),
type: CALL.E_CALL,
} as CallingEvent;

await callingRepo.onCallEvent(event, '');

expect(recvMsgSpy).not.toHaveBeenCalled();
});

it('forwards a stale SETUP response to AVS', async () => {
const currentTimestamp = new Date('2026-01-20T20:00:31.000Z').getTime();
const staleEventTimestamp = currentTimestamp - 31_000;
const selfUser = new User(createUuid(), '', translateForTest);
selfUser.isMe = true;

const conversation = new Conversation(createUuid(), '', CONVERSATION_PROTOCOL.PROTEUS, translateForTest);
const {repository: callingRepo} = createCallingRepositoryForTest({
conversationState: {
findConversation: jest.fn().mockImplementation(() => conversation),
participating_user_ets: jest.fn(),
} as unknown as ConversationState,
serverTimeHandler: {
toServerTimestamp: jest.fn().mockReturnValue(currentTimestamp),
},
});

const avs = await callingRepo.initAvs(selfUser, createUuid());
avsUser = avs.wUser;
avsCall = avs.wCall;
const recvMsgSpy = jest.spyOn(avsCall, 'recvMsg').mockReturnValue(0);
recvMsgSpy.mockClear();

const event = {
content: {resp: true, type: CALL_MESSAGE_TYPE.SETUP, version: '3.0'},
conversation: conversation.id,
from: createUuid(),
sender: createUuid(),
time: new Date(staleEventTimestamp).toISOString(),
type: CALL.E_CALL,
} as CallingEvent;

await callingRepo.onCallEvent(event, '');

expect(recvMsgSpy).toHaveBeenCalled();
});

it('creates and stores a new call when an incoming call arrives', async () => {
const selfUser = new User(createUuid(), '', translateForTest);
selfUser.isMe = true;
Expand Down
16 changes: 14 additions & 2 deletions apps/webapp/src/script/repositories/calling/CallingRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ import {BackgroundEffectsHandler} from 'Repositories/media/backgroundEffectsHand
import type {MediaDevicesHandler} from 'Repositories/media/MediaDevicesHandler';
import type {MediaStreamHandler} from 'Repositories/media/MediaStreamHandler';
import {MediaType} from 'Repositories/media/MediaType';
import {backgroundEffectsStore, BackgroundEffectsQuality} from 'Repositories/media/useBackgroundEffectsStore';
import {BackgroundEffectsQuality, backgroundEffectsStore} from 'Repositories/media/useBackgroundEffectsStore';
import type {BackgroundEffectSelection, BackgroundSource} from 'Repositories/media/VideoBackgroundEffects';
import {TeamState} from 'Repositories/team/TeamState';
import {EventName} from 'Repositories/tracking/eventName';
Expand Down Expand Up @@ -1149,8 +1149,20 @@ export class CallingRepository {
} = event;
const contentStr = JSON.stringify(content);
const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
const eventTimestamp = new Date(time).getTime();
const toSecond = (timestamp: number) => Math.floor(timestamp / 1000);

if (
content.type === CALL_MESSAGE_TYPE.SETUP &&
content.resp === false &&
currentTimestamp - eventTimestamp > EventRepository.CONFIG.E_CALL_EVENT_LIFETIME
) {
this.logger.warn(
`Ignoring stale incoming call SETUP: age=${currentTimestamp - eventTimestamp}ms conversation=${conversation.id}`,
);
return;

@EnricoSchw EnricoSchw Sep 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh... we should not filter oute site AVS. Because you have different state machines..

}

const isFederated = this.core.backendFeatures.isFederated && qualified_conversation && qualified_from;
const userId = isFederated ? qualified_from : {domain: '', id: from};

Expand All @@ -1164,7 +1176,7 @@ export class CallingRepository {
contentStr,
contentStr.length,
toSecond(currentTimestamp),
toSecond(new Date(time).getTime()),
toSecond(eventTimestamp),
this.serializeQualifiedId(conversation.qualifiedId),
this.serializeQualifiedId(userId),
conversation && isMLSConversation(conversation) ? senderClientId : clientId,
Expand Down
4 changes: 3 additions & 1 deletion apps/webapp/src/script/repositories/event/CallingEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ type CallingEventContent = {
emojis: InCallEmojiType;
isHandUp: boolean;
}
: {type: EventType; version: string};
: EventType extends CALL_MESSAGE_TYPE.SETUP
? {type: EventType; version: string; resp: boolean}
: {type: EventType; version: string};
}[CALL_MESSAGE_TYPE];

export interface CallingEvent {
Expand Down
Loading