fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/providers/screen-share/provider.electron.js

@@ -65,21 +65,21 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+import { trace } from 'agora-foundation/lib/decorator';
+import { jsonstring } from 'agora-foundation/lib/utilities/misc';
 import { AgoraRtcScreenScenarioType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrStreamType } from 'fcr-core';
 import { FcrScreenCaptureType } from 'fcr-core/lib/type';
+import { action } from 'mobx';
 import { FcrUIObjectKeys } from '../../object-manager';
+import { ExcludeWIndows } from '../../utilities/constant';
+import { screenCaptureClearityConfig, screenCaptureSmoothConfig } from '../../utilities/default-config';
+import { waitUntil } from '../../utilities/tools';
+import { ERROR_MESSAGE_ABORTED } from './constant';
 import { FcrUIScreenShareProviderBase } from './provider.base';
 import { FcrUIElectronScreenShareStrategy } from './strategy/electron';
 import { FcrUIScreenShareErrorCode } from './struct';
-import { trace } from 'agora-foundation/lib/decorator';
-import { jsonstring } from 'agora-foundation/lib/utilities/misc';
-import { waitUntil } from '../../utilities/tools';
-import { ExcludeWIndows } from '../../utilities/constant';
-import { screenCaptureSmoothConfig, screenCaptureClearityConfig } from '../../utilities/default-config';
-import { action } from 'mobx';
-import { transI18n } from 'agora-ui-foundation/lib/i18n';
-import { ERROR_MESSAGE_ABORTED } from './constant';
 export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenShareProv) {
   function FcrUIScreenShareProviderImpl(objectManager) {
     var _this;
@@ -162,7 +162,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
     key: "startShare",
     value: function () {
       var _startShare = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref) {
-        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, aborted, abortController, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
+        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, errorPayload, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, aborted, abortController, shareDimensions, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
         return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -171,19 +171,23 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 streamType: FcrStreamType.BOTH,
                 videoSourceId: videoSourceId
               };
-              screenTrack = this.strategy.getScreenTrack(); // check if there's a screen track exists
+              screenTrack = this.strategy.getScreenTrack();
+              errorPayload = {
+                videoSourceId: videoSourceId,
+                captureType: captureType
+              }; // check if there's a screen track exists
               if (!screenTrack) {
                 _context3.next = 1;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT, errorPayload);
               throw new Error('cannot start screen share twice: screen track already exists');
             case 1:
               if (!this._screenStreamSync.checkIfMyScreenShareStreamExists()) {
                 _context3.next = 2;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CONFLICT, errorPayload);
               throw new Error('cannot start screen share twice: my screen stream already exists');
             case 2:
               // check if screen capture permission is granted
@@ -192,7 +196,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 _context3.next = 3;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_SCREEN_RECORDING_PERMISSION);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_SCREEN_RECORDING_PERMISSION, errorPayload);
               throw new Error('no screen recording permission');
             case 3:
               // check if screen sharing is permitted
@@ -201,7 +205,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 _context3.next = 4;
                 break;
               }
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_PUBLISH_PRIVILIGE);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.NO_PUBLISH_PRIVILIGE, errorPayload);
               throw new Error('no screen sharing permission');
             case 4:
               audioSourceId = this.strategy.getLoopbackDeviceId();
@@ -217,18 +221,20 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
               abortController.signal.addEventListener('abort', function () {
                 aborted = true;
               });
-
-              // create screen stream
+              shareDimensions = {
+                width: this.selectionBounds.width,
+                height: this.selectionBounds.height
+              }; // create screen stream
               _context3.prev = 5;
               _context3.next = 6;
-              return this._screenStreamSync.startScreenStream(createConfig, encoderConfig);
+              return this._screenStreamSync.startScreenStream(createConfig, encoderConfig, shareDimensions);
             case 6:
               _context3.next = 8;
               break;
             case 7:
               _context3.prev = 7;
               _t = _context3["catch"](5);
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_CREATE_STREAM);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_CREATE_STREAM, errorPayload);
               throw new Error("cannot create screen stream, error: ".concat(_t));
             case 8:
               _context3.prev = 8;
