@x-edu/live-player 0.0.21 → 0.0.23

package/src/config/request/helper.js

@@ -1,166 +1,166 @@
-import Request from '@/util/request'
-import { getTimestamp } from '@/util/getTimestamp'
-import config from '@/config/env'
-import { isInElectron, xElectron } from '@/util/env'
-import { getSdpQuery } from '@/util/url'
-import { getAuthHeader } from '@/util/auth/func'
-
-const IGNORE_403_HOST = ['x-record-api']
-
-const {
-  sdpOrgId,
-  sdpAppId
-} = getSdpQuery()
-
-export function rawAPI(params) {
-  const { hostKey, prefix = '', noSdpOrgId = false } = params
-  // 生产环境，CDN请求增加header会导致莫名其妙的跨域错误
-  const headers = {}
-  if (config.api.staticKeys.indexOf(hostKey) === -1) {
-    if (!headers['sdp-app-id']) {
-      headers['sdp-app-id'] = sdpAppId || config.app.appid
-    }
-    if (!noSdpOrgId && sdpOrgId && !headers['sdp-org-id']) {
-      headers['sdp-org-id'] = sdpOrgId
-    }
-    // 本地构建请求禁用缓存
-    if (process.env.DEV) {
-      // headers['Cache-Control'] = 'no-cache'
-    }
-  }
-
-  if (hostKey) {
-    params.originBaseURL = `${config.api[hostKey]}${prefix}`
-    params.baseURL = params.originBaseURL
-    // params.baseURL = process.env.DEV ? `/wds_${hostKey}${prefix}` : params.originBaseURL
-  }
-
-  const api = Request.create({
-    headers,
-    ...params
-  })
-  return api
-}
-
-/**
- * 用于创建通用 api 请求对象，携带 loading、error 通用处理
- */
-export function generateCommonAPI(params) {
-  const api = rawAPI({
-    ...params
-  })
-
-  api.interceptors.request.use(async (c) => {
-    c.params = c.params || {}
-    if (process.env.SDP_ENV !== 'ncet-xedu') {
-      c.params.v = c.params.v ?? getTimestamp(10 * 60)
-    }
-    return c
-  })
-
-  return api
-}
-
-/**
- *  用于创建需要使用 UC 认证的 api，基于 generateCommonAPI;
- */
-export function generateCommonAPIWithUC(params, throwError = false) {
-  const api = rawAPI({
-    ...params
-  })
-
-  api.interceptors.request.use(async (c) => {
-    if (c.noAuth) {
-      return c
-    }
-    // UC 计算 mac token 必须是完整的 URL
-    const Authorization = await getAuthHeader({
-      ...c,
-      url: getURL(c)
-    })
-    if (Authorization) {
-      c.headers.Authorization = Authorization
-    }
-    return c
-  })
-
-  api.interceptors.response.use(
-    (response) => response,
-    (error) => {
-      if ([
-        'WAF/ACCESS_DENIED',
-        'UC/AUTH_INVALID_TOKEN'
-      ].includes(error?.response?.data?.code)) {
-        if (IGNORE_403_HOST.indexOf(error?.config?.hostKey) === -1) {
-          if (!isInElectron) {
-            window.location.pathname = '/'
-          } else {
-            xElectron.subView.triggerLogout(error.message)
-          }
-        }
-      }
-      /* 新增，如果需要报错信息，则抛出 */
-      if (throwError) {
-        throw error
-      }
-    }
-  )
-
-  return api
-}
-
-/**
- *  用于百度云需要走cdn代理的接口(接口访问频率比较高，单独设了代理,可以理解为缓存)
- *  代理的接口不需要传认证
- *  基于generateCommonAPIWithUC
- */
-export function generateAPIWithProxy(params, throwError = false) {
-  const api = rawAPI({
-    ...params
-  })
-
-  api.interceptors.request.use(async (c) => {
-    if (c.noAuth) {
-      return c
-    }
-    // 百度云环境不需要认证
-    if (process.env.SDP_ENV === 'ncet-xedu') {
-      return c
-    }
-    // UC 计算 mac token 必须是完整的 URL
-    const Authorization = await getAuthHeader({
-      ...c,
-      url: getURL(c)
-    })
-    if (Authorization) {
-      c.headers.Authorization = Authorization
-    }
-    return c
-  })
-
-  api.interceptors.response.use(
-    (response) => response,
-    (error) => {
-      if (error?.response?.data?.code === 'WAF/ACCESS_DENIED') {
-        window.location.pathname = '/'
-      }
-      /* 新增，如果需要报错信息，则抛出 */
-      if (throwError) {
-        return error
-      }
-    }
-  )
-
-  return api
-}
-
-function getURL(c) {
-  const { url, originBaseURL } = c
-  if (/^https?:/.test(url)) {
-    return url
-  }
-  if (/^https?:/.test(originBaseURL)) {
-    return `${originBaseURL}${c.url}`
-  }
-  return `https:${originBaseURL}${c.url}`
-}
+import Request from '@/util/request'
+import { getTimestamp } from '@/util/getTimestamp'
+import config from '@/config/env'
+import { isInElectron, xElectron } from '@/util/env'
+import { getSdpQuery } from '@/util/url'
+import { getAuthHeader } from '@/util/auth/func'
+
+const IGNORE_403_HOST = ['x-record-api']
+
+const {
+  sdpOrgId,
+  sdpAppId
+} = getSdpQuery()
+
+export function rawAPI(params) {
+  const { hostKey, prefix = '', noSdpOrgId = false } = params
+  // 生产环境，CDN请求增加header会导致莫名其妙的跨域错误
+  const headers = {}
+  if (config.api.staticKeys.indexOf(hostKey) === -1) {
+    if (!headers['sdp-app-id']) {
+      headers['sdp-app-id'] = sdpAppId || config.app.appid
+    }
+    if (!noSdpOrgId && sdpOrgId && !headers['sdp-org-id']) {
+      headers['sdp-org-id'] = sdpOrgId
+    }
+    // 本地构建请求禁用缓存
+    if (process.env.DEV) {
+      // headers['Cache-Control'] = 'no-cache'
+    }
+  }
+
+  if (hostKey) {
+    params.originBaseURL = `${config.api[hostKey]}${prefix}`
+    params.baseURL = params.originBaseURL
+    // params.baseURL = process.env.DEV ? `/wds_${hostKey}${prefix}` : params.originBaseURL
+  }
+
+  const api = Request.create({
+    headers,
+    ...params
+  })
+  return api
+}
+
+/**
+ * 用于创建通用 api 请求对象，携带 loading、error 通用处理
+ */
+export function generateCommonAPI(params) {
+  const api = rawAPI({
+    ...params
+  })
+
+  api.interceptors.request.use(async (c) => {
+    c.params = c.params || {}
+    if (process.env.SDP_ENV !== 'ncet-xedu') {
+      c.params.v = c.params.v ?? getTimestamp(10 * 60)
+    }
+    return c
+  })
+
+  return api
+}
+
+/**
+ *  用于创建需要使用 UC 认证的 api，基于 generateCommonAPI;
+ */
+export function generateCommonAPIWithUC(params, throwError = false) {
+  const api = rawAPI({
+    ...params
+  })
+
+  api.interceptors.request.use(async (c) => {
+    if (c.noAuth) {
+      return c
+    }
+    // UC 计算 mac token 必须是完整的 URL
+    const Authorization = await getAuthHeader({
+      ...c,
+      url: getURL(c)
+    })
+    if (Authorization) {
+      c.headers.Authorization = Authorization
+    }
+    return c
+  })
+
+  api.interceptors.response.use(
+    (response) => response,
+    (error) => {
+      if ([
+        'WAF/ACCESS_DENIED',
+        'UC/AUTH_INVALID_TOKEN'
+      ].includes(error?.response?.data?.code)) {
+        if (IGNORE_403_HOST.indexOf(error?.config?.hostKey) === -1) {
+          if (!isInElectron) {
+            window.location.pathname = '/'
+          } else {
+            xElectron.subView.triggerLogout(error.message)
+          }
+        }
+      }
+      /* 新增，如果需要报错信息，则抛出 */
+      if (throwError) {
+        throw error
+      }
+    }
+  )
+
+  return api
+}
+
+/**
+ *  用于百度云需要走cdn代理的接口(接口访问频率比较高，单独设了代理,可以理解为缓存)
+ *  代理的接口不需要传认证
+ *  基于generateCommonAPIWithUC
+ */
+export function generateAPIWithProxy(params, throwError = false) {
+  const api = rawAPI({
+    ...params
+  })
+
+  api.interceptors.request.use(async (c) => {
+    if (c.noAuth) {
+      return c
+    }
+    // 百度云环境不需要认证
+    if (process.env.SDP_ENV === 'ncet-xedu') {
+      return c
+    }
+    // UC 计算 mac token 必须是完整的 URL
+    const Authorization = await getAuthHeader({
+      ...c,
+      url: getURL(c)
+    })
+    if (Authorization) {
+      c.headers.Authorization = Authorization
+    }
+    return c
+  })
+
+  api.interceptors.response.use(
+    (response) => response,
+    (error) => {
+      if (error?.response?.data?.code === 'WAF/ACCESS_DENIED') {
+        window.location.pathname = '/'
+      }
+      /* 新增，如果需要报错信息，则抛出 */
+      if (throwError) {
+        return error
+      }
+    }
+  )
+
+  return api
+}
+
+function getURL(c) {
+  const { url, originBaseURL } = c
+  if (/^https?:/.test(url)) {
+    return url
+  }
+  if (/^https?:/.test(originBaseURL)) {
+    return `${originBaseURL}${c.url}`
+  }
+  return `https:${originBaseURL}${c.url}`
+}

