@x-edu/live-player 0.0.19 → 0.0.21

package/src/component/IMChatroom/config/app/config.js

@@ -1,118 +1,118 @@
-import React from 'react'
-import { STYLE, ChatroomChatMessageList } from '@sdp.nd/im-web-components'
-
-import * as C from '../../constants'
-
-const WelcomeImage = require('../../asset/style/images/welcome.png')
-
-const actionConfig = {
-  trigger: undefined,
-  placement: undefined,
-  getActionRights: false
-}
-
-const nameConfig = {
-  visible: true,
-  rule: '_parsedContent.contentSender.nick_name|_parsedContent.contentSender.uid|from',
-  getInfo: false
-}
-
-const avatarConfig = {
-  visible: true,
-  icon: undefined
-}
-
-const tagConfig = {
-  visible: true,
-  getTags: false
-}
-
-export default {
-  business: 'chatroom',
-  uc: true,
-  wsUrl: undefined,
-  style: STYLE.PC,
-  platform: C.PLATFORM.WEB,
-  noticeVisible: false,
-  fontSizeVisible: false,
-  memberVisible: false,
-  autoViewMessage: true,
-  cmds: [],
-  chatroomMemberList: {
-    pageSize: 50,
-    limit: 1000,
-    actionConfig: {
-      actions: undefined,
-      ...actionConfig
-    },
-    nameConfig: {
-      ...nameConfig,
-      rule: ['real_name|nick_name|user_id', '（{user_id}）']
-    },
-    avatarConfig,
-    tagConfig
-  },
-  chatroomChatMessageList: {
-    direction: false,
-    emptyImage: <img src={WelcomeImage} />,
-    limit: 1000,
-    filterMessages: false,
-    getRecallMessageExtInfo: false,
-    messageContentConfig: {
-      nameRule: 'nick_name|real_name|user_id'
-    },
-    actionConfig: {
-      actions: [
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.DELETE,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.RECALL,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.COPY,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.KICK,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.FORBIDDEN,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.CANCEL_FORBIDDEN,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.ALLOW_SPEECH,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.CANCEL_ALLOW_SPEECH,
-        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.TOP_MESSAGE
-      ],
-      ...actionConfig
-    },
-    nameConfig: {
-      ...nameConfig
-      // rule: 'nick_name|real_name|user_id'
-    },
-    avatarConfig,
-    tagConfig
-  },
-  messageEditor: {
-    inputStyle: '',
-    placeholder: '',
-    readonly: false,
-    banedIconUrl: '',
-    contextMenu: [],
-    getMessageHeaders: false,
-    shortcutKeyConfig: {
-      selectable: false
-    },
-    emotionConfig: {
-      mode: 'emoji',
-      emojiPagesize: '4*8',
-      dynamicPagesize: '2*4',
-      emotionPackages: [],
-      emotionOnlinePreview: false,
-      children: undefined
-    },
-    fileConfig: {
-      accept: 'image/*',
-      multiple: false,
-      minSize: 0,
-      maxSize: Infinity,
-      maxNameLength: Infinity,
-      select: true,
-      photograph: false,
-      screenshot: false,
-      drop: false,
-      paste: false
-    }
-  },
-  initialStyle: 'html{background: #eee;}',
-  iframeCssUrl: ''
-}
+import React from 'react'
+import { STYLE, ChatroomChatMessageList } from '@sdp.nd/im-web-components'
+
+import * as C from '../../constants'
+
+const WelcomeImage = require('../../asset/style/images/welcome.png')
+
+const actionConfig = {
+  trigger: undefined,
+  placement: undefined,
+  getActionRights: false
+}
+
+const nameConfig = {
+  visible: true,
+  rule: '_parsedContent.contentSender.nick_name|_parsedContent.contentSender.uid|from',
+  getInfo: false
+}
+
+const avatarConfig = {
+  visible: true,
+  icon: undefined
+}
+
+const tagConfig = {
+  visible: true,
+  getTags: false
+}
+
+export default {
+  business: 'chatroom',
+  uc: true,
+  wsUrl: undefined,
+  style: STYLE.PC,
+  platform: C.PLATFORM.WEB,
+  noticeVisible: false,
+  fontSizeVisible: false,
+  memberVisible: false,
+  autoViewMessage: true,
+  cmds: [],
+  chatroomMemberList: {
+    pageSize: 50,
+    limit: 1000,
+    actionConfig: {
+      actions: undefined,
+      ...actionConfig
+    },
+    nameConfig: {
+      ...nameConfig,
+      rule: ['real_name|nick_name|user_id', '（{user_id}）']
+    },
+    avatarConfig,
+    tagConfig
+  },
+  chatroomChatMessageList: {
+    direction: false,
+    emptyImage: <img src={WelcomeImage} />,
+    limit: 1000,
+    filterMessages: false,
+    getRecallMessageExtInfo: false,
+    messageContentConfig: {
+      nameRule: 'nick_name|real_name|user_id'
+    },
+    actionConfig: {
+      actions: [
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.DELETE,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.RECALL,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.COPY,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.KICK,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.FORBIDDEN,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.CANCEL_FORBIDDEN,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.ALLOW_SPEECH,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.CANCEL_ALLOW_SPEECH,
+        ChatroomChatMessageList.C.CHATROOM_CHAT_MESSAGE_LIST_ITEM_ACTION.TOP_MESSAGE
+      ],
+      ...actionConfig
+    },
+    nameConfig: {
+      ...nameConfig
+      // rule: 'nick_name|real_name|user_id'
+    },
+    avatarConfig,
+    tagConfig
+  },
+  messageEditor: {
+    inputStyle: '',
+    placeholder: '',
+    readonly: false,
+    banedIconUrl: '',
+    contextMenu: [],
+    getMessageHeaders: false,
+    shortcutKeyConfig: {
+      selectable: false
+    },
+    emotionConfig: {
+      mode: 'emoji',
+      emojiPagesize: '4*8',
+      dynamicPagesize: '2*4',
+      emotionPackages: [],
+      emotionOnlinePreview: false,
+      children: undefined
+    },
+    fileConfig: {
+      accept: 'image/*',
+      multiple: false,
+      minSize: 0,
+      maxSize: Infinity,
+      maxNameLength: Infinity,
+      select: true,
+      photograph: false,
+      screenshot: false,
+      drop: false,
+      paste: false
+    }
+  },
+  initialStyle: 'html{background: #eee;}',
+  iframeCssUrl: ''
+}

