mtxt-ui3 0.0.2 → 0.0.23

package/dist/components/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, ref, reactive, computed, inject, resolveComponent, withDirectives, vShow, provide, nextTick, watch, onBeforeUnmount, isVNode, mergeProps, onBeforeUpdate, Fragment, onMounted, onUnmounted, createTextVNode } from 'vue';
+import { defineComponent, createVNode, ref, reactive, computed, inject, resolveComponent, withDirectives, vShow, provide, nextTick, watch, onBeforeUnmount, Fragment, isVNode, mergeProps, onBeforeUpdate, onMounted, onUnmounted, createTextVNode } from 'vue';
 import { useRouter } from 'vue-router';
 import { message, Form, Row, Col, FormItem, SelectOption, Input, Select, Switch, InputNumber } from 'ant-design-vue';
 import axios$2 from 'axios';
@@ -6444,11 +6444,12 @@ class RTCEndpoint extends Event$1 {
 const Events = Events$1;
 const Endpoint = RTCEndpoint;
 
-const appName$1 = "live";
 class WebRtcMt$1 {
   constructor(opt) {
+    this.opt = opt;
     this.init(opt);
   }
+  opt;
   dom;
   p_player;
   // 返回播放视频数据
@@ -6471,11 +6472,10 @@ class WebRtcMt$1 {
       addRtspProxyUrl
     } = plays;
     const stream = `v${cameraIp}-${cameraRtspPort}-${cameraChannel}-${cameraStream}`;
-    const sdpUrl = `${mediaServerAddr}/index/api/webrtc?app=${appName$1}&stream=${stream}&type=play`;
     return {
       stream,
       addRtspProxyUrl,
-      sdpUrl: mediaServerAddr.indexOf("/index/api/webrtc") > -1 ? mediaServerAddr : sdpUrl
+      sdpUrl: mediaServerAddr
     };
   }
   // 初始化
@@ -6493,6 +6493,7 @@ class WebRtcMt$1 {
       }
     }
   }
+  // protected retryTime;
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
@@ -6506,13 +6507,17 @@ class WebRtcMt$1 {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
-            resolve(res);
           } else {
-            this.mediaServerAddrMap.delete(plays.videoElm);
-            reject();
-            this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+            setTimeout(() => {
+              this.rePlay();
+            }, 3 * 60 * 1e3);
           }
+          resolve(res);
         });
+      }).catch(err => {
+        setTimeout(() => {
+          this.rePlay();
+        }, 3 * 60 * 1e3);
       });
     });
   }
