fcr-ui-widget-sdk 3.10.0 → 3.10.1

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 export { FcrUIWidgetSDKImpl as FcrUIWidgetSDK } from './sdk';
-export type { FcrUIWidgetObserver } from './type';
+export type { FcrUIWidgetSDKCallback, FcrUIWidgetSDKApiResponse, FcrUIWidgetSDKApiRequest, FcrUIWidgetSDKObserver, FcrUIWidgetSDKMethodName, FcrUIWidgetSDKCallbacName, } from './type';

package/lib/sdk.d.ts

@@ -1,14 +1,27 @@
 import type { FcrIPConnectorSessionParams, FcrPhoneConnectorSessionParams, FcrRoomInfo, FcrRoomSchedule, FcrRoomState, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIWidgetObserver, FcrUIWidgetSDK } from './type';
+import { FcrUIWidgetSDKObserver, FcrUIWidgetSDK } from './type';
 export declare class FcrUIWidgetSDKImpl implements FcrUIWidgetSDK {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _requestPromises;
+    private static _globalCounter;
     constructor();
     private _addLogObserver;
     private _createCallId;
     private _createRequestParams;
     private _sendRequest;
+    private _bridgeReady;
+    /** 避免 __onFcrJSBridgeReady__ / BRIDGE_READY postMessage 重复执行初始化 */
+    private _onBridgeReadyRan;
+    private _pendingRequests;
+    /**
+     * 等待 bridge 就绪后再发起请求。桥接没准备好时先缓存请求，待bridge ready之后批量发送。
+     * - 已就绪则直接走_sendRequest
+     * - 未就绪则放入_pendingRequests，超时10s自动reject
+     */
+    private _ensureBridgeReady;
+    private _handleBridgeReadyMessage;
+    private _onBridgeReady;
     getRoomInfo(): Promise<FcrRoomInfo>;
     getRoomSchedule(): Promise<FcrRoomSchedule>;
     getRoomState(): Promise<FcrRoomState>;
@@ -17,8 +30,11 @@ export declare class FcrUIWidgetSDKImpl implements FcrUIWidgetSDK {
     getAllUserCount(): Promise<number>;
     startSessionByPhone(params: FcrPhoneConnectorSessionParams): Promise<string>;
     startSessionByIP(params: FcrIPConnectorSessionParams): Promise<string>;
-    stopSession(sessionId: string): Promise<void>;
-    addObserver(observer: FcrUIWidgetObserver): void;
-    removeObserver(observer: FcrUIWidgetObserver): void;
+    stopSession(sessionId: string): Promise<number>;
+    active(): Promise<void>;
+    inactive(): Promise<void>;
+    getActivity(): Promise<boolean>;
+    addObserver(observer: FcrUIWidgetSDKObserver): void;
+    removeObserver(observer: FcrUIWidgetSDKObserver): void;
     private _handlePostMessage;
 }

package/lib/sdk.js

@@ -3,31 +3,38 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof3 = require("@babel/runtime/helpers/typeof");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUIWidgetSDKImpl = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.index-of.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.slice.js");
+require("core-js/modules/es.array.splice.js");
+require("core-js/modules/es.date.now.js");
 require("core-js/modules/es.map.js");
-require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.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");
@@ -42,26 +49,29 @@ 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.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _bound = require("agora-foundation/lib/decorator/bound");
 var _observable = require("agora-foundation/lib/utilities/observable");
+var _type = require("./type");
 var _logger = require("./logger");
 var _utils = require("./utils");
 var _FcrUIWidgetSDKImpl;
 var _initProto;
-function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof3(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof3(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof3(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof3(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _setFunctionName(e, t, n) { "symbol" == _typeof3(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 ? _typeof3(e) : "null")); return e; }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
   function FcrUIWidgetSDKImpl() {
+    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUIWidgetSDKImpl);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIWidgetSDK',
@@ -69,18 +79,59 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
     })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_requestPromises", new Map());
-    window.addEventListener('message', this._handlePostMessage);
-    this._addLogObserver();
+    (0, _defineProperty2["default"])(this, "_bridgeReady", false);
+    /** 避免 __onFcrJSBridgeReady__ / BRIDGE_READY postMessage 重复执行初始化 */
+    (0, _defineProperty2["default"])(this, "_onBridgeReadyRan", false);
+    (0, _defineProperty2["default"])(this, "_pendingRequests", []);
+    (0, _defineProperty2["default"])(this, "_handleBridgeReadyMessage", function (event) {
+      var _data$payload;
+      var data = event.data;
+      if ((data === null || data === void 0 ? void 0 : data.type) === _type.FcrJSBridgeMessageEvent && ((_data$payload = data.payload) === null || _data$payload === void 0 ? void 0 : _data$payload.action) === _type.FcrUIWidgetSDKActionEnum.BRIDGE_READY) {
+        _this._onBridgeReady();
+      }
+    });
+    (0, _defineProperty2["default"])(this, "_onBridgeReady", function () {
+      if (_this._onBridgeReadyRan) {
+        return;
+      }
+      _this._onBridgeReadyRan = true;
+      _this._bridgeReady = true;
+      window.removeEventListener('message', _this._handleBridgeReadyMessage);
+      window.addEventListener('message', _this._handlePostMessage);
+      _this._addLogObserver();
+      _this.logger.debug('init sdk onBridgeReady');
+      // flush pending requests
+      var requests = _this._pendingRequests.slice();
+      _this._pendingRequests = [];
+      requests.forEach(function (_ref) {
+        var funcName = _ref.funcName,
+          parameters = _ref.parameters,
+          resolve = _ref.resolve,
+          reject = _ref.reject;
+        _this._sendRequest(funcName, parameters).then(resolve)["catch"](reject);
+      });
+    });
+    this._bridgeReady = typeof window.__fcrJSBridgeReady__ === 'boolean' ? window.__fcrJSBridgeReady__ : false;
+    window.addEventListener('message', this._handleBridgeReadyMessage);
+    if (window.__fcrJSBridgeReady__) {
+      this._onBridgeReady();
+    } else {
+      window.__onFcrJSBridgeReady__ = this._onBridgeReady;
+    }
   }
   return (0, _createClass2["default"])(FcrUIWidgetSDKImpl, [{
     key: "_addLogObserver",
     value: function _addLogObserver() {
       this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onRoomStateUpdated', 'onRemoteUsersJoined', 'onRemoteUsersLeft', 'onUserInfoUpdated', 'onAllUserCountUpdated']));
     }
+
+    // private _createCallId(prefix: string) {
+    //   return `${prefix}-${++this._callIdCounter}-${Date.now()}`;
+    // }
   }, {
     key: "_createCallId",
     value: function _createCallId(prefix) {
-      return "".concat(prefix, "-").concat(Number(new Date()));
+      return "".concat(prefix, "-").concat(++FcrUIWidgetSDKImpl._globalCounter, "-").concat(Date.now());
     }
   }, {
     key: "_createRequestParams",
@@ -88,7 +139,7 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
       var callId = this._createCallId(funcName);
       var finalParameters = parameters !== null && parameters !== void 0 ? parameters : [];
       return {
-        action: 'apiRequest',
+        action: _type.FcrUIWidgetSDKActionEnum.API_REQUEST,
         callId: callId,
         method: funcName,
         parameters: finalParameters
@@ -101,118 +152,182 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
       var p = (0, _utils.createControlledPromise)();
       this._requestPromises.set(params.callId, p);
       try {
-        if ((0, _typeof2["default"])(window.JsBridge) === 'object' && window.JsBridge !== null) {
-          var func = window.JsBridge[funcName];
-          if (typeof func === 'function') {
-            func(params);
-            this.logger.debug('sendRequest + JsBridge: ', params);
-          }
+        if (typeof window.postMessageToFcrJSBridge === 'function' && window.postMessageToFcrJSBridge !== null) {
+          window.postMessageToFcrJSBridge(params);
+          this.logger.debug('sendRequest + postMessageToFcrJSBridge: ', params);
         } else {
-          this.logger.debug('sendRequest + postMessage: ', params);
-          window.parent.postMessage(params, '*');
+          if ((0, _utils.isNativePlatform)()) {
+            this.logger.warn('sendRequest + postMessageToFcrJSBridge is not supported in native platform');
+            var reject = p.reject;
+            reject && reject(new Error('postMessageToFcrJSBridge is not available on native platform'));
+          } else {
+            this.logger.debug('sendRequest + postMessage: ', params);
+            window.parent.postMessage(params, '*');
+          }
         }
       } catch (error) {
         this.logger.error('Error sending request:', error);
-        var reject = p.reject;
-        reject && reject(error);
+        var _reject = p.reject;
+        _reject && _reject(error);
       }
       return p.promise;
     }
+  }, {
+    key: "_ensureBridgeReady",
+    value:
+    /**
+     * 等待 bridge 就绪后再发起请求。桥接没准备好时先缓存请求，待bridge ready之后批量发送。
+     * - 已就绪则直接走_sendRequest
+     * - 未就绪则放入_pendingRequests，超时10s自动reject
+     */
+    function _ensureBridgeReady(funcName, parameters) {
+      var _this2 = this;
+      if (this._bridgeReady) {
+        // bridge已就绪，直接请求
+        return this._sendRequest(funcName, parameters);
+      }
+
+      // bridge未就绪，请求进入pending队列
+      return new Promise(function (resolve, reject) {
+        var timeoutId;
+
+        // 同步清理timeout
+        var wrappedResolve = function wrappedResolve(value) {
+          clearTimeout(timeoutId);
+          resolve(value);
+        };
+        var wrappedReject = function wrappedReject(reason) {
+          clearTimeout(timeoutId);
+          reject(reason);
+        };
+        var pendingRequest = {
+          funcName: funcName,
+          parameters: parameters,
+          resolve: wrappedResolve,
+          reject: wrappedReject
+        };
+
+        // 添加到pending队列
+        _this2._pendingRequests.push(pendingRequest);
+
+        // 设定10s超时，超时未ready自动失败并移除
+        timeoutId = setTimeout(function () {
+          // 找到并移除pendingRequest
+          var idx = _this2._pendingRequests.indexOf(pendingRequest);
+          if (idx > -1) {
+            _this2._pendingRequests.splice(idx, 1);
+          }
+          reject(new Error('Bridge ready timeout'));
+        }, 10000);
+      });
+    }
   }, {
     key: "getRoomInfo",
-    value: function
-    // @trace
-    getRoomInfo() {
-      return this._sendRequest('getRoomInfo');
+    value: function getRoomInfo() {
+      return this._ensureBridgeReady('getRoomInfo');
     }
   }, {
     key: "getRoomSchedule",
-    value: function
-    // @trace
-    getRoomSchedule() {
-      return this._sendRequest('getRoomSchedule');
+    value: function getRoomSchedule() {
+      return this._ensureBridgeReady('getRoomSchedule');
     }
   }, {
     key: "getRoomState",
-    value: function
-    // @trace
-    getRoomState() {
-      return this._sendRequest('getRoomState');
+    value: function getRoomState() {
+      return this._ensureBridgeReady('getRoomState');
     }
   }, {
     key: "getLocalUser",
-    value: function
-    // @trace
-    getLocalUser() {
-      return this._sendRequest('getLocalUser');
+    value: function getLocalUser() {
+      return this._ensureBridgeReady('getLocalUser');
     }
   }, {
     key: "getUserList",
-    value: function
-    // @trace
-    getUserList() {
-      return this._sendRequest('getUserList');
+    value: function getUserList() {
+      return this._ensureBridgeReady('getUserList');
     }
   }, {
     key: "getAllUserCount",
-    value: function
-    // @trace
-    getAllUserCount() {
-      return this._sendRequest('getAllUserCount');
+    value: function getAllUserCount() {
+      return this._ensureBridgeReady('getAllUserCount');
     }
   }, {
     key: "startSessionByPhone",
     value: function startSessionByPhone(params) {
-      return this._sendRequest('startSessionByPhone', [params]);
+      return this._ensureBridgeReady('startSessionByPhone', [params]);
     }
   }, {
     key: "startSessionByIP",
     value: function startSessionByIP(params) {
-      return this._sendRequest('startSessionByIP', [params]);
+      return this._ensureBridgeReady('startSessionByIP', [params]);
     }
   }, {
     key: "stopSession",
     value: function stopSession(sessionId) {
-      return this._sendRequest('stopSession', [sessionId]);
+      return this._ensureBridgeReady('stopSession', [sessionId]);
+    }
+  }, {
+    key: "active",
+    value: function active() {
+      return this._ensureBridgeReady('active');
+    }
+  }, {
+    key: "inactive",
+    value: function inactive() {
+      return this._ensureBridgeReady('inactive');
+    }
+  }, {
+    key: "getActivity",
+    value: function getActivity() {
+      return this._ensureBridgeReady('getActivity');
     }
   }, {
     key: "addObserver",
-    value: function
-    // @trace
-    addObserver(observer) {
+    value: function addObserver(observer) {
       this._observable.addObserver(observer);
     }
   }, {
     key: "removeObserver",
-    value: function
-    // @trace
-    removeObserver(observer) {
+    value: function removeObserver(observer) {
       this._observable.removeObserver(observer);
     }
   }, {
     key: "_handlePostMessage",
     value: function _handlePostMessage(event) {
       if (event.data) {
-        var action = event.data.action;
-        if (action === 'apiResponse') {
+        var _event$data = event.data,
+          payload = _event$data.payload,
+          type = _event$data.type;
+        if (!payload) return;
+        var isFcrJSBridge = typeof window.postMessageToFcrJSBridge === 'function' && window.postMessageToFcrJSBridge !== null;
+        if (type !== _type.FcrJSBridgeMessageEvent && isFcrJSBridge) {
+          return;
+        }
+        if (payload.action === _type.FcrUIWidgetSDKActionEnum.API_RESPONSE) {
           this.logger.debug('handlePostMessage apiResponse: ', event.data);
-          var _event$data = event.data,
-            callId = _event$data.callId,
-            returnValue = _event$data.returnValue;
+          var _ref2 = payload,
+            callId = _ref2.callId,
+            returnValue = _ref2.returnValue,
+            error = _ref2.error;
           var controllerPromiseGroup = this._requestPromises.get(callId);
           if (controllerPromiseGroup) {
             this.logger.info('resolve callId', callId);
-            var resolve = controllerPromiseGroup.resolve;
-            resolve && resolve(returnValue);
+            var resolve = controllerPromiseGroup.resolve,
+              reject = controllerPromiseGroup.reject;
+            if (error) {
+              reject && reject(error);
+            } else {
+              resolve && resolve(returnValue);
+            }
             this._requestPromises["delete"](callId);
           }
-        } else if (action === 'callback') {
+        } else if (payload.action === _type.FcrUIWidgetSDKActionEnum.CALLBACK) {
           var _this$_observable;
           this.logger.debug('handlePostMessage callback: ', event.data);
-          var _event$data2 = event.data,
-            payload = _event$data2.payload,
-            method = _event$data2.method;
-          var args = Array.isArray(payload) ? payload : [payload];
+          var _payload = payload.payload,
+            method = _payload.method,
+            parameters = _payload.parameters;
+          var args = Array.isArray(parameters) ? parameters : [parameters];
           (_this$_observable = this._observable).notifyObservers.apply(_this$_observable, [method].concat((0, _toConsumableArray2["default"])(args)));
         }
       }
@@ -220,7 +335,6 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
   }]);
 }();
 _FcrUIWidgetSDKImpl = FcrUIWidgetSDKImpl;
-var _applyDecs$e = _applyDecs(_FcrUIWidgetSDKImpl, [[_bound.bound, 2, "getRoomInfo"], [_bound.bound, 2, "getRoomSchedule"], [_bound.bound, 2, "getRoomState"], [_bound.bound, 2, "getLocalUser"], [_bound.bound, 2, "getUserList"], [_bound.bound, 2, "getAllUserCount"], [_bound.bound, 2, "startSessionByPhone"], [_bound.bound, 2, "startSessionByIP"], [_bound.bound, 2, "stopSession"], [_bound.bound, 2, "addObserver"], [_bound.bound, 2, "removeObserver"], [_bound.bound, 2, "_handlePostMessage"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIWidgetSDKImpl, [[_bound.bound, 2, "getRoomInfo"], [_bound.bound, 2, "getRoomSchedule"], [_bound.bound, 2, "getRoomState"], [_bound.bound, 2, "getLocalUser"], [_bound.bound, 2, "getUserList"], [_bound.bound, 2, "getAllUserCount"], [_bound.bound, 2, "startSessionByPhone"], [_bound.bound, 2, "startSessionByIP"], [_bound.bound, 2, "stopSession"], [_bound.bound, 2, "active"], [_bound.bound, 2, "inactive"], [_bound.bound, 2, "getActivity"], [_bound.bound, 2, "addObserver"], [_bound.bound, 2, "removeObserver"], [_bound.bound, 2, "_handlePostMessage"]], []).e, 1);
+_initProto = _applyDecs$e[0];
+(0, _defineProperty2["default"])(FcrUIWidgetSDKImpl, "_globalCounter", 0);

package/lib/type.d.ts

@@ -1,23 +1,16 @@
 import type { FcrIPConnectorSession, FcrIPConnectorSessionParams, FcrPhoneConnectorSession, FcrPhoneConnectorSessionParams, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState, FcrRoomInfo, FcrRoomSchedule, FcrRoomState, FcrUserInfo } from 'fcr-core/lib/type';
-import type { FcrUserJoinedEvent, FcrUserLeftEvent, FcrUserPageParams, FcrUserPageResponse, FcrUserUpdatedEvent } from 'fcr-core/lib/room-control/user-control/type';
-type MethodNames<T> = {
-    [K in keyof T]: T[K] extends Function ? K : never;
-}[keyof T];
-export type FcrUIWebWidgetMethodName = MethodNames<FcrUIBaseWidget>;
-export type ID = string;
-export interface FcrPopupSize {
-    width: number;
-    height: number;
-}
+import type { FcrUserJoinedEvent, FcrUserLeftEvent, FcrUserUpdatedEvent } from 'fcr-core/lib/room-control/user-control/type';
+export type FcrUIWidgetSDKMethodName = keyof FcrUIWidgetSDK;
+export type FcrUIWidgetSDKMethodParameters = unknown[];
 export interface FcrUIWidgetSDK {
     /**
      * 获取房间信息
      */
-    getRoomInfo(): Promise<FcrRoomInfo>;
+    getRoomInfo(): Promise<FcrRoomInfo | undefined>;
     /**
      * 获取房间行程信息（如开始时间、持续时长等）
      */
-    getRoomSchedule(): Promise<FcrRoomSchedule>;
+    getRoomSchedule(): Promise<FcrRoomSchedule | undefined>;
     /**
      * 获取当前房间状态
      */
@@ -25,11 +18,11 @@ export interface FcrUIWidgetSDK {
     /**
      * 获取本地用户信息
      */
-    getLocalUser(): Promise<FcrUserInfo>;
+    getLocalUser(): Promise<FcrUserInfo | undefined>;
     /**
      * 获取远端用户列表
      */
-    getUserList(): Promise<FcrUserInfo[]>;
+    getUserList(): Promise<Readonly<FcrUserInfo[]>>;
     /**
      * 获取房间内用户总数
      */
@@ -47,40 +40,54 @@ export interface FcrUIWidgetSDK {
      * 停止会话
      * @param sessionId 会话ID
      */
-    stopSession(sessionId: string): Promise<void>;
+    stopSession(sessionId: string): Promise<number>;
+    /**
+     * 激活widget
+     * @param widgetId widgetId
+     */
+    active(): Promise<void>;
+    /**
+     * 停用widget
+     * @param widgetId widgetId
+     */
+    inactive(): Promise<void>;
+    /**
+     * 获取指定 widget 是否处于激活状态（scene 中 `widgets.{widgetId}.state === 1`）。
+     */
+    getActivity(): Promise<boolean>;
     /**
      * 添加观察者，用来接收 Widget 事件回调
      * @param observer 实现 FcrUIWidgetObserver 的对象
      */
-    addObserver(observer: FcrUIWidgetObserver): void;
+    addObserver(observer: FcrUIWidgetSDKObserver): void;
     /**
      * 移除之前添加的观察者
      * @param observer 要移除的观察者
      */
-    removeObserver(observer: FcrUIWidgetObserver): void;
+    removeObserver(observer: FcrUIWidgetSDKObserver): void;
 }
-export interface FcrUIWidgetObserver {
+export interface FcrUIWidgetSDKObserver {
     /**
      * 房间状态更新回调
      * @param state 最新的房间状态
      * @returns
      */
-    onRoomStateUpdated(roomId: string, state: FcrRoomState): void;
+    onRoomStateUpdated?(roomId: string, state: FcrRoomState): void;
     /**
      * 远端用户加入房间回调
      * @param events 事件数组
      */
-    onRemoteUsersJoined(roomId: string, events: FcrUserJoinedEvent[]): void;
+    onRemoteUsersJoined?(roomId: string, events: FcrUserJoinedEvent[]): void;
     /**
      * 远端用户离开房间回调
      * @param events 事件数组
      */
-    onRemoteUsersLeft(roomId: string, events: FcrUserLeftEvent[]): void;
+    onRemoteUsersLeft?(roomId: string, events: FcrUserLeftEvent[]): void;
     /**
      * Callback to receive the user updated event.
      * @param event
      */
-    onUserInfoUpdated(roomId: string, event: FcrUserUpdatedEvent): void;
+    onUserInfoUpdated?(roomId: string, event: FcrUserUpdatedEvent): void;
     /**
      * 房间内所有用户总数更新回调
      * @param count 当前的用户数量
@@ -101,106 +108,54 @@ export interface FcrUIWidgetObserver {
      */
     onIPConnectorSessionStateUpdated?(session: FcrIPConnectorSession, state: FcrRoomConnectorSessionState, reason: FcrRoomConnectorSessionReason): void;
 }
-export interface FcrUIBaseWidget {
-    /**
-     * 获取房间信息
-     */
-    getRoomInfo(): FcrRoomInfo | undefined;
-    /**
-     *  获取房间行程信息（如开始时间、持续时长等）
-     */
-    getRoomSchedule(): FcrRoomSchedule | undefined;
-    /**
-     * 获取当前房间状态
-     */
-    getRoomState(): FcrRoomState;
-    /**
-     * 获取本地用户信息
-     */
-    getLocalUser(): FcrUserInfo;
-    /**
-     * 获取远端用户列表
-     */
-    getUserList(): Readonly<FcrUserInfo[]>;
-    /**
-     * 获取房间内用户总数
-     */
-    getAllUserCount(): number;
-    /**
-     * 开始电话会话
-     * @param params 会话参数
-     */
-    startSessionByPhone(params: FcrPhoneConnectorSessionParams): Promise<string>;
-    /**
-     * 开始IP会话
-     */
-    startSessionByIP(params: FcrIPConnectorSessionParams): Promise<string>;
-    /**
-     * 停止会话
-     * @param sessionId 会话ID
-     */
-    stopSession(sessionId: string): Promise<void>;
-    /**
-     * Fetches the list of users.
-     * @param params
-     */
-    fetchUserList(params: FcrUserPageParams): Promise<FcrUserPageResponse>;
-    /**
-     * 添加观察者，用来接收 Widget 事件回调
-     * @param observer 实现 FcrUIWidgetObserver 的对象
-     */
-    addObserver(observer: FcrUIWidgetObserver): void;
-    /**
-     * 移除之前添加的观察者
-     * @param observer 要移除的观察者
-     */
-    removeObserver(observer: FcrUIWidgetObserver): void;
-}
-export interface FcrUIWebWidget extends FcrUIBaseWidget {
-    /**
-     * 实例化widget
-     * 创建webview并注入FcrUIBaseWidget中的方法或者回调,命名空间FcrJSBridge
-     * webview加载FcrUIWebWidgetConfig.url
-     * @param webview 承载内嵌iframe的window引用
-     * @param dialogWindow 承载widgetDialog的window引用
-     */
-    init(webview: Window, dialogWindow: Window): void;
-    /**
-     * 刷新webview
-     */
-    reload(): void;
-    /**
-     *销毁widget
-     */
-    release(): void;
-}
-export type ApiRequest = {
-    action: 'apiRequest';
-    callId: number;
-    method: string;
-    parameters: [];
+export type FcrUIWidgetSDKApiRequest = {
+    action: FcrUIWidgetSDKActionEnum.API_REQUEST;
+    callId: string;
+    method: FcrUIWidgetSDKMethodName;
+    parameters: FcrUIWidgetSDKMethodParameters;
 };
-export type ApiResponse = {
-    action: 'apiResponse';
-    callId: number;
-    method: string;
-    returnValue: unknown;
+export type FcrUIWidgetSDKApiResponse = {
+    action: FcrUIWidgetSDKActionEnum.API_RESPONSE;
+    callId: string;
+    method: FcrUIWidgetSDKMethodName;
+    returnValue?: unknown;
+    error?: {
+        code: number;
+        message: string;
+    };
 };
-export type Callback = {
-    action: 'callback';
-    payload: object;
+export type FcrUIWidgetSDKCallbacName = keyof FcrUIWidgetSDKObserver;
+export type FcrUIWidgetSDKCallback = {
+    action: FcrUIWidgetSDKActionEnum.CALLBACK;
+    payload: {
+        method: FcrUIWidgetSDKCallbacName;
+        parameters: unknown[];
+    };
 };
-export type ControlledPromise<T> = {
+export type FcrUIWidgetSDKControlledPromise<T> = {
     promise: Promise<T>;
     resolve?: (value: T | PromiseLike<T>) => void;
     reject?: (reason?: any) => void;
 };
-export interface JsBridge {
-    [funcName: string]: (params: Record<string, any>) => void;
-}
+export type FcrUIWidgetSDKPendingRequest = {
+    funcName: FcrUIWidgetSDKMethodName;
+    parameters?: FcrUIWidgetSDKMethodParameters;
+    resolve: (value: any) => void;
+    reject: (error?: any) => void;
+};
 declare global {
     interface Window {
-        JsBridge?: JsBridge;
+        /** 宿主注入：JS Bridge 是否已就绪 */
+        __fcrJSBridgeReady__?: boolean;
+        __onFcrJSBridgeReady__?: () => void;
+        postMessageToFcrJSBridge?: (params: Record<string, any>) => void;
     }
 }
-export {};
+export declare const FcrJSBridgeMessageEvent = "fcr-js-bridge";
+export declare enum FcrUIWidgetSDKActionEnum {
+    API_REQUEST = "apiRequest",
+    API_RESPONSE = "apiResponse",
+    CALLBACK = "callback",
+    /** 宿主跨域 iframe 无法用 __onFcrJSBridgeReady__ 回调时，通过 postMessage 通知桥接就绪 */
+    BRIDGE_READY = "bridgeReady"
+}

package/lib/type.js

@@ -3,4 +3,18 @@
 require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.FcrUIWidgetSDKActionEnum = exports.FcrJSBridgeMessageEvent = void 0;
+// export interface JsBridge {
+//   [funcName: string]: (params: Record<string, any>) => void;
+// }
+
+var FcrJSBridgeMessageEvent = exports.FcrJSBridgeMessageEvent = 'fcr-js-bridge';
+var FcrUIWidgetSDKActionEnum = exports.FcrUIWidgetSDKActionEnum = /*#__PURE__*/function (FcrUIWidgetSDKActionEnum) {
+  FcrUIWidgetSDKActionEnum["API_REQUEST"] = "apiRequest";
+  FcrUIWidgetSDKActionEnum["API_RESPONSE"] = "apiResponse";
+  FcrUIWidgetSDKActionEnum["CALLBACK"] = "callback";
+  /** 宿主跨域 iframe 无法用 __onFcrJSBridgeReady__ 回调时，通过 postMessage 通知桥接就绪 */
+  FcrUIWidgetSDKActionEnum["BRIDGE_READY"] = "bridgeReady";
+  return FcrUIWidgetSDKActionEnum;
+}({});

package/lib/utils.d.ts

@@ -1,2 +1,3 @@
-import { ControlledPromise } from './type';
-export declare const createControlledPromise: <T>() => ControlledPromise<T>;
+import { FcrUIWidgetSDKControlledPromise } from './type';
+export declare const createControlledPromise: <T>() => FcrUIWidgetSDKControlledPromise<T>;
+export declare const isNativePlatform: () => boolean;

package/lib/utils.js

@@ -4,9 +4,11 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createControlledPromise = void 0;
+exports.isNativePlatform = exports.createControlledPromise = void 0;
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
 var createControlledPromise = exports.createControlledPromise = function createControlledPromise() {
   var resolve = function resolve() {};
   var reject = function reject() {};
@@ -19,4 +21,9 @@ var createControlledPromise = exports.createControlledPromise = function createC
     resolve: resolve,
     reject: reject
   };
+};
+var isNativePlatform = exports.isNativePlatform = function isNativePlatform() {
+  var ua = navigator.userAgent.toLowerCase();
+  var hasWebViewUA = /wv|webview/.test(ua) || /; wv\)/.test(ua);
+  return hasWebViewUA;
 };

package/lib-es/sdk.js

@@ -1,33 +1,39 @@
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.symbol.description.js";
-import "core-js/modules/es.symbol.to-primitive.js";
-import "core-js/modules/es.error.cause.js";
-import "core-js/modules/es.error.to-string.js";
-import "core-js/modules/es.array.push.js";
-import "core-js/modules/es.date.to-primitive.js";
-import "core-js/modules/es.function.bind.js";
-import "core-js/modules/es.function.name.js";
-import "core-js/modules/es.object.create.js";
-import "core-js/modules/es.object.define-property.js";
-import "core-js/modules/es.object.get-own-property-descriptor.js";
-import "core-js/modules/esnext.function.metadata.js";
-import "core-js/modules/esnext.symbol.metadata.js";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _typeof from "@babel/runtime/helpers/typeof";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _FcrUIWidgetSDKImpl;
 var _initProto;
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.to-primitive.js";
+import "core-js/modules/es.error.cause.js";
+import "core-js/modules/es.error.to-string.js";
 import "core-js/modules/es.array.concat.js";
+import "core-js/modules/es.array.for-each.js";
+import "core-js/modules/es.array.index-of.js";
 import "core-js/modules/es.array.is-array.js";
 import "core-js/modules/es.array.iterator.js";
-import "core-js/modules/es.date.to-string.js";
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.array.slice.js";
+import "core-js/modules/es.array.splice.js";
+import "core-js/modules/es.date.now.js";
+import "core-js/modules/es.date.to-primitive.js";
+import "core-js/modules/es.function.bind.js";
+import "core-js/modules/es.function.name.js";
 import "core-js/modules/es.map.js";
 import "core-js/modules/es.number.constructor.js";
+import "core-js/modules/es.object.create.js";
+import "core-js/modules/es.object.define-property.js";
+import "core-js/modules/es.object.get-own-property-descriptor.js";
 import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.promise.js";
 import "core-js/modules/es.string.iterator.js";
+import "core-js/modules/esnext.function.metadata.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.map.delete-all.js";
 import "core-js/modules/esnext.map.emplace.js";
 import "core-js/modules/esnext.map.every.js";
@@ -42,7 +48,10 @@ import "core-js/modules/esnext.map.merge.js";
 import "core-js/modules/esnext.map.reduce.js";
 import "core-js/modules/esnext.map.some.js";
 import "core-js/modules/esnext.map.update.js";
+import "core-js/modules/esnext.symbol.metadata.js";
+import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/web.dom-collections.iterator.js";
+import "core-js/modules/web.timers.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 set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -50,10 +59,12 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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 { bound } from 'agora-foundation/lib/decorator/bound';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+import { FcrJSBridgeMessageEvent, FcrUIWidgetSDKActionEnum } from './type';
 import { createLogger, generateLogObserver } from './logger';
-import { createControlledPromise } from './utils';
+import { createControlledPromise, isNativePlatform } from './utils';
 export var FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
   function FcrUIWidgetSDKImpl() {
+    var _this = this;
     _classCallCheck(this, FcrUIWidgetSDKImpl);
     _defineProperty(this, "logger", (_initProto(this), createLogger({
       prefix: 'FcrUIWidgetSDK',
@@ -61,18 +72,59 @@ export var FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
     })));
     _defineProperty(this, "_observable", new AgoraObservable());
     _defineProperty(this, "_requestPromises", new Map());
-    window.addEventListener('message', this._handlePostMessage);
-    this._addLogObserver();
+    _defineProperty(this, "_bridgeReady", false);
+    /** 避免 __onFcrJSBridgeReady__ / BRIDGE_READY postMessage 重复执行初始化 */
+    _defineProperty(this, "_onBridgeReadyRan", false);
+    _defineProperty(this, "_pendingRequests", []);
+    _defineProperty(this, "_handleBridgeReadyMessage", function (event) {
+      var _data$payload;
+      var data = event.data;
+      if ((data === null || data === void 0 ? void 0 : data.type) === FcrJSBridgeMessageEvent && ((_data$payload = data.payload) === null || _data$payload === void 0 ? void 0 : _data$payload.action) === FcrUIWidgetSDKActionEnum.BRIDGE_READY) {
+        _this._onBridgeReady();
+      }
+    });
+    _defineProperty(this, "_onBridgeReady", function () {
+      if (_this._onBridgeReadyRan) {
+        return;
+      }
+      _this._onBridgeReadyRan = true;
+      _this._bridgeReady = true;
+      window.removeEventListener('message', _this._handleBridgeReadyMessage);
+      window.addEventListener('message', _this._handlePostMessage);
+      _this._addLogObserver();
+      _this.logger.debug('init sdk onBridgeReady');
+      // flush pending requests
+      var requests = _this._pendingRequests.slice();
+      _this._pendingRequests = [];
+      requests.forEach(function (_ref) {
+        var funcName = _ref.funcName,
+          parameters = _ref.parameters,
+          resolve = _ref.resolve,
+          reject = _ref.reject;
+        _this._sendRequest(funcName, parameters).then(resolve)["catch"](reject);
+      });
+    });
+    this._bridgeReady = typeof window.__fcrJSBridgeReady__ === 'boolean' ? window.__fcrJSBridgeReady__ : false;
+    window.addEventListener('message', this._handleBridgeReadyMessage);
+    if (window.__fcrJSBridgeReady__) {
+      this._onBridgeReady();
+    } else {
+      window.__onFcrJSBridgeReady__ = this._onBridgeReady;
+    }
   }
   return _createClass(FcrUIWidgetSDKImpl, [{
     key: "_addLogObserver",
     value: function _addLogObserver() {
       this.addObserver(generateLogObserver(this.logger, ['onRoomStateUpdated', 'onRemoteUsersJoined', 'onRemoteUsersLeft', 'onUserInfoUpdated', 'onAllUserCountUpdated']));
     }
+
+    // private _createCallId(prefix: string) {
+    //   return `${prefix}-${++this._callIdCounter}-${Date.now()}`;
+    // }
   }, {
     key: "_createCallId",
     value: function _createCallId(prefix) {
-      return "".concat(prefix, "-").concat(Number(new Date()));
+      return "".concat(prefix, "-").concat(++FcrUIWidgetSDKImpl._globalCounter, "-").concat(Date.now());
     }
   }, {
     key: "_createRequestParams",
@@ -80,7 +132,7 @@ export var FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
       var callId = this._createCallId(funcName);
       var finalParameters = parameters !== null && parameters !== void 0 ? parameters : [];
       return {
-        action: 'apiRequest',
+        action: FcrUIWidgetSDKActionEnum.API_REQUEST,
         callId: callId,
         method: funcName,
         parameters: finalParameters
@@ -93,118 +145,182 @@ export var FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
       var p = createControlledPromise();
       this._requestPromises.set(params.callId, p);
       try {
-        if (_typeof(window.JsBridge) === 'object' && window.JsBridge !== null) {
-          var func = window.JsBridge[funcName];
-          if (typeof func === 'function') {
-            func(params);
-            this.logger.debug('sendRequest + JsBridge: ', params);
-          }
+        if (typeof window.postMessageToFcrJSBridge === 'function' && window.postMessageToFcrJSBridge !== null) {
+          window.postMessageToFcrJSBridge(params);
+          this.logger.debug('sendRequest + postMessageToFcrJSBridge: ', params);
         } else {
-          this.logger.debug('sendRequest + postMessage: ', params);
-          window.parent.postMessage(params, '*');
+          if (isNativePlatform()) {
+            this.logger.warn('sendRequest + postMessageToFcrJSBridge is not supported in native platform');
+            var reject = p.reject;
+            reject && reject(new Error('postMessageToFcrJSBridge is not available on native platform'));
+          } else {
+            this.logger.debug('sendRequest + postMessage: ', params);
+            window.parent.postMessage(params, '*');
+          }
         }
       } catch (error) {
         this.logger.error('Error sending request:', error);
-        var reject = p.reject;
-        reject && reject(error);
+        var _reject = p.reject;
+        _reject && _reject(error);
       }
       return p.promise;
     }
+  }, {
+    key: "_ensureBridgeReady",
+    value:
+    /**
+     * 等待 bridge 就绪后再发起请求。桥接没准备好时先缓存请求，待bridge ready之后批量发送。
+     * - 已就绪则直接走_sendRequest
+     * - 未就绪则放入_pendingRequests，超时10s自动reject
+     */
+    function _ensureBridgeReady(funcName, parameters) {
+      var _this2 = this;
+      if (this._bridgeReady) {
+        // bridge已就绪，直接请求
+        return this._sendRequest(funcName, parameters);
+      }
+
+      // bridge未就绪，请求进入pending队列
+      return new Promise(function (resolve, reject) {
+        var timeoutId;
+
+        // 同步清理timeout
+        var wrappedResolve = function wrappedResolve(value) {
+          clearTimeout(timeoutId);
+          resolve(value);
+        };
+        var wrappedReject = function wrappedReject(reason) {
+          clearTimeout(timeoutId);
+          reject(reason);
+        };
+        var pendingRequest = {
+          funcName: funcName,
+          parameters: parameters,
+          resolve: wrappedResolve,
+          reject: wrappedReject
+        };
+
+        // 添加到pending队列
+        _this2._pendingRequests.push(pendingRequest);
+
+        // 设定10s超时，超时未ready自动失败并移除
+        timeoutId = setTimeout(function () {
+          // 找到并移除pendingRequest
+          var idx = _this2._pendingRequests.indexOf(pendingRequest);
+          if (idx > -1) {
+            _this2._pendingRequests.splice(idx, 1);
+          }
+          reject(new Error('Bridge ready timeout'));
+        }, 10000);
+      });
+    }
   }, {
     key: "getRoomInfo",
-    value: function
-    // @trace
-    getRoomInfo() {
-      return this._sendRequest('getRoomInfo');
+    value: function getRoomInfo() {
+      return this._ensureBridgeReady('getRoomInfo');
     }
   }, {
     key: "getRoomSchedule",
-    value: function
-    // @trace
-    getRoomSchedule() {
-      return this._sendRequest('getRoomSchedule');
+    value: function getRoomSchedule() {
+      return this._ensureBridgeReady('getRoomSchedule');
     }
   }, {
     key: "getRoomState",
-    value: function
-    // @trace
-    getRoomState() {
-      return this._sendRequest('getRoomState');
+    value: function getRoomState() {
+      return this._ensureBridgeReady('getRoomState');
     }
   }, {
     key: "getLocalUser",
-    value: function
-    // @trace
-    getLocalUser() {
-      return this._sendRequest('getLocalUser');
+    value: function getLocalUser() {
+      return this._ensureBridgeReady('getLocalUser');
     }
   }, {
     key: "getUserList",
-    value: function
-    // @trace
-    getUserList() {
-      return this._sendRequest('getUserList');
+    value: function getUserList() {
+      return this._ensureBridgeReady('getUserList');
     }
   }, {
     key: "getAllUserCount",
-    value: function
-    // @trace
-    getAllUserCount() {
-      return this._sendRequest('getAllUserCount');
+    value: function getAllUserCount() {
+      return this._ensureBridgeReady('getAllUserCount');
     }
   }, {
     key: "startSessionByPhone",
     value: function startSessionByPhone(params) {
-      return this._sendRequest('startSessionByPhone', [params]);
+      return this._ensureBridgeReady('startSessionByPhone', [params]);
     }
   }, {
     key: "startSessionByIP",
     value: function startSessionByIP(params) {
-      return this._sendRequest('startSessionByIP', [params]);
+      return this._ensureBridgeReady('startSessionByIP', [params]);
     }
   }, {
     key: "stopSession",
     value: function stopSession(sessionId) {
-      return this._sendRequest('stopSession', [sessionId]);
+      return this._ensureBridgeReady('stopSession', [sessionId]);
+    }
+  }, {
+    key: "active",
+    value: function active() {
+      return this._ensureBridgeReady('active');
+    }
+  }, {
+    key: "inactive",
+    value: function inactive() {
+      return this._ensureBridgeReady('inactive');
+    }
+  }, {
+    key: "getActivity",
+    value: function getActivity() {
+      return this._ensureBridgeReady('getActivity');
     }
   }, {
     key: "addObserver",
-    value: function
-    // @trace
-    addObserver(observer) {
+    value: function addObserver(observer) {
       this._observable.addObserver(observer);
     }
   }, {
     key: "removeObserver",
-    value: function
-    // @trace
-    removeObserver(observer) {
+    value: function removeObserver(observer) {
       this._observable.removeObserver(observer);
     }
   }, {
     key: "_handlePostMessage",
     value: function _handlePostMessage(event) {
       if (event.data) {
-        var action = event.data.action;
-        if (action === 'apiResponse') {
+        var _event$data = event.data,
+          payload = _event$data.payload,
+          type = _event$data.type;
+        if (!payload) return;
+        var isFcrJSBridge = typeof window.postMessageToFcrJSBridge === 'function' && window.postMessageToFcrJSBridge !== null;
+        if (type !== FcrJSBridgeMessageEvent && isFcrJSBridge) {
+          return;
+        }
+        if (payload.action === FcrUIWidgetSDKActionEnum.API_RESPONSE) {
           this.logger.debug('handlePostMessage apiResponse: ', event.data);
-          var _event$data = event.data,
-            callId = _event$data.callId,
-            returnValue = _event$data.returnValue;
+          var _ref2 = payload,
+            callId = _ref2.callId,
+            returnValue = _ref2.returnValue,
+            error = _ref2.error;
           var controllerPromiseGroup = this._requestPromises.get(callId);
           if (controllerPromiseGroup) {
             this.logger.info('resolve callId', callId);
-            var resolve = controllerPromiseGroup.resolve;
-            resolve && resolve(returnValue);
+            var resolve = controllerPromiseGroup.resolve,
+              reject = controllerPromiseGroup.reject;
+            if (error) {
+              reject && reject(error);
+            } else {
+              resolve && resolve(returnValue);
+            }
             this._requestPromises["delete"](callId);
           }
-        } else if (action === 'callback') {
+        } else if (payload.action === FcrUIWidgetSDKActionEnum.CALLBACK) {
           var _this$_observable;
           this.logger.debug('handlePostMessage callback: ', event.data);
-          var _event$data2 = event.data,
-            payload = _event$data2.payload,
-            method = _event$data2.method;
-          var args = Array.isArray(payload) ? payload : [payload];
+          var _payload = payload.payload,
+            method = _payload.method,
+            parameters = _payload.parameters;
+          var args = Array.isArray(parameters) ? parameters : [parameters];
           (_this$_observable = this._observable).notifyObservers.apply(_this$_observable, [method].concat(_toConsumableArray(args)));
         }
       }
@@ -212,7 +328,6 @@ export var FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
   }]);
 }();
 _FcrUIWidgetSDKImpl = FcrUIWidgetSDKImpl;
-var _applyDecs$e = _applyDecs(_FcrUIWidgetSDKImpl, [[bound, 2, "getRoomInfo"], [bound, 2, "getRoomSchedule"], [bound, 2, "getRoomState"], [bound, 2, "getLocalUser"], [bound, 2, "getUserList"], [bound, 2, "getAllUserCount"], [bound, 2, "startSessionByPhone"], [bound, 2, "startSessionByIP"], [bound, 2, "stopSession"], [bound, 2, "addObserver"], [bound, 2, "removeObserver"], [bound, 2, "_handlePostMessage"]], []).e;
-var _applyDecs$e2 = _slicedToArray(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+var _applyDecs$e = _slicedToArray(_applyDecs(_FcrUIWidgetSDKImpl, [[bound, 2, "getRoomInfo"], [bound, 2, "getRoomSchedule"], [bound, 2, "getRoomState"], [bound, 2, "getLocalUser"], [bound, 2, "getUserList"], [bound, 2, "getAllUserCount"], [bound, 2, "startSessionByPhone"], [bound, 2, "startSessionByIP"], [bound, 2, "stopSession"], [bound, 2, "active"], [bound, 2, "inactive"], [bound, 2, "getActivity"], [bound, 2, "addObserver"], [bound, 2, "removeObserver"], [bound, 2, "_handlePostMessage"]], []).e, 1);
+_initProto = _applyDecs$e[0];
+_defineProperty(FcrUIWidgetSDKImpl, "_globalCounter", 0);

package/lib-es/type.js

@@ -1 +1,13 @@
-export {};
+// export interface JsBridge {
+//   [funcName: string]: (params: Record<string, any>) => void;
+// }
+
+export var FcrJSBridgeMessageEvent = 'fcr-js-bridge';
+export var FcrUIWidgetSDKActionEnum = /*#__PURE__*/function (FcrUIWidgetSDKActionEnum) {
+  FcrUIWidgetSDKActionEnum["API_REQUEST"] = "apiRequest";
+  FcrUIWidgetSDKActionEnum["API_RESPONSE"] = "apiResponse";
+  FcrUIWidgetSDKActionEnum["CALLBACK"] = "callback";
+  /** 宿主跨域 iframe 无法用 __onFcrJSBridgeReady__ 回调时，通过 postMessage 通知桥接就绪 */
+  FcrUIWidgetSDKActionEnum["BRIDGE_READY"] = "bridgeReady";
+  return FcrUIWidgetSDKActionEnum;
+}({});

package/lib-es/utils.js

@@ -1,5 +1,7 @@
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.promise.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.regexp.test.js";
 export var createControlledPromise = function createControlledPromise() {
   var resolve = function resolve() {};
   var reject = function reject() {};
@@ -12,4 +14,9 @@ export var createControlledPromise = function createControlledPromise() {
     resolve: resolve,
     reject: reject
   };
+};
+export var isNativePlatform = function isNativePlatform() {
+  var ua = navigator.userAgent.toLowerCase();
+  var hasWebViewUA = /wv|webview/.test(ua) || /; wv\)/.test(ua);
+  return hasWebViewUA;
 };

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "fcr-ui-widget-sdk",
-  "version": "3.10.0",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
-  "author": "agora.io",
-  "license": "MIT",
-  "files": [
-    "lib",
-    "lib-es"
-  ],
-  "scripts": {
-    "build": "agora-tc-transpile --esm",
-    "build-widget": "node scripts/build-widget.js",
-    "test": "agora-tc-test-karma-browser"
-  },
-  "dependencies": {
-    "agora-foundation": "3.10.0",
-    "fcr-core": "3.10.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.23.5",
-    "@babel/preset-env": "^7.23.5",
-    "@babel/preset-react": "^7.24.1",
-    "@babel/preset-typescript": "^7.23.3",
-    "agora-toolchain": "3.10.0",
-    "tslib": "^2.6.2"
-  }
-}
+{
+  "name": "fcr-ui-widget-sdk",
+  "version": "3.10.1",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
+  "author": "agora.io",
+  "license": "MIT",
+  "files": [
+    "lib",
+    "lib-es"
+  ],
+  "scripts": {
+    "build": "agora-tc-transpile --esm",
+    "build-widget": "node scripts/build-widget.js",
+    "test": "agora-tc-test-karma-browser"
+  },
+  "dependencies": {
+    "agora-foundation": "3.10.1",
+    "fcr-core": "3.10.1"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.23.5",
+    "@babel/preset-env": "^7.23.5",
+    "@babel/preset-react": "^7.24.1",
+    "@babel/preset-typescript": "^7.23.3",
+    "agora-toolchain": "3.10.1",
+    "tslib": "^2.6.2"
+  }
+}