fcr-core 3.11.0-rc.2 → 3.11.0-rc.3

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

@@ -26,6 +26,7 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.some.js");
 var _imports = require("../../imports");
 var _type = require("../../type");
 var _user = require("../../utilities/user");
@@ -42,6 +43,8 @@ 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; }
+const WAITING_ROOM_USER_PROPERTY_PREFIXES = ['security.waitingRoom', 'security.ticket'];
+
 /**
  * @internal
  */
@@ -61,6 +64,35 @@ class FcrUserControlImpl {
 
   //@internal
   _enableUserCount = true;
+  _buildNotifiedUserChangedProperties(changedProperties, causeCmd) {
+    const hasFlexProps = causeCmd === 8 && Object.keys(changedProperties).some(key => key.startsWith('flexProps'));
+    if (hasFlexProps) {
+      const flexPropsChangedProperties = {};
+      for (const key in changedProperties) {
+        if (key.startsWith('flexProps')) {
+          flexPropsChangedProperties[key] = changedProperties[key];
+        }
+      }
+      if (Object.keys(flexPropsChangedProperties).length === 0) {
+        return undefined;
+      }
+      const structure = (0, _collection.convertToStructure)(flexPropsChangedProperties);
+      return structure['flexProps'] ?? {};
+    }
+    const waitingRoomChangedProperties = {};
+    for (const key in changedProperties) {
+      if (key === 'security' || WAITING_ROOM_USER_PROPERTY_PREFIXES.some(prefix => key.startsWith(prefix))) {
+        waitingRoomChangedProperties[key] = changedProperties[key];
+      }
+    }
+    if (Object.keys(waitingRoomChangedProperties).length === 0) {
+      return undefined;
+    }
+    const structure = 'security' in waitingRoomChangedProperties ? waitingRoomChangedProperties : (0, _collection.convertToStructure)(waitingRoomChangedProperties);
+    return 'security' in structure ? {
+      security: structure['security']
+    } : structure;
+  }
 
   //@internal
   _sceneObserver = {
@@ -158,20 +190,12 @@ class FcrUserControlImpl {
           type
         });
       }
-      if (event.cause?.cmd === 8) {
-        const changedProperties = {};
-        for (const key in event.changedProperties) {
-          if (key.startsWith('flexProps')) {
-            changedProperties[key] = event.changedProperties[key];
-          }
-        }
-        if (Object.keys(changedProperties).length > 0) {
-          const structure = (0, _collection.convertToStructure)(changedProperties);
-          this._observable.notifyObservers('onUserPropertiesUpdated', roomId, {
-            ...event,
-            changedProperties: structure['flexProps']
-          });
-        }
+      const notifiedChangedProperties = this._buildNotifiedUserChangedProperties(event.changedProperties, event.cause?.cmd);
+      if (notifiedChangedProperties) {
+        this._observable.notifyObservers('onUserPropertiesUpdated', roomId, {
+          ...event,
+          changedProperties: notifiedChangedProperties
+        });
       }
       if (event.cause?.cmd === _constants.ROOM_MESSAGE_COMMANDS.CLIENT_RECORDING_PERMISSION) {
         const {

package/lib/utilities/parameters.js

@@ -100,6 +100,10 @@ const HARMONY_OR_ELECTRON_COMMON_PARAMS = [
   'rtc.video.low_stream_enable_hw_encoder': false
 }, {
   'rtc.video.enable_minor_stream_intra_request': true
+},
+// BR710 小流不符合预期分辨率的临时方案，详见APAAS-15529
+{
+  'che.video.enableProfileAutoAdjuster': false
 }];
 
 /** ELECTRON common parameters */

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

@@ -20,6 +20,7 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/esnext.iterator.some.js";
 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); }
@@ -38,6 +39,7 @@ import validateParams from '../../utilities/validate-params';
 import { fcrUserKickedOutTypeSchema, fcrUserRolesSchema, stringKeyUnknownValueSchema, stringSchema, stringArraySchema, fcrUserRoleSchema, stringKeyNumberValueSchema } from '../../schema';
 import { ROOM_MESSAGE_COMMANDS } from '../helpers/constants';
 import { ErrorModuleCode } from '../../imports';
