jakob/PairDrop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move logging of rtc message from class Peer class to overwritten method in class RTCPeer

Browse source
This commit is contained in:
schlagmichdoch 2023-03-03 12:38:34 +01:00
parent f9f1abef7a
commit d6ef5887dd
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/scripts/network.js
View file

@ -320,7 +320,6 @@ class Peer {
return;
}
message = JSON.parse(message);
console.log('RTC:', message);
switch (message.type) {
case 'request':
this._onFilesTransferRequest(message);
@ -568,6 +567,14 @@ class RTCPeer extends Peer {
this._channel = channel;
}
_onMessage(message) {
if (typeof message === 'string') {
message = JSON.parse(message);
console.log('RTC:', message);
}
super._onMessage(message);
}
getConnectionHash() {
const localDescriptionLines = this._conn.localDescription.sdp.split("\r\n");
const remoteDescriptionLines = this._conn.remoteDescription.sdp.split("\r\n");

13
public_included_ws_fallback/scripts/network.js
View file

@ -324,13 +324,12 @@ class Peer {
this.sendJSON({ type: 'progress', progress: progress });
}
_onMessage(message, logMessage = true) {
_onMessage(message) {
if (typeof message !== 'string') {
this._onChunkReceived(message);
return;
}
message = JSON.parse(message);
if (logMessage) console.log('RTC:', message);
switch (message.type) {
case 'request':
this._onFilesTransferRequest(message);
@ -578,6 +577,14 @@ class RTCPeer extends Peer {
this._channel = channel;
}
_onMessage(message) {
if (typeof message === 'string') {
message = JSON.parse(message);
console.log('RTC:', message);
}
super._onMessage(message);
}
getConnectionHash() {
const localDescriptionLines = this._conn.localDescription.sdp.split("\r\n");
const remoteDescriptionLines = this._conn.remoteDescription.sdp.split("\r\n");
@ -749,7 +756,7 @@ class PeersManager {
_onWsRelay(message) {
const messageJSON = JSON.parse(message)
if (messageJSON.type === 'ws-chunk') message = base64ToArrayBuffer(messageJSON.chunk);
this.peers[messageJSON.sender.id]._onMessage(message, false)
this.peers[messageJSON.sender.id]._onMessage(message)
}
_onPeers(msg) {