jakob/PairDrop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try to stabilize connection and prevent remove reconnecting fallback on error

Browse source
This commit is contained in:
schlagmichdoch 2023-02-10 18:56:13 +01:00
parent 206b42614d
commit b8c78bccfa
2 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
public/scripts/network.js
View file

@ -10,7 +10,6 @@ class ServerConnection {
Events.on('pagehide', _ => this._disconnect()); Events.on('pagehide', _ => this._disconnect());
document.addEventListener('visibilitychange', _ => this._onVisibilityChange()); document.addEventListener('visibilitychange', _ => this._onVisibilityChange());
if (navigator.connection) navigator.connection.addEventListener('change', _ => this._reconnect()); if (navigator.connection) navigator.connection.addEventListener('change', _ => this._reconnect());
Events.on('reconnect', _ => this._reconnect());
Events.on('room-secrets', e => this._sendRoomSecrets(e.detail)); Events.on('room-secrets', e => this._sendRoomSecrets(e.detail));
Events.on('room-secret-deleted', e => this.send({ type: 'room-secret-deleted', roomSecret: e.detail})); Events.on('room-secret-deleted', e => this.send({ type: 'room-secret-deleted', roomSecret: e.detail}));
Events.on('room-secrets-cleared', e => this.send({ type: 'room-secrets-cleared', roomSecrets: e.detail})); Events.on('room-secrets-cleared', e => this.send({ type: 'room-secrets-cleared', roomSecrets: e.detail}));
@ -498,7 +497,7 @@ class RTCPeer extends Peer {
} }
_connect(peerId, isCaller) { _connect(peerId, isCaller) {
if (!this._conn) this._openConnection(peerId, isCaller); if (!this._conn || this._conn.signalingState === "closed") this._openConnection(peerId, isCaller);
if (isCaller) { if (isCaller) {
this._openChannel(); this._openChannel();
@ -517,7 +516,6 @@ class RTCPeer extends Peer {
} }
_openChannel() { _openChannel() {
if (this._conn.signalingState === "closed") return;
const channel = this._conn.createDataChannel('data-channel', { const channel = this._conn.createDataChannel('data-channel', {
ordered: true, ordered: true,
reliable: true // Obsolete. See https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel/reliable reliable: true // Obsolete. See https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel/reliable
@ -544,10 +542,8 @@ class RTCPeer extends Peer {
if (message.sdp) { if (message.sdp) {
this._conn.setRemoteDescription(message.sdp) this._conn.setRemoteDescription(message.sdp)
.then( _ => { .then( _ => {
if (message.sdp.type === 'offer') { return this._conn.createAnswer()
return this._conn.createAnswer() .then(d => this._onDescription(d));
.then(d => this._onDescription(d));
}
}) })
.catch(e => this._onError(e)); .catch(e => this._onError(e));
} else if (message.ice) { } else if (message.ice) {
@ -562,19 +558,15 @@ class RTCPeer extends Peer {
channel.binaryType = 'arraybuffer'; channel.binaryType = 'arraybuffer';
channel.onmessage = e => this._onMessage(e.data); channel.onmessage = e => this._onMessage(e.data);
channel.onclose = _ => this._onChannelClosed(); channel.onclose = _ => this._onChannelClosed();
Events.on('pagehide', _ => this._closeChannel()); Events.on('pagehide', _ => this._conn.close());
this._channel = channel; this._channel = channel;
} }
_closeChannel() {
this._channel.onclose = null;
this._conn.close();
this._conn = null;
}
_onChannelClosed() { _onChannelClosed() {
console.log('RTC: channel closed', this._peerId); console.log('RTC: channel closed', this._peerId);
Events.fire('peer-disconnected', this._peerId); Events.fire('peer-disconnected', this._peerId);
if (this._channel) this._channel.onclose = null;
this._conn.close();
if (!this._isCaller) return; if (!this._isCaller) return;
this._connect(this._peerId, true); // reopen the channel this._connect(this._peerId, true); // reopen the channel
} }
@ -583,11 +575,10 @@ class RTCPeer extends Peer {
console.log('RTC: state changed:', this._conn.connectionState); console.log('RTC: state changed:', this._conn.connectionState);
switch (this._conn.connectionState) { switch (this._conn.connectionState) {
case 'disconnected': case 'disconnected':
this._onChannelClosed(); this._onError('rtc connection disconnected');
break; break;
case 'failed': case 'failed':
this._conn = null; this._onError('rtc connection failed');
this._onChannelClosed();
break; break;
} }
} }
@ -595,8 +586,7 @@ class RTCPeer extends Peer {
_onIceConnectionStateChange() { _onIceConnectionStateChange() {
switch (this._conn.iceConnectionState) { switch (this._conn.iceConnectionState) {
case 'failed': case 'failed':
console.error('ICE Gathering failed'); this._onError('ICE Gathering failed');
Events.fire('reconnect');
break; break;
default: default:
console.log('ICE Gathering', this._conn.iceConnectionState); console.log('ICE Gathering', this._conn.iceConnectionState);
@ -605,7 +595,6 @@ class RTCPeer extends Peer {
_onError(error) { _onError(error) {
console.error(error); console.error(error);
Events.fire('reconnect');
} }
_send(message) { _send(message) {
@ -646,7 +635,7 @@ class PeersManager {
Events.on('files-selected', e => this._onFilesSelected(e.detail)); Events.on('files-selected', e => this._onFilesSelected(e.detail));
Events.on('respond-to-files-transfer-request', e => this._onRespondToFileTransferRequest(e.detail)) Events.on('respond-to-files-transfer-request', e => this._onRespondToFileTransferRequest(e.detail))
Events.on('send-text', e => this._onSendText(e.detail)); Events.on('send-text', e => this._onSendText(e.detail));
Events.on('peer-disconnected', e => this._onPeerLeft(e.detail)); Events.on('peer-disconnected', e => this._onPeerDisconnected(e.detail));
Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail)); Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail));
Events.on('beforeunload', e => this._onBeforeUnload(e)); Events.on('beforeunload', e => this._onBeforeUnload(e));
} }
@ -709,12 +698,9 @@ class PeersManager {
this.peers[message.to].sendText(message.text); this.peers[message.to].sendText(message.text);
} }
_onPeerLeft(peerId) { _onPeerDisconnected(peerId) {
const peer = this.peers[peerId]; const peer = this.peers[peerId];
delete this.peers[peerId]; delete this.peers[peerId];
if (!peer || !peer._conn) return;
if (peer._channel) peer._channel.onclose = null;
peer._conn.close();
} }
_onSecretRoomDeleted(roomSecret) { _onSecretRoomDeleted(roomSecret) {

2
public/service-worker.js
View file

@ -1,4 +1,4 @@
const cacheVersion = 'v8'; const cacheVersion = 'v9';
const cacheTitle = `pairdrop-cache-${cacheVersion}`; const cacheTitle = `pairdrop-cache-${cacheVersion}`;
const urlsToCache = [ const urlsToCache = [
'index.html', 'index.html',