npm - @rongcloud/plugin-rtc - Versions diffs - 5.2.4-beem.2 → 5.2.4-beem.5 - Mend

@rongcloud/plugin-rtc 5.2.4-beem.2 → 5.2.4-beem.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.2
- * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
- * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, LogLevel, RTCMode, IRuntime, RTCPluginContext, IServerRTCRoomEntry, IJoinRTCRoomData, IReceivedMessage, KVString, RTCJoinType, IRTCJoinedInfo, IPluginGenerator } from '@rongcloud/engine';

package/dist/index.esm.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.2
- * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
- * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { Logger, EventEmitter, isNumber, ErrorCode, ConnectionStatus, assert, ConversationType, RTCApiType, validate, isArray, RTCMode, isHttpUrl, isBoolean, HttpMethod, isString, notEmptyString, RTCJoinType, RTCIdentityChangeType, VersionManage } from '@rongcloud/engine';
@@ -137,6 +137,7 @@ class AsyncTaskQueue {
             }
             this.locked = true;
             const { resolve, task, reject } = this.queue.shift();
+            logger.info(`async task queue waiting length -> ${this.queue.length}`);
             let result;
             try {
                 result = yield task();
@@ -152,7 +153,8 @@ class AsyncTaskQueue {
     }
     push(task) {
         const promise = new Promise((resolve, reject) => {
-            this.queue.push({ resolve, task, reject });
+            const length = this.queue.push({ resolve, task, reject });
+            logger.info(`async task queue length -> ${length}`);
         });
         this.checkToStart();
         return promise;
@@ -5619,6 +5621,7 @@ var RCMediaType;
     RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
 })(RCMediaType || (RCMediaType = {}));
