Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-19 15:09:15 +00:00
Code Issues Releases Activity

改用滑动窗口

Browse Source
This commit is contained in:
jhqwqmc
2025-11-21 10:29:08 +08:00
parent c2a8fdf6e5
commit 33da29d6bf
9 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bukkit/loader/build.gradle.kts
View File

@@ -85,5 +85,6 @@ tasks {
relocate("io.netty.handler.codec.rtsp", "net.momirealms.craftengine.libraries.netty.handler.codec.rtsp") relocate("io.netty.handler.codec.rtsp", "net.momirealms.craftengine.libraries.netty.handler.codec.rtsp")
relocate("io.netty.handler.codec.spdy", "net.momirealms.craftengine.libraries.netty.handler.codec.spdy") relocate("io.netty.handler.codec.spdy", "net.momirealms.craftengine.libraries.netty.handler.codec.spdy")
relocate("io.netty.handler.codec.http2", "net.momirealms.craftengine.libraries.netty.handler.codec.http2") relocate("io.netty.handler.codec.http2", "net.momirealms.craftengine.libraries.netty.handler.codec.http2")
relocate("io.github.bucket4j", "net.momirealms.craftengine.libraries.bucket4j")
} }
} }

1
bukkit/paper-loader/build.gradle.kts
View File

@@ -172,6 +172,7 @@ tasks {
relocate("io.netty.handler.codec.rtsp", "net.momirealms.craftengine.libraries.netty.handler.codec.rtsp") relocate("io.netty.handler.codec.rtsp", "net.momirealms.craftengine.libraries.netty.handler.codec.rtsp")
relocate("io.netty.handler.codec.spdy", "net.momirealms.craftengine.libraries.netty.handler.codec.spdy") relocate("io.netty.handler.codec.spdy", "net.momirealms.craftengine.libraries.netty.handler.codec.spdy")
relocate("io.netty.handler.codec.http2", "net.momirealms.craftengine.libraries.netty.handler.codec.http2") relocate("io.netty.handler.codec.http2", "net.momirealms.craftengine.libraries.netty.handler.codec.http2")
relocate("io.github.bucket4j", "net.momirealms.craftengine.libraries.bucket4j")
} }
} }

3
common-files/src/main/resources/craft-engine.properties
View File

@@ -34,4 +34,5 @@ reactive-streams=${reactive_streams_version}
amazon-sdk-s3=${amazon_awssdk_version} amazon-sdk-s3=${amazon_awssdk_version}
amazon-sdk-eventstream=${amazon_awssdk_eventstream_version} amazon-sdk-eventstream=${amazon_awssdk_eventstream_version}
evalex=${evalex_version} evalex=${evalex_version}
jimfs=${jimfs_version} jimfs=${jimfs_version}
bucket4j=${bucket4j_version}

5
core/build.gradle.kts
View File

@@ -21,7 +21,7 @@ dependencies {
implementation("net.momirealms:sparrow-nbt-codec:${rootProject.properties["sparrow_nbt_version"]}") implementation("net.momirealms:sparrow-nbt-codec:${rootProject.properties["sparrow_nbt_version"]}")
implementation("net.momirealms:sparrow-nbt-legacy-codec:${rootProject.properties["sparrow_nbt_version"]}") implementation("net.momirealms:sparrow-nbt-legacy-codec:${rootProject.properties["sparrow_nbt_version"]}")
// S3 // S3
implementation("net.momirealms:craft-engine-s3:0.8") implementation("net.momirealms:craft-engine-s3:0.9")
// Util // Util
compileOnly("net.momirealms:sparrow-util:${rootProject.properties["sparrow_util_version"]}") compileOnly("net.momirealms:sparrow-util:${rootProject.properties["sparrow_util_version"]}")
// Adventure // Adventure
@@ -69,6 +69,8 @@ dependencies {
compileOnly("com.mojang:authlib:${rootProject.properties["authlib_version"]}") compileOnly("com.mojang:authlib:${rootProject.properties["authlib_version"]}")
// concurrentutil // concurrentutil
compileOnly("ca.spottedleaf:concurrentutil:${rootProject.properties["concurrent_util_version"]}") compileOnly("ca.spottedleaf:concurrentutil:${rootProject.properties["concurrent_util_version"]}")
// bucket4j
compileOnly("com.bucket4j:bucket4j_jdk17-core:${rootProject.properties["bucket4j_version"]}")
} }
java { java {
@@ -107,6 +109,7 @@ tasks {
relocate("io.netty.handler.codec.rtsp", "net.momirealms.craftengine.libraries.netty.handler.codec.rtsp") relocate("io.netty.handler.codec.rtsp", "net.momirealms.craftengine.libraries.netty.handler.codec.rtsp")
relocate("io.netty.handler.codec.spdy", "net.momirealms.craftengine.libraries.netty.handler.codec.spdy") relocate("io.netty.handler.codec.spdy", "net.momirealms.craftengine.libraries.netty.handler.codec.spdy")
relocate("io.netty.handler.codec.http2", "net.momirealms.craftengine.libraries.netty.handler.codec.http2") relocate("io.netty.handler.codec.http2", "net.momirealms.craftengine.libraries.netty.handler.codec.http2")
relocate("io.github.bucket4j", "net.momirealms.craftengine.libraries.bucket4j") // bucket4j
} }
} }