package/src/config/request/im-broadcasts.js

@@ -1,12 +1,12 @@
-import { generateCommonAPI, generateCommonAPIWithUC } from './helper'
-
-const api = generateCommonAPIWithUC({
-  hostKey: 'im-broadcasts',
-  prefix: ''
-})
-
-export default api
-
-export const staticAPI = generateCommonAPI({
-  hostKey: 'im-broadcasts-static'
-})
+import { generateCommonAPI, generateCommonAPIWithUC } from './helper'
+
+const api = generateCommonAPIWithUC({
+  hostKey: 'im-broadcasts',
+  prefix: ''
+})
+
+export default api
+
+export const staticAPI = generateCommonAPI({
+  hostKey: 'im-broadcasts-static'
+})

package/src/config/request/live-activity-gateway.js

@@ -1,8 +1,8 @@
-import { generateCommonAPIWithUC } from './helper'
-
-const api = generateCommonAPIWithUC({
-  hostKey: 'live-activity-gateway',
-  prefix: '/v1'
-})
-
-export default api
+import { generateCommonAPIWithUC } from './helper'
+
+const api = generateCommonAPIWithUC({
+  hostKey: 'live-activity-gateway',
+  prefix: '/v1'
+})
+
+export default api

package/src/config/request/live-activity.js

