@cloud-app-dev/vidc 3.0.17 → 3.0.18

package/es/Player/event/errorEvent.js

@@ -22,6 +22,7 @@ import { useState, useEffect, useRef } from 'react';
 import EventName from './eventName';
 import Flvjs from '@cloud-app-dev/flv.js';
 import Hls from 'hls.js';
+import { useRegisterPlayerEvent, useVideoEvent } from '.';
 
 function useErrorEvent(_ref) {
   var event = _ref.event,
@@ -40,64 +41,54 @@ function useErrorEvent(_ref) {
 
   var errorInfo = useRef(null);
   var reloadTimer = useRef(null);
-  useEffect(function () {
-    var errorHandle = function errorHandle() {
-      var _console;
 
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+  var errorHandle = function errorHandle() {
+    var _console;
 
-      if (args[2] && args[2].msg && args[2].msg.includes('Unsupported audio')) {
-        return;
-      }
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
 
-      (_console = console).error.apply(_console, args);
+    if (args[2] && args[2].msg && args[2].msg.includes('Unsupported audio')) {
+      return;
+    }
 
-      errorInfo.current = args;
+    (_console = console).error.apply(_console, args);
 
-      if (!(errorHandleAdapter === null || errorHandleAdapter === void 0 ? void 0 : errorHandleAdapter(args))) {
-        setErrorTime(errorTimer + 1);
-      }
-    };
+    errorInfo.current = args;
 
-    var reloadSuccess = function reloadSuccess() {
-      if (errorTimer > 0) {
-        console.warn('视频重连成功！');
-        event.emit(EventName.RELOAD_SUCCESS);
-        clearErrorTimer();
-      }
-    };
+    if (!(errorHandleAdapter === null || errorHandleAdapter === void 0 ? void 0 : errorHandleAdapter(args))) {
+      setErrorTime(errorTimer + 1);
+    }
+  };
 
-    var clearErrorTimer = function clearErrorTimer() {
-      return setErrorTime(0);
-    };
+  var clearErrorTimer = function clearErrorTimer() {
+    return setErrorTime(0);
+  };
 
+  var reloadSuccess = function reloadSuccess() {
+    if (errorTimer > 0) {
+      console.warn('视频重连成功！');
+      event.emit(EventName.RELOAD_SUCCESS);
+      clearErrorTimer();
+    }
+  };
+
+  useVideoEvent('error', errorHandle);
+  useVideoEvent('canplay', reloadSuccess);
+  useRegisterPlayerEvent(EventName.ERROR, errorHandle);
+  useRegisterPlayerEvent(EventName.CLEAR_ERROR_TIMER, clearErrorTimer);
+  useEffect(function () {
     if (flv) {
       flv.on(Flvjs.Events.ERROR, errorHandle);
     }
 
     if (hls) {
       hls.on(Hls.Events.ERROR, errorHandle);
-    }
-
-    if (event) {
-      event.on(EventName.ERROR, errorHandle);
-      event.on(EventName.CLEAR_ERROR_TIMER, clearErrorTimer);
-      event.addEventListener('error', errorHandle); //获取video状态清除错误状态
-
-      event.addEventListener('canplay', reloadSuccess);
-    }
+    } //事件销毁由flv、hls销毁时控制
+    // eslint-disable-next-line react-hooks/exhaustive-deps
 
-    return function () {
-      // flv, hls事件不用主动销毁，库内部自己处理
-      if (event) {
-        event.off(EventName.ERROR, errorHandle);
-        event.removeEventListener('error', errorHandle);
-        event.removeEventListener('canplay', reloadSuccess);
-      }
-    }; // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [event, flv, hls, errorTimer]);
+  }, [flv, hls]);
   useEffect(function () {
     if (errorTimer === 0) {
       return undefined;

package/es/Player/event/eventName.d.ts

@@ -1,3 +1,18 @@
-import type { EventName } from '../player';
-declare const Events: EventName;
+declare const Events: {
+    RELOAD: string;
+    RELOAD_FAIL: string;
+    RELOAD_SUCCESS: string;
+    ERROR: string;
+    ERROR_RELOAD: string;
+    HISTORY_PLAY_END: string;
+    PLAY_ENDED: string;
+    SEEK: string;
+    TRANSFORM: string;
+    CHANGE_PLAY_INDEX: string;
+    HIDE_CONTRALLER: string;
+    SHOW_CONTRALLER: string;
+    CLEAR_ERROR_TIMER: string;
+    CANVAS_PAUSE: string;
+    CANVAS_PLAY: string;
+};
 export default Events;

package/es/Player/event/eventName.js

@@ -5,11 +5,15 @@ var Events = {
   ERROR: 'error',
   ERROR_RELOAD: 'errorRload',
   HISTORY_PLAY_END: 'historyPlayEnd',
+  PLAY_ENDED: 'play_ended',
   SEEK: 'seek',
   TRANSFORM: 'transform',
   CHANGE_PLAY_INDEX: 'changePlayIndex',
   HIDE_CONTRALLER: 'hideContraller',
   SHOW_CONTRALLER: 'showContraller',
-  CLEAR_ERROR_TIMER: 'clearErrorTimer'
+  CLEAR_ERROR_TIMER: 'clearErrorTimer',
+  CANVAS_PAUSE: 'canvasPause',
+  CANVAS_PLAY: 'canvasPlay' //逐帧播放
+
 };
 export default Events;

package/es/Player/event/index.d.ts

@@ -17,6 +17,8 @@ declare class VideoEventInstance {
 }
 declare type PlayEvent = VideoEventInstance;
 export declare function usePlayerEvent(video: HTMLVideoElement): PlayEvent;
+export declare function useVideoEvent(eventName: string, handle: (event: any) => void, context?: VideoEventInstance): void;
+export declare function useRegisterPlayerEvent(eventName: string, handle: (event: any) => void, context?: VideoEventInstance): void;
 export declare function useVideoEvents(event: VideoEventInstance, events: CustomEvent[]): void;
 export declare function useRegisterPlayerEvents(event: VideoEventInstance, events: CustomEvent[]): void;
 export default VideoEventInstance;

package/es/Player/event/index.js

@@ -1,3 +1,4 @@
+import _useLatest from "ahooks/es/useLatest";
 import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -18,7 +19,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-import { useEffect, useState } from 'react';
+import { useContext, useEffect, useMemo, useState } from 'react';
+import { Context } from '../context';
 
 var VideoEventInstance = /*#__PURE__*/function () {
   function VideoEventInstance(video) {
@@ -128,6 +130,56 @@ export function usePlayerEvent(video) {
   }, [video]);
   return event;
 }
+export function useVideoEvent(eventName, handle, context) {
+  var ctx = useContext(Context);
+  var event = useMemo(function () {
+    var _a;
+
+    return (_a = ctx === null || ctx === void 0 ? void 0 : ctx.event) !== null && _a !== void 0 ? _a : context;
+  }, [context, ctx === null || ctx === void 0 ? void 0 : ctx.event]);
+
+  var handlerRef = _useLatest(handle);
+
+  useEffect(function () {
+    if (!event) {
+      return undefined;
+    }
+
+    var eventListener = function eventListener(event) {
+      return handlerRef.current(event);
+    };
+
+    event.addEventListener(eventName, eventListener);
+    return function () {
+      event.removeEventListener(eventName, eventListener);
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [event, eventName]);
+}
+export function useRegisterPlayerEvent(eventName, handle, context) {
+  var ctx = useContext(Context);
+  var event = useMemo(function () {
+    var _a;
+
+    return (_a = ctx === null || ctx === void 0 ? void 0 : ctx.event) !== null && _a !== void 0 ? _a : context;
+  }, [context, ctx === null || ctx === void 0 ? void 0 : ctx.event]);
+
+  var handlerRef = _useLatest(handle);
+
+  useEffect(function () {
+    if (!event) {
+      return undefined;
+    }
+
+    var eventListener = function eventListener(event) {
+      return handlerRef.current(event);
+    };
+
+    event.on(eventName, eventListener);
+    return function () {
+      event.off(eventName, eventListener);
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [event, eventName]);
+}
 export function useVideoEvents(event, events) {
   useEffect(function () {
     if (!event || !events) {
@@ -149,7 +201,7 @@ export function useVideoEvents(event, events) {
 
         event.removeEventListener(eventName, handle);
       });
-    };
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [event]);
 }
 export function useRegisterPlayerEvents(event, events) {
@@ -173,7 +225,7 @@ export function useRegisterPlayerEvents(event, events) {
 
         event.off(eventName, handle);
       });
-    };
+    }; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [event]);
 }
 export default VideoEventInstance;

package/es/Player/fps_play.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import type Api from './api';
+import type VideoEventInstance from './event';
+interface IFPSPlay {
+    api: Api;
+    event: VideoEventInstance;
+    fpsDelay?: number;
+}
+declare function FPSPlay({ api, event, fpsDelay }: IFPSPlay): JSX.Element;
+export default FPSPlay;

package/es/Player/fps_play.js

@@ -0,0 +1,80 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useEffect, useRef, useState } from 'react';
+import Events from './event/eventName';
+import useRafInterval from '../useRafInterval';
+import { useRegisterPlayerEvent } from './event';
+var oneFps = 1 / 30;
+
+function FPSPlay(_ref) {
+  var api = _ref.api,
+      event = _ref.event,
+      fpsDelay = _ref.fpsDelay;
+
+  var _useState = useState(Date.now()),
+      _useState2 = _slicedToArray(_useState, 2),
+      forceKey = _useState2[0],
+      update = _useState2[1];
+
+  var ref = useRef(null);
+  var timerRef = useRef(null);
+  useEffect(function () {
+    var fpsCapture = function fpsCapture() {
+      if (!ref.current || !event.video) {
+        return;
+      }
+
+      var video = event.video;
+      var fpsTime = api.getCurrentTime() + oneFps;
+      video.currentTime = fpsTime;
+
+      if (video.currentTime >= api.getDuration()) {
+        clearInterval(timerRef.current);
+        video.currentTime = 0;
+        event.emit(Events.PLAY_ENDED);
+      }
+
+      var canvas = ref.current;
+      var ctx = canvas.getContext('2d');
+
+      var _video$getBoundingCli = video.getBoundingClientRect(),
+          width = _video$getBoundingCli.width,
+          height = _video$getBoundingCli.height;
+
+      canvas.width = width;
+      canvas.height = height;
+      ctx.drawImage(video, 0, 0, width, height);
+    };
+
+    fpsCapture();
+    timerRef.current = setInterval(fpsCapture, fpsDelay);
+    return function () {
+      clearInterval(timerRef.current);
+    };
+  }, [api, event, fpsDelay, forceKey]);
+  useRegisterPlayerEvent(Events.CANVAS_PAUSE, function () {
+    clearInterval(timerRef.current);
+  });
+  useRegisterPlayerEvent(Events.CANVAS_PLAY, function () {
+    update(Date.now());
+  });
+  useRafInterval(function () {
+    return !api.paused ? api.pause() : null;
+  }, 10);
+  return /*#__PURE__*/React.createElement("canvas", {
+    className: "fps-play-canvas",
+    ref: ref
+  });
+}
+
+export default FPSPlay;

package/es/Player/frontend_player.js

@@ -50,8 +50,6 @@ function FrontendPlayer(_a) {
     url: url,
     onSeek: onSeek,
     begin: begin,
-    api: api,
-    event: event,
     duration: duration
   });
   return /*#__PURE__*/React.createElement(SinglePlayer, Object.assign({

package/es/Player/frontend_timeline.d.ts

@@ -1,15 +1,11 @@
 /// <reference types="react" />
-import type Api from './api';
-import type VideoEventInstance from './event';
 import './style/timeline.less';
 interface ITimeLineProps {
-    api: Api;
-    event: VideoEventInstance;
     duration: number;
     begin: number;
     end: number;
     onSeek?: (time: number) => void;
     url?: string;
 }
-declare function FrontendTimeLine({ api, event, duration, begin, end, onSeek, url }: ITimeLineProps): JSX.Element;
+declare function FrontendTimeLine({ duration, begin, end, onSeek, url }: ITimeLineProps): JSX.Element;
 export default FrontendTimeLine;

package/es/Player/frontend_timeline.js

@@ -12,21 +12,25 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useCallback, useEffect, useMemo, useState, startTransition, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo, useState, startTransition, useRef, useContext } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useTimes } from './timeline';
 import { FMT } from './util';
 import moment from 'moment';
+import { Context } from './context';
 import "./style/timeline.css";
 
 function FrontendTimeLine(_ref) {
-  var api = _ref.api,
-      event = _ref.event,
-      duration = _ref.duration,
+  var duration = _ref.duration,
       begin = _ref.begin,
       end = _ref.end,
       onSeek = _ref.onSeek,
       url = _ref.url;
+
+  var _useContext = useContext(Context),
+      api = _useContext.api,
+      event = _useContext.event;
+
   var lastSeekCTimeRef = useRef(0); // time 是记录seek时跳了多少
 
   var _useState = useState({

package/es/Player/live_heart.js

@@ -14,7 +14,7 @@ function useLiveHeart(_ref) {
   var cTimeRef = useRef(null);
 
   var run = function run() {
-    if (!isLive && documentVisibility !== 'visible') {
+    if (!isLive || documentVisibility !== 'visible') {
       return;
     }
 

package/es/Player/message.js

@@ -10,8 +10,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect, useState, useMemo, useRef } from 'react';
+import React, { useState, useMemo, useRef } from 'react';
 import IconFont from './iconfont';
+import { useRegisterPlayerEvent, useVideoEvent } from './event';
 import EventName from './event/eventName';
 import "./style/message.css";
 
@@ -42,99 +43,83 @@ function VideoMessage(_ref) {
 
     return '';
   }, [state.errorTimer, state.status]);
-  useEffect(function () {
-    var openLoading = function openLoading() {
-      clearTimeout(timeRef.current);
-      timeRef.current = setTimeout(function () {
-        return setState(function (old) {
-          return Object.assign(Object.assign({}, old), {
-            loading: true
-          });
-        });
-      }, 200);
-    };
 
-    var closeLoading = function closeLoading() {
-      clearTimeout(timeRef.current);
-      setState(function (old) {
+  var openLoading = function openLoading() {
+    clearTimeout(timeRef.current);
+    timeRef.current = setTimeout(function () {
+      return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
-          loading: false
+          loading: true
         });
       });
-    };
-
-    var errorReload = function errorReload(timer) {
-      clearTimeout(timeRef.current);
-      setState(function () {
-        return {
-          status: 'reload',
-          errorTimer: timer,
-          loading: true
-        };
+    }, 200);
+  };
+
+  var closeLoading = function closeLoading() {
+    clearTimeout(timeRef.current);
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        loading: false
       });
-    };
-
-    var reloadFail = function reloadFail() {
-      return setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          status: 'fail'
-        });
+    });
+  };
+
+  var errorReload = function errorReload(timer) {
+    clearTimeout(timeRef.current);
+    setState(function () {
+      return {
+        status: 'reload',
+        errorTimer: timer,
+        loading: true
+      };
+    });
+  };
+
+  var reloadFail = function reloadFail() {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        status: 'fail'
       });
-    };
+    });
+  };
 
-    var reloadSuccess = function reloadSuccess() {
-      return setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          status: null
-        });
+  var reloadSuccess = function reloadSuccess() {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        status: null
       });
