easy-player-pro 0.1.8 → 0.1.10

package/lib/core/easy-player-pro.js

@@ -1,5 +1,5 @@
 import { defaultConfig } from "./config";
-import { merge } from 'lodash-es';
+import { mergeWith } from 'lodash-es';
 export class EasyPlayerPro {
     constructor(container, config) {
         this.player = null;
@@ -114,8 +114,13 @@ export class EasyPlayerPro {
          */
         this.onError = (err) => {
         };
-        this.config = merge({}, defaultConfig, config);
-        this.player = new window.EasyPlayerPro(container, this.config);
+        this.config = mergeWith({}, defaultConfig, config, (objValue, srcValue) => {
+            if (Array.isArray(objValue)) {
+                return srcValue;
+            }
+        });
+        this.container = container;
+        this.player = new window.EasyPlayerPro(this.container, this.config);
         this.videoElement = this.player.$container.querySelector('video');
         this.isDestroy = false;
         this.controller = new AbortController();
@@ -391,13 +396,22 @@ export class EasyPlayerPro {
      * 关闭视频，释放底层资源
      */
     destroy() {
-        if (this.player) {
-            if (this._isRtcSRS()) {
-                this.controller.abort();
+        try {
+            if (this.player) {
+                if (this._isRtcSRS()) {
+                    this.controller.abort();
+                }
+                this.player.destroy().catch(() => { });
             }
-            this.player.destroy();
+            this.player = null;
+            this.container.innerHTML = '';
+            this.container.removeAttribute('data--easy-prov');
+            this.isDestroy = true;
         }
-        this.player = null;
-        this.isDestroy = true;
+        catch (error) { }
+    }
+    close() {
+        this.destroy();
+        this.player = new window.EasyPlayerPro(this.container, this.config);
     }
 }

package/lib/types/core/easy-player-pro.d.ts

@@ -15,6 +15,7 @@ export type AudioInfoType = {
 export declare class EasyPlayerPro {
     private player;
     private config;
+    private container;
     private _url;
     private videoElement;
     private controller;
@@ -188,6 +189,7 @@ export declare class EasyPlayerPro {
      * 关闭视频，释放底层资源
      */
     destroy(): void;
+    close(): void;
 }
 export interface EasyPlayerProType {
     isDestroy: boolean;
@@ -227,4 +229,5 @@ export interface EasyPlayerProType {
     getAudioInfo: () => AudioInfoType | null;
     setMic: (isMic: boolean) => void;
     destroy: () => void;
+    close: () => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-player-pro",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "easy-player-pro 是一款能够同时支持HTTP、HTTP-FLV、HLS（m3u8）、WS、WEBRTC、FMP4视频直播与视频点播等多种协议，支持H.264、H.265、AAC、G711A、Mp3等多种音视频编码格式，支持MSE、WASM、WebCodec等多种解码方式，支持Windows、Linux、Android、iOS全平台终端的H5播放器，使用简单, 功能强大",
   "type": "module",
   "module": "./lib/index.js",