@cloud-app-dev/vidc 3.0.0 → 3.0.3

package/es/Player/player.d.ts

@@ -113,6 +113,11 @@ export interface ISinglePlayerProps {
    */
   reload?: () => void;
 
+  /**
+   * extaction
+   */
+  extActions?: { [key: string]: (...args: any) => void };
+
   /**
    * 视频可播放时执行钩子
    */
@@ -129,7 +134,7 @@ export interface ISinglePlayerProps {
   playerEvents?: CustomEvent[];
 }
 
-export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, 'isLive' | 'reload' | 'type'> {
+export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, 'isLive' | 'reload'> {
   /**
    * 前端录像开始时间
    */
@@ -146,16 +151,9 @@ export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, 'isLive'
   onSeek?: (time: number) => void;
 
   forwordRef?: React.MutableRefObject<ExportPlayerType>;
-
-  /**
-   * 视频可播放时执行钩子
-   */
-  onCanPlayerInit?: (data: any) => void;
 }
 
-export interface ISegmentPlayerProps extends Omit<ISinglePlayerProps, 'url' | 'onCanPlayerInit'> {
-  onCanPlayerInit?: (ext: { [key: string]: any }) => void;
-
+export interface ISegmentPlayerProps extends Omit<ISinglePlayerProps, 'url'> {
   /**
    * 云录像片段信息
    */

package/es/Player/segment_player.d.ts

@@ -5,5 +5,5 @@ import type { ISegmentPlayerProps } from './player';
  * @param param0
  * @returns
  */
-declare function SegmentPlayer({ segments, begin, forwordRef, onCanPlayerInit, defaultIndex, customTimeLine, ...props }: ISegmentPlayerProps): JSX.Element;
+declare function SegmentPlayer({ segments, begin, forwordRef, defaultIndex, onCanPlayerInit, customTimeLine, ...props }: ISegmentPlayerProps): JSX.Element;
 export default SegmentPlayer;

package/es/Player/segment_player.js

@@ -1,3 +1,6 @@
+import _useUpdate from "ahooks/es/useUpdate";
+import _useLatest from "ahooks/es/useLatest";
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -19,17 +22,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __rest } from "tslib";
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import SinglePlayer from './single_player';
 import SegmentTimeLine from './segment_timeline';
 import Events from './event/eventName';
+
 /**
  * @desc 计算第一个url
  * @param segments
  * @param defaultIndex
  * @returns
  */
-
 function getFirstUrlIndex(segments) {
   var defaultIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
 
@@ -60,7 +63,7 @@ function getFirstUrlIndex(segments) {
 
 function usePlayIndex(event, segments) {
   var defaultIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  var deps = arguments.length > 3 ? arguments[3] : undefined;
+  var deps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
 
   var _useState = useState({
     index: getFirstUrlIndex(segments, defaultIndex)
@@ -89,7 +92,7 @@ function usePlayIndex(event, segments) {
         });
       });
     }
-  }, [state.index]); // 监听片段播放状态，自动跳转下一个片段
+  }, [segments, state.index]); // 监听片段播放状态，自动跳转下一个片段
 
   useEffect(function () {
     if (!event) {
@@ -98,7 +101,7 @@ function usePlayIndex(event, segments) {
 
     var fn = function fn() {
       return setState(function (old) {
-        return Object.assign(Object.assign({}, onload), {
+        return Object.assign(Object.assign({}, old), {
           index: old.index + 1 < segments.length ? old.index + 1 : old.index
         });
       });
@@ -107,7 +110,7 @@ function usePlayIndex(event, segments) {
     event.addEventListener('ended', fn);
     return function () {
       return event.removeEventListener('ended', fn);
-    };
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [event, segments].concat(_toConsumableArray(deps)));
   return {
     index: state.index,
@@ -131,10 +134,21 @@ function SegmentPlayer(_a) {
   var segments = _a.segments,
       begin = _a.begin,
       forwordRef = _a.forwordRef,
-      _onCanPlayerInit = _a.onCanPlayerInit,
       defaultIndex = _a.defaultIndex,
+      onCanPlayerInit = _a.onCanPlayerInit,
       customTimeLine = _a.customTimeLine,
-      props = __rest(_a, ["segments", "begin", "forwordRef", "onCanPlayerInit", "defaultIndex", "customTimeLine"]);
+      props = __rest(_a, ["segments", "begin", "forwordRef", "defaultIndex", "onCanPlayerInit", "customTimeLine"]);
+
+  var _useState3 = useState({
+    seekTime: 0
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      state = _useState4[0],
+      setState = _useState4[1];
+
+  var latestSegmentsRef = _useLatest(segments);
+
+  var update = _useUpdate();
 
   var ref = useRef(null);
   var playRef = forwordRef ? forwordRef : ref;
@@ -143,13 +157,6 @@ function SegmentPlayer(_a) {
       api = _ref.api,
       event = _ref.event;
 
-  var _useState3 = useState({
-    forceKey: Date.now()
-  }),
-      _useState4 = _slicedToArray(_useState3, 2),
-      state = _useState4[0],
-      setState = _useState4[1];
-
   var duration = useMemo(function () {
     return segments === null || segments === void 0 ? void 0 : segments.map(function (v) {
       return (v.endTime - v.beginTime) / 1000;
@@ -158,45 +165,76 @@ function SegmentPlayer(_a) {
     }, 0);
   }, [segments]);
 
-  var _usePlayIndex = usePlayIndex(event, segments, defaultIndex, [state.forceKey]),
+  var _usePlayIndex = usePlayIndex(event, segments, defaultIndex, [segments, defaultIndex]),
       index = _usePlayIndex.index,
       setIndex = _usePlayIndex.setIndex;
 
   var url = useMemo(function () {
-    return segments && segments[index] ? segments[index].url : undefined;
+    return segments[index] ? segments[index].url : undefined;
   }, [segments, index]); // 重置reload
 
   var reload = function reload() {
     playRef.current.event.emit(Events.RELOAD);
     setIndex(0);
     playRef.current.api.reload();
-  }; // 秒级别转换
+  }; // time 毫秒的时间戳
 
 
-  var beginTemp = useMemo(function () {
-    return begin ? String(begin).length === 10 ? Math.floor(begin * 1000) : begin : begin;
+  var seekTo = function seekTo(time) {
+    var index = latestSegmentsRef.current.findIndex(function (v) {
+      return time >= v.beginTime && time < v.endTime;
+    });
+
+    if (index === -1) {
+      return;
+    }
+
+    var currentTime = time - latestSegmentsRef.current[index].beginTime;
+    setIndex(index);
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        seekTime: currentTime / 1000
+      });
+    });
+  }; // 处理seek 后index变化后 cuurenttime变化的过程
+
+
+  useEffect(function () {
+    if (state.seekTime === 0) {
+      return;
+    }
+
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        seekTime: 0
+      });
+    });
+    playRef.current.video.currentTime = state.seekTime; // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [state.seekTime]);
+  var hasReady = api && event;
+  var timeline = customTimeLine !== null && customTimeLine !== void 0 ? customTimeLine : /*#__PURE__*/React.createElement(SegmentTimeLine, {
+    begin: begin,
+    api: api,
+    event: event,
+    index: index,
+    segments: segments,
+    duration: duration,
+    setIndex: setIndex
+  });
+  var onInit = useCallback(function () {
+    update();
+    onCanPlayerInit && onCanPlayerInit(); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/React.createElement(SinglePlayer, Object.assign({
     ref: playRef,
     url: url,
+    onCanPlayerInit: onInit,
     reload: reload,
-    onCanPlayerInit: function onCanPlayerInit() {
-      setState({
-        forceKey: Date.now()
-      });
-      _onCanPlayerInit && _onCanPlayerInit({
-        setIndex: setIndex
-      });
+    extActions: {
+      setIndex: setIndex,
+      seekTo: seekTo
     },
-    customTimeLine: api && event && (customTimeLine || /*#__PURE__*/React.createElement(SegmentTimeLine, {
-      begin: beginTemp,
-      api: api,
-      event: event,
-      index: index,
-      segments: segments,
-      duration: duration,
-      setIndex: setIndex
-    }))
+    customTimeLine: hasReady ? timeline : /*#__PURE__*/React.createElement(React.Fragment, null)
   }, props));
 }
 

package/es/Player/segment_timeline.js

@@ -16,7 +16,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo } from 'react';
 import { useTimes } from './timeline';
 import useBarStatus from './contraller_bar/useBarStatus';
-import { dateFormat } from './util';
+import moment from 'moment';
+import { FMT } from './util';
 import "./style/timeline.css";
 
 function SegmentTimeLine(_ref) {
@@ -40,7 +41,7 @@ function SegmentTimeLine(_ref) {
     }).reduce(function (a, b, i) {
       return i >= index ? a : a + b;
     }, 0);
-  }, [index]);
+  }, [index, segments]);
   var playPercent = useMemo(function () {
     return (currentTime + indexDuration) / duration * 100;
   }, [currentTime, duration, indexDuration]);
@@ -66,7 +67,7 @@ function SegmentTimeLine(_ref) {
     } else {
       api.seekTo(currentTime);
     }
-  }, [api, segments, index]);
+  }, [segments, api, index, setIndex]);
   return /*#__PURE__*/React.createElement("div", {
     className: "player-timeline-layout player-segment-timeline-layout ".concat(status === 0 ? 'hide-time-line' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -113,8 +114,8 @@ function TipTitle(_ref2) {
       var _end = begin + (segments[0].endTime - segments[0].beginTime);
 
       return {
-        start: dateFormat(_start),
-        end: dateFormat(_end)
+        start: moment(_start).format(FMT),
+        end: moment(_end).format(FMT)
       };
     }
 
@@ -126,8 +127,8 @@ function TipTitle(_ref2) {
     var start = begin + indexDuration;
     var end = start + (segments[index].endTime - segments[index].beginTime);
     return {
-      start: dateFormat(start),
-      end: dateFormat(end)
+      start: moment(start).format(FMT),
+      end: moment(end).format(FMT)
     };
   }, [index, segments, begin]),
       start = _useMemo.start,

package/es/Player/single_player.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import type { ISinglePlayerProps, ExportPlayerType } from './player';
 import './style/index.less';
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ISinglePlayerProps & React.RefAttributes<ExportPlayerType>>>;
-export default _default;
+declare const SinglePlayer: React.ForwardRefExoticComponent<ISinglePlayerProps & React.RefAttributes<ExportPlayerType>>;
+export default SinglePlayer;

package/es/Player/single_player.js

@@ -34,7 +34,9 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       isLive = _a.isLive,
       errorReloadTimer = _a.errorReloadTimer,
       children = _a.children,
-      props = __rest(_a, ["className", "url", "type", "hideContrallerBar", "isLive", "errorReloadTimer", "children"]);
+      onCanPlayerInit = _a.onCanPlayerInit,
+      extActions = _a.extActions,
+      props = __rest(_a, ["className", "url", "type", "hideContrallerBar", "isLive", "errorReloadTimer", "children", "onCanPlayerInit", "extActions"]);
 
   var autoPlay = props.autoPlay,
       preload = props.preload,
@@ -113,11 +115,11 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       return undefined;
     }
 
-    var map = {
+    var map = Object.assign({
       reload: reload,
       unload: unload,
       toggleFit: toggle
-    };
+    }, extActions);
     return new Proxy(api, {
       get: function get(target, key) {
         var _a;
@@ -127,7 +129,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       set: function set() {
         return true;
       }
-    });
+    }); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [api]); // 代理Event
 
   var playEvent = useMemo(function () {
@@ -154,11 +156,12 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       plugins: [flv, hls],
       fit: fit
     };
-  }, [api, event, video, fit]);
+  }, [video, state.container, playApi, playEvent, flv, hls, fit]);
   useEffect(function () {
     if (api && event && video) {
-      props.onCanPlayerInit && props.onCanPlayerInit();
-    }
+      onCanPlayerInit && onCanPlayerInit();
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
   }, [api, event, video]);
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-player-container ".concat(className),
@@ -193,7 +196,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     leftMidExtContents: leftMidExtContents,
     reload: (_b = props.reload) !== null && _b !== void 0 ? _b : reload,
     hideTimeProgress: !!customTimeLine
