@rongcloud/plugin-rtc 5.6.3-alpha.5 → 5.6.3-alpha.7

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.6.3-alpha.5
- * CommitId - 48fe4c6914037db2dfd263f31aba741834041487
- * Wed Nov 16 2022 17:24:53 GMT+0800 (中国标准时间)
+ * RCRTC - v5.6.3-alpha.7
+ * CommitId - 58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce
+ * Fri Nov 18 2022 11:53:17 GMT+0800 (中国标准时间)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, BasicLogger, INaviInfo, RTCPluginContext, AbsCodec, IPromiseResult, ErrorCode, KVString, IRuntime, IAsyncRes, ConnectionStatus, ConversationType, ISendMsgOptions, IReceivedMessage, EnableLogL, IPluginGenerator } from '@rongcloud/engine';

package/dist/index.esm.js

@@ -1,12 +1,12 @@
 /*
- * RCRTC - v5.6.3-alpha.5
- * CommitId - 48fe4c6914037db2dfd263f31aba741834041487
- * Wed Nov 16 2022 17:24:53 GMT+0800 (中国标准时间)
+ * RCRTC - v5.6.3-alpha.7
+ * CommitId - 58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce
+ * Fri Nov 18 2022 11:53:17 GMT+0800 (中国标准时间)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 import { EventEmitter, isNumber, validate, isObject as isObject$1, ErrorCode, HttpMethod, isArray, ConnectionStatus, notEmptyObject, notEmptyArray, notEmptyString, isString, RTCMode as RTCMode$1, assert, ConversationType, isHttpUrl, isBoolean, isUndefined, forEach, VersionManage, LogL } from '@rongcloud/engine';
 
-/******************************************************************************
+/*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -8050,7 +8050,7 @@ class Pinger {
         this._latestTimestamp = Date.now();
         this._started = false;
         this._timer = null;
-        this._pullRTCRoomStatus = (roomId, tracId) => { };
+        this._pullRTCRoomStatus = (roomId, tracId, targetPullVersion) => { };
         const { roomId, roomMode } = this._store;
         this._roomId = roomId;
         this._roomMode = roomMode;
@@ -8101,7 +8101,7 @@ class Pinger {
             (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_RTCPING_PULL_ROOM_STATUS_O, JSON.stringify({
                 pingerVersion,
             }), traceId);
-            this._pullRTCRoomStatus(this._roomId, traceId);
+            this._pullRTCRoomStatus(this._roomId, traceId, pingerVersion);
         }
     }
     _checkAlive() {
@@ -14800,7 +14800,7 @@ const getCommonHeader$1 = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.6.3-alpha.5",
+    ClientVersion: "5.6.3-alpha.7",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15376,7 +15376,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.6.3-alpha.5",
+    ClientVersion: "5.6.3-alpha.7",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -18684,7 +18684,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.6.3-alpha.5";
+        const rtcVersion = "5.6.3-alpha.7";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -18834,7 +18834,7 @@ class PolarisHttpReporter {
     _formatR1Data() {
         return {
             joinTime: this._context.userJoinTime || 0,
-            rtcVersion: "5.6.3-alpha.5",
+            rtcVersion: "5.6.3-alpha.7",
             imVersion: this._context.getCoreVersion(),
             platform: 'web',
             device: navigator.platform,
@@ -21833,7 +21833,7 @@ class OnSignalReconnectedCommand extends BaseCommand {
              * 处理全量的房间数据
              */
             const CDNUris = (_e = data.roomInfo.filter((item) => item.key === 'cdn_uris')[0]) === null || _e === void 0 ? void 0 : _e.value;
