pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-03 17:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use right logging

Browse Source
This commit is contained in:
Owen
2025-08-14 12:01:07 -07:00
parent 200e3af384
commit 65bdb232f4
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/hybridServer.ts
View File

@@ -69,26 +69,26 @@ export async function createHybridClientServer() {
// Listen to connection events // Listen to connection events
client.on("connect", () => { client.on("connect", () => {
console.log("Connected to WebSocket server"); logger.info("Connected to WebSocket server");
client.sendMessage("remoteExitNode/register", { client.sendMessage("remoteExitNode/register", {
remoteExitNodeVersion: APP_VERSION remoteExitNodeVersion: APP_VERSION
}); });
}); });
client.on("disconnect", () => { client.on("disconnect", () => {
console.log("Disconnected from WebSocket server"); logger.info("Disconnected from WebSocket server");
}); });
client.on("message", (message) => { client.on("message", (message) => {
console.log("Received message:", message.type, message.data); logger.info("Received message:", message.type, message.data);
}); });
// Connect to the server // Connect to the server
try { try {
await client.connect(); await client.connect();
console.log("Connection initiated"); logger.info("Connection initiated");
} catch (error) { } catch (error) {
console.error("Failed to connect:", error); logger.error("Failed to connect:", error);
} }
client.sendMessageInterval( client.sendMessageInterval(

19
server/routers/ws/client.ts
View File

@@ -2,6 +2,7 @@ import WebSocket from 'ws';
import axios from 'axios'; import axios from 'axios';
import { URL } from 'url'; import { URL } from 'url';
import { EventEmitter } from 'events'; import { EventEmitter } from 'events';
import logger from '@server/logger';
export interface Config { export interface Config {
id: string; id: string;
@@ -96,7 +97,7 @@ export class WebSocketClient extends EventEmitter {
data: data data: data
}; };
console.debug(`Sending message: ${messageType}`, data); logger.debug(`Sending message: ${messageType}`, data);
this.conn.send(JSON.stringify(message), (error) => { this.conn.send(JSON.stringify(message), (error) => {
if (error) { if (error) {
@@ -115,13 +116,13 @@ export class WebSocketClient extends EventEmitter {
): () => void { ): () => void {
// Send immediately // Send immediately
this.sendMessage(messageType, data).catch(err => { this.sendMessage(messageType, data).catch(err => {
console.error('Failed to send initial message:', err); logger.error('Failed to send initial message:', err);
}); });
// Set up interval // Set up interval
const intervalId = setInterval(() => { const intervalId = setInterval(() => {
this.sendMessage(messageType, data).catch(err => { this.sendMessage(messageType, data).catch(err => {
console.error('Failed to send message:', err); logger.error('Failed to send message:', err);
}); });
}, interval); }, interval);
@@ -154,7 +155,7 @@ export class WebSocketClient extends EventEmitter {
this.isConnecting = false; this.isConnecting = false;
return; return;
} catch (error) { } catch (error) {
console.error(`Failed to connect: ${error}. Retrying in ${this.reconnectInterval}ms...`); logger.error(`Failed to connect: ${error}. Retrying in ${this.reconnectInterval}ms...`);
if (!this.shouldReconnect) { if (!this.shouldReconnect) {
this.isConnecting = false; this.isConnecting = false;
@@ -184,7 +185,7 @@ export class WebSocketClient extends EventEmitter {
const conn = new WebSocket(wsURL.toString()); const conn = new WebSocket(wsURL.toString());
conn.on('open', () => { conn.on('open', () => {
console.debug('WebSocket connection established'); logger.debug('WebSocket connection established');
this.conn = conn; this.conn = conn;
this.setConnected(true); this.setConnected(true);
this.isConnecting = false; this.isConnecting = false;
@@ -202,17 +203,17 @@ export class WebSocketClient extends EventEmitter {
} }
this.emit('message', message); this.emit('message', message);
} catch (error) { } catch (error) {
console.error('Failed to parse message:', error); logger.error('Failed to parse message:', error);
} }
}); });
conn.on('close', (code, reason) => { conn.on('close', (code, reason) => {
console.debug(`WebSocket connection closed: ${code} ${reason}`); logger.debug(`WebSocket connection closed: ${code} ${reason}`);
this.handleDisconnect(); this.handleDisconnect();
}); });
conn.on('error', (error) => { conn.on('error', (error) => {
console.error('WebSocket error:', error); logger.error('WebSocket error:', error);
if (this.conn === null) { if (this.conn === null) {
// Connection failed during establishment // Connection failed during establishment
reject(error); reject(error);
@@ -237,7 +238,7 @@ export class WebSocketClient extends EventEmitter {
// Set timeout for pong response // Set timeout for pong response
this.pingTimeoutTimer = setTimeout(() => { this.pingTimeoutTimer = setTimeout(() => {
console.error('Ping timeout - no pong received'); logger.error('Ping timeout - no pong received');
this.handleDisconnect(); this.handleDisconnect();
}, this.pingTimeout); }, this.pingTimeout);
} }