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

Remove redundant 'receive-progress' and move setting of progress to receive confirmation methods

Browse source
This commit is contained in:
schlagmichdoch 2024-02-17 15:39:33 +01:00
parent 8592499d22
commit d70f9d762e
1 changed files with 18 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

55
public/scripts/network.js
View file

@ -355,7 +355,8 @@ class Peer {
this._transferStatusInterval = null; this._transferStatusInterval = null;
this._bytesTotal = 0; this._bytesTotal = 0;
this._bytesReceivedFiles = 0; this._bytesReceivedFiles = 0;
this._timeStart = null; this._timeStartTransferComplete = null;
this._timeStartTransferFile = null;
this._byteLogs = []; this._byteLogs = [];
// tidy up sender // tidy up sender
@ -512,9 +513,6 @@ class Peer {
case 'transfer-header': case 'transfer-header':
this._onTransferHeader(message); this._onTransferHeader(message);
break; break;
case 'receive-progress':
this._onReceiveProgress(message.progress);
break;
case 'receive-confirmation': case 'receive-confirmation':
this._onReceiveConfirmation(message.bytesReceived); this._onReceiveConfirmation(message.bytesReceived);
break; break;
@ -630,13 +628,13 @@ class Peer {
this._reset(); this._reset();
} }
_addLog(bytesReceivedCurrentFile) { _addLog(bytesReceivedTotal) {
const now = Date.now(); const now = Date.now();
// Add log // Add log
this._byteLogs.push({ this._byteLogs.push({
time: now, time: now,
bytesReceived: this._bytesReceivedFiles + bytesReceivedCurrentFile bytesReceived: bytesReceivedTotal
}); });
// Always include at least 5 entries (2.5 MB) to increase precision // Always include at least 5 entries (2.5 MB) to increase precision
@ -813,15 +811,6 @@ class Peer {
this._chunker._resendFromOffset(offset); this._chunker._resendFromOffset(offset);
} }
_onReceiveProgress(progress) {
if (this._state !== Peer.STATE_TRANSFER_PROCEEDING) {
this._sendState();
return;
}
Events.fire('set-progress', {peerId: this._peerId, progress: progress, status: this._transferStatusString});
}
_onReceiveConfirmation(bytesReceived) { _onReceiveConfirmation(bytesReceived) {
if (!this._chunker || this._state !== Peer.STATE_TRANSFER_PROCEEDING) { if (!this._chunker || this._state !== Peer.STATE_TRANSFER_PROCEEDING) {
this._sendState(); this._sendState();
@ -829,7 +818,12 @@ class Peer {
} }
this._chunker._onReceiveConfirmation(bytesReceived); this._chunker._onReceiveConfirmation(bytesReceived);
this._addLog(bytesReceived); const bytesReceivedTotal = this._bytesReceivedFiles + bytesReceived;
const progress = Math.round(1e4 * bytesReceivedTotal / this._bytesTotal) / 1e4;
this._addLog(bytesReceivedTotal);
Events.fire('set-progress', {peerId: this._peerId, progress: progress, status: this._transferStatusString});
} }
_onFileReceiveComplete(message) { _onFileReceiveComplete(message) {
@ -964,10 +958,15 @@ class Peer {
); );
} }
_sendReceiveConfirmation(bytesReceivedCurrentFile) { _sendReceiveConfirmation(bytesReceived) {
this._sendMessage({type: 'receive-confirmation', bytesReceived: bytesReceivedCurrentFile}); this._sendMessage({type: 'receive-confirmation', bytesReceived: bytesReceived});
this._addLog(bytesReceivedCurrentFile); const bytesReceivedTotal = this._bytesReceivedFiles + bytesReceived;
const progress = Math.round(1e4 * bytesReceivedTotal / this._bytesTotal) / 1e4;
this._addLog(bytesReceivedTotal);
Events.fire('set-progress', {peerId: this._peerId, progress: progress, status: this._transferStatusString});
} }
_sendResendRequest(offset) { _sendResendRequest(offset) {
@ -994,25 +993,7 @@ class Peer {
catch (e) { catch (e) {
this._abortTransfer(); this._abortTransfer();
Logger.error(e); Logger.error(e);
return;
} }
// While transferring -> round progress to 4th digit. After transferring, set it to 1.
let progress = this._digester
? Math.floor(1e4 * (this._bytesReceivedFiles + this._digester._bytesReceived) / this._acceptedRequest.totalSize) / 1e4
: 1;
Events.fire('set-progress', {peerId: this._peerId, progress: progress, status: this._transferStatusString});
// occasionally notify sender about our progress
if (progress - this._lastProgress >= 0.005 || progress === 1) {
this._lastProgress = progress;
this._sendProgress(progress);
}
}
_sendProgress(progress) {
this._sendMessage({ type: 'receive-progress', progress: progress });
} }
_fileReceived(file) { _fileReceived(file) {