-            handleFullRoomData(data, store, this.callbacks, invoker, this.subhook, CDNUris, traceId);
+            yield handleFullRoomData(data, store, this.callbacks, invoker, this.subhook, CDNUris, traceId);
             (_g = (_f = store.context) === null || _f === void 0 ? void 0 : _f.logger) === null || _g === void 0 ? void 0 : _g.info(RCLoggerTag.L_ABSTRACT_ROOM_IM_RECONNECTED_R, JSON.stringify({
                 status: RCLoggerStatus.SUCCESSED,
                 roomData: data,
@@ -22132,7 +22132,7 @@ var PullRoomStatusEvent;
 })(PullRoomStatusEvent || (PullRoomStatusEvent = {}));
 
 class PullRTCRoomStatusCommand extends BaseCommand {
-    constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener) {
+    constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener, _targetPullVersion) {
         super();
         this._roomId = _roomId;
         this._traceId = _traceId;
@@ -22140,28 +22140,38 @@ class PullRTCRoomStatusCommand extends BaseCommand {
         this._callbacks = _callbacks;
         this._subhook = _subhook;
         this._dealUserAppListener = _dealUserAppListener;
+        this._targetPullVersion = _targetPullVersion;
     }
     get kind() {
         return RCCommandKind.PULL_RTCROOM_STATUS;
     }
     execute(store, invoker) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const version = store.getRoomStatusVersion();
+            const localVersion = store.getRoomStatusVersion();
             (_a = this._context.logger) === null || _a === void 0 ? void 0 : _a.info(RCLoggerTag.L_PULL_ROOM_STATUS_T, JSON.stringify({
                 roomId: this._roomId,
-                version,
+                localVersion,
             }), this._traceId);
-            const { code, data } = yield this._context.pullRTCRoomStatus(this._roomId, version);
-            if (code !== ErrorCode.SUCCESS) {
+            if (this._targetPullVersion && this._targetPullVersion <= localVersion) {
                 (_b = this._context.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
+                    status: RCLoggerStatus.SUCCESSED,
+                    msg: 'the roomData has been pulled',
+                    localVersion,
+                    targetPullVersion: this._targetPullVersion,
+                }), this._traceId);
+                return { code: ErrorCode.SUCCESS };
+            }
+            const { code, data } = yield this._context.pullRTCRoomStatus(this._roomId, localVersion);
+            if (code !== ErrorCode.SUCCESS) {
+                (_c = this._context.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
                     status: RCLoggerStatus.FAILED,
                     code,
                 }), this._traceId);
                 return { code };
             }
             const { bFullStatus, version: newVersion, usersData, roomStatus, } = data;
