releaseb fast updates

Sammers21 · Dec 28, 2023 · cd164bb · cd164bb
1 parent d216403
commit cd164bb
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 123 deletions.
diff --git a/settings/logback.xml b/settings/logback.xml
@@ -4,7 +4,7 @@
             <pattern>%date{ISO8601} [%thread] %-5level %logger{40} - %msg %n</pattern>
         </encoder>
     </appender>
-    <logger name="io.github.sammers.pla" level="DEBUG"/>
+    <!-- <logger name="io.github.sammers.pla" level="DEBUG"/> -->
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>

diff --git a/src/io/github/sammers/pla/blizzard/BlizzardAPI.java b/src/io/github/sammers/pla/blizzard/BlizzardAPI.java
@@ -3,7 +3,7 @@
 import io.github.sammers.pla.Main;
 import io.github.sammers.pla.db.Character;
 import io.github.sammers.pla.logic.CharacterCache;
-import io.github.sammers.pla.logic.WoWAPIRateLimiter;
+import io.github.sammers.pla.logic.RateLimiter;
 import io.github.sammers.pla.logic.Refs;
 import io.reactivex.Completable;
 import io.reactivex.Maybe;
@@ -27,6 +27,7 @@
 
 import static io.github.sammers.pla.logic.Conts.EU;
 import static io.github.sammers.pla.logic.Conts.US;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Blizzard API.
