fix: reload router functions when a plugin adds endpoints

ludomikula · ludomikula · commit 083110c33adb · 2023-11-24T20:03:52.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ client/.yarn/cache/*.zip
 server/node-service/.yarn/cache/*.zip
 .metadata/
 .DS_Store
+application-dev.yml
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfigurationSupport.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfigurationSupport.java
@@ -0,0 +1,17 @@
+package org.lowcoder.api.framework.configuration;
+
+import org.lowcoder.api.framework.plugin.endpoint.ReloadableRouterFunctionMapping;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.config.WebFluxConfigurationSupport;
+import org.springframework.web.reactive.function.server.support.RouterFunctionMapping;
+
+@Configuration
+public class CustomWebFluxConfigurationSupport extends WebFluxConfigurationSupport
+{
+	@Override
+	protected RouterFunctionMapping createRouterFunctionMapping() 
+	{
+		return new ReloadableRouterFunctionMapping();
+	}
+
+}
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/endpoint/PluginEndpointHandlerImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/endpoint/PluginEndpointHandlerImpl.java
@@ -21,24 +21,32 @@
 import org.lowcoder.plugin.api.data.EndpointRequest;
 import org.lowcoder.plugin.api.data.EndpointResponse;
 import org.lowcoder.sdk.exception.BaseException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.ResolvableType;
 import org.springframework.http.ResponseCookie;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.RequestPredicate;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.reactive.function.server.ServerResponse.BodyBuilder;
+import org.springframework.web.reactive.function.server.support.RouterFunctionMapping;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
 @Slf4j
+@RequiredArgsConstructor
 @Component
 public class PluginEndpointHandlerImpl implements PluginEndpointHandler
 {
 	private static final String PLUGINS_BASE_URL = "/plugins/";
 	private List<RouterFunction<ServerResponse>> routes = new ArrayList<>();
-
+	
+	private final ApplicationContext applicationContext;
+	private final RouterFunctionMapping routerFunctionMapping;
+	
 	@Override
 	public void registerEndpoints(String pluginUrlPrefix, List<PluginEndpoint> endpoints) 
 	{
@@ -57,7 +65,9 @@ public void registerEndpoints(String pluginUrlPrefix, List<PluginEndpoint> endpo
 						registerEndpointHandler(urlPrefix, endpoint, handler);
 					}
 				}
-			}			
+			}
+			
+			((ReloadableRouterFunctionMapping)routerFunctionMapping).reloadFunctionMappings();			
 		}
 	}
 	
@@ -74,8 +84,10 @@ private void registerEndpointHandler(String urlPrefix, PluginEndpoint endpoint,
 			if (checkHandlerMethod(handler))
 			{
 				
-				EndpointExtension endpointMeta = handler.getAnnotation(EndpointExtension.class);
-				routes.add(route(createRequestPredicate(urlPrefix, endpointMeta), req -> {
+				EndpointExtension endpointMeta = handler.getAnnotation(EndpointExtension.class);			
+				String endpointName = endpoint.getClass().getSimpleName() + "_" + handler.getName();
+				
+				RouterFunction<ServerResponse> routerFunction = route(createRequestPredicate(urlPrefix, endpointMeta), req -> {
 						Mono<ServerResponse> result = null;
 						try
 						{
@@ -87,8 +99,10 @@ private void registerEndpointHandler(String urlPrefix, PluginEndpoint endpoint,
 							throw new BaseException("Error running handler for [ " + endpointMeta.method() + ": " + endpointMeta.uri() + "] !");
 						}
 						return result; 
-					})
-				);
+				});				
+				routes.add(routerFunction);				
+				registerRouterFunctionMapping(endpointName, routerFunction);
+				
 				log.info("Registered endpoint: {} -> {}: {}", endpoint.getClass().getSimpleName(), endpointMeta.method(), urlPrefix + endpointMeta.uri());
 			}
 			else
@@ -98,6 +112,18 @@ private void registerEndpointHandler(String urlPrefix, PluginEndpoint endpoint,
 		}
 	}
 	
+	private void registerRouterFunctionMapping(String endpointName, RouterFunction<ServerResponse> routerFunction)
+	{
+		String beanName = "pluginEndpoint_" + endpointName + "_" + System.currentTimeMillis();
+		
+		((GenericApplicationContext)applicationContext).registerBean(beanName, RouterFunction.class, () -> {
+			return routerFunction;
+		});
+		
+		log.debug("Registering RouterFunction bean definition: {}", beanName);
+	}
+	
+	
 	private Mono<ServerResponse> createServerResponse(EndpointResponse pluginResponse)
 	{
 		/** Create response with given status **/
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/endpoint/ReloadableRouterFunctionMapping.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/endpoint/ReloadableRouterFunctionMapping.java
@@ -0,0 +1,20 @@
+package org.lowcoder.api.framework.plugin.endpoint;
+
+import org.springframework.web.reactive.function.server.RouterFunctions;
+import org.springframework.web.reactive.function.server.support.RouterFunctionMapping;
+
+
+public class ReloadableRouterFunctionMapping extends RouterFunctionMapping
+{
+	/**
+	 * Rescan application context for RouterFunction beans
+	 */
+	public void reloadFunctionMappings()
+	{
+		initRouterFunctions();
+		if (getRouterFunction() != null)
+		{
+			RouterFunctions.changeParser(getRouterFunction(), getPathPatternParser());
+		}
+	}
+}
