🔧 feat: handler处理，避免重复

lunasaw · Jan 1, 2024 · bd7bc0f · bd7bc0f
1 parent 9aaddae
commit bd7bc0f
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 46 deletions.
diff --git a/.../gbproxy/client/transmit/request/message/handler/control/DeviceControlMessageHandler.java b/.../gbproxy/client/transmit/request/message/handler/control/DeviceControlMessageHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -37,7 +38,7 @@ public DeviceControlMessageHandler(MessageProcessorClient messageProcessorClient
 
     @Override
     public String getRootType() {
-        return CONTROL;
+        return ClientMessageRequestProcessor.METHOD + CONTROL;
     }
 
     @Override

diff --git a/...gbproxy/client/transmit/request/message/handler/notify/BroadcastNotifyMessageHandler.java b/...gbproxy/client/transmit/request/message/handler/notify/BroadcastNotifyMessageHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.entity.DeviceSession;
@@ -36,7 +37,7 @@ public BroadcastNotifyMessageHandler(MessageProcessorClient messageProcessorClie
 
     @Override
     public String getRootType() {
-        return NOTIFY;
+        return ClientMessageRequestProcessor.METHOD + NOTIFY;
     }
 
     @Override

diff --git a/...gbproxy/client/transmit/request/message/handler/query/AlarmQueryMessageClientHandler.java b/...gbproxy/client/transmit/request/message/handler/query/AlarmQueryMessageClientHandler.java
@@ -3,6 +3,7 @@
 import javax.sip.RequestEvent;
 
 import io.github.lunasaw.gbproxy.client.transmit.cmd.ClientSendCmd;
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 import io.github.lunasaw.sip.common.entity.FromDevice;
@@ -39,7 +40,7 @@ public AlarmQueryMessageClientHandler(MessageProcessorClient messageProcessorCli
 
     @Override
     public String getRootType() {
-        return QUERY;
+        return ClientMessageRequestProcessor.METHOD + QUERY;
     }
 
     @Override

diff --git a/...proxy/client/transmit/request/message/handler/query/CatalogQueryMessageClientHandler.java b/...proxy/client/transmit/request/message/handler/query/CatalogQueryMessageClientHandler.java
@@ -3,6 +3,7 @@
 import javax.sip.RequestEvent;
 
 import io.github.lunasaw.gb28181.common.entity.response.DeviceResponse;
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 
 import lombok.Setter;
@@ -41,7 +42,7 @@ public CatalogQueryMessageClientHandler(MessageProcessorClient messageProcessorC
 
     @Override
     public String getRootType() {
-        return QUERY;
+        return ClientMessageRequestProcessor.METHOD + QUERY;
     }
 
 

diff --git a/...w/gbproxy/client/transmit/request/message/handler/query/ConfigDownloadMessageHandler.java b/...w/gbproxy/client/transmit/request/message/handler/query/ConfigDownloadMessageHandler.java
@@ -3,6 +3,7 @@
 import javax.sip.RequestEvent;
 
 import io.github.lunasaw.gbproxy.client.transmit.cmd.ClientSendCmd;
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.entity.ToDevice;
@@ -41,7 +42,7 @@ public ConfigDownloadMessageHandler(MessageProcessorClient messageProcessorClien
 
     @Override
     public String getRootType() {
-        return QUERY;
+        return ClientMessageRequestProcessor.METHOD + QUERY;
     }
 
 

diff --git a/...xy/client/transmit/request/message/handler/query/DeviceInfoQueryMessageClientHandler.java b/...xy/client/transmit/request/message/handler/query/DeviceInfoQueryMessageClientHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 
@@ -40,7 +41,7 @@ public DeviceInfoQueryMessageClientHandler(MessageProcessorClient messageProcess
 
     @Override
     public String getRootType() {
-        return QUERY;
+        return ClientMessageRequestProcessor.METHOD + QUERY;
     }
 
 

diff --git a/.../client/transmit/request/message/handler/query/DeviceStatusQueryMessageClientHandler.java b/.../client/transmit/request/message/handler/query/DeviceStatusQueryMessageClientHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 
 import org.springframework.stereotype.Component;
@@ -42,7 +43,7 @@ public DeviceStatusQueryMessageClientHandler(MessageProcessorClient messageProce
 
     @Override
     public String getRootType() {
-        return QUERY;
+        return ClientMessageRequestProcessor.METHOD + QUERY;
     }
 
 

diff --git a/...xy/client/transmit/request/message/handler/query/RecordInfoQueryMessageClientHandler.java b/...xy/client/transmit/request/message/handler/query/RecordInfoQueryMessageClientHandler.java
@@ -2,18 +2,18 @@
 
 import javax.sip.RequestEvent;
 
-import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 import org.springframework.stereotype.Component;
 
-import io.github.lunasaw.sip.common.entity.DeviceSession;
 import io.github.lunasaw.gb28181.common.entity.query.DeviceRecordQuery;
 import io.github.lunasaw.gb28181.common.entity.response.DeviceRecord;
 import io.github.lunasaw.gbproxy.client.transmit.cmd.ClientSendCmd;
+import io.github.lunasaw.gbproxy.client.transmit.request.message.ClientMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageClientHandlerAbstract;
 import io.github.lunasaw.gbproxy.client.transmit.request.message.MessageProcessorClient;
+import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
+import io.github.lunasaw.sip.common.entity.DeviceSession;
 import io.github.lunasaw.sip.common.entity.FromDevice;
 import io.github.lunasaw.sip.common.entity.ToDevice;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -36,10 +36,9 @@ public RecordInfoQueryMessageClientHandler(MessageProcessorClient messageProcess
         super(messageProcessorClient, sipUserGenerateClient);
     }
 
-
     @Override
     public String getRootType() {
-        return QUERY;
+        return ClientMessageRequestProcessor.METHOD + QUERY;
     }
 
     @Override

diff --git a/...hub/lunasaw/gbproxy/client/transmit/request/subscribe/SubscribeClientHandlerAbstract.java b/...hub/lunasaw/gbproxy/client/transmit/request/subscribe/SubscribeClientHandlerAbstract.java
@@ -6,8 +6,8 @@
 import org.springframework.stereotype.Component;
 
 import gov.nist.javax.sip.message.SIPRequest;
-import io.github.lunasaw.sip.common.entity.DeviceSession;
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
+import io.github.lunasaw.sip.common.entity.DeviceSession;
 import io.github.lunasaw.sip.common.transmit.event.message.MessageHandlerAbstract;
 import io.github.lunasaw.sip.common.utils.SipUtils;
 import lombok.Data;
@@ -32,7 +32,7 @@ public SubscribeClientHandlerAbstract(SubscribeProcessorClient subscribeProcesso
 
     @Override
     public String getRootType() {
-        return "Root";
+        return ClientSubscribeRequestProcessor.METHOD + "Root";
     }
 
     public DeviceSession getDeviceSession(RequestEvent event) {

diff --git a/...e/catalog/CatalogQueryMessageHandler.java → .../SubscribeCatalogQueryMessageHandler.java b/...e/catalog/CatalogQueryMessageHandler.java → .../SubscribeCatalogQueryMessageHandler.java
@@ -2,14 +2,14 @@
 
 import javax.sip.RequestEvent;
 import javax.sip.header.ContentTypeHeader;
+import javax.sip.header.EventHeader;
 import javax.sip.header.ExpiresHeader;
 import javax.sip.message.Response;
 
 import io.github.lunasaw.gbproxy.client.user.SipUserGenerateClient;
 import io.github.lunasaw.sip.common.entity.Device;
 import io.github.lunasaw.gb28181.common.entity.response.DeviceSubscribe;
 import io.github.lunasaw.sip.common.enums.ContentTypeEnum;
-import io.github.lunasaw.sip.common.service.SipUserGenerate;
 import io.github.lunasaw.sip.common.transmit.ResponseCmd;
 import io.github.lunasaw.sip.common.utils.SipRequestUtils;
 import org.springframework.stereotype.Component;
@@ -36,11 +36,11 @@
 @Slf4j
 @Getter
 @Setter
-public class CatalogQueryMessageHandler extends SubscribeClientHandlerAbstract {
+public class SubscribeCatalogQueryMessageHandler extends SubscribeClientHandlerAbstract {
 
     public static final String CMD_TYPE = CmdTypeEnum.CATALOG.getType();
 
-    public CatalogQueryMessageHandler(SubscribeProcessorClient subscribeProcessorClient, SipUserGenerateClient sipUserGenerate) {
+    public SubscribeCatalogQueryMessageHandler(SubscribeProcessorClient subscribeProcessorClient, SipUserGenerateClient sipUserGenerate) {
         super(subscribeProcessorClient, sipUserGenerate);
     }
 
@@ -53,6 +53,13 @@ public String getRootType() {
     @Override
     public void handForEvt(RequestEvent event) {
         DeviceSession deviceSession = getDeviceSession(event);
+
+        EventHeader header = (EventHeader) event.getRequest().getHeader(EventHeader.NAME);
+        if (header == null){
+            log.info("handForEvt::event = {}", event);
+            return;
+        }
+
         // 订阅消息过来
         String sipId = deviceSession.getSipId();
         String userId = deviceSession.getUserId();

diff --git a/.../io/github/lunasaw/gbproxy/server/transimit/request/message/BaseMessageServerHandler.java b/.../io/github/lunasaw/gbproxy/server/transimit/request/message/BaseMessageServerHandler.java
@@ -40,8 +40,5 @@ public String getCmdType() {
         return cmdType;
     }
 
-    @Override
-    public String getRootType() {
-        return super.getRootType();
-    }
+
 }
diff --git a/...ub/lunasaw/gbproxy/server/transimit/request/message/notify/AlarmNotifyMessageHandler.java b/...ub/lunasaw/gbproxy/server/transimit/request/message/notify/AlarmNotifyMessageHandler.java
@@ -3,6 +3,7 @@
 import javax.sip.RequestEvent;
 
 import io.github.lunasaw.gb28181.common.entity.notify.DeviceAlarmNotify;
+import io.github.lunasaw.gbproxy.server.transimit.request.message.ServerMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.server.user.SipUserGenerateServer;
 
 import org.springframework.stereotype.Component;
@@ -36,7 +37,7 @@ public AlarmNotifyMessageHandler(MessageProcessorServer messageProcessorServer,
 
     @Override
     public String getRootType() {
-        return NOTIFY;
+        return ServerMessageRequestProcessor.METHOD + NOTIFY;
     }
 
     @Override

diff --git a/...unasaw/gbproxy/server/transimit/request/message/notify/KeepaliveNotifyMessageHandler.java b/...unasaw/gbproxy/server/transimit/request/message/notify/KeepaliveNotifyMessageHandler.java
@@ -4,6 +4,7 @@
 import javax.sip.message.Response;
 
 import gov.nist.javax.sip.message.SIPRequest;
+import io.github.lunasaw.gbproxy.server.transimit.request.message.ServerMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.server.user.SipUserGenerateServer;
 import io.github.lunasaw.sip.common.entity.RemoteAddressInfo;
 import io.github.lunasaw.sip.common.entity.ToDevice;
@@ -39,7 +40,7 @@ public KeepaliveNotifyMessageHandler(MessageProcessorServer messageProcessorServ
 
     @Override
     public String getRootType() {
-        return NOTIFY;
+        return ServerMessageRequestProcessor.METHOD + NOTIFY;
     }
 
 

diff --git a/...asaw/gbproxy/server/transimit/request/message/notify/MediaStatusNotifyMessageHandler.java b/...asaw/gbproxy/server/transimit/request/message/notify/MediaStatusNotifyMessageHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.server.transimit.request.message.ServerMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.server.user.SipUserGenerateServer;
 
 import org.springframework.stereotype.Component;
@@ -36,7 +37,7 @@ public MediaStatusNotifyMessageHandler(MessageProcessorServer messageProcessorSe
 
     @Override
     public String getRootType() {
-        return NOTIFY;
+        return ServerMessageRequestProcessor.METHOD + NOTIFY;
     }
 
 

diff --git a/...w/gbproxy/server/transimit/request/message/notify/MobilePositionNotifyMessageHandler.java b/...w/gbproxy/server/transimit/request/message/notify/MobilePositionNotifyMessageHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.server.transimit.request.message.ServerMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.server.user.SipUserGenerateServer;
 import io.github.lunasaw.sip.common.entity.ToDevice;
 import io.github.lunasaw.sip.common.entity.DeviceSession;
@@ -36,7 +37,7 @@ public MobilePositionNotifyMessageHandler(MessageProcessorServer messageProcesso
 
     @Override
     public String getRootType() {
-        return NOTIFY;
+        return ServerMessageRequestProcessor.METHOD + NOTIFY;
     }
 
 

diff --git a/...b/lunasaw/gbproxy/server/transimit/request/message/response/RecordInfoMessageHandler.java b/...b/lunasaw/gbproxy/server/transimit/request/message/response/RecordInfoMessageHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.server.transimit.request.message.ServerMessageRequestProcessor;
 import io.github.lunasaw.sip.common.entity.DeviceSession;
 import org.springframework.stereotype.Component;
 
@@ -34,7 +35,7 @@ public RecordInfoMessageHandler(MessageProcessorServer messageProcessorServer, S
 
     @Override
     public String getRootType() {
-        return RESPONSE;
+        return ServerMessageRequestProcessor.METHOD + RESPONSE;
     }
 
     @Override

diff --git a/...asaw/gbproxy/server/transimit/request/message/response/ResponseCatalogMessageHandler.java b/...asaw/gbproxy/server/transimit/request/message/response/ResponseCatalogMessageHandler.java
@@ -2,6 +2,7 @@
 
 import javax.sip.RequestEvent;
 
+import io.github.lunasaw.gbproxy.server.transimit.request.message.ServerMessageRequestProcessor;
 import io.github.lunasaw.gbproxy.server.user.SipUserGenerateServer;
 import io.github.lunasaw.sip.common.entity.ToDevice;
 import io.github.lunasaw.sip.common.entity.DeviceSession;
@@ -55,6 +56,6 @@ public String getCmdType() {
 
     @Override
     public String getRootType() {
-        return RESPONSE;
+        return ServerMessageRequestProcessor.METHOD + RESPONSE;
     }
 }
diff --git a/.../github/lunasaw/gbproxy/server/transimit/request/notify/catalog/CatalogNotifyHandler.java b/.../github/lunasaw/gbproxy/server/transimit/request/notify/catalog/CatalogNotifyHandler.java
@@ -2,15 +2,12 @@
 
 import javax.sip.RequestEvent;
 
-import io.github.lunasaw.gbproxy.server.transimit.request.notify.NotifyProcessorServer;
-import io.github.lunasaw.gbproxy.server.user.SipUserGenerateServer;
-
 import org.springframework.stereotype.Component;
 
-import io.github.lunasaw.sip.common.entity.DeviceSession;
 import io.github.lunasaw.gb28181.common.entity.notify.DeviceOtherUpdateNotify;
-import io.github.lunasaw.gbproxy.server.transimit.request.message.MessageProcessorServer;
 import io.github.lunasaw.gbproxy.server.transimit.request.notify.NotifyServerHandlerAbstract;
+import io.github.lunasaw.gbproxy.server.transimit.request.notify.ServerNotifyRequestProcessor;
+import io.github.lunasaw.sip.common.entity.DeviceSession;
 import io.github.lunasaw.sip.common.entity.ToDevice;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,7 +25,6 @@ public class CatalogNotifyHandler extends NotifyServerHandlerAbstract {
 
     public static final String CMD_TYPE = "Catalog";
 
-
     @Override
     public void handForEvt(RequestEvent event) {
         DeviceSession deviceSession = getDeviceSession(event);
@@ -52,6 +48,6 @@ public String getCmdType() {
 
     @Override
     public String getRootType() {
-        return RESPONSE;
+        return ServerNotifyRequestProcessor.METHOD + RESPONSE;
     }
 }
diff --git a/sip-common/src/main/java/io/github/lunasaw/sip/common/entity/FromDevice.java b/sip-common/src/main/java/io/github/lunasaw/sip/common/entity/FromDevice.java
@@ -1,8 +1,7 @@
 package io.github.lunasaw.sip.common.entity;
 
 import io.github.lunasaw.sip.common.constant.Constant;
-import io.github.lunasaw.sip.common.enums.StreamModeEnum;
-import io.github.lunasaw.sip.common.enums.TransModeEnum;
+
 import io.github.lunasaw.sip.common.utils.SipRequestUtils;
 import lombok.Data;
 
@@ -31,8 +30,8 @@ public static FromDevice getInstance(String userId, String ip, int port) {
         fromDevice.setUserId(userId);
         fromDevice.setIp(ip);
         fromDevice.setPort(port);
-        fromDevice.setTransport(TransModeEnum.UDP.getType());
-        fromDevice.setStreamMode(StreamModeEnum.TCP_PASSIVE.getType());
+        fromDevice.setTransport("UDP");
+        fromDevice.setStreamMode("TCP_PASSIVE");
         fromDevice.setFromTag(SipRequestUtils.getNewFromTag());
         fromDevice.setAgent(Constant.AGENT);
         return fromDevice;