feat:"拆分上游首字节/空闲/总期限并在执行期间续期预留与并发租约"

- OpenAiCompatibleProvider:总期限上限 3600 秒(默认仍 90),新增首字节与空闲超时,流式有数据即重置空闲窗口
- GatewayRequestExecutionService:调用期间定时续期钱包预留与 Redis 租约,结束即停
- ChatBillingService.renew 只延长 pending 预留;GatewayGuard 只续仍持有的租约,丢失不重建
- 新增本地 Docker 启动覆盖文件(预编译产物,仅监听 127.0.0.1)
- 新增流式空闲/长流、续期、过期恢复不释放运行中调用、租约续期回归

验证:mvn -B -o clean verify 409 项通过(独立 PostgreSQL/Redis)

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
xppandClaude Opus 5.5 committed 2026-10-22 15:25:28 +08:00
1 parent 1a608f8ff8
commit aef5356c54
12 files changed
+263 -10

No files matched your search

@@ -450,6 +450,22 @@ class PlatformAdminPostgresTest {
assertEquals(0,jdbc.queryForObject("SELECT count(*) FROM wallet_entries WHERE operation='usage'",Integer.class));
assertEquals(2,jdbc.queryForObject("SELECT count(*) FROM usage_events WHERE status='failed' AND cost_amount=0",Integer.class));
}
@Test void renewedRunningCallIsNotReleasedByExpiryRecovery() {
var f=chatFixture();
wallet.grant(ownerToken,memberId,UUID.randomUUID(),"1","renewal test",meta);
var running=f.reserve(null);
jdbc.update("UPDATE chat_billing_requests SET expires_at=now()+interval '5 seconds' WHERE id=?",running.id());
assertTrue(f.billing().renew(running.id(),1_800_000));
assertTrue(jdbc.queryForObject("SELECT expires_at>now()+interval '29 minutes' FROM chat_billing_requests WHERE id=?",Boolean.class,running.id()));
// Renewal never shortens an existing hold.
assertTrue(f.billing().renew(running.id(),60_000));
assertTrue(jdbc.queryForObject("SELECT expires_at>now()+interval '29 minutes' FROM chat_billing_requests WHERE id=?",Boolean.class,running.id()));
f.billing().recoverExpired();
assertEquals("pending",jdbc.queryForObject("SELECT status FROM chat_billing_requests WHERE id=?",String.class,running.id()));
assertTrue(jdbc.queryForObject("SELECT reserved_balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId).signum()>0);
f.billing().fail(running,"TEST_DONE","done",1);
assertFalse(f.billing().renew(running.id(),1_800_000));
}
@Test void unexpectedProviderOverrunIsRecordedAsDebtAndBlocksNewCalls() {
var f=chatFixture();
wallet.grant(ownerToken,memberId,UUID.randomUUID(),"1","billing test",meta);
@@ -73,6 +73,21 @@ class FairAdmissionRedisTest {
keyHolder.close();
}
@Test void renewalExtendsOnlyLeasesStillHeld() throws Exception {
var admission = guard(0).acquire(model, UUID.randomUUID(), 0);
String slots = prefix + "gateway:slots:model:fair-model";
String token = redis.opsForZSet().range(slots, 0, 0).iterator().next();
double before = redis.opsForZSet().score(slots, token);
assertTrue(admission.renew(1_800_000));
assertTrue(redis.opsForZSet().score(slots, token) > before + 1_000_000);
redis.opsForZSet().remove(slots, token);
// A lost lease is reported, never silently recreated on top of another caller's capacity.
assertFalse(admission.renew(1_800_000));
assertNull(redis.opsForZSet().score(slots, token));
admission.close();
assertFalse(admission.renew(1_800_000));
}
private long zcard(String kind) {
Long value = redis.opsForZSet().zCard(prefix + "gateway:" + kind + ":model:fair-model");
return value == null ? 0 : value;
@@ -96,6 +96,26 @@ class GatewayRequestExecutionServiceTest {
verify(admission).close();
}
@Test
void runningCallRenewsItsHoldAndLeaseUntilTheWorkReturns() throws Exception {
ChatBillingService billing = mock(ChatBillingService.class);
var ticket = new ChatBillingService.Ticket(UUID.randomUUID(), userId, null);
when(billing.reserve(key, model, normalized, null, context.metadata())).thenReturn(ticket);
var service = new GatewayRequestExecutionService(billing, new ApiRequestRiskPolicy(ApiRequestRiskEngine.allowAll()), 20);
ApiRequestAdmission admission = mock(ApiRequestAdmission.class);
when(admission.renew(anyLong())).thenReturn(true);
try {
assertEquals("done", service.execute(context, key, model, normalized, null, () -> admission,
ignored -> { Thread.sleep(150); return "done"; }, failure -> new ApiException("CALL_FAILED", "failed", 502), ApiException::getCode));
verify(billing, atLeast(2)).renew(eq(ticket.id()), anyLong());
verify(admission, atLeast(2)).renew(anyLong());
// Renewal stops with the call; a finished request must not keep its hold alive.
clearInvocations(billing);
Thread.sleep(100);
verify(billing, never()).renew(any(), anyLong());
} finally { service.shutdown(); }
}
@Test
void workFailureIsRecordedAndAdmissionLeaseCloses() {
ChatBillingService billing = mock(ChatBillingService.class);
@@ -0,0 +1,85 @@
package com.moyi.controlplane.provider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.moyi.controlplane.common.ApiException;
import com.moyi.controlplane.security.SecretCipher;
import com.sun.net.httpserver.HttpServer;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.mock.env.MockEnvironment;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
/** Long streams survive while bytes flow; a silent upstream ends at the idle window, not the total deadline. */
class StreamDeadlineTest {
private OpenAiCompatibleProvider provider(HttpServer server, int total, int idle) {
var env = new MockEnvironment()
.withProperty("moyi.providers.deepseek.api-key", "local-fake-key")
.withProperty("moyi.providers.deepseek.base-url", "http://127.0.0.1:" + server.getAddress().getPort() + "/v1")
.withProperty("moyi.gateway.upstream-timeout-seconds", Integer.toString(total))
.withProperty("moyi.gateway.upstream-idle-timeout-seconds", Integer.toString(idle));
return new OpenAiCompatibleProvider(new ObjectMapper(), env, mock(JdbcTemplate.class), new SecretCipher("local-test-only"));
}
private HttpServer sse(long gapMs, int events, boolean finish) throws Exception {
var server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
server.createContext("/v1/chat/completions", exchange -> {
exchange.getResponseHeaders().set("Content-Type", "text/event-stream");
exchange.sendResponseHeaders(200, 0);
try (var out = exchange.getResponseBody()) {
for (int i = 0; i < events; i++) {
out.write(("data: {\"i\":" + i + "}\n\n").getBytes(StandardCharsets.UTF_8));
out.flush();
Thread.sleep(gapMs);
}
if (finish) out.write("data: [DONE]\n\n".getBytes(StandardCharsets.UTF_8));
else Thread.sleep(5_000);
} catch (Exception ignored) { }
});
server.start();
return server;
}
@Test void streamLongerThanTheIdleWindowSucceedsWhileEventsKeepArriving() throws Exception {
var server = sse(400, 8, true);
var provider = provider(server, 10, 1);
try (var stream = provider.stream("provider-deepseek", "model", Map.of("messages", List.of()))) {
var chunks = new ArrayList<Map<String,Object>>();
long started = System.nanoTime();
stream.events(chunks::add);
assertEquals(8, chunks.size());
assertTrue(System.nanoTime() - started > 2_000_000_000L, "the stream outlived the 1s idle window");
} finally { provider.close(); server.stop(0); }
}
@Test void silentUpstreamTimesOutAtTheIdleWindow() throws Exception {
var server = sse(0, 1, false);
var provider = provider(server, 10, 1);
try (var stream = provider.stream("provider-deepseek", "model", Map.of("messages", List.of()))) {
long started = System.nanoTime();
var error = assertThrows(ApiException.class, () -> stream.events(chunk -> { }));
assertEquals("UPSTREAM_PROVIDER_TIMEOUT", error.getCode());
long elapsedMs = (System.nanoTime() - started) / 1_000_000;
assertTrue(elapsedMs < 4_000, "ended by the idle window, not the 10s total: " + elapsedMs);
} finally { provider.close(); server.stop(0); }
}
@Test void totalDeadlineIsCappedAndIdleNeverExceedsIt() throws Exception {
var server = sse(0, 1, true);
var env = new MockEnvironment()
.withProperty("moyi.providers.deepseek.api-key", "local-fake-key")
.withProperty("moyi.providers.deepseek.base-url", "http://127.0.0.1:" + server.getAddress().getPort() + "/v1")
.withProperty("moyi.gateway.upstream-timeout-seconds", "999999")
.withProperty("moyi.gateway.upstream-idle-timeout-seconds", "999999");
var provider = new OpenAiCompatibleProvider(new ObjectMapper(), env, mock(JdbcTemplate.class), new SecretCipher("local-test-only"));
try {
assertEquals(OpenAiCompatibleProvider.MAX_TIMEOUT_SECONDS, org.springframework.test.util.ReflectionTestUtils.getField(provider, "timeoutSeconds"));
assertEquals(1000L * OpenAiCompatibleProvider.MAX_TIMEOUT_SECONDS, org.springframework.test.util.ReflectionTestUtils.getField(provider, "idleTimeoutMs"));
} finally { provider.close(); server.stop(0); }
}
}