nexus/PairDrop
2
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2026-05-21 11:45:02 +00:00
Code Issues Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files
public/scripts/network.js
+8 -1
View File
@@ -320,7 +320,6 @@ class Peer {
return; return;
} }
message = JSON.parse(message); message = JSON.parse(message);
console.log('RTC:', message);
switch (message.type) { switch (message.type) {
case 'request': case 'request':
this._onFilesTransferRequest(message); this._onFilesTransferRequest(message);
@@ -568,6 +567,14 @@ class RTCPeer extends Peer {
this._channel = channel; this._channel = channel;
} }
_onMessage(message) {
if (typeof message === 'string') {
message = JSON.parse(message);
console.log('RTC:', message);
}
super._onMessage(message);
}
getConnectionHash() { getConnectionHash() {
const localDescriptionLines = this._conn.localDescription.sdp.split("\r\n"); const localDescriptionLines = this._conn.localDescription.sdp.split("\r\n");
const remoteDescriptionLines = this._conn.remoteDescription.sdp.split("\r\n"); const remoteDescriptionLines = this._conn.remoteDescription.sdp.split("\r\n");
public_included_ws_fallback/scripts/network.js
+10 -3
View File
@@ -324,13 +324,12 @@ class Peer {
this.sendJSON({ type: 'progress', progress: progress }); this.sendJSON({ type: 'progress', progress: progress });
} }
_onMessage(message, logMessage = true) { _onMessage(message) {
if (typeof message !== 'string') { if (typeof message !== 'string') {
this._onChunkReceived(message); this._onChunkReceived(message);
return; return;
} }
message = JSON.parse(message); message = JSON.parse(message);
if (logMessage) console.log('RTC:', message);
switch (message.type) { switch (message.type) {
case 'request': case 'request':
this._onFilesTransferRequest(message); this._onFilesTransferRequest(message);
@@ -578,6 +577,14 @@ class RTCPeer extends Peer {
this._channel = channel; this._channel = channel;
} }
_onMessage(message) {
if (typeof message === 'string') {
message = JSON.parse(message);
console.log('RTC:', message);
}
super._onMessage(message);
}
getConnectionHash() { getConnectionHash() {
const localDescriptionLines = this._conn.localDescription.sdp.split("\r\n"); const localDescriptionLines = this._conn.localDescription.sdp.split("\r\n");
const remoteDescriptionLines = this._conn.remoteDescription.sdp.split("\r\n"); const remoteDescriptionLines = this._conn.remoteDescription.sdp.split("\r\n");
@@ -749,7 +756,7 @@ class PeersManager {
_onWsRelay(message) { _onWsRelay(message) {
const messageJSON = JSON.parse(message) const messageJSON = JSON.parse(message)
if (messageJSON.type === 'ws-chunk') message = base64ToArrayBuffer(messageJSON.chunk); 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) { _onPeers(msg) {