zby-live-sdk 1.0.49-beta-talrtc1014 → 1.0.49-beta-1222-1

package/src/channel/pomelo/index.js

@@ -1,184 +1,184 @@
-import pomeloClient from './polemo';
-import dealReceiveStreamMsg from '../stream-msg';
-import defaultApi from '../../default/extend';
-import util from '../../util/util';
-import polemoUtil from './util';
-import zbysdk from '../../zby-live-sdk';
-import dataReport from '../../network/dataReport';
-import {getApiCloudBaseUrl} from '../../config/config.js';
-
-let sendMsgCheckIntervalTimer = null;
-let sendMsgCheckIntervalTime = 3000;
-
-const pomeloObj = {
-  isInRoom: false,
-  sendMsgCacheList: {},
-  sendMsgCheckList: {},
-  sendMsgIndex: 0,
-  initParams: null,
-  async joinRoom(args, cb) {
-    if (!args) {
-      return;
-    }
-    this.log('channel_log : start joining pomelo ......');
-    const { userId, roomId, chatUrl, userName, role, institutionId, guid} = args;
-    const _args = { userId, roomId, host: chatUrl, userName, institutionId, guid, role: polemoUtil.translateRole(role) };
-    this.log(`joinRoom: args: ${JSON.stringify(_args)}`);
-    this.initParams = _args;
-    // 定时检查发送消息列表
-    // this.checkSendMsgList();
-    const res = await pomeloClient.joinRoom({
-      ..._args,
-      roomId: util.getConfId(institutionId, roomId)
-    }, dealCb);
-    // 加入房间成功
-    if (res.code === 200) {
-      this.log('joinRoom success');
-      this.isInRoom = true;
-      await this.checkFailedAndCacheMSg();
-      this.checkSendMsgList();
-    } else {
-      this.log('joinRoom failed');
-    }
-    try {
-      dataReport.joinRoomResult({
-        code: res.code === 200 ? '0' : '3',
-        // cloud_api_response: JSON.stringify(window.zby_sdk_cloud_data),
-        cloud_api_response: window.zby_sdk_cloud_data,
-        cloud_api_url: `${getApiCloudBaseUrl()}/rtccloud/class/init`,
-        chat_url: chatUrl
-      });
-    } catch (e) {};
-  },
-  // 离开房间重置所有变量
-  leaveRoom() {
-    this.log('leaveRoom');
-    this.isInRoom = false;
-    this.sendMsgCacheList = {};
-    sendMsgCheckIntervalTimer = null;
-    pomeloClient.disconnect();
-  },
-  async sendChannelMsg(data) {
-    const currTime = new Date().getTime();
-    // 记录缓存列表
-    this.sendMsgIndex++;
-    const { role, userId } = this.initParams;
-    const params = {
-      type: 'streamMessage',
-      online_trace_id: `pc${util.firstUpperCase(role)}${util.uuid()}`,
-      body: JSON.stringify({
-        message: JSON.stringify(data),
-        trace_id: `sdk_1.0_${(currTime).toString().padStart(16, '123456')}`,
-        index: this.sendMsgIndex,
-        save: '0',
-        targetid: data.targetId,
-        mtype: 'stream',
-        uuid: `${userId}_2_${this.sendMsgIndex}_${currTime}`
-      }),
-    };
-    if (this.isInRoom) {
-      // 加入房间成功直接发送消息
-      const res = await this.sendChannelMsgInner(params, data.target || '*');
-      if (res.code !== 200) {
-        this.sendMsgCheckList[params.online_trace_id] = params;
-      }
-    } else {
-      // 为加入房间成功先缓存消息队列
-      this.cacheSendChannelMsg(params, data.target);
-    }
-  },
-  // 缓存消息队列
-  cacheSendChannelMsg(data, target) {
-    const len = Object.keys(this.sendMsgCacheList).length;
-    // 大于100条不再缓存
-    if (len > 100) {
-      return;
-    }
-    this.sendMsgCacheList[data.online_trace_id] = {
-      data,
-      target
-    };
-  },
-  // 发送消息
-  sendChannelMsgInner(data, target = '*') {
-    this.log(`sendChannelMsgInner: data: ${JSON.stringify(data)}, target: ${target}`);
-    try {
-      dataReport.pomeloSendMsg({api:data.body.api,data:{...data,body:JSON.parse(data.body)},target});
-    } catch(e) {
-      console.log('pomeloSendMsg_error',e);
-    }
-    return pomeloClient.sendChannelMessage(data, target);
-  },
-  // 遍历失败和缓存消息
-  async checkFailedAndCacheMSg() {
-    // 遍历失败消息
-    const len = Object.keys(this.sendMsgCheckList).length;
-    if (len > 0) {
-      this.log(`checkSendMsgList-sendMsgCheckList :${JSON.stringify(this.sendMsgCheckList)}`);
-      for(let index in this.sendMsgCheckList) {
-        const msg = this.sendMsgCheckList[index];
-        const res = await this.sendChannelMsgInner(msg.data, msg.target);
-        if (res.code === 200) {
-          delete this.sendMsgCheckList[index];
-        }
-      }
-    }
-    // 遍历缓存消息
-    const len1 = Object.keys(this.sendMsgCacheList).length;
-    if (len1 > 0) {
-      this.log(`checkSendMsgList-sendMsgCacheList :${JSON.stringify(this.sendMsgCacheList)}`);
-      for(let index in this.sendMsgCacheList) {
-        const msg = this.sendMsgCacheList[index];
-        const res = await this.sendChannelMsgInner(msg.data, msg.target);
-        if (res.code === 200) {
-          delete this.sendMsgCacheList[index];
-        }
-      }
-    }
-  },
-
-  // 定时检查缓存队列
-  async checkSendMsgList() {
-    sendMsgCheckIntervalTimer = setInterval(async () => {
-      if (!this.isInRoom) {
-        return false;
-      }
-      this.checkFailedAndCacheMSg();
-    }, sendMsgCheckIntervalTime);
-  },
-  log(msg) {
-    defaultApi.writeLog(msg, 'channel-polemo');
-  }
-};
-
-function dealCb(msg) {
-  try {
-    const body = JSON.parse(msg.body);
-    // 收发消息
-    if (msg.type === 'streamMessage') {
-      const { roomId, userId, userName, institutionId, role } = pomeloObj.initParams;
-      const baseInfo = { roomId, userId, userName, institutionId, role: polemoUtil.translateRole('', role), target: msg.from };
-      const message = {...JSON.parse(body.message), ...body};
-      dealReceiveStreamMsg(message, baseInfo);
-    }
-    // 切换sdk
-    if (msg.type === 'streamsdk') {
-      console.log(`%c接收到信道广播的切换SDK消息,切换到：${body.data}, 当前: ${window.current_sdk_type}`, 'color:blue');
-      defaultApi.writeLog(`%c接收到信道广播的切换SDK消息,切换到：${body.data}, 当前: ${window.current_sdk_type}`);
-      if (window.current_sdk_type !== body.data) {
-        zbysdk.changeSDK();
-      } else {
-        console.log('%c接收到信道广播目标SDK和本地一致，不切换：' + body.data, 'color:blue');
-        defaultApi.writeLog(`%c接收到信道广播目标SDK和本地一致，不切换到：${body.data}`);
-        ENTRY.recordLogToFile('info', 'channel target sdk type is the same as the local sdk ,will not change sdk to :' + body.data);
-      }
-    }
-  } catch (error) {
-
-  }
-}
-
-
-
-
-export default pomeloObj;
+import pomeloClient from './polemo';
+import dealReceiveStreamMsg from '../stream-msg';
+import defaultApi from '../../default/extend';
+import util from '../../util/util';
+import polemoUtil from './util';
+import zbysdk from '../../zby-live-sdk';
+import dataReport from '../../network/dataReport';
+import {getApiCloudBaseUrl} from '../../config/config.js';
+
+let sendMsgCheckIntervalTimer = null;
+let sendMsgCheckIntervalTime = 3000;
+
+const pomeloObj = {
+  isInRoom: false,
+  sendMsgCacheList: {},
+  sendMsgCheckList: {},
+  sendMsgIndex: 0,
+  initParams: null,
+  async joinRoom(args, cb) {
+    if (!args) {
+      return;
+    }
+    this.log('channel_log : start joining pomelo ......');
+    const { userId, roomId, chatUrl, userName, role, institutionId, guid} = args;
+    const _args = { userId, roomId, host: chatUrl, userName, institutionId, guid, role: polemoUtil.translateRole(role) };
+    this.log(`joinRoom: args: ${JSON.stringify(_args)}`);
+    this.initParams = _args;
+    // 定时检查发送消息列表
+    // this.checkSendMsgList();
+    const res = await pomeloClient.joinRoom({
+      ..._args,
+      roomId: util.getConfId(institutionId, roomId)
+    }, dealCb);
+    // 加入房间成功
+    if (res.code === 200) {
+      this.log('joinRoom success');
+      this.isInRoom = true;
+      await this.checkFailedAndCacheMSg();
+      this.checkSendMsgList();
+    } else {
+      this.log('joinRoom failed');
+    }
+    try {
+      dataReport.joinRoomResult({
+        code: res.code === 200 ? '0' : '3',
+        // cloud_api_response: JSON.stringify(window.zby_sdk_cloud_data),
+        cloud_api_response: window.zby_sdk_cloud_data,
+        cloud_api_url: `${getApiCloudBaseUrl()}/rtccloud/class/init`,
+        chat_url: chatUrl
+      });
+    } catch (e) {};
+  },
+  // 离开房间重置所有变量
+  leaveRoom() {
+    this.log('leaveRoom');
+    this.isInRoom = false;
+    this.sendMsgCacheList = {};
+    sendMsgCheckIntervalTimer = null;
+    pomeloClient.disconnect();
+  },
+  async sendChannelMsg(data) {
+    const currTime = new Date().getTime();
+    // 记录缓存列表
+    this.sendMsgIndex++;
+    const { role, userId } = this.initParams;
+    const params = {
+      type: 'streamMessage',
+      online_trace_id: `pc${util.firstUpperCase(role)}${util.uuid()}`,
+      body: JSON.stringify({
+        message: JSON.stringify(data),
+        trace_id: `sdk_1.0_${(currTime).toString().padStart(16, '123456')}`,
+        index: this.sendMsgIndex,
+        save: '0',
+        targetid: data.targetId,
+        mtype: 'stream',
+        uuid: `${userId}_2_${this.sendMsgIndex}_${currTime}`
+      }),
+    };
+    if (this.isInRoom) {
+      // 加入房间成功直接发送消息
+      const res = await this.sendChannelMsgInner(params, data.target || '*');
+      if (res.code !== 200) {
+        this.sendMsgCheckList[params.online_trace_id] = params;
+      }
+    } else {
+      // 为加入房间成功先缓存消息队列
+      this.cacheSendChannelMsg(params, data.target);
+    }
+  },
+  // 缓存消息队列
+  cacheSendChannelMsg(data, target) {
+    const len = Object.keys(this.sendMsgCacheList).length;
+    // 大于100条不再缓存
+    if (len > 100) {
+      return;
+    }
+    this.sendMsgCacheList[data.online_trace_id] = {
+      data,
+      target
+    };
+  },
+  // 发送消息
+  sendChannelMsgInner(data, target = '*') {
+    this.log(`sendChannelMsgInner: data: ${JSON.stringify(data)}, target: ${target}`);
+    try {
+      dataReport.pomeloSendMsg({api:data.body.api,data:{...data,body:JSON.parse(data.body)},target});
+    } catch(e) {
+      console.log('pomeloSendMsg_error',e);
+    }
+    return pomeloClient.sendChannelMessage(data, target);
+  },
+  // 遍历失败和缓存消息
+  async checkFailedAndCacheMSg() {
+    // 遍历失败消息
+    const len = Object.keys(this.sendMsgCheckList).length;
+    if (len > 0) {
+      this.log(`checkSendMsgList-sendMsgCheckList :${JSON.stringify(this.sendMsgCheckList)}`);
+      for(let index in this.sendMsgCheckList) {
+        const msg = this.sendMsgCheckList[index];
+        const res = await this.sendChannelMsgInner(msg.data, msg.target);
+        if (res.code === 200) {
+          delete this.sendMsgCheckList[index];
+        }
+      }
+    }
+    // 遍历缓存消息
+    const len1 = Object.keys(this.sendMsgCacheList).length;
+    if (len1 > 0) {
+      this.log(`checkSendMsgList-sendMsgCacheList :${JSON.stringify(this.sendMsgCacheList)}`);
+      for(let index in this.sendMsgCacheList) {
+        const msg = this.sendMsgCacheList[index];
+        const res = await this.sendChannelMsgInner(msg.data, msg.target);
+        if (res.code === 200) {
+          delete this.sendMsgCacheList[index];
+        }
+      }
+    }
+  },
+
+  // 定时检查缓存队列
+  async checkSendMsgList() {
+    sendMsgCheckIntervalTimer = setInterval(async () => {
+      if (!this.isInRoom) {
+        return false;
+      }
+      this.checkFailedAndCacheMSg();
+    }, sendMsgCheckIntervalTime);
+  },
+  log(msg) {
+    defaultApi.writeLog(msg, 'channel-polemo');
+  }
+};
+
+function dealCb(msg) {
+  try {
+    const body = JSON.parse(msg.body);
+    // 收发消息
+    if (msg.type === 'streamMessage') {
+      const { roomId, userId, userName, institutionId, role } = pomeloObj.initParams;
+      const baseInfo = { roomId, userId, userName, institutionId, role: polemoUtil.translateRole('', role), target: msg.from };
+      const message = {...JSON.parse(body.message), ...body};
+      dealReceiveStreamMsg(message, baseInfo);
+    }
+    // 切换sdk
+    if (msg.type === 'streamsdk') {
+      console.log(`%c接收到信道广播的切换SDK消息,切换到：${body.data}, 当前: ${window.current_sdk_type}`, 'color:blue');
+      defaultApi.writeLog(`%c接收到信道广播的切换SDK消息,切换到：${body.data}, 当前: ${window.current_sdk_type}`);
+      if (window.current_sdk_type !== body.data) {
+        zbysdk.changeSDK();
+      } else {
+        console.log('%c接收到信道广播目标SDK和本地一致，不切换：' + body.data, 'color:blue');
+        defaultApi.writeLog(`%c接收到信道广播目标SDK和本地一致，不切换到：${body.data}`);
+        ENTRY.recordLogToFile('info', 'channel target sdk type is the same as the local sdk ,will not change sdk to :' + body.data);
+      }
+    }
+  } catch (error) {
+
+  }
+}
+
+
+
+
+export default pomeloObj;