-            (_c = this._context.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
+            (_d = this._context.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
                 bFullStatus,
                 version: int64ToTimestamp(newVersion),
                 usersData,
@@ -22173,7 +22183,7 @@ class PullRTCRoomStatusCommand extends BaseCommand {
              */
             if (bFullStatus) {
                 const { urisData, CDNUris } = transPullFullUsersData(usersData);
-                handleFullRoomData(urisData, store, this._callbacks, invoker, this._subhook, CDNUris, this._traceId);
+                yield handleFullRoomData(urisData, store, this._callbacks, invoker, this._subhook, CDNUris, this._traceId);
                 return { code };
             }
             /**
@@ -22279,12 +22289,12 @@ class RCAbstractRoom extends EventEmitter {
                     // eslint-disable-next-line no-case-declarations
                     const tracId = (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.createTraceId();
                     (_f = (_e = this._context) === null || _e === void 0 ? void 0 : _e.logger) === null || _f === void 0 ? void 0 : _f.info(RCLoggerTag.L_RTCNTF_PULL_ROOM_STATUS_O, null, tracId);
-                    this._startPullRTCRoomStatus(roomId, tracId);
+                    this._startPullRTCRoomStatus(roomId, tracId, time);
                     break;
             }
         }));
     }
-    _pullRTCRoomStatus(roomId, tracId) {
+    _pullRTCRoomStatus(roomId, tracId, targetPullVersion) {
         return new PullRTCRoomStatusCommand(roomId, tracId, this._context, {
             onUserJoin: this._callAppListener.bind(this, 'onUserJoin'),
             onUserLeave: this._callAppListener.bind(this, 'onUserLeave'),
@@ -22293,15 +22303,15 @@ class RCAbstractRoom extends EventEmitter {
             onTrackPublish: this._onTrackPublish.bind(this),
             onTrackUnpublish: this._onTrackUnpublish.bind(this),
             onCDNEnableChange: this._callAppListener.bind(this, 'onCDNEnableChange'),
-        }, this._subhook.bind(this), this._dealUserAppListener.bind(this));
+        }, this._subhook.bind(this), this._dealUserAppListener.bind(this), targetPullVersion);
     }
     /**
      * 拉取房间数据
      * @param roomId 房间 id
      */
-    _startPullRTCRoomStatus(roomId, tracId) {
+    _startPullRTCRoomStatus(roomId, tracId, targetPullVersion) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._invoker.push(this._pullRTCRoomStatus(roomId, tracId));
+            yield this._invoker.push(this._pullRTCRoomStatus(roomId, tracId, targetPullVersion));
         });
     }
     __innerInit(mode, joinType, livingType, innerUserDatas, outerUserDatas, traceId) {
@@ -28074,7 +28084,7 @@ class RCRTCClient extends RCMediaStreamCapture {
     }
     reportSDKInfo() {
         this._context.reportSDKInfo({
-            'plugin-rtc': "5.6.3-alpha.5",
+            'plugin-rtc': "5.6.3-alpha.7",
         });
     }
 }
@@ -29067,7 +29077,7 @@ const installer = {
             console.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        VersionManage.add('plugin-rtc', "5.6.3-alpha.5");
+        VersionManage.add('plugin-rtc', "5.6.3-alpha.7");
         if (!VersionManage.validEngine("^5.6.0")) {
             console.error(`The current engine version '${VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.0"}'.`);
             return false;
@@ -29081,8 +29091,8 @@ const installer = {
         RTCLogger.setLogger(originLogger);
         logger.setLogger(originLogger);
         originLogger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-            'RCRTC Version': "5.6.3-alpha.5",
-            Commit: "48fe4c6914037db2dfd263f31aba741834041487",
+            'RCRTC Version': "5.6.3-alpha.7",
+            Commit: "58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce",
             'browserInfo.browser': browserInfo.browser,
             'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
             'browserInfo.version': browserInfo.version,

package/dist/index.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.6.3-alpha.5
- * CommitId - 48fe4c6914037db2dfd263f31aba741834041487
- * Wed Nov 16 2022 17:24:53 GMT+0800 (中国标准时间)
+ * RCRTC - v5.6.3-alpha.7
+ * CommitId - 58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce
+ * Fri Nov 18 2022 11:53:17 GMT+0800 (中国标准时间)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 'use strict';
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var engine = require('@rongcloud/engine');
 
-/******************************************************************************
+/*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -8054,7 +8054,7 @@ class Pinger {
         this._latestTimestamp = Date.now();
         this._started = false;
         this._timer = null;
-        this._pullRTCRoomStatus = (roomId, tracId) => { };
+        this._pullRTCRoomStatus = (roomId, tracId, targetPullVersion) => { };
         const { roomId, roomMode } = this._store;
         this._roomId = roomId;
         this._roomMode = roomMode;
@@ -8105,7 +8105,7 @@ class Pinger {
             (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_RTCPING_PULL_ROOM_STATUS_O, JSON.stringify({
                 pingerVersion,
             }), traceId);
-            this._pullRTCRoomStatus(this._roomId, traceId);
+            this._pullRTCRoomStatus(this._roomId, traceId, pingerVersion);
         }
     }
     _checkAlive() {
@@ -14804,7 +14804,7 @@ const getCommonHeader$1 = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.6.3-alpha.5",
+    ClientVersion: "5.6.3-alpha.7",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -15380,7 +15380,7 @@ const getCommonHeader = () => ({
     'Content-Type': 'application/json;charset=UTF-8',
     'Cache-Control': 'no-cache',
     ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-    ClientVersion: "5.6.3-alpha.5",
+    ClientVersion: "5.6.3-alpha.7",
     'Client-Session-Id': getUUID(),
     'Request-Id': Date.now().toString(),
 });
@@ -18688,7 +18688,7 @@ class PolarisReporter {
      * 加入房间
      */
     sendR1() {
-        const rtcVersion = "5.6.3-alpha.5";
+        const rtcVersion = "5.6.3-alpha.7";
         const imVersion = this._context.getCoreVersion();
         const platform = 'web';
         const pcName = navigator.platform;
@@ -18838,7 +18838,7 @@ class PolarisHttpReporter {
     _formatR1Data() {
         return {
             joinTime: this._context.userJoinTime || 0,
-            rtcVersion: "5.6.3-alpha.5",
+            rtcVersion: "5.6.3-alpha.7",
             imVersion: this._context.getCoreVersion(),
             platform: 'web',
             device: navigator.platform,
@@ -21837,7 +21837,7 @@ class OnSignalReconnectedCommand extends BaseCommand {
              * 处理全量的房间数据
              */
             const CDNUris = (_e = data.roomInfo.filter((item) => item.key === 'cdn_uris')[0]) === null || _e === void 0 ? void 0 : _e.value;
-            handleFullRoomData(data, store, this.callbacks, invoker, this.subhook, CDNUris, traceId);
+            yield handleFullRoomData(data, store, this.callbacks, invoker, this.subhook, CDNUris, traceId);
             (_g = (_f = store.context) === null || _f === void 0 ? void 0 : _f.logger) === null || _g === void 0 ? void 0 : _g.info(RCLoggerTag.L_ABSTRACT_ROOM_IM_RECONNECTED_R, JSON.stringify({
                 status: RCLoggerStatus.SUCCESSED,
                 roomData: data,
@@ -22136,7 +22136,7 @@ var PullRoomStatusEvent;
 })(PullRoomStatusEvent || (PullRoomStatusEvent = {}));
 
 class PullRTCRoomStatusCommand extends BaseCommand {
-    constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener) {
+    constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener, _targetPullVersion) {
         super();
         this._roomId = _roomId;
         this._traceId = _traceId;
@@ -22144,28 +22144,38 @@ class PullRTCRoomStatusCommand extends BaseCommand {
         this._callbacks = _callbacks;
         this._subhook = _subhook;
         this._dealUserAppListener = _dealUserAppListener;
+        this._targetPullVersion = _targetPullVersion;
     }
     get kind() {
         return RCCommandKind.PULL_RTCROOM_STATUS;
     }
     execute(store, invoker) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const version = store.getRoomStatusVersion();
+            const localVersion = store.getRoomStatusVersion();
             (_a = this._context.logger) === null || _a === void 0 ? void 0 : _a.info(RCLoggerTag.L_PULL_ROOM_STATUS_T, JSON.stringify({
                 roomId: this._roomId,
-                version,
+                localVersion,
             }), this._traceId);
-            const { code, data } = yield this._context.pullRTCRoomStatus(this._roomId, version);
-            if (code !== engine.ErrorCode.SUCCESS) {
+            if (this._targetPullVersion && this._targetPullVersion <= localVersion) {
                 (_b = this._context.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
+                    status: RCLoggerStatus.SUCCESSED,
+                    msg: 'the roomData has been pulled',
+                    localVersion,
+                    targetPullVersion: this._targetPullVersion,
+                }), this._traceId);
+                return { code: engine.ErrorCode.SUCCESS };
+            }
+            const { code, data } = yield this._context.pullRTCRoomStatus(this._roomId, localVersion);
+            if (code !== engine.ErrorCode.SUCCESS) {
+                (_c = this._context.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
                     status: RCLoggerStatus.FAILED,
                     code,
                 }), this._traceId);
                 return { code };
             }
             const { bFullStatus, version: newVersion, usersData, roomStatus, } = data;
-            (_c = this._context.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
+            (_d = this._context.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
                 bFullStatus,
                 version: int64ToTimestamp(newVersion),
                 usersData,
@@ -22177,7 +22187,7 @@ class PullRTCRoomStatusCommand extends BaseCommand {
              */
             if (bFullStatus) {
                 const { urisData, CDNUris } = transPullFullUsersData(usersData);
-                handleFullRoomData(urisData, store, this._callbacks, invoker, this._subhook, CDNUris, this._traceId);
+                yield handleFullRoomData(urisData, store, this._callbacks, invoker, this._subhook, CDNUris, this._traceId);
                 return { code };
             }
             /**
@@ -22283,12 +22293,12 @@ class RCAbstractRoom extends engine.EventEmitter {
                     // eslint-disable-next-line no-case-declarations
                     const tracId = (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.createTraceId();
                     (_f = (_e = this._context) === null || _e === void 0 ? void 0 : _e.logger) === null || _f === void 0 ? void 0 : _f.info(RCLoggerTag.L_RTCNTF_PULL_ROOM_STATUS_O, null, tracId);
-                    this._startPullRTCRoomStatus(roomId, tracId);
+                    this._startPullRTCRoomStatus(roomId, tracId, time);
                     break;
             }
         }));
     }
-    _pullRTCRoomStatus(roomId, tracId) {
+    _pullRTCRoomStatus(roomId, tracId, targetPullVersion) {
         return new PullRTCRoomStatusCommand(roomId, tracId, this._context, {
             onUserJoin: this._callAppListener.bind(this, 'onUserJoin'),
             onUserLeave: this._callAppListener.bind(this, 'onUserLeave'),
@@ -22297,15 +22307,15 @@ class RCAbstractRoom extends engine.EventEmitter {
             onTrackPublish: this._onTrackPublish.bind(this),
             onTrackUnpublish: this._onTrackUnpublish.bind(this),
             onCDNEnableChange: this._callAppListener.bind(this, 'onCDNEnableChange'),
-        }, this._subhook.bind(this), this._dealUserAppListener.bind(this));
+        }, this._subhook.bind(this), this._dealUserAppListener.bind(this), targetPullVersion);
     }
     /**
      * 拉取房间数据
      * @param roomId 房间 id
      */
-    _startPullRTCRoomStatus(roomId, tracId) {
+    _startPullRTCRoomStatus(roomId, tracId, targetPullVersion) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._invoker.push(this._pullRTCRoomStatus(roomId, tracId));
+            yield this._invoker.push(this._pullRTCRoomStatus(roomId, tracId, targetPullVersion));
         });
     }
     __innerInit(mode, joinType, livingType, innerUserDatas, outerUserDatas, traceId) {
@@ -28078,7 +28088,7 @@ class RCRTCClient extends RCMediaStreamCapture {
     }
     reportSDKInfo() {
         this._context.reportSDKInfo({
-            'plugin-rtc': "5.6.3-alpha.5",
+            'plugin-rtc': "5.6.3-alpha.7",
         });
     }
 }
@@ -29071,7 +29081,7 @@ const installer = {
             console.error('Please use the https protocol or use `http://localhost` to open the page!');
             return false;
         }
-        engine.VersionManage.add('plugin-rtc', "5.6.3-alpha.5");
+        engine.VersionManage.add('plugin-rtc', "5.6.3-alpha.7");
         if (!engine.VersionManage.validEngine("^5.6.0")) {
             console.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.0"}'.`);
             return false;
@@ -29085,8 +29095,8 @@ const installer = {
         RTCLogger.setLogger(originLogger);
         logger.setLogger(originLogger);
         originLogger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-            'RCRTC Version': "5.6.3-alpha.5",
-            Commit: "48fe4c6914037db2dfd263f31aba741834041487",
+            'RCRTC Version': "5.6.3-alpha.7",
+            Commit: "58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce",
             'browserInfo.browser': browserInfo.browser,
             'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
             'browserInfo.version': browserInfo.version,

package/dist/index.umd.js

@@ -1,7 +1,7 @@
 /*
- * RCRTC - v5.6.3-alpha.5
- * CommitId - 48fe4c6914037db2dfd263f31aba741834041487
- * Wed Nov 16 2022 17:24:53 GMT+0800 (中国标准时间)
+ * RCRTC - v5.6.3-alpha.7
+ * CommitId - 58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce
+ * Fri Nov 18 2022 11:53:17 GMT+0800 (中国标准时间)
  * ©2020 RongCloud, Inc. All rights reserved.
  */
 (function (global, factory) {
@@ -10,7 +10,7 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.RCRTC = {}, global.RCEngine));
 })(this, (function (exports, engine) { 'use strict';
 
-    /******************************************************************************
+    /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -8054,7 +8054,7 @@
             this._latestTimestamp = Date.now();
             this._started = false;
             this._timer = null;
-            this._pullRTCRoomStatus = (roomId, tracId) => { };
+            this._pullRTCRoomStatus = (roomId, tracId, targetPullVersion) => { };
             const { roomId, roomMode } = this._store;
             this._roomId = roomId;
             this._roomMode = roomMode;
@@ -8105,7 +8105,7 @@
                 (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_RTCPING_PULL_ROOM_STATUS_O, JSON.stringify({
                     pingerVersion,
                 }), traceId);
-                this._pullRTCRoomStatus(this._roomId, traceId);
+                this._pullRTCRoomStatus(this._roomId, traceId, pingerVersion);
             }
         }
         _checkAlive() {
@@ -14804,7 +14804,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.6.3-alpha.5",
+        ClientVersion: "5.6.3-alpha.7",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString(),
     });
@@ -15380,7 +15380,7 @@
         'Content-Type': 'application/json;charset=UTF-8',
         'Cache-Control': 'no-cache',
         ClientType: `web|${browserInfo.browser}|${browserInfo.version}`,
-        ClientVersion: "5.6.3-alpha.5",
+        ClientVersion: "5.6.3-alpha.7",
         'Client-Session-Id': getUUID(),
         'Request-Id': Date.now().toString(),
     });
@@ -18688,7 +18688,7 @@
          * 加入房间
          */
         sendR1() {
-            const rtcVersion = "5.6.3-alpha.5";
+            const rtcVersion = "5.6.3-alpha.7";
             const imVersion = this._context.getCoreVersion();
             const platform = 'web';
             const pcName = navigator.platform;
@@ -18838,7 +18838,7 @@
         _formatR1Data() {
             return {
                 joinTime: this._context.userJoinTime || 0,
-                rtcVersion: "5.6.3-alpha.5",
+                rtcVersion: "5.6.3-alpha.7",
                 imVersion: this._context.getCoreVersion(),
                 platform: 'web',
                 device: navigator.platform,
@@ -21837,7 +21837,7 @@
                  * 处理全量的房间数据
                  */
                 const CDNUris = (_e = data.roomInfo.filter((item) => item.key === 'cdn_uris')[0]) === null || _e === void 0 ? void 0 : _e.value;
-                handleFullRoomData(data, store, this.callbacks, invoker, this.subhook, CDNUris, traceId);
+                yield handleFullRoomData(data, store, this.callbacks, invoker, this.subhook, CDNUris, traceId);
                 (_g = (_f = store.context) === null || _f === void 0 ? void 0 : _f.logger) === null || _g === void 0 ? void 0 : _g.info(RCLoggerTag.L_ABSTRACT_ROOM_IM_RECONNECTED_R, JSON.stringify({
                     status: RCLoggerStatus.SUCCESSED,
                     roomData: data,
@@ -22136,7 +22136,7 @@
     })(PullRoomStatusEvent || (PullRoomStatusEvent = {}));
 
     class PullRTCRoomStatusCommand extends BaseCommand {
-        constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener) {
+        constructor(_roomId, _traceId, _context, _callbacks, _subhook, _dealUserAppListener, _targetPullVersion) {
             super();
             this._roomId = _roomId;
             this._traceId = _traceId;
@@ -22144,28 +22144,38 @@
             this._callbacks = _callbacks;
             this._subhook = _subhook;
             this._dealUserAppListener = _dealUserAppListener;
+            this._targetPullVersion = _targetPullVersion;
         }
         get kind() {
             return RCCommandKind.PULL_RTCROOM_STATUS;
         }
         execute(store, invoker) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function* () {
-                const version = store.getRoomStatusVersion();
+                const localVersion = store.getRoomStatusVersion();
                 (_a = this._context.logger) === null || _a === void 0 ? void 0 : _a.info(RCLoggerTag.L_PULL_ROOM_STATUS_T, JSON.stringify({
                     roomId: this._roomId,
-                    version,
+                    localVersion,
                 }), this._traceId);
-                const { code, data } = yield this._context.pullRTCRoomStatus(this._roomId, version);
-                if (code !== engine.ErrorCode.SUCCESS) {
+                if (this._targetPullVersion && this._targetPullVersion <= localVersion) {
                     (_b = this._context.logger) === null || _b === void 0 ? void 0 : _b.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
+                        status: RCLoggerStatus.SUCCESSED,
+                        msg: 'the roomData has been pulled',
+                        localVersion,
+                        targetPullVersion: this._targetPullVersion,
+                    }), this._traceId);
+                    return { code: engine.ErrorCode.SUCCESS };
+                }
+                const { code, data } = yield this._context.pullRTCRoomStatus(this._roomId, localVersion);
+                if (code !== engine.ErrorCode.SUCCESS) {
+                    (_c = this._context.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
                         status: RCLoggerStatus.FAILED,
                         code,
                     }), this._traceId);
                     return { code };
                 }
                 const { bFullStatus, version: newVersion, usersData, roomStatus, } = data;
-                (_c = this._context.logger) === null || _c === void 0 ? void 0 : _c.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
+                (_d = this._context.logger) === null || _d === void 0 ? void 0 : _d.info(RCLoggerTag.L_PULL_ROOM_STATUS_R, JSON.stringify({
                     bFullStatus,
                     version: int64ToTimestamp(newVersion),
                     usersData,
@@ -22177,7 +22187,7 @@
                  */
                 if (bFullStatus) {
                     const { urisData, CDNUris } = transPullFullUsersData(usersData);
-                    handleFullRoomData(urisData, store, this._callbacks, invoker, this._subhook, CDNUris, this._traceId);
+                    yield handleFullRoomData(urisData, store, this._callbacks, invoker, this._subhook, CDNUris, this._traceId);
                     return { code };
                 }
                 /**
@@ -22283,12 +22293,12 @@
                         // eslint-disable-next-line no-case-declarations
                         const tracId = (_d = (_c = this._context) === null || _c === void 0 ? void 0 : _c.logger) === null || _d === void 0 ? void 0 : _d.createTraceId();
                         (_f = (_e = this._context) === null || _e === void 0 ? void 0 : _e.logger) === null || _f === void 0 ? void 0 : _f.info(RCLoggerTag.L_RTCNTF_PULL_ROOM_STATUS_O, null, tracId);
-                        this._startPullRTCRoomStatus(roomId, tracId);
+                        this._startPullRTCRoomStatus(roomId, tracId, time);
                         break;
                 }
             }));
         }
-        _pullRTCRoomStatus(roomId, tracId) {
+        _pullRTCRoomStatus(roomId, tracId, targetPullVersion) {
             return new PullRTCRoomStatusCommand(roomId, tracId, this._context, {
                 onUserJoin: this._callAppListener.bind(this, 'onUserJoin'),
                 onUserLeave: this._callAppListener.bind(this, 'onUserLeave'),
@@ -22297,15 +22307,15 @@
                 onTrackPublish: this._onTrackPublish.bind(this),
                 onTrackUnpublish: this._onTrackUnpublish.bind(this),
                 onCDNEnableChange: this._callAppListener.bind(this, 'onCDNEnableChange'),
-            }, this._subhook.bind(this), this._dealUserAppListener.bind(this));
+            }, this._subhook.bind(this), this._dealUserAppListener.bind(this), targetPullVersion);
         }
         /**
          * 拉取房间数据
          * @param roomId 房间 id
          */
-        _startPullRTCRoomStatus(roomId, tracId) {
+        _startPullRTCRoomStatus(roomId, tracId, targetPullVersion) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield this._invoker.push(this._pullRTCRoomStatus(roomId, tracId));
+                yield this._invoker.push(this._pullRTCRoomStatus(roomId, tracId, targetPullVersion));
             });
         }
         __innerInit(mode, joinType, livingType, innerUserDatas, outerUserDatas, traceId) {
@@ -28078,7 +28088,7 @@
         }
         reportSDKInfo() {
             this._context.reportSDKInfo({
-                'plugin-rtc': "5.6.3-alpha.5",
+                'plugin-rtc': "5.6.3-alpha.7",
             });
         }
     }
@@ -29071,7 +29081,7 @@ message probuf {
                 console.error('Please use the https protocol or use `http://localhost` to open the page!');
                 return false;
             }
-            engine.VersionManage.add('plugin-rtc', "5.6.3-alpha.5");
+            engine.VersionManage.add('plugin-rtc', "5.6.3-alpha.7");
             if (!engine.VersionManage.validEngine("^5.6.0")) {
                 console.error(`The current engine version '${engine.VersionManage.getInfo().engine}' error, plugin-rtc required engine version at least '${"^5.6.0"}'.`);
                 return false;
@@ -29085,8 +29095,8 @@ message probuf {
             RTCLogger.setLogger(originLogger);
             logger.setLogger(originLogger);
             originLogger.warn(RCLoggerTag.L_INDEX_INSTALL_RTC_PLUGIN_O, JSON.stringify({
-                'RCRTC Version': "5.6.3-alpha.5",
-                Commit: "48fe4c6914037db2dfd263f31aba741834041487",
+                'RCRTC Version': "5.6.3-alpha.7",
+                Commit: "58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce",
                 'browserInfo.browser': browserInfo.browser,
                 'browserInfo.supportsUnifiedPlan': browserInfo.supportsUnifiedPlan,
                 'browserInfo.version': browserInfo.version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rongcloud/plugin-rtc",
-  "version": "5.6.3-alpha.5",
+  "version": "5.6.3-alpha.7",
   "description": "@rongcloud/plugin-rtc",
   "main": "./dist/index.js",
   "__attrs__": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "@rongcloud/engine": "^5.6.0"
   },
-  "__commit__": "48fe4c6914037db2dfd263f31aba741834041487"
+  "__commit__": "58b37e81b5a25ac7a7c2ed16fa4f996fdc6004ce"
 }