@x-edu/live-player 0.0.19 → 0.0.21

package/src/component/IMChatroom/sdk/imcore/util/format.js

@@ -1,177 +1,177 @@
-import Long from 'long'
-import get from 'lodash/get'
-
-import jsonBigInt from '../../../util/jsonBigInt'
-import { getCurrentAccountId } from '../../../util/account'
-
-import { MessageType, MessageHeader } from '../constants'
-import parser from './parser'
-
-export const transferStringToLong = (value) => Long.fromString(value, true)
-
-export const transferLongToString = (value) => {
-  if (typeof value === 'object') {
-    const message = {
-      ...value
-    }
-    Object.keys(message).forEach((key) => {
-      if (Long.isLong(message[key])) {
-        message[key] = message[key].toString()
-      }
-    })
-    return message
-  }
-
-  return value.toString()
-}
-
-const getMessageSender = (_parsedContent) => {
-  try {
-    return JSON.parse(get(_parsedContent, `headers.${MessageHeader.ContentSender}`))
-  } catch (e) {
-    return null
-  }
-}
-
-const parseContent = (content) => {
-  const _parsedContent = parser.parse(content)
-
-  const contentSender = getMessageSender(_parsedContent)
-  if (contentSender) {
-    _parsedContent.contentSender = contentSender
-  }
-
-  return _parsedContent
-}
-
-// 解析消息内容，返回解析结果
-export const parseMessageContent = (content) => {
-  let _parsedContent
-  if (content) {
-    _parsedContent = typeof content === 'string' ? parseContent(content) : content
-  } else {
-    _parsedContent = {
-      type: MessageType.Error,
-      data: null
-    }
-  }
-  return _parsedContent
-}
-
-export const parseMessage = (message, reserveMessage) => {
-  const { content } = message
-  let _parsedContent
-  let _content = content
-  if (content) {
-    _parsedContent = typeof content === 'string' ? parseContent(content) : content
-
-    if (_parsedContent.type === MessageType.Error && reserveMessage) {
-      const reserveContent = reserveMessage.content
-      if (reserveContent) {
-        _content = reserveContent
-        _parsedContent = parseContent(reserveContent)
-      }
-    }
-  } else {
-    _parsedContent = {
-      type: MessageType.Error,
-      data: null
-    }
-  }
-
-  const parsedMessage = {
-    ...message,
-    _parsedContent,
-    content: _content
-  }
-
-  if (_parsedContent.type === MessageType.FlexBox) {
-    return transformFlexBoxMessage(parsedMessage)
-  }
-
-  console.log('parseMessage:', parsedMessage)
-  return parsedMessage
-}
-
-export const parseMessages = (messages) => messages.map((message) => parseMessage(message))
-
-export const formatMessages = (messages) => parseMessages(messages.map((message) => ({
-  ...message,
-  _localInfo: {
-    id: message.id,
-    index: 0
-  },
-  _direction: message.from === getCurrentAccountId() ? 'up' : 'down'
-})))
-
-// flexbox/json 消息转换
-function transformFlexBoxMessage(message) {
-  const headers = get(message, '_parsedContent.headers')
-
-  // 改变消息类型
-  headers[MessageHeader.ContentType] = `${MessageType.CustomFlexBox}/xml`
-
-  // 移除消息头上设置的模板信息 - 坚决不认消息头的模板信息！！！
-  delete headers[MessageHeader.LanguageTemplate]
-  delete headers[MessageHeader.SupportLanguages]
-  delete headers[MessageHeader.LanguageParameter]
-
-  let flexbox = get(message, '_parsedContent.data.json.flexbox')
-
-  // 将消息中的flexbox信息更新到模板信息中
-  const attrs = get(message, 'attrs', [])
-  const flexboxAttr = attrs.find((attr) => attr.key === 'flexbox')
-  if (flexboxAttr && flexboxAttr.value) {
-    const flexboxData = jsonBigInt.parse(flexboxAttr.value)
-    const { state, ...others } = flexboxData
-    flexbox = {
-      ...flexbox,
-      ...others,
-      _flexBoxState: String(state || 0)
-    }
-  }
-
-  const {
-    templateId,
-    'support-languages': supportLanguages,
-    'parameter-value': parameterValue,
-    'default-template': defaultTemplate,
-    _flexBoxState,
-    ...data
-  } = flexbox
-
-  // 重新设置模板信息
-  if (templateId) {
-    headers[MessageHeader.LanguageTemplate] = templateId
-  }
-  if (supportLanguages) {
-    headers[MessageHeader.SupportLanguages] = supportLanguages
-  }
-  if (parameterValue) {
-    try {
-      headers[MessageHeader.LanguageParameter] = JSON.stringify(parameterValue)
-    } catch (e) {
-      console.log('parse language parameter error: ', e)
-    }
-  }
-
-  // 存储flexbox/json解析完后除去模板消息字段外的数据
-  headers['flexbox-json-data'] = JSON.stringify(data)
-
-  const headerString = Object.keys(headers).reduce((acc, key) => {
-    const result = `${acc}${key}:${headers[key]}\r\n`
-    return result
-  }, '')
-
-  // 转换成新的消息内容
-  const content = `${headerString}\r\n${defaultTemplate || ''}`
-
-  return {
-    ...message,
-    _flexBoxState, // 保存消息 state
-    _flexBoxContent: message.content,
-    _defaultContent: defaultTemplate ? content : '', // 有defaultTemplate时需要直接设置_defaultContent，这样翻译的时候没有找到语言时也能正确解析消息
-    content,
-    _parsedContent: parseMessageContent(content)
-  }
-}
+import Long from 'long'
+import get from 'lodash/get'
+
+import jsonBigInt from '../../../util/jsonBigInt'
+import { getCurrentAccountId } from '../../../util/account'
+
+import { MessageType, MessageHeader } from '../constants'
+import parser from './parser'
+
+export const transferStringToLong = (value) => Long.fromString(value, true)
+
+export const transferLongToString = (value) => {
+  if (typeof value === 'object') {
+    const message = {
+      ...value
+    }
+    Object.keys(message).forEach((key) => {
+      if (Long.isLong(message[key])) {
+        message[key] = message[key].toString()
+      }
+    })
+    return message
+  }
+
+  return value.toString()
+}
+
+const getMessageSender = (_parsedContent) => {
+  try {
+    return JSON.parse(get(_parsedContent, `headers.${MessageHeader.ContentSender}`))
+  } catch (e) {
+    return null
+  }
+}
+
+const parseContent = (content) => {
+  const _parsedContent = parser.parse(content)
+
+  const contentSender = getMessageSender(_parsedContent)
+  if (contentSender) {
+    _parsedContent.contentSender = contentSender
+  }
+
+  return _parsedContent
+}
+
+// 解析消息内容，返回解析结果
+export const parseMessageContent = (content) => {
+  let _parsedContent
+  if (content) {
+    _parsedContent = typeof content === 'string' ? parseContent(content) : content
+  } else {
+    _parsedContent = {
+      type: MessageType.Error,
+      data: null
+    }
+  }
+  return _parsedContent
+}
+
+export const parseMessage = (message, reserveMessage) => {
+  const { content } = message
+  let _parsedContent
+  let _content = content
+  if (content) {
+    _parsedContent = typeof content === 'string' ? parseContent(content) : content
+
+    if (_parsedContent.type === MessageType.Error && reserveMessage) {
+      const reserveContent = reserveMessage.content
+      if (reserveContent) {
+        _content = reserveContent
+        _parsedContent = parseContent(reserveContent)
+      }
+    }
+  } else {
+    _parsedContent = {
+      type: MessageType.Error,
+      data: null
+    }
+  }
+
+  const parsedMessage = {
+    ...message,
+    _parsedContent,
+    content: _content
+  }
+
+  if (_parsedContent.type === MessageType.FlexBox) {
+    return transformFlexBoxMessage(parsedMessage)
+  }
+
+  console.log('parseMessage:', parsedMessage)
+  return parsedMessage
+}
+
+export const parseMessages = (messages) => messages.map((message) => parseMessage(message))
+
+export const formatMessages = (messages) => parseMessages(messages.map((message) => ({
+  ...message,
+  _localInfo: {
+    id: message.id,
+    index: 0
+  },
+  _direction: message.from === getCurrentAccountId() ? 'up' : 'down'
+})))
+
+// flexbox/json 消息转换
+function transformFlexBoxMessage(message) {
+  const headers = get(message, '_parsedContent.headers')
+
+  // 改变消息类型
+  headers[MessageHeader.ContentType] = `${MessageType.CustomFlexBox}/xml`
+
+  // 移除消息头上设置的模板信息 - 坚决不认消息头的模板信息！！！
+  delete headers[MessageHeader.LanguageTemplate]
+  delete headers[MessageHeader.SupportLanguages]
+  delete headers[MessageHeader.LanguageParameter]
+
+  let flexbox = get(message, '_parsedContent.data.json.flexbox')
+
+  // 将消息中的flexbox信息更新到模板信息中
+  const attrs = get(message, 'attrs', [])
+  const flexboxAttr = attrs.find((attr) => attr.key === 'flexbox')
+  if (flexboxAttr && flexboxAttr.value) {
+    const flexboxData = jsonBigInt.parse(flexboxAttr.value)
+    const { state, ...others } = flexboxData
+    flexbox = {
+      ...flexbox,
+      ...others,
+      _flexBoxState: String(state || 0)
+    }
+  }
+
+  const {
+    templateId,
+    'support-languages': supportLanguages,
+    'parameter-value': parameterValue,
+    'default-template': defaultTemplate,
+    _flexBoxState,
+    ...data
+  } = flexbox
+
+  // 重新设置模板信息
+  if (templateId) {
+    headers[MessageHeader.LanguageTemplate] = templateId
+  }
+  if (supportLanguages) {
+    headers[MessageHeader.SupportLanguages] = supportLanguages
+  }
+  if (parameterValue) {
+    try {
+      headers[MessageHeader.LanguageParameter] = JSON.stringify(parameterValue)
+    } catch (e) {
+      console.log('parse language parameter error: ', e)
+    }
+  }
+
+  // 存储flexbox/json解析完后除去模板消息字段外的数据
+  headers['flexbox-json-data'] = JSON.stringify(data)
+
+  const headerString = Object.keys(headers).reduce((acc, key) => {
+    const result = `${acc}${key}:${headers[key]}\r\n`
+    return result
+  }, '')
+
+  // 转换成新的消息内容
+  const content = `${headerString}\r\n${defaultTemplate || ''}`
+
+  return {
+    ...message,
+    _flexBoxState, // 保存消息 state
+    _flexBoxContent: message.content,
+    _defaultContent: defaultTemplate ? content : '', // 有defaultTemplate时需要直接设置_defaultContent，这样翻译的时候没有找到语言时也能正确解析消息
+    content,
+    _parsedContent: parseMessageContent(content)
+  }
+}

