fix: reset connection keep cookies

Author: florianepitech

pom.xml

@@ -38,6 +38,12 @@
             <version>RELEASE</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <properties>

src/main/java/net/httpclient/wrapper/ratelimiter/RateLimiter.java

@@ -1,5 +1,7 @@
 package net.httpclient.wrapper.ratelimiter;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -8,7 +10,10 @@
 
 public class RateLimiter {
 
+    @Getter @Setter @NotNull
     private Duration duration;
+
+    @Getter @Setter @Nullable
     private Instant lastAcquire;
 
     /*
@@ -26,25 +31,18 @@ public RateLimiter(@NotNull Duration duration) {
     /**
      * Sleep until the duration is passed.
      */
-    public void acquire() {
-        synchronized (this) {
-            try {
-                dangerousAcquire();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void dangerousAcquire() throws InterruptedException {
-        synchronized (this) {
+    public synchronized void acquire() {
+        try {
             if (lastAcquire == null) {
                 lastAcquire = Instant.now();
                 return;
             }
-            Duration durationToSleep = getRemainingTime();
-            if (durationToSleep.isZero()) Thread.sleep(durationToSleep.toMillis());
+            Duration durationToSleep = getRemainingDuration();
+            if (!durationToSleep.isZero() && !durationToSleep.isNegative())
+                Thread.sleep(durationToSleep.toMillis());
             lastAcquire = Instant.now();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
     }
 
@@ -56,31 +54,16 @@ public void reset() {
     }
 
     /**
-     * Get the remaining time before the next acquire.
-     * @return The remaining time in milliseconds.
+     * Get the time to wait before executing the next acquire.
+     * @return The time to wait in Duration.
      */
-    public @NotNull Duration getRemainingTime() {
-        if (lastAcquire == null) return Duration.ZERO;
-        long lastRequest = lastAcquire.toEpochMilli();
-        long now = Instant.now().toEpochMilli();
-        long result = lastRequest + duration.toMillis() - now;
-        return (result > 0) ? Duration.ofMillis(result) : Duration.ZERO;
-    }
-
-    /*
-     $      Getters
-     */
-
-    public @NotNull Duration getDuration() {
-        return duration;
-    }
-
-    public @Nullable Instant getLastAcquire() {
-        return lastAcquire;
-    }
-
-    public void setDuration(@NotNull Duration duration) {
-        this.duration = duration;
+    public @NotNull Duration getRemainingDuration() {
+        if (lastAcquire == null) return (Duration.ZERO);
+        if (duration.isZero()) return (Duration.ZERO);
+        Instant now = Instant.now();
+        Instant timeToExec = lastAcquire.plus(duration);
+        if (timeToExec.isBefore(now)) return (Duration.ZERO);
+        return (Duration.between(now, timeToExec));
     }
 
 }

src/main/java/net/httpclient/wrapper/response/RequestResponse.java

@@ -77,4 +77,9 @@ public long getTime() {
             return (-1);
         return (end.getTime() - start.getTime());
     }
+
+    public String getReasonPhrase() {
+        return (httpResponse.getStatusLine().getReasonPhrase());
+    }
+
 }

src/main/java/net/httpclient/wrapper/session/HttpClientSessionAsync.java

@@ -45,8 +45,12 @@ public class HttpClientSessionAsync extends HttpClientSession {
      $      Constructor
      */
 
+    /**
+     * Create a new session with a default number of simultaneous requests
+     * set to <b>1</b>.
+     */
     public HttpClientSessionAsync() {
-        this(3);
+        this(1);
     }
 
     public HttpClientSessionAsync(int maxSynchronousRequest) {

src/main/java/net/httpclient/wrapper/session/HttpClientSessionRateLimited.java

@@ -6,6 +6,7 @@
 import net.httpclient.wrapper.response.RequestResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.entity.ContentType;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -16,12 +17,12 @@ public class HttpClientSessionRateLimited extends HttpClientSession {
     private final RateLimiter rateLimiter;
 
     public HttpClientSessionRateLimited() {
-        this(1.0);
+        this(Duration.ofSeconds(1));
     }
 
-    public HttpClientSessionRateLimited(double permitsPerSecond) {
+    public HttpClientSessionRateLimited(@NotNull Duration duration) {
         super();
-        rateLimiter = new RateLimiter(Duration.ofSeconds((int)permitsPerSecond));
+        rateLimiter = new RateLimiter(duration);
     }
 
     @Override
@@ -108,4 +109,11 @@ public RequestResponse forceSendForm(String url, List<NameValuePair> form) throw
         return (super.sendForm(url, form));
     }
 
+    /*
+     $      Getters
+     */
+
+    public RateLimiter getRateLimiter() {
+        return rateLimiter;
+    }
 }

src/test/java/net/httpclient/wrapper/ratelimiter/RateLimiterTest.java

@@ -17,19 +17,34 @@ public void constructTest() {
 
     @Test
     public void acquireTest() {
-        RateLimiter rateLimiter = new RateLimiter(Duration.ofSeconds(1));
+        int timeSec = 3;
+        RateLimiter rateLimiter = new RateLimiter(Duration.ofSeconds(timeSec));
+        System.out.println("Start acquire test: " + Instant.now());
         assertDoesNotThrow(() -> rateLimiter.acquire());
+        System.out.println("Waiting " + timeSec + " second: " + Instant.now());
         assertDoesNotThrow(() -> rateLimiter.acquire());
+        System.out.println("Waiting " + timeSec + " second: " + Instant.now());
+        assertDoesNotThrow(() -> rateLimiter.acquire());
+        System.out.println("End of test: " + Instant.now());
     }
 
     @Test
     public void getRemainingTimeTest() throws InterruptedException {
         int durationInSeconds = 3;
         RateLimiter rateLimiter = new RateLimiter(Duration.ofSeconds(durationInSeconds));
         rateLimiter.acquire();
-        assertEquals(durationInSeconds, rateLimiter.getRemainingTime().toSeconds());
+        assertEquals(durationInSeconds - 1, rateLimiter.getRemainingDuration().toSeconds());
         rateLimiter.reset();
-        assertEquals(Duration.ZERO, rateLimiter.getRemainingTime());
+        assertEquals(Duration.ZERO, rateLimiter.getRemainingDuration());
+    }
+
+    @Test
+    public void testChangeDuration() {
+        int durationInSeconds = 1;
+        RateLimiter rateLimiter = new RateLimiter(Duration.ofSeconds(durationInSeconds));
+        rateLimiter.acquire();
+        rateLimiter.setDuration(Duration.ofSeconds(2));
+        assertEquals(2, rateLimiter.getDuration().toSeconds());
     }
 
 }