Skip to content

fix: preserve renegotiation signaling events #27

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

Merged
mertushka merged 1 commit into from
Jun 24, 2026
Merged

fix: preserve renegotiation signaling events #27

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
61 changes: 30 additions & 31 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2485,6 +2485,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._iceConnectionState = "new";
this._iceGatheringState = "new";
this._signalingState = "stable";
this._lastDispatchedSignalingState = "stable";
this._native = null;
this._nativeCertificates = null;
}
Expand Down Expand Up @@ -2805,8 +2806,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this.dispatchEvent(makeEvent("icegatheringstatechange"));
this._iceTransport()?.dispatchEvent(makeEvent("gatheringstatechange"));
}
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
if (this._suppressNextNativeSignalingState === "stable")
this._suppressNextNativeSignalingState = null;
Expand All @@ -2829,8 +2829,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._signalingState = "have-local-pranswer";
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand Down Expand Up @@ -2974,7 +2973,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._clearNegotiationNeededIfDataMLineIsPresent();
this._refreshIceRole();
if (manuallyUpdatedSignalingState && previousSignalingState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
this._dispatchSignalingStateChange();
if (appliedIceRestart) {
if (previousIceGatheringState === "complete") this._queueSyntheticIceRestartGathering();
this._clearIceRestartRequest();
Expand Down Expand Up @@ -3062,8 +3061,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._signalingState = "have-remote-pranswer";
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand Down Expand Up @@ -3104,8 +3102,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._signalingState = "stable";
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
if (this._suppressNextNativeSignalingState === "stable")
this._suppressNextNativeSignalingState = null;
Expand All @@ -3124,8 +3121,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._armDataChannelNativeCloseSuppression();
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand All @@ -3148,8 +3144,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._refreshIceRole();
this._assignDataChannelIdsFromDtlsRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand All @@ -3161,8 +3156,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._syncSignalingStateFromDescriptions();
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand All @@ -3180,8 +3174,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._refreshIceRole();
this._assignDataChannelIdsFromDtlsRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand All @@ -3204,7 +3197,7 @@ class RTCPeerConnection extends SimpleEventTarget {
}
this._refreshIceRole();
this._updateSctpTransport();
this.dispatchEvent(makeEvent("signalingstatechange"));
this._dispatchSignalingStateChange();
await nextTask();
return;
}
Expand Down Expand Up @@ -3251,7 +3244,7 @@ class RTCPeerConnection extends SimpleEventTarget {
if (previousSignalingState !== this._signalingState) {
suppressedNativeSignalingState = this._signalingState;
this._suppressNextNativeSignalingState = suppressedNativeSignalingState;
this.dispatchEvent(makeEvent("signalingstatechange"));
this._dispatchSignalingStateChange();
}
if (normalized.type !== "offer") {
for (const candidate of this._pendingIce.splice(0)) await this.addIceCandidate(candidate);
Expand Down Expand Up @@ -3385,7 +3378,7 @@ class RTCPeerConnection extends SimpleEventTarget {
for (const channel of this._channels.values()) {
if (channel.readyState !== "closed") channel._handleClose();
}
this.dispatchEvent(makeEvent("signalingstatechange"));
this._dispatchSignalingStateChange();
this.dispatchEvent(makeEvent("iceconnectionstatechange"));
this.dispatchEvent(makeEvent("connectionstatechange"));
}
Expand Down Expand Up @@ -4132,6 +4125,11 @@ class RTCPeerConnection extends SimpleEventTarget {
this._signalingState = this._descriptionSignalingState();
}

_dispatchSignalingStateChange() {
this._lastDispatchedSignalingState = this._signalingState;
this.dispatchEvent(makeEvent("signalingstatechange"));
}

_setPendingLocalDescription(description) {
this._pendingLocalDescription = description;
this._localDescription = description || this._currentLocalDescription;
Expand Down Expand Up @@ -4192,8 +4190,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this.dispatchEvent(makeEvent("icegatheringstatechange"));
this._iceTransport()?.dispatchEvent(makeEvent("gatheringstatechange"));
}
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
if (this._suppressNextNativeSignalingState === "stable")
this._suppressNextNativeSignalingState = null;
Expand Down Expand Up @@ -4436,8 +4433,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._signalingState = "stable";
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
}

Expand All @@ -4449,8 +4445,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._syncSignalingStateFromDescriptions();
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
}

Expand All @@ -4464,8 +4459,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._syncSignalingStateFromDescriptions();
this._refreshIceRole();
this._updateSctpTransport();
if (previousState !== this._signalingState)
this.dispatchEvent(makeEvent("signalingstatechange"));
if (previousState !== this._signalingState) this._dispatchSignalingStateChange();
await nextTask();
}

Expand All @@ -4484,7 +4478,7 @@ class RTCPeerConnection extends SimpleEventTarget {
this._clearNegotiationNeededIfDataMLineIsPresent();
this._refreshIceRole();
this._updateSctpTransport();
this.dispatchEvent(makeEvent("signalingstatechange"));
this._dispatchSignalingStateChange();
await nextTask();
}

Expand Down Expand Up @@ -4648,9 +4642,14 @@ class RTCPeerConnection extends SimpleEventTarget {
break;
}
if (event.state !== this._descriptionSignalingState()) break;
if (event.state === this._signalingState) break;
if (
event.state === this._signalingState &&
event.state === this._lastDispatchedSignalingState
) {
break;
}
this._signalingState = event.state;
this.dispatchEvent(makeEvent("signalingstatechange"));
this._dispatchSignalingStateChange();
break;
}
}
Expand Down
25 changes: 25 additions & 0 deletions test/basic.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,31 @@ test("setRemoteDescription ignores late duplicate native signalingstatechange",
assert.deepEqual(states, ["have-remote-offer"]);
});

test("setLocalDescription emits repeated offer states across renegotiation", async (t) => {
const offerer = new RTCPeerConnection();
const answerer = new RTCPeerConnection();
t.after(() => closeAllAndWait(offerer, answerer));
offerer.createDataChannel("initial");

const states = [];
offerer.addEventListener("signalingstatechange", () => states.push(offerer.signalingState));

const offer = await offerer.createOffer();
await offerer.setLocalDescription(offer);
await answerer.setRemoteDescription(offer);
const answer = await answerer.createAnswer();
await answerer.setLocalDescription(answer);
await offerer.setRemoteDescription(answer);

assert.equal(offerer.signalingState, "stable");
offerer.createDataChannel("renegotiated");
const reoffer = await offerer.createOffer();
await offerer.setLocalDescription(reoffer);

assert.equal(offerer.signalingState, "have-local-offer");
assert.deepEqual(states, ["have-local-offer", "stable", "have-local-offer"]);
});

test("once event listeners are removed before invocation", () => {
const target = new EventTarget();
let calls = 0;
Expand Down
Loading