@@ -1,13 +1,13 @@
-import { generateCommonAPI, generateCommonAPIWithUC } from './helper'
-
-const api = generateCommonAPIWithUC({
-  hostKey: 'live-activity',
-  prefix: ''
-}, true)
-
-export default api
-
-export const proxyApi = generateCommonAPI({
-  hostKey: 'x-proxy',
-  prefix: '/proxy/live'
-})
+import { generateCommonAPI, generateCommonAPIWithUC } from './helper'
+
+const api = generateCommonAPIWithUC({
+  hostKey: 'live-activity',
+  prefix: ''
+}, true)
+
+export default api
+
+export const proxyApi = generateCommonAPI({
+  hostKey: 'x-proxy',
+  prefix: '/proxy/live'
+})

package/src/config/request/raw.js

@@ -1,6 +1,6 @@
-import { generateCommonAPI } from './helper'
-
-// 用于少数仅一个接口，且不区分环境的情况
-const api = generateCommonAPI()
-
-export default api
+import { generateCommonAPI } from './helper'
+
+// 用于少数仅一个接口，且不区分环境的情况
+const api = generateCommonAPI()
+
+export default api

package/src/config/request/x-cloud-web.js

@@ -1,13 +1,13 @@
-import { generateCommonAPIWithUC, generateCommonAPI } from './helper'
-
-const api = generateCommonAPIWithUC({
-  hostKey: 'x-cloud-web',
-  prefix: ''
-})
-
-export default api
-
-export const apiCommon = generateCommonAPI({
-  hostKey: 'x-cloud-web',
-  prefix: ''
-})
+import { generateCommonAPIWithUC, generateCommonAPI } from './helper'
+
+const api = generateCommonAPIWithUC({
+  hostKey: 'x-cloud-web',
+  prefix: ''
+})
+
+export default api
+
+export const apiCommon = generateCommonAPI({
+  hostKey: 'x-cloud-web',
+  prefix: ''
+})

