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

fix overwrite method _onMessage of class RTCPeer

Browse source
This commit is contained in:
schlagmichdoch 2023-03-03 16:36:55 +01:00
parent a9d7960a59
commit bfb5aa8546
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
public/scripts/network.js
View file

@ -319,25 +319,25 @@ class Peer {
this._onChunkReceived(message); this._onChunkReceived(message);
return; return;
} }
message = JSON.parse(message); const messageJSON = JSON.parse(message);
switch (message.type) { switch (messageJSON.type) {
case 'request': case 'request':
this._onFilesTransferRequest(message); this._onFilesTransferRequest(messageJSON);
break; break;
case 'header': case 'header':
this._onFilesHeader(message); this._onFilesHeader(messageJSON);
break; break;
case 'partition': case 'partition':
this._onReceivedPartitionEnd(message); this._onReceivedPartitionEnd(messageJSON);
break; break;
case 'partition-received': case 'partition-received':
this._sendNextPartition(); this._sendNextPartition();
break; break;
case 'progress': case 'progress':
this._onDownloadProgress(message.progress); this._onDownloadProgress(messageJSON.progress);
break; break;
case 'files-transfer-response': case 'files-transfer-response':
this._onFileTransferRequestResponded(message); this._onFileTransferRequestResponded(messageJSON);
break; break;
case 'file-transfer-complete': case 'file-transfer-complete':
this._onFileTransferCompleted(); this._onFileTransferCompleted();
@ -346,7 +346,7 @@ class Peer {
this._onMessageTransferCompleted(); this._onMessageTransferCompleted();
break; break;
case 'text': case 'text':
this._onTextReceived(message); this._onTextReceived(messageJSON);
break; break;
} }
} }
@ -570,8 +570,7 @@ class RTCPeer extends Peer {
_onMessage(message) { _onMessage(message) {
if (typeof message === 'string') { if (typeof message === 'string') {
message = JSON.parse(message); console.log('RTC:', JSON.parse(message));
console.log('RTC:', message);
} }
super._onMessage(message); super._onMessage(message);
} }

19
public_included_ws_fallback/scripts/network.js
View file

@ -329,25 +329,25 @@ class Peer {
this._onChunkReceived(message); this._onChunkReceived(message);
return; return;
} }
message = JSON.parse(message); const messageJSON = JSON.parse(message);
switch (message.type) { switch (messageJSON.type) {
case 'request': case 'request':
this._onFilesTransferRequest(message); this._onFilesTransferRequest(messageJSON);
break; break;
case 'header': case 'header':
this._onFilesHeader(message); this._onFilesHeader(messageJSON);
break; break;
case 'partition': case 'partition':
this._onReceivedPartitionEnd(message); this._onReceivedPartitionEnd(messageJSON);
break; break;
case 'partition-received': case 'partition-received':
this._sendNextPartition(); this._sendNextPartition();
break; break;
case 'progress': case 'progress':
this._onDownloadProgress(message.progress); this._onDownloadProgress(messageJSON.progress);
break; break;
case 'files-transfer-response': case 'files-transfer-response':
this._onFileTransferRequestResponded(message); this._onFileTransferRequestResponded(messageJSON);
break; break;
case 'file-transfer-complete': case 'file-transfer-complete':
this._onFileTransferCompleted(); this._onFileTransferCompleted();
@ -356,7 +356,7 @@ class Peer {
this._onMessageTransferCompleted(); this._onMessageTransferCompleted();
break; break;
case 'text': case 'text':
this._onTextReceived(message); this._onTextReceived(messageJSON);
break; break;
} }
} }
@ -580,8 +580,7 @@ class RTCPeer extends Peer {
_onMessage(message) { _onMessage(message) {
if (typeof message === 'string') { if (typeof message === 'string') {
message = JSON.parse(message); console.log('RTC:', JSON.parse(message));
console.log('RTC:', message);
} }
super._onMessage(message); super._onMessage(message);
} }