@x-edu/live-player 0.0.21 → 0.0.23

package/src/component/IMChatroom/sdk/imcore/emitters/connectionDisconnect.js

@@ -1,5 +1,5 @@
-import subscription from '../../../subscription'
-
-export default function connectionDisconnect(data) {
-  subscription.websocket.publish(subscription.EVENT.DISCONNECT, data)
-}
+import subscription from '../../../subscription'
+
+export default function connectionDisconnect(data) {
+  subscription.websocket.publish(subscription.EVENT.DISCONNECT, data)
+}

package/src/component/IMChatroom/sdk/imcore/emitters/index.js

@@ -1,57 +1,57 @@
-import IMCoreChatroom from '@ndim/chatroom'
-
-import chatroomInfoGetFail from './chatroomInfoGetFail'
-import chatroomKickedBySelf from './chatroomKickedBySelf'
-import chatroomKickedByAdmin from './chatroomKickedByAdmin'
-import chatroomDestroyed from './chatroomDestroyed'
-import chatroomLoginFail from './chatroomLoginFail'
-import chatroomLoginSuccess from './chatroomLoginSuccess'
-import chatroomMemberLogin from './chatroomMemberLogin'
-import chatroomMemberLogout from './chatroomMemberLogout'
-import connectionConnected from './connectionConnected'
-import connectionConnecting from './connectionConnecting'
-import connectionDisconnect from './connectionDisconnect'
-import messageReceive from './messageReceive'
-
-const actions = {
-  [IMCoreChatroom.ChatroomConnectionEvent.GetChatroomInfoFail]: chatroomInfoGetFail,
-  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomKickedBySelf]: chatroomKickedBySelf,
-  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomKickedByAdmin]: chatroomKickedByAdmin,
-  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomDestroyed]: chatroomDestroyed,
-  [IMCoreChatroom.ChatroomConnectionEvent.LoginChatroomFail]: chatroomLoginFail,
-  [IMCoreChatroom.ChatroomConnectionEvent.LoginChatroomSuccess]: chatroomLoginSuccess,
-  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogin]: chatroomMemberLogin,
-  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogout]: chatroomMemberLogout,
-  [IMCoreChatroom.ConnectionEvent.Open]: undefined,
-  [IMCoreChatroom.ConnectionEvent.Connected]: connectionConnected,
-  [IMCoreChatroom.ConnectionEvent.Reconnecting]: connectionConnecting,
-  [IMCoreChatroom.ConnectionEvent.Disconnect]: connectionDisconnect,
-  [IMCoreChatroom.ConnectionEvent.Kicked]: chatroomKickedBySelf,
-  [IMCoreChatroom.ConnectionEvent.KickedForRedirect]: undefined,
-  [IMCoreChatroom.ConnectionEvent.Close]: undefined,
-  [IMCoreChatroom.ConnectionEvent.Error]: undefined,
-  [IMCoreChatroom.ConnectionEvent.LoginFail]: undefined,
-  [IMCoreChatroom.MessageEvent.Receive.Inbox]: messageReceive
-}
-
-const emitters = {}
-Object.keys(actions).forEach((key) => {
-  emitters[key] = (...args) => {
-    if (
-      ![
-        IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogin,
-        IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogout,
-        IMCoreChatroom.MessageEvent.Receive.Inbox
-      ].some((actionName) => actionName === key)
-    ) {
-      // thirdParty.onPostMessage(thirdParty.EVENT.CONNECT_STATUS, key)
-    }
-
-    const action = actions[key]
-    if (action) {
-      action(...args)
-    }
-  }
-})
-
-export default emitters
+import IMCoreChatroom from '@ndim/chatroom'
+
+import chatroomInfoGetFail from './chatroomInfoGetFail'
+import chatroomKickedBySelf from './chatroomKickedBySelf'
+import chatroomKickedByAdmin from './chatroomKickedByAdmin'
+import chatroomDestroyed from './chatroomDestroyed'
+import chatroomLoginFail from './chatroomLoginFail'
+import chatroomLoginSuccess from './chatroomLoginSuccess'
+import chatroomMemberLogin from './chatroomMemberLogin'
+import chatroomMemberLogout from './chatroomMemberLogout'
+import connectionConnected from './connectionConnected'
+import connectionConnecting from './connectionConnecting'
+import connectionDisconnect from './connectionDisconnect'
+import messageReceive from './messageReceive'
+
+const actions = {
+  [IMCoreChatroom.ChatroomConnectionEvent.GetChatroomInfoFail]: chatroomInfoGetFail,
+  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomKickedBySelf]: chatroomKickedBySelf,
+  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomKickedByAdmin]: chatroomKickedByAdmin,
+  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomDestroyed]: chatroomDestroyed,
+  [IMCoreChatroom.ChatroomConnectionEvent.LoginChatroomFail]: chatroomLoginFail,
+  [IMCoreChatroom.ChatroomConnectionEvent.LoginChatroomSuccess]: chatroomLoginSuccess,
+  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogin]: chatroomMemberLogin,
+  [IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogout]: chatroomMemberLogout,
+  [IMCoreChatroom.ConnectionEvent.Open]: undefined,
+  [IMCoreChatroom.ConnectionEvent.Connected]: connectionConnected,
+  [IMCoreChatroom.ConnectionEvent.Reconnecting]: connectionConnecting,
+  [IMCoreChatroom.ConnectionEvent.Disconnect]: connectionDisconnect,
+  [IMCoreChatroom.ConnectionEvent.Kicked]: chatroomKickedBySelf,
+  [IMCoreChatroom.ConnectionEvent.KickedForRedirect]: undefined,
+  [IMCoreChatroom.ConnectionEvent.Close]: undefined,
+  [IMCoreChatroom.ConnectionEvent.Error]: undefined,
+  [IMCoreChatroom.ConnectionEvent.LoginFail]: undefined,
+  [IMCoreChatroom.MessageEvent.Receive.Inbox]: messageReceive
+}
+
+const emitters = {}
+Object.keys(actions).forEach((key) => {
+  emitters[key] = (...args) => {
+    if (
+      ![
+        IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogin,
+        IMCoreChatroom.ChatroomConnectionEvent.ChatroomMemberLogout,
+        IMCoreChatroom.MessageEvent.Receive.Inbox
+      ].some((actionName) => actionName === key)
+    ) {
+      // thirdParty.onPostMessage(thirdParty.EVENT.CONNECT_STATUS, key)
+    }
+
+    const action = actions[key]
+    if (action) {
+      action(...args)
+    }
+  }
+})
+
+export default emitters

