npm - @tencentcloud/tuiroom-engine-js - Versions diffs - 1.0.0 → 1.0.1-beta - Mend

@tencentcloud/tuiroom-engine-js 1.0.0 → 1.0.1-beta

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 (4) hide show

package/index.cjs.js CHANGED Viewed

@@ -9664,7 +9664,7 @@ class Logger {
     }
 }
-var version = "1.0.0";
+var version = "1.0.1-beta";
 const userAgent = navigator.userAgent.toLowerCase();
 const isElectron = userAgent.indexOf(' electron/') > -1;
@@ -10084,7 +10084,7 @@ class TUIRoomEngine {
         const requestCallback = args.splice(args.length - 1, 1)[0];
         return new Promise((resolve, reject) => {
             const requestIdCallback = (requestId) => {
-                this.logger.info(`roomEngine.${funcName} success`, requestId);
+                this.logger.info(`roomEngine.${funcName} success with requestId:`, requestId);
                 resolve(requestId);
             };
             const requestActionCallback = (requestCallbackType, code, requestId, userId, message) => {
@@ -10162,7 +10162,38 @@ class TUIRoomEngine {
                 options.requestCallback = () => { };
             }
             const { seatIndex, timeout, requestCallback } = options;
-            return yield this.JSCallNativeRequestFunctionPromise('takeSeat', seatIndex, timeout, requestCallback);
+            // isTakeSeatWithRequest: 本次 takeSeat 执行是否需要发送信令
+            // 自由发言模式下或者身份为主持人/管理员调用 takeSeat 时不需要发信令，直接进行身份转换，roomEngineWASM 返回 requestId 为 0
+            // 举手发言模式下普通用户调用 takeSeat 时需要发信令， roomEngineWASM 返回真实的 requestId, 用户可使用 requestId 取消上麦请求
+            let isTakeSeatWithRequest = true;
+            return new Promise((resolve, reject) => {
+                const requestIdCallback = (requestId) => {
+                    if (requestId === 0) {
+                        isTakeSeatWithRequest = false;
+                    }
+                    else {
+                        this.logger.info(`roomEngine.takeSeat success with requestId:`, requestId);
+                        resolve(requestId);
+                    }
+                };
+                const requestActionCallback = (requestCallbackType, code, requestId, userId, message) => {
+                    requestCallback({ requestCallbackType, requestId, userId, code, message });
+                    if (requestCallbackType === exports.TUIRequestCallbackType.kRequestAccepted && !isTakeSeatWithRequest) {
+                        this.logger.info(`roomEngine.takeSeat success without request.`);
+                        resolve(0);
+                    }
+                    if (requestCallbackType === exports.TUIRequestCallbackType.kRequestError) {
+                        reject(new TUIError({ code, message }));
+                    }
+                };
+                try {
+                    this.roomEngineWASM.takeSeat(seatIndex, timeout, requestIdCallback, requestActionCallback);
+                }
+                catch (error) {
+                    console.error(`roomEngine.takeSeat error. `, error.code, error.message);
+                    reject(new TUIError({ code: error.code || exports.TUIErrorCode.ERR_FAILED, message: error.message }));
+                }
+            });
         });
     }
     /**

package/index.esm.js CHANGED Viewed

@@ -9655,7 +9655,7 @@ class Logger {
     }
 }
-var version = "1.0.0";
+var version = "1.0.1-beta";
 const userAgent = navigator.userAgent.toLowerCase();
 const isElectron = userAgent.indexOf(' electron/') > -1;
@@ -10075,7 +10075,7 @@ class TUIRoomEngine {
         const requestCallback = args.splice(args.length - 1, 1)[0];
         return new Promise((resolve, reject) => {
             const requestIdCallback = (requestId) => {
-                this.logger.info(`roomEngine.${funcName} success`, requestId);
+                this.logger.info(`roomEngine.${funcName} success with requestId:`, requestId);
                 resolve(requestId);
             };
             const requestActionCallback = (requestCallbackType, code, requestId, userId, message) => {
@@ -10153,7 +10153,38 @@ class TUIRoomEngine {
                 options.requestCallback = () => { };
             }
             const { seatIndex, timeout, requestCallback } = options;
-            return yield this.JSCallNativeRequestFunctionPromise('takeSeat', seatIndex, timeout, requestCallback);
+            // isTakeSeatWithRequest: 本次 takeSeat 执行是否需要发送信令
+            // 自由发言模式下或者身份为主持人/管理员调用 takeSeat 时不需要发信令，直接进行身份转换，roomEngineWASM 返回 requestId 为 0
+            // 举手发言模式下普通用户调用 takeSeat 时需要发信令， roomEngineWASM 返回真实的 requestId, 用户可使用 requestId 取消上麦请求
+            let isTakeSeatWithRequest = true;
+            return new Promise((resolve, reject) => {
+                const requestIdCallback = (requestId) => {
+                    if (requestId === 0) {
+                        isTakeSeatWithRequest = false;
+                    }
+                    else {
+                        this.logger.info(`roomEngine.takeSeat success with requestId:`, requestId);
+                        resolve(requestId);
+                    }
+                };
+                const requestActionCallback = (requestCallbackType, code, requestId, userId, message) => {
+                    requestCallback({ requestCallbackType, requestId, userId, code, message });
+                    if (requestCallbackType === TUIRequestCallbackType.kRequestAccepted && !isTakeSeatWithRequest) {
+                        this.logger.info(`roomEngine.takeSeat success without request.`);
+                        resolve(0);
+                    }
+                    if (requestCallbackType === TUIRequestCallbackType.kRequestError) {
+                        reject(new TUIError({ code, message }));
+                    }
+                };
+                try {
+                    this.roomEngineWASM.takeSeat(seatIndex, timeout, requestIdCallback, requestActionCallback);
+                }
+                catch (error) {
+                    console.error(`roomEngine.takeSeat error. `, error.code, error.message);
+                    reject(new TUIError({ code: error.code || TUIErrorCode.ERR_FAILED, message: error.message }));
+                }
+            });
         });
     }
     /**

package/index.js CHANGED Viewed

@@ -9662,7 +9662,7 @@
         }
     }
-    var version = "1.0.0";
+    var version = "1.0.1-beta";
     const userAgent = navigator.userAgent.toLowerCase();
     const isElectron = userAgent.indexOf(' electron/') > -1;
@@ -10082,7 +10082,7 @@
             const requestCallback = args.splice(args.length - 1, 1)[0];
             return new Promise((resolve, reject) => {
                 const requestIdCallback = (requestId) => {
-                    this.logger.info(`roomEngine.${funcName} success`, requestId);
+                    this.logger.info(`roomEngine.${funcName} success with requestId:`, requestId);
                     resolve(requestId);
                 };
                 const requestActionCallback = (requestCallbackType, code, requestId, userId, message) => {
@@ -10160,7 +10160,38 @@
                     options.requestCallback = () => { };
                 }
                 const { seatIndex, timeout, requestCallback } = options;
-                return yield this.JSCallNativeRequestFunctionPromise('takeSeat', seatIndex, timeout, requestCallback);
+                // isTakeSeatWithRequest: 本次 takeSeat 执行是否需要发送信令
+                // 自由发言模式下或者身份为主持人/管理员调用 takeSeat 时不需要发信令，直接进行身份转换，roomEngineWASM 返回 requestId 为 0
+                // 举手发言模式下普通用户调用 takeSeat 时需要发信令， roomEngineWASM 返回真实的 requestId, 用户可使用 requestId 取消上麦请求
+                let isTakeSeatWithRequest = true;
+                return new Promise((resolve, reject) => {
+                    const requestIdCallback = (requestId) => {
+                        if (requestId === 0) {
+                            isTakeSeatWithRequest = false;
+                        }
+                        else {
+                            this.logger.info(`roomEngine.takeSeat success with requestId:`, requestId);
+                            resolve(requestId);
+                        }
+                    };
+                    const requestActionCallback = (requestCallbackType, code, requestId, userId, message) => {
+                        requestCallback({ requestCallbackType, requestId, userId, code, message });
+                        if (requestCallbackType === exports.TUIRequestCallbackType.kRequestAccepted && !isTakeSeatWithRequest) {
+                            this.logger.info(`roomEngine.takeSeat success without request.`);
+                            resolve(0);
+                        }
+                        if (requestCallbackType === exports.TUIRequestCallbackType.kRequestError) {
+                            reject(new TUIError({ code, message }));
+                        }
+                    };
+                    try {
+                        this.roomEngineWASM.takeSeat(seatIndex, timeout, requestIdCallback, requestActionCallback);
+                    }
+                    catch (error) {
+                        console.error(`roomEngine.takeSeat error. `, error.code, error.message);
+                        reject(new TUIError({ code: error.code || exports.TUIErrorCode.ERR_FAILED, message: error.message }));
+                    }
+                });
             });
         }
         /**

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tencentcloud/tuiroom-engine-js",
-  "version": "1.0.0",
+  "version": "1.0.1-beta",
   "description": "TUIRoomEngine Web SDK",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "rtc-detect": "^0.0.5",
     "tim-js-sdk": "^2.25.0",
-    "trtc-cloud-js-sdk": "^1.0.5",
+    "trtc-cloud-js-sdk": "1.0.7-beta",
     "tsignaling": "^0.10.0"
   }
 }