From 2e7582e6c6083e504bc1260db8f073f618bd4274 Mon Sep 17 00:00:00 2001 From: emerson Date: Mon, 3 Jul 2023 16:15:51 +0000 Subject: [PATCH] standardize logging --- src/Channel.ts | 10 ++--- src/Client.ts | 104 +++++++++++++++++++++++------------------------ src/IRCClient.ts | 1 - src/Message.ts | 3 +- src/Server.ts | 20 ++++----- 5 files changed, 67 insertions(+), 71 deletions(-) diff --git a/src/Channel.ts b/src/Channel.ts index 9f7f084..65f2460 100644 --- a/src/Channel.ts +++ b/src/Channel.ts @@ -66,7 +66,7 @@ export class Channel { }).catch(e => { const errcode = e.response?.data?.errcode; if (errcode !== "M_NOT_FOUND") - console.log(e); + this.server.doLog(e); this.delSyncLock("m.room.create") }) this.addSyncLock("m.room.canonical_alias"); @@ -79,7 +79,7 @@ export class Channel { }).catch(e => { const errcode = e.response?.data?.errcode; if (errcode !== "M_NOT_FOUND") - console.log(e); + this.server.doLog(e); this.delSyncLock("m.room.canonical_alias") }) this.addSyncLock("m.room.topic"); @@ -94,7 +94,7 @@ export class Channel { }).catch(e => { const errcode = e.response?.data?.errcode; if (errcode !== "M_NOT_FOUND") - console.log(this.roomId, e); + this.server.doLog(`${this.roomId}: ${e}`); this.delSyncLock("m.room.topic") }) this.addSyncLock("m.room.members"); @@ -113,7 +113,7 @@ export class Channel { }).catch(e => { const errcode = e.response?.data?.errcode; if (errcode !== "M_NOT_FOUND") - console.log(e); + this.server.doLog(e); this.delSyncLock("m.room.members") }) this.addSyncLock("m.room.power_levels") @@ -132,7 +132,7 @@ export class Channel { }).catch(e => { const errcode = e.response?.data?.errcode; if (errcode !== "M_NOT_FOUND") - console.log(e); + this.server.doLog(e); this.delSyncLock("m.room.power_levels") }) } diff --git a/src/Client.ts b/src/Client.ts index 1dd607c..596af5c 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -167,7 +167,7 @@ export class Client { break; default: this.sendMessage(this.server.name, "421", [this.user.nick, message.command, 'Unknown command'], message.tags); - console.log(`unknown command ${message.command}`); + this.server.doLog(`unknown command ${message.command}`); break; } } @@ -206,14 +206,14 @@ export class Client { } else { this.sendMessage(this.server.name, "306", [this.user.nick, "You have been marked as being away"], message.tags); } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }) } @@ -294,14 +294,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }) } @@ -331,14 +331,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }) } @@ -373,14 +373,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }) } @@ -420,10 +420,8 @@ export class Client { return; } for (const msg of batch.messages) { - console.log(firstMessage.params[1], msg.params[1]); const separator = (msg.tags.has('draft/multiline-concat') || firstMessage.params[1] === msg.params[1]) ? '' : '\n'; fullMessage = `${fullMessage}${separator}${msg.params[1]}`; - console.log(fullMessage); } const highlightFilteredMsg = fullMessage.split(" ").map(w => { if (!w.startsWith('@')) return w; @@ -456,14 +454,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }); } @@ -517,14 +515,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }); } @@ -597,14 +595,14 @@ export class Client { //@ts-ignore this.sendMessage(this.server.name, "NOTICE", [this.user.nick, JSON.stringify(response.data)], message.tags); } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }) } @@ -633,14 +631,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }); } @@ -653,14 +651,14 @@ export class Client { } this.apiCall.put(`/rooms/${targetChannel.roomId}/typing/${this.user.mxid}`, data).then(r => { // No response body for successful request - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }); } @@ -712,14 +710,14 @@ export class Client { this.server.eventIDToLabel.set(maybeEventID, maybeLabel) } } - }).catch(function (error) { + }).catch((error) => { if (error.response) { - console.log(error.response.data); + this.server.doLog(error.response.data); } else if (error.request) { - console.log(error.request); + this.server.doLog(error.request); } else { - console.log('Error', error.message); - console.log(error.config); + this.server.doLog(`Error: ${error.message}`); + this.server.doLog(error.config); } }) } diff --git a/src/IRCClient.ts b/src/IRCClient.ts index df1f90f..88ac66e 100644 --- a/src/IRCClient.ts +++ b/src/IRCClient.ts @@ -11,7 +11,6 @@ export class IRCClient extends Client { } writeMessage(message: string) { - //console.log(`SENT: ${msgToSend}`); this.socket.write(`${message}\r\n`); } diff --git a/src/Message.ts b/src/Message.ts index 231b6ea..d235450 100644 --- a/src/Message.ts +++ b/src/Message.ts @@ -75,7 +75,6 @@ function addToTags(key: string): boolean { } export function parseIRCMessage(rawLine: string) { - //console.log(`RAW: ${rawLine}`); let restOfMessage = rawLine; let parsedTags: Map = new Map(); let prefix = ''; @@ -119,6 +118,6 @@ export function parseIRCMessage(rawLine: string) { if (lastParam !== '') { params.push(lastParam); } - //console.log(parsedTags, prefix, command, params); + return new IRCMessage(parsedTags, prefix, command, params); } \ No newline at end of file diff --git a/src/Server.ts b/src/Server.ts index 6ff759d..b985e87 100644 --- a/src/Server.ts +++ b/src/Server.ts @@ -65,7 +65,7 @@ export class IRCServer { this.getDirectMessages(); this.doSync(); }).catch(e => { - console.log(e); + this.doLog(e); }) } @@ -158,7 +158,7 @@ export class IRCServer { }) this.listener.listen(this.config["port"], () => { - console.log(`Listening on port ${this.config["port"]}`); + this.doLog(`Listening on port ${this.config["port"]}`); }) } } @@ -308,8 +308,8 @@ export class IRCServer { case 'org.matrix.msc3381.poll.start': break; default: - console.log(`${targetChannel.name}:`); - console.log(nextEvent); + this.doLog(`${targetChannel.name}:`); + this.doLog(nextEvent); break; } } @@ -398,7 +398,7 @@ export class IRCServer { handleMatrixGuestAccess(event: any, targetChannel: Channel) { const rule = event["content"]?.["guest_access"]; if (!rule) { - console.log(`Warning: Guest access not found in ${event}`); + this.doLog(`Warning: Guest access not found in ${event}`); return; } targetChannel.guestAccess = rule; @@ -407,7 +407,7 @@ export class IRCServer { handleMatrixHistoryVisibility(event: any, targetChannel: Channel) { const rule = event["content"]?.["history_visibility"]; if (!rule) { - console.log(`Warning: history visibility not found in ${event}`); + this.doLog(`Warning: history visibility not found in ${event}`); return; } targetChannel.historyVisibility = rule; @@ -416,7 +416,7 @@ export class IRCServer { handleMatrixJoinRule(event: any, targetChannel: Channel) { const rule = event["content"]?.["join_rule"]; if (!rule) { - console.log(`Warning: join rule not found in ${event}`); + this.doLog(`Warning: join rule not found in ${event}`); return; } targetChannel.joinRules = rule; @@ -467,7 +467,7 @@ export class IRCServer { targetChannel.matrixUsers.delete(targetUser.nick) } else { - console.log(`Got unknown m.room.member event: ${event}`); + this.doLog(`Got unknown m.room.member event: ${event}`); } } @@ -498,7 +498,7 @@ export class IRCServer { return; const mxcregex = uri.match(/mxc:\/\/(?[^\/]+)\/(?.+)/) if (!mxcregex || !mxcregex.groups) - console.log(`Failed to parse MXC URI: ${uri}`); + this.doLog(`Failed to parse MXC URI: ${uri}`); else uri = `${this.homeserver}/_matrix/media/v3/download/${mxcregex.groups.servername}/${mxcregex.groups.mediaid}`; messageContent = `\x01ACTION shared ${messageContent}: ${uri}\x01`; @@ -641,7 +641,7 @@ export class IRCServer { const mxcregex = imgMxc.match(/mxc:\/\/(?[^\/]+)\/(?.+)/) let uri = imgMxc; if (!mxcregex || !mxcregex.groups) { - console.log(`Failed to parse MXC URI: ${imgMxc}`); + this.doLog(`Failed to parse MXC URI: ${imgMxc}`); } else { uri = `${this.homeserver}/_matrix/media/v3/download/${mxcregex.groups.servername}/${mxcregex.groups.mediaid}`; }