package/src/component/IMChatroom/sdk/imcore/emitters/messageReceive.js

@@ -1,36 +1,36 @@
-// import get from 'lodash/get'
-
-import subscription from '../../../subscription'
-import appConfig from '../../../config/app'
-import bridge from '../../bridge'
-// import { MESSAGE_TYPE } from '../../../constants'
-
-import { transferLongToString, formatMessages } from '../util/format'
-
-export default function messageReceive(data) {
-  console.log('message.receive', data)
-  let messages = []
-  data.forEach((items) => {
-    messages = messages.concat(items)
-  })
-
-  const items = formatMessages(messages.map((message) => transferLongToString(message)))
-
-  // items.forEach((message) => {
-  //   const messageType = get(message, '_parsedContent.type')
-  //   if ([MESSAGE_TYPE.CTL, MESSAGE_TYPE.NTF, MESSAGE_TYPE.TEL].some((type) => messageType === type)) {
-  //     thirdParty.onPostMessage(thirdParty.EVENT.CMD, message)
-  //   }
-  // })
-
-  if (appConfig.get('chatroomChatMessageList.filterMessages')) {
-    return bridge.register('filterMessages', {
-      type: 'new',
-      messages: items
-    }).then(({ messages: newMessages }) => {
-      subscription.websocket.publish(subscription.EVENT.RECEIVE_MESSAGES, newMessages)
-    })
-  } else {
-    subscription.websocket.publish(subscription.EVENT.RECEIVE_MESSAGES, items)
-  }
-}
+// import get from 'lodash/get'
+
+import subscription from '../../../subscription'
+import appConfig from '../../../config/app'
+import bridge from '../../bridge'
+// import { MESSAGE_TYPE } from '../../../constants'
+
+import { transferLongToString, formatMessages } from '../util/format'
+
+export default function messageReceive(data) {
+  console.log('message.receive', data)
+  let messages = []
+  data.forEach((items) => {
+    messages = messages.concat(items)
+  })
+
+  const items = formatMessages(messages.map((message) => transferLongToString(message)))
+
+  // items.forEach((message) => {
+  //   const messageType = get(message, '_parsedContent.type')
+  //   if ([MESSAGE_TYPE.CTL, MESSAGE_TYPE.NTF, MESSAGE_TYPE.TEL].some((type) => messageType === type)) {
+  //     thirdParty.onPostMessage(thirdParty.EVENT.CMD, message)
+  //   }
+  // })
+
+  if (appConfig.get('chatroomChatMessageList.filterMessages')) {
+    return bridge.register('filterMessages', {
+      type: 'new',
+      messages: items
+    }).then(({ messages: newMessages }) => {
+      subscription.websocket.publish(subscription.EVENT.RECEIVE_MESSAGES, newMessages)
+    })
+  } else {
+    subscription.websocket.publish(subscription.EVENT.RECEIVE_MESSAGES, items)
+  }
+}

