@satorijs/adapter-discord 3.4.3 → 3.4.4

package/lib/index.js

@@ -1493,8 +1493,12 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
     this._d = 0;
     this._sessionId = "";
   }
-  prepare() {
-    return this.bot.http.ws(this._resumeUrl || this.bot.config.gateway);
+  async prepare() {
+    if (this._resumeUrl) {
+      return this.bot.http.ws(this._resumeUrl);
+    }
+    const { url } = await this.bot.internal.getGatewayBot();
+    return this.bot.http.ws(url);
   }
   heartbeat() {
     logger.debug(`heartbeat d ${this._d}`);
@@ -1504,19 +1508,8 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
     }));
   }
   accept() {
-    if (this._sessionId) {
-      logger.debug("resuming");
-      this.bot.socket.send(JSON.stringify({
-        op: 6 /* RESUME */,
-        d: {
-          token: this.bot.config.token,
-          session_id: this._sessionId,
-          seq: this._d
-        }
-      }));
-      this.bot.online();
-    }
     this.bot.socket.on("message", async (data) => {
+      var _a, _b;
       let parsed;
       try {
         parsed = JSON.parse(data.toString());
@@ -1529,17 +1522,35 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
       }
       if (parsed.op === 10 /* HELLO */) {
         this._ping = setInterval(() => this.heartbeat(), parsed.d.heartbeat_interval);
-        if (this._sessionId)
+        if (this._sessionId) {
+          logger.debug("resuming");
+          this.bot.socket.send(JSON.stringify({
+            op: 6 /* RESUME */,
+            d: {
+              token: this.bot.config.token,
+              session_id: this._sessionId,
+              seq: this._d
+            }
+          }));
+        } else {
+          this.bot.socket.send(JSON.stringify({
+            op: 2 /* IDENTIFY */,
+            d: {
+              token: this.bot.config.token,
+              properties: {},
+              compress: false,
+              intents: this.bot.config.intents
+            }
+          }));
+        }
+      }
+      if (parsed.op === 9 /* INVALID_SESSION */) {
+        if (parsed.d)
           return;
-        this.bot.socket.send(JSON.stringify({
-          op: 2 /* IDENTIFY */,
-          d: {
-            token: this.bot.config.token,
-            properties: {},
-            compress: false,
-            intents: this.bot.config.intents
-          }
-        }));
+        this._sessionId = "";
+        logger.warn("offline: invalid session");
+        this.bot.offline();
+        (_a = this.bot.socket) == null ? void 0 : _a.close();
       }
       if (parsed.op === 0 /* DISPATCH */) {
         if (parsed.t === "READY") {
@@ -1552,10 +1563,18 @@ var WsClient = class extends import_satori3.Adapter.WsClient {
           logger.debug("session_id " + this._sessionId);
           return this.bot.online();
         }
+        if (parsed.t === "RESUMED") {
+          return this.bot.online();
+        }
         const session = await adaptSession(this.bot, parsed);
         if (session)
           this.bot.dispatch(session);
       }
+      if (parsed.op === 7 /* RECONNECT */) {
+        this.bot.offline();
+        logger.warn("offline: discord request reconnect");
+        (_b = this.bot.socket) == null ? void 0 : _b.close();
+      }
     });
     this.bot.socket.on("close", () => {
       clearInterval(this._ping);
@@ -1566,7 +1585,6 @@ __name(WsClient, "WsClient");
 ((WsClient2) => {
   WsClient2.Config = import_satori3.Schema.intersect([
     import_satori3.Schema.object({
-      gateway: import_satori3.Schema.string().default("wss://gateway.discord.gg/?v=10&encoding=json").description("要连接的 WebSocket 网关。"),
       intents: import_satori3.Schema.bitset(GatewayIntent).description("需要订阅的机器人事件。").default(0 | 512 /* GUILD_MESSAGES */ | 1024 /* GUILD_MESSAGE_REACTIONS */ | 4096 /* DIRECT_MESSAGES */ | 8192 /* DIRECT_MESSAGE_REACTIONS */ | 32768 /* MESSAGE_CONTENT */)
     }).description("推送设置"),
     import_satori3.Adapter.WsClient.Config