Add logger

.eslintrc.cjs

@@ -27,5 +27,6 @@ module.exports = {
     'no-shadow': 'off',
     '@typescript-eslint/no-shadow': ['error'],
     '@typescript-eslint/no-floating-promises': 'error',
+    '@typescript-eslint/no-explicit-any': [1, { ignoreRestArgs: true }],
   },
 }

client/env.ts

@@ -1,3 +1,3 @@
 export const uri = process.env?.SERVER_URI || 'http://localhost:3000'
 export const username = process.env?.RPG_FOR_BOTS_USERNAME || 'foobar'
-export const password = process.env?.RPG_FOR_BOTS_PASSWORD || 'foobar'
+export const password = process.env?.RPG_FOR_BOTS_PASSWORD || 'foobar2'

client/index.ts

@@ -14,6 +14,7 @@ const socket: Socket<ServerToClientEvents, ClientToServerEvents> = io(uri, {
 const start = Date.now()
 
 socket.emit('ping', () => {
+  // eslint-disable-next-line no-console
   console.log(`Ping: ${Date.now() - start}ms`)
 
   socket.close()

server/index.ts

@@ -9,6 +9,7 @@ import {
 
 import { port } from './env'
 import { parseToken, validateCredentials } from './aurh'
+import logger from './logger'
 
 const server = new Server<
   ClientToServerEvents,
@@ -21,8 +22,9 @@ server.use((socket, next) => {
   const credentials = parseToken(socket.handshake.auth?.token || '')
 
   if (!validateCredentials(credentials)) {
-    console.debug(
-      `[${socket.id}] Invalid credentials for user "${credentials.username}" from ${socket.handshake.address}`,
+    logger.debug(
+      socket,
+      `Invalid credentials for user "${credentials.username}" from ${socket.handshake.address}`,
     )
     next(new Error('Invalid credentials'))
     return
@@ -33,20 +35,18 @@ server.use((socket, next) => {
 })
 
 server.on('connection', (socket) => {
-  console.debug(
-    `[${socket.id}] New connection from ${socket.handshake.address}`,
-  )
+  logger.debug(socket, `New connection from ${socket.handshake.address}`)
 
   if (socket.data.username) {
-    console.log(`[${socket.id}] User "${socket.data.username}" came online`)
+    logger.log(socket, `User came online`)
   }
 
   socket.on('disconnect', () => {
     if (socket.data.username) {
-      console.log(`[${socket.id}] User "${socket.data.username}" went offline`)
+      logger.log(socket, `User went offline`)
     }
 
-    console.debug(`[${socket.id}] Connection closed`)
+    logger.debug(socket, `Connection closed`)
   })
 
   socket.on('ping', (callback) => {

server/logger.ts

@@ -0,0 +1,70 @@
+import { Socket } from 'socket.io'
+
+import {
+  ClientToServerEvents,
+  InterServerEvents,
+  ServerToClientEvents,
+  SocketData,
+} from '../shared/socket'
+
+function combineWithSocketData(
+  socket: Socket<
+    ClientToServerEvents,
+    ServerToClientEvents,
+    InterServerEvents,
+    SocketData
+  >,
+  ...data: any[]
+): // eslint-disable-next-line @typescript-eslint/no-explicit-any
+any[] {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const output: any[] = Array.from(data)
+
+  if (socket.data.username) {
+    output.unshift(`[${socket.data.username}]`)
+  }
+
+  output.unshift(`[${socket.id}]`)
+  // output.unshift(`[${socket.handshake.address}]`)
+
+  return output
+}
+
+export default {
+  log: (
+    socket: Socket<
+      ClientToServerEvents,
+      ServerToClientEvents,
+      InterServerEvents,
+      SocketData
+    >,
+    ...data: any[]
+  ): void => {
+    // eslint-disable-next-line no-console
+    console.log(...combineWithSocketData(socket, ...data))
+  },
+  debug: (
+    socket: Socket<
+      ClientToServerEvents,
+      ServerToClientEvents,
+      InterServerEvents,
+      SocketData
+    >,
+    ...data: any[]
+  ): void => {
+    // eslint-disable-next-line no-console
+    console.debug(...combineWithSocketData(socket, ...data))
+  },
+  error: (
+    socket: Socket<
+      ClientToServerEvents,
+      ServerToClientEvents,
+      InterServerEvents,
+      SocketData
+    >,
+    ...data: any[]
+  ): void => {
+    // eslint-disable-next-line no-console
+    console.error(...combineWithSocketData(socket, ...data))
+  },
+}