Limit connections from the same place (#56)

* connections

* Update fly.toml

* update jdk

Author: SentryMan

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: "19"
+          java-version: "20"
           java-package: jdk
           architecture: x64
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM amazoncorretto:19-alpine-jdk as jreBuilder
+FROM amazoncorretto:20-alpine-jdk as jreBuilder
 
 RUN apk add binutils
 RUN jlink \

fly.toml

@@ -1,38 +1,36 @@
-# fly.toml file generated for manga-spring on 2022-08-25T19:39:19-04:00
+# fly.toml app configuration file generated for manga-spring on 2023-05-26T14:02:59-04:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
 
 app = "manga-spring"
+primary_region = "iad"
 kill_signal = "SIGINT"
-kill_timeout = 5
-processes = []
-
-[env]
+kill_timeout = "5s"
 
 [experimental]
-  allowed_public_ports = []
   auto_rollback = true
 
 [[services]]
-  http_checks = []
+  protocol = "tcp"
   internal_port = 8080
   processes = ["app"]
-  protocol = "tcp"
-  script_checks = []
-  [services.concurrency]
-    hard_limit = 25
-    soft_limit = 20
-    type = "connections"
 
   [[services.ports]]
-    force_https = true
-    handlers = ["http"]
     port = 80
+    handlers = ["http"]
+    force_https = true
 
   [[services.ports]]
-    handlers = ["tls", "http"]
     port = 443
+    handlers = ["tls", "http"]
+  [services.concurrency]
+    type = "connections"
+    hard_limit = 25
+    soft_limit = 20
 
   [[services.tcp_checks]]
-    grace_period = "1s"
     interval = "15s"
-    restart_limit = 0
     timeout = "2s"
+    grace_period = "1s"
+    restart_limit = 0

pom.xml

@@ -13,8 +13,8 @@
 	<name>MangaBackend</name>
 	<description>RSocket API for Manga-Spring Site</description>
 	<properties>
-		<java.version>19</java.version>
-		<avaje.inject.version>8.12</avaje.inject.version>
+		<java.version>20</java.version>
+		<avaje.inject.version>9.2</avaje.inject.version>
 		<mainClass>com.mangasite.MangaBackendApplication</mainClass>
 		<start-class>com.mangasite.MangaBackendApplication</start-class>
 	</properties>

…ava/com/mangasite/record/DeviceInfo.java …va/com/mangasite/records/DeviceInfo.javasrc/main/java/com/mangasite/record/DeviceInfo.java renamed to src/main/java/com/mangasite/records/DeviceInfo.java src/main/java/com/mangasite/record/DeviceInfo.java renamed to src/main/java/com/mangasite/records/DeviceInfo.java

@@ -1,4 +1,4 @@
-package com.mangasite.record;
+package com.mangasite.records;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

…/com/mangasite/record/ServerMessage.java …com/mangasite/records/ServerMessage.javasrc/main/java/com/mangasite/record/ServerMessage.java renamed to src/main/java/com/mangasite/records/ServerMessage.java src/main/java/com/mangasite/record/ServerMessage.java renamed to src/main/java/com/mangasite/records/ServerMessage.java

@@ -1,3 +1,3 @@
-package com.mangasite.record;
+package com.mangasite.records;
 
 public record ServerMessage(String message) {}

src/main/java/com/mangasite/services/ConnectService.java

@@ -6,16 +6,19 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import org.springframework.http.MediaType;
 import org.springframework.messaging.rsocket.RSocketRequester;
 
 import com.mangasite.domain.MangaChapters;
-import com.mangasite.record.DeviceInfo;
-import com.mangasite.record.ServerMessage;
+import com.mangasite.records.DeviceInfo;
+import com.mangasite.records.ServerMessage;
 
 import io.rsocket.RSocket;
+import io.rsocket.exceptions.RejectedSetupException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -29,6 +32,7 @@ public final class ConnectService {
   private ConnectService() {}
 
   private static final String CLIENT = "Client: ";
+  private static final Map<String, Integer> maxNumberOfConnections = new HashMap<>();
 
   /**
    * Logs Rsocket Connect/Disconnect events
@@ -38,6 +42,15 @@ private ConnectService() {}
    */
   public static void startConnectionLog(RSocketRequester rSocketRequester, String clientName) {
     final var startTime = Instant.now();
+
+    var sameClientConnections =
+        maxNumberOfConnections.compute(clientName, (k, v) -> v == null ? 0 : v + 1);
+
+    if (sameClientConnections > 1) {
+      throw new RejectedSetupException(
+          "too many connections from the same place, leave some for the rest of us");
+    }
+
     rSocketRequester
         .rsocketClient()
         .source()
@@ -60,6 +73,13 @@ public static void startConnectionLog(RSocketRequester rSocketRequester, String
                   "Total Remaining Connections: " + ACTIVE_CONNECTIONS.decrementAndGet());
               CLIENT_REQUESTER_MAP.remove(clientName);
               CLIENT_MANGA_MAP.remove(clientName);
+              var frequency = maxNumberOfConnections.get(clientName);
+
+              if (frequency == 0) {
+                maxNumberOfConnections.remove(clientName);
+              } else {
+                maxNumberOfConnections.put(clientName, frequency - 1);
+              }
             })
         .subscribe(
             null,

src/main/resources/META-INF/native-image/reflect-config.json

@@ -379,15 +379,15 @@
     "allPublicConstructors": true
   },
   {
-    "name": "com.mangasite.record.DeviceInfo",
+    "name": "com.mangasite.records.DeviceInfo",
     "allDeclaredFields": true,
     "allDeclaredConstructors": true,
     "allPublicConstructors": true,
     "allDeclaredMethods": true,
     "allPublicMethods": true
   },
   {
-    "name": "com.mangasite.record.ServerMessage",
+    "name": "com.mangasite.records.ServerMessage",
     "allDeclaredFields": true,
     "allDeclaredMethods": true,
     "allDeclaredConstructors": true,