From f2c6210539cfc5f423a773b4d897c37a9066f821 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 10 二月 2023 16:24:27 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 974 ++++++++++++++++++++++++++++----------------------------
1 files changed, 486 insertions(+), 488 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index ba95972..dae42c7 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -10,6 +10,8 @@
import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.dto.HookType;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -19,7 +21,10 @@
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.DeferredResultEx;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +32,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
@@ -35,20 +41,21 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
-/**
+/**
* @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
* @author: swwheihei
- * @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
+ * @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@RestController
@RequestMapping("/index/hook")
public class ZLMHttpHookListener {
- private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
+ private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
- @Autowired
- private SIPCommander cmder;
+ @Autowired
+ private SIPCommander cmder;
@Autowired
private ISIPCommanderForPlatform commanderFroPlatform;
@@ -59,265 +66,243 @@
@Autowired
private ZLMRTPServerFactory zlmrtpServerFactory;
- @Autowired
- private IPlayService playService;
+ @Autowired
+ private IPlayService playService;
- @Autowired
- private IVideoManagerStorage storager;
+ @Autowired
+ private IVideoManagerStorage storager;
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
- @Autowired
- private IDeviceService deviceService;
+ @Autowired
+ private IDeviceService deviceService;
- @Autowired
- private IMediaServerService mediaServerService;
+ @Autowired
+ private IMediaServerService mediaServerService;
- @Autowired
- private IStreamProxyService streamProxyService;
+ @Autowired
+ private IStreamProxyService streamProxyService;
- @Autowired
- private IStreamPushService streamPushService;
+ @Autowired
+ private DeferredResultHolder resultHolder;
- @Autowired
- private IMediaService mediaService;
+ @Autowired
+ private IMediaService mediaService;
- @Autowired
- private EventPublisher eventPublisher;
+ @Autowired
+ private EventPublisher eventPublisher;
- @Autowired
- private ZLMMediaListManager zlmMediaListManager;
+ @Autowired
+ private ZLMMediaListManager zlmMediaListManager;
- @Autowired
- private ZlmHttpHookSubscribe subscribe;
+ @Autowired
+ private ZlmHttpHookSubscribe subscribe;
- @Autowired
- private UserSetting userSetting;
+ @Autowired
+ private UserSetting userSetting;
- @Autowired
- private IUserService userService;
+ @Autowired
+ private IUserService userService;
- @Autowired
- private VideoStreamSessionManager sessionManager;
+ @Autowired
+ private VideoStreamSessionManager sessionManager;
- @Autowired
- private AssistRESTfulUtils assistRESTfulUtils;
+ @Autowired
+ private AssistRESTfulUtils assistRESTfulUtils;
- @Qualifier("taskExecutor")
- @Autowired
- private ThreadPoolTaskExecutor taskExecutor;
+ @Qualifier("taskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
- /**
- * 鏈嶅姟鍣ㄥ畾鏃朵笂鎶ユ椂闂达紝涓婃姤闂撮殧鍙厤缃紝榛樿10s涓婃姤涓�娆�
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
- public JSONObject onServerKeepalive(@RequestBody OnServerKeepaliveHookParam param){
+ /**
+ * 鏈嶅姟鍣ㄥ畾鏃朵笂鎶ユ椂闂达紝涓婃姤闂撮殧鍙厤缃紝榛樿10s涓婃姤涓�娆�
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
+ public HookResult onServerKeepalive(@RequestBody OnServerKeepaliveHookParam param) {
- logger.info("[ZLM HOOK] 鏀跺埌zlm蹇冭烦锛�" + param.getMediaServerId());
+ logger.info("[ZLM HOOK] 鏀跺埌zlm蹇冭烦锛�" + param.getMediaServerId());
- taskExecutor.execute(()->{
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);
- JSONObject json = (JSONObject) JSON.toJSON(param);
- if (subscribes != null && subscribes.size() > 0) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, json);
- }
- }
- });
- mediaServerService.updateMediaServerKeepalive(param.getMediaServerId(), param.getData());
+ taskExecutor.execute(() -> {
+ List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);
+ JSONObject json = (JSONObject) JSON.toJSON(param);
+ if (subscribes != null && subscribes.size() > 0) {
+ for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
+ subscribe.response(null, json);
+ }
+ }
+ });
+ mediaServerService.updateMediaServerKeepalive(param.getMediaServerId(), param.getData());
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("msg", "success");
+ return HookResult.SUCCESS();
+ }
- return ret;
- }
-
- /**
- * 鎾斁鍣ㄩ壌鏉冧簨浠讹紝rtsp/rtmp/http-flv/ws-flv/hls鐨勬挱鏀鹃兘灏嗚Е鍙戞閴存潈浜嬩欢銆�
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
- public JSONObject onPlay(@RequestBody OnPlayHookParam param){
- if (logger.isDebugEnabled()) {
- logger.debug("[ZLM HOOK] 鎾斁閴存潈锛歿}->{}" + param.getMediaServerId(), param);
- }
- String mediaServerId = param.getMediaServerId();
+ /**
+ * 鎾斁鍣ㄩ壌鏉冧簨浠讹紝rtsp/rtmp/http-flv/ws-flv/hls鐨勬挱鏀鹃兘灏嗚Е鍙戞閴存潈浜嬩欢銆�
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
+ public HookResult onPlay(@RequestBody OnPlayHookParam param) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("[ZLM HOOK] 鎾斁閴存潈锛歿}->{}" + param.getMediaServerId(), param);
+ }
+ String mediaServerId = param.getMediaServerId();
- taskExecutor.execute(()->{
- JSONObject json = (JSONObject) JSON.toJSON(param);
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);
- if (subscribe != null ) {
- MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
- if (mediaInfo != null) {
- subscribe.response(mediaInfo, json);
- }
- }
- });
- JSONObject ret = new JSONObject();
- if (!"rtp".equals(param.getApp())) {
- Map<String, String> paramMap = urlParamToMap(param.getParams());
- StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
- if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {
- ret.put("code", 401);
- ret.put("msg", "Unauthorized");
- return ret;
- }
- }
+ taskExecutor.execute(() -> {
+ JSONObject json = (JSONObject) JSON.toJSON(param);
+ ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);
+ if (subscribe != null) {
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ }
+ }
+ });
+ if (!"rtp".equals(param.getApp())) {
+ Map<String, String> paramMap = urlParamToMap(param.getParams());
+ StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
+ if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {
+ return new HookResult(401, "Unauthorized");
+ }
+ }
- ret.put("code", 0);
- ret.put("msg", "success");
- return ret;
- }
-
- /**
- * rtsp/rtmp/rtp鎺ㄦ祦閴存潈浜嬩欢銆�
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
- public JSONObject onPublish(@RequestBody OnPublishHookParam param) {
+ return HookResult.SUCCESS();
+ }
- JSONObject json = (JSONObject) JSON.toJSON(param);
+ /**
+ * rtsp/rtmp/rtp鎺ㄦ祦閴存潈浜嬩欢銆�
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
+ public HookResultForOnPublish onPublish(@RequestBody OnPublishHookParam param) {
- logger.info("[ZLM HOOK]鎺ㄦ祦閴存潈锛歿}->{}", param.getMediaServerId(), param);
- JSONObject ret = new JSONObject();
- String mediaServerId = json.getString("mediaServerId");
- MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+ JSONObject json = (JSONObject) JSON.toJSON(param);
- if (!"rtp".equals(param.getApp())) {
- if (userSetting.getPushAuthority()) {
- // 鎺ㄦ祦閴存潈
- if (param.getParams() == null) {
- logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
- ret.put("code", 401);
- ret.put("msg", "Unauthorized");
- return ret;
- }
- Map<String, String> paramMap = urlParamToMap(param.getParams());
- String sign = paramMap.get("sign");
- if (sign == null) {
- logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
- ret.put("code", 401);
- ret.put("msg", "Unauthorized");
- return ret;
- }
- // 鎺ㄦ祦鑷畾涔夋挱鏀鹃壌鏉冪爜
- String callId = paramMap.get("callId");
- // 閴存潈閰嶇疆
- boolean hasAuthority = userService.checkPushAuthority(callId, sign);
- if (!hasAuthority) {
- logger.info("鎺ㄦ祦閴存潈澶辫触锛� sign 鏃犳潈闄�: callId={}. sign={}", callId, sign);
- ret.put("code", 401);
- ret.put("msg", "Unauthorized");
- return ret;
- }
- StreamAuthorityInfo streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
- streamAuthorityInfo.setCallId(callId);
- streamAuthorityInfo.setSign(sign);
- // 閴存潈閫氳繃
- redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
- // 閫氱煡assist鏂扮殑callId
- if (mediaInfo != null && mediaInfo.getRecordAssistPort() > 0) {
- taskExecutor.execute(()->{
- assistRESTfulUtils.addStreamCallInfo(mediaInfo, param.getApp(), param.getStream(), callId, null);
- });
- }
- }
- }else {
- zlmMediaListManager.sendStreamEvent(param.getApp(),param.getStream(), param.getMediaServerId());
- }
+ logger.info("[ZLM HOOK]鎺ㄦ祦閴存潈锛歿}->{}", param.getMediaServerId(), param);
- ret.put("code", 0);
- ret.put("msg", "success");
+ String mediaServerId = json.getString("mediaServerId");
+ MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
- if (!"rtp".equals(param.getApp())) {
- ret.put("enable_audio", true);
- }
-
- taskExecutor.execute(()->{
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
- if (subscribe != null) {
- if (mediaInfo != null) {
- subscribe.response(mediaInfo, json);
- }else {
- ret.put("code", 1);
- ret.put("msg", "zlm not register");
- }
- }
- });
-
- if ("rtp".equals(param.getApp())) {
- ret.put("enable_mp4", userSetting.getRecordSip());
- }else {
- ret.put("enable_mp4", userSetting.isRecordPushLive());
- }
- List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, param.getStream());
- if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
- String deviceId = ssrcTransactionForAll.get(0).getDeviceId();
- String channelId = ssrcTransactionForAll.get(0).getChannelId();
- DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
- if (deviceChannel != null) {
- ret.put("enable_audio", deviceChannel.isHasAudio());
- }
- // 濡傛灉鏄綍鍍忎笅杞藉氨璁剧疆瑙嗛闂撮殧鍗佺
- if (ssrcTransactionForAll.get(0).getType() == VideoStreamSessionManager.SessionType.download) {
- ret.put("mp4_max_second", 10);
- ret.put("enable_mp4", true);
- ret.put("enable_audio", true);
- }
- }
- return ret;
- }
-
- /**
- * rtsp/rtmp娴佹敞鍐屾垨娉ㄩ攢鏃惰Е鍙戞浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
- public JSONObject onStreamChanged(@RequestBody OnStreamChangedHookParam param){
-
- if (param.isRegist()) {
- logger.info("[ZLM HOOK] 娴佹敞鍐�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- }else {
- logger.info("[ZLM HOOK] 娴佹敞閿�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- }
+ if (!"rtp".equals(param.getApp())) {
+ if (userSetting.getPushAuthority()) {
+ // 鎺ㄦ祦閴存潈
+ if (param.getParams() == null) {
+ logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
+ return new HookResultForOnPublish(401, "Unauthorized");
+ }
+ Map<String, String> paramMap = urlParamToMap(param.getParams());
+ String sign = paramMap.get("sign");
+ if (sign == null) {
+ logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
+ return new HookResultForOnPublish(401, "Unauthorized");
+ }
+ // 鎺ㄦ祦鑷畾涔夋挱鏀鹃壌鏉冪爜
+ String callId = paramMap.get("callId");
+ // 閴存潈閰嶇疆
+ boolean hasAuthority = userService.checkPushAuthority(callId, sign);
+ if (!hasAuthority) {
+ logger.info("鎺ㄦ祦閴存潈澶辫触锛� sign 鏃犳潈闄�: callId={}. sign={}", callId, sign);
+ return new HookResultForOnPublish(401, "Unauthorized");
+ }
+ StreamAuthorityInfo streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
+ streamAuthorityInfo.setCallId(callId);
+ streamAuthorityInfo.setSign(sign);
+ // 閴存潈閫氳繃
+ redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
+ // 閫氱煡assist鏂扮殑callId
+ if (mediaInfo != null && mediaInfo.getRecordAssistPort() > 0) {
+ taskExecutor.execute(() -> {
+ assistRESTfulUtils.addStreamCallInfo(mediaInfo, param.getApp(), param.getStream(), callId, null);
+ });
+ }
+ }
+ } else {
+ zlmMediaListManager.sendStreamEvent(param.getApp(), param.getStream(), param.getMediaServerId());
+ }
- JSONObject json = (JSONObject) JSON.toJSON(param);
- taskExecutor.execute(()-> {
- ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
- if (subscribe != null) {
- MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
- if (mediaInfo != null) {
- subscribe.response(mediaInfo, json);
- }
- }
- // 娴佹秷澶辩Щ闄edis play
- List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
- if (param.isRegist()) {
- if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
- || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
- || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
+ HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
+ if (!"rtp".equals(param.getApp())) {
+ result.setEnable_audio(true);
+ }
- StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
- if (streamAuthorityInfo == null) {
- streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
- } else {
- streamAuthorityInfo.setOriginType(param.getOriginType());
- streamAuthorityInfo.setOriginTypeStr(param.getOriginTypeStr());
- }
- redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
- }
- } else {
- redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream());
- }
- });
+ taskExecutor.execute(() -> {
+ ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
+ if (subscribe != null) {
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ } else {
+ new HookResultForOnPublish(1, "zlm not register");
+ }
+ }
+ });
+
+ if ("rtp".equals(param.getApp())) {
+ result.setEnable_mp4(userSetting.getRecordSip());
+ } else {
+ result.setEnable_mp4(userSetting.isRecordPushLive());
+ }
+ List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, param.getStream());
+ if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
+ String deviceId = ssrcTransactionForAll.get(0).getDeviceId();
+ String channelId = ssrcTransactionForAll.get(0).getChannelId();
+ DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
+ if (deviceChannel != null) {
+ result.setEnable_audio(deviceChannel.isHasAudio());
+ }
+ // 濡傛灉鏄綍鍍忎笅杞藉氨璁剧疆瑙嗛闂撮殧鍗佺
+ if (ssrcTransactionForAll.get(0).getType() == VideoStreamSessionManager.SessionType.download) {
+ result.setMp4_max_second(10);
+ result.setEnable_audio(true);
+ result.setEnable_mp4(true);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * rtsp/rtmp娴佹敞鍐屾垨娉ㄩ攢鏃惰Е鍙戞浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
+ public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {
+
+ if (param.isRegist()) {
+ logger.info("[ZLM HOOK] 娴佹敞鍐�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
+ } else {
+ logger.info("[ZLM HOOK] 娴佹敞閿�, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
+ }
+
+
+ JSONObject json = (JSONObject) JSON.toJSON(param);
+ taskExecutor.execute(() -> {
+ ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);
+ if (subscribe != null) {
+ MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
+ if (mediaInfo != null) {
+ subscribe.response(mediaInfo, json);
+ }
+ }
+ // 娴佹秷澶辩Щ闄edis play
+ List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
+ if (param.isRegist()) {
+ if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
+ || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
+ || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {
+
+ StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
+ if (streamAuthorityInfo == null) {
+ streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
+ } else {
+ streamAuthorityInfo.setOriginType(param.getOriginType());
+ streamAuthorityInfo.setOriginTypeStr(param.getOriginTypeStr());
+ }
+ redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
+ }
+ } else {
+ redisCatchStorage.removeStreamAuthorityInfo(param.getApp(), param.getStream());
+ }
if ("rtsp".equals(param.getSchema())){
logger.info("娴佸彉鍖栵細娉ㄥ唽->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());
@@ -465,72 +450,57 @@
GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());
if (gbStream != null) {
// eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);
- }
- zlmMediaListManager.removeMedia(param.getApp(), param.getStream());
- }
- if (type != null) {
- // 鍙戦�佹祦鍙樺寲redis娑堟伅
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("serverId", userSetting.getServerId());
- jsonObject.put("app", param.getApp());
- jsonObject.put("stream", param.getStream());
- jsonObject.put("register", param.isRegist());
- jsonObject.put("mediaServerId", param.getMediaServerId());
- redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
- }
- }
- }
- }
- if (!param.isRegist()) {
- List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());
- if (sendRtpItems.size() > 0) {
- for (SendRtpItem sendRtpItem : sendRtpItems) {
- if (sendRtpItem.getApp().equals(param.getApp())) {
- String platformId = sendRtpItem.getPlatformId();
- ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
- Device device = deviceService.getDevice(platformId);
+ }
+ zlmMediaListManager.removeMedia(param.getApp(), param.getStream());
+ }
+ if (type != null) {
+ // 鍙戦�佹祦鍙樺寲redis娑堟伅
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("serverId", userSetting.getServerId());
+ jsonObject.put("app", param.getApp());
+ jsonObject.put("stream", param.getStream());
+ jsonObject.put("register", param.isRegist());
+ jsonObject.put("mediaServerId", param.getMediaServerId());
+ redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
+ }
+ }
+ }
+ }
+ if (!param.isRegist()) {
+ List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());
+ if (sendRtpItems.size() > 0) {
+ for (SendRtpItem sendRtpItem : sendRtpItems) {
+ if (sendRtpItem.getApp().equals(param.getApp())) {
+ String platformId = sendRtpItem.getPlatformId();
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ Device device = deviceService.getDevice(platformId);
- try {
- if (platform != null) {
- commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
- }else {
- if (sendRtpItem.isOnlyAudio()) {
- AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
- if (audioBroadcastCatch != null) {
-// playService.stopAudioBroadcast(device.getDeviceId(), sendRtpItem.getChannelId());
- if ("talk".equals(param.getApp())) {
-// cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
- }else {
-// cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);
- }
- }
- }
+ try {
+ if (platform != null) {
+ commanderFroPlatform.streamByeCmd(platform, sendRtpItem);
+ } else {
+ cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());
+ }
+ } catch (SipException | InvalidArgumentException | ParseException |
+ SsrcTransactionNotFoundException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
+ }
+ }
+ }
+ }
+ }
+ }
+ });
+ return HookResult.SUCCESS();
+ }
-
- }
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
- }
- }
- }
- }
- }
- }
-
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("msg", "success");
- return ret;
- }
-
- /**
- * 娴佹棤浜鸿鐪嬫椂浜嬩欢锛岀敤鎴峰彲浠ラ�氳繃姝や簨浠堕�夋嫨鏄惁鍏抽棴鏃犱汉鐪嬬殑娴併��
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")
- public JSONObject onStreamNoneReader(@RequestBody OnStreamNoneReaderHookParam param){
+ /**
+ * 娴佹棤浜鸿鐪嬫椂浜嬩欢锛岀敤鎴峰彲浠ラ�氳繃姝や簨浠堕�夋嫨鏄惁鍏抽棴鏃犱汉鐪嬬殑娴併��
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")
+ public JSONObject onStreamNoneReader(@RequestBody OnStreamNoneReaderHookParam param) {
logger.info("[ZLM HOOK]娴佹棤浜鸿鐪嬶細{]->{}->{}/{}" + param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
JSONObject ret = new JSONObject();
@@ -571,215 +541,243 @@
}
}
- redisCatchStorage.stopPlay(streamInfoForPlayCatch);
- storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
- return ret;
- }
- // 褰曞儚鍥炴斁
- StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, param.getStream(), null);
- if (streamInfoForPlayBackCatch != null ) {
- if (streamInfoForPlayBackCatch.isPause()) {
- ret.put("close", false);
- }else {
- Device device = deviceService.getDevice(streamInfoForPlayBackCatch.getDeviceID());
- if (device != null) {
- try {
- cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(),
- streamInfoForPlayBackCatch.getStream(), null);
- } catch (InvalidArgumentException | ParseException | SipException |
- SsrcTransactionNotFoundException e) {
- logger.error("[鏃犱汉瑙傜湅]鍥炴斁锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
- }
- }
- redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),
- streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
- }
- return ret;
- }
- // 褰曞儚涓嬭浇
- StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, param.getStream(), null);
- // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
- if (streamInfoForDownload != null) {
- ret.put("close", false);
- return ret;
- }
- }else {
- // 闈炲浗鏍囨祦 鎺ㄦ祦/鎷夋祦浠ｇ悊
- // 鎷夋祦浠ｇ悊
- StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
- if (streamProxyItem != null ) {
- if (streamProxyItem.isEnable_remove_none_reader()) {
- // 鏃犱汉瑙傜湅鑷姩绉婚櫎
- ret.put("close", true);
- streamProxyService.del(param.getApp(), param.getStream());
- String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url();
- logger.info("[{}/{}]<-[{}] 鎷夋祦浠ｇ悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", param.getApp(), param.getStream(), url);
- }else if (streamProxyItem.isEnable_disable_none_reader()) {
- // 鏃犱汉瑙傜湅鍋滅敤
- ret.put("close", true);
- // 淇敼鏁版嵁
- streamProxyService.stop(param.getApp(), param.getStream());
- }else {
- // 鏃犱汉瑙傜湅涓嶅仛澶勭悊
- ret.put("close", false);
- }
- return ret;
- }
- // 鎺ㄦ祦鍏锋湁涓诲姩鎬э紝鏆傛椂涓嶅仛澶勭悊
+ redisCatchStorage.stopPlay(streamInfoForPlayCatch);
+ storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
+ return ret;
+ }
+ // 褰曞儚鍥炴斁
+ StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, param.getStream(), null);
+ if (streamInfoForPlayBackCatch != null) {
+ if (streamInfoForPlayBackCatch.isPause()) {
+ ret.put("close", false);
+ } else {
+ Device device = deviceService.getDevice(streamInfoForPlayBackCatch.getDeviceID());
+ if (device != null) {
+ try {
+ cmder.streamByeCmd(device, streamInfoForPlayBackCatch.getChannelId(),
+ streamInfoForPlayBackCatch.getStream(), null);
+ } catch (InvalidArgumentException | ParseException | SipException |
+ SsrcTransactionNotFoundException e) {
+ logger.error("[鏃犱汉瑙傜湅]鍥炴斁锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
+ }
+ }
+ redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),
+ streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
+ }
+ return ret;
+ }
+ // 褰曞儚涓嬭浇
+ StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, param.getStream(), null);
+ // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
+ if (streamInfoForDownload != null) {
+ ret.put("close", false);
+ return ret;
+ }
+ } else {
+ // 闈炲浗鏍囨祦 鎺ㄦ祦/鎷夋祦浠ｇ悊
+ // 鎷夋祦浠ｇ悊
+ StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
+ if (streamProxyItem != null) {
+ if (streamProxyItem.isEnable_remove_none_reader()) {
+ // 鏃犱汉瑙傜湅鑷姩绉婚櫎
+ ret.put("close", true);
+ streamProxyService.del(param.getApp(), param.getStream());
+ String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrc_url();
+ logger.info("[{}/{}]<-[{}] 鎷夋祦浠ｇ悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", param.getApp(), param.getStream(), url);
+ } else if (streamProxyItem.isEnable_disable_none_reader()) {
+ // 鏃犱汉瑙傜湅鍋滅敤
+ ret.put("close", true);
+ // 淇敼鏁版嵁
+ streamProxyService.stop(param.getApp(), param.getStream());
+ } else {
+ // 鏃犱汉瑙傜湅涓嶅仛澶勭悊
+ ret.put("close", false);
+ }
+ return ret;
+ }
+ // 鎺ㄦ祦鍏锋湁涓诲姩鎬э紝鏆傛椂涓嶅仛澶勭悊
// StreamPushItem streamPushItem = streamPushService.getPush(app, streamId);
// if (streamPushItem != null) {
// // TODO 鍙戦�佸仠姝�
//
// }
- }
- return ret;
- }
-
- /**
- * 娴佹湭鎵惧埌浜嬩欢锛岀敤鎴峰彲浠ュ湪姝や簨浠惰Е鍙戞椂锛岀珛鍗冲幓鎷夋祦锛岃繖鏍峰彲浠ュ疄鐜版寜闇�鎷夋祦锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
- public JSONObject onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param){
- logger.info("[ZLM HOOK] 娴佹湭鎵惧埌锛歿}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- taskExecutor.execute(()->{
- MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
- if (userSetting.isAutoApplyPlay() && mediaInfo != null) {
- if ("rtp".equals(param.getApp())) {
- if (mediaInfo.isRtpEnable()) {
- String[] s = param.getStream().split("_");
- if (s.length == 2) {
- String deviceId = s[0];
- String channelId = s[1];
- Device device = redisCatchStorage.getDevice(deviceId);
- if (device != null) {
- playService.play(mediaInfo,deviceId, channelId, null, null, null);
- }
- }
- }
- }else {
- // 鎷夋祦浠ｇ悊
- StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
- if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {
- streamProxyService.start(param.getApp(), param.getStream());
- }
- }
- }
- });
+ }
+ return ret;
+ }
+ /**
+ * 娴佹湭鎵惧埌浜嬩欢锛岀敤鎴峰彲浠ュ湪姝や簨浠惰Е鍙戞椂锛岀珛鍗冲幓鎷夋祦锛岃繖鏍峰彲浠ュ疄鐜版寜闇�鎷夋祦锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
+ public DeferredResult<HookResult> onStreamNotFound(@RequestBody OnStreamNotFoundHookParam param) {
+ logger.info("[ZLM HOOK] 娴佹湭鎵惧埌锛歿}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("msg", "success");
- return ret;
- }
-
- /**
- * 鏈嶅姟鍣ㄥ惎鍔ㄤ簨浠讹紝鍙互鐢ㄤ簬鐩戝惉鏈嶅姟鍣ㄥ穿婧冮噸鍚紱姝や簨浠跺鍥炲涓嶆晱鎰熴��
- *
- */
- @ResponseBody
- @PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
- public JSONObject onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){
+ DeferredResult<HookResult> defaultResult = new DeferredResult<>();
- jsonObject.put("ip", request.getRemoteAddr());
- ZLMServerConfig zlmServerConfig = JSON.to(ZLMServerConfig.class, jsonObject);
- zlmServerConfig.setIp(request.getRemoteAddr());
- logger.info("[ZLM HOOK] zlm 鍚姩 " + zlmServerConfig.getGeneralMediaServerId());
- taskExecutor.execute(()->{
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
- if (subscribes != null && subscribes.size() > 0) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, jsonObject);
- }
- }
- mediaServerService.zlmServerOnline(zlmServerConfig);
- });
+ MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
+ if (!userSetting.isAutoApplyPlay() || mediaInfo == null) {
+ defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
+ return defaultResult;
+ }
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("msg", "success");
- return ret;
- }
+ if ("rtp".equals(param.getApp())) {
+ String[] s = param.getStream().split("_");
+ if (!mediaInfo.isRtpEnable() || s.length != 2) {
+ defaultResult.setResult(HookResult.SUCCESS());
+ return defaultResult;
+ }
+ String deviceId = s[0];
+ String channelId = s[1];
+ Device device = redisCatchStorage.getDevice(deviceId);
+ if (device == null) {
+ defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
+ return defaultResult;
+ }
+ DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
+ if (deviceChannel == null) {
+ defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
+ return defaultResult;
+ }
+ logger.info("[ZLM HOOK] 娴佹湭鎵惧埌, 鍙戣捣鑷姩鐐规挱锛歿}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
+ RequestMessage msg = new RequestMessage();
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
+ boolean exist = resultHolder.exist(key, null);
+ msg.setKey(key);
+ String uuid = UUID.randomUUID().toString();
+ msg.setId(uuid);
+ DeferredResult<HookResult> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
+ DeferredResultEx<HookResult> deferredResultEx = new DeferredResultEx<>(result);
- /**
- * 鍙戦�乺tp(startSendRtp)琚姩鍏抽棴鏃跺洖璋�
- */
- @ResponseBody
- @PostMapping(value = "/on_send_rtp_stopped", produces = "application/json;charset=UTF-8")
- public JSONObject onSendRtpStopped(HttpServletRequest request, @RequestBody OnSendRtpStoppedHookParam param){
+ result.onTimeout(() -> {
+ logger.info("鐐规挱鎺ュ彛绛夊緟瓒呮椂");
+ // 閲婃斁rtpserver
+ msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "鐐规挱瓒呮椂"));
+ resultHolder.invokeResult(msg);
+ });
+ // TODO 鍦ㄧ偣鎾湭鎴愬姛鐨勬儏鍐典笅鍦ㄦ璋冪敤鎺ュ彛鐐规挱浼氬鑷磋繑鍥炵殑娴佸湴鍧�ip閿欒
+ deferredResultEx.setFilter(result1 -> {
+ WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>) result1;
+ HookResult resultForEnd = new HookResult();
+ resultForEnd.setCode(wvpResult1.getCode());
+ resultForEnd.setMsg(wvpResult1.getMsg());
+ return resultForEnd;
+ });
- logger.info("[ZLM HOOK] rtp鍙戦�佸叧闂細{}->{}/{}", param.getMediaServerId(), param.getApp(), param.getStream());
+ // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+ resultHolder.put(key, uuid, deferredResultEx);
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("msg", "success");
+ if (!exist) {
+ playService.play(mediaInfo, deviceId, channelId, null, eventResult -> {
+ msg.setData(new HookResult(eventResult.statusCode, eventResult.msg));
+ resultHolder.invokeResult(msg);
+ }, null);
+ }
+ return result;
+ } else {
+ // 鎷夋祦浠ｇ悊
+ StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
+ if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {
+ streamProxyService.start(param.getApp(), param.getStream());
+ }
+ DeferredResult<HookResult> result = new DeferredResult<>();
+ result.setResult(HookResult.SUCCESS());
+ return result;
+ }
+ }
- // 鏌ユ壘瀵瑰簲鐨勪笂绾ф帹娴侊紝鍙戦�佸仠姝�
- if (!"rtp".equals(param.getApp())) {
- return ret;
- }
- taskExecutor.execute(()->{
- List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());
- if (sendRtpItems.size() > 0) {
- for (SendRtpItem sendRtpItem : sendRtpItems) {
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
- try {
- commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
- }
- redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),
- sendRtpItem.getCallId(), sendRtpItem.getStreamId());
- }
- }
- });
+ /**
+ * 鏈嶅姟鍣ㄥ惎鍔ㄤ簨浠讹紝鍙互鐢ㄤ簬鐩戝惉鏈嶅姟鍣ㄥ穿婧冮噸鍚紱姝や簨浠跺鍥炲涓嶆晱鎰熴��
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
+ public HookResult onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject) {
+ jsonObject.put("ip", request.getRemoteAddr());
+ ZLMServerConfig zlmServerConfig = JSON.to(ZLMServerConfig.class, jsonObject);
+ zlmServerConfig.setIp(request.getRemoteAddr());
+ logger.info("[ZLM HOOK] zlm 鍚姩 " + zlmServerConfig.getGeneralMediaServerId());
+ taskExecutor.execute(() -> {
+ List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);
+ if (subscribes != null && subscribes.size() > 0) {
+ for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
+ subscribe.response(null, jsonObject);
+ }
+ }
+ mediaServerService.zlmServerOnline(zlmServerConfig);
+ });
- return ret;
- }
+ return HookResult.SUCCESS();
+ }
- /**
- * rtpServer鏀舵祦瓒呮椂
- */
- @ResponseBody
- @PostMapping(value = "/on_rtp_server_timeout", produces = "application/json;charset=UTF-8")
- public JSONObject onRtpServerTimeout(HttpServletRequest request, @RequestBody OnRtpServerTimeoutHookParam param){
- logger.info("[ZLM HOOK] rtpServer rtp瓒呮椂锛歿}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());
+ /**
+ * 鍙戦�乺tp(startSendRtp)琚姩鍏抽棴鏃跺洖璋�
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_send_rtp_stopped", produces = "application/json;charset=UTF-8")
+ public HookResult onSendRtpStopped(HttpServletRequest request, @RequestBody OnSendRtpStoppedHookParam param) {
- JSONObject ret = new JSONObject();
- ret.put("code", 0);
- ret.put("msg", "success");
+ logger.info("[ZLM HOOK] rtp鍙戦�佸叧闂細{}->{}/{}", param.getMediaServerId(), param.getApp(), param.getStream());
- taskExecutor.execute(()->{
- JSONObject json = (JSONObject) JSON.toJSON(param);
- List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
- if (subscribes != null && subscribes.size() > 0) {
- for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
- subscribe.response(null, json);
- }
- }
- });
+ // 鏌ユ壘瀵瑰簲鐨勪笂绾ф帹娴侊紝鍙戦�佸仠姝�
+ if (!"rtp".equals(param.getApp())) {
+ return HookResult.SUCCESS();
+ }
+ taskExecutor.execute(() -> {
+ List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(param.getStream());
+ if (sendRtpItems.size() > 0) {
+ for (SendRtpItem sendRtpItem : sendRtpItems) {
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());
+ try {
+ commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍙戦�丅YE: {}", e.getMessage());
+ }
+ redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),
+ sendRtpItem.getCallId(), sendRtpItem.getStreamId());
+ }
+ }
+ });
- return ret;
- }
+ return HookResult.SUCCESS();
+ }
- private Map<String, String> urlParamToMap(String params) {
- HashMap<String, String> map = new HashMap<>();
- if (ObjectUtils.isEmpty(params)) {
- return map;
- }
- String[] paramsArray = params.split("&");
- if (paramsArray.length == 0) {
- return map;
- }
- for (String param : paramsArray) {
- String[] paramArray = param.split("=");
- if (paramArray.length == 2){
- map.put(paramArray[0], paramArray[1]);
- }
- }
- return map;
- }
+ /**
+ * rtpServer鏀舵祦瓒呮椂
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_rtp_server_timeout", produces = "application/json;charset=UTF-8")
+ public HookResult onRtpServerTimeout(HttpServletRequest request, @RequestBody OnRtpServerTimeoutHookParam param) {
+ logger.info("[ZLM HOOK] rtpServer鏀舵祦瓒呮椂锛歿}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());
+
+ taskExecutor.execute(() -> {
+ JSONObject json = (JSONObject) JSON.toJSON(param);
+ List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);
+ if (subscribes != null && subscribes.size() > 0) {
+ for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {
+ subscribe.response(null, json);
+ }
+ }
+ });
+
+ return HookResult.SUCCESS();
+ }
+
+ private Map<String, String> urlParamToMap(String params) {
+ HashMap<String, String> map = new HashMap<>();
+ if (ObjectUtils.isEmpty(params)) {
+ return map;
+ }
+ String[] paramsArray = params.split("&");
+ if (paramsArray.length == 0) {
+ return map;
+ }
+ for (String param : paramsArray) {
+ String[] paramArray = param.split("=");
+ if (paramArray.length == 2) {
+ map.put(paramArray[0], paramArray[1]);
+ }
+ }
+ return map;
+ }
}
--
Gitblit v1.8.0