-    };
-
-    var reload = function reload() {
-      return setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          status: 'reload',
-          loading: true
-        });
+    });
+  };
+
+  var reload = function reload() {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        status: 'reload',
+        loading: true
       });
-    };
-
-    var playEnd = function playEnd() {
-      clearTimeout(timeRef.current);
-      setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          status: null,
-          loading: false
-        });
+    });
+  };
+
+  var playEnd = function playEnd() {
+    clearTimeout(timeRef.current);
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        status: null,
+        loading: false
       });
-      api.pause();
-    };
-
-    event.addEventListener('loadstart', openLoading); // event.addEventListener('waiting', openLoading);
-    // event.addEventListener('seeking', openLoading)
-
-    event.addEventListener('loadeddata', closeLoading);
-    event.addEventListener('canplay', closeLoading);
-    event.on(EventName.ERROR_RELOAD, errorReload);
-    event.on(EventName.RELOAD_FAIL, reloadFail);
-    event.on(EventName.RELOAD_SUCCESS, reloadSuccess);
-    event.on(EventName.RELOAD, reload);
-    event.on(EventName.HISTORY_PLAY_END, playEnd);
-    event.on(EventName.CLEAR_ERROR_TIMER, reloadSuccess);
-    return function () {
-      event.removeEventListener('loadstart', openLoading); // event.removeEventListener('waiting', openLoading);
-      // event.removeEventListener('seeking', openLoading)
-
-      event.removeEventListener('loadeddata', closeLoading);
-      event.removeEventListener('canplay', closeLoading);
-      event.off(EventName.ERROR_RELOAD, errorReload);
-      event.off(EventName.RELOAD_FAIL, reloadFail);
-      event.off(EventName.RELOAD_SUCCESS, reloadSuccess);
-      event.off(EventName.RELOAD, reload);
-      event.off(EventName.HISTORY_PLAY_END, playEnd);
-      event.off(EventName.CLEAR_ERROR_TIMER, reloadSuccess);
-    };
-  }, [api, event]);
+    });
+    api.pause();
+  };
+
+  useVideoEvent('loadstart', openLoading);
+  useVideoEvent('loadeddata', closeLoading);
+  useVideoEvent('canplay', closeLoading);
+  useRegisterPlayerEvent(EventName.ERROR_RELOAD, errorReload);
+  useRegisterPlayerEvent(EventName.RELOAD_FAIL, reloadFail);
+  useRegisterPlayerEvent(EventName.RELOAD_SUCCESS, reloadSuccess);
+  useRegisterPlayerEvent(EventName.RELOAD, reload);
+  useRegisterPlayerEvent(EventName.HISTORY_PLAY_END, playEnd);
+  useRegisterPlayerEvent(EventName.CLEAR_ERROR_TIMER, reloadSuccess);
   var loading = state.loading,
       status = state.status;
   return /*#__PURE__*/React.createElement("div", {

package/es/Player/player.d.ts

@@ -132,6 +132,16 @@ export interface ISinglePlayerProps {
    * 自定义播放器的事件
    */
   playerEvents?: CustomEvent[];
+
+  /**
+   * 开启单帧播放
+   */
+  oneFpsPlay?: boolean;
+
+  /**
+   * 获取视频针的频次 (ms)
+   */
+  fpsDelay?: number;
 }
 
 export interface IFrontendPlayerProps extends Omit<ISinglePlayerProps, 'isLive' | 'reload'> {
@@ -173,21 +183,6 @@ export const SinglePlayer: React.FunctionComponent<ISinglePlayerProps>;
 export const FrontendPlayer: React.FunctionComponent<IFrontendPlayerProps>;
 export const SegmentPlayer: React.FunctionComponent<ISegmentPlayerProps>;
 
-export interface EventName {
-  RELOAD: 'reload'; //手动视频重载
-  RELOAD_FAIL: 'reloadFail'; // 视频出错，重连失败
-  RELOAD_SUCCESS: 'reloadSuccess'; //视频出错，重连成功
-  ERROR: 'error'; //视频出错
-  ERROR_RELOAD: 'errorRload'; //视频出错，自动重连
-  HISTORY_PLAY_END: 'historyPlayEnd'; //历史视频列表播放结束
-  SEEK: 'seek'; //跳跃播放时间
-  TRANSFORM: 'transform'; //视频容器缩放
-  CHANGE_PLAY_INDEX: 'changePlayIndex'; //历史视频列表播放索引改变
-  HIDE_CONTRALLER: 'hideContraller';
-  SHOW_CONTRALLER: 'showContraller';
-  CLEAR_ERROR_TIMER: 'clearErrorTimer';
-}
-
 export type EventInfo = {
   type: string;
   listener: ((...args: any) => void)[];