17
core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/SelfHost.java
View File

@@ -1,5 +1,6 @@
package net.momirealms.craftengine.core.pack.host.impl; package net.momirealms.craftengine.core.pack.host.impl;
import io.github.bucket4j.Bandwidth;
import net.momirealms.craftengine.core.pack.host.ResourcePackDownloadData; import net.momirealms.craftengine.core.pack.host.ResourcePackDownloadData;
import net.momirealms.craftengine.core.pack.host.ResourcePackHost; import net.momirealms.craftengine.core.pack.host.ResourcePackHost;
import net.momirealms.craftengine.core.pack.host.ResourcePackHostFactory; import net.momirealms.craftengine.core.pack.host.ResourcePackHostFactory;
@@ -12,6 +13,7 @@ import net.momirealms.craftengine.core.util.MiscUtils;
import net.momirealms.craftengine.core.util.ResourceConfigUtils; import net.momirealms.craftengine.core.util.ResourceConfigUtils;
import java.nio.file.Path; import java.nio.file.Path;
import java.time.Duration;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@@ -76,14 +78,19 @@ public class SelfHost implements ResourcePackHost {
boolean oneTimeToken = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("one-time-token", true), "one-time-token"); boolean oneTimeToken = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("one-time-token", true), "one-time-token");
String protocol = arguments.getOrDefault("protocol", "http").toString(); String protocol = arguments.getOrDefault("protocol", "http").toString();
boolean denyNonMinecraftRequest = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("deny-non-minecraft-request", true), "deny-non-minecraft-request"); boolean denyNonMinecraftRequest = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("deny-non-minecraft-request", true), "deny-non-minecraft-request");
Map<String, Object> rateMap = MiscUtils.castToMap(arguments.get("rate-map"), true); Map<String, Object> rateMap = MiscUtils.castToMap(arguments.getOrDefault("rate-map", arguments.get("rate-limit")), true);
int maxRequests = 5; int maxRequests = 5;
int resetInterval = 20_000; int resetInterval = 20;
if (rateMap != null) { if (rateMap != null) {
maxRequests = ResourceConfigUtils.getAsInt(rateMap.getOrDefault("max-requests", 5), "max-requests"); maxRequests = Math.max(ResourceConfigUtils.getAsInt(rateMap.getOrDefault("max-requests", 5), "max-requests"), 1);
resetInterval = ResourceConfigUtils.getAsInt(rateMap.getOrDefault("reset-interval", 20), "reset-interval") * 1000; resetInterval = Math.max(ResourceConfigUtils.getAsInt(rateMap.getOrDefault("reset-interval", 20), "reset-interval"), 1);
} }
selfHostHttpServer.updateProperties(ip, port, url, denyNonMinecraftRequest, protocol, maxRequests, resetInterval, oneTimeToken); Bandwidth limit = Bandwidth.builder()
.capacity(maxRequests)
.refillGreedy(maxRequests, Duration.ofSeconds(resetInterval))
.initialTokens(maxRequests / 2) // 修正首次可以直接突破限制请求 maxRequests * 2 次
.build();
selfHostHttpServer.updateProperties(ip, port, url, denyNonMinecraftRequest, protocol, limit, oneTimeToken);
return INSTANCE; return INSTANCE;
} }
} }

50
core/src/main/java/net/momirealms/craftengine/core/pack/host/impl/SelfHostHttpServer.java
View File

