Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-08-07 e898c344aaa515b4fe16ae7ce3d979160d1e962b

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

@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.common.InviteInfo;

import com.genersoft.iot.vmp.common.InviteSessionType;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.common.VideoManagerConstants;

import com.genersoft.iot.vmp.conf.UserSetting;

import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;

import com.genersoft.iot.vmp.gb28181.bean.*;

@@ -24,14 +25,18 @@
import com.genersoft.iot.vmp.media.zlm.dto.hook.*;

import com.genersoft.iot.vmp.service.*;

import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.utils.DateUtil;

import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;

import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;

import com.genersoft.iot.vmp.vmanager.bean.StreamContent;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

import org.springframework.util.ObjectUtils;

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

@@ -124,6 +129,9 @@
    @Autowired

    private ThreadPoolTaskExecutor taskExecutor;



    @Autowired

    private RedisTemplate<Object, Object> redisTemplate;



    /**

     * 服务器定时上报时间，上报间隔可配置，默认10s上报一次

     */

@@ -192,7 +200,10 @@


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

        MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);



        if (mediaInfo == null) {

            return new HookResultForOnPublish(200, "success");

        }

        // 推流鉴权的处理

        if (!"rtp".equals(param.getApp())) {

            if (userSetting.getPushAuthority()) {

                // 推流鉴权

@@ -232,10 +243,7 @@




        HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();

        if (!"rtp".equals(param.getApp())) {

            result.setEnable_audio(true);

        }



        result.setEnable_audio(true);

        taskExecutor.execute(() -> {

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

            if (subscribe != null) {

@@ -247,10 +255,20 @@
            }

        });



        // 是否录像

        if ("rtp".equals(param.getApp())) {

            result.setEnable_mp4(userSetting.getRecordSip());

        } else {

            result.setEnable_mp4(userSetting.isRecordPushLive());

        }

        // 替换流地址

        if ("rtp".equals(param.getApp()) && !mediaInfo.isRtpEnable()) {

            String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));;

            InviteInfo inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);

            if (inviteInfo != null) {

                result.setStream_replace(inviteInfo.getStream());

                logger.info("[ZLM HOOK]推流鉴权 stream: {} 替换为 {}", param.getStream(), inviteInfo.getStream());

            }

        }

        List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, param.getStream());

        if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {

@@ -264,7 +282,6 @@
            // 如果是录像下载就设置视频间隔十秒

            if (ssrcTransactionForAll.get(0).getType() == InviteSessionType.DOWNLOAD) {

                result.setMp4_max_second(10);

                result.setEnable_audio(true);

                result.setEnable_mp4(true);

            }

            // 如果是talk对讲，则默认获取声音

@@ -291,6 +308,14 @@
                }

            }

        }

        if (param.getApp().equalsIgnoreCase("rtp")) {

            String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_" + param.getStream();

            OtherRtpSendInfo otherRtpSendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(receiveKey);

            if (otherRtpSendInfo != null) {

                result.setEnable_mp4(true);

            }

        }

        logger.info("[ZLM HOOK]推流鉴权 响应：{}->{}->>>>{}", param.getMediaServerId(), param, result);

        return result;

    }