package/src/component/IMChatroom/config/app/index.js

@@ -1,60 +1,60 @@
-import get from 'lodash/get'
-import isPlainObject from 'lodash/isPlainObject'
-import Url from 'browser-url'
-
-import config from './config'
-
-class App {
-  config = config
-
-  set = (productConfig) => {
-    this.config = this._defaultsDeep(productConfig, this.config)
-    this.initStyle()
-  }
-
-  get = (key) => {
-    if (key) {
-      return get(this.config, key)
-    }
-    return this.config
-  }
-
-  initStyle = () => {
-    const { initialStyle, iframeCssUrl } = this.config
-    if (iframeCssUrl) {
-      const urlData = new Url(iframeCssUrl)
-      urlData.query._t = new Date().getTime()
-
-      const link = document.createElement('link')
-      link.href = urlData.href
-      link.rel = 'stylesheet'
-      document.body.appendChild(link)
-    }
-
-    if (initialStyle) {
-      const style = document.createElement('style')
-      style.innerText = initialStyle
-      document.body.appendChild(style)
-    }
-  }
-
-  _defaultsDeep(a, b) {
-    if (isPlainObject(a)) {
-      const data = {
-        ...b
-      }
-      Object.keys(a).forEach((key) => {
-        if (b[key] !== undefined) {
-          data[key] = this._defaultsDeep(a[key], b[key])
-        } else {
-          data[key] = a[key]
-        }
-      })
-      return data
-    } else {
-      return a
-    }
-  }
-}
-
-export default new App()
+import get from 'lodash/get'
+import isPlainObject from 'lodash/isPlainObject'
+import Url from 'browser-url'
+
+import config from './config'
+
+class App {
+  config = config
+
+  set = (productConfig) => {
+    this.config = this._defaultsDeep(productConfig, this.config)
+    this.initStyle()
+  }
+
+  get = (key) => {
+    if (key) {
+      return get(this.config, key)
+    }
+    return this.config
+  }
+
+  initStyle = () => {
+    const { initialStyle, iframeCssUrl } = this.config
+    if (iframeCssUrl) {
+      const urlData = new Url(iframeCssUrl)
+      urlData.query._t = new Date().getTime()
+
+      const link = document.createElement('link')
+      link.href = urlData.href
+      link.rel = 'stylesheet'
+      document.body.appendChild(link)
+    }
+
+    if (initialStyle) {
+      const style = document.createElement('style')
+      style.innerText = initialStyle
+      document.body.appendChild(style)
+    }
+  }
+
+  _defaultsDeep(a, b) {
+    if (isPlainObject(a)) {
+      const data = {
+        ...b
+      }
+      Object.keys(a).forEach((key) => {
+        if (b[key] !== undefined) {
+          data[key] = this._defaultsDeep(a[key], b[key])
+        } else {
+          data[key] = a[key]
+        }
+      })
+      return data
+    } else {
+      return a
+    }
+  }
+}
+
+export default new App()

package/src/component/IMChatroom/config/env.js

