Merge pull request #4 from AcaiSoftware/development

Added `cfClearance` and `userAgent` in order to bypass newly implemen…

Author: brissach

README.md

@@ -2,6 +2,13 @@
 # ChatGPT-Java
 A **Java** wrapper for the unofficial reverse-engineered [ChatGPT](https://chat.openai.com/) API.
 
+## Important Update
+OpenAI have recently implemented Cloudflare's Under Attack mode on ChatGPT, meaning you will need to supply a valid Cloudflare cookie and user agent to use the API.
+
+This may be temporary, however we do not know at the moment.
+
+Refer to the [Registering ChatGPT](https://github.com/AcaiSoftware/chatgpt-java#registering-chatgpt) section for more information on how to set these values.
+
 ## Add ChatGPT-Java to your own build
 ### Maven
 ```xml
@@ -13,7 +20,7 @@ A **Java** wrapper for the unofficial reverse-engineered [ChatGPT](https://chat.
 <dependency>
   <groupId>gg.acai</groupId>
   <artifactId>chatgpt-java</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 
@@ -22,7 +29,9 @@ A **Java** wrapper for the unofficial reverse-engineered [ChatGPT](https://chat.
 All builder fields are optional except for ``sessionToken``.
 ```java
 ChatGPT chatGpt = ChatGPT.newBuilder()
-  .sessionToken("token_here") // required field
+  .sessionToken("token_here") // required field: get from cookies
+  .cfClearance("cf_clearance_here") // required to bypass Cloudflare: get from cookies
+  .userAgent("user_agent_here") // required to bypass Cloudflare: google 'what is my user agent'
   .addExceptionAttribute(new ParsedExceptionEntry("exception keyword", Exception.class)) // optional: adds an exception attribute
   .connectTimeout(60L) // optional: specify custom connection timeout limit
   .readTimeout(30L) // optional: specify custom read timeout limit

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>gg.acai</groupId>
     <artifactId>chatgpt-java</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <properties>
         <java.version>17</java.version>

src/main/java/gg/acai/chatgpt/AbstractConversation.java

@@ -62,7 +62,7 @@ public Response sendMessage(ChatGPTRequest request) {
         Request req = new okhttp3.Request.Builder()
                 .header("Authorization", "Bearer " + gpt.getAccessToken())
                 .header("Accept", "text/event-stream")
-                .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36")
+                .header("User-Agent", gpt.getUserAgent())
                 .header("Cookie", "cf_clearance=" + gpt.getCfClearance())
                 .url(APIUrls.CONVERSATION_URL.getUrl())
                 .post(b)

src/main/java/gg/acai/chatgpt/AbstractStreamConversation.java

@@ -65,7 +65,7 @@ public Response sendMessage(ChatGPTRequest request) {
         Request req = new okhttp3.Request.Builder()
                 .header("Authorization", "Bearer " + gpt.getAccessToken())
                 .header("Accept", "text/event-stream")
-                .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36")
+                .header("User-Agent", gpt.getUserAgent())
                 .header("Cookie", "cf_clearance=" + gpt.getCfClearance())
                 .url(APIUrls.CONVERSATION_URL.getUrl())
                 .post(b)

src/main/java/gg/acai/chatgpt/ChatGPT.java

@@ -89,4 +89,5 @@ static ChatGPTBuilder newBuilder() {
      */
     ExceptionParser getExceptionParser();
 
+    String getUserAgent();
 }

src/main/java/gg/acai/chatgpt/ChatGPTAPI.java

@@ -25,7 +25,8 @@ public final class ChatGPTAPI implements ChatGPT {
     private final OkHttpClient client;
     private final ExceptionParser exceptionParser;
     private final String cfClearance;
-    public ChatGPTAPI(String sessionToken, String cfClearance, EventBus eventBus, List<ParsedExceptionEntry> entries, long connectTimeout, long readTimeout, long writeTimeout) {
+    private final String userAgent;
+    public ChatGPTAPI(String sessionToken, String cfClearance, String userAgent, EventBus eventBus, List<ParsedExceptionEntry> entries, long connectTimeout, long readTimeout, long writeTimeout) {
         instance = this;
 
         this.client = new OkHttpClient.Builder()
@@ -40,6 +41,7 @@ public ChatGPTAPI(String sessionToken, String cfClearance, EventBus eventBus, Li
         this.exceptionParser = new ExceptionParser();
         this.exceptionParser.register(entries);
         this.cfClearance = cfClearance;
+        this.userAgent = userAgent;
     }
 
     @Override
@@ -87,6 +89,11 @@ public ExceptionParser getExceptionParser() {
         return this.exceptionParser;
     }
 
+    @Override
+    public String getUserAgent() {
+        return this.userAgent;
+    }
+
     public static ChatGPTAPI getInstance() {
         return instance;
     }

src/main/java/gg/acai/chatgpt/ChatGPTBuilder.java

@@ -22,6 +22,7 @@ public class ChatGPTBuilder {
     private long connectTimeout;
     private long writeTimeout;
     private String cfClearance;
+    private String userAgent;
 
     /**
      * Specifies the session token of the ChatGPT API
@@ -96,23 +97,29 @@ public ChatGPTBuilder writeTimeout(long writeTimeout) {
         return this;
     }
 
+    public ChatGPTBuilder userAgent(String userAgent) {
+        this.userAgent = userAgent;
+        return this;
+    }
 
     /**
      * Builds the ChatGPT API
      * @return Returns the ChatGPT API
      */
     public ChatGPT build() {
         doBuildProcedure();
-        ChatGPTAPI api = new ChatGPTAPI(sessionToken, cfClearance, eventBus, exceptionAttributes, connectTimeout, readTimeout, writeTimeout);
+        ChatGPTAPI api = new ChatGPTAPI(sessionToken, cfClearance, userAgent, eventBus, exceptionAttributes, connectTimeout, readTimeout, writeTimeout);
         api.getComplexAccessCache().refreshAccessToken();
         return api;
     }
 
     private void doBuildProcedure() {
         Requisites.requireNonNull(sessionToken, "Session token cannot be null");
-        Requisites.requireNonNull(cfClearance, "cfClearance cannot be null");
+        if (userAgent == null) userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
         if (connectTimeout == 0) connectTimeout = 60;
         if (readTimeout == 0) readTimeout = 30;
         if (writeTimeout == 0) writeTimeout = 30;
     }
+
+
 }

src/main/java/gg/acai/chatgpt/ComplexAccessCache.java

@@ -56,11 +56,11 @@ public AsyncPlaceholder<String> refreshAccessToken() {
                 return cachedAccessToken;
             }
 
-
+            ChatGPTAPI gpt = ChatGPTAPI.getInstance();
             ObjectMapper mapper = new ObjectMapper();
             Request req = new okhttp3.Request.Builder()
-                    .header("Cookie", "cf_clearance=" + ChatGPTAPI.getInstance().getCfClearance() + ";__Secure-next-auth.session-token=" + this.sessionToken)
-                    .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36")
+                    .header("Cookie", "cf_clearance=" + gpt.getCfClearance() + ";__Secure-next-auth.session-token=" + this.sessionToken)
+                    .header("User-Agent", gpt.getUserAgent())
                     .url(APIUrls.REFRESH_TOKEN_URL.getUrl())
                     .get()
                     .build();