@@ -3,6 +3,8 @@ package net.momirealms.craftengine.core.pack.host.impl;
import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.Scheduler; import com.github.benmanes.caffeine.cache.Scheduler;
import io.github.bucket4j.Bandwidth;
import io.github.bucket4j.Bucket;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.*; import io.netty.channel.*;
@@ -23,6 +25,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.time.Duration;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
@@ -34,17 +37,20 @@ public class SelfHostHttpServer {
.scheduler(Scheduler.systemScheduler()) .scheduler(Scheduler.systemScheduler())
.expireAfterWrite(1, TimeUnit.MINUTES) .expireAfterWrite(1, TimeUnit.MINUTES)
.build(); .build();
private final Cache<String, IpAccessRecord> ipAccessCache = Caffeine.newBuilder() private final Cache<String, Bucket> ipRateLimiters = Caffeine.newBuilder()
.maximumSize(256) .maximumSize(256)
.scheduler(Scheduler.systemScheduler()) .scheduler(Scheduler.systemScheduler())
.expireAfterWrite(10, TimeUnit.MINUTES) .expireAfterAccess(10, TimeUnit.MINUTES)
.build(); .build();
private final AtomicLong totalRequests = new AtomicLong(); private final AtomicLong totalRequests = new AtomicLong();
private final AtomicLong blockedRequests = new AtomicLong(); private final AtomicLong blockedRequests = new AtomicLong();
private int rateLimit = 1; private Bandwidth limit = Bandwidth.builder()
private long rateLimitInterval = 1000; .capacity(1)
.refillGreedy(1, Duration.ofSeconds(1))
.initialTokens(1)
.build();
private String ip = "localhost"; private String ip = "localhost";
private int port = -1; private int port = -1;
private String protocol = "http"; private String protocol = "http";
@@ -72,15 +78,13 @@ public class SelfHostHttpServer {
String url, String url,
boolean denyNonMinecraft, boolean denyNonMinecraft,
String protocol, String protocol,
int maxRequests, Bandwidth limit,
int resetInterval,
boolean token) { boolean token) {
this.ip = ip; this.ip = ip;
this.url = url; this.url = url;
this.denyNonMinecraft = denyNonMinecraft; this.denyNonMinecraft = denyNonMinecraft;
this.protocol = protocol; this.protocol = protocol;
this.rateLimit = maxRequests; this.limit = limit;
this.rateLimitInterval = resetInterval;
this.useToken = token; this.useToken = token;
if (port <= 0 || port > 65535) { if (port <= 0 || port > 65535) {
@@ -214,22 +218,12 @@ public class SelfHostHttpServer {
} }
private boolean checkRateLimit(String clientIp) { private boolean checkRateLimit(String clientIp) {
IpAccessRecord record = ipAccessCache.getIfPresent(clientIp); Bucket rateLimiter = ipRateLimiters.get(clientIp, k -> Bucket.builder().addLimit(limit).build());
long now = System.currentTimeMillis(); if (rateLimiter == null) { // 怎么可能null?
rateLimiter = Bucket.builder().addLimit(limit).build();
if (record == null) { ipRateLimiters.put(clientIp, rateLimiter);
record = new IpAccessRecord(now, 1);
ipAccessCache.put(clientIp, record);
return false;
} }
return !rateLimiter.tryConsume(1);
if (now - record.lastAccessTime > rateLimitInterval) {
record.lastAccessTime = now;
record.accessCount = 1;
return false;
}
return ++record.accessCount > rateLimit;
} }
private boolean validateToken(String token) { private boolean validateToken(String token) {
@@ -312,14 +306,4 @@ public class SelfHostHttpServer {
CraftEngine.instance().logger().severe("SHA-1 algorithm not available", e); CraftEngine.instance().logger().severe("SHA-1 algorithm not available", e);
} }
} }
private static class IpAccessRecord {
long lastAccessTime;
int accessCount;
IpAccessRecord(long lastAccessTime, int accessCount) {
this.lastAccessTime = lastAccessTime;
this.accessCount = accessCount;
}
}
} }

3
core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java
View File

@@ -419,7 +419,8 @@ public abstract class CraftEngine implements Plugin {
Dependencies.LZ4, Dependencies.LZ4,
Dependencies.EVALEX, Dependencies.EVALEX,
Dependencies.NETTY_HTTP, Dependencies.NETTY_HTTP,
Dependencies.JIMFS Dependencies.JIMFS,
Dependencies.BUCKET_4_J
); );
} }

7
core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java
View File

@@ -372,6 +372,13 @@ public class Dependencies {
List.of(Relocation.of("jimfs", "com{}google{}common{}jimfs")) List.of(Relocation.of("jimfs", "com{}google{}common{}jimfs"))
); );
public static final Dependency BUCKET_4_J = new Dependency(
"bucket4j",
"com{}bucket4j",
"bucket4j_jdk17-core",
List.of(Relocation.of("bucket4j", "io{}github{}bucket4j"))
);
public static final Dependency NETTY_HTTP = new Dependency( public static final Dependency NETTY_HTTP = new Dependency(
"netty-codec-http", "netty-codec-http",
"io{}netty", "io{}netty",

1
gradle.properties
View File

@@ -56,6 +56,7 @@ amazon_awssdk_eventstream_version=1.0.1
jimfs_version=1.3.1 jimfs_version=1.3.1
authlib_version=7.0.60 authlib_version=7.0.60
concurrent_util_version=0.0.3 concurrent_util_version=0.0.3
bucket4j_version=8.15.0
# Proxy settings # Proxy settings
#systemProp.socks.proxyHost=127.0.0.1 #systemProp.socks.proxyHost=127.0.0.1