package/src/component/IMChatroom/sdk/imcore/util/parser.js

@@ -1,35 +1,35 @@
-import MessageParser from '@sdp.nd/im-sdk-commons/lib/msg-parser'
-
-import getUCInstance from '../../uc'
-import cs from '../../cs'
-import { chatroomServiceName } from '../../cs/constants'
-
-export default new MessageParser({
-  base: {
-    getDefaultEmotionUrl: (
-      smileyData
-    ) => {
-      const { filename } = smileyData.data
-      return `/im-chatroom/smiley/sys/${filename}.gif`
-    },
-    getPublicEmojiURL: ({
-      filename
-    }) => `/im-chatroom/smiley/emoji/${filename}`,
-    getPublicDownloadURL: (data) => {
-      const { id: dentryId, ...other } = data
-      return cs.getPublicDownloadURL({
-        serviceName: chatroomServiceName,
-        dentryId,
-        ...other
-      })
-    },
-    getUserAvatarUrl: (uri) => `${getUCInstance().getAvatarURL({
-      userId: uri,
-      size: 80
-    })}&_=${Date.now()}`
-  },
-  highlight: {
-    keyword: '',
-    className: ''
-  }
-})
+import MessageParser from '@sdp.nd/im-sdk-commons/lib/msg-parser'
+
+import getUCInstance from '../../uc'
+import cs from '../../cs'
+import { chatroomServiceName } from '../../cs/constants'
+
+export default new MessageParser({
+  base: {
+    getDefaultEmotionUrl: (
+      smileyData
+    ) => {
+      const { filename } = smileyData.data
+      return `/im-chatroom/smiley/sys/${filename}.gif`
+    },
+    getPublicEmojiURL: ({
+      filename
+    }) => `/im-chatroom/smiley/emoji/${filename}`,
+    getPublicDownloadURL: (data) => {
+      const { id: dentryId, ...other } = data
+      return cs.getPublicDownloadURL({
+        serviceName: chatroomServiceName,
+        dentryId,
+        ...other
+      })
+    },
+    getUserAvatarUrl: (uri) => `${getUCInstance().getAvatarURL({
+      userId: uri,
+      size: 80
+    })}&_=${Date.now()}`
+  },
+  highlight: {
+    keyword: '',
+    className: ''
+  }
+})

