Merge remote-tracking branch 'origin/refactor/error-message' into development

Author: winverse

Diff for: packages/velog-server/src/common/plugins/global/errorHandlerPlugin.ts

@@ -15,17 +15,14 @@ const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
     request.log.error(error, 'fastify onError')
     const discord = container.resolve(DiscordService)
     discord
-      .sendMessage(
-        'error',
-        JSON.stringify({
-          type: 'fastify OnError',
-          requestbody: request?.body || 'none',
-          query: request?.query || 'none',
-          error,
-          user: request?.user,
-          ip: request?.ip,
-        }),
-      )
+      .sendMessage('error', {
+        type: 'fastify OnError',
+        body: request?.body,
+        query: request?.query,
+        error,
+        user: request?.user,
+        ip: request?.ip,
+      })
       .catch(console.error)
 
     done()
@@ -50,16 +47,14 @@ const errorHandlerPlugin: FastifyPluginCallback = (fastify, _, done) => {
     } else {
       const discord = container.resolve(DiscordService)
       discord
-        .sendMessage(
-          'error',
-          JSON.stringify({
-            type: 'fastify handleError',
-            requestbody: request?.body,
-            error,
-            user: request?.user,
-            ip: request?.ip,
-          }),
-        )
+        .sendMessage('error', {
+          type: 'fastify handleError',
+          body: request?.body,
+          query: request?.query,
+          error,
+          user: request?.user,
+          ip: request?.ip,
+        })
         .catch(console.error)
     }
   })

Diff for: packages/velog-server/src/common/plugins/global/mercuriusPlugin.ts

@@ -23,7 +23,7 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
     },
     errorHandler: (error, request) => {
       const { name, message, code, stack, errors, statusCode } = error
-      const result = {
+      const errorData = {
         name,
         message,
         code,
@@ -38,43 +38,38 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
         const discord = container.resolve(DiscordService)
 
         discord
-          .sendMessage(
-            'error',
-            JSON.stringify({
-              type: 'errorHandler',
-              requestbody: request?.body,
-              result,
-              user: request?.user,
-              ip: request?.ip,
-            }),
-          )
+          .sendMessage('error', {
+            type: 'errorHandler',
+            body: request?.body,
+            user: request?.user,
+            ip: request?.ip,
+            originError: error,
+            error: errorData,
+          })
           .catch(console.error)
       }
     },
-    errorFormatter: (execution, ctx) => {
-      const e = execution.errors?.[0]?.originalError
+    errorFormatter: (error, ctx) => {
+      const e = error.errors?.[0]?.originalError
 
       if (!isHttpError(e)) {
         console.log('mecurius errorFormatter')
-        ;(ctx as any).request?.log?.error(execution, 'errorFormatter')
+        ;(ctx as any).request?.log?.error(error, 'errorFormatter')
         const discord = container.resolve(DiscordService)
         discord
-          .sendMessage(
-            'error',
-            JSON.stringify({
-              type: 'errorFormat',
-              requestbody: (ctx as any).request?.body,
-              execution,
-              user: (ctx as any).request?.user,
-              ip: (ctx as any).request?.ip,
-            }),
-          )
+          .sendMessage('error', {
+            type: 'errorFormat',
+            body: (ctx as any).request?.body,
+            error,
+            user: (ctx as any).request?.user,
+            ip: (ctx as any).request?.ip,
+          })
           .catch(console.error)
 
-        return { statusCode: 500, response: execution }
+        return { statusCode: 500, response: error }
       }
 
-      const errors = execution.errors?.map((error) =>
+      const errors = error.errors?.map((error) =>
         Object.assign(error, {
           extensions: {
             name: e.name,

Diff for: packages/velog-server/src/lib/discord/DiscordService.ts

@@ -1,6 +1,8 @@
-import { injectable, singleton } from 'tsyringe'
+import { container, injectable, singleton } from 'tsyringe'
 import { Client, GatewayIntentBits } from 'discord.js'
 import { ENV } from '@env'
+import { RedisService } from '@lib/redis/RedisService'
+import { Time } from '@constants/TimeConstants'
 
 @injectable()
 @singleton()
@@ -22,9 +24,16 @@ export class DiscordService {
       this.client.login(ENV.discordBotToken)
     })
   }
-  public async sendMessage(type: MessageType, message: string) {
+  public async sendMessage(type: MessageType, payload: MessagePayload) {
     this.isSending = true
 
+    const metaData = Object.assign(payload, {
+      body: payload.body ?? 'none',
+      query: payload.query ?? 'none',
+    })
+
+    const message = JSON.stringify(metaData)
+
     const frequentWord = [
       'connection pool',
       'canceling statement',
@@ -44,6 +53,14 @@ export class DiscordService {
       return
     }
 
+    if (payload.body?.include('WritePost') && payload?.user?.id) {
+      const redisService = container.resolve(RedisService)
+      const key = redisService.generateKey.errorMessageCache(payload.type, payload?.user?.id)
+      const exists = await redisService.exists(key)
+      if (exists === 1) return
+      await redisService.setex(key, Time.ONE_MINUTE_IN_S * 10, 'true')
+    }
+
     try {
       const isReady = this.client.isReady()
 
@@ -82,3 +99,12 @@ export class DiscordService {
 }
 
 type MessageType = 'error' | 'spam'
+type MessagePayload = {
+  type: string
+  body?: any
+  query?: any
+  user?: { id: string }
+  ip?: string
+  error?: any
+  originError?: any
+}

Diff for: packages/velog-server/src/lib/redis/RedisService.ts

@@ -34,6 +34,7 @@ export class RedisService extends Redis implements Service {
       changeEmail: (code: string) => `changeEmailCode:${code}`,
       trendingWriters: () => `trending:writers`,
       existsUser: (userId: string) => `exists:user:${userId}`,
+      errorMessageCache: (type: string, userId: string) => `error:${type}:${userId}`,
     }
   }
 
@@ -63,6 +64,7 @@ type GenerateRedisKey = {
   changeEmail: (code: string) => string
   trendingWriters: () => string
   existsUser: (userId: string) => string
+  errorMessageCache: (type: string, userId: string) => string
 }
 
 type QueueName = 'createFeed' | 'checkPostSpam'