MirrorMirror
/
PairDrop
mirror of https://github.com/schlagmichdoch/PairDrop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split transfer into message and data transfer and rewrite FileChunkerLogic completely. Condense all Relaying of the Websocket Fallback into one message type 'ws-relay'

This commit is contained in:
schlagmichdoch 2024-02-05 02:06:53 +01:00
parent d81c03a560
commit a5dc8b6da2
2 changed files with 410 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

662
public/scripts/network.js
View File

File diff suppressed because it is too large Load Diff

18
server/ws-server.js
View File

@ -89,22 +89,12 @@ export default class PairDropWsServer {
this._onLeavePublicRoom(sender); this._onLeavePublicRoom(sender);
break; break;
case 'signal': case 'signal':
this._signalAndRelay(sender, message); this._signalAndWsRelay(sender, message);
break; break;
case 'request': case 'ws-relay':
case 'header':
case 'partition':
case 'partition-received':
case 'progress':
case 'files-transfer-response':
case 'file-transfer-complete':
case 'message-transfer-complete':
case 'text':
case 'display-name-changed':
case 'ws-chunk':
// relay ws-fallback // relay ws-fallback
if (this._conf.wsFallback) { if (this._conf.wsFallback) {
this._signalAndRelay(sender, message); this._signalAndWsRelay(sender, message);
} }
else { else {
console.log("Websocket fallback is not activated on this instance.") console.log("Websocket fallback is not activated on this instance.")
@ -112,7 +102,7 @@ export default class PairDropWsServer {
} }
} }
_signalAndRelay(sender, message) { _signalAndWsRelay(sender, message) {
const room = message.roomType === 'ip' const room = message.roomType === 'ip'
? sender.ip ? sender.ip
: message.roomId; : message.roomId;