@realsee/live 0.5.0-alpha.8 → 0.5.0-alpha.9

package/dist/realsee-live.umd.development.js

@@ -49245,38 +49245,48 @@
       WeappBridgeMessage["alive"] = "I`m alive!";
   })(WeappBridgeMessage || (WeappBridgeMessage = {}));
 
-  const endpoint = 'wss://ws.realsee.com';
-  var defaultWsEndpoint = endpoint;
-
   /**
-   * 拼接ws链接
-   * @param tpl
-   * @param params
-   * @returns
+   * ws的状态
+   * 参考https://developer.mozilla.org/en-US/docs/Web/API/WebSocket
    */
-  const generateWssUrl = (tpl, params) => {
-      const url = Object.keys(params).reduce((res, curr) => res.replace(`{{${curr}}}`, `${params[curr]}`), tpl);
-      return encodeURI(url);
-  };
-  var generateWssUrl$1 = generateWssUrl;
-
-  const isValidKey = (key, object) => key in object;
-  var isValidKey$1 = isValidKey;
+  var WebSocketState;
+  (function (WebSocketState) {
+      WebSocketState[WebSocketState["CONNECTING"] = 0] = "CONNECTING";
+      WebSocketState[WebSocketState["OPEN"] = 1] = "OPEN";
+      WebSocketState[WebSocketState["CLOSING"] = 2] = "CLOSING";
+      WebSocketState[WebSocketState["CLOSED"] = 3] = "CLOSED";
+  })(WebSocketState || (WebSocketState = {}));
 
   /**
-   * 解析参数
-   * @param query
-   * @returns
+   * ws 关闭的原因
    */
-  const parseQuery = (query = '') => query
-      .replace('?', '')
-      .split('&')
-      .map((qs) => {
-      const [k, v] = qs.split('=');
-      return { [k]: decodeURIComponent(v) };
-  })
-      .reduce((result, curr) => ({ ...result, ...curr }), {});
-  var parseQuery$1 = parseQuery;
+  const WebSocketCloseOptions = {
+      /**
+       * 重连关闭
+       */
+      reconnect: { code: 1000, reason: 'close websocket when reconnecting' },
+      /**
+       * 主动关闭
+       */
+      normalClosure: { code: 1000, reason: 'normal closure' },
+      /**
+       * 强制关闭
+       */
+      forceClosure: { code: 1000, reason: 'force closure' },
+      /**
+       * 切换到后台，被微信杀掉，需要重连连接
+       */
+      interrupted: { code: 1000, reason: 'interrupted' },
+      /**
+       * 服务端拒绝连接
+       */
+      streamEndEncountered: { code: 1000, reason: 'stream end encountered' },
+      /**
+       * 丢失心跳
+       * @deprecated
+       */
+      lostHeartbeat: { code: 1000, reason: 'lost heartbeat' },
+  };
 
   const EVENT_SYMBOL = '$$REALSEE_JSBRIDGE_EVENT$$';
   function __generateEventIfNotExisted(instance) {
@@ -49391,269 +49401,228 @@
   }
 
   /**
-   * 具有鲁棒性的WebSocket封装
-   * 1、自动重连
-   * 2、可根据网络情况进行重连
+   * ws的事件
    */