package/src/component/IMChatroom/sdk/oms.js

@@ -1,18 +1,18 @@
-import { getUserInfo } from '@/service/im'
-
-const prefix = '__user_info'
-
-export default async function getUserInfoWithCache(userId) {
-  let cacheUser = sessionStorage.getItem(`${prefix}-${userId}`)
-  if (cacheUser) {
-    cacheUser = JSON.parse(cacheUser)
-    return cacheUser
-  }
-
-  return getUserInfo(userId).then((user) => {
-    if (user) {
-      sessionStorage.setItem(`${prefix}-${userId}`, JSON.stringify(user))
-    }
-    return user
-  })
-}
+import { getUserInfo } from '@/service/im'
+
+const prefix = '__user_info'
+
+export default async function getUserInfoWithCache(userId) {
+  let cacheUser = sessionStorage.getItem(`${prefix}-${userId}`)
+  if (cacheUser) {
+    cacheUser = JSON.parse(cacheUser)
+    return cacheUser
+  }
+
+  return getUserInfo(userId).then((user) => {
+    if (user) {
+      sessionStorage.setItem(`${prefix}-${userId}`, JSON.stringify(user))
+    }
+    return user
+  })
+}

package/src/component/IMChatroom/sdk/uc.js

@@ -1,3 +1,3 @@
-import { getUCInstance } from '@/util/auth/func'
-
-export default getUCInstance
+import { getUCInstance } from '@/util/auth/func'
+
+export default getUCInstance