@@ -1,5 +1,5 @@
-import config from '@/config/env'
-
-const { env } = config
-
-export default env
+import config from '@/config/env'
+
+const { env } = config
+
+export default env

package/src/component/IMChatroom/config/index.js

@@ -1,3 +1,3 @@
-import './request'
-import './env'
-import './url'
+import './request'
+import './env'
+import './url'

package/src/component/IMChatroom/config/request/config/base.js

@@ -1,124 +1,124 @@
-/* eslint-disable no-param-reassign */
-import { buildURL } from '@sdp.nd/request-adapter-waf'
-import { message } from 'fish'
-import get from 'lodash/get'
-import intl from '../../../i18n'
-
-import getUCInstance from '../../../sdk/uc'
-import { ERROR_CODE } from '../../../constants'
-import {
-  setChatroom,
-  setChatroomConversationId,
-  setChatroomToken
-} from '../../../util/chatroom'
-import jsonBigInt from '../../../util/jsonBigInt'
-
-import urlConfig from '../../url'
-import { logout } from '@/util/auth/func'
-
-const PROTECTION_PREFIX = /^\)\]\}',?\n/
-
-const invalidTokenErrorCodes = [
-  ERROR_CODE.UC_AUTH_INVALID_TOKEN,
-  ERROR_CODE.UC_AUTH_TOKEN_EXPIRED,
-  ERROR_CODE.UC_MAC_SIGN_INVALID
-]
-
-const ignoreMessageErrorCodes = [
-  ERROR_CODE.IMP_TOKEN_EXPIRED,
-  ERROR_CODE.IMP_AUTH_TOKEN_EXPIRED
-]
-
-export default {
-  headers: {
-    'sdp-app-id': urlConfig.sdpAppId
-  },
-  transformResponse: [(data) => {
-    if (!data) return data
-
-    // 长整型统一转化为字符串
-    try {
-      return jsonBigInt.parse(data.replace(PROTECTION_PREFIX, ''))
-    } catch (e) {
-      return data
-    }
-  }],
-  validateStatus(status) {
-    return status === 200
-  },
-  interceptors: {
-    async request(config) {
-      // 因为oms sdk中delete、get、head、options这几个方法的第一个请求是config，不是url
-      // 所以axios中config.url被设置成了config，所以这边需要转换一下
-      if (['delete', 'get', 'head', 'options'].some((method) => method === config.method)) {
-        if (typeof config.url !== 'string') {
-          const options = config.url || {}
-          config = {
-            ...config,
-            ...options
-          }
-        }
-      }
-
-      // 因为im-sdk-*中post、put、patch这几个方法的第二个请求是config，不是data
-      // 所以axios中config.data被设置成了config，所以这边需要转换一下
-      if (['post', 'put', 'patch'].some((method) => method === config.method)) {
-        const options = config.data || {}
-        if (options.data || options.params) {
-          config = {
-            ...config,
-            ...options
-          }
-        }
-      }
-      const uc = getUCInstance()
-      if (uc.getAuthHeaderAsync) {
-        const url = buildURL(config.url, config.params, config.paramsSerializer).replace(/@/g, '%40')
-        const Authorization = await uc.getAuthHeaderAsync({
-          url,
-          method: config.method.toLocaleUpperCase()
-        })
-        config.headers = {
-          ...config.headers,
-          Authorization
-        }
-      }
-
-      return config
-    },
-    response: {
-      success(response) {
-        return response.data
-      },
-      error(error) {
-        let response
-        if (error.message === ERROR_CODE.NETWORK_ERROR) {
-          response = {
-            data: {
-              code: ERROR_CODE.NETWORK_ERROR,
-              message: intl.get('error.networkError')
-            }
-          }
-        } else {
-          response = error.response
-        }
-
-        const code = get(response, 'data.code')
-        if (!ignoreMessageErrorCodes.some((item) => item === code)) {
-          message.error(intl.get(`error.${code}`, '') || get(response, 'data.message') || intl.get('error.serviceError'))
-        }
-        if (invalidTokenErrorCodes.some((item) => item === code)) {
-          setTimeout(() => {
-            logout()
-            setChatroom()
-            setChatroomConversationId()
-            setChatroomToken()
-            // TODO: 重新登录
-            message.error('请重新登录')
-          }, 3000)
-        }
-        return Promise.reject(response)
-      }
-    }
-  }
-}
+/* eslint-disable no-param-reassign */
+import { buildURL } from '@sdp.nd/request-adapter-waf'
+import { message } from 'fish'
+import get from 'lodash/get'
+import intl from '../../../i18n'
+
+import getUCInstance from '../../../sdk/uc'
+import { ERROR_CODE } from '../../../constants'
+import {
+  setChatroom,
+  setChatroomConversationId,
+  setChatroomToken
+} from '../../../util/chatroom'
+import jsonBigInt from '../../../util/jsonBigInt'
+
+import urlConfig from '../../url'
+import { logout } from '@/util/auth/func'
+
+const PROTECTION_PREFIX = /^\)\]\}',?\n/
+
+const invalidTokenErrorCodes = [
+  ERROR_CODE.UC_AUTH_INVALID_TOKEN,
+  ERROR_CODE.UC_AUTH_TOKEN_EXPIRED,
+  ERROR_CODE.UC_MAC_SIGN_INVALID
+]
+
+const ignoreMessageErrorCodes = [
+  ERROR_CODE.IMP_TOKEN_EXPIRED,
+  ERROR_CODE.IMP_AUTH_TOKEN_EXPIRED
+]
+
+export default {
+  headers: {
+    'sdp-app-id': urlConfig.sdpAppId
+  },
+  transformResponse: [(data) => {
+    if (!data) return data
+
+    // 长整型统一转化为字符串
+    try {
+      return jsonBigInt.parse(data.replace(PROTECTION_PREFIX, ''))
+    } catch (e) {
+      return data
+    }
+  }],
+  validateStatus(status) {
+    return status === 200
+  },
+  interceptors: {
+    async request(config) {
+      // 因为oms sdk中delete、get、head、options这几个方法的第一个请求是config，不是url
+      // 所以axios中config.url被设置成了config，所以这边需要转换一下
+      if (['delete', 'get', 'head', 'options'].some((method) => method === config.method)) {
+        if (typeof config.url !== 'string') {
+          const options = config.url || {}
+          config = {
+            ...config,
+            ...options
+          }
+        }
+      }
+
+      // 因为im-sdk-*中post、put、patch这几个方法的第二个请求是config，不是data
+      // 所以axios中config.data被设置成了config，所以这边需要转换一下
+      if (['post', 'put', 'patch'].some((method) => method === config.method)) {
+        const options = config.data || {}
+        if (options.data || options.params) {
+          config = {
+            ...config,
+            ...options
+          }
+        }
+      }
+      const uc = getUCInstance()
+      if (uc.getAuthHeaderAsync) {
+        const url = buildURL(config.url, config.params, config.paramsSerializer).replace(/@/g, '%40')
+        const Authorization = await uc.getAuthHeaderAsync({
+          url,
+          method: config.method.toLocaleUpperCase()
+        })
+        config.headers = {
+          ...config.headers,
+          Authorization
+        }
+      }
+
+      return config
+    },
+    response: {
+      success(response) {
+        return response.data
+      },
+      error(error) {
+        let response
+        if (error.message === ERROR_CODE.NETWORK_ERROR) {
+          response = {
+            data: {
+              code: ERROR_CODE.NETWORK_ERROR,
+              message: intl.get('error.networkError')
+            }
+          }
+        } else {
+          response = error.response
+        }
+
+        const code = get(response, 'data.code')
+        if (!ignoreMessageErrorCodes.some((item) => item === code)) {
+          message.error(intl.get(`error.${code}`, '') || get(response, 'data.message') || intl.get('error.serviceError'))
+        }
+        if (invalidTokenErrorCodes.some((item) => item === code)) {
+          setTimeout(() => {
+            logout()
+            setChatroom()
+            setChatroomConversationId()
+            setChatroomToken()
+            // TODO: 重新登录
+            message.error('请重新登录')
+          }, 3000)
+        }
+        return Promise.reject(response)
+      }
+    }
+  }
+}

