[feat]Gateway and client status management

shenyu-admin/src/main/java/org/apache/shenyu/admin/config/ClusterConfiguration.java

@@ -23,6 +23,7 @@
 import org.apache.shenyu.admin.mode.cluster.filter.ClusterForwardFilter;
 import org.apache.shenyu.admin.mode.cluster.service.ClusterSelectMasterService;
 import org.apache.shenyu.admin.mode.cluster.service.ShenyuClusterService;
+import org.apache.shenyu.admin.service.impl.InstanceCheckService;
 import org.apache.shenyu.admin.service.impl.UpstreamCheckService;
 import org.apache.shenyu.admin.service.manager.LoadServiceDocEntry;
 import org.slf4j.Logger;
@@ -50,6 +51,7 @@ public class ClusterConfiguration {
      *
      * @param shenyuClusterSelectMasterService shenyu cluster select master service
      * @param upstreamCheckService upstream check service
+     * @param instanceCheckService instance check service
      * @param loadServiceDocEntry load service doc entry
      * @param clusterProperties cluster properties
      * @return Shenyu cluster service
@@ -58,11 +60,13 @@ public class ClusterConfiguration {
     @ConditionalOnMissingBean
     public ShenyuRunningModeService shenyuRunningModeService(final ClusterSelectMasterService shenyuClusterSelectMasterService,
                                                              final UpstreamCheckService upstreamCheckService,
+                                                             final InstanceCheckService instanceCheckService,
                                                              final LoadServiceDocEntry loadServiceDocEntry,
                                                              final ClusterProperties clusterProperties) {
         LOGGER.info("starting in cluster mode ...");
         return new ShenyuClusterService(shenyuClusterSelectMasterService,
                 upstreamCheckService,
+                instanceCheckService,
                 loadServiceDocEntry,
                 clusterProperties
         );

shenyu-admin/src/main/java/org/apache/shenyu/admin/config/ShenyuAdminConfiguration.java

@@ -19,6 +19,8 @@
 
 import org.apache.shenyu.admin.service.converter.SelectorHandleConverter;
 import org.apache.shenyu.admin.service.converter.SelectorHandleConverterFactor;
+import org.apache.shenyu.admin.service.publish.InstanceInfoReportEventPublisher;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -62,4 +64,9 @@ public LocaleResolver localeResolver() {
         localeResolver.setSupportedLocales(Stream.of(Locale.US, Locale.SIMPLIFIED_CHINESE).collect(Collectors.toList()));
         return localeResolver;
     }
+
+    @Bean
+    public InstanceInfoReportEventPublisher instanceInfoReportEventPublisher(final ApplicationEventPublisher publisher) {
+        return new InstanceInfoReportEventPublisher(publisher);
+    }
 }

shenyu-admin/src/main/java/org/apache/shenyu/admin/config/StandaloneConfiguration.java

@@ -19,6 +19,7 @@
 
 import org.apache.shenyu.admin.mode.ShenyuRunningModeService;
 import org.apache.shenyu.admin.mode.standalone.ShenyuStandaloneService;
+import org.apache.shenyu.admin.service.impl.InstanceCheckService;
 import org.apache.shenyu.admin.service.impl.UpstreamCheckService;
 import org.apache.shenyu.admin.service.manager.LoadServiceDocEntry;
 import org.slf4j.Logger;
@@ -40,18 +41,21 @@ public class StandaloneConfiguration {
      * Shenyu running mode standalone service.
      *
      * @param upstreamCheckService upstream check service
+     * @param instanceCheckService instance check service
      * @param loadServiceDocEntry load service doc entry
      * @return Shenyu standalone service
      */
     @Bean(destroyMethod = "shutdown")
     @ConditionalOnProperty(value = {"shenyu.cluster.enabled"}, havingValue = "false", matchIfMissing = true)
     @ConditionalOnMissingBean
     public ShenyuRunningModeService shenyuRunningModeService(final UpstreamCheckService upstreamCheckService,
+                                                             final InstanceCheckService instanceCheckService,
                                                              final LoadServiceDocEntry loadServiceDocEntry) {
         LOGGER.info("starting in standalone mode ...");
         return new ShenyuStandaloneService(
                 upstreamCheckService,
-                loadServiceDocEntry
+                loadServiceDocEntry,
+                instanceCheckService
         );
     }
 

shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/InstanceController.java

@@ -17,8 +17,10 @@
 
 package org.apache.shenyu.admin.controller;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import org.apache.shenyu.admin.aspect.annotation.RestApi;
+import org.apache.shenyu.register.common.dto.InstanceBeatInfoDTO;
 import org.apache.shenyu.admin.model.page.CommonPager;
 import org.apache.shenyu.admin.model.page.PageParameter;
 import org.apache.shenyu.admin.model.query.InstanceQuery;
@@ -27,10 +29,13 @@
 import org.apache.shenyu.admin.model.vo.InstanceInfoVO;
 import org.apache.shenyu.admin.service.InstanceInfoService;
 import org.apache.shenyu.admin.service.PageService;
+import org.apache.shenyu.admin.service.impl.InstanceCheckService;
 import org.apache.shenyu.admin.utils.ShenyuResultMessage;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -41,8 +46,11 @@ public class InstanceController implements PagedController<InstanceQueryConditio
 
     private final InstanceInfoService instanceInfoService;
 
-    public InstanceController(final InstanceInfoService instanceInfoService) {
+    private final InstanceCheckService instanceCheckService;
+
+    public InstanceController(final InstanceInfoService instanceInfoService, final InstanceCheckService instanceCheckService) {
         this.instanceInfoService = instanceInfoService;
+        this.instanceCheckService = instanceCheckService;
     }
 
     /**
@@ -72,6 +80,13 @@ public ShenyuAdminResult queryPlugins(@RequestParam(name = "instanceType", requi
                     namespaceId
             )
         );
+        commonPager.getDataList().forEach(instanceInfoVO -> {
+            String instanceKey = instanceCheckService.getInstanceKey(instanceInfoVO);
+            InstanceInfoVO instanceHealthBeatInfo = instanceCheckService.getInstanceHealthBeatInfo(instanceKey);
+            instanceInfoVO.setLastHeartBeatTime(instanceHealthBeatInfo.getLastHeartBeatTime());
+            instanceInfoVO.setInstanceState(instanceHealthBeatInfo.getInstanceState());
+            instanceInfoVO.setDateUpdated(instanceHealthBeatInfo.getDateUpdated());
+        });
         return ShenyuAdminResult.success(ShenyuResultMessage.QUERY_SUCCESS, commonPager);
     }
 
@@ -88,6 +103,33 @@ public ShenyuAdminResult detailInstanceInfo(@PathVariable("id") final String id)
         return ShenyuAdminResult.success(ShenyuResultMessage.DETAIL_SUCCESS, instanceInfoVO);
     }
 
+    /**
+     * receive beat.
+     *
+     * @param instanceBeatInfoDTO instanceBeatInfoDTO.
+     * @return {@linkplain ShenyuAdminResult}
+     */
+    @PostMapping("/beat")
+    public String beat(@Valid @RequestBody final InstanceBeatInfoDTO instanceBeatInfoDTO) {
+        //todo:admin集群模式下，请求转发给master节点
+        instanceCheckService.handleBeatInfo(instanceBeatInfoDTO);
+        return ShenyuResultMessage.SUCCESS;
+    }
+
+    /**
+     * visual instance info.
+     *
+     * @param namespaceId namespace id.
+     * @return {@linkplain ShenyuAdminResult}
+     */
+    @GetMapping("/analysis/{namespaceId}")
+    public ShenyuAdminResult getInstanceDataVisual(@PathVariable("namespaceId") final String namespaceId) {
+        return ShenyuAdminResult.success(ShenyuResultMessage.QUERY_SUCCESS, instanceCheckService.getInstanceDataVisual(namespaceId));
+    }
+
+
+
+
 
     @Override
     public PageService<InstanceQueryCondition, InstanceInfoVO> pageService() {

shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/URIRegisterExecutorSubscriber.java

@@ -95,7 +95,7 @@ public void executor(final Collection<URIRegisterDTO> dataList) {
                                 heartbeat.stream().map(URIRegisterDTO::getNamespaceId)
                                         .filter(StringUtils::isNotBlank)
                                         .findFirst()
-                                        .ifPresent(namespaceId -> service.heartbeat(selectorName, register, namespaceId));
+                                        .ifPresent(namespaceId -> service.heartbeat(selectorName, heartbeat, namespaceId));
                             }
                             if (CollectionUtils.isNotEmpty(offline)) {
                                 offline.stream().map(URIRegisterDTO::getNamespaceId)

shenyu-admin/src/main/java/org/apache/shenyu/admin/mode/cluster/service/ShenyuClusterService.java

@@ -19,6 +19,7 @@
 
 import org.apache.shenyu.admin.config.properties.ClusterProperties;
 import org.apache.shenyu.admin.mode.ShenyuRunningModeService;
+import org.apache.shenyu.admin.service.impl.InstanceCheckService;
 import org.apache.shenyu.admin.service.impl.UpstreamCheckService;
 import org.apache.shenyu.admin.service.manager.LoadServiceDocEntry;
 import org.apache.shenyu.common.concurrent.ShenyuThreadFactory;
@@ -43,9 +44,12 @@ public class ShenyuClusterService implements ShenyuRunningModeService {
     private final ScheduledExecutorService executorService;
 
     private final ClusterProperties clusterProperties;
+
+    private final InstanceCheckService instanceCheckService;
 
     public ShenyuClusterService(final ClusterSelectMasterService shenyuClusterSelectMasterService,
                                 final UpstreamCheckService upstreamCheckService,
+                                final InstanceCheckService instanceCheckService,
                                 final LoadServiceDocEntry loadServiceDocEntry,
                                 final ClusterProperties clusterProperties) {
         this.shenyuClusterSelectMasterService = shenyuClusterSelectMasterService;
@@ -54,6 +58,7 @@ public ShenyuClusterService(final ClusterSelectMasterService shenyuClusterSelect
         this.clusterProperties = clusterProperties;
         this.executorService = new ScheduledThreadPoolExecutor(1,
                 ShenyuThreadFactory.create("master-selector", true));
+        this.instanceCheckService = instanceCheckService;
     }
 
     /**
@@ -85,7 +90,8 @@ private void doSelectMaster(final String host, final String port, final String c
 
             // start upstream check task
             upstreamCheckService.setup();
-
+
+            instanceCheckService.setup();
             // load api
             loadServiceDocEntry.loadApiDocument();
 
@@ -106,6 +112,7 @@ private void doSelectMaster(final String host, final String port, final String c
             LOG.error("select master error", e);
             // close the upstream check service
             upstreamCheckService.close();
+            instanceCheckService.close();
 
             String message = String.format("renew master fail, %s", e.getMessage());
             throw new ShenyuException(message);

shenyu-admin/src/main/java/org/apache/shenyu/admin/mode/standalone/ShenyuStandaloneService.java

@@ -18,6 +18,7 @@
 package org.apache.shenyu.admin.mode.standalone;
 
 import org.apache.shenyu.admin.mode.ShenyuRunningModeService;
+import org.apache.shenyu.admin.service.impl.InstanceCheckService;
 import org.apache.shenyu.admin.service.impl.UpstreamCheckService;
 import org.apache.shenyu.admin.service.manager.LoadServiceDocEntry;
 
@@ -26,23 +27,31 @@ public class ShenyuStandaloneService implements ShenyuRunningModeService {
     private final UpstreamCheckService upstreamCheckService;
 
     private final LoadServiceDocEntry loadServiceDocEntry;
+
+    private final InstanceCheckService instanceCheckService;
 
     public ShenyuStandaloneService(final UpstreamCheckService upstreamCheckService,
-                                   final LoadServiceDocEntry loadServiceDocEntry) {
+                                   final LoadServiceDocEntry loadServiceDocEntry,
+                                   final InstanceCheckService instanceCheckService) {
         this.upstreamCheckService = upstreamCheckService;
         this.loadServiceDocEntry = loadServiceDocEntry;
+        this.instanceCheckService = instanceCheckService;
     }
 
     @Override
     public void start(final String host, final int port, final String contextPath) {
         // start upstream check task
         upstreamCheckService.setup();
+
+        instanceCheckService.setup();
+
         // load api
         loadServiceDocEntry.loadApiDocument();
     }
 
     @Override
     public void shutdown() {
         upstreamCheckService.close();
+        instanceCheckService.close();
     }
 }

shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/InstanceInfoDO.java

@@ -17,7 +17,7 @@
 
 package org.apache.shenyu.admin.model.entity;
 
-import org.apache.shenyu.admin.model.dto.InstanceInfoDTO;
+import org.apache.shenyu.admin.model.vo.InstanceInfoVO;
 import org.apache.shenyu.common.utils.UUIDUtils;
 
 import java.sql.Timestamp;
@@ -39,6 +39,8 @@ public final class InstanceInfoDO extends BaseDO {
     private Integer instanceState;
 
     private String namespaceId;
+
+    private long lastHeartBeatTime;
 
     public InstanceInfoDO() {
 
@@ -99,27 +101,7 @@ public InstanceInfoDO(final String id, final Timestamp dateCreated, final Timest
         this.instanceInfo = instanceInfo;
         this.namespaceId = namespaceId;
     }
-
-    /**
-     * build InstanceInfoDO.
-     *
-     * @param instanceInfoDTO instanceInfoDTO
-     * @return InstanceInfoDO
-     */
-    public static InstanceInfoDO buildInstanceInfoDO(final InstanceInfoDTO instanceInfoDTO) {
-        Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-        return InstanceInfoDO.builder()
-                .id(UUIDUtils.getInstance().generateShortUuid())
-                .instanceIp(instanceInfoDTO.getInstanceIp())
-                .instancePort(instanceInfoDTO.getInstancePort())
-                .instanceType(instanceInfoDTO.getInstanceType())
-                .instanceInfo(instanceInfoDTO.getInstanceInfo())
-                .instanceState(instanceInfoDTO.getInstanceState())
-                .namespaceId(instanceInfoDTO.getNamespaceId())
-                .dateCreated(currentTime)
-                .dateUpdated(currentTime)
-                .build();
-    }
+
 
     /**
      * get instanceIp.
@@ -228,7 +210,25 @@ public String getNamespaceId() {
     public void setNamespaceId(final String namespaceId) {
         this.namespaceId = namespaceId;
     }
-
+
+    /**
+     * get lastHeartBeatTime.
+     *
+     * @return lastHeartBeatTime
+     */
+    public long getLastHeartBeatTime() {
+        return lastHeartBeatTime;
+    }
+
+    /**
+     * set lastHeartBeatTime.
+     *
+     * @param lastHeartBeatTime lastHeartBeatTime
+     */
+    public void setLastHeartBeatTime(final long lastHeartBeatTime) {
+        this.lastHeartBeatTime = lastHeartBeatTime;
+    }
+
     /**
      * builder.
      *
@@ -262,6 +262,27 @@ public boolean equals(final Object o) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), instanceIp, instancePort, instanceType, instanceInfo, instanceState, namespaceId);
     }
+
+    /**
+     * build InstanceInfoDO.
+     *
+     * @param instanceInfoVO instanceInfoVO
+     * @return InstanceInfoDO
+     */
+    public static InstanceInfoDO buildInstanceInfoDO(final InstanceInfoVO instanceInfoVO) {
+        Timestamp currentTime = new Timestamp(System.currentTimeMillis());
+        return InstanceInfoDO.builder()
+                .id(UUIDUtils.getInstance().generateShortUuid())
+                .instanceIp(instanceInfoVO.getInstanceIp())
+                .instancePort(instanceInfoVO.getInstancePort())
+                .instanceType(instanceInfoVO.getInstanceType())
+                .instanceInfo(instanceInfoVO.getInstanceInfo())
+                .instanceState(instanceInfoVO.getInstanceState())
+                .namespaceId(instanceInfoVO.getNamespaceId())
+                .dateCreated(currentTime)
+                .dateUpdated(currentTime)
+                .build();
+    }
 
     public static final class InstanceInfoDOBuilder {