From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 750 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 552 insertions(+), 198 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index a90225a..7c5b149 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -1,31 +1,48 @@
package com.genersoft.iot.vmp.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaConfig;
-import com.genersoft.iot.vmp.conf.ProxyServletConfig;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
-import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.ZLMRunInfo;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
-import org.mitre.dsmiley.httpproxy.ProxyServlet;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
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.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.ObjectUtils;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
/**
* 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞�
@@ -35,20 +52,19 @@
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
- private Map<String, IMediaServerItem> zlmServers = new HashMap<>(); // 鎵�鏈夋暟鎹簱鐨剒lm鐨勭紦瀛�
- private Map<String, Integer> zlmServerStatus = new LinkedHashMap<>(); // 鎵�鏈変笂绾跨殑zlm鐨勭紦瀛樹互鍙婅礋杞�
+ private final String zlmKeepaliveKeyPrefix = "zlm-keepalive_";
- @Value("${sip.ip}")
- private String sipIp;
+ @Autowired
+ private SipConfig sipConfig;
@Value("${server.ssl.enabled:false}")
private boolean sslEnabled;
@Value("${server.port}")
- private String serverPort;
+ private Integer serverPort;
@Autowired
- private MediaConfig mediaConfig;
+ private UserSetting userSetting;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@@ -56,9 +72,11 @@
@Autowired
private MediaServerMapper mediaServerMapper;
+ @Autowired
+ DataSourceTransactionManager dataSourceTransactionManager;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ TransactionDefinition transactionDefinition;
@Autowired
private VideoStreamSessionManager streamSession;
@@ -66,53 +84,190 @@
@Autowired
private ZLMRTPServerFactory zlmrtpServerFactory;
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @Autowired
+ private EventPublisher publisher;
+
+ @Autowired
+ private DynamicTask dynamicTask;
/**
* 鍒濆鍖�
*/
@Override
- public void init() {
- zlmServers.clear();
- zlmServerStatus.clear();
- List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
- for (IMediaServerItem mediaServerItem : mediaServerItemList) {
- zlmServers.put(mediaServerItem.getId(), mediaServerItem);
+ public void updateVmServer(List<MediaServerItem> mediaServerItemList) {
+ logger.info("[zlm] 缂撳瓨鍒濆鍖� ");
+ for (MediaServerItem mediaServerItem : mediaServerItemList) {
+ if (ObjectUtils.isEmpty(mediaServerItem.getId())) {
+ continue;
+ }
+ // 鏇存柊
+ if (mediaServerItem.getSsrcConfig() == null) {
+ SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
+ mediaServerItem.setSsrcConfig(ssrcConfig);
+ RedisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId(), mediaServerItem);
+ }
+ // 鏌ヨredis鏄惁瀛樺湪姝ediaServer
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
+ if (!RedisUtil.hasKey(key)) {
+ RedisUtil.set(key, mediaServerItem);
+ }
+
}
}
@Override
- public void closeRTPServer(Device device, String channelId) {
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(device.getDeviceId(), channelId);
- IMediaServerItem mediaServerItem = null;
- if (streamInfo != null) {
- mediaServerItem = this.getOne (streamInfo.getMediaServerId());
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback) {
+ return openRTPServer(mediaServerItem, streamId, null, ssrcCheck,isPlayback);
+ }
+
+ @Override
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String presetSsrc, boolean ssrcCheck, boolean isPlayback, Integer port) {
+ if (mediaServerItem == null || mediaServerItem.getId() == null) {
+ return null;
}
- String streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);
+ // 鑾峰彇mediaServer鍙敤鐨剆src
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
+
+ SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
+ if (ssrcConfig == null) {
+ logger.info("media server [ {} ] ssrcConfig is null", mediaServerItem.getId());
+ return null;
+ }else {
+ String ssrc;
+ if (presetSsrc != null) {
+ ssrc = presetSsrc;
+ }else {
+ if (isPlayback) {
+ ssrc = ssrcConfig.getPlayBackSsrc();
+ }else {
+ ssrc = ssrcConfig.getPlaySsrc();
+ }
+ }
+
+ if (streamId == null) {
+ streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
+ }
+ int rtpServerPort;
+ if (mediaServerItem.isRtpEnable()) {
+ rtpServerPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId, ssrcCheck?Integer.parseInt(ssrc):0, port);
+ } else {
+ rtpServerPort = mediaServerItem.getRtpProxyPort();
+ }
+ RedisUtil.set(key, mediaServerItem);
+ return new SSRCInfo(rtpServerPort, ssrc, streamId);
+ }
+ }
+
+ @Override
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback) {
+ return openRTPServer(mediaServerItem, streamId, ssrc, ssrcCheck, isPlayback, null);
+ }
+
+ @Override
+ public void closeRTPServer(MediaServerItem mediaServerItem, String streamId) {
+ if (mediaServerItem == null) {
+ return;
+ }
zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
- streamSession.remove(device.getDeviceId(), channelId);
+ releaseSsrc(mediaServerItem.getId(), streamId);
}
@Override
- public void update(MediaConfig mediaConfig) {
-
+ public void closeRTPServer(String mediaServerId, String streamId) {
+ MediaServerItem mediaServerItem = this.getOne(mediaServerId);
+ closeRTPServer(mediaServerItem, streamId);
}
@Override
- public List<IMediaServerItem> getAll() {
- if (zlmServers.size() == 0) {
- init();
+ public void releaseSsrc(String mediaServerItemId, String ssrc) {
+ MediaServerItem mediaServerItem = getOne(mediaServerItemId);
+ if (mediaServerItem == null || ssrc == null) {
+ return;
}
- List<IMediaServerItem> result = new ArrayList<>();
- for (String id : zlmServers.keySet()) {
- IMediaServerItem mediaServerItem = zlmServers.get(id);
- mediaServerItem.setCount(zlmServerStatus.get(id) == null ? 0 : zlmServerStatus.get(id));
+ SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
+ ssrcConfig.releaseSsrc(ssrc);
+ mediaServerItem.setSsrcConfig(ssrcConfig);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
+ RedisUtil.set(key, mediaServerItem);
+ }
+
+ /**
+ * zlm 閲嶅惎鍚庨噸缃粬鐨勬帹娴佷俊鎭紝 TODO 缁欐鍦ㄤ娇鐢ㄧ殑璁惧鍙戦�佸仠姝㈠懡浠�
+ */
+ @Override
+ public void clearRTPServer(MediaServerItem mediaServerItem) {
+ mediaServerItem.setSsrcConfig(new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain()));
+ RedisUtil.zAdd(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), mediaServerItem.getId(), 0);
+
+ }
+
+
+ @Override
+ public void update(MediaServerItem mediaSerItem) {
+ mediaServerMapper.update(mediaSerItem);
+ MediaServerItem mediaServerItemInRedis = getOne(mediaSerItem.getId());
+ MediaServerItem mediaServerItemInDataBase = mediaServerMapper.queryOne(mediaSerItem.getId());
+ if (mediaServerItemInRedis != null && mediaServerItemInRedis.getSsrcConfig() != null) {
+ mediaServerItemInDataBase.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
+ }else {
+ mediaServerItemInDataBase.setSsrcConfig(
+ new SsrcConfig(
+ mediaServerItemInDataBase.getId(),
+ null,
+ sipConfig.getDomain()
+ )
+ );
+ }
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItemInDataBase.getId();
+ RedisUtil.set(key, mediaServerItemInDataBase);
+ }
+
+ @Override
+ public List<MediaServerItem> getAll() {
+ List<MediaServerItem> result = new ArrayList<>();
+ List<Object> mediaServerKeys = RedisUtil.scan(String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetting.getServerId() + "_" ));
+ String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ for (Object mediaServerKey : mediaServerKeys) {
+ String key = (String) mediaServerKey;
+ MediaServerItem mediaServerItem = (MediaServerItem) RedisUtil.get(key);
+ // 妫�鏌ョ姸鎬�
+ Double aDouble = RedisUtil.zScore(onlineKey, mediaServerItem.getId());
+ if (aDouble != null) {
+ mediaServerItem.setStatus(true);
+ }
result.add(mediaServerItem);
}
+ result.sort((serverItem1, serverItem2)->{
+ int sortResult = 0;
+ LocalDateTime localDateTime1 = LocalDateTime.parse(serverItem1.getCreateTime(), DateUtil.formatter);
+ LocalDateTime localDateTime2 = LocalDateTime.parse(serverItem2.getCreateTime(), DateUtil.formatter);
+
+ sortResult = localDateTime1.compareTo(localDateTime2);
+ return sortResult;
+ });
return result;
+ }
-// return mediaServerMapper.queryAll();
+ @Override
+ public List<MediaServerItem> getAllFromDatabase() {
+ return mediaServerMapper.queryAll();
+ }
+
+ @Override
+ public List<MediaServerItem> getAllOnline() {
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ Set<String> mediaServerIdSet = RedisUtil.zRevRange(key, 0, -1);
+
+ List<MediaServerItem> result = new ArrayList<>();
+ if (mediaServerIdSet != null && mediaServerIdSet.size() > 0) {
+ for (String mediaServerId : mediaServerIdSet) {
+ String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
+ result.add((MediaServerItem) RedisUtil.get(serverKey));
+ }
+ }
+ Collections.reverse(result);
+ return result;
}
/**
@@ -121,24 +276,75 @@
* @return MediaServerItem
*/
@Override
- public IMediaServerItem getOne(String mediaServerId) {
- if (mediaServerId ==null) return null;
- IMediaServerItem mediaServerItem = zlmServers.get(mediaServerId);
- if (mediaServerItem != null) {
- mediaServerItem.setCount(zlmServerStatus.get(mediaServerId) == null ? 0 : zlmServerStatus.get(mediaServerId));
- return mediaServerItem;
- }else {
- IMediaServerItem item = mediaServerMapper.queryOne(mediaServerId);
- if (item != null) {
- zlmServers.put(item.getId(), item);
+ public MediaServerItem getOne(String mediaServerId) {
+ if (mediaServerId == null) {
+ return null;
+ }
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerId;
+ return (MediaServerItem)RedisUtil.get(key);
+ }
+
+ @Override
+ public MediaServerItem getDefaultMediaServer() {
+
+ return mediaServerMapper.queryDefault();
+ }
+
+ @Override
+ public void clearMediaServerForOnline() {
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ RedisUtil.del(key);
+ }
+
+ @Override
+ public void add(MediaServerItem mediaServerItem) {
+ mediaServerItem.setCreateTime(DateUtil.getNow());
+ mediaServerItem.setUpdateTime(DateUtil.getNow());
+ mediaServerItem.setHookAliveInterval(120);
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ if (responseJSON != null) {
+ JSONArray data = responseJSON.getJSONArray("data");
+ if (data != null && data.size() > 0) {
+ ZLMServerConfig zlmServerConfig= JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"淇濆瓨澶辫触锛屽獟浣撴湇鍔D [ " + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ }
+ mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
+ zlmServerConfig.setIp(mediaServerItem.getIp());
+ mediaServerMapper.add(mediaServerItem);
+ zlmServerOnline(zlmServerConfig);
+ }else {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"杩炴帴澶辫触");
}
- return item;
+
+ }else {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"杩炴帴澶辫触");
}
}
@Override
- public IMediaServerItem getOneByHostAndPort(String host, int port) {
- return mediaServerMapper.queryOneByHostAndPort(host, port);
+ public int addToDatabase(MediaServerItem mediaSerItem) {
+ return mediaServerMapper.add(mediaSerItem);
+ }
+
+ @Override
+ public int updateToDatabase(MediaServerItem mediaSerItem) {
+ int result = 0;
+ if (mediaSerItem.isDefaultServer()) {
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ int delResult = mediaServerMapper.delDefault();
+ if (delResult == 0) {
+ logger.error("绉婚櫎鏁版嵁搴撻粯璁lm鑺傜偣澶辫触");
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ return 0;
+ }
+ result = mediaServerMapper.add(mediaSerItem);
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ }else {
+ result = mediaServerMapper.update(mediaSerItem);
+ }
+ return result;
}
/**
@@ -146,115 +352,135 @@
* @param zlmServerConfig zlm涓婄嚎鎼哄甫鐨勫弬鏁�
*/
@Override
- public void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig) {
- logger.info("[ {} ]-[ {}:{} ]宸茶繛鎺�",
- zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
+ public void zlmServerOnline(ZLMServerConfig zlmServerConfig) {
- IMediaServerItem serverItem = getOne(zlmServerConfig.getGeneralMediaServerId());
- String now = this.format.format(new Date(System.currentTimeMillis()));
- if (serverItem != null) {
- serverItem.setSecret(zlmServerConfig.getApiSecret());
- serverItem.setIp(zlmServerConfig.getIp());
- // 濡傛灉鏄厤缃枃浠朵腑鐨剒lm銆� 涔熷氨鏄粯璁lm銆� 涓�鍒囦互閰嶇疆鏂囦欢鍐呭涓哄噯
- // docker閮ㄧ讲涓嶄細浣跨敤zlm閰嶇疆鐨勭鍙ｅ彿;
- // 鐩存帴缂栬瘧閮ㄧ讲鐨勪娇鐢ㄩ厤缃枃浠剁殑绔彛鍙凤紝濡傛灉zlm淇敼閰嶆敼浜嗛厤缃紝wvp鑷姩淇敼
-
- if (serverItem.getId().equals(mediaConfig.getId())
- || (serverItem.getIp().equals(mediaConfig.getIp()) && serverItem.getHttpPort() == mediaConfig.getHttpPort())) {
- // 閰嶇疆鏂囦欢鐨剒lm
- mediaConfig.setId(zlmServerConfig.getGeneralMediaServerId());
- mediaConfig.setUpdateTime(now);
- if (mediaConfig.getHttpPort() == 0) mediaConfig.setHttpPort(zlmServerConfig.getHttpPort());
- if (mediaConfig.getHttpSSlPort() == 0) mediaConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- if (mediaConfig.getRtmpPort() == 0) mediaConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
- if (mediaConfig.getRtmpSSlPort() == 0) mediaConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- if (mediaConfig.getRtspPort() == 0) mediaConfig.setRtspPort(zlmServerConfig.getRtspPort());
- if (mediaConfig.getRtspSSLPort() == 0) mediaConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
- if (mediaConfig.getRtpProxyPort() == 0) mediaConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- mediaServerMapper.update(mediaConfig);
- serverItem = mediaConfig.getMediaSerItem();
- setZLMConfig(mediaConfig);
- }else {
- if (!serverItem.isDocker()) {
- serverItem.setHttpPort(zlmServerConfig.getHttpPort());
- serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
- serverItem.setRtmpPort(zlmServerConfig.getRtmpPort());
- serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
- serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
- serverItem.setRtspPort(zlmServerConfig.getRtspPort());
-
- }
- serverItem.setUpdateTime(now);
- mediaServerMapper.update(serverItem);
- setZLMConfig(serverItem);
- }
+ MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
+ if (serverItem == null) {
+ logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛歿}鏉ヨ嚜{}锛歿}", zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ logger.warn("璇锋鏌LM鐨�<general.mediaServerId>閰嶇疆鏄惁涓嶹VP鐨�<media.id>涓�鑷�");
+ return;
}else {
- if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
- || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
- mediaConfig.setId(zlmServerConfig.getGeneralMediaServerId());
- mediaConfig.setCreateTime(now);
- mediaConfig.setUpdateTime(now);
- serverItem = mediaConfig;
- mediaServerMapper.add(mediaConfig);
+ logger.info("[ZLM] 姝ｅ湪杩炴帴 : {} -> {}:{}",
+ zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
+ }
+ serverItem.setHookAliveInterval(zlmServerConfig.getHookAliveInterval());
+ if (serverItem.getHttpPort() == 0) {
+ serverItem.setHttpPort(zlmServerConfig.getHttpPort());
+ }
+ if (serverItem.getHttpSSlPort() == 0) {
+ serverItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
+ }
+ if (serverItem.getRtmpPort() == 0) {
+ serverItem.setRtmpPort(zlmServerConfig.getRtmpPort());
+ }
+ if (serverItem.getRtmpSSlPort() == 0) {
+ serverItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+ }
+ if (serverItem.getRtspPort() == 0) {
+ serverItem.setRtspPort(zlmServerConfig.getRtspPort());
+ }
+ if (serverItem.getRtspSSLPort() == 0) {
+ serverItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+ }
+ if (serverItem.getRtpProxyPort() == 0) {
+ serverItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+ }
+ serverItem.setStatus(true);
+
+ if (ObjectUtils.isEmpty(serverItem.getId())) {
+ logger.warn("[鏈敞鍐岀殑zlm] serverItem缂哄皯ID锛� 鏃犳硶鎺ュ叆锛歿}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ return;
+ }
+ mediaServerMapper.update(serverItem);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId();
+ if (RedisUtil.get(key) == null) {
+ SsrcConfig ssrcConfig = new SsrcConfig(zlmServerConfig.getGeneralMediaServerId(), null, sipConfig.getDomain());
+ serverItem.setSsrcConfig(ssrcConfig);
+ }else {
+ MediaServerItem mediaServerItemInRedis = (MediaServerItem)RedisUtil.get(key);
+ serverItem.setSsrcConfig(mediaServerItemInRedis.getSsrcConfig());
+ }
+ RedisUtil.set(key, serverItem);
+ resetOnlineServerItem(serverItem);
+ if (serverItem.isAutoConfig()) {
+ setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable()));
+ }
+ final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId();
+ dynamicTask.stop(zlmKeepaliveKey);
+ dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(serverItem), (serverItem.getHookAliveInterval() + 5) * 1000);
+ publisher.zlmOnlineEventPublish(serverItem.getId());
+ logger.info("[ZLM] 杩炴帴鎴愬姛 {} - {}:{} ",
+ zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
+ }
+
+ class KeepAliveTimeoutRunnable implements Runnable{
+
+ private MediaServerItem serverItem;
+
+ public KeepAliveTimeoutRunnable(MediaServerItem serverItem) {
+ this.serverItem = serverItem;
+ }
+
+ @Override
+ public void run() {
+ logger.info("[zlm蹇冭烦鍒版湡]锛�" + serverItem.getId());
+ // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
+ JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(serverItem);
+ if (mediaServerConfig != null && mediaServerConfig.getInteger("code") == 0) {
+ logger.info("[zlm蹇冭烦鍒版湡]锛歿}楠岃瘉鍚巣lm浠嶅湪绾匡紝鎭㈠蹇冭烦淇℃伅,璇锋鏌lm鏄惁鍙互姝ｅ父鍚憌vp鍙戦�佸績璺�", serverItem.getId());
+ // 娣诲姞zlm淇℃伅
+ updateMediaServerKeepalive(serverItem.getId(), mediaServerConfig);
}else {
- // 涓�涓柊鐨剒lm鎺ュ叆wvp
- serverItem = new MediaServerItem(zlmServerConfig, sipIp);
- serverItem.setCreateTime(now);
- serverItem.setUpdateTime(now);
- mediaServerMapper.add(serverItem);
+ publisher.zlmOfflineEventPublish(serverItem.getId());
}
}
- // 鏇存柊缂撳瓨
- if (zlmServerStatus.get(serverItem.getId()) == null) {
- zlmServers.put(serverItem.getId(), serverItem);
- zlmServerStatus.put(serverItem.getId(),0);
- }
- // 鏌ヨ鏈嶅姟娴佹暟閲�
- IMediaServerItem finalServerItem = serverItem;
- zlmresTfulUtils.getMediaList(serverItem, null, null, "rtmp",(mediaList ->{
- Integer code = mediaList.getInteger("code");
- if (code == 0) {
- JSONArray data = mediaList.getJSONArray("data");
- if (data != null) {
- zlmServerStatus.put(finalServerItem.getId(),data.size());
- }else {
- zlmServerStatus.put(finalServerItem.getId(),0);
- }
-
- }
- }));
-
}
- /**
- * 鏇存柊缂撳瓨
- * @param mediaServerItem zlm鏈嶅姟
- * @param count 鍦ㄧ嚎鏁�
- * @param online 鍦ㄧ嚎鐘舵��
- */
+
@Override
- public void updateServerCatch(IMediaServerItem mediaServerItem, Integer count, Boolean online) {
- if (mediaServerItem != null) {
- zlmServers.put(mediaServerItem.getId(), mediaServerItem);
- Collection<Integer> values = zlmServerStatus.values();
- if (online != null && count != null) {
- zlmServerStatus.put(mediaServerItem.getId(), count);
- }
+ public void zlmServerOffline(String mediaServerId) {
+ delete(mediaServerId);
+ final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerId;
+ dynamicTask.stop(zlmKeepaliveKey);
+ }
+
+ @Override
+ public void resetOnlineServerItem(MediaServerItem serverItem) {
+ // 鏇存柊缂撳瓨
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ // 浣跨敤zset鐨勫垎鏁颁綔涓哄綋鍓嶅苟鍙戦噺锛� 榛樿鍊艰缃负0
+ if (RedisUtil.zScore(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
+ RedisUtil.zAdd(key, serverItem.getId(), 0L);
+ // 鏌ヨ鏈嶅姟娴佹暟閲�
+ zlmresTfulUtils.getMediaList(serverItem, null, null, "rtsp",(mediaList ->{
+ Integer code = mediaList.getInteger("code");
+ if (code == 0) {
+ JSONArray data = mediaList.getJSONArray("data");
+ if (data != null) {
+ RedisUtil.zAdd(key, serverItem.getId(), data.size());
+ }
+ }
+ }));
+ }else {
+ clearRTPServer(serverItem);
}
}
+
@Override
public void addCount(String mediaServerId) {
- if (zlmServerStatus.get(mediaServerId) != null) {
- zlmServerStatus.put(mediaServerId, zlmServerStatus.get(mediaServerId) + 1);
+ if (mediaServerId == null) {
+ return;
}
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ RedisUtil.zIncrScore(key, mediaServerId, 1);
+
}
@Override
public void removeCount(String mediaServerId) {
- if (zlmServerStatus.get(mediaServerId) != null) {
- zlmServerStatus.put(mediaServerId, zlmServerStatus.get(mediaServerId) - 1);
- }
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+ RedisUtil.zIncrScore(key, mediaServerId, - 1);
}
/**
@@ -262,79 +488,207 @@
* @return MediaServerItem
*/
@Override
- public IMediaServerItem getMediaServerForMinimumLoad() {
- int mediaCount = -1;
- String key = null;
- System.out.println(JSON.toJSONString(zlmServerStatus));
- if (zlmServerStatus.size() == 1) {
- Map.Entry entry = zlmServerStatus.entrySet().iterator().next();
- key= (String) entry.getKey();
- }else {
- for (String id : zlmServerStatus.keySet()) {
- if (key == null) {
- key = id;
- mediaCount = zlmServerStatus.get(id);
- }
- if (zlmServerStatus.get(id) == 0) {
- key = id;
- break;
- }else if (mediaCount >= zlmServerStatus.get(id)){
- mediaCount = zlmServerStatus.get(id);
- key = id;
- }
+ public MediaServerItem getMediaServerForMinimumLoad() {
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId();
+
+ if (RedisUtil.zSize(key) == null || RedisUtil.zSize(key) == 0) {
+ if (RedisUtil.zSize(key) == null || RedisUtil.zSize(key) == 0) {
+ logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
+ return null;
}
}
- if (key == null) {
- logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
- return null;
- }else{
- return zlmServers.get(key);
- }
+ // 鑾峰彇鍒嗘暟鏈�浣庣殑锛屽強骞跺彂鏈�浣庣殑
+ Set<Object> objects = RedisUtil.zRange(key, 0, -1);
+ ArrayList<Object> mediaServerObjectS = new ArrayList<>(objects);
+
+ String mediaServerId = (String)mediaServerObjectS.get(0);
+ return getOne(mediaServerId);
}
/**
* 瀵箊lm鏈嶅姟鍣ㄨ繘琛屽熀纭�閰嶇疆
* @param mediaServerItem 鏈嶅姟ID
+ * @param restart 鏄惁閲嶅惎zlm
*/
@Override
- public void setZLMConfig(IMediaServerItem mediaServerItem) {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm",
+ public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
+ logger.info("[ZLM] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
- String recordHookPrex = null;
- if (mediaServerItem.getRecordAssistPort() != 0) {
- recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaServerItem.getRecordAssistPort());
- }
+
Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
- param.put("ffmpeg.cmd","%s -fflags nobuffer -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_flow_report",String.format("%s/on_flow_report", hookPrex));
param.put("hook.on_play",String.format("%s/on_play", hookPrex));
- param.put("hook.on_http_access","");
+ param.put("hook.on_http_access",String.format("%s/on_http_access", hookPrex));
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_record_ts",String.format("%s/on_record_ts", hookPrex));
+ param.put("hook.on_rtsp_auth",String.format("%s/on_rtsp_auth", hookPrex));
+ param.put("hook.on_rtsp_realm",String.format("%s/on_rtsp_realm", hookPrex));
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.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
+ param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrex));
+ if (mediaServerItem.getRecordAssistPort() > 0) {
+ param.put("hook.on_record_mp4",String.format("http://127.0.0.1:%s/api/record/on_record_mp4", mediaServerItem.getRecordAssistPort()));
+ }else {
+ param.put("hook.on_record_mp4","");
+ }
param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS",mediaServerItem.getStreamNoneReaderDelayMS());
+ // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
+ // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
+ // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
+ // 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
+ param.put("general.continue_push_ms", "3000" );
+ // 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
+ // 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
+// param.put("general.wait_track_ready_ms", "3000" );
+ if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
+ param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
+ }
JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);
if (responseJSON != null && responseJSON.getInteger("code") == 0) {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ if (restart) {
+ logger.info("[ZLM] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ zlmresTfulUtils.restartServer(mediaServerItem);
+ }else {
+ logger.info("[ZLM] 璁剧疆鎴愬姛 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ }
+
+
}else {
- logger.info("[ {} ]-[ {}:{} ]璁剧疆zlm澶辫触" + responseJSON.getString("msg"),
+ logger.info("[ZLM] 璁剧疆zlm澶辫触 {} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}
+
+
+ }
+
+
+ @Override
+ public MediaServerItem checkMediaServer(String ip, int port, String secret) {
+ if (mediaServerMapper.queryOneByHostAndPort(ip, port) != null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "姝よ繛鎺ュ凡瀛樺湪");
+ }
+ MediaServerItem mediaServerItem = new MediaServerItem();
+ mediaServerItem.setIp(ip);
+ mediaServerItem.setHttpPort(port);
+ mediaServerItem.setSecret(secret);
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ if (responseJSON == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杩炴帴澶辫触");
+ }
+ JSONArray data = responseJSON.getJSONArray("data");
+ ZLMServerConfig zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ if (zlmServerConfig == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "璇诲彇閰嶇疆澶辫触");
+ }
+ if (mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId()) != null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "濯掍綋鏈嶅姟ID [" + zlmServerConfig.getGeneralMediaServerId() + " ] 宸插瓨鍦紝璇蜂慨鏀瑰獟浣撴湇鍔″櫒閰嶇疆");
+ }
+ mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpPort());
+ mediaServerItem.setRtmpPort(zlmServerConfig.getRtmpPort());
+ mediaServerItem.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
+ mediaServerItem.setRtspPort(zlmServerConfig.getRtspPort());
+ mediaServerItem.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
+ mediaServerItem.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
+ mediaServerItem.setStreamIp(ip);
+ mediaServerItem.setHookIp(sipConfig.getIp());
+ mediaServerItem.setSdpIp(ip);
+ return mediaServerItem;
+ }
+
+ @Override
+ public boolean checkMediaRecordServer(String ip, int port) {
+ boolean result = false;
+ OkHttpClient client = new OkHttpClient();
+ String url = String.format("http://%s:%s/index/api/record", ip, port);
+ Request request = new Request.Builder()
+ .get()
+ .url(url)
+ .build();
+ try {
+ Response response = client.newCall(request).execute();
+ if (response != null) {
+ result = true;
+ }
+ } catch (Exception e) {}
+
+ return result;
+ }
+
+ @Override
+ public void delete(String id) {
+ RedisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetting.getServerId(), id);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + id;
+ RedisUtil.del(key);
+ }
+ @Override
+ public void deleteDb(String id){
+ //鍚屾鍒犻櫎鏁版嵁搴撲腑鐨勬暟鎹�
+ mediaServerMapper.delOne(id);
+ }
+
+ @Override
+ public void updateMediaServerKeepalive(String mediaServerId, JSONObject data) {
+ MediaServerItem mediaServerItem = getOne(mediaServerId);
+ if (mediaServerItem == null) {
+ // 缂撳瓨涓嶅瓨鍦紝浠庢暟鎹簱鏌ヨ锛屽鏋滄暟鎹簱涓嶅瓨鍦ㄥ垯鏄敊璇殑
+ MediaServerItem mediaServerItemFromDatabase = getOneFromDatabase(mediaServerId);
+ if (mediaServerItemFromDatabase == null) {
+ return;
+ }
+ // zlm杩炴帴閲嶈瘯
+ logger.warn("[鏇存柊ZLM 淇濇椿淇℃伅]澶辫触锛屾湭鎵惧埌娴佸獟浣撲俊鎭�,灏濊瘯閲嶈繛zlm");
+// reloadZlm();
+ mediaServerItem = getOne(mediaServerId);
+ if (mediaServerItem == null) {
+ // zlm杩炴帴閲嶈瘯
+ logger.warn("[鏇存柊ZLM 淇濇椿淇℃伅]澶辫触锛屾湭鎵惧埌娴佸獟浣撲俊鎭�");
+ return;
+ }
+ }
+ final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + mediaServerItem.getId();
+ dynamicTask.stop(zlmKeepaliveKey);
+ dynamicTask.startDelay(zlmKeepaliveKey, new KeepAliveTimeoutRunnable(mediaServerItem), (mediaServerItem.getHookAliveInterval() + 5) * 1000);
+ }
+
+ private MediaServerItem getOneFromDatabase(String mediaServerId) {
+ return mediaServerMapper.queryOne(mediaServerId);
+ }
+
+ @Override
+ public void syncCatchFromDatabase() {
+ List<MediaServerItem> allInCatch = getAll();
+ List<MediaServerItem> allInDatabase = mediaServerMapper.queryAll();
+ Map<String, MediaServerItem> mediaServerItemMap = new HashMap<>();
+
+ for (MediaServerItem mediaServerItem : allInDatabase) {
+ mediaServerItemMap.put(mediaServerItem.getId(), mediaServerItem);
+ }
+ for (MediaServerItem mediaServerItem : allInCatch) {
+ if (!mediaServerItemMap.containsKey(mediaServerItem.getId())) {
+ delete(mediaServerItem.getId());
+ }
+ }
+ }
+
+ @Override
+ public boolean checkRtpServer(MediaServerItem mediaServerItem, String app, String stream) {
+ JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaServerItem, stream);
+ if(rtpInfo.getInteger("code") == 0){
+ return rtpInfo.getBoolean("exist");
+ }
+ return false;
}
}
--
Gitblit v1.8.0