Add localeContextResolver using lang query param

Thomasr · ludomikula · commit 62b795bfb2a3 · 2025-01-13T09:02:16.000+01:00
Add error handler &amp; retry logic in flow endpoint
Add chinese locale file
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java
@@ -153,9 +153,12 @@ public enum BizError {
     BUNDLE_NAME_CONFLICT(500, 6403),
     ILLEGAL_BUNDLE_PERMISSION_ID(500, 6404),
 
-    //slug 6501 - 6501
+    //slug 6501 - 6502
     SLUG_DUPLICATE_ENTRY(403, 6501),
-    SLUG_INVALID(403, 6502);
+    SLUG_INVALID(403, 6502),
+
+    //flow 6601 - 6601
+    FLOW_ERROR(500, 6601);
 
     static {
         checkDuplicates(values(), BizError::getBizErrorCode);
diff --git a/server/api-service/lowcoder-sdk/src/main/resources/locale_en.properties b/server/api-service/lowcoder-sdk/src/main/resources/locale_en.properties
@@ -284,4 +284,5 @@ USER_NOT_EXIST=User not exist.
 DUPLICATE_AUTH_CONFIG_ADDITION=Provider auth type already added to organization
 EMAIL_PROVIDER_DISABLED=Email provider is disabled.
 SLUG_DUPLICATE_ENTRY=Slug already exists
-SLUG_INVALID=Slug format is invalid
+SLUG_INVALID=Slug format is invalid
+FLOW_ERROR=Flow error message: {0}
diff --git a/server/api-service/lowcoder-sdk/src/main/resources/locale_zh.properties b/server/api-service/lowcoder-sdk/src/main/resources/locale_zh.properties
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java
@@ -7,12 +7,19 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.i18n.LocaleContext;
+import org.springframework.context.i18n.SimpleLocaleContext;
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.reactive.config.DelegatingWebFluxConfiguration;
 import org.springframework.web.reactive.function.server.support.RouterFunctionMapping;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.i18n.LocaleContextResolver;
+
+import java.util.List;
+import java.util.Locale;
 
 @RequiredArgsConstructor
 @Configuration
@@ -43,4 +50,28 @@ protected void configureHttpMessageCodecs(ServerCodecConfigurer configurer) {
 				.jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper()));
 	}
 
+	@Bean
+	public LocaleContextResolver localeContextResolver() {
+		return new LocaleContextResolver() {
+			@Override
+			public LocaleContext resolveLocaleContext(ServerWebExchange exchange) {
+				List<String> language = exchange.getRequest().getQueryParams().getOrDefault("lang", List.of("en_US"));
+				String localeStr = language.get(0);
+				String[] parts = localeStr.split("_");
+				if(parts.length == 2) {
+					Locale locale = new Locale(parts[0], parts[1]);
+					return new SimpleLocaleContext(locale);
+				} else {
+					Locale locale = new Locale(parts[0]);
+					return new SimpleLocaleContext(locale);
+				}
+			}
+
+			@Override
+			public void setLocaleContext(ServerWebExchange exchange, LocaleContext localeContext) {
+				throw new UnsupportedOperationException("Cannot change HTTP accept header - use a different locale context resolution strategy");
+			}
+		};
+	}
+
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/GlobalContextFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/GlobalContextFilter.java
@@ -11,6 +11,7 @@
 import org.lowcoder.infra.util.NetworkUtils;
 import org.lowcoder.sdk.util.CookieHelper;
 import org.lowcoder.sdk.util.UriUtils;
+import org.springframework.context.i18n.LocaleContext;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -20,6 +21,7 @@
 import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -98,7 +100,10 @@ private Map<String, Object> buildContextMap(ServerWebExchange serverWebExchange,
         contextMap.put(REQUEST_PATH, request.getPath().pathWithinApplication().value());
         contextMap.put(REQUEST, request);
         contextMap.put(REQUEST_METHOD, ofNullable(request.getMethod()).map(HttpMethod::name).orElse(""));
-        contextMap.put(CLIENT_LOCALE, globalContextService.getClientLocale(request));
+
+        LocaleContext localeContext = serverWebExchange.getLocaleContext();
+        Locale currentLocale = localeContext.getLocale() != null ? localeContext.getLocale() : Locale.ENGLISH;
+        contextMap.put(CLIENT_LOCALE, currentLocale);
         contextMap.put(CURRENT_ORG_MEMBER, orgMemberService.getCurrentOrgMember(visitorId).cache());
         contextMap.put(VISITOR_TOKEN, cookieHelper.getCookieToken(serverWebExchange));
         contextMap.put(DOMAIN, UriUtils.getRefererDomainFromRequest(serverWebExchange));
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/ApiFlowController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/ApiFlowController.java
@@ -4,16 +4,24 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.lowcoder.api.authentication.request.AuthException;
+import org.lowcoder.sdk.exception.BizError;
+import org.lowcoder.sdk.exception.BizException;
 import org.lowcoder.sdk.util.JsonUtils;
 import org.lowcoder.sdk.webclient.WebClientBuildHelper;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver;
 import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import static org.lowcoder.api.authentication.util.AuthenticationUtils.mapToAuthToken;
@@ -38,7 +46,11 @@ public Mono<String> flow(FlowRequest flowRequest) {
                     .body(BodyInserters.fromValue(jsonBody))
                     .headers(httpHeaders -> flowRequest.headers().forEach(httpHeaders::add))
                     .retrieve()
-                    .bodyToMono(String.class);
+                    .bodyToMono(String.class)
+                    .onErrorResume(Mono::error)
+                    .retryWhen(Retry.backoff(Objects.requireNonNullElse(flowRequest.retries(), 0),
+                                    Duration.of(Objects.requireNonNullElse(flowRequest.timeout(), HTTP_TIMEOUT), ChronoUnit.SECONDS))
+                            .onRetryExhaustedThrow(((retryBackoffSpec, retrySignal) -> new BizException(BizError.FLOW_ERROR, "FLOW_ERROR", retrySignal.failure().getMessage()))));
         } catch (Exception e) {
             return Mono.error(e);
         }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/ApiFlowEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/ApiFlowEndpoints.java
@@ -21,6 +21,8 @@ public interface ApiFlowEndpoints
 	public record FlowRequest(String path,
 							  String method,
 							  Map<String, Object> data,
-							  Map<String, String> headers) {
+							  Map<String, String> headers,
+							  Integer timeout,
+							  Integer retries) {
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ public interface ApiFlowEndpoints`
`21`	`21`	`public record FlowRequest(String path,`
`22`	`22`	`String method,`
`23`	`23`	`Map<String, Object> data,`
`24`		`- Map<String, String> headers) {`
	`24`	`+ Map<String, String> headers,`
	`25`	`+ Integer timeout,`
	`26`	`+ Integer retries) {`
`25`	`27`	`}`
`26`	`28`	`}`