mirror of
https://github.com/schlagmichdoch/PairDrop.git
synced 2026-04-18 07:12:15 +00:00
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:
File diff suppressed because it is too large
Load Diff
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user