feat(qq): log trace id

satorijs · Dec 26, 2023 · 8b0279b · 8b0279b
1 parent 600a305
commit 8b0279b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/adapters/qq/src/internal/group.ts b/adapters/qq/src/internal/group.ts
@@ -17,14 +17,23 @@ export class GroupInternal {
   }
 
   async sendMessage(group_openid: string, data: QQ.Message.Request) {
-    return this.http().post<{
+    const { data: resp } = await this._sendMessage(group_openid, data)
+    return resp
+  }
+
+  async _sendMessage(group_openid: string, data: QQ.Message.Request) {
+    return this.http().axios<{
       group_code: string
       msg: string
     } & {
       code: number
       message: string
       data: any
-    }>(`/v2/groups/${group_openid}/messages`, data)
+    }>({
+      url: `/v2/groups/${group_openid}/messages`,
+      data,
+      method: 'post',
+    })
   }
 
   async sendFilePrivate(openid: string, data: QQ.Message.File.Request) {

diff --git a/adapters/qq/src/message.ts b/adapters/qq/src/message.ts
@@ -68,7 +68,8 @@ export class QQGuildMessageEncoder<C extends Context = Context> extends MessageE
       }
     } catch (e) {
       this.bot.logger.error(e)
-      this.bot.logger.error('[response] %o', e.response?.data)
+      this.bot.logger.error('[response] status: %s, x-tps-trace-id: %s, %o', e.response?.status,
+        e.response?.headers?.['x-tps-trace-id'], e.response?.data)
       if ((e.repsonse?.data?.code === 40004 || e.response?.data?.code === 102) && !this.retry && this.fileUrl) {
         this.bot.logger.warn('retry image sending')
         this.retry = true
@@ -239,9 +240,10 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
         session.messageId = msg_id
       } else {
         // FIXME: missing message id
-        const resp = await this.bot.internal.sendMessage(this.session.channelId, data)
+        const { data: resp, headers, status } = await this.bot.internal._sendMessage(this.session.channelId, data)
         if (resp.msg !== 'success') {
-          this.bot.logger.warn(resp)
+          this.bot.logger.warn('[response] status: %s, x-tps-trace-id: %s, %o', status,
+            headers?.['x-tps-trace-id'], data)
         }
         if (resp.code === 304023 && this.bot.config.intents & QQ.Intents.MESSAGE_AUDIT) {
           try {
@@ -257,7 +259,8 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
     } catch (e) {
       if (!Quester.isAxiosError(e)) throw e
       this.errors.push(e)
-      this.bot.logger.warn('[response] %s %o', e.response?.status, e.response?.data)
+      this.bot.logger.warn('[response] status: %s, x-tps-trace-id: %s, %o', e.response?.status,
+        e.response?.headers?.['x-tps-trace-id'], e.response?.data)
     }
 
     // this.results.push(session.event.message)
@@ -316,7 +319,8 @@ export class QQMessageEncoder<C extends Context = Context> extends MessageEncode
     } catch (e) {
       if (!Quester.isAxiosError(e)) throw e
       this.errors.push(e)
-      this.bot.logger.warn('[response] %s %o', e.response?.status, e.response?.data)
+      this.bot.logger.warn('[response] status: %s, x-tps-trace-id: %s, %o', e.response?.status,
+        e.response?.headers?.['x-tps-trace-id'], e.response?.data)
     }
     entry?.dispose?.()
     return res