package/src/component/IMChatroom/sdk/imcore/index.js

@@ -1,178 +1,178 @@
-import IMCoreChatroom from '@ndim/chatroom'
-import { reverse } from 'lodash'
-
-import getUCInstance from '../uc'
-import { getCurrentAccount, getCurrentAccountId } from '../../util/account'
-import appConfig from '../../config/app'
-import bridge from '../bridge'
-import * as C from '../../constants'
-
-import loadPlugins from './plugins'
-import { imCoreOrigin, imCoreApiOrigin, ContentType, MessageTypeMap } from './constants'
-import requestInterceptors from './interceptors/request'
-import responseInterceptors from './interceptors/response'
-import emitters from './emitters'
-import { transferStringToLong, transferLongToString, formatMessages } from './util/format'
-import getUserInfoWithCache from '../oms'
-
-// eslint-disable-next-line import/no-mutable-exports
-let imCoreChatroom = null
-
-// eslint-disable-next-line import/prefer-default-export
-export const initIMCoreChatroom = () => new Promise((resolve, reject) => getUCInstance().getTokenAsync().then((token) => {
-  loadPlugins(token, getCurrentAccount())
-
-  imCoreChatroom = new IMCoreChatroom({
-    server: { // webSocket 配置
-      wsUrl: appConfig.get('wsUrl') || imCoreOrigin, // IMCore 服务端 webSocket 服务器响应地址，必填
-      wsProtocols: '', // webSocket 子协议
-      apiHost: imCoreApiOrigin, // IMCoreApi 服务地址，必填
-      cachePrefix: appConfig.get('business')
-    },
-    autoAck: true, // 是否自动 ack 消息（即：是否自动通知服务端已接收到的最大的收件箱消息id），默认 false，选填
-    listenConversationChange: false, // 是否监听会话变更，若监听，会话变更后将更新会话已读游标等，默认 true，选填
-    messageCompletion: { // 消息补齐配置，选填
-      enable: false, // 是否开启
-      interval: 500, // 补齐频率，默认 500，单位，毫秒
-      untilAgo: 1 // 补齐多少天的消息，默认 15，单位，天
-    }
-  })
-
-  console.log('imCoreChatroom', imCoreChatroom)
-
-  // 设置请求拦截器
-  imCoreChatroom.request.instance.interceptors.request.use(...requestInterceptors)
-  imCoreChatroom.request.instance.interceptors.response.use(...responseInterceptors)
-
-  // 注册emitter事件
-  Object.keys(emitters).forEach((emitterName) => {
-    imCoreChatroom.emitter.on(emitterName, emitters[emitterName].bind(imCoreChatroom))
-  })
-
-  // 连接登录聊天室
-  imCoreChatroom.connect(getCurrentAccountId())
-
-  resolve(imCoreChatroom)
-}).catch((error) => {
-  reject(error)
-}))
-
-export const getIMCoreChatroom = () => imCoreChatroom
-
-export const reconnectIMCoreChatroom = () => {
-  imCoreChatroom.connect(getCurrentAccountId())
-}
-
-const __sendMessage = (message, online) => {
-  if (!online) {
-    return Promise.resolve(formatMessages([{
-      ...message,
-      from: getCurrentAccountId(),
-      content: message.buildContent()
-    }])[0])
-  }
-  return imCoreChatroom.sendMessage({
-    time: null,
-    seq: null,
-    qos: 0,
-    resendFlag: 0,
-    convtype: 3,
-    buildContent: message.buildContent.bind(message)
-  }).then((res) => {
-    const data = transferLongToString(res)
-    return {
-      id: data.msgId,
-      seq: data.msgSeq,
-      time: data.msgTime,
-      _direction: 'up',
-      _localInfo: {
-        id: data.msgId,
-        index: 0
-      }
-    }
-  })
-}
-
-const _sendMessage = async (contentType, contentBody, online, headers) => {
-  const messageType = MessageTypeMap[contentType]
-  const message = new IMCoreChatroom.MessageConstructor[messageType]()
-  if (headers) {
-    message.setHeaders(headers)
-  }
-
-  if (contentType === ContentType.Text && contentBody.length > 500) {
-    let result
-    for (let i = 0; i < contentBody.length; i += 500) {
-      const body = contentBody.substring(i, i + 500)
-      message.setBody(body)
-      result = await __sendMessage(message, online)
-    }
-    return result
-  }
-
-  let body = contentBody
-  if (messageType === ContentType.Image) {
-    body = body.replace('fullimage', 'fullImage')
-  }
-  message.setBody(body)
-  return __sendMessage(message, online)
-}
-
-export const sendMessage = async (contentType, contentBody, online) => {
-  if (appConfig.get('messageEditor.getMessageHeaders')) {
-    return bridge.register('getMessageHeaders').then((headers) => _sendMessage(contentType, contentBody, online, headers))
-  } else {
-    const userId = await getCurrentAccountId()
-    const userInfo = await getUserInfoWithCache(userId)
-    return _sendMessage(contentType, contentBody, online,
-      {
-        'Content-Sender': {
-          user_id: userId,
-          nick_name: userInfo.real_name
-        }
-      })
-  }
-}
-
-export const getHistoryMessages = (id, limit) => imCoreChatroom.getHistoryMessages(transferStringToLong(id), limit)
-  .then((messages) => {
-    const items = reverse(formatMessages(messages.map((message) => transferLongToString(message))))
-
-    // items.forEach((message) => {
-    //   const messageType = get(message, '_parsedContent.type')
-    //   if ([C.MESSAGE_TYPE.CTL, C.MESSAGE_TYPE.NTF, C.MESSAGE_TYPE.TEL].some((type) => messageType === type)) {
-    //     thirdParty.onPostMessage(thirdParty.EVENT.CMD, message)
-    //   }
-    // })
-
-    const hasMore = items.length > 0 && items[0].id !== C.MIM_CONV_MSG_ID
-    if (appConfig.get('chatroomChatMessageList.filterMessages')) {
-      return bridge.register('filterMessages', {
-        type: 'history',
-        messages: items,
-        hasMore
-      })
-    }
-    return {
-      messages: items,
-      hasMore
-    }
-  })
-
-export const subscribeOnlineStatus = () => imCoreChatroom.subscribeOnlineStatus()
-
-export const recallMessage = (message) => {
-  if (appConfig.get('chatroomChatMessageList.getRecallMessageExtInfo')) {
-    return bridge.register('getRecallMessageExtInfo', message).then(
-      (extInfo) => imCoreChatroom.recallMessage({
-        time: transferStringToLong(message.time),
-        id: transferStringToLong(message.id)
-      }, extInfo)
-    )
-  } else {
-    return imCoreChatroom.recallMessage({
-      time: transferStringToLong(message.time),
-      id: transferStringToLong(message.id)
-    })
-  }
-}
+import IMCoreChatroom from '@ndim/chatroom'
+import { reverse } from 'lodash'
+
+import getUCInstance from '../uc'
+import { getCurrentAccount, getCurrentAccountId } from '../../util/account'
+import appConfig from '../../config/app'
+import bridge from '../bridge'
+import * as C from '../../constants'
+
+import loadPlugins from './plugins'
+import { imCoreOrigin, imCoreApiOrigin, ContentType, MessageTypeMap } from './constants'
+import requestInterceptors from './interceptors/request'
+import responseInterceptors from './interceptors/response'
+import emitters from './emitters'
+import { transferStringToLong, transferLongToString, formatMessages } from './util/format'
+import getUserInfoWithCache from '../oms'
+
+// eslint-disable-next-line import/no-mutable-exports
+let imCoreChatroom = null
+
+// eslint-disable-next-line import/prefer-default-export
+export const initIMCoreChatroom = () => new Promise((resolve, reject) => getUCInstance().getTokenAsync().then((token) => {
+  loadPlugins(token, getCurrentAccount())
+
+  imCoreChatroom = new IMCoreChatroom({
+    server: { // webSocket 配置
+      wsUrl: appConfig.get('wsUrl') || imCoreOrigin, // IMCore 服务端 webSocket 服务器响应地址，必填
+      wsProtocols: '', // webSocket 子协议
+      apiHost: imCoreApiOrigin, // IMCoreApi 服务地址，必填
+      cachePrefix: appConfig.get('business')
+    },
+    autoAck: true, // 是否自动 ack 消息（即：是否自动通知服务端已接收到的最大的收件箱消息id），默认 false，选填
+    listenConversationChange: false, // 是否监听会话变更，若监听，会话变更后将更新会话已读游标等，默认 true，选填
+    messageCompletion: { // 消息补齐配置，选填
+      enable: false, // 是否开启
+      interval: 500, // 补齐频率，默认 500，单位，毫秒
+      untilAgo: 1 // 补齐多少天的消息，默认 15，单位，天
+    }
+  })
+
+  console.log('imCoreChatroom', imCoreChatroom)
+
+  // 设置请求拦截器
+  imCoreChatroom.request.instance.interceptors.request.use(...requestInterceptors)
+  imCoreChatroom.request.instance.interceptors.response.use(...responseInterceptors)
+
+  // 注册emitter事件
+  Object.keys(emitters).forEach((emitterName) => {
+    imCoreChatroom.emitter.on(emitterName, emitters[emitterName].bind(imCoreChatroom))
+  })
+
+  // 连接登录聊天室
+  imCoreChatroom.connect(getCurrentAccountId())
+
+  resolve(imCoreChatroom)
+}).catch((error) => {
+  reject(error)
+}))
+
+export const getIMCoreChatroom = () => imCoreChatroom
+
+export const reconnectIMCoreChatroom = () => {
+  imCoreChatroom.connect(getCurrentAccountId())
+}
+
+const __sendMessage = (message, online) => {
+  if (!online) {
+    return Promise.resolve(formatMessages([{
+      ...message,
+      from: getCurrentAccountId(),
+      content: message.buildContent()
+    }])[0])
+  }
+  return imCoreChatroom.sendMessage({
+    time: null,
+    seq: null,
+    qos: 0,
+    resendFlag: 0,
+    convtype: 3,
+    buildContent: message.buildContent.bind(message)
+  }).then((res) => {
+    const data = transferLongToString(res)
+    return {
+      id: data.msgId,
+      seq: data.msgSeq,
+      time: data.msgTime,
+      _direction: 'up',
+      _localInfo: {
+        id: data.msgId,
+        index: 0
+      }
+    }
+  })
+}
+
+const _sendMessage = async (contentType, contentBody, online, headers) => {
+  const messageType = MessageTypeMap[contentType]
+  const message = new IMCoreChatroom.MessageConstructor[messageType]()
+  if (headers) {
+    message.setHeaders(headers)
+  }
+
+  if (contentType === ContentType.Text && contentBody.length > 500) {
+    let result
+    for (let i = 0; i < contentBody.length; i += 500) {
+      const body = contentBody.substring(i, i + 500)
+      message.setBody(body)
+      result = await __sendMessage(message, online)
+    }
+    return result
+  }
+
+  let body = contentBody
+  if (messageType === ContentType.Image) {
+    body = body.replace('fullimage', 'fullImage')
+  }
+  message.setBody(body)
+  return __sendMessage(message, online)
+}
+
+export const sendMessage = async (contentType, contentBody, online) => {
+  if (appConfig.get('messageEditor.getMessageHeaders')) {
+    return bridge.register('getMessageHeaders').then((headers) => _sendMessage(contentType, contentBody, online, headers))
+  } else {
+    const userId = await getCurrentAccountId()
+    const userInfo = await getUserInfoWithCache(userId)
+    return _sendMessage(contentType, contentBody, online,
+      {
+        'Content-Sender': {
+          user_id: userId,
+          nick_name: userInfo.real_name
+        }
+      })
+  }
+}
+
+export const getHistoryMessages = (id, limit) => imCoreChatroom.getHistoryMessages(transferStringToLong(id), limit)
+  .then((messages) => {
+    const items = reverse(formatMessages(messages.map((message) => transferLongToString(message))))
+
+    // items.forEach((message) => {
+    //   const messageType = get(message, '_parsedContent.type')
+    //   if ([C.MESSAGE_TYPE.CTL, C.MESSAGE_TYPE.NTF, C.MESSAGE_TYPE.TEL].some((type) => messageType === type)) {
+    //     thirdParty.onPostMessage(thirdParty.EVENT.CMD, message)
+    //   }
+    // })
+
+    const hasMore = items.length > 0 && items[0].id !== C.MIM_CONV_MSG_ID
+    if (appConfig.get('chatroomChatMessageList.filterMessages')) {
+      return bridge.register('filterMessages', {
+        type: 'history',
+        messages: items,
+        hasMore
+      })
+    }
+    return {
+      messages: items,
+      hasMore
+    }
+  })
+
+export const subscribeOnlineStatus = () => imCoreChatroom.subscribeOnlineStatus()
+
+export const recallMessage = (message) => {
+  if (appConfig.get('chatroomChatMessageList.getRecallMessageExtInfo')) {
+    return bridge.register('getRecallMessageExtInfo', message).then(
+      (extInfo) => imCoreChatroom.recallMessage({
+        time: transferStringToLong(message.time),
+        id: transferStringToLong(message.id)
+      }, extInfo)
+    )
+  } else {
+    return imCoreChatroom.recallMessage({
+      time: transferStringToLong(message.time),
+      id: transferStringToLong(message.id)
+    })
+  }
+}

package/src/component/IMChatroom/sdk/imcore/interceptors/request.js

@@ -1,7 +1,7 @@
-import imCoreApiRequestConfig from '../../../config/request/config/imCoreApi'
-
-// 添加请求拦截器
-export default [
-  imCoreApiRequestConfig.interceptors.request,
-  (error) => Promise.reject(error)
-]
+import imCoreApiRequestConfig from '../../../config/request/config/imCoreApi'
+
+// 添加请求拦截器
+export default [
+  imCoreApiRequestConfig.interceptors.request,
+  (error) => Promise.reject(error)
+]

package/src/component/IMChatroom/sdk/imcore/interceptors/response.js

@@ -1,5 +1,5 @@
-// 添加响应拦截器
-export default [
-  (response) => response,
-  (error) => Promise.reject(error)
-]
+// 添加响应拦截器
+export default [
+  (response) => response,
+  (error) => Promise.reject(error)
+]