@@ -259,9 +265,9 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
               _context3.prev = 12;
               _t2 = _context3["catch"](8);
               if (_t2 instanceof Error && _t2.message === ERROR_MESSAGE_ABORTED) {
-                this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.ABORT_START_SCREEN_CAPTURE);
+                this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.ABORT_START_SCREEN_CAPTURE, errorPayload);
               } else {
-                this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE);
+                this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE, errorPayload);
               }
               throw new Error("cannot start screen capture, error: ".concat(_t2));
             case 13:
@@ -298,6 +304,9 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
               _context4.next = 1;
               return this._screenStreamSync.stopScreenStream();
             case 1:
+              // 通知主进程屏幕共享已关闭，支持显示主窗口
+              this._renderer.setMainWindowDisplaySupport(true);
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -312,12 +321,16 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
     key: "replaceShare",
     value: function () {
       var _replaceShare = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref2) {
-        var videoSourceId, captureType, screenTrack, excludeWindows, encoderConfig, dimensions, frameRate, bitrate, _t3;
+        var videoSourceId, captureType, screenTrack, errorPayload, excludeWindows, encoderConfig, dimensions, frameRate, bitrate, _t3;
         return _regeneratorRuntime.wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               videoSourceId = _ref2.videoSourceId, captureType = _ref2.captureType;
               screenTrack = this.strategy.getScreenTrack();
+              errorPayload = {
+                videoSourceId: videoSourceId,
+                captureType: captureType
+              };
               if (!screenTrack) {
                 _context5.next = 1;
                 break;
@@ -329,17 +342,15 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
               this.logger.info("the new source id ".concat(videoSourceId, " is the same as the current one, no need to replace"));
               return _context5.abrupt("return");
             case 1:
-              _context5.next = 2;
-              return this.strategy.stopLoopbackCapture();
-            case 2:
+              this.strategy.stopLoopbackCapture();
               this._sharingDisplayBounds = this.findSharingDisplayBounds();
-              _context5.next = 3;
+              _context5.next = 2;
               return this._getExcludeWindows();
-            case 3:
+            case 2:
               excludeWindows = _context5.sent;
               encoderConfig = this._getEncoderConfig();
               dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
-              _context5.next = 4;
+              _context5.next = 3;
               return this.strategy.replaceScreenCaptureSource({
                 sourceId: videoSourceId,
                 captureType: captureType,
@@ -348,33 +359,33 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
                 frameRate: frameRate,
                 bitrate: bitrate
               });
-            case 4:
+            case 3:
               if (!this._isSharingWithAudio) {
-                _context5.next = 5;
+                _context5.next = 4;
                 break;
               }
-              _context5.next = 5;
+              _context5.next = 4;
               return this.strategy.startLoopbackCapture({});
-            case 5:
-              _context5.prev = 5;
-              _context5.next = 6;
+            case 4:
+              _context5.prev = 4;
+              _context5.next = 5;
               return this._screenStreamSync.updateStream({
                 videoSourceId: videoSourceId
               });
-            case 6:
-              _context5.next = 8;
+            case 5:
+              _context5.next = 7;
               break;
-            case 7:
-              _context5.prev = 7;
-              _t3 = _context5["catch"](5);
-              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_UPDATE_STREAM);
+            case 6:
+              _context5.prev = 6;
+              _t3 = _context5["catch"](4);
+              this.observable.notifyObservers('onScreenShareErrorOccurred', FcrUIScreenShareErrorCode.CANNOT_UPDATE_STREAM, errorPayload);
               this.logger.error("cannot update screen stream, error: ".concat(_t3));
               throw _t3;
-            case 8:
+            case 7:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[5, 7]]);
+        }, _callee5, this, [[4, 6]]);
       }));
       function replaceShare(_x2) {
         return _replaceShare.apply(this, arguments);
@@ -427,7 +438,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
               windowNames = [];
               _context6.next = 1;
               return waitUntil(function () {
-                var windowsIds = _this3._renderer.getMediaSourcesIdByTitle(['Control Bar', 'Video Window', 'Annotation', 'Annotation tool bar', 'Subtitles History']);
+                var windowsIds = _this3._renderer.getMediaSourcesIdByTitle(['Control Bar', 'Video Window', 'Annotation mask', 'Annotation toolbar', 'Subtitles History']);
                 windowsIds === null || windowsIds === void 0 || windowsIds.forEach(function (windowInfo) {
                   var windowName = windowInfo.windowName,
                     windowId = windowInfo.windowId;
@@ -473,8 +484,7 @@ export var FcrUIScreenShareProviderImpl = /*#__PURE__*/function (_FcrUIScreenSha
       return {
         dimensions: dimensions,
         frameRate: frameRate,
-        bitrate: bitrate,
-        isMirror: false
+        bitrate: bitrate
       };
     }
   }]);

package/lib-es/providers/screen-share/strategy/electron.js

@@ -148,6 +148,8 @@ export var FcrUIElectronScreenShareStrategy = /*#__PURE__*/function (_FcrUIScree
       }
       if (this._screenTrack) {
         this._stopTrackAndWaitUntilSuccess(this._screenTrack);
+      } else {
+        this.logger.warn('no screen track to stop');
       }
     }
   }, {
@@ -238,6 +240,7 @@ export var FcrUIElectronScreenShareStrategy = /*#__PURE__*/function (_FcrUIScree
           bitrate,
           abortController,
           p,
+          errorCode,
           _args3 = arguments;
         return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -289,10 +292,22 @@ export var FcrUIElectronScreenShareStrategy = /*#__PURE__*/function (_FcrUIScree
                 frameRate: frameRate,
                 bitrate: bitrate
               });
-              screenTrack.start(captureType, excludeWindows);
-              _context3.next = 2;
-              return p;
+
+              // const state = screenTrack.getState();
+
+              // this.logger.info(`track state before start: ${state}`);
+              errorCode = screenTrack.start(captureType, excludeWindows);
+              if (!(errorCode !== 0)) {
+                _context3.next = 2;
+                break;
+              }
+              screenTrack.stop();
+              screenTrack.removeObserver(this._screenTrackObserver);
+              throw new Error('screen capture cannot start and returned non-zero code');
             case 2:
+              _context3.next = 3;
+              return p;
+            case 3:
             case "end":
               return _context3.stop();
           }

