From 181bf76862b7d2ccf4382bb782a9dd11cfb10c4e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 三月 2024 18:54:39 +0800
Subject: [PATCH] 优化节点在线状态
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java | 129 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 118 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
index 0637b53..6f97558 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
@@ -4,7 +4,9 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.media.event.MediaServerChangeEvent;
+import com.genersoft.iot.vmp.media.event.MediaServerDeleteEvent;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
@@ -13,12 +15,17 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import java.io.File;
+import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -41,6 +48,15 @@
@Autowired
private DynamicTask dynamicTask;
+
+ @Value("${server.ssl.enabled:false}")
+ private boolean sslEnabled;
+
+ @Value("${server.port}")
+ private Integer serverPort;
+
+ @Autowired
+ private UserSetting userSetting;
private final String type = "zlm";
@@ -74,15 +90,13 @@
return;
}
logger.info("[ZLM-HOOK浜嬩欢-鏈嶅姟鍚姩] ID锛�" + event.getMediaServerItem().getId());
- online(serverItem);
+ online(serverItem, null);
}
@Async("taskExecutor")
@EventListener
public void onApplicationEvent(HookZlmServerKeepaliveEvent event) {
- if (event.getMediaServerItem() == null
- || !type.equals(event.getMediaServerItem().getType())
- || event.getMediaServerItem().isStatus()) {
+ if (event.getMediaServerItem() == null) {
return;
}
MediaServerItem serverItem = mediaServerService.getOne(event.getMediaServerItem().getId());
@@ -90,7 +104,19 @@
return;
}
logger.info("[ZLM-HOOK浜嬩欢-蹇冭烦] ID锛�" + event.getMediaServerItem().getId());
- online(serverItem);
+ online(serverItem, null);
+ }
+
+ @Async("taskExecutor")
+ @EventListener
+ public void onApplicationEvent(MediaServerDeleteEvent event) {
+ if (event.getMediaServerId() == null) {
+ return;
+ }
+ logger.info("[ZLM-鑺傜偣琚Щ闄 ID锛�" + event.getMediaServerId());
+ offlineZlmPrimaryMap.remove(event.getMediaServerId());
+ offlineZlmsecondaryMap.remove(event.getMediaServerId());
+ offlineZlmTimeMap.remove(event.getMediaServerId());
}
@Scheduled(fixedDelay = 10*1000) //姣忛殧10绉掓鏌ヤ竴娆�
@@ -101,7 +127,7 @@
}
if (!offlineZlmPrimaryMap.isEmpty()) {
for (MediaServerItem mediaServerItem : offlineZlmPrimaryMap.values()) {
- if (offlineZlmTimeMap.get(mediaServerItem.getId()) > 30*60*1000) {
+ if (offlineZlmTimeMap.get(mediaServerItem.getId()) < System.currentTimeMillis() - 30*60*1000) {
offlineZlmsecondaryMap.put(mediaServerItem.getId(), mediaServerItem);
offlineZlmPrimaryMap.remove(mediaServerItem.getId());
continue;
@@ -119,13 +145,13 @@
}else {
zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
initPort(mediaServerItem, zlmServerConfig);
- online(mediaServerItem);
+ online(mediaServerItem, zlmServerConfig);
}
}
}
if (!offlineZlmsecondaryMap.isEmpty()) {
for (MediaServerItem mediaServerItem : offlineZlmsecondaryMap.values()) {
- if (offlineZlmTimeMap.get(mediaServerItem.getId()) < 30*60*1000) {
+ if (offlineZlmTimeMap.get(mediaServerItem.getId()) < System.currentTimeMillis() - 30*60*1000) {
continue;
}
logger.info("[ZLM-灏濊瘯杩炴帴] ID锛歿}, 鍦板潃锛� {}:{}", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
@@ -143,20 +169,34 @@
}else {
zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
initPort(mediaServerItem, zlmServerConfig);
- online(mediaServerItem);
+ online(mediaServerItem, zlmServerConfig);
}
}
}
}
- private void online(MediaServerItem mediaServerItem) {
+ private void online(MediaServerItem mediaServerItem, ZLMServerConfig config) {
offlineZlmPrimaryMap.remove(mediaServerItem.getId());
offlineZlmsecondaryMap.remove(mediaServerItem.getId());
offlineZlmTimeMap.remove(mediaServerItem.getId());
if (!mediaServerItem.isStatus()) {
logger.info("[ZLM-杩炴帴鎴愬姛] ID锛歿}, 鍦板潃锛� {}:{}", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
mediaServerItem.setStatus(true);
+ mediaServerItem.setHookAliveInterval(10F);
mediaServerService.update(mediaServerItem);
+ if(mediaServerItem.isAutoConfig()) {
+ if (config == null) {
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ JSONArray data = responseJSON.getJSONArray("data");
+ if (data != null && !data.isEmpty()) {
+ config = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ }
+ }
+ if (config != null) {
+ setZLMConfig(mediaServerItem, "0".equals(config.getHookEnable())
+ || !Objects.equals(mediaServerItem.getHookAliveInterval(), config.getHookAliveInterval()));
+ }
+ }
}
// 璁剧疆涓ゆ蹇冭烦鏈敹鍒板垯璁や负zlm绂荤嚎
String key = "zlm-keepalive-" + mediaServerItem.getId();
@@ -165,6 +205,8 @@
mediaServerItem.setStatus(false);
offlineZlmPrimaryMap.put(mediaServerItem.getId(), mediaServerItem);
offlineZlmTimeMap.put(mediaServerItem.getId(), System.currentTimeMillis());
+ // TODO 鍙戦�佺绾块�氱煡
+ mediaServerService.update(mediaServerItem);
}, (int)(mediaServerItem.getHookAliveInterval() * 2 * 1000));
}
private void initPort(MediaServerItem mediaServerItem, ZLMServerConfig zlmServerConfig) {
@@ -186,7 +228,72 @@
if (mediaServerItem.getRtpProxyPort() == 0) {
mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
}
- mediaServerItem.setHookAliveInterval(zlmServerConfig.getHookAliveInterval());
+ mediaServerItem.setHookAliveInterval(10F);
+ }
+
+ public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ String protocol = sslEnabled ? "https" : "http";
+ String hookPrefix = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
+
+ Map<String, Object> param = new HashMap<>();
+ param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
+ if (mediaServerItem.getRtspPort() != 0) {
+ param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
+ }
+ param.put("hook.enable","1");
+ param.put("hook.on_flow_report","");
+ param.put("hook.on_play",String.format("%s/on_play", hookPrefix));
+ param.put("hook.on_http_access","");
+ param.put("hook.on_publish", String.format("%s/on_publish", hookPrefix));
+ param.put("hook.on_record_ts","");
+ param.put("hook.on_rtsp_auth","");
+ param.put("hook.on_rtsp_realm","");
+ param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrefix));
+ param.put("hook.on_shell_login","");
+ param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrefix));
+ param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrefix));
+ param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrefix));
+ param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrefix));
+ param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrefix));
+ param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrefix));
+ param.put("hook.on_record_mp4",String.format("%s/on_record_mp4", hookPrefix));
+ param.put("hook.timeoutSec","30");
+ param.put("hook.alive_interval", mediaServerItem.getHookAliveInterval());
+ // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
+ // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
+ // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
+ // 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
+ param.put("protocol.continue_push_ms", "3000" );
+ // 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
+ // 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
+ if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
+ param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
+ }
+
+ if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
+ File recordPathFile = new File(mediaServerItem.getRecordPath());
+ param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
+ param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());
+ param.put("record.appName", recordPathFile.getName());
+ }
+
+ JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
+
+ if (responseJSON != null && responseJSON.getInteger("code") == 0) {
+ if (restart) {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ zlmresTfulUtils.restartServer(mediaServerItem);
+ }else {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ }
+ }else {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆濯掍綋鏈嶅姟鑺傜偣澶辫触 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ }
}
}
--
Gitblit v1.8.0