@x-edu/live-player 0.0.32 → 0.0.33

package/src/service/live.js

@@ -1,293 +1,293 @@
-import axios from 'axios'
-import dayjs from 'dayjs'
-import config from '@/config/env'
-import liveActivityAPI, { proxyApi } from '@/config/request/live-activity'
-import liveActivityGatewayAPI from '@/config/request/live-activity-gateway'
-import { PUBLIC_LIVE_STATUS, LIVING_CLOSE_LOGIN, PUBLIC_LIVE_MODE, VIEW_REPLAY, PROVIDE_RECORD, SUB_TYPE } from '@/config/publicLive'
-import getServiceConfig from '@/lib/getServiceConfig'
-import { getAvatarURL } from '@/util/auth/func'
-import { getLocalHlsLiveStatus } from '@/util/live'
-import { withOnce } from '@/util/hof'
-import { liveProxy } from '@/config/request/x-proxy'
-
-export async function getLiveActivities(params) {
-  const { liveDateString, isTeacher, ...requestParams } = params
-  if (requestParams.status < 0) {
-    delete requestParams.status
-  }
-  if (liveDateString) {
-    requestParams.begin_time = `${liveDateString} 00:00:00`
-    requestParams.end_time = `${liveDateString} 23:59:59`
-  }
-  if (!isTeacher) {
-    delete requestParams.filter_creator
-  }
-  const requestFn = isTeacher ? getTeacherLiveActivities : getStudentLiveActivities
-  return requestFn(requestParams)
-}
-
-// 获取老师的直播列表
-export async function getTeacherLiveActivities(params) {
-  const url = '/live_activities/actions/teacher_search'
-  const { data } = await liveActivityGatewayAPI.get(url, {
-    params
-  })
-  return data
-}
-
-// 获取学生的直播列表
-export async function getStudentLiveActivities(params) {
-  const url = '/live_activities/actions/user_search'
-  const { data } = await liveActivityGatewayAPI.get(url, {
-    params
-  })
-  return data
-}
-
-// 获取直播详情
-export async function getLiveActivity(id) {
-  const url = `/live_activities/${id}/actions/full_info`
-  const { data } = await liveActivityGatewayAPI.get(url)
-  return data
-}
-
-// 获取直播回放详情
-export async function getLiveActivityReplay(id, params) {
-  const url = `/live_activity_replays/${id}/actions/full_info`
-  const { data } = await liveActivityGatewayAPI.get(url, {
-    params
-  })
-  return data
-}
-
-// 直播举报
-export async function postLiveActivityAudit(data) {
-  const url = '/v1/live_activity_audit_report'
-  await liveActivityAPI.post(url, data)
-}
-
-// 获取 csToken
-export async function getCsToken(data) {
-  // todo： 服务端为什么此接口没有版本号
-  const url = '/uranus/cs/tokens'
-  const response = await liveActivityAPI.post(url, data)
-  return response.data
-}
-
-export async function postLiveActivity(data) {
-  const url = '/v1/live_activities'
-  const response = await liveActivityAPI.post(url, data)
-  return response.data
-}
-
-// 获取用户是否被禁止直播
-export async function getUserLiveStatus(id) {
-  const url = '/v1/live_activity_banned/actions/by_user_id'
-  const response = await liveActivityAPI.get(url, {
-    params: {
-      banned_user_id: id
-    }
-  })
-  return response.data
-}
-
-// 服务器时间
-export async function getServerTime() {
-  // https://pms.101.com/index.php?m=bug&f=view&bugID=692948 返回浏览器会走disk cache 加时间戳
-  const url = `/v1/server_time?v=${Date.now()}`
-  const response = await liveActivityAPI.get(url).catch(() => ({
-    data: {
-      server_time: Date.now()
-    }
-  }))
-  return response.data
-}
-
-async function _getLiveAPICache() {
-  const url = config.api['live-static-json']
-  try {
-    const result = await axios.get(url)
-    const serverTime = dayjs(result.headers.date).valueOf()
-    return {
-      data: result.data,
-      serverTime,
-      diffTime: Date.now() - serverTime
-    }
-  } catch (e) {
-    console.error('getLiveAPICache fail', e)
-    return null
-  }
-}
-
-const getLiveAPICache = withOnce(_getLiveAPICache)
-
-export async function getOpenClassWithCache(url) {
-  const fullUrl = `${window.location.protocol}${proxyApi.defaults.baseURL}${url}`
-  const cacheInfo = await getLiveAPICache()
-  if (cacheInfo) {
-    const cacheData = cacheInfo.data.find((item) => item.source_key === fullUrl)
-    if (cacheData) {
-      try {
-        return {
-          ...JSON.parse(cacheData.json_value),
-          serverTime: cacheInfo.serverTime,
-          diffTime: cacheInfo.diffTime
-        }
-      } catch (e) {
-        console.error('getOpenClassWithCache parse error', e)
-      }
-    }
-  }
-  const result = await proxyApi.get(url)
-  if (result.headers.date) {
-    const serverTime = dayjs(result.headers.date).valueOf()
-    return {
-      ...result.data,
-      serverTime,
-      diffTime: Date.now() - serverTime
-    }
-  }
-  return result.data
-}
-
-// 公开直播详情变化部分，失败要降级处理
-export async function getOpenClassLiveSimple(liveInfo) {
-  const url = `/v1/open_class_lives/${liveInfo.live_id}/simple`
-  const data = await getOpenClassWithCache(url)
-    .catch(() => {
-      const isRecordLive = liveInfo.type === PUBLIC_LIVE_MODE.RECORDED
-      // 录播组件会计算状态，设置为0即可
-      const status = isRecordLive ? 0 : getLocalHlsLiveStatus(Date.now(), liveInfo.begin_time, liveInfo.end_time)
-      return {
-        live_id: liveInfo.live_id,
-        view_replay: VIEW_REPLAY.NOT_ALLOW,
-        replay_url: '',
-        provide_record: PROVIDE_RECORD.NOT_PROVIDED,
-        status
-      }
-    })
-  return data
-}
-
-// 公开直播详情拆分成两个接口
-export async function getOpenClassLiveBase(id) {
-  const url = `/v3/open_class_lives/${id}`
-  const data = await getOpenClassWithCache(url)
-  const { sub_type: subType } = data
-
-  // 外部推流则直接返回, 不去请求兼容接口
-  if (subType === SUB_TYPE.OUTSIDE) {
-    return data
-  }
-
-  const dynamicInfo = await getOpenClassLiveSimple(data)
-  return {
-    ...data,
-    ...dynamicInfo
-  }
-}
-
-// 公开实时直播-发起直播-公共直播邀请页使用，适配为班级直播数据
-export async function getOpenClassLiveAdapter(id) {
-  const data = await getOpenClassLiveBase(id)
-  return {
-    ...data,
-    live_activity_id: data.live_id,
-    name: data.live_name,
-    stat: data.status === PUBLIC_LIVE_STATUS.PASUED ? PUBLIC_LIVE_STATUS.LIVEING : data.status, // 暂停按直播显示
-    is_deleted: data.status === PUBLIC_LIVE_STATUS.OFFLINE,
-    create_user_user_facade: {
-      icon: getAvatarURL(data.lecture_user_id),
-      display_real_name: data.lecture_user_name
-    }
-  }
-}
-
-export async function getOpenClassLive(id) {
-  const serviceConfig = await getServiceConfig('x-cloud')
-  const liveCloseLogin = serviceConfig.properties.live_close_login || LIVING_CLOSE_LOGIN.NORMAL
-  const data = await getOpenClassLiveBase(id)
-  if (liveCloseLogin === LIVING_CLOSE_LOGIN.CLOSE) {
-    data.login = false
-  }
-  return data
-}
-
-export async function getMyOpenClassLives({
-  offset = 0,
-  limit = 10
-}) {
-  const url = '/v1/open_class_lives'
-  const response = await liveActivityAPI.get(url, {
-    params: {
-      offset,
-      limit
-    }
-  })
-  return response.data
-}
-
-/* 获取直播详情数据 */
-export async function getLiveInfo(ids) {
-  const promies = ids.map((id) => liveProxy.get(`/v3/open_class_lives/${id}`))
-  const result = await Promise.all(promies)
-  return result.map((res) => res.data)
-  // return result?.data || {}
-}
-
-/**
- * 查询直播列表-前台
- */
-export async function OpenLiveSearchFront({
-  status,
-  scopeType,
-  scopeId,
-  offset,
-  limit
-}) {
-  try {
-    const url = '/v1/open_class_lives/search_front'
-    const response = await proxyApi.get(url, {
-      params: {
-        status: status === 'all' ? undefined : status,
-        scope_type: scopeType,
-        scope_id: scopeId,
-        offset,
-        limit
-      }
-    })
-    return response?.data || {
-      count: 0,
-      items: []
-    }
-  } catch (_) {
-    return {
-      count: 0,
-      items: []
-    }
-  }
-}
-
-/**
- * 获取预约直播
- */
-export async function getSubscription() {
-  try {
-    const url = '/v1/open_class_lives/actions/get_subscription'
-    const response = await liveActivityAPI.get(url)
-    return response.data
-  } catch (_) {
-    return []
-  }
-}
-
-/**
- * 预约直播
- */
-export async function openLiveSubscribe({
-  liveId
-}) {
-  const url = `/v1/open_class_lives/${liveId}/actions/subscribe`
-  const response = await liveActivityAPI.post(url)
-  return response?.data
-}
+import axios from 'axios'
+import dayjs from 'dayjs'
+import config from '@/config/env'
+import liveActivityAPI, { proxyApi } from '@/config/request/live-activity'
+import liveActivityGatewayAPI from '@/config/request/live-activity-gateway'
+import { PUBLIC_LIVE_STATUS, LIVING_CLOSE_LOGIN, PUBLIC_LIVE_MODE, VIEW_REPLAY, PROVIDE_RECORD, SUB_TYPE } from '@/config/publicLive'
+import getServiceConfig from '@/lib/getServiceConfig'
+import { getAvatarURL } from '@/util/auth/func'
+import { getLocalHlsLiveStatus } from '@/util/live'
+import { withOnce } from '@/util/hof'
+import { liveProxy } from '@/config/request/x-proxy'
+
+export async function getLiveActivities(params) {
+  const { liveDateString, isTeacher, ...requestParams } = params
+  if (requestParams.status < 0) {
+    delete requestParams.status
+  }
+  if (liveDateString) {
+    requestParams.begin_time = `${liveDateString} 00:00:00`
+    requestParams.end_time = `${liveDateString} 23:59:59`
+  }
+  if (!isTeacher) {
+    delete requestParams.filter_creator
+  }
+  const requestFn = isTeacher ? getTeacherLiveActivities : getStudentLiveActivities
+  return requestFn(requestParams)
+}
+
+// 获取老师的直播列表
+export async function getTeacherLiveActivities(params) {
+  const url = '/live_activities/actions/teacher_search'
+  const { data } = await liveActivityGatewayAPI.get(url, {
+    params
+  })
+  return data
+}
+
+// 获取学生的直播列表
+export async function getStudentLiveActivities(params) {
+  const url = '/live_activities/actions/user_search'
+  const { data } = await liveActivityGatewayAPI.get(url, {
+    params
+  })
+  return data
+}
+
+// 获取直播详情
+export async function getLiveActivity(id) {
+  const url = `/live_activities/${id}/actions/full_info`
+  const { data } = await liveActivityGatewayAPI.get(url)
+  return data
+}
+
+// 获取直播回放详情
+export async function getLiveActivityReplay(id, params) {
+  const url = `/live_activity_replays/${id}/actions/full_info`
+  const { data } = await liveActivityGatewayAPI.get(url, {
+    params
+  })
+  return data
+}
+
+// 直播举报
+export async function postLiveActivityAudit(data) {
+  const url = '/v1/live_activity_audit_report'
+  await liveActivityAPI.post(url, data)
+}
+
+// 获取 csToken
+export async function getCsToken(data) {
+  // todo： 服务端为什么此接口没有版本号
+  const url = '/uranus/cs/tokens'
+  const response = await liveActivityAPI.post(url, data)
+  return response.data
+}
+
+export async function postLiveActivity(data) {
+  const url = '/v1/live_activities'
+  const response = await liveActivityAPI.post(url, data)
+  return response.data
+}
+
+// 获取用户是否被禁止直播
+export async function getUserLiveStatus(id) {
+  const url = '/v1/live_activity_banned/actions/by_user_id'
+  const response = await liveActivityAPI.get(url, {
+    params: {
+      banned_user_id: id
+    }
+  })
+  return response.data
+}
+
+// 服务器时间
+export async function getServerTime() {
+  // https://pms.101.com/index.php?m=bug&f=view&bugID=692948 返回浏览器会走disk cache 加时间戳
+  const url = `/v1/server_time?v=${Date.now()}`
+  const response = await liveActivityAPI.get(url).catch(() => ({
+    data: {
+      server_time: Date.now()
+    }
+  }))
+  return response.data
+}
+
+async function _getLiveAPICache() {
+  const url = config.api['live-static-json']
+  try {
+    const result = await axios.get(url)
+    const serverTime = dayjs(result.headers.date).valueOf()
+    return {
+      data: result.data,
+      serverTime,
+      diffTime: Date.now() - serverTime
+    }
+  } catch (e) {
+    console.error('getLiveAPICache fail', e)
+    return null
+  }
+}
+
+const getLiveAPICache = withOnce(_getLiveAPICache)
+
+export async function getOpenClassWithCache(url) {
+  const fullUrl = `${window.location.protocol}${proxyApi.defaults.baseURL}${url}`
+  const cacheInfo = await getLiveAPICache()
+  if (cacheInfo) {
+    const cacheData = cacheInfo.data.find((item) => item.source_key === fullUrl)
+    if (cacheData) {
+      try {
+        return {
+          ...JSON.parse(cacheData.json_value),
+          serverTime: cacheInfo.serverTime,
+          diffTime: cacheInfo.diffTime
+        }
+      } catch (e) {
+        console.error('getOpenClassWithCache parse error', e)
+      }
+    }
+  }
+  const result = await proxyApi.get(url)
+  if (result.headers.date) {
+    const serverTime = dayjs(result.headers.date).valueOf()
+    return {
+      ...result.data,
+      serverTime,
+      diffTime: Date.now() - serverTime
+    }
+  }
+  return result.data
+}
+
+// 公开直播详情变化部分，失败要降级处理
+export async function getOpenClassLiveSimple(liveInfo) {
+  const url = `/v1/open_class_lives/${liveInfo.live_id}/simple`
+  const data = await getOpenClassWithCache(url)
+    .catch(() => {
+      const isRecordLive = liveInfo.type === PUBLIC_LIVE_MODE.RECORDED
+      // 录播组件会计算状态，设置为0即可
+      const status = isRecordLive ? 0 : getLocalHlsLiveStatus(Date.now(), liveInfo.begin_time, liveInfo.end_time)
+      return {
+        live_id: liveInfo.live_id,
+        view_replay: VIEW_REPLAY.NOT_ALLOW,
+        replay_url: '',
+        provide_record: PROVIDE_RECORD.NOT_PROVIDED,
+        status
+      }
+    })
+  return data
+}
+
+// 公开直播详情拆分成两个接口
+export async function getOpenClassLiveBase(id) {
+  const url = `/v3/open_class_lives/${id}`
+  const data = await getOpenClassWithCache(url)
+  const { sub_type: subType } = data
+
+  // 外部推流则直接返回, 不去请求兼容接口
+  if (subType === SUB_TYPE.OUTSIDE) {
+    return data
+  }
+
+  const dynamicInfo = await getOpenClassLiveSimple(data)
+  return {
+    ...data,
+    ...dynamicInfo
+  }
+}
+
+// 公开实时直播-发起直播-公共直播邀请页使用，适配为班级直播数据
+export async function getOpenClassLiveAdapter(id) {
+  const data = await getOpenClassLiveBase(id)
+  return {
+    ...data,
+    live_activity_id: data.live_id,
+    name: data.live_name,
+    stat: data.status === PUBLIC_LIVE_STATUS.PASUED ? PUBLIC_LIVE_STATUS.LIVEING : data.status, // 暂停按直播显示
+    is_deleted: data.status === PUBLIC_LIVE_STATUS.OFFLINE,
+    create_user_user_facade: {
+      icon: getAvatarURL(data.lecture_user_id),
+      display_real_name: data.lecture_user_name
+    }
+  }
+}
+
+export async function getOpenClassLive(id) {
+  const serviceConfig = await getServiceConfig('x-cloud')
+  const liveCloseLogin = serviceConfig.properties.live_close_login || LIVING_CLOSE_LOGIN.NORMAL
+  const data = await getOpenClassLiveBase(id)
+  if (liveCloseLogin === LIVING_CLOSE_LOGIN.CLOSE) {
+    data.login = false
+  }
+  return data
+}
+
+export async function getMyOpenClassLives({
+  offset = 0,
+  limit = 10
+}) {
+  const url = '/v1/open_class_lives'
+  const response = await liveActivityAPI.get(url, {
+    params: {
+      offset,
+      limit
+    }
+  })
+  return response.data
+}
+
+/* 获取直播详情数据 */
+export async function getLiveInfo(ids) {
+  const promies = ids.map((id) => liveProxy.get(`/v3/open_class_lives/${id}`))
+  const result = await Promise.all(promies)
+  return result.map((res) => res.data)
+  // return result?.data || {}
+}
+
+/**
+ * 查询直播列表-前台
+ */
+export async function OpenLiveSearchFront({
+  status,
+  scopeType,
+  scopeId,
+  offset,
+  limit
+}) {
+  try {
+    const url = '/v1/open_class_lives/search_front'
+    const response = await proxyApi.get(url, {
+      params: {
+        status: status === 'all' ? undefined : status,
+        scope_type: scopeType,
+        scope_id: scopeId,
+        offset,
+        limit
+      }
+    })
+    return response?.data || {
+      count: 0,
+      items: []
+    }
+  } catch (_) {
+    return {
+      count: 0,
+      items: []
+    }
+  }
+}
+
+/**
+ * 获取预约直播
+ */
+export async function getSubscription() {
+  try {
+    const url = '/v1/open_class_lives/actions/get_subscription'
+    const response = await liveActivityAPI.get(url)
+    return response.data
+  } catch (_) {
+    return []
+  }
+}
+
+/**
+ * 预约直播
+ */
+export async function openLiveSubscribe({
+  liveId
+}) {
+  const url = `/v1/open_class_lives/${liveId}/actions/subscribe`
+  const response = await liveActivityAPI.post(url)
+  return response?.data
+}

package/src/service/manageApi.js

@@ -1,7 +1,7 @@
-import ManageApi from '@/config/request/manage-api'
-
-// 获取管理后台角色
-export async function getManageRoles() {
-  const { data } = await ManageApi.get('/v1/users/actions/get_my_manage_roles')
-  return data
-}
+import ManageApi from '@/config/request/manage-api'
+
+// 获取管理后台角色
+export async function getManageRoles() {
+  const { data } = await ManageApi.get('/v1/users/actions/get_my_manage_roles')
+  return data
+}

package/src/service/managePortal.js

@@ -1,6 +1,6 @@
-import ManagePortalApi from '@/config/request/manage-portal'
-
-export async function checkAppPermission() {
-  const resp = await ManagePortalApi.get('/v2/apps/actions/check_app_permission')
-  return resp?.data
-}
+import ManagePortalApi from '@/config/request/manage-portal'
+
+export async function checkAppPermission() {
+  const resp = await ManagePortalApi.get('/v2/apps/actions/check_app_permission')
+  return resp?.data
+}