package/src/component/IMChatroom/subscription/channel/app.js

@@ -1,5 +1,5 @@
-import postal from 'postal'
-
-const appChannel = postal.channel('app')
-
-export default appChannel
+import postal from 'postal'
+
+const appChannel = postal.channel('app')
+
+export default appChannel

package/src/component/IMChatroom/subscription/channel/ctl.js

@@ -1,22 +1,22 @@
-import postal from 'postal'
-import get from 'lodash/get'
-import { actions } from '../../context/chatroom'
-
-import { CTL_CMD } from '../../constants'
-
-const ctlChannel = postal.channel('ctl')
-
-// 置顶聊天室消息
-ctlChannel.subscribe(CTL_CMD.LIVE_TOP_MESSAGES, (message) => {
-  const messages = get(message, '_parsedContent.data.json.ctl.message.items', [])
-  if (messages.length) {
-    actions.setChatroomStickedMessages(messages)
-  }
-})
-
-// 删除聊天室置顶消息
-ctlChannel.subscribe(CTL_CMD.TOP_MESSAGES, () => {
-  actions.setChatroomStickedMessages()
-})
-
-export default ctlChannel
+import postal from 'postal'
+import get from 'lodash/get'
+import { actions } from '../../context/chatroom'
+
+import { CTL_CMD } from '../../constants'
+
+const ctlChannel = postal.channel('ctl')
+
+// 置顶聊天室消息
+ctlChannel.subscribe(CTL_CMD.LIVE_TOP_MESSAGES, (message) => {
+  const messages = get(message, '_parsedContent.data.json.ctl.message.items', [])
+  if (messages.length) {
+    actions.setChatroomStickedMessages(messages)
+  }
+})
+
+// 删除聊天室置顶消息
+ctlChannel.subscribe(CTL_CMD.TOP_MESSAGES, () => {
+  actions.setChatroomStickedMessages()
+})
+
+export default ctlChannel