package/src/config/request/x-proxy.js

@@ -1,34 +1,34 @@
-import { generateCommonAPI, generateCommonAPIWithUC } from './helper'
-
-// test5.ykt.eduyun.cn 为提测的地址
-// 使用测试环境数据
-
-const api = generateCommonAPI({
-  hostKey: 'x-proxy',
-  prefix: '/proxy/cloud'
-})
-
-export const liveProxy = generateCommonAPI({
-  hostKey: 'x-proxy',
-  prefix: '/proxy/live'
-})
-
-// 积分配置
-export const recordConfigAPI = generateCommonAPI({
-  hostKey: 'x-proxy',
-  prefix: '/proxy/record_config/v1'
-})
-
-// 资源推荐
-export const recommendAPI = generateCommonAPI({
-  hostKey: 'x-proxy',
-  prefix: '/proxy/recommend/v1'
-})
-
-// 资源推荐v2
-export const recommendAPIV2 = generateCommonAPIWithUC({
-  hostKey: 'recommend',
-  prefix: '/v2'
-})
-
-export default api
+import { generateCommonAPI, generateCommonAPIWithUC } from './helper'
+
+// test5.ykt.eduyun.cn 为提测的地址
+// 使用测试环境数据
+
+const api = generateCommonAPI({
+  hostKey: 'x-proxy',
+  prefix: '/proxy/cloud'
+})
+
+export const liveProxy = generateCommonAPI({
+  hostKey: 'x-proxy',
+  prefix: '/proxy/live'
+})
+
+// 积分配置
+export const recordConfigAPI = generateCommonAPI({
+  hostKey: 'x-proxy',
+  prefix: '/proxy/record_config/v1'
+})
+
+// 资源推荐
+export const recommendAPI = generateCommonAPI({
+  hostKey: 'x-proxy',
+  prefix: '/proxy/recommend/v1'
+})
+
+// 资源推荐v2
+export const recommendAPIV2 = generateCommonAPIWithUC({
+  hostKey: 'recommend',
+  prefix: '/v2'
+})
+
+export default api

package/src/demo/Detail.jsx

@@ -1,11 +1,11 @@
-import React from 'react'
-import Live from '../App'
-
-export default function Detail() {
-  return (
-    <Live.PublicLiveDetail
-      liveId="25c5bdb9-0f27-4479-9d32-9bca2326988c"
-      appId="e5649925-441d-4a53-b525-51a2f1c4e0a8"
-    />
-  )
-}
+import React from 'react'
+import Live from '../App'
+
+export default function Detail() {
+  return (
+    <Live.PublicLiveDetail
+      liveId="25c5bdb9-0f27-4479-9d32-9bca2326988c"
+      appId="e5649925-441d-4a53-b525-51a2f1c4e0a8"
+    />
+  )
+}