@@ -6544,10 +6549,12 @@ class WebRtcMt$1 {
   // 注册事件监听
   playEvent(player, videoElm, sdpUrl) {
     player.on(Events.WEBRTC_ICE_CANDIDATE_ERROR, e => {
-      this.log("err", "ICE \u534F\u5546\u51FA\u9519");
+      this.log("warn", "ICE \u534F\u5546\u51FA\u9519");
       this.rePlay(videoElm);
     });
-    player.on(Events.WEBRTC_ON_REMOTE_STREAMS, e => {});
+    player.on(Events.WEBRTC_ON_REMOTE_STREAMS, e => {
+      this.log("warn", "\u83B7\u53D6\u5230\u4E86\u8FDC\u7AEF\u6D41\uFF0C\u53EF\u4EE5\u64AD\u653E");
+    });
     player.on(Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, e => {
       this.log("warn", `offer anwser \u4EA4\u6362\u5931\u8D25\uFF0C\u83B7\u53D6\u89C6\u9891\u6D41\u5931\u8D25, ${e}`);
       this.rePlay(videoElm);
@@ -6568,9 +6575,10 @@ class WebRtcMt$1 {
   }
   // 重播
   rePlay(videoElm) {
+    this.stopPlay();
     setTimeout(() => {
-      this.play(videoElm);
-    }, 3e3);
+      this.init(this.opt);
+    }, 5 * 1e3);
   }
   // 播放
   play(videoElm) {
@@ -6624,10 +6632,18 @@ const props$7 = {
     require: false,
     default: "fill"
   },
-  // 定时器时间
-  intervalTime: {
-    type: Number,
-    default: 36e5
+  // token
+  token: {
+    type: String,
+    default: ""
+  },
+  baseUrl: {
+    type: String,
+    default: ""
+  },
+  domId: {
+    type: String,
+    default: ""
   }
 };
 const VideoPlayerV2 = defineComponent({
@@ -6635,8 +6651,7 @@ const VideoPlayerV2 = defineComponent({
   emits: ["changeStream"],
   setup(_prop, _context) {
     let play;
-    const isMtip = ref(false);
-    const uuid = UUID();
+    const uuid = _prop.domId;
     const videoFull = id => {
       const elm = document.getElementById(`videoPlayer_${uuid}`);
       if (elm.requestFullScreen) {
@@ -6646,16 +6661,15 @@ const VideoPlayerV2 = defineComponent({
       } else if (elm.webkitRequestFullScreen) {
         elm.webkitRequestFullScreen();
       }
-      setTimeout(() => {
-        window.onresize = () => {
-          _context.emit("changeStream");
-        };
-      }, 500);
+      if (videoInfo2.value.brandTypeCode !== "MP4") {
+        setTimeout(() => {
+          window.onresize = () => {
+            _context.emit("changeStream");
+          };
+        }, 500);
+      }
     };
-    _context.expose({
-      videoFull
-    });
-    const videoInfo2 = ref();
+    const videoInfo2 = ref({});
     const stopPlay = () => {
       if (play) {
         play.stopPlay(`videoPlayer_${uuid}`);
@@ -6668,56 +6682,30 @@ const VideoPlayerV2 = defineComponent({
         ...camera,
         ..._prop.cameraConfig
       };
-      const {
-        channel,
-        streamType
-      } = camera;
       let url = camera.webrtcTemplateMerged;
-      if (!isMtip.value && channel && streamType && url?.indexOf("${channel}") > -1 && url?.indexOf("${streamType}") > -1) {
-        url = url.replaceAll("${channel}", channel);
-        url = url.replaceAll("${streamType}", streamType);
-        play = new WebRtcMt$1({
-          plays: {
-            videoElm: `videoPlayer_${uuid}`,
-            mediaServerAddr: camera.mediaServerPo.url,
-            cameraUserName: camera.user,
-            cameraPwd: camera.pass,
-            cameraIp: camera.ip,
-            cameraRtspPort: camera.rtspPort,
-            cameraChannel: camera.channel,
-            cameraStream: camera.streamType,
-            addRtspProxyUrl: url
-          }
-        });
-      } else {
-        play = new WebRtcMt$1({
-          plays: {
-            videoElm: `videoPlayer_${uuid}`,
-            mediaServerAddr: camera.mediaServerPo.url,
-            cameraUserName: camera.user,
-            cameraPwd: camera.pass,
-            cameraIp: camera.ip,
-            cameraRtspPort: camera.rtspPort,
-            cameraChannel: camera.channel,
-            cameraStream: camera.streamType,
-            addRtspProxyUrl: url
-          }
-        });
-      }
+      play = new WebRtcMt$1({
+        plays: {
+          videoElm: `videoPlayer_${uuid}`,
+          mediaServerAddr: camera.mediaServerPo.url,
+          cameraUserName: camera.user,
+          cameraPwd: camera.pass,
+          cameraIp: camera.ip,
+          cameraRtspPort: camera.rtspPort,
+          cameraChannel: camera.channel,
+          cameraStream: camera.streamType,
+          addRtspProxyUrl: url
+        }
+      });
     };
-    const stopV = id => {
-      const videoElement = document.getElementById(id);
-      if (videoElement) {
-        videoElement.pause();
-        videoElement.removeAttribute("src");
-        videoElement.load();
-      }
+    const releaseUrl = ref("");
+    const release = async () => {
+      const res = await axios$2.get(releaseUrl.value);
+      return res;
     };
-    const timer = setInterval(() => {
-      stopPlay();
-      stopV(`videoPlayer_${uuid}`);
-      init();
-    }, _prop.intervalTime);
+    _context.expose({
+      videoFull,
+      release
+    });
     const getVideoDetail = async camera => {
       let uuid2 = "";
       if (camera && Object.keys(camera).length && typeof camera === "object") {
@@ -6725,34 +6713,39 @@ const VideoPlayerV2 = defineComponent({
       } else if (camera && typeof camera === "string") {
         uuid2 = camera;
       }
-      const response = await fetch(`/api/vms/v1/camera/getByUuid?uuid=${uuid2}`, {
-        method: "GET",
+      if (!uuid2) {
+        return;
+      }
+      const detailRes = await axios$2.get(`${_prop.baseUrl}/api/vms/v1/camera/getByUuid?uuid=${uuid2}`, {
         headers: {
-          token: sessionStorage.getItem("token") || ""
+          token: _prop.token || sessionStorage.getItem("token") || ""
         }
       });
-      const res = await response.json();
-      const urlResponse = await fetch(`/api/vms/v1/camera/getWebrtcUrls?uuid=${uuid2}`, {
-        method: "GET",
+      const res = await axios$2.get(`${_prop.baseUrl}/api/vms/v1/camera/getWebrtcUrls?uuid=${uuid2}`, {
         headers: {
-          token: sessionStorage.getItem("token") || ""
+          token: _prop.token || sessionStorage.getItem("token") || ""
         }
       });
-      const urlRes = await urlResponse.json();
-      if (response.status === 200 && res.data && res.data !== "") {
-        const camera2 = res.data;
-        if (urlResponse.status === 200 && urlRes.data[0] && urlRes.data[2] && urlRes.data[2] !== "uuid not found") {
-          isMtip.value = true;
-          camera2.webrtcTemplateMerged = urlRes.data[0];
-          camera2.mediaServerPo.url = urlRes.data[2];
+      const {
+        data
+      } = detailRes;
+      videoInfo2.value = {
+        ...data.data,
+        ..._prop.cameraConfig
+      };
+      if (res.status === 200) {
+        if (res.data.data[0]) {
+          videoInfo2.value.webrtcTemplateMerged = res.data.data[0];
+          releaseUrl.value = res.data.data[1];
+          if (videoInfo2.value.mediaServerPo) {
+            videoInfo2.value.mediaServerPo.url = res.data.data[2];
+          }
+          init();
         }
-        videoInfo2.value = camera2;
-        init();
       }
     };
     watch([() => _prop.camera, () => _prop.cameraConfig], ([camera, cameraConfig]) => {
       stopPlay();
-      stopV(`videoPlayer_${uuid}`);
       getVideoDetail(camera);
     }, {
       immediate: true,
@@ -6760,15 +6753,27 @@ const VideoPlayerV2 = defineComponent({
     });
     onBeforeUnmount(() => {
       stopPlay();
-      stopV(`videoPlayer_${uuid}`);
-      clearInterval(timer);
     });
-    return () => createVNode("video", {
-      "id": `videoPlayer_${uuid}`,
-      "class": `videoComponent ${_prop.fill}`,
-      "muted": true,
-      "autoplay": true
-    }, null);
+    const renderVideo = () => {
+      if (videoInfo2.value.brandTypeCode === "MP4") {
+        return createVNode("video", {
+          "id": `videoPlayer_${uuid}`,
+          "class": "videoComponent fill",
+          "src": videoInfo2.value.mp4ResourcesPath,
+          "autoplay": true,
+          "loop": true,
+          "muted": true
+        }, null);
+      } else {
+        return createVNode("video", {
+          "id": `videoPlayer_${uuid}`,
+          "class": `videoComponent ${_prop.fill}`,
+          "muted": true,
+          "autoplay": true
+        }, null);
+      }
+    };
+    return () => createVNode(Fragment, null, [renderVideo()]);
   }
 });
 var videoPlayerV2 = installComponent(VideoPlayerV2, "video-player-v2");

package/dist/hooks/index.cjs

@@ -5826,7 +5826,6 @@ class RTCEndpoint extends Event$1 {
 const Events = Events$1;
 const Endpoint = RTCEndpoint;
 
-const appName = "live";
 const playOneWebRtcMt = async (uuid, domId, dom, token) => {
   let play;
   const response = await fetch(`/api/vms/v1/camera/getByUuid?uuid=${uuid}`, {
@@ -5869,8 +5868,10 @@ const playOneWebRtcMt = async (uuid, domId, dom, token) => {
 };
 class WebRtcMt {
   constructor(opt) {
+    this.opt = opt;
     this.init(opt);
   }
+  opt;
   dom;
   p_player;
   // 返回播放视频数据
@@ -5893,11 +5894,10 @@ class WebRtcMt {
       addRtspProxyUrl
     } = plays;
     const stream = `v${cameraIp}-${cameraRtspPort}-${cameraChannel}-${cameraStream}`;
-    const sdpUrl = `${mediaServerAddr}/index/api/webrtc?app=${appName}&stream=${stream}&type=play`;
     return {
       stream,
       addRtspProxyUrl,
-      sdpUrl: mediaServerAddr.indexOf("/index/api/webrtc") > -1 ? mediaServerAddr : sdpUrl
+      sdpUrl: mediaServerAddr
     };
   }
   // 初始化
@@ -5915,6 +5915,7 @@ class WebRtcMt {
       }
     }
   }
+  // protected retryTime;
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
@@ -5928,13 +5929,17 @@ class WebRtcMt {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
-            resolve(res);
           } else {
-            this.mediaServerAddrMap.delete(plays.videoElm);
-            reject();
-            this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+            setTimeout(() => {
+              this.rePlay();
+            }, 3 * 60 * 1e3);
           }
+          resolve(res);
         });
+      }).catch(err => {
+        setTimeout(() => {
+          this.rePlay();
+        }, 3 * 60 * 1e3);
       });
     });
   }
@@ -5966,10 +5971,12 @@ class WebRtcMt {
   // 注册事件监听
   playEvent(player, videoElm, sdpUrl) {
     player.on(Events.WEBRTC_ICE_CANDIDATE_ERROR, e => {
-      this.log("err", "ICE \u534F\u5546\u51FA\u9519");
+      this.log("warn", "ICE \u534F\u5546\u51FA\u9519");
       this.rePlay(videoElm);
     });
-    player.on(Events.WEBRTC_ON_REMOTE_STREAMS, e => {});
+    player.on(Events.WEBRTC_ON_REMOTE_STREAMS, e => {
+      this.log("warn", "\u83B7\u53D6\u5230\u4E86\u8FDC\u7AEF\u6D41\uFF0C\u53EF\u4EE5\u64AD\u653E");
+    });
     player.on(Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, e => {
       this.log("warn", `offer anwser \u4EA4\u6362\u5931\u8D25\uFF0C\u83B7\u53D6\u89C6\u9891\u6D41\u5931\u8D25, ${e}`);
       this.rePlay(videoElm);
@@ -5990,9 +5997,10 @@ class WebRtcMt {
   }
   // 重播
   rePlay(videoElm) {
+    this.stopPlay();
     setTimeout(() => {
-      this.play(videoElm);
-    }, 3e3);
+      this.init(this.opt);
+    }, 5 * 1e3);
   }
   // 播放
   play(videoElm) {

package/dist/hooks/index.js

@@ -5817,7 +5817,6 @@ class RTCEndpoint extends Event$1 {
 const Events = Events$1;
 const Endpoint = RTCEndpoint;
 
-const appName = "live";
 const playOneWebRtcMt = async (uuid, domId, dom, token) => {
   let play;
   const response = await fetch(`/api/vms/v1/camera/getByUuid?uuid=${uuid}`, {
@@ -5860,8 +5859,10 @@ const playOneWebRtcMt = async (uuid, domId, dom, token) => {
 };
 class WebRtcMt {
   constructor(opt) {
+    this.opt = opt;
     this.init(opt);
   }
+  opt;
   dom;
   p_player;
   // 返回播放视频数据
@@ -5884,11 +5885,10 @@ class WebRtcMt {
       addRtspProxyUrl
     } = plays;
     const stream = `v${cameraIp}-${cameraRtspPort}-${cameraChannel}-${cameraStream}`;
-    const sdpUrl = `${mediaServerAddr}/index/api/webrtc?app=${appName}&stream=${stream}&type=play`;
     return {
       stream,
       addRtspProxyUrl,
-      sdpUrl: mediaServerAddr.indexOf("/index/api/webrtc") > -1 ? mediaServerAddr : sdpUrl
+      sdpUrl: mediaServerAddr
     };
   }
   // 初始化
@@ -5906,6 +5906,7 @@ class WebRtcMt {
       }
     }
   }
+  // protected retryTime;
   // 拉流创建播放器
   createVideo(plays) {
     this.mediaServerAddrMap.set(plays.videoElm, plays);
@@ -5919,13 +5920,17 @@ class WebRtcMt {
         response.json().then(res => {
           if (res.code === 0) {
             this.startPlay(plays);
-            resolve(res);
           } else {
-            this.mediaServerAddrMap.delete(plays.videoElm);
-            reject();
-            this.log("err", "\u4ECE\u670D\u52A1\u7AEF\u62C9\u6D41\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5");
+            setTimeout(() => {
+              this.rePlay();
+            }, 3 * 60 * 1e3);
           }
+          resolve(res);
         });
+      }).catch(err => {
+        setTimeout(() => {
+          this.rePlay();
+        }, 3 * 60 * 1e3);
       });
     });
   }
@@ -5957,10 +5962,12 @@ class WebRtcMt {
   // 注册事件监听
   playEvent(player, videoElm, sdpUrl) {
     player.on(Events.WEBRTC_ICE_CANDIDATE_ERROR, e => {
-      this.log("err", "ICE \u534F\u5546\u51FA\u9519");
+      this.log("warn", "ICE \u534F\u5546\u51FA\u9519");
       this.rePlay(videoElm);
     });
-    player.on(Events.WEBRTC_ON_REMOTE_STREAMS, e => {});
+    player.on(Events.WEBRTC_ON_REMOTE_STREAMS, e => {
+      this.log("warn", "\u83B7\u53D6\u5230\u4E86\u8FDC\u7AEF\u6D41\uFF0C\u53EF\u4EE5\u64AD\u653E");
+    });
     player.on(Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, e => {
       this.log("warn", `offer anwser \u4EA4\u6362\u5931\u8D25\uFF0C\u83B7\u53D6\u89C6\u9891\u6D41\u5931\u8D25, ${e}`);
       this.rePlay(videoElm);
@@ -5981,9 +5988,10 @@ class WebRtcMt {
   }
   // 重播
   rePlay(videoElm) {
+    this.stopPlay();
     setTimeout(() => {
-      this.play(videoElm);
-    }, 3e3);
+      this.init(this.opt);
+    }, 5 * 1e3);
   }
   // 播放
   play(videoElm) {