fix(qq): status

satorijs · Nov 23, 2024 · 965c091 · 965c091
1 parent bfa7e86
commit 965c091
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/adapters/qq/src/bot/index.ts b/adapters/qq/src/bot/index.ts
@@ -50,15 +50,9 @@ export class QQBot<C extends Context = Context> extends Bot<C, QQBot.Config> {
   }
 
   async initialize() {
-    try {
-      const user = await this.guildBot.internal.getMe()
-      Object.assign(this.user, user)
-      this.user.name = user.username
-    } catch (e) {
-      if (this.http.isError(e) && e.response) {
-        this.logger.warn(`GET /users/@me response: %o`, e.response.data)
-      }
-    }
+    const user = await this.guildBot.internal.getMe()
+    Object.assign(this.user, user)
+    this.user.name = user.username
   }
 
   async stop() {

diff --git a/adapters/qq/src/http.ts b/adapters/qq/src/http.ts
@@ -1,4 +1,4 @@
-import { Adapter, Binary, Context, Schema } from '@satorijs/core'
+import { Adapter, Binary, Context, Schema, Universal } from '@satorijs/core'
 import { getPublicKeyAsync, signAsync, verifyAsync } from '@noble/ed25519'
 import { QQBot } from './bot'
 import { Opcode, Payload } from './types'
@@ -13,7 +13,7 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, QQBot<C>
     if (bot.config.authType === 'bearer') {
       await bot.getAccessToken()
     }
-    await bot.initialize()
+    await this.initialize(bot)
 
     bot.ctx.server.post(bot.config.path, async (ctx) => {
       const bot = this.bots.find(bot => bot.config.id === ctx.get('X-Bot-Appid'))
@@ -25,9 +25,6 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, QQBot<C>
         const key = this.getPrivateKey(bot.config.secret)
         const data = payload.d.event_ts + payload.d.plain_token
         const sig = await signAsync(new TextEncoder().encode(data), key)
-        setTimeout(() => {
-          bot.online()
-        }, 0)
         ctx.body = {
           plain_token: payload.d.plain_token,
           signature: Binary.toHex(sig)
@@ -40,6 +37,9 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, QQBot<C>
           return ctx.status = 403
         }
 
+        if (bot.status !== Universal.Status.ONLINE) {
+          await this.initialize(bot)
+        }
         bot.dispatch(bot.session({
           type: 'internal',
           _type: 'qq/' + payload.t.toLowerCase().replace(/_/g, '-'),
@@ -56,6 +56,20 @@ export class HttpServer<C extends Context = Context> extends Adapter<C, QQBot<C>
     })
   }
 
+  async initialize(bot: QQBot) {
+    try {
+      await bot.initialize()
+      bot.online()
+    } catch (e) {
+      if (bot.http.isError(e) && e.response) {
+        bot.logger.warn(`GET /users/@me response: %o`, e.response.data)
+      } else {
+        bot.logger.warn(e)
+      }
+      bot.offline()
+    }
+  }
+
   private getPrivateKey(secret: string) {
     const seedSize = 32
     let seed = secret

diff --git a/adapters/qq/src/ws.ts b/adapters/qq/src/ws.ts
@@ -75,7 +75,11 @@ export class WsClient<C extends Context = Context> extends Adapter.WsClient<C, Q
           this._sessionId = parsed.d.session_id
           this.bot.user = decodeUser(parsed.d.user)
           this.bot.guildBot.user = this.bot.user
-          await this.bot.initialize()
+          try {
+            await this.bot.initialize()
+          } catch (e) {
+            this.bot.logger.warn(e)
+          }
           return this.bot.online()
         }
         if (parsed.t === 'RESUMED') {