package/src/component/IMChatroom/subscription/channel/member.js

@@ -1,40 +1,40 @@
-import postal from 'postal'
-import { COMMON_LIST_UPDATE_ACTION } from '@sdp.nd/im-web-components'
-
-import EVENT from '../event'
-
-const memberChannel = postal.channel('member')
-
-// 聊天室成员登录
-memberChannel.subscribe(EVENT.MEMBER_LOGIN, (message) => {
-  const { members = [], membercount } = message
-
-  if (members.length) {
-    memberChannel.publish(EVENT.COMMON_LIST_UPDATE, {
-      action: COMMON_LIST_UPDATE_ACTION.ADD,
-      items: members.map(({ uid }) => ({
-        user_id: uid
-      }))
-    })
-  }
-
-  memberChannel.publish(EVENT.CHATROOM_MEMBER_COUNT_UPDATE, membercount)
-})
-
-// 聊天室成员登出
-memberChannel.subscribe(EVENT.MEMBER_LOGOUT, (message) => {
-  const { members = [], membercount } = message
-
-  if (members.length) {
-    memberChannel.publish(EVENT.COMMON_LIST_UPDATE, {
-      action: COMMON_LIST_UPDATE_ACTION.DELETE,
-      items: members.map(({ uid }) => ({
-        user_id: uid
-      }))
-    })
-  }
-
-  memberChannel.publish(EVENT.CHATROOM_MEMBER_COUNT_UPDATE, membercount)
-})
-
-export default memberChannel
+import postal from 'postal'
+import { COMMON_LIST_UPDATE_ACTION } from '@sdp.nd/im-web-components'
+
+import EVENT from '../event'
+
+const memberChannel = postal.channel('member')
+
+// 聊天室成员登录
+memberChannel.subscribe(EVENT.MEMBER_LOGIN, (message) => {
+  const { members = [], membercount } = message
+
+  if (members.length) {
+    memberChannel.publish(EVENT.COMMON_LIST_UPDATE, {
+      action: COMMON_LIST_UPDATE_ACTION.ADD,
+      items: members.map(({ uid }) => ({
+        user_id: uid
+      }))
+    })
+  }
+
+  memberChannel.publish(EVENT.CHATROOM_MEMBER_COUNT_UPDATE, membercount)
+})
+
+// 聊天室成员登出
+memberChannel.subscribe(EVENT.MEMBER_LOGOUT, (message) => {
+  const { members = [], membercount } = message
+
+  if (members.length) {
+    memberChannel.publish(EVENT.COMMON_LIST_UPDATE, {
+      action: COMMON_LIST_UPDATE_ACTION.DELETE,
+      items: members.map(({ uid }) => ({
+        user_id: uid
+      }))
+    })
+  }
+
+  memberChannel.publish(EVENT.CHATROOM_MEMBER_COUNT_UPDATE, membercount)
+})
+
+export default memberChannel

package/src/component/IMChatroom/subscription/channel/message.js

@@ -1,13 +1,13 @@
-import postal from 'postal'
-import { message as messageTip } from 'fish'
-
-import EVENT from '../event'
-
-const messageChannel = postal.channel('message')
-
-messageChannel.subscribe(EVENT.COMMON_TOAST_TIP_MAKE, (data) => {
-  const { type, message } = data
-  messageTip[type](message)
-})
-
-export default messageChannel
+import postal from 'postal'
+import { message as messageTip } from 'fish'
+
+import EVENT from '../event'
+
+const messageChannel = postal.channel('message')
+
+messageChannel.subscribe(EVENT.COMMON_TOAST_TIP_MAKE, (data) => {
+  const { type, message } = data
+  messageTip[type](message)
+})
+
+export default messageChannel