Merge branch 'feat/ark/fix_request_id' into 'master'

Feat/ark/fix request

See merge request iaasng/volcengine-java-sdk!210

Author: volc-sdk-team

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/RequestIdInterceptor.java

@@ -17,10 +17,13 @@ public RequestIdInterceptor() {}
 
     @Override
     public Response intercept(Chain chain) throws IOException {
-        Request request = chain.request()
-                .newBuilder()
-                .header(Const.CLIENT_REQUEST_HEADER, genRequestId())
-                .build();
+        Request.Builder requestBuilder = chain.request().newBuilder();
+
+        if (chain.request().header(Const.CLIENT_REQUEST_HEADER) == null || chain.request().header(Const.CLIENT_REQUEST_HEADER).length() == 0) {
+            requestBuilder = requestBuilder.header(Const.CLIENT_REQUEST_HEADER, genRequestId());
+        }
+
+        Request request = requestBuilder.build();
         return chain.proceed(request);
     }
 

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/utils/ResponseBodyCallback.java

@@ -68,10 +68,14 @@ public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response)
                 if (line.startsWith("data:")) {
                     String data = line.substring(5).trim();
 
-                    ArkAPIError err = mapper.readValue(data, ArkAPIError.class);
-                    if (err.getError() != null) {
-                        throw new ArkHttpException(err, null, -1, requestId);
-                    }
+                    try {
+                        ArkAPIError err = mapper.readValue(data, ArkAPIError.class);
+                        if (err.getError() != null) {
+                            throw new ArkHttpException(err, null, -1, requestId);
+                        }
+                    } catch (ArkHttpException e) {
+                        throw e;
+                    } catch (Exception ignored) {}
 
                     sse = new SSE(data);
                 } else if (line.equals("") && sse != null) {