applying changes from code review

Author: pierre-lehnen-rc

apps/meteor/app/api/server/v1/media-calls.ts

@@ -1,6 +1,6 @@
 import { MediaCall } from '@rocket.chat/core-services';
 import type { IMediaCall } from '@rocket.chat/core-typings';
-import type { ServerMediaSignal } from '@rocket.chat/media-signaling';
+import type { ServerMediaCallSignal } from '@rocket.chat/media-signaling';
 import { MediaCalls } from '@rocket.chat/models';
 import {
 	ajv,
@@ -77,7 +77,7 @@ const mediaCallsStateEndpoints = API.v1
 		{
 			response: {
 				200: ajv.compile<{
-					signals: ServerMediaSignal[];
+					signals: ServerMediaCallSignal[];
 				}>({
 					additionalProperties: false,
 					type: 'object',

apps/meteor/server/services/media-call/service.ts

@@ -72,10 +72,10 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 		}
 	}
 
-	public async getUserStateSignals(uid: IUser['_id'], contractId: string): Promise<ServerMediaSignal[]> {
+	public async getUserStateSignals(uid: IUser['_id'], contractId: string): Promise<ServerMediaCallSignal[]> {
 		const calls = await MediaCalls.findAllNotOverByUid(uid).toArray();
 
-		const signals: ServerMediaSignal[] = [];
+		const signals: ServerMediaCallSignal[] = [];
 		for (const call of calls) {
 			const callSignals = await getSignalsForExistingCall(call, uid, contractId);
 			signals.push(...callSignals);

ee/packages/media-calls/src/server/signals/getInitialOfferSignal.ts

@@ -3,18 +3,13 @@ import type { CallRole, ServerMediaSignalRemoteSDP } from '@rocket.chat/media-si
 import { MediaCallNegotiations } from '@rocket.chat/models';
 
 export async function getInitialOfferSignal(call: IMediaCall, role: CallRole): Promise<ServerMediaSignalRemoteSDP | null> {
-	// Since the initial offer is always provided by the caller, they don't need to receive it from the server
-	if (role !== 'callee') {
-		return null;
-	}
-
 	const { [role]: actor } = call;
 	if (!actor.contractId) {
 		return null;
 	}
 
 	const negotiation = await MediaCallNegotiations.findLatestByCallId(call._id);
-	if (!negotiation?.offer) {
+	if (!negotiation?.offer || negotiation.offerer === role) {
 		return null;
 	}
 

packages/core-services/src/types/IMediaCallService.ts

@@ -1,9 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import type { ClientMediaSignal, ServerMediaSignal } from '@rocket.chat/media-signaling';
+import type { ClientMediaSignal, ServerMediaCallSignal } from '@rocket.chat/media-signaling';
 
 export interface IMediaCallService {
 	processSignal(fromUid: IUser['_id'], signal: ClientMediaSignal): Promise<void>;
 	processSerializedSignal(fromUid: IUser['_id'], signal: string): Promise<void>;
 	hangupExpiredCalls(): Promise<void>;
-	getUserStateSignals(uid: IUser['_id'], contractId: string): Promise<ServerMediaSignal[]>;
+	getUserStateSignals(uid: IUser['_id'], contractId: string): Promise<ServerMediaCallSignal[]>;
 }

packages/media-signaling/src/lib/Session.ts

@@ -699,6 +699,7 @@ export class MediaSignalingSession extends Emitter<MediaSignalingEvents> {
 		if (!this.registration.active) {
 			if (hadCall) {
 				this.emit('endedCall');
+				this.lastState.hasCall = false;
 			}
 			this.config.logger?.debug('skipping session events on inactive session');
 			return;