-  })), !isLive ? customTimeLine ? customTimeLine : /*#__PURE__*/React.createElement(Timeline, {
+  })), customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, {
     api: playApi,
     event: event
   }) : null, /*#__PURE__*/React.createElement(ErrorEvent, {
@@ -222,6 +225,7 @@ SinglePlayer.defaultProps = {
     mediaDataSource: {},
     config: {}
   },
-  hlsConfig: {}
+  hlsConfig: {},
+  extActions: {}
 };
-export default /*#__PURE__*/React.memo(SinglePlayer);
+export default SinglePlayer;

package/es/Player/util.d.ts

@@ -22,28 +22,6 @@ export declare const playUnload: (video: HTMLVideoElement, flv?: Flvjs.Player, h
  */
 export declare function getVideoType(url: string): "flv" | "native" | "m3u8";
 export declare function timeStamp(second: number): string;
-/**
- * 日期格式化
- * @param {*} timetemp
- */
-export declare function dateFormat(timetemp: number): string;
-/**
- * 全屏
- * @param {*} element
- */
-export declare function fullscreen(element: HTMLElement): void;
-/**
- * exitFullscreen 退出全屏
- * @param  {Objct} element 选择器
- */
-export declare function exitFullscreen(): void;
-/**
- * 判读是否支持全屏
- */
-export declare function fullscreenEnabled(): boolean;
-/**
- * [isFullscreen 判断浏览器是否全屏]
- * @return [全屏则返回当前调用全屏的元素,不全屏返回false]
- */
-export declare function isFullscreen(ele: HTMLElement): boolean;
 export declare function getRandom(): string;
+export declare function tryCatch(fn: () => void | Promise<any>): Promise<void>;
+export declare const FMT = "YYYY-MM-DD HH:mm:ss";

package/es/Player/util.js

@@ -1,3 +1,8 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+
+import { __awaiter } from "tslib";
 import Flvjs from 'flv.zv.js';
 import Hls from 'hls.js';
 import Events from './event/eventName';
@@ -62,7 +67,9 @@ export var playReload = function playReload(video, event, flv, hls, url) {
   if (flv) {
     flv.unload();
     flv.load();
-    flv.play();
+    tryCatch(function () {
+      return flv.play();
+    });
   }
 
   if (hls) {
@@ -71,12 +78,16 @@ export var playReload = function playReload(video, event, flv, hls, url) {
     hls.stopLoad();
     hls.startLoad();
     hls.loadSource(url);
-    video.play();
+    tryCatch(function () {
+      return video.play();
+    });
   }
 
   if (!flv && !hls) {
     video.setAttribute('src', url);
-    video.play();
+    tryCatch(function () {
+      return video.play();
+    });
   }
 
   event.emit(Events.RELOAD);
@@ -120,56 +131,34 @@ export function timeStamp(second) {
 
   return "".concat(h < 10 ? '0' + h : h, ":").concat(m < 10 ? '0' + m : m, ":").concat(s < 10 ? '0' + s : s);
 }
-/**
- * 日期格式化
- * @param {*} timetemp
- */
-
-export function dateFormat(timetemp) {
-  var date = new Date(timetemp);
-  var YYYY = date.getFullYear();
-  var DD = date.getDate();
-  var MM = date.getMonth() + 1;
-  var hh = date.getHours();
-  var mm = date.getMinutes();
-  var ss = date.getSeconds();
-  return "".concat(YYYY, ".").concat(MM > 9 ? MM : '0' + MM, ".").concat(DD > 9 ? DD : '0' + DD, " ").concat(hh > 9 ? hh : '0' + hh, ".").concat(mm > 9 ? mm : '0' + mm, ".").concat(ss > 9 ? ss : '0' + ss);
-}
-/**
- * 全屏
- * @param {*} element
- */
-
-export function fullscreen(element) {
-  element.requestFullscreen();
-}
-/**
- * exitFullscreen 退出全屏
- * @param  {Objct} element 选择器
- */
-
-export function exitFullscreen() {
-  document.exitFullscreen();
-}
-/**
- * 判读是否支持全屏
- */
-
-export function fullscreenEnabled() {
-  return document.fullscreenEnabled;
-}
-/**
- * [isFullscreen 判断浏览器是否全屏]
- * @return [全屏则返回当前调用全屏的元素,不全屏返回false]
- */
-
-export function isFullscreen(ele) {
-  if (!ele) {
-    return false;
-  }
-
-  return document.fullscreenElement === ele;
-}
 export function getRandom() {
   return Math.random().toString(36).substr(2);
-}
+}
+export function tryCatch(fn) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return fn();
+
+          case 3:
+            _context.next = 8;
+            break;
+
+          case 5:
+            _context.prev = 5;
+            _context.t0 = _context["catch"](0);
+            console.debug(_context.t0);
+
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 5]]);
+  }));
+}
+export var FMT = 'YYYY-MM-DD HH:mm:ss';

