mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 23:16:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

close p2p connection for all devices on disconnect

Browse source
This commit is contained in:
schlagmichdoch 2023-01-06 15:22:41 +01:00
parent 7980e1a6fc
commit add1304e70
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/scripts/network.js
View file

@ -15,10 +15,10 @@ class ServerConnection {
if (this._isConnected() || this._isConnecting()) return; if (this._isConnected() || this._isConnecting()) return;
const ws = new WebSocket(this._endpoint()); const ws = new WebSocket(this._endpoint());
ws.binaryType = 'arraybuffer'; ws.binaryType = 'arraybuffer';
ws.onopen = e => console.log('WS: server connected'); ws.onopen = _ => console.log('WS: server connected');
ws.onmessage = e => this._onMessage(e.data); ws.onmessage = e => this._onMessage(e.data);
ws.onclose = e => this._onDisconnect(); ws.onclose = _ => this._onDisconnect();
ws.onerror = e => console.error(e); ws.onerror = e => this._onError(e);
this._socket = ws; this._socket = ws;
} }
@ -66,13 +66,15 @@ class ServerConnection {
this.send({ type: 'disconnect' }); this.send({ type: 'disconnect' });
this._socket.onclose = null; this._socket.onclose = null;
this._socket.close(); this._socket.close();
Events.fire('disconnect');
} }
_onDisconnect() { _onDisconnect() {
console.log('WS: server disconnected'); console.log('WS: server disconnected');
Events.fire('notify-user', 'Connection lost. Retry in 5 seconds...'); Events.fire('notify-user', 'Connection lost. Retry in 5 seconds...');
clearTimeout(this._reconnectTimer); clearTimeout(this._reconnectTimer);
this._reconnectTimer = setTimeout(_ => this._connect(), 5000); this._reconnectTimer = setTimeout(this._connect, 5000);
Events.fire('disconnect');
} }
_onVisibilityChange() { _onVisibilityChange() {
@ -87,6 +89,11 @@ class ServerConnection {
_isConnecting() { _isConnecting() {
return this._socket && this._socket.readyState === this._socket.CONNECTING; return this._socket && this._socket.readyState === this._socket.CONNECTING;
} }
_onError(e) {
console.error(e);
this._connect();
}
} }
class Peer { class Peer {
@ -369,6 +376,7 @@ class PeersManager {
Events.on('files-selected', e => this._onFilesSelected(e.detail)); Events.on('files-selected', e => this._onFilesSelected(e.detail));
Events.on('send-text', e => this._onSendText(e.detail)); Events.on('send-text', e => this._onSendText(e.detail));
Events.on('peer-left', e => this._onPeerLeft(e.detail)); Events.on('peer-left', e => this._onPeerLeft(e.detail));
Events.on('disconnect', this._clearPeers);
} }
_onMessage(message) { _onMessage(message) {
@ -411,6 +419,11 @@ class PeersManager {
peer._conn.close(); peer._conn.close();
} }
_clearPeers() {
if (this.peers) {
Object.keys(this.peers).forEach(peerId => this._onPeerLeft(peerId));
}
}
} }
class WSPeer { class WSPeer {