fix politeness
This commit is contained in:
@@ -149,10 +149,11 @@ export class PeerManager {
|
|||||||
if (!peerConnection) {
|
if (!peerConnection) {
|
||||||
let remotePeerID = message.from;
|
let remotePeerID = message.from;
|
||||||
let newPeer = new PeerConnection(this, remotePeerID, this.websocketSendPeerMessage.bind(this));
|
let newPeer = new PeerConnection(this, remotePeerID, this.websocketSendPeerMessage.bind(this));
|
||||||
if (this._isBootstrapPeer) {
|
|
||||||
newPeer.setPolite(false);
|
newPeer.setPoliteFromID(remotePeerID, true);
|
||||||
}
|
|
||||||
peerConnection = newPeer;
|
peerConnection = newPeer;
|
||||||
|
|
||||||
this.peers.set(newPeer.remotePeerID, newPeer);
|
this.peers.set(newPeer.remotePeerID, newPeer);
|
||||||
|
|
||||||
this.onConnectRequest(newPeer);
|
this.onConnectRequest(newPeer);
|
||||||
@@ -580,6 +581,12 @@ class PeerConnection {
|
|||||||
this.polite = polite;
|
this.polite = polite;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setPoliteFromID(peerID: PeerID, remote = false) {
|
||||||
|
let polite = (parseInt(peerID.charAt(peerID.length-1), 16) % 2 == 0) && !remote;
|
||||||
|
|
||||||
|
this.setPolite(polite);
|
||||||
|
}
|
||||||
|
|
||||||
setupDataChannel() {
|
setupDataChannel() {
|
||||||
if (!this.dataChannel) {
|
if (!this.dataChannel) {
|
||||||
throw new Error();
|
throw new Error();
|
||||||
@@ -713,6 +720,7 @@ class PeerConnection {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
this.makingOffer = true;
|
this.makingOffer = true;
|
||||||
|
this.setPoliteFromID(this.peerManager.peerID);
|
||||||
await this.rtcPeer.setLocalDescription();
|
await this.rtcPeer.setLocalDescription();
|
||||||
|
|
||||||
if (!this.rtcPeer.localDescription) {
|
if (!this.rtcPeer.localDescription) {
|
||||||
|
|||||||
@@ -82,9 +82,7 @@ export class PeerManager {
|
|||||||
if (!peerConnection) {
|
if (!peerConnection) {
|
||||||
let remotePeerID = message.from;
|
let remotePeerID = message.from;
|
||||||
let newPeer = new PeerConnection(this, remotePeerID, this.websocketSendPeerMessage.bind(this));
|
let newPeer = new PeerConnection(this, remotePeerID, this.websocketSendPeerMessage.bind(this));
|
||||||
if (this._isBootstrapPeer) {
|
newPeer.setPoliteFromID(remotePeerID, true);
|
||||||
newPeer.setPolite(false);
|
|
||||||
}
|
|
||||||
peerConnection = newPeer;
|
peerConnection = newPeer;
|
||||||
this.peers.set(newPeer.remotePeerID, newPeer);
|
this.peers.set(newPeer.remotePeerID, newPeer);
|
||||||
this.onConnectRequest(newPeer);
|
this.onConnectRequest(newPeer);
|
||||||
@@ -417,6 +415,10 @@ class PeerConnection {
|
|||||||
setPolite(polite) {
|
setPolite(polite) {
|
||||||
this.polite = polite;
|
this.polite = polite;
|
||||||
}
|
}
|
||||||
|
setPoliteFromID(peerID, remote = false) {
|
||||||
|
let polite = (parseInt(peerID.charAt(peerID.length - 1), 16) % 2 == 0) && !remote;
|
||||||
|
this.setPolite(polite);
|
||||||
|
}
|
||||||
setupDataChannel() {
|
setupDataChannel() {
|
||||||
if (!this.dataChannel) {
|
if (!this.dataChannel) {
|
||||||
throw new Error();
|
throw new Error();
|
||||||
@@ -513,6 +515,7 @@ class PeerConnection {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
this.makingOffer = true;
|
this.makingOffer = true;
|
||||||
|
this.setPoliteFromID(this.peerManager.peerID);
|
||||||
await this.rtcPeer.setLocalDescription();
|
await this.rtcPeer.setLocalDescription();
|
||||||
if (!this.rtcPeer.localDescription) {
|
if (!this.rtcPeer.localDescription) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user