package/src/demo/List.jsx

@@ -1,64 +1,66 @@
-import React, { useEffect, useState } from 'react'
-import { UC } from '@sdp.nd/nd-uc-sdk'
-import Live from '../App'
-
-// const uc = new UC({
-//   env: 'ncet-xedu',
-//   sdpAppId: 'e5649925-441d-4a53-b525-51a2f1c4e0a8',
-//   origins: {
-//     UC: 'https://uc-gateway.ykt.eduyun.cn',
-//     SSO: 'https://sso.basic.smartedu.cn'
-//   },
-//   isGlobalSDKCacheEnabled: true
-// })
-const uc = new UC({
-  env: 'preproduction',
-  sdpAppId: '331593d3-af38-456e-bdb8-5263525608f4',
-  origins: {
-    UC: 'https://uc-gateway.beta.101.com',
-    SSO: 'https://ysc-sso.ykt.eduyun.cn'
-  },
-  isGlobalSDKCacheEnabled: true
-})
-
-export default function List() {
-  const [ucInstance, setUcInstance] = useState(uc)
-  const [userInfo, setUserInfo] = useState(null)
-
-  const handleSubscribe = (data) => {
-    console.log(data)
-  }
-
-  useEffect(() => {
-    async function init() {
-      try {
-        await ucInstance.login({
-          loginName: '18695708674',
-          password: 'Gyh.1122'
-          // loginName: '18695708674',
-          // password: 'gyh123456'
-        })
-        const account = ucInstance.getCurrentAccount()
-        const info = await account.getAccountInfo()
-        setUserInfo(info)
-      } catch (error) {
-        console.log(error)
-      }
-    }
-    init()
-  }, [])
-
-  if (!userInfo) {
-    return null
-  }
-
-  return (
-    <Live.PublicLiveList
-      uc={ucInstance}
-      loginInfo={{
-        userInfo
-      }}
-      onSubscribe={handleSubscribe}
-    />
-  )
-}
+import React, { useEffect, useState } from 'react'
+import { UC } from '@sdp.nd/nd-uc-sdk'
+import Live from '../App'
+
+const uc = new UC({
+  env: 'ncet-xedu',
+  sdpAppId: 'e5649925-441d-4a53-b525-51a2f1c4e0a8',
+  origins: {
+    UC: 'https://uc-gateway.ykt.eduyun.cn',
+    SSO: 'https://sso.basic.smartedu.cn'
+  },
+  isGlobalSDKCacheEnabled: true
+})
+// const uc = new UC({
+//   env: 'preproduction',
+//   sdpAppId: '331593d3-af38-456e-bdb8-5263525608f4',
+//   origins: {
+//     UC: 'https://uc-gateway.beta.101.com',
+//     SSO: 'https://ysc-sso.ykt.eduyun.cn'
+//   },
+//   isGlobalSDKCacheEnabled: true
+// })
+
+export default function List() {
+  const [ucInstance] = useState(uc)
+  const [userInfo, setUserInfo] = useState(null)
+
+  const handleSubscribe = (data) => {
+    console.log(data)
+  }
+
+  useEffect(() => {
+    async function init() {
+      try {
+        await ucInstance.login({
+          loginName: '15280425124',
+          password: 'chen135246+'
+          // loginName: '18695708674',
+          // password: 'gyh123456'
+        })
+        const account = ucInstance.getCurrentAccount()
+        const info = await account.getAccountInfo()
+        setUserInfo(info)
+      } catch (error) {
+        console.log(error)
+      }
+    }
+    init()
+  }, [])
+
+  if (!userInfo) {
+    return null
+  }
+
+  return (
+    <Live.PublicLiveList
+      uc={ucInstance}
+      loginInfo={{
+        userInfo
+      }}
+      onSubscribe={handleSubscribe}
+      scopeType={'e_teacher_studio'}
+      scopeId={'165fee8b-56b8-48a3-a5e0-f2bf82525ff1'}
+    />
+  )
+}