package/src/component/IMChatroom/config/request/config/chatroom.js

@@ -1,26 +1,26 @@
-/* eslint-disable no-param-reassign */
-import { getChatroomToken } from '../../../util/chatroom'
-
-import requestConfig from './base'
-
-export default {
-  ...requestConfig,
-  interceptors: {
-    ...requestConfig.interceptors,
-    request: async (config) => {
-      const token = getChatroomToken()
-      if (token) {
-        config.headers = {
-          ...config.headers,
-          imchatroomstoken: token
-        }
-      } else {
-        config.url = config.url.replace('v2', 'v0.1')
-      }
-
-      config = await requestConfig.interceptors.request(config)
-
-      return config
-    }
-  }
-}
+/* eslint-disable no-param-reassign */
+import { getChatroomToken } from '../../../util/chatroom'
+
+import requestConfig from './base'
+
+export default {
+  ...requestConfig,
+  interceptors: {
+    ...requestConfig.interceptors,
+    request: async (config) => {
+      const token = getChatroomToken()
+      if (token) {
+        config.headers = {
+          ...config.headers,
+          imchatroomstoken: token
+        }
+      } else {
+        config.url = config.url.replace('v2', 'v0.1')
+      }
+
+      config = await requestConfig.interceptors.request(config)
+
+      return config
+    }
+  }
+}