Merge branch 'wvp-28181-2.0'

648540858

2022-09-05 aa6bce35c710750b68d4e6c53095e9be4e1afd8d

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -22,9 +22,7 @@
import org.springframework.http.HttpStatus;

import org.springframework.http.ResponseEntity;

import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;

import org.springframework.util.ObjectUtils;

import org.springframework.util.StringUtils;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -81,7 +79,7 @@
    private ZLMMediaListManager zlmMediaListManager;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;

   private ZlmHttpHookSubscribe subscribe;



   @Autowired

   private UserSetting userSetting;

@@ -105,13 +103,13 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onServerKeepalive(@RequestBody JSONObject json){

   public JSONObject onServerKeepalive(@RequestBody JSONObject json){



      logger.info("[ ZLM HOOK ] on_server_keepalive API调用，参数：" + json.toString());

      String mediaServerId = json.getString("mediaServerId");

      List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);

      List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);

      if (subscribes != null  && subscribes.size() > 0) {

         for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {

         for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

            subscribe.response(null, json);

         }

      }

@@ -120,7 +118,8 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);



      return ret;

   }



   /**

@@ -129,16 +128,15 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_flow_report", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){

   public JSONObject onFlowReport(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_flow_report API调用，参数：" + json.toString());

      }

      String mediaServerId = json.getString("mediaServerId");

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -147,7 +145,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_http_access", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onHttpAccess(@RequestBody JSONObject json){

   public JSONObject onHttpAccess(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_http_access API 调用，参数：" + json.toString());

@@ -158,7 +156,7 @@
      ret.put("err", "");

      ret.put("path", "");

      ret.put("second", 600);

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -167,7 +165,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onPlay(@RequestBody OnPlayHookParam param){

   public JSONObject onPlay(@RequestBody OnPlayHookParam param){



      JSONObject json = (JSONObject)JSON.toJSON(param);



@@ -175,7 +173,7 @@
         logger.debug("[ ZLM HOOK ]on_play API调用，参数：" + JSON.toJSONString(param));

      }

      String mediaServerId = param.getMediaServerId();

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);

      ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);

      if (subscribe != null ) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

@@ -186,17 +184,16 @@
      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")))) {

         if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {

            ret.put("code", 401);

            ret.put("msg", "Unauthorized");

            return new ResponseEntity<>(ret.toString(),HttpStatus.OK);

            return ret;

         }

      }



      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -205,7 +202,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onPublish(@RequestBody OnPublishHookParam param) {

   public JSONObject onPublish(@RequestBody OnPublishHookParam param) {



      JSONObject json = (JSONObject) JSON.toJSON(param);



@@ -219,7 +216,7 @@
            logger.info("推流鉴权失败： 缺少不要参数：sign=md5(user表的pushKey)");

            ret.put("code", 401);

            ret.put("msg", "Unauthorized");

            return new ResponseEntity<>(ret.toString(), HttpStatus.OK);

            return ret;

         }

         Map<String, String> paramMap = urlParamToMap(param.getParams());

         String sign = paramMap.get("sign");

@@ -227,7 +224,7 @@
            logger.info("推流鉴权失败： 缺少不要参数：sign=md5(user表的pushKey)");

            ret.put("code", 401);

            ret.put("msg", "Unauthorized");

            return new ResponseEntity<>(ret.toString(), HttpStatus.OK);

            return ret;

         }

         // 推流自定义播放鉴权码

         String callId = paramMap.get("callId");

@@ -237,7 +234,7 @@
            logger.info("推流鉴权失败： sign 无权限: callId={}. sign={}", callId, sign);

            ret.put("code", 401);

            ret.put("msg", "Unauthorized");

            return new ResponseEntity<>(ret.toString(), HttpStatus.OK);

            return ret;

         }

         StreamAuthorityInfo streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);

         streamAuthorityInfo.setCallId(callId);

@@ -245,12 +242,11 @@
         // 鉴权通过

         redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);

         // 通知assist新的callId

         taskExecutor.execute(()->{

            if (mediaInfo != null && mediaInfo.getRecordAssistPort() > 0) {

         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());

      }

@@ -263,7 +259,7 @@
      }





      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);

      ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);

      if (subscribe != null) {

         if (mediaInfo != null) {

            subscribe.response(mediaInfo, json);

@@ -294,10 +290,7 @@


         }

      }







      return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);

      return ret;

   }





@@ -308,7 +301,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_record_mp4", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json){

   public JSONObject onRecordMp4(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_record_mp4 API调用，参数：" + json.toString());

@@ -317,7 +310,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   /**

    * 录制hls完成后通知事件；此事件对回复不敏感。

@@ -325,7 +318,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_record_ts", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onRecordTs(@RequestBody JSONObject json){

   public JSONObject onRecordTs(@RequestBody JSONObject json){



      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_record_ts API调用，参数：" + json.toString());

@@ -334,7 +327,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -343,7 +336,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_rtsp_realm", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onRtspRealm(@RequestBody JSONObject json){

   public JSONObject onRtspRealm(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_rtsp_realm API调用，参数：" + json.toString());

@@ -352,7 +345,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("realm", "");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   

@@ -362,7 +355,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_rtsp_auth", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onRtspAuth(@RequestBody JSONObject json){

   public JSONObject onRtspAuth(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_rtsp_auth API调用，参数：" + json.toString());

@@ -372,7 +365,7 @@
      ret.put("code", 0);

      ret.put("encrypted", false);

      ret.put("passwd", "test");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -381,13 +374,13 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_shell_login", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onShellLogin(@RequestBody JSONObject json){

   public JSONObject onShellLogin(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_shell_login API调用，参数：" + json.toString());

      }

      String mediaServerId = json.getString("mediaServerId");

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_shell_login, json);

      ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_shell_login, json);

      if (subscribe != null ) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

@@ -399,7 +392,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -408,12 +401,12 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){

   public JSONObject onStreamChanged(@RequestBody MediaItem item){



      logger.info("[ ZLM HOOK ]on_stream_changed API调用，参数：" + JSONObject.toJSONString(item));

      String mediaServerId = item.getMediaServerId();

      JSONObject json = (JSONObject) JSON.toJSON(item);

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);

      ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);

      if (subscribe != null ) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

@@ -478,8 +471,12 @@
               if (mediaServerItem != null){

                  if (regist) {

                     StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);

                     String callId = null;

                     if (streamAuthorityInfo != null) {

                        callId = streamAuthorityInfo.getCallId();

                     }

                     StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,

                           app, stream, tracks, streamAuthorityInfo.getCallId());

                           app, stream, tracks, callId);

                     item.setStreamInfo(streamInfoByAppAndStream);

                     redisCatchStorage.addStream(mediaServerItem, type, app, stream, item);

                     if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()

@@ -519,7 +516,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -528,7 +525,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){

   public JSONObject onStreamNoneReader(@RequestBody JSONObject json){



      logger.info("[ ZLM HOOK ]on_stream_none_reader API调用，参数：" + json.toString());

      String mediaServerId = json.getString("mediaServerId");

@@ -573,7 +570,7 @@
         if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {

            ret.put("close", false);

         }

         return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

         return ret;

      }else {

         StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);

         if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {

@@ -584,7 +581,7 @@
         }else {

            ret.put("close", false);

         }

         return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

         return ret;

      }

   }

   

@@ -594,7 +591,7 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onStreamNotFound(@RequestBody JSONObject json){

   public JSONObject onStreamNotFound(@RequestBody JSONObject json){

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_stream_not_found API调用，参数：" + json.toString());

      }

@@ -619,7 +616,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<>(ret.toString(),HttpStatus.OK);

      return ret;

   }

   

   /**

@@ -628,16 +625,16 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){

   public JSONObject onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_server_started API调用，参数：" + jsonObject.toString());

      }

      String remoteAddr = request.getRemoteAddr();

      jsonObject.put("ip", remoteAddr);

      List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);

      List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);

      if (subscribes != null  && subscribes.size() > 0) {

         for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {

         for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

            subscribe.response(null, jsonObject);

         }

      }

@@ -649,7 +646,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<>(ret.toString(),HttpStatus.OK);

      return ret;

   }



   private Map<String, String> urlParamToMap(String params) {