From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 249 +++++++++++++++++++++++++------------------------
1 files changed, 125 insertions(+), 124 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
old mode 100644
new mode 100755
index e255bd3..4a781f3
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -1,172 +1,173 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.MediaConfig;
-import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
+import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForServerStarted;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.service.IStreamProxyService;
+import com.genersoft.iot.vmp.service.IMediaServerService;
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.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
@Component
-@Order(value=1)
+@Order(value=12)
public class ZLMRunner implements CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
- @Autowired
- private IVideoManagerStorager storager;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private MediaConfig mediaConfig;
-
- @Autowired
- private SipConfig sipConfig;
-
- @Value("${server.port}")
- private String serverPort;
-
- @Value("${server.ssl.enabled:false}")
- private boolean sslEnabled;
-
- private boolean startGetMedia = false;
+ private Map<String, Boolean> startGetMedia;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
- private ZLMMediaListManager zlmMediaListManager;
+ private ZlmHttpHookSubscribe hookSubscribe;
@Autowired
- private ZLMHttpHookSubscribe hookSubscribe;
+ private EventPublisher publisher;
@Autowired
- private ZLMServerManger zlmServerManger;
+ private IMediaServerService mediaServerService;
@Autowired
- private IStreamProxyService streamProxyService;
+ private MediaConfig mediaConfig;
+
+ @Autowired
+ private DynamicTask dynamicTask;
+
@Override
public void run(String... strings) throws Exception {
- // 璁㈤槄 zlm鍚姩浜嬩欢
- hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,(response)->{
- ZLMServerConfig ZLMServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
- zLmRunning(ZLMServerConfig);
+ mediaServerService.clearMediaServerForOnline();
+ MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
+ if (defaultMediaServer == null) {
+ mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
+ }else {
+ MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+ mediaServerService.updateToDatabase(mediaSerItem);
+ }
+ mediaServerService.syncCatchFromDatabase();
+ HookSubscribeForServerStarted hookSubscribeForServerStarted = HookSubscribeFactory.on_server_started();
+ // 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
+ hookSubscribe.addSubscribe(hookSubscribeForServerStarted,
+ (mediaServerItem, hookParam)->{
+ ZLMServerConfig zlmServerConfig = (ZLMServerConfig)hookParam;
+ if (zlmServerConfig !=null ) {
+ if (startGetMedia != null) {
+ startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
+ if (startGetMedia.size() == 0) {
+ hookSubscribe.removeSubscribe(HookSubscribeFactory.on_server_started());
+ }
+ }
+ }
});
// 鑾峰彇zlm淇℃伅
- logger.info("绛夊緟zlm鎺ュ叆...");
- startGetMedia = true;
- ZLMServerConfig ZLMServerConfig = getMediaServerConfig();
+ logger.info("[zlm] 绛夊緟榛樿zlm涓�...");
- if (ZLMServerConfig != null) {
- zLmRunning(ZLMServerConfig);
+ // 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
+ List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
+ Map<String, MediaServerItem> allMap = new HashMap<>();
+ mediaServerService.updateVmServer(all);
+ if (all.size() == 0) {
+ all.add(mediaConfig.getMediaSerItem());
}
+ for (MediaServerItem mediaServerItem : all) {
+ if (startGetMedia == null) {
+ startGetMedia = new ConcurrentHashMap<>();
+ }
+ startGetMedia.put(mediaServerItem.getId(), true);
+ connectZlmServer(mediaServerItem);
+ allMap.put(mediaServerItem.getId(), mediaServerItem);
+ }
+ String taskKey = "zlm-connect-timeout";
+ dynamicTask.startDelay(taskKey, ()->{
+ if (startGetMedia != null && startGetMedia.size() > 0) {
+ Set<String> allZlmId = startGetMedia.keySet();
+ for (String id : allZlmId) {
+ logger.error("[ {} ]]涓诲姩杩炴帴澶辫触锛屼笉鍐嶅皾璇曡繛鎺�", id);
+ }
+ startGetMedia = null;
+ }
+ // 鑾峰彇redis涓墍鏈夌殑zlm
+ List<MediaServerItem> allInRedis = mediaServerService.getAll();
+ for (MediaServerItem mediaServerItem : allInRedis) {
+ if (!allMap.containsKey(mediaServerItem.getId())) {
+ mediaServerService.delete(mediaServerItem.getId());
+ }
+ }
+ }, 60 * 1000 );
}
- public ZLMServerConfig getMediaServerConfig() {
- if (!startGetMedia) return null;
- JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
- ZLMServerConfig ZLMServerConfig = null;
- if (responseJSON != null) {
- JSONArray data = responseJSON.getJSONArray("data");
- if (data != null && data.size() > 0) {
- ZLMServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ @Async("taskExecutor")
+ public void connectZlmServer(MediaServerItem mediaServerItem){
+ String connectZlmServerTaskKey = "connect-zlm-" + mediaServerItem.getId();
+ ZLMServerConfig zlmServerConfigFirst = getMediaServerConfig(mediaServerItem);
+ if (zlmServerConfigFirst != null) {
+ zlmServerConfigFirst.setIp(mediaServerItem.getIp());
+ zlmServerConfigFirst.setHttpPort(mediaServerItem.getHttpPort());
+ startGetMedia.remove(mediaServerItem.getId());
+ if (startGetMedia.size() == 0) {
+ hookSubscribe.removeSubscribe(HookSubscribeFactory.on_server_started());
+ }
+ mediaServerService.zlmServerOnline(zlmServerConfigFirst);
+ }else {
+ logger.info("[ {} ]-[ {}:{} ]涓诲姩杩炴帴澶辫触, 娓呯悊鐩稿叧璧勬簮锛� 寮�濮嬪皾璇曢噸璇曡繛鎺�",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ publisher.zlmOfflineEventPublish(mediaServerItem.getId());
+ }
+ dynamicTask.startCron(connectZlmServerTaskKey, ()->{
+ ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem);
+ if (zlmServerConfig != null) {
+ dynamicTask.stop(connectZlmServerTaskKey);
+ zlmServerConfig.setIp(mediaServerItem.getIp());
+ zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
+ startGetMedia.remove(mediaServerItem.getId());
+ if (startGetMedia.size() == 0) {
+ hookSubscribe.removeSubscribe(HookSubscribeFactory.on_server_started());
+ }
+ mediaServerService.zlmServerOnline(zlmServerConfig);
+ }
+ }, 2000);
+ }
+
+ public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) {
+ if (startGetMedia == null) { return null;}
+ if (!mediaServerItem.isDefaultServer() && mediaServerService.getOne(mediaServerItem.getId()) == null) {
+ return null;
+ }
+ if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) {
+ return null;
+ }
+ JSONObject responseJson = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ ZLMServerConfig zlmServerConfig = null;
+ if (responseJson != null) {
+ JSONArray data = responseJson.getJSONArray("data");
+ if (data != null && data.size() > 0) {
+ zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
}
} else {
- logger.error("getMediaServerConfig澶辫触, 1s鍚庨噸璇�");
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- ZLMServerConfig = getMediaServerConfig();
+ logger.error("[ {} ]-[ {}:{} ]涓诲姩杩炴帴澶辫触, 2s鍚庨噸璇�",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}
- return ZLMServerConfig;
- }
+ return zlmServerConfig;
- private void saveZLMConfig() {
- logger.info("璁剧疆zlm...");
- if (StringUtils.isEmpty(mediaConfig.getHookIp())) mediaConfig.setHookIp(sipConfig.getSipIp());
- String protocol = sslEnabled ? "https" : "http";
- String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaConfig.getHookIp(), serverPort);
- String recordHookPrex = null;
- if (mediaConfig.getRecordAssistPort() != 0) {
- recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaConfig.getRecordAssistPort());
- }
- Map<String, Object> param = new HashMap<>();
- param.put("api.secret",mediaConfig.getSecret()); // -profile:v Baseline
-// param.put("ffmpeg.cmd","%s -fflags nobuffer -rtsp_transport tcp -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s");
- param.put("hook.enable","1");
- param.put("hook.on_flow_report","");
- param.put("hook.on_play",String.format("%s/on_play", hookPrex));
- param.put("hook.on_http_access","");
- param.put("hook.on_publish", String.format("%s/on_publish", hookPrex));
- param.put("hook.on_record_mp4",recordHookPrex != null? String.format("%s/on_record_mp4", recordHookPrex): "");
- 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", hookPrex));
- param.put("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex));
- param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
- param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
- param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
- param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS",mediaConfig.getStreamNoneReaderDelayMS());
-
- JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
-
- if (responseJSON != null && responseJSON.getInteger("code") == 0) {
- logger.info("璁剧疆zlm鎴愬姛");
- }else {
- logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
- }
- }
-
- /**
- * zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
- */
- private void zLmRunning(ZLMServerConfig zlmServerConfig){
- logger.info( "[ id: " + zlmServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
- // 鍏抽棴寰幆鑾峰彇zlm閰嶇疆
- startGetMedia = false;
- if (mediaConfig.getAutoConfig()) saveZLMConfig();
- zlmServerManger.updateServerCatch(zlmServerConfig);
-
- // 娓呯┖鎵�鏈塻ession
-// zlmMediaListManager.clearAllSessions();
-
- // 鏇存柊娴佸垪琛�
- zlmMediaListManager.updateMediaList();
- // 鎭㈠娴佷唬鐞�
- List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
- for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
- logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
- JSONObject jsonObject = streamProxyService.addStreamProxyToZlm(streamProxyDto);
- if (jsonObject == null) {
- // 璁剧疆涓烘湭鍚敤
- logger.info("鎭㈠娴佷唬鐞嗗け璐ワ紝璇锋鏌ユ祦鍦板潃鍚庨噸鏂板惎鐢�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
- streamProxyService.stop(streamProxyDto.getApp(), streamProxyDto.getStream());
- }
- }
}
}
--
Gitblit v1.8.0