package/src/channel/pomelo/latestQueue.js

@@ -1,151 +1,151 @@
-function DoubleLinkList() {
-  function DNode(data) {
-    this.data = data;
-    this.next = null;
-    this.prev = null;
-  }
-
-  this.head = null;
-  this.tail = null;
-  this.length = 0;
-
-  this.insert_head = function (data) {
-    var temp_node = new DNode(data);
-    if (this.head == null) {
-      this.head = temp_node;
-      this.tail = temp_node;
-    } else {
-      temp_node.next = this.head;
-      this.head.prev = temp_node;
-      this.head = temp_node;
-    }
-    this.length += 1;
-
-    return temp_node;
-  };
-
-  this.insert_tail = function (data) {
-    var node = new DNode(data);
-    if (this.tail == null) {
-      this.head = node;
-      this.tail = node;
-    } else {
-      node.prev = this.tail;
-      this.tail.next = node;
-      this.tail = node;
-    }
-    this.length += 1;
-
-    return node;
-  };
-
-  this.delete = function (node) {
-    if (node.prev != null && node.next != null) {
-      node.prev.next = node.next;
-      node.next.prev = node.prev;
-    } else if (node.prev != null) {
-      this.tail = node.prev;
-      this.tail.next = null;
-
-    } else if (node.next != null) {
-      this.head = node.next;
-      this.head.prev = null;
-    } else {
-      this.head = null;
-      this.tail = null;
-    }
-
-    this.length -= 1;
-  };
-
-  this.touch = function (node) {
-    if (node.prev != null && node.next != null) {
-      node.prev.next = node.next;
-      node.next.prev = node.prev;
-    } else if (node.prev != null) {
-      this.tail = node.prev;
-      this.tail.next = null;
-    } else if (node.next != null) {
-      this.head = node.next;
-      this.head.prev = null;
-    } else {
-      this.head = null;
-      this.tail = null;
-    }
-
-
-    node.prev = null;
-    node.next = null;
-    if (this.tail == null) {
-      this.head = node;
-      this.tail = node;
-    } else {
-      node.prev = this.tail;
-      this.tail.next = node;
-      this.tail = node;
-    }
-  };
-
-  this.getLength = function () {
-    return this.length;
-  };
-
-  this.getHead = function () {
-    return this.head;
-  };
-
-  this.getTail = function () {
-    return this.tail;
-  };
-}
-
-export default function LatestQueue() {
-  this.latestDList = new DoubleLinkList();
-  this.latestDict = {};
-
-  function LatestNode(msgId, timestamp) {
-    this.msgId = msgId;
-    this.timestamp = timestamp;
-  }
-
-  this.insert = function (msgId, timestamp) {
-    if (this.latestDict[msgId]) {
-      return;
-    }
-
-    const latestNode = new LatestNode(msgId, timestamp);
-
-    this.latestDList.insert_tail(latestNode);
-    this.latestDict[msgId] = latestNode;
-  };
-
-  this.isRepeat = function (msgId) {
-    return !!this.latestDict[msgId];
-  };
-
-  this.delete = function (latestInterval, maxDeleteNum) {
-    let tempDNode = this.latestDList.getHead();
-    let currentDeleteNum = 0;
-    let currentTimeStamp = Date.now();
-    while (tempDNode != null) {
-      if (currentTimeStamp - tempDNode.data.timestamp >= latestInterval) {
-        delete this.latestDict[tempDNode.data.msgId];
-        // console.log('我进来了，delete')
-        this.latestDList.delete(tempDNode);
-        currentDeleteNum += 1;
-      }
-
-      if (currentDeleteNum >= maxDeleteNum) {
-        break;
-      }
-
-      tempDNode = tempDNode.next;
-    }
-
-    return currentDeleteNum;
-  };
-
-  this.getLength = function () {
-    return this.latestDList.getLength();
-  };
-}
+function DoubleLinkList() {
+  function DNode(data) {
+    this.data = data;
+    this.next = null;
+    this.prev = null;
+  }
+
+  this.head = null;
+  this.tail = null;
+  this.length = 0;
+
+  this.insert_head = function (data) {
+    var temp_node = new DNode(data);
+    if (this.head == null) {
+      this.head = temp_node;
+      this.tail = temp_node;
+    } else {
+      temp_node.next = this.head;
+      this.head.prev = temp_node;
+      this.head = temp_node;
+    }
+    this.length += 1;
+
+    return temp_node;
+  };
+
+  this.insert_tail = function (data) {
+    var node = new DNode(data);
+    if (this.tail == null) {
+      this.head = node;
+      this.tail = node;
+    } else {
+      node.prev = this.tail;
+      this.tail.next = node;
+      this.tail = node;
+    }
+    this.length += 1;
+
+    return node;
+  };
+
+  this.delete = function (node) {
+    if (node.prev != null && node.next != null) {
+      node.prev.next = node.next;
+      node.next.prev = node.prev;
+    } else if (node.prev != null) {
+      this.tail = node.prev;
+      this.tail.next = null;
+
+    } else if (node.next != null) {
+      this.head = node.next;
+      this.head.prev = null;
+    } else {
+      this.head = null;
+      this.tail = null;
+    }
+
+    this.length -= 1;
+  };
+
+  this.touch = function (node) {
+    if (node.prev != null && node.next != null) {
+      node.prev.next = node.next;
+      node.next.prev = node.prev;
+    } else if (node.prev != null) {
+      this.tail = node.prev;
+      this.tail.next = null;
+    } else if (node.next != null) {
+      this.head = node.next;
+      this.head.prev = null;
+    } else {
+      this.head = null;
+      this.tail = null;
+    }
+
+
+    node.prev = null;
+    node.next = null;
+    if (this.tail == null) {
+      this.head = node;
+      this.tail = node;
+    } else {
+      node.prev = this.tail;
+      this.tail.next = node;
+      this.tail = node;
+    }
+  };
+
+  this.getLength = function () {
+    return this.length;
+  };
+
+  this.getHead = function () {
+    return this.head;
+  };
+
+  this.getTail = function () {
+    return this.tail;
+  };
+}
+
+export default function LatestQueue() {
+  this.latestDList = new DoubleLinkList();
+  this.latestDict = {};
+
+  function LatestNode(msgId, timestamp) {
+    this.msgId = msgId;
+    this.timestamp = timestamp;
+  }
+
+  this.insert = function (msgId, timestamp) {
+    if (this.latestDict[msgId]) {
+      return;
+    }
+
+    const latestNode = new LatestNode(msgId, timestamp);
+
+    this.latestDList.insert_tail(latestNode);
+    this.latestDict[msgId] = latestNode;
+  };
+
+  this.isRepeat = function (msgId) {
+    return !!this.latestDict[msgId];
+  };
+
+  this.delete = function (latestInterval, maxDeleteNum) {
+    let tempDNode = this.latestDList.getHead();
+    let currentDeleteNum = 0;
+    let currentTimeStamp = Date.now();
+    while (tempDNode != null) {
+      if (currentTimeStamp - tempDNode.data.timestamp >= latestInterval) {
+        delete this.latestDict[tempDNode.data.msgId];
+        // console.log('我进来了，delete')
+        this.latestDList.delete(tempDNode);
+        currentDeleteNum += 1;
+      }
+
+      if (currentDeleteNum >= maxDeleteNum) {
+        break;
+      }
+
+      tempDNode = tempDNode.next;
+    }
+
+    return currentDeleteNum;
+  };
+
+  this.getLength = function () {
+    return this.latestDList.getLength();
+  };
+}