package/es/PlayerExt/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ISegmentType } from 'src/Player/player';
+import { ISegmentType } from '../Player/player';
 import './index.less';
 export declare type PlayModeType = 1 | 2;
 export interface IPluginProps {

package/es/ScreenPlayer/PlayerWithExt.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { ExportPlayerType, ISegmentType, ISinglePlayerProps } from 'src/Player/player';
-import type { PlayModeType } from 'src/PlayerExt';
+import type { ExportPlayerType, ISegmentType, ISinglePlayerProps } from '../Player/player';
+import type { PlayModeType } from '../PlayerExt';
 interface ILivePlayerWithExtProps extends ISinglePlayerProps {
     mode?: PlayModeType;
     style: React.CSSProperties;

package/es/ScreenPlayer/PlayerWithExt.js

@@ -16,6 +16,7 @@ import LivePlayer from '../Player/single_player';
 import SegmentPlayer from '../Player/segment_player';
 import FrontendPlayer from '../Player/frontend_player';
 import ExtModel from '../PlayerExt';
+import moment from 'moment';
 export function LivePlayerWithExt(_a) {
   var mode = _a.mode,
       isLive = _a.isLive,
@@ -31,7 +32,7 @@ export function LivePlayerWithExt(_a) {
   var ref = useRef();
   var update = useCallback(function () {
     return updatePlayer(ref);
-  }, []);
+  }, [updatePlayer]);
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
@@ -59,17 +60,9 @@ export function SegmentPlayerWithExt(_a) {
       props = __rest(_a, ["begin", "style", "className", "segments", "updatePlayer", "onClick"]);
 
   var ref = useRef();
-
-  var update = function update() {
-    var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    for (var k in obj) {
-      ref.current[k] = obj[k];
-    }
-
-    updatePlayer(ref);
-  };
-
+  var update = useCallback(function () {
+    return updatePlayer(ref);
+  }, [updatePlayer]);
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
@@ -115,7 +108,8 @@ export function FrontendPlayerWithExt(_ref) {
         begin = _ref2[0],
         end = _ref2[1];
     var videoUrl = new URL(segments[0].url);
-    videoUrl.searchParams.set('begin', "".concat(begin));
+    videoUrl.searchParams.set('begin', "".concat(moment(begin).unix()));
+    videoUrl.searchParams.set('end', "".concat(moment(end).unix()));
     setState({
       begin: begin,
       end: end,
@@ -127,27 +121,22 @@ export function FrontendPlayerWithExt(_ref) {
       return;
     }
 
+    var endTime = moment(segments[segments.length - 1].endTime).unix();
+    var beginTime = moment(time).unix();
     var videoUrl = new URL(state.url);
-    videoUrl.searchParams.set('begin', "".concat(time));
+    videoUrl.searchParams.set('begin', "".concat(beginTime));
+    videoUrl.searchParams.set('end', "".concat(endTime));
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
         url: videoUrl.toString()
       });
     });
-  }, [state.url]);
+  }, [segments, state.url]);
   var ref = useRef();
-
-  var update = function update() {
-    var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    for (var k in obj) {
-      ref.current[k] = obj[k];
-    }
-
-    ref.current['seekTo'] = seekTo;
-    updatePlayer(ref);
-  };
-
+  var update = useCallback(function () {
+    return updatePlayer(ref);
+  }, [updatePlayer]);
+  console.log(state.url);
   return /*#__PURE__*/React.createElement("div", {
     className: "player-with-ext-layout ".concat(className),
     style: style,
@@ -161,9 +150,13 @@ export function FrontendPlayerWithExt(_ref) {
     url: state.url,
     hideContrallerBar: true,
     forwordRef: ref,
+    extActions: {
+      seekTo: seekTo
+    },
     begin: state.begin,
     end: state.end,
     onCanPlayerInit: update,
-    customTimeLine: /*#__PURE__*/React.createElement(React.Fragment, null)
+    customTimeLine: /*#__PURE__*/React.createElement(React.Fragment, null),
+    type: "flv"
   })));
 }