fix: 再接続の制御を除去 (#959)

approvers · Aug 6, 2023 · 9ebe81d · 9ebe81d
1 parent f053514
commit 9ebe81d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 52 deletions.
diff --git a/src/adaptor/discord/voice.ts b/src/adaptor/discord/voice.ts
@@ -5,7 +5,6 @@ import {
   VoiceConnectionStatus,
   createAudioPlayer,
   createAudioResource,
-  entersState,
   joinVoiceChannel
 } from '@discordjs/voice';
 import {
@@ -121,55 +120,16 @@ export class DiscordVoiceConnection<K extends string | number | symbol>
     this.connection = null;
   }
 
-  onDisconnected(shouldReconnect: () => boolean): void {
+  onDisconnected(handler: () => void): void {
     if (!this.connection) {
       throw new Error(
         'You must invoke `connect` before to register disconnection handler'
       );
     }
-    this.connection.on(
-      VoiceConnectionStatus.Disconnected,
-      () => void this.makeDisconnectionHandler(shouldReconnect)
-    );
-  }
-  private makeDisconnectionHandler(shouldReconnect: () => boolean) {
-    return async () => {
-      if (!this.connection) {
-        return;
-      }
-      try {
-        await Promise.race([
-          entersState(
-            this.connection,
-            VoiceConnectionStatus.Signalling,
-            TIMEOUT_MS
-          ),
-          entersState(
-            this.connection,
-            VoiceConnectionStatus.Connecting,
-            TIMEOUT_MS
-          )
-        ]);
-        // 再接続に成功。
-        return;
-      } catch (error) {
-        console.error(error);
-        this.destroy();
-      }
-      if (!shouldReconnect()) {
-        return;
-      }
-      try {
-        const newConn = new DiscordVoiceConnection(
-          this.channel,
-          this.audioRecord
-        );
-        this.connection = newConn.connection;
-        this.player = newConn.player;
-      } catch (error) {
-        console.error(error);
-      }
-    };
+    this.connection.on(VoiceConnectionStatus.Disconnected, () => {
+      handler();
+      this.destroy();
+    });
   }
 }
 

diff --git a/src/service/command/gyokuon.ts b/src/service/command/gyokuon.ts
@@ -84,7 +84,6 @@ export class GyokuonCommand implements CommandResponder<typeof SCHEMA> {
     connectionVC.connect();
     connectionVC.onDisconnected(() => {
       this.doingGyokuon = false;
-      return false;
     });
 
     if (isShort) {

diff --git a/src/service/command/kaere.ts b/src/service/command/kaere.ts
@@ -184,7 +184,6 @@ export class KaereCommand implements CommandResponder<typeof SCHEMA> {
     connection.connect();
     connection.onDisconnected(() => {
       this.doingKaere = false;
-      return false;
     });
     await this.deps.stdout.sendEmbed({
       title: '提督、もうこんな時間だよ',

diff --git a/src/service/command/party.ts b/src/service/command/party.ts
@@ -188,7 +188,6 @@ export class PartyCommand implements CommandResponder<typeof SCHEMA> {
     this.connection.connect();
     this.connection.onDisconnected(() => {
       this.connection = null;
-      return false;
     });
     await message.reply(partyStarting);
     await this.connection.playToEnd(this.generateNextKey());

diff --git a/src/service/voice-connection.ts b/src/service/voice-connection.ts
@@ -54,9 +54,7 @@ export interface VoiceConnection<K> {
   unpause(): void;
 
   /**
-   * 回復できない接続解除が発生した時に、同じチャンネルへ再接続するかどうかのハンドラを登録する。ボイスチャンネルが削除されたなど、必ず再接続できないこともある。
-   *
-   * @param shouldReconnect - この関数が `true` を返す場合は、回復できない接続解除でも同じチャンネルへの再接続を試みる。
+   * 接続解除が発生した時のハンドラを登録する。
    */
-  onDisconnected(shouldReconnect: () => boolean): void;
+  onDisconnected(handler: () => void): void;
 }