fcr-core 3.8.0-alpha → 3.8.1-alpha

package/lib/room-control/stt-control/index.js

@@ -1,9 +1,6 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
@@ -28,8 +25,6 @@ require("core-js/modules/esnext.map.merge.js");
 require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("../../imports");
 var _logger = require("../../utilities/logger");
 var _schema = require("../../schema");
@@ -39,10 +34,7 @@ var _type2 = require("../../type");
 var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
 var _user = require("../../utilities/user");
 var _type3 = require("../type");
-var _FcrSttControlImpl;
-let _initProto, _startCaptionDecs, _startTranscribingDecs, _updateSourceLanguageDecs, _subscribeTranscribingLanguageDecs, _ref;
-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) { (0, _defineProperty2.default)(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; }
+let _initProto, _startCaptionDecs, _startTranscribingDecs, _updateSourceLanguageDecs, _subscribeTranscribingLanguageDecs;
 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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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); }
@@ -51,84 +43,88 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 /**
  * @internal
  */
-_ref = (_startCaptionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageConfigSchema)], _startTranscribingDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageConfigSchema)], _updateSourceLanguageDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageSchema)], _subscribeTranscribingLanguageDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageSchema)], "logger");
 class FcrSttControlImpl {
-  constructor(_scene, _api, _sharedCache) {
-    //@internal
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrUserControlImpl'
-    })));
-    //@internal
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_cacheMaxLimit", 10);
-    (0, _defineProperty2.default)(this, "_sttEventWrapperListMap", new Map());
-    //@internal
-    (0, _defineProperty2.default)(this, "_sceneObserver", {
-      onStreamMessageReceived: async (sceneId, data) => {
-        const sttUids = this._scene.getScenePropertiesByKeyPath('widgets.stt.extra.pubBotUids');
-        const isSttBot = sttUids.includes(Number(data.streamId));
-        if (!isSttBot) {
-          return;
+  static {
+    [_initProto] = _applyDecs(this, [[_startCaptionDecs, 2, "startCaption"], [_imports.trace, 2, "stopCaption"], [_startTranscribingDecs, 2, "startTranscribing"], [_imports.trace, 2, "stopTranscribing"], [_updateSourceLanguageDecs, 2, "updateSourceLanguage"], [_subscribeTranscribingLanguageDecs, 2, "subscribeTranscribingLanguage"], [_imports.trace, 2, "unsubscribeTranscribingLanguage"], [_imports.trace, 2, "release"]], []).e;
+  }
+  //@internal
+  [(_startCaptionDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageConfigSchema)], _startTranscribingDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageConfigSchema)], _updateSourceLanguageDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageSchema)], _subscribeTranscribingLanguageDecs = [_imports.trace, (0, _validateParams.default)(_schema.fcrLanguageSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrUserControlImpl'
+  }));
+
+  //@internal
+  _observable = new _imports.AgoraObservable();
+
+  //@internal
+
+  _cacheMaxLimit = 10;
+  _sttEventWrapperListMap = new Map();
+
+  //@internal
+  _sceneObserver = {
+    onStreamMessageReceived: async (sceneId, data) => {
+      const sttUids = this._scene.getScenePropertiesByKeyPath('widgets.stt.extra.pubBotUids');
+      const isSttBot = sttUids.includes(Number(data.streamId));
+      if (!isSttBot) {
+        return;
+      }
+      const sttStreamMessageData = await (0, _imports.deCompressGzipToJson)(data.payload);
+      this._handleSttStreamMessageData(sttStreamMessageData, sceneId);
+    },
+    onUserPropertiesUpdated: (sceneId, event) => {
+      if (event.cause && event.cause.data) {
+        const causeData = event.cause.data;
+        if (causeData.widgetUuid == _type3.FcrWidgetUuid.STT && causeData.widgetCause && causeData.widgetCause.cmd == 3450) {
+          const localUserId = this._scene.localUser.getLocalUserId();
+          if (event.operatorUser.userId !== localUserId) {
+            return;
+          }
+          const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
+          if (causeData.widgetCause.reason === 0) {
+            const isTranscribingStopped = this._getTranscribingState() === _type.FcrTranscribingState.STOPPED;
+            if (isTranscribingStopped) {
+              this._sttEventWrapperListMap.clear();
+            }
+            this._observable.notifyObservers('onLocalCaptionStateUpdated', sceneId, _type.FcrCaptionState.STOPPED, operatorUser);
+          }
+          if (causeData.widgetCause.reason === 1) {
+            this._observable.notifyObservers('onLocalCaptionStateUpdated', sceneId, _type.FcrCaptionState.STARTED, operatorUser);
+          }
         }
-        const sttreamMessagetData = await (0, _imports.deCompressGzipToJson)(data.payload);
-        const sttEvent = this._parseSTT(sttreamMessagetData);
-        if (sttEvent) {
-          this._observable.notifyObservers('onSttEventReceived', sceneId, sttEvent);
+      }
+    },
+    onScenePropertiesUpdated: (sceneId, event) => {
+      if (event.cause && event.cause.data) {
+        const causeData = event.cause.data;
+        if (!causeData.widgetCause) {
+          return;
         }
-      },
-      onUserPropertiesUpdated: (sceneId, event) => {
-        if (event.cause && event.cause.data) {
-          const causeData = event.cause.data;
-          if (causeData.widgetUuid == _type3.FcrWidgetUuid.STT && causeData.widgetCause && causeData.widgetCause.cmd == 3450) {
-            const localUserId = this._scene.localUser.getLocalUserId();
-            if (event.operatorUser.userId !== localUserId) {
-              return;
-            }
-            const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
-            if (causeData.widgetCause.reason === 0) {
-              const isTranscribingStopped = this._getTranscribingState() === _type.FcrTranscribingState.STOPPED;
-              if (isTranscribingStopped) {
-                this._sttEventWrapperListMap.clear();
-              }
-              this._observable.notifyObservers('onLocalCaptionStateUpdated', sceneId, _type.FcrCaptionState.STOPPED, operatorUser);
-            }
-            if (causeData.widgetCause.reason === 1) {
-              this._observable.notifyObservers('onLocalCaptionStateUpdated', sceneId, _type.FcrCaptionState.STARTED, operatorUser);
+        if (causeData.widgetUuid == _type3.FcrWidgetUuid.TRANSCRIBE && causeData.widgetCause.cmd == _type3.FcrWidgetCauseCmd.TRANSCRIBE) {
+          const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
+          if (causeData.widgetCause.reason === 0) {
+            const isCaptionStopped = this._getLocalCaptionState() === _type.FcrCaptionState.STOPPED;
+            if (isCaptionStopped) {
+              this._sttEventWrapperListMap.clear();
             }
+            this._observable.notifyObservers('onTranscribingStateUpdated', sceneId, _type.FcrTranscribingState.STOPPED, operatorUser);
           }
-        }
-      },
-      onScenePropertiesUpdated: (sceneId, event) => {
-        if (event.cause && event.cause.data) {
-          const causeData = event.cause.data;
-          if (!causeData.widgetCause) {
-            return;
+          if (causeData.widgetCause.reason === 1) {
+            this._observable.notifyObservers('onTranscribingStateUpdated', sceneId, _type.FcrTranscribingState.STARTED, operatorUser);
           }
-          if (causeData.widgetUuid == _type3.FcrWidgetUuid.TRANSCRIBE && causeData.widgetCause.cmd == _type3.FcrWidgetCauseCmd.TRANSCRIBE) {
-            const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
-            if (causeData.widgetCause.reason === 0) {
-              const isCaptionStopped = this._getLocalCaptionState() === _type.FcrCaptionState.STOPPED;
-              if (isCaptionStopped) {
-                this._sttEventWrapperListMap.clear();
-              }
-              this._observable.notifyObservers('onTranscribingStateUpdated', sceneId, _type.FcrTranscribingState.STOPPED, operatorUser);
-            }
-            if (causeData.widgetCause.reason === 1) {
-              this._observable.notifyObservers('onTranscribingStateUpdated', sceneId, _type.FcrTranscribingState.STARTED, operatorUser);
-            }
+        }
+        if (causeData.widgetUuid == _type3.FcrWidgetUuid.STT && causeData.widgetCause.cmd == _type3.FcrWidgetCauseCmd.STT) {
+          let operatorUser;
+          if (event.operatorUser) {
+            operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
           }
-          if (causeData.widgetUuid == _type3.FcrWidgetUuid.STT && causeData.widgetCause.cmd == _type3.FcrWidgetCauseCmd.STT) {
-            let operatorUser;
-            if (event.operatorUser) {
-              operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
-            }
-            if (causeData.widgetCause.reason === 2) {
-              this._observable.notifyObservers('onSourceLanguageUpdated', sceneId, operatorUser);
-            }
+          if (causeData.widgetCause.reason === 2) {
+            this._observable.notifyObservers('onSourceLanguageUpdated', sceneId, operatorUser);
           }
         }
       }
-    });
+    }
+  };
+  constructor(_scene, _api, _sharedCache) {
     this._scene = _scene;
     this._api = _api;
     this._sharedCache = _sharedCache;
@@ -225,8 +221,7 @@ class FcrSttControlImpl {
   _getTranscribingState() {
     return this._scene.getScenePropertiesByKeyPath('widgets.transcribe.state');
   }
-  _parseSTT(sttreamMessagetData) {
-    var _this$_scene$getStrea;
+  _handleSttStreamMessageData(sttStreamMessageData, sceneId) {
     const codeMap = {
       'zh-CN': _type2.FcrLanguage.ZH,
       'en-US': _type2.FcrLanguage.EN,
@@ -236,15 +231,15 @@ class FcrSttControlImpl {
       'pt-PT': _type2.FcrLanguage.PT,
       'es-ES': _type2.FcrLanguage.ES
     };
-    const transcript = sttreamMessagetData.transcript;
-    const translation = sttreamMessagetData.translation;
+    const transcript = sttStreamMessageData.transcript;
+    const translation = sttStreamMessageData.translation;
     const messageItem = transcript || translation;
-    const uid = messageItem === null || messageItem === void 0 ? void 0 : messageItem.uid;
+    const uid = messageItem?.uid;
     if (!uid) {
       this.logger.error('parseSTT failed, uid is null');
       return null;
     }
-    const owner = (_this$_scene$getStrea = this._scene.getStreamByStreamId(uid.toString())) === null || _this$_scene$getStrea === void 0 ? void 0 : _this$_scene$getStrea.owner;
+    const owner = this._scene.getStreamByStreamId(uid.toString())?.owner;
     if (!owner) {
       this.logger.error('parseSTT failed, owner is null');
       return null;
@@ -276,6 +271,7 @@ class FcrSttControlImpl {
           }
         };
         sttEventWrapperList = [sttEventWrapper];
+        this._observable.notifyObservers('onSttEventReceived', sceneId, sttEventWrapper.event);
       } else {
         const lastSttEventWrapper = sttEventWrapperList[sttEventWrapperList.length - 1];
         // add
@@ -294,42 +290,48 @@ class FcrSttControlImpl {
             // remove oldest
             sttEventWrapperList.shift();
           }
+          this._observable.notifyObservers('onSttEventReceived', sceneId, sttEventWrapper.event);
         } else {
           if (transcript.textTs >= lastSttEventWrapper.endTs) {
             // update
             sttEventWrapperList[sttEventWrapperList.length - 1] = {
-              startTs: lastSttEventWrapper.endTs,
+              startTs: lastSttEventWrapper.startTs,
               endTs: transcript.textTs,
               event: (0, _imports.merge)(lastSttEventWrapper.event, {
-                transcript: _objectSpread(_objectSpread({}, formatTranscript), {}, {
+                transcript: {
+                  ...formatTranscript,
                   id: lastSttEventWrapper.event.transcript.id
-                })
+                }
               })
             };
+            this._observable.notifyObservers('onSttEventReceived', sceneId, sttEventWrapperList[sttEventWrapperList.length - 1].event);
           }
         }
       }
     }
     if (translation) {
-      var _sttEventWrapperList;
       // 获取缓存句子
-      sttEventWrapperList = (_sttEventWrapperList = sttEventWrapperList) === null || _sttEventWrapperList === void 0 ? void 0 : _sttEventWrapperList.map(wrapper => {
+      sttEventWrapperList = sttEventWrapperList?.map(wrapper => {
+        const language = codeMap[translation.results0.language];
         const formatTranslation = {
           id: wrapper.event.transcript.id,
-          language: codeMap[translation.results0.language],
+          language,
           text: translation.results0.texts.join(''),
           timestamp: translation.textTs,
           isFinal: translation.isFinal,
           owner: (0, _user.convertRteUserToFcrUser)(owner, this._roomCache)
         };
         if (translation.textTs > wrapper.startTs && translation.textTs <= wrapper.endTs) {
-          const transInfo = wrapper.event.translations.get(translation.results0.language);
+          const transInfo = wrapper.event.translations.get(language);
           if (!transInfo) {
             wrapper.event.translations.set(formatTranslation.language, formatTranslation);
+            this._observable.notifyObservers('onSttEventReceived', sceneId, wrapper.event);
           } else if (translation.textTs >= transInfo.timestamp) {
-            wrapper.event.translations.set(formatTranslation.language, _objectSpread(_objectSpread({}, formatTranslation), {}, {
+            wrapper.event.translations.set(formatTranslation.language, {
+              ...formatTranslation,
               id: wrapper.event.transcript.id
-            }));
+            });
+            this._observable.notifyObservers('onSttEventReceived', sceneId, wrapper.event);
           } else if (transInfo.isFinal == true && wrapper.event.transcript.isFinal == true) {
             return null;
           }
@@ -339,15 +341,10 @@ class FcrSttControlImpl {
     }
     if (sttEventWrapperList) {
       this._sttEventWrapperListMap.set(userId, sttEventWrapperList);
-      const lastSttEventWrapper = sttEventWrapperList[sttEventWrapperList.length - 1];
-      return lastSttEventWrapper.event;
     }
-    return null;
   }
   _addLogObserver() {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onSttEventReceived', 'onLocalCaptionStateUpdated', 'onTranscribingStateUpdated', 'onSourceLanguageUpdated']));
   }
 }
-exports.FcrSttControlImpl = FcrSttControlImpl;
-_FcrSttControlImpl = FcrSttControlImpl;
-[_initProto] = _applyDecs(_FcrSttControlImpl, [[_startCaptionDecs, 2, "startCaption"], [_imports.trace, 2, "stopCaption"], [_startTranscribingDecs, 2, "startTranscribing"], [_imports.trace, 2, "stopTranscribing"], [_updateSourceLanguageDecs, 2, "updateSourceLanguage"], [_subscribeTranscribingLanguageDecs, 2, "subscribeTranscribingLanguage"], [_imports.trace, 2, "unsubscribeTranscribingLanguage"], [_imports.trace, 2, "release"]], []).e;
+exports.FcrSttControlImpl = FcrSttControlImpl;

package/lib/room-control/stt-control/type.d.ts

@@ -136,7 +136,7 @@ export interface FcrSttTranscript extends FcrSttMessageItem {
     text: string;
     language: FcrLanguage;
 }
-export interface FcrSttreamMessagetData {
+export interface FcrSttStreamMessageData {
     transcript?: FcrSttTranscript;
     translation?: FcrSttTranslation;
 }