fcr-core 3.10.0 → 3.10.1-rc.2

package/lib/engine/index.js

@@ -60,6 +60,7 @@ var _parameters = require("../utilities/parameters");
 var _validateParams = _interopRequireDefault(require("../utilities/validate-params"));
 var _infinityRoomControl = require("../room-control/infinity-room-control");
 var _remoteControl = require("../remote-control");
+var _convertRoomType = require("../utilities/convertRoomType");
 let _initProto, _renewUserTokenDecs, _createMainRoomControlDecs, _createInfinityRoomControlDecs, _createWaitingRoomControlDecs, _createRoomRouterDecs, _createRoomControlAndJoinDecs, _sendPeerMessageDecs, _setParametersDecs;
 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 + ""; }
@@ -295,7 +296,8 @@ class FcrCoreEngineImpl {
         data,
         ts
       } = res;
-      switch (data.room.roomProperties.roomType) {
+      const fcrRoomType = (0, _convertRoomType.convertServerRoomTypeToFcrRoomType)(data.room.roomProperties.roomType);
+      switch (fcrRoomType) {
         case _type3.FcrRoomType.Waitingroom:
           roomControl = this.createWaitingRoomControl(data.room.roomInfo.roomUuid);
           break;
@@ -306,13 +308,13 @@ class FcrCoreEngineImpl {
           roomControl = this.createMainRoomControl(roomId);
           break;
         default:
-          throw new Error(`Unknown room type: ${data.room.roomProperties.roomType}`);
+          throw new Error(`Unknown room type: ${fcrRoomType}`);
       }
       await roomControl.join({
         ...options,
         snapshot: data,
         timestamp: ts,
-        createStreamConfigs: data.room.roomProperties.roomType === _type3.FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
+        createStreamConfigs: fcrRoomType === _type3.FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
       });
     }, [], {
       retriesMax: 10

package/lib/imports.d.ts

@@ -41,7 +41,7 @@ export type { AgoraRteAudioRawDataConfig, AgoraRteBeautyOptions, AgoraRteCameraP
 export type { AgoraRteMonitor } from 'agora-rte-sdk/lib/core/monitor';
 export type { AgoraRteMediaControl } from 'agora-rte-sdk/lib/core/media/type';
 export type { AgoraRteUpdateStreamPrivilege, AgoraRteMediaStreamInfo, } from 'agora-rte-sdk/lib/core/scene/type';
-export { AgoraRteConnectionState, AgoraRteEngine, convertStreamTypeToPublishState, AgoraRteLatencyLevel, } from 'agora-rte-sdk';
+export { AgoraRteConnectionState, AgoraRteEngine, convertStreamTypeToPublishState, AgoraRteLatencyLevel, AgoraRteVideoOutputOrientationMode, } from 'agora-rte-sdk';
 export { AgoraRteRoomConnectorType, AgoraRteStreamPrivilegeOperation, AgoraRteStreamPrivilegeVideoSourceType, AgoraRteStreamPrivilegeAudioSourceType, AgoraRteMediaStreamType, } from 'agora-rte-sdk/lib/core/scene/type';
 export { AgoraRtcRegion, AgoraRtcVideoSourceType, AgoraRtcAudioSourceType, AgoraRtcMediaSourceState, AgoraRtcRenderMode, AgoraRtcVideoStreamType, AgoraRtcCapability, AgoraRtcAiDenoiseLevel, AgoraRtcAudioOutputRouting, AgoraRtcLatencyLevelType, AgoraRtcEncryptionMode, AgoraRtcDegradationPreference, } from 'agora-rte-sdk/lib/core/rtc/type';
 export { AgoraRteStreamLayer } from 'agora-rte-sdk/lib/type';

package/lib/imports.js

@@ -204,6 +204,12 @@ Object.defineProperty(exports, "AgoraRteVideoOrientation", {
     return _type5.AgoraRteVideoOrientation;
   }
 });
+Object.defineProperty(exports, "AgoraRteVideoOutputOrientationMode", {
+  enumerable: true,
+  get: function () {
+    return _agoraRteSdk.AgoraRteVideoOutputOrientationMode;
+  }
+});
 Object.defineProperty(exports, "AgoraRteVideoSourceType", {
   enumerable: true,
   get: function () {

package/lib/index.d.ts

@@ -3,3 +3,7 @@ export { FcrStreamLatencyLevel, FcrPermissionAction, FcrPrivilegeUserRole, FcrUs
 export { FcrCoreEngineImpl as FcrCoreEngine } from './engine';
 export { FcrCoreEngineConfig } from './struct';
 export { FcrError } from './type';
+export type { AgoraRtcDimensions } from './schema';
+export type { AgoraRteCameraPosition as FcrCameraPosition } from './imports';
+export { FcrDegradationPreference } from './schema';
+export { AgoraRteVideoOutputOrientationMode as FcrVideoOutputOrientationMode } from './imports';

package/lib/index.js

@@ -51,6 +51,12 @@ Object.defineProperty(exports, "FcrCoreEngineConfig", {
     return _struct.FcrCoreEngineConfig;
   }
 });
+Object.defineProperty(exports, "FcrDegradationPreference", {
+  enumerable: true,
+  get: function () {
+    return _schema.FcrDegradationPreference;
+  }
+});
 Object.defineProperty(exports, "FcrDualVideoStreamConfig", {
   enumerable: true,
   get: function () {
@@ -147,6 +153,12 @@ Object.defineProperty(exports, "FcrVideoEncoderConfig", {
     return _type.FcrVideoEncoderConfig;
   }
 });
+Object.defineProperty(exports, "FcrVideoOutputOrientationMode", {
+  enumerable: true,
+  get: function () {
+    return _imports.AgoraRteVideoOutputOrientationMode;
+  }
+});
 Object.defineProperty(exports, "FcrVideoRenderMode", {
   enumerable: true,
   get: function () {
@@ -173,4 +185,6 @@ Object.defineProperty(exports, "registerPlugin", {
 });
 var _type = require("./type");
 var _engine = require("./engine");
-var _struct = require("./struct");
+var _struct = require("./struct");
+var _schema = require("./schema");
+var _imports = require("./imports");

package/lib/room-control/index.js

@@ -43,6 +43,7 @@ var _2 = require("..");
 var _errorHelpers = require("../utilities/error-helpers");
 var _helpers = require("./helpers");
 var _sttControl = require("./stt-control");
+var _widgetControl = require("./widget-control");
 var _applicationControl = require("./application-control");
 let _initProto, _joinDecs, _updateRoomPropertiesDecs, _updateIncrementRoomPropertiesDecs, _deleteRoomPropertiesDecs, _startCloudRecordingDecs, _startLiveStreamingDecs, _updateLiveStreamingLayoutDecs, _sendRoomMessageDecs; // Core SDK imports
 // Service and API imports
@@ -117,6 +118,7 @@ class FcrBaseRoomControlImpl {
           this.sharingControl = new _sharingControl.FcrSharingControlImpl(this._scene, this._api, this._engine, this._config, this._privilegeControl, this._streamControl, this._sharedCache, this._userControl);
         }
         this._sttControl = new _sttControl.FcrSttControlImpl(this._scene, this._api, this._sharedCache);
+        this._widgetControl = new _widgetControl.FcrWidgetControlImpl(this._scene, this._api, this._sharedCache);
         this._observable.notifyObservers('onJoinRoomSuccess', sceneId);
       },
       // onJoinSceneFailure: (sceneId, error) => {
@@ -238,6 +240,10 @@ class FcrBaseRoomControlImpl {
     (0, _helpers.validateControllerInitialized)(this._sttControl, _errorHelpers.ControllerType.STT);
     return this._sttControl;
   }
+  getWidgetControl() {
+    (0, _helpers.validateControllerInitialized)(this._widgetControl, _errorHelpers.ControllerType.WIDGET);
+    return this._widgetControl;
+  }
   getApplicationControl() {
     (0, _helpers.validateControllerInitialized)(this._applicationControl, _errorHelpers.ControllerType.APPLICATION);
     return this._applicationControl;
@@ -362,7 +368,6 @@ class FcrBaseRoomControlImpl {
     (0, _helpers.validateRoomJoined)(this._joinRoomSuccess, 'get schedule info');
     const schedule = this._scene.getScenePropertiesByKeyPath('schedule');
     return {
-      ...schedule,
       duration: schedule.duration ?? 0,
       startTime: Math.floor((schedule.startTime ?? 0) / 1000)
     };

package/lib/room-control/room-control-factory.js

@@ -7,6 +7,7 @@ exports.RoomControlFactory = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _imports = require("../imports");
+var _convertRoomType = require("../utilities/convertRoomType");
 var _error = require("../utilities/error");
 var _infinityRoomControl = require("./infinity-room-control");
 var _room = require("./interpreter-control/room");
@@ -53,7 +54,10 @@ class RoomControlFactory {
       roomResponse,
       monitorControl
     } = params;
-    const roomType = roomResponse.room.roomProperties.roomType;
+    const roomType = (0, _convertRoomType.convertServerRoomTypeToFcrRoomType)(roomResponse.room.roomProperties.roomType);
+    if (roomType === null) {
+      throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.UNDEFINED_ERROR, `Unsupported room types: ${roomResponse.room.roomProperties.roomType}`);
+    }
     const RoomControlImpl = ROOM_CONTROL_IMPLEMENTATIONS[roomType];
     if (!RoomControlImpl) {
       throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.UNDEFINED_ERROR, `Unsupported room types: ${roomType}`);

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

@@ -13,6 +13,7 @@ import { FcrSharingControl } from './sharing-control/type';
 import { FcrSttControl } from './stt-control/type';
 import { FcrRoomAnnouncement } from './infinity-room-control/type';
 import { FcrApplicationControl } from './application-control/type';
+import { FcrWidgetControl } from './widget-control/type';
 export interface FcrBaseRoomControl {
     /**
      * Gets the caption control.
@@ -26,6 +27,10 @@ export interface FcrBaseRoomControl {
      * Gets the stream control.
      */
     getStreamControl(): FcrStreamControl;
+    /**
+     * Gets the widget control.
+     */
+    getWidgetControl(): FcrWidgetControl;
     /**
      * Gets the room session control.
      */
@@ -304,12 +309,12 @@ export type FcrJoinBeforeHostWaitingRoomObserver = FcrRoomObserver & {};
 export type FcrMainRoomObserver = FcrRoomObserver & {};
 export type FcrLocalUserWaitingRoomMovedEvent = FcrRoomPropertiesUpdatedEvent;
 export declare enum FcrRoomType {
-    Mainroom = 11,
-    Waitingroom = 102,
-    Subroom = 101,
-    Interpreterroom = 103,
-    JoinBeforeHostWaitingRoom = 104,
-    Infinityroom = 12
+    Mainroom = 0,
+    Subroom = 1,
+    Waitingroom = 2,
+    Interpreterroom = 3,
+    JoinBeforeHostWaitingRoom = 4,
+    Infinityroom = 5
 }
 export declare enum FcrLiveStreamingStateUpdatedReason {
     USERSTOPPED = 1,

package/lib/room-control/type.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrWidgetUuid = exports.FcrWidgetCauseCmd = exports.FcrRoomType = exports.FcrLiveStreamingStateUpdatedReason = exports.FcrLineType = void 0;
 let FcrRoomType = exports.FcrRoomType = /*#__PURE__*/function (FcrRoomType) {
-  FcrRoomType[FcrRoomType["Mainroom"] = 11] = "Mainroom";
-  FcrRoomType[FcrRoomType["Waitingroom"] = 102] = "Waitingroom";
-  FcrRoomType[FcrRoomType["Subroom"] = 101] = "Subroom";
-  FcrRoomType[FcrRoomType["Interpreterroom"] = 103] = "Interpreterroom";
-  FcrRoomType[FcrRoomType["JoinBeforeHostWaitingRoom"] = 104] = "JoinBeforeHostWaitingRoom";
-  FcrRoomType[FcrRoomType["Infinityroom"] = 12] = "Infinityroom";
+  FcrRoomType[FcrRoomType["Mainroom"] = 0] = "Mainroom";
+  FcrRoomType[FcrRoomType["Subroom"] = 1] = "Subroom";
+  FcrRoomType[FcrRoomType["Waitingroom"] = 2] = "Waitingroom";
+  FcrRoomType[FcrRoomType["Interpreterroom"] = 3] = "Interpreterroom";
+  FcrRoomType[FcrRoomType["JoinBeforeHostWaitingRoom"] = 4] = "JoinBeforeHostWaitingRoom";
+  FcrRoomType[FcrRoomType["Infinityroom"] = 5] = "Infinityroom";
   return FcrRoomType;
 }({});
 let FcrLiveStreamingStateUpdatedReason = exports.FcrLiveStreamingStateUpdatedReason = /*#__PURE__*/function (FcrLiveStreamingStateUpdatedReason) {

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

@@ -71,8 +71,8 @@ class FcrUserControlImpl {
       });
       const fcrUserEvents = events.map(e => {
         return {
-          userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo, this._roomCache),
-          operatorUser: e.operatorUser && (0, _user.convertRteUserToFcrUser)(e.operatorUser, this._roomCache)
+          userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo, this._roomCache)
+          // operatorUser: e.operatorUser && convertRteUserToFcrUser(e.operatorUser, this._roomCache),
         };
       });
       fcrUserEvents.forEach(event => {

package/lib/room-control/widget-control/index.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,115 @@
+"use strict";
+
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+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/esnext.symbol.metadata.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrWidgetControlImpl = void 0;
+var _imports = require("../../imports");
+var _type = require("../../type");
+var _error = require("../../utilities/error");
+var _logger = require("../../utilities/logger");
+let _initProto, _getActivityDecs, _activeDecs, _inactiveDecs;
+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); }
+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; }
+/** scene 属性更新中表示 widget 状态变更的 cause.cmd（与服务端约定一致） */
+const WIDGET_SCENE_PROPERTIES_CMD = 13;
+var WidgetState = /*#__PURE__*/function (WidgetState) {
+  WidgetState[WidgetState["INACTIVE"] = 0] = "INACTIVE";
+  WidgetState[WidgetState["ACTIVE"] = 1] = "ACTIVE";
+  return WidgetState;
+}(WidgetState || {});
+/**
+ * @internal
+ */
+class FcrWidgetControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_getActivityDecs, 2, "getActivity"], [_activeDecs, 2, "active"], [_inactiveDecs, 2, "inactive"], [_imports.trace, 2, "release"]], []).e;
+  }
+  //@internal
+  [(_getActivityDecs = (0, _imports.trace)(['widgetId']), _activeDecs = (0, _imports.trace)(['widgetId']), _inactiveDecs = (0, _imports.trace)(['widgetId']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrWidgetControlImpl'
+  }));
+
+  //@internal
+  _observable = new _imports.AgoraObservable();
+
+  //@internal
+  _sceneObserver = {
+    onScenePropertiesUpdated: (sceneId, event) => {
+      if (event.cause?.cmd !== WIDGET_SCENE_PROPERTIES_CMD) {
+        return;
+      }
+      const changedWidgets = event.changedProperties?.flexWidgets;
+      if (!changedWidgets || typeof changedWidgets !== 'object') {
+        return;
+      }
+      for (const widgetId of Object.keys(changedWidgets)) {
+        const state = changedWidgets[widgetId]?.state;
+        if (state === WidgetState.ACTIVE) {
+          this._observable.notifyObservers('onWidgetActive', sceneId, widgetId);
+        } else if (state === WidgetState.INACTIVE) {
+          this._observable.notifyObservers('onWidgetInactive', sceneId, widgetId);
+        }
+      }
+    }
+  };
+  constructor(_scene, _api, _sharedCache) {
+    this._scene = _scene;
+    this._api = _api;
+    this._scene.addObserver(this._sceneObserver);
+    this._addLogObserver();
+  }
+  getActivity(widgetId) {
+    const state = this._scene.getScenePropertiesByKeyPath(`flexWidgets.${widgetId}.state`);
+    return state === WidgetState.ACTIVE;
+  }
+  active(widgetId) {
+    return (0, _error.handleRequestError)(() => this._api.updateWidgetState({
+      roomUuid: this._scene.sceneId,
+      widgetId,
+      state: 1
+    }), _imports.ErrorModuleCode.FCR_ROOM, 'activate widget failed');
+  }
+  inactive(widgetId) {
+    return (0, _error.handleRequestError)(() => this._api.updateWidgetState({
+      roomUuid: this._scene.sceneId,
+      widgetId,
+      state: 0
+    }), _imports.ErrorModuleCode.FCR_ROOM, 'deactivate widget failed');
+  }
+  addObserver(observer) {
+    this._observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this._observable.removeObserver(observer);
+  }
+  release() {
+    this._scene.removeObserver(this._sceneObserver);
+    this._observable.removeAllObservers();
+    return _type.FcrReturnCode.SUCCESS;
+  }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onWidgetActive', ['roomId', 'widgetId']], ['onWidgetInactive', ['roomId', 'widgetId']]]));
+  }
+}
+exports.FcrWidgetControlImpl = FcrWidgetControlImpl;

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

@@ -0,0 +1,33 @@
+/**
+ * 房间内 widget 激活状态控制与事件订阅。
+ */
+export interface FcrWidgetControl {
+    /**
+     * 获取指定 widget 是否处于激活状态（scene 中 `widgets.{widgetId}.state === 1`）。
+     */
+    getActivity(widgetId: string): boolean;
+    /**
+     * 激活指定 widget。
+     */
+    active(widgetId: string): Promise<void>;
+    /**
+     * 停用指定 widget。
+     */
+    inactive(widgetId: string): Promise<void>;
+    addObserver(observer: FcrWidgetObserver): void;
+    removeObserver(observer: FcrWidgetObserver): void;
+    /**
+     * 移除场景监听与观察者。
+     */
+    release(): number;
+}
+export interface FcrWidgetObserver {
+    /**
+     * widget 进入激活状态（scene 属性更新且 cmd === 13，state === 1）。
+     */
+    onWidgetActive?: (roomId: string, widgetId: string) => void;
+    /**
+     * widget 进入非激活状态（scene 属性更新且 cmd === 13，state === 0）。
+     */
+    onWidgetInactive?: (roomId: string, widgetId: string) => void;
+}

package/lib/room-control/widget-control/type.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/room-router/index.js

@@ -33,6 +33,7 @@ var _retryHelpers = require("../utilities/retry-helpers");
 var _logger = require("../utilities/logger");
 var _validateParams = _interopRequireDefault(require("../utilities/validate-params"));
 var _type3 = require("./type");
+var _convertRoomType = require("../utilities/convertRoomType");
 let _initProto, _initDecs, _joinRoomDecs;
 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 + ""; }
@@ -212,8 +213,13 @@ class FcrRoomRouterImpl {
     const {
       data
     } = roomResponse;
+    const fcrRoomType = (0, _convertRoomType.convertServerRoomTypeToFcrRoomType)(data.room.roomProperties.roomType);
+    if (fcrRoomType === null) {
+      const fcrError = (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM, _imports.DetailErrorCode.UNDEFINED_ERROR, `update room state failed: Unknown room type: ${data.room.roomProperties.roomType}`);
+      throw fcrError;
+    }
     this._nextRoomRoute = {
-      roomType: data.room.roomProperties.roomType,
+      roomType: fcrRoomType,
       roomId: data.room.roomInfo.roomUuid,
       isJoined: true
     };

package/lib/service/api.d.ts

@@ -476,6 +476,11 @@ export declare class FcrCoreServiceApi {
         roomUuid: string;
         userUuid: string;
     }): Promise<any>;
+    updateWidgetState(params: {
+        roomUuid: string;
+        widgetId: string;
+        state: 0 | 1;
+    }): Promise<any>;
     startTranscribing(params: {
         roomUuid: string;
         userUuid: string;

package/lib/service/api.js

@@ -340,7 +340,7 @@ class FcrCoreServiceApi {
       ts
     } = await this._client.fetch({
       path: `/v1/rooms/${params.roomId}/users/${params.userId}/entry`,
-      method: 'PUT',
+      method: 'POST',
       data: {
         password: params.password,
         stream: params.stream,
@@ -367,7 +367,7 @@ class FcrCoreServiceApi {
       ts
     } = await this._client.fetch({
       path: `/v1/rooms/${params.roomId}/users/${params.userId}/internal/entry`,
-      method: 'PUT',
+      method: 'POST',
       data: {
         password: params.password,
         stream: params.stream,
@@ -1128,6 +1128,20 @@ class FcrCoreServiceApi {
       method: 'PUT'
     });
   }
+  async updateWidgetState(params) {
+    const {
+      roomUuid,
+      widgetId,
+      state
+    } = params;
+    return await this._client.fetch({
+      path: `/v1/rooms/${roomUuid}/widgets/${widgetId}`,
+      method: 'PUT',
+      data: {
+        state
+      }
+    });
+  }
   async startTranscribing(params) {
     const {
       roomUuid,

package/lib/type.d.ts

@@ -90,7 +90,7 @@ export type FcrUserInfo = {
     readonly userRole: FcrUserRole;
     readonly connectorType: FcrRoomConnectorType;
     readonly platform: FcrPlatform;
-    readonly avatar: string;
+    readonly avatar?: string;
 };
 /** 流信息类型 */
 export type FcrStreamInfo = {

package/lib/utilities/convertRoomType.d.ts

@@ -0,0 +1,2 @@
+import { FcrRoomType } from '../room-control/type';
+export declare const convertServerRoomTypeToFcrRoomType: (roomType: number) => FcrRoomType | null;

package/lib/utilities/convertRoomType.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertServerRoomTypeToFcrRoomType = void 0;
+var _type = require("../room-control/type");
+const convertServerRoomTypeToFcrRoomType = roomType => {
+  switch (roomType) {
+    case 11:
+      return _type.FcrRoomType.Mainroom;
+    case 102:
+      return _type.FcrRoomType.Waitingroom;
+    case 101:
+      return _type.FcrRoomType.Subroom;
+    case 103:
+      return _type.FcrRoomType.Interpreterroom;
+    case 104:
+      return _type.FcrRoomType.JoinBeforeHostWaitingRoom;
+    case 12:
+      return _type.FcrRoomType.Infinityroom;
+    default:
+      return null;
+  }
+};
+exports.convertServerRoomTypeToFcrRoomType = convertServerRoomTypeToFcrRoomType;

package/lib/utilities/error-helpers.d.ts

@@ -22,7 +22,8 @@ export declare enum ControllerType {
     MEDIA = "media",
     STT = "stt",
     REMOTE_CONTROL = "remote control",
-    APPLICATION = "application"
+    APPLICATION = "application",
+    WIDGET = "widget"
 }
 /**
  * 错误处理配置接口

package/lib/utilities/error-helpers.js

@@ -29,6 +29,7 @@ let ControllerType = exports.ControllerType = /*#__PURE__*/function (ControllerT
   ControllerType["STT"] = "stt";
   ControllerType["REMOTE_CONTROL"] = "remote control";
   ControllerType["APPLICATION"] = "application";
+  ControllerType["WIDGET"] = "widget";
   return ControllerType;
 }({});
 /**

package/lib-es/engine/index.js

@@ -59,6 +59,7 @@ import { getCoreIpList, getCoreLogFileSize, getEasemobChatIpList, getEasemobRest
 import validateParams from '../utilities/validate-params';
 import { FcrInfinityRoomControlImpl } from '../room-control/infinity-room-control';
 import { FcrRemoteControlImpl } from '../remote-control';
+import { convertServerRoomTypeToFcrRoomType } from '../utilities/convertRoomType';
 export class FcrCoreEngineImpl {
   static {
     [_initProto] = _applyDecs(this, [[trace, 2, "release"], [trace, 2, "login"], [trace, 2, "logout"], [_renewUserTokenDecs, 2, "renewUserToken"], [trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createInfinityRoomControlDecs, 2, "createInfinityRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [trace, 2, "getDesktopMediaControl"], [trace, 2, "getMobileMediaControl"], [trace, 2, "getMonitorControl"], [trace, 2, "getPeerSessionControl"], [trace, 2, "getRemoteControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
@@ -288,7 +289,8 @@ export class FcrCoreEngineImpl {
         data,
         ts
       } = res;
-      switch (data.room.roomProperties.roomType) {
+      const fcrRoomType = convertServerRoomTypeToFcrRoomType(data.room.roomProperties.roomType);
+      switch (fcrRoomType) {
         case FcrRoomType.Waitingroom:
           roomControl = this.createWaitingRoomControl(data.room.roomInfo.roomUuid);
           break;
@@ -299,13 +301,13 @@ export class FcrCoreEngineImpl {
           roomControl = this.createMainRoomControl(roomId);
           break;
         default:
-          throw new Error(`Unknown room type: ${data.room.roomProperties.roomType}`);
+          throw new Error(`Unknown room type: ${fcrRoomType}`);
       }
       await roomControl.join({
         ...options,
         snapshot: data,
         timestamp: ts,
-        createStreamConfigs: data.room.roomProperties.roomType === FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
+        createStreamConfigs: fcrRoomType === FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
       });
     }, [], {
       retriesMax: 10

package/lib-es/imports.js

@@ -37,7 +37,7 @@ export { Mutex } from 'agora-foundation/lib/worker/mutex';
 
 export { AgoraRteError } from 'agora-rte-sdk/lib/core/utilities/error';
 export { AgoraError as FcrError } from 'agora-foundation/lib/utilities/error/agora-error';
-export { AgoraRteConnectionState, AgoraRteEngine, convertStreamTypeToPublishState, AgoraRteLatencyLevel } from 'agora-rte-sdk';
+export { AgoraRteConnectionState, AgoraRteEngine, convertStreamTypeToPublishState, AgoraRteLatencyLevel, AgoraRteVideoOutputOrientationMode } from 'agora-rte-sdk';
 export { AgoraRteRoomConnectorType, AgoraRteStreamPrivilegeOperation, AgoraRteStreamPrivilegeVideoSourceType, AgoraRteStreamPrivilegeAudioSourceType, AgoraRteMediaStreamType } from 'agora-rte-sdk/lib/core/scene/type';
 export { AgoraRtcRegion, AgoraRtcVideoSourceType, AgoraRtcAudioSourceType, AgoraRtcMediaSourceState, AgoraRtcRenderMode, AgoraRtcVideoStreamType, AgoraRtcCapability, AgoraRtcAiDenoiseLevel, AgoraRtcAudioOutputRouting, AgoraRtcLatencyLevelType, AgoraRtcEncryptionMode, AgoraRtcDegradationPreference } from 'agora-rte-sdk/lib/core/rtc/type';
 export { AgoraRteStreamLayer } from 'agora-rte-sdk/lib/type';

package/lib-es/index.js

@@ -6,4 +6,6 @@ export { FcrCoreEngineImpl as FcrCoreEngine } from './engine';
 export { FcrCoreEngineConfig } from './struct';
 
 // classes
-export { FcrError } from './type';
+export { FcrError } from './type';
+export { FcrDegradationPreference } from './schema';
+export { AgoraRteVideoOutputOrientationMode as FcrVideoOutputOrientationMode } from './imports';

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

@@ -58,6 +58,7 @@ import { FcrConnectionState } from '..';
 import { ControllerType } from '../utilities/error-helpers';
 import { FcrJoinHelper, LIVE_STREAMING_STATE_VALUES, liveStreamingErrorHelper, RECORDING_STATE_VALUES, RESPONSE_CODES, ROOM_CONTROL_CONSTANTS, ROOM_MESSAGE_COMMANDS, ROOM_STATE_VALUES, roomControlErrorHelper, validateControllerInitialized, validateJoinRoomPreconditions, validateRoomJoined } from './helpers';
 import { FcrSttControlImpl } from './stt-control';
+import { FcrWidgetControlImpl } from './widget-control';
 import { FcrApplicationControlImpl } from './application-control';
 
 /**
@@ -120,6 +121,7 @@ export class FcrBaseRoomControlImpl {
           this.sharingControl = new FcrSharingControlImpl(this._scene, this._api, this._engine, this._config, this._privilegeControl, this._streamControl, this._sharedCache, this._userControl);
         }
         this._sttControl = new FcrSttControlImpl(this._scene, this._api, this._sharedCache);
+        this._widgetControl = new FcrWidgetControlImpl(this._scene, this._api, this._sharedCache);
         this._observable.notifyObservers('onJoinRoomSuccess', sceneId);
       },
       // onJoinSceneFailure: (sceneId, error) => {
@@ -241,6 +243,10 @@ export class FcrBaseRoomControlImpl {
     validateControllerInitialized(this._sttControl, ControllerType.STT);
     return this._sttControl;
   }
+  getWidgetControl() {
+    validateControllerInitialized(this._widgetControl, ControllerType.WIDGET);
+    return this._widgetControl;
+  }
   getApplicationControl() {
     validateControllerInitialized(this._applicationControl, ControllerType.APPLICATION);
     return this._applicationControl;
@@ -365,7 +371,6 @@ export class FcrBaseRoomControlImpl {
     validateRoomJoined(this._joinRoomSuccess, 'get schedule info');
     const schedule = this._scene.getScenePropertiesByKeyPath('schedule');
     return {
-      ...schedule,
       duration: schedule.duration ?? 0,
       startTime: Math.floor((schedule.startTime ?? 0) / 1000)
     };

package/lib-es/room-control/room-control-factory.js

@@ -1,6 +1,7 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import { DetailErrorCode, ErrorModuleCode, FcrChatRoomControlImpl } from '../imports';
+import { convertServerRoomTypeToFcrRoomType } from '../utilities/convertRoomType';
 import { generateFcrCoreClientError } from '../utilities/error';
 import { FcrInfinityRoomControlImpl } from './infinity-room-control';
 import { FcrInterpreterRoomControlImpl } from './interpreter-control/room';
@@ -48,7 +49,10 @@ export class RoomControlFactory {
       roomResponse,
       monitorControl
     } = params;
-    const roomType = roomResponse.room.roomProperties.roomType;
+    const roomType = convertServerRoomTypeToFcrRoomType(roomResponse.room.roomProperties.roomType);
+    if (roomType === null) {
+      throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.UNDEFINED_ERROR, `Unsupported room types: ${roomResponse.room.roomProperties.roomType}`);
+    }
     const RoomControlImpl = ROOM_CONTROL_IMPLEMENTATIONS[roomType];
     if (!RoomControlImpl) {
       throw generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.UNDEFINED_ERROR, `Unsupported room types: ${roomType}`);

package/lib-es/room-control/type.js

@@ -1,10 +1,10 @@
 export let FcrRoomType = /*#__PURE__*/function (FcrRoomType) {
-  FcrRoomType[FcrRoomType["Mainroom"] = 11] = "Mainroom";
-  FcrRoomType[FcrRoomType["Waitingroom"] = 102] = "Waitingroom";
-  FcrRoomType[FcrRoomType["Subroom"] = 101] = "Subroom";
-  FcrRoomType[FcrRoomType["Interpreterroom"] = 103] = "Interpreterroom";
-  FcrRoomType[FcrRoomType["JoinBeforeHostWaitingRoom"] = 104] = "JoinBeforeHostWaitingRoom";
-  FcrRoomType[FcrRoomType["Infinityroom"] = 12] = "Infinityroom";
+  FcrRoomType[FcrRoomType["Mainroom"] = 0] = "Mainroom";
+  FcrRoomType[FcrRoomType["Subroom"] = 1] = "Subroom";
+  FcrRoomType[FcrRoomType["Waitingroom"] = 2] = "Waitingroom";
+  FcrRoomType[FcrRoomType["Interpreterroom"] = 3] = "Interpreterroom";
+  FcrRoomType[FcrRoomType["JoinBeforeHostWaitingRoom"] = 4] = "JoinBeforeHostWaitingRoom";
+  FcrRoomType[FcrRoomType["Infinityroom"] = 5] = "Infinityroom";
   return FcrRoomType;
 }({});
 export let FcrLiveStreamingStateUpdatedReason = /*#__PURE__*/function (FcrLiveStreamingStateUpdatedReason) {

package/lib-es/room-control/user-control/index.js

@@ -68,8 +68,8 @@ export class FcrUserControlImpl {
       });
       const fcrUserEvents = events.map(e => {
         return {
-          userInfo: e.userInfo && convertRteUserToFcrUser(e.userInfo, this._roomCache),
-          operatorUser: e.operatorUser && convertRteUserToFcrUser(e.operatorUser, this._roomCache)
+          userInfo: e.userInfo && convertRteUserToFcrUser(e.userInfo, this._roomCache)
+          // operatorUser: e.operatorUser && convertRteUserToFcrUser(e.operatorUser, this._roomCache),
         };
       });
       fcrUserEvents.forEach(event => {

package/lib-es/room-control/widget-control/index.js

@@ -0,0 +1,109 @@
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.function.metadata.js";
+import "core-js/modules/esnext.map.delete-all.js";
+import "core-js/modules/esnext.map.emplace.js";
+import "core-js/modules/esnext.map.every.js";
+import "core-js/modules/esnext.map.filter.js";
+import "core-js/modules/esnext.map.find.js";
+import "core-js/modules/esnext.map.find-key.js";
+import "core-js/modules/esnext.map.includes.js";
+import "core-js/modules/esnext.map.key-of.js";
+import "core-js/modules/esnext.map.map-keys.js";
+import "core-js/modules/esnext.map.map-values.js";
+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";
+let _initProto, _getActivityDecs, _activeDecs, _inactiveDecs;
+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); }
+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 { ErrorModuleCode } from '../../imports';
+import { AgoraObservable, trace } from '../../imports';
+import { FcrReturnCode } from '../../type';
+import { handleRequestError } from '../../utilities/error';
+import { createLogger, generateLogObserver } from '../../utilities/logger';
+/** scene 属性更新中表示 widget 状态变更的 cause.cmd（与服务端约定一致） */
+const WIDGET_SCENE_PROPERTIES_CMD = 13;
+var WidgetState = /*#__PURE__*/function (WidgetState) {
+  WidgetState[WidgetState["INACTIVE"] = 0] = "INACTIVE";
+  WidgetState[WidgetState["ACTIVE"] = 1] = "ACTIVE";
+  return WidgetState;
+}(WidgetState || {});
+/**
+ * @internal
+ */
+export class FcrWidgetControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_getActivityDecs, 2, "getActivity"], [_activeDecs, 2, "active"], [_inactiveDecs, 2, "inactive"], [trace, 2, "release"]], []).e;
+  }
+  //@internal
+  [(_getActivityDecs = trace(['widgetId']), _activeDecs = trace(['widgetId']), _inactiveDecs = trace(['widgetId']), "logger")] = (_initProto(this), createLogger({
+    prefix: 'FcrWidgetControlImpl'
+  }));
+
+  //@internal
+  _observable = new AgoraObservable();
+
+  //@internal
+  _sceneObserver = {
+    onScenePropertiesUpdated: (sceneId, event) => {
+      if (event.cause?.cmd !== WIDGET_SCENE_PROPERTIES_CMD) {
+        return;
+      }
+      const changedWidgets = event.changedProperties?.flexWidgets;
+      if (!changedWidgets || typeof changedWidgets !== 'object') {
+        return;
+      }
+      for (const widgetId of Object.keys(changedWidgets)) {
+        const state = changedWidgets[widgetId]?.state;
+        if (state === WidgetState.ACTIVE) {
+          this._observable.notifyObservers('onWidgetActive', sceneId, widgetId);
+        } else if (state === WidgetState.INACTIVE) {
+          this._observable.notifyObservers('onWidgetInactive', sceneId, widgetId);
+        }
+      }
+    }
+  };
+  constructor(_scene, _api, _sharedCache) {
+    this._scene = _scene;
+    this._api = _api;
+    this._scene.addObserver(this._sceneObserver);
+    this._addLogObserver();
+  }
+  getActivity(widgetId) {
+    const state = this._scene.getScenePropertiesByKeyPath(`flexWidgets.${widgetId}.state`);
+    return state === WidgetState.ACTIVE;
+  }
+  active(widgetId) {
+    return handleRequestError(() => this._api.updateWidgetState({
+      roomUuid: this._scene.sceneId,
+      widgetId,
+      state: 1
+    }), ErrorModuleCode.FCR_ROOM, 'activate widget failed');
+  }
+  inactive(widgetId) {
+    return handleRequestError(() => this._api.updateWidgetState({
+      roomUuid: this._scene.sceneId,
+      widgetId,
+      state: 0
+    }), ErrorModuleCode.FCR_ROOM, 'deactivate widget failed');
+  }
+  addObserver(observer) {
+    this._observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this._observable.removeObserver(observer);
+  }
+  release() {
+    this._scene.removeObserver(this._sceneObserver);
+    this._observable.removeAllObservers();
+    return FcrReturnCode.SUCCESS;
+  }
+  _addLogObserver() {
+    this.addObserver(generateLogObserver(this.logger, [['onWidgetActive', ['roomId', 'widgetId']], ['onWidgetInactive', ['roomId', 'widgetId']]]));
+  }
+}

package/lib-es/room-control/widget-control/type.js

@@ -0,0 +1 @@
+export {};

package/lib-es/room-router/index.js

@@ -33,6 +33,7 @@ import { createLogger, generateLogObserver } from '../utilities/logger';
 import validateParams from '../utilities/validate-params';
 import { ROOM_ROUTER_CONSTANTS } from './type';
 import { DetailErrorCode, ErrorModuleCode } from '../imports';
+import { convertServerRoomTypeToFcrRoomType } from '../utilities/convertRoomType';
 
 /**
  * @internal
@@ -207,8 +208,13 @@ export class FcrRoomRouterImpl {
     const {
       data
     } = roomResponse;
+    const fcrRoomType = convertServerRoomTypeToFcrRoomType(data.room.roomProperties.roomType);
+    if (fcrRoomType === null) {
+      const fcrError = generateFcrCoreClientError(ErrorModuleCode.FCR_ROOM, DetailErrorCode.UNDEFINED_ERROR, `update room state failed: Unknown room type: ${data.room.roomProperties.roomType}`);
+      throw fcrError;
+    }
     this._nextRoomRoute = {
-      roomType: data.room.roomProperties.roomType,
+      roomType: fcrRoomType,
       roomId: data.room.roomInfo.roomUuid,
       isJoined: true
     };

package/lib-es/service/api.js

@@ -334,7 +334,7 @@ export class FcrCoreServiceApi {
       ts
     } = await this._client.fetch({
       path: `/v1/rooms/${params.roomId}/users/${params.userId}/entry`,
-      method: 'PUT',
+      method: 'POST',
       data: {
         password: params.password,
         stream: params.stream,
@@ -361,7 +361,7 @@ export class FcrCoreServiceApi {
       ts
     } = await this._client.fetch({
       path: `/v1/rooms/${params.roomId}/users/${params.userId}/internal/entry`,
-      method: 'PUT',
+      method: 'POST',
       data: {
         password: params.password,
         stream: params.stream,
@@ -1122,6 +1122,20 @@ export class FcrCoreServiceApi {
       method: 'PUT'
     });
   }
+  async updateWidgetState(params) {
+    const {
+      roomUuid,
+      widgetId,
+      state
+    } = params;
+    return await this._client.fetch({
+      path: `/v1/rooms/${roomUuid}/widgets/${widgetId}`,
+      method: 'PUT',
+      data: {
+        state
+      }
+    });
+  }
   async startTranscribing(params) {
     const {
       roomUuid,

package/lib-es/utilities/convertRoomType.js

@@ -0,0 +1,19 @@
+import { FcrRoomType } from '../room-control/type';
+export const convertServerRoomTypeToFcrRoomType = roomType => {
+  switch (roomType) {
+    case 11:
+      return FcrRoomType.Mainroom;
+    case 102:
+      return FcrRoomType.Waitingroom;
+    case 101:
+      return FcrRoomType.Subroom;
+    case 103:
+      return FcrRoomType.Interpreterroom;
+    case 104:
+      return FcrRoomType.JoinBeforeHostWaitingRoom;
+    case 12:
+      return FcrRoomType.Infinityroom;
+    default:
+      return null;
+  }
+};

package/lib-es/utilities/error-helpers.js

@@ -25,6 +25,7 @@ export let ControllerType = /*#__PURE__*/function (ControllerType) {
   ControllerType["STT"] = "stt";
   ControllerType["REMOTE_CONTROL"] = "remote control";
   ControllerType["APPLICATION"] = "application";
+  ControllerType["WIDGET"] = "widget";
   return ControllerType;
 }({});
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.10.0",
+  "version": "3.10.1-rc.2",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "3.10.0",
+    "agora-toolchain": "3.10.1-rc.2",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -55,14 +55,14 @@
   "dependencies": {
     "@netless/app-slide": "^0.2.81",
     "@netless/appliance-plugin": "^1.1.21",
-    "@netless/forge-room": "1.2.0-alpha.1",
-    "@netless/forge-rtm": "1.2.0-alpha.1",
-    "@netless/forge-whiteboard": "1.2.0-alpha.1",
+    "@netless/forge-room": "1.1.0",
+    "@netless/forge-rtm": "1.1.0",
+    "@netless/forge-whiteboard": "1.1.0",
     "@netless/video-js-plugin": "^0.3.8",
     "@netless/white-snapshot": "^0.4.2",
     "@netless/window-manager": "^1.0.7-beta.6",
-    "agora-foundation": "3.10.0",
-    "agora-rte-sdk": "3.10.0",
+    "agora-foundation": "3.10.1-rc.2",
+    "agora-rte-sdk": "3.10.1-rc.2",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.13.0",