@x-edu/live-player 0.0.12 → 0.0.13

package/dist/XEduLivePlayer.common.js

@@ -25817,7 +25817,7 @@ module.exports = __webpack_require__(5666);
 /***/ 3006:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
-var _regeneratorRuntime = __webpack_require__(7757);
+var _regeneratorRuntime = __webpack_require__(5273);
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -30746,7 +30746,7 @@ var LIVING_CLOSE_LOGIN = {
   CLOSE: '1'
 }; // 子类型 1 网龙会议 2 外部推流 3 转播
 
-var SUB_TYPE = {
+var publicLive_SUB_TYPE = {
   NET_DRAGON: 1,
   OUTSIDE: 2,
   REBROADCAST: 3
@@ -31762,7 +31762,7 @@ function _getOpenClassLiveBase() {
             data = _context14.sent;
             subType = data.sub_type; // 外部推流则直接返回, 不去请求兼容接口
 
-            if (!(subType === SUB_TYPE.OUTSIDE)) {
+            if (!(subType === publicLive_SUB_TYPE.OUTSIDE)) {
               _context14.next = 7;
               break;
             }
@@ -32523,6 +32523,119 @@ function Loading_Loading(_ref) {
     wrapperClassName: classnames_default()('x-edu-nested-loading', wrapperClassName)
   }, children);
 }
+// EXTERNAL MODULE: ./node_modules/@sdp.nd/fish/es/loader/style/index.js
+var loader_style = __webpack_require__(4646);
+;// CONCATENATED MODULE: ./src/util/push/index.js
+
+
+
+
+function push_asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function push_asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { push_asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { push_asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function push_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function push_defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function push_createClass(Constructor, protoProps, staticProps) { if (protoProps) push_defineProperties(Constructor.prototype, protoProps); if (staticProps) push_defineProperties(Constructor, staticProps); return Constructor; }
+
+
+var push_url = '/3rd/im-web-push/index.umd.js';
+var push_loadJS = loader.loadJS;
+var instPromise; // http://git.sdp.nd/component-h5/web-im-push/-/tree/master
+
+var ImPush = /*#__PURE__*/function () {
+  function ImPush() {
+    push_classCallCheck(this, ImPush);
+
+    this.listeners = [];
+  }
+
+  push_createClass(ImPush, [{
+    key: "init",
+    value: function () {
+      var _init = push_asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee() {
+        return regenerator_default().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!instPromise) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return", instPromise);
+
+              case 2:
+                instPromise = push_loadJS(push_url, 'ndiot_push').then(function () {
+                  window.ndiot_push.open({
+                    url: env["default"].push.host,
+                    appId: env["default"].app.appid,
+                    disableSharedWorker: true
+                  });
+                  return window.ndiot_push;
+                });
+                return _context.abrupt("return", instPromise);
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function init() {
+        return _init.apply(this, arguments);
+      }
+
+      return init;
+    }()
+  }, {
+    key: "getInstance",
+    value: function getInstance() {
+      return window.ndiot_push;
+    }
+  }, {
+    key: "addTopicListener",
+    value: function addTopicListener(name, listener) {
+      var inst = this.getInstance();
+      this.listeners.push(listener);
+      inst.subscribe(name);
+      this.listen();
+    }
+  }, {
+    key: "removeTopicListener",
+    value: function removeTopicListener(name, listener) {
+      var inst = this.getInstance();
+      this.listeners = this.listeners.filter(function (l) {
+        return l !== listener;
+      });
+      inst.unsubscribe(name);
+      this.listen();
+    }
+  }, {
+    key: "listen",
+    value: function listen() {
+      var _this = this;
+
+      var inst = this.getInstance();
+
+      inst.onNewMessage = function (data) {
+        console.log('im-push', data);
+
+        _this.listeners.forEach(function (l) {
+          l(data);
+        });
+      };
+    }
+  }]);
+
+  return ImPush;
+}();
+
+/* harmony default export */ var push = (new ImPush());
 ;// CONCATENATED MODULE: ./src/util/object.js
 function pick(obj, keys) {
   if (!Array.isArray(keys)) {
@@ -33264,8 +33377,8 @@ function usePullSource_isSourceReady(_x) {
 }
 
 function hook_usePullSource_isSourceReady() {
-  hook_usePullSource_isSourceReady = usePullSource_asyncToGenerator( /*#__PURE__*/runtime_regenerator_default().mark(function _callee(url) {
-    return runtime_regenerator_default().wrap(function _callee$(_context) {
+  hook_usePullSource_isSourceReady = usePullSource_asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee(url) {
+    return regenerator_default().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
@@ -33370,8 +33483,7 @@ function LiveStatus_arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 function LiveStatus(_ref) {
-  var isStreamLive = _ref.isStreamLive,
-      handleLogin = _ref.handleLogin,
+  var handleLogin = _ref.handleLogin,
       userInfo = _ref.userInfo,
       liveInfo = _ref.liveInfo,
       hasPlayed = _ref.hasPlayed,
@@ -33402,7 +33514,8 @@ function LiveStatus(_ref) {
   var isCompleted = liveInfo.status === publicLive_PUBLIC_LIVE_STATUS.COMPLETEED;
   var isPaused = liveInfo.status === publicLive_PUBLIC_LIVE_STATUS.PASUED;
   var isOffline = liveInfo.status === publicLive_PUBLIC_LIVE_STATUS.OFFLINE;
-  var isRecordLive = liveInfo.type === PUBLIC_LIVE_MODE.RECORDED; // 当前时间是否在回放时间开始前, 如果没有回放开始时间, 则直接判断未回放还没生成
+  var isRecordLive = liveInfo.type === PUBLIC_LIVE_MODE.RECORDED;
+  var isStreamLive = liveInfo.type === PUBLIC_LIVE_MODE.LIVING && (liveInfo.sub_type === SUB_TYPE.OUTSIDE || liveInfo.sub_type === SUB_TYPE.REBROADCAST); // 当前时间是否在回放时间开始前, 如果没有回放开始时间, 则直接判断未回放还没生成
 
   var isBeforeRecordTime = liveInfo.replay_begin_time ? dayjs_min_default()().isBefore(dayjs_min_default()(liveInfo.replay_begin_time)) : true;
   var mustLogin = !userInfo && liveInfo.login;
@@ -33581,8 +33694,7 @@ function RecordVideo_arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 function RecordVideo(_ref) {
-  var isStreamLive = _ref.isStreamLive,
-      userInfo = _ref.userInfo,
+  var userInfo = _ref.userInfo,
       liveInfo = _ref.liveInfo,
       visitTime = _ref.visitTime,
       diffTime = _ref.diffTime,
@@ -33723,7 +33835,6 @@ function RecordVideo(_ref) {
     options: options,
     onReady: handleVideoReady
   }), /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(detail_LiveStatus, {
-    isStreamLive: isStreamLive,
     userInfo: userInfo,
     visitTime: visitTime,
     diffTime: diffTime,
@@ -33735,8 +33846,6 @@ function RecordVideo(_ref) {
     onReloadLive: handleVideoReload
   }));
 }
-// EXTERNAL MODULE: ./node_modules/@sdp.nd/fish/es/loader/style/index.js
-var loader_style = __webpack_require__(4646);
 ;// CONCATENATED MODULE: ./src/component/AliPlayer/index.jsx
 
 
@@ -44356,8 +44465,7 @@ var shouldfixedLoading = window.navigator.userAgent.indexOf('iPad') > -1 || wind
 function LiveVideo(_ref) {
   var _liveInfo$imInfo9, _liveInfo$imInfo9$par;
 
-  var isStreamLive = _ref.isStreamLive,
-      handleLogin = _ref.handleLogin,
+  var handleLogin = _ref.handleLogin,
       userInfo = _ref.userInfo,
       liveInfo = _ref.liveInfo,
       visitTime = _ref.visitTime,
@@ -44455,7 +44563,7 @@ function LiveVideo(_ref) {
       onRequestFullScreen();
     });
     aliPlayer.on('liveStreamStop', function (err) {
-      setIsLiveLoadError(true);
+      setIsLiveException(true);
       console.warn("liveStreamStop: isOnline ".concat(window.navigator.onLine));
       console.error('liveStreamStop', err);
     });
@@ -44491,7 +44599,6 @@ function LiveVideo(_ref) {
     options: options,
     onReady: handleVideoReady
   }), supportM3u8 && /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(detail_LiveStatus, {
-    isStreamLive: isStreamLive,
     handleLogin: handleLogin,
     userInfo: userInfo,
     visitTime: visitTime,
@@ -55262,6 +55369,7 @@ function detail_arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
  // import IMChatroom from '@/component/IMChatroom'
 
 
@@ -55352,7 +55460,7 @@ function PublicLiveDetail(_ref) {
       userRole = loginInfo.userRole,
       loginStatus = loginInfo.loginStatus;
   var isLiveToReplay = !replay;
-  var isStreamLive = liveInfo && liveInfo.type === PUBLIC_LIVE_MODE.LIVING;
+  var isStreamLive = liveInfo && liveInfo.type === PUBLIC_LIVE_MODE.LIVING && (liveInfo.sub_type === publicLive_SUB_TYPE.OUTSIDE || liveInfo.sub_type === publicLive_SUB_TYPE.REBROADCAST);
 
   var handleStatusChange = /*#__PURE__*/function () {
     var _ref2 = detail_asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee(status) {
@@ -55377,7 +55485,7 @@ function PublicLiveDetail(_ref) {
               subType = liveInfo.sub_type, bid = liveInfo.bid, roomId = liveInfo.room_id;
               imLiveInfoResp = {}; // 如果类型为外部推流, 则去请求新的直播详情接口
 
-              if (!(subType === SUB_TYPE.OUTSIDE || subType === SUB_TYPE.REBROADCAST)) {
+              if (!(subType === publicLive_SUB_TYPE.OUTSIDE || subType === publicLive_SUB_TYPE.REBROADCAST)) {
                 _context.next = 14;
                 break;
               }
@@ -55498,7 +55606,7 @@ function PublicLiveDetail(_ref) {
                 subType = data.sub_type, bid = data.bid, roomId = data.room_id;
                 imLiveInfoResp = {}; // 如果类型为外部推流, 则去请求新的直播详情接口
 
-                if (!(subType === SUB_TYPE.OUTSIDE || subType === SUB_TYPE.REBROADCAST)) {
+                if (!(subType === publicLive_SUB_TYPE.OUTSIDE || subType === publicLive_SUB_TYPE.REBROADCAST)) {
                   _context2.next = 26;
                   break;
                 }
@@ -55535,6 +55643,19 @@ function PublicLiveDetail(_ref) {
                 data.imInfo = imLiveInfoResp;
 
               case 31:
+                if (!(data.type === PUBLIC_LIVE_MODE.LIVING && data.sub_type === publicLive_SUB_TYPE.OUTSIDE)) {
+                  _context2.next = 34;
+                  break;
+                }
+
+                _context2.next = 36;
+                break;
+
+              case 34:
+                _context2.next = 36;
+                return push.init();
+
+              case 36:
                 // 如果是转播或者是推流 直接播放（用于调试模式）
                 _getUrlQuery2 = (0,url/* getUrlQuery */.pf)(), preview = _getUrlQuery2.preview; // 后台点预览会加这个参数
 
@@ -55543,7 +55664,7 @@ function PublicLiveDetail(_ref) {
                 }) : data;
                 setLiveInfo(generateInfo);
 
-              case 34:
+              case 39:
               case "end":
                 return _context2.stop();
             }
@@ -55558,6 +55679,31 @@ function PublicLiveDetail(_ref) {
 
     init();
   }, []);
+  (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useEffect)(function () {
+    if (!liveInfo || liveInfo.sub_type === publicLive_SUB_TYPE.OUTSIDE) {
+      return;
+    }
+
+    var handler = function handler(data) {
+      var _data$extraFields = data.extraFields,
+          extraFields = _data$extraFields === void 0 ? {} : _data$extraFields;
+      console.log('public Live:', data);
+
+      if (extraFields.event === PUBLIC_LIVE_PUSH_EVENT.STATUS_CHANGE && extraFields.liveId === liveId) {
+        console.log("public Live: receive push status ".concat(parseInt(extraFields.status, 10)));
+        handleStatusChange(parseInt(extraFields.status, 10));
+      }
+    };
+
+    push.addTopicListener("".concat(PUBLIC_LIVE_PUSH_TOPIC, "_").concat(liveId), handler);
+    return function () {
+      if (!liveInfo || liveInfo.sub_type === publicLive_SUB_TYPE.OUTSIDE) {
+        return;
+      }
+
+      push.removeTopicListener("".concat(PUBLIC_LIVE_PUSH_TOPIC, "_").concat(liveId), handler);
+    };
+  }, [!!liveInfo]);
   (0,external_commonjs_react_commonjs2_react_root_React_namespaceObject.useEffect)(function () {
     if (userInfo) {
       onReportProgress();
@@ -55684,7 +55830,6 @@ function PublicLiveDetail(_ref) {
     },
     onRequestFullScreen: handleRequestFullScreen
   }) : isRecordLive ? /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(RecordVideo, {
-    isStreamLive: isStreamLive,
     userInfo: userInfo,
     liveInfo: liveInfo,
     visitTime: visitTime,
@@ -55698,7 +55843,6 @@ function PublicLiveDetail(_ref) {
     },
     onRequestFullScreen: handleRequestFullScreen
   }) : /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(LiveVideo, {
-    isStreamLive: isStreamLive,
     handleLogin: handleLogin,
     userInfo: userInfo,
     liveInfo: liveInfo,
@@ -55712,7 +55856,7 @@ function PublicLiveDetail(_ref) {
       handleVideoPlay(true);
     },
     onRequestFullScreen: handleRequestFullScreen
-  })), !isReplayMode && !isRecordLive && liveInfo.sub_type !== SUB_TYPE.NET_DRAGON && liveInfo.status !== publicLive_PUBLIC_LIVE_STATUS.COMPLETEED && /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(LineSwitch, {
+  })), !isReplayMode && !isRecordLive && isStreamLive && liveInfo.status !== publicLive_PUBLIC_LIVE_STATUS.COMPLETEED && /*#__PURE__*/external_commonjs_react_commonjs2_react_root_React_default().createElement(LineSwitch, {
     className: src_detail_index_module["live-line-switch"],
     liveInfo: liveInfo,
     onChange: handleSelectChange
@@ -61285,10 +61429,10 @@ function Action(_ref) {
       setCurAction = _useState2[1];
 
   var handleBtnClick = /*#__PURE__*/function () {
-    var _ref2 = Action_asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee(e) {
+    var _ref2 = Action_asyncToGenerator( /*#__PURE__*/runtime_regenerator_default().mark(function _callee(e) {
       var now, begin, _error$response, _error$response$data, _error$response2, _error$response2$data;
 
-      return regenerator_default().wrap(function _callee$(_context) {
+      return runtime_regenerator_default().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0: