🎉 fix all

PlexPt · PlexPt · commit 4e9e4eb3ac1b · 2022-12-07T18:27:49.000+08:00
diff --git a/config.json b/config.json
@@ -1,5 +1,5 @@
 {
   "email":"xxx@gmail.com",
   "password": "xxx",
-  "session_token" : " "
+  "session_token" : "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2R0NNIn0..pDMxLMivBYXB17Ro.9D4en7rDjvTrWuK3nBEyPKpB5Cr1lYmfTVyc9dLiSQRkwVwcqgC2kxoZ5KWk9tw-xRXCTwNftQDbPPpSyvNaTzzW44Fr0e0W31_x7U4tYTtq_wwhakLiCJG_iWmErEiX7ILE3uD47LwwIKEudAwFgJnVY1e5LvkLVr1xJ7fdVJpGG8SucljbMeZA70Q0HI3tx0oIeT3wUb8LR6RTWs8XoLXdDByQVbaogCcODBexSO8Cu2L_IYfzDiUphW2wiRvSl7ac1Eda-k8MhOGDH0Ti4brUxFqegoSCvIN_vst3KT49sjL7Exi6zS7I8Al_YAoHVFAKblSnigdEXso1nezwDIUzi9_rWpXNaLZpCVy3tNROOn7jwaFKHh09f6fwAoTs3xKlGQwho80HlHjGV_MnVOG7BzWwZSu9qXdkEUpQiaIupKHOI7DVAW4iJHXxOs8hjgH8_fr61c7gPqd_Vvh2U_ZgGwejG9zWAay2kgA06neiBEm8-4t3KhLWP4alsbUe0VsNZpDfUQbiQzE_SjXmkyfvfLNaL8quTpiMTzdVHz8lgv7i88oupV4tYi7250qxk9R1YjWWcQuR8ey-PjWjikmIVZM3axRwuV8LVOHYvE_zm2ezUfg8lXz_9kvdyowmHuXmSP5V9NJJwsULENQMJS0PBwkElkuNZK4usbSwiphnPjPdwRlh60SOFWALq4jGNF4FFFA3iKhRMwCOIL1w13roOiCye6n5FEhE5RaNQifpL9eiRXkaMygwp_w6UkhQ64PLsLGWVF7GByb1rP2cLfWzi-FkegixnWaWY2E9NyxIerc8RaFjU3ZBTzgwmgBrkKFAHGpE3TiE_lZb189LYuLck-U63Cup6af8ZZdKThtcxupQCwmX2SS33MhJRNPbnKbECg49IwnL-xa03zKQOMaaLnecqEaLz02hpNHu43sr5qaf9_G4JDl7Uw_zk_61P3RByI0V8VThV33rZWnB7_cqgpcU7Nvg7TqHH-PUttOA9zjwt4xGk5qG3ZKZx9DLbuBFmHUZIIqafi2QfC-1hB3E46a-DI_5T4ZKyT0JbS3iBszydf_cR3AhUAQEFcN7jkMXktZtK9UkT_q7JRkZcaM_aGc5DmAFztC143NqePXC2n9GzY7pVk3f4D10Bv3GnY-5vm56leP7yfDb5Esml5j4vv4G5vS8sBhr_Z_MZ7P7xY5pP2GiyheadhuZFM5-eUSNMQvsW6ShpXkH5Vm0cJolPfbdMFsUTLFYUoxjEblMvNGRnL3QTwVLWCKtLkijSBlNO3zs4hB6CruR9LuKFwnlxU0ykM3US_33twogTCL1CSu4OeXlKmjBFvZwTto-owZkesueXEL2BRMVQgXPS8wIOBENItZhm5vwNTjQd97pgaeNLfeGI1KldRTFHp6zSIJPiXa_ovC2rhSdWO6dv9PIjymmk5kPG230AXwnFjpxrHlCL6_fBpfdGmhX6OoqUTlMt5jloPrGbHB7D04CkSm9vaM09Gd7y9ntFPYdIlEoEYxuRS9oCtLglvmcjXSekInBrJ_WW4dp0YIgqDo5wliZBIvMjNKJ_1uNwOs0upuYjXRYagdei--HZR-aU7z6B4pxsP2TuPaAomKxyQI6xSdvU_B-QQdhZ3B918kJ_FI3dy4VHszuIl1DO5uF76ZgriR3ub4wJqZ6jMieajbWDbTMasrUf8u9XUbNd2YcuEej1Oatfe_wyYO1UGtON_Ae7Hzr39jvtgxSq4UdTMsWueA8xU98VOfKH68eB1HG-W42UZ03Af4cP7K8_E9BTI9xB2_HIZL5cgwVWguNxtkAiIheZcjo5r0ofF8gdOnWZyr2TSpsQNNOQmK6Tf33SYhzH7e1qmB5soLasHgf8CgA1dPVymvPRk2NtkmPNudT0o1p3i-P7r4uBbid2HFKbo_zlZR6liFVFyfuWQCUI7U9RZHdnasJO0EaazRDtsZOn25iOKWwBNWz6xc_aAe-djvxFIg5o6xFcD2ICPFFiItgVP9ZKbaSMPt5VmAXzcfDk-y29kHBULGdlS69J18uIa2vwbPKhHZGGSk9saVVP2FoCCZWBGTYyxWuvVy-S6VfqMaK90d_jFcJnzyOYzj1o2dzehNloLTFTtp1XupOk1mWgA-kPTWUwCZPon8vnfHMsCtNHz7g49F5ct0H0rN4ebxLFu6-UMZdNAS9w7mZdvHskrUXLHRWALh4CAIxRVXjDl25Wz4sm2qqdoZnAZmYM2hiVZHkkq5gSan7akP60iK_sM8L5s9-NNY6hjQoUfDrADGGurw2iBIbiyoDyfIZG51LFsD3kZC12YsRrGw6POpy4SMzq7N7QMOOIJETGxVWXQ.J3g7qTqK295YtTdBxhSboQ"
 }
diff --git a/src/main/java/com/github/plexpt/chatgpt/ChatGTP.java b/src/main/java/com/github/plexpt/chatgpt/ChatGTP.java
@@ -101,8 +101,6 @@ public static void main(String[] args) {
                         System.out.println(e);
                     }
                 } else {
-                    List<String> messages = new ArrayList<>();
-                    int linesPrinted = 0;
 
                     try {
                         System.out.println("Chatbot: ");
@@ -118,19 +116,6 @@ public static void main(String[] args) {
                             }
                         }
 
-                        // Wrap each part separately
-//                        formattedParts.clear();
-//                        for (String part : messageParts) {
-//                            formattedParts.addAll(Arrays.asList(TextWrapper.wrap(part, width
-//                                    = 80)));
-//                            for (String formattedLine : formattedParts) {
-//                                if (formattedParts.size() > linesPrinted + 1) {
-//                                    System.out.println(formattedParts.get(linesPrinted));
-//                                    linesPrinted++;
-//                                }
-//                            }
-//                        }
-//                        System.out.println(formattedParts.get(linesPrinted));
                     } catch (Exception e) {
                         System.out.println("Something went wrong!");
                         e.printStackTrace();
diff --git a/src/main/java/com/github/plexpt/chatgpt/Chatbot.java b/src/main/java/com/github/plexpt/chatgpt/Chatbot.java
@@ -1,14 +1,14 @@
 package com.github.plexpt.chatgpt;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.google.gson.Gson;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.regex.Pattern;
 
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
@@ -73,15 +73,15 @@ public void refreshHeaders() {
     Map<String, Object> getChatStream(Map<String, Object> data) {
         String url = "https://chat.openai.com/backend-api/conversation";
 
-        String responseBody = HttpUtil.createPost(url)
+        String body = HttpUtil.createPost(url)
                 .headerMap(headers, true)
                 .body(JSON.toJSONString(data), "application/json")
                 .execute()
                 .body();
 
         String message = "";
         Map<String, Object> chatData = new HashMap<>();
-        for (String s : responseBody.split("\n")) {
+        for (String s : body.split("\n")) {
             if ((s == null) || "".equals(s)) {
                 continue;
             }
@@ -94,10 +94,14 @@ Map<String, Object> getChatStream(Map<String, Object> data) {
 
             try {
 
-                message = lineData.getJSONObject("message")
+                JSONArray jsonArray = lineData.getJSONObject("message")
                         .getJSONObject("content")
-                        .getJSONArray("parts")
-                        .getString(0);
+                        .getJSONArray("parts");
+
+                if (jsonArray.size() == 0) {
+                    continue;
+                }
+                message = jsonArray.getString(0);
 
                 conversationId = lineData.getString("conversation_id");
                 parentId = (lineData.getJSONObject("message")).getString("id");
@@ -138,79 +142,125 @@ public Map<String, Object> getChatText(Map<String, Object> data) {
             session.setProxies(proxies);
         }
 
-        Response response = session.post("https://chat.openai.com/backend-api/conversation", data);
+        HttpResponse response = session.post2("https://chat.openai.com/backend-api/conversation",
+                data);
+        String body = response.body();
 
         String errorDesc = "";
 
-        try {
-            JSONObject responseObject = JSON.parseObject(response.toString());
-
 
-            this.parentId = (String) responseObject.getJSONObject("message").get("id");
-            this.conversationId = (String) responseObject.get("conversation_id");
+        String message = "";
+        Map<String, Object> chatData = new HashMap<>();
+        for (String s : body.split("\n")) {
+            if ((s == null) || "".equals(s)) {
+                continue;
+            }
+            if (s.contains("data: [DONE]")) {
+                continue;
+            }
 
-            Map<String, Object> message = (Map<String, Object>) responseObject.getJSONObject(
-                            "message")
-                    .getJSONObject("content")
-                    .getJSONArray("parts")
-                    .get(0);
-            Map<String, Object> result = new HashMap<>();
-            result.put("message", message);
-            result.put("conversation_id", this.conversationId);
-            result.put("parent_id", this.parentId);
-            return result;
+            String part = s.substring(5);
+            JSONObject lineData = JSON.parseObject(part);
 
-        } catch (Exception e) {
-            e.printStackTrace();
             try {
-                // Get the title text
-                System.out.println(response.toString());
-
-                String titleText = Pattern.compile("<title>(.*)</title>")
-                        .matcher(response.toString())
-                        .group();
-
-//                // Find all div elements and capture the id attribute and the contents of the
-//                // element
-//                String divPattern = "<div[^>]*id=\"([^\"]*)\">(.*)</div>";
-//                Matcher matcher = Pattern.compile(divPattern)
-//                        .matcher(response.toString());
-//                List<String[]> divElements = (List<String[]>) matcher;
+
+                JSONArray jsonArray = lineData.getJSONObject("message")
+                        .getJSONObject("content")
+                        .getJSONArray("parts");
+
+                if (jsonArray.size() == 0) {
+                    continue;
+                }
+                message = jsonArray.getString(0);
+
+                conversationId = lineData.getString("conversation_id");
+                parentId = (lineData.getJSONObject("message")).getString("id");
+
+                chatData.put("message", message);
+                chatData.put("conversation_id", conversationId);
+                chatData.put("parent_id", parentId);
+            } catch (Exception e) {
+                System.out.println("getChatStream Exception: " + part);
+                //  e.printStackTrace();
+                continue;
+            }
+
+        }
+        return chatData;
+
+//        try {
+//            JSONObject responseObject = JSON.parseObject(body);
 //
 //
-//                for (int i = 1; i <= matcher.groupCount(); i++) {
-//                    String group = matcher.group(i);
-//                    // 对匹配的组进行操作
+//            this.parentId = (String) responseObject.getJSONObject("message").get("id");
+//            this.conversationId = (String) responseObject.get("conversation_id");
 //
-//                }
+//            JSONArray jsonArray = responseObject.getJSONObject(
+//                            "message")
+//                    .getJSONObject("content")
+//                    .getJSONArray("parts");
+//            if (jsonArray.size() == 0) {
+////                continue;
+//            }
+//            Map<String, Object> message = (Map<String, Object>) jsonArray
+//                    .get(0);
+//            Map<String, Object> result = new HashMap<>();
+//            result.put("message", message);
+//            result.put("conversation_id", this.conversationId);
+//            result.put("parent_id", this.parentId);
+//            return result;
 //
-//                        .results()
-//                        .map(m -> new String[]{m.group(1), m.group(2)})
-//                        .collect(Collectors.toList());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            try {
+//                // Get the title text
+//                System.out.println(body);
 //
-//                // Loop through the div elements and find the one with the "message" id
-//                String messageText = "";
-//                for (String[] div : divElements) {
-//                    String divId = div[0];
-//                    String divContent = div[1];
-//                    if (divId.equals("message")) {
-//                        messageText = divContent;
-//                        break;
-//                    }
-//                }
-                // Concatenate the title and message text
-                errorDesc = titleText;
-            } catch (Exception ex) {
-                ex.printStackTrace();
-//                errorDesc = (String) ((Map) JSON.parse(response.toString())).get("detail");
-//                if (errorDesc.containsKey("message")) {
-//                    errorDesc = (String) errorDesc.get("message");
-//                }
-            } finally {
-                System.out.println(response.toString());
-                throw new RuntimeException("Response is not in the correct format " + errorDesc);
-            }
-        }
+//                String titleText = Pattern.compile("<title>(.*)</title>")
+//                        .matcher(response.toString())
+//                        .group();
+//
+////                // Find all div elements and capture the id attribute and the contents of the
+////                // element
+////                String divPattern = "<div[^>]*id=\"([^\"]*)\">(.*)</div>";
+////                Matcher matcher = Pattern.compile(divPattern)
+////                        .matcher(response.toString());
+////                List<String[]> divElements = (List<String[]>) matcher;
+////
+////
+////                for (int i = 1; i <= matcher.groupCount(); i++) {
+////                    String group = matcher.group(i);
+////                    // 对匹配的组进行操作
+////
+////                }
+////
+////                        .results()
+////                        .map(m -> new String[]{m.group(1), m.group(2)})
+////                        .collect(Collectors.toList());
+////
+////                // Loop through the div elements and find the one with the "message" id
+////                String messageText = "";
+////                for (String[] div : divElements) {
+////                    String divId = div[0];
+////                    String divContent = div[1];
+////                    if (divId.equals("message")) {
+////                        messageText = divContent;
+////                        break;
+////                    }
+////                }
+//                // Concatenate the title and message text
+//                errorDesc = titleText;
+//            } catch (Exception ex) {
+//                ex.printStackTrace();
+////                errorDesc = (String) ((Map) JSON.parse(response.toString())).get("detail");
+////                if (errorDesc.containsKey("message")) {
+////                    errorDesc = (String) errorDesc.get("message");
+////                }
+//            } finally {
+//                System.out.println(response.toString());
+//                throw new RuntimeException("Response is not in the correct format " + errorDesc);
+//            }
+//        }
 
     }
 
diff --git a/src/main/java/com/github/plexpt/chatgpt/Session.java b/src/main/java/com/github/plexpt/chatgpt/Session.java
@@ -1,5 +1,7 @@
 package com.github.plexpt.chatgpt;
 
+import com.alibaba.fastjson2.JSON;
+
 import net.dreamlu.mica.http.HttpRequest;
 
 import java.util.HashMap;
@@ -30,6 +32,18 @@ public Response post(String url, Map<String, Object> data) {
                 .response();
     }
 
+    public HttpResponse post2(String url, Map<String, Object> data) {
+        getCookiesString();
+
+
+        return HttpUtil.createPost(url)
+                .addHeaders(headers)
+                .cookie(getCookiesString())
+                .body(JSON.toJSONString(data), "application/json")
+                .execute();
+
+    }
+
     public Response post(String url, Map<String, Object> data, boolean followRedirects) {
         getCookiesString();
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"email":"[email protected]",`
`3`	`3`	`"password": "xxx",`
`4`		`- "session_token" : " "`
	`4`	+ "session_token" : "eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2R0NNIn0..pDMxLMivBYXB17Ro.9D4en7rDjvTrWuK3nBEyPKpB5Cr1lYmfTVyc9dLiSQRkwVwcqgC2kxoZ5KWk9tw-xRXCTwNftQDbPPpSyvNaTzzW44Fr0e0W31_x7U4tYTtq_wwhakLiCJG_iWmErEiX7ILE3uD47LwwIKEudAwFgJnVY1e5LvkLVr1xJ7fdVJpGG8SucljbMeZA70Q0HI3tx0oIeT3wUb8LR6RTWs8XoLXdDByQVbaogCcODBexSO8Cu2L_IYfzDiUphW2wiRvSl7ac1Eda-k8MhOGDH0Ti4brUxFqegoSCvIN_vst3KT49sjL7Exi6zS7I8Al_YAoHVFAKblSnigdEXso1nezwDIUzi9_rWpXNaLZpCVy3tNROOn7jwaFKHh09f6fwAoTs3xKlGQwho80HlHjGV_MnVOG7BzWwZSu9qXdkEUpQiaIupKHOI7DVAW4iJHXxOs8hjgH8_fr61c7gPqd_Vvh2U_ZgGwejG9zWAay2kgA06neiBEm8-4t3KhLWP4alsbUe0VsNZpDfUQbiQzE_SjXmkyfvfLNaL8quTpiMTzdVHz8lgv7i88oupV4tYi7250qxk9R1YjWWcQuR8ey-PjWjikmIVZM3axRwuV8LVOHYvE_zm2ezUfg8lXz_9kvdyowmHuXmSP5V9NJJwsULENQMJS0PBwkElkuNZK4usbSwiphnPjPdwRlh60SOFWALq4jGNF4FFFA3iKhRMwCOIL1w13roOiCye6n5FEhE5RaNQifpL9eiRXkaMygwp_w6UkhQ64PLsLGWVF7GByb1rP2cLfWzi-FkegixnWaWY2E9NyxIerc8RaFjU3ZBTzgwmgBrkKFAHGpE3TiE_lZb189LYuLck-U63Cup6af8ZZdKThtcxupQCwmX2SS33MhJRNPbnKbECg49IwnL-xa03zKQOMaaLnecqEaLz02hpNHu43sr5qaf9_G4JDl7Uw_zk_61P3RByI0V8VThV33rZWnB7_cqgpcU7Nvg7TqHH-PUttOA9zjwt4xGk5qG3ZKZx9DLbuBFmHUZIIqafi2QfC-1hB3E46a-DI_5T4ZKyT0JbS3iBszydf_cR3AhUAQEFcN7jkMXktZtK9UkT_q7JRkZcaM_aGc5DmAFztC143NqePXC2n9GzY7pVk3f4D10Bv3GnY-5vm56leP7yfDb5Esml5j4vv4G5vS8sBhr_Z_MZ7P7xY5pP2GiyheadhuZFM5-eUSNMQvsW6ShpXkH5Vm0cJolPfbdMFsUTLFYUoxjEblMvNGRnL3QTwVLWCKtLkijSBlNO3zs4hB6CruR9LuKFwnlxU0ykM3US_33twogTCL1CSu4OeXlKmjBFvZwTto-owZkesueXEL2BRMVQgXPS8wIOBENItZhm5vwNTjQd97pgaeNLfeGI1KldRTFHp6zSIJPiXa_ovC2rhSdWO6dv9PIjymmk5kPG230AXwnFjpxrHlCL6_fBpfdGmhX6OoqUTlMt5jloPrGbHB7D04CkSm9vaM09Gd7y9ntFPYdIlEoEYxuRS9oCtLglvmcjXSekInBrJ_WW4dp0YIgqDo5wliZBIvMjNKJ_1uNwOs0upuYjXRYagdei--HZR-aU7z6B4pxsP2TuPaAomKxyQI6xSdvU_B-QQdhZ3B918kJ_FI3dy4VHszuIl1DO5uF76ZgriR3ub4wJqZ6jMieajbWDbTMasrUf8u9XUbNd2YcuEej1Oatfe_wyYO1UGtON_Ae7Hzr39jvtgxSq4UdTMsWueA8xU98VOfKH68eB1HG-W42UZ03Af4cP7K8_E9BTI9xB2_HIZL5cgwVWguNxtkAiIheZcjo5r0ofF8gdOnWZyr2TSpsQNNOQmK6Tf33SYhzH7e1qmB5soLasHgf8CgA1dPVymvPRk2NtkmPNudT0o1p3i-P7r4uBbid2HFKbo_zlZR6liFVFyfuWQCUI7U9RZHdnasJO0EaazRDtsZOn25iOKWwBNWz6xc_aAe-djvxFIg5o6xFcD2ICPFFiItgVP9ZKbaSMPt5VmAXzcfDk-y29kHBULGdlS69J18uIa2vwbPKhHZGGSk9saVVP2FoCCZWBGTYyxWuvVy-S6VfqMaK90d_jFcJnzyOYzj1o2dzehNloLTFTtp1XupOk1mWgA-kPTWUwCZPon8vnfHMsCtNHz7g49F5ct0H0rN4ebxLFu6-UMZdNAS9w7mZdvHskrUXLHRWALh4CAIxRVXjDl25Wz4sm2qqdoZnAZmYM2hiVZHkkq5gSan7akP60iK_sM8L5s9-NNY6hjQoUfDrADGGurw2iBIbiyoDyfIZG51LFsD3kZC12YsRrGw6POpy4SMzq7N7QMOOIJETGxVWXQ.J3g7qTqK295YtTdBxhSboQ"
`5`	`5`	`}`