@@ -522,8 +547,6 @@
        if ("rtp".equals(param.getApp())) {

            ret.put("close", userSetting.getStreamOnDemand());

            // 国标流， 点播/录像回放/录像下载

//            StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(param.getStream());



            InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());

            // 点播

            if (inviteInfo != null) {

@@ -559,6 +582,7 @@
                Device device = deviceService.getDevice(inviteInfo.getDeviceId());

                if (device != null) {

                    try {

                        // 多查询一次防止已经被处理了

                        InviteInfo info = inviteStreamService.getInviteInfo(inviteInfo.getType(),

                                inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream());

                        if (info != null) {

@@ -577,7 +601,7 @@
                return ret;

            }

            SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, param.getStream(), null);

            if ("talk".equals(sendRtpItem.getApp())) {

            if (sendRtpItem != null && "talk".equals(sendRtpItem.getApp())) {

                ret.put("close", false);

                return ret;

            }

@@ -588,7 +612,7 @@
            // 拉流代理

            StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());

            if (streamProxyItem != null) {

                if (streamProxyItem.isEnableDisableNoneReader()) {

                if (streamProxyItem.isEnableRemoveNoneReader()) {

                    // 无人观看自动移除

                    ret.put("close", true);

                    streamProxyService.del(param.getApp(), param.getStream());

@@ -633,7 +657,7 @@


        if ("rtp".equals(param.getApp())) {

            String[] s = param.getStream().split("_");

            if (!mediaInfo.isRtpEnable() || s.length != 2) {

            if ((s.length != 2 && s.length != 4)) {

                defaultResult.setResult(HookResult.SUCCESS());

                return defaultResult;

            }

@@ -649,33 +673,78 @@
                defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));

                return defaultResult;

            }

            logger.info("[ZLM HOOK] 流未找到, 发起自动点播：{}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

            if (s.length == 2) {

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

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



            result.onTimeout(() -> {

                logger.info("[ZLM HOOK] 自动点播, 等待超时");

                // 释放rtpserver

                msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "点播超时"));

                resultHolder.invokeResult(msg);

            });



            // 录像查询以channelId作为deviceId查询

            resultHolder.put(key, uuid, result);



            if (!exist) {

                playService.play(mediaInfo, deviceId, channelId, (code, message, data) -> {

                    msg.setData(new HookResult(code, message));

                result.onTimeout(() -> {

                    logger.info("[ZLM HOOK] 预览流自动点播, 等待超时");

                    msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "点播超时"));

                    resultHolder.invokeResult(msg);

                });



                resultHolder.put(key, uuid, result);



                if (!exist) {

                    playService.play(mediaInfo, deviceId, channelId, null, (code, message, data) -> {

                        msg.setData(new HookResult(code, message));

                        resultHolder.invokeResult(msg);

                    });

                }

                return result;

            }else if(s.length == 4){

                // 此时为录像回放， 录像回放格式为> 设备ID_通道ID_开始时间_结束时间

                String startTimeStr = s[2];

                String endTimeStr = s[3];

                if (startTimeStr == null || endTimeStr == null || startTimeStr.length() != 14 || endTimeStr.length() != 14) {

                    defaultResult.setResult(HookResult.SUCCESS());

                    return defaultResult;

                }

                String startTime = DateUtil.urlToyyyy_MM_dd_HH_mm_ss(startTimeStr);

                String endTime = DateUtil.urlToyyyy_MM_dd_HH_mm_ss(endTimeStr);

                logger.info("[ZLM HOOK] 回放流未找到, 发起自动点播：{}->{}->{}/{}-{}-{}",

                        param.getMediaServerId(), param.getSchema(),

                        param.getApp(), param.getStream(),

                        startTime, endTime

                );

                RequestMessage msg = new RequestMessage();

                String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + 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());



                result.onTimeout(() -> {

                    logger.info("[ZLM HOOK] 回放流自动点播, 等待超时");

                    // 释放rtpserver

                    msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "点播超时"));

                    resultHolder.invokeResult(msg);

                });



                resultHolder.put(key, uuid, result);



                if (!exist) {

                    SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaInfo, param.getStream(), null,

                            device.isSsrcCheck(),  true, 0, false, false, device.getStreamModeForParam());

                    playService.playBack(mediaInfo, ssrcInfo, deviceId, channelId, startTime, endTime, (code, message, data) -> {

                        msg.setData(new HookResult(code, message));

                        resultHolder.invokeResult(msg);

                    });

                }

                return result;

            }else {

                defaultResult.setResult(HookResult.SUCCESS());

                return defaultResult;

            }

            return result;



        } else {

            // 拉流代理

            StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());