@x-edu/live-player 0.0.31 → 0.0.33

package/src/detail/const.js

@@ -1,20 +1,20 @@
-export const ShortUrlMap = {
-  vlab221027: '88dc48f1-7460-45d1-9c62-dd18e2557f6f',
-  'nect-ai20221028': 'bfc88f3a-5ff6-4eec-ac4f-9bc393c485c2',
-  // 正式直播
-  kms: '600f4e30-13ae-4dcd-872a-54d955503bec',
-  flt1: '105f8dff-0f25-4d91-8da8-5e1e8800d5cb',
-  flt2: '46f69dad-1475-4299-9288-2500f3bbdaff',
-  flt3: 'fba98ffe-2f5f-4630-bd39-8cf8a37d5da5',
-  flt4: '5e395246-3c9f-4be4-af40-8b7472b888ed',
-  flt5: 'ec6db645-aa15-449d-b9b2-13e0715aa281',
-  kexueyanxiu1: '382a180d-2ddb-42a4-bbe2-b7dc87b288f1',
-  kexueyanxiu2: 'ef02bcc2-ce21-4e1e-bb9e-ef0871a0a7c1',
-  kexueyanxiu3: 'f32ac797-1eef-404a-b47e-5fb168da00f1',
-  kexueyanxiu4: 'b5a96a64-e471-4bf4-b659-b981850a08a8',
-  kexueyanxiu5: 'a49c4b2b-3d6e-4589-85f2-e1efd7f3e098',
-  kexueyanxiu6: 'ae28b934-e7a1-4ba8-98da-23cc1a508893',
-  kexueyanxiu7: '6c01e78a-a09e-4c28-b3d7-5091799a9e65',
-  kexueyanxiu8: '73b9d13f-f58e-41f5-9f93-a0923ccf6044',
-  kexueyanxiu9: 'e05f575f-0f7b-4de8-ad44-24ce4f35aea1'
-}
+export const ShortUrlMap = {
+  vlab221027: '88dc48f1-7460-45d1-9c62-dd18e2557f6f',
+  'nect-ai20221028': 'bfc88f3a-5ff6-4eec-ac4f-9bc393c485c2',
+  // 正式直播
+  kms: '600f4e30-13ae-4dcd-872a-54d955503bec',
+  flt1: '105f8dff-0f25-4d91-8da8-5e1e8800d5cb',
+  flt2: '46f69dad-1475-4299-9288-2500f3bbdaff',
+  flt3: 'fba98ffe-2f5f-4630-bd39-8cf8a37d5da5',
+  flt4: '5e395246-3c9f-4be4-af40-8b7472b888ed',
+  flt5: 'ec6db645-aa15-449d-b9b2-13e0715aa281',
+  kexueyanxiu1: '382a180d-2ddb-42a4-bbe2-b7dc87b288f1',
+  kexueyanxiu2: 'ef02bcc2-ce21-4e1e-bb9e-ef0871a0a7c1',
+  kexueyanxiu3: 'f32ac797-1eef-404a-b47e-5fb168da00f1',
+  kexueyanxiu4: 'b5a96a64-e471-4bf4-b659-b981850a08a8',
+  kexueyanxiu5: 'a49c4b2b-3d6e-4589-85f2-e1efd7f3e098',
+  kexueyanxiu6: 'ae28b934-e7a1-4ba8-98da-23cc1a508893',
+  kexueyanxiu7: '6c01e78a-a09e-4c28-b3d7-5091799a9e65',
+  kexueyanxiu8: '73b9d13f-f58e-41f5-9f93-a0923ccf6044',
+  kexueyanxiu9: 'e05f575f-0f7b-4de8-ad44-24ce4f35aea1'
+}

package/src/detail/hook/usePullSource.js