+const WAITING_ROOM_USER_PROPERTY_PREFIXES = ['security.waitingRoom', 'security.ticket'];
 
 /**
  * @internal
@@ -58,6 +60,35 @@ export class FcrUserControlImpl {
 
   //@internal
   _enableUserCount = true;
+  _buildNotifiedUserChangedProperties(changedProperties, causeCmd) {
+    const hasFlexProps = causeCmd === 8 && Object.keys(changedProperties).some(key => key.startsWith('flexProps'));
+    if (hasFlexProps) {
+      const flexPropsChangedProperties = {};
+      for (const key in changedProperties) {
+        if (key.startsWith('flexProps')) {
+          flexPropsChangedProperties[key] = changedProperties[key];
+        }
+      }
+      if (Object.keys(flexPropsChangedProperties).length === 0) {
+        return undefined;
+      }
+      const structure = convertToStructure(flexPropsChangedProperties);
+      return structure['flexProps'] ?? {};
+    }
+    const waitingRoomChangedProperties = {};
+    for (const key in changedProperties) {
+      if (key === 'security' || WAITING_ROOM_USER_PROPERTY_PREFIXES.some(prefix => key.startsWith(prefix))) {
+        waitingRoomChangedProperties[key] = changedProperties[key];
+      }
+    }
+    if (Object.keys(waitingRoomChangedProperties).length === 0) {
+      return undefined;
+    }
+    const structure = 'security' in waitingRoomChangedProperties ? waitingRoomChangedProperties : convertToStructure(waitingRoomChangedProperties);
+    return 'security' in structure ? {
+      security: structure['security']
+    } : structure;
+  }
 
   //@internal
   _sceneObserver = {
@@ -155,20 +186,12 @@ export class FcrUserControlImpl {
           type
         });
       }
-      if (event.cause?.cmd === 8) {
-        const changedProperties = {};
-        for (const key in event.changedProperties) {
-          if (key.startsWith('flexProps')) {
-            changedProperties[key] = event.changedProperties[key];
-          }
-        }
-        if (Object.keys(changedProperties).length > 0) {
-          const structure = convertToStructure(changedProperties);
-          this._observable.notifyObservers('onUserPropertiesUpdated', roomId, {
-            ...event,
-            changedProperties: structure['flexProps']
-          });
-        }
+      const notifiedChangedProperties = this._buildNotifiedUserChangedProperties(event.changedProperties, event.cause?.cmd);
+      if (notifiedChangedProperties) {
+        this._observable.notifyObservers('onUserPropertiesUpdated', roomId, {
+          ...event,
+          changedProperties: notifiedChangedProperties
+        });
       }
       if (event.cause?.cmd === ROOM_MESSAGE_COMMANDS.CLIENT_RECORDING_PERMISSION) {
         const {

package/lib-es/utilities/parameters.js

@@ -94,6 +94,10 @@ const HARMONY_OR_ELECTRON_COMMON_PARAMS = [
   'rtc.video.low_stream_enable_hw_encoder': false
 }, {
   'rtc.video.enable_minor_stream_intra_request': true
+},
+// BR710 小流不符合预期分辨率的临时方案，详见APAAS-15529
+{
+  'che.video.enableProfileAutoAdjuster': false
 }];
 
 /** ELECTRON common parameters */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.11.0-rc.2",
+  "version": "3.11.0-rc.3",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -29,8 +29,7 @@
     "build:en-docs": "typedoc --entryPoints ./build-doc/en-sdk.d.ts --readme ./build-doc/readme-en.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/en/tsconfig.json --out en-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
     "build:cn-docs": "typedoc --entryPoints ./build-doc/cn-sdk.d.ts --readme ./build-doc/readme-cn.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/cn/tsconfig.json --out cn-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
     "test-browser": "agora-tc-test-karma-browser",
-    "test-electron": "agora-tc-test-karma-electron",
-    "preinstall": "node ./scripts/check-ai-kb.js"
+    "test-electron": "agora-tc-test-karma-electron"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
@@ -43,7 +42,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "3.11.0-rc.2",
+    "agora-toolchain": "3.11.0-rc.3",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -57,14 +56,14 @@
   "dependencies": {
     "@netless/app-slide": "^0.2.81",
     "@netless/appliance-plugin": "^1.1.21",
-    "@netless/forge-room": "1.2.0-beta.3",
-    "@netless/forge-rtm": "1.2.0-beta.3",
-    "@netless/forge-whiteboard": "1.2.0-beta.3",
+    "@netless/forge-room": "1.2.1",
+    "@netless/forge-rtm": "1.2.1",
+    "@netless/forge-whiteboard": "1.2.1",
     "@netless/video-js-plugin": "^0.3.8",
     "@netless/white-snapshot": "^0.4.2",
     "@netless/window-manager": "^1.0.7-beta.6",
-    "agora-foundation": "3.11.0-rc.2",
-    "agora-rte-sdk": "3.11.0-rc.2",
+    "agora-foundation": "3.11.0-rc.3",
+    "agora-rte-sdk": "3.11.0-rc.3",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.13.0",