fix: ストリームの再接続を調整

めちゃくちゃ繋ぎなおそうとするのでアカンわ…
rokoucha · Oct 5, 2021 · 1b43b32 · 1b43b32
1 parent 0ad30c7
commit 1b43b32
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/components/futabaComemntProvider.tsx b/src/components/futabaComemntProvider.tsx
@@ -1,4 +1,4 @@
-import { FutabaClient, Response } from '../lib/futaba'
+import { FutabaClient, Response, Threads } from '../lib/futaba'
 import { FutabaCommentStreamer } from './futabaCommentStreamer'
 import { useReturnAsync } from '../utils'
 import React, { useEffect, useRef, useState } from 'react'
@@ -43,6 +43,10 @@ export const FutabaCommentProvider: React.VFC<FutabaCommentProviderProps> = ({
     }
   }, [settings])
 
+  useEffect(() => {
+    streamsRef.current = []
+  }, [restart])
+
   useEffect(() => {
     if (!futabaRef.current) return
 
@@ -75,11 +79,14 @@ export const FutabaCommentProvider: React.VFC<FutabaCommentProviderProps> = ({
 
     ;(async () => {
       let threads
-      try {
-        threads = await futaba.threads()
-      } catch (e) {
-        console.error(loggingName, e)
-        return
+      while (threads === undefined) {
+        console.log(loggingName, 'trying to fetch threads...')
+        try {
+          threads = await futaba.threads()
+          break
+        } catch (e) {
+          console.error(loggingName, e)
+        }
       }
 
       streams = threads.res
@@ -98,7 +105,7 @@ export const FutabaCommentProvider: React.VFC<FutabaCommentProviderProps> = ({
           )
         })
 
-      console.info(loggingName, streams.length, 'streams')
+      console.info(loggingName, streams.length, 'streams ready')
 
       streamsRef.current = streams
     })()
@@ -112,7 +119,7 @@ export const FutabaCommentProvider: React.VFC<FutabaCommentProviderProps> = ({
           key={index}
           result={result}
           setDplayerComment={setDplayerComment}
-          setRestart={setRestart}
+          restart={() => setRestart((restart) => !restart)}
           setZenzaComment={setZenzaComment}
           stream={stream}
         />

diff --git a/src/components/futabaCommentStreamer.tsx b/src/components/futabaCommentStreamer.tsx
@@ -8,18 +8,18 @@ const loggingName = 'Futaba Comment Streamer' as const
 
 type FutabaCommentStreamerProps = {
   id: number
+  restart: () => any
   result: () => string | undefined
   setDplayerComment: SetterOrUpdater<DPlayerCommentPayload> | null
-  setRestart: React.Dispatch<React.SetStateAction<boolean>>
   setZenzaComment: SetterOrUpdater<ZenzaCommentChat> | null
   stream: AsyncGenerator<Response, void, undefined>
 }
 
 export const FutabaCommentStreamer: React.VFC<FutabaCommentStreamerProps> = ({
   id,
+  restart,
   result,
   setDplayerComment,
-  setRestart,
   setZenzaComment,
   stream,
 }) => {
@@ -63,15 +63,15 @@ export const FutabaCommentStreamer: React.VFC<FutabaCommentStreamerProps> = ({
       } finally {
         console.info(loggingName, id, 'closed by remote', result())
 
-        setRestart(true)
+        restart()
       }
     })()
 
     return () => {
-      console.info(loggingName, id, 'closed by provider')
+      console.info(loggingName, id, 'closed by provider', result())
       stream.return()
 
-      setRestart(true)
+      restart()
     }
   })