+// export const RongRTCVideoBitrate: { [key: RCResolution]: BitrateConf } = {
 const RongRTCVideoBitrate = {
     [RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
     [RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -5635,23 +5638,26 @@ const RongRTCVideoBitrate = {
     [RCResolution.W1920_H1080]: { width: 1920, height: 1080, maxBitrate: 4000, minBitrate: 400 }
 };
 /**
-* 取最接近的视频分辨率配置
+* 向上取最接近的视频分辨率配置
 * @param {number} width
 * @param {number} height
 */
 const getNearestResolution = (width, height) => {
-    const area = width * height;
-    let d = Number.MAX_VALUE;
-    let conf = null;
-    for (const key in RongRTCVideoBitrate) {
-        const item = RongRTCVideoBitrate[key];
-        const d2 = Math.abs(item.width * item.height - area);
-        if (d2 < d) {
-            conf = item;
-            d = d2;
-        }
+    // 优先精准匹配
+    const conf = RongRTCVideoBitrate[`W${width}_H${height}`];
+    if (conf) {
+        return conf;
     }
-    return conf;
+    // 不规则分辨率计算最接近的配置
+    const area = width * height;
+    const confs = Object.keys(RongRTCVideoBitrate)
+        .map(key => RongRTCVideoBitrate[key])
+        // 升序
+        .sort((item, item2) => item.height * item.width - item2.width * item2.height)
+        // 过滤分辨率小于 area 的配置，避免分配带宽不足
+        .filter(item => item.height * item.width >= area);
+    // 若 confs 长度为 0 说明分辨率远大于可支持的分辨率配置，取最大配置
+    return confs[0] || RongRTCVideoBitrate.W1920_H1080;
 };
 const Multiplier = {
     10: 1,
@@ -6217,13 +6223,18 @@ const getValue = (value) => {
  * @param track
  */
 const getVideoTrackInfo = (track) => {
+    const settings = track.getSettings();
     const constraints = track.getConstraints();
     // firefox 平台不存在 getCapabilities 方法
     // const capabilities = track.getCapabilities()
     // const width = getValue(constraints.width) || getValue(capabilities.width)
     // const height = getValue(constraints.height) || getValue(capabilities.height)
     // const frameRate = getValue(constraints.frameRate) || getValue(capabilities.frameRate)
-    return { width: getValue(constraints.width), height: getValue(constraints.height), frameRate: getValue(constraints.frameRate) };
+    return {
+        width: settings.width || getValue(constraints.width),
+        height: settings.height || getValue(constraints.height),
+        frameRate: settings.frameRate || getValue(constraints.frameRate)
+    };
 };
 /**
  * 取视频流动态码率
@@ -6232,8 +6243,8 @@ const getVideoTrackInfo = (track) => {
  */
 const getDynamicBitrate = (track) => {
     const { width, height, frameRate } = getVideoTrackInfo(track);
-    // 计算动态码率以备给 answer 使用
-    const config = getNearestResolution(width, height);
+    // 计算动态码率，若 videoTrack 的分辨率读取失败，则以 640 * 480 的默认分辨率计算码率
+    const config = getNearestResolution(width || 640, height || 480);
     const multiple = getBitrateMultiple(frameRate);
     return { min: config.minBitrate * multiple, max: config.maxBitrate * multiple };
 };
@@ -7656,6 +7667,7 @@ class ASdpStrategy {
         return __awaiter(this, void 0, void 0, function* () {
             // 过滤行末的空格，服务可能产生空格数据
             sdp = sdp.replace(/\s+\r\n/g, '\r\n');
+            logger.info(`set remote answer -> ${sdp}`);
             try {
                 yield this._peer.setRemoteDescription({ type: 'answer', sdp });
             }
@@ -8064,14 +8076,12 @@ class RCRTCPeerConnection extends EventEmitter {
     createOffer(iceRestart) {
         return __awaiter(this, void 0, void 0, function* () {
             const offer = yield this._sdpStrategy.createOffer(iceRestart);
-            // logger.debug(`sdpDemantics -> ${offer.semantics}`)
-            logger.debug(`offer -> ${JSON.stringify(offer.sdp)}`);
+            logger.info(`create offer -> ${JSON.stringify(offer.sdp)}`);
             return offer;
         });
     }
     setRemoteAnswer(answer) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.debug(`answer -> ${JSON.stringify(answer)}`);
             return this._sdpStrategy.setRemoteAnswer(answer);
         });
     }
@@ -8446,7 +8456,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.2";
+        const rtcVersion = "5.2.4-beem.5";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8610,7 +8620,7 @@ class RCAbstractRoom {
         this._initRemoteTracks();
         const crtUserId = this._context.getCurrentId();
         const selfRes = this._roomResources[crtUserId] = this._roomResources[crtUserId] || [];
-        logger.debug(`room data -> ${JSON.stringify(this._roomResources)}`);
+        logger.info(`room data -> ${JSON.stringify(this._roomResources)}`);
         /*
          * 加入房间后，若房间中已存在己方发布的资源，表示之前未能完成正常退出流程
          * 需先清除房间内的己方资源，通知房间内其他人己方已取消当前资源的发布
@@ -8688,6 +8698,7 @@ class RCAbstractRoom {
     }
     _callAppListener(eventType, ...attrs) {
         var _a;
+        eventType !== 'onPing' && logger.info(`${eventType} callback ->`, ...attrs);
         const handle = (_a = this._appListener) === null || _a === void 0 ? void 0 : _a[eventType];
         if (!handle) {
             return;
@@ -8725,7 +8736,7 @@ class RCAbstractRoom {
                 logger.error(`unpublish prev uris failed -> code: ${code}`);
             }
             else {
-                logger.debug('unpublish uris prev login succeed');
+                logger.info('unpublish uris prev login succeed');
             }
         });
     }
@@ -8776,7 +8787,7 @@ class RCAbstractRoom {
         if (this._destroyed) {
             return;
         }
-        logger.warn(`onKickOff -> byServer: ${byServer}`);
+        // logger.warn(`onKickOff -> byServer: ${byServer}`)
         this._ntfClearRoomItem();
         this._leaveHandle(!byServer);
         // 扩展字段，备注用户为什么被踢出房间
@@ -8872,7 +8883,7 @@ class RCAbstractRoom {
                 // 重新订阅二次发布资源
                 if (subedTracks.length) {
                     const trackIds = subedTracks.map(item => item.getTrackId());
-                    logger.debug(`resub tracks -> ${JSON.stringify(trackIds)}`);
+                    logger.info(`resub tracks -> ${JSON.stringify(trackIds)}`);
                     const { code } = yield push(() => this.__subscribe(subedTracks, true));
                     if (code !== RCRTCCode.SUCCESS) {
                         logger.error(`resub tracks failed -> code: ${code}, ids: ${JSON.stringify(trackIds)}`);
@@ -8941,7 +8952,7 @@ class RCAbstractRoom {
             const downgrade = [];
             users.forEach(item => {
                 if (+item.state === 0) {
-                    logger.debug(`user joined -> ${item.userId}`);
+                    logger.info(`user joined -> ${item.userId}`);
                     // 对端 im 重连之后调加入房间信令获取最新数据，服务会给本端下发“对端加入房间”的消息，本端内存已包含对端人员，所以需过滤掉
                     if (!this._roomResources[item.userId]) {
                         item.switchRoleType ? upgrade.push(item.userId) : joined.push(item.userId);
@@ -8949,7 +8960,7 @@ class RCAbstractRoom {
                     this._roomResources[item.userId] = this._roomResources[item.userId] || [];
                 }
                 else {
-                    logger.debug(`user left -> ${item.userId}`);
+                    logger.info(`user left -> ${item.userId}`);
                     item.switchRoleType ? downgrade.push(item.userId) : left.push(item.userId);
                 }
             });
@@ -9244,7 +9255,7 @@ class RCAbstractRoom {
     _removePubFailedTracks(tracks) {
         tracks.forEach(item => {
             const track = item instanceof RCLocalTrack ? item : item.track;
-            logger.debug(`remove pub failed track from peerconnection -> trackId: ${track.getTrackId()}`);
+            logger.info(`remove pub failed track from peerconnection -> trackId: ${track.getTrackId()}`);
             this._pc.removeLocalTrackById(track.getTrackId());
         });
     }
@@ -9277,7 +9288,7 @@ class RCAbstractRoom {
                 logger.error(`publish failed, tracks limit exceeded -> roomId: ${this._roomId}`);
                 return { code: RCRTCCode.PUBLISH_TRACK_LIMIT_EXCEEDED };
             }
-            logger.debug(`publish tracks -> roomId: ${this._roomId}, tracks: ${tracks.map(getTrackIdFromAttr)}`);
+            logger.info(`publish tracks -> roomId: ${this._roomId}, tracks: ${tracks.map(getTrackIdFromAttr)}`);
             /*
              * 资源发布应先与 mediaserver 交换资源，建 PeerConnection 通道，后通知房间
              * 资源取消发布则应先通知取消发布，后与 mediaServer 协商取消资源发布
@@ -9358,7 +9369,7 @@ class RCAbstractRoom {
                 const { track: localTrack } = item instanceof RCLocalTrack ? { track: item } : item;
                 localTrack.__innerSetPublished(true);
             });
-            logger.debug(`publish success: ${publishTrackIds.join(',')}`);
+            logger.info(`publish success -> ${publishTrackIds.join(',')}`);
             if (this._roomMode === RTCMode.LIVE) {
                 return { code: RCRTCCode.SUCCESS, liveUrl: urls === null || urls === void 0 ? void 0 : urls.liveUrl };
             }
@@ -9504,7 +9515,7 @@ class RCAbstractRoom {
                 logger.error('send unpublish notification failed:', singalCode);
                 return { code: RCRTCCode.SIGNAL_ERROR };
             }
-            logger.debug(`unpublish success -> tracks: ${resourceIds.join(',')}`);
+            logger.info(`unpublish success -> tracks: ${resourceIds.join(',')}`);
             const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
             if (resCode !== RCRTCCode.SUCCESS) {
                 return { code: resCode };
@@ -9729,7 +9740,7 @@ class RCAbstractRoom {
                 logger.error(`change subscribe list failed: ${resultCode}`);
                 return { code: resultCode };
             }
-            logger.debug(`subscribe success: ${subTrackIds.join(',')}`);
+            logger.info(`subscribe success: ${subTrackIds.join(',')}`);
             const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
             if (resCode !== RCRTCCode.SUCCESS) {
                 return { code: resCode };
@@ -9791,10 +9802,10 @@ class RCAbstractRoom {
             }
             const { code, data } = yield this._context.joinRTCRoom(this._roomId, this._roomMode, livingType);
             if (code !== ErrorCode.SUCCESS) {
-                logger.error(`RTC __onReconnected getRTCRoomInfo failed: ${code}`);
+                logger.warn(`RTC __onReconnected getRTCRoomInfo failed: ${code}`);
                 return;
             }
-            logger.debug(`RTC __onReconnected getRTCRoomInfo success: ${JSON.stringify(data)}`);
+            logger.info(`RTC __onReconnected getRTCRoomInfo success: ${JSON.stringify(data)}`);
             // 查找新加入人员
             const joinedUserIds = [];
             // 新发布资源
@@ -10703,7 +10714,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.2.4-beem.2",
+    ClientVersion: "5.2.4-beem.5",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -10778,7 +10789,7 @@ class RCMediaService {
             for (let i = 0; i < urls.length; i += 1) {
                 const url = `${urls[i]}${path}`;
                 const commonHeader = getCommonHeader();
-                logger.debug(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
+                logger.info(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
                 const { status, data } = yield this._runtime.httpReq({
                     url,
                     body: JSON.stringify(body),
@@ -10794,11 +10805,11 @@ class RCMediaService {
                     if (resp.clusterId) {
                         this._clusterId = resp.clusterId;
                     }
-                    logger.debug(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
+                    logger.info(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
                     return { code: RCRTCCode.SUCCESS, data: resp };
                 }
                 else {
-                    logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}, status: ${status}, url: ${url}`);
+                    logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}, status: ${status}`);
                     // 失败的请求需记录，避免多配置时总是请求无效的地址
                     this._failedMs.push(...this._msInNavi.splice(i, 1));
                 }
@@ -10861,7 +10872,7 @@ class RCMediaService {
             // mcu 地址默认使用 https 协议
             const url = `${this._configUrl.replace(/^(https?:\/\/)?/, 'https://')}/server/mcu/config`;
             const commonHeader = getCommonHeader();
-            logger.debug(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
+            logger.info(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
             const { status, data: jsonStr } = yield this._runtime.httpReq({
                 url,
                 headers: Object.assign(Object.assign({}, commonHeader), headers),
@@ -10869,10 +10880,11 @@ class RCMediaService {
                 method: HttpMethod.POST
             });
             if (status === 200) {
-                logger.debug(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
+                logger.info(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
                 const data = JSON.parse(jsonStr);
                 return { code: data.resultCode, res: data };
             }
+            logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}`);
             return { code: RCRTCCode.REQUEST_FAILED };
         });
     }
@@ -12731,7 +12743,7 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        VersionManage.add('plugin-rtc', "5.2.4-beem.2");
+        VersionManage.add('plugin-rtc', "5.2.4-beem.5");
         if (!VersionManage.validEngine("4.6.0-beem.5")) {
             logger.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
             return false;
@@ -12741,7 +12753,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.2"}, Commit: ${"51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.5"}, Commit: ${"13f398c4a680ab6054d831b2e76e51f68a677de9"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/dist/index.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.2
- * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
- * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -140,6 +140,7 @@ class AsyncTaskQueue {
             }
             this.locked = true;
             const { resolve, task, reject } = this.queue.shift();
+            logger.info(`async task queue waiting length -> ${this.queue.length}`);
             let result;
             try {
                 result = yield task();
@@ -155,7 +156,8 @@ class AsyncTaskQueue {
     }
     push(task) {
         const promise = new Promise((resolve, reject) => {
-            this.queue.push({ resolve, task, reject });
+            const length = this.queue.push({ resolve, task, reject });
+            logger.info(`async task queue length -> ${length}`);
         });
         this.checkToStart();
         return promise;
@@ -5622,6 +5624,7 @@ exports.RCMediaType = void 0;
     RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
 })(exports.RCMediaType || (exports.RCMediaType = {}));
+// export const RongRTCVideoBitrate: { [key: RCResolution]: BitrateConf } = {
 const RongRTCVideoBitrate = {
     [exports.RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
     [exports.RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -5638,23 +5641,26 @@ const RongRTCVideoBitrate = {
     [exports.RCResolution.W1920_H1080]: { width: 1920, height: 1080, maxBitrate: 4000, minBitrate: 400 }
 };
 /**
-* 取最接近的视频分辨率配置
+* 向上取最接近的视频分辨率配置
 * @param {number} width
 * @param {number} height
 */
 const getNearestResolution = (width, height) => {
-    const area = width * height;
-    let d = Number.MAX_VALUE;
-    let conf = null;
-    for (const key in RongRTCVideoBitrate) {
-        const item = RongRTCVideoBitrate[key];
-        const d2 = Math.abs(item.width * item.height - area);
-        if (d2 < d) {
-            conf = item;
-            d = d2;
-        }
+    // 优先精准匹配
+    const conf = RongRTCVideoBitrate[`W${width}_H${height}`];
+    if (conf) {
+        return conf;
     }
-    return conf;
+    // 不规则分辨率计算最接近的配置
+    const area = width * height;
+    const confs = Object.keys(RongRTCVideoBitrate)
+        .map(key => RongRTCVideoBitrate[key])
+        // 升序
+        .sort((item, item2) => item.height * item.width - item2.width * item2.height)
+        // 过滤分辨率小于 area 的配置，避免分配带宽不足
+        .filter(item => item.height * item.width >= area);
+    // 若 confs 长度为 0 说明分辨率远大于可支持的分辨率配置，取最大配置
+    return confs[0] || RongRTCVideoBitrate.W1920_H1080;
 };
 const Multiplier = {
     10: 1,
@@ -6220,13 +6226,18 @@ const getValue = (value) => {
  * @param track
  */
 const getVideoTrackInfo = (track) => {
+    const settings = track.getSettings();
     const constraints = track.getConstraints();
     // firefox 平台不存在 getCapabilities 方法
     // const capabilities = track.getCapabilities()
     // const width = getValue(constraints.width) || getValue(capabilities.width)
     // const height = getValue(constraints.height) || getValue(capabilities.height)
     // const frameRate = getValue(constraints.frameRate) || getValue(capabilities.frameRate)
-    return { width: getValue(constraints.width), height: getValue(constraints.height), frameRate: getValue(constraints.frameRate) };
+    return {
+        width: settings.width || getValue(constraints.width),
+        height: settings.height || getValue(constraints.height),
+        frameRate: settings.frameRate || getValue(constraints.frameRate)
+    };
 };
 /**
  * 取视频流动态码率
@@ -6235,8 +6246,8 @@ const getVideoTrackInfo = (track) => {
  */
 const getDynamicBitrate = (track) => {
     const { width, height, frameRate } = getVideoTrackInfo(track);
-    // 计算动态码率以备给 answer 使用
-    const config = getNearestResolution(width, height);
+    // 计算动态码率，若 videoTrack 的分辨率读取失败，则以 640 * 480 的默认分辨率计算码率
+    const config = getNearestResolution(width || 640, height || 480);
     const multiple = getBitrateMultiple(frameRate);
     return { min: config.minBitrate * multiple, max: config.maxBitrate * multiple };
 };
@@ -7659,6 +7670,7 @@ class ASdpStrategy {
         return __awaiter(this, void 0, void 0, function* () {
             // 过滤行末的空格，服务可能产生空格数据
             sdp = sdp.replace(/\s+\r\n/g, '\r\n');
+            logger.info(`set remote answer -> ${sdp}`);
             try {
                 yield this._peer.setRemoteDescription({ type: 'answer', sdp });
             }
@@ -8067,14 +8079,12 @@ class RCRTCPeerConnection extends engine.EventEmitter {
     createOffer(iceRestart) {
         return __awaiter(this, void 0, void 0, function* () {
             const offer = yield this._sdpStrategy.createOffer(iceRestart);
-            // logger.debug(`sdpDemantics -> ${offer.semantics}`)
-            logger.debug(`offer -> ${JSON.stringify(offer.sdp)}`);
+            logger.info(`create offer -> ${JSON.stringify(offer.sdp)}`);
             return offer;
         });
     }
     setRemoteAnswer(answer) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.debug(`answer -> ${JSON.stringify(answer)}`);
             return this._sdpStrategy.setRemoteAnswer(answer);
         });
     }
@@ -8449,7 +8459,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.2.4-beem.2";
+        const rtcVersion = "5.2.4-beem.5";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -8613,7 +8623,7 @@ class RCAbstractRoom {
         this._initRemoteTracks();
         const crtUserId = this._context.getCurrentId();
         const selfRes = this._roomResources[crtUserId] = this._roomResources[crtUserId] || [];
-        logger.debug(`room data -> ${JSON.stringify(this._roomResources)}`);
+        logger.info(`room data -> ${JSON.stringify(this._roomResources)}`);
         /*
          * 加入房间后，若房间中已存在己方发布的资源，表示之前未能完成正常退出流程
          * 需先清除房间内的己方资源，通知房间内其他人己方已取消当前资源的发布
@@ -8691,6 +8701,7 @@ class RCAbstractRoom {
     }
     _callAppListener(eventType, ...attrs) {
         var _a;
+        eventType !== 'onPing' && logger.info(`${eventType} callback ->`, ...attrs);
         const handle = (_a = this._appListener) === null || _a === void 0 ? void 0 : _a[eventType];
         if (!handle) {
             return;
@@ -8728,7 +8739,7 @@ class RCAbstractRoom {
                 logger.error(`unpublish prev uris failed -> code: ${code}`);
             }
             else {
-                logger.debug('unpublish uris prev login succeed');
+                logger.info('unpublish uris prev login succeed');
             }
         });
     }
@@ -8779,7 +8790,7 @@ class RCAbstractRoom {
         if (this._destroyed) {
             return;
         }
-        logger.warn(`onKickOff -> byServer: ${byServer}`);
+        // logger.warn(`onKickOff -> byServer: ${byServer}`)
         this._ntfClearRoomItem();
         this._leaveHandle(!byServer);
         // 扩展字段，备注用户为什么被踢出房间
@@ -8875,7 +8886,7 @@ class RCAbstractRoom {
                 // 重新订阅二次发布资源
                 if (subedTracks.length) {
                     const trackIds = subedTracks.map(item => item.getTrackId());
-                    logger.debug(`resub tracks -> ${JSON.stringify(trackIds)}`);
+                    logger.info(`resub tracks -> ${JSON.stringify(trackIds)}`);
                     const { code } = yield push(() => this.__subscribe(subedTracks, true));
                     if (code !== exports.RCRTCCode.SUCCESS) {
                         logger.error(`resub tracks failed -> code: ${code}, ids: ${JSON.stringify(trackIds)}`);
@@ -8944,7 +8955,7 @@ class RCAbstractRoom {
             const downgrade = [];
             users.forEach(item => {
                 if (+item.state === 0) {
-                    logger.debug(`user joined -> ${item.userId}`);
+                    logger.info(`user joined -> ${item.userId}`);
                     // 对端 im 重连之后调加入房间信令获取最新数据，服务会给本端下发“对端加入房间”的消息，本端内存已包含对端人员，所以需过滤掉
                     if (!this._roomResources[item.userId]) {
                         item.switchRoleType ? upgrade.push(item.userId) : joined.push(item.userId);
@@ -8952,7 +8963,7 @@ class RCAbstractRoom {
                     this._roomResources[item.userId] = this._roomResources[item.userId] || [];
                 }
                 else {
-                    logger.debug(`user left -> ${item.userId}`);
+                    logger.info(`user left -> ${item.userId}`);
                     item.switchRoleType ? downgrade.push(item.userId) : left.push(item.userId);
                 }
             });
@@ -9247,7 +9258,7 @@ class RCAbstractRoom {
     _removePubFailedTracks(tracks) {
         tracks.forEach(item => {
             const track = item instanceof RCLocalTrack ? item : item.track;
-            logger.debug(`remove pub failed track from peerconnection -> trackId: ${track.getTrackId()}`);
+            logger.info(`remove pub failed track from peerconnection -> trackId: ${track.getTrackId()}`);
             this._pc.removeLocalTrackById(track.getTrackId());
         });
     }
@@ -9280,7 +9291,7 @@ class RCAbstractRoom {
                 logger.error(`publish failed, tracks limit exceeded -> roomId: ${this._roomId}`);
                 return { code: exports.RCRTCCode.PUBLISH_TRACK_LIMIT_EXCEEDED };
             }
-            logger.debug(`publish tracks -> roomId: ${this._roomId}, tracks: ${tracks.map(getTrackIdFromAttr)}`);
+            logger.info(`publish tracks -> roomId: ${this._roomId}, tracks: ${tracks.map(getTrackIdFromAttr)}`);
             /*
              * 资源发布应先与 mediaserver 交换资源，建 PeerConnection 通道，后通知房间
              * 资源取消发布则应先通知取消发布，后与 mediaServer 协商取消资源发布
@@ -9361,7 +9372,7 @@ class RCAbstractRoom {
                 const { track: localTrack } = item instanceof RCLocalTrack ? { track: item } : item;
                 localTrack.__innerSetPublished(true);
             });
-            logger.debug(`publish success: ${publishTrackIds.join(',')}`);
+            logger.info(`publish success -> ${publishTrackIds.join(',')}`);
             if (this._roomMode === engine.RTCMode.LIVE) {
                 return { code: exports.RCRTCCode.SUCCESS, liveUrl: urls === null || urls === void 0 ? void 0 : urls.liveUrl };
             }
@@ -9507,7 +9518,7 @@ class RCAbstractRoom {
                 logger.error('send unpublish notification failed:', singalCode);
                 return { code: exports.RCRTCCode.SIGNAL_ERROR };
             }
-            logger.debug(`unpublish success -> tracks: ${resourceIds.join(',')}`);
+            logger.info(`unpublish success -> tracks: ${resourceIds.join(',')}`);
             const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
             if (resCode !== exports.RCRTCCode.SUCCESS) {
                 return { code: resCode };
@@ -9732,7 +9743,7 @@ class RCAbstractRoom {
                 logger.error(`change subscribe list failed: ${resultCode}`);
                 return { code: resultCode };
             }
-            logger.debug(`subscribe success: ${subTrackIds.join(',')}`);
+            logger.info(`subscribe success: ${subTrackIds.join(',')}`);
             const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
             if (resCode !== exports.RCRTCCode.SUCCESS) {
                 return { code: resCode };
@@ -9794,10 +9805,10 @@ class RCAbstractRoom {
             }
             const { code, data } = yield this._context.joinRTCRoom(this._roomId, this._roomMode, livingType);
             if (code !== engine.ErrorCode.SUCCESS) {
-                logger.error(`RTC __onReconnected getRTCRoomInfo failed: ${code}`);
+                logger.warn(`RTC __onReconnected getRTCRoomInfo failed: ${code}`);
                 return;
             }
-            logger.debug(`RTC __onReconnected getRTCRoomInfo success: ${JSON.stringify(data)}`);
+            logger.info(`RTC __onReconnected getRTCRoomInfo success: ${JSON.stringify(data)}`);
             // 查找新加入人员
             const joinedUserIds = [];
             // 新发布资源
@@ -10706,7 +10717,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.2.4-beem.2",
+    ClientVersion: "5.2.4-beem.5",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString()
 });
@@ -10781,7 +10792,7 @@ class RCMediaService {
             for (let i = 0; i < urls.length; i += 1) {
                 const url = `${urls[i]}${path}`;
                 const commonHeader = getCommonHeader();
-                logger.debug(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
+                logger.info(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
                 const { status, data } = yield this._runtime.httpReq({
                     url,
                     body: JSON.stringify(body),
@@ -10797,11 +10808,11 @@ class RCMediaService {
                     if (resp.clusterId) {
                         this._clusterId = resp.clusterId;
                     }
-                    logger.debug(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
+                    logger.info(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
                     return { code: exports.RCRTCCode.SUCCESS, data: resp };
                 }
                 else {
-                    logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}, status: ${status}, url: ${url}`);
+                    logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}, status: ${status}`);
                     // 失败的请求需记录，避免多配置时总是请求无效的地址
                     this._failedMs.push(...this._msInNavi.splice(i, 1));
                 }
@@ -10864,7 +10875,7 @@ class RCMediaService {
             // mcu 地址默认使用 https 协议
             const url = `${this._configUrl.replace(/^(https?:\/\/)?/, 'https://')}/server/mcu/config`;
             const commonHeader = getCommonHeader();
-            logger.debug(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
+            logger.info(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
             const { status, data: jsonStr } = yield this._runtime.httpReq({
                 url,
                 headers: Object.assign(Object.assign({}, commonHeader), headers),
@@ -10872,10 +10883,11 @@ class RCMediaService {
                 method: engine.HttpMethod.POST
             });
             if (status === 200) {
-                logger.debug(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
+                logger.info(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
                 const data = JSON.parse(jsonStr);
                 return { code: data.resultCode, res: data };
             }
+            logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}`);
             return { code: exports.RCRTCCode.REQUEST_FAILED };
         });
     }
@@ -12734,7 +12746,7 @@ const installer = {
             logger.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        engine.VersionManage.add('plugin-rtc', "5.2.4-beem.2");
+        engine.VersionManage.add('plugin-rtc', "5.2.4-beem.5");
         if (!engine.VersionManage.validEngine("4.6.0-beem.5")) {
             logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
             return false;
@@ -12744,7 +12756,7 @@ const installer = {
     setup(context, runtime, options = {}) {
         logger.setLogLevel(options.logLevel);
         logger.setLogStdout(options.logStdout);
-        logger.warn(`RCRTC Version: ${"5.2.4-beem.2"}, Commit: ${"51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"}`);
+        logger.warn(`RCRTC Version: ${"5.2.4-beem.5"}, Commit: ${"13f398c4a680ab6054d831b2e76e51f68a677de9"}`);
         logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
         logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
         logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/dist/index.umd.js CHANGED Viewed

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.2.4-beem.2
- * CommitId - 51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c
- * Mon May 16 2022 17:37:30 GMT+0800 (China Standard Time)
+ * RCRTC - v5.2.4-beem.5
+ * CommitId - 13f398c4a680ab6054d831b2e76e51f68a677de9
+ * Mon May 23 2022 11:07:54 GMT+0800 (China Standard Time)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -140,6 +140,7 @@
                 }
                 this.locked = true;
                 const { resolve, task, reject } = this.queue.shift();
+                logger.info(`async task queue waiting length -> ${this.queue.length}`);
                 let result;
                 try {
                     result = yield task();
@@ -155,7 +156,8 @@
         }
         push(task) {
             const promise = new Promise((resolve, reject) => {
-                this.queue.push({ resolve, task, reject });
+                const length = this.queue.push({ resolve, task, reject });
+                logger.info(`async task queue length -> ${length}`);
             });
             this.checkToStart();
             return promise;
@@ -5622,6 +5624,7 @@
         RCMediaType[RCMediaType["AUDIO_VIDEO"] = 2] = "AUDIO_VIDEO";
     })(exports.RCMediaType || (exports.RCMediaType = {}));
+    // export const RongRTCVideoBitrate: { [key: RCResolution]: BitrateConf } = {
     const RongRTCVideoBitrate = {
         [exports.RCResolution.W176_H132]: { width: 176, height: 132, maxBitrate: 150, minBitrate: 80 },
         [exports.RCResolution.W176_H144]: { width: 176, height: 144, maxBitrate: 160, minBitrate: 80 },
@@ -5638,23 +5641,26 @@
         [exports.RCResolution.W1920_H1080]: { width: 1920, height: 1080, maxBitrate: 4000, minBitrate: 400 }
     };
     /**
-    * 取最接近的视频分辨率配置
+    * 向上取最接近的视频分辨率配置
     * @param {number} width
     * @param {number} height
     */
     const getNearestResolution = (width, height) => {
-        const area = width * height;
-        let d = Number.MAX_VALUE;
-        let conf = null;
-        for (const key in RongRTCVideoBitrate) {
-            const item = RongRTCVideoBitrate[key];
-            const d2 = Math.abs(item.width * item.height - area);
-            if (d2 < d) {
-                conf = item;
-                d = d2;
-            }
+        // 优先精准匹配
+        const conf = RongRTCVideoBitrate[`W${width}_H${height}`];
+        if (conf) {
+            return conf;
         }
-        return conf;
+        // 不规则分辨率计算最接近的配置
+        const area = width * height;
+        const confs = Object.keys(RongRTCVideoBitrate)
+            .map(key => RongRTCVideoBitrate[key])
+            // 升序
+            .sort((item, item2) => item.height * item.width - item2.width * item2.height)
+            // 过滤分辨率小于 area 的配置，避免分配带宽不足
+            .filter(item => item.height * item.width >= area);
+        // 若 confs 长度为 0 说明分辨率远大于可支持的分辨率配置，取最大配置
+        return confs[0] || RongRTCVideoBitrate.W1920_H1080;
     };
     const Multiplier = {
         10: 1,
@@ -6220,13 +6226,18 @@
      * @param track
      */
     const getVideoTrackInfo = (track) => {
+        const settings = track.getSettings();
         const constraints = track.getConstraints();
         // firefox 平台不存在 getCapabilities 方法
         // const capabilities = track.getCapabilities()
         // const width = getValue(constraints.width) || getValue(capabilities.width)
         // const height = getValue(constraints.height) || getValue(capabilities.height)
         // const frameRate = getValue(constraints.frameRate) || getValue(capabilities.frameRate)
-        return { width: getValue(constraints.width), height: getValue(constraints.height), frameRate: getValue(constraints.frameRate) };
+        return {
+            width: settings.width || getValue(constraints.width),
+            height: settings.height || getValue(constraints.height),
+            frameRate: settings.frameRate || getValue(constraints.frameRate)
+        };
     };
     /**
      * 取视频流动态码率
@@ -6235,8 +6246,8 @@
      */
     const getDynamicBitrate = (track) => {
         const { width, height, frameRate } = getVideoTrackInfo(track);
-        // 计算动态码率以备给 answer 使用
-        const config = getNearestResolution(width, height);
+        // 计算动态码率，若 videoTrack 的分辨率读取失败，则以 640 * 480 的默认分辨率计算码率
+        const config = getNearestResolution(width || 640, height || 480);
         const multiple = getBitrateMultiple(frameRate);
         return { min: config.minBitrate * multiple, max: config.maxBitrate * multiple };
     };
@@ -7659,6 +7670,7 @@
             return __awaiter(this, void 0, void 0, function* () {
                 // 过滤行末的空格，服务可能产生空格数据
                 sdp = sdp.replace(/\s+\r\n/g, '\r\n');
+                logger.info(`set remote answer -> ${sdp}`);
                 try {
                     yield this._peer.setRemoteDescription({ type: 'answer', sdp });
                 }
@@ -8067,14 +8079,12 @@
         createOffer(iceRestart) {
             return __awaiter(this, void 0, void 0, function* () {
                 const offer = yield this._sdpStrategy.createOffer(iceRestart);
-                // logger.debug(`sdpDemantics -> ${offer.semantics}`)
-                logger.debug(`offer -> ${JSON.stringify(offer.sdp)}`);
+                logger.info(`create offer -> ${JSON.stringify(offer.sdp)}`);
                 return offer;
             });
         }
         setRemoteAnswer(answer) {
             return __awaiter(this, void 0, void 0, function* () {
-                logger.debug(`answer -> ${JSON.stringify(answer)}`);
                 return this._sdpStrategy.setRemoteAnswer(answer);
             });
         }
@@ -8449,7 +8459,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.2.4-beem.2";
+            const rtcVersion = "5.2.4-beem.5";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -8613,7 +8623,7 @@
             this._initRemoteTracks();
             const crtUserId = this._context.getCurrentId();
             const selfRes = this._roomResources[crtUserId] = this._roomResources[crtUserId] || [];
-            logger.debug(`room data -> ${JSON.stringify(this._roomResources)}`);
+            logger.info(`room data -> ${JSON.stringify(this._roomResources)}`);
             /*
              * 加入房间后，若房间中已存在己方发布的资源，表示之前未能完成正常退出流程
              * 需先清除房间内的己方资源，通知房间内其他人己方已取消当前资源的发布
@@ -8691,6 +8701,7 @@
         }
         _callAppListener(eventType, ...attrs) {
             var _a;
+            eventType !== 'onPing' && logger.info(`${eventType} callback ->`, ...attrs);
             const handle = (_a = this._appListener) === null || _a === void 0 ? void 0 : _a[eventType];
             if (!handle) {
                 return;
@@ -8728,7 +8739,7 @@
                     logger.error(`unpublish prev uris failed -> code: ${code}`);
                 }
                 else {
-                    logger.debug('unpublish uris prev login succeed');
+                    logger.info('unpublish uris prev login succeed');
                 }
             });
         }
@@ -8779,7 +8790,7 @@
             if (this._destroyed) {
                 return;
             }
-            logger.warn(`onKickOff -> byServer: ${byServer}`);
+            // logger.warn(`onKickOff -> byServer: ${byServer}`)
             this._ntfClearRoomItem();
             this._leaveHandle(!byServer);
             // 扩展字段，备注用户为什么被踢出房间
@@ -8875,7 +8886,7 @@
                     // 重新订阅二次发布资源
                     if (subedTracks.length) {
                         const trackIds = subedTracks.map(item => item.getTrackId());
-                        logger.debug(`resub tracks -> ${JSON.stringify(trackIds)}`);
+                        logger.info(`resub tracks -> ${JSON.stringify(trackIds)}`);
                         const { code } = yield push(() => this.__subscribe(subedTracks, true));
                         if (code !== exports.RCRTCCode.SUCCESS) {
                             logger.error(`resub tracks failed -> code: ${code}, ids: ${JSON.stringify(trackIds)}`);
@@ -8944,7 +8955,7 @@
                 const downgrade = [];
                 users.forEach(item => {
                     if (+item.state === 0) {
-                        logger.debug(`user joined -> ${item.userId}`);
+                        logger.info(`user joined -> ${item.userId}`);
                         // 对端 im 重连之后调加入房间信令获取最新数据，服务会给本端下发“对端加入房间”的消息，本端内存已包含对端人员，所以需过滤掉
                         if (!this._roomResources[item.userId]) {
                             item.switchRoleType ? upgrade.push(item.userId) : joined.push(item.userId);
@@ -8952,7 +8963,7 @@
                         this._roomResources[item.userId] = this._roomResources[item.userId] || [];
                     }
                     else {
-                        logger.debug(`user left -> ${item.userId}`);
+                        logger.info(`user left -> ${item.userId}`);
                         item.switchRoleType ? downgrade.push(item.userId) : left.push(item.userId);
                     }
                 });
@@ -9247,7 +9258,7 @@
         _removePubFailedTracks(tracks) {
             tracks.forEach(item => {
                 const track = item instanceof RCLocalTrack ? item : item.track;
-                logger.debug(`remove pub failed track from peerconnection -> trackId: ${track.getTrackId()}`);
+                logger.info(`remove pub failed track from peerconnection -> trackId: ${track.getTrackId()}`);
                 this._pc.removeLocalTrackById(track.getTrackId());
             });
         }
@@ -9280,7 +9291,7 @@
                     logger.error(`publish failed, tracks limit exceeded -> roomId: ${this._roomId}`);
                     return { code: exports.RCRTCCode.PUBLISH_TRACK_LIMIT_EXCEEDED };
                 }
-                logger.debug(`publish tracks -> roomId: ${this._roomId}, tracks: ${tracks.map(getTrackIdFromAttr)}`);
+                logger.info(`publish tracks -> roomId: ${this._roomId}, tracks: ${tracks.map(getTrackIdFromAttr)}`);
                 /*
                  * 资源发布应先与 mediaserver 交换资源，建 PeerConnection 通道，后通知房间
                  * 资源取消发布则应先通知取消发布，后与 mediaServer 协商取消资源发布
@@ -9361,7 +9372,7 @@
                     const { track: localTrack } = item instanceof RCLocalTrack ? { track: item } : item;
                     localTrack.__innerSetPublished(true);
                 });
-                logger.debug(`publish success: ${publishTrackIds.join(',')}`);
+                logger.info(`publish success -> ${publishTrackIds.join(',')}`);
                 if (this._roomMode === engine.RTCMode.LIVE) {
                     return { code: exports.RCRTCCode.SUCCESS, liveUrl: urls === null || urls === void 0 ? void 0 : urls.liveUrl };
                 }
@@ -9507,7 +9518,7 @@
                     logger.error('send unpublish notification failed:', singalCode);
                     return { code: exports.RCRTCCode.SIGNAL_ERROR };
                 }
-                logger.debug(`unpublish success -> tracks: ${resourceIds.join(',')}`);
+                logger.info(`unpublish success -> tracks: ${resourceIds.join(',')}`);
                 const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
                 if (resCode !== exports.RCRTCCode.SUCCESS) {
                     return { code: resCode };
@@ -9732,7 +9743,7 @@
                     logger.error(`change subscribe list failed: ${resultCode}`);
                     return { code: resultCode };
                 }
-                logger.debug(`subscribe success: ${subTrackIds.join(',')}`);
+                logger.info(`subscribe success: ${subTrackIds.join(',')}`);
                 const resCode = yield this._pc.setRemoteAnswer(answer.sdp);
                 if (resCode !== exports.RCRTCCode.SUCCESS) {
                     return { code: resCode };
@@ -9794,10 +9805,10 @@
                 }
                 const { code, data } = yield this._context.joinRTCRoom(this._roomId, this._roomMode, livingType);
                 if (code !== engine.ErrorCode.SUCCESS) {
-                    logger.error(`RTC __onReconnected getRTCRoomInfo failed: ${code}`);
+                    logger.warn(`RTC __onReconnected getRTCRoomInfo failed: ${code}`);
                     return;
                 }
-                logger.debug(`RTC __onReconnected getRTCRoomInfo success: ${JSON.stringify(data)}`);
+                logger.info(`RTC __onReconnected getRTCRoomInfo success: ${JSON.stringify(data)}`);
                 // 查找新加入人员
                 const joinedUserIds = [];
                 // 新发布资源
@@ -10706,7 +10717,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.2.4-beem.2",
+        ClientVersion: "5.2.4-beem.5",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString()
     });
@@ -10781,7 +10792,7 @@
                 for (let i = 0; i < urls.length; i += 1) {
                     const url = `${urls[i]}${path}`;
                     const commonHeader = getCommonHeader();
-                    logger.debug(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
+                    logger.info(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
                     const { status, data } = yield this._runtime.httpReq({
                         url,
                         body: JSON.stringify(body),
@@ -10797,11 +10808,11 @@
                         if (resp.clusterId) {
                             this._clusterId = resp.clusterId;
                         }
-                        logger.debug(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
+                        logger.info(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
                         return { code: exports.RCRTCCode.SUCCESS, data: resp };
                     }
                     else {
-                        logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}, status: ${status}, url: ${url}`);
+                        logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}, status: ${status}`);
                         // 失败的请求需记录，避免多配置时总是请求无效的地址
                         this._failedMs.push(...this._msInNavi.splice(i, 1));
                     }
@@ -10864,7 +10875,7 @@
                 // mcu 地址默认使用 https 协议
                 const url = `${this._configUrl.replace(/^(https?:\/\/)?/, 'https://')}/server/mcu/config`;
                 const commonHeader = getCommonHeader();
-                logger.debug(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
+                logger.info(`request -> Request-Id: ${commonHeader['Request-Id']}, url: ${url}`);
                 const { status, data: jsonStr } = yield this._runtime.httpReq({
                     url,
                     headers: Object.assign(Object.assign({}, commonHeader), headers),
@@ -10872,10 +10883,11 @@
                     method: engine.HttpMethod.POST
                 });
                 if (status === 200) {
-                    logger.debug(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
+                    logger.info(`request success -> Request-Id: ${commonHeader['Request-Id']}`);
                     const data = JSON.parse(jsonStr);
                     return { code: data.resultCode, res: data };
                 }
+                logger.warn(`request failed -> Request-Id: ${commonHeader['Request-Id']}`);
                 return { code: exports.RCRTCCode.REQUEST_FAILED };
             });
         }
@@ -12734,7 +12746,7 @@
                 logger.error('Please use the https protocol or use `http://localhost` to open the page!');
                 return false;
             }
-            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.2");
+            engine.VersionManage.add('plugin-rtc', "5.2.4-beem.5");
             if (!engine.VersionManage.validEngine("4.6.0-beem.5")) {
                 logger.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"4.6.0-beem.5"}'.`);
                 return false;
@@ -12744,7 +12756,7 @@
         setup(context, runtime, options = {}) {
             logger.setLogLevel(options.logLevel);
             logger.setLogStdout(options.logStdout);
-            logger.warn(`RCRTC Version: ${"5.2.4-beem.2"}, Commit: ${"51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"}`);
+            logger.warn(`RCRTC Version: ${"5.2.4-beem.5"}, Commit: ${"13f398c4a680ab6054d831b2e76e51f68a677de9"}`);
             logger.warn(`browserInfo.browser -> ${browserInfo.browser}`);
             logger.warn(`browserInfo.supportsUnifiedPlan -> ${browserInfo.supportsUnifiedPlan}`);
             logger.warn(`browserInfo.version -> ${browserInfo.version}`);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rongcloud/plugin-rtc",
-  "version": "5.2.4-beem.2",
+  "version": "5.2.4-beem.5",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "4.6.0-beem.5"
   },
-  "__commit__": "51c7e1de9a288f3456394ed2bc6ee9e09c4afa8c"
+  "__commit__": "13f398c4a680ab6054d831b2e76e51f68a677de9"
 }