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

Add STATE_TRANSFER_REQUEST_RECEIVED and close transfer request dialog if requesting peer reloads

Browse source
This commit is contained in:
schlagmichdoch 2024-02-16 17:56:55 +01:00
parent 0d17ada58b
commit 3c8848d406
2 changed files with 55 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

48
public/scripts/network.js
View file

@ -321,6 +321,7 @@ class Peer {
static STATE_IDLE = 'idle';
static STATE_PREPARE = 'prepare';
static STATE_TRANSFER_REQUEST_SENT = 'transfer-request-sent';
static STATE_TRANSFER_REQUEST_RECEIVED = 'transfer-request-received';
static STATE_RECEIVE_PROCEEDING = 'receive-proceeding';
static STATE_TRANSFER_PROCEEDING = 'transfer-proceeding';
static STATE_TEXT_SENT = 'text-sent';
@ -493,7 +494,7 @@ class Peer {
this._onDisplayNameChanged(message);
break;
case 'state':
this._onState(message.state);
await this._onState(message.state);
break;
case 'transfer-request':
await this._onTransferRequest(message);
@ -556,23 +557,29 @@ class Peer {
this._sendMessage({type: 'state', state: this._state})
}
_onState(peerState) {
if (this._state === Peer.STATE_RECEIVE_PROCEEDING) {
this._onStateReceiver(peerState);
async _onState(peerState) {
if (this._state === Peer.STATE_TRANSFER_PROCEEDING) {
this._onStateIfSender(peerState);
}
else if (this._state === Peer.STATE_TRANSFER_PROCEEDING) {
this._onStateSender(peerState);
else if (this._state === Peer.STATE_RECEIVE_PROCEEDING) {
this._onStateIfReceiver(peerState);
}
else if (this._state === Peer.STATE_TRANSFER_REQUEST_SENT) {
await this._onStateIfTransferRequestSent(peerState);
}
else if (this._state === Peer.STATE_TRANSFER_REQUEST_RECEIVED) {
this._onStateIfTransferRequestReceived(peerState);
}
}
_onStateSender(peerState) {
_onStateIfSender(peerState) {
// this peer is sender
if (peerState !== Peer.STATE_RECEIVE_PROCEEDING) {
this._abortTransfer();
}
}
_onStateReceiver(peerState) {
_onStateIfReceiver(peerState) {
// this peer is receiver
switch (peerState) {
case Peer.STATE_TRANSFER_REQUEST_SENT:
@ -592,6 +599,25 @@ class Peer {
}
}
async _onStateIfTransferRequestSent(peerState) {
// This peer has sent a transfer request
// If other peer is still idle -> send request again
if (peerState === Peer.STATE_IDLE) {
await this._sendFileTransferRequest(this._filesRequested);
}
}
_onStateIfTransferRequestReceived(peerState) {
// This peer has received a transfer request
// If other peer is not in "STATE_TRANSFER_REQUEST_SENT" anymore -> reset and hide request from user
if (peerState !== Peer.STATE_TRANSFER_REQUEST_SENT) {
this._reset();
Events.fire('files-transfer-request-abort', {
peerId: this._peerId
})
}
}
_abortTransfer() {
Events.fire('set-progress', {peerId: this._peerId, progress: 0, status: 'error'});
this._reset();
@ -625,7 +651,8 @@ class Peer {
}
}
Events.fire('set-progress', {peerId: this._peerId, progress: 1, status: 'prepare'})
this._state = Peer.STATE_TRANSFER_REQUEST_SENT;
Events.fire('set-progress', {peerId: this._peerId, progress: 0, status: 'wait'});
this._filesRequested = files;
@ -636,8 +663,6 @@ class Peer {
thumbnailDataUrl: dataUrl
});
Events.fire('set-progress', {peerId: this._peerId, progress: 0, status: 'wait'})
this._state = Peer.STATE_TRANSFER_REQUEST_SENT;
}
_onTransferRequestResponse(message) {
@ -764,6 +789,7 @@ class Peer {
}
}
this._state = Peer.STATE_TRANSFER_REQUEST_RECEIVED;
this._pendingRequest = request;
// Automatically accept request if auto-accept is set to true via the Edit Paired Devices Dialog