packages/media-signaling/src/lib/services/webrtc/LocalStream.ts (1)

13-16: Guard for non‑audio tracks is in place — good.

Matches earlier feedback and prevents misrouting video to audio sender.

packages/media-signaling/src/lib/services/webrtc/LocalStream.ts (3)

27-29: Surface replaceTrack failures and include track id in logs.

Catch and log errors to avoid unhandled rejections; add context to debug logs.

-		this.logger?.debug('LocalStream.setRemoteTrack');
-		await this.audioTransceiver.sender.replaceTrack(newTrack);
+		this.logger?.debug('LocalStream.setRemoteTrack', newTrack ? newTrack.id : null);
+		try {
+			await this.audioTransceiver.sender.replaceTrack(newTrack);
+		} catch (err) {
+			this.logger?.error('LocalStream.replaceTrack failed', err);
+			throw err;
+		}

---

14-16: Remove redundant optional chaining.

newTrack is already truthy; ?. is unnecessary.

-		if (newTrack && newTrack?.kind !== 'audio') {
+		if (newTrack && newTrack.kind !== 'audio') {

---

10-10: Consider sendonly for the local audio transceiver.

If receiving is handled elsewhere (e.g., a dedicated RemoteStream), prefer sendonly to avoid accidental coupling.

-		this.audioTransceiver = this.peer.addTransceiver('audio', { direction: 'sendrecv' });
+		this.audioTransceiver = this.peer.addTransceiver('audio', { direction: 'sendonly' });

packages/media-signaling/src/lib/services/webrtc/Stream.ts (4)

30-32: Release mic resources on stop.

Stopping tracks before removal avoids lingering device capture and improves UX/privacy.

  public stopAudio(): void {
-		this.removeAudioTracks();
+		// Stop local audio tracks to release the microphone, then remove them
+		this.mediaStream.getAudioTracks().forEach((track) => {
+			try {
+				track.stop();
+			} catch {}
+		});
+		this.removeAudioTracks();
  }

---

34-43: Drop impossible null checks in toggleAudioTracks.

getAudioTracks() yields MediaStreamTrack[]; the !track guard is dead code.

  protected toggleAudioTracks(): void {
    this.logger?.debug('Stream.toggleAudioTracks', this.enabled);
-    this.mediaStream.getAudioTracks().forEach((track) => {
-      if (!track) {
-        return;
-      }
-
-      track.enabled = this.enabled;
-    });
+    this.mediaStream.getAudioTracks().forEach((track) => {
+      track.enabled = this.enabled;
+    });
  }

---

45-54: Same here: remove redundant null guard in removeAudioTracks.

  protected removeAudioTracks(): void {
    this.logger?.debug('Stream.removeAudioTracks');
-    this.mediaStream.getAudioTracks().forEach((track) => {
-      if (!track) {
-        return;
-      }
-
-      this.mediaStream.removeTrack(track);
-    });
+    this.mediaStream.getAudioTracks().forEach((track) => {
+      this.mediaStream.removeTrack(track);
+    });
  }

---

56-73: Clarify setAudioTrack return semantics.

A boolean conflates “invalid kind” vs “already present”. Consider a discriminated union for clearer call‑site logic. Non‑blocking.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

packages/media-signaling/src/lib/services/webrtc/Processor.ts (4)

318-320: Sanitize ICE candidate logging and avoid counting null end-of-candidates.

Avoid logging IPs/ports; also don’t increment on null candidates.

Apply this diff:

-		this.config.logger?.debug('MediaCallWebRTCProcessor.onIceCandidate', event.candidate);
-		this.iceCandidateCount++;
+		const c = event.candidate;
+		this.config.logger?.debug('MediaCallWebRTCProcessor.onIceCandidate', c ? { protocol: c.protocol, sdpMLineIndex: c.sdpMLineIndex } : null);
+		if (c) {
+			this.iceCandidateCount++;
+		}

---

100-107: Reset ICE wait state on non-restart offers too.

Without startNewNegotiation() when iceRestart is false, iceGatheringFinished may remain true and skip waiting for ICE.

Apply this diff:

 		if (iceRestart) {
 			this.restartIce();
+		} else {
+			this.startNewNegotiation();
 		}
 
 		const offer = await this.peer.createOffer();

---

222-235: Don’t fail on ICE timeout; proceed with available candidates.

Let offers/answers continue with partial ICE; surface timeout via state instead of throwing.

Apply this diff:

-		await this.waitForIceGathering();
+		try {
+			await this.waitForIceGathering();
+		} catch (e) {
+			if ((e as Error).message !== 'timeout') {
+				throw e;
+			}
+			// Continue with partial/no candidates; state already reflects timeout.
+		}

---

396-400: Initialize flag only after successful track setup.

Setting localMediaStreamInitialized = true before await setTrack(...) can leave a false-positive initialized state if it throws.

Apply this diff:

 	private async loadInputTrack(): Promise<void> {
 		this.config.logger?.debug('MediaCallWebRTCProcessor.loadInputTrack');
-		this.localMediaStreamInitialized = true;
-		await this.localStream.setTrack(this.inputTrack);
+		await this.localStream.setTrack(this.inputTrack);
+		this.localMediaStreamInitialized = true;
 	}

packages/media-signaling/src/lib/Call.ts (1)

671-676: Emit the new client state (not the old one).

Event consumers expect the current state; emitting oldClientState is misleading.

Apply this diff:

 		this.updateStateTimeouts();
 		this.requestStateReport();
 		this.oldClientState = clientState;
-		this.emitter.emit('clientStateChange', oldClientState);
+		this.emitter.emit('clientStateChange', clientState);

packages/media-signaling/src/lib/services/webrtc/LocalStream.ts (1)

27-42: Stabilize audio sender lookup across replaceTrack(null) to avoid extra transceivers.

After you start detaching with replaceTrack(null), peer.getSenders().find(s => s.track?.kind === 'audio') won’t find the sender and you’ll create new transceivers. Persist and reuse the known audio transceiver/sender.

Within this method, prefer the known sender and fall back to discovery; persist the transceiver when first created:

-		const sender = this.peer.getSenders().find((sender) => sender.track?.kind === 'audio');
+		const knownSender = this.transceiver?.sender ?? null;
+		let sender = knownSender ?? this.peer.getSenders().find((s) => s.track?.kind === 'audio') ?? null;
 		if (!sender) {
 			if (newTrack) {
 				this.logger?.debug('LocalStream.setRemoteTrack.addTrack');
 				// This will require a re-negotiation
-				this.peer.addTrack(newTrack, this.mediaStream);
+				const added = this.peer.addTrack(newTrack, this.mediaStream);
+				this.transceiver = this.peer.getTransceivers().find((t) => t.sender === added) ?? this.transceiver;
 			}
 			return;
 		}
 
 		// If the peer already has a track of the same kind, we can just replace it with the new track with no issues
 		await sender.replaceTrack(newTrack);
+		this.transceiver ??= this.peer.getTransceivers().find((t) => t.sender === sender) ?? null;

And add this field to the class:

private transceiver: RTCRtpTransceiver | null = null;

packages/media-signaling/src/lib/Call.ts (3)

709-712: Clarify targeting vs signature error in logs.

This branch fires when the signal isn’t targeted to this session; it’s not an “unsigned offer request”. Downgrade to debug or fix the message.

-			this.config.logger?.error('Received an unsigned offer request.');
+			this.config.logger?.debug('Offer request not targeted to this session. Ignoring.');

---

1100-1106: Verify contract/session id used for signal targeting.

Server signals use toContractId. This compares against config.sessionId, but Transport uses transporter.contractId. Mismatch will drop valid signals.

Proposed change:

-		if (signal.toContractId) {
-			return signal.toContractId === this.config.sessionId;
-		}
+		if (signal.toContractId) {
+			return signal.toContractId === this.config.transporter.contractId;
+		}

If sessionId is indeed the same value, please confirm and add a doc comment tying both together.

---

645-647: Confirm event payload semantics for stateChange.

Docs say “with the old state as param”. If that’s intentional, fine; otherwise switch to new state for consistency with clientStateChange.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

packages/models/src/models/MediaCalls.ts (1)

40-53: Caller-scoped lookup fixes the prior auth confusion.

Looks good and addresses the earlier $or bypass risk by scoping to caller.

packages/models/src/models/MediaCalls.ts (6)

29-37: Add an index for expiry scans; consider uniqueness for callerRequestedId.

• findAllExpiredCalls filters by ended + expiresAt but current compound index is ended,uids,expiresAt. Without uids equality, the query won’t leverage the expiresAt range. Add a supporting index.
• If semantics require a single callerRequestedId per caller, make that composite sparse index unique to prevent ambiguous matches.

Apply:

 			{
-				key: { 'caller.type': 1, 'caller.id': 1, 'callerRequestedId': 1 },
-				sparse: true,
+				key: { 'caller.type': 1, 'caller.id': 1, 'callerRequestedId': 1 },
+				unique: true, // enforce one requestedId per caller
+				sparse: true,
 			},
+			// Supports ended + expiresAt range scans used by findAllExpiredCalls
+			{ key: { ended: 1, expiresAt: 1 }, unique: false },

If uniqueness is not desired, omit the unique flag; otherwise confirm no existing duplicates before rollout.

---

63-71: Gate ringing transition on not-ended.

Prevent state changes on already-ended calls.

 		return this.updateOne(
 			{
 				_id: callId,
-				state: 'none',
+				state: 'none',
+				ended: false,
 			},
 			{ $set: { state: 'ringing', expiresAt } },
 		);

---

73-89: Accept transition should also ensure not-ended; verify callee.contractId schema.

• Add ended: false to the filter for robustness.
• Confirm MediaCallContactInformation defines contractId to avoid schema drift.

 			{
 				_id: callId,
 				state: { $in: ['none', 'ringing'] },
+				ended: false,
 			},
 			{
 				$set: {
-					'state': 'accepted',
+					state: 'accepted',
 					'callee.contractId': calleeContractId,
 					expiresAt,
 				},
 			},

---

91-104: Activate transition should ensure not-ended.

Add ended: false to avoid re-activating a call that raced to hangup/expire.

 			{
 				_id: callId,
 				state: 'accepted',
+				ended: false,
 			},

---

138-157: Block transfers on ended calls.

Guard on ended: false alongside state and transferredAt checks.

 			{
 				_id: callId,
-				state: {
-					$in: ['accepted', 'active'],
-				},
-				transferredAt: {
-					$exists: false,
-				},
+				state: { $in: ['accepted', 'active'] },
+				ended: false,
+				transferredAt: { $exists: false },
 			},

---

159-169: This query will benefit from ended+expiresAt index.

As written, it can’t use the expiresAt range efficiently with the current ended,uids,expiresAt index. The additional { ended: 1, expiresAt: 1 } index proposed above will optimize this path.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.