Upgrade springboot, hutool, jtokkit and maven plugin

lzhpo · Jul 4, 2023 · 96e8bb5 · 96e8bb5
1 parent 91ca782
commit 96e8bb5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.12</version>
+        <version>2.7.13</version>
         <relativePath/>
     </parent>
 
@@ -43,13 +43,13 @@
         <java.version>1.8</java.version>
         <spotless-plugin.version>2.30.0</spotless-plugin.version>
         <palantirJavaFormat.version>1.1.0</palantirJavaFormat.version>
-        <maven.gpg.version>3.0.1</maven.gpg.version>
-        <maven.source.version>3.2.1</maven.source.version>
+        <maven.gpg.version>3.1.0</maven.gpg.version>
+        <maven.source.version>3.3.0</maven.source.version>
         <maven.javadoc.version>3.5.0</maven.javadoc.version>
-        <flatten-maven-plugin>1.2.7</flatten-maven-plugin>
-        <hutool.version>5.8.19</hutool.version>
+        <flatten-maven-plugin>1.5.0</flatten-maven-plugin>
+        <hutool.version>5.8.20</hutool.version>
         <okhttp.version>4.10.0</okhttp.version>
-        <jtokkit.version>0.4.0</jtokkit.version>
+        <jtokkit.version>0.6.1</jtokkit.version>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/com/lzhpo/chatgpt/sse/AbstractEventSourceListener.java b/src/main/java/com/lzhpo/chatgpt/sse/AbstractEventSourceListener.java
@@ -17,12 +17,14 @@
 package com.lzhpo.chatgpt.sse;
 
 import com.lzhpo.chatgpt.exception.OpenAiException;
-import java.util.Objects;
+import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
+import okio.BufferedSource;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -50,8 +52,20 @@ public void onEvent(
     public void onFailure(@NotNull EventSource eventSource, @Nullable Throwable e, @Nullable Response response) {
         String errorMsg = Optional.ofNullable(e)
                 .map(Throwable::getMessage)
-                .orElseGet(() -> Objects.nonNull(response) ? response.toString() : "Unexpected exception");
-        log.error("Execute onFailure method, response: {}, error: {}", response, errorMsg);
+                .orElse(Optional.ofNullable(response)
+                        .map(Response::body)
+                        .map(ResponseBody::source)
+                        .map(bufferedSource -> {
+                            try {
+                                bufferedSource.request(Long.MAX_VALUE);
+                            } catch (Exception ex) {
+                                throw new OpenAiException(ex);
+                            }
+                            return bufferedSource;
+                        })
+                        .map(BufferedSource::getBuffer)
+                        .map(buffer -> buffer.clone().readString(StandardCharsets.UTF_8))
+                        .orElse("Unexpected exception"));
         throw new OpenAiException(errorMsg);
     }