@@ -44,7 +45,9 @@ public class BlizzardAPI {
     private final Map<String, Cutoffs> cutoffs;
     private final String clientId;
     private final AtomicReference<BlizzardAuthToken> token = new AtomicReference<>();
-    private final WoWAPIRateLimiter woWAPIRateLimiter = new WoWAPIRateLimiter(Main.VTHREAD_SCHEDULER);
+    private final RateLimiter rateLimiter = new RateLimiter(100, TimeUnit.SECONDS, 1000, 
+                                            Optional.of(new RateLimiter(36000, TimeUnit.HOURS, 1000, Optional.empty(), Main.VTHREAD_SCHEDULER)),
+                                            Main.VTHREAD_SCHEDULER);
 
     public BlizzardAPI(String clientId, String clientSecret, WebClient webClient, Refs refs, CharacterCache characterCache, Map<String, Cutoffs> cutoffs) {
         this.clientId = clientId;
@@ -56,7 +59,7 @@ public BlizzardAPI(String clientId, String clientSecret, WebClient webClient, Re
     }
 
     public Completable rpsToken() {
-        return woWAPIRateLimiter.request();
+        return rateLimiter.request();
     }
 
     public Single<BlizzardAuthToken> token() {

diff --git a/src/io/github/sammers/pla/logic/RateLimiter.java b/src/io/github/sammers/pla/logic/RateLimiter.java
@@ -16,14 +16,64 @@ public class RateLimiter {
     private final LinkedList<Long> secondRing = new LinkedList<>();
     private final ConcurrentLinkedQueue<CompletableEmitter> requestQes = new ConcurrentLinkedQueue<>();
     private final int maxRequestsTotal;
+    private final Optional<RateLimiter> parent;
 
     public RateLimiter(int permits, TimeUnit per, int maxRequestsTotal, Optional<RateLimiter> parent, Scheduler scheduler) {
-
+        this.maxRequestsTotal = maxRequestsTotal;
+        this.parent = parent;
+        long now = System.currentTimeMillis();
+        long duration = per.toMillis(permits);
+        long step = duration / permits;
+        for (int i = 0; i < permits; i++) {
+            secondRing.add(now - (i * step));
+        }
+        scheduler.scheduleDirect(() -> {
+            while (true) {
+                CompletableEmitter src = requestQes.poll();
+                while (src != null) {
+                    if (secondRing.size() < permits) {
+                        secondRing.add(System.currentTimeMillis());
+                        src.onComplete();
+                    } else {
+                        Long oldestSecondR = secondRing.poll();
+                        if (oldestSecondR != null) {
+                            Long sleepSecondRing = 1000 - (System.currentTimeMillis() - oldestSecondR);
+                            if (sleepSecondRing > 0) {
+                                try {
+                                    log.debug("Sleeping for {} ms", sleepSecondRing);
+                                    Thread.sleep(sleepSecondRing);
+                                } catch (InterruptedException e) {
+                                    log.error("Interrupted", e);
+                                }
+                            }
+                        }
+                        secondRing.add(System.currentTimeMillis());
+                        src.onComplete();
+                    }
+                    src = requestQes.poll();
+                }
+                try {
+                    log.trace("Sleeping for {} ms after processing all requests", 100);
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    log.error("Interrupted", e);
+                }
+            }
+        });
     }
 
     public Completable request() {
+        if (parent.isPresent()) {
+            return parent.get().request().andThen(request0());
+        } else {
+            return request0();
+        }
+    }
+
+    private Completable request0() {
         if (requestQes.size() > maxRequestsTotal) {
-            return Completable.error(new IllegalStateException("There are too many requests in the queue. Current size: " + requestQes.size()));
+            return Completable.error(new IllegalStateException(
+                    "There are too many requests in the queue. Current size: " + requestQes.size()));
         } else {
             return Completable.create(requestQes::add);
         }

diff --git a/src/io/github/sammers/pla/logic/WoWAPIRateLimiter.java b/src/io/github/sammers/pla/logic/WoWAPIRateLimiter.java
diff --git a/test/io/github/sammers/pla/logic/RateLimiterTest.java b/test/io/github/sammers/pla/logic/RateLimiterTest.java
@@ -0,0 +1,81 @@
+package io.github.sammers.pla.logic;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import io.reactivex.Completable;
+import io.reactivex.Scheduler;
+import io.vertx.core.cli.Option;
+
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.Optional;
+import java.util.ArrayList;
+
+public class RateLimiterTest {
+
+    public static final Scheduler VTHREAD_EXECUTOR = io.reactivex.schedulers.Schedulers.from(Executors.newVirtualThreadPerTaskExecutor());
+
+    @Test
+    public void basic() {
+        Long start = System.currentTimeMillis();
+        RateLimiter woWAPIRateLimiter = new RateLimiter(2, TimeUnit.SECONDS, 100, Optional.empty(),  VTHREAD_EXECUTOR);
+        Completable.merge(
+            List.of(
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request()
+            )
+        ).blockingAwait();
+        assertTimePassed(start, 5000L);
+    }
+
+    @Test
+    public void basicWithHr() {
+        Long start = System.currentTimeMillis();
+        RateLimiter woWAPIRateLimiter = new RateLimiter(36000, TimeUnit.HOURS, 100, Optional.empty(),  VTHREAD_EXECUTOR);
+        Completable.merge(
+            List.of(
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request(),
+                woWAPIRateLimiter.request()
+            )
+        ).blockingAwait();
+        assertTimePassed(start, 1000L);
+    }
+
+    @Test
+    public void complexBlizzardLike() {
+        Long start = System.currentTimeMillis();
+        RateLimiter woWAPIRateLimiter = new RateLimiter(10, TimeUnit.SECONDS, 100, 
+            Optional.of(new RateLimiter(10, TimeUnit.SECONDS, 100, Optional.empty(),  VTHREAD_EXECUTOR)),
+        VTHREAD_EXECUTOR);
+        List<Completable> x = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            x.add(woWAPIRateLimiter.request());
+        }
+        Completable.merge(x).blockingAwait();
+        assertTimePassed(start, 1000L);
+    }
+
+
+    private void assertTimePassed(Long start, Long passed) {
+        String exp = "Expected " + passed + " ms to pass, but only " + (System.currentTimeMillis() - start) + " ms passed";
+        boolean b = (System.currentTimeMillis() - start) >= passed;
+        Assertions.assertTrue(b, exp);
+    }
+}
diff --git a/test/io/github/sammers/pla/logic/WoWAPIRateLimiterTest.java b/test/io/github/sammers/pla/logic/WoWAPIRateLimiterTest.java