@@ -1,82 +1,82 @@
-import { useEffect, useRef } from 'react'
-import axios from 'axios'
-import useIsMounted from '@/hook/useIsMounted'
-import { PUBLIC_LIVE_STATUS } from '@/config/publicLive'
-import { getOpenClassLiveSimple } from '@/service/live'
-
-const pullInterval = 10 * 1000
-const pullStatusInterval = 30 * 1000
-const pullMultiply = pullStatusInterval / pullInterval
-
-const pullTimeout = 10 * 1000
-
-export default function usePullSource({
-  liveInfo,
-  reload,
-  onStatusChange,
-  shouldStartPull
-}) {
-  const sourceSrc = liveInfo?.imInfo?.param?.url
-    || liveInfo?.imInfo?.param?.playurl?.[0]
-  const isMounted = useIsMounted()
-  const counterIdRef = useRef()
-
-  const loopIndex = useRef()
-  const getIsCurrentLop = (index) => index <= loopIndex.current
-
-  async function checkLiveReadyInterval(i = 0) {
-    loopIndex.current = i
-    let liveStatus
-    if (i % pullMultiply === 0) {
-      liveStatus = await getLiveNewStatus(liveInfo)
-      if (getIsCurrentLop(i)) {
-        onStatusChange(liveStatus)
-      }
-    }
-    if (liveStatus !== PUBLIC_LIVE_STATUS.COMPLETEED
-      && sourceSrc) {
-      const isSourceReady = await checkSourceReady(sourceSrc)
-      if (getIsCurrentLop(i)) {
-        if (isSourceReady && isMounted) {
-          reload()
-          return
-        }
-      }
-    }
-    if (isMounted && getIsCurrentLop(i)) {
-      counterIdRef.current = setTimeout(() => {
-        checkLiveReadyInterval(i + 1)
-      }, pullInterval)
-    }
-  }
-
-  useEffect(() => {
-    clearTimeout(counterIdRef.current)
-    if (shouldStartPull) {
-      counterIdRef.current = setTimeout(() => {
-        checkLiveReadyInterval(0)
-      }, pullInterval)
-    }
-    return () => {
-      if (shouldStartPull) {
-        clearTimeout(counterIdRef.current)
-      }
-    }
-  }, [sourceSrc, liveInfo.status, shouldStartPull])
-}
-
-async function checkSourceReady(url) {
-  try {
-    await axios.get(url, {
-      timeout: pullTimeout
-    })
-    return true
-  } catch (e) {
-    return false
-  }
-}
-
-async function getLiveNewStatus(liveInfo) {
-  const newLiveInfo = await getOpenClassLiveSimple(liveInfo)
-  return newLiveInfo.status
-}
+import { useEffect, useRef } from 'react'
+import axios from 'axios'
+import useIsMounted from '@/hook/useIsMounted'
+import { PUBLIC_LIVE_STATUS } from '@/config/publicLive'
+import { getOpenClassLiveSimple } from '@/service/live'
+
+const pullInterval = 10 * 1000
+const pullStatusInterval = 30 * 1000
+const pullMultiply = pullStatusInterval / pullInterval
+
+const pullTimeout = 10 * 1000
+
+export default function usePullSource({
+  liveInfo,
+  reload,
+  onStatusChange,
+  shouldStartPull
+}) {
+  const sourceSrc = liveInfo?.imInfo?.param?.url
+    || liveInfo?.imInfo?.param?.playurl?.[0]
+  const isMounted = useIsMounted()
+  const counterIdRef = useRef()
+
+  const loopIndex = useRef()
+  const getIsCurrentLop = (index) => index <= loopIndex.current
+
+  async function checkLiveReadyInterval(i = 0) {
+    loopIndex.current = i
+    let liveStatus
+    if (i % pullMultiply === 0) {
+      liveStatus = await getLiveNewStatus(liveInfo)
+      if (getIsCurrentLop(i)) {
+        onStatusChange(liveStatus)
+      }
+    }
+    if (liveStatus !== PUBLIC_LIVE_STATUS.COMPLETEED
+      && sourceSrc) {
+      const isSourceReady = await checkSourceReady(sourceSrc)
+      if (getIsCurrentLop(i)) {
+        if (isSourceReady && isMounted) {
+          reload()
+          return
+        }
+      }
+    }
+    if (isMounted && getIsCurrentLop(i)) {
+      counterIdRef.current = setTimeout(() => {
+        checkLiveReadyInterval(i + 1)
+      }, pullInterval)
+    }
+  }
+
+  useEffect(() => {
+    clearTimeout(counterIdRef.current)
+    if (shouldStartPull) {
+      counterIdRef.current = setTimeout(() => {
+        checkLiveReadyInterval(0)
+      }, pullInterval)
+    }
+    return () => {
+      if (shouldStartPull) {
+        clearTimeout(counterIdRef.current)
+      }
+    }
+  }, [sourceSrc, liveInfo.status, shouldStartPull])
+}
+
+async function checkSourceReady(url) {
+  try {
+    await axios.get(url, {
+      timeout: pullTimeout
+    })
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
+async function getLiveNewStatus(liveInfo) {
+  const newLiveInfo = await getOpenClassLiveSimple(liveInfo)
+  return newLiveInfo.status
+}

package/src/detail/hook/usePullState.js

@@ -1,51 +1,51 @@
-import { useEffect, useRef } from 'react'
-import { getOpenClassLiveSimple } from '@/service/live'
-import useIsMounted from '@/hook/useIsMounted'
-import { PUBLIC_LIVE_STATUS } from '@/config/publicLive'
-
-const pullInterval = 1 * 60 * 1000
-
-export default function usePullState({
-  liveInfo,
-  reload,
-  shouldStartPull
-}) {
-  const isMounted = useIsMounted()
-  const counterIdRef = useRef()
-
-  function checkSourceReadyInterval() {
-    isSourceReady(liveInfo)
-      .then(
-        () => {
-          if (isMounted) {
-            reload()
-          }
-        },
-        () => {
-          if (isMounted) {
-            counterIdRef.current = setTimeout(() => {
-              checkSourceReadyInterval()
-            }, pullInterval)
-          }
-        }
-      )
-  }
-
-  useEffect(() => {
-    if (liveInfo && shouldStartPull) {
-      checkSourceReadyInterval()
-    }
-    return () => {
-      clearTimeout(counterIdRef.current)
-    }
-  }, [liveInfo, shouldStartPull])
-}
-
-async function isSourceReady(liveInfo) {
-  const newLiveInfo = await getOpenClassLiveSimple(liveInfo)
-  if (newLiveInfo.status === PUBLIC_LIVE_STATUS.LIVEING) {
-    return true
-  } else {
-    throw new Error('not started')
-  }
-}
+import { useEffect, useRef } from 'react'
+import { getOpenClassLiveSimple } from '@/service/live'
+import useIsMounted from '@/hook/useIsMounted'
+import { PUBLIC_LIVE_STATUS } from '@/config/publicLive'
+
+const pullInterval = 1 * 60 * 1000
+
+export default function usePullState({
+  liveInfo,
+  reload,
+  shouldStartPull
+}) {
+  const isMounted = useIsMounted()
+  const counterIdRef = useRef()
+
+  function checkSourceReadyInterval() {
+    isSourceReady(liveInfo)
+      .then(
+        () => {
+          if (isMounted) {
+            reload()
+          }
+        },
+        () => {
+          if (isMounted) {
+            counterIdRef.current = setTimeout(() => {
+              checkSourceReadyInterval()
+            }, pullInterval)
+          }
+        }
+      )
+  }
+
+  useEffect(() => {
+    if (liveInfo && shouldStartPull) {
+      checkSourceReadyInterval()
+    }
+    return () => {
+      clearTimeout(counterIdRef.current)
+    }
+  }, [liveInfo, shouldStartPull])
+}
+
+async function isSourceReady(liveInfo) {
+  const newLiveInfo = await getOpenClassLiveSimple(liveInfo)
+  if (newLiveInfo.status === PUBLIC_LIVE_STATUS.LIVEING) {
+    return true
+  } else {
+    throw new Error('not started')
+  }
+}