mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-22 07:46:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'show_peer_on_channel_open' into add_device_pairing

Browse source 
# Conflicts:
#	client/scripts/network.js
This commit is contained in:
schlagmichdoch 2022-12-22 20:28:45 +01:00
commit fdb0bbf098
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/scripts/network.js
View file

@ -187,12 +187,12 @@ class Peer {
_onChunkReceived(chunk) {
if(!chunk.byteLength) return;
this._digester.unchunk(chunk);
const progress = this._digester.progress;
this._onDownloadProgress(progress);
// occasionally notify sender about our progress
// occasionally notify sender about our progress
if (progress - this._lastProgress < 0.01) return;
this._lastProgress = progress;
this._sendProgress(progress);
@ -254,7 +254,7 @@ class RTCPeer extends Peer {
}
_openChannel() {
const channel = this._conn.createDataChannel('data-channel', {
const channel = this._conn.createDataChannel('data-channel', {
ordered: true,
reliable: true // Obsolete. See https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel/reliable
});
@ -293,6 +293,7 @@ class RTCPeer extends Peer {
_onChannelOpened(event) {
console.log('RTC: channel opened with', this._peerId);
Events.fire('peer-connected', this._peerId);
const channel = event.channel || event.target;
channel.binaryType = 'arraybuffer';
channel.onmessage = e => this._onMessage(e.data);
@ -302,6 +303,7 @@ class RTCPeer extends Peer {
_onChannelClosed() {
console.log('RTC: channel closed', this._peerId);
Events.fire('peer-left', this._peerId);
if (!this._isCaller) return;
this._connect(this._peerId, true); // reopen the channel
}

16
client/scripts/ui.js
View file

@ -26,8 +26,6 @@ class PeersUI {
_onPeerJoined(peer) {
if ($(peer.id)) return; // peer already exists
const peerUI = new PeerUI(peer);
$$('x-peers').appendChild(peerUI.$el);
setTimeout(e => window.animateBackground(false), 1750); // Stop animation
}
_onPeers(peers) {
@ -91,8 +89,18 @@ class PeerUI {
constructor(peer) {
this._peer = peer;
this._initDom();
this._bindListeners(this.$el);
this.callbackFunction = (e) => this._onPeerConnected(e.detail);
Events.on('peer-connected', this.callbackFunction);
}
_onPeerConnected(peerId) {
if (peerId === this._peer.id) {
Events.off('peer-connected', this.callbackFunction)
this._initDom();
this._bindListeners(this.$el);
$$('x-peers').appendChild(this.$el);
setTimeout(e => window.animateBackground(false), 1750); // Stop animation
}
}
_initDom() {