@tencentcloud/trtc-cloud-wx 0.0.18 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencentcloud/trtc-cloud-wx",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "",
   "main": "./trtc-cloud-wx.js",
   "type": "module",

package/trtc-cloud-wx.js

@@ -1150,13 +1150,13 @@ var Logger = /*#__PURE__*/function () {
 var logger = new Logger();
 
 var name = "@tencentcloud/trtc-cloud-wx";
-var version = "0.0.18";
+var version = "0.0.19";
 var description = "";
 var main = "dist/trtc-cloud-wx.js";
 var module$1 = "dist/trtc-cloud-wx.js";
 var type = "module";
 var scripts = {
-	build: "npm run clear && rollup -c",
+	build: "npm run clear && rollup -c && node ./build/copy_to_roomkit.js",
 	dev: "node ./build/chokidar.js",
 	clear: "node ./build/clear.js",
 	copy: "node ./build/copy.js",
@@ -1236,7 +1236,6 @@ var TRTCCloud = /*#__PURE__*/function () {
     this.userId = '';
     this.isEnterRoom = false;
     this.isVideoMuted = false;
-    this.isMicMuted = false;
     this.isOpenCamera = false;
     this.audioVolumeEvaluation = 0;
     this.allTimer = {};
@@ -1279,7 +1278,6 @@ var TRTCCloud = /*#__PURE__*/function () {
       this.userId = '';
       this.isEnterRoom = false;
       this.isVideoMuted = false;
-      this.isMicMuted = false;
       this.isOpenCamera = false;
       Object.keys(this.allTimer).forEach(function (key) {
         clearInterval(_this.allTimer[key]);
@@ -1296,6 +1294,9 @@ var TRTCCloud = /*#__PURE__*/function () {
           _this2.trtc.createPusher({});
           taskMachine.send(TaskQueueEvent.SETPROCESS);
         } else {
+          if (_this2.isEnterRoom) {
+            _this2.exitRoom();
+          }
           taskMachine.send(TaskQueueEvent.SETDONE);
         }
       });
@@ -1747,31 +1748,44 @@ var TRTCCloud = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              logger.info('muteLocalVideo with options: ', mute, streamType);
+              logger.info('muteLocalVideo called with options: ', mute, streamType);
               if (this.isOpenCamera) {
-                _context6.next = 3;
+                _context6.next = 4;
                 break;
               }
+              logger.info('muteLocalVideo early exit: isOpenCamera is false');
               return _context6.abrupt("return");
-            case 3:
+            case 4:
               _context6.t0 = streamType;
-              _context6.next = _context6.t0 === exports.TRTCVideoStreamType.TRTCVideoStreamTypeBig ? 6 : _context6.t0 === exports.TRTCVideoStreamType.TRTCVideoStreamTypeSub ? 6 : 11;
+              _context6.next = _context6.t0 === exports.TRTCVideoStreamType.TRTCVideoStreamTypeBig ? 7 : _context6.t0 === exports.TRTCVideoStreamType.TRTCVideoStreamTypeSub ? 7 : 20;
               break;
-            case 6:
+            case 7:
               this.isVideoMuted = mute;
-              _context6.next = 9;
+              logger.info('muteLocalVideo: isVideoMuted set to ', mute);
+              _context6.prev = 9;
+              _context6.next = 12;
               return this.setPusherAttributes({
                 videoPreview: mute,
                 enableCamera: !mute
               }, 'muteLocalVideo');
-            case 9:
+            case 12:
+              logger.info('muteLocalVideo: setPusherAttributes success');
+              _context6.next = 18;
+              break;
+            case 15:
+              _context6.prev = 15;
+              _context6.t1 = _context6["catch"](9);
+              logger.error('muteLocalVideo: setPusherAttributes failed with error ', _context6.t1);
+            case 18:
               logger.info('muteLocalVideo success');
-              return _context6.abrupt("break", 11);
-            case 11:
+              return _context6.abrupt("break", 21);
+            case 20:
+              logger.info('muteLocalVideo: streamType not supported ', streamType);
+            case 21:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this);
+        }, _callee6, this, [[9, 15]]);
       }));
     }
     /**
@@ -2000,7 +2014,6 @@ var TRTCCloud = /*#__PURE__*/function () {
     key: "startLocalAudio",
     value: function startLocalAudio(quality) {
       return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var _this12 = this;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -2011,26 +2024,18 @@ var TRTCCloud = /*#__PURE__*/function () {
               }
               throw new Error('Current role is audience, unable to access mic. Call switchRole to become a host.');
             case 3:
-              if (!this.isMicMuted) {
-                _context9.next = 5;
-                break;
-              }
-              throw new Error('The microphone has been muted. Please unmute it first.');
-            case 5:
-              _context9.next = 7;
-              return this.setPusherAttributes(function () {
-                return {
-                  enableMic: !_this12.isMicMuted
-                };
+              _context9.next = 5;
+              return this.setPusherAttributes({
+                enableMic: true
               }, 'startLocalAudio');
-            case 7:
+            case 5:
               logger.info('startLocalAudio success');
               this.emit('onMicDidReady');
               this.emit('onUserAudioAvailable', this.userId, 1);
               if (this.enterRoom) {
                 this.emit('onSendFirstLocalAudioFrame');
               }
-            case 11:
+            case 9:
             case "end":
               return _context9.stop();
           }
@@ -2066,20 +2071,39 @@ var TRTCCloud = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              logger.info('muteLocalAudio with options: ', mute);
-              _context11.next = 3;
+              logger.info('muteLocalAudio called with options: ', mute);
+              _context11.prev = 1;
+              _context11.next = 4;
               return this.setPusherAttributes({
-                enableMic: !mute
+                muted: mute
               }, 'muteLocalAudio');
-            case 3:
-              this.isMicMuted = mute;
-              logger.info('muteLocalAudio success');
+            case 4:
+              logger.info('setPusherAttributes executed successfully');
+              _context11.next = 11;
+              break;
+            case 7:
+              _context11.prev = 7;
+              _context11.t0 = _context11["catch"](1);
+              logger.error('Error in setPusherAttributes: ', _context11.t0);
+              throw _context11.t0;
+            case 11:
+              _context11.prev = 11;
               this.emit('onUserAudioAvailable', this.userId, mute === true ? 0 : 1);
-            case 6:
+              logger.info('onUserAudioAvailable event emitted successfully');
+              _context11.next = 20;
+              break;
+            case 16:
+              _context11.prev = 16;
+              _context11.t1 = _context11["catch"](11);
+              logger.error('Error in emitting onUserAudioAvailable event: ', _context11.t1);
+              throw _context11.t1;
+            case 20:
+              logger.info('muteLocalAudio execution finished');
+            case 21:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this);
+        }, _callee11, this, [[1, 7], [11, 16]]);
       }));
     }
   }, {
@@ -2102,17 +2126,17 @@ var TRTCCloud = /*#__PURE__*/function () {
   }, {
     key: "muteAllRemoteAudio",
     value: function muteAllRemoteAudio(mute) {
-      var _this13 = this;
+      var _this12 = this;
       logger.info('muteAllRemoteAudio with options: ', mute);
       var playerList = this.trtc.getPlayerList();
       playerList.forEach(function (player) {
         var streamId = player.streamID;
-        var playerAttributes = _this13.setTRTCPlayerAttributes(streamId, {
+        var playerAttributes = _this12.setTRTCPlayerAttributes(streamId, {
           muteAudio: mute
         });
-        _this13.InterfaceEventEmitter.emit('playerAttributesChange', {
+        _this12.InterfaceEventEmitter.emit('playerAttributesChange', {
           streamId: streamId,
-          view: _this13.renderMap.get(streamId),
+          view: _this12.renderMap.get(streamId),
           playerAttributes: playerAttributes,
           callback: function callback() {
             logger.info('muteAllRemoteAudio success');
@@ -2132,14 +2156,14 @@ var TRTCCloud = /*#__PURE__*/function () {
   }, {
     key: "switchCamera",
     value: function switchCamera(frontCamera) {
-      var _this14 = this;
+      var _this13 = this;
       logger.info('switchCamera with options: ', frontCamera);
       var pusher = this.trtc.getPusherInstance();
       if (frontCamera === (pusher.pusherAttributes.frontCamera === 'front')) return Promise.resolve();
       return new Promise(function (resolve, reject) {
         wx.createLivePusherContext().switchCamera({
           success: function success(event) {
-            return __awaiter(_this14, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+            return __awaiter(_this13, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
               return _regeneratorRuntime().wrap(function _callee12$(_context12) {
                 while (1) switch (_context12.prev = _context12.next) {
                   case 0:
@@ -2352,7 +2376,7 @@ var TRTCCloud = /*#__PURE__*/function () {
   }, {
     key: "setPusherAttributes",
     value: function setPusherAttributes(params, funName) {
-      var _this15 = this;
+      var _this14 = this;
       // 定义一个超时时间（以毫秒为单位）
       var timeoutDuration = 2000;
       var timeoutPromise = new Promise(function (resolve, reject) {
@@ -2365,13 +2389,13 @@ var TRTCCloud = /*#__PURE__*/function () {
           var pusher = {};
           switch (funName) {
             case 'enterRoom':
-              pusher = _this15.trtc.enterRoom(params);
+              pusher = _this14.trtc.enterRoom(params);
               break;
             default:
-              pusher = _this15.trtc.setPusherAttributes(params);
+              pusher = _this14.trtc.setPusherAttributes(params);
               break;
           }
-          _this15.InterfaceEventEmitter.emit('pusherAttributesChange', {
+          _this14.InterfaceEventEmitter.emit('pusherAttributesChange', {
             pusher: pusher,
             callback: function callback() {
               resolve(pusher);