package/lib-es/providers/screen-share/stream-state-sync.js

@@ -103,7 +103,7 @@ export var FcrUIScreenStreamSync = /*#__PURE__*/function () {
   }, {
     key: "startScreenStream",
     value: function () {
-      var _startScreenStream = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(createConfig, encoderConfig) {
+      var _startScreenStream = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(createConfig, encoderConfig, shareDimensions) {
         var streamId, screenStreamId, _t;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -118,7 +118,7 @@ export var FcrUIScreenStreamSync = /*#__PURE__*/function () {
               this._isStopped = false;
               _context.prev = 2;
               _context.next = 3;
-              return this._sharingControl.startScreenSharing(createConfig, encoderConfig.dimensions);
+              return this._sharingControl.startScreenSharing(createConfig, shareDimensions);
             case 3:
               screenStreamId = _context.sent;
               this._streamControl.setVideoEncoderConfig(screenStreamId, encoderConfig, FcrVideoStreamType.HIGH_STREAM);
@@ -134,7 +134,7 @@ export var FcrUIScreenStreamSync = /*#__PURE__*/function () {
           }
         }, _callee, this, [[2, 4]]);
       }));
-      function startScreenStream(_x, _x2) {
+      function startScreenStream(_x, _x2, _x3) {
         return _startScreenStream.apply(this, arguments);
       }
       return startScreenStream;
@@ -293,7 +293,7 @@ export var FcrUIScreenStreamSync = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function updateStream(_x3) {
+      function updateStream(_x4) {
         return _updateStream.apply(this, arguments);
       }
       return updateStream;

package/lib-es/providers/stt-provider/stt-provider.js

@@ -1,23 +1,3 @@
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.symbol.description.js";
-import "core-js/modules/es.symbol.to-primitive.js";
-import "core-js/modules/es.error.cause.js";
-import "core-js/modules/es.error.to-string.js";
-import "core-js/modules/es.array.filter.js";
-import "core-js/modules/es.array.is-array.js";
-import "core-js/modules/es.date.to-primitive.js";
-import "core-js/modules/es.function.bind.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.number.constructor.js";
-import "core-js/modules/es.object.create.js";
-import "core-js/modules/es.object.define-properties.js";
-import "core-js/modules/es.object.define-property.js";
-import "core-js/modules/es.object.get-own-property-descriptor.js";
-import "core-js/modules/es.object.get-own-property-descriptors.js";
-import "core-js/modules/es.object.keys.js";
-import "core-js/modules/esnext.function.metadata.js";
-import "core-js/modules/esnext.iterator.filter.js";
-import "core-js/modules/esnext.symbol.metadata.js";
 import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
@@ -29,22 +9,51 @@ var _initProto, _init__captionState, _init__transcribingState, _init__openOrStop
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.to-primitive.js";
+import "core-js/modules/es.error.cause.js";
+import "core-js/modules/es.error.to-string.js";
 import "core-js/modules/es.array.concat.js";
+import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.array.find-index.js";
 import "core-js/modules/es.array.find-last-index.js";
 import "core-js/modules/es.array.for-each.js";
 import "core-js/modules/es.array.includes.js";
+import "core-js/modules/es.array.is-array.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/es.array.splice.js";
 import "core-js/modules/es.date.now.js";
+import "core-js/modules/es.date.to-primitive.js";
+import "core-js/modules/es.function.bind.js";
+import "core-js/modules/es.function.name.js";
 import "core-js/modules/es.map.js";
+import "core-js/modules/es.number.constructor.js";
+import "core-js/modules/es.object.create.js";
+import "core-js/modules/es.object.define-properties.js";
+import "core-js/modules/es.object.define-property.js";
+import "core-js/modules/es.object.get-own-property-descriptor.js";
+import "core-js/modules/es.object.get-own-property-descriptors.js";
+import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.string.includes.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/es.weak-map.js";
+import "core-js/modules/esnext.function.metadata.js";
 import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.map.delete-all.js";
 import "core-js/modules/esnext.map.emplace.js";
@@ -60,21 +69,13 @@ import "core-js/modules/esnext.map.merge.js";
 import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
+import "core-js/modules/esnext.symbol.metadata.js";
 import "core-js/modules/esnext.weak-map.delete-all.js";
 import "core-js/modules/esnext.weak-map.emplace.js";
 import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/web.dom-collections.iterator.js";
-function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
-function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
-function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
-function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
-function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-import { AgoraObservable, bound, createLogger, get } from 'fcr-core/lib/imports';
+import { AgoraObservable, bound, get } from 'fcr-core/lib/imports';
+import { createLogger } from '../../utilities/logger';
 import { FcrCaptionState, FcrTranscribingState } from 'fcr-core/lib/room-control/stt-control/type';
 import { FcrLanguage, FcrPrivilegeUserRole, FcrSecurityAction, FcrUserRole } from 'fcr-core/lib/type';
 import { observable, reaction, runInAction } from 'mobx';
@@ -83,6 +84,7 @@ import { FcrUISessionKey } from '../../modules/participant/type';
 import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { SourceLanguageMapGenerateI18nKey } from '../../modules/components/caption-menu/translation-setting-options';
 import { ORIGIN } from '../../shared-data/interpreter';
+import { FcrUIToastKey } from '../../modules/toast-manager/type';
 var createSentence = function createSentence(id, userId, transcript, translation) {
   return {
     type: 'sentence',
@@ -93,6 +95,15 @@ var createSentence = function createSentence(id, userId, transcript, translation
     startTs: transcript.timestamp
   };
 };
+var createAction = function createAction(actionType) {
+  var now = Date.now();
+  return {
+    type: 'action',
+    id: "".concat(actionType, "-").concat(now),
+    actionType: actionType,
+    startTs: now
+  };
+};
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -139,44 +150,12 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
         if (isSelfOperator) {
           return;
         }
-
-        // 主持人或联合主持人显示允许开启、关闭(字幕、转写)的提示
-        if (isHostOrCohost) {
+        if (!isHostOrCohost && targetRoles !== null && targetRoles !== void 0 && targetRoles.includes(selfRole)) {
           var _securityInfo$info;
-          switch ((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) {
-            case FcrSecurityAction.SttStartTranscribe:
-              _this._messageProvider.showToast({
-                type: 'normal',
-                message: enable ? transI18n('fmt_ai_rtt_toast_host_enabled_rtt') : transI18n('fmt_ai_rtt_toast_host_not_permitted_start_stop_rtt')
-              });
-              break;
-            case FcrSecurityAction.SttStartCaption:
-              _this._messageProvider.showToast({
-                type: 'normal',
-                message: enable ? transI18n('fmt_ai_subtitles_toast_host_enabled_captions') : transI18n('fmt_ai_subtitles_toast_host_disabled_subtitles')
-              });
-              break;
-          }
-        } else if (targetRoles !== null && targetRoles !== void 0 && targetRoles.includes(selfRole)) {
-          var _securityInfo$info2;
           // 普通与会者只在主持人或联合主持人禁止使用, 且自己正在使用时, 才显示提示
-          switch ((_securityInfo$info2 = securityInfo.info) === null || _securityInfo$info2 === void 0 ? void 0 : _securityInfo$info2.action) {
-            case FcrSecurityAction.SttStartTranscribe:
-              if (!enable && _this.transcribingState) {
-                _this._messageProvider.showToast({
-                  type: 'normal',
-                  message: transI18n('fmt_ai_rtt_toast_host_not_permitted_start_stop_rtt')
-                });
-              }
-              break;
+          switch ((_securityInfo$info = securityInfo.info) === null || _securityInfo$info === void 0 ? void 0 : _securityInfo$info.action) {
             case FcrSecurityAction.SttStartCaption:
               if (!enable && _this.captionState) {
-                _this._messageProvider.showToast({
-                  type: 'normal',
-                  message: transI18n('fmt_ai_subtitles_toast_host_disabled_subtitles')
-                });
-
-                // 主持人或联合主持人在安全中不允许使用字幕时, 停止字幕
                 _this.stopCaption(true);
               }
               break;
@@ -210,6 +189,8 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
       onTranscribingStateUpdated: function onTranscribingStateUpdated(roomId, state, operatorUser) {
         runInAction(function () {
           _this._transcribingState = state === FcrTranscribingState.STARTED;
+          var action = createAction(_this._transcribingState ? FcrUISttActionType.START_TRANSCRIBING : FcrUISttActionType.STOP_TRANSCRIBING);
+          _this._transcribingList.push(action);
           if (operatorUser) {
             _this._openOrStopTranscribingUser = operatorUser;
           } else {
@@ -231,21 +212,17 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
         } else {
           _this._sourceLanguage = sourceLanguage;
           var reason2 = SourceLanguageMapGenerateI18nKey[sourceLanguage];
-          var message = '';
-          if ((operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === _this._localUserId) {
-            message = transI18n('fmt_ai_subtitles_toast_change_language_self', {
-              reason1: reason2 ? transI18n(reason2) : sourceLanguage
-            });
-          } else {
-            message = transI18n('fmt_ai_subtitles_toast_change_language_attendees', {
-              reason1: operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userName,
-              reason2: reason2 ? transI18n(reason2) : sourceLanguage
-            });
-          }
-          _this._messageProvider.showToast({
-            type: 'normal',
-            message: message,
-            duration: 2000
+          var isSelf = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === _this._localUserId;
+          _this._messageProvider.showToastByKey({
+            key: isSelf ? FcrUIToastKey.FMT_AI_SUBTITLES_TOAST_CHANGE_LANGUAGE_SELF : FcrUIToastKey.FMT_AI_SUBTITLES_TOAST_CHANGE_LANGUAGE_ATTENDEES,
+            params: {
+              transI18nOptions: isSelf ? {
+                reason1: reason2 ? transI18n(reason2) : sourceLanguage
+              } : {
+                reason1: operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userName,
+                reason2: reason2 ? transI18n(reason2) : sourceLanguage
+              }
+            }
           });
         }
       }
@@ -279,6 +256,10 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
     this._interpreterDataSource = sharedInterpreterDataSource;
     this._captionState = this._sttControl.getLocalCaptionState() === FcrCaptionState.STARTED;
     this._transcribingState = this._sttControl.getTranscribingState() === FcrTranscribingState.STARTED;
+    if (this._transcribingState) {
+      var action = createAction(FcrUISttActionType.START_TRANSCRIBING);
+      this._transcribingList.push(action);
+    }
     this._openOrStopTranscribingUser = null;
     this._hasEverEnabledTranscribing = roomControl.getRoomPropertiesByKeyPath('stt.transcribingChanged') === true;
     var config = this._sttControl.getConfig();
@@ -579,10 +560,8 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
               return this._sttControl.stopCaption();
             case 1:
               if (!isCallbackTriggered) {
-                this._messageProvider.showToast({
-                  type: 'normal',
-                  message: transI18n('fmt_ai_subtitles_toast_you_turned_off_subtitles'),
-                  duration: 2000
+                this._messageProvider.showToastByKey({
+                  key: FcrUIToastKey.FMT_AI_SUBTITLES_TOAST_YOU_TURNED_OFF_SUBTITLES
                 });
               }
               this._isCaptionOpening = false;
@@ -857,7 +836,7 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
     key: "_subscribeTranslateLanguage",
     value: function () {
       var _subscribeTranslateLanguage3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(language) {
-        var previous, now, sentence, _t;
+        var previous, _t;
         return _regeneratorRuntime.wrap(function (_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -870,14 +849,6 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
               return _context9.abrupt("return");
             case 1:
               this._translateLanguage = language;
-              now = Date.now();
-              sentence = {
-                type: 'action',
-                id: "".concat(FcrUISttActionType.START_TRANSLATION, "-").concat(now),
-                actionType: FcrUISttActionType.START_TRANSLATION,
-                startTs: now
-              };
-              this._transcribingList.push(sentence);
               _context9.prev = 2;
               _context9.next = 3;
               return this._sttControl.subscribeTranscribingLanguage(language);
@@ -906,7 +877,7 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
     key: "_unsubscribeTranslateLanguage",
     value: function () {
       var _unsubscribeTranslateLanguage2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0() {
-        var previous, now, sentence, _t2;
+        var previous, _t2;
         return _regeneratorRuntime.wrap(function (_context0) {
           while (1) switch (_context0.prev = _context0.next) {
             case 0:
@@ -919,14 +890,6 @@ export var FcrUISttProviderImpl = /*#__PURE__*/function () {
               return _context0.abrupt("return");
             case 1:
               this._translateLanguage = null;
-              now = Date.now();
-              sentence = {
-                type: 'action',
-                id: "".concat(FcrUISttActionType.STOP_TRANSLATION, "-").concat(now),
-                actionType: FcrUISttActionType.STOP_TRANSLATION,
-                startTs: now
-              };
-              this._transcribingList.push(sentence);
               _context0.prev = 2;
               _context0.next = 3;
               return this._sttControl.unsubscribeTranscribingLanguage();

package/lib-es/providers/stt-provider/type.js

@@ -4,8 +4,10 @@ export var FcrUISttConstants = {
 
 /** 转写动作类型 */
 export var FcrUISttActionType = /*#__PURE__*/function (FcrUISttActionType) {
-  FcrUISttActionType["START_TRANSLATION"] = "START_TRANSLATION";
-  FcrUISttActionType["STOP_TRANSLATION"] = "STOP_TRANSLATION";
+  /** 开始转写 */
+  FcrUISttActionType["START_TRANSCRIBING"] = "START_TRANSCRIBING";
+  /** 停止转写 */
+  FcrUISttActionType["STOP_TRANSCRIBING"] = "STOP_TRANSCRIBING";
   return FcrUISttActionType;
 }({});