From 12741d637776e5679461aa24be8505e668fc9f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=91=D0=B0=D0=B1?= =?UTF-8?q?=D1=83=D1=88=D0=BA=D0=B8=D0=BD?= Date: Fri, 21 Feb 2025 11:42:47 +0100 Subject: [PATCH] changed console to logs --- frontend/app/player/web/assist/Call.ts | 23 ++++++++++++----------- tracker/tracker-assist/src/Assist.ts | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/frontend/app/player/web/assist/Call.ts b/frontend/app/player/web/assist/Call.ts index b01c38012..75c32605e 100644 --- a/frontend/app/player/web/assist/Call.ts +++ b/frontend/app/player/web/assist/Call.ts @@ -2,6 +2,7 @@ import type { LocalStream } from './LocalStream'; import type { Socket } from './types'; import type { Store } from '../../common/types'; import { userStore } from "App/mstore"; +import logger from '@/logger'; export enum CallingState { NoCall, @@ -98,7 +99,7 @@ export default class Call { if (event.candidate) { this.socket.emit('webrtc_call_ice_candidate', { from: remotePeerId, candidate: event.candidate }); } else { - console.log("ICE candidate gathering complete"); + logger.log("ICE candidate gathering complete"); } }; @@ -128,7 +129,7 @@ export default class Call { this.callArgs.localStream.onVideoTrack((vTrack: MediaStreamTrack) => { const sender = pc.getSenders().find((s) => s.track?.kind === 'video'); if (!sender) { - console.warn('No video sender found'); + logger.warn('No video sender found'); return; } sender.replaceTrack(vTrack); @@ -153,16 +154,16 @@ export default class Call { this.socket.emit('webrtc_call_offer', { from: remotePeerId, offer }); this.connectAttempts = 0; } catch (e: any) { - console.error(e); + logger.error(e); // Trying to reconnect const tryReconnect = async (error: any) => { if (error.type === 'peer-unavailable' && this.connectAttempts < 5) { this.connectAttempts++; - console.log('reconnecting', this.connectAttempts); + logger.log('reconnecting', this.connectAttempts); await new Promise((resolve) => setTimeout(resolve, 250)); await this._peerConnection(remotePeerId); } else { - console.log('error', this.connectAttempts); + logger.log('error', this.connectAttempts); this.callArgs?.onError?.('Could not establish a connection with the peer after 5 attempts'); } }; @@ -176,7 +177,7 @@ export default class Call { const remotePeerId = data.from; const pc = this.connections[remotePeerId]; if (!pc) { - console.error("No connection found for remote peer", remotePeerId); + logger.error("No connection found for remote peer", remotePeerId); return; } try { @@ -184,10 +185,10 @@ export default class Call { if (pc.signalingState !== "stable") { await pc.setRemoteDescription(new RTCSessionDescription(data.answer)); } else { - console.warn("Skipping setRemoteDescription: Already in stable state"); + logger.warn("Skipping setRemoteDescription: Already in stable state"); } } catch (e) { - console.error("Error setting remote description from answer", e); + logger.error("Error setting remote description from answer", e); this.callArgs?.onError?.(e); } } @@ -202,10 +203,10 @@ export default class Call { try { await pc.addIceCandidate(new RTCIceCandidate(data.candidate)); } catch (e) { - console.error("Error adding ICE candidate", e); + logger.error("Error adding ICE candidate", e); } } else { - console.warn("Пропущен некорректный ICE-кандидат:", data.candidate); + logger.warn("Invalid ICE candidate skipped:", data.candidate); } } @@ -311,7 +312,7 @@ export default class Call { this.store.update({ calling: CallingState.Connecting }); const tab = this.store.get().currentTab; if (!tab) { - console.warn('No tab data to connect to peer'); + logger.warn('No tab data to connect to peer'); } // Generate a peer identifier depending on the assist version diff --git a/tracker/tracker-assist/src/Assist.ts b/tracker/tracker-assist/src/Assist.ts index 10ae74f5e..551e02006 100644 --- a/tracker/tracker-assist/src/Assist.ts +++ b/tracker/tracker-assist/src/Assist.ts @@ -252,7 +252,7 @@ export default class Assist { } app.debug.log('Socket:', ...args) socket.on('close', (e) => { - console.warn('Socket closed:', e); + app.debug.warn('Socket closed:', e); }) })