-  class RobustWebSocket$1 extends Subscribe {
-      constructor(options) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-          super();
-          this._options = {
-              timeout: 10000,
-              shouldReconnect: (event, ws) => {
-                  if (event.code === 1008 || event.code === 1011)
-                      return;
-                  return [0, 3000, 10000][ws.attempts];
-              },
-              should1000Reconnect: false,
-              ignoreConnectivityEvents: false,
-              automaticOpen: false,
-          };
-          this._attempts = 0;
-          this._reconnects = -1;
-          this._reconnectWhenOnlineAgain = false;
-          this._explicitlyClosed = false;
-          this._connectivityEventsAttached = false;
-          /**
-           * 清理连接中的请求
-           */
-          this._clearPendingReconnectIfNeeded = () => {
-              if (this._pendingReconnect) {
-                  clearTimeout(this._pendingReconnect);
-                  this._pendingReconnect = undefined;
-              }
-          };
-          /**
-           * 当网页连接上网络进行重连
-           * @param event
-           */
-          this._online = (event) => {
-              if (this._reconnectWhenOnlineAgain) {
-                  this._clearPendingReconnectIfNeeded();
-                  this._reconnect(event);
-              }
-          };
-          /**
-           * 当网页断开网络进行关闭
-           */
-          this._offline = () => {
-              var _a;
-              this._reconnectWhenOnlineAgain = true;
-              (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.close(1000);
-          };
+  var WebSocketEvent;
+  (function (WebSocketEvent) {
+      WebSocketEvent["open"] = "open";
+      WebSocketEvent["close"] = "close";
+      WebSocketEvent["error"] = "error";
+      WebSocketEvent["message"] = "message";
+  })(WebSocketEvent || (WebSocketEvent = {}));
+
+  class Ws4Webview extends Subscribe {
+      constructor() {
+          super(...arguments);
+          this._state = null;
           /**
-           * 解除网络监听事件
+           * @description 注册ws接通事件回调
+           * @param listener 事件回调函数
+           * @param once 是否只执行一次
+           * @returns
            */
-          this._detachConnectivityEvents = () => {
-              if (this._connectivityEventsAttached) {
-                  globalThis === null || globalThis === void 0 ? void 0 : globalThis.removeEventListener('online', this._online);
-                  globalThis === null || globalThis === void 0 ? void 0 : globalThis.removeEventListener('offline', this._offline);
-                  this._connectivityEventsAttached = false;
-              }
-          };
+          this.onOpen = (listener, once) => once ? this.once(WebSocketEvent.open, listener) : this.on(WebSocketEvent.open, listener);
           /**
-           * 注册网络监听事件
+           * @description 注册一次ws接通事件回调
+           * @param listener 事件回调函数
            */
-          this._attachConnectivityEvents = () => {
-              if (!this._connectivityEventsAttached) {
-                  globalThis === null || globalThis === void 0 ? void 0 : globalThis.addEventListener('online', this._online);
-                  globalThis === null || globalThis === void 0 ? void 0 : globalThis.addEventListener('offline', this._offline);
-                  this._connectivityEventsAttached = true;
-              }
-          };
+          this.onceOpen = (listener) => this.onOpen(listener, true);
           /**
-           * 发送消息
-           * @param data
+           * @description 移除ws接通事件回调
+           * @param listener 事件回调函数
            * @returns
            */
-          this.send = (data) => {
-              var _a, _b, _c;
-              if (((_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.readyState) === ((_b = this._realWebSocket) === null || _b === void 0 ? void 0 : _b.OPEN)) {
-                  (_c = this._realWebSocket) === null || _c === void 0 ? void 0 : _c.send(data);
-              }
-          };
+          this.offOpen = (listener) => this.hasListener(WebSocketEvent.open) && this.off(WebSocketEvent.open, listener);
           /**
-           * 关闭连接
-           * @param code 代码
-           * @param reason 原因
+           * @description 注册ws消息事件回调
+           * @param listener 事件回调函数
+           * @param once 是否只执行一次
            * @returns
            */
-          this.close = (code, reason) => {
-              var _a;
-              if (typeof code !== 'number') {
-                  reason = code;
-                  code = 1000;
-              }
-              this._clearPendingReconnectIfNeeded();
-              this._reconnectWhenOnlineAgain = false;
-              this._explicitlyClosed = true;
-              this._detachConnectivityEvents();
-              return (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.close(code, reason);
-          };
+          this.onMessage = (listener, once) => once ? this.once(WebSocketEvent.message, listener) : this.on(WebSocketEvent.message, listener);
           /**
-           * 进行ws连接
+           * @description 注册一次ws消息事件回调
+           * @param listener 事件回调函数
            */
-          this.open = (url) => {
-              var _a, _b;
-              if (url) {
-                  this._url = url;
-              }
-              if (((_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.readyState) !== WebSocket.OPEN &&
-                  ((_b = this._realWebSocket) === null || _b === void 0 ? void 0 : _b.readyState) !== WebSocket.CONNECTING) {
-                  this._clearPendingReconnectIfNeeded();
-                  this._reconnectWhenOnlineAgain = false;
-                  this._explicitlyClosed = false;
-                  this._createWebSocket();
-              }
-          };
+          this.onceMessage = (listener) => this.onMessage(listener, true);
           /**
-           * 创建ws连接
+           * @description 移除ws接通事件回调
+           * @param listener 事件回调函数
+           * @returns
            */
-          this._createWebSocket = () => {
-              var _a, _b, _c;
-              const newUrl = typeof this._url === 'string' ? this._url : (_a = this._url) === null || _a === void 0 ? void 0 : _a.call(this, this);
-              if (!newUrl)
-                  return;
-              this._pendingReconnect = undefined;
-              this._removeWebSocketEvent();
-              this._realWebSocket = new WebSocket(newUrl, this._protocols || undefined);
-              this._attempts = this._attempts + 1;
-              this.emit('connecting', new CustomEvent('connecting', {
-                  detail: { attempts: this._attempts, reconnects: this._reconnects },
-              }));
-              const timeoutCallback = () => {
-                  this._connectTimeout = undefined;
-                  this._detachConnectivityEvents();
-                  this.emit('timeout', new CustomEvent('connecting', {
-                      detail: {
-                          attempts: this._attempts,
-                          reconnects: this._reconnects,
-                      },
-                  }));
-              };
-              this._connectTimeout = setTimeout(timeoutCallback, (_b = this._options) === null || _b === void 0 ? void 0 : _b.timeout);
-              this._dispatchWebSocketEvent();
-              if (!((_c = this._options) === null || _c === void 0 ? void 0 : _c.ignoreConnectivityEvents)) {
-                  this._attachConnectivityEvents();
-              }
-          };
+          this.offMessage = (listener) => this.hasListener(WebSocketEvent.message) && this.off(WebSocketEvent.message, listener);
           /**
-           * 断开ws事件
+           * @description 注册ws错误事件回调
+           * @param listener 事件回调函数
+           * @param once 是否只执行一次
+           * @returns
            */
-          this._removeWebSocketEvent = () => {
-              var _a, _b, _c, _d;
-              (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.removeEventListener('open', this._webSocketOpenHandler);
-              (_b = this._realWebSocket) === null || _b === void 0 ? void 0 : _b.removeEventListener('close', this._webSocketCloseHandler);
-              (_c = this._realWebSocket) === null || _c === void 0 ? void 0 : _c.removeEventListener('error', this._webSocketErrorHandler);
-              (_d = this._realWebSocket) === null || _d === void 0 ? void 0 : _d.removeEventListener('message', this._webSocketMessageHandler);
-          };
+          this.onError = (listener, once) => once ? this.once(WebSocketEvent.error, listener) : this.on(WebSocketEvent.error, listener);
           /**
-           * 分发ws事件
+           * @description 注册一次ws消息事件回调
+           * @param listener 事件回调函数
            */
-          this._dispatchWebSocketEvent = () => {
-              var _a, _b, _c, _d;
-              (_a = this._realWebSocket) === null || _a === void 0 ? void 0 : _a.addEventListener('open', this._webSocketOpenHandler);
-              (_b = this._realWebSocket) === null || _b === void 0 ? void 0 : _b.addEventListener('close', this._webSocketCloseHandler);
-              (_c = this._realWebSocket) === null || _c === void 0 ? void 0 : _c.addEventListener('error', this._webSocketErrorHandler);
-              (_d = this._realWebSocket) === null || _d === void 0 ? void 0 : _d.addEventListener('message', this._webSocketMessageHandler);
-          };
+          this.onceError = (listener) => this.onError(listener, true);
           /**
-           * ws连接事件
+           * @description 移除ws接通事件回调
+           * @param listener 事件回调函数
            * @returns
            */
-          this._webSocketOpenHandler = (event) => {
-              if (this._connectTimeout) {
-                  clearTimeout(this._connectTimeout);
-                  this._connectTimeout = undefined;
-              }
-              const reconnects = ++this._reconnects;
-              const attempts = this._attempts;
-              this._attempts = 0;
-              this._reconnectWhenOnlineAgain = false;
-              return this.emit('open', Object.assign(event, { detail: { reconnects, attempts } }));
-          };
+          this.offError = (listener) => this.hasListener(WebSocketEvent.error) && this.off(WebSocketEvent.error, listener);
           /**
-           * ws 关闭事件
-           * @param event
+           * @description 注册ws错误事件回调
+           * @param listener 事件回调函数
+           * @param once 是否只执行一次
            * @returns
            */
-          this._webSocketCloseHandler = (event) => {
-              this._reconnect(event);
-              return this.emit('close', event);
-          };
+          this.onClose = (listener, once) => once ? this.once(WebSocketEvent.close, listener) : this.on(WebSocketEvent.close, listener);
           /**
-           * ws 异常
-           * @param event
-           * @returns
+           * @description 注册一次ws消息事件回调
+           * @param listener 事件回调函数
            */
-          this._webSocketErrorHandler = (event) => {
-              return this.emit('error', new CustomEvent('error', { detail: { error: event } }));
-          };
+          this.onceClose = (listener) => this.onClose(listener, true);
           /**
-           * ws消息
-           * @param event
+           * @description 移除ws接通事件回调
+           * @param listener 事件回调函数
            * @returns
            */
-          this._webSocketMessageHandler = (event) => {
-              return this.emit('message', event);
-          };
-          if (options) {
-              this.setOptions(options);
-          }
+          this.offClose = (listener) => this.hasListener(WebSocketEvent.close) && this.off(WebSocketEvent.close, listener);
       }
-      get attempts() {
-          return this._attempts;
+      get readyState() {
+          return this._state;
       }
-      setOptions(options) {
-          if (!options)
-              return;
-          this._url = options.url;
-          this._protocols = options.protocols;
-          const opts = Object.assign(this._options, options.robustOptions || {});
-          if (typeof (opts === null || opts === void 0 ? void 0 : opts.timeout) !== 'number') {
-              throw new Error('timeout must be the number of milliseconds to timeout a connection attempt');
-          }
-          if (typeof (opts === null || opts === void 0 ? void 0 : opts.shouldReconnect) !== 'function') {
-              throw new Error('shouldReconnect must be a function that returns the number of milliseconds to wait for a reconnect attempt, or null or undefined to not reconnect.');
-          }
-          this._options = opts;
-          if (this._options.automaticOpen) {
-              this._createWebSocket();
-          }
+      /**
+       * 连接ws
+       * @param options
+       */
+      connect(options) {
+          if (this._state === WebSocketState.CONNECTING || this._state === WebSocketState.OPEN)
+              return Promise.reject("\u5DF2\u5B58\u5728\u4E00\u4E2A\u8FDE\u63A5\u4E2D\u6216\u6253\u5F00\u72B6\u6001\u7684websocket\u5B9E\u4F8B" /* ErrorMessage.WsAlreadyExists */);
+          return new Promise((resolve, reject) => {
+              const { url } = options;
+              if (!url)
+                  throw new Error("\u975E\u6CD5\u7684websocket\u94FE\u63A5" /* ErrorMessage.WsUrlInvalid */);
+              this._wsOptions = options;
+              this._state = WebSocketState.CONNECTING;
+              this._wsTask = new WebSocket(url);
+              this.registerEventHandler();
+              this.handleConnected();
+              this.onceOpen(() => resolve(true));
+              this.onceError((err) => reject(err));
+          });
       }
       /**
-       * 进行重连
-       * @param event
+       * 重连websocket
        * @returns
        */
-      _reconnect(event) {
-          var _a, _b, _c, _d;
-          if ((!((_a = this._options) === null || _a === void 0 ? void 0 : _a.should1000Reconnect) && event.code === 1000) ||
-              this._explicitlyClosed) {
-              this._attempts = 0;
-              return;
-          }
-          if (((_b = globalThis === null || globalThis === void 0 ? void 0 : globalThis.navigator) === null || _b === void 0 ? void 0 : _b.onLine) === false) {
-              this._reconnectWhenOnlineAgain = true;
-              return;
+      async reconnect() {
+          this.close(WebSocketCloseOptions.reconnect);
+          if (this._wsOptions)
+              this.connect(this._wsOptions);
+      }
+      /**
+       * @description 发送消息
+       * @param data 消息体
+       */
+      send(data) {
+          try {
+              if (this._wsTask && this.readyState === WebSocketState.OPEN) {
+                  this._wsTask.send(data);
+              }
+              else if (this._wsTask && this.readyState === WebSocketState.CONNECTING) {
+                  this.once(WebSocketEvent.open, () => { var _a; return (_a = this._wsTask) === null || _a === void 0 ? void 0 : _a.send(data); });
+              }
+              else {
+                  this.once(WebSocketEvent.open, () => this.send(data));
+                  this.reconnect();
+              }
           }
-          const delay = (_d = (_c = this._options) === null || _c === void 0 ? void 0 : _c.shouldReconnect) === null || _d === void 0 ? void 0 : _d.call(_c, event, this);
-          if (typeof delay === 'number') {
-              this._pendingReconnect = setTimeout(this._createWebSocket, delay);
+          catch (e) {
+              this.once(WebSocketEvent.open, () => this.send(data));
+              this.reconnect();
           }
       }
-  }
+      /**
+       * @description 手动关闭ws
+       * @param options 关闭ws的配置参数
+       */
+      close(options) {
+          var _a;
+          this._state = WebSocketState.CLOSING;
+          (_a = this._wsTask) === null || _a === void 0 ? void 0 : _a.close(options.code, options.reason);
+      }
+      /**
+       * 处理连接后的事件绑定
+       */
+      handleConnected() {
+          this.onceOpen(() => (this._state = WebSocketState.OPEN));
+          this.onClose(() => (this._state = WebSocketState.CLOSED));
+      }
+      /**
+       * 注册websocket事件
+       */
+      registerEventHandler() {
+          var _a, _b, _c, _d;
+          (_a = this._wsTask) === null || _a === void 0 ? void 0 : _a.addEventListener(WebSocketEvent.open, (ev) => this.emit(WebSocketEvent.open, ev));
+          (_b = this._wsTask) === null || _b === void 0 ? void 0 : _b.addEventListener(WebSocketEvent.message, (result) => {
+              let data = result.data;
+              try {
+                  if (typeof result.data === 'string') {
+                      data = JSON.parse(result.data);
+                  }
+              }
+              catch (e) {
+                  /** 不可序列化的数据不用处理 */
+              }
+              this.emit(WebSocketEvent.message, data);
+          });
+          (_c = this._wsTask) === null || _c === void 0 ? void 0 : _c.addEventListener(WebSocketEvent.close, (ev) => this.emit(WebSocketEvent.close, ev));
+          (_d = this._wsTask) === null || _d === void 0 ? void 0 : _d.addEventListener(WebSocketEvent.error, (ev) => this.emit(WebSocketEvent.error, ev));
+      }
+  }
+  var Ws4Webview$1 = Ws4Webview;
+
+  const endpoint = 'wss://ws.realsee.com';
+  var defaultWsEndpoint = endpoint;
 
+  /**
+   * 拼接ws链接
+   * @param tpl
+   * @param params
+   * @returns
+   */
+  const generateWssUrl = (tpl, params) => {
+      const url = Object.keys(params).reduce((res, curr) => res.replace(`{{${curr}}}`, `${params[curr]}`), tpl);
+      return encodeURI(url);
+  };
+  var generateWssUrl$1 = generateWssUrl;
+
+  const isValidKey = (key, object) => key in object;
+  var isValidKey$1 = isValidKey;
+
+  /**
+   * 解析参数
+   * @param query
+   * @returns
+   */
+  const parseQuery = (query = '') => query
+      .replace('?', '')
+      .split('&')
+      .map((qs) => {
+      const [k, v] = qs.split('=');
+      return { [k]: decodeURIComponent(v) };
+  })
+      .reduce((result, curr) => ({ ...result, ...curr }), {});
+  var parseQuery$1 = parseQuery;
+
+  const ws = (() => new Ws4Webview$1())();
   class HybridBridge {
       constructor() {
-          var _a, _b;
           /**
            * @deprecated 兼容旧逻辑
            */
           this._rsWeappBridgeMethodAdapter = {};
-          this._ws = new RobustWebSocket$1();
-          this._readyState = 'close';
+          this._forceClose = false;
           /**
            * 进行jsbridge的初始化，即打通ws通道
            * @param timeout 超时计时
@@ -49676,7 +49645,7 @@
                   sign: wssig,
               });
               try {
-                  const result = await this._open(url);
+                  const result = await ws.connect({ url });
                   if (result) {
                       this.initBuiltInHandlers();
                       res[0] = await this.waitReady(timeout);
@@ -49690,130 +49659,6 @@
               }
               return res;
           };
-          /**
-           * 内建的处理函数
-           */
-          this.initBuiltInHandlers = () => {
-              this._registerLifecycleHandler();
-              this._registerHeartbeatHandler();
-              this._registerMessageHandler();
-              this._registerBridgeRequestHandler();
-              this._registerReadyHandler();
-          };
-          /**
-           * 进行连接
-           * @param url ws链接
-           * @returns
-           */
-          this._open = (url) => new Promise((resolve) => {
-              const handleOpen = () => {
-                  this._receivedMessage(WeappBridgeMessage.ready, () => resolve(true), true);
-                  this._ws.once('timeout', () => resolve(false));
-                  this.send(WeappBridgeMessage.isReady);
-              };
-              this._ws.once('open', handleOpen);
-              this._ws.open(url);
-          });
-          /**
-           * 注册生命周期回调
-           */
-          this._registerLifecycleHandler = () => {
-              this._ws.on('connecting', () => {
-                  console.log('RsWeappBridge connecting');
-                  this._readyState = 'connecting';
-              });
-              this._ws.on('open', () => {
-                  console.log('RsWeappBridge open');
-                  this._readyState = 'open';
-              });
-              this._ws.on('close', () => {
-                  this._readyState = 'close';
-              });
-              this._ws.on('error', () => {
-                  console.log('RsWeappBridge error');
-                  this._readyState = 'close';
-              });
-              this._ws.on('timeout', () => {
-                  console.log('RsWeappBridge timeout');
-                  this._readyState = 'close';
-              });
-          };
-          /**
-           * 注册心跳的回调
-           * @deprecated 兼容老的容器SDK
-           */
-          this._registerHeartbeatHandler = () => {
-              // 收到ping时回复pong
-              this._receivedMessage(WeappBridgeMessage.ping, () => setTimeout(() => this._ws.send(WeappBridgeMessage.pong), 500));
-              // 收到pong时回复ping
-              this._receivedMessage(WeappBridgeMessage.pong, () => setTimeout(() => this._ws.send(WeappBridgeMessage.ping), 1000));
-          };
-          /**
-           * 当收到某消息时
-           * @param targetMessage 目标消息
-           * @param handler 回调
-           * @param once 是否一次性处理
-           */
-          this._receivedMessage = (targetMessage, handler, once) => {
-              const msgHandler = (evnet) => {
-                  if (evnet.data === targetMessage) {
-                      handler();
-                      if (once) {
-                          this._ws.off('message', msgHandler);
-                      }
-                  }
-              };
-              this._ws.on('message', msgHandler);
-          };
-          /**
-           * 注册准备就绪的回调
-           */
-          this._registerReadyHandler = () => {
-              // 收到就绪询问时回复已就绪
-              this._receivedMessage(WeappBridgeMessage.isReady, () => this._ws.send(WeappBridgeMessage.ready));
-          };
-          /**
-           * 发送消息
-           */
-          this.send = (data) => {
-              this._ws.send(data);
-          };
-          /**
-           * 等待响应
-           * @param timeout 超时计时
-           * @returns
-           */
-          this.waitReady = (timeout = 6000) => {
-              return new Promise((resolve, reject) => {
-                  this._receivedMessage(WeappBridgeMessage.ready, () => resolve(true));
-                  this.send(WeappBridgeMessage.isReady);
-                  setTimeout(() => reject('HybridBridge 初始化超时~'), timeout);
-              });
-          };
-          this._parseMessage = (event) => {
-              try {
-                  return JSON.parse(event.data);
-              }
-              catch (e) {
-                  return event.data;
-              }
-          };
-          /**
-           * 注册消息投递回调
-           * @deprecated 兼容老方法
-           */
-          this._registerMessageHandler = () => {
-              this._ws.on('message', (event) => {
-                  const message = this._parseMessage(event);
-                  if (typeof message === 'object') {
-                      const { id, command, data } = message;
-                      if (command === 'message' &&
-                          typeof this._rsWeappBridgeMethodAdapter.bindMessage === 'function') {
-                          this._rsWeappBridgeMethodAdapter.bindMessage({ id, data });
-                      }
-                  }
-              });
-          };
           this.getStaticData = (callbackFunctionName) => {
               this.callAndBackfeed(JSON.stringify({
                   actionUrl: 'common/staticData',
@@ -49860,52 +49705,134 @@
                   callback(false);
               }
           };
-          /**
-           * 执行
-           * @param method
-           * @param args
-           * @returns
-           */
-          this.execute = async (method, args) => await this._invokeBridgeMethod(method, args);
-          /**
-           *
-           * @param method
-           * @param args
-           * @returns
-           * @deprecated 兼容老方法
-           */
-          this._invokeBridgeMethod = (method, args) => new Promise((success, fail) => {
-              const id = uuid();
-              const wsBridgeResponsehandler = (event) => {
-                  const result = this._parseMessage(event);
-                  if (typeof result === 'object') {
-                      if (result.method === method && result.id === id) {
-                          this._ws.off('message', wsBridgeResponsehandler);
-                          result.error ? fail(result.error) : success(result.data);
+      }
+      get isReady() {
+          return ws.readyState === WebSocketState.OPEN;
+      }
+      /**
+       * 内建的处理函数
+       */
+      initBuiltInHandlers() {
+          this._registerLifecycleHandler();
+          this._registerHeartbeatHandler();
+          this._registerMessageHandler();
+          this._registerBridgeRequestHandler();
+          this._registerReadyHandler();
+      }
+      /**
+       * 注册生命周期回调
+       */
+      _registerLifecycleHandler() {
+          ws.onOpen(() => console.log('RsWeappBridge open'));
+          ws.onClose((res) => {
+              console.log('RsWeappBridge close');
+              if (res.code === 1000) {
+                  switch ((res.reason + '').toLowerCase()) {
+                      case WebSocketCloseOptions.lostHeartbeat.reason: {
+                          // 心跳丢失
+                          ws.reconnect();
+                          break;
+                      }
+                      // case WebSocketCloseOptions.normalClosure.reason: // 主动关闭
+                      case WebSocketCloseOptions.interrupted.reason: // 切换到后台，被微信杀掉，需要重连连接
+                      case WebSocketCloseOptions.streamEndEncountered.reason: // 服务端拒绝连接
+                      default: {
+                          if (!this._forceClose) {
+                              ws.reconnect();
+                          }
+                          break;
                       }
                   }
-              };
-              this._ws.on('message', wsBridgeResponsehandler);
-              this.send(JSON.stringify({ method, args, id }));
+              }
+              if (res.code !== 1000 && !this._forceClose) {
+                  ws.reconnect();
+              }
+              if (this._forceClose)
+                  this._forceClose = false;
           });
-          if (((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.window) === null || _a === void 0 ? void 0 : _a.__Realsee_WxMini_HybridBridge__) instanceof HybridBridge) {
-              return (_b = globalThis === null || globalThis === void 0 ? void 0 : globalThis.window) === null || _b === void 0 ? void 0 : _b.__Realsee_WxMini_HybridBridge__;
-          }
-          if (globalThis === null || globalThis === void 0 ? void 0 : globalThis.window) {
-              globalThis.window.__Realsee_WxMini_HybridBridge__ = this;
-              this.initBuiltInHandlers();
-          }
+          ws.onError((err) => console.error(err));
       }
-      get isReady() {
-          return this._readyState === 'open';
+      /**
+       * 注册心跳的回调
+       * @deprecated 兼容老的容器SDK
+       */
+      _registerHeartbeatHandler() {
+          // 收到ping时回复pong
+          this._receivedMessage(WeappBridgeMessage.ping, () => ws.send(WeappBridgeMessage.pong));
+          // 收到pong时回复ping
+          this._receivedMessage(WeappBridgeMessage.pong, () => ws.send(WeappBridgeMessage.ping));
+      }
+      /**
+       * 当收到某消息时
+       * @param targetMessage 目标消息
+       * @param handler 回调
+       * @param once 是否一次性处理
+       */
+      _receivedMessage(targetMessage, handler, once) {
+          const msgHandler = (msg) => {
+              if (msg === targetMessage) {
+                  handler();
+                  if (once) {
+                      ws.offMessage(msgHandler);
+                  }
+              }
+          };
+          ws.onMessage(msgHandler);
+      }
+      /**
+       * 强制关闭ws
+       * @param options
+       */
+      forceClose(options) {
+          this._forceClose = true;
+          ws.close(options);
+      }
+      /**
+       * 注册准备就绪的回调
+       */
+      _registerReadyHandler() {
+          // 收到就绪询问时回复已就绪
+          this._receivedMessage(WeappBridgeMessage.isReady, () => ws.send(WeappBridgeMessage.ready));
+      }
+      /**
+       * 发送消息
+       */
+      send(data) {
+          ws.send(data);
+      }
+      /**
+       * 等待响应
+       * @param timeout 超时计时
+       * @returns
+       */
+      waitReady(timeout = 6000) {
+          return new Promise((resolve, reject) => {
+              this._receivedMessage(WeappBridgeMessage.ready, () => resolve(true));
+              this.send(WeappBridgeMessage.isReady);
+              setTimeout(() => reject('HybridBridge 初始化超时~'), timeout);
+          });
+      }
+      /**
+       * 注册消息投递回调
+       * @deprecated 兼容老方法
+       */
+      _registerMessageHandler() {
+          ws.onMessage((message) => {
+              if (typeof message === 'object') {
+                  const { id, command, data } = message;
+                  if (command === 'message' &&
+                      typeof this._rsWeappBridgeMethodAdapter.bindMessage === 'function') {
+                      this._rsWeappBridgeMethodAdapter.bindMessage({ id, data });
+                  }
+              }
+          });
       }
       /**
        * 注册bridge方法回调
        * @deprecated 兼容老方法
        */
       _registerBridgeRequestHandler() {
-          this._ws.on('message', async (event) => {
-              const request = this._parseMessage(event);
+          ws.onMessage(async (request) => {
               if (typeof request === 'object') {
                   const { id, method, args, command } = request;
                   if (command === 'request') {
@@ -49958,25 +49885,22 @@
               type: 'callAndBackfeed',
           });
           let timer = null;
-          const callback = (event) => {
-              const message = this._parseMessage(event);
-              if (typeof message === 'object') {
-                  const { id, result, errmsg, command } = message;
-                  if (command === 'rsSchemeResponse' && id === reqId) {
-                      this._ws.off('message', callback);
-                      if (timer)
-                          clearTimeout(timer);
-                      if (errmsg) {
-                          console.warn(errmsg);
-                          backfeed(0);
-                      }
-                      else {
-                          backfeed(result);
-                      }
+          const callback = (message) => {
+              const { id, result, errmsg, command } = message;
+              if (command === 'rsSchemeResponse' && id === reqId) {
+                  ws.offMessage(callback);
+                  if (timer)
+                      clearTimeout(timer);
+                  if (errmsg) {
+                      console.warn(errmsg);
+                      backfeed(0);
+                  }
+                  else {
+                      backfeed(result);
                   }
               }
           };
-          this._ws.on('message', callback);
+          ws.onMessage(callback);
           this.send(data);
           // 30s超时处理
           timer = globalThis.setTimeout(() => {
@@ -49997,22 +49921,19 @@
               command: 'rsSchemeRequest',
               type: 'callAndListen',
           });
-          const callback = (event) => {
-              const message = this._parseMessage(event);
-              if (typeof message === 'object') {
-                  const { id, result, errmsg, command } = message;
-                  if (command === 'rsSchemeResponse' && id === reqId) {
-                      if (errmsg) {
-                          console.warn(errmsg);
-                          fn(false);
-                      }
-                      else {
-                          fn(result);
-                      }
+          const callback = (message) => {
+              const { id, result, errmsg, command } = message;
+              if (command === 'rsSchemeResponse' && id === reqId) {
+                  if (errmsg) {
+                      console.warn(errmsg);
+                      fn(false);
+                  }
+                  else {
+                      fn(result);
                   }
               }
           };
-          this._ws.on('message', callback);
+          ws.onMessage(callback);
           this.send(data);
       }
       /**
@@ -50031,26 +49952,23 @@
                   command: 'request',
               });
               let timer = null;
-              const callback = (event) => {
-                  const message = this._parseMessage(event);
-                  if (typeof message === 'object') {
-                      const { id, result, error, command } = message;
-                      if (command === 'response' &&
-                          id === reqId &&
-                          message.method === method) {
-                          this._ws.off('message', callback);
-                          if (timer)
-                              clearTimeout(timer);
-                          if (error) {
-                              fail(error);
-                          }
-                          else {
-                              success(result);
-                          }
+              const callback = (message) => {
+                  const { id, result, error, command } = message;
+                  if (command === 'response' &&
+                      id === reqId &&
+                      message.method === method) {
+                      ws.offMessage(callback);
+                      if (timer)
+                          clearTimeout(timer);
+                      if (error) {
+                          fail(error);
+                      }
+                      else {
+                          success(result);
                       }
                   }
               };
-              this._ws.on('message', callback);
+              ws.onMessage(callback);
               this.send(data);
               // 30s超时处理
               timer = setTimeout(() => fail('method invoke timeout'), 30000);
@@ -50063,14 +49981,18 @@
    */
   class WxMiniprogramController extends BaseController {
       constructor() {
-          super(...arguments);
-          this._hybridBridge = new HybridBridge();
+          super();
           this.initializing = false;
+          Promise.resolve().then(async () => {
+              try {
+                  await this.checkBridgeReady();
+              }
+              catch (error) {
+                  console.warn(error);
+              }
+          });
       }
-      get hybridBridge() {
-          return this._hybridBridge;
-      }
-      checkBridgeReady(timeout = 60000) {
+      checkBridgeReady(timeout = 6000) {
           if (this.ready)
               return true;
           return new Promise(async (resolve, reject) => {
@@ -50087,11 +50009,12 @@
               }
               else {
                   this.initializing = true;
-                  const [res, error] = await this._hybridBridge.initialize(timeout);
+                  const hybridBridge = new HybridBridge();
+                  const [res, error] = await hybridBridge.initialize(timeout);
                   if (!res || error) {
                       throw error || new Error('HybridBridge 初始化失败~');
                   }
-                  this._hybridBridge.getStaticData(registerGlobalValue('HYBRID_BRIDGE_NAME', (data) => {
+                  hybridBridge === null || hybridBridge === void 0 ? void 0 : hybridBridge.getStaticData(registerGlobalValue('HYBRID_BRIDGE_NAME', (data) => {
                       this.deviceInfo = (() => {
                           try {
                               return JSON.parse(data);
@@ -50100,13 +50023,14 @@
                               return data;
                           }
                       })();
+                      this.hybridBridge = hybridBridge;
+                      this.initializing = false;
+                      return resolve(true);
                   }));
-                  this.initializing = false;
-                  return resolve(true);
               }
           });
       }
-      async checkReady(timeout = 60000) {
+      async checkReady(timeout = 6000) {
           const res = [null, null];
           if (this.ready) {
               res[0] = true;
@@ -50122,7 +50046,8 @@
           return res;
       }
       get ready() {
-          return !!this._hybridBridge.isReady;
+          var _a;
+          return !!((_a = this.hybridBridge) === null || _a === void 0 ? void 0 : _a.isReady);
       }
       get scheme() {
           var _a;
@@ -50164,7 +50089,7 @@
                       resolve(res);
                   }),
               });
-              this._hybridBridge.callAndBackfeed(msg);
+              this.hybridBridge.callAndBackfeed(msg);
           });
       }
       async callAndListen(scheme, callback) {
@@ -50209,7 +50134,7 @@
                   actionUrl,
                   functionName: registerGlobalValue(actionUrl, _callback, false),
               });
-              this._hybridBridge.callAndListen(msg);
+              this.hybridBridge.callAndListen(msg);
           });
       }
       async invoke(method, data) {
@@ -50219,7 +50144,7 @@
               throw readyError;
           }
           else {
-              return (await ((_b = (_a = this._hybridBridge).invoke) === null || _b === void 0 ? void 0 : _b.call(_a, method, data)));
+              return (await ((_b = (_a = this.hybridBridge).invoke) === null || _b === void 0 ? void 0 : _b.call(_a, method, data)));
           }
       }
   }
@@ -50533,7 +50458,7 @@
   }
 
   const defaultOptions = {
-      timeout: 60000,
+      timeout: 6000,
   };
   /**
    * 小程序 [web-view](https://developers.weixin.qq.com/miniprogram/dev/component/web-view.html) JSBridge。
@@ -50649,12 +50574,10 @@
           }
           const proxyCache = (url) => {
               if (this.webViewType === WebViewTypeEnum.WKWebview) {
-                  return url
-                      .replace(/https*:/, '')
-                      .replace(/\/\//, 'realseeproxycache://');
+                  return url.replace(/https*:/, '').replace(/\/\//, 'realseeproxycache://');
               }
               else if (this.webViewType === WebViewTypeEnum.WebView) {
-                  return (url + (url.indexOf('?') !== -1 ? '&' : '?') + 'realseeproxycache=1');
+                  return url + (url.indexOf('?') !== -1 ? '&' : '?') + 'realseeproxycache=1';
               }
               return url;
           };
@@ -50663,10 +50586,6 @@
       async invokeNativeApi(method, data) {
           return await this._controller.invoke(method, data);
       }
-      async execute(method, args) {
-          var _a, _b, _c;
-          return await ((_c = (_b = (_a = this._controller) === null || _a === void 0 ? void 0 : _a.hybridBridge) === null || _b === void 0 ? void 0 : _b.execute) === null || _c === void 0 ? void 0 : _c.call(_b, method, args));
-      }
   }
 
   /**
@@ -51584,6 +51503,13 @@
                   return false;
               }
               const { force = false } = options;
+              // 检测一下麦克风权限，hack
+              if (this._options.rtc && this._options.jsBridge) {
+                  const res = yield this._options.jsBridge.detectMicro();
+                  if (!res) {
+                      return new Error('Failed to obtain microphone authorization');
+                  }
+              }
               // 检查是否已有实例在使用
               const currentState = this.state;
               if (currentState === exports.LiveState.CONNECTING ||